oa-oauth 0.2.6 → 0.3.0.rc3

data/Gemfile

@@ -1,5 +1,9 @@
+require File.expand_path('../lib/omniauth/version', __FILE__)
+
 source 'http://rubygems.org'
 
+gem 'oa-core', OmniAuth::Version::STRING, :path => '../oa-core'
+
 platforms :jruby do
   gem 'jruby-openssl', '~> 0.7'
 end

data/lib/omniauth/oauth.rb

@@ -3,54 +3,72 @@ require 'omniauth/core'
 module OmniAuth
   module Strategies
     autoload :OAuth,              'omniauth/strategies/oauth'
+    autoload :Blogger,            'omniauth/strategies/oauth/blogger'
+    autoload :Dopplr,             'omniauth/strategies/oauth/dopplr'
+    autoload :Douban,             'omniauth/strategies/oauth/douban'
+    autoload :Dropbox,            'omniauth/strategies/oauth/dropbox'
+    autoload :Evernote,           'omniauth/strategies/oauth/evernote'
+    autoload :Flattr,             'omniauth/strategies/oauth/flattr'    
+    autoload :Flickr,             'omniauth/strategies/oauth/flickr'    
+    autoload :Goodreads,          'omniauth/strategies/oauth/goodreads'
+    autoload :Google,             'omniauth/strategies/oauth/google'
+    autoload :GoogleHealth,       'omniauth/strategies/oauth/google_health'
+    autoload :GoogleHealthSandbox,'omniauth/strategies/oauth/google_health_sandbox'
+    autoload :Hyves,              'omniauth/strategies/oauth/hyves'
+    autoload :Identica,           'omniauth/strategies/oauth/identica'
+    autoload :LinkedIn,           'omniauth/strategies/oauth/linked_in'
+    autoload :Meetup,             'omniauth/strategies/oauth/meetup'
+    autoload :Miso,               'omniauth/strategies/oauth/miso'
+    autoload :Netflix,            'omniauth/strategies/oauth/netflix'
+    autoload :Orkut,              'omniauth/strategies/oauth/orkut'    
+    autoload :Qzone,              'omniauth/strategies/oauth/qzone'
+    autoload :Plurk,              'omniauth/strategies/oauth/plurk'
+    autoload :Rdio,               'omniauth/strategies/oauth/rdio'
+    autoload :SmugMug,            'omniauth/strategies/oauth/smug_mug'
+    autoload :T163,               'omniauth/strategies/oauth/t163'
+    autoload :Tqq,                'omniauth/strategies/oauth/tqq'
+    autoload :TradeMe,            'omniauth/strategies/oauth/trade_me'
+    autoload :TripIt,             'omniauth/strategies/oauth/trip_it'
+    autoload :Tsina,              'omniauth/strategies/oauth/tsina'
+    autoload :Tsohu,              'omniauth/strategies/oauth/tsohu'
+    autoload :Tumblr,             'omniauth/strategies/oauth/tumblr'
+    autoload :Twitter,            'omniauth/strategies/oauth/twitter'
+    autoload :TypePad,            'omniauth/strategies/oauth/type_pad'
+    autoload :Vimeo,              'omniauth/strategies/oauth/vimeo'
+    autoload :Yahoo,              'omniauth/strategies/oauth/yahoo'
+    autoload :Yammer,             'omniauth/strategies/oauth/yammer'
+    autoload :YouTube,            'omniauth/strategies/oauth/you_tube'
+
     autoload :OAuth2,             'omniauth/strategies/oauth2'
