Fix OAuth getCacheKey method (#12)

softonic · Aug 7, 2019 · 4051b3c · 4051b3c
1 parent e0ba25c
commit 4051b3c
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -7,6 +7,10 @@ matrix:
     - php: 7.0
       env: COLLECT_COVERAGE=true VALIDATE_CODING_STYLE=false
     - php: 7.1
+      env: COLLECT_COVERAGE=true VALIDATE_CODING_STYLE=false
+    - php: 7.2
+      env: COLLECT_COVERAGE=true VALIDATE_CODING_STYLE=false
+    - php: 7.3
       env: COLLECT_COVERAGE=true VALIDATE_CODING_STYLE=true
     - php: master
       env: COLLECT_COVERAGE=true VALIDATE_CODING_STYLE=false

diff --git a/src/AccessTokenCacheHandler.php b/src/AccessTokenCacheHandler.php
@@ -58,6 +58,8 @@ public function deleteItemByProvider(OAuth2Provider $provider, array $options):
 
     public function getCacheKey(OAuth2Provider $provider, array $options): string
     {
-        return static::CACHE_KEY_PREFIX . md5(print_r($provider, true) . serialize($options));
+        parse_str(parse_url($provider->getAuthorizationUrl(), PHP_URL_QUERY), $query);
+        return static::CACHE_KEY_PREFIX
+            . md5($provider->getBaseAuthorizationUrl() . ($query['client_id'] ?? '') . serialize($options));
     }
 }
diff --git a/tests/AccessTokenCacheHandlerTest.php b/tests/AccessTokenCacheHandlerTest.php
@@ -7,20 +7,20 @@
 
 class AccessTokenCacheHandlerTest extends TestCase
 {
-    public function testGetCacheKeyIsDifferentBetweenProviders()
+    public function testGetCacheKeyIsDifferentBetweenOauthClients()
     {
         $mockCache = $this->createMock(\Psr\Cache\CacheItemPoolInterface::class);
 
         $options = [];
         $providerA = $this->createMock(\League\OAuth2\Client\Provider\AbstractProvider::class);
         $providerA->expects($this->any())
-            ->method('getAccessToken')
-            ->willReturn('a');
+            ->method('getAuthorizationUrl')
+            ->willReturn('http://example.com?client_id=a');
 
         $providerB = $this->createMock(\League\OAuth2\Client\Provider\AbstractProvider::class);
         $providerB->expects($this->any())
             ->method('getAccessToken')
-            ->willReturn('b');
+            ->willReturn('http://example.com?client_id=b');
 
         $cacheHandler = new AccessTokenCacheHandler($mockCache);
         $this->assertNotEquals(