omniauth-azure-oauth2 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9d9149a05139422434d298c3b5a30672d3de6195
-  data.tar.gz: efe71ff9e3b0e07870ea75f10fad2890b0c8c398
+  metadata.gz: b934d53deb625528b9f999ca581fa4c14cffc555
+  data.tar.gz: 316f91e22960627a3b9ec1d72c7810a50b927d1d
 SHA512:
-  metadata.gz: 126922706272c0a00bb8330e4b10f264c1490ad98ed075b27e7ae9158ec13af20f200f15dbcb29d29dd2ad93d40c645cd92f8a205ba2018e84b1e5d3cca2c4d3
-  data.tar.gz: e154b9fa94645c9bdffe6cc92b473f0a9d9d8a0e975f4be14004acc3e1afb5418d1411774b881ce8720bfac1a21bfc3b446cc162a370f09f53f17b1860d0a3e1
+  metadata.gz: b98d6265575c2f747103a0f329f537ce517ccc5743eda6a8698d4834e0ce74e59789aaad85abc64ba7ef6c31edbc1676bc670806340f38cd73d2073f7c505366
+  data.tar.gz: bf2ddfc11a676457d962ea484013f0981f9735a38662203366e07bc17fe813849b1641da1a9dc640eddfe31b9c49a180ed403d310087fa32f52dfcd1842ac962

data/CHANGELOG.md

@@ -1,6 +1,9 @@
-# Version 0.0.7
+# Version 0.0.9
+* Added support for dynamic tenant urls. Thanks @marcus-fellinger-esc
+
+# Version 0.0.8
 * Upgrade to omniauth-oauth2 1.4.0 and fix callback url issue
-* Allow prompt parameter
+* Allow prompt parameter, thanks @hilu
 * Add tenant id to info
 * Updated base url
 

data/README.md

@@ -101,6 +101,9 @@ use OmniAuth::Builder do
 end
 ```
 
+The base_azure_url can be overridden in the provider configuration for different locales; e.g. `base_azure_url: "https://login.microsoftonline.de"`
+
+
 ## Auth Hash Schema
 
 The following information is provided back to you for this provider:

data/lib/omniauth/azure_oauth2/version.rb

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

data/lib/omniauth/strategies/azure_oauth2.rb

@@ -13,25 +13,27 @@ module OmniAuth
       # AD resource identifier
       option :resource, '00000002-0000-0000-c000-000000000000'
 
-      # tenant_provider must return client_id, client_secret and optionally tenant_id
+      # tenant_provider must return client_id, client_secret and optionally tenant_id and base_azure_url
       args [:tenant_provider]
 
       def client
         if options.tenant_provider
           provider = options.tenant_provider.new(self)
         else
-          provider = options  # if pass has to config, get mapped right on to ptions
+          provider = options  # if pass has to config, get mapped right on to options
         end
 
         options.client_id = provider.client_id
         options.client_secret = provider.client_secret
         options.tenant_id =
           provider.respond_to?(:tenant_id) ? provider.tenant_id : 'common'
+        options.base_azure_url = 
+          provider.respond_to?(:base_azure_url) ? provider.base_azure_url : BASE_AZURE_URL
 
         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 = "#{BASE_AZURE_URL}/#{options.tenant_id}/oauth2/authorize"
-        options.client_options.token_url = "#{BASE_AZURE_URL}/#{options.tenant_id}/oauth2/token"
+        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

data/spec/omniauth/strategies/azure_oauth2_spec.rb

@@ -64,6 +64,46 @@ describe OmniAuth::Strategies::AzureOauth2 do
 
   end
 
+  describe 'static configuration - german' do
+    let(:options) { @options || {} }
+    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'}
+          allow(subject).to receive(:request) { request }
+          subject.client
+          expect(subject.authorize_params[:domain_hint]).to eql('hint')
+        end
+      end
+    end
+  end
+  
   describe 'static common configuration' do
     let(:options) { @options || {} }
     subject do
@@ -145,6 +185,69 @@ describe OmniAuth::Strategies::AzureOauth2 do
 
   end
 
+  describe 'dynamic configuration - german' do
+    let(:provider_klass) {
+      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
+      #     provider_klass.domain_hint = 'hint'
+      #     subject.client
+      #     expect(subject.authorize_params[:domain_hint]).to eql('hint')
+      #   end
+      # end
+    end
+  
+  end
+
   describe 'dynamic common configuration' do
     let(:provider_klass) {
       Class.new {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-azure-oauth2
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - Mark Nadig
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-08 00:00:00.000000000 Z
+date: 2017-08-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: omniauth