oa-oauth 0.2.6 → 0.3.0.rc3

data/lib/omniauth/strategies/{twitter.rb → oauth/twitter.rb}

@@ -3,39 +3,38 @@ require 'multi_json'
 
 module OmniAuth
   module Strategies
-    #
     # Authenticate to Twitter via OAuth and retrieve basic
     # user information.
     #
     # Usage:
-    #
     #    use OmniAuth::Strategies::Twitter, 'consumerkey', 'consumersecret'
-    #
     class Twitter < OmniAuth::Strategies::OAuth
       # Initialize the middleware
       #
       # @option options [Boolean, true] :sign_in When true, use the "Sign in with Twitter" flow instead of the authorization flow.
-      def initialize(app, consumer_key = nil, consumer_secret = nil, options = {}, &block)
+      def initialize(app, consumer_key=nil, consumer_secret=nil, options={}, &block)
         client_options = {
-          :site => 'https://api.twitter.com'
+          :site => 'https://api.twitter.com',
         }
-
         options[:authorize_params] = {:force_login => 'true'} if options.delete(:force_login) == true
-        client_options[:authorize_path] = '/oauth/authenticate' unless options[:sign_in] == false
-        super(app, :twitter, consumer_key, consumer_secret, client_options, options)
+        client_options[:authorize_path] = '/oauth/authorize' unless options[:sign_in] == false
+        super(app, options[:name] || :twitter, consumer_key, consumer_secret, client_options, options, &block)
       end
 
       def auth_hash
-        OmniAuth::Utils.deep_merge(super, {
-          'uid' => @access_token.params[:user_id],
-          'user_info' => user_info,
-          'extra' => {'user_hash' => user_hash}
-        })
+        OmniAuth::Utils.deep_merge(
+          super, {
+            'uid' => @access_token.params[:user_id],
+            'user_info' => user_info,
+            'extra' => {
+              'user_hash' => user_hash,
+            },
+          }
+        )
       end
 
       def user_info
         user_hash = self.user_hash
-
         {
           'nickname' => user_hash['screen_name'],
           'name' => user_hash['name'] || user_hash['screen_name'],
@@ -44,13 +43,15 @@ module OmniAuth
           'description' => user_hash['description'],
           'urls' => {
             'Website' => user_hash['url'],
-            'Twitter' => 'http://twitter.com/' + user_hash['screen_name']
-          }
+            'Twitter' => 'http://twitter.com/' + user_hash['screen_name'],
+          },
         }
       end
 
       def user_hash
         @user_hash ||= MultiJson.decode(@access_token.get('/1/account/verify_credentials.json').body)
+      rescue ::Errno::ETIMEDOUT
+        raise ::Timeout::Error
       end
     end
   end

data/lib/omniauth/strategies/{type_pad.rb → oauth/type_pad.rb}

@@ -3,56 +3,53 @@ require 'multi_json'
 
 module OmniAuth
   module Strategies
-    #
     # Authenticate to Typepad via OAuth and retrieve basic
     # user information.
     #
     # Usage:
-    #
     #    use OmniAuth::Strategies::Typepad, 'consumerkey', 'consumersecret', :application_id => 'my_type_pad_application_id'
-    #
     #    application_id is required.
-    #
     class TypePad < OmniAuth::Strategies::OAuth
-      def initialize(app, consumer_key = nil, consumer_secret = nil, options = {}, &block)
-
+      def initialize(app, consumer_key=nil, consumer_secret=nil, options={}, &block)
         # TypePad uses the application ID for one of the OAuth paths.
         app_id = options[:application_id]
-
         client_options = {
-          :site => 'https://www.typepad.com',
-          :request_token_path => '/secure/services/oauth/request_token',
           :access_token_path => '/secure/services/oauth/access_token',
           :authorize_path => "/secure/services/api/#{app_id}/oauth-approve",
           :http_method => :get,
           # You *must* use query_string for the token dance.
-          :scheme => :query_string
+          :scheme => :query_string,
+          :site => 'https://www.typepad.com',
+          :request_token_path => '/secure/services/oauth/request_token',
         }
-
         options.merge! :scheme => :query_string, :http_method => :get
-
-        super(app, :type_pad, consumer_key, consumer_secret, client_options, options)
+        super(app, :type_pad, consumer_key, consumer_secret, client_options, options, &block)
       end
 
       def auth_hash
         ui = user_info
-        OmniAuth::Utils.deep_merge(super, {
-          'uid' => ui['uid'],
-          'user_info' => ui,
-          'extra' => {'user_hash' => user_hash}
-        })
+        OmniAuth::Utils.deep_merge(
+          super, {
+            'uid' => ui['uid'],
+            'user_info' => ui,
+            'extra' => {
+              'user_hash' => user_hash,
+            },
+          }
+        )
       end
 
       def user_info
         user_hash = self.user_hash
