Use named constructor for lcobucci/jwt Ecdsa signers

lexik · Jan 20, 2021 · 82b64a2 · 82b64a2
1 parent f6c0d9a
commit 82b64a2
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 1 deletion.
diff --git a/Services/JWSProvider/LcobucciJWSProvider.php b/Services/JWSProvider/LcobucciJWSProvider.php
@@ -214,6 +214,10 @@ private function getSignerForAlgorithm($signatureAlgorithm)
 
         $signerClass = $signerMap[$signatureAlgorithm];
 
+        if (is_subclass_of($signerClass, Signer\Ecdsa::class) && method_exists($signerClass, 'create')) {
+            return $signerClass::create();
+        }
+
         return new $signerClass();
     }
 

diff --git a/Tests/Services/JWSProvider/AbstractJWSProviderTest.php b/Tests/Services/JWSProvider/AbstractJWSProviderTest.php
@@ -181,7 +181,7 @@ public function testCreateWithExtraStandardClaims()
         $this->assertNotEmpty($created->getToken());
     }
 
-    private function getKeyLoaderMock()
+    protected function getKeyLoaderMock()
     {
         return $this
             ->getMockBuilder(static::$keyLoaderClass)

diff --git a/Tests/Services/JWSProvider/LcobucciJWSProviderTest.php b/Tests/Services/JWSProvider/LcobucciJWSProviderTest.php
@@ -4,6 +4,7 @@
 
 use Lexik\Bundle\JWTAuthenticationBundle\Services\JWSProvider\LcobucciJWSProvider;
 use Lexik\Bundle\JWTAuthenticationBundle\Services\KeyLoader\RawKeyLoader;
+use Lexik\Bundle\JWTAuthenticationBundle\Signature\CreatedJWS;
 
 /**
  * Tests the LcobucciJWSProvider.
@@ -14,4 +15,25 @@ final class LcobucciJWSProviderTest extends AbstractJWSProviderTest
 {
     protected static $providerClass  = LcobucciJWSProvider::class;
     protected static $keyLoaderClass = RawKeyLoader::class;
+
+    public function testCreateWithEcdsa()
+    {
+        $keyLoaderMock = $this->getKeyLoaderMock();
+        $keyLoaderMock
+            ->expects($this->once())
+            ->method('loadKey')
+            ->with('private')
+            ->willReturn(self::$privateKey);
+        $keyLoaderMock
+            ->expects($this->once())
+            ->method('getPassphrase')
+            ->willReturn('foobar');
+
+        $payload     = ['username' => 'chalasr'];
+        $jwsProvider = new LcobucciJWSProvider($keyLoaderMock, 'openssl', 'EC512', 3600, 0);
+
+        $this->assertInstanceOf(CreatedJWS::class, $created = $jwsProvider->create($payload));
+
+        return $created->getToken();
+    }
 }
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -26,4 +26,8 @@
             </exclude>
         </whitelist>
     </filter>
+
+    <php>
+        <env name="SYMFONY_DEPRECATIONS_HELPER" value="max[self]=0"></env>
+    </php>
 </phpunit>