Merge pull request #2824 from ORCID/lmendoza/PD-0000hot-fix-switch-user-issues

PD-5489

Author: cryptalith

src/app/core/http/retry-transient.interceptor.ts

@@ -8,9 +8,9 @@ import {
 import { Injectable } from '@angular/core'
 import { Observable, timer } from 'rxjs'
 import { retry } from 'rxjs/operators'
+import { SKIP_TRANSIENT_RETRY } from './retry-transient'
 
 const RETRYABLE_HTTP_STATUSES = new Set([0, 408, 502, 503, 504])
-const RETRYABLE_HTTP_METHODS = new Set(['GET', 'HEAD', 'OPTIONS'])
 const MAX_RETRIES = 2
 
 @Injectable()
@@ -19,9 +19,8 @@ export class RetryTransientInterceptor implements HttpInterceptor {
     req: HttpRequest<unknown>,
     next: HttpHandler
   ): Observable<HttpEvent<unknown>> {
-    // Retrying non-idempotent requests (e.g. switch-user POST) can trigger
-    // duplicate server-side actions and break account/session flows.
-    if (!RETRYABLE_HTTP_METHODS.has(req.method.toUpperCase())) {
+    // Allow request-level opt out for known special flows.
+    if (req.context.get(SKIP_TRANSIENT_RETRY)) {
       return next.handle(req)
     }
 

src/app/core/http/retry-transient.ts

@@ -1,8 +1,9 @@
-import { HttpErrorResponse } from '@angular/common/http'
+import { HttpContextToken, HttpErrorResponse } from '@angular/common/http'
 import { MonoTypeOperatorFunction, timer } from 'rxjs'
 import { retry } from 'rxjs/operators'
 
 export const RETRYABLE_HTTP_STATUSES = new Set([0, 408, 502, 503, 504])
+export const SKIP_TRANSIENT_RETRY = new HttpContextToken<boolean>(() => false)
 
 export function retryTransient<T>(
   maxRetries = 2,

src/app/core/user/user.service.ts

@@ -1,4 +1,9 @@
-import { HttpClient, HttpHeaders, HttpParams } from '@angular/common/http'
+import {
+  HttpClient,
+  HttpContext,
+  HttpHeaders,
+  HttpParams,
+} from '@angular/common/http'
 import { Inject, Injectable } from '@angular/core'
 import {
   BehaviorSubject,
@@ -56,7 +61,7 @@ import { TogglzFlag } from 'src/app/types/config.endpoint'
 import { LOCAL_SESSION_UID } from 'src/app/constants'
 import { Params } from '@angular/router'
 import { CookieService } from 'ngx-cookie-service'
-import { retryTransient } from '../http/retry-transient'
+import { retryTransient, SKIP_TRANSIENT_RETRY } from '../http/retry-transient'
 
 @Injectable({
   providedIn: 'root',
@@ -568,6 +573,7 @@ export class UserService {
       .post(`${runtimeEnvironment.API_WEB}switch-user`, '', {
         headers: this.headers,
         params: params,
+        context: new HttpContext().set(SKIP_TRANSIENT_RETRY, true),
       })
       .pipe(
         catchError((error) => {