github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-22 22:43:33 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: Trim whitespace on email field for invites (#20547)

Browse Source 
If the whitespace isn't trimmed from the input field the email is
considered invalid, and the button remains greyed out. We should handle
removing any trailing whitespace and not rely on the user trying to see
it themselves.
This commit is contained in:
Blake Erickson
2023-03-06 17:39:59 -07:00
committed by GitHub
parent 15cf62411a
commit b4528b9e27
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/assets/javascripts/discourse/app/controllers/create-invite.js
View File

@ -34,12 +34,12 @@ export default Controller.extend(
@discourseComputed("buffered.emailOrDomain") @discourseComputed("buffered.emailOrDomain")
isEmail(emailOrDomain) { isEmail(emailOrDomain) {
return emailValid(emailOrDomain); return emailValid(emailOrDomain?.trim());
}, },
@discourseComputed("buffered.emailOrDomain") @discourseComputed("buffered.emailOrDomain")
isDomain(emailOrDomain) { isDomain(emailOrDomain) {
return hostnameValid(emailOrDomain); return hostnameValid(emailOrDomain?.trim());
}, },
isLink: not("isEmail"), isLink: not("isEmail"),
@ -83,9 +83,9 @@ export default Controller.extend(
if (data.emailOrDomain) { if (data.emailOrDomain) {
if (emailValid(data.emailOrDomain)) { if (emailValid(data.emailOrDomain)) {
data.email = data.emailOrDomain; data.email = data.emailOrDomain?.trim();
} else if (hostnameValid(data.emailOrDomain)) { } else if (hostnameValid(data.emailOrDomain)) {
data.domain = data.emailOrDomain; data.domain = data.emailOrDomain?.trim();
} }
delete data.emailOrDomain; delete data.emailOrDomain;
} }

2
app/assets/javascripts/discourse/tests/acceptance/create-invite-modal-test.js
View File

@ -155,7 +155,7 @@ acceptance("Invites - Email Invites", function (needs) {
"sends skip_email to server" "sends skip_email to server"
); );
await fillIn("#invite-email", "test2@example.com"); await fillIn("#invite-email", "test2@example.com ");
assert.ok(exists(".send-invite"), "shows save and send email button"); assert.ok(exists(".send-invite"), "shows save and send email button");
await click(".send-invite"); await click(".send-invite");
assert.ok( assert.ok(