fix checkstyle

zanata · Oct 4, 2017 · e738879 · e738879
1 parent 1fc8d0c
commit e738879
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 7 deletions.
diff --git a/server/services/src/main/java/org/zanata/servlet/SAMLFilter.kt b/server/services/src/main/java/org/zanata/servlet/SAMLFilter.kt
@@ -68,7 +68,7 @@ class SAMLFilter() : Filter {
                 val samlAttributeMap: Map<String, List<String>?> =
                         session.getAttribute(GeneralConstants.SESSION_ATTRIBUTE_MAP) as? Map<String, List<String>?>? ?: mapOf()
                 // These assumes IDP follow standard SAML assertion names
-                val usernameFromSSO= getValueFromSessionAttribute(samlAttributeMap, "uid", { _ -> principalName})
+                val usernameFromSSO = getValueFromSessionAttribute(samlAttributeMap, "uid", { _ -> principalName})
                 val emailFromSSO = getValueFromSessionAttribute(samlAttributeMap, "email")
                 val nameFromSSO = getValueFromSessionAttribute(samlAttributeMap, "cn")
                 log.info("SSO login: username: {}, name: {}, uuid: {}",

diff --git a/server/services/src/test/java/org/zanata/servlet/SAMLFilterTest.kt b/server/services/src/test/java/org/zanata/servlet/SAMLFilterTest.kt
@@ -108,4 +108,4 @@ class SAMLFilterTest {
         verify(authenticationManager).ssoLogin(account, "abc-123-unique", "jsmith@example.com", "John Smith")
         verify(response).sendRedirect("/dashboard")
     }
-}
+}
diff --git a/server/zanata-war/src/main/webapp/WEB-INF/faces-config.xml b/server/zanata-war/src/main/webapp/WEB-INF/faces-config.xml
@@ -115,11 +115,6 @@
       <to-view-id>/dashboard/home.xhtml</to-view-id>
       <redirect />
     </navigation-case>
-    <navigation-case>
-      <from-outcome>sso</from-outcome>
-      <to-view-id>/account/ssologin.xhtml</to-view-id>
-      <redirect />
-    </navigation-case>
   </navigation-rule>
 
   <navigation-rule>