A platform for community discussion. Free, open, simple.
FEATURE: Allow blocking a deleted user's email without their IP address (#41258)
Régis Hanol0150d3615414
diff --git a/config/locales/client.en.yml b/config/locales/client.en.ymlindex cb49dc7fb3e..b396f7190b2 100644--- a/config/locales/client.en.yml+++ b/config/locales/client.en.yml@@ -9312,10 +9312,12 @@ en:other: "Can't delete all posts because the user has more than %{count} posts. (delete_all_posts_max)"delete_confirm_title: "Are you sure you want to delete this user? This is permanent!"delete_confirm: "It is generally preferable to anonymize users rather than deleting them, to avoid removing content from existing discussions."- delete_and_block: "Delete and block user"- delete_and_block_description: "Delete the user and block their email and IP address."+ delete_and_block: "Delete and block email and IP address"+ delete_and_block_description: "Delete the user and block their email address and IP address."+ delete_and_block_email: "Delete and block email"+ delete_and_block_email_description: "Delete the user and block their email address, but allow their IP address to be reused."delete_dont_block: "Delete user"- delete_dont_block_description: "Delete the user without blocking."+ delete_dont_block_description: "Delete the user without blocking their email address or IP address."deleting_user: "Deleting user…"deleted: "The user was deleted."delete_failed: "There was an error deleting that user. Make sure all posts are deleted before trying to delete the user."diff --git a/frontend/discourse/admin/controllers/admin-user/index.js b/frontend/discourse/admin/controllers/admin-user/index.jsindex 09bc0ce97ab..e83c2bd2dbb 100644--- a/frontend/discourse/admin/controllers/admin-user/index.js+++ b/frontend/discourse/admin/controllers/admin-user/index.js@@ -443,67 +443,24 @@ export default class AdminUserIndexController extends Controller {}get deleteUserOptions() {- return [- {- id: "delete_dont_block",- label: i18n("admin.user.delete_dont_block"),- description: i18n("admin.user.delete_dont_block_description"),- icon: "trash-can",- },- {- id: "delete_and_block",- label: i18n("admin.user.delete_and_block"),- description: i18n("admin.user.delete_and_block_description"),- icon: "ban",- },- ];+ return this.adminTools.deleteUserOptions;}@actiondestroyUser(optionId) {- const block = optionId === "delete_and_block";- const postCount = this.get("model.post_count");+ const postCount = this.model.post_count;const maxPostCount = this.siteSettings.delete_all_posts_max;const location = document.location.pathname;- const performDestroy = () => {- this.dialog.notice(i18n("admin.user.deleting_user"));- let formData = { context: location };- if (block) {- formData["block_email"] = true;- formData["block_urls"] = true;- formData["block_ip"] = true;- }- if (postCount <= maxPostCount) {- formData["delete_posts"] = true;- }- this.model- .destroy(formData)- .then((data) => {- if (data.deleted) {- if (/^\/admin\/users\/list\//.test(location)) {- document.location = location;- } else {- document.location = getURL("/admin/users/list/active");- }- } else {- this.dialog.alert(i18n("admin.user.delete_failed"));- }- })- .catch(() => {- this.dialog.alert(i18n("admin.user.delete_failed"));- });- };-- this.dialog.deleteConfirm({- title: i18n("admin.user.delete_confirm_title"),- message: i18n("admin.user.delete_confirm"),- class: `delete-user-modal ${- block ? "delete-and-block" : "delete-dont-block"- }`,- confirmButtonLabel: `admin.user.${optionId}`,- confirmButtonIcon: block ? "triangle-exclamation" : "trash-can",- didConfirm: performDestroy,+ this.adminTools.showDeleteUserModal(this.model.id, optionId, {+ deletePosts: postCount <= maxPostCount,+ onDeleted: () => {+ if (/^\/admin\/users\/list\//.test(location)) {+ document.location = location;+ } else {+ document.location = getURL("/admin/users/list/active");+ }+ },});}diff --git a/frontend/discourse/admin/services/admin-tools.js b/frontend/discourse/admin/services/admin-tools.jsindex dab9ee37897..6f97779aeae 100644--- a/frontend/discourse/admin/services/admin-tools.js+++ b/frontend/discourse/admin/services/admin-tools.js@@ -30,6 +30,70 @@ export default class AdminToolsService extends Service {return AdminUser.find(id).then((user) => user.destroy(formData));}+ get deleteUserOptions() {+ return [+ {+ id: "delete_dont_block",+ label: i18n("admin.user.delete_dont_block"),+ description: i18n("admin.user.delete_dont_block_description"),+ icon: "trash-can",+ },+ {+ id: "delete_and_block_email",+ label: i18n("admin.user.delete_and_block_email"),+ description: i18n("admin.user.delete_and_block_email_description"),+ icon: "envelope",+ blockFlags: { block_email: true },+ },+ {+ id: "delete_and_block",+ label: i18n("admin.user.delete_and_block"),+ description: i18n("admin.user.delete_and_block_description"),+ icon: "ban",+ blockFlags: { block_email: true, block_urls: true, block_ip: true },+ },+ ];+ }++ showDeleteUserModal(+ userId,+ optionId,+ { deletePosts = false, onDeleted } = {}+ ) {+ const option = this.deleteUserOptions.find((o) => o.id === optionId);+ const blockFlags = option?.blockFlags ?? {};+ const block = Object.keys(blockFlags).length > 0;++ this.dialog.deleteConfirm({+ title: i18n("admin.user.delete_confirm_title"),+ message: i18n("admin.user.delete_confirm"),+ class: `delete-user-modal ${+ block ? "delete-and-block" : "delete-dont-block"+ }`,+ confirmButtonLabel: `admin.user.${optionId}`,+ confirmButtonIcon: block ? "triangle-exclamation" : "trash-can",+ didConfirm: async () => {+ this.dialog.notice(i18n("admin.user.deleting_user"));++ const formData = { context: document.location.pathname, ...blockFlags };+ if (deletePosts) {+ formData.delete_posts = true;+ }++ try {+ const data = await this.deleteUser(userId, formData);+ if (data?.deleted) {+ onDeleted?.();+ } else {+ this.dialog.alert(i18n("admin.user.delete_failed"));+ }+ } catch {+ this.dialog.alert(i18n("admin.user.delete_failed"));+ }+ },+ });+ }+spammerDetails(adminUser) {return {deleteUser: () => this._deleteSpammer(adminUser),diff --git a/frontend/discourse/app/controllers/user.js b/frontend/discourse/app/controllers/user.jsindex 763e6bc9a89..b36ca4a639a 100644--- a/frontend/discourse/app/controllers/user.js+++ b/frontend/discourse/app/controllers/user.js@@ -7,12 +7,10 @@ import CanCheckEmailsHelper from "discourse/lib/can-check-emails-helper";import getURL from "discourse/lib/get-url";import optionalService from "discourse/lib/optional-service";import { prioritizeNameInUx } from "discourse/lib/settings";-import { i18n } from "discourse-i18n";export default class UserController extends Controller {@service currentUser;@service router;- @service dialog;@optionalService adminTools;@computed("siteSettings.moderators_view_emails")@@ -322,59 +320,14 @@ export default class UserController extends Controller {}get adminDeleteOptions() {- return [- {- id: "delete_dont_block",- label: i18n("admin.user.delete_dont_block"),- description: i18n("admin.user.delete_dont_block_description"),- icon: "trash-can",- },- {- id: "delete_and_block",- label: i18n("admin.user.delete_and_block"),- description: i18n("admin.user.delete_and_block_description"),- icon: "ban",- },- ];+ return this.adminTools?.deleteUserOptions ?? [];}@actionadminDelete(optionId) {- const block = optionId === "delete_and_block";- const userId = this.get("model.id");- const location = document.location.pathname;-- const performDestroy = () => {- this.dialog.notice(i18n("admin.user.deleting_user"));- let formData = { context: location };- if (block) {- formData["block_email"] = true;- formData["block_urls"] = true;- formData["block_ip"] = true;- }- formData["delete_posts"] = true;-- return this.adminTools- .deleteUser(userId, formData)- .then((data) => {- if (data.deleted) {- document.location = getURL("/admin/users/list/active");- } else {- this.dialog.alert(i18n("admin.user.delete_failed"));- }- })- .catch(() => this.dialog.alert(i18n("admin.user.delete_failed")));- };-- this.dialog.deleteConfirm({- title: i18n("admin.user.delete_confirm_title"),- message: i18n("admin.user.delete_confirm"),- class: `delete-user-modal ${- block ? "delete-and-block" : "delete-dont-block"- }`,- confirmButtonLabel: `admin.user.${optionId}`,- confirmButtonIcon: block ? "triangle-exclamation" : "trash-can",- didConfirm: performDestroy,+ this.adminTools.showDeleteUserModal(this.model.id, optionId, {+ deletePosts: true,+ onDeleted: () => (document.location = getURL("/admin/users/list/active")),});}diff --git a/frontend/discourse/tests/acceptance/admin-user-index-test.js b/frontend/discourse/tests/acceptance/admin-user-index-test.jsindex 733c0663e0e..665724e0d87 100644--- a/frontend/discourse/tests/acceptance/admin-user-index-test.js+++ b/frontend/discourse/tests/acceptance/admin-user-index-test.js@@ -7,6 +7,7 @@ import { i18n } from "discourse-i18n";const { TOTP, BACKUP_CODE, SECURITY_KEY } = SECOND_FACTOR_METHODS;let deleteAndBlock;+let deleteData;acceptance("Admin - User Index", function (needs) {needs.user();@@ -116,6 +117,7 @@ acceptance("Admin - User Index", function (needs) {server.delete("/admin/users/5.json", (request) => {const data = helper.parsePostData(request.requestBody);+ deleteData = data;deleteAndBlock = !!(data.block_email || data.block_ip || data.block_urls);return helper.response({});@@ -219,6 +221,7 @@ acceptance("Admin - User Index", function (needs) {needs.hooks.beforeEach(() => {deleteAndBlock = null;+ deleteData = null;});test("can edit username", async function (assert) {@@ -370,6 +373,26 @@ acceptance("Admin - User Index", function (needs) {assert.true(deleteAndBlock, "user does get blocked");});+ test("delete user - delete and block email only blocks the email, not the IP", async function (assert) {+ await visit("/admin/users/5/user5");++ const dropdown = selectKit(".btn-user-delete");+ await dropdown.expand();+ await dropdown.selectRowByValue("delete_and_block_email");++ await click(+ ".delete-user-modal.delete-and-block .dialog-footer .btn-danger"+ );++ assert.strictEqual(deleteData.block_email, "true", "blocks the email");+ assert.strictEqual(deleteData.block_ip, undefined, "does not block the IP");+ assert.strictEqual(+ deleteData.block_urls,+ undefined,+ "does not block external URLs"+ );+ });+test("delete explanation - shows admin-specific message when admin cannot be deleted", async function (assert) {await visit("/admin/users/8/admin_user");diff --git a/frontend/discourse/tests/acceptance/user-profile-summary-test.js b/frontend/discourse/tests/acceptance/user-profile-summary-test.jsindex 005bcbc6a53..5b1d75c7568 100644--- a/frontend/discourse/tests/acceptance/user-profile-summary-test.js+++ b/frontend/discourse/tests/acceptance/user-profile-summary-test.js@@ -7,6 +7,7 @@ import selectKit from "discourse/tests/helpers/select-kit-helper";import { i18n } from "discourse-i18n";let deleteAndBlock;+let deleteData;acceptance("User Profile - Summary", function (needs) {needs.user();@@ -158,6 +159,7 @@ acceptance("User Profile - Summary - Admin", function (needs) {server.delete("/admin/users/5.json", (request) => {const data = helper.parsePostData(request.requestBody);+ deleteData = data;deleteAndBlock = !!(data.block_email || data.block_ip || data.block_urls);return helper.response({});@@ -166,6 +168,7 @@ acceptance("User Profile - Summary - Admin", function (needs) {needs.hooks.beforeEach(() => {deleteAndBlock = null;+ deleteData = null;});test("Delete only action", async function (assert) {@@ -198,4 +201,24 @@ acceptance("User Profile - Summary - Admin", function (needs) {);assert.true(deleteAndBlock, "second option also blocks user");});++ test("Delete and block email only", async function (assert) {+ await visit("/u/charlie/summary");++ const dropdown = selectKit(".btn-delete-user");+ await dropdown.expand();+ await dropdown.selectRowByValue("delete_and_block_email");++ await click(+ ".delete-user-modal.delete-and-block .dialog-footer .btn-danger"+ );++ assert.strictEqual(deleteData.block_email, "true", "blocks the email");+ assert.strictEqual(deleteData.block_ip, undefined, "does not block the IP");+ assert.strictEqual(+ deleteData.block_urls,+ undefined,+ "does not block external URLs"+ );+ });});