X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/a59152e34814f453a7380e68a55534e2f8922d57..5c724cffa06b5c5a809e0f6cce194a3f012c7ba3:/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 0d4e944f05..48fbc6bd04 100644
--- a/apps/workbench/app/controllers/sessions_controller.rb
+++ b/apps/workbench/app/controllers/sessions_controller.rb
@@ -1,11 +1,24 @@
+# Copyright (C) The Arvados Authors. All rights reserved.
+#
+# SPDX-License-Identifier: AGPL-3.0
+
 class SessionsController < ApplicationController
-  skip_around_filter :thread_with_api_token, :only => [:destroy, :index]
-  skip_before_filter :find_object_by_uuid, :only => [:destroy, :index]
+  skip_around_filter :require_thread_api_token, :only => [:destroy, :logged_out]
+  skip_around_filter :set_thread_api_token, :only => [:destroy, :logged_out]
+  skip_before_filter :find_object_by_uuid
+  skip_before_filter :find_objects_for_index
+  skip_before_filter :ensure_arvados_api_exists
+
   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 logged_out
+    redirect_to root_url if session[:arvados_api_token]
+    render_index
+  end
+
   def index
-    redirect_to root_url if session[:orvos_api_token]
   end
 end