Merge pull request #2198 from ORCID/fix/9119-qa-notice-panel-not-disp…

…layed-when-verifying-email-address-while-signed-out fix: Display email verified notice panel
ORCID · Mar 15, 2024 · 16da1e1 · 16da1e1
2 parents fd63aee + be59a05
commit 16da1e1
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/src/app/sign-in/components/form-sign-in/form-sign-in.component.html b/src/app/sign-in/components/form-sign-in/form-sign-in.component.html
@@ -62,7 +62,7 @@
   <ng-container *ngIf="signInUpdatesV1Togglz">
     <app-my-orcid-alerts
       *ngIf="
-        (signInUpdatesV1Togglz && (emailVerified || invalidVerifyUrl)) ||
+        (emailVerified || invalidVerifyUrl) ||
         (printError && badCredentials)
       "
       [emailVerified]="emailVerified"

diff --git a/src/app/sign-in/components/form-sign-in/form-sign-in.component.ts b/src/app/sign-in/components/form-sign-in/form-sign-in.component.ts
@@ -57,8 +57,6 @@ export class FormSignInComponent implements OnInit, AfterViewInit, OnDestroy {
   @Input() signInType: TypeSignIn
   @Input() signInData: SignInData
   @Input() signInUpdatesV1Togglz: boolean
-  @Input() emailVerified: boolean
-  @Input() invalidVerifyUrl: boolean
   @Output() isOauthError = new EventEmitter<boolean>()
   @Output() show2FAEmitter = new EventEmitter<object>()
   @Output() loading = new EventEmitter<boolean>()
@@ -81,6 +79,8 @@ export class FormSignInComponent implements OnInit, AfterViewInit, OnDestroy {
   private readonly $destroy = new Subject()
   authorizationFormSubmitted: boolean
   backendErrorsMatcher = new ErrorStateMatcherForPasswordField()
+  emailVerified: boolean
+  invalidVerifyUrl: boolean
 
   placeholderUsername = $localize`:@@ngOrcid.signin.username:Email or 16-digit ORCID iD`
   placeholderPassword = $localize`:@@ngOrcid.signin.yourOrcidPassword:Your ORCID password`
@@ -143,6 +143,14 @@ export class FormSignInComponent implements OnInit, AfterViewInit, OnDestroy {
               }
             })
         }
+
+        if (platform.queryParameters.emailVerified) {
+          this.emailVerified = platform.queryParameters.emailVerified
+        }
+
+        if (platform.queryParameters.invalidVerifyUrl) {
+          this.invalidVerifyUrl = platform.queryParameters.invalidVerifyUrl
+        }
       })
   }
 

diff --git a/src/app/sign-in/pages/sign-in/sign-in.component.html b/src/app/sign-in/pages/sign-in/sign-in.component.html
@@ -33,8 +33,6 @@
                 [email]="email"
                 #formSignInComponent
                 [signInType]="signInType"
-                [emailVerified]="emailVerified"
-                [invalidVerifyUrl]="invalidVerifyUrl"
                 (show2FAEmitter)="show2FAEmitter($event)"
                 (isOauthError)="isOauthError = $event"
                 (errorDescription)="errorDescription = $event"