X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/f2060a005a084ff544d9479ea50bb8a02fe6a31d..42c20b25e1325124b88e3b9b285544dc41122b56:/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 48fbc6bd04..6557fc0626 100644
--- a/apps/workbench/app/controllers/sessions_controller.rb
+++ b/apps/workbench/app/controllers/sessions_controller.rb
@@ -3,15 +3,16 @@
 # SPDX-License-Identifier: AGPL-3.0
 
 class SessionsController < ApplicationController
-  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
+  skip_around_action :require_thread_api_token, :only => [:destroy, :logged_out]
+  skip_around_action :set_thread_api_token, :only => [:destroy, :logged_out]
+  skip_before_action :find_object_by_uuid
+  skip_before_action :find_objects_for_index, raise: false
+  skip_before_action :ensure_arvados_api_exists
 
   def destroy
+    token = session[:arvados_api_token]
     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, api_token: token)
   end
 
   def logged_out