@dsivd/prestations-ng 15.2.3-beta6 → 15.2.3-beta9

package/fesm2020/dsivd-prestations-ng.mjs

@@ -32,36 +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 => {
-            console.log('event', event);
             if (event instanceof HttpResponse) {
                 if (isIamExpiredHeader(event) ||
-                    isRedirectionToIamACV(event) ||
-                    isRedirectionToCyberLogin(event)) {
-                    this._iamExpirationHeaderPresence.next(true);
+                    isRedirectionToLogin(event)) {
+                    this._isIamSessionExpired.next(true);
                 }
             }
             return event;
@@ -69,11 +63,13 @@ 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);
-                }
+            // status is 200, but still an error since
+            // login page is returned when xml/json is expected
+            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);
@@ -9935,19 +9931,19 @@ class TableSort {
 class RedirectComponent {
     constructor(iamInterceptor) {
         this.iamInterceptor = iamInterceptor;
-        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());
     }
+    reloadPage() {
+        window.location.reload();
+    }
     showModal() {
         this.counter = 10;
         this.isModalVisible = true;
         setInterval(() => {
             if (0 === this.counter) {
-                window.location.reload();
+                this.reloadPage();
                 return;
             }
             this.counter--;
@@ -9955,10 +9951,10 @@ class RedirectComponent {
     }
 }
 RedirectComponent.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.3.5", ngImport: i0, type: RedirectComponent, deps: [{ token: IamExpiredInterceptorService }], target: i0.ɵɵFactoryTarget.Component });
-RedirectComponent.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "12.0.0", version: "13.3.5", type: RedirectComponent, selector: "redirector", ngImport: i0, template: "<foehn-modal\n    [modalBodyText]=\"modalBodyText\"\n    [isModalVisible]=\"isModalVisible\"\n    [modalHeaderText]=\"modalHeaderText\"\n    [closeable]=\"false\"\n>\n    <div modal-footer class=\"w-100 text-right font-weight-bold\">\n        Vous allez \u00EAtre redirig\u00E9 dans {{ counter }} s.\n    </div>\n</foehn-modal>\n", components: [{ type: FoehnModalComponent, selector: "foehn-modal", inputs: ["id", "name", "modalSize", "modalBodyText", "modalHeaderText", "closeable", "modalTriggerHtmlElement", "isModalVisible"], outputs: ["isModalVisibleChange"] }] });
+RedirectComponent.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "12.0.0", version: "13.3.5", type: RedirectComponent, selector: "redirector", ngImport: i0, template: "<foehn-modal\n    [modalHeaderText]=\"'Information'\"\n    [isModalVisible]=\"isModalVisible\"\n    [closeable]=\"false\"\n>\n    <p>Votre session a expir\u00E9.</p>\n    <p>Vous pouvez <a href=\"#\" (click)=\"$event.preventDefault(); reloadPage();\">vous connecter</a> \u00E0 nouveau pour continuer \u00E0 utiliser nos services.</p>\n\n    <div modal-footer class=\"w-100 text-right font-weight-bold\">\n        Vous allez \u00EAtre redirig\u00E9 dans {{ counter }} s.\n    </div>\n</foehn-modal>\n", components: [{ type: FoehnModalComponent, selector: "foehn-modal", inputs: ["id", "name", "modalSize", "modalBodyText", "modalHeaderText", "closeable", "modalTriggerHtmlElement", "isModalVisible"], outputs: ["isModalVisibleChange"] }] });
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.3.5", ngImport: i0, type: RedirectComponent, decorators: [{
             type: Component,
-            args: [{ selector: 'redirector', template: "<foehn-modal\n    [modalBodyText]=\"modalBodyText\"\n    [isModalVisible]=\"isModalVisible\"\n    [modalHeaderText]=\"modalHeaderText\"\n    [closeable]=\"false\"\n>\n    <div modal-footer class=\"w-100 text-right font-weight-bold\">\n        Vous allez \u00EAtre redirig\u00E9 dans {{ counter }} s.\n    </div>\n</foehn-modal>\n" }]
+            args: [{ selector: 'redirector', template: "<foehn-modal\n    [modalHeaderText]=\"'Information'\"\n    [isModalVisible]=\"isModalVisible\"\n    [closeable]=\"false\"\n>\n    <p>Votre session a expir\u00E9.</p>\n    <p>Vous pouvez <a href=\"#\" (click)=\"$event.preventDefault(); reloadPage();\">vous connecter</a> \u00E0 nouveau pour continuer \u00E0 utiliser nos services.</p>\n\n    <div modal-footer class=\"w-100 text-right font-weight-bold\">\n        Vous allez \u00EAtre redirig\u00E9 dans {{ counter }} s.\n    </div>\n</foehn-modal>\n" }]
         }], ctorParameters: function () { return [{ type: IamExpiredInterceptorService }]; } });
 
 class SdkRedirectModule {