omniauth-etrade 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 386beef791f783891844e963ac2ce7b6a634899f
-  data.tar.gz: 2d6041c347a70b0a8b09139d9714d602492c0759
+  metadata.gz: 75205eeaf38a8a968abb19ee94266286444bbece
+  data.tar.gz: d76032be348d24b3e7e8a4776e11c4a23c694e3b
 SHA512:
-  metadata.gz: 47209b5e279d7872c54df88a68070df31135dd6a7e4578c683027f94570637b4b7b1af0d966a84cf1a807f8406f4b1b96c8ddb3964cd477c4c7500991370fc86
-  data.tar.gz: 6ac4028328559dda45499e51bd909ec33cf3621a507a8977db90377e7dad28c07db09cd8672f47581e12b3db5006bdb76bdb2062051f269cb929d52ccf2f5b72
+  metadata.gz: 7597c7bb1b3601650cc7e1e25e7ab997cd23418e80ed6e980814b9c6f7f6d515f8b7cfcd526de7779315c000b016c5ca5d34f6f955b51350a291d3ae3b5ce8df
+  data.tar.gz: 34bf1d6abeaa1666db2bcd7d7db4f3ae4814874f22cc9768a85f981c0f891251ff19d995ee66db04d5304f5f985b67354b77c645948ad09b56f0b5eab6380dca

data/README.md

@@ -1,25 +1,50 @@
-<<<<<<< HEAD
 # Omniauth::Etrade
 
