@dsivd/prestations-ng 15.2.3-beta7 → 15.2.3-beta8

package/fesm2020/dsivd-prestations-ng.mjs

@@ -33,16 +33,15 @@ import weekOfYear from 'dayjs/plugin/weekOfYear';
 const IAM_SESSION_EXPIRED_HEADER = 'iam-session-expired';
 const CYBER_LOGIN_PATH = '/100018/login';
 const ACV_LOGIN_PATH = '/iamlogin';
-const isIamExpiredHeader = (event) => !!event.headers.get(IAM_SESSION_EXPIRED_HEADER);
-const isRedirectionToIamACV = (event) => {
-    const isRedirection = event.status === 302 /* Found */;
-    const location = event.headers.get('Location');
-    return isRedirection && location?.includes(ACV_LOGIN_PATH);
+const isIamExpiredHeader = (event) => {
+    return !!event.headers.get(IAM_SESSION_EXPIRED_HEADER);
 };
-const isRedirectionToCyberLogin = (event) => {
+const isRedirectionToLogin = (event) => {
     const isRedirection = event.status === 302 /* Found */;
-    const location = event.headers.get('Location');
-    return isRedirection && location?.includes(CYBER_LOGIN_PATH);
+    const locationHeader = event.headers.get('Location');
+    const isLocationCyberLogin = locationHeader?.includes(CYBER_LOGIN_PATH);
+    const isLocationAcvLogin = locationHeader?.includes(ACV_LOGIN_PATH);
+    return isRedirection && (isLocationCyberLogin || isLocationAcvLogin);
 };
 class IamExpiredInterceptorService {
     constructor() {
@@ -53,11 +52,9 @@ class IamExpiredInterceptorService {
     }
     intercept(req, next) {
         return next.handle(req).pipe(map(event => {
-            console.log('event', typeof event, event);
             if (event instanceof HttpResponse) {
                 if (isIamExpiredHeader(event) ||
-                    isRedirectionToIamACV(event) ||
-                    isRedirectionToCyberLogin(event)) {
+                    isRedirectionToLogin(event)) {
                     this._isIamSessionExpired.next(true);
                 }
             }
@@ -65,13 +62,12 @@ class IamExpiredInterceptorService {
         }), catchError(this.handleError.bind(this)));
     }
     handleError(err) {
-        console.log('err', typeof err, err);
         if (err instanceof HttpErrorResponse) {
-            if (err.status === 200 /* Ok */) {
-                const isLogin = err.url.indexOf(CYBER_LOGIN_PATH) > 0;
-                if (isLogin) {
-                    this._isIamSessionExpired.next(true);
-                }
+            const isStatusOk = err.status === 200 /* Ok */;
+            const isUrlCyberLogin = err.url.includes(CYBER_LOGIN_PATH);
+            const isUrlAcvLogin = err.url.includes(ACV_LOGIN_PATH);
+            if (isStatusOk && (isUrlCyberLogin || isUrlAcvLogin)) {
+                this._isIamSessionExpired.next(true);
             }
         }
         return throwError(err);