oa-oauth 0.1.6 → 0.2.0.beta1

data/README.rdoc

@@ -30,6 +30,6 @@ If you want to allow multiple providers, use the OmniAuth Builder:
     
     use OmniAuth::Builder do
       provider :twitter, 'consumer_key', 'consumer_secret'
-      provider :facebook, 'app_id', 'app_secret'
+      provider :facebook, 'client_id', 'client_secret'
     end
     

data/lib/omniauth/oauth.rb

@@ -17,5 +17,6 @@ module OmniAuth
     autoload :Dopplr,             'omniauth/strategies/dopplr'
     autoload :Meetup,             'omniauth/strategies/meetup'
     autoload :SoundCloud,         'omniauth/strategies/sound_cloud'
+    autoload :SmugMug,            'omniauth/strategies/smug_mug'
   end
 end

data/lib/omniauth/strategies/dopplr.rb

@@ -10,13 +10,43 @@ module OmniAuth
     #    use OmniAuth::Strategies::Dopplr, 'consumerkey', 'consumersecret'
     #
     class Dopplr < OmniAuth::Strategies::OAuth
-      def initialize(app, consumer_key, consumer_secret)
-        super(app, :dopplr, consumer_key, consumer_secret,
-                :site => 'https://www.dopplr.com',
-                :request_token_path => "/oauth/request_token",
-                :access_token_path  => "/oauth/access_token",
-                :authorize_path    => "/oauth/authorize")
-      end     
+      # 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)
+        client_options = {
+          :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  
+      
+      def user_data
+        @data ||= MultiJson.decode(@access_token.get('/oauthapi/whoami').body)['whoami']
+      end
+      
+      def user_info
+        {
+          '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"],
+          }
+        }
+      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/facebook.rb

@@ -7,15 +7,14 @@ module OmniAuth
     # basic user information.
     #
     # @example Basic Usage
-    #   use OmniAuth::Strategies::Facebook, 'app_id', 'app_secret'
+    #   use OmniAuth::Strategies::Facebook, 'client_id', 'client_secret'
     class Facebook < OAuth2
       # @param [Rack Application] app standard middleware application parameter
-      # @param [String] app_id the application id as [registered on Facebook](http://www.facebook.com/developers/)
-      # @param [String] app_secret the application secret as registered on Facebook
+      # @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, app_id, app_secret, options = {})
-        options[:site] = 'https://graph.facebook.com/'
-        super(app, :facebook, app_id, app_secret, options)
+      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)
       end
       
       def user_data
@@ -30,9 +29,11 @@ module OmniAuth
       def user_info
         {
           'nickname' => user_data["link"].split('/').last,
+          '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"],

data/lib/omniauth/strategies/foursquare.rb

@@ -1,9 +1,22 @@
+require 'omniauth/oauth'
+require 'multi_json'
+
 module OmniAuth
   module Strategies
     class Foursquare < OAuth
-      def initialize(app, consumer_key, consumer_secret)
-        super(app, :foursquare, consumer_key, consumer_secret,
-                :site => 'http://foursquare.com')
+      # 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)
       end
       
       def auth_hash

data/lib/omniauth/strategies/github.rb

@@ -8,13 +8,16 @@ module OmniAuth
     # and provide the proper credentials to this middleware.
     class GitHub < OAuth2
       # @param [Rack Application] app standard middleware application argument
-      # @param [String] app_id the application ID for your client
-      # @param [String] app_secret the application secret
-      def initialize(app, app_id, app_secret, options = {})
-        options[:site] = 'https://github.com/'
-        options[:authorize_path] = '/login/oauth/authorize'
-        options[:access_token_path] = '/login/oauth/access_token'
-        super(app, :github, app_id, app_secret, options)
+      # @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)
+        client_options = {
+          :site => 'https://github.com/',
+          :authorize_path => '/login/oauth/authorize',
+          :access_token_path => '/login/oauth/access_token'
+        }
+        
+        super(app, :github, client_id, client_secret, client_options, options, &block)
       end
       
       protected

data/lib/omniauth/strategies/gowalla.rb

@@ -14,11 +14,14 @@ module OmniAuth
       # @param [String] api_key the application id as [registered on Gowalla](http://gowalla.com/api/keys)
       # @param [String] secret_key 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, api_key, secret_key, options = {})
-        options[:site] = 'https://api.gowalla.com/api/oauth'
-        options[:authorize_url] = 'https://gowalla.com/api/oauth/new'
-        options[:access_token_url] = 'https://api.gowalla.com/api/oauth/token'
-        super(app, :gowalla, api_key, secret_key, options)
+      def initialize(app, api_key = nil, secret_key = nil, options = {}, &block)
+        client_options = {
+          :site => 'https://api.gowalla.com/api/oauth',
+          :authorize_url => 'https://gowalla.com/api/oauth/new',
+          :access_token_url => 'https://api.gowalla.com/api/oauth/token'
+        }
+        
+        super(app, :gowalla, api_key, secret_key, client_options, options, &block)
       end
       
       protected

data/lib/omniauth/strategies/identica.rb

@@ -12,17 +12,17 @@ module OmniAuth
     #    use OmniAuth::Strategies::Identica, 'consumerkey', 'consumersecret'
     #
     class Identica < OmniAuth::Strategies::OAuth
-      def initialize(app, consumer_key, consumer_secret)
+      def initialize(app, consumer_key = nil, consumer_secret = nil, options = {}, &block)
         super(app, :identica, consumer_key, consumer_secret,
-                :site => 'http://identi.ca',
+                {:site => 'http://identi.ca',
                 :request_token_path => "/api/oauth/request_token",
                 :access_token_path  => "/api/oauth/access_token",
-                :authorize_path     => "/api/oauth/authorize")
+                :authorize_path     => "/api/oauth/authorize"}, options, &block)
       end
 
       def auth_hash
         OmniAuth::Utils.deep_merge(super, {
-          'uid' => @access_token.params[:user_id],
+          'uid' => user_hash['id'],
           'user_info' => user_info,
           'extra' => {'user_hash' => user_hash}
         })

