From 46bfb6c37862515f48bd9448c6538b3c061ce64d Mon Sep 17 00:00:00 2001
From: Camelia Dumitru <c.dumitru@orcid.org>
Date: Tue, 21 Jul 2026 10:03:58 +0100
Subject: [PATCH 1/2] PD-5946 Maping of the registry end points to the client
 side after removing the  old sprint security oauth in registry

---
 src/app/core/register/register.backend-validators.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/app/core/register/register.backend-validators.ts b/src/app/core/register/register.backend-validators.ts
index cdb12ad29..4c1905d93 100644
--- a/src/app/core/register/register.backend-validators.ts
+++ b/src/app/core/register/register.backend-validators.ts
@@ -61,10 +61,12 @@ export function RegisterBackendValidatorMixin<
       controlName: string,
       value: RegisterForm
     ): Observable<RegisterForm> {
+      // Map validationEndpoint (e.g., 'validatePassword') to endpoint (e.g., 'registerPasswordValidate.json')
+      const endpointSuffix = this.formInputs[controlName].validationEndpoint.replace('validate', '');
       return this._http
         .post<RegisterForm>(
           runtimeEnvironment.API_WEB +
-            `oauth/custom/register/${this.formInputs[controlName].validationEndpoint}.json`,
+            `register${endpointSuffix}Validate.json`,
           value
         )
         .pipe(catchError((error) => this._errorHandler.handleError(error)))

From 4de6cc4a9ef5262e80be3bcc8570d084870cc56c Mon Sep 17 00:00:00 2001
From: Camelia Dumitru <c.dumitru@orcid.org>
Date: Tue, 21 Jul 2026 13:57:07 +0100
Subject: [PATCH 2/2] PD-5950  fixed the additional error message display

---
 ...-personal-additional-emails.component.html |  9 +++-----
 ...rm-personal-additional-emails.component.ts | 23 +++++++++++++++++++
 2 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/src/app/register/components/form-personal-additional-emails/form-personal-additional-emails.component.html b/src/app/register/components/form-personal-additional-emails/form-personal-additional-emails.component.html
index cae32bc1e..1333d3995 100644
--- a/src/app/register/components/form-personal-additional-emails/form-personal-additional-emails.component.html
+++ b/src/app/register/components/form-personal-additional-emails/form-personal-additional-emails.component.html
@@ -42,17 +42,14 @@
     >
       Please enter a valid email address, for example joe&#64;institution.edu
     </mat-error>
-    <ng-container *ngIf="additionalEmailsTouched">
+    <ng-container *ngIf="additionalEmailsTouched || getBackendErrorsForAdditionalEmail(additionalEmailControl.value).length > 0">
       <mat-error
         *ngFor="
-          let error of getControlErrorAtFormLevel(
-            additionalEmailControl.value,
-            'backendErrors'
-          )
+          let error of getBackendErrorsForAdditionalEmail(additionalEmailControl.value)
         "
       >
         <app-backend-error
-          [showEmailAlreadyExistUntilNextButtonWasClicked]="true"
+          [showEmailAlreadyExistUntilNextButtonWasClicked]="false"
           [nextButtonWasClicked]="nextButtonWasClicked"
           [errorCode]="error"
           [value]="additionalEmailControl.value.value"
diff --git a/src/app/register/components/form-personal-additional-emails/form-personal-additional-emails.component.ts b/src/app/register/components/form-personal-additional-emails/form-personal-additional-emails.component.ts
index bce9d17c5..022e553f2 100644
--- a/src/app/register/components/form-personal-additional-emails/form-personal-additional-emails.component.ts
+++ b/src/app/register/components/form-personal-additional-emails/form-personal-additional-emails.component.ts
@@ -58,6 +58,29 @@ export class FormPersonalAdditionalEmailsComponent implements AfterViewInit {
     )
   }
 
+  // Helper method to safely get backend errors for this email
+  getBackendErrorsForAdditionalEmail(control: AbstractControl | null): string[] {
+    if (!control || !control.parent?.parent?.errors) {
+      return []
+    }
+    
+    const backendErrors = control.parent.parent.errors['backendErrors']
+    if (!backendErrors?.['additionalEmails']) {
+      return []
+    }
+    
+    // Try to match by email value (trim whitespace)
+    const emailValue = control.value?.trim() || ''
+    const errors = backendErrors['additionalEmails'][emailValue]
+    
+    // If not found, try without trimming
+    if (!errors) {
+      return backendErrors['additionalEmails'][control.value] || []
+    }
+    
+    return errors || []
+  }
+
   // deleteEmailInput(id: string): void {
   //   this.additionalEmails.removeControl(id)
   //   this._changeDetectorRef.detectChanges()