Changed references to "dataverse.xhtml" to use the dataverse alias, i…

…n order to utilize the Pretty Faces URL. [ref #1111]
IQSS · Feb 26, 2015 · 547b1d8 · 547b1d8
1 parent 17a086b
commit 547b1d8
Show file tree

Hide file tree

Showing 8 changed files with 26 additions and 19 deletions.
diff --git a/src/main/java/Bundle.properties b/src/main/java/Bundle.properties
@@ -42,6 +42,7 @@ previous=Previous
 next=Next
 more=More...
 less=Less...
+select=Select...
 
 # dataverse_header.xhtml
 
@@ -124,11 +125,15 @@ login.institution=Institution Log In
 login.invaliduserpassword=The username and/or password you entered is invalid. Contact support@dataverse.org if you need assistance accessing your account.
 
 #shib.xhtml
-shib.btn.accept=Accept Terms and Convert Account
+shib.btn.acceptAndConvert=Accept Terms and Convert Account
+shib.btn.acceptAndCreate=Accept Terms and Create Account
 shib.welcome=Welcome,
-shib.welcomeMessage=The email provided by {0} authentication matches an existing Dataverse account. If you would like to have your pre-existing Dataverse account now associated with your institutional email, please enter your current Dataverse password and then click the Convert Account button.
+shib.welcomeExistingUserMessage=The email provided by {0} authentication matches an existing Dataverse account. If you would like to associate your existing Dataverse account with {0} authentication, please enter the password of that existing Dataverse account, review the Terms of Use, and then click the Accept Terms and Convert Account button.
 shib.dataverseUsername=Dataverse Username
 shib.currentDataversePassword=Current Dataverse Password
+shib.accountInformation=Account Information
+shib.offerToCreateNewAccount=Please agree to the Dataverse Terms of Use to create your account.
+shib.passwordRejected=Accounts can only be converted if you provide the correct password for your existing account.
 
 # passwordreset.xhtml
 

diff --git a/src/main/java/edu/harvard/iq/dataverse/AdvancedSearchPage.java b/src/main/java/edu/harvard/iq/dataverse/AdvancedSearchPage.java
@@ -74,16 +74,10 @@ public String find() throws IOException, UnsupportedEncodingException {
         queryStrings.add(constructDataverseQuery());
         queryStrings.add(constructDatasetQuery());
         queryStrings.add(constructFileQuery());
-        String dataverseSubtree = "";
-        if (dataverse != null) {
-            if (!dataverse.equals(dataverseServiceBean.findRootDataverse())) {
-                dataverseSubtree = "&alias=" + dataverse.getAlias();
-            }
-        }
 
         String returnString = "/dataverse.xhtml?q=";
         returnString += URLEncoder.encode(constructQuery(queryStrings, false, false), "UTF-8");       
-        returnString += dataverseSubtree + "&faces-redirect=true";
+        returnString += "&alias=" + dataverse.getAlias() + "&faces-redirect=true";
 
 
         logger.fine(returnString);        

diff --git a/src/main/java/edu/harvard/iq/dataverse/DataverseHeaderFragment.java b/src/main/java/edu/harvard/iq/dataverse/DataverseHeaderFragment.java
@@ -137,11 +137,11 @@ public String logout() {
             redirectPage = URLDecoder.decode(redirectPage, "UTF-8");
         } catch (UnsupportedEncodingException ex) {
             Logger.getLogger(LoginPage.class.getName()).log(Level.SEVERE, null, ex);
-            redirectPage = "dataverse.xhtml";
+            redirectPage = "dataverse.xhtml&alias=" + dataverseService.findRootDataverse().getAlias();
         }
 
         if (StringUtils.isEmpty(redirectPage)) {
-            redirectPage = "dataverse.xhtml";
+            redirectPage = "dataverse.xhtml&alias=" + dataverseService.findRootDataverse().getAlias();
         }
 
         logger.log(Level.INFO, "Sending user to = " + redirectPage);

diff --git a/src/main/java/edu/harvard/iq/dataverse/LoginPage.java b/src/main/java/edu/harvard/iq/dataverse/LoginPage.java
@@ -68,6 +68,9 @@ public enum EditMode {LOGIN, SUCCESS, FAILED};
 
     @Inject DataverseSession session;    
 
+    @EJB
+    DataverseServiceBean dataverseService;
+
     @EJB
     BuiltinUserServiceBean dataverseUserService;
 
@@ -140,11 +143,15 @@ public String login() {
             logger.log(Level.INFO, "User authenticated: {0}", r.getEmail());
             session.setUser(r);
 
+            if ("dataverse.xhtml".equals(redirectPage)) {
+                redirectPage = redirectPage + "&alias=" + dataverseService.findRootDataverse().getAlias();
+            }
+
             try {            
                 redirectPage = URLDecoder.decode(redirectPage, "UTF-8");
             } catch (UnsupportedEncodingException ex) {
                 Logger.getLogger(LoginPage.class.getName()).log(Level.SEVERE, null, ex);
-                redirectPage = "dataverse.xhtml";
+                redirectPage = "dataverse.xhtml&alias=" + dataverseService.findRootDataverse().getAlias();
             }
 
             logger.log(Level.INFO, "Sending user to = " + redirectPage);

diff --git a/src/main/java/edu/harvard/iq/dataverse/SearchIncludeFragment.java b/src/main/java/edu/harvard/iq/dataverse/SearchIncludeFragment.java
@@ -161,7 +161,7 @@ public String searchRedirect(String dataverseRedirectPage) {
          */
 
         dataverseRedirectPage = StringUtils.isBlank(dataverseRedirectPage) ? "dataverse.xhtml" : dataverseRedirectPage;
-        String optionalDataverseScope = dataverse.getId().equals(dataverseService.findRootDataverse().getId()) ? "" : "&id=" + dataverse.getId();
+        String optionalDataverseScope = "&alias=" + dataverse.getAlias();
 
         return dataverseRedirectPage + "?faces-redirect=true&q=" + query + optionalDataverseScope;
 

diff --git a/src/main/java/edu/harvard/iq/dataverse/authorization/providers/builtin/BuiltinUserPage.java b/src/main/java/edu/harvard/iq/dataverse/authorization/providers/builtin/BuiltinUserPage.java
@@ -307,7 +307,7 @@ public String save() {
             userNotificationService.sendNotification(au,
                                                      new Timestamp(new Date().getTime()), 
                                                      UserNotification.Type.CREATEACC, null);
-            return "/dataverse.xhtml?faces-redirect=true;";
+            return "/dataverse.xhtml?alias=" + dataverseService.findRootDataverse().getAlias() + "faces-redirect=true;";
         } else {
             authSvc.updateAuthenticatedUser(currentUser, builtinUser.getDisplayInfo());
             editMode = null;
@@ -323,7 +323,7 @@ public String save() {
 
     public String cancel() {
         if (editMode == EditMode.CREATE) {
-            return "/dataverse.xhtml?faces-redirect=true;";
+            return "/dataverse.xhtml?alias=" + dataverseService.findRootDataverse().getAlias() + "faces-redirect=true;";
         }
 
         editMode = null;

diff --git a/src/main/java/edu/harvard/iq/dataverse/passwordreset/PasswordResetPage.java b/src/main/java/edu/harvard/iq/dataverse/passwordreset/PasswordResetPage.java
@@ -1,7 +1,7 @@
 package edu.harvard.iq.dataverse.passwordreset;
 
+import edu.harvard.iq.dataverse.DataverseServiceBean;
 import edu.harvard.iq.dataverse.DataverseSession;
-import edu.harvard.iq.dataverse.EMailValidator;
 import edu.harvard.iq.dataverse.ValidateEmail;
 import edu.harvard.iq.dataverse.authorization.AuthenticationServiceBean;
 import edu.harvard.iq.dataverse.authorization.providers.builtin.BuiltinAuthenticationProvider;
@@ -15,7 +15,6 @@
 import javax.faces.view.ViewScoped;
 import javax.inject.Inject;
 import javax.inject.Named;
-import javax.validation.ConstraintValidatorContext;
 import org.hibernate.validator.constraints.NotBlank;
 
 @ViewScoped
@@ -29,6 +28,8 @@ public class PasswordResetPage implements java.io.Serializable {
     @EJB
     BuiltinUserServiceBean dataverseUserService;
     @EJB
+    DataverseServiceBean dataverseService;    
+    @EJB
     AuthenticationServiceBean authSvc;
     @Inject
     DataverseSession session;
@@ -109,7 +110,7 @@ public String resetPassword() {
             String builtinAuthProviderId = BuiltinAuthenticationProvider.PROVIDER_ID;
             AuthenticatedUser au = authSvc.lookupUser(builtinAuthProviderId, user.getUserName());
             session.setUser(au);
-            return "/dataverse.xhtml?faces-redirect=true";
+            return "/dataverse.xhtml?alias=" + dataverseService.findRootDataverse().getAlias() + "faces-redirect=true";
         } else {
             FacesContext.getCurrentInstance().addMessage(null, new FacesMessage(FacesMessage.SEVERITY_ERROR, response.getMessageSummary(), response.getMessageDetail()));
             return null;

diff --git a/src/main/webapp/loginpage.xhtml b/src/main/webapp/loginpage.xhtml
@@ -63,7 +63,7 @@
                                 <div class="form-group">
                                     <div class="col-sm-offset-2 col-sm-9">
                                         <p:commandButton id="login" value="#{bundle.login}" update="@all" action="#{LoginPage.login}"/>
-                                        <p:button value="#{bundle.cancel}" style="margin-left:1em;" outcome="/dataverse.xhtml"/>
+                                        <p:button value="#{bundle.cancel}" style="margin-left:1em;" outcome="/dataverse.xhtml?alias=#{dataverseServiceBean.findRootDataverse().alias}"/>
                                     </div>
                                 </div>
                                 <div style="margin-top:.5em;">