oa-oauth 0.2.6 → 0.3.0.rc3

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

@@ -0,0 +1,43 @@
+require 'omniauth/oauth'
+require 'multi_json'
+
+module OmniAuth
+  module Strategies
+    # Authenticate to Bitly utilizing OAuth 2.0 and retrieve
+    # basic user information.
+    #
+    # @example Basic Usage
+    #     use OmniAuth::Strategies::Bitly, 'API Key', 'Secret Key'
+    class Bitly < OmniAuth::Strategies::OAuth2
+      # @param [Rack Application] app standard middleware application parameter
+      # @param [String] client_id the application id as [registered on Bitly](http://bit.ly/a/account)
+      # @param [String] client_secret the application secret as [registered on Bitly](http://bit.ly/a/account)
+      def initialize(app, client_id=nil, client_secret=nil, options={}, &block)
+        client_options = {
+          :authorize_url => 'https://bit.ly/oauth/authorize',
+          :token_url => 'https://api-ssl.bit.ly/oauth/access_token',
+        }
+        super(app, :bitly, client_id, client_secret, client_options, options, &block)
+      end
+
+      def auth_hash
+        OmniAuth::Utils.deep_merge(
+          super, {
+            'uid' => @access_token['login'],
+            'user_info' => user_data,
+            'extra' => {
+              'user_hash' => user_data,
+            },
+          }
+        )
+      end
+
+      def user_data
+        {
+          'login' => @access_token['login'],
+          'client_id' => @access_token['apiKey'],
+        }
+      end
+    end
+  end
+end

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

@@ -0,0 +1,54 @@
+require 'omniauth/oauth'
+require 'multi_json'
+
+module OmniAuth
+  module Strategies
+    # Authenticate to Cobot utilizing OAuth 2.0 and retrieve
+    # basic user information.
+    #
+    # @example Basic Usage
+    #     use OmniAuth::Strategies::Cobot, 'Client ID', 'Client Secret'
+    class Cobot < OmniAuth::Strategies::OAuth2
+      # @param [Rack Application] app standard middleware application parameter
+      # @param [String] client_id the application id as [registered on Cobot](https://www.cobot.me/oauth2_clients)
+      # @param [String] client_secret the application secret as [registered on Cobot](https://www.cobot.me/oauth2_clients)
+      def initialize(app, client_id=nil, client_secret=nil, options={}, &block)
+        client_options = {
+          :authorize_url => 'https://www.cobot.me/oauth2/authorize',
+          :token_url => 'https://www.cobot.me/oauth2/access_token'
+        }
+        super(app, :cobot, client_id, client_secret, client_options, {:scope => 'read write'}.merge(options), &block)
+      end
+
+      def auth_hash
+        OmniAuth::Utils.deep_merge(
+          super, {
+            'uid' => user_data['login'],
+            'user_info' => user_info,
+            'extra' => {
+              'user_hash' => user_data,
+            }
+          }
+        )
+      end
+
+      def user_data
+        @data ||= MultiJson.decode(@access_token.get('https://www.cobot.me/api/user').body)
+      end
+
+      # OAuth2 by default uses 'Bearer %s' in the header
+      def build_access_token
+        access_token = super
+        access_token.options[:header_format] = "OAuth %s"
+        access_token
+      end
+
+      def user_info
+        {
+          'name'  => user_data['login'],
+          'email' => user_data['email']
+        }
+      end
+    end
+  end
+end

data/lib/omniauth/strategies/{dailymile.rb → oauth2/dailymile.rb}

@@ -3,30 +3,37 @@ require 'multi_json'
 
 module OmniAuth
   module Strategies
-    #
     # Authenticate to DailyMile utilizing OAuth 2.0 and retrieve
     # basic user information.
     #
     # @example Basic Usage
-    #     use OmniAuth::Strategies::DailyMile, 'CLIENT_ID', 'CLIENT_SECRET'
-    class Dailymile < OAuth2
+    #     use OmniAuth::Strategies::DailyMile, 'client_id', 'CLIENT_SECRET'
+    class Dailymile < OmniAuth::Strategies::OAuth2
       # @param [Rack Application] app standard middleware application parameter
       # @param [String] client_id the application id as [registered on Dailymile](http://www.dailymile.com/api/consumers/new)
       # @param [String] cliend_secret the application secret as [registered on Dailymile](http://www.dailymile.com/api/consumers/new)
