Update to v2.0 URIs and remove unknown resource params

Author: joelvh

lib/omniauth/strategies/microsoft_graph.rb

@@ -6,28 +6,22 @@ class MicrosoftGraph < OmniAuth::Strategies::OAuth2
       option :name, :microsoft_graph
 
       option :client_options, {
-        site:          'https://login.microsoftonline.com/common/oauth2/authorize',
-        token_url:     'https://login.microsoftonline.com/common/oauth2/token',
-        authorize_url: 'https://login.microsoftonline.com/common/oauth2/authorize'
+        site:          'https://login.microsoftonline.com',
+        token_url:     '/common/oauth2/v2.0/token',
+        authorize_url: '/common/oauth2/v2.0/authorize'
       }
 
-      option :authorize_params, {
-        resource: 'https://graph.microsoft.com/'
-      }
-
-      option :token_params, {
-        resource: 'https://graph.microsoft.com/'        
-      }
+      option :authorize_options, [:scope]
 
       uid { raw_info["id"] }
 
       info do
         {
-          'email' => raw_info["mail"],
-          'first_name' => raw_info["givenName"],
-          'last_name' => raw_info["surname"],
-          'name' => [raw_info["givenName"], raw_info["surname"]].join(' '),
-          'nickname' => raw_info["displayName"],
+          email:      raw_info["mail"],
+          first_name: raw_info["givenName"],
+          last_name:  raw_info["surname"],
+          name:       full_name,
+          nickname:   raw_info["displayName"],
         }
       end
 
@@ -39,7 +33,11 @@ class MicrosoftGraph < OmniAuth::Strategies::OAuth2
       end
 
       def raw_info
-        @raw_info ||= access_token.get(authorize_params.resource + 'v1.0/me').parsed
+        @raw_info ||= access_token.get('/v2.0/me').parsed
+      end
+
+      def full_name
+        [raw_info["givenName"], raw_info["surname"]].compact.join(' ')
       end
     end
   end