-
         {
           'uid' => user_hash['urlId'],
           'nickname' => user_hash['preferredUsername'],
           'name' => user_hash['displayName'],
           'image' => user_hash['avatarLink']['url'],
           'description' => user_hash['aboutMe'],
-          'urls' => {'Profile' => user_hash['profilePageUrl']}
+          'urls' => {
+            'Profile' => user_hash['profilePageUrl'],
+          },
         }
       end
 
@@ -62,13 +59,7 @@ module OmniAuth
         # 'Unauthorized' is the response body of a truly unauthorized request.
 
         # Also note that API requests hit a different site than the OAuth dance.
-        r = self.consumer.request(
-              :get,
-              "https://api.typepad.com/users/@self.json",
-              @access_token,
-              :scheme => 'header'
-            )
-
+        r = self.consumer.request(:get, 'https://api.typepad.com/users/@self.json', @access_token, :scheme => 'header')
         @user_hash ||= MultiJson.decode(r.body)
       end
     end

data/lib/omniauth/strategies/{vimeo.rb → oauth/vimeo.rb}

@@ -11,23 +11,27 @@ module OmniAuth
     #    use OmniAuth::Strategies::Vimeo, 'consumerkey', 'consumersecret'
     #
     class Vimeo < OmniAuth::Strategies::OAuth
-      def initialize(app, consumer_key = nil, consumer_secret = nil, options = {}, &block)
-        opts = {
-          :site               => 'http://vimeo.com',
+      def initialize(app, consumer_key=nil, consumer_secret=nil, options={}, &block)
+        client_options = {
+          :access_token_path => '/oauth/access_token',
+          :authorize_path => '/oauth/authorize',
           :request_token_path => '/oauth/request_token',
-          :access_token_path  => '/oauth/access_token',
-          :authorize_path     => '/oauth/authorize'
+          :site => 'http://vimeo.com',
         }
-        super(app, :vimeo, consumer_key, consumer_secret, opts, options, &block)
+        super(app, :vimeo, consumer_key, consumer_secret, client_options, options, &block)
       end
 
       def auth_hash
         user = user_hash['person']
-        OmniAuth::Utils.deep_merge(super, {
-          'uid' => user['id'],
-          'user_info' => user_info,
-          'extra' => { 'user_hash' => user }
-        })
+        OmniAuth::Utils.deep_merge(
+          super, {
+            'uid' => user['id'],
+            'user_info' => user_info,
+            'extra' => {
+              'user_hash' => user,
+            },
+          }
+        )
       end
 
       def user_info
@@ -40,13 +44,13 @@ module OmniAuth
           'image' => user['portraits']['portrait'].select{|h| h['height'] == '300'}.first['_content'],
           'urls' => {
             'website' => user['url'],
-            'vimeo' => user['profileurl']
-          }
+            'vimeo' => user['profileurl'],
+          },
         }
       end
 
       def user_hash
-        url = "http://vimeo.com/api/rest/v2?method=vimeo.people.getInfo&format=json"
+        url = 'http://vimeo.com/api/rest/v2?method=vimeo.people.getInfo&format=json'
         @user_hash ||= MultiJson.decode(@access_token.get(url).body)
       end
     end

data/lib/omniauth/strategies/{yahoo.rb → oauth/yahoo.rb}

@@ -12,24 +12,27 @@ module OmniAuth
     #    use OmniAuth::Strategies::Yahoo, 'consumerkey', 'consumersecret'
     #
     class Yahoo < OmniAuth::Strategies::OAuth
-      def initialize(app, consumer_key = nil, consumer_secret = nil, options = {}, &block)
+      def initialize(app, consumer_key=nil, consumer_secret=nil, options={}, &block)
         client_options = {
-          :site => 'https://api.login.yahoo.com',
-          :request_token_path => '/oauth/v2/get_request_token',
           :access_token_path => '/oauth/v2/get_token',
-          :authorize_path => "/oauth/v2/request_auth"
+          :authorize_path => '/oauth/v2/request_auth',
+          :request_token_path => '/oauth/v2/get_request_token',
+          :site => 'https://api.login.yahoo.com',
         }
-
-        super(app, :yahoo, consumer_key, consumer_secret, client_options, options)
+        super(app, :yahoo, consumer_key, consumer_secret, client_options, options, &block)
       end
 
       def auth_hash
         ui = user_info
