diff --git a/src/app/authorize/pages/authorize/authorize.component.ts b/src/app/authorize/pages/authorize/authorize.component.ts index 181431f82..30ccbf22f 100644 --- a/src/app/authorize/pages/authorize/authorize.component.ts +++ b/src/app/authorize/pages/authorize/authorize.component.ts @@ -65,7 +65,7 @@ export class AuthorizeComponent { }) this._togglz - .getStateOf('DOMAINS_INTERSTITIAL') + .getStateOf('OAUTH_DOMAINS_INTERSTITIAL') .pipe(take(1)) .subscribe((value) => { this.oauthDomainsInterstitialEnabled = value diff --git a/src/app/core/login-interstitials/login-interstitials.service.ts b/src/app/core/login-interstitials/login-interstitials.service.ts index 700664b36..4b1ddfc55 100644 --- a/src/app/core/login-interstitials/login-interstitials.service.ts +++ b/src/app/core/login-interstitials/login-interstitials.service.ts @@ -27,7 +27,7 @@ export class LoginInterstitialsService { this.interstitialService .getInterstitialsViewed('DOMAIN_INTERSTITIAL') .subscribe((viewed) => { - this.alreadySawSignDomainInterstitial = viewed + // this.alreadySawSignDomainInterstitial = viewed }) this.toggleService .getStateOf('LOGIN_DOMAINS_INTERSTITIAL') @@ -39,38 +39,38 @@ export class LoginInterstitialsService { checkLoginInterstitials(userRecord: UserRecord): Observable | void { if ( userRecord?.userInfo && - userRecord?.emails?.emailDomains && + userRecord?.emails && !this.alreadyCheckLoginInterstitials ) { this.alreadyCheckLoginInterstitials = true - const isNotImpersonating = - userRecord.userInfo.REAL_USER_ORCID === - userRecord.userInfo.EFFECTIVE_USER_ORCID + // const isNotImpersonating = + // userRecord.userInfo.REAL_USER_ORCID === + // userRecord.userInfo.EFFECTIVE_USER_ORCID - if ( - isNotImpersonating && - !this.userHasPublicDomains(userRecord.emails) && - this.userHasPrivateDomains(userRecord.emails) && - this.loginDomainsInterstitialEnabled && - !this.alreadySawSignDomainInterstitial - ) { - this.alreadySawSignDomainInterstitial = true - this.interstitialService - .setInterstitialsViewed('DOMAIN_INTERSTITIAL') - .subscribe() - const data: ShareEmailsDomainsComponentDialogInput = { - userEmailsJson: userRecord.emails, - } - - const dialog = this._matDialog.open(ShareEmailsDomainsDialogComponent, { - data, - width: '580px', - disableClose: true, - autoFocus: false, - restoreFocus: false, - }) - return dialog.afterClosed() + // if ( + // isNotImpersonating && + // !this.userHasPublicDomains(userRecord.emails) && + // this.userHasPrivateDomains(userRecord.emails) && + // this.loginDomainsInterstitialEnabled && + // !this.alreadySawSignDomainInterstitial + // ) { + this.alreadySawSignDomainInterstitial = true + this.interstitialService + .setInterstitialsViewed('DOMAIN_INTERSTITIAL') + .subscribe() + const data: ShareEmailsDomainsComponentDialogInput = { + userEmailsJson: userRecord.emails, } + + const dialog = this._matDialog.open(ShareEmailsDomainsDialogComponent, { + data, + width: '580px', + disableClose: true, + autoFocus: false, + restoreFocus: false, + }) + return dialog.afterClosed() + // } } }