Merge branch 'zeroturnaround-master'

RallySoftware · Aug 17, 2018 · 1a03a1a · 1a03a1a
2 parents 4ff652a + 3ff7c9e
commit 1a03a1a
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/mujina-idp/src/main/java/mujina/idp/SsoController.java b/mujina-idp/src/main/java/mujina/idp/SsoController.java
@@ -59,10 +59,13 @@ private void doSSO(HttpServletRequest request, HttpServletResponse response, Aut
 
     String assertionConsumerServiceURL = idpConfiguration.getAcsEndpoint() != null ? idpConfiguration.getAcsEndpoint() : authnRequest.getAssertionConsumerServiceURL();
 
+    List<SAMLAttribute> attributes = attributes(authentication.getName());
+
     SAMLPrincipal principal = new SAMLPrincipal(
       authentication.getName(),
-      NameIDType.UNSPECIFIED,
-      attributes(authentication.getName()),
+      attributes.stream().filter(attr -> "urn:oasis:names:tc:SAML:1.1:nameid-format".equals(attr.getName()))
+          .findFirst().map(attr -> attr.getValue()).orElse(NameIDType.UNSPECIFIED),
+      attributes,
       authnRequest.getIssuer().getValue(),
       authnRequest.getID(),
       assertionConsumerServiceURL,