omniauth-microsoft_graph 0.3.3 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 6530221ebe39d69b96ba1e8eb74ec88378f6499d
-  data.tar.gz: 4f16cdfda140432a828d8d838f33126d59714764
+SHA256:
+  metadata.gz: f6fe6e2c005ac0bf995f831460527c29ea1610daecfd48e9c83a6987a3b7ab91
+  data.tar.gz: 569e04a9a5e50e712ea4e4a847454f6d263392a9932fcd179b6e5a1db9c77645
 SHA512:
-  metadata.gz: dc680a9b3565e3b015f6ee50718854f173f3a2ebd198f19df721b2caa961cafe9f7337307fef9779eebabc0b32c19235f7c74335206dabc274c7785271694a76
-  data.tar.gz: bd712e7e5bf694a253f328b212a233bdec230891a775882adfe960af63adbf4f632b29c91423ea91cb130ceae9e79fa9fb0bc38dba06284837d91e364a240e49
+  metadata.gz: b2be452a85ef752c0c0b0b30a0338cbe867dbd3e29079001ebf3ae5e7377ca0fbd3c8ef8a0fb61461c507b99c9692a8aefb9ecf4c556bcd2f7f9e4e97125a56b
+  data.tar.gz: b77352003e95997a8993c098f894df4c3ea846c42fd0f18743cb933fe5417db3d631934ac073d2424cb7f8491407927fc83af5cfb77962b7d6a1305839bbed28

data/.github/FUNDING.yml

@@ -0,0 +1,3 @@
+# These are supported funding model platforms
+
+github: [synth] # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]

data/.github/workflows/ruby.yml

@@ -0,0 +1,33 @@
+# This workflow uses actions that are not certified by GitHub.
+# They are provided by a third-party and are governed by
+# separate terms of service, privacy policy, and support
+# documentation.
+# This workflow will download a prebuilt Ruby version, install dependencies and run tests with Rake
+# For more information see: https://github.com/marketplace/actions/setup-ruby-jruby-and-truffleruby
+
+name: Ruby
+
+on:
+  push:
+  pull_request:
+
+jobs:
+  test:
+
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby-version: ['2.6', '2.7', '3.0']
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Ruby
+    # To automatically get bug fixes and new Ruby versions for ruby/setup-ruby,
+    # change this to (see https://github.com/ruby/setup-ruby#versioning):
+    # uses: ruby/setup-ruby@v1
+      uses: ruby/setup-ruby@473e4d8fe5dd94ee328fdfca9f8c9c7afc9dae5e
+      with:
+        ruby-version: ${{ matrix.ruby-version }}
+        bundler-cache: true # runs 'bundle install' and caches installed gems automatically
+    - name: Run tests
+      run: bundle exec rake

data/README.md

@@ -1,4 +1,5 @@
-# Omniauth::MicrosoftGraph [![Build Status](https://travis-ci.org/synth/omniauth-microsoft_graph.svg?branch=master)](https://travis-ci.org/synth/omniauth-microsoft_graph)
+# Omniauth::MicrosoftGraph ![ruby workflow](https://github.com/synth/omniauth-microsoft_graph/actions/workflows/ruby.yml/badge.svg)
+
 
 Microsoft Graph OAuth2 Strategy for OmniAuth.
 Can be used to authenticate with Office365 or other MS services, and get a token for the Microsoft Graph Api, formerly the Office365 Unified Api.
@@ -33,6 +34,8 @@ Just add {login_hint: "email@example.com"} to your url generation to form:
 ```ruby
 /auth/microsoft_graph?login_hint=email@example.com
 ```
+### Upgrading to 1.0.0
+This version requires OmniAuth v2. If you are using Rails, you will need to include or upgrade `omniauth-rails_csrf_protection`. If you upgrade and get an error in your logs complaining about "authenticity error" or similiar, make sure to do `bundle update omniauth-rails_csrf_protection`
 
 ## Contributing
 

data/lib/omniauth/microsoft_graph/version.rb

@@ -1,5 +1,5 @@
-module Omniauth
+module OmniAuth
   module MicrosoftGraph
-    VERSION = "0.3.3"
+    VERSION = "1.2.0"
   end
 end

data/lib/omniauth/strategies/microsoft_graph.rb

