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

package/fesm2020/dsivd-prestations-ng.mjs

@@ -31,7 +31,22 @@ 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 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 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();
@@ -41,10 +56,11 @@ class IamExpiredInterceptorService {
     }
     intercept(req, next) {
         return next.handle(req).pipe(map(event => {
+            console.log('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) {
+                if (isIamExpiredHeader(event) ||
+                    isRedirectionToIamACV(event) ||
+                    isRedirectionToCyberLogin(event)) {
                     this._iamExpirationHeaderPresence.next(true);
                 }
             }
@@ -54,7 +70,7 @@ class IamExpiredInterceptorService {
     handleError(err) {
         if (err instanceof HttpErrorResponse) {
             if (err.status === 200) {
-                const isLogin = err.url.indexOf(LOGIN_PATH) > 0;
+                const isLogin = err.url.indexOf(CYBER_LOGIN_PATH) > 0;
                 if (isLogin) {
                     this._iamExpirationHeaderPresence.next(true);
                 }
@@ -9917,45 +9933,33 @@ class TableSort {
 }
 
 class RedirectComponent {
-    constructor(iamInterceptor, foehnPageModalService) {
+    constructor(iamInterceptor) {
         this.iamInterceptor = iamInterceptor;
-        this.foehnPageModalService = foehnPageModalService;
-        this.subscription = this.iamInterceptor.iamExpirationHeaderPresence.subscribe(() => this.showModal());
-    }
-    ngOnInit() {
         this.modalHeaderText = 'Information';
         this.modalBodyText = `<p>Votre session a expiré.</p>
             <p>Vous pouvez vous connecter à nouveau pour continuer à utiliser nos services.</p>`;
-    }
-    ngOnDestroy() {
-        this.subscription.unsubscribe();
-    }
-    redirect() {
-        this.foehnPageModalService
-            .buildSelfRedirectionThroughCyberLogin()
-            .pipe(first(), tap(redirectUrl => {
-            window.location.href = redirectUrl;
-        }))
-            .subscribe();
+        this.iamInterceptor.iamExpirationHeaderPresence
+            .pipe(first())
+            .subscribe(() => this.showModal());
     }
     showModal() {
         this.counter = 10;
         this.isModalVisible = true;
         setInterval(() => {
             if (0 === this.counter) {
-                this.redirect();
+                window.location.reload();
                 return;
             }
             this.counter--;
         }, 1000);
     }
 }
-RedirectComponent.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.3.5", ngImport: i0, type: RedirectComponent, deps: [{ token: IamExpiredInterceptorService }, { token: FoehnPageModalService }], target: i0.ɵɵFactoryTarget.Component });
+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"] }] });
 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" }]
-        }], ctorParameters: function () { return [{ type: IamExpiredInterceptorService }, { type: FoehnPageModalService }]; } });
+        }], ctorParameters: function () { return [{ type: IamExpiredInterceptorService }]; } });
 
 class SdkRedirectModule {
 }