-      def initialize(app, client_id = nil, client_secret = nil, options = {}, &block)
+      def initialize(app, client_id=nil, client_secret=nil, options={}, &block)
         client_options = {
-          :site => 'https://api.dailymile.com/oauth',
-          :authorize_path => '/oauth/authorize',
-          :access_token_path => '/oauth/token'
+          :authorize_url => 'https://api.dailymile.com/oauth/authorize',
+          :token_url => 'https://api.dailymile.com/oauth/token',
         }
-
         super(app, :dailymile, client_id, client_secret, client_options, options, &block)
       end
 
-      protected
+      def auth_hash
+        OmniAuth::Utils.deep_merge(
+          super, {
+            'uid' => user_data['url'].split('/').last,
+            'user_info' => user_info,
+            'extra' => {
+              'user_hash' => user_data,
+            },
+          }
+        )
+      end
 
       def user_data
-        @data ||= MultiJson.decode(@access_token.get("/people/me.json"))
+        @data ||= MultiJson.decode(@access_token.get('/people/me.json'))
       end
 
       def request_phase
@@ -47,18 +54,10 @@ module OmniAuth
           'image' => user_data['photo_url'],
           'description' => user_data['goal'],
           'urls' => {
-            'dailymile' => user_data['url']
-          }
+            'dailymile' => user_data['url'],
+          },
         }
       end
-
-      def auth_hash
-        OmniAuth::Utils.deep_merge(super, {
-          'uid' => user_data["url"].split('/').last,
-          'user_info' => user_info,
-          'extra' => {'user_hash' => user_data}
-        })
-      end
     end
   end
 end

data/lib/omniauth/strategies/{doit.rb → oauth2/doit.rb}

@@ -3,25 +3,33 @@ require 'multi_json'
 
 module OmniAuth
   module Strategies
-    class Doit < OAuth2
-      def initialize(app, consumer_key = nil, consumer_secret = nil, options = {}, &block)
+    class Doit < OmniAuth::Strategies::OAuth2
+      def initialize(app, client_id=nil, client_secret=nil, options={}, &block)
         client_options = {
-          :site => 'https://openapi.doit.im',
           :authorize_url => 'https://openapi.doit.im/oauth/authorize',
-          :access_token_url => 'https://openapi.doit.im/oauth/access_token'
+          :token_url => 'https://openapi.doit.im/oauth/access_token',
         }
-
-        super(app, :doit, consumer_key, consumer_secret, client_options, options, &block)
+        super(app, :doit, client_id, client_secret, client_options, options, &block)
       end
 
-      protected
+      def auth_hash
+        OmniAuth::Utils.deep_merge(
+          super, {
+            'uid' => user_data['id'],
+            'user_info' => user_info,
+            'extra' => {
+              'user_hash' => user_data,
+            },
+          }
+        )
+      end
 
       def user_data
-        @data ||= MultiJson.decode(@access_token.get(client.site+"/v1/settings"),{'Authorization'=> 'OAuth'+@access_token.token})
+        @data ||= MultiJson.decode(@access_token.get('https://openapi.doit.im/v1/settings'), {'Authorization' => 'OAuth' + @access_token.token})
       end
 
       def request_phase
-        options[:response_type] ||= "code"
+        options[:response_type] ||= 'code'
         super
       end
 
@@ -44,17 +52,9 @@ module OmniAuth
           'user_timezone'=> user_data['user_timezone'],
           'remind_email'=> user_data['remind_email'],
           'created'=> user_data['created'],
-          'updated'=> user_data['updated']
+          'updated'=> user_data['updated'],
         }
       end
-
-      def auth_hash
-        OmniAuth::Utils.deep_merge(super, {
-          'uid' => user_data['id'],
-          'user_info' => user_info,
-          'extra' => {'user_hash' => user_data}
-        })
-      end
     end
   end
 end

