omniauth-dice 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2b1dcf3f2a37af9ae8765b1c55c3e95a2edeeee4
-  data.tar.gz: a03353cebcefc089831a9eacdb58ffba36aecd0f
+  metadata.gz: de1eea3be3faeb1e1d48d6427bb459ee29e5154c
+  data.tar.gz: 89f2ac6f4e497c8e6be849dd0f0b172f9aeff86a
 SHA512:
-  metadata.gz: ff09f5d4fca2c035d1ef6e2c62c32a8bf3c4252fb0e03d9dfdabde2636c4526f369454b8f9a90a4bedf4f6e47433159846a6c776af27672367da986d68254c4c
-  data.tar.gz: 5864952a54de400474e426e791f8a7a41136dfe90add87aaa5ef9cd69c224d688e4fe298f86466abe9f2438c0411aea2c8d61f4a071b250ec18de03440c58bfe
+  metadata.gz: 32e0341f76f988f83e0df357b40946450a9804a401e5eb36e0dedc6eac8113d081879bc8bbe148a132af6e3640a37d817b3d9afbb68bb8ca70ecffae912f416d
+  data.tar.gz: 80501d7343afe9689f0dba3e947cc053c6f3852b3f3a9c9f3c00fcc2aeeff1897dfc1c78ba2d722b1351cc98ba135a500edfdf4a87cc3fe8c99798032a84f0d4

data/README.md

@@ -26,19 +26,37 @@ Or install it yourself with:
 
 Setup your OmniAuth::Dice builder like so:
 
+Ruby on Rails (3.0+):
 ```ruby
-{
+Rails.application.config.middleware.use OmniAuth::Builder do
+  provider :dice, {
+    cas_server:          'https://example.org',
+    authentication_path: '/users',
+    primary_visa:        'EQUESTRIA',
+    dnc_options: { :transformation => 'downcase' }, # see `dnc` gem for all options
+    ssl_config: {
+        ca_file:     '/path/to/your/CA.all.pem',
+        client_cert: '/path/to/server/cert.pem',
+        client_key:  '/path/to/server/key.np.key'
+    }
+  }
+end
+```
+
+Rack / Sinatra:
+```ruby
+use OmniAuth::Strategies::Dice, {
   cas_server:          'https://example.org:3000',
   authentication_path: '/dn',
   format_header:       'application/xml', # default is 'application/json'
   format:              'xml', # default is 'json'
   primary_visa:        'EQUESTRIA', # Optional
   dnc_options: { transformation: 'downcase' }, # see `dnc` gem for all options
-  ssl_config:  {
-    ca_file:     'spec/certs/CA.pem',
-    client_cert: 'spec/certs/client.pem',
-    client_key:  'spec/certs/key.np.pem'
-  } # See OmniAuth::Strategies::Dice.ssl_hash for all options
+  ssl_config: {
+      ca_file:     '/path/to/your/CA.all.pem',
+      client_cert: '/path/to/server/cert.pem',
+      client_key:  '/path/to/server/key.np.key'
+  }
 }
 ```
 
@@ -67,14 +85,14 @@ Full configuration options are as follows:
 `Faraday` (the HTTP library used by OmniAuth) can accept certificate paths:
 
 ```
-  client_cert: 'spec/certs/client.pem',
-  client_key:  'spec/certs/key.np.pem'
+  client_cert: 'path/to/server/cert.pem',
+  client_key:  'path/to/server/key.np.pem'
 ```
 
 Or it also works with actual certificates (such as to pass a passphrase in):
 ```
-  client_cert: File.read('spec/certs/client.pem').to_cert,
-  client_key:  OpenSSL::PKey::RSA.new(File.read('spec/certs/key.pem'), 'PASSW0RD')
+  client_cert: File.read('path/to/server/cert.pem').to_cert,
+  client_key:  OpenSSL::PKey::RSA.new(File.read('path/to/server/key.pem'), 'PASSW0RD')
 ```
 
 ## Contributing

data/lib/omniauth/dice/version.rb

@@ -1,5 +1,5 @@
 module Omniauth
   module Dice
-    VERSION = '0.1.4'
+    VERSION = '0.1.5'
   end
 end

data/lib/omniauth/strategies/dice.rb

@@ -100,7 +100,7 @@ module OmniAuth
         @data = parse_response_data
         session['omniauth.auth'] ||= auth_hash
 
-        redirect request.env['omniauth.origin'] || '/'
+        super
       end
 
       def auth_hash
@@ -317,6 +317,7 @@ module OmniAuth
       def parse_response_data
         log :debug, '.parse_response_data'
         log :debug, "cas_server response.body:\r\n#{@raw_data}"
+        formatted_data = nil
         unless @raw_data.class == Hash # Webmock hack
           case options.format.to_sym
           when :json
@@ -324,8 +325,9 @@ module OmniAuth
           when :xml
             formatted_data = MultiXml.parse(@raw_data)['userinfo']
           end
-          log :debug, "Formatted response.body data: #{formatted_data}"
         end
+        formatted_data = formatted_data.nil? ? @raw_data : formatted_data
+        log :debug, "Formatted response.body data: #{formatted_data}"
 
         formatted_data
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-dice
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Steven Haddox
@@ -30,7 +30,7 @@ cert_chain:
   42qdwEXvvkODZAD6KAIXPdmbMfBgPbcd+B/4eUA0PyKo+4dgL1NuqX4MPWToevIZ
   O8EKLF2X7NmC6FY1bOsSj/J8r1SOkx0rxgF+geRvY1P+hfNjDfxTsjU=
   -----END CERTIFICATE-----
-date: 2015-02-03 00:00:00.000000000 Z
+date: 2015-02-07 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.2.2
+rubygems_version: 2.4.4
 signing_key: 
 specification_version: 4
 summary: DN Interoperable Conversion Expert Strategy