closes #11465

[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..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
-  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]
+
   def destroy
     session.clear
-    redirect_to $orvos_api_client.orvos_logout_url(return_to: logged_out_url)
+    redirect_to arvados_api_client.arvados_logout_url(return_to: root_url)
   end
+
   def index
-    redirect_to root_url if session[:orvos_api_token]
+    redirect_to root_url if session[:arvados_api_token]
+    render_index
   end
 end