Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed email pattern to allow emails TLDs with more than 4 characters #2958

Open
wants to merge 4 commits into
base: dspace-7_x
Choose a base branch
from
Open

Fixed email pattern to allow emails TLDs with more than 4 characters #2958

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4f736d0
Fix email pattern
oscar-escire Apr 25, 2024
0d9a540
Add patterns for form validations in file
VictorHugoDuranS Jun 14, 2024
4b49c7c
Change patterns for form with email inputs
VictorHugoDuranS Jun 16, 2024
82261ac
Change pattern for validation error on emails
VictorHugoDuranS Aug 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/app/access-control/epeople-registry/eperson-form/eperson-form.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,7 +252,7 @@ export class EPersonFormComponent implements OnInit, OnDestroy {
name: 'email',
validators: {
required: null,
pattern: '^[a-z0-9._%+-]+@[a-z0-9.-]+\\.[a-z]{2,4}$',
pattern: '^[a-zA-Z0-9.!#$%&\'*+\/=?^_`{|}~-]+@(?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])\\.(?:[a-zA-Z0-9](?:\\.[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)*$',
},
required: true,
errorMessages: {
Expand Down
2 changes: 1 addition & 1 deletion src/app/info/feedback/feedback-form/feedback-form.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ export class FeedbackFormComponent implements OnInit {
* Form builder created used from the feedback from
*/
feedbackForm = this.fb.group({
email: ['', [Validators.required, Validators.pattern('^[a-z0-9._%+-]+@[a-z0-9.-]+\\.[a-z]{2,4}$')]],
email: ['', [Validators.required, Validators.pattern('^[a-zA-Z0-9.!#$%&\'*+\/=?^_`{|}~-]+@(?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])\\.(?:[a-zA-Z0-9](?:\\.[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)*$')]],
message: ['', Validators.required],
page: [''],
});
Expand Down
2 changes: 1 addition & 1 deletion src/app/item-page/bitstreams/request-a-copy/bitstream-request-a-copy-page.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ export class BitstreamRequestACopyPageComponent implements OnInit, OnDestroy {
}),
email: new UntypedFormControl('', {
validators: [Validators.required,
Validators.pattern('^[a-z0-9._%+-]+@[a-z0-9.-]+\.[a-z]{2,4}$')]
Validators.pattern('^[a-zA-Z0-9.!#$%&\'*+\/=?^_`{|}~-]+@(?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])\\.(?:[a-zA-Z0-9](?:\\.[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)*$')]
}),
allfiles: new UntypedFormControl(''),
message: new UntypedFormControl(''),
Expand Down
2 changes: 1 addition & 1 deletion src/app/register-email-form/register-email-form.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ export class RegisterEmailFormComponent implements OnDestroy, OnInit {
Validators.email,
// Regex pattern borrowed from HTML5 specs for a valid email address:
// https://html.spec.whatwg.org/multipage/input.html#valid-e-mail-address
Validators.pattern('^[a-zA-Z0-9.!#$%&\'*+\/=?^_`{|}~-]+@[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(?:\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)*$')
Validators.pattern('^[a-zA-Z0-9.!#$%&\'*+\/=?^_`{|}~-]+@(?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])\\.(?:[a-zA-Z0-9](?:\\.[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)*$')
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why has this been modified? The pattern here is the same one noted in the HTML5 docs here: https://html.spec.whatwg.org/multipage/input.html#valid-e-mail-address

When I test this at https://demo.dspace.org/register, I've found that I already can add an email with a longer TLD. So, I think this pattern was already correct, and just needed to be copied elsewhere (or moved into a constant to be reused elsewhere)

];
this.form = this.formBuilder.group({
email: new UntypedFormControl('', {
Expand Down
Loading