@@ -89,7 +89,7 @@ module OmniAuth
             verifier = body && body['code']
             client_get_token(verifier, '/auth/microsoft_graph/callback') if verifier
           rescue JSON::ParserError => e
-            warn "[omniauth google-oauth2] JSON parse error=#{e}"
+            warn "[omniauth microsoft_graph] JSON parse error=#{e}"
           end
         end
       end

data/omniauth-microsoft_graph.gemspec

@@ -5,7 +5,7 @@ require 'omniauth/microsoft_graph/version'
 
 Gem::Specification.new do |spec|
   spec.name          = "omniauth-microsoft_graph"
-  spec.version       = Omniauth::MicrosoftGraph::VERSION
+  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}
@@ -18,8 +18,8 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency 'omniauth', '~> 1.1', '>= 1.1.1'
-  spec.add_runtime_dependency 'omniauth-oauth2', '~> 1.6'
+  spec.add_runtime_dependency 'omniauth', '~> 2.0'
+  spec.add_runtime_dependency 'omniauth-oauth2', '~> 1.8.0'
   spec.add_development_dependency "sinatra", '~> 0'
   spec.add_development_dependency "rake", '~> 12.3.3', '>= 12.3.3'
   spec.add_development_dependency 'rspec', '~> 3.6'

data/spec/omniauth/strategies/microsoft_graph_oauth2_spec.rb

@@ -151,7 +151,7 @@ describe OmniAuth::Strategies::MicrosoftGraph do
       end
 
       it 'should set default scope to email,profile' do
-        expect(subject.authorize_params['scope']).to eq('openid email profile https://graph.microsoft.com/User.Read')
+        expect(subject.authorize_params['scope']).to eq('offline_access openid email profile https://graph.microsoft.com/User.Read')
       end
 
       it 'should support space delimited scopes' do
@@ -243,6 +243,7 @@ describe OmniAuth::Strategies::MicrosoftGraph do
 
   describe '#callback_path' do
     it 'has the correct default callback path' do
+      allow(subject).to receive(:script_name).and_return('')
       expect(subject.callback_path).to eq('/auth/microsoft_graph/callback')
     end
 
@@ -250,6 +251,11 @@ describe OmniAuth::Strategies::MicrosoftGraph do
       @options = { callback_path: '/auth/foo/callback' }
       expect(subject.callback_path).to eq('/auth/foo/callback')
     end
+
+    it 'should set the callback_path with script_name if present' do
+      allow(subject).to receive(:script_name).and_return('/api/v1')
+      expect(subject.callback_path).to eq('/api/v1/auth/microsoft_graph/callback')
+    end
   end
 
   describe '#info' do
@@ -261,7 +267,7 @@ describe OmniAuth::Strategies::MicrosoftGraph do
         end
       end
     end
-    let(:access_token) { OAuth2::AccessToken.from_hash(client, {}) }
+    let(:access_token) { OAuth2::AccessToken.from_hash(client, { 'access_token' => 'a' }) }
     before { allow(subject).to receive(:access_token).and_return(access_token) }
 
     context 'with verified email' do
@@ -285,7 +291,7 @@ describe OmniAuth::Strategies::MicrosoftGraph do
         end
       end
     end
-    let(:access_token) { OAuth2::AccessToken.from_hash(client, {}) }
+    let(:access_token) { OAuth2::AccessToken.from_hash(client, { 'access_token' => 'a' }) }
 
     before { allow(subject).to receive(:access_token).and_return(access_token) }
 

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-microsoft_graph
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 1.2.0
 platform: ruby
 authors:
 - Peter Philips
 - Joel Van Horn
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-03-17 00:00:00.000000000 Z
+date: 2022-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: omniauth
@@ -17,34 +17,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.1.1
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.1.1
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: omniauth-oauth2
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: 1.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: 1.8.0
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
@@ -115,6 +109,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/FUNDING.yml"
+- ".github/workflows/ruby.yml"
 - ".travis.yml"
 - CHANGELOG.md
 - Gemfile
@@ -133,7 +129,7 @@ homepage: https://github.com/synth/omniauth-microsoft_graph
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -148,9 +144,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.2
-signing_key: 
+rubygems_version: 3.1.6
+signing_key:
 specification_version: 4
 summary: omniauth provider for Microsoft Graph
 test_files: