omniauth-azure-oauth2 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 277d288ce60567e9f3dd948e30a53ff4241b2238
-  data.tar.gz: 5b3a6edccbf4217230e55965cf7bce245a2faa62
+  metadata.gz: d9c73b1998879a637805a6e9bb99e474877b44f1
+  data.tar.gz: e6f364fd018413ca5ed2fb58cb26f63e946ccd9c
 SHA512:
-  metadata.gz: 0285ebc4357800e6c8fb9a075a8f9f767dbe372329912832f75035a24a4ab6b1ba17f6e0995b5576d431721f289ab326c97fa41115338b3ded5b2d5ef9e082bf
-  data.tar.gz: 32b6b1e9d5a822b823d2b024fec4f28e946a214f1276b1fa25820e282a42cc49f32f56ab456f97e60cfea4f9fc8ae3aa626081f344da33b5d9767aff913f3dc8
+  metadata.gz: 1ae29a25456cbae45d709dbd5d3fd125afcb6ff19d6169e0ea8a8d27a931e7221d4f40b271edd230fbdfb6988222c84dac9980553f805f9ef34c3e4ba9f23159
+  data.tar.gz: f9b8ddaa179edf69138b303afc33582b7809563f52c11e6c6c7814cb6e6ab515659541c6dbc85c51fa7a589812c3a56b7bd0175a92d3abf3303c75c05f2e08b3

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# VERSION 0.0.3
+* added common endpoint and removed mandatory requirement for tenant-id
+* upgraded jwt
+
 # VERSION 0.0.1
 
 * Initial build

data/README.md

@@ -29,20 +29,40 @@ Permissions need Delegated Permissions to at least have "Enable sign-on and read
 
 Note: Seems like the terminology is still fluid, so follow the MS guidance (buwahaha) to set this up.
 
-The TenantInfo information can be a hash or class. It must provide client_id, client_secret and tenant_id.
-Optionally a domain_hint. For a simple single-tenant app, this could be:
+The TenantInfo information can be a hash or class. It must provide client_id and client_secret.
+Optionally a domain_hint and tenant_id. For a simple single-tenant app, this could be:
 
 ```ruby
 use OmniAuth::Builder do
   provider :azure_oauth2,
     {
       client_id: ENV['AZURE_CLIENT_ID'],
-      client_secret: ENV['AZURE_CLIENT_ID'],
+      client_secret: ENV['AZURE_CLIENT_SECRET'],
       tenant_id: ENV['AZURE_TENANT_ID']
     }
 end
 ```
 
+Or the alternative format for use with [devise](https://github.com/plataformatec/devise):
+
+```ruby
+config.omniauth :azure_oauth2, client_id: ENV['AZURE_CLIENT_ID'],
+      client_secret: ENV['AZURE_CLIENT_SECRET'], tenant_id: ENV['AZURE_TENANT_ID']
+```
+
+For multi-tenant apps where you don't know the tenant_id in advance, simply leave out the tenant_id to use the 
+[common endpoint](http://msdn.microsoft.com/en-us/library/azure/dn645542.aspx).
+
+```ruby
+use OmniAuth::Builder do
+  provider :azure_oauth2,
+    {
+      client_id: ENV['AZURE_CLIENT_ID'],
+      client_secret: ENV['AZURE_CLIENT_SECRET']
+    }
+end
+```
+
 For dynamic tenant assignment, pass a class that supports those same attributes and accepts the strategy as a parameter
 
 ```ruby

data/lib/omniauth/azure_oauth2/version.rb

@@ -1,5 +1,5 @@
 module OmniAuth
   module AzureOauth2
-    VERSION = "0.0.2"
+    VERSION = "0.0.3"
   end
 end

data/lib/omniauth/strategies/azure_oauth2.rb

@@ -13,7 +13,7 @@ module OmniAuth
       # AD resource identifier
       option :resource, '00000002-0000-0000-c000-000000000000'
 
-      # tenant_provider must return client_id, client_secret, tenant_id
+      # tenant_provider must return client_id, client_secret and optionally tenant_id
       args [:tenant_provider]
 
       def client
@@ -25,7 +25,8 @@ module OmniAuth
 
         options.client_id = provider.client_id
         options.client_secret = provider.client_secret
-        options.tenant_id = provider.tenant_id
+        options.tenant_id = 
+          provider.respond_to?(:tenant_id) ? provider.tenant_id : 'common'
 
         options.authorize_params.domain_hint = provider.domain_hint if provider.respond_to?(:domain_hint) && provider.domain_hint
         options.client_options.authorize_url = "#{BASE_AZURE_URL}/#{options.tenant_id}/oauth2/authorize"
@@ -44,14 +45,15 @@ module OmniAuth
           name: raw_info['unique_name'],
           first_name: raw_info['given_name'],
           last_name: raw_info['family_name'],
-          email: raw_info['email'] || raw_info['upn']
+          email: raw_info['email'] || raw_info['upn'],
+          oid: raw_info['oid']
         }
       end
 
 
       def raw_info
         # it's all here in JWT http://msdn.microsoft.com/en-us/library/azure/dn195587.aspx
-        @raw_info ||= JWT.decode(access_token.token, nil, false)
+        @raw_info ||= JWT.decode(access_token.token, nil, false).first
       end
 
     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', '~> 0.1'
+  gem.add_dependency 'jwt', '~> 1.0.0'
 
   gem.add_runtime_dependency 'omniauth-oauth2', '~> 1.1'
 

data/spec/omniauth/strategies/azure_oauth2_spec.rb

@@ -53,6 +53,22 @@ describe OmniAuth::Strategies::AzureOauth2 do
 
   end
 
+  describe 'static common configuration' do
+    let(:options) { @options || {} }
+    subject do
+      OmniAuth::Strategies::AzureOauth2.new(app, {client_id: 'id', client_secret: 'secret'}.merge(options))
+    end
+
+    describe '#client' do
+      it 'has correct authorize url' do
+        expect(subject.client.options[:authorize_url]).to eql('https://login.windows.net/common/oauth2/authorize')
+      end
+
+      it 'has correct token url' do
+        expect(subject.client.options[:token_url]).to eql('https://login.windows.net/common/oauth2/token')
+      end
+    end
+  end
 
   describe 'dynamic configuration' do
     let(:provider_klass) {
@@ -109,4 +125,35 @@ describe OmniAuth::Strategies::AzureOauth2 do
     end
 
   end
+  
+  describe 'dynamic common configuration' do
+    let(:provider_klass) {
+      Class.new {
+        def initialize(strategy)
+        end
+
+        def client_id
+          'id'
+        end
+
+        def client_secret
+          'secret'
+        end
+      }
+    }
+
+    subject do
+      OmniAuth::Strategies::AzureOauth2.new(app, provider_klass)
+    end
+
+    describe '#client' do
+      it 'has correct authorize url' do
+        expect(subject.client.options[:authorize_url]).to eql('https://login.windows.net/common/oauth2/authorize')
+      end
+
+      it 'has correct token url' do
+        expect(subject.client.options[:token_url]).to eql('https://login.windows.net/common/oauth2/token')
+      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.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Mark Nadig
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-31 00:00:00.000000000 Z
+date: 2014-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: omniauth
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: omniauth-oauth2
   requirement: !ruby/object:Gem::Requirement