projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into 3112-report-bug
[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 ba081375892d8b65c8a14a70440cc7a6b510dfc0..97c8d5a9dd4dc7f81184d1a62d7222110a169770 100644
(file)
--- a/
apps/workbench/app/controllers/sessions_controller.rb
+++ b/
apps/workbench/app/controllers/sessions_controller.rb
@@
-1,11
+1,15
@@
class SessionsController < ApplicationController
class SessionsController < ApplicationController
- skip_around_filter :thread_with_api_token, :only => [:destroy, :index]
+ skip_around_filter :require_thread_api_token, :only => [:destroy, :index]
+ skip_around_filter :set_thread_api_token, :only => [:destroy, :index]
skip_before_filter :find_object_by_uuid, :only => [:destroy, :index]
skip_before_filter :find_object_by_uuid, :only => [:destroy, :index]
+
def destroy
session.clear
def destroy
session.clear
- redirect_to
$arvados_api_client.arvados_logout_url(return_to: logged_ou
t_url)
+ redirect_to
arvados_api_client.arvados_logout_url(return_to: roo
t_url)
end
end
+
def index
redirect_to root_url if session[:arvados_api_token]
def index
redirect_to root_url if session[:arvados_api_token]
+ render_index
end
end
end
end