Provider class modified for Azure v2 API compatibility (#734)

Author: alessandrofuda

Provider.php

@@ -18,32 +18,29 @@ class Provider extends AbstractProvider
      *
      * @var string
      */
-    protected $graphUrl = 'https://graph.windows.net/myorganization/me';
+    protected $graphUrl = 'https://graph.microsoft.com/v1.0/me';
 
     /**
-     * The Graph API version for the request.
+     * The scopes being requested.
      *
-     * @var string
+     * @var array
      */
-    protected $version = '1.5';
+    protected $scopes = ['User.Read'];
 
     /**
      * {@inheritdoc}
      */
     protected function getAuthUrl($state)
     {
-        return $this->buildAuthUrlFromBase(
-            'https://login.microsoftonline.com/'.($this->config['tenant'] ?? 'common').'/oauth2/authorize',
-            $state
-        );
+        return $this->buildAuthUrlFromBase($this->getBaseUrl().'/oauth2/v2.0/authorize', $state);
     }
 
     /**
      * {@inheritdoc}
      */
     protected function getTokenUrl()
     {
-        return 'https://login.microsoftonline.com/common/oauth2/token';
+        return $this->getBaseUrl().'/oauth2/v2.0/token';
     }
 
     public function getAccessToken($code)
@@ -63,9 +60,6 @@ public function getAccessToken($code)
     protected function getUserByToken($token)
     {
         $response = $this->getHttpClient()->get($this->graphUrl, [
-            RequestOptions::QUERY => [
-                'api-version' => $this->version,
-            ],
             RequestOptions::HEADERS => [
                 'Accept'        => 'application/json',
                 'Authorization' => 'Bearer '.$token,
@@ -81,27 +75,45 @@ protected function getUserByToken($token)
     protected function mapUserToObject(array $user)
     {
         return (new User())->setRaw($user)->map([
-            'id'    => $user['objectId'], 'nickname' => null, 'name' => $user['displayName'],
-            'email' => $user['userPrincipalName'], 'avatar' => null,
+            'id'        => $user['id'],
+            'nickname'  => null,
+            'name'      => $user['displayName'],
+            'email'     => $user['userPrincipalName'],
+            'avatar'    => null,
         ]);
     }
 
     /**
      * {@inheritdoc}
      */
-    protected function getTokenFields($code)
+    public static function additionalConfigKeys()
     {
-        return array_merge(parent::getTokenFields($code), [
-            'grant_type' => 'authorization_code',
-            'resource'   => 'https://graph.windows.net',
+        return ['tenant', 'logout_url', 'proxy'];
+    }
+
+    /**
+     * Get the access token response for the given code.
+     *
+     * @param string $code
+     *
+     * @return array
+     */
+    public function getAccessTokenResponse($code)
+    {
+        $response = $this->getHttpClient()->post($this->getTokenUrl(), [
+            RequestOptions::HEADERS     => ['Accept' => 'application/json'],
+            RequestOptions::FORM_PARAMS => $this->getTokenFields($code),
+            RequestOptions::PROXY       => $this->getConfig('proxy'),
         ]);
+
+        return json_decode($response->getBody(), true);
     }
 
     /**
-     * {@inheritdoc}
+     * @return string
      */
-    public static function additionalConfigKeys()
+    protected function getBaseUrl(): string
     {
-        return ['tenant'];
+        return 'https://login.microsoftonline.com/'.$this->getConfig('tenant', 'common');
     }
 }

README.md

@@ -15,6 +15,9 @@ Please see the [Base Installation Guide](https://socialiteproviders.com/usage/),
   'client_id' => env('AZURE_CLIENT_ID'),  
   'client_secret' => env('AZURE_CLIENT_SECRET'),  
   'redirect' => env('AZURE_REDIRECT_URI') 
+  'tenant' => env('AZURE_TENANT_ID'),
+  'logout_url' => 'https://login.microsoftonline.com/'.env('AZURE_TENANT_ID').'/oauth2/v2.0/logout?post_logout_redirect_uri=',
+  'proxy' => env('PROXY')  // optionally
 ],
 ```