updated dependency "league/oauth2-client" to 2.3

markus-g · Feb 22, 2018 · fed7e8f · fed7e8f
1 parent 5cf038b
commit fed7e8f
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 13 deletions.
diff --git a/composer.json b/composer.json
@@ -19,11 +19,11 @@
     "jetbrains"
   ],
   "require": {
-    "php": ">=5.5.0",
-    "league/oauth2-client": "^1.4.2"
+    "php": ">=7.0.0",
+    "league/oauth2-client": "^2.3.0"
   },
   "require-dev": {
-    "phpunit/phpunit": "^4.8",
+    "phpunit/phpunit": "^6.0",
     "mockery/mockery": "^0.9"
   },
   "autoload": {

diff --git a/src/Provider/Youtrack.php b/src/Provider/Youtrack.php
@@ -8,6 +8,7 @@
 use League\OAuth2\Client\Token\AccessToken;
 use League\OAuth2\Client\Tool\BearerAuthorizationTrait;
 use Psr\Http\Message\ResponseInterface;
+use UnexpectedValueException;
 
 /**
  * Class Youtrack
@@ -132,7 +133,7 @@ public function getAccessToken($grant, array $options = [])
         ];
         $params = $grant->prepareRequestParameters($params, $options);
         $request = $this->getAccessTokenRequest($params);
-        $response = $this->getResponse($request);
+        $response = $this->getParsedResponse($request);
         $prepared = $this->prepareAccessTokenResponse($response);
         $token = $this->createAccessToken($prepared, $grant);
 
@@ -232,7 +233,7 @@ protected function checkResponse(ResponseInterface $response, $data)
      */
     protected function createResourceOwner(array $response, AccessToken $token)
     {
-        return new YoutrackUser($response, self::ACCESS_TOKEN_RESOURCE_OWNER_ID);
+        return new YoutrackUser($response, $token);
     }
 
     /**
@@ -248,7 +249,14 @@ protected function fetchResourceOwnerDetails(AccessToken $token)
         $options = ['body' => \GuzzleHttp\Psr7\build_query(['scope' => $this->scopes])];
         $request = $this->getAuthenticatedRequest(self::METHOD_GET, $url, $token, $options);
 
-        return $this->getResponse($request);
+        $response = $this->getParsedResponse($request);
+        if (false === is_array($response)) {
+            throw new UnexpectedValueException(
+                'Invalid response received from Authorization Server. Expected JSON.'
+            );
+        }
+
+        return $response;
     }
 
     /**

diff --git a/src/Provider/YoutrackUser.php b/src/Provider/YoutrackUser.php
@@ -4,6 +4,7 @@
 
 use DateTime;
 use League\OAuth2\Client\Provider\ResourceOwnerInterface;
+use League\OAuth2\Client\Token\AccessToken;
 use League\OAuth2\Client\Tool\ArrayAccessorTrait;
 
 /**
@@ -17,14 +18,20 @@ class YoutrackUser implements ResourceOwnerInterface
      * @var array
      */
     protected $response;
+    /**
+     * @var AccessToken
+     */
+    protected $token;
 
     /**
      * YoutrackUser constructor.
      * @param array $response
+     * @param AccessToken $token
      */
-    public function __construct(array $response)
+    public function __construct(array $response, AccessToken $token)
     {
         $this->response = $response;
+        $this->token = $token;
     }
 
     /**
@@ -141,6 +148,14 @@ public function getId()
         return $this->response['id'];
     }
 
+    /**
+     * @return AccessToken
+     */
+    public function getToken(): AccessToken
+    {
+        return $this->token;
+    }
+
     /**
      * Return all of the owner details available as an array.
      *

diff --git a/test/src/Provider/YoutrackTest.php b/test/src/Provider/YoutrackTest.php
@@ -5,8 +5,9 @@
 use MarkusG\OAuth2\Client\Provider\Youtrack;
 use MarkusG\OAuth2\Client\Provider\YoutrackUser;
 use Mockery as m;
+use PHPUnit\Framework\TestCase;
 
-class YoutrackTest extends \PHPUnit_Framework_TestCase
+class YoutrackTest extends TestCase
 {
     protected $provider;
 
@@ -41,10 +42,11 @@ public function testAuthorizationUrl()
 
     public function testScopes()
     {
-        $options = ['scope' => [uniqid(),uniqid()]];
+        $options = ['scope' => [uniqid(), uniqid()]];
         $url = $this->provider->getAuthorizationUrl($options);
-        $this->assertContains(urlencode(implode(' ', $options['scope'])), $url);
+        $this->assertContains(rawurlencode(implode(' ', $options['scope'])), $url);
     }
+
     public function testGetAuthorizationUrl()
     {
         $url = $this->provider->getAuthorizationUrl();
@@ -59,6 +61,7 @@ public function testGetBaseAccessTokenUrl()
         $uri = parse_url($url);
         $this->assertEquals('/hub/api/rest/oauth2/token', $uri['path']);
     }
+
     public function testGetAccessToken()
     {
         $response = m::mock('Psr\Http\Message\ResponseInterface');
@@ -77,7 +80,7 @@ public function testGetAccessToken()
 
     public function testUserData()
     {
-        $userId = rand(1000,9999);
+        $userId = rand(1000, 9999);
         $name = uniqid();
         $login = uniqid();
         $type = uniqid();
@@ -86,7 +89,7 @@ public function testUserData()
         $postResponse->shouldReceive('getHeader')->andReturn(['content-type' => 'application/x-www-form-urlencoded']);
         $postResponse->shouldReceive('getStatusCode')->andReturn(200);
         $userResponse = m::mock('Psr\Http\Message\ResponseInterface');
-        $userResponse->shouldReceive('getBody')->andReturn('{"id": '.$userId.', "login": "'.$login.'", "name": "'.$name.'", "type": "'.$type.'"}');
+        $userResponse->shouldReceive('getBody')->andReturn('{"id": ' . $userId . ', "login": "' . $login . '", "name": "' . $name . '", "type": "' . $type . '"}');
         $userResponse->shouldReceive('getHeader')->andReturn(['content-type' => 'json']);
         $userResponse->shouldReceive('getStatusCode')->andReturn(200);
         $client = m::mock('GuzzleHttp\ClientInterface');
@@ -108,5 +111,4 @@ public function testUserData()
     }
 
 
-
 }