@dsivd/prestations-ng 18.2.4-beta.5 → 18.2.4-beta.7

package/fesm2022/dsivd-prestations-ng.mjs

@@ -5,7 +5,7 @@ import { ActivatedRoute, NavigationStart, RouterModule, NavigationEnd, RouterLin
 import { of, Subject, BehaviorSubject, combineLatest, throwError, switchMap as switchMap$1, forkJoin, tap as tap$1, concat, toArray, EMPTY, startWith, filter as filter$1, merge, withLatestFrom, debounceTime as debounceTime$1, map as map$1 } from 'rxjs';
 import { map, shareReplay, filter, tap, debounceTime, catchError, switchMap, take, first, throttleTime, mergeMap, share, finalize, distinctUntilChanged } from 'rxjs/operators';
 import * as i1 from '@angular/common/http';
-import { HttpStatusCode, HttpClient, HttpHeaders, HttpResponseBase, HttpErrorResponse, HttpParams, HttpEventType, HttpResponse, HTTP_INTERCEPTORS, provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
+import { HttpStatusCode, HttpClient, HttpResponseBase, HttpHeaders, HttpErrorResponse, HttpParams, HttpEventType, HttpResponse, HTTP_INTERCEPTORS, provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
 import * as i3 from '@angular/forms';
 import { NgModel, NgForm, FormsModule } from '@angular/forms';
 import * as i2 from '@angular/common';
@@ -1911,7 +1911,7 @@ const isRedirectionToLogin = (event) => {
 class IamExpiredInterceptorService {
     constructor() {
         this.http = inject(HttpClient);
-        this.appInfoService = inject(ApplicationInfoService);
+        // private appInfoService = inject(ApplicationInfoService);
         this.sessionInfoService = inject(SessionInfo);
         this._isIamSessionExpired = new BehaviorSubject(false);
     }
@@ -1924,30 +1924,41 @@ class IamExpiredInterceptorService {
     intercept(req, next) {
         // Skip interceptor for the preliminary requests
         if (req.headers.has('X-Skip-Interceptor') ||
-            req.url.includes(APP_INFO_API_URL) ||
+            // req.url.includes(APP_INFO_API_URL) ||
             req.url.includes(SESSION_INFO_API_URL)) {
+            console.log('skipping interceptor for req : ', req);
             return next.handle(req);
         }
-        const isDevEnv = this.appInfoService.data.pipe(map(appInfo => appInfo.environment.toUpperCase() === 'CO'));
-        const isUserConnected = this.sessionInfoService.data.pipe(map(sessionInfo => !!sessionInfo?.context));
-        return combineLatest([isDevEnv, isUserConnected]).pipe(take(1), switchMap(([isDev, isConnected]) => {
-            const renewIamSession = this.http
-                .options('/sessioninfo/v2/me', {
-                headers: new HttpHeaders({
-                    'X-Skip-Interceptor': 'true'
-                })
-            })
-                .pipe(catchError(() => of(null)));
-            return (!isDev && isConnected ? renewIamSession : of(null)).pipe(switchMap(() => next.handle(req).pipe(map(event => {
-                if (event instanceof HttpResponseBase) {
-                    if (hasIamExpiredHeader(event) ||
-                        isRedirectionToLogin(event)) {
-                        this.setIamSessionExpiredManually();
-                    }
-                }
-                return event;
-            }), catchError(this.handleError.bind(this)))));
+        // const isDevEnv = this.appInfoService.data.pipe(
+        //     map(appInfo => appInfo.environment.toUpperCase() === 'CO'),
+        //     tap(result => {
+        //         console.log('isDevEnv', result);
+        //     })
+        // );
+        const isUserConnected = this.sessionInfoService.data.pipe(map(sessionInfo => !!sessionInfo?.context), tap(result => {
+            console.log('isUserConnected', result);
         }));
+        return combineLatest([isUserConnected]).pipe(take(1), switchMap(([isConnected]) => (isConnected ? this.getRenewIamSession() : of(null)).pipe(switchMap(() => next.handle(req).pipe(map(event => {
+            if (event instanceof HttpResponseBase) {
+                if (hasIamExpiredHeader(event) ||
+                    isRedirectionToLogin(event)) {
+                    this.setIamSessionExpiredManually();
+                }
+            }
+            return event;
+        }), catchError(this.handleError.bind(this)))))));
+    }
+    getRenewIamSession() {
+        // call session info through RP IAM (prestations.vd.ch)
+        // this renews the session since it is a "securised" endpoint
+        // use OPTIONS to avoid extra load on session info
+        return this.http
+            .options('/sessioninfo/v2/me', {
+            headers: new HttpHeaders({
+                'X-Skip-Interceptor': 'true'
+            })
+        })
+            .pipe(catchError(() => of(null)));
     }
     handleError(err) {
         if (err instanceof HttpErrorResponse) {