9694-capture-affiliations-during-sign-in

Author: cryptalith

src/app/authorize/pages/authorize/authorize.component.ts

@@ -55,7 +55,6 @@ export class AuthorizeComponent {
 
   // User session properties
   isNotImpersonating = false
-  insidePopUpWindows = false
   interstitialComponent: ComponentType<any>
   redirectByReportAlreadyAuthorize: boolean
 
@@ -74,7 +73,7 @@ export class AuthorizeComponent {
    */
   ngOnInit(): void {
     this.loading = true
-    this.insidePopUpWindows = !!this.window.opener
+    
 
     forkJoin({
       platform: this.loadPlatformInfo(),

src/app/core/login-interstitials-manager/implementations/login-affiliation-interstitials-manager.service.ts

@@ -1,4 +1,4 @@
-import { Component, Injectable, Type } from '@angular/core'
+import { Component, Inject, Injectable, Type } from '@angular/core'
 import { MatLegacyDialog as MatDialog } from '@angular/material/legacy-dialog'
 import { Observable, of } from 'rxjs'
 
@@ -17,6 +17,7 @@ import {
   AffilationsComponentDialogOutput,
   AffiliationsInterstitialDialogComponent,
 } from 'src/app/cdk/interstitials/affiliations-interstitial/interstitial-dialog-extend/affiliations-interstitial-dialog.component'
+import { WINDOW } from 'src/app/cdk/window'
 
 @Injectable({
   providedIn: 'root',
@@ -38,7 +39,8 @@ export class LoginAffiliationInterstitialManagerService extends LoginBaseInterst
     matDialog: MatDialog,
     interstitialsService: InterstitialsService,
     togglzService: TogglzService,
-    qaFlagService: QaFlagsService
+    qaFlagService: QaFlagsService,
+    @Inject(WINDOW) private _window: Window
   ) {
     // Pass dependencies to the parent
     super(matDialog, togglzService, interstitialsService, qaFlagService)
@@ -58,13 +60,16 @@ export class LoginAffiliationInterstitialManagerService extends LoginBaseInterst
       userRecord?.userInfo?.EFFECTIVE_USER_ORCID
     )
 
+    const insideAnIframe = !!this._window.opener
+
     const userHasEmploymentAffiliation = userRecord?.affiliations?.some(
       (affiliation) =>
         affiliation.type === 'EMPLOYMENT' &&
         affiliation.affiliationGroup.length > 0
     )
 
-    if (userHasEmploymentAffiliation || isImpersonation) return of(false)
+    if (userHasEmploymentAffiliation || isImpersonation || insideAnIframe)
+      return of(false)
     return of(true)
   }
 

src/app/core/login-interstitials-manager/implementations/login-domain-interstitials-manager.service.ts

@@ -17,6 +17,7 @@ import {
   ShareEmailsDomainsComponentDialogOutput,
   ShareEmailsDomainsDialogComponent,
 } from 'src/app/cdk/interstitials/share-emails-domains/interstitial-dialog-extend/share-emails-domains-dialog.component'
+import { WINDOW } from 'src/app/cdk/window'
 
 @Injectable({
   providedIn: 'root',
@@ -38,7 +39,8 @@ export class LoginDomainInterstitialManagerService extends LoginBaseInterstitial
     _matDialog: MatDialog,
     interstitialsService: InterstitialsService,
     togglzService: TogglzService,
-    qaFlagService: QaFlagsService
+    qaFlagService: QaFlagsService,
+    @Inject(WINDOW) private _window: Window,
   ) {
     // Pass dependencies to the parent
     super(_matDialog, togglzService, interstitialsService, qaFlagService)
@@ -56,10 +58,12 @@ export class LoginDomainInterstitialManagerService extends LoginBaseInterstitial
       userRecord?.userInfo?.EFFECTIVE_USER_ORCID
     )
 
+    const insidePopUpWindows = !!this._window.opener
+
     const hasNoPublicDomains = !this.userHasPublicDomains(userRecord.emails)
     const hasPrivateDomains = this.userHasPrivateDomains(userRecord.emails)
 
-    if (!hasNoPublicDomains || !hasPrivateDomains || isImpersonation) {
+    if (!hasNoPublicDomains || !hasPrivateDomains || isImpersonation || insidePopUpWindows) {
       return of(false)
     }
     return of(true)
@@ -92,3 +96,7 @@ export class LoginDomainInterstitialManagerService extends LoginBaseInterstitial
     return ShareEmailsDomainsComponent
   }
 }
+function Inject(WINDOW: any): (target: typeof LoginDomainInterstitialManagerService, propertyKey: undefined, parameterIndex: 4) => void {
+  throw new Error('Function not implemented.')
+}
+