@dsivd/prestations-ng 19.1.1 → 19.1.2

package/CHANGELOG.md

@@ -6,6 +6,16 @@
 
 ---
 
+## [19.1.2]
+
+### Fixed
+
+- [provide-prestations-ng-core.ts](projects/prestations-ng/src/provide-prestations-ng-core.ts)
+    - `providePrestationsNgCore()` registers again the HTTP interceptors lost with `FoehnPageModule` in 19.0.0:
+      the `foehn-transmit-waiting-modal` is displayed again during a long transmission, the warning before the
+      expiration of the session receives its date again, and a new version of the application deployed meanwhile is
+      detected again.
+
 ## [19.1.1]
 
 ### Fixed
@@ -13,12 +23,12 @@
 - [foehn-input-phone.component.ts](projects/prestations-ng/src/foehn-input/foehn-input-phone.component.ts)
     - fixed help texts to be aligned with ch.vd.cyber.prestationsbe.validation.PhoneNumberValidator (prestations-be)
     - dictionary keys have changed to be more explicit :
-      - foehn-input-phone.STANDARD_HELPTEXT_SWISS_FIX_AND_MOBILE
-      - foehn-input-phone.STANDARD_HELPTEXT_SWISS_FIX_ONLY
-      - foehn-input-phone.STANDARD_HELPTEXT_SWISS_MOBILE_ONLY
-      - foehn-input-phone.STANDARD_HELPTEXT_INTERNATIONAL_FIX_AND_MOBILE
-      - foehn-input-phone.STANDARD_HELPTEXT_INTERNATIONAL_FIX_ONLY
-      - foehn-input-phone.STANDARD_HELPTEXT_INTERNATIONAL_MOBILE_ONLY
+        - foehn-input-phone.STANDARD_HELPTEXT_SWISS_FIX_AND_MOBILE
+        - foehn-input-phone.STANDARD_HELPTEXT_SWISS_FIX_ONLY
+        - foehn-input-phone.STANDARD_HELPTEXT_SWISS_MOBILE_ONLY
+        - foehn-input-phone.STANDARD_HELPTEXT_INTERNATIONAL_FIX_AND_MOBILE
+        - foehn-input-phone.STANDARD_HELPTEXT_INTERNATIONAL_FIX_ONLY
+        - foehn-input-phone.STANDARD_HELPTEXT_INTERNATIONAL_MOBILE_ONLY
 
 ## [19.1.0] - should be aligned with prestations-be 19.1.x
 

package/fesm2022/dsivd-prestations-ng.mjs

@@ -5397,6 +5397,193 @@ class I18nForm {
     }
 }
 
