From 30ce6e395c5094c3989288619a99f539bb61f05d Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Wed, 14 Jul 2021 05:35:49 +0200
Subject: [PATCH] Fix user email address being banned on self-deletion (#16503)
* Add tests
* Fix user email address being banned on self-deletion
Fixes #16498
---
app/controllers/settings/deletes_controller.rb | 2 +-
app/models/account.rb | 4 ++--
spec/controllers/settings/deletes_controller_spec.rb | 4 ++++
3 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/app/controllers/settings/deletes_controller.rb b/app/controllers/settings/deletes_controller.rb
index 7b8f8d207..e0dd5edcb 100644
--- a/app/controllers/settings/deletes_controller.rb
+++ b/app/controllers/settings/deletes_controller.rb
@@ -42,7 +42,7 @@ class Settings::DeletesController < Settings::BaseController
end
def destroy_account!
- current_account.suspend!(origin: :local)
+ current_account.suspend!(origin: :local, block_email: false)
AccountDeletionWorker.perform_async(current_user.account_id)
sign_out
end
diff --git a/app/models/account.rb b/app/models/account.rb
index 8be36bf5b..a6d8d1537 100644
--- a/app/models/account.rb
+++ b/app/models/account.rb
@@ -232,11 +232,11 @@ class Account < ApplicationRecord
suspended? && deletion_request.present?
end
- def suspend!(date: Time.now.utc, origin: :local)
+ def suspend!(date: Time.now.utc, origin: :local, block_email: true)
transaction do
create_deletion_request!
update!(suspended_at: date, suspension_origin: origin)
- create_canonical_email_block!
+ create_canonical_email_block! if block_email
end
end
diff --git a/spec/controllers/settings/deletes_controller_spec.rb b/spec/controllers/settings/deletes_controller_spec.rb
index 8d5c4774f..92ab401c9 100644
--- a/spec/controllers/settings/deletes_controller_spec.rb
+++ b/spec/controllers/settings/deletes_controller_spec.rb
@@ -59,6 +59,10 @@ describe Settings::DeletesController do
expect(user.account.reload).to be_suspended
end
+ it 'does not create an email block' do
+ expect(CanonicalEmailBlock.block?(user.email)).to be false
+ end
+
context 'when suspended' do
let(:user) { Fabricate(:user, account_attributes: { username: 'alice', suspended_at: Time.now.utc }) }