github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-01-16 06:42:41 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: Show error message when password is too common (#30507)

Browse Source
This commit is contained in:
Jan Cernik 2025-01-03 09:23:14 -03:00 committed by GitHub
parent d8e8c9f1e4
commit 1c893d1725
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 20 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/assets/javascripts/discourse/app/components/modal/create-account.js
View File

@ -461,11 +461,7 @@ export default class CreateAccount extends Component.extend(
) { ) {
this.rejectedEmails.pushObject(result.values.email); this.rejectedEmails.pushObject(result.values.email);
} }
if ( if (result.errors?.["user_password.password"]?.length > 0) {
result.errors &&
result.errors.password &&
result.errors.password.length > 0
) {
this.rejectedPasswords.pushObject(attrs.accountPassword); this.rejectedPasswords.pushObject(attrs.accountPassword);
} }
this.set("formSubmitted", false); this.set("formSubmitted", false);

8
app/assets/javascripts/discourse/app/controllers/invites-show.js
View File

@ -338,15 +338,11 @@ export default class InvitesShowController extends Controller.extend(
) { ) {
this.rejectedEmails.pushObject(result.values.email); this.rejectedEmails.pushObject(result.values.email);
} }
if ( if (result.errors?.["user_password.password"]?.length > 0) {
result.errors &&
result.errors.password &&
result.errors.password.length > 0
) {
this.rejectedPasswords.pushObject(this.accountPassword); this.rejectedPasswords.pushObject(this.accountPassword);
this.rejectedPasswordsMessages.set( this.rejectedPasswordsMessages.set(
this.accountPassword, this.accountPassword,
result.errors.password[0] result.errors["user_password.password"][0]
); );
} }
if (result.message) { if (result.message) {

2
app/assets/javascripts/discourse/app/controllers/password-reset.js
View File

@ -145,7 +145,7 @@ export default class PasswordResetController extends Controller.extend(
securityKeyRequired: false, securityKeyRequired: false,
errorMessage: null, errorMessage: null,
}); });
} else if (result.errors?.password?.length > 0) { } else if (result.errors?.["user_password.password"]?.length > 0) {
this.rejectedPasswords.pushObject(this.accountPassword); this.rejectedPasswords.pushObject(this.accountPassword);
this.rejectedPasswordsMessages.set( this.rejectedPasswordsMessages.set(
this.accountPassword, this.accountPassword,

6
app/assets/javascripts/discourse/app/controllers/signup.js
View File

@ -456,11 +456,7 @@ export default class SignupPageController extends Controller.extend(
) { ) {
this.rejectedEmails.pushObject(result.values.email); this.rejectedEmails.pushObject(result.values.email);
} }
if ( if (result.errors?.["user_password.password"]?.length > 0) {
result.errors &&
result.errors.password &&
result.errors.password.length > 0
) {
this.rejectedPasswords.pushObject(attrs.accountPassword); this.rejectedPasswords.pushObject(attrs.accountPassword);
} }
this.set("formSubmitted", false); this.set("formSubmitted", false);

2
app/assets/javascripts/discourse/tests/acceptance/password-reset-test.js
View File

@ -22,7 +22,7 @@ acceptance("Password Reset", function (needs) {
if (body.password === "jonesyAlienSlayer") { if (body.password === "jonesyAlienSlayer") {
return helper.response({ return helper.response({
success: false, success: false,
errors: { password: ["is the name of your cat"] }, errors: { "user_password.password": ["is the name of your cat"] },
friendly_messages: ["Password is the name of your cat"], friendly_messages: ["Password is the name of your cat"],
}); });
} else { } else {

14
spec/system/signup_spec.rb
View File

@ -71,6 +71,20 @@ shared_examples "signup scenarios" do |signup_page_object, login_page_object|
expect(page).to have_current_path("/t/#{topic.slug}/#{topic.id}") expect(page).to have_current_path("/t/#{topic.slug}/#{topic.id}")
end end
it "cannot signup with a common password" do
signup_form
.open
.fill_email("johndoe@example.com")
.fill_username("john")
.fill_password("0123456789")
expect(signup_form).to have_valid_fields
signup_form.click_create_account
expect(signup_form).to have_content(
I18n.t("activerecord.errors.models.user_password.attributes.password.common"),
)
end
context "with invite code" do context "with invite code" do
before { SiteSetting.invite_code = "cupcake" } before { SiteSetting.invite_code = "cupcake" }