@dsivd/prestations-ng 16.5.4-beta.1 → 16.5.4-beta.2

package/fesm2020/dsivd-prestations-ng.mjs

@@ -2,10 +2,10 @@ import * as i0 from '@angular/core';
 import { Injectable, Optional, Inject, EventEmitter, Directive, Input, ViewChildren, ViewChild, forwardRef, Output, HostBinding, Pipe, Component, ContentChildren, HostListener, NgModule, TemplateRef, ContentChild, InjectionToken } from '@angular/core';
 import * as i1$1 from '@angular/router';
 import { ActivatedRoute, NavigationStart, RouterModule, NavigationEnd, RouterLink } from '@angular/router';
-import { of, BehaviorSubject, combineLatest, Subject, throwError, tap as tap$1, concat, toArray, EMPTY, merge, withLatestFrom, debounceTime as debounceTime$1, switchMap as switchMap$1, map as map$1 } from 'rxjs';
+import { of, BehaviorSubject, combineLatest, Subject, throwError, tap as tap$1, concat, toArray, EMPTY, merge, withLatestFrom, debounceTime as debounceTime$1, map as map$1 } from 'rxjs';
 import { map, shareReplay, debounceTime, catchError, switchMap, tap, first, filter, throttleTime, mergeMap, share, finalize, distinctUntilChanged } from 'rxjs/operators';
 import * as i1 from '@angular/common/http';
-import { HttpResponse, HttpErrorResponse, HttpParams, HttpEventType, HTTP_INTERCEPTORS, HttpClientModule, HttpClient } from '@angular/common/http';
+import { HttpResponseBase, HttpErrorResponse, HttpParams, HttpEventType, HttpResponse, HTTP_INTERCEPTORS, HttpClientModule, HttpClient } from '@angular/common/http';
 import * as i3 from '@angular/forms';
 import { NgModel, NgForm, FormsModule } from '@angular/forms';
 import * as i2 from '@angular/common';
@@ -1420,7 +1420,7 @@ class IamExpiredInterceptorService {
     }
     intercept(req, next) {
         return next.handle(req).pipe(map(event => {
-            if (event instanceof HttpResponse) {
+            if (event instanceof HttpResponseBase) {
                 if (hasIamExpiredHeader(event) ||
                     isRedirectionToLogin(event)) {
                     this._isIamSessionExpired.next(true);
@@ -12919,28 +12919,18 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.10", ngImpo
         }] });
 
 class RedirectComponent {
-    constructor(iamInterceptor, foehnPageModalService, sessionInfo) {
+    constructor(iamInterceptor, foehnPageModalService) {
         this.iamInterceptor = iamInterceptor;
         this.foehnPageModalService = foehnPageModalService;
-        this.sessionInfo = sessionInfo;
-        this.redirectUrl = '';
-        this.sessionInfo.data
-            .pipe(first(), switchMap$1(data => {
-            if (!data || !!data.context) {
-                // not connected or connected cyber
-                return this.foehnPageModalService.buildSelfRedirectionThroughCyberLogin();
-            }
-            // connected ACV, refresh page
-            return of('');
-        }), tap(redirectUrl => {
-            this.redirectUrl = redirectUrl;
-        }))
-            // eslint-disable-next-line rxjs-angular/prefer-async-pipe
-            .subscribe( /* redirect url should be calculated when the user is still connected to know if IAM or Cyber*/);
+        this.redirectUrl = this.foehnPageModalService.buildSelfRedirectionThroughCyberLogin();
         this.isModalVisible = this.iamInterceptor.isIamSessionExpired.pipe(first(), tap(() => this.startTimer()));
     }
     reloadPage() {
-        window.location.href = this.redirectUrl;
+        this.redirectUrl
+            // eslint-disable-next-line rxjs-angular/prefer-async-pipe
+            .subscribe(redirectUrl => {
+            window.location.href = redirectUrl;
+        });
     }
     startTimer() {
         this.counter = 10;
@@ -12953,12 +12943,12 @@ class RedirectComponent {
         }, 1000);
     }
 }
-RedirectComponent.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.10", ngImport: i0, type: RedirectComponent, deps: [{ token: IamExpiredInterceptorService }, { token: FoehnPageModalService }, { token: SessionInfo }], target: i0.ɵɵFactoryTarget.Component });
-RedirectComponent.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "15.2.10", type: RedirectComponent, selector: "redirector", ngImport: i0, template: "<foehn-modal\n    [modalHeaderText]=\"'Information'\"\n    [isModalVisible]=\"isModalVisible | async\"\n    [closeable]=\"false\"\n>\n    <p>Votre session a expir\u00E9.</p>\n    <p>\n        Vous pouvez\n        <a [href]=\"redirectUrl\">vous connecter</a>\n        \u00E0 nouveau pour continuer \u00E0 utiliser nos services.\n    </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", dependencies: [{ kind: "component", type: FoehnModalComponent, selector: "foehn-modal", inputs: ["id", "name", "modalSize", "modalBodyText", "modalHeaderText", "closeable", "modalTriggerHtmlElement", "isModalVisible"], outputs: ["isModalVisibleChange"] }, { kind: "pipe", type: i2.AsyncPipe, name: "async" }] });
+RedirectComponent.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.10", ngImport: i0, type: RedirectComponent, deps: [{ token: IamExpiredInterceptorService }, { token: FoehnPageModalService }], target: i0.ɵɵFactoryTarget.Component });
+RedirectComponent.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "15.2.10", type: RedirectComponent, selector: "redirector", ngImport: i0, template: "<foehn-modal\n    [modalHeaderText]=\"'Information'\"\n    [isModalVisible]=\"isModalVisible | async\"\n    [closeable]=\"false\"\n>\n    <p>Votre session a expir\u00E9.</p>\n    <p>\n        Vous pouvez\n        <a [href]=\"redirectUrl | async\">vous connecter</a>\n        \u00E0 nouveau pour continuer \u00E0 utiliser nos services.\n    </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", dependencies: [{ kind: "component", type: FoehnModalComponent, selector: "foehn-modal", inputs: ["id", "name", "modalSize", "modalBodyText", "modalHeaderText", "closeable", "modalTriggerHtmlElement", "isModalVisible"], outputs: ["isModalVisibleChange"] }, { kind: "pipe", type: i2.AsyncPipe, name: "async" }] });
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.10", ngImport: i0, type: RedirectComponent, decorators: [{
             type: Component,
-            args: [{ selector: 'redirector', template: "<foehn-modal\n    [modalHeaderText]=\"'Information'\"\n    [isModalVisible]=\"isModalVisible | async\"\n    [closeable]=\"false\"\n>\n    <p>Votre session a expir\u00E9.</p>\n    <p>\n        Vous pouvez\n        <a [href]=\"redirectUrl\">vous connecter</a>\n        \u00E0 nouveau pour continuer \u00E0 utiliser nos services.\n    </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 }, { type: FoehnPageModalService }, { type: SessionInfo }]; } });
+            args: [{ selector: 'redirector', template: "<foehn-modal\n    [modalHeaderText]=\"'Information'\"\n    [isModalVisible]=\"isModalVisible | async\"\n    [closeable]=\"false\"\n>\n    <p>Votre session a expir\u00E9.</p>\n    <p>\n        Vous pouvez\n        <a [href]=\"redirectUrl | async\">vous connecter</a>\n        \u00E0 nouveau pour continuer \u00E0 utiliser nos services.\n    </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 }, { type: FoehnPageModalService }]; } });
 
 class SdkRedirectModule {
 }