Remove the internal crypto algorithm enum that has to be maintained

The algorithms are already downloaded from Apple, so just use this as the master list instead of keeping another internal lookup key list.
AzimoLabs · Jan 28, 2022 · 25e0639 · 25e0639
1 parent c0594bd
commit 25e0639
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 68 deletions.
diff --git a/src/Api/Enum/CryptographicAlgorithmEnum.php b/src/Api/Enum/CryptographicAlgorithmEnum.php
diff --git a/src/Api/Factory/ResponseFactory.php b/src/Api/Factory/ResponseFactory.php
@@ -56,15 +56,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())
- )
- );
- }
  }
 }
diff --git a/src/Api/Response/JsonWebKeySetCollection.php b/src/Api/Response/JsonWebKeySetCollection.php
@@ -19,16 +19,16 @@ public function __construct(array $authKeys)
 
  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;
  }
 }
diff --git a/tests/Unit/Api/Factory/ResponseFactoryTest.php b/tests/Unit/Api/Factory/ResponseFactoryTest.php
@@ -113,27 +113,6 @@ public function provideCreateFromArrayThrowsResponseValidationExceptionWhenKeyAr
  ];
  }
 
- public function testIfCreateFromArraySkipsCreatingJsonWebKeySetWhenKidIsNotSupported(): void
- {
- self::assertEquals(
- new JsonWebKeySetCollection([]),
- $this->responseFactory->createFromArray(
- [
- 'keys' => [
- [
- 'kty' => 'RSA',
- 'kid' => 'bar',
- 'use' => 'sig',
- 'alg' => 'RS256',
- 'n' => 'foo',
- 'e' => 'AQAB',
- ],
- ],
- ]
- )
- );
- }
-
  public function testIfCreateFromArrayReturnsExpectedJsonWebKeySetCollection(): void
  {
  $responseBody = [

diff --git a/tests/Unit/Auth/Jwt/JwtVerifierTest.php b/tests/Unit/Auth/Jwt/JwtVerifierTest.php
@@ -78,7 +78,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->jwtTokenMock);
  }
@@ -96,7 +96,7 @@ public function testIfVerifyThrowsInvalidCryptographicAlgorithmExceptionWhenAuth
  ->andReturn(new JWT\Token\DataSet(['kid' => '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->jwtTokenMock);
  }