display client name if present for IDP Dicovery

[#117269923] https://www.pivotaltracker.com/story/show/117269923 Signed-off-by: Priyata Agrawal <pagrawal@pivotal.io>
cloudfoundry · May 4, 2016 · 50535aa · 50535aa
1 parent e88a116
commit 50535aa
Show file tree

Hide file tree

Showing 3 changed files with 55 additions and 5 deletions.
diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/login/LoginInfoEndpoint.java b/server/src/main/java/org/cloudfoundry/identity/uaa/login/LoginInfoEndpoint.java
@@ -34,7 +34,6 @@
 import org.cloudfoundry.identity.uaa.util.UaaStringUtils;
 import org.cloudfoundry.identity.uaa.zone.IdentityZone;
 import org.cloudfoundry.identity.uaa.zone.IdentityZoneConfiguration;
-import org.cloudfoundry.identity.uaa.zone.IdentityZoneConfigurationValidator;
 import org.cloudfoundry.identity.uaa.zone.IdentityZoneHolder;
 import org.springframework.core.io.support.PropertiesLoaderUtils;
 import org.springframework.dao.EmptyResultDataAccessException;
@@ -223,7 +222,13 @@ private String login(Model model, Principal principal, List<String> excludedProm
 
     private String login(Model model, Principal principal, List<String> excludedPrompts, boolean jsonResponse, HttpServletRequest request) {
         HttpSession session = request != null ? request.getSession(false) : null;
-        List<String> allowedIdps = getAllowedIdps(session);
+        List<String> allowedIdps = null;
+        String clientName = null;
+        Map<String,Object> clientInfo;
+        if((clientInfo = getClientInfo(session)) != null) {
+            allowedIdps = (List<String>) clientInfo.get(ClientConstants.ALLOWED_PROVIDERS);
+            clientName = (String) clientInfo.get(ClientConstants.CLIENT_NAME);
+        }
 
         Map<String, SamlIdentityProviderDefinition> samlIdps = getSamlIdentityProviderDefinitions(allowedIdps);
         Map<String, AbstractXOAuthIdentityProviderDefinition> oauthIdentityProviderDefinitions = getOauthIdentityProviderDefinitions();
@@ -321,6 +326,7 @@ private String login(Model model, Principal principal, List<String> excludedProm
             model.addAttribute(FIELD_USERNAME_SHOW, fieldUsernameShow);
             model.addAttribute(IDP_DEFINITIONS, samlIdps.values());
             model.addAttribute(OAUTH_DEFINITIONS, oauthIdentityProviderDefinitions);
+            model.addAttribute("clientName", clientName);
         }
         model.addAttribute(LINKS, links);
         setCommitInfo(model);
@@ -404,15 +410,15 @@ protected boolean hasSavedOauthAuthorizeRequest(HttpSession session) {
         return false;
     }
 
-    public List<String> getAllowedIdps(HttpSession session) {
+    public Map<String, Object> getClientInfo(HttpSession session) {
         if (!hasSavedOauthAuthorizeRequest(session)) {
             return null;
         }
         SavedRequest savedRequest = (SavedRequest) session.getAttribute("SPRING_SECURITY_SAVED_REQUEST");
         String[] client_ids = savedRequest.getParameterValues("client_id");
         try {
             ClientDetails clientDetails = clientDetailsService.loadClientByClientId(client_ids[0]);
-            return (List<String>) clientDetails.getAdditionalInformation().get(ClientConstants.ALLOWED_PROVIDERS);
+            return clientDetails.getAdditionalInformation();
         } catch (NoSuchClientException x) {
             return null;
         }

diff --git a/server/src/main/resources/templates/web/idp_discovery/email.html b/server/src/main/resources/templates/web/idp_discovery/email.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html xmlns:th="http://www.thymeleaf.org" xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" layout:decorator="layouts/pivotal-ui-main">
 <div layout:fragment="page-content">
-<h4 class="txt-c pbxxl ptxl">
+<h4 class="txt-c pbxxl ptxl" th:text="${T(org.springframework.util.StringUtils).hasText(clientName) ? 'Sign in to continue to ' + clientName : 'Sign in to continue'}">
     Sign in to continue
 </h4>
 <form action="/login/password" th:action="@{/login/password}" method="post" role="form" _lpchecked="1">

diff --git a/uaa/src/test/java/org/cloudfoundry/identity/uaa/login/LoginMockMvcTests.java b/uaa/src/test/java/org/cloudfoundry/identity/uaa/login/LoginMockMvcTests.java
@@ -1645,6 +1645,50 @@ public void idpDiscoveryPageDisplayed_IfFlagIsEnabled() throws Exception {
         getWebApplicationContext().getBean(LoginInfoEndpoint.class).setIdpDiscoveryEnabled(false);
     }
 
+    @Test
+    public void idpDiscoveryClientNameDisplayed() throws Exception {
+        getWebApplicationContext().getBean(LoginInfoEndpoint.class).setIdpDiscoveryEnabled(true);
+        BaseClientDetails client = new BaseClientDetails("koala-client", "", "", "client_credentials", "uaa.none", "http://*.wildcard.testing,http://testing.com");
+        client.setClientSecret("secret");
+        client.addAdditionalInformation(ClientConstants.CLIENT_NAME, "woohoo");
+        MockMvcUtils.utils().createClient(getMockMvc(), adminToken, client);
+
+        MockHttpSession session = new MockHttpSession();
+        SavedRequest savedRequest = new DefaultSavedRequest(new MockHttpServletRequest(), new PortResolverImpl()) {
+            @Override
+            public String getRedirectUrl() {
+                return "http://test/redirect/oauth/authorize";
+            }
+            @Override
+            public String[] getParameterValues(String name) {
+                if ("client_id".equals(name)) {
+                    return new String[] {"koala-client"};
+                }
+                return new String[0];
+            }
+            @Override public List<Cookie> getCookies() { return null; }
+            @Override public String getMethod() { return null; }
+            @Override public List<String> getHeaderValues(String name) { return null; }
+            @Override
+            public Collection<String> getHeaderNames() { return null; }
+            @Override public List<Locale> getLocales() { return null; }
+            @Override public Map<String, String[]> getParameterMap() { return null; }
+        };
+        session.setAttribute("SPRING_SECURITY_SAVED_REQUEST", savedRequest);
+
+        getMockMvc().perform(get("/login")
+            .session(session)
+            .header("Accept", TEXT_HTML))
+            .andExpect(status().isOk())
+            .andExpect(view().name("idp_discovery/email"))
+            .andExpect(content().string(containsString("Sign in to continue to woohoo")))
+            .andExpect(xpath("//input[@name='email']").exists())
+            .andExpect(xpath("//div[@class='action']//a").string("Create account"))
+            .andExpect(xpath("//input[@type='submit']/@value").string("Next"));
+
+        getWebApplicationContext().getBean(LoginInfoEndpoint.class).setIdpDiscoveryEnabled(false);
+    }
+
     @Test
     public void emailPageIdpDiscoveryEnabled_SelfServiceLinksDisabled() throws Exception {
         setSelfServiceLinksEnabled(false);