Merge pull request #270 from banyan/redirect_back_or_to-work-with-ext…

…ernal

fix `redirect_back_or_to` when we login with externals

lib/sorcery/controller/submodules/external.rb

@@ -46,7 +46,9 @@ def login_from(provider)
             @provider.process_callback(params,session)
             @user_hash = @provider.get_user_hash
             if user = user_class.load_from_provider(provider,@user_hash[:uid].to_s)
+              return_to_url = session[:return_to_url]
               reset_session
+              session[:return_to_url] = return_to_url
               auto_login(user)
               user
             end

spec/rails3/app/controllers/application_controller.rb

@@ -137,6 +137,46 @@ def test_login_from5
     end
   end
 
+  def test_return_to_with_external
+    if @user = login_from(:twitter)
+      redirect_back_or_to "bla", :notice => "Success!"
+    else
+      redirect_to "blu", :alert => "Failed!"
+    end
+  end
+
+  def test_return_to_with_external2
+    if @user = login_from(:facebook)
+      redirect_back_or_to "bla", :notice => "Success!"
+    else
+      redirect_to "blu", :alert => "Failed!"
+    end
+  end
+
+  def test_return_to_with_external3
+    if @user = login_from(:github)
+      redirect_back_or_to "bla", :notice => "Success!"
+    else
+      redirect_to "blu", :alert => "Failed!"
+    end
+  end
+
+  def test_return_to_with_external4
+    if @user = login_from(:google)
+      redirect_back_or_to "bla", :notice => "Success!"
+    else
+      redirect_to "blu", :alert => "Failed!"
+    end
+  end
+
+  def test_return_to_with_external5
+    if @user = login_from(:liveid)
+      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/rails3/spec/controller_oauth2_spec.rb

@@ -81,6 +81,14 @@ def stub_all_oauth2_requests!
       flash[:alert].should == "Failed!"
     end
 
+    it "on successful login_from the user should be redirected to the url he originally wanted" do
+      sorcery_model_property_set(:authentications_class, Authentication)
+      create_new_external_user(:facebook)
+      get :test_return_to_with_external2, {}, :return_to_url => "fuu"
+      response.should redirect_to("fuu")
+      flash[:notice].should == "Success!"
+    end
+
   # provider: github
     it "login_at redirects correctly (github)" do
       create_new_user
@@ -103,6 +111,14 @@ def stub_all_oauth2_requests!
       flash[:alert].should == "Failed!"
     end
 
+    it "on successful login_from the user should be redirected to the url he originally wanted (github)" do
+      sorcery_model_property_set(:authentications_class, Authentication)
+      create_new_external_user(:github)
+      get :test_return_to_with_external3, {}, :return_to_url => "fuu"
+      response.should redirect_to("fuu")
+      flash[:notice].should == "Success!"
+    end
+
   # provider: google
     it "login_at redirects correctly (google)" do
       create_new_user
@@ -125,6 +141,14 @@ def stub_all_oauth2_requests!
       flash[:alert].should == "Failed!"
     end
 
+    it "on successful login_from the user should be redirected to the url he originally wanted (google)" do
+      sorcery_model_property_set(:authentications_class, Authentication)
+      create_new_external_user(:google)
+      get :test_return_to_with_external4, {}, :return_to_url => "fuu"
+      response.should redirect_to("fuu")
+      flash[:notice].should == "Success!"
+    end
+
   # provider: liveid
     it "login_at redirects correctly (liveid)" do
       create_new_user
@@ -147,6 +171,14 @@ def stub_all_oauth2_requests!
       flash[:alert].should == "Failed!"
     end
 
+    it "on successful login_from the user should be redirected to the url he originally wanted (liveid)" do
+      sorcery_model_property_set(:authentications_class, Authentication)
+      create_new_external_user(:liveid)
+      get :test_return_to_with_external5, {}, :return_to_url => "fuu"
+      response.should redirect_to("fuu")
+      flash[:notice].should == "Success!"
+    end
+
   end
 
 

spec/rails3/spec/controller_oauth_spec.rb

@@ -63,6 +63,15 @@ def stub_all_oauth_requests!
       get :test_login_from, :oauth_verifier => "blablaRERASDFcxvSDFA"
       flash[:alert].should == "Failed!"
     end
+
+    it "on successful 'login_from' the user should be redirected to the url he originally wanted" do
+      sorcery_model_property_set(:authentications_class, Authentication)
+      create_new_external_user(:twitter)
+      get :test_return_to_with_external, {}, :return_to_url => "fuu"
+      response.should redirect_to("fuu")
+      flash[:notice].should == "Success!"
+    end
+
   end
 
   describe ApplicationController do