monkey-front-core 0.0.196 → 0.0.199
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/esm2020/lib/core/interceptors/monkeyecx-http-config-header.interceptor.mjs +34 -12
- package/esm2020/lib/core/services/auth/monkeyecx-authentication.service.mjs +6 -1
- package/fesm2015/monkey-front-core.mjs +46 -19
- package/fesm2015/monkey-front-core.mjs.map +1 -1
- package/fesm2020/monkey-front-core.mjs +36 -10
- package/fesm2020/monkey-front-core.mjs.map +1 -1
- package/lib/core/interceptors/monkeyecx-http-config-header.interceptor.d.ts +6 -3
- package/lib/core/services/auth/monkeyecx-authentication.service.d.ts +4 -2
- package/monkey-front-core-0.0.199.tgz +0 -0
- package/package.json +1 -1
- package/monkey-front-core-0.0.196.tgz +0 -0
|
@@ -1,17 +1,35 @@
|
|
|
1
1
|
import { Injectable } from '@angular/core';
|
|
2
|
-
import { throwError } from 'rxjs';
|
|
3
|
-
import { catchError, map, mergeMap, take } from 'rxjs/operators';
|
|
2
|
+
import { from, throwError } from 'rxjs';
|
|
3
|
+
import { catchError, first, map, mergeMap, take } from 'rxjs/operators';
|
|
4
4
|
import * as i0 from "@angular/core";
|
|
5
5
|
import * as i1 from "../services/auth";
|
|
6
6
|
import * as i2 from "../services/error";
|
|
7
|
+
import * as i3 from "../services";
|
|
7
8
|
export class MonkeyEcxHttpConfigHeaderInterceptor {
|
|
8
|
-
constructor(
|
|
9
|
-
this.
|
|
10
|
-
this.
|
|
9
|
+
constructor(authService, errorHandlingService, config) {
|
|
10
|
+
this.authService = authService;
|
|
11
|
+
this.errorHandlingService = errorHandlingService;
|
|
12
|
+
this.config = config;
|
|
11
13
|
// not to do
|
|
12
14
|
}
|
|
13
|
-
|
|
14
|
-
|
|
15
|
+
async handle(request, next) {
|
|
16
|
+
const { url } = request;
|
|
17
|
+
if (this.authService.isTokenMandatory(url)) {
|
|
18
|
+
try {
|
|
19
|
+
await this.config
|
|
20
|
+
.config()
|
|
21
|
+
.pipe(first((val) => {
|
|
22
|
+
return !!val;
|
|
23
|
+
}))
|
|
24
|
+
.toPromise();
|
|
25
|
+
}
|
|
26
|
+
catch (e) {
|
|
27
|
+
// not to do
|
|
28
|
+
}
|
|
29
|
+
}
|
|
30
|
+
return this.authService
|
|
31
|
+
.getRequestWithHeadersOb(request)
|
|
32
|
+
.pipe(take(1), map((event) => {
|
|
15
33
|
return event;
|
|
16
34
|
}), mergeMap((resp) => {
|
|
17
35
|
request = request.clone({
|
|
@@ -19,14 +37,18 @@ export class MonkeyEcxHttpConfigHeaderInterceptor {
|
|
|
19
37
|
});
|
|
20
38
|
return next.handle(request);
|
|
21
39
|
}), catchError((error) => {
|
|
22
|
-
this.
|
|
40
|
+
this.errorHandlingService.handleError(error);
|
|
23
41
|
return throwError(error);
|
|
24
|
-
}))
|
|
42
|
+
}))
|
|
43
|
+
.toPromise();
|
|
44
|
+
}
|
|
45
|
+
intercept(request, next) {
|
|
46
|
+
return from(this.handle(request, next));
|
|
25
47
|
}
|
|
26
48
|
}
|
|
27
|
-
MonkeyEcxHttpConfigHeaderInterceptor.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: MonkeyEcxHttpConfigHeaderInterceptor, deps: [{ token: i1.MonkeyEcxAuthenticationService }, { token: i2.MonkeyEcxErrorHandlingService }], target: i0.ɵɵFactoryTarget.Injectable });
|
|
49
|
+
MonkeyEcxHttpConfigHeaderInterceptor.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: MonkeyEcxHttpConfigHeaderInterceptor, deps: [{ token: i1.MonkeyEcxAuthenticationService }, { token: i2.MonkeyEcxErrorHandlingService }, { token: i3.MonkeyEcxConfigService }], target: i0.ɵɵFactoryTarget.Injectable });
|
|
28
50
|
MonkeyEcxHttpConfigHeaderInterceptor.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: MonkeyEcxHttpConfigHeaderInterceptor });
|
|
29
51
|
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: MonkeyEcxHttpConfigHeaderInterceptor, decorators: [{
|
|
30
52
|
type: Injectable
|
|
31
|
-
}], ctorParameters: function () { return [{ type: i1.MonkeyEcxAuthenticationService }, { type: i2.MonkeyEcxErrorHandlingService }]; } });
|
|
32
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
53
|
+
}], ctorParameters: function () { return [{ type: i1.MonkeyEcxAuthenticationService }, { type: i2.MonkeyEcxErrorHandlingService }, { type: i3.MonkeyEcxConfigService }]; } });
|
|
54
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibW9ua2V5ZWN4LWh0dHAtY29uZmlnLWhlYWRlci5pbnRlcmNlcHRvci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uL3Byb2plY3RzL21vbmtleS1mcm9udC1jb3JlL3NyYy9saWIvY29yZS9pbnRlcmNlcHRvcnMvbW9ua2V5ZWN4LWh0dHAtY29uZmlnLWhlYWRlci5pbnRlcmNlcHRvci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sZUFBZSxDQUFDO0FBUTNDLE9BQU8sRUFBRSxJQUFJLEVBQWMsVUFBVSxFQUFFLE1BQU0sTUFBTSxDQUFDO0FBQ3BELE9BQU8sRUFBRSxVQUFVLEVBQUUsS0FBSyxFQUFFLEdBQUcsRUFBRSxRQUFRLEVBQUUsSUFBSSxFQUFFLE1BQU0sZ0JBQWdCLENBQUM7Ozs7O0FBTXhFLE1BQU0sT0FBTyxvQ0FBb0M7SUFDL0MsWUFDVSxXQUEyQyxFQUMzQyxvQkFBbUQsRUFDbkQsTUFBOEI7UUFGOUIsZ0JBQVcsR0FBWCxXQUFXLENBQWdDO1FBQzNDLHlCQUFvQixHQUFwQixvQkFBb0IsQ0FBK0I7UUFDbkQsV0FBTSxHQUFOLE1BQU0sQ0FBd0I7UUFFdEMsWUFBWTtJQUNkLENBQUM7SUFFTyxLQUFLLENBQUMsTUFBTSxDQUFDLE9BQXlCLEVBQUUsSUFBaUI7UUFDL0QsTUFBTSxFQUFFLEdBQUcsRUFBRSxHQUFHLE9BQU8sQ0FBQztRQUV4QixJQUFJLElBQUksQ0FBQyxXQUFXLENBQUMsZ0JBQWdCLENBQUMsR0FBRyxDQUFDLEVBQUU7WUFDMUMsSUFBSTtnQkFDRixNQUFNLElBQUksQ0FBQyxNQUFNO3FCQUNkLE1BQU0sRUFBRTtxQkFDUixJQUFJLENBQ0gsS0FBSyxDQUFDLENBQUMsR0FBUSxFQUFFLEVBQUU7b0JBQ2pCLE9BQU8sQ0FBQyxDQUFDLEdBQUcsQ0FBQztnQkFDZixDQUFDLENBQUMsQ0FDSDtxQkFDQSxTQUFTLEVBQUUsQ0FBQzthQUNoQjtZQUFDLE9BQU8sQ0FBQyxFQUFFO2dCQUNWLFlBQVk7YUFDYjtTQUNGO1FBRUQsT0FBTyxJQUFJLENBQUMsV0FBVzthQUNwQix1QkFBdUIsQ0FBQyxPQUFPLENBQUM7YUFDaEMsSUFBSSxDQUNILElBQUksQ0FBQyxDQUFDLENBQUMsRUFDUCxHQUFHLENBQUMsQ0FBQyxLQUFVLEVBQUUsRUFBRTtZQUNqQixPQUFPLEtBQUssQ0FBQztRQUNmLENBQUMsQ0FBQyxFQUNGLFFBQVEsQ0FBQyxDQUFDLElBQVMsRUFBRSxFQUFFO1lBQ3JCLE9BQU8sR0FBRyxPQUFPLENBQUMsS0FBSyxDQUFDO2dCQUN0QixVQUFVLEVBQUUsSUFBSTthQUNqQixDQUFDLENBQUM7WUFDSCxPQUFPLElBQUksQ0FBQyxNQUFNLENBQUMsT0FBTyxDQUFDLENBQUM7UUFDOUIsQ0FBQyxDQUFDLEVBQ0YsVUFBVSxDQUFDLENBQUMsS0FBd0IsRUFBRSxFQUFFO1lBQ3RDLElBQUksQ0FBQyxvQkFBb0IsQ0FBQyxXQUFXLENBQUMsS0FBSyxDQUFDLENBQUM7WUFDN0MsT0FBTyxVQUFVLENBQUMsS0FBSyxDQUFDLENBQUM7UUFDM0IsQ0FBQyxDQUFDLENBQ0g7YUFDQSxTQUFTLEVBQUUsQ0FBQztJQUNqQixDQUFDO0lBRUQsU0FBUyxDQUFDLE9BQXlCLEVBQUUsSUFBaUI7UUFDcEQsT0FBTyxJQUFJLENBQUMsSUFBSSxDQUFDLE1BQU0sQ0FBQyxPQUFPLEVBQUUsSUFBSSxDQUFDLENBQUMsQ0FBQztJQUMxQyxDQUFDOztpSUFsRFUsb0NBQW9DO3FJQUFwQyxvQ0FBb0M7MkZBQXBDLG9DQUFvQztrQkFEaEQsVUFBVSIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IEluamVjdGFibGUgfSBmcm9tICdAYW5ndWxhci9jb3JlJztcbmltcG9ydCB7XG4gIEh0dHBFcnJvclJlc3BvbnNlLFxuICBIdHRwRXZlbnQsXG4gIEh0dHBIYW5kbGVyLFxuICBIdHRwSW50ZXJjZXB0b3IsXG4gIEh0dHBSZXF1ZXN0XG59IGZyb20gJ0Bhbmd1bGFyL2NvbW1vbi9odHRwJztcbmltcG9ydCB7IGZyb20sIE9ic2VydmFibGUsIHRocm93RXJyb3IgfSBmcm9tICdyeGpzJztcbmltcG9ydCB7IGNhdGNoRXJyb3IsIGZpcnN0LCBtYXAsIG1lcmdlTWFwLCB0YWtlIH0gZnJvbSAncnhqcy9vcGVyYXRvcnMnO1xuaW1wb3J0IHsgTW9ua2V5RWN4RXJyb3JIYW5kbGluZ1NlcnZpY2UgfSBmcm9tICcuLi9zZXJ2aWNlcy9lcnJvcic7XG5pbXBvcnQgeyBNb25rZXlFY3hBdXRoZW50aWNhdGlvblNlcnZpY2UgfSBmcm9tICcuLi9zZXJ2aWNlcy9hdXRoJztcbmltcG9ydCB7IE1vbmtleUVjeENvbmZpZ1NlcnZpY2UgfSBmcm9tICcuLi9zZXJ2aWNlcyc7XG5cbkBJbmplY3RhYmxlKClcbmV4cG9ydCBjbGFzcyBNb25rZXlFY3hIdHRwQ29uZmlnSGVhZGVySW50ZXJjZXB0b3IgaW1wbGVtZW50cyBIdHRwSW50ZXJjZXB0b3Ige1xuICBjb25zdHJ1Y3RvcihcbiAgICBwcml2YXRlIGF1dGhTZXJ2aWNlOiBNb25rZXlFY3hBdXRoZW50aWNhdGlvblNlcnZpY2UsXG4gICAgcHJpdmF0ZSBlcnJvckhhbmRsaW5nU2VydmljZTogTW9ua2V5RWN4RXJyb3JIYW5kbGluZ1NlcnZpY2UsXG4gICAgcHJpdmF0ZSBjb25maWc6IE1vbmtleUVjeENvbmZpZ1NlcnZpY2VcbiAgKSB7XG4gICAgLy8gbm90IHRvIGRvXG4gIH1cblxuICBwcml2YXRlIGFzeW5jIGhhbmRsZShyZXF1ZXN0OiBIdHRwUmVxdWVzdDxhbnk+LCBuZXh0OiBIdHRwSGFuZGxlcikge1xuICAgIGNvbnN0IHsgdXJsIH0gPSByZXF1ZXN0O1xuXG4gICAgaWYgKHRoaXMuYXV0aFNlcnZpY2UuaXNUb2tlbk1hbmRhdG9yeSh1cmwpKSB7XG4gICAgICB0cnkge1xuICAgICAgICBhd2FpdCB0aGlzLmNvbmZpZ1xuICAgICAgICAgIC5jb25maWcoKVxuICAgICAgICAgIC5waXBlKFxuICAgICAgICAgICAgZmlyc3QoKHZhbDogYW55KSA9PiB7XG4gICAgICAgICAgICAgIHJldHVybiAhIXZhbDtcbiAgICAgICAgICAgIH0pXG4gICAgICAgICAgKVxuICAgICAgICAgIC50b1Byb21pc2UoKTtcbiAgICAgIH0gY2F0Y2ggKGUpIHtcbiAgICAgICAgLy8gbm90IHRvIGRvXG4gICAgICB9XG4gICAgfVxuXG4gICAgcmV0dXJuIHRoaXMuYXV0aFNlcnZpY2VcbiAgICAgIC5nZXRSZXF1ZXN0V2l0aEhlYWRlcnNPYihyZXF1ZXN0KVxuICAgICAgLnBpcGUoXG4gICAgICAgIHRha2UoMSksXG4gICAgICAgIG1hcCgoZXZlbnQ6IGFueSkgPT4ge1xuICAgICAgICAgIHJldHVybiBldmVudDtcbiAgICAgICAgfSksXG4gICAgICAgIG1lcmdlTWFwKChyZXNwOiBhbnkpID0+IHtcbiAgICAgICAgICByZXF1ZXN0ID0gcmVxdWVzdC5jbG9uZSh7XG4gICAgICAgICAgICBzZXRIZWFkZXJzOiByZXNwXG4gICAgICAgICAgfSk7XG4gICAgICAgICAgcmV0dXJuIG5leHQuaGFuZGxlKHJlcXVlc3QpO1xuICAgICAgICB9KSxcbiAgICAgICAgY2F0Y2hFcnJvcigoZXJyb3I6IEh0dHBFcnJvclJlc3BvbnNlKSA9PiB7XG4gICAgICAgICAgdGhpcy5lcnJvckhhbmRsaW5nU2VydmljZS5oYW5kbGVFcnJvcihlcnJvcik7XG4gICAgICAgICAgcmV0dXJuIHRocm93RXJyb3IoZXJyb3IpO1xuICAgICAgICB9KVxuICAgICAgKVxuICAgICAgLnRvUHJvbWlzZSgpO1xuICB9XG5cbiAgaW50ZXJjZXB0KHJlcXVlc3Q6IEh0dHBSZXF1ZXN0PGFueT4sIG5leHQ6IEh0dHBIYW5kbGVyKTogT2JzZXJ2YWJsZTxIdHRwRXZlbnQ8YW55Pj4ge1xuICAgIHJldHVybiBmcm9tKHRoaXMuaGFuZGxlKHJlcXVlc3QsIG5leHQpKTtcbiAgfVxufVxuIl19
|
|
@@ -23,6 +23,10 @@ export class MonkeyEcxAuthenticationService {
|
|
|
23
23
|
console.error('isCompanyAuthorized needs to be declared!');
|
|
24
24
|
return false;
|
|
25
25
|
};
|
|
26
|
+
this.isTokenMandatory = (url) => {
|
|
27
|
+
console.error('isTokenMandatory needs to be declared!');
|
|
28
|
+
return false;
|
|
29
|
+
};
|
|
26
30
|
this.getRequestWithHeaders = (request) => {
|
|
27
31
|
console.error('getRequestWithHeaders needs to be declared!');
|
|
28
32
|
return null;
|
|
@@ -47,6 +51,7 @@ export class MonkeyEcxAuthenticationService {
|
|
|
47
51
|
this.redirectLoginWelcomeBack =
|
|
48
52
|
args?.redirectLoginWelcomeBack || this.redirectLoginWelcomeBack.bind(this);
|
|
49
53
|
this.isAuthorized = args?.isAuthorized || this.isAuthorized.bind(this);
|
|
54
|
+
this.isTokenMandatory = args?.isTokenMandatory || this.isTokenMandatory.bind(this);
|
|
50
55
|
this.isCompanyAuthorized = args?.isCompanyAuthorized || this.isCompanyAuthorized.bind(this);
|
|
51
56
|
this.getRequestWithHeaders =
|
|
52
57
|
args?.getRequestWithHeaders || this.getRequestWithHeaders.bind(this);
|
|
@@ -61,4 +66,4 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.1.1", ngImpor
|
|
|
61
66
|
type: Injectable,
|
|
62
67
|
args: [{ providedIn: 'root' }]
|
|
63
68
|
}], ctorParameters: function () { return []; } });
|
|
64
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
69
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibW9ua2V5ZWN4LWF1dGhlbnRpY2F0aW9uLnNlcnZpY2UuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi8uLi9wcm9qZWN0cy9tb25rZXktZnJvbnQtY29yZS9zcmMvbGliL2NvcmUvc2VydmljZXMvYXV0aC9tb25rZXllY3gtYXV0aGVudGljYXRpb24uc2VydmljZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSwrQkFBK0I7QUFDL0IsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLGVBQWUsQ0FBQzs7QUFLM0MsTUFBTSxPQUFPLDhCQUE4QjtJQUN6QztRQUlBLHVCQUFrQixHQUFHLEdBQUcsRUFBRTtZQUN4QixPQUFPLENBQUMsS0FBSyxDQUFDLDBDQUEwQyxDQUFDLENBQUM7WUFDMUQsT0FBTyxJQUFJLENBQUM7UUFDZCxDQUFDLENBQUM7UUFFRixnQkFBVyxHQUFHLEdBQUcsRUFBRTtZQUNqQixPQUFPLENBQUMsS0FBSyxDQUFDLG1DQUFtQyxDQUFDLENBQUM7WUFDbkQsT0FBTyxJQUFJLENBQUM7UUFDZCxDQUFDLENBQUM7UUFFRiw2QkFBd0IsR0FBRyxHQUFHLEVBQUU7WUFDOUIsT0FBTyxDQUFDLEtBQUssQ0FBQyxnREFBZ0QsQ0FBQyxDQUFDO1lBQ2hFLE9BQU8sSUFBSSxDQUFDO1FBQ2QsQ0FBQyxDQUFDO1FBRUYsaUJBQVksR0FBRyxHQUFZLEVBQUU7WUFDM0IsT0FBTyxDQUFDLEtBQUssQ0FBQyxvQ0FBb0MsQ0FBQyxDQUFDO1lBQ3BELE9BQU8sS0FBSyxDQUFDO1FBQ2YsQ0FBQyxDQUFDO1FBRUYsd0JBQW1CLEdBQUcsR0FBWSxFQUFFO1lBQ2xDLE9BQU8sQ0FBQyxLQUFLLENBQUMsMkNBQTJDLENBQUMsQ0FBQztZQUMzRCxPQUFPLEtBQUssQ0FBQztRQUNmLENBQUMsQ0FBQztRQUVGLHFCQUFnQixHQUFHLENBQUMsR0FBVyxFQUFXLEVBQUU7WUFDMUMsT0FBTyxDQUFDLEtBQUssQ0FBQyx3Q0FBd0MsQ0FBQyxDQUFDO1lBQ3hELE9BQU8sS0FBSyxDQUFDO1FBQ2YsQ0FBQyxDQUFDO1FBRUYsMEJBQXFCLEdBQUcsQ0FBQyxPQUF5QixFQUEwQixFQUFFO1lBQzVFLE9BQU8sQ0FBQyxLQUFLLENBQUMsNkNBQTZDLENBQUMsQ0FBQztZQUM3RCxPQUFPLElBQUksQ0FBQztRQUNkLENBQUMsQ0FBQztRQUVGLDRCQUF1QixHQUFHLENBQUMsT0FBeUIsRUFBeUIsRUFBRTtZQUM3RSxPQUFPLENBQUMsS0FBSyxDQUFDLCtDQUErQyxDQUFDLENBQUM7WUFDL0QsT0FBTyxJQUFJLENBQUM7UUFDZCxDQUFDLENBQUM7UUFFRix3QkFBbUIsR0FBRyxDQUFDLFFBQTJCLEVBQVcsRUFBRTtZQUM3RCxPQUFPLENBQUMsS0FBSyxDQUFDLDJDQUEyQyxDQUFDLENBQUM7WUFDM0QsT0FBTyxLQUFLLENBQUM7UUFDZixDQUFDLENBQUM7UUFFRixpQkFBWSxHQUFHLEdBQTJCLEVBQUU7WUFDMUMsT0FBTyxDQUFDLEtBQUssQ0FBQyxvQ0FBb0MsQ0FBQyxDQUFDO1lBQ3BELE9BQU8sSUFBSSxDQUFDO1FBQ2QsQ0FBQyxDQUFDO1FBbkRBLFlBQVk7SUFDZCxDQUFDO0lBb0RELElBQUksQ0FBQyxJQVdKO1FBQ0MsSUFBSSxDQUFDLGtCQUFrQixHQUFHLElBQUksRUFBRSxrQkFBa0IsSUFBSSxJQUFJLENBQUMsa0JBQWtCLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxDQUFDO1FBQ3pGLElBQUksQ0FBQyxXQUFXLEdBQUcsSUFBSSxFQUFFLFdBQVcsSUFBSSxJQUFJLENBQUMsV0FBVyxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsQ0FBQztRQUNwRSxJQUFJLENBQUMsd0JBQXdCO1lBQzNCLElBQUksRUFBRSx3QkFBd0IsSUFBSSxJQUFJLENBQUMsd0JBQXdCLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxDQUFDO1FBQzdFLElBQUksQ0FBQyxZQUFZLEdBQUcsSUFBSSxFQUFFLFlBQVksSUFBSSxJQUFJLENBQUMsWUFBWSxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsQ0FBQztRQUN2RSxJQUFJLENBQUMsZ0JBQWdCLEdBQUcsSUFBSSxFQUFFLGdCQUFnQixJQUFJLElBQUksQ0FBQyxnQkFBZ0IsQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLENBQUM7UUFDbkYsSUFBSSxDQUFDLG1CQUFtQixHQUFHLElBQUksRUFBRSxtQkFBbUIsSUFBSSxJQUFJLENBQUMsbUJBQW1CLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxDQUFDO1FBQzVGLElBQUksQ0FBQyxxQkFBcUI7WUFDeEIsSUFBSSxFQUFFLHFCQUFxQixJQUFJLElBQUksQ0FBQyxxQkFBcUIsQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLENBQUM7UUFDdkUsSUFBSSxDQUFDLHVCQUF1QixHQUFHLElBQUksRUFBRSx1QkFBdUIsQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLENBQUM7UUFDeEUsSUFBSSxDQUFDLG1CQUFtQixHQUFHLElBQUksRUFBRSxtQkFBbUIsSUFBSSxJQUFJLENBQUMsbUJBQW1CLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxDQUFDO1FBQzVGLElBQUksQ0FBQyxZQUFZLEdBQUcsSUFBSSxFQUFFLFlBQVksSUFBSSxJQUFJLENBQUMsWUFBWSxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsQ0FBQztJQUN6RSxDQUFDOzsySEEvRVUsOEJBQThCOytIQUE5Qiw4QkFBOEIsY0FEakIsTUFBTTsyRkFDbkIsOEJBQThCO2tCQUQxQyxVQUFVO21CQUFDLEVBQUUsVUFBVSxFQUFFLE1BQU0sRUFBRSIsInNvdXJjZXNDb250ZW50IjpbIi8qIGVzbGludC1kaXNhYmxlIG5vLWNvbnNvbGUgKi9cbmltcG9ydCB7IEluamVjdGFibGUgfSBmcm9tICdAYW5ndWxhci9jb3JlJztcbmltcG9ydCB7IE9ic2VydmFibGUgfSBmcm9tICdyeGpzJztcbmltcG9ydCB7IEh0dHBFcnJvclJlc3BvbnNlLCBIdHRwUmVxdWVzdCB9IGZyb20gJ0Bhbmd1bGFyL2NvbW1vbi9odHRwJztcblxuQEluamVjdGFibGUoeyBwcm92aWRlZEluOiAncm9vdCcgfSlcbmV4cG9ydCBjbGFzcyBNb25rZXlFY3hBdXRoZW50aWNhdGlvblNlcnZpY2Uge1xuICBjb25zdHJ1Y3RvcigpIHtcbiAgICAvLyBub3QgdG8gZG9cbiAgfVxuXG4gIGhhZEF0TGVhc3RPbmVMb2dpbiA9ICgpID0+IHtcbiAgICBjb25zb2xlLmVycm9yKCdoYWRBdExlYXN0T25lTG9naW4gbmVlZHMgdG8gYmUgZGVjbGFyZWQhJyk7XG4gICAgcmV0dXJuIG51bGw7XG4gIH07XG5cbiAgcmVkaXJlY3RBcHAgPSAoKSA9PiB7XG4gICAgY29uc29sZS5lcnJvcigncmVkaXJlY3RBcHAgbmVlZHMgdG8gYmUgZGVjbGFyZWQhJyk7XG4gICAgcmV0dXJuIG51bGw7XG4gIH07XG5cbiAgcmVkaXJlY3RMb2dpbldlbGNvbWVCYWNrID0gKCkgPT4ge1xuICAgIGNvbnNvbGUuZXJyb3IoJ3JlZGlyZWN0TG9naW5XZWxjb21lQmFjayBuZWVkcyB0byBiZSBkZWNsYXJlZCEnKTtcbiAgICByZXR1cm4gbnVsbDtcbiAgfTtcblxuICBpc0F1dGhvcml6ZWQgPSAoKTogYm9vbGVhbiA9PiB7XG4gICAgY29uc29sZS5lcnJvcignaXNBdXRob3JpemVkIG5lZWRzIHRvIGJlIGRlY2xhcmVkIScpO1xuICAgIHJldHVybiBmYWxzZTtcbiAgfTtcblxuICBpc0NvbXBhbnlBdXRob3JpemVkID0gKCk6IGJvb2xlYW4gPT4ge1xuICAgIGNvbnNvbGUuZXJyb3IoJ2lzQ29tcGFueUF1dGhvcml6ZWQgbmVlZHMgdG8gYmUgZGVjbGFyZWQhJyk7XG4gICAgcmV0dXJuIGZhbHNlO1xuICB9O1xuXG4gIGlzVG9rZW5NYW5kYXRvcnkgPSAodXJsOiBzdHJpbmcpOiBib29sZWFuID0+IHtcbiAgICBjb25zb2xlLmVycm9yKCdpc1Rva2VuTWFuZGF0b3J5IG5lZWRzIHRvIGJlIGRlY2xhcmVkIScpO1xuICAgIHJldHVybiBmYWxzZTtcbiAgfTtcblxuICBnZXRSZXF1ZXN0V2l0aEhlYWRlcnMgPSAocmVxdWVzdDogSHR0cFJlcXVlc3Q8YW55Pik6IEh0dHBSZXF1ZXN0PGFueT4gfCBhbnkgPT4ge1xuICAgIGNvbnNvbGUuZXJyb3IoJ2dldFJlcXVlc3RXaXRoSGVhZGVycyBuZWVkcyB0byBiZSBkZWNsYXJlZCEnKTtcbiAgICByZXR1cm4gbnVsbDtcbiAgfTtcblxuICBnZXRSZXF1ZXN0V2l0aEhlYWRlcnNPYiA9IChyZXF1ZXN0OiBIdHRwUmVxdWVzdDxhbnk+KTogT2JzZXJ2YWJsZTxhbnk+IHwgYW55ID0+IHtcbiAgICBjb25zb2xlLmVycm9yKCdnZXRSZXF1ZXN0V2l0aEhlYWRlcnNPYiBuZWVkcyB0byBiZSBkZWNsYXJlZCEnKTtcbiAgICByZXR1cm4gbnVsbDtcbiAgfTtcblxuICByZWZyZXNoU2hvdWxkSGFwcGVuID0gKHJlc3BvbnNlOiBIdHRwRXJyb3JSZXNwb25zZSk6IGJvb2xlYW4gPT4ge1xuICAgIGNvbnNvbGUuZXJyb3IoJ3JlZnJlc2hTaG91bGRIYXBwZW4gbmVlZHMgdG8gYmUgZGVjbGFyZWQhJyk7XG4gICAgcmV0dXJuIGZhbHNlO1xuICB9O1xuXG4gIHJlZnJlc2hUb2tlbiA9ICgpOiBPYnNlcnZhYmxlPGFueT4gfCBudWxsID0+IHtcbiAgICBjb25zb2xlLmVycm9yKCdyZWZyZXNoVG9rZW4gbmVlZHMgdG8gYmUgZGVjbGFyZWQhJyk7XG4gICAgcmV0dXJuIG51bGw7XG4gIH07XG5cbiAgaW5pdChhcmdzOiB7XG4gICAgaGFkQXRMZWFzdE9uZUxvZ2luPzogYW55O1xuICAgIHJlZGlyZWN0QXBwPzogYW55O1xuICAgIHJlZGlyZWN0TG9naW5XZWxjb21lQmFjaz86IGFueTtcbiAgICBpc0F1dGhvcml6ZWQ/OiBhbnk7XG4gICAgaXNUb2tlbk1hbmRhdG9yeT86IGFueTtcbiAgICBpc0NvbXBhbnlBdXRob3JpemVkPzogYW55O1xuICAgIGdldFJlcXVlc3RXaXRoSGVhZGVycz86IGFueTtcbiAgICBnZXRSZXF1ZXN0V2l0aEhlYWRlcnNPYj86IGFueTtcbiAgICByZWZyZXNoU2hvdWxkSGFwcGVuPzogYW55O1xuICAgIHJlZnJlc2hUb2tlbj86IGFueTtcbiAgfSkge1xuICAgIHRoaXMuaGFkQXRMZWFzdE9uZUxvZ2luID0gYXJncz8uaGFkQXRMZWFzdE9uZUxvZ2luIHx8IHRoaXMuaGFkQXRMZWFzdE9uZUxvZ2luLmJpbmQodGhpcyk7XG4gICAgdGhpcy5yZWRpcmVjdEFwcCA9IGFyZ3M/LnJlZGlyZWN0QXBwIHx8IHRoaXMucmVkaXJlY3RBcHAuYmluZCh0aGlzKTtcbiAgICB0aGlzLnJlZGlyZWN0TG9naW5XZWxjb21lQmFjayA9XG4gICAgICBhcmdzPy5yZWRpcmVjdExvZ2luV2VsY29tZUJhY2sgfHwgdGhpcy5yZWRpcmVjdExvZ2luV2VsY29tZUJhY2suYmluZCh0aGlzKTtcbiAgICB0aGlzLmlzQXV0aG9yaXplZCA9IGFyZ3M/LmlzQXV0aG9yaXplZCB8fCB0aGlzLmlzQXV0aG9yaXplZC5iaW5kKHRoaXMpO1xuICAgIHRoaXMuaXNUb2tlbk1hbmRhdG9yeSA9IGFyZ3M/LmlzVG9rZW5NYW5kYXRvcnkgfHwgdGhpcy5pc1Rva2VuTWFuZGF0b3J5LmJpbmQodGhpcyk7XG4gICAgdGhpcy5pc0NvbXBhbnlBdXRob3JpemVkID0gYXJncz8uaXNDb21wYW55QXV0aG9yaXplZCB8fCB0aGlzLmlzQ29tcGFueUF1dGhvcml6ZWQuYmluZCh0aGlzKTtcbiAgICB0aGlzLmdldFJlcXVlc3RXaXRoSGVhZGVycyA9XG4gICAgICBhcmdzPy5nZXRSZXF1ZXN0V2l0aEhlYWRlcnMgfHwgdGhpcy5nZXRSZXF1ZXN0V2l0aEhlYWRlcnMuYmluZCh0aGlzKTtcbiAgICB0aGlzLmdldFJlcXVlc3RXaXRoSGVhZGVyc09iID0gYXJncz8uZ2V0UmVxdWVzdFdpdGhIZWFkZXJzT2IuYmluZCh0aGlzKTtcbiAgICB0aGlzLnJlZnJlc2hTaG91bGRIYXBwZW4gPSBhcmdzPy5yZWZyZXNoU2hvdWxkSGFwcGVuIHx8IHRoaXMucmVmcmVzaFNob3VsZEhhcHBlbi5iaW5kKHRoaXMpO1xuICAgIHRoaXMucmVmcmVzaFRva2VuID0gYXJncz8ucmVmcmVzaFRva2VuIHx8IHRoaXMucmVmcmVzaFRva2VuLmJpbmQodGhpcyk7XG4gIH1cbn1cbiJdfQ==
|
|
@@ -10,13 +10,13 @@ import * as moment_ from 'moment';
|
|
|
10
10
|
import * as i1$2 from 'ngx-cookie-service';
|
|
11
11
|
import * as i1$3 from '@angular/router';
|
|
12
12
|
import { NavigationStart, NavigationEnd, NavigationError, NavigationCancel } from '@angular/router';
|
|
13
|
-
import { BehaviorSubject, Subscription, throwError, interval, concat, of, Subject } from 'rxjs';
|
|
13
|
+
import { BehaviorSubject, Subscription, throwError, interval, concat, of, Subject, from } from 'rxjs';
|
|
14
14
|
import { filter, take, takeWhile, map, catchError, first, takeUntil, mergeMap, finalize } from 'rxjs/operators';
|
|
15
15
|
import { NG_VALUE_ACCESSOR } from '@angular/forms';
|
|
16
16
|
import { TemplatePortal } from '@angular/cdk/portal';
|
|
17
17
|
import * as i1$4 from '@angular/cdk/overlay';
|
|
18
18
|
import { OverlayModule } from '@angular/cdk/overlay';
|
|
19
|
-
import { __decorate } from 'tslib';
|
|
19
|
+
import { __decorate, __awaiter } from 'tslib';
|
|
20
20
|
import * as i1$5 from '@angular/common/http';
|
|
21
21
|
import { HttpParams, HttpErrorResponse, HTTP_INTERCEPTORS, HttpClientModule } from '@angular/common/http';
|
|
22
22
|
import { datadogRum } from '@datadog/browser-rum';
|
|
@@ -3467,6 +3467,10 @@ class MonkeyEcxAuthenticationService {
|
|
|
3467
3467
|
console.error('isCompanyAuthorized needs to be declared!');
|
|
3468
3468
|
return false;
|
|
3469
3469
|
};
|
|
3470
|
+
this.isTokenMandatory = (url) => {
|
|
3471
|
+
console.error('isTokenMandatory needs to be declared!');
|
|
3472
|
+
return false;
|
|
3473
|
+
};
|
|
3470
3474
|
this.getRequestWithHeaders = (request) => {
|
|
3471
3475
|
console.error('getRequestWithHeaders needs to be declared!');
|
|
3472
3476
|
return null;
|
|
@@ -3491,6 +3495,7 @@ class MonkeyEcxAuthenticationService {
|
|
|
3491
3495
|
this.redirectLoginWelcomeBack =
|
|
3492
3496
|
(args === null || args === void 0 ? void 0 : args.redirectLoginWelcomeBack) || this.redirectLoginWelcomeBack.bind(this);
|
|
3493
3497
|
this.isAuthorized = (args === null || args === void 0 ? void 0 : args.isAuthorized) || this.isAuthorized.bind(this);
|
|
3498
|
+
this.isTokenMandatory = (args === null || args === void 0 ? void 0 : args.isTokenMandatory) || this.isTokenMandatory.bind(this);
|
|
3494
3499
|
this.isCompanyAuthorized = (args === null || args === void 0 ? void 0 : args.isCompanyAuthorized) || this.isCompanyAuthorized.bind(this);
|
|
3495
3500
|
this.getRequestWithHeaders =
|
|
3496
3501
|
(args === null || args === void 0 ? void 0 : args.getRequestWithHeaders) || this.getRequestWithHeaders.bind(this);
|
|
@@ -4601,31 +4606,53 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.1.1", ngImpor
|
|
|
4601
4606
|
}], ctorParameters: function () { return [{ type: MonkeyEcxAuthenticationService }, { type: MonkeyEcxErrorHandlingService }]; } });
|
|
4602
4607
|
|
|
4603
4608
|
class MonkeyEcxHttpConfigHeaderInterceptor {
|
|
4604
|
-
constructor(
|
|
4605
|
-
this.
|
|
4606
|
-
this.
|
|
4609
|
+
constructor(authService, errorHandlingService, config) {
|
|
4610
|
+
this.authService = authService;
|
|
4611
|
+
this.errorHandlingService = errorHandlingService;
|
|
4612
|
+
this.config = config;
|
|
4607
4613
|
// not to do
|
|
4608
4614
|
}
|
|
4615
|
+
handle(request, next) {
|
|
4616
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
4617
|
+
const { url } = request;
|
|
4618
|
+
if (this.authService.isTokenMandatory(url)) {
|
|
4619
|
+
try {
|
|
4620
|
+
yield this.config
|
|
4621
|
+
.config()
|
|
4622
|
+
.pipe(first((val) => {
|
|
4623
|
+
return !!val;
|
|
4624
|
+
}))
|
|
4625
|
+
.toPromise();
|
|
4626
|
+
}
|
|
4627
|
+
catch (e) {
|
|
4628
|
+
// not to do
|
|
4629
|
+
}
|
|
4630
|
+
}
|
|
4631
|
+
return this.authService
|
|
4632
|
+
.getRequestWithHeadersOb(request)
|
|
4633
|
+
.pipe(take(1), map((event) => {
|
|
4634
|
+
return event;
|
|
4635
|
+
}), mergeMap((resp) => {
|
|
4636
|
+
request = request.clone({
|
|
4637
|
+
setHeaders: resp
|
|
4638
|
+
});
|
|
4639
|
+
return next.handle(request);
|
|
4640
|
+
}), catchError((error) => {
|
|
4641
|
+
this.errorHandlingService.handleError(error);
|
|
4642
|
+
return throwError(error);
|
|
4643
|
+
}))
|
|
4644
|
+
.toPromise();
|
|
4645
|
+
});
|
|
4646
|
+
}
|
|
4609
4647
|
intercept(request, next) {
|
|
4610
|
-
|
|
4611
|
-
return ((_b = (_a = this.monkeyecxAuthenticationService) === null || _a === void 0 ? void 0 : _a.getRequestWithHeadersOb(request)) === null || _b === void 0 ? void 0 : _b.pipe(take(1), map((event) => {
|
|
4612
|
-
return event;
|
|
4613
|
-
}), mergeMap((resp) => {
|
|
4614
|
-
request = request.clone({
|
|
4615
|
-
setHeaders: resp
|
|
4616
|
-
});
|
|
4617
|
-
return next.handle(request);
|
|
4618
|
-
}), catchError((error) => {
|
|
4619
|
-
this.monkeyecxErrorHandlingService.handleError(error);
|
|
4620
|
-
return throwError(error);
|
|
4621
|
-
}))) || throwError('getRequestWithHeadersOb undefined');
|
|
4648
|
+
return from(this.handle(request, next));
|
|
4622
4649
|
}
|
|
4623
4650
|
}
|
|
4624
|
-
MonkeyEcxHttpConfigHeaderInterceptor.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: MonkeyEcxHttpConfigHeaderInterceptor, deps: [{ token: MonkeyEcxAuthenticationService }, { token: MonkeyEcxErrorHandlingService }], target: i0.ɵɵFactoryTarget.Injectable });
|
|
4651
|
+
MonkeyEcxHttpConfigHeaderInterceptor.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: MonkeyEcxHttpConfigHeaderInterceptor, deps: [{ token: MonkeyEcxAuthenticationService }, { token: MonkeyEcxErrorHandlingService }, { token: MonkeyEcxConfigService }], target: i0.ɵɵFactoryTarget.Injectable });
|
|
4625
4652
|
MonkeyEcxHttpConfigHeaderInterceptor.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: MonkeyEcxHttpConfigHeaderInterceptor });
|
|
4626
4653
|
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: MonkeyEcxHttpConfigHeaderInterceptor, decorators: [{
|
|
4627
4654
|
type: Injectable
|
|
4628
|
-
}], ctorParameters: function () { return [{ type: MonkeyEcxAuthenticationService }, { type: MonkeyEcxErrorHandlingService }]; } });
|
|
4655
|
+
}], ctorParameters: function () { return [{ type: MonkeyEcxAuthenticationService }, { type: MonkeyEcxErrorHandlingService }, { type: MonkeyEcxConfigService }]; } });
|
|
4629
4656
|
|
|
4630
4657
|
/* eslint-disable max-len */
|
|
4631
4658
|
class MonkeyEcxHttpConfigQueueInterceptor {
|