Rename GooglePublicKey to OpenIdVerificator and rename some methods

Author: marickvantuil

src/GooglePublicKey.php renamed to src/OpenIdVerificator.php

@@ -9,7 +9,7 @@
 use phpseclib\Crypt\RSA;
 use phpseclib\Math\BigInteger;
 
-class GooglePublicKey
+class OpenIdVerificator
 {
     private const V3_CERTS = 'GOOGLE_V3_CERTS';
     private const URL_OPENID_CONFIG = 'https://accounts.google.com/.well-known/openid-configuration';
@@ -24,7 +24,7 @@ public function __construct(Client $guzzle, RSA $rsa)
         $this->rsa = $rsa;
     }
 
-    public function get($kid = null)
+    public function getPublicKey($kid = null)
     {
         $v3Certs = Cache::rememberForever(self::V3_CERTS, function () {
             return $this->getv3Certs();
@@ -52,7 +52,7 @@ private function extractPublicKeyFromCertificate($certificate)
         return $this->rsa->getPublicKey();
     }
 
-    public function getKid($openIdToken)
+    public function getKidFromOpenIdToken($openIdToken)
     {
         return $this->callApiAndReturnValue(self::URL_TOKEN_INFO . '?id_token=' . $openIdToken, 'kid');
     }

src/TaskHandler.php

@@ -15,7 +15,7 @@ class TaskHandler
     private $jwt;
     private $publicKey;
 
-    public function __construct(CloudTasksClient $client, Request $request, JWT $jwt, GooglePublicKey $publicKey)
+    public function __construct(CloudTasksClient $client, Request $request, JWT $jwt, OpenIdVerificator $publicKey)
     {
         $this->client = $client;
         $this->request = $request;
@@ -46,8 +46,8 @@ public function authorizeRequest()
         }
 
         $openIdToken = $this->request->bearerToken();
-        $kid = $this->publicKey->getKid($openIdToken);
-        $publicKey = $this->publicKey->get($kid);
+        $kid = $this->publicKey->getKidFromOpenIdToken($openIdToken);
+        $publicKey = $this->publicKey->getPublicKey($kid);
 
         $decodedToken = $this->jwt->decode($openIdToken, $publicKey, ['RS256']);
 

tests/GooglePublicKeyTest.php

@@ -6,12 +6,12 @@
 use Illuminate\Support\Facades\Cache;
 use Mockery;
 use phpseclib\Crypt\RSA;
-use Stackkit\LaravelGoogleCloudTasksQueue\GooglePublicKey;
+use Stackkit\LaravelGoogleCloudTasksQueue\OpenIdVerificator;
 
 class GooglePublicKeyTest extends TestCase
 {
     /**
-     * @var GooglePublicKey
+     * @var OpenIdVerificator
      */
     private $publicKey;
 
@@ -26,31 +26,31 @@ protected function setUp(): void
 
         $this->guzzle = Mockery::mock(new Client());
 
-        $this->publicKey = new GooglePublicKey($this->guzzle, new RSA());
+        $this->publicKey = new OpenIdVerificator($this->guzzle, new RSA());
     }
 
     /** @test */
     public function it_fetches_the_gcloud_public_key()
     {
-        $this->assertStringContainsString('-----BEGIN PUBLIC KEY-----', $this->publicKey->get());
+        $this->assertStringContainsString('-----BEGIN PUBLIC KEY-----', $this->publicKey->getPublicKey());
     }
 
     /** @test */
     public function it_caches_the_gcloud_public_key()
     {
         $this->assertFalse($this->publicKey->isCached());
 
-        $this->publicKey->get();
+        $this->publicKey->getPublicKey();
 
         $this->assertTrue($this->publicKey->isCached());
     }
 
     /** @test */
     public function it_will_return_the_cached_gcloud_public_key()
     {
-        $this->publicKey->get();
+        $this->publicKey->getPublicKey();
 
-        $this->publicKey->get();
+        $this->publicKey->getPublicKey();
 
         $this->guzzle->shouldHaveReceived('get')->twice();
     }

tests/TaskHandlerTest.php

@@ -10,7 +10,7 @@
 use Mockery;
 use phpseclib\Crypt\RSA;
 use Stackkit\LaravelGoogleCloudTasksQueue\CloudTasksException;
-use Stackkit\LaravelGoogleCloudTasksQueue\GooglePublicKey;
+use Stackkit\LaravelGoogleCloudTasksQueue\OpenIdVerificator;
 use Stackkit\LaravelGoogleCloudTasksQueue\TaskHandler;
 use Tests\Support\TestMailable;
 
@@ -40,9 +40,9 @@ protected function setUp(): void
         ])->byDefault();
 
         // Ensure we don't fetch the Google public key each test...
-        $googlePublicKey = Mockery::mock(app(GooglePublicKey::class));
-        $googlePublicKey->shouldReceive('get')->andReturnNull();
-        $googlePublicKey->shouldReceive('getKid')->andReturnNull();
+        $googlePublicKey = Mockery::mock(app(OpenIdVerificator::class));
+        $googlePublicKey->shouldReceive('getPublicKey')->andReturnNull();
+        $googlePublicKey->shouldReceive('getKidFromOpenIdToken')->andReturnNull();
 
         $this->handler = new TaskHandler(
             new CloudTasksClient([