oa-oauth 0.2.6 → 0.3.0.rc3

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

@@ -0,0 +1,45 @@
+require 'omniauth/oauth'
+require 'multi_json'
+
+module OmniAuth
+  module Strategies
+    class Glitch < OmniAuth::Strategies::OAuth2
+      def initialize(app, client_id=nil, client_secret=nil, options={}, &block)
+
+        # :scope (identity|read|write) is required for authorization and should be passed
+        # in the OmniAuth :provider options hash in your application
+
+        client_options = {
+          :site => 'http://api.glitch.com',
+          :authorize_url => '/oauth2/authorize',
+          :token_url => '/oauth2/token'
+        }
+        super(app, :glitch, client_id, client_secret, client_options, options, &block)
+      end
+
+      def auth_hash
+        OmniAuth::Utils.deep_merge(
+          super, {
+            'uid' => user_data['player_tsid'],
+            'user_info' => user_info,
+            'extra' => user_data,
+          }
+        )
+      end
+
+      def user_data
+        @access_token.options.merge!({:param_name => 'oauth_token', :mode => :query})
+        response = @access_token.post('/simple/players.info')
+        @data ||= MultiJson.decode(response.body)
+      end
+
+      def user_info
+        {
+          'name' => user_data['user_name'],
+          'nickname' => user_data['player_name'],
+          'image' => user_data['avatar_url'],
+        }
+      end
+    end
+  end
+end

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

@@ -0,0 +1,72 @@
+require 'omniauth/oauth'
+require 'multi_json'
+
+module OmniAuth
+  module Strategies
+    # Authenticate to Gowalla utilizing OAuth 2.0 and retrieve
+    # basic user information.
+    #
+    # @example Basic Usage
+    #     use OmniAuth::Strategies::Gowalla, 'API Key', 'Secret Key'
+    class Gowalla < OmniAuth::Strategies::OAuth2
+      # @param [Rack Application] app standard middleware application parameter
+      # @param [String] client_id the application id as [registered on Gowalla](http://gowalla.com/api/keys)
+      # @param [String] client_secret the application secret as [registered on Gowalla](http://gowalla.com/api/keys)
+      # @option options ['read','read-write'] :scope ('read') the scope of your authorization request; must be `read` or `read-write`
+      def initialize(app, client_id=nil, client_secret=nil, options={}, &block)
+        client_options = {
+          :authorize_url => 'https://gowalla.com/api/oauth/new',
+          :token_url => 'https://api.gowalla.com/api/oauth/token',
+        }
+        super(app, :gowalla, client_id, client_secret, client_options, options, &block)
+      end
+
+      def auth_hash
+        OmniAuth::Utils.deep_merge(
+          super, {
+            'uid' => user_data['url'].split('/').last,
+            'user_info' => user_info,
+            'extra' => {
+              'user_hash' => user_data,
+              'refresh_token' => refresh_token,
+              'token_expires_at' => token_expires_at,
+            },
+          }
+        )
+      end
+
+      def user_data
+        @data ||= MultiJson.decode(@access_token.get('/users/me.json'))
+      end
+
+      def refresh_token
+        @refresh_token ||= @access_token.refresh_token
+      end
+
+      def token_expires_at
+        @expires_at ||= @access_token.expires_at
+      end
+
+      def request_phase
+        options[:scope] ||= 'read'
+        super
+      end
+
+      def user_info
+        {
+          'name' => "#{user_data['first_name']} #{user_data['last_name']}",
+          'nickname' => user_data['username'],
+          'first_name' => user_data['first_name'],
+          'last_name' => user_data['last_name'],
+          'location' => user_data['hometown'],
+          'description' => user_data['bio'],
+          'image' => user_data['image_url'],
+          'urls' => {
+            'Gowalla' => "http://www.gowalla.com#{user_data['url']}",
+            'Website' => user_data['website'],
+          },
+        }
+      end
+    end
+  end
+end

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

@@ -8,20 +8,30 @@ module OmniAuth
     #
     # @example Basic Usage
     #   use OmniAuth::Strategies::Instagram, 'client_id', 'client_secret'
-    class Instagram < OAuth2
+    class Instagram < OmniAuth::Strategies::OAuth2
       # @option options [String] :scope separate the scopes by a space