-        OmniAuth::Utils.deep_merge(super, {
-          'uid' => ui['uid'],
-          'user_info' => ui,
-          'extra' => {'user_hash' => user_hash}
-        })
+        OmniAuth::Utils.deep_merge(
+          super, {
+            'uid' => ui['uid'],
+            'user_info' => ui,
+            'extra' => {
+              'user_hash' => user_hash,
+            },
+          }
+        )
       end
 
       def user_info
@@ -42,7 +45,9 @@ module OmniAuth
           'name' => profile['givenName'] || nickname,
           'image' => profile['image']['imageUrl'],
           'description' => profile['message'],
-          'urls' => {'Profile' => profile['profileUrl'] }
+          'urls' => {
+            'Profile' => profile['profileUrl'],
+          },
         }
       end
 

data/lib/omniauth/strategies/{yammer.rb → oauth/yammer.rb}

@@ -4,23 +4,26 @@ require 'multi_json'
 module OmniAuth
   module Strategies
     class Yammer < OmniAuth::Strategies::OAuth
-      def initialize(app, consumer_key = nil, consumer_secret = nil, options = {}, &block)
+      def initialize(app, consumer_key=nil, consumer_secret=nil, options={}, &block)
         client_options = {
-          :site => 'https://www.yammer.com',
-          :request_token_path => '/oauth/request_token',
           :access_token_path => '/oauth/access_token',
-          :authorize_path => "/oauth/authorize"
+          :authorize_path => '/oauth/authorize',
+          :request_token_path => '/oauth/request_token',
+          :site => 'https://www.yammer.com',
         }
-
-        super(app, :yammer, consumer_key, consumer_secret, client_options, options)
+        super(app, :yammer, consumer_key, consumer_secret, client_options, options, &block)
       end
 
       def auth_hash
-        OmniAuth::Utils.deep_merge(super, {
-          'uid' => user_hash['id'],
-          'user_info' => user_info,
-          'extra' => {'user_hash' => user_hash}
-        })
+        OmniAuth::Utils.deep_merge(
+          super, {
+            'uid' => user_hash['id'],
+            'user_info' => user_info,
+            'extra' => {
+              'user_hash' => user_hash,
+            },
+          }
+        )
       end
 
       def user_info
@@ -31,7 +34,9 @@ module OmniAuth
           'location' => user_hash['location'],
           'image' => user_hash['mugshot-url'],
           'description' => user_hash['job-title'],
-          'urls' => {'Yammer' => user_hash['web-url']}
+          'urls' => {
+            'Yammer' => user_hash['web-url'],
+          },
         }
       end
 

data/lib/omniauth/strategies/{you_tube.rb → oauth/you_tube.rb}

@@ -1,5 +1,4 @@
 # Based heavily on the Google strategy, monkeypatch and all
-
 require 'omniauth/oauth'
 require 'multi_json'
 
@@ -13,24 +12,27 @@ module OmniAuth
     #    use OmniAuth::Strategies::YouTube, 'consumerkey', 'consumersecret'
     #
     class YouTube < OmniAuth::Strategies::OAuth
-      def initialize(app, consumer_key = nil, consumer_secret = nil, options = {}, &block)
+      def initialize(app, consumer_key=nil, consumer_secret=nil, options={}, &block)
         client_options = {
-          :site => 'https://www.google.com',
-          :request_token_path => '/accounts/OAuthGetRequestToken',
           :access_token_path => '/accounts/OAuthGetAccessToken',
-          :authorize_path => '/accounts/OAuthAuthorizeToken'
+          :authorize_path => '/accounts/OAuthAuthorizeToken',
+          :request_token_path => '/accounts/OAuthGetRequestToken',
+          :site => 'https://www.google.com',
         }
-
-        super(app, :you_tube, consumer_key, consumer_secret, client_options, options)
+        super(app, :you_tube, consumer_key, consumer_secret, client_options, options, &block)
       end
 
       def auth_hash
         ui = user_info
-        OmniAuth::Utils.deep_merge(super, {
-          'uid' => ui['uid'],
-          'user_info' => ui,
-          'extra' => {'user_hash' => user_hash}
-        })
+        OmniAuth::Utils.deep_merge(
+          super, {
+            'uid' => ui['uid'],
+            'user_info' => ui,
+            'extra' => {
+              'user_hash' => user_hash,
+            },
+          }
+        )
       end
 
       def user_info
@@ -42,14 +44,14 @@ module OmniAuth
           'last_name' => entry['yt$lastName'] && entry['yt$lastName']['$t'],
           'image' => entry['media$thumbnail'] && entry['media$thumbnail']['url'],
           'description' => entry['yt$description'] && entry['yt$description']['$t'],
