oa-oauth 0.2.6 → 0.3.0.rc3

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

@@ -3,41 +3,45 @@ require 'multi_json'
 
 module OmniAuth
   module Strategies
-    #
     # Authenticate to Identica via OAuth and retrieve basic
     # user information.
     #
     # Usage:
-    #
     #    use OmniAuth::Strategies::Identica, 'consumerkey', 'consumersecret'
-    #
     class Identica < OmniAuth::Strategies::OAuth
-      def initialize(app, consumer_key = nil, consumer_secret = nil, options = {}, &block)
-        super(app, :identica, consumer_key, consumer_secret,
-                {:site => 'http://identi.ca',
-                :request_token_path => "/api/oauth/request_token",
-                :access_token_path  => "/api/oauth/access_token",
-                :authorize_path     => "/api/oauth/authorize"}, options, &block)
+      def initialize(app, consumer_key=nil, consumer_secret=nil, options={}, &block)
+        client_options = {
+          :access_token_path => '/api/oauth/access_token',
+          :authorize_path => '/api/oauth/authorize',
+          :request_token_path => '/api/oauth/request_token',
+          :site => 'http://identi.ca',
+        }
+        super(app, :identica, 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
         user_hash = self.user_hash
-
         {
           'nickname' => user_hash['screen_name'],
           'name' => user_hash['name'],
           'location' => user_hash['location'],
           'image' => user_hash['profile_image_url'],
           'description' => user_hash['description'],
-          'urls' => {'Website' => user_hash['url']}
+          'urls' => {
+            'Website' => user_hash['url'],
+          },
         }
       end
 

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

@@ -4,27 +4,27 @@ require 'omniauth/oauth'
 module OmniAuth
   module Strategies
     class LinkedIn < 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.linkedin.com',
-          :request_token_path => '/uas/oauth/requestToken',
           :access_token_path => '/uas/oauth/accessToken',
           :authorize_path => '/uas/oauth/authorize',
-          :scheme => :header
+          :request_token_path => '/uas/oauth/requestToken',
+          :scheme => :header,
+          :site => 'https://api.linkedin.com',
         }
-
         client_options[:authorize_path] = '/uas/oauth/authenticate' unless options[:sign_in] == false
-
         super(app, :linked_in, consumer_key, consumer_secret, client_options, options, &block)
       end
 
       def auth_hash
         hash = user_hash(@access_token)
 
-        OmniAuth::Utils.deep_merge(super, {
-          'uid' => hash.delete('id'),
-          'user_info' => hash
-        })
+        OmniAuth::Utils.deep_merge(super,
+          {
+            'uid' => hash.delete('id'),
+            'user_info' => hash,
+          }
+        )
       end
 
       def user_hash(access_token)
@@ -34,17 +34,17 @@ module OmniAuth
           'id' => person['id'],
           'first_name' => person['first_name'],
           'last_name' => person['last_name'],
-          'nickname' => person['public_profile_url'].split('/').last,
+          'nickname' => person['public_profile_url'].to_s.split('/').last,
           'location' => person['location']['name'],
           'image' => person['picture_url'],
           'description' => person['headline'],
-          'public_profile_url' => person['public_profile_url']
+          'public_profile_url' => person['public_profile_url'],
         }
-        hash['urls']={}
+        hash['urls'] = {}
         member_urls = person['member_url_resources']['member_url']
         if (!member_urls.nil?) and (!member_urls.empty?)
           [member_urls].flatten.each do |url|
-            hash['urls']["#{url['name']}"]=url['url']
+            hash['urls']["#{url['name']}"] = url['url']
           end
         end
         hash['urls']['LinkedIn'] = person['public_profile_url']

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

@@ -3,34 +3,36 @@ require 'multi_json'
 
 module OmniAuth
   module Strategies
-    #
     # Authenticate with Meetup via OAuth and retrieve an access token for API usage
     #
     # Usage:
-    #
     #    use OmniAuth::Strategies::Meetup, 'consumerkey', 'consumersecret'
-    #
     class Meetup < OmniAuth::Strategies::OAuth
       # Initialize meetup middleware
       # @param [Rack Application] app standard middleware application parameter
       # @param [String] consumer_key the application consumer id
       # @param [String] consumer_secret the application consumer secret
       # @option options [Boolean, true] :sign_in When true, use a sign-in 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)
         auth_path = (options[:sign_in] == false) ? 'http://www.meetup.com/authorize' : 'http://www.meetup.com/authenticate'
