-
Notifications
You must be signed in to change notification settings - Fork 17
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #2094 from ORCID/feature/register2
Feature/register2
- Loading branch information
Showing
88 changed files
with
4,743 additions
and
27 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,253 @@ | ||
| import { HttpClient } from '@angular/common/http' | ||
| import { | ||
| AbstractControl, | ||
| AsyncValidatorFn, | ||
| UntypedFormGroup, | ||
| ValidationErrors, | ||
| } from '@angular/forms' | ||
| import { Observable, of } from 'rxjs' | ||
| import { catchError, map, retry } from 'rxjs/operators' | ||
| import { Constructor } from 'src/app/types' | ||
| import { RegisterForm } from 'src/app/types/register.endpoint' | ||
| import { environment } from 'src/environments/environment' | ||
| import { ErrorHandlerService } from '../error-handler/error-handler.service' | ||
|
|
||
| interface HasHttpClientAndErrorHandler { | ||
| _http: HttpClient | ||
| _errorHandler: ErrorHandlerService | ||
| } | ||
|
|
||
| interface HasFormAdapters { | ||
| formGroupToEmailRegisterForm(formGroup: UntypedFormGroup): RegisterForm | ||
| formGroupToPasswordRegisterForm(formGroup: UntypedFormGroup): RegisterForm | ||
| formGroupToFullRegistrationForm( | ||
| StepA: UntypedFormGroup, | ||
| StepB: UntypedFormGroup, | ||
| StepC: UntypedFormGroup, | ||
| StepD: UntypedFormGroup | ||
| ): RegisterForm | ||
| } | ||
|
|
||
| export function Register2BackendValidatorMixin< | ||
| T extends Constructor<HasHttpClientAndErrorHandler & HasFormAdapters> | ||
| >(base: T) { | ||
| return class RegisterBackendValidator extends base { | ||
| constructor(...args: any[]) { | ||
| super(...args) | ||
| } | ||
| formInputs = { | ||
| givenNames: { | ||
| validationEndpoint: 'validateGivenNames', | ||
| }, | ||
| familyNames: { | ||
| validationEndpoint: 'validateFamilyNames', | ||
| }, | ||
| email: { | ||
| validationEndpoint: 'validateEmail', | ||
| }, | ||
| emailsAdditional: { | ||
| validationEndpoint: 'validateEmailsAdditional', | ||
| }, | ||
| passwordConfirm: { | ||
| validationEndpoint: 'validatePasswordConfirm', | ||
| }, | ||
| password: { | ||
| validationEndpoint: 'validatePassword', | ||
| }, | ||
| } | ||
|
|
||
| validateRegisterValue( | ||
| controlName: string, | ||
| value: RegisterForm | ||
| ): Observable<RegisterForm> { | ||
| return this._http | ||
| .post<RegisterForm>( | ||
| environment.API_WEB + | ||
| `oauth/custom/register/${this.formInputs[controlName].validationEndpoint}.json`, | ||
| value | ||
| ) | ||
| .pipe( | ||
| retry(3), | ||
| catchError((error) => this._errorHandler.handleError(error)) | ||
| ) | ||
| } | ||
|
|
||
| validateAdditionalEmailsReactivation( | ||
| value: RegisterForm | ||
| ): Observable<RegisterForm> { | ||
| return this._http | ||
| .post( | ||
| `${environment.API_WEB}reactivateAdditionalEmailsValidate.json`, | ||
| value | ||
| ) | ||
| .pipe( | ||
| retry(3), | ||
| catchError((error) => this._errorHandler.handleError(error)) | ||
| ) | ||
| } | ||
|
|
||
| backendValueValidate( | ||
| controlName: 'givenNames' | 'familyNames' | 'email' | 'password' | ||
| ): AsyncValidatorFn { | ||
| return ( | ||
| control: AbstractControl | ||
| ): Observable<ValidationErrors | null> => { | ||
| if (control.value === '') { | ||
| return of(null) | ||
| } | ||
| const value = {} | ||
| value[controlName] = { value: control.value } | ||
|
|
||
| return this.validateRegisterValue(controlName, value).pipe( | ||
| map((res) => { | ||
| if (res[controlName].errors && res[controlName].errors.length > 0) { | ||
| const error = { | ||
| backendError: res[controlName].errors, | ||
| } | ||
| return error | ||
| } | ||
| return null | ||
| }) | ||
| ) | ||
| } | ||
| } | ||
|
|
||
| backendAdditionalEmailsValidate(reactivate: boolean): AsyncValidatorFn { | ||
| return ( | ||
| formGroup: UntypedFormGroup | ||
| ): Observable<ValidationErrors | null> => { | ||
| const value: RegisterForm = this.formGroupToEmailRegisterForm(formGroup) | ||
| if (!value.emailsAdditional || value.emailsAdditional.length === 0) { | ||
| return of(null) | ||
| } | ||
|
|
||
| if (reactivate) { | ||
| return this.validateAdditionalEmailsReactivation(value).pipe( | ||
| map((response) => { | ||
| // Add errors to additional emails controls | ||
| return this.setFormGroupEmailErrors(response, 'backendErrors') | ||
| }) | ||
| ) | ||
| } | ||
|
|
||
| return this.validateRegisterValue('emailsAdditional', value).pipe( | ||
| map((response) => { | ||
| // Add errors to additional emails controls | ||
| return this.setFormGroupEmailErrors(response, 'backendErrors') | ||
| }) | ||
| ) | ||
| } | ||
| } | ||
|
|
||
| backendPasswordValidate(): AsyncValidatorFn { | ||
| return ( | ||
| formGroup: UntypedFormGroup | ||
| ): Observable<ValidationErrors | null> => { | ||
| const value: RegisterForm = | ||
| this.formGroupToPasswordRegisterForm(formGroup) | ||
| if (value.password.value === '' || value.passwordConfirm.value === '') { | ||
| return of(null) | ||
| } | ||
| return this.validateRegisterValue('password', value).pipe( | ||
| map((response) => { | ||
| // Add errors to additional emails controls | ||
| return this.setFormGroupPasswordErrors(response, 'backendErrors') | ||
| }) | ||
| ) | ||
| } | ||
| } | ||
|
|
||
| backendRegisterFormValidate( | ||
| StepA: UntypedFormGroup, | ||
| StepB: UntypedFormGroup, | ||
| StepC: UntypedFormGroup, | ||
| StepD: UntypedFormGroup, | ||
|
|
||
| type?: 'shibboleth' | ||
| ): Observable<RegisterForm> { | ||
| const registerForm = this.formGroupToFullRegistrationForm( | ||
| StepA, | ||
| StepB, | ||
| StepC, | ||
| StepD | ||
| ) | ||
| return this._http | ||
| .post<RegisterForm>(`${environment.API_WEB}register.json`, registerForm) | ||
| .pipe( | ||
| retry(3), | ||
| catchError((error) => this._errorHandler.handleError(error)) | ||
| ) | ||
| } | ||
|
|
||
| public setFormGroupEmailErrors( | ||
| registerForm: RegisterForm, | ||
| errorGroup: string | ||
| ) { | ||
| let hasErrors = false | ||
| const error = {} | ||
| error[errorGroup] = { | ||
| additionalEmails: {}, | ||
| email: [], | ||
| } | ||
|
|
||
| registerForm.emailsAdditional.forEach((responseControl) => { | ||
| if (responseControl.errors && responseControl.errors.length > 0) { | ||
| hasErrors = true | ||
| error[errorGroup]['additionalEmails'][responseControl.value] = | ||
| responseControl.errors | ||
| } | ||
| }) | ||
|
|
||
| if ( | ||
| registerForm.email && | ||
| registerForm.email.errors && | ||
| registerForm.email.errors.length > 0 | ||
| ) { | ||
| hasErrors = true | ||
| error[errorGroup]['email'].push({ | ||
| value: registerForm.email.value, | ||
| errors: registerForm.email.errors, | ||
| }) | ||
| } | ||
|
|
||
| return hasErrors ? error : null | ||
| } | ||
|
|
||
| public setFormGroupPasswordErrors( | ||
| registerForm: RegisterForm, | ||
| errorGroup: string | ||
| ) { | ||
| let hasErrors = false | ||
| const error = {} | ||
| error[errorGroup] = { | ||
| password: [], | ||
| passwordConfirm: [], | ||
| } | ||
|
|
||
| if ( | ||
| registerForm.password && | ||
| registerForm.password.errors && | ||
| registerForm.password.errors.length > 0 | ||
| ) { | ||
| hasErrors = true | ||
| error[errorGroup]['password'].push({ | ||
| value: registerForm.email.value, | ||
| errors: registerForm.email.errors, | ||
| }) | ||
| } | ||
| if ( | ||
| registerForm.passwordConfirm && | ||
| registerForm.passwordConfirm.errors && | ||
| registerForm.passwordConfirm.errors.length > 0 | ||
| ) { | ||
| hasErrors = true | ||
| error[errorGroup]['passwordConfirm'].push({ | ||
| value: registerForm.passwordConfirm.value, | ||
| errors: registerForm.passwordConfirm.errors, | ||
| }) | ||
| } | ||
|
|
||
| return hasErrors ? error : null | ||
| } | ||
| } | ||
| } |
Oops, something went wrong.