[OAuth2] Provider\Yahoo - speedup (get uid from xoauth_yahoo_guid)

SocialConnect · Jan 30, 2018 · d08c69f · d08c69f · ovr · Jan 30, 2018
1 parent 6216aad
commit d08c69f
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 40 deletions.
diff --git a/src/OAuth2/Provider/Yahoo.php b/src/OAuth2/Provider/Yahoo.php
@@ -56,57 +56,22 @@ public function parseToken($body)
     {
         $result = json_decode($body, true);
         if ($result) {
-            return new AccessToken($result);
-        }
-
-        throw new InvalidAccessToken('AccessToken is not a valid JSON');
-    }
-
-    /**
-     * Retreive userId
-     * @throws InvalidResponse
-     */
-    private function getCurrentUserId(AccessTokenInterface $accessToken)
-    {
-        $response = $this->httpClient->request(
-            $this->getBaseUri() . 'me/guid',
-            [
-                'format' => 'json'
-            ],
-            Client::GET,
-            [
-                'Authorization' => 'Bearer ' . $accessToken->getToken(),
-            ]
-        );
+            $token = new AccessToken($result);
+            $token->setUid($result['xoauth_yahoo_guid']);
 
-        if (!$response->isSuccess()) {
-            throw new InvalidResponse(
-                'API (get guid) response with error code',
-                $response
-            );
+            return $token;
         }
 
-        $result = $response->json();
-
-        if (!$result) {
-            throw new InvalidResponse(
-                'API response is not a valid JSON object',
-                $response
-            );
-        }
-
-        return $result->guid->value;
+        throw new InvalidAccessToken('AccessToken is not a valid JSON');
     }
 
     /**
      * {@inheritdoc}
      */
     public function getIdentity(AccessTokenInterface $accessToken)
     {
-        $uid = $this->getCurrentUserId($accessToken);
-
         $response = $this->httpClient->request(
-            $this->getBaseUri() . 'user/' . $uid . '/profile',
+            $this->getBaseUri() . "user/{$accessToken->getUserId()}/profile",
             [
                 'format' => 'json',
             ],

diff --git a/tests/Test/OAuth2/Provider/YahooTest.php b/tests/Test/OAuth2/Provider/YahooTest.php
@@ -8,6 +8,8 @@
 
 namespace Test\OAuth2\Provider;
 
+use SocialConnect\OAuth2\AccessToken;
+
 class YahooTest extends AbstractProviderTestCase
 {
     /**
@@ -17,4 +19,27 @@ protected function getProviderClassName()
     {
         return \SocialConnect\OAuth2\Provider\Yahoo::class;
     }
+
+    /**
+     * @throws \SocialConnect\Provider\Exception\InvalidAccessToken
+     */
+    public function testParseTokenSuccess()
+    {
+        $expectedToken = 'XXXXXXXX';
+        $expectedUserId = 'ETAPBOZJBRRBKZE6LLUMJYD3JA';
+
+        $accessToken = $this->getProvider()->parseToken(
+            json_encode(
+                [
+                    'access_token' => $expectedToken,
+                    // Yahoo uses xoauth_yahoo_guid instead of user_id
+                    'xoauth_yahoo_guid' => $expectedUserId
+                ]
+            )
+        );
+
+        parent::assertInstanceOf(AccessToken::class, $accessToken);
+        parent::assertSame($expectedToken, $accessToken->getToken());
+        parent::assertSame($expectedUserId, $accessToken->getUserId());
+    }
 }