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

package/fesm2020/dsivd-prestations-ng.mjs

@@ -32,35 +32,30 @@ import weekOfYear from 'dayjs/plugin/weekOfYear';
 /* eslint-disable @typescript-eslint/no-explicit-any */
 const IAM_SESSION_EXPIRED_HEADER = 'iam-session-expired';
 const CYBER_LOGIN_PATH = '/100018/login';
-const PORTAIL_IAM_ACV_EXTRA_PATH = 'portail.vd.ch:443/iamlogin';
-const PORTAIL_IAM_ACV_INTRA_PATH = 'portail.etat-de-vaud.ch:443/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(PORTAIL_IAM_ACV_EXTRA_PATH) ||
-            location?.includes(PORTAIL_IAM_ACV_INTRA_PATH)));
+const ACV_LOGIN_PATH = '/iamlogin';
+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() {
-        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 => {
             if (event instanceof HttpResponse) {
                 if (isIamExpiredHeader(event) ||
-                    isRedirectionToIamACV(event) ||
-                    isRedirectionToCyberLogin(event)) {
-                    this._iamExpirationHeaderPresence.next(true);
+                    isRedirectionToLogin(event)) {
+                    this._isIamSessionExpired.next(true);
                 }
             }
             return event;
@@ -68,11 +63,11 @@ class IamExpiredInterceptorService {
     }
     handleError(err) {
         if (err instanceof HttpErrorResponse) {
-            if (err.status === 200) {
-                const isLogin = err.url.indexOf(CYBER_LOGIN_PATH) > 0;
-                if (isLogin) {
-                    this._iamExpirationHeaderPresence.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);
@@ -9937,7 +9932,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());
     }