-    autoload :XAuth,              'omniauth/strategies/xauth'
+    autoload :AngelList,          'omniauth/strategies/oauth2/angellist'
+    autoload :Bitly,              'omniauth/strategies/oauth2/bitly'
+    autoload :Cobot,              'omniauth/strategies/oauth2/cobot'
+    autoload :Dailymile,          'omniauth/strategies/oauth2/dailymile'
+    autoload :Doit,               'omniauth/strategies/oauth2/doit'
+    autoload :Facebook,           'omniauth/strategies/oauth2/facebook'
+    autoload :Foursquare,         'omniauth/strategies/oauth2/foursquare'
+    autoload :GitHub,             'omniauth/strategies/oauth2/github'
+    autoload :Glitch,             'omniauth/strategies/oauth2/glitch'
+    autoload :GoogleOAuth2,       'omniauth/strategies/google_oauth2'
+    autoload :Gowalla,            'omniauth/strategies/oauth2/gowalla'
+    autoload :Instagram,          'omniauth/strategies/oauth2/instagram'
+    autoload :Liveid,             'omniauth/strategies/oauth2/liveid'
+    autoload :Mailchimp,          'omniauth/strategies/oauth2/mailchimp'
+    autoload :Mailru,             'omniauth/strategies/oauth2/mailru'
+    autoload :Mixi,               'omniauth/strategies/oauth2/mixi'
+    autoload :Renren,             'omniauth/strategies/oauth2/renren'
+    autoload :Salesforce,         'omniauth/strategies/oauth2/salesforce'
+    autoload :SoundCloud,         'omniauth/strategies/oauth2/sound_cloud'
+    autoload :Taobao,             'omniauth/strategies/oauth2/taobao'
+    autoload :Teambox,            'omniauth/strategies/oauth2/teambox'
+    autoload :ThirtySevenSignals, 'omniauth/strategies/oauth2/thirty_seven_signals'
+    autoload :Viadeo,             'omniauth/strategies/oauth2/viadeo'
+    autoload :Vkontakte,          'omniauth/strategies/oauth2/vkontakte'
+    autoload :WePay,              'omniauth/strategies/oauth2/we_pay'
 
-    autoload :Bitly,              'omniauth/strategies/bitly'
-    autoload :Dailymile,          'omniauth/strategies/dailymile'
-    autoload :Doit,               'omniauth/strategies/doit'
-    autoload :Dopplr,             'omniauth/strategies/dopplr'
-    autoload :Douban,             'omniauth/strategies/douban'
-    autoload :Evernote,           'omniauth/strategies/evernote'
-    autoload :Facebook,           'omniauth/strategies/facebook'
-    autoload :Foursquare,         'omniauth/strategies/foursquare'
-    autoload :GitHub,             'omniauth/strategies/github'
-    autoload :Goodreads,          'omniauth/strategies/goodreads'
-    autoload :Google,             'omniauth/strategies/google'
-    autoload :Gowalla,            'omniauth/strategies/gowalla'
-    autoload :Hyves,              'omniauth/strategies/hyves'
-    autoload :Identica,           'omniauth/strategies/identica'
-    autoload :Instagram,          'omniauth/strategies/instagram'
-    autoload :Instapaper,         'omniauth/strategies/instapaper'
-    autoload :LinkedIn,           'omniauth/strategies/linked_in'
-    autoload :Meetup,             'omniauth/strategies/meetup'
-    autoload :Miso,               'omniauth/strategies/miso'
-    autoload :Mixi,               'omniauth/strategies/mixi'
-    autoload :Netflix,            'omniauth/strategies/netflix'
-    autoload :Qzone,              'omniauth/strategies/qzone'
-    autoload :Plurk,              'omniauth/strategies/plurk'
-    autoload :Rdio,               'omniauth/strategies/rdio'
-    autoload :Renren,             'omniauth/strategies/renren'
-    autoload :Salesforce,         'omniauth/strategies/salesforce'
-    autoload :SmugMug,            'omniauth/strategies/smug_mug'
-    autoload :SoundCloud,         'omniauth/strategies/sound_cloud'
-    autoload :T163,               'omniauth/strategies/t163'
-    autoload :TB,               'omniauth/strategies/taobao'
-    autoload :Teambox,            'omniauth/strategies/teambox'
-    autoload :ThirtySevenSignals, 'omniauth/strategies/thirty_seven_signals'
-    autoload :Tqq,                'omniauth/strategies/tqq'
-    autoload :TradeMe,            'omniauth/strategies/trade_me'
-    autoload :TripIt,             'omniauth/strategies/trip_it'
-    autoload :Tsina,              'omniauth/strategies/tsina'
-    autoload :Tsohu,              'omniauth/strategies/tsohu'
-    autoload :Tumblr,             'omniauth/strategies/tumblr'
-    autoload :Twitter,            'omniauth/strategies/twitter'
-    autoload :TypePad,            'omniauth/strategies/type_pad'
-    autoload :Vimeo,              'omniauth/strategies/vimeo'
-    autoload :Vkontakte,          'omniauth/strategies/vkontakte'
-    autoload :Yahoo,              'omniauth/strategies/yahoo'
-    autoload :Yammer,             'omniauth/strategies/yammer'
-    autoload :YouTube,            'omniauth/strategies/you_tube'
-    autoload :Mailru,             'omniauth/strategies/mailru'
+
+    autoload :XAuth,              'omniauth/strategies/xauth'
+    autoload :Instapaper,         'omniauth/strategies/xauth/instapaper'
+    
   end
 end

