load interstitials after loading user session in oauth (#2488)

* load interstitials after loading user session in oauth

* load-interstitials-after-loading-user-session-in-oauth

* load-interstitials-after-loading-user-session-in-oauth

* move user session filter to interstitial service

---------

Co-authored-by: Leonardo Mendoza <[email protected]>

Author: auumgn

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

@@ -63,12 +63,17 @@ export class AuthorizeComponent {
     forkJoin({
       userSession: this.loadUserSession(),
       platform: this.loadPlatformInfo(),
-      interstitial: this.loadInterstitialViewed(),
       togglz: this.loadTogglzState(),
       emails: this.loadEmails(),
-    }).subscribe(({ userSession }) => {
-      this.handleUserSession(userSession)
     })
+      .pipe(
+        tap(() => {
+          this.loadInterstitialViewed()
+        })
+      )
+      .subscribe(({ userSession }) => {
+        this.handleUserSession(userSession)
+      })
   }
 
   /**

src/app/cdk/interstitials/interstitials.service.ts

@@ -29,6 +29,7 @@ export class InterstitialsService {
 
   getInterstitialsViewed(interstitial: Interstitials): Observable<boolean> {
     return this._userInfo.getUserSession().pipe(
+      filter((userInfo) => !!userInfo.userInfo),
       map((userInfo) => {
         const effectiveUser = userInfo?.userInfo?.EFFECTIVE_USER_ORCID
         if (interstitial === 'DOMAIN_INTERSTITIAL') {