oa-oauth 0.2.0.beta4 → 0.2.0.beta5

data/lib/oa-oauth.rb

@@ -0,0 +1 @@
+require 'omniauth/oauth'

data/lib/omniauth/oauth.rb

@@ -27,5 +27,6 @@ module OmniAuth
     autoload :Vimeo,              'omniauth/strategies/vimeo'
     autoload :YouTube,            'omniauth/strategies/you_tube'
     autoload :Hyves,              'omniauth/strategies/hyves'
+    autoload :Miso,               'omniauth/strategies/miso'
   end
 end

data/lib/omniauth/strategies/foursquare.rb

@@ -3,50 +3,55 @@ require 'multi_json'
 
 module OmniAuth
   module Strategies
-    class Foursquare < OAuth
+    class Foursquare < 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, consumer_key = nil, consumer_secret = nil, options = {}, &block)
-        client_options = {:site => 'http://foursquare.com'}
-        
-        auth_path = (options[:sign_in] == false) ? '/oauth/authorize' : '/oauth/authenticate'
-        auth_path = "/mobile#{auth_path}" if options[:mobile]
-        
-        client_options[:authorize_path] = auth_path
-        
-        super(app, :foursquare, consumer_key, consumer_secret, client_options, options, &block)
+      def initialize(app, client_id = nil, client_secret = nil, options = {}, &block)
+        super(app, :foursquare, client_id, client_secret, {
+          :site => "https://api.foursquare.com/v2",
+          :authorize_url      => "https://foursquare.com/oauth2/authenticate",
+          :access_token_url   => "https://foursquare.com/oauth2/access_token"
+        }, options, &block)
       end
       
-      def auth_hash
-        OmniAuth::Utils.deep_merge(super, {
-          'uid' => user_hash['id'],
-          'user_info' => user_info,
-          'extra' => {'user_hash' => user_hash}
-        })
+      def user_data
+        @data ||= MultiJson.decode(@access_token.get(client.site+'/users/self', {'oauth_token' => @access_token.token}))
+      end
+      
+      def request_phase
+        options[:response_type] ||= 'code'
+        super
+      end
+      
+      def callback_phase
+        options[:grant_type] ||= 'authorization_code'
+        super
       end
       
       def user_info
-        user_hash = self.user_hash
-        
         {
-          'nickname' => user_hash['twitter'],
-          'first_name' => user_hash['firstname'],
-          'last_name' => user_hash['lastname'],
-          'email' => user_hash['email'],
-          'name' => "#{user_hash['firstname']} #{user_hash['lastname']}".strip,
-        # 'location' => user_hash['location'],
-          'image' => user_hash['photo'],
-        # 'description' => user_hash['description'],
-          'phone' => user_hash['phone'],
+          'nickname' => user_data['response']['user']['contact']['twitter'],
+          'first_name' => user_data['response']['user']['firstName'],
+          'last_name' => user_data['response']['user']['lastName'],
+          'email' => user_data['response']['user']['contact']['twitter'],
+          '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 user_hash
-        @user_hash ||= MultiJson.decode(@access_token.get('http://api.foursquare.com/v1/user.json').body)['user']
+      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
+end

data/lib/omniauth/strategies/google.rb

@@ -20,8 +20,10 @@ module OmniAuth
           :authorize_path => '/accounts/OAuthAuthorizeToken'
         }
 
-        options[:scope] ||= "http://www.google.com/m8/feeds"
-
+        google_contacts_auth = "http://www.google.com/m8/feeds"
+        options[:scope] ||= google_contacts_auth
+        options[:scope] << " #{google_contacts_auth}" unless options[:scope].include?(google_contacts_auth)
+        
         super(app, :google, consumer_key, consumer_secret, client_options, options)
       end
       

data/lib/omniauth/strategies/linked_in.rb

@@ -5,12 +5,18 @@ module OmniAuth
   module Strategies
     class LinkedIn < OmniAuth::Strategies::OAuth
       def initialize(app, consumer_key = nil, consumer_secret = nil, options = {}, &block)
-        super(app, :linked_in, consumer_key, consumer_secret,
-                {:site => 'https://api.linkedin.com',
-                :request_token_path => '/uas/oauth/requestToken',
-                :access_token_path => '/uas/oauth/accessToken',
-                :authorize_path => '/uas/oauth/authorize',
-                :scheme => :header}, 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
+        }
+
+        client_options[:authorize_path] = '/uas/oauth/authenticate' unless options[:sign_in] == false
+
+        '/uas/oauth/authorize'
+        super(app, :linked_in, consumer_key, consumer_secret, client_options, options, &block)
       end
       
       def auth_hash

data/lib/omniauth/strategies/miso.rb

@@ -0,0 +1,41 @@
+require 'omniauth/oauth'
+require 'multi_json'
+
+module OmniAuth
+  module Strategies
+    # 
+    # Authenticate to Miso via OAuth and retrieve basic
+    # user information.
+    #
+    # Usage:
+    #
+    #    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)
+      end
+      
+      def auth_hash
+        OmniAuth::Utils.deep_merge(super, {
+          'uid' => user_hash['id'],
+          'user_info' => user_info,
+          'extra' => {'user_hash' => user_hash}
+        })
+      end
+      
+      def user_info 
+        {
+          'nickname' => user_hash['username'],
+          'name' => user_hash['full_name'],
+          'image' => user_hash['profile_image_url'],
+          'description' => user_hash['tagline'],
+        }
+      end
+      
+      def user_hash
+        @user_hash ||= MultiJson.decode(@access_token.get('/api/oauth/v1/users/show.json').body)['user']
+      end
+    end
+  end
+end