+const APP_VERSION_HEADER = 'app-version';
+class AppInfoHeadersInterceptor {
+    constructor() {
+        this.foehnPageService = inject(FoehnPageService);
+        this.errorListenerRegistered = false;
+        // Enregistrer une seule fois
+        if (!this.errorListenerRegistered) {
+            window.addEventListener('error', (event) => {
+                if (event.message?.includes('ChunkLoadError') ||
+                    event.message?.includes('Loading chunk')) {
+                    this.foehnPageService.setAppVersionMismatch();
+                }
+            });
+            this.errorListenerRegistered = true;
+        }
+    }
+    intercept(request, next) {
+        return next.handle(request).pipe(tap$1((httpEvent) => {
+            if (httpEvent instanceof HttpResponse) {
+                const appVersionInHeader = httpEvent.headers.get(APP_VERSION_HEADER);
+                if (!this.appVersion?.length) {
+                    this.appVersion = appVersionInHeader;
+                }
+                else if (appVersionInHeader &&
+                    this.appVersion !== appVersionInHeader) {
+                    this.foehnPageService.setAppVersionMismatch();
+                }
+            }
+        }));
+    }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "21.2.21", ngImport: i0, type: AppInfoHeadersInterceptor, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "21.2.21", ngImport: i0, type: AppInfoHeadersInterceptor, providedIn: 'root' }); }
+}
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.2.21", ngImport: i0, type: AppInfoHeadersInterceptor, decorators: [{
+            type: Injectable,
+            args: [{
+                    providedIn: 'root',
+                }]
+        }], ctorParameters: () => [] });
+const APP_INFO_HEADERS_INTERCEPTOR_PROVIDER = [
+    {
+        provide: HTTP_INTERCEPTORS,
+        useExisting: AppInfoHeadersInterceptor,
+        multi: true,
+    },
+];
+
+class CurrentSessionExpiration {
+}
+
+class IntervalHelper {
+    static accurateInterval(
+    // eslint-disable-next-line
+    callBack, intervalInMilliseconds, 
+    // eslint-disable-next-line
+    errorCallBack) {
+        let timeout = null;
+        let nextAt = Date.now() + intervalInMilliseconds;
+        const clear = () => clearTimeout(timeout);
+        const timerHandler = () => {
+            nextAt += intervalInMilliseconds;
+            // Avoid time drift by doing "nextAt - Date.now()"
+            const calculatedTimeout = nextAt - Date.now();
+            // Verify browser tab inactivity
+            if (calculatedTimeout < 0) {
+                if (errorCallBack) {
+                    clear();
+                    return errorCallBack();
+                }
+            }
+            timeout = setTimeout(timerHandler, Math.max(0, nextAt - Date.now()));
+            callBack();
+        };
+        // Avoid time drift by doing "nextAt - Date.now()"
+        timeout = setTimeout(timerHandler, nextAt - Date.now());
+        return { clear };
+    }
+}
+
+class DemandeExpirationService {
+    constructor() {
+        this.PULLING_IN_MILLISECONDS = 1000;
+        this._demandeExpirationDateTimeSubject = new BehaviorSubject(null);
+        this.intervalSubject = new BehaviorSubject(null);
+    }
+    shouldDisplayExpirationTimerMessage() {
+        return combineLatest([
+            this.getDemandeExpirationDateTime(),
+            this.intervalSubject.asObservable(),
+        ]).pipe(map(([value]) => !dayjs().isBefore(value?.expiration)), tap((visible) => {
+            if (visible) {
+                this.clearPulling();
+            }
+        }), shareReplay(1));
+    }
+    setDemandeExpirationDateTime(expiration) {
+        this._demandeExpirationDateTimeSubject.next(expiration);
+    }
+    getDemandeExpirationDateTime() {
+        return this._demandeExpirationDateTimeSubject.asObservable().pipe(filter((value) => !!value && value.expiration?.isValid()), tap((value) => {
+            if (dayjs().isBefore(value.expiration)) {
+                this.startPulling();
+            }
+        }), shareReplay(1));
+    }
+    startPulling() {
+        this.clearPulling();
+        this.interval = IntervalHelper.accurateInterval(() => {
+            this.intervalSubject.next();
+        }, this.PULLING_IN_MILLISECONDS, () => {
+            this.startPulling();
+        });
+    }
+    clearPulling() {
+        this.interval?.clear();
+    }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "21.2.21", ngImport: i0, type: DemandeExpirationService, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "21.2.21", ngImport: i0, type: DemandeExpirationService, providedIn: 'root' }); }
+}
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.2.21", ngImport: i0, type: DemandeExpirationService, decorators: [{
+            type: Injectable,
+            args: [{
+                    providedIn: 'root',
+                }]
+        }] });
+
+const EXPIRATION_HEADER = 'Sessions-Expirations';
+class DemandeExpirationInterceptor {
+    constructor() {
+        this.demandeExpirationService = inject(DemandeExpirationService);
+    }
+    intercept(request, next) {
+        return next.handle(request).pipe(tap$1((httpEvent) => {
+            if (httpEvent.type === HttpEventType.Sent) {
+                return;
+            }
+            if (httpEvent instanceof HttpResponse) {
+                if (httpEvent.headers.has(EXPIRATION_HEADER)) {
+                    this.manageDemandeExpirationHeader(httpEvent.headers.get(EXPIRATION_HEADER), httpEvent.body);
+                }
+            }
+        }));
+    }
+    manageDemandeExpirationHeader(expirationByDemande, responseBody) {
+        const expirationByDemandeMap = this.getExpirationByDemandeMap(expirationByDemande);
+        const expiration = new CurrentSessionExpiration();
+        const reference = responseBody?.meta?.reference || '';
+        const dateTimeForReference = expirationByDemandeMap.get(reference);
+        const dateTimeForIam = expirationByDemandeMap.get('IAM');
+        if (dateTimeForReference) {
+            expiration.type = 'SESSION-TOKEN';
+            expiration.expiration = dayjs(dateTimeForReference);
+        }
+        else if (dateTimeForIam) {
+            expiration.type = 'IAM';
+            expiration.expiration = dayjs(dateTimeForIam);
+        }
+        if (expiration.expiration?.isValid()) {
+            this.demandeExpirationService.setDemandeExpirationDateTime(expiration);
+        }
+    }
+    getExpirationByDemandeMap(expirationByDemande) {
+        const myMap = new Map();
+        const expirationByDemandesAsArray = expirationByDemande.split(';');
+        expirationByDemandesAsArray.forEach((value) => {
+            const valueAsArray = value.split(',');
+            myMap.set(valueAsArray[0], new Date(valueAsArray[1]));
+        });
+        return myMap;
+    }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "21.2.21", ngImport: i0, type: DemandeExpirationInterceptor, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "21.2.21", ngImport: i0, type: DemandeExpirationInterceptor, providedIn: 'root' }); }
+}
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.2.21", ngImport: i0, type: DemandeExpirationInterceptor, decorators: [{
+            type: Injectable,
+            args: [{
+                    providedIn: 'root',
+                }]
+        }] });
+const DEMANDE_EXPIRATION_INTERCEPTOR_PROVIDER = [
+    {
+        provide: HTTP_INTERCEPTORS,
+        useExisting: DemandeExpirationInterceptor,
+        multi: true,
+    },
+];
+
 const OIDC_ENABLED = new InjectionToken('enable.oidc.interceptor', {
     factory: () => false,
 });
@@ -5468,6 +5655,11 @@ function providePrestationsNgCore() {
             useExisting: IamExpiredInterceptorService,
             multi: true,
         },
