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

package/fesm2020/dsivd-prestations-ng.mjs

@@ -31,32 +31,46 @@ import weekOfYear from 'dayjs/plugin/weekOfYear';
 
 /* eslint-disable @typescript-eslint/no-explicit-any */
 const IAM_SESSION_EXPIRED_HEADER = 'iam-session-expired';
-const LOGIN_PATH = '/100018/login';
+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 isRedirectionToCyberLogin = (event) => {
+    const isRedirection = event.status === 302 /* Found */;
+    const location = event.headers.get('Location');
+    return isRedirection && location?.includes(CYBER_LOGIN_PATH);
+};
 class IamExpiredInterceptorService {
     constructor() {
-        this._iamExpirationHeaderPresence = new Subject();
+        this._isIamSessionExpired = new Subject();
     }
-    get iamExpirationHeaderPresence() {
-        return this._iamExpirationHeaderPresence.asObservable();
+    get isIamSessionExpired() {
+        return this._isIamSessionExpired.asObservable();
     }
     intercept(req, next) {
         return next.handle(req).pipe(map(event => {
+            console.log('event', typeof event, event);
             if (event instanceof HttpResponse) {
-                // either we have the header 'iam-session-expired'
-                const iamExpiredHeader = event.headers.get(IAM_SESSION_EXPIRED_HEADER);
-                if (null !== iamExpiredHeader) {
-                    this._iamExpirationHeaderPresence.next(true);
+                if (isIamExpiredHeader(event) ||
+                    isRedirectionToIamACV(event) ||
+                    isRedirectionToCyberLogin(event)) {
+                    this._isIamSessionExpired.next(true);
                 }
             }
             return event;
         }), catchError(this.handleError.bind(this)));
     }
     handleError(err) {
+        console.log('err', typeof err, err);
         if (err instanceof HttpErrorResponse) {
-            if (err.status === 200) {
-                const isLogin = err.url.indexOf(LOGIN_PATH) > 0;
+            if (err.status === 200 /* Ok */) {
+                const isLogin = err.url.indexOf(CYBER_LOGIN_PATH) > 0;
                 if (isLogin) {
-                    this._iamExpirationHeaderPresence.next(true);
+                    this._isIamSessionExpired.next(true);
                 }
             }
         }
@@ -9922,7 +9936,7 @@ class RedirectComponent {
         this.modalHeaderText = 'Information';
         this.modalBodyText = `<p>Votre session a expiré.</p>
             <p>Vous pouvez vous connecter à nouveau pour continuer à utiliser nos services.</p>`;
-        this.iamInterceptor.iamExpirationHeaderPresence
+        this.iamInterceptor.isIamSessionExpired
             .pipe(first())
             .subscribe(() => this.showModal());
     }