@dsivd/prestations-ng 17.10.9 → 17.10.10
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/CHANGELOG.md +8 -0
- package/dsivd-prestations-ng-17.10.10.tgz +0 -0
- package/esm2022/sdk-redirect/iam-expired-interceptor.service.mjs +3 -3
- package/esm2022/sdk-redirect/redirect.component.mjs +18 -4
- package/fesm2022/dsivd-prestations-ng.mjs +19 -5
- package/fesm2022/dsivd-prestations-ng.mjs.map +1 -1
- package/package.json +1 -1
- package/sdk-redirect/redirect.component.d.ts +5 -1
- package/dsivd-prestations-ng-17.10.9.tgz +0 -0
package/CHANGELOG.md
CHANGED
|
@@ -6,6 +6,14 @@
|
|
|
6
6
|
|
|
7
7
|
---
|
|
8
8
|
|
|
9
|
+
## [17.10.10]
|
|
10
|
+
|
|
11
|
+
### Fixed
|
|
12
|
+
|
|
13
|
+
- [redirect.component.ts](projects/prestations-ng/src/sdk-redirect/redirect.component.ts)
|
|
14
|
+
- fixed interval destruction
|
|
15
|
+
- now use `window.location.reload()` instead of `window.location.href = ''`
|
|
16
|
+
|
|
9
17
|
## [17.10.9]
|
|
10
18
|
|
|
11
19
|
### Fixed
|
|
Binary file
|
|
@@ -30,7 +30,7 @@ export class IamExpiredInterceptorService {
|
|
|
30
30
|
if (event instanceof HttpResponseBase) {
|
|
31
31
|
if (hasIamExpiredHeader(event) ||
|
|
32
32
|
isRedirectionToLogin(event)) {
|
|
33
|
-
this.
|
|
33
|
+
this.setIamSessionExpiredManually();
|
|
34
34
|
}
|
|
35
35
|
}
|
|
36
36
|
return event;
|
|
@@ -45,7 +45,7 @@ export class IamExpiredInterceptorService {
|
|
|
45
45
|
err.error &&
|
|
46
46
|
err.error.code === 'BENEFICIARY_REQUIRED';
|
|
47
47
|
if (isUrlCyberLogin || isUrlAcvLogin || isBeneficiaryRequired) {
|
|
48
|
-
this.
|
|
48
|
+
this.setIamSessionExpiredManually();
|
|
49
49
|
}
|
|
50
50
|
}
|
|
51
51
|
return throwError(() => err);
|
|
@@ -59,4 +59,4 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.3.12", ngImpo
|
|
|
59
59
|
providedIn: 'root'
|
|
60
60
|
}]
|
|
61
61
|
}] });
|
|
62
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
62
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaWFtLWV4cGlyZWQtaW50ZXJjZXB0b3Iuc2VydmljZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL3Byb2plY3RzL3ByZXN0YXRpb25zLW5nL3NyYy9zZGstcmVkaXJlY3QvaWFtLWV4cGlyZWQtaW50ZXJjZXB0b3Iuc2VydmljZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSx1REFBdUQ7QUFDdkQsT0FBTyxFQUNILGlCQUFpQixFQUtqQixnQkFBZ0IsRUFDaEIsY0FBYyxFQUNqQixNQUFNLHNCQUFzQixDQUFDO0FBQzlCLE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSxlQUFlLENBQUM7QUFDM0MsT0FBTyxFQUFFLGVBQWUsRUFBdUIsVUFBVSxFQUFFLE1BQU0sTUFBTSxDQUFDO0FBQ3hFLE9BQU8sRUFBRSxVQUFVLEVBQUUsR0FBRyxFQUFFLE1BQU0sZ0JBQWdCLENBQUM7O0FBRWpELE1BQU0sMEJBQTBCLEdBQUcscUJBQXFCLENBQUM7QUFDekQsTUFBTSxnQkFBZ0IsR0FBRyxlQUFlLENBQUM7QUFDekMsTUFBTSxjQUFjLEdBQUcsV0FBVyxDQUFDO0FBRW5DLE1BQU0sbUJBQW1CLEdBQUcsQ0FBQyxLQUF1QixFQUFXLEVBQUUsQ0FDN0QsQ0FBQyxDQUFDLEtBQUssQ0FBQyxPQUFPLENBQUMsR0FBRyxDQUFDLDBCQUEwQixDQUFDLENBQUM7QUFFcEQsTUFBTSxvQkFBb0IsR0FBRyxDQUFDLEtBQXVCLEVBQVcsRUFBRTtJQUM5RCxNQUFNLGFBQWEsR0FBRyxLQUFLLENBQUMsTUFBTSxLQUFLLGNBQWMsQ0FBQyxLQUFLLENBQUM7SUFDNUQsTUFBTSxjQUFjLEdBQUcsS0FBSyxDQUFDLE9BQU8sQ0FBQyxHQUFHLENBQUMsVUFBVSxDQUFDLENBQUM7SUFFckQsTUFBTSxvQkFBb0IsR0FBRyxjQUFjLEVBQUUsUUFBUSxDQUFDLGdCQUFnQixDQUFDLENBQUM7SUFDeEUsTUFBTSxrQkFBa0IsR0FBRyxjQUFjLEVBQUUsUUFBUSxDQUFDLGNBQWMsQ0FBQyxDQUFDO0lBRXBFLE9BQU8sYUFBYSxJQUFJLENBQUMsb0JBQW9CLElBQUksa0JBQWtCLENBQUMsQ0FBQztBQUN6RSxDQUFDLENBQUM7QUFLRixNQUFNLE9BQU8sNEJBQTRCO0lBSHpDO1FBSVkseUJBQW9CLEdBQ3hCLElBQUksZUFBZSxDQUFVLEtBQUssQ0FBQyxDQUFDO0tBaUQzQztJQS9DRyxJQUFJLG1CQUFtQjtRQUNuQixPQUFPLElBQUksQ0FBQyxvQkFBb0IsQ0FBQyxZQUFZLEVBQUUsQ0FBQztJQUNwRCxDQUFDO0lBRUQsNEJBQTRCO1FBQ3hCLElBQUksQ0FBQyxvQkFBb0IsQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLENBQUM7SUFDekMsQ0FBQztJQUVELFNBQVMsQ0FDTCxHQUFxQixFQUNyQixJQUFpQjtRQUVqQixPQUFPLElBQUksQ0FBQyxNQUFNLENBQUMsR0FBRyxDQUFDLENBQUMsSUFBSSxDQUN4QixHQUFHLENBQUMsS0FBSyxDQUFDLEVBQUU7WUFDUixJQUFJLEtBQUssWUFBWSxnQkFBZ0IsRUFBRSxDQUFDO2dCQUNwQyxJQUNJLG1CQUFtQixDQUFDLEtBQUssQ0FBQztvQkFDMUIsb0JBQW9CLENBQUMsS0FBSyxDQUFDLEVBQzdCLENBQUM7b0JBQ0MsSUFBSSxDQUFDLDRCQUE0QixFQUFFLENBQUM7Z0JBQ3hDLENBQUM7WUFDTCxDQUFDO1lBQ0QsT0FBTyxLQUFLLENBQUM7UUFDakIsQ0FBQyxDQUFDLEVBQ0YsVUFBVSxDQUFDLElBQUksQ0FBQyxXQUFXLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxDQUFDLENBQzFDLENBQUM7SUFDTixDQUFDO0lBRU8sV0FBVyxDQUNmLEdBQXVDO1FBRXZDLElBQUksR0FBRyxZQUFZLGlCQUFpQixFQUFFLENBQUM7WUFDbkMsbURBQW1EO1lBQ25ELE1BQU0sZUFBZSxHQUFHLEdBQUcsQ0FBQyxHQUFHLENBQUMsUUFBUSxDQUFDLGdCQUFnQixDQUFDLENBQUM7WUFDM0QsTUFBTSxhQUFhLEdBQUcsR0FBRyxDQUFDLEdBQUcsQ0FBQyxRQUFRLENBQUMsY0FBYyxDQUFDLENBQUM7WUFDdkQsTUFBTSxxQkFBcUIsR0FDdkIsR0FBRyxDQUFDLE1BQU0sS0FBSyxHQUFHO2dCQUNsQixHQUFHLENBQUMsS0FBSztnQkFDVCxHQUFHLENBQUMsS0FBSyxDQUFDLElBQUksS0FBSyxzQkFBc0IsQ0FBQztZQUU5QyxJQUFJLGVBQWUsSUFBSSxhQUFhLElBQUkscUJBQXFCLEVBQUUsQ0FBQztnQkFDNUQsSUFBSSxDQUFDLDRCQUE0QixFQUFFLENBQUM7WUFDeEMsQ0FBQztRQUNMLENBQUM7UUFFRCxPQUFPLFVBQVUsQ0FBQyxHQUFHLEVBQUUsQ0FBQyxHQUFHLENBQUMsQ0FBQztJQUNqQyxDQUFDOytHQWxEUSw0QkFBNEI7bUhBQTVCLDRCQUE0QixjQUZ6QixNQUFNOzs0RkFFVCw0QkFBNEI7a0JBSHhDLFVBQVU7bUJBQUM7b0JBQ1IsVUFBVSxFQUFFLE1BQU07aUJBQ3JCIiwic291cmNlc0NvbnRlbnQiOlsiLyogZXNsaW50LWRpc2FibGUgQHR5cGVzY3JpcHQtZXNsaW50L25vLWV4cGxpY2l0LWFueSAqL1xuaW1wb3J0IHtcbiAgICBIdHRwRXJyb3JSZXNwb25zZSxcbiAgICBIdHRwRXZlbnQsXG4gICAgSHR0cEhhbmRsZXIsXG4gICAgSHR0cEludGVyY2VwdG9yLFxuICAgIEh0dHBSZXF1ZXN0LFxuICAgIEh0dHBSZXNwb25zZUJhc2UsXG4gICAgSHR0cFN0YXR1c0NvZGVcbn0gZnJvbSAnQGFuZ3VsYXIvY29tbW9uL2h0dHAnO1xuaW1wb3J0IHsgSW5qZWN0YWJsZSB9IGZyb20gJ0Bhbmd1bGFyL2NvcmUnO1xuaW1wb3J0IHsgQmVoYXZpb3JTdWJqZWN0LCBPYnNlcnZhYmxlLCBTdWJqZWN0LCB0aHJvd0Vycm9yIH0gZnJvbSAncnhqcyc7XG5pbXBvcnQgeyBjYXRjaEVycm9yLCBtYXAgfSBmcm9tICdyeGpzL29wZXJhdG9ycyc7XG5cbmNvbnN0IElBTV9TRVNTSU9OX0VYUElSRURfSEVBREVSID0gJ2lhbS1zZXNzaW9uLWV4cGlyZWQnO1xuY29uc3QgQ1lCRVJfTE9HSU5fUEFUSCA9ICcvMTAwMDE4L2xvZ2luJztcbmNvbnN0IEFDVl9MT0dJTl9QQVRIID0gJy9pYW1sb2dpbic7XG5cbmNvbnN0IGhhc0lhbUV4cGlyZWRIZWFkZXIgPSAoZXZlbnQ6IEh0dHBSZXNwb25zZUJhc2UpOiBib29sZWFuID0+XG4gICAgISFldmVudC5oZWFkZXJzLmdldChJQU1fU0VTU0lPTl9FWFBJUkVEX0hFQURFUik7XG5cbmNvbnN0IGlzUmVkaXJlY3Rpb25Ub0xvZ2luID0gKGV2ZW50OiBIdHRwUmVzcG9uc2VCYXNlKTogYm9vbGVhbiA9PiB7XG4gICAgY29uc3QgaXNSZWRpcmVjdGlvbiA9IGV2ZW50LnN0YXR1cyA9PT0gSHR0cFN0YXR1c0NvZGUuRm91bmQ7XG4gICAgY29uc3QgbG9jYXRpb25IZWFkZXIgPSBldmVudC5oZWFkZXJzLmdldCgnTG9jYXRpb24nKTtcblxuICAgIGNvbnN0IGlzTG9jYXRpb25DeWJlckxvZ2luID0gbG9jYXRpb25IZWFkZXI/LmluY2x1ZGVzKENZQkVSX0xPR0lOX1BBVEgpO1xuICAgIGNvbnN0IGlzTG9jYXRpb25BY3ZMb2dpbiA9IGxvY2F0aW9uSGVhZGVyPy5pbmNsdWRlcyhBQ1ZfTE9HSU5fUEFUSCk7XG5cbiAgICByZXR1cm4gaXNSZWRpcmVjdGlvbiAmJiAoaXNMb2NhdGlvbkN5YmVyTG9naW4gfHwgaXNMb2NhdGlvbkFjdkxvZ2luKTtcbn07XG5cbkBJbmplY3RhYmxlKHtcbiAgICBwcm92aWRlZEluOiAncm9vdCdcbn0pXG5leHBvcnQgY2xhc3MgSWFtRXhwaXJlZEludGVyY2VwdG9yU2VydmljZSBpbXBsZW1lbnRzIEh0dHBJbnRlcmNlcHRvciB7XG4gICAgcHJpdmF0ZSBfaXNJYW1TZXNzaW9uRXhwaXJlZDogU3ViamVjdDxib29sZWFuPiA9XG4gICAgICAgIG5ldyBCZWhhdmlvclN1YmplY3Q8Ym9vbGVhbj4oZmFsc2UpO1xuXG4gICAgZ2V0IGlzSWFtU2Vzc2lvbkV4cGlyZWQoKTogT2JzZXJ2YWJsZTxib29sZWFuPiB7XG4gICAgICAgIHJldHVybiB0aGlzLl9pc0lhbVNlc3Npb25FeHBpcmVkLmFzT2JzZXJ2YWJsZSgpO1xuICAgIH1cblxuICAgIHNldElhbVNlc3Npb25FeHBpcmVkTWFudWFsbHkoKTogdm9pZCB7XG4gICAgICAgIHRoaXMuX2lzSWFtU2Vzc2lvbkV4cGlyZWQubmV4dCh0cnVlKTtcbiAgICB9XG5cbiAgICBpbnRlcmNlcHQoXG4gICAgICAgIHJlcTogSHR0cFJlcXVlc3Q8YW55PixcbiAgICAgICAgbmV4dDogSHR0cEhhbmRsZXJcbiAgICApOiBPYnNlcnZhYmxlPEh0dHBFdmVudDxhbnk+IHwgYW55PiB7XG4gICAgICAgIHJldHVybiBuZXh0LmhhbmRsZShyZXEpLnBpcGUoXG4gICAgICAgICAgICBtYXAoZXZlbnQgPT4ge1xuICAgICAgICAgICAgICAgIGlmIChldmVudCBpbnN0YW5jZW9mIEh0dHBSZXNwb25zZUJhc2UpIHtcbiAgICAgICAgICAgICAgICAgICAgaWYgKFxuICAgICAgICAgICAgICAgICAgICAgICAgaGFzSWFtRXhwaXJlZEhlYWRlcihldmVudCkgfHxcbiAgICAgICAgICAgICAgICAgICAgICAgIGlzUmVkaXJlY3Rpb25Ub0xvZ2luKGV2ZW50KVxuICAgICAgICAgICAgICAgICAgICApIHtcbiAgICAgICAgICAgICAgICAgICAgICAgIHRoaXMuc2V0SWFtU2Vzc2lvbkV4cGlyZWRNYW51YWxseSgpO1xuICAgICAgICAgICAgICAgICAgICB9XG4gICAgICAgICAgICAgICAgfVxuICAgICAgICAgICAgICAgIHJldHVybiBldmVudDtcbiAgICAgICAgICAgIH0pLFxuICAgICAgICAgICAgY2F0Y2hFcnJvcih0aGlzLmhhbmRsZUVycm9yLmJpbmQodGhpcykpXG4gICAgICAgICk7XG4gICAgfVxuXG4gICAgcHJpdmF0ZSBoYW5kbGVFcnJvcihcbiAgICAgICAgZXJyOiBIdHRwRXJyb3JSZXNwb25zZSB8IEh0dHBFdmVudDxhbnk+XG4gICAgKTogT2JzZXJ2YWJsZTxIdHRwRXZlbnQ8YW55Pj4ge1xuICAgICAgICBpZiAoZXJyIGluc3RhbmNlb2YgSHR0cEVycm9yUmVzcG9uc2UpIHtcbiAgICAgICAgICAgIC8vIGxvZ2luIHBhZ2UgaXMgcmV0dXJuZWQgd2hlbiB4bWwvanNvbiBpcyBleHBlY3RlZFxuICAgICAgICAgICAgY29uc3QgaXNVcmxDeWJlckxvZ2luID0gZXJyLnVybC5pbmNsdWRlcyhDWUJFUl9MT0dJTl9QQVRIKTtcbiAgICAgICAgICAgIGNvbnN0IGlzVXJsQWN2TG9naW4gPSBlcnIudXJsLmluY2x1ZGVzKEFDVl9MT0dJTl9QQVRIKTtcbiAgICAgICAgICAgIGNvbnN0IGlzQmVuZWZpY2lhcnlSZXF1aXJlZCA9XG4gICAgICAgICAgICAgICAgZXJyLnN0YXR1cyA9PT0gNDAxICYmXG4gICAgICAgICAgICAgICAgZXJyLmVycm9yICYmXG4gICAgICAgICAgICAgICAgZXJyLmVycm9yLmNvZGUgPT09ICdCRU5FRklDSUFSWV9SRVFVSVJFRCc7XG5cbiAgICAgICAgICAgIGlmIChpc1VybEN5YmVyTG9naW4gfHwgaXNVcmxBY3ZMb2dpbiB8fCBpc0JlbmVmaWNpYXJ5UmVxdWlyZWQpIHtcbiAgICAgICAgICAgICAgICB0aGlzLnNldElhbVNlc3Npb25FeHBpcmVkTWFudWFsbHkoKTtcbiAgICAgICAgICAgIH1cbiAgICAgICAgfVxuXG4gICAgICAgIHJldHVybiB0aHJvd0Vycm9yKCgpID0+IGVycik7XG4gICAgfVxufVxuIl19
|
|
@@ -32,12 +32,21 @@ export class RedirectComponent {
|
|
|
32
32
|
}
|
|
33
33
|
}));
|
|
34
34
|
}
|
|
35
|
+
ngOnDestroy() {
|
|
36
|
+
this.cancelSetInterval();
|
|
37
|
+
}
|
|
35
38
|
reloadPage() {
|
|
39
|
+
this.cancelSetInterval();
|
|
40
|
+
if (!this.redirectUrl?.length) {
|
|
41
|
+
window.location.reload();
|
|
42
|
+
return;
|
|
43
|
+
}
|
|
36
44
|
window.location.href = this.redirectUrl;
|
|
37
45
|
}
|
|
38
46
|
startTimer() {
|
|
47
|
+
this.cancelSetInterval();
|
|
39
48
|
this.counter = 10;
|
|
40
|
-
setInterval(() => {
|
|
49
|
+
this.intervalId = setInterval(() => {
|
|
41
50
|
if (0 === this.counter) {
|
|
42
51
|
this.reloadPage();
|
|
43
52
|
return;
|
|
@@ -45,11 +54,16 @@ export class RedirectComponent {
|
|
|
45
54
|
this.counter--;
|
|
46
55
|
}, 1000);
|
|
47
56
|
}
|
|
57
|
+
cancelSetInterval() {
|
|
58
|
+
if (this.intervalId) {
|
|
59
|
+
clearInterval(this.intervalId);
|
|
60
|
+
}
|
|
61
|
+
}
|
|
48
62
|
static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "17.3.12", ngImport: i0, type: RedirectComponent, deps: [{ token: i1.IamExpiredInterceptorService }, { token: i2.FoehnPageModalService }, { token: i3.SessionInfo }], target: i0.ɵɵFactoryTarget.Component }); }
|
|
49
|
-
static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "17.3.12", 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
|
|
63
|
+
static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "17.3.12", 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=\"#\" (click)=\"$event.preventDefault(); reloadPage()\">\n vous connecter\n </a>\n \u00E0 nouveau pour continuer \u00E0 utiliser nos services.\n </p>\n\n <div modal-footer class=\"w-100 text-end fw-bold\">\n Vous allez \u00EAtre redirig\u00E9 dans {{ counter }} s.\n </div>\n</foehn-modal>\n", dependencies: [{ kind: "component", type: i4.FoehnModalComponent, selector: "foehn-modal", inputs: ["id", "name", "modalSize", "modalBodyText", "modalHeaderText", "closeable", "modalTriggerHtmlElement", "isModalVisible"], outputs: ["isModalVisibleChange"] }, { kind: "pipe", type: i5.AsyncPipe, name: "async" }] }); }
|
|
50
64
|
}
|
|
51
65
|
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.3.12", ngImport: i0, type: RedirectComponent, decorators: [{
|
|
52
66
|
type: Component,
|
|
53
|
-
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
|
|
67
|
+
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=\"#\" (click)=\"$event.preventDefault(); reloadPage()\">\n vous connecter\n </a>\n \u00E0 nouveau pour continuer \u00E0 utiliser nos services.\n </p>\n\n <div modal-footer class=\"w-100 text-end fw-bold\">\n Vous allez \u00EAtre redirig\u00E9 dans {{ counter }} s.\n </div>\n</foehn-modal>\n" }]
|
|
54
68
|
}], ctorParameters: () => [{ type: i1.IamExpiredInterceptorService }, { type: i2.FoehnPageModalService }, { type: i3.SessionInfo }] });
|
|
55
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
69
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicmVkaXJlY3QuY29tcG9uZW50LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vcHJvamVjdHMvcHJlc3RhdGlvbnMtbmcvc3JjL3Nkay1yZWRpcmVjdC9yZWRpcmVjdC5jb21wb25lbnQudHMiLCIuLi8uLi8uLi8uLi9wcm9qZWN0cy9wcmVzdGF0aW9ucy1uZy9zcmMvc2RrLXJlZGlyZWN0L3JlZGlyZWN0LmNvbXBvbmVudC5odG1sIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxTQUFTLEVBQWEsTUFBTSxlQUFlLENBQUM7QUFDckQsT0FBTyxFQUFjLEVBQUUsRUFBRSxTQUFTLEVBQUUsTUFBTSxNQUFNLENBQUM7QUFDakQsT0FBTyxFQUFFLEtBQUssRUFBRSxHQUFHLEVBQUUsTUFBTSxnQkFBZ0IsQ0FBQzs7Ozs7OztBQVc1QyxNQUFNLE9BQU8saUJBQWlCO0lBUzFCLFlBQ1ksY0FBNEMsRUFDNUMscUJBQTRDLEVBQzVDLFdBQXdCO1FBRnhCLG1CQUFjLEdBQWQsY0FBYyxDQUE4QjtRQUM1QywwQkFBcUIsR0FBckIscUJBQXFCLENBQXVCO1FBQzVDLGdCQUFXLEdBQVgsV0FBVyxDQUFhO1FBUnBDLGdCQUFXLEdBQUcsRUFBRSxDQUFDO1FBVWIsSUFBSSxDQUFDLFdBQVcsQ0FBQyxJQUFJO2FBQ2hCLElBQUksQ0FDRCxLQUFLLEVBQUUsRUFDUCxTQUFTLENBQUMsSUFBSSxDQUFDLEVBQUU7WUFDYixJQUFJLENBQUMsSUFBSSxJQUFJLENBQUMsQ0FBQyxJQUFJLENBQUMsT0FBTyxFQUFFLENBQUM7Z0JBQzFCLG1DQUFtQztnQkFDbkMsT0FBTyxJQUFJLENBQUMscUJBQXFCLENBQUMscUNBQXFDLEVBQUUsQ0FBQztZQUM5RSxDQUFDO1lBQ0QsOEJBQThCO1lBQzlCLE9BQU8sRUFBRSxDQUFDLEVBQUUsQ0FBQyxDQUFDO1FBQ2xCLENBQUMsQ0FBQyxFQUNGLEdBQUcsQ0FBQyxXQUFXLENBQUMsRUFBRTtZQUNkLElBQUksQ0FBQyxXQUFXLEdBQUcsV0FBVyxDQUFDO1FBQ25DLENBQUMsQ0FBQyxDQUNMO1lBQ0QsMERBQTBEO2FBQ3pELFNBQVMsRUFBQywrRkFBK0YsQ0FBQyxDQUFDO1FBRWhILElBQUksQ0FBQyxjQUFjLEdBQUcsSUFBSSxDQUFDLGNBQWMsQ0FBQyxtQkFBbUIsQ0FBQyxJQUFJLENBQzlELEdBQUcsQ0FBQyxtQkFBbUIsQ0FBQyxFQUFFO1lBQ3RCLElBQUksbUJBQW1CLEVBQUUsQ0FBQztnQkFDdEIsSUFBSSxDQUFDLFVBQVUsRUFBRSxDQUFDO1lBQ3RCLENBQUM7UUFDTCxDQUFDLENBQUMsQ0FDTCxDQUFDO0lBQ04sQ0FBQztJQUVELFdBQVc7UUFDUCxJQUFJLENBQUMsaUJBQWlCLEVBQUUsQ0FBQztJQUM3QixDQUFDO0lBRUQsVUFBVTtRQUNOLElBQUksQ0FBQyxpQkFBaUIsRUFBRSxDQUFDO1FBRXpCLElBQUksQ0FBQyxJQUFJLENBQUMsV0FBVyxFQUFFLE1BQU0sRUFBRSxDQUFDO1lBQzVCLE1BQU0sQ0FBQyxRQUFRLENBQUMsTUFBTSxFQUFFLENBQUM7WUFDekIsT0FBTztRQUNYLENBQUM7UUFDRCxNQUFNLENBQUMsUUFBUSxDQUFDLElBQUksR0FBRyxJQUFJLENBQUMsV0FBVyxDQUFDO0lBQzVDLENBQUM7SUFFTyxVQUFVO1FBQ2QsSUFBSSxDQUFDLGlCQUFpQixFQUFFLENBQUM7UUFFekIsSUFBSSxDQUFDLE9BQU8sR0FBRyxFQUFFLENBQUM7UUFDbEIsSUFBSSxDQUFDLFVBQVUsR0FBRyxXQUFXLENBQUMsR0FBRyxFQUFFO1lBQy9CLElBQUksQ0FBQyxLQUFLLElBQUksQ0FBQyxPQUFPLEVBQUUsQ0FBQztnQkFDckIsSUFBSSxDQUFDLFVBQVUsRUFBRSxDQUFDO2dCQUNsQixPQUFPO1lBQ1gsQ0FBQztZQUNELElBQUksQ0FBQyxPQUFPLEVBQUUsQ0FBQztRQUNuQixDQUFDLEVBQUUsSUFBSSxDQUFDLENBQUM7SUFDYixDQUFDO0lBRU8saUJBQWlCO1FBQ3JCLElBQUksSUFBSSxDQUFDLFVBQVUsRUFBRSxDQUFDO1lBQ2xCLGFBQWEsQ0FBQyxJQUFJLENBQUMsVUFBVSxDQUFDLENBQUM7UUFDbkMsQ0FBQztJQUNMLENBQUM7K0dBeEVRLGlCQUFpQjttR0FBakIsaUJBQWlCLGtEQ2I5QiwyaUJBa0JBOzs0RkRMYSxpQkFBaUI7a0JBTDdCLFNBQVM7K0JBRUksWUFBWSIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IENvbXBvbmVudCwgT25EZXN0cm95IH0gZnJvbSAnQGFuZ3VsYXIvY29yZSc7XG5pbXBvcnQgeyBPYnNlcnZhYmxlLCBvZiwgc3dpdGNoTWFwIH0gZnJvbSAncnhqcyc7XG5pbXBvcnQgeyBmaXJzdCwgdGFwIH0gZnJvbSAncnhqcy9vcGVyYXRvcnMnO1xuXG5pbXBvcnQgeyBGb2VoblBhZ2VNb2RhbFNlcnZpY2UgfSBmcm9tICcuLi9mb2Vobi1wYWdlL2ZvZWhuLXBhZ2UtbW9kYWwuc2VydmljZSc7XG5pbXBvcnQgeyBTZXNzaW9uSW5mbyB9IGZyb20gJy4uL3Nkay1zZXNzaW9uLWluZm8vc2Vzc2lvbi1pbmZvLnNlcnZpY2UnO1xuaW1wb3J0IHsgSWFtRXhwaXJlZEludGVyY2VwdG9yU2VydmljZSB9IGZyb20gJy4vaWFtLWV4cGlyZWQtaW50ZXJjZXB0b3Iuc2VydmljZSc7XG5cbkBDb21wb25lbnQoe1xuICAgIC8vIGVzbGludC1kaXNhYmxlLW5leHQtbGluZSAgQGFuZ3VsYXItZXNsaW50L2NvbXBvbmVudC1zZWxlY3RvclxuICAgIHNlbGVjdG9yOiAncmVkaXJlY3RvcicsXG4gICAgdGVtcGxhdGVVcmw6ICcuL3JlZGlyZWN0LmNvbXBvbmVudC5odG1sJ1xufSlcbmV4cG9ydCBjbGFzcyBSZWRpcmVjdENvbXBvbmVudCBpbXBsZW1lbnRzIE9uRGVzdHJveSB7XG4gICAgaXNNb2RhbFZpc2libGU6IE9ic2VydmFibGU8Ym9vbGVhbj47XG4gICAgY291bnRlcjogbnVtYmVyO1xuXG4gICAgcmVkaXJlY3RVcmwgPSAnJztcblxuICAgIC8vIGVzbGludC1kaXNhYmxlLW5leHQtbGluZSBAdHlwZXNjcmlwdC1lc2xpbnQvbm8tZXhwbGljaXQtYW55XG4gICAgcHJpdmF0ZSBpbnRlcnZhbElkOiBhbnk7XG5cbiAgICBjb25zdHJ1Y3RvcihcbiAgICAgICAgcHJpdmF0ZSBpYW1JbnRlcmNlcHRvcjogSWFtRXhwaXJlZEludGVyY2VwdG9yU2VydmljZSxcbiAgICAgICAgcHJpdmF0ZSBmb2VoblBhZ2VNb2RhbFNlcnZpY2U6IEZvZWhuUGFnZU1vZGFsU2VydmljZSxcbiAgICAgICAgcHJpdmF0ZSBzZXNzaW9uSW5mbzogU2Vzc2lvbkluZm9cbiAgICApIHtcbiAgICAgICAgdGhpcy5zZXNzaW9uSW5mby5kYXRhXG4gICAgICAgICAgICAucGlwZShcbiAgICAgICAgICAgICAgICBmaXJzdCgpLFxuICAgICAgICAgICAgICAgIHN3aXRjaE1hcChkYXRhID0+IHtcbiAgICAgICAgICAgICAgICAgICAgaWYgKCFkYXRhIHx8ICEhZGF0YS5jb250ZXh0KSB7XG4gICAgICAgICAgICAgICAgICAgICAgICAvLyBub3QgY29ubmVjdGVkIG9yIGNvbm5lY3RlZCBjeWJlclxuICAgICAgICAgICAgICAgICAgICAgICAgcmV0dXJuIHRoaXMuZm9laG5QYWdlTW9kYWxTZXJ2aWNlLmJ1aWxkU2VsZlJlZGlyZWN0aW9uVGhyb3VnaEN5YmVyTG9naW4oKTtcbiAgICAgICAgICAgICAgICAgICAgfVxuICAgICAgICAgICAgICAgICAgICAvLyBjb25uZWN0ZWQgQUNWLCByZWZyZXNoIHBhZ2VcbiAgICAgICAgICAgICAgICAgICAgcmV0dXJuIG9mKCcnKTtcbiAgICAgICAgICAgICAgICB9KSxcbiAgICAgICAgICAgICAgICB0YXAocmVkaXJlY3RVcmwgPT4ge1xuICAgICAgICAgICAgICAgICAgICB0aGlzLnJlZGlyZWN0VXJsID0gcmVkaXJlY3RVcmw7XG4gICAgICAgICAgICAgICAgfSlcbiAgICAgICAgICAgIClcbiAgICAgICAgICAgIC8vIGVzbGludC1kaXNhYmxlLW5leHQtbGluZSByeGpzLWFuZ3VsYXIvcHJlZmVyLWFzeW5jLXBpcGVcbiAgICAgICAgICAgIC5zdWJzY3JpYmUoLyogcmVkaXJlY3QgdXJsIHNob3VsZCBiZSBjYWxjdWxhdGVkIHdoZW4gdGhlIHVzZXIgaXMgc3RpbGwgY29ubmVjdGVkIHRvIGtub3cgaWYgSUFNIG9yIEN5YmVyKi8pO1xuXG4gICAgICAgIHRoaXMuaXNNb2RhbFZpc2libGUgPSB0aGlzLmlhbUludGVyY2VwdG9yLmlzSWFtU2Vzc2lvbkV4cGlyZWQucGlwZShcbiAgICAgICAgICAgIHRhcChpc0lhbVNlc3Npb25FeHBpcmVkID0+IHtcbiAgICAgICAgICAgICAgICBpZiAoaXNJYW1TZXNzaW9uRXhwaXJlZCkge1xuICAgICAgICAgICAgICAgICAgICB0aGlzLnN0YXJ0VGltZXIoKTtcbiAgICAgICAgICAgICAgICB9XG4gICAgICAgICAgICB9KVxuICAgICAgICApO1xuICAgIH1cblxuICAgIG5nT25EZXN0cm95KCk6IHZvaWQge1xuICAgICAgICB0aGlzLmNhbmNlbFNldEludGVydmFsKCk7XG4gICAgfVxuXG4gICAgcmVsb2FkUGFnZSgpOiB2b2lkIHtcbiAgICAgICAgdGhpcy5jYW5jZWxTZXRJbnRlcnZhbCgpO1xuXG4gICAgICAgIGlmICghdGhpcy5yZWRpcmVjdFVybD8ubGVuZ3RoKSB7XG4gICAgICAgICAgICB3aW5kb3cubG9jYXRpb24ucmVsb2FkKCk7XG4gICAgICAgICAgICByZXR1cm47XG4gICAgICAgIH1cbiAgICAgICAgd2luZG93LmxvY2F0aW9uLmhyZWYgPSB0aGlzLnJlZGlyZWN0VXJsO1xuICAgIH1cblxuICAgIHByaXZhdGUgc3RhcnRUaW1lcigpOiB2b2lkIHtcbiAgICAgICAgdGhpcy5jYW5jZWxTZXRJbnRlcnZhbCgpO1xuXG4gICAgICAgIHRoaXMuY291bnRlciA9IDEwO1xuICAgICAgICB0aGlzLmludGVydmFsSWQgPSBzZXRJbnRlcnZhbCgoKSA9PiB7XG4gICAgICAgICAgICBpZiAoMCA9PT0gdGhpcy5jb3VudGVyKSB7XG4gICAgICAgICAgICAgICAgdGhpcy5yZWxvYWRQYWdlKCk7XG4gICAgICAgICAgICAgICAgcmV0dXJuO1xuICAgICAgICAgICAgfVxuICAgICAgICAgICAgdGhpcy5jb3VudGVyLS07XG4gICAgICAgIH0sIDEwMDApO1xuICAgIH1cblxuICAgIHByaXZhdGUgY2FuY2VsU2V0SW50ZXJ2YWwoKTogdm9pZCB7XG4gICAgICAgIGlmICh0aGlzLmludGVydmFsSWQpIHtcbiAgICAgICAgICAgIGNsZWFySW50ZXJ2YWwodGhpcy5pbnRlcnZhbElkKTtcbiAgICAgICAgfVxuICAgIH1cbn1cbiIsIjxmb2Vobi1tb2RhbFxuICAgIFttb2RhbEhlYWRlclRleHRdPVwiJ0luZm9ybWF0aW9uJ1wiXG4gICAgW2lzTW9kYWxWaXNpYmxlXT1cImlzTW9kYWxWaXNpYmxlIHwgYXN5bmNcIlxuICAgIFtjbG9zZWFibGVdPVwiZmFsc2VcIlxuPlxuICAgIDxwPlZvdHJlIHNlc3Npb24gYSBleHBpcsOpLjwvcD5cbiAgICA8cD5cbiAgICAgICAgVm91cyBwb3V2ZXpcbiAgICAgICAgPGEgaHJlZj1cIiNcIiAoY2xpY2spPVwiJGV2ZW50LnByZXZlbnREZWZhdWx0KCk7IHJlbG9hZFBhZ2UoKVwiPlxuICAgICAgICAgICAgdm91cyBjb25uZWN0ZXJcbiAgICAgICAgPC9hPlxuICAgICAgICDDoCBub3V2ZWF1IHBvdXIgY29udGludWVyIMOgIHV0aWxpc2VyIG5vcyBzZXJ2aWNlcy5cbiAgICA8L3A+XG5cbiAgICA8ZGl2IG1vZGFsLWZvb3RlciBjbGFzcz1cInctMTAwIHRleHQtZW5kIGZ3LWJvbGRcIj5cbiAgICAgICAgVm91cyBhbGxleiDDqnRyZSByZWRpcmlnw6kgZGFucyB7eyBjb3VudGVyIH19IHMuXG4gICAgPC9kaXY+XG48L2ZvZWhuLW1vZGFsPlxuIl19
|
|
@@ -1848,7 +1848,7 @@ class IamExpiredInterceptorService {
|
|
|
1848
1848
|
if (event instanceof HttpResponseBase) {
|
|
1849
1849
|
if (hasIamExpiredHeader(event) ||
|
|
1850
1850
|
isRedirectionToLogin(event)) {
|
|
1851
|
-
this.
|
|
1851
|
+
this.setIamSessionExpiredManually();
|
|
1852
1852
|
}
|
|
1853
1853
|
}
|
|
1854
1854
|
return event;
|
|
@@ -1863,7 +1863,7 @@ class IamExpiredInterceptorService {
|
|
|
1863
1863
|
err.error &&
|
|
1864
1864
|
err.error.code === 'BENEFICIARY_REQUIRED';
|
|
1865
1865
|
if (isUrlCyberLogin || isUrlAcvLogin || isBeneficiaryRequired) {
|
|
1866
|
-
this.
|
|
1866
|
+
this.setIamSessionExpiredManually();
|
|
1867
1867
|
}
|
|
1868
1868
|
}
|
|
1869
1869
|
return throwError(() => err);
|
|
@@ -13671,12 +13671,21 @@ class RedirectComponent {
|
|
|
13671
13671
|
}
|
|
13672
13672
|
}));
|
|
13673
13673
|
}
|
|
13674
|
+
ngOnDestroy() {
|
|
13675
|
+
this.cancelSetInterval();
|
|
13676
|
+
}
|
|
13674
13677
|
reloadPage() {
|
|
13678
|
+
this.cancelSetInterval();
|
|
13679
|
+
if (!this.redirectUrl?.length) {
|
|
13680
|
+
window.location.reload();
|
|
13681
|
+
return;
|
|
13682
|
+
}
|
|
13675
13683
|
window.location.href = this.redirectUrl;
|
|
13676
13684
|
}
|
|
13677
13685
|
startTimer() {
|
|
13686
|
+
this.cancelSetInterval();
|
|
13678
13687
|
this.counter = 10;
|
|
13679
|
-
setInterval(() => {
|
|
13688
|
+
this.intervalId = setInterval(() => {
|
|
13680
13689
|
if (0 === this.counter) {
|
|
13681
13690
|
this.reloadPage();
|
|
13682
13691
|
return;
|
|
@@ -13684,12 +13693,17 @@ class RedirectComponent {
|
|
|
13684
13693
|
this.counter--;
|
|
13685
13694
|
}, 1000);
|
|
13686
13695
|
}
|
|
13696
|
+
cancelSetInterval() {
|
|
13697
|
+
if (this.intervalId) {
|
|
13698
|
+
clearInterval(this.intervalId);
|
|
13699
|
+
}
|
|
13700
|
+
}
|
|
13687
13701
|
static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "17.3.12", ngImport: i0, type: RedirectComponent, deps: [{ token: IamExpiredInterceptorService }, { token: FoehnPageModalService }, { token: SessionInfo }], target: i0.ɵɵFactoryTarget.Component }); }
|
|
13688
|
-
static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "17.3.12", 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
|
|
13702
|
+
static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "17.3.12", 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=\"#\" (click)=\"$event.preventDefault(); reloadPage()\">\n vous connecter\n </a>\n \u00E0 nouveau pour continuer \u00E0 utiliser nos services.\n </p>\n\n <div modal-footer class=\"w-100 text-end fw-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" }] }); }
|
|
13689
13703
|
}
|
|
13690
13704
|
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.3.12", ngImport: i0, type: RedirectComponent, decorators: [{
|
|
13691
13705
|
type: Component,
|
|
13692
|
-
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
|
|
13706
|
+
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=\"#\" (click)=\"$event.preventDefault(); reloadPage()\">\n vous connecter\n </a>\n \u00E0 nouveau pour continuer \u00E0 utiliser nos services.\n </p>\n\n <div modal-footer class=\"w-100 text-end fw-bold\">\n Vous allez \u00EAtre redirig\u00E9 dans {{ counter }} s.\n </div>\n</foehn-modal>\n" }]
|
|
13693
13707
|
}], ctorParameters: () => [{ type: IamExpiredInterceptorService }, { type: FoehnPageModalService }, { type: SessionInfo }] });
|
|
13694
13708
|
|
|
13695
13709
|
class SdkRedirectModule {
|