getExtraInfo was removed.

RelyingParty/RecoveredFailureRelyingParty.php

@@ -4,7 +4,7 @@
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\Security\Core\SecurityContextInterface;
 
-use Fp\OpenIdBundle\RelyingParty\IdentityProviderResponse;
+use Fp\OpenIdBundle\Security\Core\Authentication\Token\OpenIdToken;
 
 class RecoveredFailureRelyingParty implements RelyingPartyInterface
 {
@@ -21,7 +21,7 @@ public function supports(Request $request)
         if (false == $error = $request->getSession()->get(SecurityContextInterface::AUTHENTICATION_ERROR)) {
             return false;
         }
-        if (false == $error->getExtraInformation() instanceof IdentityProviderResponse) {
+        if (false == $error->getToken() instanceof OpenIdToken) {
             return false;
         }
 
@@ -41,6 +41,9 @@ public function manage(Request $request)
 
         $request->getSession()->remove(SecurityContextInterface::AUTHENTICATION_ERROR);
 
-        return $error->getExtraInformation();
+        return new IdentityProviderResponse(
+            $error->getToken()->getIdentity(),
+            $error->getToken()->getAttributes()
+        );
     }
 }

Resources/doc/interactive_user_creation.md

@@ -89,8 +89,8 @@ use Symfony\Bundle\FrameworkBundle\Controller\Controller;
 use Acme\DemoBundle\Entity\User;
 
 use Fp\OpenIdBundle\RelyingParty\Exception\OpenIdAuthenticationCanceledException;
-use Fp\OpenIdBundle\RelyingParty\IdentityProviderResponse;
 use Fp\OpenIdBundle\RelyingParty\RecoveredFailureRelyingParty;
+use Fp\OpenIdBundle\Security\Core\Authentication\Token\OpenIdToken
 
 class SecurityController extends Controller
 {
@@ -107,18 +107,18 @@ class SecurityController extends Controller
         }
 
         /**
-         * @var $identityProvidedResponse IdentityProviderResponse
+         * @var $token OpenIdToken
          */
-        $identityProvidedResponse = $failure->getExtraInformation();
-        if (false == $identityProvidedResponse instanceof IdentityProviderResponse) {
-            throw new \LogicException('The failure does not contain IdentityProvidedResponse in extraInfo, Is the failure come from openid?');
+        $token = $failure->getToken();
+        if (false == $token instanceof OpenIdToken) {
+            throw new \LogicException('The failure does not contain OpenIdToken, Is the failure come from openid?');
         }
 
         $attributes = array_merge(array(
             'contact/email' => '',
             'namePerson/first' => '',
             'namePerson/last' => '',
-            ), $identityProvidedResponse->getAttributes())
+            ), $token->getAttributes())
         ;
         
         //the next code is pseudo. You have to adopt it to your needs.
@@ -134,7 +134,7 @@ class SecurityController extends Controller
                 $this->getUserManager()->updateUser($user);
 
                 $identity = $this->getIdentityManager()->create();
-                $identity->setIdentity($identityProvidedResponse->getIdentity());
+                $identity->setIdentity($token->getIdentity());
                 $identity->setAttributes($attributes);
                 $identity->setUser($user);
                 $this->getIdentityManager()->update($identity);

Security/Http/Firewall/OpenIdAuthenticationListener.php

@@ -43,7 +43,7 @@ protected function attemptAuthentication(Request $request)
             try {
                 return $this->authenticationManager->authenticate($token);
             } catch (AuthenticationException $e) {
-                $e->setExtraInformation($result);
+                $e->setToken($token);
 
                 throw $e;
             }

Tests/RelyingParty/RecoveredFailureRelyingPartyTest.php

@@ -1,6 +1,7 @@
 <?php
 namespace Fp\OpenIdBundle\Tests\RelyingParty;
 
+use Fp\OpenIdBundle\Security\Core\Authentication\Token\OpenIdToken;
 use Symfony\Component\Security\Core\SecurityContextInterface;
 use Symfony\Component\Security\Core\Exception\AuthenticationException;
 
@@ -87,12 +88,12 @@ public function shouldNotSupportIfAuthenticationErrorWithoutIdentityProviderResp
     /**
      * @test
      */
