omniauth-etrade 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2a13b4faadfddfa04581b5d94cff2aba966a3e86
-  data.tar.gz: 08add985bb607cf701b7c6321fe297512dc43b63
+  metadata.gz: a3efa1508fa2d02bbfb4f09e8e466db7c2828e7c
+  data.tar.gz: 687d6e1fc20b4ae7a1eb2d0fd929d96b423cfba2
 SHA512:
-  metadata.gz: 761615071f5182cc940deffa694c033732884fcc6143fea7b59cac195b26903c707010c5ba28a1d8eabcbd3ee0c41996f4bf5926a3b02375f8b6fc4c2e44f0be
-  data.tar.gz: d30bbcb10c2defab5f110f9f611f9ca8d4c84f76a81905f2a7c441ac728b60b504c34089b8e0f414884ec87eb240a145315aaaaf8a0e39a59c65df60b278a27f
+  metadata.gz: 9b6734c8ddbb0e668f968f925d3da3967fda78492733daaa0ffe0f0e08fbc9aabb6979b766a7b62218aa5f299e61b1ca0b0fa74815353339025b2e5aebb4d24d
+  data.tar.gz: dcb7379f217fcebe6649ca85297cb8722420bb87b0000cfa075735c23905a1bf8c1a8ce1259cb09b3ec50d0fba2560702df0d169974db99427f95d6efa72cc54

data/lib/omniauth-etrade/version.rb

@@ -1,5 +1,5 @@
 module OmniAuth
   module Etrade
-    VERSION = "0.0.3"
+    VERSION = "0.0.4"
   end
 end

data/lib/omniauth/strategies/etrade.rb

@@ -32,7 +32,34 @@ module OmniAuth
          fail!(:service_unavailable, e)
        end
 
-      
+         def callback_phase
+           raise OmniAuth::NoSessionError.new("Session Expired") if session['oauth'].nil?
+
+           Rails.logger.debugger(session['oauth'].to_yaml)
+
+           request_token = ::OAuth::RequestToken.new(consumer, session['oauth'][name.to_s].delete('request_token'), session['oauth'][name.to_s].delete('request_secret'))
+
+           opts = {}
+           if session['oauth'][name.to_s]['callback_confirmed']
+             opts[:oauth_verifier] = request['oauth_verifier']
+           else
+             opts[:oauth_callback] = callback_url
+           end
+
+           @access_token = request_token.get_access_token(opts)
+
+         super
+       rescue ::Timeout::Error => e
+         fail!(:timeout, e)
+       rescue ::Net::HTTPFatalError, ::OpenSSL::SSL::SSLError => e
+         fail!(:service_unavailable, e)
+       rescue ::OAuth::Unauthorized => e
+         fail!(:invalid_credentials, e)
+       rescue ::MultiJson::DecodeError => e
+         fail!(:invalid_response, e)
+       rescue ::OmniAuth::NoSessionError => e
+         fail!(:session_expired, e)
+       end
       
       uid { raw_info['uid'] }
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-etrade
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Athens Holloway
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-24 00:00:00.000000000 Z
+date: 2013-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: omniauth