projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '2412-do-not-reuse-task-work-dirs'
[arvados.git]
/
apps
/
workbench
/
app
/
controllers
/
sessions_controller.rb
diff --git
a/apps/workbench/app/controllers/sessions_controller.rb
b/apps/workbench/app/controllers/sessions_controller.rb
index 0d4e944f05db09e20863710b8adb243af0659d25..488c67c3c2e8b51cfb8990b9148d7b3b4d0a7f13 100644
(file)
--- a/
apps/workbench/app/controllers/sessions_controller.rb
+++ b/
apps/workbench/app/controllers/sessions_controller.rb
@@
-1,11
+1,12
@@
class SessionsController < ApplicationController
class SessionsController < ApplicationController
- skip_around_filter :thread_with_api_token, :only => [:destroy, :index]
+ skip_around_filter :thread_with_mandatory_api_token, :only => [:destroy, :index]
+ skip_around_filter :thread_with_optional_api_token, :only => [:destroy, :index]
skip_before_filter :find_object_by_uuid, :only => [:destroy, :index]
def destroy
session.clear
skip_before_filter :find_object_by_uuid, :only => [:destroy, :index]
def destroy
session.clear
- redirect_to $
orvos_api_client.orvos_logout_url(return_to: logged_ou
t_url)
+ redirect_to $
arvados_api_client.arvados_logout_url(return_to: roo
t_url)
end
def index
end
def index
- redirect_to root_url if session[:
orv
os_api_token]
+ redirect_to root_url if session[:
arvad
os_api_token]
end
end
end
end