-TODO: Write a gem description
+This is the official OmniAuth strategy for authenticating with E*Trade's API. To use it, you'll need a consumer key and consumer secret which can be obtained from E*Trade (more information available at [developer.etrade.com](https://developer.etrade.com/))
 
 ## Installation
 
-Add this line to your application's Gemfile:
+Add the strategy to your application's Gemfile:
 
-    gem 'omniauth-etrade'
+```ruby
+gem 'omniauth-etrade'
+```
 
 And then execute:
 
-    $ bundle
+```ruby
+bundle
+```
 
 Or install it yourself as:
 
-    $ gem install omniauth-etrade
+```ruby
+gem install omniauth-etrade
+```
 
 ## Usage
 
-TODO: Write usage instructions here
+Once installation is complete. Integrate the strategy into your middleware:
+
+```ruby
+use OmniAuth::Builder do
+  provider :etrade, ENV['CONSUMER_KEY'], ENV['CONSUMER_SECRET']
+end
+```
+
+In Rails, you'll want to add to the middleware stack:
+
+```ruby
+Rails.application.config.middleware.use OmniAuth::Builder do
+  provider :etrade, ENV['CONSUMER_KEY'], ENV['CONSUMER_SECRET']
+end
+```
+
+If using devise, you'll want to declare provider in your config\initializers\devise.rb:
+
+```ruby
+config.omniauth :etrade, ENV['CONSUMER_KEY'], ENV['CONSUMER_SECRET']
+```
 
 ## Contributing
 
@@ -28,9 +53,3 @@ TODO: Write usage instructions here
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)
 5. Create new Pull Request
-=======
-omniauth-etrade
-===============
-
-OmniAuth strategy for etrade
->>>>>>> f25330067f94cde611f7e70695801b6da0fcda0a

data/lib/omniauth-etrade/version.rb

@@ -1,5 +1,5 @@
 module OmniAuth
   module Etrade
-    VERSION = "0.0.5"
+    VERSION = "0.0.6"
   end
 end

data/lib/omniauth/strategies/etrade.rb

@@ -3,83 +3,51 @@ require 'omniauth-oauth'
 module OmniAuth
   module Strategies
     class Etrade < OmniAuth::Strategies::OAuth
-      
+
       option :client_options, {
         :site               => 'https://etws.etrade.com',
         :authorize_url      => 'https://us.etrade.com/e/t/etws/authorize',
         :request_token_url  => 'https://etws.etrade.com/oauth/request_token',
-        :access_token_url   => 'https://etws.etrade.com/oauth/access_token'
+        :access_token_url   => 'https://etws.etrade.com/oauth/access_token',
+        # default http_method for oauth gem is post, however etrade requires this
+        # to be get
+        :http_method => :get
       }
 
       def callback_url
         'oob'
       end
-      
-      def request_phase
-         request_token = consumer.get_request_token({:oauth_callback => callback_url}, options.request_params)
-         session['oauth'] ||= {}
-         session['oauth'][name.to_s] = {'callback_confirmed' => request_token.callback_confirmed?, 'request_token' => request_token.token, 'request_secret' => request_token.secret}
-
-         if request_token.callback_confirmed?
-           redirect request_token.authorize_url({key: options.consumer_key}.merge(options[:authorize_params])).sub! 'oauth_token', 'token'
-         else
-           redirect request_token.authorize_url(options[:authorize_params].merge(oauth_callback: callback_url, key: options.consumer_key)).sub! 'oauth_token', 'token'
-         end
-
-       rescue ::Timeout::Error => e
-         fail!(:timeout, e)
-       rescue ::Net::HTTPFatalError, ::OpenSSL::SSL::SSLError => e
-         fail!(:service_unavailable, e)
-       end
-
-         def callback_phase
-           raise OmniAuth::NoSessionError.new("Session Expired") if session['oauth'].nil?
-
-           Rails.logger.debug(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'] }
+      def request_phase
+        begin
+          request_token = consumer.get_request_token({:oauth_callback => callback_url}, options.request_params)
+          session['oauth'] ||= {}
+          session['oauth'][name.to_s] = {'callback_confirmed' => request_token.callback_confirmed?,
+            'request_token' => request_token.token, 'request_secret' => request_token.secret}
+
+          Rails.logger.debug { "#{request_token.to_yaml}" }
+
+          if request_token.callback_confirmed?
+            redirect request_token.authorize_url({key: options.consumer_key}.merge(options[:authorize_params])).sub! 'oauth_token', 'token'
+          else
+            redirect request_token.authorize_url(
+              options[:authorize_params].merge(oauth_callback: callback_url, key: options.consumer_key)).sub! 'oauth_token', 'token'
+          end
+        rescue ::Timeout::Error => e
+          fail!(:timeout, e)
+        rescue ::Net::HTTPFatalError, ::OpenSSL::SSL::SSLError => e
+          fail!(:service_unavailable, e)
+        end
+      end
 
-      info do
-        {
-          'uid'   => raw_info['uid'],
-          'name'  => raw_info['display_name'],
-          'email' => raw_info['email']
-        }
+      def callback_phase
+        super
       end
 
       extra do
-        { 'raw_info' => raw_info }
+        { 'access_token' => access_token }
       end
 
-      def raw_info
-        Rails.logger.debug(access_token.to_yaml)
-        @raw_info ||= MultiJson.decode(access_token.get('/1/account/info').body)        
-      end
-    
     end
   end
-end
+end

data/omniauth-etrade.gemspec

@@ -8,7 +8,7 @@ Gem::Specification.new do |spec|
   spec.name          = "omniauth-etrade"
   spec.version       = OmniAuth::Etrade::VERSION
   spec.authors       = ["Athens Holloway"]
-  spec.email         = ["athens@uvest.co"]
+  spec.email         = ["athens@logicart.co"]
   spec.description   = %q{OmniAuth strategy of E*TRADE}
   spec.summary       = %q{OmniAuth strategy of E*TRADE}
   spec.homepage      = "https://github.com/uvest/omniauth-etrade"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-etrade
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Athens Holloway
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-25 00:00:00.000000000 Z
+date: 2014-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: omniauth
@@ -124,7 +124,7 @@ dependencies:
         version: '0'
 description: OmniAuth strategy of E*TRADE
 email:
-- athens@uvest.co
+- athens@logicart.co
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -159,7 +159,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.0.0
 signing_key: 
 specification_version: 4
 summary: OmniAuth strategy of E*TRADE