Merge pull request #3 from identification-io/master

Upgrade to v2.0 OAuth endpoint

Author: synth

lib/omniauth/microsoft_graph/version.rb

@@ -1,5 +1,5 @@
 module Omniauth
-  module Office365
-    VERSION = "0.1.0"
+  module MicrosoftGraph
+    VERSION = "0.1.1"
   end
 end

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, %i[display score auth_type scope prompt login_hint domain_hint response_mode]
 
       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"] || raw_info["userPrincipalName"],
+          first_name: raw_info["givenName"],
+          last_name:  raw_info["surname"],
+          name:       full_name,
+          nickname:   raw_info["userPrincipalName"],
         }
       end
 
@@ -39,7 +33,21 @@ 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('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
+        raw_info.values_at("givenName", "surname").compact.join(' ')
       end
     end
   end

omniauth-microsoft_graph.gemspec

@@ -5,9 +5,9 @@ require 'omniauth/microsoft_graph/version'
 
 Gem::Specification.new do |spec|
   spec.name          = "omniauth-microsoft_graph"
-  spec.version       = Omniauth::Office365::VERSION
-  spec.authors       = ["Peter Philips"]
-  spec.email         = ["pete@p373.net"]
+  spec.version       = Omniauth::MicrosoftGraph::VERSION
+  spec.authors       = ["Peter Philips", "Joel Van Horn"]
+  spec.email         = ["pete@p373.net", "joel@joelvanhorn.com"]
   spec.summary       = %q{omniauth provider for Microsoft Graph}
   spec.description   = %q{omniauth provider for new Microsoft Graph API}
   spec.homepage      = "https://github.com/synth/omniauth-microsoft_graph"