Remove support for image urls

Author: stevenmaguire

CHANGELOG.md

@@ -1,6 +1,23 @@
 # Changelog
 All Notable changes to `oauth2-microsoft` will be documented in this file
 
+## 2.2.0 - 2017-06-07
+
+### Added
+- Nothing
+
+### Deprecated
+- Nothing
+
+### Fixed
+- Nothing
+
+### Removed
+- Support for retrieving image urls.
+
+### Security
+- Nothing
+
 ## 2.1.0 - 2017-06-04
 
 ### Added

src/Provider/Microsoft.php

@@ -93,11 +93,7 @@ protected function checkResponse(ResponseInterface $response, $data)
      */
     protected function createResourceOwner(array $response, AccessToken $token)
     {
-        $user = new MicrosoftResourceOwner($response);
-
-        $imageUrl = $this->getUserImageUrl($response, $token);
-
-        return $user->setImageurl($imageUrl);
+        return new MicrosoftResourceOwner($response);
     }
 
     /**
@@ -113,42 +109,4 @@ public function getResourceOwnerDetailsUrl(AccessToken $token)
 
         return (string) Uri::withQueryValue($uri, 'access_token', (string) $token);
     }
-
-    /**
-     * Get user image from provider
-     *
-     * @param  array        $response
-     * @param  AccessToken  $token
-     *
-     * @return array
-     */
-    protected function getUserImage(array $response, AccessToken $token)
-    {
-        $url = 'https://apis.live.net/v5.0/'.$response['id'].'/picture';
-
-        $request = $this->getAuthenticatedRequest('get', $url, $token);
-
-        $response = $this->getResponse($request);
-
-        return json_decode((string) $response->getBody(), true);
-    }
-
-    /**
-     * Get user image url from provider, if available
-     *
-     * @param  array        $response
-     * @param  AccessToken  $token
-     *
-     * @return string
-     */
-    protected function getUserImageUrl(array $response, AccessToken $token)
-    {
-        $image = $this->getUserImage($response, $token);
-
-        if (isset($image['url'])) {
-            return $image['url'];
-        }
-
-        return null;
-    }
 }

src/Provider/MicrosoftResourceOwner.php

@@ -21,13 +21,6 @@ public function __construct(array $response = array())
         $this->response = $response;
     }
 
-    /**
-     * Image url
-     *
-     * @var string
-     */
-    protected $imageurl;
-
     /**
      * Get user id
      *
@@ -58,28 +51,6 @@ public function getFirstname()
         return $this->response['first_name'] ?: null;
     }
 
-    /**
-     * Get user imageurl
-     *
-     * @return string|null
-     */
-    public function getImageurl()
-    {
-        return $this->imageurl;
-    }
-
-    /**
-     * Set user imageurl
-     *
-     * @return string|null
-     */
-    public function setImageurl($imageurl)
-    {
-        $this->imageurl = $imageurl;
-
-        return $this;
-    }
-
     /**
      * Get user lastname
      *

tests/src/Provider/MicrosoftTest.php

@@ -111,7 +111,7 @@ public function testGetAccessToken()
         $this->assertNull($token->getResourceOwnerId());
     }
 
-    public function testUserDataWithoutImage()
+    public function testUserData()
     {
         $email = uniqid();
         $firstname = uniqid();
@@ -128,14 +128,10 @@ public function testUserDataWithoutImage()
         $userResponse->shouldReceive('getBody')->andReturn('{"id": '.$userId.', "name": "'.$name.'", "first_name": "'.$firstname.'", "last_name": "'.$lastname.'", "emails": {"preferred": "'.$email.'"}, "link": "'.$urls.'"}');
         $userResponse->shouldReceive('getHeader')->andReturn(['content-type' => 'json']);
 
-        $imageResponse = m::mock('Psr\Http\Message\ResponseInterface');
-        $imageResponse->shouldReceive('getBody')->andReturn('{}');
-        $imageResponse->shouldReceive('getHeader')->andReturn(['content-type' => 'json']);
-
         $client = m::mock('GuzzleHttp\ClientInterface');
         $client->shouldReceive('send')
-            ->times(3)
-            ->andReturn($postResponse, $userResponse, $imageResponse);
+            ->times(2)
+            ->andReturn($postResponse, $userResponse);
         $this->provider->setHttpClient($client);
 
         $token = $this->provider->getAccessToken('authorization_code', ['code' => 'mock_authorization_code']);
@@ -153,47 +149,6 @@ public function testUserDataWithoutImage()
         $this->assertEquals($userId, $user->toArray()['id']);
         $this->assertEquals($urls.'/cid-'.$userId, $user->getUrls());
         $this->assertEquals($urls.'/cid-'.$userId, $user->toArray()['link'].'/cid-'.$user->toArray()['id']);
-        $this->assertNull($user->getImageurl());
-    }
-
-    public function testUserDataWithImage()
-    {
-        $email = uniqid();
-        $firstname = uniqid();
-        $imageurl = uniqid();
-        $lastname = uniqid();
-        $name = uniqid();
-        $userId = rand(1000,9999);
-        $urls = uniqid();
-
-        $postResponse = m::mock('Psr\Http\Message\ResponseInterface');
-        $postResponse->shouldReceive('getBody')->andReturn('{"access_token": "mock_access_token", "expires": 3600, "refresh_token": "mock_refresh_token", "uid": '.$userId.'}');
-        $postResponse->shouldReceive('getHeader')->andReturn(['content-type' => 'json']);
-
-        $userResponse = m::mock('Psr\Http\Message\ResponseInterface');
-        $userResponse->shouldReceive('getBody')->andReturn('{"id": '.$userId.', "name": "'.$name.'", "first_name": "'.$firstname.'", "last_name": "'.$lastname.'", "emails": {"preferred": "'.$email.'"}, "link": "'.$urls.'"}');
-        $userResponse->shouldReceive('getHeader')->andReturn(['content-type' => 'json']);
-
-        $imageResponse = m::mock('Psr\Http\Message\ResponseInterface');
-        $imageResponse->shouldReceive('getBody')->andReturn('{"url":"'.$imageurl.'"}');
-        $imageResponse->shouldReceive('getHeader')->andReturn(['content-type' => 'json']);
-
-        $client = m::mock('GuzzleHttp\ClientInterface');
-        $client->shouldReceive('send')
-            ->times(3)
-            ->andReturn($postResponse, $userResponse, $imageResponse);
-        $this->provider->setHttpClient($client);
-
-        $token = $this->provider->getAccessToken('authorization_code', ['code' => 'mock_authorization_code']);
-        $user = $this->provider->getResourceOwner($token);
-
-        $this->assertEquals($email, $user->getEmail());
-        $this->assertEquals($firstname, $user->getFirstname());
-        $this->assertEquals($imageurl, $user->getImageurl());
-        $this->assertEquals($lastname, $user->getLastname());
-        $this->assertEquals($name, $user->getName());
-        $this->assertEquals($userId, $user->getId());
-        $this->assertEquals($urls.'/cid-'.$userId, $user->getUrls());
     }
 
     /**