From a58e91b659cfeebfb15bde228310238327d59ae2 Mon Sep 17 00:00:00 2001 From: Leonardo Mendoza Fernadez Date: Mon, 11 Nov 2024 11:51:18 -0600 Subject: [PATCH 1/3] 9489-qa-email-domains-interstitial-shown-to-user-with-at-least-one-public-email-domain --- src/app/authorize/pages/authorize/authorize.component.ts | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/app/authorize/pages/authorize/authorize.component.ts b/src/app/authorize/pages/authorize/authorize.component.ts index 3cc104ae5..07673a147 100644 --- 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 && From 6592274fb4906280f5383dfb2080d4e4987233bb Mon Sep 17 00:00:00 2001 From: leomendoza123 Date: Mon, 11 Nov 2024 18:08:46 +0000 Subject: [PATCH 2/3] =?UTF-8?q?=F0=9F=A4=96=20GITHUB=20ACTIONS=20format=5F?= =?UTF-8?q?prettier?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app/authorize/pages/authorize/authorize.component.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/authorize/pages/authorize/authorize.component.ts b/src/app/authorize/pages/authorize/authorize.component.ts index 07673a147..45eeb7e42 100644 --- a/src/app/authorize/pages/authorize/authorize.component.ts +++ b/src/app/authorize/pages/authorize/authorize.component.ts @@ -76,7 +76,7 @@ export class AuthorizeComponent { tap((value) => { this.originalEmailsBackendCopy = cloneDeep(value) this.userHasPrivateDomains = this.userHasPrivateEmails(value) - this.userHasPublicDomains= this.userHasPublicEmails(value) + this.userHasPublicDomains = this.userHasPublicEmails(value) }), first() ) From 6387cb873dd37f32542d13190b51f6d40cca45fb Mon Sep 17 00:00:00 2001 From: github actions Date: Mon, 11 Nov 2024 18:43:56 +0000 Subject: [PATCH 3/3] v2.107.8 changelog update --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index fa8fe9ac6..a1de64907 100644 --- 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)