data/lib/omniauth/strategies/google_oauth2.rb

@@ -0,0 +1,59 @@
+require 'omniauth/oauth'
+require 'multi_json'
+
+module OmniAuth
+  module Strategies
+    # OAuth 2.0 based authentication with Google.
+    class GoogleOAuth2 < 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
+      # @option options [String] :scope ('https://www.googleapis.com/auth/userinfo.email') space-separated services that you need.
+      def initialize(app, client_id = nil, client_secret = nil, options = {}, &block)
+        client_options = {
+          :site => 'https://accounts.google.com',
+          :authorize_url => '/o/oauth2/auth',
+          :token_url => '/o/oauth2/token'
+        }
+
+        super(app, :google_oauth2, client_id, client_secret, client_options, options, &block)
+      end
+
+      def request_phase
+        google_email_scope = "www.googleapis.com/auth/userinfo.email"
+        options[:scope] ||= "https://#{google_email_scope}"
+        options[:scope] << "https://#{google_email_scope}" unless options[:scope] =~ %r[http[s]?:\/\/#{google_email_scope}]
+        redirect client.auth_code.authorize_url(
+          {:redirect_uri => callback_url, :response_type => "code"}.merge(options))
+      end
+
+      def auth_hash
+        OmniAuth::Utils.deep_merge(super, {
+          'uid' => user_info['uid'],
+          'user_info' => user_info,
+          'credentials' => {'expires_at' => @access_token.expires_at},
+          'extra' => {'user_hash' => user_data}
+        })
+      end
+
+      def user_info
+        if user_data['data']['isVerified']
+          email = user_data['data']['email']
+        else
+          email = nil
+        end
+        {
+          'email' => email,
+          'uid' => email,
+          'name' => email
+        }
+      end
+
+      def user_data
+        @data ||=
+          @access_token.get("https://www.googleapis.com/userinfo/email?alt=json").parsed
+      end
+
+    end
+  end
+end

data/lib/omniauth/strategies/oauth.rb

@@ -7,7 +7,7 @@ module OmniAuth
     class OAuth
       include OmniAuth::Strategy
 
-      def initialize(app, name, consumer_key = nil, consumer_secret = nil, consumer_options = {}, options = {}, &block)
+      def initialize(app, name, consumer_key=nil, consumer_secret=nil, consumer_options={}, options={}, &block)
         self.consumer_key = consumer_key
         self.consumer_secret = consumer_secret
         self.consumer_options = consumer_options
@@ -40,9 +40,13 @@ module OmniAuth
 
       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?
+
         request_token = ::OAuth::RequestToken.new(consumer, session['oauth'][name.to_s].delete('request_token'), session['oauth'][name.to_s].delete('request_secret'))
 
         opts = {}
@@ -56,12 +60,14 @@ module OmniAuth
         super
       rescue ::Timeout::Error => e
         fail!(:timeout, e)
-      rescue ::Net::HTTPFatalError => e
+      rescue ::Net::HTTPFatalError, ::OpenSSL::SSL::SSLError => e
         fail!(:service_unavailable, e)
       rescue ::OAuth::Unauthorized => e
         fail!(:invalid_credentials, e)
       rescue ::NoMethodError, ::MultiJson::DecodeError => e
         fail!(:invalid_response, e)
+      rescue ::OmniAuth::NoSessionError => e
+        fail!(:session_expired, e)
       end
 
       def auth_hash

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

@@ -0,0 +1,58 @@
+# Based heavily on the Google strategy, monkeypatch and all
+require 'omniauth/oauth'
+require 'multi_json'
+
+module OmniAuth
+  module Strategies
+    # Authenticate to YouTube via OAuth and retrieve basic user info.
+    #
+    # Usage:
+    #    use OmniAuth::Strategies::YouTube, 'consumerkey', 'consumersecret'
+    class Blogger < OmniAuth::Strategies::OAuth
+      def initialize(app, consumer_key=nil, consumer_secret=nil, options={}, &block)
+        client_options = {
+          :access_token_path => '/accounts/OAuthGetAccessToken',
+          :authorize_path => '/accounts/OAuthAuthorizeToken',
+          :request_token_path => '/accounts/OAuthGetRequestToken',
+          :site => 'https://www.google.com',
+        }
+        super(app, :blogger, 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},
+        })
+      end
+
+      # TODO: Remove contact list from hash returned to the application
+      def user_info
+        {
+          'uid' => user_hash['feed']['author'][0]['email']['$t'],
+          'nickname' => user_hash['feed']['author'][0]['name']['$t'],
+        }
+      end
+
+      def user_hash
+        # Using Contact feed
+        @user_hash ||= MultiJson.decode(@access_token.get('https://www.google.com/m8/feeds/contacts/default/full/?alt=json').body)
+      end
+
+      def request_phase
+        request_token = consumer.get_request_token({:oauth_callback => callback_url}, {:scope => 'http://www.blogger.com/feeds/ http://www.google.com/m8/feeds/'})
+        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/{dopplr.rb → oauth/dopplr.rb}

