singin-interstitial

ORCID · Nov 25, 2024 · 6035557 · 6035557
1 parent f3bd8ad
commit 6035557
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 12 deletions.
diff --git a/src/app/authorize/pages/authorize/authorize.component.ts b/src/app/authorize/pages/authorize/authorize.component.ts
@@ -95,11 +95,11 @@ export class AuthorizeComponent {
     if (
       url &&
       this.userHasPrivateDomains &&
-      !this.userHasPublicDomains &&
-      this.oauthDomainsInterstitialEnabled &&
-      !this.domainInterstitialHasBeenViewed &&
-      this.userIsNotImpersonating &&
-      !this.insidePopUpWindows
+      !this.userHasPublicDomains 
+      // this.oauthDomainsInterstitialEnabled &&
+      // !this.domainInterstitialHasBeenViewed &&
+      // this.userIsNotImpersonating &&
+      // !this.insidePopUpWindows
     ) {
       this.showAuthorizationComponent = false
       this.showInterstital = true

diff --git a/src/app/cdk/interstitials/share-emails-domains/share-emails-domains-dialog.component.ts b/src/app/cdk/interstitials/share-emails-domains/share-emails-domains-dialog.component.ts
@@ -47,7 +47,7 @@ export class ShareEmailsDomainsDialogComponent extends ShareEmailsDomainsCompone
     this.dialogRef.close(emails)
   }
 
-  override afterEmailUpdates() {
-    this.finishIntertsitial()
+  override afterEmailUpdates(emails: string[]) {
+    this.finishIntertsitial(emails)
   }
 }
diff --git a/src/app/cdk/interstitials/share-emails-domains/share-emails-domains.component.ts b/src/app/cdk/interstitials/share-emails-domains/share-emails-domains.component.ts
@@ -89,15 +89,15 @@ export class ShareEmailsDomainsComponent {
 
       this.recordEmailsService.postEmails(this.userEmailsJson).subscribe(
         (response) => {
-          this.afterEmailUpdates()
+          this.afterEmailUpdates(this.domainToMakePublic)
         },
         (error) => this.finishIntertsitial()
       )
     } else {
       this.finishIntertsitial()
     }
   }
-  afterEmailUpdates() {
+  afterEmailUpdates(emails: string[]) {
     this.afterSummit = true
     this.beforeSummit = false
     setTimeout(() => {

diff --git a/src/app/core/login-interstitials/login-interstitials.service.ts b/src/app/core/login-interstitials/login-interstitials.service.ts
@@ -26,7 +26,7 @@ export class LoginInterstitialsService {
     this.interstitialService
       .getInterstitialsViewed('SIGN_IN_DOMAIN_INTERSTITIAL')
       .subscribe((viewed) => {
-        this.alreadySawSignDomainInterstitial = viewed
+        // this.alreadySawSignDomainInterstitial = viewed
       })
     this.toggleService
       .getStateOf('LOGIN_DOMAINS_INTERSTITIAL')
@@ -43,12 +43,12 @@ export class LoginInterstitialsService {
         userRecord.userInfo.EFFECTIVE_USER_ORCID
     }
     if (
-      isNotImpersonating &&
+      // isNotImpersonating &&
       userRecord.emails &&
       userRecord.emails.emailDomains &&
       !this.userHasPublicDomains(userRecord.emails) &&
       this.userHasPrivateDomains(userRecord.emails) &&
-      this.loginDomainsInterstitialEnabled &&
+      // this.loginDomainsInterstitialEnabled &&
       !this.alreadySawSignDomainInterstitial
     ) {
       this.alreadySawSignDomainInterstitial = true