-
-        super(app, :meetup, consumer_key, consumer_secret,
-                { :request_token_path  => "https://api.meetup.com/oauth/request",
-                  :access_token_path   => "https://api.meetup.com/oauth/access",
-                  :authorize_path      => auth_path }, options)
+        client_options = {
+          :access_token_path => 'https://api.meetup.com/oauth/access',
+          :authorize_path => auth_path,
+          :request_token_path => 'https://api.meetup.com/oauth/request',
+        }
+        super(app, :meetup, consumer_key, consumer_secret, client_options, options, &block)
       end
 
       def auth_hash
-        OmniAuth::Utils.deep_merge(super, {
-          'uid' => member['id'],
-          'user_info' => user_info,
-          'extra' => { 'user_hash' => member }
-        })
+        OmniAuth::Utils.deep_merge(super,
+          {
+            'uid' => member['id'],
+            'user_info' => user_info,
+            'extra' => {
+              'user_hash' => member,
+            },
+          }
+        )
       end
 
       def user_info
@@ -39,8 +41,8 @@ module OmniAuth
           'image' => member['photo_url'],
           'location' => member['city'],
           'urls' => {
-            'profile' => member['link']
-          }
+            'profile' => member['link'],
+          },
         }
       end
 

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

@@ -12,16 +12,23 @@ module OmniAuth
     #    use OmniAuth::Strategies::Miso, 'consumerkey', 'consumersecret'
     #
     class Miso < OmniAuth::Strategies::OAuth
-      def initialize(app, consumer_key = nil, consumer_secret = nil, options = {}, &block)
-        super(app, :miso, consumer_key, consumer_secret, {:site => 'https://gomiso.com'}, options)
+      def initialize(app, consumer_key=nil, consumer_secret=nil, options={}, &block)
+        client_options = {
+          :site => 'https://gomiso.com',
+        }
+        super(app, :miso, 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

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

@@ -9,14 +9,14 @@ module OmniAuth
     #    use OmniAuth::Strategies::Netflix, 'consumerkey', 'consumersecret'
     #
     class Netflix < OmniAuth::Strategies::OAuth
-      def initialize(app, consumer_key = nil, consumer_secret = nil, options = {}, &block)
-        opts = {
-          :site               => 'http://api.netflix.com',
-          :request_token_path => "/oauth/request_token",
-          :access_token_path  => "/oauth/access_token",
-          :authorize_url      => "https://api-user.netflix.com/oauth/login"
+      def initialize(app, consumer_key=nil, consumer_secret=nil, options={}, &block)
+        client_options = {
+          :access_token_path => '/oauth/access_token',
+          :authorize_url => 'https://api-user.netflix.com/oauth/login',
+          :request_token_path => '/oauth/request_token',
+          :site => 'http://api.netflix.com',
         }
-        super(app, :netflix, consumer_key, consumer_secret, opts, options, &block)
+        super(app, :netflix, consumer_key, consumer_secret, client_options, options, &block)
       end
 
       def request_phase
@@ -24,7 +24,6 @@ module OmniAuth
         session['oauth'] ||= {}
         session['oauth'][name.to_s] = {'callback_confirmed' => request_token.callback_confirmed?, 'request_token' => request_token.token, 'request_secret' => request_token.secret}
         r = Rack::Response.new
-
         if request_token.callback_confirmed?
           r.redirect(request_token.authorize_url(
             :oauth_consumer_key => consumer.key
@@ -35,16 +34,19 @@ module OmniAuth
             :oauth_consumer_key => consumer.key
           ))
         end
-
         r.finish
       end
 
       def auth_hash
-        OmniAuth::Utils.deep_merge(super, {
-          'uid' => user_hash['user']['user_id'],
-          'user_info' => user_info,
-          'extra' => { 'user_hash' => user_hash['user'] }
-        })
+        OmniAuth::Utils.deep_merge(super,
+          {
+            'uid' => user_hash['user']['user_id'],
+            'user_info' => user_info,
+            'extra' => {
+              'user_hash' => user_hash['user'],
+            },
+          }
+        )
       end
 
       def user_info

data/lib/omniauth/strategies/oauth/orkut.rb

@@ -0,0 +1,63 @@
+require 'omniauth/oauth'
+require 'multi_json'
+
+module OmniAuth
+  module Strategies
+    #
+    # Authenticate to Orkut via OAuth and retrieve basic user info.
+    #
+    # Usage:
+    #
+    # use OmniAuth::Strategies::Orkut, 'consumerkey', 'consumersecret'
+    #
+    class Orkut < OmniAuth::Strategies::OAuth
+      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'
+        }
+        super(app, :orkut, consumer_key, consumer_secret, client_options, options)
+      end
+
+      def auth_hash
+        ui = user_info
+        OmniAuth::Utils.deep_merge(super, {
+          'uid' => ui['uid'],
+          'user_info' => ui,
+          'extra' => {'user_hash' => user_hash}
+        })
+      end
+
+      def user_info
+        entry = user_hash['entry']
+          {
+            'uid' => entry['id'],
+            'first_name' => entry['name']['givenName'],
+            'last_name' => entry['name']['familyName'],
+            'image' => entry['thumbnailUrl']
+          }
+      end
+      
+      def user_hash
+        @user_hash ||= MultiJson.decode(@access_token.get("http://www.orkut.com/social/rest/people/@me/@self").body)
+      end
+        
+      def request_phase
+        request_token = consumer.get_request_token({:oauth_callback => callback_url}, {:scope => 'http://orkut.gmodules.com/social/rest'})
+        session['oauth'] ||= {}
+        session['oauth'][name.to_s] = {'callback_confirmed' => request_token.callback_confirmed?, 'request_token' => request_token.token, 'request_secret' => request_token.secret}
+        r = Rack::Response.new
+
+        if request_token.callback_confirmed?
+          r.redirect(request_token.authorize_url)
+        else
+          r.redirect(request_token.authorize_url(:oauth_callback => callback_url))
+        end
+
+        r.finish
+      end
+    end
+  end
+end

data/lib/omniauth/strategies/oauth/plurk.rb

@@ -0,0 +1,57 @@
+require 'omniauth/oauth'
+require 'multi_json'
+
+module OmniAuth
+  module Strategies
+    # Authenticate to Plurk via OAuth and retrieve basic user info.
+    #
+    # Please note that this strategy relies on Plurk API 2.0,
+    # which is still in Beta.
+    #
+    # Usage:
+    #   use OmniAuth::Strategies::Plurk
+    class Plurk < OmniAuth::Strategies::OAuth
+      # @param [Rack Application] app standard middleware application parameter
+      # @param [String] consumer_key App key [registered on plurk] (http://www.plurk.com/PlurkApp/register)
+      # @param [String] consumer_secret App secret registered on plurk
+      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',
+          :site => 'http://www.plurk.com',
+        }
+        super(app, :plurk, consumer_key, consumer_secret, client_options, options, &block)
+      end
+
+      def auth_hash
+        user = self.user_hash
+        OmniAuth::Utils.deep_merge(super,
+          {
+            'uid' => user['id'],
+            'user_info' => user_info,
+            'extra' => {
+              'user_hash' => user_hash,
+            },
+          }
+        )
+      end
+
+      def user_info
+        user = self.user_hash
+        {
+          'name' => user['full_name'],
+          'nickname' => user['display_name'] || user['nick_name'],
+          'location' => user['location'],
+          'image' => user['has_profile_image'] == 1 ? "http://avatars.plurk.com/#{user['id']}-medium#{user['avatar']}.gif" : 'http://www.plurk.com/static/default_medium.gif',
+          'urls' => {'Plurk' => 'http://plurk.com/' + user['nick_name']},
+        }
+      end
+
+      def user_hash
+        @user_hash  ||= MultiJson.decode(@access_token.get('/APP/Profile/getOwnProfile').body)['user_info']
+      end
+
+    end
+  end
+end

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

