monkey-front-core 0.0.198 → 0.0.201
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/fesm2015/monkey-front-core.mjs +15 -26
- package/fesm2015/monkey-front-core.mjs.map +1 -1
- package/fesm2020/monkey-front-core.mjs +15 -26
- package/fesm2020/monkey-front-core.mjs.map +1 -1
- package/lib/core/interceptors/monkeyecx-http-config-header.interceptor.d.ts +0 -1
- package/monkey-front-core-0.0.201.tgz +0 -0
- package/package.json +1 -1
- package/monkey-front-core-0.0.198.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 && JSON.stringify(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,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibW9ua2V5ZWN4LWh0dHAtY29uZmlnLWhlYWRlci5pbnRlcmNlcHRvci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uL3Byb2plY3RzL21vbmtleS1mcm9udC1jb3JlL3NyYy9saWIvY29yZS9pbnRlcmNlcHRvcnMvbW9ua2V5ZWN4LWh0dHAtY29uZmlnLWhlYWRlci5pbnRlcmNlcHRvci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sZUFBZSxDQUFDO0FBUTNDLE9BQU8sRUFBRSxJQUFJLEVBQWMsVUFBVSxFQUFFLE1BQU0sTUFBTSxDQUFDO0FBQ3BELE9BQU8sRUFBRSxVQUFVLEVBQUUsS0FBSyxFQUFFLEdBQUcsRUFBRSxRQUFRLEVBQUUsSUFBSSxFQUFFLE1BQU0sZ0JBQWdCLENBQUM7Ozs7O0FBTXhFLE1BQU0sT0FBTyxvQ0FBb0M7SUFDL0MsWUFDVSxXQUEyQyxFQUMzQyxvQkFBbUQsRUFDbkQsTUFBOEI7UUFGOUIsZ0JBQVcsR0FBWCxXQUFXLENBQWdDO1FBQzNDLHlCQUFvQixHQUFwQixvQkFBb0IsQ0FBK0I7UUFDbkQsV0FBTSxHQUFOLE1BQU0sQ0FBd0I7UUFFdEMsWUFBWTtJQUNkLENBQUM7SUFFTyxLQUFLLENBQUMsTUFBTSxDQUFDLE9BQXlCLEVBQUUsSUFBaUI7UUFDL0QsTUFBTSxFQUFFLEdBQUcsRUFBRSxHQUFHLE9BQU8sQ0FBQztRQUV4QixPQUFPLENBQUMsR0FBRyxDQUFDLFVBQVUsQ0FBQyxDQUFDO1FBQ3hCLElBQUksSUFBSSxDQUFDLFdBQVcsQ0FBQyxnQkFBZ0IsQ0FBQyxHQUFHLENBQUMsRUFBRTtZQUMxQyxPQUFPLENBQUMsR0FBRyxDQUFDLFVBQVUsQ0FBQyxDQUFDO1lBQ3hCLElBQUk7Z0JBQ0YsT0FBTyxDQUFDLEdBQUcsQ0FBQyxVQUFVLENBQUMsQ0FBQztnQkFDeEIsTUFBTSxDQUFDLEdBQUcsTUFBTSxJQUFJLENBQUMsTUFBTTtxQkFDeEIsTUFBTSxFQUFFO3FCQUNSLElBQUksQ0FDSCxLQUFLLENBQUMsQ0FBQyxHQUFRLEVBQUUsRUFBRTtvQkFDakIsT0FBTyxDQUFDLEdBQUcsQ0FBQyxVQUFVLENBQUMsQ0FBQztvQkFDeEIsT0FBTyxDQUFDLEdBQUcsQ0FBQyxHQUFHLENBQUMsQ0FBQztvQkFDakIsT0FBTyxDQUFDLENBQUMsR0FBRyxJQUFJLElBQUksQ0FBQyxTQUFTLENBQUMsR0FBRyxDQUFDLEtBQUssSUFBSSxDQUFDO2dCQUMvQyxDQUFDLENBQUMsQ0FDSDtxQkFDQSxTQUFTLEVBQUUsQ0FBQztnQkFDZixPQUFPLENBQUMsR0FBRyxDQUFDLFVBQVUsQ0FBQyxDQUFDO2dCQUN4QixPQUFPLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQyxDQUFDO2FBQ2hCO1lBQUMsT0FBTyxDQUFDLEVBQUU7Z0JBQ1YsT0FBTyxDQUFDLEdBQUcsQ0FBQyxVQUFVLENBQUMsQ0FBQztnQkFDeEIsT0FBTyxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUMsQ0FBQztnQkFDZixZQUFZO2FBQ2I7WUFDRCxPQUFPLENBQUMsR0FBRyxDQUFDLFVBQVUsQ0FBQyxDQUFDO1NBQ3pCO1FBRUQsT0FBTyxJQUFJLENBQUMsV0FBVzthQUNwQix1QkFBdUIsQ0FBQyxPQUFPLENBQUM7YUFDaEMsSUFBSSxDQUNILElBQUksQ0FBQyxDQUFDLENBQUMsRUFDUCxHQUFHLENBQUMsQ0FBQyxLQUFVLEVBQUUsRUFBRTtZQUNqQixPQUFPLEtBQUssQ0FBQztRQUNmLENBQUMsQ0FBQyxFQUNGLFFBQVEsQ0FBQyxDQUFDLElBQVMsRUFBRSxFQUFFO1lBQ3JCLE9BQU8sR0FBRyxPQUFPLENBQUMsS0FBSyxDQUFDO2dCQUN0QixVQUFVLEVBQUUsSUFBSTthQUNqQixDQUFDLENBQUM7WUFDSCxPQUFPLElBQUksQ0FBQyxNQUFNLENBQUMsT0FBTyxDQUFDLENBQUM7UUFDOUIsQ0FBQyxDQUFDLEVBQ0YsVUFBVSxDQUFDLENBQUMsS0FBd0IsRUFBRSxFQUFFO1lBQ3RDLElBQUksQ0FBQyxvQkFBb0IsQ0FBQyxXQUFXLENBQUMsS0FBSyxDQUFDLENBQUM7WUFDN0MsT0FBTyxVQUFVLENBQUMsS0FBSyxDQUFDLENBQUM7UUFDM0IsQ0FBQyxDQUFDLENBQ0g7YUFDQSxTQUFTLEVBQUUsQ0FBQztJQUNqQixDQUFDO0lBRUQsU0FBUyxDQUFDLE9BQXlCLEVBQUUsSUFBaUI7UUFDcEQsT0FBTyxJQUFJLENBQUMsSUFBSSxDQUFDLE1BQU0sQ0FBQyxPQUFPLEVBQUUsSUFBSSxDQUFDLENBQUMsQ0FBQztJQUMxQyxDQUFDOztpSUE1RFUsb0NBQW9DO3FJQUFwQyxvQ0FBb0M7MkZBQXBDLG9DQUFvQztrQkFEaEQsVUFBVSIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IEluamVjdGFibGUgfSBmcm9tICdAYW5ndWxhci9jb3JlJztcbmltcG9ydCB7XG4gIEh0dHBFcnJvclJlc3BvbnNlLFxuICBIdHRwRXZlbnQsXG4gIEh0dHBIYW5kbGVyLFxuICBIdHRwSW50ZXJjZXB0b3IsXG4gIEh0dHBSZXF1ZXN0XG59IGZyb20gJ0Bhbmd1bGFyL2NvbW1vbi9odHRwJztcbmltcG9ydCB7IGZyb20sIE9ic2VydmFibGUsIHRocm93RXJyb3IgfSBmcm9tICdyeGpzJztcbmltcG9ydCB7IGNhdGNoRXJyb3IsIGZpcnN0LCBtYXAsIG1lcmdlTWFwLCB0YWtlIH0gZnJvbSAncnhqcy9vcGVyYXRvcnMnO1xuaW1wb3J0IHsgTW9ua2V5RWN4RXJyb3JIYW5kbGluZ1NlcnZpY2UgfSBmcm9tICcuLi9zZXJ2aWNlcy9lcnJvcic7XG5pbXBvcnQgeyBNb25rZXlFY3hBdXRoZW50aWNhdGlvblNlcnZpY2UgfSBmcm9tICcuLi9zZXJ2aWNlcy9hdXRoJztcbmltcG9ydCB7IE1vbmtleUVjeENvbmZpZ1NlcnZpY2UgfSBmcm9tICcuLi9zZXJ2aWNlcyc7XG5cbkBJbmplY3RhYmxlKClcbmV4cG9ydCBjbGFzcyBNb25rZXlFY3hIdHRwQ29uZmlnSGVhZGVySW50ZXJjZXB0b3IgaW1wbGVtZW50cyBIdHRwSW50ZXJjZXB0b3Ige1xuICBjb25zdHJ1Y3RvcihcbiAgICBwcml2YXRlIGF1dGhTZXJ2aWNlOiBNb25rZXlFY3hBdXRoZW50aWNhdGlvblNlcnZpY2UsXG4gICAgcHJpdmF0ZSBlcnJvckhhbmRsaW5nU2VydmljZTogTW9ua2V5RWN4RXJyb3JIYW5kbGluZ1NlcnZpY2UsXG4gICAgcHJpdmF0ZSBjb25maWc6IE1vbmtleUVjeENvbmZpZ1NlcnZpY2VcbiAgKSB7XG4gICAgLy8gbm90IHRvIGRvXG4gIH1cblxuICBwcml2YXRlIGFzeW5jIGhhbmRsZShyZXF1ZXN0OiBIdHRwUmVxdWVzdDxhbnk+LCBuZXh0OiBIdHRwSGFuZGxlcikge1xuICAgIGNvbnN0IHsgdXJsIH0gPSByZXF1ZXN0O1xuXG4gICAgY29uc29sZS5sb2coJz09PT09PSAxJyk7XG4gICAgaWYgKHRoaXMuYXV0aFNlcnZpY2UuaXNUb2tlbk1hbmRhdG9yeSh1cmwpKSB7XG4gICAgICBjb25zb2xlLmxvZygnPT09PT09IDInKTtcbiAgICAgIHRyeSB7XG4gICAgICAgIGNvbnNvbGUubG9nKCc9PT09PT0gMycpO1xuICAgICAgICBjb25zdCB4ID0gYXdhaXQgdGhpcy5jb25maWdcbiAgICAgICAgICAuY29uZmlnKClcbiAgICAgICAgICAucGlwZShcbiAgICAgICAgICAgIGZpcnN0KCh2YWw6IGFueSkgPT4ge1xuICAgICAgICAgICAgICBjb25zb2xlLmxvZygnPT09PT09IDQnKTtcbiAgICAgICAgICAgICAgY29uc29sZS5sb2codmFsKTtcbiAgICAgICAgICAgICAgcmV0dXJuICEhdmFsICYmIEpTT04uc3RyaW5naWZ5KHZhbCkgIT09ICd7fSc7XG4gICAgICAgICAgICB9KVxuICAgICAgICAgIClcbiAgICAgICAgICAudG9Qcm9taXNlKCk7XG4gICAgICAgIGNvbnNvbGUubG9nKCc9PT09PT0gNScpO1xuICAgICAgICBjb25zb2xlLmxvZyh4KTtcbiAgICAgIH0gY2F0Y2ggKGUpIHtcbiAgICAgICAgY29uc29sZS5sb2coJz09PT09PSA2Jyk7XG4gICAgICAgIGNvbnNvbGUubG9nKGUpO1xuICAgICAgICAvLyBub3QgdG8gZG9cbiAgICAgIH1cbiAgICAgIGNvbnNvbGUubG9nKCc9PT09PT0gNycpO1xuICAgIH1cblxuICAgIHJldHVybiB0aGlzLmF1dGhTZXJ2aWNlXG4gICAgICAuZ2V0UmVxdWVzdFdpdGhIZWFkZXJzT2IocmVxdWVzdClcbiAgICAgIC5waXBlKFxuICAgICAgICB0YWtlKDEpLFxuICAgICAgICBtYXAoKGV2ZW50OiBhbnkpID0+IHtcbiAgICAgICAgICByZXR1cm4gZXZlbnQ7XG4gICAgICAgIH0pLFxuICAgICAgICBtZXJnZU1hcCgocmVzcDogYW55KSA9PiB7XG4gICAgICAgICAgcmVxdWVzdCA9IHJlcXVlc3QuY2xvbmUoe1xuICAgICAgICAgICAgc2V0SGVhZGVyczogcmVzcFxuICAgICAgICAgIH0pO1xuICAgICAgICAgIHJldHVybiBuZXh0LmhhbmRsZShyZXF1ZXN0KTtcbiAgICAgICAgfSksXG4gICAgICAgIGNhdGNoRXJyb3IoKGVycm9yOiBIdHRwRXJyb3JSZXNwb25zZSkgPT4ge1xuICAgICAgICAgIHRoaXMuZXJyb3JIYW5kbGluZ1NlcnZpY2UuaGFuZGxlRXJyb3IoZXJyb3IpO1xuICAgICAgICAgIHJldHVybiB0aHJvd0Vycm9yKGVycm9yKTtcbiAgICAgICAgfSlcbiAgICAgIClcbiAgICAgIC50b1Byb21pc2UoKTtcbiAgfVxuXG4gIGludGVyY2VwdChyZXF1ZXN0OiBIdHRwUmVxdWVzdDxhbnk+LCBuZXh0OiBIdHRwSGFuZGxlcik6IE9ic2VydmFibGU8SHR0cEV2ZW50PGFueT4+IHtcbiAgICByZXR1cm4gZnJvbSh0aGlzLmhhbmRsZShyZXF1ZXN0LCBuZXh0KSk7XG4gIH1cbn1cbiJdfQ==
|
|
@@ -4615,19 +4615,28 @@ class MonkeyEcxHttpConfigHeaderInterceptor {
|
|
|
4615
4615
|
handle(request, next) {
|
|
4616
4616
|
return __awaiter(this, void 0, void 0, function* () {
|
|
4617
4617
|
const { url } = request;
|
|
4618
|
+
console.log('====== 1');
|
|
4618
4619
|
if (this.authService.isTokenMandatory(url)) {
|
|
4620
|
+
console.log('====== 2');
|
|
4619
4621
|
try {
|
|
4620
|
-
|
|
4622
|
+
console.log('====== 3');
|
|
4623
|
+
const x = yield this.config
|
|
4621
4624
|
.config()
|
|
4622
|
-
.pipe(
|
|
4625
|
+
.pipe(first((val) => {
|
|
4626
|
+
console.log('====== 4');
|
|
4627
|
+
console.log(val);
|
|
4628
|
+
return !!val && JSON.stringify(val) !== '{}';
|
|
4629
|
+
}))
|
|
4623
4630
|
.toPromise();
|
|
4624
|
-
|
|
4625
|
-
|
|
4626
|
-
}
|
|
4631
|
+
console.log('====== 5');
|
|
4632
|
+
console.log(x);
|
|
4627
4633
|
}
|
|
4628
|
-
catch (
|
|
4634
|
+
catch (e) {
|
|
4635
|
+
console.log('====== 6');
|
|
4636
|
+
console.log(e);
|
|
4629
4637
|
// not to do
|
|
4630
4638
|
}
|
|
4639
|
+
console.log('====== 7');
|
|
4631
4640
|
}
|
|
4632
4641
|
return this.authService
|
|
4633
4642
|
.getRequestWithHeadersOb(request)
|
|
@@ -4645,26 +4654,6 @@ class MonkeyEcxHttpConfigHeaderInterceptor {
|
|
|
4645
4654
|
.toPromise();
|
|
4646
4655
|
});
|
|
4647
4656
|
}
|
|
4648
|
-
onValidateConfig() {
|
|
4649
|
-
return new Promise((resolve) => {
|
|
4650
|
-
let count = 0;
|
|
4651
|
-
const interval = setInterval(() => __awaiter(this, void 0, void 0, function* () {
|
|
4652
|
-
count += 1;
|
|
4653
|
-
if (count > 20) {
|
|
4654
|
-
clearInterval(interval);
|
|
4655
|
-
resolve(null);
|
|
4656
|
-
}
|
|
4657
|
-
const config = yield this.config
|
|
4658
|
-
.config()
|
|
4659
|
-
.pipe(take(1))
|
|
4660
|
-
.toPromise();
|
|
4661
|
-
if (config) {
|
|
4662
|
-
clearInterval(interval);
|
|
4663
|
-
resolve(null);
|
|
4664
|
-
}
|
|
4665
|
-
}), 200);
|
|
4666
|
-
});
|
|
4667
|
-
}
|
|
4668
4657
|
intercept(request, next) {
|
|
4669
4658
|
return from(this.handle(request, next));
|
|
4670
4659
|
}
|