Skip to content

A platform for community discussion. Free, open, simple.

FIX: Make confirmation phrase matching locale-safe (#38923)

Régis Hanole1a47e731171
diff --git a/frontend/discourse/admin/components/bulk-user-delete-confirmation.gjs b/frontend/discourse/admin/components/bulk-user-delete-confirmation.gjs
index 822b356bee9..bc5f5b3f6b8 100644
--- a/frontend/discourse/admin/components/bulk-user-delete-confirmation.gjs
+++ b/frontend/discourse/admin/components/bulk-user-delete-confirmation.gjs
@@ -101,7 +101,8 @@ export default class BulkUserDeleteConfirmation extends Component {
@action
onPromptInput(event) {
this.confirmButtonDisabled =
- event.target.value.toLowerCase() !== this.confirmDeletePhrase;
+ event.target.value.toLocaleLowerCase() !==
+ this.confirmDeletePhrase.toLocaleLowerCase();
}
@action
diff --git a/frontend/discourse/app/components/dialog-messages/second-factor-confirm-phrase.gjs b/frontend/discourse/app/components/dialog-messages/second-factor-confirm-phrase.gjs
index 3e5eb2b8629..a24eb4295b3 100644
--- a/frontend/discourse/app/components/dialog-messages/second-factor-confirm-phrase.gjs
+++ b/frontend/discourse/app/components/dialog-messages/second-factor-confirm-phrase.gjs
@@ -14,11 +14,11 @@ export default class SecondFactorConfirmPhrase extends Component {
@action
onConfirmPhraseInput(event) {
- if (event.target.value === this.disabledString) {
- this.dialog.set("confirmButtonDisabled", false);
- } else {
- this.dialog.set("confirmButtonDisabled", true);
- }
+ this.dialog.set(
+ "confirmButtonDisabled",
+ event.target.value.toLocaleLowerCase() !==
+ this.disabledString.toLocaleLowerCase()
+ );
}
<template>
diff --git a/frontend/discourse/tests/integration/components/dialog-holder-test.gjs b/frontend/discourse/tests/integration/components/dialog-holder-test.gjs
index 88122e6cbf0..3c25ca7eeb0 100644
--- a/frontend/discourse/tests/integration/components/dialog-holder-test.gjs
+++ b/frontend/discourse/tests/integration/components/dialog-holder-test.gjs
@@ -306,6 +306,8 @@ module("Integration | Component | dialog-holder", function (hooks) {
assert.dom(".btn-danger").isDisabled();
await fillIn("#confirm-phrase", "Disable");
assert.dom(".btn-danger").isEnabled();
+ await fillIn("#confirm-phrase", "disable");
+ assert.dom(".btn-danger").isEnabled();
});
test("delete confirm with a component and model", async function (assert) {
diff --git a/spec/system/admin_users_list_spec.rb b/spec/system/admin_users_list_spec.rb
index 1db814ee462..32fb247bd5b 100644
--- a/spec/system/admin_users_list_spec.rb
+++ b/spec/system/admin_users_list_spec.rb
@@ -62,10 +62,10 @@ describe "Admin Users Page" do
expect(confirmation_modal).to be_open
expect(confirmation_modal).to have_confirm_button_disabled
- confirmation_modal.fill_in_confirmation_phase(user_count: 3)
+ confirmation_modal.fill_in_confirmation_phrase(user_count: 3)
expect(confirmation_modal).to have_confirm_button_disabled
- confirmation_modal.fill_in_confirmation_phase(user_count: 2)
+ confirmation_modal.fill_in_confirmation_phrase(user_count: 2)
expect(confirmation_modal).to have_confirm_button_enabled
confirmation_modal.confirm
@@ -88,6 +88,21 @@ describe "Admin Users Page" do
expect(User.where(id: [user_1.id, user_2.id]).count).to eq(0)
end
+ it "accepts the confirmation phrase case-insensitively" do
+ admin_users_page.visit
+ admin_users_page.bulk_select_button.click
+
+ admin_users_page.user_row(user_1.id).bulk_select_checkbox.click
+ admin_users_page.bulk_actions_dropdown.expand
+ admin_users_page.bulk_actions_dropdown.option(".bulk-delete").click
+
+ expect(confirmation_modal).to be_open
+ expect(confirmation_modal).to have_confirm_button_disabled
+
+ confirmation_modal.fill_in_confirmation_phrase(user_count: 1, upcase: true)
+ expect(confirmation_modal).to have_confirm_button_enabled
+ end
+
xit "remembers selected users when the user list refreshes due to search" do
admin_users_page.visit
admin_users_page.bulk_select_button.click
@@ -109,7 +124,7 @@ describe "Admin Users Page" do
expect(confirmation_modal).to be_open
- confirmation_modal.fill_in_confirmation_phase(user_count: 2)
+ confirmation_modal.fill_in_confirmation_phrase(user_count: 2)
confirmation_modal.confirm
expect(confirmation_modal).to have_content("Starting bulk delete…")
@@ -136,7 +151,7 @@ describe "Admin Users Page" do
admin_users_page.user_row(user_1.id).bulk_select_checkbox.click
admin_users_page.bulk_actions_dropdown.expand
admin_users_page.bulk_actions_dropdown.option(".bulk-delete").click
- confirmation_modal.fill_in_confirmation_phase(user_count: 1)
+ confirmation_modal.fill_in_confirmation_phrase(user_count: 1)
user_1.update!(admin: true)
@@ -157,7 +172,7 @@ describe "Admin Users Page" do
admin_users_page.user_row(user_1.id).bulk_select_checkbox.click
admin_users_page.bulk_actions_dropdown.expand
admin_users_page.bulk_actions_dropdown.option(".bulk-delete").click
- confirmation_modal.fill_in_confirmation_phase(user_count: 1)
+ confirmation_modal.fill_in_confirmation_phrase(user_count: 1)
confirmation_modal.block_ip_and_email_checkbox.click
confirmation_modal.confirm
diff --git a/spec/system/page_objects/modals/bulk_user_delete_confirmation.rb b/spec/system/page_objects/modals/bulk_user_delete_confirmation.rb
index 8b2f47d24c2..41152e5d820 100644
--- a/spec/system/page_objects/modals/bulk_user_delete_confirmation.rb
+++ b/spec/system/page_objects/modals/bulk_user_delete_confirmation.rb
@@ -27,16 +27,14 @@ module PageObjects
end
end
- def fill_in_confirmation_phase(user_count:)
- within(modal) do
- find("input.confirmation-phrase").fill_in(
- with:
- I18n.t(
- "admin_js.admin.users.bulk_actions.delete.confirmation_modal.confirmation_phrase",
- count: user_count,
- ),
+ def fill_in_confirmation_phrase(user_count:, upcase: false)
+ phrase =
+ I18n.t(
+ "admin_js.admin.users.bulk_actions.delete.confirmation_modal.confirmation_phrase",
+ count: user_count,
)
- end
+ phrase = phrase.upcase if upcase
+ within(modal) { find("input.confirmation-phrase").fill_in(with: phrase) }
end
def has_successful_log_entry_for_user?(user:, position:, total:)