omniauth-microsoft_graph 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 66a0ea4d256b036a576000cd3de91de39bfc45a0
-  data.tar.gz: ce2a59256d5db7b62f751a32b16e730bf1f940d6
+  metadata.gz: cdecd030ef703f1a67b5ee1a0cb818c522e62caa
+  data.tar.gz: fe2acbe7d3c926ebe96d1836f381d9861cd553e3
 SHA512:
-  metadata.gz: 969345446695fcceaded706cd2afbc5fb27ea9f1b63596d8942865cdaedbb63fd5ac9c23f6779c68ca7e5b0120e1bcf7949ac6e9f81c943d207934566de4e5bd
-  data.tar.gz: 92e18899eb92fac4f3249a0e4732ca378071a0564d0810ff0c180ce9a5abaa623038e256c96870fd6084a449e1ae7355b576979bdee539fb3f413c94d7231f50
+  metadata.gz: 1dbfaaa74ed47f1982ee67990dcaa422e8ab7c5ecd5e6f8f5209432b748ed922906a0458be0c554404f1b1dc37128c06493760ac5438b747f1587fd0559bc00d
+  data.tar.gz: 0d754b53cc811ab543c6efc57776ee2ad0e471dbc57b194dc4fcc82c3c1a1c2aeab18e4df5c6e7a843a1807b7f3781e68c8f5bed4385a974abf80e6f8e02ef8a

data/example/example.rb

@@ -1,6 +1,6 @@
 $:.push File.dirname(__FILE__) + '/../lib'
 
-require 'omniauth-microsoft_graph'
+require 'microsoft_graph'
 require 'sinatra'
 require 'json'
 

data/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

data/lib/omniauth/strategies/microsoft_graph.rb

@@ -6,28 +6,22 @@ module OmniAuth
       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
 
@@ -37,9 +31,27 @@ module OmniAuth
           'params' => access_token.params
         }
       end
+      
+      def callback_url
+        options[:redirect_uri] || (full_host + script_name + callback_path)
+      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["displayName"].presence || raw_info.values_at("givenName", "surname").compact.join(' ')
       end
     end
   end

data/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"

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-microsoft_graph
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Peter Philips
+- Joel Van Horn
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-18 00:00:00.000000000 Z
+date: 2018-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: omniauth-oauth2
@@ -83,6 +84,7 @@ dependencies:
 description: omniauth provider for new Microsoft Graph API
 email:
 - pete@p373.net
+- joel@joelvanhorn.com
 executables: []
 extensions: []
 extra_rdoc_files: []