hazza/dspace-angular
1
0
Fork 1
mirror of https://github.com/DSpace/dspace-angular.git synced 2025-10-16 22:43:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'atmire/w2p-97298_issue-3281_self-register-issue-7.2' into w2p-97298_issue-3281_self-register-issue-main

Browse Source 
# Conflicts:
#	src/app/register-email-form/register-email-form.component.ts
#	src/assets/i18n/en.json5
This commit is contained in:
Alexandre Vryghem
2023-01-26 10:31:40 +01:00
parent b0d5fc5c0c 0d7a030960
commit d3832326a5
2 changed files with 19 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/app/register-email-form/register-email-form.component.ts
View File

@@ -3,7 +3,7 @@ import {EpersonRegistrationService} from '../core/data/eperson-registration.serv
import {NotificationsService} from '../shared/notifications/notifications.service'; import {NotificationsService} from '../shared/notifications/notifications.service';
import {TranslateService} from '@ngx-translate/core'; import {TranslateService} from '@ngx-translate/core';
import {Router} from '@angular/router'; import {Router} from '@angular/router';
import {FormBuilder, FormControl, FormGroup, Validators} from '@angular/forms'; import { FormBuilder, FormControl, FormGroup, Validators, ValidatorFn } from '@angular/forms';
import {Registration} from '../core/shared/registration.model'; import {Registration} from '../core/shared/registration.model';
import {RemoteData} from '../core/data/remote-data'; import {RemoteData} from '../core/data/remote-data';
import {ConfigurationDataService} from '../core/data/configuration-data.service'; import {ConfigurationDataService} from '../core/data/configuration-data.service';
@@ -84,24 +84,34 @@ export class RegisterEmailFormComponent implements OnInit {
} }
ngOnInit(): void { ngOnInit(): void {
this.form = this.formBuilder.group({ const validators: ValidatorFn[] = [
email: new FormControl('', { Validators.required,
validators: [Validators.required,
// Regex pattern borrowed from HTML5 specs for a valid email address: // Regex pattern borrowed from HTML5 specs for a valid email address:
// https://html.spec.whatwg.org/multipage/input.html#valid-e-mail-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](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(?:\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)*$')
], ];
this.form = this.formBuilder.group({
email: new FormControl('', {
validators: validators,
}) })
}); });
this.validMailDomains = []; this.validMailDomains = [];
this.configService.findByPropertyName('authentication-password.domain.valid') this.configService.findByPropertyName('authentication-password.domain.valid')
.pipe(getAllCompletedRemoteData()) .pipe(getAllCompletedRemoteData())
.subscribe((remoteData) => { .subscribe((remoteData: RemoteData<ConfigurationProperty>) => {
if (remoteData.payload) {
for (const remoteValue of remoteData.payload.values) { for (const remoteValue of remoteData.payload.values) {
this.validMailDomains.push(remoteValue); this.validMailDomains.push(remoteValue);
if (this.validMailDomains.length !== 0 && this.MESSAGE_PREFIX === 'register-page.registration') {
this.form.get('email').setValidators([
...validators,
Validators.pattern(this.validMailDomains.map((domain: string) => '(^.*@' + domain.replace(new RegExp('\\.', 'g'), '\\.') + '$)').join('|')),
]);
this.form.updateValueAndValidity();
} }
} }
); }
});
this.configService.findByPropertyName('registration.verification.enabled').pipe( this.configService.findByPropertyName('registration.verification.enabled').pipe(
getFirstSucceededRemoteDataPayload(), getFirstSucceededRemoteDataPayload(),
map((res: ConfigurationProperty) => res?.values[0].toLowerCase() === 'true') map((res: ConfigurationProperty) => res?.values[0].toLowerCase() === 'true')

2
src/assets/i18n/en.json5
View File

@@ -3284,7 +3284,7 @@
"register-page.registration.error.recaptcha": "Error when trying to authenticate with recaptcha", "register-page.registration.error.recaptcha": "Error when trying to authenticate with recaptcha",
"register-page.registration.google-recaptcha.must-accept-cookies": "In order to register you must accept the <b>Registration and Password recovery</b> (Google reCaptcha) cookies.", "register-page.registration.google-recaptcha.must-accept-cookies": "In order to register you must accept the <b>Registration and Password recovery</b> (Google reCaptcha) cookies.",
"register-page.registration.error.maildomain": "this email address is not on the list of domains who can register. Allowed domains are {{ domains }}", "register-page.registration.error.maildomain": "This email address is not on the list of domains who can register. Allowed domains are {{ domains }}",
"register-page.registration.google-recaptcha.open-cookie-settings": "Open cookie settings", "register-page.registration.google-recaptcha.open-cookie-settings": "Open cookie settings",