monkey-front-core 0.0.197 → 0.0.200
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 +17 -28
- package/esm2020/lib/core/services/auth/monkeyecx-authentication.service.mjs +2 -1
- package/fesm2015/monkey-front-core.mjs +16 -26
- package/fesm2015/monkey-front-core.mjs.map +1 -1
- package/fesm2020/monkey-front-core.mjs +16 -26
- package/fesm2020/monkey-front-core.mjs.map +1 -1
- package/lib/core/interceptors/monkeyecx-http-config-header.interceptor.d.ts +0 -1
- package/lib/core/services/auth/monkeyecx-authentication.service.d.ts +1 -0
- package/monkey-front-core-0.0.200.tgz +0 -0
- package/package.json +1 -1
- package/monkey-front-core-0.0.197.tgz +0 -0
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { Injectable } from '@angular/core';
|
|
2
2
|
import { from, throwError } from 'rxjs';
|
|
3
|
-
import { catchError, map, mergeMap, take } from 'rxjs/operators';
|
|
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";
|
|
@@ -14,19 +14,28 @@ export class MonkeyEcxHttpConfigHeaderInterceptor {
|
|
|
14
14
|
}
|
|
15
15
|
async handle(request, next) {
|
|
16
16
|
const { url } = request;
|
|
17
|
+
console.log('====== 1');
|
|
17
18
|
if (this.authService.isTokenMandatory(url)) {
|
|
19
|
+
console.log('====== 2');
|
|
18
20
|
try {
|
|
19
|
-
|
|
21
|
+
console.log('====== 3');
|
|
22
|
+
const x = await this.config
|
|
20
23
|
.config()
|
|
21
|
-
.pipe(
|
|
24
|
+
.pipe(first((val) => {
|
|
25
|
+
console.log('====== 4');
|
|
26
|
+
console.log(val);
|
|
27
|
+
return !!val;
|
|
28
|
+
}))
|
|
22
29
|
.toPromise();
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
}
|
|
30
|
+
console.log('====== 5');
|
|
31
|
+
console.log(x);
|
|
26
32
|
}
|
|
27
|
-
catch (
|
|
33
|
+
catch (e) {
|
|
34
|
+
console.log('====== 6');
|
|
35
|
+
console.log(e);
|
|
28
36
|
// not to do
|
|
29
37
|
}
|
|
38
|
+
console.log('====== 7');
|
|
30
39
|
}
|
|
31
40
|
return this.authService
|
|
32
41
|
.getRequestWithHeadersOb(request)
|
|
@@ -43,26 +52,6 @@ export class MonkeyEcxHttpConfigHeaderInterceptor {
|
|
|
43
52
|
}))
|
|
44
53
|
.toPromise();
|
|
45
54
|
}
|
|
46
|
-
onValidateConfig() {
|
|
47
|
-
return new Promise((resolve) => {
|
|
48
|
-
let count = 0;
|
|
49
|
-
const interval = setInterval(async () => {
|
|
50
|
-
count += 1;
|
|
51
|
-
if (count > 20) {
|
|
52
|
-
clearInterval(interval);
|
|
53
|
-
resolve(null);
|
|
54
|
-
}
|
|
55
|
-
const config = await this.config
|
|
56
|
-
.config()
|
|
57
|
-
.pipe(take(1))
|
|
58
|
-
.toPromise();
|
|
59
|
-
if (config) {
|
|
60
|
-
clearInterval(interval);
|
|
61
|
-
resolve(null);
|
|
62
|
-
}
|
|
63
|
-
}, 200);
|
|
64
|
-
});
|
|
65
|
-
}
|
|
66
55
|
intercept(request, next) {
|
|
67
56
|
return from(this.handle(request, next));
|
|
68
57
|
}
|
|
@@ -72,4 +61,4 @@ MonkeyEcxHttpConfigHeaderInterceptor.ɵprov = i0.ɵɵngDeclareInjectable({ minVe
|
|
|
72
61
|
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: MonkeyEcxHttpConfigHeaderInterceptor, decorators: [{
|
|
73
62
|
type: Injectable
|
|
74
63
|
}], ctorParameters: function () { return [{ type: i1.MonkeyEcxAuthenticationService }, { type: i2.MonkeyEcxErrorHandlingService }, { type: i3.MonkeyEcxConfigService }]; } });
|
|
75
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
64
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibW9ua2V5ZWN4LWh0dHAtY29uZmlnLWhlYWRlci5pbnRlcmNlcHRvci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uL3Byb2plY3RzL21vbmtleS1mcm9udC1jb3JlL3NyYy9saWIvY29yZS9pbnRlcmNlcHRvcnMvbW9ua2V5ZWN4LWh0dHAtY29uZmlnLWhlYWRlci5pbnRlcmNlcHRvci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sZUFBZSxDQUFDO0FBUTNDLE9BQU8sRUFBRSxJQUFJLEVBQWMsVUFBVSxFQUFFLE1BQU0sTUFBTSxDQUFDO0FBQ3BELE9BQU8sRUFBRSxVQUFVLEVBQUUsS0FBSyxFQUFFLEdBQUcsRUFBRSxRQUFRLEVBQUUsSUFBSSxFQUFFLE1BQU0sZ0JBQWdCLENBQUM7Ozs7O0FBTXhFLE1BQU0sT0FBTyxvQ0FBb0M7SUFDL0MsWUFDVSxXQUEyQyxFQUMzQyxvQkFBbUQsRUFDbkQsTUFBOEI7UUFGOUIsZ0JBQVcsR0FBWCxXQUFXLENBQWdDO1FBQzNDLHlCQUFvQixHQUFwQixvQkFBb0IsQ0FBK0I7UUFDbkQsV0FBTSxHQUFOLE1BQU0sQ0FBd0I7UUFFdEMsWUFBWTtJQUNkLENBQUM7SUFFTyxLQUFLLENBQUMsTUFBTSxDQUFDLE9BQXlCLEVBQUUsSUFBaUI7UUFDL0QsTUFBTSxFQUFFLEdBQUcsRUFBRSxHQUFHLE9BQU8sQ0FBQztRQUV4QixPQUFPLENBQUMsR0FBRyxDQUFDLFVBQVUsQ0FBQyxDQUFDO1FBQ3hCLElBQUksSUFBSSxDQUFDLFdBQVcsQ0FBQyxnQkFBZ0IsQ0FBQyxHQUFHLENBQUMsRUFBRTtZQUMxQyxPQUFPLENBQUMsR0FBRyxDQUFDLFVBQVUsQ0FBQyxDQUFDO1lBQ3hCLElBQUk7Z0JBQ0YsT0FBTyxDQUFDLEdBQUcsQ0FBQyxVQUFVLENBQUMsQ0FBQztnQkFDeEIsTUFBTSxDQUFDLEdBQUcsTUFBTSxJQUFJLENBQUMsTUFBTTtxQkFDeEIsTUFBTSxFQUFFO3FCQUNSLElBQUksQ0FDSCxLQUFLLENBQUMsQ0FBQyxHQUFRLEVBQUUsRUFBRTtvQkFDakIsT0FBTyxDQUFDLEdBQUcsQ0FBQyxVQUFVLENBQUMsQ0FBQztvQkFDeEIsT0FBTyxDQUFDLEdBQUcsQ0FBQyxHQUFHLENBQUMsQ0FBQztvQkFDakIsT0FBTyxDQUFDLENBQUMsR0FBRyxDQUFDO2dCQUNmLENBQUMsQ0FBQyxDQUNIO3FCQUNBLFNBQVMsRUFBRSxDQUFDO2dCQUNmLE9BQU8sQ0FBQyxHQUFHLENBQUMsVUFBVSxDQUFDLENBQUM7Z0JBQ3hCLE9BQU8sQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDLENBQUM7YUFDaEI7WUFBQyxPQUFPLENBQUMsRUFBRTtnQkFDVixPQUFPLENBQUMsR0FBRyxDQUFDLFVBQVUsQ0FBQyxDQUFDO2dCQUN4QixPQUFPLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQyxDQUFDO2dCQUNmLFlBQVk7YUFDYjtZQUNELE9BQU8sQ0FBQyxHQUFHLENBQUMsVUFBVSxDQUFDLENBQUM7U0FDekI7UUFFRCxPQUFPLElBQUksQ0FBQyxXQUFXO2FBQ3BCLHVCQUF1QixDQUFDLE9BQU8sQ0FBQzthQUNoQyxJQUFJLENBQ0gsSUFBSSxDQUFDLENBQUMsQ0FBQyxFQUNQLEdBQUcsQ0FBQyxDQUFDLEtBQVUsRUFBRSxFQUFFO1lBQ2pCLE9BQU8sS0FBSyxDQUFDO1FBQ2YsQ0FBQyxDQUFDLEVBQ0YsUUFBUSxDQUFDLENBQUMsSUFBUyxFQUFFLEVBQUU7WUFDckIsT0FBTyxHQUFHLE9BQU8sQ0FBQyxLQUFLLENBQUM7Z0JBQ3RCLFVBQVUsRUFBRSxJQUFJO2FBQ2pCLENBQUMsQ0FBQztZQUNILE9BQU8sSUFBSSxDQUFDLE1BQU0sQ0FBQyxPQUFPLENBQUMsQ0FBQztRQUM5QixDQUFDLENBQUMsRUFDRixVQUFVLENBQUMsQ0FBQyxLQUF3QixFQUFFLEVBQUU7WUFDdEMsSUFBSSxDQUFDLG9CQUFvQixDQUFDLFdBQVcsQ0FBQyxLQUFLLENBQUMsQ0FBQztZQUM3QyxPQUFPLFVBQVUsQ0FBQyxLQUFLLENBQUMsQ0FBQztRQUMzQixDQUFDLENBQUMsQ0FDSDthQUNBLFNBQVMsRUFBRSxDQUFDO0lBQ2pCLENBQUM7SUFFRCxTQUFTLENBQUMsT0FBeUIsRUFBRSxJQUFpQjtRQUNwRCxPQUFPLElBQUksQ0FBQyxJQUFJLENBQUMsTUFBTSxDQUFDLE9BQU8sRUFBRSxJQUFJLENBQUMsQ0FBQyxDQUFDO0lBQzFDLENBQUM7O2lJQTVEVSxvQ0FBb0M7cUlBQXBDLG9DQUFvQzsyRkFBcEMsb0NBQW9DO2tCQURoRCxVQUFVIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgSW5qZWN0YWJsZSB9IGZyb20gJ0Bhbmd1bGFyL2NvcmUnO1xuaW1wb3J0IHtcbiAgSHR0cEVycm9yUmVzcG9uc2UsXG4gIEh0dHBFdmVudCxcbiAgSHR0cEhhbmRsZXIsXG4gIEh0dHBJbnRlcmNlcHRvcixcbiAgSHR0cFJlcXVlc3Rcbn0gZnJvbSAnQGFuZ3VsYXIvY29tbW9uL2h0dHAnO1xuaW1wb3J0IHsgZnJvbSwgT2JzZXJ2YWJsZSwgdGhyb3dFcnJvciB9IGZyb20gJ3J4anMnO1xuaW1wb3J0IHsgY2F0Y2hFcnJvciwgZmlyc3QsIG1hcCwgbWVyZ2VNYXAsIHRha2UgfSBmcm9tICdyeGpzL29wZXJhdG9ycyc7XG5pbXBvcnQgeyBNb25rZXlFY3hFcnJvckhhbmRsaW5nU2VydmljZSB9IGZyb20gJy4uL3NlcnZpY2VzL2Vycm9yJztcbmltcG9ydCB7IE1vbmtleUVjeEF1dGhlbnRpY2F0aW9uU2VydmljZSB9IGZyb20gJy4uL3NlcnZpY2VzL2F1dGgnO1xuaW1wb3J0IHsgTW9ua2V5RWN4Q29uZmlnU2VydmljZSB9IGZyb20gJy4uL3NlcnZpY2VzJztcblxuQEluamVjdGFibGUoKVxuZXhwb3J0IGNsYXNzIE1vbmtleUVjeEh0dHBDb25maWdIZWFkZXJJbnRlcmNlcHRvciBpbXBsZW1lbnRzIEh0dHBJbnRlcmNlcHRvciB7XG4gIGNvbnN0cnVjdG9yKFxuICAgIHByaXZhdGUgYXV0aFNlcnZpY2U6IE1vbmtleUVjeEF1dGhlbnRpY2F0aW9uU2VydmljZSxcbiAgICBwcml2YXRlIGVycm9ySGFuZGxpbmdTZXJ2aWNlOiBNb25rZXlFY3hFcnJvckhhbmRsaW5nU2VydmljZSxcbiAgICBwcml2YXRlIGNvbmZpZzogTW9ua2V5RWN4Q29uZmlnU2VydmljZVxuICApIHtcbiAgICAvLyBub3QgdG8gZG9cbiAgfVxuXG4gIHByaXZhdGUgYXN5bmMgaGFuZGxlKHJlcXVlc3Q6IEh0dHBSZXF1ZXN0PGFueT4sIG5leHQ6IEh0dHBIYW5kbGVyKSB7XG4gICAgY29uc3QgeyB1cmwgfSA9IHJlcXVlc3Q7XG5cbiAgICBjb25zb2xlLmxvZygnPT09PT09IDEnKTtcbiAgICBpZiAodGhpcy5hdXRoU2VydmljZS5pc1Rva2VuTWFuZGF0b3J5KHVybCkpIHtcbiAgICAgIGNvbnNvbGUubG9nKCc9PT09PT0gMicpO1xuICAgICAgdHJ5IHtcbiAgICAgICAgY29uc29sZS5sb2coJz09PT09PSAzJyk7XG4gICAgICAgIGNvbnN0IHggPSBhd2FpdCB0aGlzLmNvbmZpZ1xuICAgICAgICAgIC5jb25maWcoKVxuICAgICAgICAgIC5waXBlKFxuICAgICAgICAgICAgZmlyc3QoKHZhbDogYW55KSA9PiB7XG4gICAgICAgICAgICAgIGNvbnNvbGUubG9nKCc9PT09PT0gNCcpO1xuICAgICAgICAgICAgICBjb25zb2xlLmxvZyh2YWwpO1xuICAgICAgICAgICAgICByZXR1cm4gISF2YWw7XG4gICAgICAgICAgICB9KVxuICAgICAgICAgIClcbiAgICAgICAgICAudG9Qcm9taXNlKCk7XG4gICAgICAgIGNvbnNvbGUubG9nKCc9PT09PT0gNScpO1xuICAgICAgICBjb25zb2xlLmxvZyh4KTtcbiAgICAgIH0gY2F0Y2ggKGUpIHtcbiAgICAgICAgY29uc29sZS5sb2coJz09PT09PSA2Jyk7XG4gICAgICAgIGNvbnNvbGUubG9nKGUpO1xuICAgICAgICAvLyBub3QgdG8gZG9cbiAgICAgIH1cbiAgICAgIGNvbnNvbGUubG9nKCc9PT09PT0gNycpO1xuICAgIH1cblxuICAgIHJldHVybiB0aGlzLmF1dGhTZXJ2aWNlXG4gICAgICAuZ2V0UmVxdWVzdFdpdGhIZWFkZXJzT2IocmVxdWVzdClcbiAgICAgIC5waXBlKFxuICAgICAgICB0YWtlKDEpLFxuICAgICAgICBtYXAoKGV2ZW50OiBhbnkpID0+IHtcbiAgICAgICAgICByZXR1cm4gZXZlbnQ7XG4gICAgICAgIH0pLFxuICAgICAgICBtZXJnZU1hcCgocmVzcDogYW55KSA9PiB7XG4gICAgICAgICAgcmVxdWVzdCA9IHJlcXVlc3QuY2xvbmUoe1xuICAgICAgICAgICAgc2V0SGVhZGVyczogcmVzcFxuICAgICAgICAgIH0pO1xuICAgICAgICAgIHJldHVybiBuZXh0LmhhbmRsZShyZXF1ZXN0KTtcbiAgICAgICAgfSksXG4gICAgICAgIGNhdGNoRXJyb3IoKGVycm9yOiBIdHRwRXJyb3JSZXNwb25zZSkgPT4ge1xuICAgICAgICAgIHRoaXMuZXJyb3JIYW5kbGluZ1NlcnZpY2UuaGFuZGxlRXJyb3IoZXJyb3IpO1xuICAgICAgICAgIHJldHVybiB0aHJvd0Vycm9yKGVycm9yKTtcbiAgICAgICAgfSlcbiAgICAgIClcbiAgICAgIC50b1Byb21pc2UoKTtcbiAgfVxuXG4gIGludGVyY2VwdChyZXF1ZXN0OiBIdHRwUmVxdWVzdDxhbnk+LCBuZXh0OiBIdHRwSGFuZGxlcik6IE9ic2VydmFibGU8SHR0cEV2ZW50PGFueT4+IHtcbiAgICByZXR1cm4gZnJvbSh0aGlzLmhhbmRsZShyZXF1ZXN0LCBuZXh0KSk7XG4gIH1cbn1cbiJdfQ==
|
|
@@ -51,6 +51,7 @@ export class MonkeyEcxAuthenticationService {
|
|
|
51
51
|
this.redirectLoginWelcomeBack =
|
|
52
52
|
args?.redirectLoginWelcomeBack || this.redirectLoginWelcomeBack.bind(this);
|
|
53
53
|
this.isAuthorized = args?.isAuthorized || this.isAuthorized.bind(this);
|
|
54
|
+
this.isTokenMandatory = args?.isTokenMandatory || this.isTokenMandatory.bind(this);
|
|
54
55
|
this.isCompanyAuthorized = args?.isCompanyAuthorized || this.isCompanyAuthorized.bind(this);
|
|
55
56
|
this.getRequestWithHeaders =
|
|
56
57
|
args?.getRequestWithHeaders || this.getRequestWithHeaders.bind(this);
|
|
@@ -65,4 +66,4 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.1.1", ngImpor
|
|
|
65
66
|
type: Injectable,
|
|
66
67
|
args: [{ providedIn: 'root' }]
|
|
67
68
|
}], ctorParameters: function () { return []; } });
|
|
68
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
69
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibW9ua2V5ZWN4LWF1dGhlbnRpY2F0aW9uLnNlcnZpY2UuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi8uLi9wcm9qZWN0cy9tb25rZXktZnJvbnQtY29yZS9zcmMvbGliL2NvcmUvc2VydmljZXMvYXV0aC9tb25rZXllY3gtYXV0aGVudGljYXRpb24uc2VydmljZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSwrQkFBK0I7QUFDL0IsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLGVBQWUsQ0FBQzs7QUFLM0MsTUFBTSxPQUFPLDhCQUE4QjtJQUN6QztRQUlBLHVCQUFrQixHQUFHLEdBQUcsRUFBRTtZQUN4QixPQUFPLENBQUMsS0FBSyxDQUFDLDBDQUEwQyxDQUFDLENBQUM7WUFDMUQsT0FBTyxJQUFJLENBQUM7UUFDZCxDQUFDLENBQUM7UUFFRixnQkFBVyxHQUFHLEdBQUcsRUFBRTtZQUNqQixPQUFPLENBQUMsS0FBSyxDQUFDLG1DQUFtQyxDQUFDLENBQUM7WUFDbkQsT0FBTyxJQUFJLENBQUM7UUFDZCxDQUFDLENBQUM7UUFFRiw2QkFBd0IsR0FBRyxHQUFHLEVBQUU7WUFDOUIsT0FBTyxDQUFDLEtBQUssQ0FBQyxnREFBZ0QsQ0FBQyxDQUFDO1lBQ2hFLE9BQU8sSUFBSSxDQUFDO1FBQ2QsQ0FBQyxDQUFDO1FBRUYsaUJBQVksR0FBRyxHQUFZLEVBQUU7WUFDM0IsT0FBTyxDQUFDLEtBQUssQ0FBQyxvQ0FBb0MsQ0FBQyxDQUFDO1lBQ3BELE9BQU8sS0FBSyxDQUFDO1FBQ2YsQ0FBQyxDQUFDO1FBRUYsd0JBQW1CLEdBQUcsR0FBWSxFQUFFO1lBQ2xDLE9BQU8sQ0FBQyxLQUFLLENBQUMsMkNBQTJDLENBQUMsQ0FBQztZQUMzRCxPQUFPLEtBQUssQ0FBQztRQUNmLENBQUMsQ0FBQztRQUVGLHFCQUFnQixHQUFHLENBQUMsR0FBVyxFQUFXLEVBQUU7WUFDMUMsT0FBTyxDQUFDLEtBQUssQ0FBQyx3Q0FBd0MsQ0FBQyxDQUFDO1lBQ3hELE9BQU8sS0FBSyxDQUFDO1FBQ2YsQ0FBQyxDQUFDO1FBRUYsMEJBQXFCLEdBQUcsQ0FBQyxPQUF5QixFQUEwQixFQUFFO1lBQzVFLE9BQU8sQ0FBQyxLQUFLLENBQUMsNkNBQTZDLENBQUMsQ0FBQztZQUM3RCxPQUFPLElBQUksQ0FBQztRQUNkLENBQUMsQ0FBQztRQUVGLDRCQUF1QixHQUFHLENBQUMsT0FBeUIsRUFBeUIsRUFBRTtZQUM3RSxPQUFPLENBQUMsS0FBSyxDQUFDLCtDQUErQyxDQUFDLENBQUM7WUFDL0QsT0FBTyxJQUFJLENBQUM7UUFDZCxDQUFDLENBQUM7UUFFRix3QkFBbUIsR0FBRyxDQUFDLFFBQTJCLEVBQVcsRUFBRTtZQUM3RCxPQUFPLENBQUMsS0FBSyxDQUFDLDJDQUEyQyxDQUFDLENBQUM7WUFDM0QsT0FBTyxLQUFLLENBQUM7UUFDZixDQUFDLENBQUM7UUFFRixpQkFBWSxHQUFHLEdBQTJCLEVBQUU7WUFDMUMsT0FBTyxDQUFDLEtBQUssQ0FBQyxvQ0FBb0MsQ0FBQyxDQUFDO1lBQ3BELE9BQU8sSUFBSSxDQUFDO1FBQ2QsQ0FBQyxDQUFDO1FBbkRBLFlBQVk7SUFDZCxDQUFDO0lBb0RELElBQUksQ0FBQyxJQVdKO1FBQ0MsSUFBSSxDQUFDLGtCQUFrQixHQUFHLElBQUksRUFBRSxrQkFBa0IsSUFBSSxJQUFJLENBQUMsa0JBQWtCLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxDQUFDO1FBQ3pGLElBQUksQ0FBQyxXQUFXLEdBQUcsSUFBSSxFQUFFLFdBQVcsSUFBSSxJQUFJLENBQUMsV0FBVyxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsQ0FBQztRQUNwRSxJQUFJLENBQUMsd0JBQXdCO1lBQzNCLElBQUksRUFBRSx3QkFBd0IsSUFBSSxJQUFJLENBQUMsd0JBQXdCLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxDQUFDO1FBQzdFLElBQUksQ0FBQyxZQUFZLEdBQUcsSUFBSSxFQUFFLFlBQVksSUFBSSxJQUFJLENBQUMsWUFBWSxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsQ0FBQztRQUN2RSxJQUFJLENBQUMsZ0JBQWdCLEdBQUcsSUFBSSxFQUFFLGdCQUFnQixJQUFJLElBQUksQ0FBQyxnQkFBZ0IsQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLENBQUM7UUFDbkYsSUFBSSxDQUFDLG1CQUFtQixHQUFHLElBQUksRUFBRSxtQkFBbUIsSUFBSSxJQUFJLENBQUMsbUJBQW1CLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxDQUFDO1FBQzVGLElBQUksQ0FBQyxxQkFBcUI7WUFDeEIsSUFBSSxFQUFFLHFCQUFxQixJQUFJLElBQUksQ0FBQyxxQkFBcUIsQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLENBQUM7UUFDdkUsSUFBSSxDQUFDLHVCQUF1QixHQUFHLElBQUksRUFBRSx1QkFBdUIsQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLENBQUM7UUFDeEUsSUFBSSxDQUFDLG1CQUFtQixHQUFHLElBQUksRUFBRSxtQkFBbUIsSUFBSSxJQUFJLENBQUMsbUJBQW1CLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxDQUFDO1FBQzVGLElBQUksQ0FBQyxZQUFZLEdBQUcsSUFBSSxFQUFFLFlBQVksSUFBSSxJQUFJLENBQUMsWUFBWSxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsQ0FBQztJQUN6RSxDQUFDOzsySEEvRVUsOEJBQThCOytIQUE5Qiw4QkFBOEIsY0FEakIsTUFBTTsyRkFDbkIsOEJBQThCO2tCQUQxQyxVQUFVO21CQUFDLEVBQUUsVUFBVSxFQUFFLE1BQU0sRUFBRSIsInNvdXJjZXNDb250ZW50IjpbIi8qIGVzbGludC1kaXNhYmxlIG5vLWNvbnNvbGUgKi9cbmltcG9ydCB7IEluamVjdGFibGUgfSBmcm9tICdAYW5ndWxhci9jb3JlJztcbmltcG9ydCB7IE9ic2VydmFibGUgfSBmcm9tICdyeGpzJztcbmltcG9ydCB7IEh0dHBFcnJvclJlc3BvbnNlLCBIdHRwUmVxdWVzdCB9IGZyb20gJ0Bhbmd1bGFyL2NvbW1vbi9odHRwJztcblxuQEluamVjdGFibGUoeyBwcm92aWRlZEluOiAncm9vdCcgfSlcbmV4cG9ydCBjbGFzcyBNb25rZXlFY3hBdXRoZW50aWNhdGlvblNlcnZpY2Uge1xuICBjb25zdHJ1Y3RvcigpIHtcbiAgICAvLyBub3QgdG8gZG9cbiAgfVxuXG4gIGhhZEF0TGVhc3RPbmVMb2dpbiA9ICgpID0+IHtcbiAgICBjb25zb2xlLmVycm9yKCdoYWRBdExlYXN0T25lTG9naW4gbmVlZHMgdG8gYmUgZGVjbGFyZWQhJyk7XG4gICAgcmV0dXJuIG51bGw7XG4gIH07XG5cbiAgcmVkaXJlY3RBcHAgPSAoKSA9PiB7XG4gICAgY29uc29sZS5lcnJvcigncmVkaXJlY3RBcHAgbmVlZHMgdG8gYmUgZGVjbGFyZWQhJyk7XG4gICAgcmV0dXJuIG51bGw7XG4gIH07XG5cbiAgcmVkaXJlY3RMb2dpbldlbGNvbWVCYWNrID0gKCkgPT4ge1xuICAgIGNvbnNvbGUuZXJyb3IoJ3JlZGlyZWN0TG9naW5XZWxjb21lQmFjayBuZWVkcyB0byBiZSBkZWNsYXJlZCEnKTtcbiAgICByZXR1cm4gbnVsbDtcbiAgfTtcblxuICBpc0F1dGhvcml6ZWQgPSAoKTogYm9vbGVhbiA9PiB7XG4gICAgY29uc29sZS5lcnJvcignaXNBdXRob3JpemVkIG5lZWRzIHRvIGJlIGRlY2xhcmVkIScpO1xuICAgIHJldHVybiBmYWxzZTtcbiAgfTtcblxuICBpc0NvbXBhbnlBdXRob3JpemVkID0gKCk6IGJvb2xlYW4gPT4ge1xuICAgIGNvbnNvbGUuZXJyb3IoJ2lzQ29tcGFueUF1dGhvcml6ZWQgbmVlZHMgdG8gYmUgZGVjbGFyZWQhJyk7XG4gICAgcmV0dXJuIGZhbHNlO1xuICB9O1xuXG4gIGlzVG9rZW5NYW5kYXRvcnkgPSAodXJsOiBzdHJpbmcpOiBib29sZWFuID0+IHtcbiAgICBjb25zb2xlLmVycm9yKCdpc1Rva2VuTWFuZGF0b3J5IG5lZWRzIHRvIGJlIGRlY2xhcmVkIScpO1xuICAgIHJldHVybiBmYWxzZTtcbiAgfTtcblxuICBnZXRSZXF1ZXN0V2l0aEhlYWRlcnMgPSAocmVxdWVzdDogSHR0cFJlcXVlc3Q8YW55Pik6IEh0dHBSZXF1ZXN0PGFueT4gfCBhbnkgPT4ge1xuICAgIGNvbnNvbGUuZXJyb3IoJ2dldFJlcXVlc3RXaXRoSGVhZGVycyBuZWVkcyB0byBiZSBkZWNsYXJlZCEnKTtcbiAgICByZXR1cm4gbnVsbDtcbiAgfTtcblxuICBnZXRSZXF1ZXN0V2l0aEhlYWRlcnNPYiA9IChyZXF1ZXN0OiBIdHRwUmVxdWVzdDxhbnk+KTogT2JzZXJ2YWJsZTxhbnk+IHwgYW55ID0+IHtcbiAgICBjb25zb2xlLmVycm9yKCdnZXRSZXF1ZXN0V2l0aEhlYWRlcnNPYiBuZWVkcyB0byBiZSBkZWNsYXJlZCEnKTtcbiAgICByZXR1cm4gbnVsbDtcbiAgfTtcblxuICByZWZyZXNoU2hvdWxkSGFwcGVuID0gKHJlc3BvbnNlOiBIdHRwRXJyb3JSZXNwb25zZSk6IGJvb2xlYW4gPT4ge1xuICAgIGNvbnNvbGUuZXJyb3IoJ3JlZnJlc2hTaG91bGRIYXBwZW4gbmVlZHMgdG8gYmUgZGVjbGFyZWQhJyk7XG4gICAgcmV0dXJuIGZhbHNlO1xuICB9O1xuXG4gIHJlZnJlc2hUb2tlbiA9ICgpOiBPYnNlcnZhYmxlPGFueT4gfCBudWxsID0+IHtcbiAgICBjb25zb2xlLmVycm9yKCdyZWZyZXNoVG9rZW4gbmVlZHMgdG8gYmUgZGVjbGFyZWQhJyk7XG4gICAgcmV0dXJuIG51bGw7XG4gIH07XG5cbiAgaW5pdChhcmdzOiB7XG4gICAgaGFkQXRMZWFzdE9uZUxvZ2luPzogYW55O1xuICAgIHJlZGlyZWN0QXBwPzogYW55O1xuICAgIHJlZGlyZWN0TG9naW5XZWxjb21lQmFjaz86IGFueTtcbiAgICBpc0F1dGhvcml6ZWQ/OiBhbnk7XG4gICAgaXNUb2tlbk1hbmRhdG9yeT86IGFueTtcbiAgICBpc0NvbXBhbnlBdXRob3JpemVkPzogYW55O1xuICAgIGdldFJlcXVlc3RXaXRoSGVhZGVycz86IGFueTtcbiAgICBnZXRSZXF1ZXN0V2l0aEhlYWRlcnNPYj86IGFueTtcbiAgICByZWZyZXNoU2hvdWxkSGFwcGVuPzogYW55O1xuICAgIHJlZnJlc2hUb2tlbj86IGFueTtcbiAgfSkge1xuICAgIHRoaXMuaGFkQXRMZWFzdE9uZUxvZ2luID0gYXJncz8uaGFkQXRMZWFzdE9uZUxvZ2luIHx8IHRoaXMuaGFkQXRMZWFzdE9uZUxvZ2luLmJpbmQodGhpcyk7XG4gICAgdGhpcy5yZWRpcmVjdEFwcCA9IGFyZ3M/LnJlZGlyZWN0QXBwIHx8IHRoaXMucmVkaXJlY3RBcHAuYmluZCh0aGlzKTtcbiAgICB0aGlzLnJlZGlyZWN0TG9naW5XZWxjb21lQmFjayA9XG4gICAgICBhcmdzPy5yZWRpcmVjdExvZ2luV2VsY29tZUJhY2sgfHwgdGhpcy5yZWRpcmVjdExvZ2luV2VsY29tZUJhY2suYmluZCh0aGlzKTtcbiAgICB0aGlzLmlzQXV0aG9yaXplZCA9IGFyZ3M/LmlzQXV0aG9yaXplZCB8fCB0aGlzLmlzQXV0aG9yaXplZC5iaW5kKHRoaXMpO1xuICAgIHRoaXMuaXNUb2tlbk1hbmRhdG9yeSA9IGFyZ3M/LmlzVG9rZW5NYW5kYXRvcnkgfHwgdGhpcy5pc1Rva2VuTWFuZGF0b3J5LmJpbmQodGhpcyk7XG4gICAgdGhpcy5pc0NvbXBhbnlBdXRob3JpemVkID0gYXJncz8uaXNDb21wYW55QXV0aG9yaXplZCB8fCB0aGlzLmlzQ29tcGFueUF1dGhvcml6ZWQuYmluZCh0aGlzKTtcbiAgICB0aGlzLmdldFJlcXVlc3RXaXRoSGVhZGVycyA9XG4gICAgICBhcmdzPy5nZXRSZXF1ZXN0V2l0aEhlYWRlcnMgfHwgdGhpcy5nZXRSZXF1ZXN0V2l0aEhlYWRlcnMuYmluZCh0aGlzKTtcbiAgICB0aGlzLmdldFJlcXVlc3RXaXRoSGVhZGVyc09iID0gYXJncz8uZ2V0UmVxdWVzdFdpdGhIZWFkZXJzT2IuYmluZCh0aGlzKTtcbiAgICB0aGlzLnJlZnJlc2hTaG91bGRIYXBwZW4gPSBhcmdzPy5yZWZyZXNoU2hvdWxkSGFwcGVuIHx8IHRoaXMucmVmcmVzaFNob3VsZEhhcHBlbi5iaW5kKHRoaXMpO1xuICAgIHRoaXMucmVmcmVzaFRva2VuID0gYXJncz8ucmVmcmVzaFRva2VuIHx8IHRoaXMucmVmcmVzaFRva2VuLmJpbmQodGhpcyk7XG4gIH1cbn1cbiJdfQ==
|
|
@@ -3495,6 +3495,7 @@ class MonkeyEcxAuthenticationService {
|
|
|
3495
3495
|
this.redirectLoginWelcomeBack =
|
|
3496
3496
|
(args === null || args === void 0 ? void 0 : args.redirectLoginWelcomeBack) || this.redirectLoginWelcomeBack.bind(this);
|
|
3497
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);
|
|
3498
3499
|
this.isCompanyAuthorized = (args === null || args === void 0 ? void 0 : args.isCompanyAuthorized) || this.isCompanyAuthorized.bind(this);
|
|
3499
3500
|
this.getRequestWithHeaders =
|
|
3500
3501
|
(args === null || args === void 0 ? void 0 : args.getRequestWithHeaders) || this.getRequestWithHeaders.bind(this);
|
|
@@ -4614,19 +4615,28 @@ class MonkeyEcxHttpConfigHeaderInterceptor {
|
|
|
4614
4615
|
handle(request, next) {
|
|
4615
4616
|
return __awaiter(this, void 0, void 0, function* () {
|
|
4616
4617
|
const { url } = request;
|
|
4618
|
+
console.log('====== 1');
|
|
4617
4619
|
if (this.authService.isTokenMandatory(url)) {
|
|
4620
|
+
console.log('====== 2');
|
|
4618
4621
|
try {
|
|
4619
|
-
|
|
4622
|
+
console.log('====== 3');
|
|
4623
|
+
const x = yield this.config
|
|
4620
4624
|
.config()
|
|
4621
|
-
.pipe(
|
|
4625
|
+
.pipe(first((val) => {
|
|
4626
|
+
console.log('====== 4');
|
|
4627
|
+
console.log(val);
|
|
4628
|
+
return !!val;
|
|
4629
|
+
}))
|
|
4622
4630
|
.toPromise();
|
|
4623
|
-
|
|
4624
|
-
|
|
4625
|
-
}
|
|
4631
|
+
console.log('====== 5');
|
|
4632
|
+
console.log(x);
|
|
4626
4633
|
}
|
|
4627
|
-
catch (
|
|
4634
|
+
catch (e) {
|
|
4635
|
+
console.log('====== 6');
|
|
4636
|
+
console.log(e);
|
|
4628
4637
|
// not to do
|
|
4629
4638
|
}
|
|
4639
|
+
console.log('====== 7');
|
|
4630
4640
|
}
|
|
4631
4641
|
return this.authService
|
|
4632
4642
|
.getRequestWithHeadersOb(request)
|
|
@@ -4644,26 +4654,6 @@ class MonkeyEcxHttpConfigHeaderInterceptor {
|
|
|
4644
4654
|
.toPromise();
|
|
4645
4655
|
});
|
|
4646
4656
|
}
|
|
4647
|
-
onValidateConfig() {
|
|
4648
|
-
return new Promise((resolve) => {
|
|
4649
|
-
let count = 0;
|
|
4650
|
-
const interval = setInterval(() => __awaiter(this, void 0, void 0, function* () {
|
|
4651
|
-
count += 1;
|
|
4652
|
-
if (count > 20) {
|
|
4653
|
-
clearInterval(interval);
|
|
4654
|
-
resolve(null);
|
|
4655
|
-
}
|
|
4656
|
-
const config = yield this.config
|
|
4657
|
-
.config()
|
|
4658
|
-
.pipe(take(1))
|
|
4659
|
-
.toPromise();
|
|
4660
|
-
if (config) {
|
|
4661
|
-
clearInterval(interval);
|
|
4662
|
-
resolve(null);
|
|
4663
|
-
}
|
|
4664
|
-
}), 200);
|
|
4665
|
-
});
|
|
4666
|
-
}
|
|
4667
4657
|
intercept(request, next) {
|
|
4668
4658
|
return from(this.handle(request, next));
|
|
4669
4659
|
}
|