omniauth-delegated-authentication 0.1 → 0.2

data/lib/omniauth-delegated-authentication/version.rb

@@ -1,5 +1,5 @@
 module OmniAuth
   module DelegatedAuthentication
-    VERSION = "0.1"
+    VERSION = "0.2"
   end
 end

data/lib/omniauth/strategies/omniauth-delegated-authentication.rb

@@ -27,12 +27,16 @@ module OmniAuth
       end
 
       def callback_phase
-        if request.params['error'] || request.params['error_reason']
-          raise CallbackError.new(request.params['error'], request.params['error_description'] || request.params['error_reason'], request.params['error_uri'])
+        if request.params['action'] == "cancel"
+          raise CallbackError.new(request.params['action'], request.params['ResponseCode'])
         end
 
         self.consent_token = process_consent_token
         self.consent_token = client.refreshConsentToken(self.consent_token) unless consent_token.isValid?
+
+        super
+      rescue CallbackError => e
+        fail!(:invalid_credentials, e)
       end
 
       protected
@@ -45,10 +49,9 @@ module OmniAuth
       class CallbackError < StandardError
         attr_accessor :error, :error_reason, :error_uri
 
-        def initialize(error, error_reason=nil, error_uri=nil)
+        def initialize(error, error_reason=nil)
           self.error = error
           self.error_reason = error_reason
-          self.error_uri = error_uri
         end
       end
     end

data/omniauth-delegated-authentication.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'omniauth-delegated-authentication'
-  s.version     = '0.1'
+  s.version     = '0.2'
   s.date        = '2013-01-29'
   s.summary     = "Delegated Authentication protocol developer strategy for Omniauth"
   s.description = s.summary

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-delegated-authentication
 version: !ruby/object:Gem::Version
-  version: '0.1'
+  version: '0.2'
   prerelease: 
 platform: ruby
 authors:
@@ -20,7 +20,6 @@ files:
 - lib/omniauth-delegated-authentication.rb
 - lib/omniauth-delegated-authentication/version.rb
 - lib/omniauth/strategies/omniauth-delegated-authentication.rb
-- omniauth-delegated-authentication-0.1.gem
 - omniauth-delegated-authentication.gemspec
 homepage: http://rubygems.org/gems/omniauth-delegated-authentication
 licenses: []