+        // Formerly provided by FoehnPageModule: the version of the application changed during a deployment,
+        // the expiration of the session and the modal displayed during the transmission
+        APP_INFO_HEADERS_INTERCEPTOR_PROVIDER,
+        DEMANDE_EXPIRATION_INTERCEPTOR_PROVIDER,
+        DEMANDE_TRANSMIT_INTERCEPTOR_PROVIDER,
         {
             provide: ErrorHandler,
             useClass: ChunkLoadErrorHandler,
@@ -7288,82 +7480,6 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.2.21", ngImpo
             args: [{ selector: 'foehn-app-version-mis-match-modal', imports: [FoehnModalComponent, AsyncPipe, SdkDictionaryPipe], template: "<foehn-modal\n    [id]=\"'foehn-app-version-mismatch-modal'\"\n    [modalHeaderText]=\"\n        'foehn-app-version-mismatch-modal.title' | fromDictionary\n    \"\n    modalSize=\"modal-md\"\n    [isModalVisible]=\"isModalVisible | async\"\n    [closeable]=\"false\"\n>\n    <div\n        id=\"foehn-app-version-mismatch-modal-body\"\n        [innerHTML]=\"\n            'foehn-app-version-mismatch-modal.content' | fromDictionary\n        \"\n    ></div>\n\n    <div modal-footer class=\"w-100\">\n        <div class=\"d-flex\">\n            <button\n                id=\"saveAndReloadBtn\"\n                type=\"button\"\n                class=\"btn btn-primary ms-auto\"\n                [innerHTML]=\"\n                    (hasDemandeInProgress\n                        ? 'foehn-app-version-mismatch-modal.btn.save-and-reload'\n                        : 'foehn-app-version-mismatch-modal.btn.reload'\n                    ) | fromDictionary\n                \"\n                (click)=\"saveAndReload()\"\n            ></button>\n        </div>\n    </div>\n</foehn-modal>\n", styles: [":host ::ng-deep .modal{z-index:10000}\n"] }]
         }], ctorParameters: () => [] });
 
-class IntervalHelper {
-    static accurateInterval(
-    // eslint-disable-next-line
-    callBack, intervalInMilliseconds, 
-    // eslint-disable-next-line
-    errorCallBack) {
-        let timeout = null;
-        let nextAt = Date.now() + intervalInMilliseconds;
-        const clear = () => clearTimeout(timeout);
-        const timerHandler = () => {
-            nextAt += intervalInMilliseconds;
-            // Avoid time drift by doing "nextAt - Date.now()"
-            const calculatedTimeout = nextAt - Date.now();
-            // Verify browser tab inactivity
-            if (calculatedTimeout < 0) {
-                if (errorCallBack) {
-                    clear();
-                    return errorCallBack();
-                }
-            }
-            timeout = setTimeout(timerHandler, Math.max(0, nextAt - Date.now()));
-            callBack();
-        };
-        // Avoid time drift by doing "nextAt - Date.now()"
-        timeout = setTimeout(timerHandler, nextAt - Date.now());
-        return { clear };
-    }
-}
-
-class DemandeExpirationService {
-    constructor() {
-        this.PULLING_IN_MILLISECONDS = 1000;
-        this._demandeExpirationDateTimeSubject = new BehaviorSubject(null);
-        this.intervalSubject = new BehaviorSubject(null);
-    }
-    shouldDisplayExpirationTimerMessage() {
-        return combineLatest([
-            this.getDemandeExpirationDateTime(),
-            this.intervalSubject.asObservable(),
-        ]).pipe(map(([value]) => !dayjs().isBefore(value?.expiration)), tap((visible) => {
-            if (visible) {
-                this.clearPulling();
-            }
-        }), shareReplay(1));
-    }
-    setDemandeExpirationDateTime(expiration) {
-        this._demandeExpirationDateTimeSubject.next(expiration);
-    }
-    getDemandeExpirationDateTime() {
-        return this._demandeExpirationDateTimeSubject.asObservable().pipe(filter((value) => !!value && value.expiration?.isValid()), tap((value) => {
-            if (dayjs().isBefore(value.expiration)) {
-                this.startPulling();
-            }
-        }), shareReplay(1));
-    }
-    startPulling() {
-        this.clearPulling();
-        this.interval = IntervalHelper.accurateInterval(() => {
-            this.intervalSubject.next();
-        }, this.PULLING_IN_MILLISECONDS, () => {
-            this.startPulling();
-        });
-    }
-    clearPulling() {
-        this.interval?.clear();
-    }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "21.2.21", ngImport: i0, type: DemandeExpirationService, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "21.2.21", ngImport: i0, type: DemandeExpirationService, providedIn: 'root' }); }
-}
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.2.21", ngImport: i0, type: DemandeExpirationService, decorators: [{
-            type: Injectable,
-            args: [{
-                    providedIn: 'root',
-                }]
-        }] });
-
 class FoehnPageExpirationTimerComponent {
     constructor() {
         this.applicationInfoService = inject(ApplicationInfoService);