projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'refs/remotes/origin/2939-create-params' into origin...
[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 7967111fff748717a0a47c8a2643c8722007587d..585f322a859186d06ba02d9b8a37e8f50c965490 100644
(file)
--- a/
apps/workbench/app/controllers/sessions_controller.rb
+++ b/
apps/workbench/app/controllers/sessions_controller.rb
@@
-1,9
+1,10
@@
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
$
arvados_api_client.arvados_logout_url(return_to: root_url)
+ redirect_to arvados_api_client.arvados_logout_url(return_to: root_url)
end
def index
redirect_to root_url if session[:arvados_api_token]
end
def index
redirect_to root_url if session[:arvados_api_token]