@@ -13,18 +13,17 @@ module OmniAuth
     #
     class Qzone < OmniAuth::Strategies::OAuth
       # Initialize the middleware
-      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 => 'http://openapi.qzone.qq.com',
+          :access_token_path => '/oauth/qzoneoauth_access_token',
+          :authorize_path => '/oauth/qzoneoauth_authorize',
+          :http_method => :get,
           :request_token_path => '/oauth/qzoneoauth_request_token',
-          :access_token_path  => '/oauth/qzoneoauth_access_token',
-          :authorize_path     => '/oauth/qzoneoauth_authorize',
-          :scheme             => :query_string,
-          :http_method        => :get
+          :scheme => :query_string,
+          :site => 'http://openapi.qzone.qq.com',
         }
-
         options[:authorize_params] = {:oauth_consumer_key => consumer_key}
-        super(app, :qzone, consumer_key, consumer_secret, client_options, options)
+        super(app, :qzone, consumer_key, consumer_secret, client_options, options, &block)
       end
 
       #HACK qzone is using a none-standard parameter oauth_overicode
@@ -40,11 +39,15 @@ module OmniAuth
 
       def auth_hash
         ui = user_info
-        OmniAuth::Utils.deep_merge(super, {
+        OmniAuth::Utils.deep_merge(super,
+          {
             'uid' => ui['uid'],
             'user_info' => ui,
-            'extra' => {'user_hash' => user_hash}
-          })
+            'extra' => {
+              'user_hash' => user_hash,
+            },
+          }
+        )
       end
 
       def user_info
@@ -57,7 +60,7 @@ module OmniAuth
           'urls' => {
             'figureurl_1' => user_hash['figureurl_1'],
             'figureurl_2' => user_hash['figureurl_2'],
-          }
+          },
         }
       end