Fix redirect to login page when using single open id provider authentication

zanata-war/src/main/java/org/zanata/action/LoginAction.java

@@ -29,6 +29,7 @@
 import org.jboss.seam.annotations.In;
 import org.jboss.seam.annotations.Name;
 import org.jboss.seam.annotations.Scope;
+import org.jboss.seam.security.Identity;
 import org.zanata.ApplicationConfiguration;
 import org.zanata.security.AuthenticationManager;
 import org.zanata.security.AuthenticationType;
@@ -50,6 +51,9 @@
 public class LoginAction implements Serializable {
     private static final long serialVersionUID = 1L;
 
+    @In
+    private Identity identity;
+
     @In
     private ZanataCredentials credentials;
 
@@ -151,4 +155,24 @@ public static OpenIdProviderType getBestSuitedProvider(String openId) {
             return OpenIdProviderType.Generic;
         }
     }
+
+    /**
+     * Indicates which location a user should be redirected when accessing the
+     * login page.
+     *
+     * @return A string indicating where the user should be redirected when
+     *         trying to access the login page.
+     */
+    public String getLoginPageRedirect() {
+        if (identity.isLoggedIn()) {
+            return "dashboard";
+        }
+        if (applicationConfiguration.isOpenIdAuth()
+                && applicationConfiguration.isSingleOpenIdProvider()) {
+            // go directly to the provider's login page
+            return genericOpenIdLogin(applicationConfiguration
+                    .getOpenIdProviderUrl());
+        }
+        return "login";
+    }
 }

zanata-war/src/main/webapp/WEB-INF/pages.xml

@@ -108,9 +108,9 @@
       value="no-cache, no-store, max-age=0, must-revalidate" />
     <param name="continue" value="#{userRedirect.encodedUrl}" />
 
-    <action execute="#{identity.isLoggedIn()}" />
-    <navigation from-action="#{identity.isLoggedIn()}">
-      <rule if-outcome="true">
+    <action execute="#{loginAction.getLoginPageRedirect()}" />
+    <navigation from-action="#{loginAction.getLoginPageRedirect()}">
+      <rule if-outcome="dashboard">
         <redirect view-id="/dashboard/home.xhtml" />
       </rule>
     </navigation>

zanata-war/src/main/webapp/WEB-INF/template/banner.xhtml

@@ -160,7 +160,7 @@
 
       <h:form rendered="#{applicationConfigurationAction.singleOpenId}">
         <h:commandLink id="openid_single_signin_link"
-          action="#{loginAction.genericOpenIdLogin(applicationConfiguration.openIdProviderUrl)}"
+          action="#{loginAction.getLoginPageRedirect()}"
           propagation="none" styleClass="l--push-left-half button--primary">
           #{messages['jsf.Login']}
         </h:commandLink>