data/lib/omniauth/strategies/linked_in.rb

@@ -4,13 +4,13 @@ require 'omniauth/oauth'
 module OmniAuth
   module Strategies
     class LinkedIn < OmniAuth::Strategies::OAuth
-      def initialize(app, consumer_key, consumer_secret)
+      def initialize(app, consumer_key = nil, consumer_secret = nil, options = {}, &block)
         super(app, :linked_in, consumer_key, consumer_secret,
-                :site => 'https://api.linkedin.com',
+                {:site => 'https://api.linkedin.com',
                 :request_token_path => '/uas/oauth/requestToken',
                 :access_token_path => '/uas/oauth/accessToken',
                 :authorize_path => '/uas/oauth/authorize',
-                :scheme => :header)
+                :scheme => :header}, options, &block)
       end
       
       def auth_hash
@@ -23,7 +23,7 @@ module OmniAuth
       end
       
       def user_hash(access_token)
-        person = Nokogiri::XML::Document.parse(@access_token.get('/v1/people/~:(id,first-name,last-name,headline,member-url-resources,picture-url,location)').body).xpath('person')
+        person = Nokogiri::XML::Document.parse(@access_token.get('/v1/people/~:(id,first-name,last-name,headline,member-url-resources,picture-url,location,public-profile-url)').body).xpath('person')
         
         hash = {
           'id' => person.xpath('id').text,
@@ -38,7 +38,9 @@ module OmniAuth
           end
         }
         
-        hash[:name] = "#{hash['first_name']} #{hash['last_name']}"
+        hash['urls']['LinkedIn'] = person.xpath('public-profile-url').text
+        hash['name'] = "#{hash['first_name']} #{hash['last_name']}"
+        
         hash
       end
     end

data/lib/omniauth/strategies/meetup.rb

@@ -11,12 +11,12 @@ module OmniAuth
     #    use OmniAuth::Strategies::Meetup, 'consumerkey', 'consumersecret'
     #
     class Meetup < OmniAuth::Strategies::OAuth
-      def initialize(app, consumer_key, consumer_secret)
+      def initialize(app, consumer_key = nil, consumer_secret = nil, options = {}, &block)
         super(app, :meetup, consumer_key, consumer_secret,
                 # :site => 'https://api.meetup.com',
-                :request_token_path => "https://api.meetup.com/oauth/request",
+                {:request_token_path => "https://api.meetup.com/oauth/request",
                 :access_token_path  => "https://api.meetup.com/oauth/access",
-                :authorize_path     => "http://www.meetup.com/authorize/")
+                :authorize_path     => "http://www.meetup.com/authorize/"}, options)
       end
     end
   end

data/lib/omniauth/strategies/oauth.rb

@@ -6,23 +6,40 @@ module OmniAuth
     class OAuth
       include OmniAuth::Strategy
       
-      def initialize(app, name, consumer_key, consumer_secret, options = {})
+      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
-        @consumer = ::OAuth::Consumer.new(consumer_key, consumer_secret, options)
       end