-    public function shouldSupportIfAuthenticationErrorWithIdentityProviderResponseSet()
+    public function shouldSupportIfAuthenticationErrorWithOpenIdTokenProviderResponseSet()
     {
-        $identityProviderResponse = new IdentityProviderResponse('an_identity');
+        $token = new OpenIdToken('aProviderKey', 'identity');
 
         $error = new AuthenticationException('an error');
-        $error->setExtraInformation($identityProviderResponse);
+        $error->setToken($token);
 
         $session = $this->createSessionStub($returnGet = $error);
         $request = $this->createRequestStub($returnGet = 1, $returnSession = $session);
@@ -105,7 +106,7 @@ public function shouldSupportIfAuthenticationErrorWithIdentityProviderResponseSe
     /**
      * @test
      *
-     * @expectedException InvalidArgumentException
+     * @expectedException \InvalidArgumentException
      * @expectedExceptionMessage The relying party does not support the request
      */
     public function throwIfTryManageNotSupportedRequest()
@@ -123,10 +124,14 @@ public function throwIfTryManageNotSupportedRequest()
      */
     public function shouldReturnIdentityProviderResponseOnManage()
     {
-        $expectedIdentityProviderResponse = new IdentityProviderResponse('an_identity');
+        $expectedIdentity = 'theIdentity';
+        $expectedAttributes = array('foo' => 'fooVal', 'bar' => 'barVal');
+
+        $token = new OpenIdToken('aProviderKey', $expectedIdentity);
+        $token->setAttributes($expectedAttributes);
 
         $error = new AuthenticationException('an error');
-        $error->setExtraInformation($expectedIdentityProviderResponse);
+        $error->setToken($token);
 
         $session = $this->createSessionStub($returnGet = $error);
         $request = $this->createRequestStub($returnGet = 1, $returnSession = $session);
@@ -136,16 +141,19 @@ public function shouldReturnIdentityProviderResponseOnManage()
         //guard
         $this->assertTrue($relyingParty->supports($request));
 
-        $this->assertSame($expectedIdentityProviderResponse, $relyingParty->manage($request));
+        $actualIdentityProviderResponse = $relyingParty->manage($request);
+        $this->assertInstanceOf('Fp\OpenIdBundle\RelyingParty\IdentityProviderResponse', $actualIdentityProviderResponse);
+        $this->assertEquals($expectedIdentity,$actualIdentityProviderResponse->getIdentity());
+        $this->assertEquals($expectedAttributes,$actualIdentityProviderResponse->getAttributes());
     }
 
     /**
      * @test
      */
     public function shouldRemoveErrorFromSessionOnManage()
-    {
+    {        
         $error = new AuthenticationException('an error');
-        $error->setExtraInformation(new IdentityProviderResponse('an_identity'));
+        $error->setToken(new OpenIdToken('aProviderKey', 'anIdentity'));
 
         $session = $this->createSessionStub($returnGet = $error);
         $session

Tests/Security/Core/Authentication/Provider/OpenIdAuthenticationProviderTest.php

@@ -273,7 +273,7 @@ public function shouldCreateAuthenticatedTokenUsingUserProviderAndSearchByIdenti
     /**
      * @test
      *
-     * @expectedException Symfony\Component\Security\Core\Exception\AuthenticationServiceException
+     * @expectedException \Symfony\Component\Security\Core\Exception\AuthenticationServiceException
      * @expectedExceptionMessage User provider did not return an implementation of user interface.
      */
     public function throwIfUserProviderReturnNotUserInstance()
@@ -304,7 +304,7 @@ public function throwIfUserProviderReturnNotUserInstance()
     /**
      * @test
      *
-     * @expectedException Symfony\Component\Security\Core\Exception\UsernameNotFoundException
+     * @expectedException \Symfony\Component\Security\Core\Exception\UsernameNotFoundException
      * @expectedExceptionMessage Cannot find user by openid identity
      */
     public function shouldNotCreateUserIfNotExistIfFlagNotSet()
@@ -399,7 +399,7 @@ public function shouldCreateAuthenticatedTokenUsingUserManagerCreateFromIdentity
     /**
      * @test
      *
-     * @expectedException Symfony\Component\Security\Core\Exception\AuthenticationServiceException
+     * @expectedException \Symfony\Component\Security\Core\Exception\AuthenticationServiceException
      * @expectedExceptionMessage User provider did not return an implementation of user interface.
      */
     public function throwIfUserManagerCreateNotUserInstance()
@@ -467,7 +467,7 @@ public function shouldWrapAnyThrownExceptionsAsAuthenticatedServiceException()
             $this->assertSame($expectedPreviousException, $e->getPrevious());
             $this->assertEquals($expectedMessage, $e->getMessage());
             $this->assertEquals($expectedCode, $e->getCode());
-            $this->assertNull($e->getExtraInformation());
+            $this->assertNull($e->getToken());
 
             return;
         }

Tests/Security/Http/OpenIdAuthenticationListenerTest.php

@@ -330,7 +330,7 @@ public function throwIfRelyingPartyReturnNeitherRedirectResponseOrIdentityProvid
     /**
      * @test
      */
-    public function shouldAddIdentityProviderResponseToEachThrownAuthenticationExceptionAsExtraInformation()
+    public function shouldAddTokenToEachThrownAuthenticationException()
     {
         $expectedIdentityProviderResponse = new IdentityProviderResponse('an_identity');
         $expectedAuthenticationException = new AuthenticationException('an error');
@@ -360,7 +360,7 @@ public function shouldAddIdentityProviderResponseToEachThrownAuthenticationExcep
             ->method('onAuthenticationFailure')
             ->will($this->returnCallback(function($request, $exception) use($testcase, $expectedAuthenticationException, $expectedIdentityProviderResponse) {
                 $testcase->assertSame($exception, $expectedAuthenticationException);
-                $testcase->assertSame($expectedIdentityProviderResponse, $exception->getExtraInformation());
+                $testcase->assertInstanceOf('Fp\OpenIdBundle\Security\Core\Authentication\Token\OpenIdToken', $exception->getToken());
 
                 return new Response('');
             }))