data/lib/omniauth/strategies/{facebook.rb → oauth2/facebook.rb}

@@ -8,21 +8,46 @@ module OmniAuth
     #
     # @example Basic Usage
     #   use OmniAuth::Strategies::Facebook, 'client_id', 'client_secret'
-    class Facebook < OAuth2
+    class Facebook < OmniAuth::Strategies::OAuth2
       # @param [Rack Application] app standard middleware application parameter
       # @param [String] client_id the application id as [registered on Facebook](http://www.facebook.com/developers/)
       # @param [String] client_secret the application secret as registered on Facebook
       # @option options [String] :scope ('email,offline_access') comma-separated extended permissions such as `email` and `manage_pages`
-      def initialize(app, client_id = nil, client_secret = nil, options = {}, &block)
-        super(app, :facebook, client_id, client_secret, {:site => 'https://graph.facebook.com/'}, options, &block)
+      def initialize(app, client_id=nil, client_secret=nil, options = {}, &block)
+        client_options = {
+          :site => 'https://graph.facebook.com/',
+          :token_url => '/oauth/access_token'
+        }
+
+        options = {
+          :parse => :query
+        }.merge(options)
+
+        super(app, :facebook, 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_data
-        @data ||= MultiJson.decode(@access_token.get('/me', {}, { "Accept-Language" => "en-us,en;"}))
+        @access_token.options[:mode] = :query
+        @access_token.options[:param_name] = 'access_token'
+        @data ||= @access_token.get('/me').parsed
+      rescue ::OAuth2::Error => e
+        raise e.response.inspect
       end
 
       def request_phase
-        options[:scope] ||= "email,offline_access"
+        options[:scope] ||= 'email,offline_access'
         super
       end
 
@@ -30,7 +55,7 @@ module OmniAuth
         if facebook_session.nil? || facebook_session.empty?
           super
         else
-          @access_token = ::OAuth2::AccessToken.new(client, facebook_session['access_token'])
+          @access_token = ::OAuth2::AccessToken.new(client, facebook_session['access_token'], {:mode => :query, :param_name => 'access_token'})
         end
       end
 
@@ -45,26 +70,18 @@ module OmniAuth
 
       def user_info
         {
-          'nickname' => user_data["username"],
-          'email' => (user_data["email"] if user_data["email"]),
-          'first_name' => user_data["first_name"],
-          'last_name' => user_data["last_name"],
+          'nickname' => user_data['username'],
+          'email' => (user_data['email'] if user_data['email']),
+          'first_name' => user_data['first_name'],
+          'last_name' => user_data['last_name'],
           'name' => "#{user_data['first_name']} #{user_data['last_name']}",
           'image' => "http://graph.facebook.com/#{user_data['id']}/picture?type=square",
           'urls' => {
-            'Facebook' => user_data["link"],
-            'Website' => user_data["website"],
-          }
+            'Facebook' => user_data['link'],
+            'Website' => user_data['website'],
+          },
         }
       end
-
-      def auth_hash
-        OmniAuth::Utils.deep_merge(super, {
-          'uid' => user_data['id'],
-          'user_info' => user_info,
-          'extra' => {'user_hash' => user_data}
-        })
-      end
     end
   end
 end

data/lib/omniauth/strategies/{foursquare.rb → oauth2/foursquare.rb}

@@ -3,18 +3,30 @@ require 'multi_json'
 
 module OmniAuth
   module Strategies
-    class Foursquare < OAuth2
+    class Foursquare < OmniAuth::Strategies::OAuth2
       # Initialize the middleware
       #
       # @option options [Boolean, true] :sign_in When true, use a sign-in flow instead of the authorization flow.
       # @option options [Boolean, false] :mobile When true, use the mobile sign-in interface.
-      def initialize(app, client_id = nil, client_secret = nil, options = {}, &block)
+      def initialize(app, client_id=nil, client_secret=nil, options={}, &block)
         options[:sign_in] ||= true
