From: Tom Clegg <tom@clinicalfuture.com>
Date: Fri, 1 Feb 2013 05:57:31 +0000 (-0800)
Subject: support return_to after logout
X-Git-Tag: 1.1.0~3452
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/dfa941be22b95671a8d75d1a5f995bb059ad3a9b

support return_to after logout
---

diff --git a/app/controllers/user_sessions_controller.rb b/app/controllers/user_sessions_controller.rb
index f941cb0653..1e61392f5f 100644
--- a/app/controllers/user_sessions_controller.rb
+++ b/app/controllers/user_sessions_controller.rb
@@ -64,7 +64,8 @@ class UserSessionsController < ApplicationController
     session[:user_id] = nil
 
     flash[:notice] = 'You have logged off'
-    redirect_to "#{CUSTOM_PROVIDER_URL}/users/sign_out?redirect_uri=#{root_url}"
+    return_to = params[:return_to] || root_url
+    redirect_to "#{CUSTOM_PROVIDER_URL}/users/sign_out?redirect_uri=#{CGI.escape return_to}"
   end
 
   # login - Just bounce to /auth/joshid. The only purpose of this function is