-          'location' => entry['yt$location'] && entry['yt$location']['$t']
+          'location' => entry['yt$location'] && entry['yt$location']['$t'],
         }
       end
 
       def user_hash
         # YouTube treats 'default' as the currently logged-in user
         # via http://apiblog.youtube.com/2010/11/update-to-clientlogin-url.html
-        @user_hash ||= MultiJson.decode(@access_token.get("http://gdata.youtube.com/feeds/api/users/default?alt=json").body)
+        @user_hash ||= MultiJson.decode(@access_token.get('http://gdata.youtube.com/feeds/api/users/default?alt=json').body)
       end
 
       # Monkeypatch consumer.get_request_token but specify YouTube scope rather than Google Contacts

data/lib/omniauth/strategies/oauth2.rb

@@ -37,7 +37,7 @@ module OmniAuth
       # @param [String] client_id the client/application ID of this provider
       # @param [String] client_secret the client/application secret of this provider
       # @param [Hash] options that will be passed through to the OAuth2::Client (see [oauth2 docs](http://rubydoc.info/gems/oauth2))
-      def initialize(app, name, client_id = nil, client_secret = nil, client_options = {}, options = {}, &block)
+      def initialize(app, name, client_id=nil, client_secret=nil, client_options={}, options={}, &block)
         self.client_id = client_id
         self.client_secret = client_secret
         self.client_options = client_options
@@ -55,7 +55,7 @@ module OmniAuth
       protected
 
       def request_phase
-        redirect client.web_server.authorize_url({:redirect_uri => callback_url}.merge(options))
+        redirect client.auth_code.authorize_url({:redirect_uri => callback_url}.merge(options))
       end
 
       def callback_phase
@@ -64,10 +64,10 @@ module OmniAuth
         end
 
         @access_token = build_access_token
-        @access_token = client.web_server.refresh_access_token(@access_token.refresh_token) if @access_token.expired?
+        @access_token = client.auth_code.refresh_token(@access_token.refresh_token) if @access_token.expired?
 
         super
-      rescue ::OAuth2::HTTPError, ::OAuth2::AccessDenied, CallbackError => e
+      rescue ::OAuth2::Error, CallbackError => e
         fail!(:invalid_credentials, e)
       rescue ::MultiJson::DecodeError => e
         fail!(:invalid_response, e)
@@ -77,7 +77,9 @@ module OmniAuth
 
       def build_access_token
         verifier = request.params['code']
-        client.web_server.get_access_token(verifier, {:redirect_uri => callback_url}.merge(options))
+        client.auth_code.get_token(verifier, {:redirect_uri => callback_url}.merge(options))
+      rescue ::OAuth2::Error => e
+        raise e.response.inspect
       end
 
       def auth_hash

data/lib/omniauth/strategies/oauth2/angellist.rb

@@ -0,0 +1,57 @@
+require 'omniauth/oauth'
+require 'multi_json'
+
+module OmniAuth
+  module Strategies
+    # Authenticate to AngelList utilizing OAuth 2.0 and retrieve
+    # basic user information.
+    #
+    # @example Basic Usage
+    #     use OmniAuth::Strategies::AngelList, 'API Key', 'Secret Key'
+    class AngelList < OmniAuth::Strategies::OAuth2
+      # @param [Rack Application] app standard middleware application parameter
+      # @param [String] client_id the application id as [registered on AngelList](http://angel.co/api/oauth/faq)
+      # @param [String] client_secret the application secret as [registered on AngelList](http://bit.ly/api/oauth/faq )
+      def initialize(app, client_id=nil, client_secret=nil, options={}, &block)
+        client_options = {
+          :site => 'https://api.angel.co/',
+          :authorize_url => 'https://angel.co/api/oauth/authorize',
+          :token_url => 'https://angel.co/api/oauth/token'
+        }
+
+        super(app, :angellist, client_id, client_secret, client_options, options, &block)
+      end
+
+      def auth_hash
+        OmniAuth::Utils.deep_merge(
+          super, {
+            'uid' => user_data['id'],
+            'user_info' => user_info,
+            'extra' => {
+              'user_hash' => user_data,
+            }
+          }
+        )
+      end
+
+      def user_info
+        {
+          'name' => user_data['name'],
+          'bio' => user_data['bio'],
+          'image' => user_data['image'],
+          'urls' => {
+            'AngelList' => user_data['angellist_url'],
+            'Website' => user_data['online_bio_url']
+          },
+        }
+      end
+
+      def user_data
+        @data ||= begin
+          @access_token.options[:mode] = :query
+          @access_token.get('/1/me').parsed
+        end
+      end
+    end
+  end
+end