@dsivd/prestations-ng 16.5.4-beta.1 → 16.5.4-beta.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dsivd-prestations-ng-v16.5.4-beta.3.tgz +0 -0
- package/esm2020/sdk-redirect/iam-expired-interceptor.service.mjs +4 -6
- package/fesm2015/dsivd-prestations-ng.mjs +3 -5
- package/fesm2015/dsivd-prestations-ng.mjs.map +1 -1
- package/fesm2020/dsivd-prestations-ng.mjs +3 -5
- package/fesm2020/dsivd-prestations-ng.mjs.map +1 -1
- package/package.json +1 -1
- package/dsivd-prestations-ng-v16.5.4-beta.1.tgz +0 -0
|
Binary file
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/* eslint-disable @typescript-eslint/no-explicit-any */
|
|
2
|
-
import { HttpErrorResponse,
|
|
2
|
+
import { HttpErrorResponse, HttpResponseBase } from '@angular/common/http';
|
|
3
3
|
import { Injectable } from '@angular/core';
|
|
4
4
|
import { Subject, throwError } from 'rxjs';
|
|
5
5
|
import { catchError, map } from 'rxjs/operators';
|
|
@@ -27,7 +27,7 @@ export class IamExpiredInterceptorService {
|
|
|
27
27
|
}
|
|
28
28
|
intercept(req, next) {
|
|
29
29
|
return next.handle(req).pipe(map(event => {
|
|
30
|
-
if (event instanceof
|
|
30
|
+
if (event instanceof HttpResponseBase) {
|
|
31
31
|
if (hasIamExpiredHeader(event) ||
|
|
32
32
|
isRedirectionToLogin(event)) {
|
|
33
33
|
this._isIamSessionExpired.next(true);
|
|
@@ -38,12 +38,10 @@ export class IamExpiredInterceptorService {
|
|
|
38
38
|
}
|
|
39
39
|
handleError(err) {
|
|
40
40
|
if (err instanceof HttpErrorResponse) {
|
|
41
|
-
// status is 200, but still an error since
|
|
42
41
|
// login page is returned when xml/json is expected
|
|
43
|
-
const isStatusOk = err.status === 200 /* HttpStatusCode.Ok */;
|
|
44
42
|
const isUrlCyberLogin = err.url.includes(CYBER_LOGIN_PATH);
|
|
45
43
|
const isUrlAcvLogin = err.url.includes(ACV_LOGIN_PATH);
|
|
46
|
-
if (
|
|
44
|
+
if (isUrlCyberLogin || isUrlAcvLogin) {
|
|
47
45
|
this._isIamSessionExpired.next(true);
|
|
48
46
|
}
|
|
49
47
|
}
|
|
@@ -58,4 +56,4 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.10", ngImpo
|
|
|
58
56
|
providedIn: 'root'
|
|
59
57
|
}]
|
|
60
58
|
}] });
|
|
61
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
59
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaWFtLWV4cGlyZWQtaW50ZXJjZXB0b3Iuc2VydmljZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL3Byb2plY3RzL3ByZXN0YXRpb25zLW5nL3NyYy9zZGstcmVkaXJlY3QvaWFtLWV4cGlyZWQtaW50ZXJjZXB0b3Iuc2VydmljZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSx1REFBdUQ7QUFDdkQsT0FBTyxFQUNILGlCQUFpQixFQUtqQixnQkFBZ0IsRUFFbkIsTUFBTSxzQkFBc0IsQ0FBQztBQUM5QixPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sZUFBZSxDQUFDO0FBQzNDLE9BQU8sRUFBYyxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sTUFBTSxDQUFDO0FBQ3ZELE9BQU8sRUFBRSxVQUFVLEVBQUUsR0FBRyxFQUFFLE1BQU0sZ0JBQWdCLENBQUM7O0FBRWpELE1BQU0sMEJBQTBCLEdBQUcscUJBQXFCLENBQUM7QUFDekQsTUFBTSxnQkFBZ0IsR0FBRyxlQUFlLENBQUM7QUFDekMsTUFBTSxjQUFjLEdBQUcsV0FBVyxDQUFDO0FBRW5DLE1BQU0sbUJBQW1CLEdBQUcsQ0FBQyxLQUF1QixFQUFXLEVBQUUsQ0FDN0QsQ0FBQyxDQUFDLEtBQUssQ0FBQyxPQUFPLENBQUMsR0FBRyxDQUFDLDBCQUEwQixDQUFDLENBQUM7QUFFcEQsTUFBTSxvQkFBb0IsR0FBRyxDQUFDLEtBQXVCLEVBQVcsRUFBRTtJQUM5RCxNQUFNLGFBQWEsR0FBRyxLQUFLLENBQUMsTUFBTSxtQ0FBeUIsQ0FBQztJQUM1RCxNQUFNLGNBQWMsR0FBRyxLQUFLLENBQUMsT0FBTyxDQUFDLEdBQUcsQ0FBQyxVQUFVLENBQUMsQ0FBQztJQUVyRCxNQUFNLG9CQUFvQixHQUFHLGNBQWMsRUFBRSxRQUFRLENBQUMsZ0JBQWdCLENBQUMsQ0FBQztJQUN4RSxNQUFNLGtCQUFrQixHQUFHLGNBQWMsRUFBRSxRQUFRLENBQUMsY0FBYyxDQUFDLENBQUM7SUFFcEUsT0FBTyxhQUFhLElBQUksQ0FBQyxvQkFBb0IsSUFBSSxrQkFBa0IsQ0FBQyxDQUFDO0FBQ3pFLENBQUMsQ0FBQztBQUtGLE1BQU0sT0FBTyw0QkFBNEI7SUFIekM7UUFJWSx5QkFBb0IsR0FBcUIsSUFBSSxPQUFPLEVBQVcsQ0FBQztLQTZDM0U7SUEzQ0csSUFBSSxtQkFBbUI7UUFDbkIsT0FBTyxJQUFJLENBQUMsb0JBQW9CLENBQUMsWUFBWSxFQUFFLENBQUM7SUFDcEQsQ0FBQztJQUVELDRCQUE0QjtRQUN4QixJQUFJLENBQUMsb0JBQW9CLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxDQUFDO0lBQ3pDLENBQUM7SUFFRCxTQUFTLENBQ0wsR0FBcUIsRUFDckIsSUFBaUI7UUFFakIsT0FBTyxJQUFJLENBQUMsTUFBTSxDQUFDLEdBQUcsQ0FBQyxDQUFDLElBQUksQ0FDeEIsR0FBRyxDQUFDLEtBQUssQ0FBQyxFQUFFO1lBQ1IsSUFBSSxLQUFLLFlBQVksZ0JBQWdCLEVBQUU7Z0JBQ25DLElBQ0ksbUJBQW1CLENBQUMsS0FBSyxDQUFDO29CQUMxQixvQkFBb0IsQ0FBQyxLQUFLLENBQUMsRUFDN0I7b0JBQ0UsSUFBSSxDQUFDLG9CQUFvQixDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsQ0FBQztpQkFDeEM7YUFDSjtZQUNELE9BQU8sS0FBSyxDQUFDO1FBQ2pCLENBQUMsQ0FBQyxFQUNGLFVBQVUsQ0FBQyxJQUFJLENBQUMsV0FBVyxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUMxQyxDQUFDO0lBQ04sQ0FBQztJQUVPLFdBQVcsQ0FDZixHQUF1QztRQUV2QyxJQUFJLEdBQUcsWUFBWSxpQkFBaUIsRUFBRTtZQUNsQyxtREFBbUQ7WUFDbkQsTUFBTSxlQUFlLEdBQUcsR0FBRyxDQUFDLEdBQUcsQ0FBQyxRQUFRLENBQUMsZ0JBQWdCLENBQUMsQ0FBQztZQUMzRCxNQUFNLGFBQWEsR0FBRyxHQUFHLENBQUMsR0FBRyxDQUFDLFFBQVEsQ0FBQyxjQUFjLENBQUMsQ0FBQztZQUV2RCxJQUFJLGVBQWUsSUFBSSxhQUFhLEVBQUU7Z0JBQ2xDLElBQUksQ0FBQyxvQkFBb0IsQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLENBQUM7YUFDeEM7U0FDSjtRQUVELE9BQU8sVUFBVSxDQUFDLEdBQUcsRUFBRSxDQUFDLEdBQUcsQ0FBQyxDQUFDO0lBQ2pDLENBQUM7OzBIQTdDUSw0QkFBNEI7OEhBQTVCLDRCQUE0QixjQUZ6QixNQUFNOzRGQUVULDRCQUE0QjtrQkFIeEMsVUFBVTttQkFBQztvQkFDUixVQUFVLEVBQUUsTUFBTTtpQkFDckIiLCJzb3VyY2VzQ29udGVudCI6WyIvKiBlc2xpbnQtZGlzYWJsZSBAdHlwZXNjcmlwdC1lc2xpbnQvbm8tZXhwbGljaXQtYW55ICovXG5pbXBvcnQge1xuICAgIEh0dHBFcnJvclJlc3BvbnNlLFxuICAgIEh0dHBFdmVudCxcbiAgICBIdHRwSGFuZGxlcixcbiAgICBIdHRwSW50ZXJjZXB0b3IsXG4gICAgSHR0cFJlcXVlc3QsXG4gICAgSHR0cFJlc3BvbnNlQmFzZSxcbiAgICBIdHRwU3RhdHVzQ29kZVxufSBmcm9tICdAYW5ndWxhci9jb21tb24vaHR0cCc7XG5pbXBvcnQgeyBJbmplY3RhYmxlIH0gZnJvbSAnQGFuZ3VsYXIvY29yZSc7XG5pbXBvcnQgeyBPYnNlcnZhYmxlLCBTdWJqZWN0LCB0aHJvd0Vycm9yIH0gZnJvbSAncnhqcyc7XG5pbXBvcnQgeyBjYXRjaEVycm9yLCBtYXAgfSBmcm9tICdyeGpzL29wZXJhdG9ycyc7XG5cbmNvbnN0IElBTV9TRVNTSU9OX0VYUElSRURfSEVBREVSID0gJ2lhbS1zZXNzaW9uLWV4cGlyZWQnO1xuY29uc3QgQ1lCRVJfTE9HSU5fUEFUSCA9ICcvMTAwMDE4L2xvZ2luJztcbmNvbnN0IEFDVl9MT0dJTl9QQVRIID0gJy9pYW1sb2dpbic7XG5cbmNvbnN0IGhhc0lhbUV4cGlyZWRIZWFkZXIgPSAoZXZlbnQ6IEh0dHBSZXNwb25zZUJhc2UpOiBib29sZWFuID0+XG4gICAgISFldmVudC5oZWFkZXJzLmdldChJQU1fU0VTU0lPTl9FWFBJUkVEX0hFQURFUik7XG5cbmNvbnN0IGlzUmVkaXJlY3Rpb25Ub0xvZ2luID0gKGV2ZW50OiBIdHRwUmVzcG9uc2VCYXNlKTogYm9vbGVhbiA9PiB7XG4gICAgY29uc3QgaXNSZWRpcmVjdGlvbiA9IGV2ZW50LnN0YXR1cyA9PT0gSHR0cFN0YXR1c0NvZGUuRm91bmQ7XG4gICAgY29uc3QgbG9jYXRpb25IZWFkZXIgPSBldmVudC5oZWFkZXJzLmdldCgnTG9jYXRpb24nKTtcblxuICAgIGNvbnN0IGlzTG9jYXRpb25DeWJlckxvZ2luID0gbG9jYXRpb25IZWFkZXI/LmluY2x1ZGVzKENZQkVSX0xPR0lOX1BBVEgpO1xuICAgIGNvbnN0IGlzTG9jYXRpb25BY3ZMb2dpbiA9IGxvY2F0aW9uSGVhZGVyPy5pbmNsdWRlcyhBQ1ZfTE9HSU5fUEFUSCk7XG5cbiAgICByZXR1cm4gaXNSZWRpcmVjdGlvbiAmJiAoaXNMb2NhdGlvbkN5YmVyTG9naW4gfHwgaXNMb2NhdGlvbkFjdkxvZ2luKTtcbn07XG5cbkBJbmplY3RhYmxlKHtcbiAgICBwcm92aWRlZEluOiAncm9vdCdcbn0pXG5leHBvcnQgY2xhc3MgSWFtRXhwaXJlZEludGVyY2VwdG9yU2VydmljZSBpbXBsZW1lbnRzIEh0dHBJbnRlcmNlcHRvciB7XG4gICAgcHJpdmF0ZSBfaXNJYW1TZXNzaW9uRXhwaXJlZDogU3ViamVjdDxib29sZWFuPiA9IG5ldyBTdWJqZWN0PGJvb2xlYW4+KCk7XG5cbiAgICBnZXQgaXNJYW1TZXNzaW9uRXhwaXJlZCgpOiBPYnNlcnZhYmxlPGJvb2xlYW4+IHtcbiAgICAgICAgcmV0dXJuIHRoaXMuX2lzSWFtU2Vzc2lvbkV4cGlyZWQuYXNPYnNlcnZhYmxlKCk7XG4gICAgfVxuXG4gICAgc2V0SWFtU2Vzc2lvbkV4cGlyZWRNYW51YWxseSgpOiB2b2lkIHtcbiAgICAgICAgdGhpcy5faXNJYW1TZXNzaW9uRXhwaXJlZC5uZXh0KHRydWUpO1xuICAgIH1cblxuICAgIGludGVyY2VwdChcbiAgICAgICAgcmVxOiBIdHRwUmVxdWVzdDxhbnk+LFxuICAgICAgICBuZXh0OiBIdHRwSGFuZGxlclxuICAgICk6IE9ic2VydmFibGU8SHR0cEV2ZW50PGFueT4gfCBhbnk+IHtcbiAgICAgICAgcmV0dXJuIG5leHQuaGFuZGxlKHJlcSkucGlwZShcbiAgICAgICAgICAgIG1hcChldmVudCA9PiB7XG4gICAgICAgICAgICAgICAgaWYgKGV2ZW50IGluc3RhbmNlb2YgSHR0cFJlc3BvbnNlQmFzZSkge1xuICAgICAgICAgICAgICAgICAgICBpZiAoXG4gICAgICAgICAgICAgICAgICAgICAgICBoYXNJYW1FeHBpcmVkSGVhZGVyKGV2ZW50KSB8fFxuICAgICAgICAgICAgICAgICAgICAgICAgaXNSZWRpcmVjdGlvblRvTG9naW4oZXZlbnQpXG4gICAgICAgICAgICAgICAgICAgICkge1xuICAgICAgICAgICAgICAgICAgICAgICAgdGhpcy5faXNJYW1TZXNzaW9uRXhwaXJlZC5uZXh0KHRydWUpO1xuICAgICAgICAgICAgICAgICAgICB9XG4gICAgICAgICAgICAgICAgfVxuICAgICAgICAgICAgICAgIHJldHVybiBldmVudDtcbiAgICAgICAgICAgIH0pLFxuICAgICAgICAgICAgY2F0Y2hFcnJvcih0aGlzLmhhbmRsZUVycm9yLmJpbmQodGhpcykpXG4gICAgICAgICk7XG4gICAgfVxuXG4gICAgcHJpdmF0ZSBoYW5kbGVFcnJvcihcbiAgICAgICAgZXJyOiBIdHRwRXJyb3JSZXNwb25zZSB8IEh0dHBFdmVudDxhbnk+XG4gICAgKTogT2JzZXJ2YWJsZTxIdHRwRXZlbnQ8YW55Pj4ge1xuICAgICAgICBpZiAoZXJyIGluc3RhbmNlb2YgSHR0cEVycm9yUmVzcG9uc2UpIHtcbiAgICAgICAgICAgIC8vIGxvZ2luIHBhZ2UgaXMgcmV0dXJuZWQgd2hlbiB4bWwvanNvbiBpcyBleHBlY3RlZFxuICAgICAgICAgICAgY29uc3QgaXNVcmxDeWJlckxvZ2luID0gZXJyLnVybC5pbmNsdWRlcyhDWUJFUl9MT0dJTl9QQVRIKTtcbiAgICAgICAgICAgIGNvbnN0IGlzVXJsQWN2TG9naW4gPSBlcnIudXJsLmluY2x1ZGVzKEFDVl9MT0dJTl9QQVRIKTtcblxuICAgICAgICAgICAgaWYgKGlzVXJsQ3liZXJMb2dpbiB8fCBpc1VybEFjdkxvZ2luKSB7XG4gICAgICAgICAgICAgICAgdGhpcy5faXNJYW1TZXNzaW9uRXhwaXJlZC5uZXh0KHRydWUpO1xuICAgICAgICAgICAgfVxuICAgICAgICB9XG5cbiAgICAgICAgcmV0dXJuIHRocm93RXJyb3IoKCkgPT4gZXJyKTtcbiAgICB9XG59XG4iXX0=
|
|
@@ -5,7 +5,7 @@ import { ActivatedRoute, NavigationStart, RouterModule, NavigationEnd, RouterLin
|
|
|
5
5
|
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';
|
|
6
6
|
import { map, shareReplay, debounceTime, catchError, switchMap, tap, first, filter, throttleTime, mergeMap, share, finalize, distinctUntilChanged } from 'rxjs/operators';
|
|
7
7
|
import * as i1 from '@angular/common/http';
|
|
8
|
-
import {
|
|
8
|
+
import { HttpResponseBase, HttpErrorResponse, HttpParams, HttpEventType, HttpResponse, HTTP_INTERCEPTORS, HttpClientModule, HttpClient } from '@angular/common/http';
|
|
9
9
|
import * as i3 from '@angular/forms';
|
|
10
10
|
import { NgModel, NgForm, FormsModule } from '@angular/forms';
|
|
11
11
|
import * as i2 from '@angular/common';
|
|
@@ -1422,7 +1422,7 @@ class IamExpiredInterceptorService {
|
|
|
1422
1422
|
}
|
|
1423
1423
|
intercept(req, next) {
|
|
1424
1424
|
return next.handle(req).pipe(map(event => {
|
|
1425
|
-
if (event instanceof
|
|
1425
|
+
if (event instanceof HttpResponseBase) {
|
|
1426
1426
|
if (hasIamExpiredHeader(event) ||
|
|
1427
1427
|
isRedirectionToLogin(event)) {
|
|
1428
1428
|
this._isIamSessionExpired.next(true);
|
|
@@ -1433,12 +1433,10 @@ class IamExpiredInterceptorService {
|
|
|
1433
1433
|
}
|
|
1434
1434
|
handleError(err) {
|
|
1435
1435
|
if (err instanceof HttpErrorResponse) {
|
|
1436
|
-
// status is 200, but still an error since
|
|
1437
1436
|
// login page is returned when xml/json is expected
|
|
1438
|
-
const isStatusOk = err.status === 200 /* HttpStatusCode.Ok */;
|
|
1439
1437
|
const isUrlCyberLogin = err.url.includes(CYBER_LOGIN_PATH);
|
|
1440
1438
|
const isUrlAcvLogin = err.url.includes(ACV_LOGIN_PATH);
|
|
1441
|
-
if (
|
|
1439
|
+
if (isUrlCyberLogin || isUrlAcvLogin) {
|
|
1442
1440
|
this._isIamSessionExpired.next(true);
|
|
1443
1441
|
}
|
|
1444
1442
|
}
|