Merge branch 'main' into OAuthMigration_Signin_utils

Author: amontenegro

CHANGELOG.md

@@ -1,3 +1,17 @@
+## v2.112.8 - 2025-04-01
+
+[Full Changelog](https://github.com/ORCID/orcid-angular/compare/v2.112.7...v2.112.8)
+
+## v2.112.7 - 2025-03-31
+
+[Full Changelog](https://github.com/ORCID/orcid-angular/compare/v2.112.6...v2.112.7)
+
+- [#2485](https://github.com/ORCID/orcid-angular/pull/2485): view interstitials only when signed in
+
+## v2.112.6 - 2025-03-31
+
+[Full Changelog](https://github.com/ORCID/orcid-angular/compare/v2.112.5...v2.112.6)
+
 ## v2.112.5 - 2025-03-27
 
 [Full Changelog](https://github.com/ORCID/orcid-angular/compare/v2.112.4...v2.112.5)

src/app/account-trusted-parties/components/dialog-revoke-your-own-permissions/dialog-revoke-your-own-permissions.component.html

@@ -18,7 +18,7 @@
     >
   </p>
 
-  <app-alert-message type="warning" class="orc-font-body-small">
+  <app-alert-message type="notice" class="orc-font-body-small">
     <ng-container content i18n="@@account.warningRevokeAccess">
       This user will be notified that you have revoked your account delegate
       access permissions for their record.

src/app/account-trusted-parties/components/settings-users-that-thrust-you/settings-users-that-thrust-you.component.html

@@ -82,12 +82,7 @@
         <th mat-header-cell *matHeaderCellDef></th>
         <td mat-cell *matCellDef="let element">
           <div class="actions-container orc-font-body-small">
-            <mat-icon
-              (click)="revokeAccess(element)"
-              class="warn pointer"
-              [routerLink]="trustedPartiesUrl"
-              >block</mat-icon
-            >
+            <mat-icon class="warn pointer">block</mat-icon>
 
             <a
               class="underline warn"

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

@@ -1,7 +1,7 @@
 import { HttpClient } from '@angular/common/http'
 import { Injectable } from '@angular/core'
 import { Observable, of } from 'rxjs'
-import { catchError, map, retry, switchMap } from 'rxjs/operators'
+import { catchError, filter, map, retry, switchMap, tap } from 'rxjs/operators'
 import { UserService } from 'src/app/core'
 import { ErrorHandlerService } from 'src/app/core/error-handler/error-handler.service'
 type Interstitials = 'DOMAIN_INTERSTITIAL'
@@ -16,15 +16,17 @@ export class InterstitialsService {
     private _errorHandler: ErrorHandlerService
   ) {}
 
-  setInterstitialsViewed(interstitial: Interstitials) {
+  setInterstitialsViewed(interstitial: Interstitials, updateDatabase = true) {
     return this._userInfo.getUserSession().pipe(
       map((userInfo) => {
         const effectiveUser = userInfo?.userInfo?.EFFECTIVE_USER_ORCID
         localStorage.setItem(effectiveUser + '_' + interstitial, 'true')
       }),
+      filter(() => updateDatabase),
       switchMap(() => this.addInterstitialFlag(interstitial))
     )
   }
+
   getInterstitialsViewed(interstitial: Interstitials): Observable<boolean> {
     return this._userInfo.getUserSession().pipe(
       map((userInfo) => {
@@ -56,13 +58,23 @@ export class InterstitialsService {
     )
   }
 
-  private hasInterstitialFlag(interstitialName: string): Observable<boolean> {
+  private hasInterstitialFlag(
+    interstitialName: Interstitials
+  ): Observable<boolean> {
     return this._http
       .get<boolean>(
         `${runtimeEnvironment.API_WEB}account/hasInterstitialFlag/${interstitialName}`
       )
       .pipe(
         retry(3),
+        switchMap((hasFlag) => {
+          if (hasFlag) {
+            return this.setInterstitialsViewed(interstitialName, false).pipe(
+              map(() => hasFlag)
+            )
+          }
+          return of(hasFlag)
+        }),
         catchError((error) => this._errorHandler.handleError(error))
       )
   }

src/app/core/login-interstitials/login-interstitials.service.ts

@@ -8,9 +8,10 @@ import { EmailsEndpoint } from 'src/app/types'
 import { UserRecord } from 'src/app/types/record.local'
 import { ShareEmailsDomainsComponentDialogInput } from 'src/app/cdk/interstitials/share-emails-domains/share-emails-domains.component'
 import { InterstitialsService } from 'src/app/cdk/interstitials/interstitials.service'
-import { Observable } from 'rxjs'
+import { EMPTY, Observable, of } from 'rxjs'
 import { ShareEmailsDomainsDialogComponent } from 'src/app/cdk/interstitials/share-emails-domains/share-emails-domains-dialog.component'
 import { TogglzService } from '../togglz/togglz.service'
+import { filter, switchMap, tap } from 'rxjs/operators'
 
 @Injectable({
   providedIn: 'root',
@@ -24,54 +25,68 @@ export class LoginInterstitialsService {
     private interstitialService: InterstitialsService,
     private toggleService: TogglzService
   ) {
-    this.interstitialService
-      .getInterstitialsViewed('DOMAIN_INTERSTITIAL')
-      .subscribe((viewed) => {
-        this.alreadySawSignDomainInterstitial = viewed
-      })
     this.toggleService
       .getStateOf('LOGIN_DOMAINS_INTERSTITIAL')
       .subscribe((state) => {
         this.loginDomainsInterstitialEnabled = state
       })
   }
 
-  checkLoginInterstitials(userRecord: UserRecord): Observable<string[]> | void {
+  checkLoginInterstitials(userRecord: UserRecord): Observable<string[]> {
+    if (!userRecord?.userInfo) {
+      return EMPTY
+    }
+
+    const isNotImpersonating =
+      userRecord.userInfo.REAL_USER_ORCID ===
+      userRecord.userInfo.EFFECTIVE_USER_ORCID
     if (
-      userRecord?.userInfo &&
       userRecord?.emails?.emailDomains &&
+      isNotImpersonating &&
+      !this.userHasPublicDomains(userRecord.emails) &&
+      this.userHasPrivateDomains(userRecord.emails) &&
       !this.alreadyCheckLoginInterstitials
     ) {
       this.alreadyCheckLoginInterstitials = true
-      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,
-        }
+      return this.interstitialService
+        .getInterstitialsViewed('DOMAIN_INTERSTITIAL')
+        .pipe(
+          tap((viewed) => {
+            this.alreadySawSignDomainInterstitial = viewed
+          }),
+          filter(() => {
+            return (
+              this.loginDomainsInterstitialEnabled &&
+              !this.alreadySawSignDomainInterstitial
+            )
+          }),
+          switchMap(() => {
+            this.alreadySawSignDomainInterstitial = true
+            return this.interstitialService.setInterstitialsViewed(
+              'DOMAIN_INTERSTITIAL'
+            )
+          }),
+          switchMap(() => {
+            const data: ShareEmailsDomainsComponentDialogInput = {
+              userEmailsJson: userRecord.emails,
+            }
 
-        const dialog = this._matDialog.open(ShareEmailsDomainsDialogComponent, {
-          data,
-          width: '580px',
-          disableClose: true,
-          autoFocus: false,
-          restoreFocus: false,
-          maxHeight: 'calc(100vh - 20px)',
-        })
-        return dialog.afterClosed()
-      }
+            const dialog = this._matDialog.open(
+              ShareEmailsDomainsDialogComponent,
+              {
+                data,
+                width: '580px',
+                disableClose: true,
+                autoFocus: false,
+                restoreFocus: false,
+                maxHeight: 'calc(100vh - 20px)',
+              }
+            )
+            return dialog.afterClosed()
+          })
+        )
+    } else {
+      return EMPTY
     }
   }