Merge branch 'main' into lmendoza/batch-of-work-jan-2025

ORCID · Jan 27, 2025 · aa9d7cd · aa9d7cd
2 parents 55a43ae + 261ce0c
commit aa9d7cd
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/src/app/core/register2/register2.backend-validators.ts b/src/app/core/register2/register2.backend-validators.ts
@@ -25,7 +25,8 @@ interface HasFormAdapters {
     StepB: UntypedFormGroup,
     StepC: UntypedFormGroup,
     StepC2: UntypedFormGroup,
-    StepD: UntypedFormGroup
+    StepD: UntypedFormGroup,
+    isReactivation?: boolean
   ): RegisterForm
 }
 
@@ -164,7 +165,7 @@ export function Register2BackendValidatorMixin<
       StepC: UntypedFormGroup,
       StepC2: UntypedFormGroup,
       StepD: UntypedFormGroup,
-
+      isReactivation?: boolean,
       type?: 'shibboleth'
     ): Observable<RegisterForm> {
       const registerForm = this.formGroupToFullRegistrationForm(
@@ -174,6 +175,7 @@ export function Register2BackendValidatorMixin<
         StepC2,
         StepD
       )
+      registerForm.isReactivation = isReactivation
       return this._http
         .post<RegisterForm>(`${environment.API_WEB}register.json`, registerForm)
         .pipe(

diff --git a/src/app/register2/pages/register/register2.component.ts b/src/app/register2/pages/register/register2.component.ts
@@ -176,7 +176,8 @@ export class Register2Component implements OnInit, AfterViewInit {
           this.FormGroupStepB,
           this.FormGroupStepC,
           this.FormGroupStepC2,
-          this.FormGroupStepD
+          this.FormGroupStepD,
+          this.reactivation?.isReactivation
         )
         .pipe(
           switchMap((validator: RegisterForm) => {

diff --git a/src/app/types/register.endpoint.ts b/src/app/types/register.endpoint.ts
@@ -28,6 +28,7 @@ export interface RegisterForm {
   emailAccessAllowed?: boolean
   redirectUrl?: any
   resetParams?: string
+  isReactivation?: boolean
 }
 
 export interface DuplicatedName {