Merge pull request #29 from sevencooks-gmbh-co-kg/v1.1.x

Remove the internal crypto algorithm enum that has to be maintained

Author: hywak

src/Api/Enum/CryptographicAlgorithmEnum.php

@@ -2,7 +2,6 @@
 
 namespace Azimo\Apple\Api\Factory;
 
-use Azimo\Apple\Api\Enum\CryptographicAlgorithmEnum;
 use Azimo\Apple\Api\Exception\ResponseValidationException;
 use Azimo\Apple\Api\Exception\UnsupportedCryptographicAlgorithmException;
 use Azimo\Apple\Api\Response\JsonWebKeySet;
@@ -52,15 +51,5 @@ private function validateAuthKey(array $authKey): void
                 )
             );
         }
-
-        if (!CryptographicAlgorithmEnum::isSupported($authKey['kid'])) {
-            throw new UnsupportedCryptographicAlgorithmException(
-                sprintf(
-                    'Cryptographic algorithm `%s` is not supported. Supported algorithms: `%s`',
-                    $authKey['kid'],
-                    implode(',', CryptographicAlgorithmEnum::supportedAlgorithms())
-                )
-            );
-        }
     }
 }

src/Api/Factory/ResponseFactory.php

@@ -2,7 +2,6 @@
 
 namespace Azimo\Apple\Api\Response;
 
-use Azimo\Apple\Api\Enum\CryptographicAlgorithmEnum;
 use Azimo\Apple\Api\Exception\UnsupportedCryptographicAlgorithmException;
 
 class JsonWebKeySetCollection
@@ -24,16 +23,16 @@ public function getAuthKeys(): array
 
     public function getByCryptographicAlgorithm(string $algorithm): ?JsonWebKeySet
     {
-        if (!CryptographicAlgorithmEnum::isSupported($algorithm)) {
+        $result = $this->authKeys[$algorithm] ?? null;
+        if(!$result) {
             throw new UnsupportedCryptographicAlgorithmException(
                 sprintf(
-                    'Cryptographic algorithm `%s` is not supported. Supported algorithms: `%s`',
-                    $algorithm,
-                    implode(',', CryptographicAlgorithmEnum::supportedAlgorithms())
+                    'Cryptographic algorithm `%s` is not supported.',
+                    $algorithm
                 )
             );
         }
 
-        return $this->authKeys[$algorithm] ?? null;
+        return $result;
     }
 }

src/Api/Response/JsonWebKeySetCollection.php

@@ -116,28 +116,6 @@ public function provideCreateFromArrayThrowsResponseValidationExceptionWhenKeyAr
         ];
     }
 
-    public function testIfCreateFromArrayThrowsUnsupportedCryptographicAlgorithmExceptionWhenKidIsNotSupported(): void
-    {
-        $this->expectException(UnsupportedCryptographicAlgorithmException::class);
-        $this->expectExceptionMessage(
-            'Cryptographic algorithm `bar` is not supported. Supported algorithms: `86D88Kf,eXaunmL`'
-        );
-        $this->responseFactory->createFromArray(
-            [
-                'keys' => [
-                    [
-                        'kty' => 'RSA',
-                        'kid' => 'bar',
-                        'use' => 'sig',
-                        'alg' => 'RS256',
-                        'n'   => 'foo',
-                        'e'   => 'AQAB',
-                    ],
-                ],
-            ]
-        );
-    }
-
     public function testIfCreateFromArrayReturnsExpectedJsonWebKeySetCollection(): void
     {
         $responseBody = [

tests/Unit/Api/Factory/ResponseFactoryTest.php

@@ -95,7 +95,7 @@ public function testIfVerifyThrowsInvalidCryptographicAlgorithmExceptionWhenAlgo
 
         $this->expectException(Exception\InvalidCryptographicAlgorithmException::class);
         $this->expectExceptionMessage(
-            'Cryptographic algorithm `foo` is not supported. Supported algorithms: `86D88Kf,eXaunmL,YuyXoY,W6WcOKB`'
+            'Cryptographic algorithm `foo` is not supported.'
         );
         $this->jwtVerifier->verify($this->jwtMock);
     }
@@ -113,7 +113,7 @@ public function testIfVerifyThrowsInvalidCryptographicAlgorithmExceptionWhenAuth
             ->andReturn('86D88Kf');
 
         $this->expectException(Exception\InvalidCryptographicAlgorithmException::class);
-        $this->expectExceptionMessage('Unsupported cryptographic algorithm passed `86D88Kf');
+        $this->expectExceptionMessage('Cryptographic algorithm `86D88Kf` is not supported.');
         $this->jwtVerifier->verify($this->jwtMock);
     }