omniauth-dice 0.1.8 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 154d96bc38ba5c4c2dfe1a7facf22892ce61ae26
-  data.tar.gz: 45e25aea48dd2454a1bf0720e8859b360e09c141
+  metadata.gz: b5b9be999c98d047041bd0ea7f9dc2e155971838
+  data.tar.gz: 859a4cb50fa183cb687af337b040c41e9b83d14d
 SHA512:
-  metadata.gz: 9b876975f32c4b617ddf876371876ad3265671658b41807d00d3d6295e5ee3907b1eba5c18747929936bef112c55104034c1dd41cb706f457fc70c97c6b21d44
-  data.tar.gz: 111cd2f06332c91b1eb18230e6a650c03e358b9063add3754015c028faadd7f7467a1d10eb406acf316ffee440d0a587d193574a71dc642d4bfb6ba89f7622ff
+  metadata.gz: d9a80350574e4f83156c9c051c7c41b110d9847a3d2170239d7a950d28aa1e334c2506e2f29ff8cc8dbd42d2f1ffd4726408358485700f84c74b408c0116be79
+  data.tar.gz: 488acf3620615cf66e72431bff942f7bc1dc79b02a09ddec73e44a544bf431b14a14c189902f0cfe63a3f98e8c0dcbebb13022fb153c7f02e8648f649479e902

data/lib/omniauth/dice/version.rb

@@ -1,5 +1,5 @@
 module Omniauth
   module Dice
-    VERSION = '0.1.8'
+    VERSION = '0.1.9'
   end
 end

data/lib/omniauth/strategies/dice.rb

@@ -82,20 +82,11 @@ module OmniAuth
         log :debug, "Formatted issuer_dn: #{issuer_dn}"
         set_session_dn(issuer_dn, 'issuer') if issuer_dn
 
-        redirect callback_url
+        redirect callback_path
       end
 
       def callback_phase
-        issuer_dn = env['omniauth.params']['issuer_dn']
-        if issuer_dn
-          response = connection.get query_url, { issuerDN: issuer_dn }
-        else
-          response = connection.get query_url
-        end
-        if !response || response.status.to_i >= 400
-          log :error, response.inspect
-          return fail!(:invalid_credentials)
-        end
+        response = authenticate_user
         @raw_data = response.body
         @data = parse_response_data
         session['omniauth.auth'] ||= auth_hash
@@ -148,6 +139,21 @@ module OmniAuth
         tmp_hash
       end
 
+      def authenticate_user
+        issuer_dn = env['omniauth.params']['issuer_dn']
+        if issuer_dn
+          response = connection.get query_url, { issuerDN: issuer_dn }
+        else
+          response = connection.get query_url
+        end
+        if !response || response.status.to_i >= 400
+          log :error, response.inspect
+          return fail!(:invalid_credentials)
+        end
+
+        response
+      end
+
       # Default ['omniauth.auth']['info'] field names
       def info_defaults
         [:dn, :email, :firstName, :lastName, :fullName, :citizenshipStatus,

data/spec/omniauth/strategies/dice_integrations_spec.rb

@@ -94,7 +94,7 @@ describe OmniAuth::Strategies::Dice, type: :strategy do
       expect(last_request.url).to eq('http://example.org/auth/dice')
       expect(last_request.env['rack.session']['omniauth.params']['user_dn']).to eq(user_dn.to_s)
       expect(last_request.env['rack.session']['omniauth.params']['issuer_dn']).to eq(issuer_dn)
-      expect(last_response.location).to eq('http://example.org/auth/dice/callback')
+      expect(last_response.location).to eq('/auth/dice/callback')
     end
 
     it "should set the client's DN (from header)" do
@@ -104,7 +104,7 @@ describe OmniAuth::Strategies::Dice, type: :strategy do
       expect(last_request.url).to eq('http://example.org/auth/dice')
       expect(last_request.env['rack.session']['omniauth.params']['user_dn']).to eq(user_dn.to_s)
       expect(last_request.env['rack.session']['omniauth.params']['issuer_dn']).to be_nil
-      expect(last_response.location).to eq('http://example.org/auth/dice/callback')
+      expect(last_response.location).to eq('/auth/dice/callback')
     end
 
     it "should set the issuer's DN (from header)" do
@@ -114,7 +114,7 @@ describe OmniAuth::Strategies::Dice, type: :strategy do
       expect(last_request.env['HTTP_SSL_CLIENT_I_DN']).to eq(raw_issuer_dn)
       expect(last_request.url).to eq('http://example.org/auth/dice')
       expect(last_request.env['rack.session']['omniauth.params']['issuer_dn']).to eq(issuer_dn)
-      expect(last_response.location).to eq('http://example.org/auth/dice/callback')
+      expect(last_response.location).to eq('/auth/dice/callback')
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-dice
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9
 platform: ruby
 authors:
 - Steven Haddox
@@ -30,7 +30,7 @@ cert_chain:
   42qdwEXvvkODZAD6KAIXPdmbMfBgPbcd+B/4eUA0PyKo+4dgL1NuqX4MPWToevIZ
   O8EKLF2X7NmC6FY1bOsSj/J8r1SOkx0rxgF+geRvY1P+hfNjDfxTsjU=
   -----END CERTIFICATE-----
-date: 2015-02-12 00:00:00.000000000 Z
+date: 2015-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: awesome_print
@@ -407,7 +407,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.4
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: DN Interoperable Conversion Expert Strategy