use sign in redirect for kerberos login

zanata · Jan 27, 2012 · e7e8d7d · e7e8d7d
1 parent 4379753
commit e7e8d7d
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/server/zanata-war/src/main/java/org/zanata/security/ZanataExternalLoginBean.java b/server/zanata-war/src/main/java/org/zanata/security/ZanataExternalLoginBean.java
@@ -57,12 +57,15 @@ public class ZanataExternalLoginBean implements Serializable
 
    private ApplicationConfiguration applicationConfiguration;
 
+   private UserRedirectBean userRedirectBean;
+
    @Create
    public void init()
    {
       identity = (ZanataIdentity) Component.getInstance(ZanataIdentity.class, ScopeType.SESSION);
       identityStore = (ZanataJpaIdentityStore) Component.getInstance(ZanataJpaIdentityStore.class, ScopeType.APPLICATION);
       applicationConfiguration = (ApplicationConfiguration) Component.getInstance(ApplicationConfiguration.class, ScopeType.APPLICATION);
+      userRedirectBean = (UserRedirectBean) Component.getInstance(UserRedirectBean.class, ScopeType.SESSION);
    }
 
 
@@ -129,7 +132,14 @@ public String redirect()
 
       if (applicationConfiguration.isKerberosAuth() && identity.isLoggedIn() && !isNewUser())
       {
-         return "home";
+         if (userRedirectBean.isRedirect())
+         {
+            return "redirect";
+         }
+         else
+         {
+            return "home";
+         }
       }
 
       if (applicationConfiguration.isKerberosAuth() && !identity.isLoggedIn())

diff --git a/server/zanata-war/src/main/webapp/WEB-INF/pages.xml b/server/zanata-war/src/main/webapp/WEB-INF/pages.xml
@@ -55,6 +55,9 @@
       <rule if-outcome="edit">
         <redirect view-id="/profile/edit.xhtml" />
       </rule>
+      <rule if-outcome="redirect">
+        <redirect url="#{userRedirect.url}" />
+      </rule>
       <rule if-outcome="home">
         <redirect view-id="/home.xhtml" />
       </rule>