@dsivd/prestations-ng 15.5.7 → 15.5.8
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 +7 -0
- package/dsivd-prestations-ng-v15.5.8.tgz +0 -0
- package/esm2020/sdk-recaptcha/recaptcha.service.mjs +16 -7
- package/esm2020/sdk-redirect/iam-expired-interceptor.service.mjs +4 -1
- package/esm2020/sdk-redirect/redirect.component.mjs +14 -8
- package/fesm2015/dsivd-prestations-ng.mjs +26 -11
- package/fesm2015/dsivd-prestations-ng.mjs.map +1 -1
- package/fesm2020/dsivd-prestations-ng.mjs +26 -11
- package/fesm2020/dsivd-prestations-ng.mjs.map +1 -1
- package/package.json +1 -1
- package/sdk-recaptcha/recaptcha.service.d.ts +3 -1
- package/sdk-redirect/iam-expired-interceptor.service.d.ts +1 -0
- package/sdk-redirect/redirect.component.d.ts +5 -1
- package/dsivd-prestations-ng-v15.5.7.tgz +0 -0
package/CHANGELOG.md
CHANGED
|
@@ -26,6 +26,13 @@ A change is considered **breaking** if you have to change your code or update yo
|
|
|
26
26
|
|
|
27
27
|
---
|
|
28
28
|
|
|
29
|
+
## [15.5.8]
|
|
30
|
+
|
|
31
|
+
### Fixed
|
|
32
|
+
|
|
33
|
+
- [recaptcha.service.ts](projects/prestations-ng/src/sdk-recaptcha/recaptcha.service.ts)
|
|
34
|
+
- when user was connected on page load and the back-end returns a captcha error => redirect to cyberlogin with return url to self
|
|
35
|
+
|
|
29
36
|
## [15.5.7]
|
|
30
37
|
|
|
31
38
|
### Fixed
|
|
Binary file
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { Injectable } from '@angular/core';
|
|
2
2
|
import { HttpParams } from '@angular/common/http';
|
|
3
3
|
import { BehaviorSubject, combineLatest, merge, of } from 'rxjs';
|
|
4
|
-
import { debounceTime, map } from 'rxjs/operators';
|
|
4
|
+
import { debounceTime, map, tap } from 'rxjs/operators';
|
|
5
5
|
import * as i0 from "@angular/core";
|
|
6
6
|
import * as i1 from "@angular/common/http";
|
|
7
7
|
import * as i2 from "../sdk-session-info/session-info.service";
|
|
@@ -10,10 +10,11 @@ import * as i4 from "../validation/validation-handler.service";
|
|
|
10
10
|
import * as i5 from "../gesdem/gesdem-handler.service";
|
|
11
11
|
import * as i6 from "../gesdem/gesdem-event.service";
|
|
12
12
|
import * as i7 from "../sdk-appinfo/application-info.service";
|
|
13
|
+
import * as i8 from "../sdk-redirect/iam-expired-interceptor.service";
|
|
13
14
|
export const RECAPTCHA_API_URL = 'api/recaptcha';
|
|
14
15
|
export const CAPTCHA_ERROR_NAME = 'recaptcha';
|
|
15
16
|
export class RecaptchaService {
|
|
16
|
-
constructor(http, sessionInfo, route, validationHandlerService, gesdemService, gesdemEventService, applicationInfoService) {
|
|
17
|
+
constructor(http, sessionInfo, route, validationHandlerService, gesdemService, gesdemEventService, applicationInfoService, iamExpiredInterceptorService) {
|
|
17
18
|
this.http = http;
|
|
18
19
|
this.sessionInfo = sessionInfo;
|
|
19
20
|
this.route = route;
|
|
@@ -21,6 +22,7 @@ export class RecaptchaService {
|
|
|
21
22
|
this.gesdemService = gesdemService;
|
|
22
23
|
this.gesdemEventService = gesdemEventService;
|
|
23
24
|
this.applicationInfoService = applicationInfoService;
|
|
25
|
+
this.iamExpiredInterceptorService = iamExpiredInterceptorService;
|
|
24
26
|
this.errorsSubject = new BehaviorSubject([]);
|
|
25
27
|
this.errors = this.initErrorObservable(); // has to be first since it is used in initShouldDisplayObservable !
|
|
26
28
|
this.shouldDisplay = this.initShouldDisplayObservable();
|
|
@@ -120,8 +122,15 @@ export class RecaptchaService {
|
|
|
120
122
|
]).pipe(
|
|
121
123
|
// To work around rapidly changing observables, such as the form
|
|
122
124
|
// when the page loads.
|
|
123
|
-
debounceTime(0),
|
|
124
|
-
|
|
125
|
+
debounceTime(0), tap(([isConnected, , , captchaErrors]) => {
|
|
126
|
+
const hasCaptchaError = !!captchaErrors?.length;
|
|
127
|
+
if (isConnected && hasCaptchaError) {
|
|
128
|
+
// this should not happen, the session may have timed out
|
|
129
|
+
this.iamExpiredInterceptorService.setIamSessionExpiredManually();
|
|
130
|
+
}
|
|
131
|
+
}), map(([isConnected, hasBypassEnabled, hasReference, captchaErrors]) => {
|
|
132
|
+
const hasCaptchaError = !!captchaErrors?.length;
|
|
133
|
+
if (hasCaptchaError) {
|
|
125
134
|
// always display the component if it has an error, user could has logged out in another window
|
|
126
135
|
return true;
|
|
127
136
|
}
|
|
@@ -157,12 +166,12 @@ export class RecaptchaService {
|
|
|
157
166
|
return captcha.publickey || null;
|
|
158
167
|
}
|
|
159
168
|
}
|
|
160
|
-
RecaptchaService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.3.12", ngImport: i0, type: RecaptchaService, deps: [{ token: i1.HttpClient }, { token: i2.SessionInfo }, { token: i3.ActivatedRoute }, { token: i4.ValidationHandlerService }, { token: i5.GesdemHandlerService }, { token: i6.GesdemEventService }, { token: i7.ApplicationInfoService }], target: i0.ɵɵFactoryTarget.Injectable });
|
|
169
|
+
RecaptchaService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.3.12", ngImport: i0, type: RecaptchaService, deps: [{ token: i1.HttpClient }, { token: i2.SessionInfo }, { token: i3.ActivatedRoute }, { token: i4.ValidationHandlerService }, { token: i5.GesdemHandlerService }, { token: i6.GesdemEventService }, { token: i7.ApplicationInfoService }, { token: i8.IamExpiredInterceptorService }], target: i0.ɵɵFactoryTarget.Injectable });
|
|
161
170
|
RecaptchaService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "13.3.12", ngImport: i0, type: RecaptchaService, providedIn: 'root' });
|
|
162
171
|
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.3.12", ngImport: i0, type: RecaptchaService, decorators: [{
|
|
163
172
|
type: Injectable,
|
|
164
173
|
args: [{
|
|
165
174
|
providedIn: 'root'
|
|
166
175
|
}]
|
|
167
|
-
}], ctorParameters: function () { return [{ type: i1.HttpClient }, { type: i2.SessionInfo }, { type: i3.ActivatedRoute }, { type: i4.ValidationHandlerService }, { type: i5.GesdemHandlerService }, { type: i6.GesdemEventService }, { type: i7.ApplicationInfoService }]; } });
|
|
168
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"recaptcha.service.js","sourceRoot":"","sources":["../../../../projects/prestations-ng/src/sdk-recaptcha/recaptcha.service.ts"],"names":[],"mappings":"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","sourcesContent":["import { Injectable } from '@angular/core';\nimport { HttpClient, HttpParams } from '@angular/common/http';\nimport { BehaviorSubject, combineLatest, merge, Observable, of } from 'rxjs';\nimport { SessionInfo } from '../sdk-session-info/session-info.service';\nimport { ActivatedRoute } from '@angular/router';\nimport { debounceTime, map } from 'rxjs/operators';\nimport { FormError } from '../form-error';\nimport { ValidationHandlerService } from '../validation/validation-handler.service';\nimport { GesdemEventService } from '../gesdem/gesdem-event.service';\nimport { GesdemHandlerService } from '../gesdem/gesdem-handler.service';\nimport { ApplicationInfoService } from '../sdk-appinfo/application-info.service';\nimport { ApplicationInfo } from '../sdk-appinfo/application-info';\n\nexport const RECAPTCHA_API_URL = 'api/recaptcha';\nexport const CAPTCHA_ERROR_NAME = 'recaptcha';\n\n@Injectable({\n    providedIn: 'root'\n})\nexport class RecaptchaService {\n    private readonly errors: Observable<FormError[]>;\n    private readonly errorsSubject = new BehaviorSubject<FormError[]>([]);\n    private readonly shouldDisplay: Observable<boolean>;\n    private readonly publicKey: Observable<string>;\n    private token: string;\n\n    constructor(\n        private http: HttpClient,\n        private sessionInfo: SessionInfo,\n        private route: ActivatedRoute,\n        private validationHandlerService: ValidationHandlerService,\n        private gesdemService: GesdemHandlerService,\n        private gesdemEventService: GesdemEventService,\n        private applicationInfoService: ApplicationInfoService\n    ) {\n        this.errors = this.initErrorObservable(); // has to be first since it is used in initShouldDisplayObservable !\n        this.shouldDisplay = this.initShouldDisplayObservable();\n        this.publicKey = this.initPublicKeyObservable();\n    }\n\n    onSuccess(token: string): void {\n        // To be accessed by the gesdem service and to avoid to have a circular\n        // dependency between the gesdemHandlerService and the captcha service.\n        this.gesdemService.setCaptchaToken(token);\n\n        this.token = token;\n\n        if (!!this.token) {\n            this.clearErrors();\n            this.http.post(RECAPTCHA_API_URL, { token: this.token }).subscribe(\n                // eslint-disable-next-line @typescript-eslint/no-explicit-any\n                (data: any) => {\n                    const success = !!data.success;\n                    if (success) {\n                        // Clear any potential errors from the server. We can do\n                        // that because this should be the only error in the set as\n                        // the captcha must be valid to have at least one form error.\n                        this.validationHandlerService.updateErrors([]);\n                    } else {\n                        // If this is thrown, that's pretty bad because it means\n                        // that Google couldn't verify the captcha key. This is\n                        // either an attack or a misconfiguration.\n                        this.addError('Votre captcha est invalide');\n                    }\n                },\n                (e: unknown) => {\n                    console.error(e);\n\n                    // 404, timeout or network issue. Could happen.\n                    this.addError(\n                        'Une erreur est survenue lors de la validation du captcha.'\n                    );\n                }\n            );\n        }\n    }\n\n    addError(message: string): void {\n        const existingErrors = this.errorsSubject.getValue();\n        const newError = {\n            name: CAPTCHA_ERROR_NAME,\n            code: CAPTCHA_ERROR_NAME,\n            message\n        };\n\n        this.errorsSubject.next([newError, ...existingErrors]);\n    }\n\n    clearErrors(): void {\n        this.errorsSubject.next([]);\n    }\n\n    getErrors(): Observable<FormError[]> {\n        return this.errors;\n    }\n\n    getShouldDisplay(): Observable<boolean> {\n        return this.shouldDisplay;\n    }\n\n    getPublicKey(): Observable<string> {\n        return this.publicKey;\n    }\n\n    getToken(): string {\n        return this.token;\n    }\n\n    private initErrorObservable(): Observable<FormError[]> {\n        const matchingGesdemErrors = merge(\n            // Ensures that there's an initial value\n            of([]),\n            // Read from the gesdem service all errors.\n            this.validationHandlerService.validationErrorsSubject\n        ).pipe(\n            // Errors from GesDem, or nothing\n            map(errors => errors.filter(ex => CAPTCHA_ERROR_NAME === ex.code))\n        );\n\n        // Bind errors to the component, either from the backend of from this component\n        return combineLatest([\n            // Errors from gesdem matching the name of the captcha.\n            matchingGesdemErrors,\n            // Manual errors\n            this.errorsSubject\n        ]).pipe(\n            // Merge the two errors sets\n            map(([gesdemErrors, localErrors]) => [\n                ...gesdemErrors,\n                ...localErrors\n            ])\n        );\n    }\n\n    private initShouldDisplayObservable(): Observable<boolean> {\n        const isConnectedObservable = this.sessionInfo.data.pipe(\n            map(data => !this.sessionInfo.neverConnected && !!data)\n        );\n\n        const hasBypassEnabledObservable = this.checkBypassProperty().pipe(\n            map(bypass => !!bypass.value)\n        );\n\n        const hasReferenceObservable = merge(\n            // To have an initial value. Can be null if there is no form.\n            of(this.gesdemService.lastResponse),\n            // Read the form from GesDem\n            this.gesdemEventService.formInitializationObservable()\n        ).pipe(\n            map(\n                form =>\n                    !!form &&\n                    !!this.gesdemService.lastResponse &&\n                    !!this.gesdemService.lastResponse.meta &&\n                    !!this.gesdemService.lastResponse.meta.reference\n            )\n        );\n\n        return combineLatest([\n            isConnectedObservable,\n            hasBypassEnabledObservable,\n            hasReferenceObservable,\n            this.errors\n        ]).pipe(\n            // To work around rapidly changing observables, such as the form\n            // when the page loads.\n            debounceTime(0),\n            map(\n                ([\n                    isConnected,\n                    hasBypassEnabled,\n                    hasReference,\n                    captchaErrors\n                ]) => {\n                    if (!!captchaErrors?.length) {\n                        // always display the component if it has an error, user could has logged out in another window\n                        return true;\n                    }\n                    // Do not display the captcha if the user is connected, the application\n                    // already has a reference or if the bypass is enabled.\n                    return !isConnected && !hasBypassEnabled && !hasReference;\n                }\n            )\n        );\n    }\n\n    // eslint-disable-next-line @typescript-eslint/no-explicit-any\n    private checkBypassProperty(): Observable<any> {\n        const params = !!this.route.snapshot.queryParams.reCaptchaByPassUUID\n            ? new HttpParams().set(\n                  'reCaptchaByPassUUID',\n                  this.route.snapshot.queryParams.reCaptchaByPassUUID\n              )\n            : null;\n\n        return this.http.get(`${RECAPTCHA_API_URL}/bypass`, { params });\n    }\n\n    private initPublicKeyObservable(): Observable<string> {\n        return this.applicationInfoService.data.pipe(\n            map(applicationInfo => this.getPublicKeyOrNull(applicationInfo))\n        );\n    }\n\n    private getPublicKeyOrNull(\n        applicationInfo: ApplicationInfo\n    ): string | null {\n        // Replace this whole shenanigan with applicationInfo?.configuration?.captcha?.publickey when\n        // Typescript supports it.\n        if (!applicationInfo) {\n            return null;\n        }\n\n        const { configuration } = applicationInfo;\n\n        if (!configuration) {\n            return null;\n        }\n        const { captcha } = configuration;\n\n        if (!captcha) {\n            return null;\n        }\n\n        return captcha.publickey || null;\n    }\n}\n"]}
|
|
176
|
+
}], ctorParameters: function () { return [{ type: i1.HttpClient }, { type: i2.SessionInfo }, { type: i3.ActivatedRoute }, { type: i4.ValidationHandlerService }, { type: i5.GesdemHandlerService }, { type: i6.GesdemEventService }, { type: i7.ApplicationInfoService }, { type: i8.IamExpiredInterceptorService }]; } });
|
|
177
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"recaptcha.service.js","sourceRoot":"","sources":["../../../../projects/prestations-ng/src/sdk-recaptcha/recaptcha.service.ts"],"names":[],"mappings":"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","sourcesContent":["import { Injectable } from '@angular/core';\nimport { HttpClient, HttpParams } from '@angular/common/http';\nimport { BehaviorSubject, combineLatest, merge, Observable, of } from 'rxjs';\nimport { SessionInfo } from '../sdk-session-info/session-info.service';\nimport { ActivatedRoute } from '@angular/router';\nimport { debounceTime, map, tap } from 'rxjs/operators';\nimport { FormError } from '../form-error';\nimport { ValidationHandlerService } from '../validation/validation-handler.service';\nimport { GesdemEventService } from '../gesdem/gesdem-event.service';\nimport { GesdemHandlerService } from '../gesdem/gesdem-handler.service';\nimport { ApplicationInfoService } from '../sdk-appinfo/application-info.service';\nimport { ApplicationInfo } from '../sdk-appinfo/application-info';\nimport { IamExpiredInterceptorService } from '../sdk-redirect/iam-expired-interceptor.service';\n\nexport const RECAPTCHA_API_URL = 'api/recaptcha';\nexport const CAPTCHA_ERROR_NAME = 'recaptcha';\n\n@Injectable({\n    providedIn: 'root'\n})\nexport class RecaptchaService {\n    private readonly errors: Observable<FormError[]>;\n    private readonly errorsSubject = new BehaviorSubject<FormError[]>([]);\n    private readonly shouldDisplay: Observable<boolean>;\n    private readonly publicKey: Observable<string>;\n    private token: string;\n\n    constructor(\n        private http: HttpClient,\n        private sessionInfo: SessionInfo,\n        private route: ActivatedRoute,\n        private validationHandlerService: ValidationHandlerService,\n        private gesdemService: GesdemHandlerService,\n        private gesdemEventService: GesdemEventService,\n        private applicationInfoService: ApplicationInfoService,\n        private iamExpiredInterceptorService: IamExpiredInterceptorService\n    ) {\n        this.errors = this.initErrorObservable(); // has to be first since it is used in initShouldDisplayObservable !\n        this.shouldDisplay = this.initShouldDisplayObservable();\n        this.publicKey = this.initPublicKeyObservable();\n    }\n\n    onSuccess(token: string): void {\n        // To be accessed by the gesdem service and to avoid to have a circular\n        // dependency between the gesdemHandlerService and the captcha service.\n        this.gesdemService.setCaptchaToken(token);\n\n        this.token = token;\n\n        if (!!this.token) {\n            this.clearErrors();\n            this.http.post(RECAPTCHA_API_URL, { token: this.token }).subscribe(\n                // eslint-disable-next-line @typescript-eslint/no-explicit-any\n                (data: any) => {\n                    const success = !!data.success;\n                    if (success) {\n                        // Clear any potential errors from the server. We can do\n                        // that because this should be the only error in the set as\n                        // the captcha must be valid to have at least one form error.\n                        this.validationHandlerService.updateErrors([]);\n                    } else {\n                        // If this is thrown, that's pretty bad because it means\n                        // that Google couldn't verify the captcha key. This is\n                        // either an attack or a misconfiguration.\n                        this.addError('Votre captcha est invalide');\n                    }\n                },\n                (e: unknown) => {\n                    console.error(e);\n\n                    // 404, timeout or network issue. Could happen.\n                    this.addError(\n                        'Une erreur est survenue lors de la validation du captcha.'\n                    );\n                }\n            );\n        }\n    }\n\n    addError(message: string): void {\n        const existingErrors = this.errorsSubject.getValue();\n        const newError = {\n            name: CAPTCHA_ERROR_NAME,\n            code: CAPTCHA_ERROR_NAME,\n            message\n        };\n\n        this.errorsSubject.next([newError, ...existingErrors]);\n    }\n\n    clearErrors(): void {\n        this.errorsSubject.next([]);\n    }\n\n    getErrors(): Observable<FormError[]> {\n        return this.errors;\n    }\n\n    getShouldDisplay(): Observable<boolean> {\n        return this.shouldDisplay;\n    }\n\n    getPublicKey(): Observable<string> {\n        return this.publicKey;\n    }\n\n    getToken(): string {\n        return this.token;\n    }\n\n    private initErrorObservable(): Observable<FormError[]> {\n        const matchingGesdemErrors = merge(\n            // Ensures that there's an initial value\n            of([]),\n            // Read from the gesdem service all errors.\n            this.validationHandlerService.validationErrorsSubject\n        ).pipe(\n            // Errors from GesDem, or nothing\n            map(errors => errors.filter(ex => CAPTCHA_ERROR_NAME === ex.code))\n        );\n\n        // Bind errors to the component, either from the backend of from this component\n        return combineLatest([\n            // Errors from gesdem matching the name of the captcha.\n            matchingGesdemErrors,\n            // Manual errors\n            this.errorsSubject\n        ]).pipe(\n            // Merge the two errors sets\n            map(([gesdemErrors, localErrors]) => [\n                ...gesdemErrors,\n                ...localErrors\n            ])\n        );\n    }\n\n    private initShouldDisplayObservable(): Observable<boolean> {\n        const isConnectedObservable = this.sessionInfo.data.pipe(\n            map(data => !this.sessionInfo.neverConnected && !!data)\n        );\n\n        const hasBypassEnabledObservable = this.checkBypassProperty().pipe(\n            map(bypass => !!bypass.value)\n        );\n\n        const hasReferenceObservable = merge(\n            // To have an initial value. Can be null if there is no form.\n            of(this.gesdemService.lastResponse),\n            // Read the form from GesDem\n            this.gesdemEventService.formInitializationObservable()\n        ).pipe(\n            map(\n                form =>\n                    !!form &&\n                    !!this.gesdemService.lastResponse &&\n                    !!this.gesdemService.lastResponse.meta &&\n                    !!this.gesdemService.lastResponse.meta.reference\n            )\n        );\n\n        return combineLatest([\n            isConnectedObservable,\n            hasBypassEnabledObservable,\n            hasReferenceObservable,\n            this.errors\n        ]).pipe(\n            // To work around rapidly changing observables, such as the form\n            // when the page loads.\n            debounceTime(0),\n            tap(([isConnected, , , captchaErrors]) => {\n                const hasCaptchaError = !!captchaErrors?.length;\n                if (isConnected && hasCaptchaError) {\n                    // this should not happen, the session may have timed out\n                    this.iamExpiredInterceptorService.setIamSessionExpiredManually();\n                }\n            }),\n            map(\n                ([\n                    isConnected,\n                    hasBypassEnabled,\n                    hasReference,\n                    captchaErrors\n                ]) => {\n                    const hasCaptchaError = !!captchaErrors?.length;\n                    if (hasCaptchaError) {\n                        // always display the component if it has an error, user could has logged out in another window\n                        return true;\n                    }\n                    // Do not display the captcha if the user is connected, the application\n                    // already has a reference or if the bypass is enabled.\n                    return !isConnected && !hasBypassEnabled && !hasReference;\n                }\n            )\n        );\n    }\n\n    // eslint-disable-next-line @typescript-eslint/no-explicit-any\n    private checkBypassProperty(): Observable<any> {\n        const params = !!this.route.snapshot.queryParams.reCaptchaByPassUUID\n            ? new HttpParams().set(\n                  'reCaptchaByPassUUID',\n                  this.route.snapshot.queryParams.reCaptchaByPassUUID\n              )\n            : null;\n\n        return this.http.get(`${RECAPTCHA_API_URL}/bypass`, { params });\n    }\n\n    private initPublicKeyObservable(): Observable<string> {\n        return this.applicationInfoService.data.pipe(\n            map(applicationInfo => this.getPublicKeyOrNull(applicationInfo))\n        );\n    }\n\n    private getPublicKeyOrNull(\n        applicationInfo: ApplicationInfo\n    ): string | null {\n        // Replace this whole shenanigan with applicationInfo?.configuration?.captcha?.publickey when\n        // Typescript supports it.\n        if (!applicationInfo) {\n            return null;\n        }\n\n        const { configuration } = applicationInfo;\n\n        if (!configuration) {\n            return null;\n        }\n        const { captcha } = configuration;\n\n        if (!captcha) {\n            return null;\n        }\n\n        return captcha.publickey || null;\n    }\n}\n"]}
|
|
@@ -22,6 +22,9 @@ export class IamExpiredInterceptorService {
|
|
|
22
22
|
get isIamSessionExpired() {
|
|
23
23
|
return this._isIamSessionExpired.asObservable();
|
|
24
24
|
}
|
|
25
|
+
setIamSessionExpiredManually() {
|
|
26
|
+
this._isIamSessionExpired.next(true);
|
|
27
|
+
}
|
|
25
28
|
intercept(req, next) {
|
|
26
29
|
return next.handle(req).pipe(map(event => {
|
|
27
30
|
if (event instanceof HttpResponse) {
|
|
@@ -55,4 +58,4 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.3.12", ngImpo
|
|
|
55
58
|
providedIn: 'root'
|
|
56
59
|
}]
|
|
57
60
|
}] });
|
|
58
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
61
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaWFtLWV4cGlyZWQtaW50ZXJjZXB0b3Iuc2VydmljZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL3Byb2plY3RzL3ByZXN0YXRpb25zLW5nL3NyYy9zZGstcmVkaXJlY3QvaWFtLWV4cGlyZWQtaW50ZXJjZXB0b3Iuc2VydmljZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSx1REFBdUQ7QUFDdkQsT0FBTyxFQUFjLE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSxNQUFNLENBQUM7QUFDdkQsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLGVBQWUsQ0FBQztBQUMzQyxPQUFPLEVBQ0gsaUJBQWlCLEVBS2pCLFlBQVksRUFFZixNQUFNLHNCQUFzQixDQUFDO0FBQzlCLE9BQU8sRUFBRSxVQUFVLEVBQUUsR0FBRyxFQUFFLE1BQU0sZ0JBQWdCLENBQUM7O0FBRWpELE1BQU0sMEJBQTBCLEdBQUcscUJBQXFCLENBQUM7QUFDekQsTUFBTSxnQkFBZ0IsR0FBRyxlQUFlLENBQUM7QUFDekMsTUFBTSxjQUFjLEdBQUcsV0FBVyxDQUFDO0FBRW5DLE1BQU0sbUJBQW1CLEdBQUcsQ0FBQyxLQUF3QixFQUFXLEVBQUUsQ0FDOUQsQ0FBQyxDQUFDLEtBQUssQ0FBQyxPQUFPLENBQUMsR0FBRyxDQUFDLDBCQUEwQixDQUFDLENBQUM7QUFFcEQsTUFBTSxvQkFBb0IsR0FBRyxDQUFDLEtBQXdCLEVBQVcsRUFBRTtJQUMvRCxNQUFNLGFBQWEsR0FBRyxLQUFLLENBQUMsTUFBTSxvQkFBeUIsQ0FBQztJQUM1RCxNQUFNLGNBQWMsR0FBRyxLQUFLLENBQUMsT0FBTyxDQUFDLEdBQUcsQ0FBQyxVQUFVLENBQUMsQ0FBQztJQUVyRCxNQUFNLG9CQUFvQixHQUFHLGNBQWMsRUFBRSxRQUFRLENBQUMsZ0JBQWdCLENBQUMsQ0FBQztJQUN4RSxNQUFNLGtCQUFrQixHQUFHLGNBQWMsRUFBRSxRQUFRLENBQUMsY0FBYyxDQUFDLENBQUM7SUFFcEUsT0FBTyxhQUFhLElBQUksQ0FBQyxvQkFBb0IsSUFBSSxrQkFBa0IsQ0FBQyxDQUFDO0FBQ3pFLENBQUMsQ0FBQztBQUtGLE1BQU0sT0FBTyw0QkFBNEI7SUFIekM7UUFJWSx5QkFBb0IsR0FBcUIsSUFBSSxPQUFPLEVBQVcsQ0FBQztLQStDM0U7SUE3Q0csSUFBSSxtQkFBbUI7UUFDbkIsT0FBTyxJQUFJLENBQUMsb0JBQW9CLENBQUMsWUFBWSxFQUFFLENBQUM7SUFDcEQsQ0FBQztJQUVELDRCQUE0QjtRQUN4QixJQUFJLENBQUMsb0JBQW9CLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxDQUFDO0lBQ3pDLENBQUM7SUFFRCxTQUFTLENBQ0wsR0FBcUIsRUFDckIsSUFBaUI7UUFFakIsT0FBTyxJQUFJLENBQUMsTUFBTSxDQUFDLEdBQUcsQ0FBQyxDQUFDLElBQUksQ0FDeEIsR0FBRyxDQUFDLEtBQUssQ0FBQyxFQUFFO1lBQ1IsSUFBSSxLQUFLLFlBQVksWUFBWSxFQUFFO2dCQUMvQixJQUNJLG1CQUFtQixDQUFDLEtBQUssQ0FBQztvQkFDMUIsb0JBQW9CLENBQUMsS0FBSyxDQUFDLEVBQzdCO29CQUNFLElBQUksQ0FBQyxvQkFBb0IsQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLENBQUM7aUJBQ3hDO2FBQ0o7WUFDRCxPQUFPLEtBQUssQ0FBQztRQUNqQixDQUFDLENBQUMsRUFDRixVQUFVLENBQUMsSUFBSSxDQUFDLFdBQVcsQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FDMUMsQ0FBQztJQUNOLENBQUM7SUFFTyxXQUFXLENBQ2YsR0FBdUM7UUFFdkMsSUFBSSxHQUFHLFlBQVksaUJBQWlCLEVBQUU7WUFDbEMsMENBQTBDO1lBQzFDLG1EQUFtRDtZQUNuRCxNQUFNLFVBQVUsR0FBRyxHQUFHLENBQUMsTUFBTSxpQkFBc0IsQ0FBQztZQUNwRCxNQUFNLGVBQWUsR0FBRyxHQUFHLENBQUMsR0FBRyxDQUFDLFFBQVEsQ0FBQyxnQkFBZ0IsQ0FBQyxDQUFDO1lBQzNELE1BQU0sYUFBYSxHQUFHLEdBQUcsQ0FBQyxHQUFHLENBQUMsUUFBUSxDQUFDLGNBQWMsQ0FBQyxDQUFDO1lBRXZELElBQUksVUFBVSxJQUFJLENBQUMsZUFBZSxJQUFJLGFBQWEsQ0FBQyxFQUFFO2dCQUNsRCxJQUFJLENBQUMsb0JBQW9CLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxDQUFDO2FBQ3hDO1NBQ0o7UUFFRCxPQUFPLFVBQVUsQ0FBQyxHQUFHLENBQUMsQ0FBQztJQUMzQixDQUFDOzswSEEvQ1EsNEJBQTRCOzhIQUE1Qiw0QkFBNEIsY0FGekIsTUFBTTs0RkFFVCw0QkFBNEI7a0JBSHhDLFVBQVU7bUJBQUM7b0JBQ1IsVUFBVSxFQUFFLE1BQU07aUJBQ3JCIiwic291cmNlc0NvbnRlbnQiOlsiLyogZXNsaW50LWRpc2FibGUgQHR5cGVzY3JpcHQtZXNsaW50L25vLWV4cGxpY2l0LWFueSAqL1xuaW1wb3J0IHsgT2JzZXJ2YWJsZSwgU3ViamVjdCwgdGhyb3dFcnJvciB9IGZyb20gJ3J4anMnO1xuaW1wb3J0IHsgSW5qZWN0YWJsZSB9IGZyb20gJ0Bhbmd1bGFyL2NvcmUnO1xuaW1wb3J0IHtcbiAgICBIdHRwRXJyb3JSZXNwb25zZSxcbiAgICBIdHRwRXZlbnQsXG4gICAgSHR0cEhhbmRsZXIsXG4gICAgSHR0cEludGVyY2VwdG9yLFxuICAgIEh0dHBSZXF1ZXN0LFxuICAgIEh0dHBSZXNwb25zZSxcbiAgICBIdHRwU3RhdHVzQ29kZVxufSBmcm9tICdAYW5ndWxhci9jb21tb24vaHR0cCc7XG5pbXBvcnQgeyBjYXRjaEVycm9yLCBtYXAgfSBmcm9tICdyeGpzL29wZXJhdG9ycyc7XG5cbmNvbnN0IElBTV9TRVNTSU9OX0VYUElSRURfSEVBREVSID0gJ2lhbS1zZXNzaW9uLWV4cGlyZWQnO1xuY29uc3QgQ1lCRVJfTE9HSU5fUEFUSCA9ICcvMTAwMDE4L2xvZ2luJztcbmNvbnN0IEFDVl9MT0dJTl9QQVRIID0gJy9pYW1sb2dpbic7XG5cbmNvbnN0IGhhc0lhbUV4cGlyZWRIZWFkZXIgPSAoZXZlbnQ6IEh0dHBSZXNwb25zZTxhbnk+KTogYm9vbGVhbiA9PlxuICAgICEhZXZlbnQuaGVhZGVycy5nZXQoSUFNX1NFU1NJT05fRVhQSVJFRF9IRUFERVIpO1xuXG5jb25zdCBpc1JlZGlyZWN0aW9uVG9Mb2dpbiA9IChldmVudDogSHR0cFJlc3BvbnNlPGFueT4pOiBib29sZWFuID0+IHtcbiAgICBjb25zdCBpc1JlZGlyZWN0aW9uID0gZXZlbnQuc3RhdHVzID09PSBIdHRwU3RhdHVzQ29kZS5Gb3VuZDtcbiAgICBjb25zdCBsb2NhdGlvbkhlYWRlciA9IGV2ZW50LmhlYWRlcnMuZ2V0KCdMb2NhdGlvbicpO1xuXG4gICAgY29uc3QgaXNMb2NhdGlvbkN5YmVyTG9naW4gPSBsb2NhdGlvbkhlYWRlcj8uaW5jbHVkZXMoQ1lCRVJfTE9HSU5fUEFUSCk7XG4gICAgY29uc3QgaXNMb2NhdGlvbkFjdkxvZ2luID0gbG9jYXRpb25IZWFkZXI/LmluY2x1ZGVzKEFDVl9MT0dJTl9QQVRIKTtcblxuICAgIHJldHVybiBpc1JlZGlyZWN0aW9uICYmIChpc0xvY2F0aW9uQ3liZXJMb2dpbiB8fCBpc0xvY2F0aW9uQWN2TG9naW4pO1xufTtcblxuQEluamVjdGFibGUoe1xuICAgIHByb3ZpZGVkSW46ICdyb290J1xufSlcbmV4cG9ydCBjbGFzcyBJYW1FeHBpcmVkSW50ZXJjZXB0b3JTZXJ2aWNlIGltcGxlbWVudHMgSHR0cEludGVyY2VwdG9yIHtcbiAgICBwcml2YXRlIF9pc0lhbVNlc3Npb25FeHBpcmVkOiBTdWJqZWN0PGJvb2xlYW4+ID0gbmV3IFN1YmplY3Q8Ym9vbGVhbj4oKTtcblxuICAgIGdldCBpc0lhbVNlc3Npb25FeHBpcmVkKCk6IE9ic2VydmFibGU8Ym9vbGVhbj4ge1xuICAgICAgICByZXR1cm4gdGhpcy5faXNJYW1TZXNzaW9uRXhwaXJlZC5hc09ic2VydmFibGUoKTtcbiAgICB9XG5cbiAgICBzZXRJYW1TZXNzaW9uRXhwaXJlZE1hbnVhbGx5KCk6IHZvaWQge1xuICAgICAgICB0aGlzLl9pc0lhbVNlc3Npb25FeHBpcmVkLm5leHQodHJ1ZSk7XG4gICAgfVxuXG4gICAgaW50ZXJjZXB0KFxuICAgICAgICByZXE6IEh0dHBSZXF1ZXN0PGFueT4sXG4gICAgICAgIG5leHQ6IEh0dHBIYW5kbGVyXG4gICAgKTogT2JzZXJ2YWJsZTxIdHRwRXZlbnQ8YW55PiB8IGFueT4ge1xuICAgICAgICByZXR1cm4gbmV4dC5oYW5kbGUocmVxKS5waXBlKFxuICAgICAgICAgICAgbWFwKGV2ZW50ID0+IHtcbiAgICAgICAgICAgICAgICBpZiAoZXZlbnQgaW5zdGFuY2VvZiBIdHRwUmVzcG9uc2UpIHtcbiAgICAgICAgICAgICAgICAgICAgaWYgKFxuICAgICAgICAgICAgICAgICAgICAgICAgaGFzSWFtRXhwaXJlZEhlYWRlcihldmVudCkgfHxcbiAgICAgICAgICAgICAgICAgICAgICAgIGlzUmVkaXJlY3Rpb25Ub0xvZ2luKGV2ZW50KVxuICAgICAgICAgICAgICAgICAgICApIHtcbiAgICAgICAgICAgICAgICAgICAgICAgIHRoaXMuX2lzSWFtU2Vzc2lvbkV4cGlyZWQubmV4dCh0cnVlKTtcbiAgICAgICAgICAgICAgICAgICAgfVxuICAgICAgICAgICAgICAgIH1cbiAgICAgICAgICAgICAgICByZXR1cm4gZXZlbnQ7XG4gICAgICAgICAgICB9KSxcbiAgICAgICAgICAgIGNhdGNoRXJyb3IodGhpcy5oYW5kbGVFcnJvci5iaW5kKHRoaXMpKVxuICAgICAgICApO1xuICAgIH1cblxuICAgIHByaXZhdGUgaGFuZGxlRXJyb3IoXG4gICAgICAgIGVycjogSHR0cEVycm9yUmVzcG9uc2UgfCBIdHRwRXZlbnQ8YW55PlxuICAgICk6IE9ic2VydmFibGU8SHR0cEV2ZW50PGFueT4+IHtcbiAgICAgICAgaWYgKGVyciBpbnN0YW5jZW9mIEh0dHBFcnJvclJlc3BvbnNlKSB7XG4gICAgICAgICAgICAvLyBzdGF0dXMgaXMgMjAwLCBidXQgc3RpbGwgYW4gZXJyb3Igc2luY2VcbiAgICAgICAgICAgIC8vIGxvZ2luIHBhZ2UgaXMgcmV0dXJuZWQgd2hlbiB4bWwvanNvbiBpcyBleHBlY3RlZFxuICAgICAgICAgICAgY29uc3QgaXNTdGF0dXNPayA9IGVyci5zdGF0dXMgPT09IEh0dHBTdGF0dXNDb2RlLk9rO1xuICAgICAgICAgICAgY29uc3QgaXNVcmxDeWJlckxvZ2luID0gZXJyLnVybC5pbmNsdWRlcyhDWUJFUl9MT0dJTl9QQVRIKTtcbiAgICAgICAgICAgIGNvbnN0IGlzVXJsQWN2TG9naW4gPSBlcnIudXJsLmluY2x1ZGVzKEFDVl9MT0dJTl9QQVRIKTtcblxuICAgICAgICAgICAgaWYgKGlzU3RhdHVzT2sgJiYgKGlzVXJsQ3liZXJMb2dpbiB8fCBpc1VybEFjdkxvZ2luKSkge1xuICAgICAgICAgICAgICAgIHRoaXMuX2lzSWFtU2Vzc2lvbkV4cGlyZWQubmV4dCh0cnVlKTtcbiAgICAgICAgICAgIH1cbiAgICAgICAgfVxuXG4gICAgICAgIHJldHVybiB0aHJvd0Vycm9yKGVycik7XG4gICAgfVxufVxuIl19
|
|
@@ -2,16 +2,22 @@ import { Component } from '@angular/core';
|
|
|
2
2
|
import { first } from 'rxjs/operators';
|
|
3
3
|
import * as i0 from "@angular/core";
|
|
4
4
|
import * as i1 from "./iam-expired-interceptor.service";
|
|
5
|
-
import * as i2 from "../foehn-
|
|
5
|
+
import * as i2 from "../foehn-page/foehn-page-modal.service";
|
|
6
|
+
import * as i3 from "../foehn-modal/foehn-modal.component";
|
|
7
|
+
import * as i4 from "@angular/common";
|
|
6
8
|
export class RedirectComponent {
|
|
7
|
-
constructor(iamInterceptor) {
|
|
9
|
+
constructor(iamInterceptor, foehnPageModalService) {
|
|
8
10
|
this.iamInterceptor = iamInterceptor;
|
|
11
|
+
this.foehnPageModalService = foehnPageModalService;
|
|
9
12
|
this.iamInterceptor.isIamSessionExpired
|
|
10
13
|
.pipe(first())
|
|
11
14
|
.subscribe(() => this.showModal());
|
|
15
|
+
this.redirectUrl = this.foehnPageModalService.buildSelfRedirectionThroughCyberLogin();
|
|
12
16
|
}
|
|
13
17
|
reloadPage() {
|
|
14
|
-
|
|
18
|
+
this.redirectUrl.subscribe(redirectUrl => {
|
|
19
|
+
window.location.href = redirectUrl;
|
|
20
|
+
});
|
|
15
21
|
}
|
|
16
22
|
showModal() {
|
|
17
23
|
this.counter = 10;
|
|
@@ -25,10 +31,10 @@ export class RedirectComponent {
|
|
|
25
31
|
}, 1000);
|
|
26
32
|
}
|
|
27
33
|
}
|
|
28
|
-
RedirectComponent.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.3.12", ngImport: i0, type: RedirectComponent, deps: [{ token: i1.IamExpiredInterceptorService }], target: i0.ɵɵFactoryTarget.Component });
|
|
29
|
-
RedirectComponent.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "12.0.0", version: "13.3.12", type: RedirectComponent, selector: "redirector", ngImport: i0, template: "<foehn-modal\n [modalHeaderText]=\"'Information'\"\n [isModalVisible]=\"isModalVisible\"\n [closeable]=\"false\"\n>\n <p>Votre session a expir\u00E9.</p>\n <p>\n Vous pouvez\n <a href=\"
|
|
34
|
+
RedirectComponent.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.3.12", ngImport: i0, type: RedirectComponent, deps: [{ token: i1.IamExpiredInterceptorService }, { token: i2.FoehnPageModalService }], target: i0.ɵɵFactoryTarget.Component });
|
|
35
|
+
RedirectComponent.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "12.0.0", version: "13.3.12", type: RedirectComponent, selector: "redirector", ngImport: i0, template: "<foehn-modal\n [modalHeaderText]=\"'Information'\"\n [isModalVisible]=\"isModalVisible\"\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", components: [{ type: i3.FoehnModalComponent, selector: "foehn-modal", inputs: ["id", "name", "modalSize", "modalBodyText", "modalHeaderText", "closeable", "modalTriggerHtmlElement", "isModalVisible"], outputs: ["isModalVisibleChange"] }], pipes: { "async": i4.AsyncPipe } });
|
|
30
36
|
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.3.12", ngImport: i0, type: RedirectComponent, decorators: [{
|
|
31
37
|
type: Component,
|
|
32
|
-
args: [{ selector: 'redirector', template: "<foehn-modal\n [modalHeaderText]=\"'Information'\"\n [isModalVisible]=\"isModalVisible\"\n [closeable]=\"false\"\n>\n <p>Votre session a expir\u00E9.</p>\n <p>\n Vous pouvez\n <a href=\"
|
|
33
|
-
}], ctorParameters: function () { return [{ type: i1.IamExpiredInterceptorService }]; } });
|
|
34
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
38
|
+
args: [{ selector: 'redirector', template: "<foehn-modal\n [modalHeaderText]=\"'Information'\"\n [isModalVisible]=\"isModalVisible\"\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" }]
|
|
39
|
+
}], ctorParameters: function () { return [{ type: i1.IamExpiredInterceptorService }, { type: i2.FoehnPageModalService }]; } });
|
|
40
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicmVkaXJlY3QuY29tcG9uZW50LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vcHJvamVjdHMvcHJlc3RhdGlvbnMtbmcvc3JjL3Nkay1yZWRpcmVjdC9yZWRpcmVjdC5jb21wb25lbnQudHMiLCIuLi8uLi8uLi8uLi9wcm9qZWN0cy9wcmVzdGF0aW9ucy1uZy9zcmMvc2RrLXJlZGlyZWN0L3JlZGlyZWN0LmNvbXBvbmVudC5odG1sIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxTQUFTLEVBQUUsTUFBTSxlQUFlLENBQUM7QUFJMUMsT0FBTyxFQUFFLEtBQUssRUFBRSxNQUFNLGdCQUFnQixDQUFDOzs7Ozs7QUFPdkMsTUFBTSxPQUFPLGlCQUFpQjtJQU0xQixZQUNZLGNBQTRDLEVBQzVDLHFCQUE0QztRQUQ1QyxtQkFBYyxHQUFkLGNBQWMsQ0FBOEI7UUFDNUMsMEJBQXFCLEdBQXJCLHFCQUFxQixDQUF1QjtRQUVwRCxJQUFJLENBQUMsY0FBYyxDQUFDLG1CQUFtQjthQUNsQyxJQUFJLENBQUMsS0FBSyxFQUFFLENBQUM7YUFDYixTQUFTLENBQUMsR0FBRyxFQUFFLENBQUMsSUFBSSxDQUFDLFNBQVMsRUFBRSxDQUFDLENBQUM7UUFDdkMsSUFBSSxDQUFDLFdBQVcsR0FBRyxJQUFJLENBQUMscUJBQXFCLENBQUMscUNBQXFDLEVBQUUsQ0FBQztJQUMxRixDQUFDO0lBRUQsVUFBVTtRQUNOLElBQUksQ0FBQyxXQUFXLENBQUMsU0FBUyxDQUFDLFdBQVcsQ0FBQyxFQUFFO1lBQ3JDLE1BQU0sQ0FBQyxRQUFRLENBQUMsSUFBSSxHQUFHLFdBQVcsQ0FBQztRQUN2QyxDQUFDLENBQUMsQ0FBQztJQUNQLENBQUM7SUFFTyxTQUFTO1FBQ2IsSUFBSSxDQUFDLE9BQU8sR0FBRyxFQUFFLENBQUM7UUFDbEIsSUFBSSxDQUFDLGNBQWMsR0FBRyxJQUFJLENBQUM7UUFDM0IsV0FBVyxDQUFDLEdBQUcsRUFBRTtZQUNiLElBQUksQ0FBQyxLQUFLLElBQUksQ0FBQyxPQUFPLEVBQUU7Z0JBQ3BCLElBQUksQ0FBQyxVQUFVLEVBQUUsQ0FBQztnQkFDbEIsT0FBTzthQUNWO1lBQ0QsSUFBSSxDQUFDLE9BQU8sRUFBRSxDQUFDO1FBQ25CLENBQUMsRUFBRSxJQUFJLENBQUMsQ0FBQztJQUNiLENBQUM7OytHQWhDUSxpQkFBaUI7bUdBQWpCLGlCQUFpQixrRENYOUIsd2ZBZ0JBOzRGRExhLGlCQUFpQjtrQkFMN0IsU0FBUzsrQkFFSSxZQUFZIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgQ29tcG9uZW50IH0gZnJvbSAnQGFuZ3VsYXIvY29yZSc7XG5pbXBvcnQgeyBJYW1FeHBpcmVkSW50ZXJjZXB0b3JTZXJ2aWNlIH0gZnJvbSAnLi9pYW0tZXhwaXJlZC1pbnRlcmNlcHRvci5zZXJ2aWNlJztcbmltcG9ydCB7IEZvZWhuUGFnZU1vZGFsU2VydmljZSB9IGZyb20gJy4uL2ZvZWhuLXBhZ2UvZm9laG4tcGFnZS1tb2RhbC5zZXJ2aWNlJztcbmltcG9ydCB7IE9ic2VydmFibGUgfSBmcm9tICdyeGpzJztcbmltcG9ydCB7IGZpcnN0IH0gZnJvbSAncnhqcy9vcGVyYXRvcnMnO1xuXG5AQ29tcG9uZW50KHtcbiAgICAvLyBlc2xpbnQtZGlzYWJsZS1uZXh0LWxpbmUgIEBhbmd1bGFyLWVzbGludC9jb21wb25lbnQtc2VsZWN0b3JcbiAgICBzZWxlY3RvcjogJ3JlZGlyZWN0b3InLFxuICAgIHRlbXBsYXRlVXJsOiAnLi9yZWRpcmVjdC5jb21wb25lbnQuaHRtbCdcbn0pXG5leHBvcnQgY2xhc3MgUmVkaXJlY3RDb21wb25lbnQge1xuICAgIGlzTW9kYWxWaXNpYmxlOiBib29sZWFuO1xuICAgIGNvdW50ZXI6IG51bWJlcjtcblxuICAgIHJlZGlyZWN0VXJsOiBPYnNlcnZhYmxlPHN0cmluZz47XG5cbiAgICBjb25zdHJ1Y3RvcihcbiAgICAgICAgcHJpdmF0ZSBpYW1JbnRlcmNlcHRvcjogSWFtRXhwaXJlZEludGVyY2VwdG9yU2VydmljZSxcbiAgICAgICAgcHJpdmF0ZSBmb2VoblBhZ2VNb2RhbFNlcnZpY2U6IEZvZWhuUGFnZU1vZGFsU2VydmljZVxuICAgICkge1xuICAgICAgICB0aGlzLmlhbUludGVyY2VwdG9yLmlzSWFtU2Vzc2lvbkV4cGlyZWRcbiAgICAgICAgICAgIC5waXBlKGZpcnN0KCkpXG4gICAgICAgICAgICAuc3Vic2NyaWJlKCgpID0+IHRoaXMuc2hvd01vZGFsKCkpO1xuICAgICAgICB0aGlzLnJlZGlyZWN0VXJsID0gdGhpcy5mb2VoblBhZ2VNb2RhbFNlcnZpY2UuYnVpbGRTZWxmUmVkaXJlY3Rpb25UaHJvdWdoQ3liZXJMb2dpbigpO1xuICAgIH1cblxuICAgIHJlbG9hZFBhZ2UoKTogdm9pZCB7XG4gICAgICAgIHRoaXMucmVkaXJlY3RVcmwuc3Vic2NyaWJlKHJlZGlyZWN0VXJsID0+IHtcbiAgICAgICAgICAgIHdpbmRvdy5sb2NhdGlvbi5ocmVmID0gcmVkaXJlY3RVcmw7XG4gICAgICAgIH0pO1xuICAgIH1cblxuICAgIHByaXZhdGUgc2hvd01vZGFsKCk6IHZvaWQge1xuICAgICAgICB0aGlzLmNvdW50ZXIgPSAxMDtcbiAgICAgICAgdGhpcy5pc01vZGFsVmlzaWJsZSA9IHRydWU7XG4gICAgICAgIHNldEludGVydmFsKCgpID0+IHtcbiAgICAgICAgICAgIGlmICgwID09PSB0aGlzLmNvdW50ZXIpIHtcbiAgICAgICAgICAgICAgICB0aGlzLnJlbG9hZFBhZ2UoKTtcbiAgICAgICAgICAgICAgICByZXR1cm47XG4gICAgICAgICAgICB9XG4gICAgICAgICAgICB0aGlzLmNvdW50ZXItLTtcbiAgICAgICAgfSwgMTAwMCk7XG4gICAgfVxufVxuIiwiPGZvZWhuLW1vZGFsXG4gICAgW21vZGFsSGVhZGVyVGV4dF09XCInSW5mb3JtYXRpb24nXCJcbiAgICBbaXNNb2RhbFZpc2libGVdPVwiaXNNb2RhbFZpc2libGVcIlxuICAgIFtjbG9zZWFibGVdPVwiZmFsc2VcIlxuPlxuICAgIDxwPlZvdHJlIHNlc3Npb24gYSBleHBpcsOpLjwvcD5cbiAgICA8cD5cbiAgICAgICAgVm91cyBwb3V2ZXpcbiAgICAgICAgPGEgW2hyZWZdPVwicmVkaXJlY3RVcmwgfCBhc3luY1wiPnZvdXMgY29ubmVjdGVyPC9hPlxuICAgICAgICDDoCBub3V2ZWF1IHBvdXIgY29udGludWVyIMOgIHV0aWxpc2VyIG5vcyBzZXJ2aWNlcy5cbiAgICA8L3A+XG5cbiAgICA8ZGl2IG1vZGFsLWZvb3RlciBjbGFzcz1cInctMTAwIHRleHQtcmlnaHQgZm9udC13ZWlnaHQtYm9sZFwiPlxuICAgICAgICBWb3VzIGFsbGV6IMOqdHJlIHJlZGlyaWfDqSBkYW5zIHt7IGNvdW50ZXIgfX0gcy5cbiAgICA8L2Rpdj5cbjwvZm9laG4tbW9kYWw+XG4iXX0=
|
|
@@ -48,6 +48,9 @@ class IamExpiredInterceptorService {
|
|
|
48
48
|
get isIamSessionExpired() {
|
|
49
49
|
return this._isIamSessionExpired.asObservable();
|
|
50
50
|
}
|
|
51
|
+
setIamSessionExpiredManually() {
|
|
52
|
+
this._isIamSessionExpired.next(true);
|
|
53
|
+
}
|
|
51
54
|
intercept(req, next) {
|
|
52
55
|
return next.handle(req).pipe(map(event => {
|
|
53
56
|
if (event instanceof HttpResponse) {
|
|
@@ -10665,14 +10668,18 @@ class TableSort {
|
|
|
10665
10668
|
}
|
|
10666
10669
|
|
|
10667
10670
|
class RedirectComponent {
|
|
10668
|
-
constructor(iamInterceptor) {
|
|
10671
|
+
constructor(iamInterceptor, foehnPageModalService) {
|
|
10669
10672
|
this.iamInterceptor = iamInterceptor;
|
|
10673
|
+
this.foehnPageModalService = foehnPageModalService;
|
|
10670
10674
|
this.iamInterceptor.isIamSessionExpired
|
|
10671
10675
|
.pipe(first())
|
|
10672
10676
|
.subscribe(() => this.showModal());
|
|
10677
|
+
this.redirectUrl = this.foehnPageModalService.buildSelfRedirectionThroughCyberLogin();
|
|
10673
10678
|
}
|
|
10674
10679
|
reloadPage() {
|
|
10675
|
-
|
|
10680
|
+
this.redirectUrl.subscribe(redirectUrl => {
|
|
10681
|
+
window.location.href = redirectUrl;
|
|
10682
|
+
});
|
|
10676
10683
|
}
|
|
10677
10684
|
showModal() {
|
|
10678
10685
|
this.counter = 10;
|
|
@@ -10686,12 +10693,12 @@ class RedirectComponent {
|
|
|
10686
10693
|
}, 1000);
|
|
10687
10694
|
}
|
|
10688
10695
|
}
|
|
10689
|
-
RedirectComponent.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.3.12", ngImport: i0, type: RedirectComponent, deps: [{ token: IamExpiredInterceptorService }], target: i0.ɵɵFactoryTarget.Component });
|
|
10690
|
-
RedirectComponent.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "12.0.0", version: "13.3.12", type: RedirectComponent, selector: "redirector", ngImport: i0, template: "<foehn-modal\n [modalHeaderText]=\"'Information'\"\n [isModalVisible]=\"isModalVisible\"\n [closeable]=\"false\"\n>\n <p>Votre session a expir\u00E9.</p>\n <p>\n Vous pouvez\n <a href=\"
|
|
10696
|
+
RedirectComponent.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.3.12", ngImport: i0, type: RedirectComponent, deps: [{ token: IamExpiredInterceptorService }, { token: FoehnPageModalService }], target: i0.ɵɵFactoryTarget.Component });
|
|
10697
|
+
RedirectComponent.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "12.0.0", version: "13.3.12", type: RedirectComponent, selector: "redirector", ngImport: i0, template: "<foehn-modal\n [modalHeaderText]=\"'Information'\"\n [isModalVisible]=\"isModalVisible\"\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", components: [{ type: FoehnModalComponent, selector: "foehn-modal", inputs: ["id", "name", "modalSize", "modalBodyText", "modalHeaderText", "closeable", "modalTriggerHtmlElement", "isModalVisible"], outputs: ["isModalVisibleChange"] }], pipes: { "async": i3.AsyncPipe } });
|
|
10691
10698
|
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.3.12", ngImport: i0, type: RedirectComponent, decorators: [{
|
|
10692
10699
|
type: Component,
|
|
10693
|
-
args: [{ selector: 'redirector', template: "<foehn-modal\n [modalHeaderText]=\"'Information'\"\n [isModalVisible]=\"isModalVisible\"\n [closeable]=\"false\"\n>\n <p>Votre session a expir\u00E9.</p>\n <p>\n Vous pouvez\n <a href=\"
|
|
10694
|
-
}], ctorParameters: function () { return [{ type: IamExpiredInterceptorService }]; } });
|
|
10700
|
+
args: [{ selector: 'redirector', template: "<foehn-modal\n [modalHeaderText]=\"'Information'\"\n [isModalVisible]=\"isModalVisible\"\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" }]
|
|
10701
|
+
}], ctorParameters: function () { return [{ type: IamExpiredInterceptorService }, { type: FoehnPageModalService }]; } });
|
|
10695
10702
|
|
|
10696
10703
|
class SdkRedirectModule {
|
|
10697
10704
|
}
|
|
@@ -10816,7 +10823,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.3.12", ngImpo
|
|
|
10816
10823
|
const RECAPTCHA_API_URL = 'api/recaptcha';
|
|
10817
10824
|
const CAPTCHA_ERROR_NAME = 'recaptcha';
|
|
10818
10825
|
class RecaptchaService {
|
|
10819
|
-
constructor(http, sessionInfo, route, validationHandlerService, gesdemService, gesdemEventService, applicationInfoService) {
|
|
10826
|
+
constructor(http, sessionInfo, route, validationHandlerService, gesdemService, gesdemEventService, applicationInfoService, iamExpiredInterceptorService) {
|
|
10820
10827
|
this.http = http;
|
|
10821
10828
|
this.sessionInfo = sessionInfo;
|
|
10822
10829
|
this.route = route;
|
|
@@ -10824,6 +10831,7 @@ class RecaptchaService {
|
|
|
10824
10831
|
this.gesdemService = gesdemService;
|
|
10825
10832
|
this.gesdemEventService = gesdemEventService;
|
|
10826
10833
|
this.applicationInfoService = applicationInfoService;
|
|
10834
|
+
this.iamExpiredInterceptorService = iamExpiredInterceptorService;
|
|
10827
10835
|
this.errorsSubject = new BehaviorSubject([]);
|
|
10828
10836
|
this.errors = this.initErrorObservable(); // has to be first since it is used in initShouldDisplayObservable !
|
|
10829
10837
|
this.shouldDisplay = this.initShouldDisplayObservable();
|
|
@@ -10923,8 +10931,15 @@ class RecaptchaService {
|
|
|
10923
10931
|
]).pipe(
|
|
10924
10932
|
// To work around rapidly changing observables, such as the form
|
|
10925
10933
|
// when the page loads.
|
|
10926
|
-
debounceTime(0),
|
|
10927
|
-
|
|
10934
|
+
debounceTime(0), tap(([isConnected, , , captchaErrors]) => {
|
|
10935
|
+
const hasCaptchaError = !!(captchaErrors === null || captchaErrors === void 0 ? void 0 : captchaErrors.length);
|
|
10936
|
+
if (isConnected && hasCaptchaError) {
|
|
10937
|
+
// this should not happen, the session may have timed out
|
|
10938
|
+
this.iamExpiredInterceptorService.setIamSessionExpiredManually();
|
|
10939
|
+
}
|
|
10940
|
+
}), map(([isConnected, hasBypassEnabled, hasReference, captchaErrors]) => {
|
|
10941
|
+
const hasCaptchaError = !!(captchaErrors === null || captchaErrors === void 0 ? void 0 : captchaErrors.length);
|
|
10942
|
+
if (hasCaptchaError) {
|
|
10928
10943
|
// always display the component if it has an error, user could has logged out in another window
|
|
10929
10944
|
return true;
|
|
10930
10945
|
}
|
|
@@ -10960,14 +10975,14 @@ class RecaptchaService {
|
|
|
10960
10975
|
return captcha.publickey || null;
|
|
10961
10976
|
}
|
|
10962
10977
|
}
|
|
10963
|
-
RecaptchaService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.3.12", ngImport: i0, type: RecaptchaService, deps: [{ token: i1.HttpClient }, { token: SessionInfo }, { token: i1$1.ActivatedRoute }, { token: ValidationHandlerService }, { token: GesdemHandlerService }, { token: GesdemEventService }, { token: ApplicationInfoService }], target: i0.ɵɵFactoryTarget.Injectable });
|
|
10978
|
+
RecaptchaService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.3.12", ngImport: i0, type: RecaptchaService, deps: [{ token: i1.HttpClient }, { token: SessionInfo }, { token: i1$1.ActivatedRoute }, { token: ValidationHandlerService }, { token: GesdemHandlerService }, { token: GesdemEventService }, { token: ApplicationInfoService }, { token: IamExpiredInterceptorService }], target: i0.ɵɵFactoryTarget.Injectable });
|
|
10964
10979
|
RecaptchaService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "13.3.12", ngImport: i0, type: RecaptchaService, providedIn: 'root' });
|
|
10965
10980
|
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.3.12", ngImport: i0, type: RecaptchaService, decorators: [{
|
|
10966
10981
|
type: Injectable,
|
|
10967
10982
|
args: [{
|
|
10968
10983
|
providedIn: 'root'
|
|
10969
10984
|
}]
|
|
10970
|
-
}], ctorParameters: function () { return [{ type: i1.HttpClient }, { type: SessionInfo }, { type: i1$1.ActivatedRoute }, { type: ValidationHandlerService }, { type: GesdemHandlerService }, { type: GesdemEventService }, { type: ApplicationInfoService }]; } });
|
|
10985
|
+
}], ctorParameters: function () { return [{ type: i1.HttpClient }, { type: SessionInfo }, { type: i1$1.ActivatedRoute }, { type: ValidationHandlerService }, { type: GesdemHandlerService }, { type: GesdemEventService }, { type: ApplicationInfoService }, { type: IamExpiredInterceptorService }]; } });
|
|
10971
10986
|
|
|
10972
10987
|
class SdkRecaptchaComponent {
|
|
10973
10988
|
constructor(recaptchaService, cdr) {
|