Merge pull request #8 from pdsinterop/feature/token-endpoint

added id_token option for token endpoint response

Author: ylebre

src/TokenGenerator.php

@@ -4,6 +4,7 @@
 
 use Pdsinterop\Solid\Auth\Utils\Jwks;
 use Pdsinterop\Solid\Auth\Enum\OpenId\OpenIdConnectMetadata as OidcMeta;
+use Laminas\Diactoros\Response\JsonResponse as JsonResponse;
 
 class TokenGenerator
 {
@@ -90,8 +91,9 @@ public function respondToRegistration($registration, $privateKey) {
 	}
 
 	public function addIdTokenToResponse($response, $clientId, $subject, $nonce, $privateKey) {
-			if ($response->hasHeader("Location")) {
+		if ($response->hasHeader("Location")) {
 			$value = $response->getHeaderLine("Location");
+
 			if (preg_match("/#access_token=(.*?)&/", $value, $matches)) {
 				$idToken = $this->generateIdToken(
 					$matches[1],
@@ -113,6 +115,24 @@ public function addIdTokenToResponse($response, $clientId, $subject, $nonce, $pr
 				$value = preg_replace("/code=(.*?)&/", "code=\$1&id_token=$idToken&", $value);
 				$response = $response->withHeader("Location", $value);
 			}
+		} else {
+			$response->getBody()->rewind();
+			$responseBody = $response->getBody()->getContents();
+			try {
+				$body = json_decode($responseBody, true);
+				if (isset($body['access_token'])) {
+					$body['id_token'] = $this->generateIdToken(
+						$body['access_token'],
+						$clientId,
+						$subject,
+						$nonce,
+						$privateKey
+					);
+					return new JsonResponse($body);
+				}
+			} catch (\Exception $e) {
+				// leave the response as it was;
+			}
 		}
 		return $response;
 	}