Userinfo Endpoint

OAuth2-Framework · Jun 13, 2018 · 6a795ce · 6a795ce
1 parent 3445f4c
commit 6a795ce
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 5 deletions.
diff --git a/src/Component/AuthorizationCodeGrant/AuthorizationCodeResponseType.php b/src/Component/AuthorizationCodeGrant/AuthorizationCodeResponseType.php
@@ -121,6 +121,7 @@ public function preProcess(Authorization $authorization): Authorization
         );
         $this->authorizationCodeRepository->save($authorizationCode);
         $authorization = $authorization->withResponseParameter('code', $authorizationCodeId->getValue());
+        $authorization->getMetadata()->with('authorization_code_id', $authorizationCode->getAuthorizationCodeId()->getValue());
 
         return $authorization;
     }

diff --git a/src/Component/ImplicitGrant/TokenResponseType.php b/src/Component/ImplicitGrant/TokenResponseType.php
@@ -88,6 +88,7 @@ public function preProcess(Authorization $authorization): Authorization
      */
     public function process(Authorization $authorization): Authorization
     {
+        $additionalInformation = $authorization->getTokenType()->getAdditionalInformation();
         $accessTokenId = $this->accessTokenIdGenerator->createAccessTokenId(
             $authorization->getUserAccount()->getUserAccountId(),
             $authorization->getClient()->getClientId(),
@@ -100,13 +101,16 @@ public function process(Authorization $authorization): Authorization
             $accessTokenId,
             $authorization->getUserAccount()->getUserAccountId(),
             $authorization->getClient()->getClientId(),
-            DataBag::create($authorization->getTokenType()->getAdditionalInformation()),
+            DataBag::create($additionalInformation),
             $authorization->getMetadata(),
             new \DateTimeImmutable(sprintf('now +%d seconds', $this->accessTokenLifetime)),
             null
         );
         $this->accessTokenRepository->save($accessToken);
 
+        foreach ($additionalInformation as $k => $v) {
+            $authorization = $authorization->withResponseParameter($k, $v);
+        }
         foreach ($accessToken->getResponseData() as $k => $v) {
             $authorization = $authorization->withResponseParameter($k, $v);
         }

diff --git a/src/Component/OpenIdConnect/IdTokenGrant/CodeIdTokenTokenResponseType.php b/src/Component/OpenIdConnect/IdTokenGrant/CodeIdTokenTokenResponseType.php
@@ -83,8 +83,8 @@ public function getResponseMode(): string
     public function preProcess(Authorization $authorization): Authorization
     {
         $authorization = $this->codeResponseType->preProcess($authorization);
-        $authorization = $this->tokenResponseType->preProcess($authorization);
         $authorization = $this->idTokenResponseType->preProcess($authorization);
+        $authorization = $this->tokenResponseType->preProcess($authorization);
 
         return $authorization;
     }
@@ -95,8 +95,8 @@ public function preProcess(Authorization $authorization): Authorization
     public function process(Authorization $authorization): Authorization
     {
         $authorization = $this->codeResponseType->process($authorization);
-        $authorization = $this->tokenResponseType->process($authorization);
         $authorization = $this->idTokenResponseType->process($authorization);
+        $authorization = $this->tokenResponseType->process($authorization);
 
         return $authorization;
     }

diff --git a/src/Component/OpenIdConnect/IdTokenGrant/IdTokenTokenResponseType.php b/src/Component/OpenIdConnect/IdTokenGrant/IdTokenTokenResponseType.php
@@ -73,8 +73,8 @@ public function getResponseMode(): string
      */
     public function preProcess(Authorization $authorization): Authorization
     {
-        $authorization = $this->tokenResponseType->preProcess($authorization);
         $authorization = $this->idTokenResponseType->preProcess($authorization);
+        $authorization = $this->tokenResponseType->preProcess($authorization);
 
         return $authorization;
     }
@@ -84,8 +84,8 @@ public function preProcess(Authorization $authorization): Authorization
      */
     public function process(Authorization $authorization): Authorization
     {
-        $authorization = $this->tokenResponseType->process($authorization);
         $authorization = $this->idTokenResponseType->process($authorization);
+        $authorization = $this->tokenResponseType->process($authorization);
 
         return $authorization;
     }