add specs for Salesforce provider

Gemfile

@@ -2,6 +2,7 @@ source 'https://rubygems.org'
 
 gem 'rails', '~> 3.2'
 gem 'sqlite3'
+gem 'pry'
 
 group :mongomapper do
   gem 'mongo_mapper'

README.md

@@ -37,7 +37,7 @@ Hopefully, I've achieved this. If not, let me know.
 
 ## Useful Links
 
-[Documentation](http://rubydoc.info/gems/sorcery) | 
+[Documentation](http://rubydoc.info/gems/sorcery) |
 [Railscast](http://railscasts.com/episodes/283-authentication-with-sorcery) | [Simple tutorial](https://github.com/NoamB/sorcery/wiki/Simple-Password-Authentication) | [Example Rails 3 app](https://github.com/NoamB/sorcery-example-app)
 
 Check out the tutorials in the [Wiki](https://github.com/NoamB/sorcery/wiki) for more!
@@ -245,7 +245,7 @@ STI is supported via a single setting in config/initializers/sorcery.rb.
 **External** (see [lib/sorcery/controller/submodules/external.rb](https://github.com/NoamB/sorcery/blob/master/lib/sorcery/controller/submodules/external.rb)):
 
 *   OAuth1 and OAuth2 support (currently: Twitter, Facebook, Github, Google, Heroku,
-    LinkedIn, VK, LiveID and Xing)
+    LinkedIn, VK, LiveID, Xing, and Salesforce)
 *   configurable db field names and authentications table.
 
 

lib/generators/sorcery/templates/initializer.rb

@@ -73,7 +73,7 @@
 
 
   # -- external --
-  # What providers are supported by this app, i.e. [:twitter, :facebook, :github, :linkedin, :xing, :google, :liveid] .
+  # What providers are supported by this app, i.e. [:twitter, :facebook, :github, :linkedin, :xing, :google, :liveid, :salesforce] .
   # Default: `[]`
   #
   # config.external_providers =

spec/controllers/controller_oauth2_spec.rb

@@ -137,7 +137,7 @@
       expect(flash[:notice]).to eq "Success!"
     end
 
-    [:github, :google, :liveid, :vk].each do |provider|
+    [:github, :google, :liveid, :vk, :salesforce].each do |provider|
 
       describe "with #{provider}" do
 
@@ -190,7 +190,7 @@
       end
 
       sorcery_reload!([:user_activation,:external], :user_activation_mailer => ::SorceryMailer)
-      sorcery_controller_property_set(:external_providers, [:facebook, :github, :google, :liveid, :vk])
+      sorcery_controller_property_set(:external_providers, [:facebook, :github, :google, :liveid, :vk, :salesforce])
 
       sorcery_controller_external_property_set(:facebook, :key, "eYVNBjBDi33aa9GkA3w")
       sorcery_controller_external_property_set(:facebook, :secret, "XpbeSdCoaKSmQGSeokz5qcUATClRW5u08QWNfv71N8")
@@ -207,6 +207,9 @@
       sorcery_controller_external_property_set(:vk, :key, "eYVNBjBDi33aa9GkA3w")
       sorcery_controller_external_property_set(:vk, :secret, "XpbeSdCoaKSmQGSeokz5qcUATClRW5u08QWNfv71N8")
       sorcery_controller_external_property_set(:vk, :callback_url, "http://blabla.com")
+      sorcery_controller_external_property_set(:salesforce, :key, "eYVNBjBDi33aa9GkA3w")
+      sorcery_controller_external_property_set(:salesforce, :secret, "XpbeSdCoaKSmQGSeokz5qcUATClRW5u08QWNfv71N8")
+      sorcery_controller_external_property_set(:salesforce, :callback_url, "http://blabla.com")
     end
 
     after(:all) do
@@ -235,7 +238,7 @@
       expect(ActionMailer::Base.deliveries.size).to eq old_size
     end
 
-    [:github, :google, :liveid, :vk].each do |provider|
+    [:github, :google, :liveid, :vk, :salesforce].each do |provider|
       it "does not send activation email to external users (#{provider})" do
         old_size = ActionMailer::Base.deliveries.size
         create_new_external_user provider
@@ -266,7 +269,7 @@
       end
     end
 
-    %w(facebook github google liveid vk).each do |provider|
+    %w(facebook github google liveid vk salesforce).each do |provider|
       context "when #{provider}" do
         before(:each) do
           sorcery_controller_property_set(:register_login_time, true)
@@ -306,7 +309,7 @@
 
     let(:user) { double('user', id: 42) }
 
-    %w(facebook github google liveid vk).each do |provider|
+    %w(facebook github google liveid vk salesforce).each do |provider|
       context "when #{provider}" do
         before(:each) do
           sorcery_model_property_set(:authentications_class, Authentication)
@@ -346,6 +349,7 @@ def stub_all_oauth2_requests!
     response        = double(OAuth2::Response)
     allow(response).to receive(:body) { {
       "id"=>"123",
+      "user_id"=>"123", # Needed for Salesforce
       "name"=>"Noam Ben Ari",
       "first_name"=>"Noam",
       "last_name"=>"Ben Ari",
@@ -376,7 +380,7 @@ def stub_all_oauth2_requests!
   end
 
   def set_external_property
-    sorcery_controller_property_set(:external_providers, [:facebook, :github, :google, :liveid, :vk])
+    sorcery_controller_property_set(:external_providers, [:facebook, :github, :google, :liveid, :vk, :salesforce])
     sorcery_controller_external_property_set(:facebook, :key, "eYVNBjBDi33aa9GkA3w")
     sorcery_controller_external_property_set(:facebook, :secret, "XpbeSdCoaKSmQGSeokz5qcUATClRW5u08QWNfv71N8")
     sorcery_controller_external_property_set(:facebook, :callback_url, "http://blabla.com")
@@ -392,16 +396,19 @@ def set_external_property
     sorcery_controller_external_property_set(:vk, :key, "eYVNBjBDi33aa9GkA3w")
     sorcery_controller_external_property_set(:vk, :secret, "XpbeSdCoaKSmQGSeokz5qcUATClRW5u08QWNfv71N8")
     sorcery_controller_external_property_set(:vk, :callback_url, "http://blabla.com")
+    sorcery_controller_external_property_set(:salesforce, :key, "eYVNBjBDi33aa9GkA3w")
+    sorcery_controller_external_property_set(:salesforce, :secret, "XpbeSdCoaKSmQGSeokz5qcUATClRW5u08QWNfv71N8")
+    sorcery_controller_external_property_set(:salesforce, :callback_url, "http://blabla.com")
   end
 
   def provider_url(provider)
     {
       github: "https://github.com/login/oauth/authorize?client_id=#{::Sorcery::Controller::Config.github.key}&display=&redirect_uri=http%3A%2F%2Fblabla.com&response_type=code&scope=&state=",
       google: "https://accounts.google.com/o/oauth2/auth?client_id=#{::Sorcery::Controller::Config.google.key}&display=&redirect_uri=http%3A%2F%2Fblabla.com&response_type=code&scope=https%3A%2F%2Fwww.googleapis.com%2Fauth%2Fuserinfo.email+https%3A%2F%2Fwww.googleapis.com%2Fauth%2Fuserinfo.profile&state=",
       liveid: "https://oauth.live.com/authorize?client_id=#{::Sorcery::Controller::Config.liveid.key}&display=&redirect_uri=http%3A%2F%2Fblabla.com&response_type=code&scope=wl.basic+wl.emails+wl.offline_access&state=",
-      vk: "https://oauth.vk.com/authorize?client_id=#{::Sorcery::Controller::Config.vk.key}&display=&redirect_uri=http%3A%2F%2Fblabla.com&response_type=code&scope=#{::Sorcery::Controller::Config.vk.scope}&state="
+      vk: "https://oauth.vk.com/authorize?client_id=#{::Sorcery::Controller::Config.vk.key}&display=&redirect_uri=http%3A%2F%2Fblabla.com&response_type=code&scope=#{::Sorcery::Controller::Config.vk.scope}&state=",
+      salesforce: "https://login.salesforce.com/services/oauth2/authorize?client_id=#{::Sorcery::Controller::Config.salesforce.key}&display=&redirect_uri=http%3A%2F%2Fblabla.com&response_type=code&scope=#{::Sorcery::Controller::Config.salesforce.scope}&state="
     }[provider]
   end
-
 end
 

spec/rails_app/app/controllers/sorcery_controller.rb

@@ -106,6 +106,10 @@ def login_at_test_vk
     login_at(:vk)
   end
 
+  def login_at_test_salesforce
+    login_at(:salesforce)
+  end
+
   def login_at_test_with_state
     login_at(:facebook, {state: 'bla'})
   end
@@ -168,6 +172,14 @@ def test_login_from_jira
     end
   end
 
+  def test_login_from_salesforce
+    if @user = login_from(:salesforce)
+      redirect_to 'bla', notice: 'Success!'
+    else
+      redirect_to 'blu', alert: 'Failed!'
+    end
+  end
+
   def test_return_to_with_external_twitter
     if @user = login_from(:twitter)
       redirect_back_or_to 'bla', notice: 'Success!'
@@ -226,6 +238,14 @@ def test_return_to_with_external_vk
     end
   end
 
+  def test_return_to_with_external_salesforce
+    if @user = login_from(:salesforce)
+      redirect_back_or_to 'bla', notice: 'Success!'
+    else
+      redirect_to 'blu', alert: 'Failed!'
+    end
+  end
+
   def test_create_from_provider
     provider = params[:provider]
     login_from(provider)

spec/rails_app/config/routes.rb

@@ -23,6 +23,7 @@
     get :test_login_from_liveid
     get :test_login_from_vk
     get :test_login_from_jira
+    get :test_login_from_salesforce
     get :login_at_test
     get :login_at_test_twitter
     get :login_at_test_facebook
@@ -31,6 +32,7 @@
     get :login_at_test_liveid
     get :login_at_test_vk
     get :login_at_test_jira
+    get :login_at_test_salesforce
     get :test_return_to_with_external
     get :test_return_to_with_external_twitter
     get :test_return_to_with_external_facebook
@@ -39,6 +41,7 @@
     get :test_return_to_with_external_liveid
     get :test_return_to_with_external_vk
     get :test_return_to_with_external_jira
+    get :test_return_to_with_external_salesforce
     get :test_http_basic_auth
     get :some_action_making_a_non_persisted_change_to_the_user
     post :test_login_with_remember