-        super(app, :foursquare, client_id, client_secret, {
-          :site => "https://api.foursquare.com/v2",
-          :authorize_url      => authorize_url(options),
-          :access_token_url   => "https://foursquare.com/oauth2/access_token"
-        }, options, &block)
+        client_options = {
+          :authorize_url => authorize_url(options),
+          :token_url => 'https://foursquare.com/oauth2/access_token',
+        }
+        super(app, :foursquare, client_id, client_secret, client_options, options, &block)
+      end
+
+      def auth_hash
+        OmniAuth::Utils.deep_merge(
+          super, {
+            'uid' => user_data['response']['user']['id'],
+            'user_info' => user_info,
+            'extra' => {
+              'user_hash' => user_data['response']['user'],
+            },
+          }
+        )
       end
 
       def authorize_url(options)
@@ -22,7 +34,7 @@ module OmniAuth
       end
 
       def user_data
-        @data ||= MultiJson.decode(@access_token.get(client.site+'/users/self', {'oauth_token' => @access_token.token}))
+        @data ||= MultiJson.decode(@access_token.get('https://api.foursquare.com/v2/users/self', { :params => { 'oauth_token' => @access_token.token } }).body)
       end
 
       def request_phase
@@ -42,21 +54,10 @@ module OmniAuth
           'last_name' => user_data['response']['user']['lastName'],
           'email' => user_data['response']['user']['contact']['email'],
           'name' => "#{user_data['response']['user']['firstName']} #{user_data['response']['user']['lastName']}".strip,
-        # 'location' => user_data['response']['user']['location'],
           'image' => user_data['response']['user']['photo'],
-        # 'description' => user_data['response']['user']['description'],
           'phone' => user_data['response']['user']['contact']['phone'],
-          'urls' => {}
         }
       end
-
-      def auth_hash
-        OmniAuth::Utils.deep_merge(super, {
-          'uid' => user_data['response']['user']['id'],
-          'user_info' => user_info,
-          'extra' => {'user_hash' => user_data['response']['user']}
-        })
-      end
     end
   end
 end

data/lib/omniauth/strategies/{github.rb → oauth2/github.rb}

@@ -6,45 +6,47 @@ module OmniAuth
     # OAuth 2.0 based authentication with GitHub. In order to
     # sign up for an application, you need to [register an application](http://github.com/account/applications/new)
     # and provide the proper credentials to this middleware.
-    class GitHub < OAuth2
+    class GitHub < OmniAuth::Strategies::OAuth2
       # @param [Rack Application] app standard middleware application argument
       # @param [String] client_id the application ID for your client
       # @param [String] client_secret the application secret
-      def initialize(app, client_id = nil, client_secret = nil, options = {}, &block)
+      def initialize(app, client_id=nil, client_secret=nil, options={}, &block)
         client_options = {
-          :site => 'https://github.com/',
-          :authorize_path => '/login/oauth/authorize',
-          :access_token_path => '/login/oauth/access_token'
+          :site => 'https://api.github.com',
+          :authorize_url => 'https://github.com/login/oauth/authorize',
+          :token_url => 'https://github.com/login/oauth/access_token'
         }
-
         super(app, :github, client_id, client_secret, client_options, options, &block)
       end
 
-      protected
+      def auth_hash
+        OmniAuth::Utils.deep_merge(
+          super, {
+            'uid' => user_data['id'],
+            'user_info' => user_info,
+            'extra' => {
+              'user_hash' => user_data,
+            },
+          }
+        )
+      end
 
       def user_data
-        @data ||= MultiJson.decode(@access_token.get('/api/v2/json/user/show'))['user']
+        @access_token.options[:mode] = :query
+        @data ||= @access_token.get('/user').parsed
       end
 
       def user_info
         {
-          'nickname' => user_data["login"],
+          'nickname' => user_data['login'],
           'email' => user_data['email'],
           'name' => user_data['name'],
           'urls' => {
             'GitHub' => "http://github.com/#{user_data['login']}",
-            'Blog' => user_data["blog"],
-          }
+            'Blog' => user_data['blog'],
+          },
         }
       end
-
-      def auth_hash
-        OmniAuth::Utils.deep_merge(super, {
-          'uid' => user_data['id'],
-          'user_info' => user_info,
-          'extra' => {'user_hash' => user_data}
-        })
-      end
     end
   end
 end