20846: Merge branch '19213-ubuntu2204-support' into 20846-ubuntu2204

[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 02db33d645947e60a86f4721998b682b16634029..6557fc0626a55627730b055a3a48920e89635b14 100644 (file)
--- a/apps/workbench/app/controllers/sessions_controller.rb
+++ b/apps/workbench/app/controllers/sessions_controller.rb
@@ -6,12 +6,13 @@ class SessionsController < ApplicationController
   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
+  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