oa-oauth 0.2.0 → 0.2.1

data/lib/omniauth/oauth.rb

@@ -17,6 +17,7 @@ module OmniAuth
     autoload :TripIt,             'omniauth/strategies/trip_it'
     autoload :Dopplr,             'omniauth/strategies/dopplr'
     autoload :Meetup,             'omniauth/strategies/meetup'
+    autoload :Salesforce,         'omniauth/strategies/salesforce'
     autoload :SoundCloud,         'omniauth/strategies/sound_cloud'
     autoload :SmugMug,            'omniauth/strategies/smug_mug'
     autoload :Goodreads,          'omniauth/strategies/goodreads'

data/lib/omniauth/strategies/oauth.rb

@@ -1,3 +1,4 @@
+require 'multi_json'
 require 'oauth'
 require 'omniauth/oauth'
 
@@ -13,6 +14,7 @@ module OmniAuth
         super
         self.options[:open_timeout] ||= 30
         self.options[:read_timeout] ||= 30
+        self.options[:authorize_params] = options[:authorize_params] || {}
       end
 
       def consumer
@@ -32,9 +34,9 @@ module OmniAuth
         r = Rack::Response.new
 
         if request_token.callback_confirmed?
-          r.redirect(request_token.authorize_url)
+          r.redirect(request_token.authorize_url(options[:authorize_params]))
         else
-          r.redirect(request_token.authorize_url(:oauth_callback => callback_url))
+          r.redirect(request_token.authorize_url(options[:authorize_params].merge(:oauth_callback => callback_url)))
         end
 
         r.finish

data/lib/omniauth/strategies/salesforce.rb

@@ -0,0 +1,44 @@
+require 'omniauth/strategies/oauth2'
+
+module OmniAuth
+  module Strategies
+    class Salesforce < OmniAuth::Strategies::OAuth2
+      def initialize(app, consumer_key = nil, consumer_secret = nil, options = {}, &block)
+        client_options = {
+          :site => 'https://login.salesforce.com',
+          :authorize_path => '/services/oauth2/authorize',
+          :access_token_path => '/services/oauth2/token'
+        }
+        
+        options.merge!(:response_type => 'code', :grant_type => 'authorization_code')
+
+        super(app, :salesforce, consumer_key, consumer_secret, client_options, options, &block)
+      end
+
+      def auth_hash
+        data = user_data
+        OmniAuth::Utils.deep_merge(super, {
+          'uid' => @access_token['id'],
+          'credentials' => {
+            'instance_url' => @access_token['instance_url']
+           },
+          'extra' => {'user_hash' => data},
+          'user_info' => {
+            'email' => data['email'],
+            'name' => data['display_name']
+          }
+        })
+      end
+
+      def user_data
+        @data ||= MultiJson.decode(@access_token.get(@access_token['id']))
+      rescue ::OAuth2::HTTPError => 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/twitter.rb

@@ -20,6 +20,7 @@ module OmniAuth
           :site => 'https://api.twitter.com'
         }
         
+        options[:authorize_params] = {:force_login => 'true'} if options.delete(:force_login) == true
         client_options[:authorize_path] = '/oauth/authenticate' unless options[:sign_in] == false
         super(app, :twitter, consumer_key, consumer_secret, client_options, options)
       end

metadata

@@ -2,7 +2,7 @@
 name: oa-oauth
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors: 
 - Michael Bleigh
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-11 00:00:00 -06:00
+date: 2011-04-05 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.2.0
+        version: 0.2.1
   type: :runtime
   prerelease: false
   version_requirements: *id001
@@ -64,7 +64,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.1.1
+        version: 0.2.0
   type: :runtime
   prerelease: false
   version_requirements: *id005
@@ -178,6 +178,7 @@ files:
 - lib/omniauth/strategies/netflix.rb
 - lib/omniauth/strategies/oauth.rb
 - lib/omniauth/strategies/oauth2.rb
+- lib/omniauth/strategies/salesforce.rb
 - lib/omniauth/strategies/smug_mug.rb
 - lib/omniauth/strategies/sound_cloud.rb
 - lib/omniauth/strategies/thirty_seven_signals.rb
@@ -205,7 +206,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -2125816653041836513
+      hash: -1141434774696898432
       segments: 
       - 0
       version: "0"
@@ -214,7 +215,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -2125816653041836513
+      hash: -1141434774696898432
       segments: 
       - 0
       version: "0"