data/lib/omniauth/strategies/oauth.rb

@@ -5,64 +5,66 @@ module OmniAuth
   module Strategies
     class OAuth
       include OmniAuth::Strategy
-      
+
       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
         super
       end
-      
+
       def consumer
         ::OAuth::Consumer.new(consumer_key, consumer_secret, consumer_options.merge(options[:client_options] || options[:consumer_options] || {}))
       end
 
       attr_reader :name
       attr_accessor :consumer_key, :consumer_secret, :consumer_options
-      
+
       def request_phase
         request_token = consumer.get_request_token(:oauth_callback => callback_url)
         (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))        
+          r.redirect(request_token.authorize_url(:oauth_callback => callback_url))
         end
-        
+
         r.finish
       end
-    
+
       def callback_phase
         request_token = ::OAuth::RequestToken.new(consumer, session['oauth'][name.to_s].delete('request_token'), session['oauth'][name.to_s].delete('request_secret'))
-        
+
         opts = {}
         if session['oauth'][name.to_s]['callback_confirmed']
-          opts[:oauth_verifier] = request['oauth_verifier']          
+          opts[:oauth_verifier] = request['oauth_verifier']
         else
-          opts[:oauth_callback] = callback_url  
+          opts[:oauth_callback] = callback_url
         end
 
         @access_token = request_token.get_access_token(opts)
         super
+      rescue ::Net::HTTPFatalError => e
+        fail!(:service_unavailable, e)
       rescue ::OAuth::Unauthorized => e
         fail!(:invalid_credentials, e)
       rescue ::MultiJson::DecodeError => e
         fail!(:invalid_response, e)
       end
-      
+
       def auth_hash
         OmniAuth::Utils.deep_merge(super, {
           'credentials' => {
-            'token' => @access_token.token, 
+            'token' => @access_token.token,
             'secret' => @access_token.secret
           }, 'extra' => {
             'access_token' => @access_token
           }
         })
       end
-      
+
       def unique_id
         nil
       end

data/lib/omniauth/strategies/oauth2.rb

@@ -64,7 +64,7 @@ module OmniAuth
         end
         
         verifier = request.params['code']
-        @access_token = client.web_server.get_access_token(verifier, :redirect_uri => callback_url)
+        @access_token = client.web_server.get_access_token(verifier, {:redirect_uri => callback_url}.merge(options))
         
         if @access_token.expires? && @access_token.expires_in <= 0
           client.request(:post, client.access_token_url, { 
@@ -72,8 +72,8 @@ module OmniAuth
               'grant_type' => 'refresh_token', 
               'client_secret' => client_secret,
               'refresh_token' => @access_token.refresh_token 
-            })
-          @access_token = client.web_server.get_access_token(verifier, :redirect_uri => callback_url)
+            }.merge(options))
+          @access_token = client.web_server.get_access_token(verifier, {:redirect_uri => callback_url}.merge(options))
         end
         
         super

data/lib/omniauth/strategies/trip_it.rb

@@ -17,19 +17,6 @@ module OmniAuth
                 :access_token_path  => "/oauth/access_token",
                 :authorize_url     => "https://www.tripit.com/oauth/authorize"}, options, &block)
       end
-      
-      def request_phase
-        request_token = consumer.get_request_token(:oauth_callback => callback_url)
-        (session[:oauth]||={})[name.to_sym] = {:callback_confirmed => request_token.callback_confirmed?, :request_token => request_token.token, :request_secret => request_token.secret}
-        r = Rack::Response.new
-        # For some reason, TripIt NEEDS the &oauth_callback query param or the user receives an error.
-        r.redirect request_token.authorize_url + "&oauth_callback=" + urlencode(callback_url)
-        r.finish
-      end
-      
-      def urlencode(str)
-        str.gsub(/[^a-zA-Z0-9_\.\-]/n) { sprintf('%%%02x', $&[0].ord) }
-      end
     end
   end
 end

metadata

@@ -2,7 +2,7 @@
 name: oa-oauth
 version: !ruby/object:Gem::Version 
   prerelease: 6
-  version: 0.2.0.beta4
+  version: 0.2.0.beta5
 platform: ruby
 authors: 
 - Michael Bleigh
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-11 00:00:00 -06:00
+date: 2011-03-01 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.2.0.beta4
+        version: 0.2.0.beta5
   type: :runtime
   prerelease: false
   version_requirements: *id001
@@ -143,6 +143,7 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
+- lib/oa-oauth.rb
 - lib/omniauth/oauth.rb
 - lib/omniauth/strategies/bitly.rb
 - lib/omniauth/strategies/dopplr.rb
@@ -156,6 +157,7 @@ files:
 - lib/omniauth/strategies/identica.rb
 - lib/omniauth/strategies/linked_in.rb
 - lib/omniauth/strategies/meetup.rb
+- lib/omniauth/strategies/miso.rb
 - lib/omniauth/strategies/netflix.rb
 - lib/omniauth/strategies/oauth.rb
 - lib/omniauth/strategies/oauth2.rb
@@ -184,7 +186,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3188666288228867303
+      hash: -2581674124664783395
       segments: 
       - 0
       version: "0"