From 28a6dfce01ee11836d297e540150639bfdff9571 Mon Sep 17 00:00:00 2001 From: "Stanko K.R." Date: Wed, 12 Nov 2025 20:16:18 +0100 Subject: [PATCH] Simplify user deactivation --- app/controllers/concerns/authorization.rb | 2 -- app/models/user.rb | 7 +++++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/app/controllers/concerns/authorization.rb b/app/controllers/concerns/authorization.rb index c18958536..fef0f41e9 100644 --- a/app/controllers/concerns/authorization.rb +++ b/app/controllers/concerns/authorization.rb @@ -30,8 +30,6 @@ module Authorization redirect_to session_menu_url(script_name: nil) elsif Current.membership.blank? redirect_to session_menu_url(script_name: nil) - elsif !Current.user&.active? - redirect_to unlink_membership_url(script_name: nil, membership_id: Current.membership.signed_id(purpose: :unlinking)) end end diff --git a/app/models/user.rb b/app/models/user.rb index b248b74d8..b940b67a0 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -20,7 +20,10 @@ class User < ApplicationRecord delegate :staff?, to: :identity, allow_nil: true def deactivate - accesses.destroy_all - update! active: false + transaction do + accesses.destroy_all + membership.destroy! + update! active: false + end end end