@@ -3,25 +3,21 @@ require 'multi_json'
 
 module OmniAuth
   module Strategies
-    #
     # Authenticate to Dopplr via OAuth and retrieve an access token for API usage
     #
     # Usage:
-    #
     #    use OmniAuth::Strategies::Dopplr, 'consumerkey', 'consumersecret'
-    #
     class Dopplr < OmniAuth::Strategies::OAuth
       # Initialize the Dopplr strategy.
       #
       # @option options [Hash, {}] :client_options Options to be passed directly to the OAuth Consumer
-      def initialize(app, consumer_key = nil, consumer_secret = nil, options = {}, &block)
+      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 => 'https://www.dopplr.com',
-          :request_token_path => "/oauth/request_token",
-          :access_token_path  => "/oauth/access_token",
-          :authorize_path    => "/oauth/authorize"
         }
-
         super(app, :dopplr, consumer_key, consumer_secret, client_options, options, &block)
       end
 
@@ -29,25 +25,27 @@ module OmniAuth
         @data ||= MultiJson.decode(@access_token.get('/oauthapi/whoami').body)['whoami']
       end
 
+      def auth_hash
+        OmniAuth::Utils.deep_merge(
+          super, {
+            'uid' => user_data['nick'],
+            'user_info' => user_info,
+          }
+        )
+      end
+
       def user_info
         {
-          'nickname' => user_data["nick"],
-          'first_name' => user_data["forename"],
-          'last_name' => user_data["surname"],
+          'nickname' => user_data['nick'],
+          'first_name' => user_data['forename'],
+          'last_name' => user_data['surname'],
           'name' => "#{user_data['forename']} #{user_data['surname']}",
           'urls' => {
-            'Dopplr' => user_data["dopplr_url"],
-            'DopplrMobile' => user_data["mobile_url"],
-          }
+            'Dopplr' => user_data['dopplr_url'],
+            'DopplrMobile' => user_data['mobile_url'],
+          },
         }
       end
