From f550f46452c1aeabf32a509ad01a540d904122ee Mon Sep 17 00:00:00 2001 From: baarkerlounger Date: Fri, 18 Mar 2022 18:24:36 +0000 Subject: [PATCH] Devise logout via get so we don't rely on js --- app/views/layouts/application.html.erb | 2 +- config/initializers/devise.rb | 2 +- config/routes.rb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 424cdb425..45aaaa511 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -46,7 +46,7 @@ component.navigation_item(text: 'Logs', href: case_logs_path) component.navigation_item(text: 'Your organisation', href: "/organisations/#{current_user.organisation.id}") component.navigation_item(text: 'Your account', href: user_path(current_user)) - component.navigation_item(text: 'Sign out', href: destroy_user_session_path, options: { data: {turbo_method: :delete}, method: :delete }) + component.navigation_item(text: 'Sign out', href: destroy_user_session_path) end end %> diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb index 4d43e7f3b..9f59dd22a 100644 --- a/config/initializers/devise.rb +++ b/config/initializers/devise.rb @@ -267,7 +267,7 @@ Devise.setup do |config| # config.navigational_formats = ['*/*', :html] # The default HTTP method used to sign out a resource. Default is :delete. - config.sign_out_via = :delete + config.sign_out_via = :get # ==> OmniAuth # Add a new OmniAuth provider. Check the wiki for more information on setting diff --git a/config/routes.rb b/config/routes.rb index be1c4b962..6446e718f 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -11,7 +11,7 @@ Rails.application.routes.draw do two_factor_authentication: "auth/two_factor_authentication", }, path_names: { sign_in: "sign-in", sign_out: "sign-out", two_factor_authentication: "two-factor-authentication" }, - sign_out_via: %i[delete get], + sign_out_via: %i[get], } devise_scope :admin_user do