@dsivd/prestations-ng 15.2.3-beta7 → 15.2.3-beta8
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-v15.2.3-beta8.tgz +0 -0
- package/esm2020/sdk-redirect/iam-expired-interceptor.service.mjs +14 -18
- package/fesm2015/dsivd-prestations-ng.mjs +13 -17
- package/fesm2015/dsivd-prestations-ng.mjs.map +1 -1
- package/fesm2020/dsivd-prestations-ng.mjs +13 -17
- package/fesm2020/dsivd-prestations-ng.mjs.map +1 -1
- package/package.json +1 -1
- package/dsivd-prestations-ng-v15.2.3-beta7.tgz +0 -0
|
Binary file
|
|
@@ -7,16 +7,15 @@ import * as i0 from "@angular/core";
|
|
|
7
7
|
const IAM_SESSION_EXPIRED_HEADER = 'iam-session-expired';
|
|
8
8
|
const CYBER_LOGIN_PATH = '/100018/login';
|
|
9
9
|
const ACV_LOGIN_PATH = '/iamlogin';
|
|
10
|
-
const isIamExpiredHeader = (event) =>
|
|
11
|
-
|
|
12
|
-
const isRedirection = event.status === 302 /* Found */;
|
|
13
|
-
const location = event.headers.get('Location');
|
|
14
|
-
return isRedirection && location?.includes(ACV_LOGIN_PATH);
|
|
10
|
+
const isIamExpiredHeader = (event) => {
|
|
11
|
+
return !!event.headers.get(IAM_SESSION_EXPIRED_HEADER);
|
|
15
12
|
};
|
|
16
|
-
const
|
|
13
|
+
const isRedirectionToLogin = (event) => {
|
|
17
14
|
const isRedirection = event.status === 302 /* Found */;
|
|
18
|
-
const
|
|
19
|
-
|
|
15
|
+
const locationHeader = event.headers.get('Location');
|
|
16
|
+
const isLocationCyberLogin = locationHeader?.includes(CYBER_LOGIN_PATH);
|
|
17
|
+
const isLocationAcvLogin = locationHeader?.includes(ACV_LOGIN_PATH);
|
|
18
|
+
return isRedirection && (isLocationCyberLogin || isLocationAcvLogin);
|
|
20
19
|
};
|
|
21
20
|
export class IamExpiredInterceptorService {
|
|
22
21
|
constructor() {
|
|
@@ -27,11 +26,9 @@ export class IamExpiredInterceptorService {
|
|
|
27
26
|
}
|
|
28
27
|
intercept(req, next) {
|
|
29
28
|
return next.handle(req).pipe(map(event => {
|
|
30
|
-
console.log('event', typeof event, event);
|
|
31
29
|
if (event instanceof HttpResponse) {
|
|
32
30
|
if (isIamExpiredHeader(event) ||
|
|
33
|
-
|
|
34
|
-
isRedirectionToCyberLogin(event)) {
|
|
31
|
+
isRedirectionToLogin(event)) {
|
|
35
32
|
this._isIamSessionExpired.next(true);
|
|
36
33
|
}
|
|
37
34
|
}
|
|
@@ -39,13 +36,12 @@ export class IamExpiredInterceptorService {
|
|
|
39
36
|
}), catchError(this.handleError.bind(this)));
|
|
40
37
|
}
|
|
41
38
|
handleError(err) {
|
|
42
|
-
console.log('err', typeof err, err);
|
|
43
39
|
if (err instanceof HttpErrorResponse) {
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
40
|
+
const isStatusOk = err.status === 200 /* Ok */;
|
|
41
|
+
const isUrlCyberLogin = err.url.includes(CYBER_LOGIN_PATH);
|
|
42
|
+
const isUrlAcvLogin = err.url.includes(ACV_LOGIN_PATH);
|
|
43
|
+
if (isStatusOk && (isUrlCyberLogin || isUrlAcvLogin)) {
|
|
44
|
+
this._isIamSessionExpired.next(true);
|
|
49
45
|
}
|
|
50
46
|
}
|
|
51
47
|
return throwError(err);
|
|
@@ -59,4 +55,4 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.3.5", ngImpor
|
|
|
59
55
|
providedIn: 'root'
|
|
60
56
|
}]
|
|
61
57
|
}] });
|
|
62
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
58
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaWFtLWV4cGlyZWQtaW50ZXJjZXB0b3Iuc2VydmljZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL3Byb2plY3RzL3ByZXN0YXRpb25zLW5nL3NyYy9zZGstcmVkaXJlY3QvaWFtLWV4cGlyZWQtaW50ZXJjZXB0b3Iuc2VydmljZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSx1REFBdUQ7QUFDdkQsT0FBTyxFQUFjLE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSxNQUFNLENBQUM7QUFDdkQsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLGVBQWUsQ0FBQztBQUMzQyxPQUFPLEVBQ0gsaUJBQWlCLEVBS2pCLFlBQVksRUFFZixNQUFNLHNCQUFzQixDQUFDO0FBQzlCLE9BQU8sRUFBRSxVQUFVLEVBQUUsR0FBRyxFQUFFLE1BQU0sZ0JBQWdCLENBQUM7O0FBRWpELE1BQU0sMEJBQTBCLEdBQUcscUJBQXFCLENBQUM7QUFDekQsTUFBTSxnQkFBZ0IsR0FBRyxlQUFlLENBQUM7QUFDekMsTUFBTSxjQUFjLEdBQUcsV0FBVyxDQUFDO0FBRW5DLE1BQU0sa0JBQWtCLEdBQUcsQ0FBQyxLQUF3QixFQUFXLEVBQUU7SUFDN0QsT0FBTyxDQUFDLENBQUMsS0FBSyxDQUFDLE9BQU8sQ0FBQyxHQUFHLENBQUMsMEJBQTBCLENBQUMsQ0FBQztBQUMzRCxDQUFDLENBQUM7QUFFRixNQUFNLG9CQUFvQixHQUFHLENBQUMsS0FBd0IsRUFBVyxFQUFFO0lBQy9ELE1BQU0sYUFBYSxHQUFHLEtBQUssQ0FBQyxNQUFNLG9CQUF5QixDQUFDO0lBQzVELE1BQU0sY0FBYyxHQUFHLEtBQUssQ0FBQyxPQUFPLENBQUMsR0FBRyxDQUFDLFVBQVUsQ0FBQyxDQUFDO0lBRXJELE1BQU0sb0JBQW9CLEdBQUcsY0FBYyxFQUFFLFFBQVEsQ0FBQyxnQkFBZ0IsQ0FBQyxDQUFDO0lBQ3hFLE1BQU0sa0JBQWtCLEdBQUcsY0FBYyxFQUFFLFFBQVEsQ0FBQyxjQUFjLENBQUMsQ0FBQztJQUVwRSxPQUFPLGFBQWEsSUFBSSxDQUFDLG9CQUFvQixJQUFJLGtCQUFrQixDQUFDLENBQUM7QUFDekUsQ0FBQyxDQUFDO0FBS0YsTUFBTSxPQUFPLDRCQUE0QjtJQUh6QztRQUlZLHlCQUFvQixHQUFxQixJQUFJLE9BQU8sRUFBVyxDQUFDO0tBeUMzRTtJQXZDRyxJQUFJLG1CQUFtQjtRQUNuQixPQUFPLElBQUksQ0FBQyxvQkFBb0IsQ0FBQyxZQUFZLEVBQUUsQ0FBQztJQUNwRCxDQUFDO0lBRUQsU0FBUyxDQUNMLEdBQXFCLEVBQ3JCLElBQWlCO1FBRWpCLE9BQU8sSUFBSSxDQUFDLE1BQU0sQ0FBQyxHQUFHLENBQUMsQ0FBQyxJQUFJLENBQ3hCLEdBQUcsQ0FBQyxLQUFLLENBQUMsRUFBRTtZQUNSLElBQUksS0FBSyxZQUFZLFlBQVksRUFBRTtnQkFDL0IsSUFDSSxrQkFBa0IsQ0FBQyxLQUFLLENBQUM7b0JBQ3pCLG9CQUFvQixDQUFDLEtBQUssQ0FBQyxFQUM3QjtvQkFDRSxJQUFJLENBQUMsb0JBQW9CLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxDQUFDO2lCQUN4QzthQUNKO1lBQ0QsT0FBTyxLQUFLLENBQUM7UUFDakIsQ0FBQyxDQUFDLEVBQ0YsVUFBVSxDQUFDLElBQUksQ0FBQyxXQUFXLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxDQUFDLENBQzFDLENBQUM7SUFDTixDQUFDO0lBRU8sV0FBVyxDQUNmLEdBQXVDO1FBRXZDLElBQUksR0FBRyxZQUFZLGlCQUFpQixFQUFFO1lBQ2xDLE1BQU0sVUFBVSxHQUFHLEdBQUcsQ0FBQyxNQUFNLGlCQUFzQixDQUFDO1lBQ3BELE1BQU0sZUFBZSxHQUFHLEdBQUcsQ0FBQyxHQUFHLENBQUMsUUFBUSxDQUFDLGdCQUFnQixDQUFDLENBQUM7WUFDM0QsTUFBTSxhQUFhLEdBQUcsR0FBRyxDQUFDLEdBQUcsQ0FBQyxRQUFRLENBQUMsY0FBYyxDQUFDLENBQUM7WUFFdkQsSUFBSSxVQUFVLElBQUksQ0FBQyxlQUFlLElBQUksYUFBYSxDQUFDLEVBQUU7Z0JBQ2xELElBQUksQ0FBQyxvQkFBb0IsQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLENBQUM7YUFDeEM7U0FDSjtRQUVELE9BQU8sVUFBVSxDQUFDLEdBQUcsQ0FBQyxDQUFDO0lBQzNCLENBQUM7O3lIQXpDUSw0QkFBNEI7NkhBQTVCLDRCQUE0QixjQUZ6QixNQUFNOzJGQUVULDRCQUE0QjtrQkFIeEMsVUFBVTttQkFBQztvQkFDUixVQUFVLEVBQUUsTUFBTTtpQkFDckIiLCJzb3VyY2VzQ29udGVudCI6WyIvKiBlc2xpbnQtZGlzYWJsZSBAdHlwZXNjcmlwdC1lc2xpbnQvbm8tZXhwbGljaXQtYW55ICovXG5pbXBvcnQgeyBPYnNlcnZhYmxlLCBTdWJqZWN0LCB0aHJvd0Vycm9yIH0gZnJvbSAncnhqcyc7XG5pbXBvcnQgeyBJbmplY3RhYmxlIH0gZnJvbSAnQGFuZ3VsYXIvY29yZSc7XG5pbXBvcnQge1xuICAgIEh0dHBFcnJvclJlc3BvbnNlLFxuICAgIEh0dHBFdmVudCxcbiAgICBIdHRwSGFuZGxlcixcbiAgICBIdHRwSW50ZXJjZXB0b3IsXG4gICAgSHR0cFJlcXVlc3QsXG4gICAgSHR0cFJlc3BvbnNlLFxuICAgIEh0dHBTdGF0dXNDb2RlXG59IGZyb20gJ0Bhbmd1bGFyL2NvbW1vbi9odHRwJztcbmltcG9ydCB7IGNhdGNoRXJyb3IsIG1hcCB9IGZyb20gJ3J4anMvb3BlcmF0b3JzJztcblxuY29uc3QgSUFNX1NFU1NJT05fRVhQSVJFRF9IRUFERVIgPSAnaWFtLXNlc3Npb24tZXhwaXJlZCc7XG5jb25zdCBDWUJFUl9MT0dJTl9QQVRIID0gJy8xMDAwMTgvbG9naW4nO1xuY29uc3QgQUNWX0xPR0lOX1BBVEggPSAnL2lhbWxvZ2luJztcblxuY29uc3QgaXNJYW1FeHBpcmVkSGVhZGVyID0gKGV2ZW50OiBIdHRwUmVzcG9uc2U8YW55Pik6IGJvb2xlYW4gPT4ge1xuICAgIHJldHVybiAhIWV2ZW50LmhlYWRlcnMuZ2V0KElBTV9TRVNTSU9OX0VYUElSRURfSEVBREVSKTtcbn07XG5cbmNvbnN0IGlzUmVkaXJlY3Rpb25Ub0xvZ2luID0gKGV2ZW50OiBIdHRwUmVzcG9uc2U8YW55Pik6IGJvb2xlYW4gPT4ge1xuICAgIGNvbnN0IGlzUmVkaXJlY3Rpb24gPSBldmVudC5zdGF0dXMgPT09IEh0dHBTdGF0dXNDb2RlLkZvdW5kO1xuICAgIGNvbnN0IGxvY2F0aW9uSGVhZGVyID0gZXZlbnQuaGVhZGVycy5nZXQoJ0xvY2F0aW9uJyk7XG5cbiAgICBjb25zdCBpc0xvY2F0aW9uQ3liZXJMb2dpbiA9IGxvY2F0aW9uSGVhZGVyPy5pbmNsdWRlcyhDWUJFUl9MT0dJTl9QQVRIKTtcbiAgICBjb25zdCBpc0xvY2F0aW9uQWN2TG9naW4gPSBsb2NhdGlvbkhlYWRlcj8uaW5jbHVkZXMoQUNWX0xPR0lOX1BBVEgpO1xuXG4gICAgcmV0dXJuIGlzUmVkaXJlY3Rpb24gJiYgKGlzTG9jYXRpb25DeWJlckxvZ2luIHx8IGlzTG9jYXRpb25BY3ZMb2dpbik7XG59O1xuXG5ASW5qZWN0YWJsZSh7XG4gICAgcHJvdmlkZWRJbjogJ3Jvb3QnXG59KVxuZXhwb3J0IGNsYXNzIElhbUV4cGlyZWRJbnRlcmNlcHRvclNlcnZpY2UgaW1wbGVtZW50cyBIdHRwSW50ZXJjZXB0b3Ige1xuICAgIHByaXZhdGUgX2lzSWFtU2Vzc2lvbkV4cGlyZWQ6IFN1YmplY3Q8Ym9vbGVhbj4gPSBuZXcgU3ViamVjdDxib29sZWFuPigpO1xuXG4gICAgZ2V0IGlzSWFtU2Vzc2lvbkV4cGlyZWQoKTogT2JzZXJ2YWJsZTxib29sZWFuPiB7XG4gICAgICAgIHJldHVybiB0aGlzLl9pc0lhbVNlc3Npb25FeHBpcmVkLmFzT2JzZXJ2YWJsZSgpO1xuICAgIH1cblxuICAgIGludGVyY2VwdChcbiAgICAgICAgcmVxOiBIdHRwUmVxdWVzdDxhbnk+LFxuICAgICAgICBuZXh0OiBIdHRwSGFuZGxlclxuICAgICk6IE9ic2VydmFibGU8SHR0cEV2ZW50PGFueT4gfCBhbnk+IHtcbiAgICAgICAgcmV0dXJuIG5leHQuaGFuZGxlKHJlcSkucGlwZShcbiAgICAgICAgICAgIG1hcChldmVudCA9PiB7XG4gICAgICAgICAgICAgICAgaWYgKGV2ZW50IGluc3RhbmNlb2YgSHR0cFJlc3BvbnNlKSB7XG4gICAgICAgICAgICAgICAgICAgIGlmIChcbiAgICAgICAgICAgICAgICAgICAgICAgIGlzSWFtRXhwaXJlZEhlYWRlcihldmVudCkgfHxcbiAgICAgICAgICAgICAgICAgICAgICAgIGlzUmVkaXJlY3Rpb25Ub0xvZ2luKGV2ZW50KVxuICAgICAgICAgICAgICAgICAgICApIHtcbiAgICAgICAgICAgICAgICAgICAgICAgIHRoaXMuX2lzSWFtU2Vzc2lvbkV4cGlyZWQubmV4dCh0cnVlKTtcbiAgICAgICAgICAgICAgICAgICAgfVxuICAgICAgICAgICAgICAgIH1cbiAgICAgICAgICAgICAgICByZXR1cm4gZXZlbnQ7XG4gICAgICAgICAgICB9KSxcbiAgICAgICAgICAgIGNhdGNoRXJyb3IodGhpcy5oYW5kbGVFcnJvci5iaW5kKHRoaXMpKVxuICAgICAgICApO1xuICAgIH1cblxuICAgIHByaXZhdGUgaGFuZGxlRXJyb3IoXG4gICAgICAgIGVycjogSHR0cEVycm9yUmVzcG9uc2UgfCBIdHRwRXZlbnQ8YW55PlxuICAgICk6IE9ic2VydmFibGU8SHR0cEV2ZW50PGFueT4+IHtcbiAgICAgICAgaWYgKGVyciBpbnN0YW5jZW9mIEh0dHBFcnJvclJlc3BvbnNlKSB7XG4gICAgICAgICAgICBjb25zdCBpc1N0YXR1c09rID0gZXJyLnN0YXR1cyA9PT0gSHR0cFN0YXR1c0NvZGUuT2s7XG4gICAgICAgICAgICBjb25zdCBpc1VybEN5YmVyTG9naW4gPSBlcnIudXJsLmluY2x1ZGVzKENZQkVSX0xPR0lOX1BBVEgpO1xuICAgICAgICAgICAgY29uc3QgaXNVcmxBY3ZMb2dpbiA9IGVyci51cmwuaW5jbHVkZXMoQUNWX0xPR0lOX1BBVEgpO1xuXG4gICAgICAgICAgICBpZiAoaXNTdGF0dXNPayAmJiAoaXNVcmxDeWJlckxvZ2luIHx8IGlzVXJsQWN2TG9naW4pKSB7XG4gICAgICAgICAgICAgICAgdGhpcy5faXNJYW1TZXNzaW9uRXhwaXJlZC5uZXh0KHRydWUpO1xuICAgICAgICAgICAgfVxuICAgICAgICB9XG5cbiAgICAgICAgcmV0dXJuIHRocm93RXJyb3IoZXJyKTtcbiAgICB9XG59XG4iXX0=
|
|
@@ -33,16 +33,15 @@ import weekOfYear from 'dayjs/plugin/weekOfYear';
|
|
|
33
33
|
const IAM_SESSION_EXPIRED_HEADER = 'iam-session-expired';
|
|
34
34
|
const CYBER_LOGIN_PATH = '/100018/login';
|
|
35
35
|
const ACV_LOGIN_PATH = '/iamlogin';
|
|
36
|
-
const isIamExpiredHeader = (event) =>
|
|
37
|
-
|
|
38
|
-
const isRedirection = event.status === 302 /* Found */;
|
|
39
|
-
const location = event.headers.get('Location');
|
|
40
|
-
return isRedirection && (location === null || location === void 0 ? void 0 : location.includes(ACV_LOGIN_PATH));
|
|
36
|
+
const isIamExpiredHeader = (event) => {
|
|
37
|
+
return !!event.headers.get(IAM_SESSION_EXPIRED_HEADER);
|
|
41
38
|
};
|
|
42
|
-
const
|
|
39
|
+
const isRedirectionToLogin = (event) => {
|
|
43
40
|
const isRedirection = event.status === 302 /* Found */;
|
|
44
|
-
const
|
|
45
|
-
|
|
41
|
+
const locationHeader = event.headers.get('Location');
|
|
42
|
+
const isLocationCyberLogin = locationHeader === null || locationHeader === void 0 ? void 0 : locationHeader.includes(CYBER_LOGIN_PATH);
|
|
43
|
+
const isLocationAcvLogin = locationHeader === null || locationHeader === void 0 ? void 0 : locationHeader.includes(ACV_LOGIN_PATH);
|
|
44
|
+
return isRedirection && (isLocationCyberLogin || isLocationAcvLogin);
|
|
46
45
|
};
|
|
47
46
|
class IamExpiredInterceptorService {
|
|
48
47
|
constructor() {
|
|
@@ -53,11 +52,9 @@ class IamExpiredInterceptorService {
|
|
|
53
52
|
}
|
|
54
53
|
intercept(req, next) {
|
|
55
54
|
return next.handle(req).pipe(map(event => {
|
|
56
|
-
console.log('event', typeof event, event);
|
|
57
55
|
if (event instanceof HttpResponse) {
|
|
58
56
|
if (isIamExpiredHeader(event) ||
|
|
59
|
-
|
|
60
|
-
isRedirectionToCyberLogin(event)) {
|
|
57
|
+
isRedirectionToLogin(event)) {
|
|
61
58
|
this._isIamSessionExpired.next(true);
|
|
62
59
|
}
|
|
63
60
|
}
|
|
@@ -65,13 +62,12 @@ class IamExpiredInterceptorService {
|
|
|
65
62
|
}), catchError(this.handleError.bind(this)));
|
|
66
63
|
}
|
|
67
64
|
handleError(err) {
|
|
68
|
-
console.log('err', typeof err, err);
|
|
69
65
|
if (err instanceof HttpErrorResponse) {
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
66
|
+
const isStatusOk = err.status === 200 /* Ok */;
|
|
67
|
+
const isUrlCyberLogin = err.url.includes(CYBER_LOGIN_PATH);
|
|
68
|
+
const isUrlAcvLogin = err.url.includes(ACV_LOGIN_PATH);
|
|
69
|
+
if (isStatusOk && (isUrlCyberLogin || isUrlAcvLogin)) {
|
|
70
|
+
this._isIamSessionExpired.next(true);
|
|
75
71
|
}
|
|
76
72
|
}
|
|
77
73
|
return throwError(err);
|