-
-      def auth_hash
-        OmniAuth::Utils.deep_merge(super, {
-          'uid' => user_data['nick'],
-          'user_info' => user_info
-        })
-      end
     end
   end
 end

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

@@ -6,40 +6,40 @@ module OmniAuth
     #
     # Authenticate to Douban via OAuth and retrieve basic
     # user information.
-    #
     # Usage:
-    #
     #    use OmniAuth::Strategies::Douban, 'APIKey', 'APIKeySecret'
-    #
     class Douban < 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)
         # Although in OAuth spec the :realm parameter is optional,
         # it is required for Douban.
         client_options = {
-          :site               => 'http://www.douban.com',
+          :access_token_path => '/service/auth/access_token',
+          :authorize_path => '/service/auth/authorize',
+          :realm => 'OmniAuth',
           :request_token_path => '/service/auth/request_token',
-          :access_token_path  => '/service/auth/access_token',
-          :authorize_path     => '/service/auth/authorize',
-          :realm              => 'OmniAuth'
+          :site => 'http://www.douban.com',
         }
 
         super(app, :douban, consumer_key, consumer_secret, client_options, options, &block)
       end
 
       def auth_hash
-        OmniAuth::Utils.deep_merge(super, {
-          'uid' => @access_token.params[:douban_user_id],
-          'user_info' => user_info,
-          'extra' => {'user_hash' => user_hash}
-        })
+        OmniAuth::Utils.deep_merge(
+          super, {
+            'uid' => @access_token.params[:douban_user_id],
+            'user_info' => user_info,
+            'extra' => {
+              'user_hash' => user_hash,
+            },
+          }
+        )
       end
 
       def user_info
         user_hash = self.user_hash
-
         location = user_hash['location'] ? user_hash['location']['$t'] : nil
-        image = user_hash['link'].find {|l| l['@rel'] == 'icon' }['@href']
-        douban_url = user_hash['link'].find {|l| l['@rel'] == 'alternate' }['@href']
+        image = user_hash['link'].find{|l| l['@rel'] == 'icon'}['@href']
+        douban_url = user_hash['link'].find{|l| l['@rel'] == 'alternate'}['@href']
         {
           'username' => user_hash['db:uid']['$t'],
           'name' => user_hash['title']['$t'],
@@ -47,8 +47,8 @@ module OmniAuth
           'image' => image,
           'description' => user_hash['content']['$t'],
           'urls' => {
-            'Douban' => douban_url
-          }
+            'Douban' => douban_url,
+          },
         }
       end
 

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

@@ -0,0 +1,40 @@
+require 'omniauth/oauth'
+require 'multi_json'
+
+module OmniAuth
+  module Strategies
+    class Dropbox < OmniAuth::Strategies::OAuth
+      def initialize(app, consumer_key=nil, consumer_secret=nil, options={}, &block)
+        client_options = {
+          :authorize_url => 'https://www.dropbox.com/0/oauth/authorize',
+          :access_token_url => 'https://api.dropbox.com/0/oauth/access_token',
+          :proxy => ENV['HTTP_PROXY'] || ENV['http_proxy'],
+          :request_token_url => 'https://api.dropbox.com/0/oauth/request_token',
+          :site => 'https://api.dropbox.com',
+        }
+        super(app, :dropbox, consumer_key, consumer_secret, client_options, options, &block)
+      end
+
+      def auth_hash
+        OmniAuth::Utils.deep_merge(
+          super, {
+            'uid' => user_data['uid'],
+            'user_info' => user_info,
+          }
+        )
+      end
+
+      def user_data
+        @data ||= MultiJson.decode(@access_token.get('/0/account/info').body)
+      end
+
+      def user_info
+        {
+          'name' => user_data['display_name'],
+          'uid' => user_data['uid'],
+          'email' => user_data['email']
+        }
+      end
+    end
+  end
+end