-      attr_reader :name, :consumer
-    
+      
+      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_sym] = {:callback_confirmed => request_token.callback_confirmed?, :request_token => request_token.token, :request_secret => request_token.secret}
         r = Rack::Response.new
-        r.redirect request_token.authorize_url
+        
+        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
     
       def callback_phase
         request_token = ::OAuth::RequestToken.new(consumer, session[:oauth][name.to_sym].delete(:request_token), session[:oauth][name.to_sym].delete(:request_secret))
-        @access_token = request_token.get_access_token(:oauth_verifier => request.params['oauth_verifier'])
+        
+        opts = {}
+        opts[:oauth_callback] = callback_url if session[:oauth][:callback_confirmed]
+        @access_token = request_token.get_access_token(opts)
         super
       rescue ::OAuth::Unauthorized => e
         fail!(:invalid_credentials, e)

data/lib/omniauth/strategies/oauth2.rb

@@ -16,7 +16,7 @@ module OmniAuth
       # The options passed in to the strategy.
       attr_accessor :options
       # The `OAuth2::Client` for this strategy.
-      attr_accessor :client
+      attr_accessor :client_id, :client_secret, :client_options
       
       # An error that is indicated in the OAuth 2.0 callback.
       # This could be a `redirect_uri_mismatch` or other 
@@ -37,10 +37,15 @@ module OmniAuth
       # @param [String] client_id the client/application ID of this provider
       # @param [String] client_secret the client/application secret of this provider
       # @param [Hash] options that will be passed through to the OAuth2::Client (see [oauth2 docs](http://rubydoc.info/gems/oauth2))
-      def initialize(app, name, client_id, client_secret, options = {})
-        super(app, name)
-        self.options = options
-        self.client = ::OAuth2::Client.new(client_id, client_secret, options)
+      def initialize(app, name, client_id = nil, client_secret = nil, client_options = {}, options = {}, &block)
+        self.client_id = client_id
+        self.client_secret = client_secret
+        self.client_options = client_options
+        super
+      end
+      
+      def client
+        ::OAuth2::Client.new(client_id, client_secret, client_options.merge(options[:client_options] || {}))
       end
       
       protected

data/lib/omniauth/strategies/smug_mug.rb

@@ -0,0 +1,42 @@
+require 'omniauth/oauth'
+require 'multi_json'
+
+module OmniAuth
+  module Strategies
+    #
+    # Authenticate to SmugMug via OAuth and retrieve basic user information.
+    # Usage:
+    #    use OmniAuth::Strategies::SmugMug, 'consumerkey', 'consumersecret'
+    #
+    class SmugMug < OmniAuth::Strategies::OAuth
+      def initialize(app, consumer_key = nil, consumer_secret = nil, options = {}, &block)
+        super(app, :smugmug, consumer_key, consumer_secret,
+                {:site               => 'http://api.smugmug.com',
+                :request_token_path => "/services/oauth/getRequestToken.mg",
+                :access_token_path  => "/services/oauth/getAccessToken.mg",
+                :authorize_path     => "/services/oauth/authorize.mg"}, options, &block)
+      end
+      
+      def auth_hash
+        OmniAuth::Utils.deep_merge(super, {
+          'uid' => user_hash['id'],
+          'user_info' => user_info,
+          'extra' => { 'user_hash' => user_hash }
+        })
+      end
+      
+      # user info according to schema
+      def user_info
+        { 
+          'nickname' => user_hash['NickName'],
+          'name' => user_hash['NickName']
+        }
+      end
+      
+      # info as supplied by SmugMug
+      def user_hash
+        @user_hash ||= MultiJson.decode(@access_token.get('/services/api/json/1.2.2/?method=smugmug.auth.checkAccessToken').body)['Auth']['User']
+      end
+    end
+  end
+end

data/lib/omniauth/strategies/sound_cloud.rb

@@ -13,8 +13,8 @@ module OmniAuth
     #
     
     class SoundCloud < OmniAuth::Strategies::OAuth
-      def initialize(app, consumer_key, consumer_secret)
-        super(app, :soundcloud, consumer_key, consumer_secret, :site => 'https://api.soundcloud.com')
+      def initialize(app, consumer_key = nil, consumer_secret = nil, options = {}, &block)
+        super(app, :soundcloud, consumer_key, consumer_secret, {:site => 'https://api.soundcloud.com'}, options)
       end
       
       def auth_hash

