Merge branch 'main' into lmendoza/9453-update-node-version

ORCID · Nov 12, 2024 · 7933af1 · 7933af1
2 parents 369a7be + 6387cb8
commit 7933af1
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+## v2.107.8 - 2024-11-11
+
+[Full Changelog](https://github.com/ORCID/orcid-angular/compare/v2.107.7...v2.107.8)
+
+- [#2391](https://github.com/ORCID/orcid-angular/pull/2391): 9489-qa-email-domains-interstitial-shown-to-user-with-at-least-one-pu…
+
 ## v2.107.7 - 2024-11-08
 
 [Full Changelog](https://github.com/ORCID/orcid-angular/compare/v2.107.6...v2.107.7)

diff --git a/src/app/authorize/pages/authorize/authorize.component.ts b/src/app/authorize/pages/authorize/authorize.component.ts
@@ -28,6 +28,7 @@ export class AuthorizeComponent {
   domainInterstitialHasBeenViewed: boolean
   userIsNotImpersonating: boolean
   insidePopUpWindows: boolean
+  userHasPublicDomains: boolean
 
   constructor(
     _user: UserService,
@@ -75,11 +76,15 @@ export class AuthorizeComponent {
         tap((value) => {
           this.originalEmailsBackendCopy = cloneDeep(value)
           this.userHasPrivateDomains = this.userHasPrivateEmails(value)
+          this.userHasPublicDomains = this.userHasPublicEmails(value)
         }),
         first()
       )
       .subscribe()
   }
+  userHasPublicEmails(value: EmailsEndpoint): any {
+    return !!value.emailDomains.find((domain) => domain.visibility === 'PUBLIC')
+  }
 
   userHasPrivateEmails(value: EmailsEndpoint): boolean {
     return !!value.emailDomains.find((domain) => domain.visibility !== 'PUBLIC')
@@ -90,6 +95,7 @@ export class AuthorizeComponent {
     if (
       url &&
       this.userHasPrivateDomains &&
+      !this.userHasPublicDomains &&
       this.oauthDomainsInterstitialEnabled &&
       !this.domainInterstitialHasBeenViewed &&
       this.userIsNotImpersonating &&