Create shouldRedirectToDashboard to merge redirect pages conditions

zanata · Sep 9, 2013 · ccc5cb9 · ccc5cb9
1 parent 5cafe65
commit ccc5cb9
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 13 deletions.
diff --git a/zanata-war/src/main/java/org/zanata/security/UserRedirectBean.java b/zanata-war/src/main/java/org/zanata/security/UserRedirectBean.java
@@ -185,18 +185,24 @@ public boolean isRedirectToRegister()
       return isRedirectTo(REGISTER_URL);
    }
 
-   private boolean isRedirectTo(String URL)
+   // provided user is logged in, they should be redirect to dashboard
+   public boolean shouldRedirectToDashboard()
+   {
+      return isRedirectToHome() || isRedirectToRegister();
+   }
+
+   private boolean isRedirectTo(String url)
    {
       if (isRedirect())
       {
-         String redirectUrl = getUrl();
-         int qsIndex = url.indexOf('?');
+         String redirectingUrl = getUrl();
+         int qsIndex = redirectingUrl.indexOf('?');
          if (qsIndex > 0)
          {
-            url = url.substring(0, qsIndex);
+            redirectingUrl = redirectingUrl.substring(0, qsIndex);
          }
 
-         if (url.endsWith(URL))
+         if (redirectingUrl.endsWith(url))
          {
             return true;
          }

diff --git a/zanata-war/src/main/webapp/WEB-INF/pages.xml b/zanata-war/src/main/webapp/WEB-INF/pages.xml
@@ -53,12 +53,9 @@
 	      <rule if="#{!identity.loggedIn}">
 	        <redirect view-id="/account/login_input.xhtml" />
 	      </rule>
-	      <rule if="#{authenticationManager.authenticated and !authenticationManager.newUser and userRedirect.redirectToHome}">
+	      <rule if="#{authenticationManager.authenticated and !authenticationManager.newUser and userRedirect.userRedirect.shouldRedirectToDashboard()}}">
 	        <redirect view-id="/dashboard/home.xhtml" />
 	      </rule>
-	      <rule if="#{authenticationManager.authenticated and !authenticationManager.newUser and userRedirect.redirectToRegister}">
-            <redirect view-id="/dashboard/home.xhtml" />
-          </rule>
 	      <rule if="#{authenticationManager.authenticated and !authenticationManager.newUser and userRedirect.redirect}">
 	        <redirect url="#{userRedirect.url}" />
 	      </rule>
@@ -108,10 +105,7 @@
         <begin-conversation/>
         <redirect view-id="/account/inactive_account.xhtml"/>
       </rule>
-      <rule if="#{authenticationManager.authenticated and !authenticationManager.newUser and userRedirect.redirectToHome}">
-        <redirect view-id="/dashboard/home.xhtml" />
-      </rule>
-      <rule if="#{authenticationManager.authenticated and !authenticationManager.newUser and userRedirect.redirectToRegister}">
+      <rule if="#{authenticationManager.authenticated and !authenticationManager.newUser and userRedirect.shouldRedirectToDashboard()}">
         <redirect view-id="/dashboard/home.xhtml" />
       </rule>
       <rule if="#{authenticationManager.authenticated and !authenticationManager.newUser and userRedirect.redirect}">