set token in privateUrlUser in PrivateUrlServiceBean

Author: stevenwinship

src/main/java/edu/harvard/iq/dataverse/privateurl/PrivateUrlPage.java

@@ -52,7 +52,6 @@ public String init() {
             }
             if(!sessionUserCanViewUnpublishedDataset){
                 //Only Reset if user cannot view this Draft Version
-                privateUrlUser.setToken(token);
                 session.setUser(privateUrlUser); 
             }
             logger.info("Redirecting PrivateUrlUser '" + privateUrlUser.getIdentifier() + "' to " + draftDatasetPageToBeRedirectedTo);

src/main/java/edu/harvard/iq/dataverse/privateurl/PrivateUrlServiceBean.java

@@ -51,7 +51,11 @@ public PrivateUrl getPrivateUrlFromDatasetId(long datasetId) {
      * @return A PrivateUrlUser if one can be found using the token or null.
      */
     public PrivateUrlUser getPrivateUrlUserFromToken(String token) {
-        return PrivateUrlUtil.getPrivateUrlUserFromRoleAssignment(getRoleAssignmentFromPrivateUrlToken(token));
+        PrivateUrlUser user = PrivateUrlUtil.getPrivateUrlUserFromRoleAssignment(getRoleAssignmentFromPrivateUrlToken(token));
+        if (user != null) {
+            user.setToken(token);
+        }
+        return user;
     }
 
     /**