update jwks calls

Author: ylebre

src/Config/Keys.php

@@ -3,7 +3,7 @@
 namespace Pdsinterop\Solid\Auth\Config;
 
 use Defuse\Crypto\Key as CryptoKey;
-use Lcobucci\JWT\Signer\Key;
+use Lcobucci\JWT\Signer\Key\InMemory as Key;
 use League\OAuth2\Server\CryptKey;
 
 class Keys

src/TokenGenerator.php

@@ -7,6 +7,7 @@
 use Laminas\Diactoros\Response\JsonResponse as JsonResponse;
 use League\OAuth2\Server\CryptTrait;
 
+use DateTimeImmutable;
 use Lcobucci\JWT\Configuration;
 use Lcobucci\JWT\Signer\Key\InMemory;
 use Lcobucci\JWT\Signer\Rsa\Sha256;
@@ -45,33 +46,30 @@ public function generateRegistrationAccessToken($clientId, $privateKey) {
 	public function generateIdToken($accessToken, $clientId, $subject, $nonce, $privateKey, $dpopKey=null) {
 		$issuer = $this->config->getServer()->get(OidcMeta::ISSUER);
 
-        $jwks = $this->getJwks();
+		$jwks = $this->getJwks();
 		$tokenHash = $this->generateTokenHash($accessToken);
 
-		// Create JWT
-		$signer = new \Lcobucci\JWT\Signer\Rsa\Sha256();
-		$keychain = new \Lcobucci\JWT\Signer\Keychain();
-		$builder = new \Lcobucci\JWT\Builder();
-		$token = $builder
-			->setIssuer($issuer)
-			->permittedFor($clientId)
-			->setIssuedAt(time())
-			->setNotBefore(time() - 1)
-			->setExpiration(time() + 14*24*60*60)
-			->set("azp", $clientId)
-			->set("sub", $subject)
-			->set("jti", $this->generateJti())
-			->set("nonce", $nonce)
-			->set("at_hash", $tokenHash) //FIXME: at_hash should only be added if the response_type is a token
-			->set("c_hash", $tokenHash) // FIXME: c_hash should only be added if the response_type is a code
-			->set("cnf", array(
-				"jkt" => $dpopKey,
-			//	"jwk" => $jwks['keys'][0]
-			))
-			->withHeader('kid', $jwks['keys'][0]['kid'])
-			->sign($signer, $keychain->getPrivateKey($privateKey))
-			->getToken();
-		return $token->__toString();
+                // Create JWT
+                $jwtConfig = Configuration::forSymmetricSigner(new Sha256(), InMemory::plainText($privateKey));
+                $token = $jwtConfig->builder()
+                        ->issuedBy($issuer)
+                        ->permittedFor($clientId)
+                        ->issuedAt(new DateTimeImmutable(time()))
+                        ->canOnlyBeUsedAfter(new DateTimeImmutable(time() - 1))
+                        ->expiresAt(new DateTimeImmutable(time() + 14*24*60*60))
+                        ->withClaim("azp", $clientId)
+                        ->relatedTo($subject)
+                        ->withClaim("jti", $this->generateJti())
+                        ->withClaim("nonce", $nonce)
+                        ->withClaim("at_hash", $tokenHash) //FIXME: at_hash should only be added if the response_type is a token
+                        ->withClaim("c_hash", $tokenHash) // FIXME: c_hash should only be added if the response_type is a code
+                        ->withClaim("cnf", array(
+                                "jkt" => $dpopKey,
+                        //      "jwk" => $jwks['keys'][0]
+                        ))
+                        ->withHeader('kid', $jwks['keys'][0]['kid'])
+                        ->getToken($jwtConfig->signer(), $jwtConfig->signingKey());
+                return $token->toString();
 	}
 
 	public function respondToRegistration($registration, $privateKey) {

src/Utils/Jwks.php

@@ -3,20 +3,20 @@
 namespace Pdsinterop\Solid\Auth\Utils;
 
 use JsonSerializable;
-use Lcobucci\JWT\Signer\Key;
+use Lcobucci\JWT\Signer\Key\InMemory;
 use Pdsinterop\Solid\Auth\Enum\Jwk\Parameter as JwkParameter;
 use Pdsinterop\Solid\Auth\Enum\Rsa\Parameter as RsaParameter;
 
 class Jwks implements JsonSerializable
 {
     ////////////////////////////// CLASS PROPERTIES \\\\\\\\\\\\\\\\\\\\\\\\\\\\
 
-    /** @var Key */
+    /** @var InMemory */
     private $publicKey;
 
     //////////////////////////////// PUBLIC API \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\
 
-    final public function __construct(Key $publicKey)
+    final public function __construct(InMemory $publicKey)
     {
         $this->publicKey = $publicKey;
     }
@@ -64,8 +64,8 @@ private function create() : array
 
         $publicKeys = [$this->publicKey];
 
-        array_walk($publicKeys, function (Key $publicKey) use (&$jwks) {
-            $certificate = $publicKey->getContent();
+        array_walk($publicKeys, function (InMemory $publicKey) use (&$jwks) {
+            $certificate = $publicKey->contents();
 
             $key = openssl_pkey_get_public($certificate);
             $keyInfo = openssl_pkey_get_details($key);