data/lib/omniauth/strategies/thirty_seven_signals.rb

@@ -4,11 +4,14 @@ require 'multi_json'
 module OmniAuth
   module Strategies
     class ThirtySevenSignals < OAuth2
-      def initialize(app, app_id, app_secret, options = {})
-        options[:site] = 'https://launchpad.37signals.com/'
-        options[:authorize_path] = '/authorization/new'
-        options[:access_token_path] = '/authorization/token'
-        super(app, :thirty_seven_signals, app_id, app_secret, options)
+      def initialize(app, client_id = nil, client_secret = nil, options = {}, &block)
+        client_options = {
+          :site => 'https://launchpad.37signals.com/',
+          :authorize_path => '/authorization/new',
+          :access_token_path => '/authorization/token'
+        } 
+        
+        super(app, :thirty_seven_signals, client_id, client_secret, client_options, options, &block)
       end
       
       def user_data

data/lib/omniauth/strategies/trip_it.rb

@@ -10,12 +10,12 @@ module OmniAuth
     #    use OmniAuth::Strategies::TripIt, 'consumerkey', 'consumersecret'
     #
     class TripIt < OmniAuth::Strategies::OAuth
-      def initialize(app, consumer_key, consumer_secret)
+      def initialize(app, consumer_key = nil, consumer_secret = nil, options = {}, &block)
         super(app, :tripit, consumer_key, consumer_secret,
-                :site => 'https://api.tripit.com',
+                {:site => 'https://api.tripit.com',
                 :request_token_path => "/oauth/request_token",
                 :access_token_path  => "/oauth/access_token",
-                :authorize_url     => "https://www.tripit.com/oauth/authorize")
+                :authorize_url     => "https://www.tripit.com/oauth/authorize"}, options, &block)
       end
       
       def request_phase

data/lib/omniauth/strategies/twitter.rb

@@ -12,10 +12,16 @@ module OmniAuth
     #    use OmniAuth::Strategies::Twitter, 'consumerkey', 'consumersecret'
     #
     class Twitter < OmniAuth::Strategies::OAuth
-      def initialize(app, consumer_key, consumer_secret)
-        super(app, :twitter, consumer_key, consumer_secret,
-                :site => 'https://api.twitter.com',
-                :authorize_path => '/oauth/authenticate')
+      # Initialize the middleware
+      #
+      # @option options [Boolean, true] :sign_in When true, use the "Sign in with Twitter" flow instead of the authorization flow.
+      def initialize(app, consumer_key = nil, consumer_secret = nil, options = {}, &block)
+        client_options = {
+          :site => 'https://api.twitter.com'
+        }
+        
+        client_options[:authorize_path] = '/oauth/authenticate' unless options[:sign_in] == false
+        super(app, :twitter, consumer_key, consumer_secret, client_options, options)
       end
       
       def auth_hash
@@ -35,7 +41,10 @@ module OmniAuth
           'location' => user_hash['location'],
           'image' => user_hash['profile_image_url'],
           'description' => user_hash['description'],
-          'urls' => {'Website' => user_hash['url']}
+          'urls' => {
+            'Website' => user_hash['url'],
+            'Twitter' => 'http://twitter.com/' + user_hash['screen_name']
+          }
         }
       end
       

metadata

@@ -1,13 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: oa-oauth
 version: !ruby/object:Gem::Version 
-  hash: 23
-  prerelease: false
+  hash: -1848230051
+  prerelease: true
   segments: 
   - 0
-  - 1
-  - 6
-  version: 0.1.6
+  - 2
+  - 0
+  - beta1
+  version: 0.2.0.beta1
 platform: ruby
 authors: 
 - Michael Bleigh
@@ -15,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-25 00:00:00 -05:00
+date: 2010-11-29 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -24,12 +25,13 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 23
+        hash: -1848230051
         segments: 
         - 0
-        - 1
-        - 6
-        version: 0.1.6
+        - 2
+        - 0
+        - beta1
+        version: 0.2.0.beta1
   requirement: *id001
   name: oa-core
   prerelease: false
@@ -212,6 +214,7 @@ files:
 - lib/omniauth/strategies/meetup.rb
 - lib/omniauth/strategies/oauth.rb
 - lib/omniauth/strategies/oauth2.rb
+- lib/omniauth/strategies/smug_mug.rb
 - lib/omniauth/strategies/sound_cloud.rb
 - lib/omniauth/strategies/thirty_seven_signals.rb
 - lib/omniauth/strategies/trip_it.rb
@@ -240,12 +243,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 25
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: