omniauth-azure-oauth2 0.0.9 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b934d53deb625528b9f999ca581fa4c14cffc555
-  data.tar.gz: 316f91e22960627a3b9ec1d72c7810a50b927d1d
+  metadata.gz: 0bee864f23443c93668213276a72f72f0303587a
+  data.tar.gz: 820bdf249f54726683c44d6e2ea032c7b76ea147
 SHA512:
-  metadata.gz: b98d6265575c2f747103a0f329f537ce517ccc5743eda6a8698d4834e0ce74e59789aaad85abc64ba7ef6c31edbc1676bc670806340f38cd73d2073f7c505366
-  data.tar.gz: bf2ddfc11a676457d962ea484013f0981f9735a38662203366e07bc17fe813849b1641da1a9dc640eddfe31b9c49a180ed403d310087fa32f52dfcd1842ac962
+  metadata.gz: b1a1c080c1e85a7f74b5f4606c26eae1a48cd0c70fab15551c50833ab2a837fd932cb1450131a4745daad1e15ef77c2a2af5752968f99dee777030a38cebb1f5
+  data.tar.gz: 945d2872c93387bbc15baf598cc96fb41904c5ff8c7f2c221b0ece0d8a89a46fe986ef8807283a44528117805d0a36ff0dbdb3f9fbd33248e83d32b02dae197b

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+# Version 0.0.9
+* Expand JWT dep. Thanks @ronaldsalas
+
 # Version 0.0.9
 * Added support for dynamic tenant urls. Thanks @marcus-fellinger-esc
 

data/lib/omniauth/azure_oauth2/version.rb

@@ -1,5 +1,5 @@
 module OmniAuth
   module AzureOauth2
-    VERSION = "0.0.9"
+    VERSION = "0.0.10"
   end
 end

data/lib/omniauth/strategies/azure_oauth2.rb

@@ -27,15 +27,14 @@ module OmniAuth
         options.client_secret = provider.client_secret
         options.tenant_id =
           provider.respond_to?(:tenant_id) ? provider.tenant_id : 'common'
-        options.base_azure_url = 
+        options.base_azure_url =
           provider.respond_to?(:base_azure_url) ? provider.base_azure_url : BASE_AZURE_URL
 
+        options.authorize_params = provider.authorize_params if provider.respond_to?(:authorize_params)
         options.authorize_params.domain_hint = provider.domain_hint if provider.respond_to?(:domain_hint) && provider.domain_hint
         options.authorize_params.prompt = request.params['prompt'] if request.params['prompt']
         options.client_options.authorize_url = "#{options.base_azure_url}/#{options.tenant_id}/oauth2/authorize"
         options.client_options.token_url = "#{options.base_azure_url}/#{options.tenant_id}/oauth2/token"
-
-        options.token_params.resource = options.resource
         super
       end
 
@@ -55,6 +54,11 @@ module OmniAuth
         }
       end
 
+      def token_params
+        azure_resource = request.env['omniauth.params'] && request.env['omniauth.params']['azure_resource']
+        super.merge(resource: azure_resource || options.resource)
+      end
+
       def callback_url
         full_host + script_name + callback_path
       end

data/omniauth-azure-oauth2.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |gem|
   gem.license       = "MIT"
 
   gem.add_dependency 'omniauth', '~> 1.0'
-  gem.add_dependency 'jwt', '~> 1.0'
+  gem.add_dependency 'jwt', ['>= 1.0', '< 3.0']
 
   gem.add_runtime_dependency 'omniauth-oauth2', '~> 1.4'
 

data/spec/omniauth/strategies/azure_oauth2_spec.rb

@@ -46,12 +46,6 @@ describe OmniAuth::Strategies::AzureOauth2 do
         expect(subject.client.options[:token_url]).to eql('https://login.microsoftonline.com/tenant/oauth2/token')
       end
 
-      it 'has correct token params' do
-        allow(subject).to receive(:request) { request }
-        subject.client
-        expect(subject.token_params[:resource]).to eql('00000002-0000-0000-c000-000000000000')
-      end
-
       describe "overrides" do
         it 'should override domain_hint' do
           @options = {domain_hint: 'hint'}
@@ -69,30 +63,30 @@ describe OmniAuth::Strategies::AzureOauth2 do
     subject do
       OmniAuth::Strategies::AzureOauth2.new(app, {client_id: 'id', client_secret: 'secret', tenant_id: 'tenant', base_azure_url: 'https://login.microsoftonline.de'}.merge(options))
     end
-  
+
     describe '#client' do
       it 'has correct authorize url' do
         allow(subject).to receive(:request) { request }
         expect(subject.client.options[:authorize_url]).to eql('https://login.microsoftonline.de/tenant/oauth2/authorize')
       end
-  
+
       it 'has correct authorize params' do
         allow(subject).to receive(:request) { request }
         subject.client
         expect(subject.authorize_params[:domain_hint]).to be_nil
       end
-  
+
       it 'has correct token url' do
         allow(subject).to receive(:request) { request }
         expect(subject.client.options[:token_url]).to eql('https://login.microsoftonline.de/tenant/oauth2/token')
       end
-  
+
       it 'has correct token params' do
         allow(subject).to receive(:request) { request }
         subject.client
         expect(subject.token_params[:resource]).to eql('00000002-0000-0000-c000-000000000000')
       end
-  
+
       describe "overrides" do
         it 'should override domain_hint' do
           @options = {domain_hint: 'hint'}
@@ -103,7 +97,7 @@ describe OmniAuth::Strategies::AzureOauth2 do
       end
     end
   end
-  
+
   describe 'static common configuration' do
     let(:options) { @options || {} }
     subject do
@@ -143,6 +137,9 @@ describe OmniAuth::Strategies::AzureOauth2 do
           'tenant'
         end
 
+        def authorize_params
+          { custom_option: 'value' }
+        end
       }
     }
 
@@ -162,6 +159,7 @@ describe OmniAuth::Strategies::AzureOauth2 do
       it 'has correct authorize params' do
         subject.client
         expect(subject.authorize_params[:domain_hint]).to be_nil
+        expect(subject.authorize_params[:custom_option]).to eql('value')
       end
 
       it 'has correct token url' do
@@ -190,52 +188,52 @@ describe OmniAuth::Strategies::AzureOauth2 do
       Class.new {
         def initialize(strategy)
         end
-  
+
         def client_id
           'id'
         end
-  
+
         def client_secret
           'secret'
         end
-  
+
         def tenant_id
           'tenant'
         end
-        
+
         def base_azure_url
           'https://login.microsoftonline.de'
         end
       }
     }
-  
+
     subject do
       OmniAuth::Strategies::AzureOauth2.new(app, provider_klass)
     end
-  
+
     before do
       allow(subject).to receive(:request) { request }
     end
-  
+
     describe '#client' do
       it 'has correct authorize url' do
         expect(subject.client.options[:authorize_url]).to eql('https://login.microsoftonline.de/tenant/oauth2/authorize')
       end
-  
+
       it 'has correct authorize params' do
         subject.client
         expect(subject.authorize_params[:domain_hint]).to be_nil
       end
-  
+
       it 'has correct token url' do
         expect(subject.client.options[:token_url]).to eql('https://login.microsoftonline.de/tenant/oauth2/token')
       end
-  
+
       it 'has correct token params' do
         subject.client
         expect(subject.token_params[:resource]).to eql('00000002-0000-0000-c000-000000000000')
       end
-  
+
       # todo: how to get this working?
       # describe "overrides" do
       #   it 'should override domain_hint' do
@@ -245,7 +243,7 @@ describe OmniAuth::Strategies::AzureOauth2 do
       #   end
       # end
     end
-  
+
   end
 
   describe 'dynamic common configuration' do
@@ -307,4 +305,28 @@ describe OmniAuth::Strategies::AzureOauth2 do
       end.to_not raise_error
     end
   end
+
+  describe 'token_params' do
+    let(:strategy) { OmniAuth::Strategies::AzureOauth2.new(app, client_id: 'id', client_secret: 'secret') }
+    let(:request)  { double('Request', env: env) }
+    let(:env)      { {} }
+
+    subject { strategy.token_params }
+
+    before { allow(strategy).to receive(:request).and_return request }
+
+    it { is_expected.to be_a OmniAuth::Strategy::Options }
+    it 'has default resource' do
+      expect(subject.resource).to eq '00000002-0000-0000-c000-000000000000'
+    end
+
+    context 'when custom crm url' do
+      let(:crm_url) { 'https://mydomain.crm.dynamics.com/' }
+      let(:env)     { { 'omniauth.params' => { 'azure_resource' => crm_url } } }
+
+      it 'has resource from url params' do
+        expect(subject.resource).to eq crm_url
+      end
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-azure-oauth2
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
 platform: ruby
 authors:
 - Mark Nadig
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-25 00:00:00.000000000 Z
+date: 2018-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: omniauth
@@ -28,16 +28,22 @@ dependencies:
   name: jwt
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: omniauth-oauth2
   requirement: !ruby/object:Gem::Requirement