Merge pull request #40 from karify/feature/create-default-user-username-mapper

Use username mapper to resolve username when creating a default user

Author: tmilos

src/LightSaml/SpBundle/Security/Authentication/Provider/LightsSamlSpAuthenticationProvider.php

@@ -11,8 +11,6 @@
 
 namespace LightSaml\SpBundle\Security\Authentication\Provider;
 
-use LightSaml\ClaimTypes;
-use LightSaml\SamlConstants;
 use LightSaml\SpBundle\Security\Authentication\Token\SamlSpResponseToken;
 use LightSaml\SpBundle\Security\Authentication\Token\SamlSpToken;
 use LightSaml\SpBundle\Security\Authentication\Token\SamlSpTokenFactoryInterface;
@@ -207,36 +205,11 @@ private function createUser(SamlSpResponseToken $token)
      */
     private function createDefaultUser(SamlSpResponseToken $token)
     {
-        if ($token->getResponse()->getFirstAssertion() &&
-            $token->getResponse()->getFirstAssertion()->getSubject() &&
-            $token->getResponse()->getFirstAssertion()->getSubject()->getNameID() &&
-            $token->getResponse()->getFirstAssertion()->getSubject()->getNameID()->getFormat() != SamlConstants::NAME_ID_FORMAT_TRANSIENT &&
-            $token->getResponse()->getFirstAssertion()->getSubject()->getNameID()->getValue()
-        ) {
-            return $token->getResponse()->getFirstAssertion()->getSubject()->getNameID()->getValue();
-        }
-
-        if ($token->getResponse()->getFirstAssertion() &&
-            $attributeStatement = $token->getResponse()->getFirstAssertion()->getFirstAttributeStatement()
-        ) {
-            $names = [
-                ClaimTypes::COMMON_NAME,
-                ClaimTypes::EMAIL_ADDRESS,
-                ClaimTypes::WINDOWS_ACCOUNT_NAME,
-                ClaimTypes::ADFS_1_EMAIL,
-                ClaimTypes::UPN,
-                ClaimTypes::ADFS_1_UPN,
-            ];
-
-            foreach ($names as $name) {
-                $attribute = $attributeStatement->getFirstAttributeByName($name);
-                if ($attribute && $attribute->getFirstAttributeValue()) {
-                    return $attribute->getFirstAttributeValue();
-                }
-            }
+        if (null === $this->usernameMapper) {
+            return null;
         }
 
-        return null;
+        return $this->usernameMapper->getUsername($token->getResponse());
     }
 
     /**

tests/LightSaml/SpBundle/Tests/Security/Authentication/Provider/LightsSamlSpAuthenticationProviderTest.php

@@ -189,6 +189,10 @@ public function test_creates_authenticated_token_with_default_user_from_name_id_
             )
         );
 
+        $usernameMapperMock->expects($this->exactly(2))
+            ->method('getUsername')
+            ->willReturn($nameIdValue);
+
         $authenticatedToken = $provider->authenticate($token);
 
         $this->assertTrue($authenticatedToken->isAuthenticated());
@@ -226,6 +230,10 @@ public function test_creates_authenticated_token_with_default_user_from_attribut
             )
         );
 
+        $usernameMapperMock->expects($this->exactly(2))
+            ->method('getUsername')
+            ->willReturn($email);
+
         $authenticatedToken = $provider->authenticate($token);
 
         $this->assertTrue($authenticatedToken->isAuthenticated());