Fix loading user data and configurable params

Author: joelvh

lib/omniauth/strategies/microsoft_graph.rb

@@ -11,17 +11,17 @@ class MicrosoftGraph < OmniAuth::Strategies::OAuth2
         authorize_url: '/common/oauth2/v2.0/authorize'
       }
 
-      option :authorize_options, [:scope]
+      option :authorize_options, %i[display score auth_type scope prompt login_hint domain_hint response_mode state]
 
       uid { raw_info["id"] }
 
       info do
         {
-          email:      raw_info["mail"],
+          email:      raw_info["mail"] || raw_info["userPrincipalName"],
           first_name: raw_info["givenName"],
           last_name:  raw_info["surname"],
           name:       full_name,
-          nickname:   raw_info["displayName"],
+          nickname:   raw_info["userPrincipalName"],
         }
       end
 
@@ -33,7 +33,17 @@ class MicrosoftGraph < OmniAuth::Strategies::OAuth2
       end
 
       def raw_info
-        @raw_info ||= access_token.get('/v2.0/me').parsed
+        @raw_info ||= access_token.get('https://graph.microsoft.com/v1.0/me').parsed
+      end
+
+      def authorize_params
+        super.tap do |params|
+          %w[display score auth_type].each do |v|
+            if request.params[v]
+              params[v.to_sym] = request.params[v]
+            end
+          end
+        end
       end
 
       def full_name