omniauth-salesforce 1.0.0 → 1.0.1

data/lib/omniauth-salesforce/version.rb

@@ -1,5 +1,5 @@
 module OmniAuth
   module Salesforce
-    VERSION = "1.0.0"
+    VERSION = "1.0.1"
   end
 end

data/lib/omniauth/strategies/salesforce.rb

@@ -3,12 +3,29 @@ require 'omniauth-oauth2'
 module OmniAuth
   module Strategies
     class Salesforce < OmniAuth::Strategies::OAuth2
+
+      MOBILE_USER_AGENTS =  'webos|ipod|iphone|mobile'
+
       option :client_options, {
         :site          => 'https://login.salesforce.com',
         :authorize_url => '/services/oauth2/authorize',
         :token_url     => '/services/oauth2/token'
       }
+      option :authorize_options, [
+        :scope,
+        :display,
+        :immediate,
+        :state
+      ]
+
       def request_phase
+        req = Rack::Request.new(@env)
+        options.update(req.params)
+        ua = req.user_agent.to_s
+        if !options.has_key?(:display)
+          mobile_request = ua.downcase =~ Regexp.new(MOBILE_USER_AGENTS)
+          options[:display] = mobile_request ? 'touch' : 'page'
+        end
         super
       end
 
@@ -23,15 +40,9 @@ module OmniAuth
           'last_name'       => raw_info['last_name'],
           'location'        => '',
           'description'     => '',
-          'image'           => raw_info['nick_name'],
+          'image'           => raw_info['photos']['thumbnail'] + "?oauth_token=#{access_token.token}",
           'phone'           => '',
-          'urls'            => raw_info['urls'],
-          'organizationid'  => raw_info['organization_id'],
-          'userid'          => raw_info['user_id'],
-          'username'        => raw_info['username'],
-          'organization_id' => raw_info['organization_id'],
-          'user_id'         => raw_info['user_id'],
-          'user_name'       => raw_info['username']
+          'urls'            => raw_info['urls']
         }
       end
 
@@ -40,6 +51,22 @@ module OmniAuth
         access_token.options[:param_name] = :oauth_token
         @raw_info ||= access_token.post(access_token['id']).parsed
       end
+
+      extra do
+        raw_info.merge({
+          'instance_url' => access_token.params['instance_url'],
+          'pod' => access_token.params['instance_url']
+        })
+      end
+      
     end
+
+    class SalesforceSandbox < OmniAuth::Strategies::Salesforce
+      default_options[:client_options][:site] = 'https://test.salesforce.com'
+    end
+    class DatabaseDotCom < OmniAuth::Strategies::Salesforce
+      default_options[:client_options][:site] = 'https://login.database.com'
+    end
+
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-salesforce
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-08 00:00:00.000000000 Z
+date: 2011-12-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: omniauth
-  requirement: &2152205600 !ruby/object:Gem::Requirement
+  requirement: &2164515840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152205600
+  version_requirements: *2164515840
 - !ruby/object:Gem::Dependency
   name: omniauth-oauth2
-  requirement: &2152205080 !ruby/object:Gem::Requirement
+  requirement: &2164513340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152205080
+  version_requirements: *2164513340
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2152204500 !ruby/object:Gem::Requirement
+  requirement: &2164512840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '2.7'
   type: :development
   prerelease: false
-  version_requirements: *2152204500
+  version_requirements: *2164512840
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &2152204100 !ruby/object:Gem::Requirement
+  requirement: &2164504460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152204100
+  version_requirements: *2164504460
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &2152203620 !ruby/object:Gem::Requirement
+  requirement: &2164503920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152203620
+  version_requirements: *2164503920
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &2152203120 !ruby/object:Gem::Requirement
+  requirement: &2164503360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152203120
+  version_requirements: *2164503360
 description: OmniAuth strategy for salesforce.com.
 email:
 - rvanhook@salesforce.com