-      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.instagram.com/",
-          :authorize_url      => "/oauth/authorize",
-          :access_token_url   => "/oauth/access_token"
+          :authorize_url => 'https://api.instagram.com/oauth/authorize',
+          :token_url => 'https://api.instagram.com/oauth/access_token',
         }
-
         super(app, :instagram, client_id, client_secret, client_options, options, &block)
       end
 
+      def auth_hash
+        OmniAuth::Utils.deep_merge(
+          super, {
+            'uid' => user_data['data']['id'],
+            'user_info' => user_info,
+            'extra' => {
+              'user_hash' => user_data['data'],
+            }
+          }
+        )
+      end
+
       def request_phase
-        options[:scope] ||= "basic"
+        options[:scope] ||= 'basic'
         options[:response_type] ||= 'code'
         super
       end
@@ -32,7 +42,8 @@ module OmniAuth
       end
 
       def user_data
-        @data ||= MultiJson.decode(@access_token.get("/v1/users/self"))
+        @access_token.options.merge!({:param_name => 'access_token', :mode => :query})
+        @data ||= MultiJson.decode(@access_token.get('/v1/users/self'))
       end
 
       def user_info
@@ -40,17 +51,8 @@ module OmniAuth
           'nickname' => user_data['data']['username'],
           'name' => user_data['data']['full_name'],
           'image' => user_data['data']['profile_picture'],
-          'urls' => {}
         }
       end
-
-      def auth_hash
-        OmniAuth::Utils.deep_merge(super, {
-          'uid' => user_data['data']['id'],
-          'user_info' => user_info,
-          'extra' => {'user_hash' => user_data['data']}
-        })
-      end
     end
   end
 end

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

@@ -0,0 +1,67 @@
+require 'omniauth/oauth'
+require 'multi_json'
+
+module OmniAuth
+  module Strategies
+    # Authenticate to Windows Connect utilizing OAuth 2.0 and retrieve
+    # basic user information.
+    #
+    # OAuth 2.0 - MS Documentation
+    # http://msdn.microsoft.com/en-us/library/hh243647.aspx
+    #
+    # Sign-up for account:
+    # http://go.microsoft.com/fwlink/?LinkId=213332
+    # 
+    # @example Basic Usage of Liveid
+    #
+    #   use OmniAuth::Strategies::Liveid, 'client_id', 'client_secret'
+    class Liveid < OmniAuth::Strategies::OAuth2
+      # @option options [String] :scope separate the scopes by a space
+      def initialize(app, client_id=nil, client_secret=nil, options={}, &block)
+        client_options = {
+          :authorize_url => 'https://oauth.live.com/authorize',
+          :token_url => 'https://oauth.live.com/token'
+        }
+        
+        super(app, :liveid, 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 request_phase
+        options[:scope] ||= 'wl.signin wl.basic'
+        options[:response_type] ||= 'code'
+        super
+      end
+
+      def user_data
+        @data ||= MultiJson.decode(@access_token.get('https://apis.live.net/v5.0/me').body)
+      end
+
+      def user_info
+        {
+          'id' => user_data['id'],
+          'name' => user_data['name'],
+          'email' => '',
+          'first_name' => user_data['first_name'],
+          'last_name' => user_data['last_name'],
+          'link' => user_data['link'],
+          'gender' => user_data['gender'],
+          'locale' => user_data['locale']                    
+        }
+      end
+            
+    end
+  end
+end

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

@@ -0,0 +1,39 @@
+require 'omniauth/oauth'
+require 'multi_json'
+
+module OmniAuth
+  module Strategies
+    class Mailchimp < OmniAuth::Strategies::OAuth2
+      
+      def initialize(app, client_id=nil, client_secret=nil, options={}, &block)
+        client_options = {
+          :authorize_url => 'https://login.mailchimp.com/oauth2/authorize',
+          :token_url => 'https://login.mailchimp.com/oauth2/token',
+        }
+        super(app, :mailchimp, client_id, client_secret, client_options, options, &block)
+      end
+      
+      def auth_hash
+        data = user_data
+        OmniAuth::Utils.deep_merge(
+          super, {
+            'uid' => @access_token.client.id,
+            'extra'=> {
+              'user_hash' => data
+            }
+          }
+        )
+      end
+
+      def user_data
+        @data ||=  MultiJson.decode(@access_token.get("https://login.mailchimp.com/oauth2/metadata").body)
+      rescue ::OAuth2::Error => e
+        if e.response.status == 302
+          @data ||= MultiJson.decode(@access_token.get(e.response.headers['location']))
+        else
+          raise e
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,75 @@
+require 'omniauth/oauth'
+require 'multi_json'
+
+module OmniAuth
+  module Strategies
+    # Authenticate to Vkontakte utilizing OAuth 2.0 and retrieve
+    # basic user information.
+    # documentation available here:
+    # http://api.mail.ru/docs/guides/oauth/sites/
+    #
+    # @example Basic Usage
+    #     use OmniAuth::Strategies::Mailru, 'API Key', 'Secret Key', :private_key => 'Private Key'
+    class Mailru < OmniAuth::Strategies::OAuth2
+      # @param [Rack Application] app standard middleware application parameter
+      # @param [String] client_id the application id as [registered in Mailru]
+      # @param [String] client_secret the application secret as [registered in Mailru]
+      def initialize(app, client_id=nil, client_secret=nil, options={}, &block)
+        client_options = {
+          :authorize_url => 'https://connect.mail.ru/oauth/authorize',
+          :token_url => 'https://connect.mail.ru/oauth/token',
+        }
+        @private_key  = options[:private_key]
+        super(app, :mailru, client_id, client_secret, client_options, options, &block)
+      end
+
+      def auth_hash
+        OmniAuth::Utils.deep_merge(
+          super, {
+            'uid' => user_data['uid'],
+            'user_info' => user_info,
+            'extra' => {
+              'user_hash' => user_data,
+            },
+          }
+        )
+      end
+
+      def request_phase
+        options[:response_type] ||= 'code'
+        super
+      end
+
+      def calculate_signature(params)
+        str = params['uids'] + (params.sort.collect { |c| "#{c[0]}=#{c[1]}" }).join('') + @private_key
+        Digest::MD5.hexdigest(str)
+      end
+
+      def user_data
+        request_params = {
+          'method' => 'users.getInfo',
+          'app_id' => client_id,
+          'session_key' => @access_token.token,
+          'uids' => @access_token['x_mailru_vid']
+        }
+
+        request_params.merge!('sig' => calculate_signature(request_params))
+        @data ||= MultiJson.decode(client.request(:get, 'http://www.appsmail.ru/platform/api', request_params))[0]
+      end
+
+      def user_info
+        {
+          'nickname' => user_data['nick'],
+          'email' =>  user_data['email'],
+          'first_name' => user_data['first_name'],
+          'last_name' => user_data['last_name'],
+          'name' => "#{user_data['first_name']} #{user_data['last_name']}".strip,
+          'image' => @data['pic'],
+          'urls' => {
+            'Mailru' => user_data['link'],
+          },
+        }
+      end
+    end
+  end
+end

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

@@ -8,28 +8,39 @@ module OmniAuth
     #
     # @example Basic Usage
     #   use OmniAuth::Strategies::Mixi, 'client_id', 'client_secret'
-    class Mixi < OAuth2
+    class Mixi < OmniAuth::Strategies::OAuth2
       # @option options [String] :scope separate the scopes by a space
-      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://mixi.jp/",
-          :authorize_url      => "/connect_authorize.pl",
-          :access_token_url   => "https://secure.mixi-platform.com/2/token"
+          :authorize_url => 'https://mixi.jp/connect_authorize.pl',
+          :token_url => 'https://secure.mixi-platform.com/2/token',
         }
-
         super(app, :mixi, client_id, client_secret, client_options, options, &block)
       end
 
+      def auth_hash
+        OmniAuth::Utils.deep_merge(
+          super, {
+            'uid' => user_data['entry']['id'],
+            'user_info' => user_info,
+            'credentials' => {'refresh_token' => @access_token.refresh_token},
+            'extra' => {
+              'user_hash' => user_data['entry'],
+            },
+          }
+        )
+      end
+
       def user_data
         @data ||= MultiJson.decode(@access_token.get(
-          "http://api.mixi-platform.com/2/people/@me/@self",
+          'http://api.mixi-platform.com/2/people/@me/@self',
           {'oauth_token' => @access_token.token}
         ))
       end
 
       def request_phase
-        options[:scope] ||= "r_profile"
-        options[:display] ||= "pc"
+        options[:scope] ||= 'r_profile'
+        options[:display] ||= 'pc'
         options[:response_type] ||= 'code'
         super
       end
@@ -43,17 +54,11 @@ module OmniAuth
         {
           'nickname' => user_data['entry']['displayName'],
           'image' => user_data['entry']['thumbnailUrl'],
-          'urls' => {:profile => user_data['entry']['profileUrl']}
+          'urls' => {
+            :profile => user_data['entry']['profileUrl'],
+          },
         }
       end
-
-      def auth_hash
-        OmniAuth::Utils.deep_merge(super, {
-          'uid' => user_data['entry']['id'],
-          'user_info' => user_info,
-          'extra' => {'user_hash' => user_data['entry']}
-        })
-      end
     end
   end
 end

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

@@ -10,21 +10,31 @@ module OmniAuth
     #
     # @example Basic Usage
     #   use OmniAuth::Strategies::Renren, 'client_id', 'client_secret'
-    class Renren < OAuth2
+    class Renren < OmniAuth::Strategies::OAuth2
       # @param [Rack Application] app standard middleware application parameter
       # @param [String] client_id the application id as [registered on Renren](http://dev.renren.com/)
       # @param [String] client_secret the application secret as registered on Renren
       # @option options [String] :scope ('publish_feed,status_update') comma-separated extended permissions such as `publish_feed` and `status_update`
-      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 => "http://graph.renren.com/",
-          :authorize_url      => "/oauth/authorize",
-          :access_token_url   => "/oauth/token"
+          :authorize_url => 'http://graph.renren.com/oauth/authorize',
+          :token_url => 'http://graph.renren.com/oauth/token',
         }
-
         super(app, :renren, client_id, client_secret, client_options, options, &block)
       end
 
+      def auth_hash
+        OmniAuth::Utils.deep_merge(
+          super, {
+            'uid' => user_data['uid'],
+            'user_info' => user_info,
+            'extra' => {
+              'user_hash' => user_data,
+            },
+          }
+        )
+      end
+
       def user_data
         @data ||= MultiJson.decode(Net::HTTP.post_form(URI.parse('http://api.renren.com/restserver.do'), signed_params).body)[0]
       end
@@ -32,13 +42,13 @@ module OmniAuth
       def signed_params
         params = {}
         params[:api_key] = client.id
-        params[:method] = "users.getInfo"
+        params[:method] = 'users.getInfo'
         params[:call_id] = Time.now.to_i
-        params[:format] = "json"
-        params[:v] = "1.0"
-        params[:uids] = session_key["user"]["id"]
-        params[:session_key] = session_key["renren_token"]["session_key"]
-        params[:sig] = Digest::MD5.hexdigest(params.map {|k,v| "#{k}=#{v}"}.sort.join("") + client.secret)
+        params[:format] = 'json'
+        params[:v] = '1.0'
+        params[:uids] = session_key['user']['id']
+        params[:session_key] = session_key['renren_token']['session_key']
+        params[:sig] = Digest::MD5.hexdigest(params.map{|k,v| "#{k}=#{v}"}.sort.join + client.secret)
         params
       end
 
@@ -47,7 +57,7 @@ module OmniAuth
       end
 
       def request_phase
-        options[:scope] ||= "publish_feed"
+        options[:scope] ||= 'publish_feed'
         super
       end
 
@@ -70,18 +80,10 @@ module OmniAuth
 
       def user_info
         {
-          'name' => user_data["name"],
-          'image' => user_data["tinyurl"]
+          'name' => user_data['name'],
+          'image' => user_data['tinyurl'],
         }
       end
-
-      def auth_hash
-        OmniAuth::Utils.deep_merge(super, {
-          'uid' => user_data['uid'],
-          'user_info' => user_info,
-          'extra' => {'user_hash' => user_data}
-        })
-      end
     end
   end
 end