omniauth-azure-oauth2 0.0.6 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 698040dd85554685b47bc982df7299d699ddd9d0
-  data.tar.gz: 5a6df99f1113bcf21954be0027bb1c305adfd993
+  metadata.gz: 9d9149a05139422434d298c3b5a30672d3de6195
+  data.tar.gz: efe71ff9e3b0e07870ea75f10fad2890b0c8c398
 SHA512:
-  metadata.gz: aa47882915bdb84266c88a709a4865251badb1c642b4f61461847adbee6dc096fc9eb453d469cf1a0acd690bde0377b480634307c2cb9f9667f820dc94017d4e
-  data.tar.gz: 09a4a620173b8f1f01bdf3761fed3664d2115d34eb1456ca092023d21fbdf30d42136746b81a8d72c1bb34432b8af7dcd119f08997e06ef28ac433dc45b82d49
+  metadata.gz: 126922706272c0a00bb8330e4b10f264c1490ad98ed075b27e7ae9158ec13af20f200f15dbcb29d29dd2ad93d40c645cd92f8a205ba2018e84b1e5d3cca2c4d3
+  data.tar.gz: e154b9fa94645c9bdffe6cc92b473f0a9d9d8a0e975f4be14004acc3e1afb5418d1411774b881ce8720bfac1a21bfc3b446cc162a370f09f53f17b1860d0a3e1

data/.travis.yml

@@ -0,0 +1,3 @@
+language: ruby
+rvm: 
+  - 2.1.8

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+# Version 0.0.7
+* Upgrade to omniauth-oauth2 1.4.0 and fix callback url issue
+* Allow prompt parameter
+* Add tenant id to info
+* Updated base url
+
 # Version 0.0.6 
 * Use 'name' from Azure for name, and 'unique_name' for nickname per Auth Hash spec. Thanks @jayme-github   
 

data/README.md

@@ -1,4 +1,5 @@
 # OmniAuth Windows Azure Active Directory Strategy
+[![Build Status](https://travis-ci.org/KonaTeam/omniauth-azure-oauth2.svg?branch=master)](https://travis-ci.org/KonaTeam/omniauth-azure-oauth2)
 
 This gem provides a simple way to authenticate to Windows Azure Active Directory (WAAD) over OAuth2 using OmniAuth.
 
@@ -140,6 +141,8 @@ end
 5. Push to the branch (`git push origin my-new-feature`)
 6. Create new Pull Request
 
+
 ## Misc
 Run tests `bundle exec rake`  
-Push to rubygems `bundle exec rake release`. 
+Push to rubygems `bundle exec rake release`.
+ 

data/lib/omniauth/azure_oauth2/version.rb

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

data/lib/omniauth/strategies/azure_oauth2.rb

@@ -4,7 +4,7 @@ require 'jwt'
 module OmniAuth
   module Strategies
     class AzureOauth2 < OmniAuth::Strategies::OAuth2
-      BASE_AZURE_URL = 'https://login.windows.net'
+      BASE_AZURE_URL = 'https://login.microsoftonline.com'
 
       option :name, 'azure_oauth2'
 
@@ -25,10 +25,11 @@ module OmniAuth
 
         options.client_id = provider.client_id
         options.client_secret = provider.client_secret
-        options.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.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"
 
@@ -47,10 +48,14 @@ module OmniAuth
           first_name: raw_info['given_name'],
           last_name: raw_info['family_name'],
           email: raw_info['email'] || raw_info['upn'],
-          oid: raw_info['oid']
+          oid: raw_info['oid'],
+          tid: raw_info['tid']
         }
       end
 
+      def callback_url
+        full_host + script_name + callback_path
+      end
 
       def raw_info
         # it's all here in JWT http://msdn.microsoft.com/en-us/library/azure/dn195587.aspx

data/omniauth-azure-oauth2.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'omniauth', '~> 1.0'
   gem.add_dependency 'jwt', '~> 1.0'
 
-  gem.add_runtime_dependency 'omniauth-oauth2', '~> 1.1'
+  gem.add_runtime_dependency 'omniauth-oauth2', '~> 1.4'
 
   gem.add_development_dependency 'rspec', '>= 2.14.0'
   gem.add_development_dependency 'rake'

data/spec/omniauth/strategies/azure_oauth2_spec.rb

@@ -31,19 +31,23 @@ describe OmniAuth::Strategies::AzureOauth2 do
 
     describe '#client' do
       it 'has correct authorize url' do
-        expect(subject.client.options[:authorize_url]).to eql('https://login.windows.net/tenant/oauth2/authorize')
+        allow(subject).to receive(:request) { request }
+        expect(subject.client.options[:authorize_url]).to eql('https://login.microsoftonline.com/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
-        expect(subject.client.options[:token_url]).to eql('https://login.windows.net/tenant/oauth2/token')
+        allow(subject).to receive(:request) { request }
+        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
@@ -51,6 +55,7 @@ describe OmniAuth::Strategies::AzureOauth2 do
       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
@@ -65,13 +70,17 @@ describe OmniAuth::Strategies::AzureOauth2 do
       OmniAuth::Strategies::AzureOauth2.new(app, {client_id: 'id', client_secret: 'secret'}.merge(options))
     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.windows.net/common/oauth2/authorize')
+        expect(subject.client.options[:authorize_url]).to eql('https://login.microsoftonline.com/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')
+        expect(subject.client.options[:token_url]).to eql('https://login.microsoftonline.com/common/oauth2/token')
       end
     end
   end
@@ -101,9 +110,13 @@ describe OmniAuth::Strategies::AzureOauth2 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.windows.net/tenant/oauth2/authorize')
+        expect(subject.client.options[:authorize_url]).to eql('https://login.microsoftonline.com/tenant/oauth2/authorize')
       end
 
       it 'has correct authorize params' do
@@ -112,7 +125,7 @@ describe OmniAuth::Strategies::AzureOauth2 do
       end
 
       it 'has correct token url' do
-        expect(subject.client.options[:token_url]).to eql('https://login.windows.net/tenant/oauth2/token')
+        expect(subject.client.options[:token_url]).to eql('https://login.microsoftonline.com/tenant/oauth2/token')
       end
 
       it 'has correct token params' do
@@ -152,13 +165,17 @@ describe OmniAuth::Strategies::AzureOauth2 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.windows.net/common/oauth2/authorize')
+        expect(subject.client.options[:authorize_url]).to eql('https://login.microsoftonline.com/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')
+        expect(subject.client.options[:token_url]).to eql('https://login.microsoftonline.com/common/oauth2/token')
       end
     end
   end
@@ -176,8 +193,9 @@ describe OmniAuth::Strategies::AzureOauth2 do
       double(:token => token)
     end
 
-    before :each do
+    before do
       allow(subject).to receive(:access_token) { access_token }
+      allow(subject).to receive(:request) { request }
     end
 
     it "does not clash if JWT strategy is used" do

metadata

@@ -1,83 +1,83 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-azure-oauth2
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.8
 platform: ruby
 authors:
 - Mark Nadig
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-22 00:00:00.000000000 Z
+date: 2016-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: omniauth
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
   name: jwt
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
   name: omniauth-oauth2
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.4'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.14.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.14.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: An Windows Azure Active Directory OAuth2 strategy for OmniAuth
@@ -87,7 +87,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
+- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - LICENSE
@@ -111,17 +112,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: An Windows Azure Active Directory OAuth2 strategy for OmniAuth