Fix for Resource Owner Details URL and parsing

Author: DonCallisto

src/Provider/Microsoft.php

@@ -4,10 +4,13 @@
 use League\OAuth2\Client\Provider\AbstractProvider;
 use League\OAuth2\Client\Provider\Exception\IdentityProviderException;
 use League\OAuth2\Client\Token\AccessToken;
+use League\OAuth2\Client\Tool\BearerAuthorizationTrait;
 use Psr\Http\Message\ResponseInterface;
 
 class Microsoft extends AbstractProvider
 {
+    use BearerAuthorizationTrait;
+
     /**
      * Default scopes
      *
@@ -34,7 +37,7 @@ class Microsoft extends AbstractProvider
      *
      * @var string
      */
-    protected $urlResourceOwnerDetails = 'https://apis.live.net/v5.0/me';
+    protected $urlResourceOwnerDetails = 'https://graph.microsoft.com/v1.0/me';
 
     /**
      * Get authorization url to begin OAuth flow

src/Provider/MicrosoftResourceOwner.php

@@ -38,47 +38,95 @@ public function getId()
      */
     public function getEmail()
     {
-        return $this->response['emails']['preferred'] ?: null;
+        return $this->response['mail'] ?: null;
     }
 
     /**
-     * Get user firstname
+     * Get user principal name
+     *
+     * @return string|null
+     */
+    public function getPrincipalName()
+    {
+        return $this->response['userPrincipalName'] ?: null;
+    }
+
+    /**
+     * @deprecated will be removed in 3.0. Use getGivenName() instead.
+     *
+     * Get user first name
      *
      * @return string|null
      */
     public function getFirstname()
     {
-        return $this->response['first_name'] ?: null;
+        return $this->getGivenName();
     }
 
     /**
+     * Get user given name (first name)
+     *
+     * @return string|null
+     */
+    public function getGivenName()
+    {
+        return $this->response['givenName'] ?: null;
+    }
+
+    /**
+     * @deprecated will be removed in 3.0. Use getSurname() instead.
+     *
      * Get user lastname
      *
      * @return string|null
      */
     public function getLastname()
     {
-        return $this->response['last_name'] ?: null;
+        return $this->getSurname();
     }
 
     /**
+     * Get user surname
+     *
+     * @return string|null
+     */
+    public function getSurname()
+    {
+        return $this->response['surname'] ?: null;
+    }
+
+    /**
+     * @deprecated will be removed in 3.0. Use getDisplayName() instead.
+     *
      * Get user name
      *
      * @return string|null
      */
     public function getName()
     {
-        return $this->response['name'] ?: null;
+        return $this->getDisplayName();
+    }
+
+    /**
+     * Get user name
+     *
+     * @return string|null
+     */
+    public function getDisplayName()
+    {
+        return $this->response['displayName'] ?: null;
     }
 
     /**
+     * @deprecated will be removed in 3.0.
+     *
      * Get user urls
      *
      * @return string|null
      */
     public function getUrls()
     {
-        return isset($this->response['link']) ? $this->response['link'].'/cid-'.$this->getId() : null;
+        return null;
     }
 
     /**
@@ -88,6 +136,11 @@ public function getUrls()
      */
     public function toArray()
     {
-        return $this->response;
+        return $this->response + [
+            'first_name' => $this->response['givenName'],
+            'last_name' => $this->response['surname'],
+            'name' => $this->response['displayName'],
+            'link' => null
+        ];
     }
 }

tests/src/Provider/MicrosoftTest.php

@@ -118,14 +118,14 @@ public function testUserData()
         $lastname = uniqid();
         $name = uniqid();
         $userId = rand(1000,9999);
-        $urls = uniqid();
+        $userPrincipalName = uniqid();
 
         $postResponse = m::mock('Psr\Http\Message\ResponseInterface');
         $postResponse->shouldReceive('getBody')->andReturn('{"access_token":"mock_access_token","authentication_token":"","code":"","expires_in":3600,"refresh_token":"mock_refresh_token","scope":"","state":"","token_type":""}');
         $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('getBody')->andReturn('{"id": '.$userId.', "displayName": "'.$name.'", "givenName": "'.$firstname.'", "surname": "'.$lastname.'", "mail": "'.$email.'", "userPrincipalName": "'.$userPrincipalName.'"}');
         $userResponse->shouldReceive('getHeader')->andReturn(['content-type' => 'json']);
 
         $client = m::mock('GuzzleHttp\ClientInterface');
@@ -138,17 +138,25 @@ public function testUserData()
         $user = $this->provider->getResourceOwner($token);
 
         $this->assertEquals($email, $user->getEmail());
-        $this->assertEquals($email, $user->toArray()['emails']['preferred']);
+        $this->assertEquals($email, $user->toArray()['mail']);
+        $this->assertEquals($userPrincipalName, $user->getPrincipalName());
+        $this->assertEquals($userPrincipalName, $user->toArray()['userPrincipalName']);
         $this->assertEquals($firstname, $user->getFirstname());
         $this->assertEquals($firstname, $user->toArray()['first_name']);
+        $this->assertEquals($firstname, $user->getGivenName());
+        $this->assertEquals($firstname, $user->toArray()['givenName']);
         $this->assertEquals($lastname, $user->getLastname());
         $this->assertEquals($lastname, $user->toArray()['last_name']);
+        $this->assertEquals($lastname, $user->getSurname());
+        $this->assertEquals($lastname, $user->toArray()['surname']);
         $this->assertEquals($name, $user->getName());
         $this->assertEquals($name, $user->toArray()['name']);
+        $this->assertEquals($name, $user->getDisplayName());
+        $this->assertEquals($name, $user->toArray()['displayName']);
         $this->assertEquals($userId, $user->getId());
         $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->getUrls());
+        $this->assertNull($user->toArray()['link']);
     }
 
     /**