projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
19297: Raises an error only when no object types have the requested attribute.
[arvados.git]
/
services
/
api
/
app
/
controllers
/
user_sessions_controller.rb
diff --git
a/services/api/app/controllers/user_sessions_controller.rb
b/services/api/app/controllers/user_sessions_controller.rb
index aec586ecd77f37d1aff9d7ba64a4c3895ceca0b0..ae34fa76006aabe6c7866cee09d8249f58254567 100644
(file)
--- a/
services/api/app/controllers/user_sessions_controller.rb
+++ b/
services/api/app/controllers/user_sessions_controller.rb
@@
-90,14
+90,14
@@
class UserSessionsController < ApplicationController
flash[:notice] = params[:message]
end
flash[:notice] = params[:message]
end
- # logout -
Clear our rack session BUT essentially redirect to the provider
- #
to clean up the Devise session from there too !
+ # logout -
this gets intercepted by controller, so this is probably
+ #
mostly dead code at this point.
def logout
session[:user_id] = nil
flash[:notice] = 'You have logged off'
return_to = params[:return_to] || root_url
def logout
session[:user_id] = nil
flash[:notice] = 'You have logged off'
return_to = params[:return_to] || root_url
- redirect_to
"#{Rails.configuration.Services.SSO.ExternalURL}users/sign_out?redirect_uri=#{CGI.escape return_to}"
+ redirect_to
return_to
end
# login. Redirect to LoginCluster.
end
# login. Redirect to LoginCluster.