monkey-front-core 0.0.326 → 0.0.327
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-error.interceptor.mjs +1 -12
- package/esm2020/lib/core/interceptors/monkeyecx-http-config-header.interceptor.mjs +1 -8
- package/fesm2015/monkey-front-core.mjs +0 -18
- package/fesm2015/monkey-front-core.mjs.map +1 -1
- package/fesm2020/monkey-front-core.mjs +0 -18
- package/fesm2020/monkey-front-core.mjs.map +1 -1
- package/monkey-front-core-0.0.327.tgz +0 -0
- package/package.json +1 -1
- package/monkey-front-core-0.0.326.tgz +0 -0
|
@@ -11,36 +11,25 @@ export class MonkeyEcxHttpConfigErrorInterceptor {
|
|
|
11
11
|
// no to do
|
|
12
12
|
}
|
|
13
13
|
async handle(request, error) {
|
|
14
|
-
console.log('=====================6');
|
|
15
14
|
if (this.monkeyecxAuthenticationService.refreshShouldHappen(error)) {
|
|
16
15
|
await this.monkeyecxAuthenticationService?.refreshToken();
|
|
17
16
|
const headers = await this.monkeyecxAuthenticationService.getRequestWithHeadersAsync(request);
|
|
18
17
|
return headers;
|
|
19
18
|
}
|
|
20
|
-
console.log('=====================7');
|
|
21
19
|
return throwError(null);
|
|
22
20
|
}
|
|
23
21
|
intercept(request, next) {
|
|
24
|
-
console.log('=====================1');
|
|
25
22
|
return next.handle(request).pipe(map((event) => {
|
|
26
23
|
return event;
|
|
27
24
|
}), catchError((error) => {
|
|
28
|
-
console.log('=====================2');
|
|
29
|
-
console.log(error);
|
|
30
25
|
return from(this.handle(request, error)).pipe(take(1), map((event) => {
|
|
31
|
-
console.log('=====================3');
|
|
32
|
-
console.log(event);
|
|
33
26
|
return event;
|
|
34
27
|
}), mergeMap((resp) => {
|
|
35
|
-
console.log('=====================4');
|
|
36
|
-
console.log(resp);
|
|
37
28
|
request = request.clone({
|
|
38
29
|
setHeaders: resp
|
|
39
30
|
});
|
|
40
31
|
return next.handle(request);
|
|
41
32
|
}), catchError(() => {
|
|
42
|
-
console.log('=====================5');
|
|
43
|
-
console.log(error);
|
|
44
33
|
this.monkeyecxErrorHandlingService.handleError(error, 'refresh_token');
|
|
45
34
|
return throwError(error);
|
|
46
35
|
}));
|
|
@@ -52,4 +41,4 @@ MonkeyEcxHttpConfigErrorInterceptor.ɵprov = i0.ɵɵngDeclareInjectable({ minVer
|
|
|
52
41
|
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: MonkeyEcxHttpConfigErrorInterceptor, decorators: [{
|
|
53
42
|
type: Injectable
|
|
54
43
|
}], ctorParameters: function () { return [{ type: i1.MonkeyEcxAuthenticationService }, { type: i2.MonkeyEcxErrorHandlingService }]; } });
|
|
55
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
44
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibW9ua2V5ZWN4LWh0dHAtY29uZmlnLWVycm9yLmludGVyY2VwdG9yLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vLi4vcHJvamVjdHMvbW9ua2V5LWZyb250LWNvcmUvc3JjL2xpYi9jb3JlL2ludGVyY2VwdG9ycy9tb25rZXllY3gtaHR0cC1jb25maWctZXJyb3IuaW50ZXJjZXB0b3IudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBT0EsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLGVBQWUsQ0FBQztBQUMzQyxPQUFPLEVBQUUsSUFBSSxFQUFjLFVBQVUsRUFBRSxNQUFNLE1BQU0sQ0FBQztBQUNwRCxPQUFPLEVBQUUsVUFBVSxFQUFFLEdBQUcsRUFBRSxRQUFRLEVBQUUsSUFBSSxFQUFFLE1BQU0sZ0JBQWdCLENBQUM7Ozs7QUFVakUsTUFBTSxPQUFPLG1DQUFtQztJQUM5QyxZQUNVLDhCQUE4RCxFQUM5RCw2QkFBNEQ7UUFENUQsbUNBQThCLEdBQTlCLDhCQUE4QixDQUFnQztRQUM5RCxrQ0FBNkIsR0FBN0IsNkJBQTZCLENBQStCO1FBRXBFLFdBQVc7SUFDYixDQUFDO0lBRU8sS0FBSyxDQUFDLE1BQU0sQ0FBQyxPQUF5QixFQUFFLEtBQXdCO1FBQ3RFLElBQUksSUFBSSxDQUFDLDhCQUE4QixDQUFDLG1CQUFtQixDQUFDLEtBQUssQ0FBQyxFQUFFO1lBQ2xFLE1BQU0sSUFBSSxDQUFDLDhCQUE4QixFQUFFLFlBQVksRUFBRSxDQUFDO1lBQzFELE1BQU0sT0FBTyxHQUFHLE1BQU0sSUFBSSxDQUFDLDhCQUE4QixDQUFDLDBCQUEwQixDQUFDLE9BQU8sQ0FBQyxDQUFDO1lBQzlGLE9BQU8sT0FBTyxDQUFDO1NBQ2hCO1FBQ0QsT0FBTyxVQUFVLENBQUMsSUFBSSxDQUFDLENBQUM7SUFDMUIsQ0FBQztJQUVELFNBQVMsQ0FBQyxPQUF5QixFQUFFLElBQWlCO1FBQ3BELE9BQU8sSUFBSSxDQUFDLE1BQU0sQ0FBQyxPQUFPLENBQUMsQ0FBQyxJQUFJLENBQzlCLEdBQUcsQ0FBQyxDQUFDLEtBQXFCLEVBQUUsRUFBRTtZQUM1QixPQUFPLEtBQUssQ0FBQztRQUNmLENBQUMsQ0FBQyxFQUNGLFVBQVUsQ0FBQyxDQUFDLEtBQXdCLEVBQUUsRUFBRTtZQUN0QyxPQUFPLElBQUksQ0FBQyxJQUFJLENBQUMsTUFBTSxDQUFDLE9BQU8sRUFBRSxLQUFLLENBQUMsQ0FBQyxDQUFDLElBQUksQ0FDM0MsSUFBSSxDQUFDLENBQUMsQ0FBQyxFQUNQLEdBQUcsQ0FBQyxDQUFDLEtBQVUsRUFBRSxFQUFFO2dCQUNqQixPQUFPLEtBQUssQ0FBQztZQUNmLENBQUMsQ0FBQyxFQUNGLFFBQVEsQ0FBQyxDQUFDLElBQVMsRUFBRSxFQUFFO2dCQUNyQixPQUFPLEdBQUcsT0FBTyxDQUFDLEtBQUssQ0FBQztvQkFDdEIsVUFBVSxFQUFFLElBQUk7aUJBQ2pCLENBQUMsQ0FBQztnQkFDSCxPQUFPLElBQUksQ0FBQyxNQUFNLENBQUMsT0FBTyxDQUFDLENBQUM7WUFDOUIsQ0FBQyxDQUFDLEVBQ0YsVUFBVSxDQUFDLEdBQUcsRUFBRTtnQkFDZCxJQUFJLENBQUMsNkJBQTZCLENBQUMsV0FBVyxDQUFDLEtBQUssRUFBRSxlQUFlLENBQUMsQ0FBQztnQkFDdkUsT0FBTyxVQUFVLENBQUMsS0FBSyxDQUFDLENBQUM7WUFDM0IsQ0FBQyxDQUFDLENBQ0gsQ0FBQztRQUNKLENBQUMsQ0FBQyxDQUNILENBQUM7SUFDSixDQUFDOztnSUF6Q1UsbUNBQW1DO29JQUFuQyxtQ0FBbUM7MkZBQW5DLG1DQUFtQztrQkFEL0MsVUFBVSIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7XG4gIEh0dHBFcnJvclJlc3BvbnNlLFxuICBIdHRwRXZlbnQsXG4gIEh0dHBIYW5kbGVyLFxuICBIdHRwSW50ZXJjZXB0b3IsXG4gIEh0dHBSZXF1ZXN0XG59IGZyb20gJ0Bhbmd1bGFyL2NvbW1vbi9odHRwJztcbmltcG9ydCB7IEluamVjdGFibGUgfSBmcm9tICdAYW5ndWxhci9jb3JlJztcbmltcG9ydCB7IGZyb20sIE9ic2VydmFibGUsIHRocm93RXJyb3IgfSBmcm9tICdyeGpzJztcbmltcG9ydCB7IGNhdGNoRXJyb3IsIG1hcCwgbWVyZ2VNYXAsIHRha2UgfSBmcm9tICdyeGpzL29wZXJhdG9ycyc7XG5pbXBvcnQgeyBNb25rZXlFY3hBdXRoZW50aWNhdGlvblNlcnZpY2UgfSBmcm9tICcuLi9zZXJ2aWNlcy9hdXRoJztcbmltcG9ydCB7IE1vbmtleUVjeEVycm9ySGFuZGxpbmdTZXJ2aWNlIH0gZnJvbSAnLi4vc2VydmljZXMvZXJyb3InO1xuXG5leHBvcnQgaW50ZXJmYWNlIEhlYWRlcnMge1xuICBuYW1lOiBzdHJpbmc7XG4gIHZhbHVlOiBzdHJpbmc7XG59XG5cbkBJbmplY3RhYmxlKClcbmV4cG9ydCBjbGFzcyBNb25rZXlFY3hIdHRwQ29uZmlnRXJyb3JJbnRlcmNlcHRvciBpbXBsZW1lbnRzIEh0dHBJbnRlcmNlcHRvciB7XG4gIGNvbnN0cnVjdG9yKFxuICAgIHByaXZhdGUgbW9ua2V5ZWN4QXV0aGVudGljYXRpb25TZXJ2aWNlOiBNb25rZXlFY3hBdXRoZW50aWNhdGlvblNlcnZpY2UsXG4gICAgcHJpdmF0ZSBtb25rZXllY3hFcnJvckhhbmRsaW5nU2VydmljZTogTW9ua2V5RWN4RXJyb3JIYW5kbGluZ1NlcnZpY2VcbiAgKSB7XG4gICAgLy8gbm8gdG8gZG9cbiAgfVxuXG4gIHByaXZhdGUgYXN5bmMgaGFuZGxlKHJlcXVlc3Q6IEh0dHBSZXF1ZXN0PGFueT4sIGVycm9yOiBIdHRwRXJyb3JSZXNwb25zZSkge1xuICAgIGlmICh0aGlzLm1vbmtleWVjeEF1dGhlbnRpY2F0aW9uU2VydmljZS5yZWZyZXNoU2hvdWxkSGFwcGVuKGVycm9yKSkge1xuICAgICAgYXdhaXQgdGhpcy5tb25rZXllY3hBdXRoZW50aWNhdGlvblNlcnZpY2U/LnJlZnJlc2hUb2tlbigpO1xuICAgICAgY29uc3QgaGVhZGVycyA9IGF3YWl0IHRoaXMubW9ua2V5ZWN4QXV0aGVudGljYXRpb25TZXJ2aWNlLmdldFJlcXVlc3RXaXRoSGVhZGVyc0FzeW5jKHJlcXVlc3QpO1xuICAgICAgcmV0dXJuIGhlYWRlcnM7XG4gICAgfVxuICAgIHJldHVybiB0aHJvd0Vycm9yKG51bGwpO1xuICB9XG5cbiAgaW50ZXJjZXB0KHJlcXVlc3Q6IEh0dHBSZXF1ZXN0PGFueT4sIG5leHQ6IEh0dHBIYW5kbGVyKTogT2JzZXJ2YWJsZTxIdHRwRXZlbnQ8YW55Pj4ge1xuICAgIHJldHVybiBuZXh0LmhhbmRsZShyZXF1ZXN0KS5waXBlKFxuICAgICAgbWFwKChldmVudDogSHR0cEV2ZW50PGFueT4pID0+IHtcbiAgICAgICAgcmV0dXJuIGV2ZW50O1xuICAgICAgfSksXG4gICAgICBjYXRjaEVycm9yKChlcnJvcjogSHR0cEVycm9yUmVzcG9uc2UpID0+IHtcbiAgICAgICAgcmV0dXJuIGZyb20odGhpcy5oYW5kbGUocmVxdWVzdCwgZXJyb3IpKS5waXBlKFxuICAgICAgICAgIHRha2UoMSksXG4gICAgICAgICAgbWFwKChldmVudDogYW55KSA9PiB7XG4gICAgICAgICAgICByZXR1cm4gZXZlbnQ7XG4gICAgICAgICAgfSksXG4gICAgICAgICAgbWVyZ2VNYXAoKHJlc3A6IGFueSkgPT4ge1xuICAgICAgICAgICAgcmVxdWVzdCA9IHJlcXVlc3QuY2xvbmUoe1xuICAgICAgICAgICAgICBzZXRIZWFkZXJzOiByZXNwXG4gICAgICAgICAgICB9KTtcbiAgICAgICAgICAgIHJldHVybiBuZXh0LmhhbmRsZShyZXF1ZXN0KTtcbiAgICAgICAgICB9KSxcbiAgICAgICAgICBjYXRjaEVycm9yKCgpID0+IHtcbiAgICAgICAgICAgIHRoaXMubW9ua2V5ZWN4RXJyb3JIYW5kbGluZ1NlcnZpY2UuaGFuZGxlRXJyb3IoZXJyb3IsICdyZWZyZXNoX3Rva2VuJyk7XG4gICAgICAgICAgICByZXR1cm4gdGhyb3dFcnJvcihlcnJvcik7XG4gICAgICAgICAgfSlcbiAgICAgICAgKTtcbiAgICAgIH0pXG4gICAgKTtcbiAgfVxuXG4gIC8qIGludGVyY2VwdChyZXF1ZXN0OiBIdHRwUmVxdWVzdDxhbnk+LCBuZXh0OiBIdHRwSGFuZGxlcik6IE9ic2VydmFibGU8SHR0cEV2ZW50PGFueT4+IHtcbiAgICByZXR1cm4gbmV4dC5oYW5kbGUocmVxdWVzdCkucGlwZShcbiAgICAgIG1hcCgoZXZlbnQ6IEh0dHBFdmVudDxhbnk+KSA9PiB7XG4gICAgICAgIHJldHVybiBldmVudDtcbiAgICAgIH0pLFxuICAgICAgY2F0Y2hFcnJvcigoZXJyb3I6IEh0dHBFcnJvclJlc3BvbnNlKSA9PiB7XG4gICAgICAgIGlmICh0aGlzLm1vbmtleWVjeEF1dGhlbnRpY2F0aW9uU2VydmljZS5yZWZyZXNoU2hvdWxkSGFwcGVuKGVycm9yKSkge1xuICAgICAgICAgIHJldHVybiB0aGlzLm1vbmtleWVjeEF1dGhlbnRpY2F0aW9uU2VydmljZT8ucmVmcmVzaFRva2VuKCk/LnBpcGUoXG4gICAgICAgICAgICB0YWtlKDEpLFxuICAgICAgICAgICAgbWFwKCgpID0+IHtcbiAgICAgICAgICAgICAgcmV0dXJuIHRoaXMubW9ua2V5ZWN4QXV0aGVudGljYXRpb25TZXJ2aWNlLmdldFJlcXVlc3RXaXRoSGVhZGVycyhyZXF1ZXN0KTtcbiAgICAgICAgICAgIH0pLFxuICAgICAgICAgICAgbWVyZ2VNYXAoKHJlc3A6IGFueSkgPT4ge1xuICAgICAgICAgICAgICByZXR1cm4gbmV4dC5oYW5kbGUocmVzcCkucGlwZShcbiAgICAgICAgICAgICAgICBjYXRjaEVycm9yKChlcnJvcjogYW55KSA9PiB7XG4gICAgICAgICAgICAgICAgICB0aGlzLm1vbmtleWVjeEVycm9ySGFuZGxpbmdTZXJ2aWNlLmhhbmRsZUVycm9yKGVycm9yLCAncmVmcmVzaF90b2tlbicpO1xuICAgICAgICAgICAgICAgICAgcmV0dXJuIHRocm93RXJyb3IobnVsbCk7XG4gICAgICAgICAgICAgICAgfSlcbiAgICAgICAgICAgICAgKTtcbiAgICAgICAgICAgIH0pLFxuICAgICAgICAgICAgY2F0Y2hFcnJvcigoZXJyb3I6IGFueSkgPT4ge1xuICAgICAgICAgICAgICB0aGlzLm1vbmtleWVjeEVycm9ySGFuZGxpbmdTZXJ2aWNlLmhhbmRsZUVycm9yKGVycm9yLCAncmVmcmVzaF90b2tlbicpO1xuICAgICAgICAgICAgICByZXR1cm4gdGhyb3dFcnJvcihudWxsKTtcbiAgICAgICAgICAgIH0pXG4gICAgICAgICAgKSB8fCB0aHJvd0Vycm9yKGVycm9yKTtcbiAgICAgICAgfVxuICAgICAgICByZXR1cm4gdGhyb3dFcnJvcihlcnJvcik7XG4gICAgICB9KVxuICAgICk7XG4gIH0gKi9cbn1cbiJdfQ==
|
|
@@ -38,21 +38,14 @@ export class MonkeyEcxHttpConfigHeaderInterceptor {
|
|
|
38
38
|
return resp;
|
|
39
39
|
}
|
|
40
40
|
intercept(request, next) {
|
|
41
|
-
console.log('****************1');
|
|
42
41
|
return from(this.handle(request)).pipe(take(1), map((event) => {
|
|
43
|
-
console.log('****************2');
|
|
44
|
-
console.log(event);
|
|
45
42
|
return event;
|
|
46
43
|
}), mergeMap((resp) => {
|
|
47
|
-
console.log('****************3');
|
|
48
|
-
console.log(resp);
|
|
49
44
|
request = request.clone({
|
|
50
45
|
setHeaders: resp
|
|
51
46
|
});
|
|
52
47
|
return next.handle(request);
|
|
53
48
|
}), catchError((error) => {
|
|
54
|
-
console.log('****************4');
|
|
55
|
-
console.log(error);
|
|
56
49
|
this.errorHandlingService.handleError(error);
|
|
57
50
|
return throwError(error);
|
|
58
51
|
}));
|
|
@@ -63,4 +56,4 @@ MonkeyEcxHttpConfigHeaderInterceptor.ɵprov = i0.ɵɵngDeclareInjectable({ minVe
|
|
|
63
56
|
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: MonkeyEcxHttpConfigHeaderInterceptor, decorators: [{
|
|
64
57
|
type: Injectable
|
|
65
58
|
}], ctorParameters: function () { return [{ type: i1.MonkeyEcxAuthenticationService }, { type: i2.MonkeyEcxErrorHandlingService }, { type: i3.MonkeyEcxConfigService }]; } });
|
|
66
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
59
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibW9ua2V5ZWN4LWh0dHAtY29uZmlnLWhlYWRlci5pbnRlcmNlcHRvci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uL3Byb2plY3RzL21vbmtleS1mcm9udC1jb3JlL3NyYy9saWIvY29yZS9pbnRlcmNlcHRvcnMvbW9ua2V5ZWN4LWh0dHAtY29uZmlnLWhlYWRlci5pbnRlcmNlcHRvci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFPQSxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sZUFBZSxDQUFDO0FBQzNDLE9BQU8sRUFBRSxJQUFJLEVBQWMsVUFBVSxFQUFFLE1BQU0sTUFBTSxDQUFDO0FBQ3BELE9BQU8sRUFBRSxVQUFVLEVBQUUsS0FBSyxFQUFFLEdBQUcsRUFBRSxRQUFRLEVBQUUsSUFBSSxFQUFFLE1BQU0sZ0JBQWdCLENBQUM7Ozs7O0FBTXhFLE1BQU0sT0FBTyxvQ0FBb0M7SUFDL0MsWUFDVSxXQUEyQyxFQUMzQyxvQkFBbUQsRUFDbkQsTUFBOEI7UUFGOUIsZ0JBQVcsR0FBWCxXQUFXLENBQWdDO1FBQzNDLHlCQUFvQixHQUFwQixvQkFBb0IsQ0FBK0I7UUFDbkQsV0FBTSxHQUFOLE1BQU0sQ0FBd0I7UUFFdEMsWUFBWTtJQUNkLENBQUM7SUFFTyxLQUFLLENBQUMsTUFBTSxDQUFDLE9BQXlCO1FBQzVDLE1BQU0sRUFBRSxHQUFHLEVBQUUsR0FBRyxPQUFPLENBQUM7UUFDeEIsSUFBSSxJQUFJLENBQUMsV0FBVyxDQUFDLGdCQUFnQixDQUFDLEdBQUcsQ0FBQyxFQUFFO1lBQzFDLElBQUk7Z0JBQ0YsTUFBTSxJQUFJLENBQUMsTUFBTTtxQkFDZCxNQUFNLEVBQUU7cUJBQ1IsSUFBSSxDQUNILEtBQUssQ0FBQyxDQUFDLEdBQVEsRUFBRSxFQUFFO29CQUNqQixPQUFPLENBQUMsQ0FBQyxHQUFHLElBQUksSUFBSSxDQUFDLFNBQVMsQ0FBQyxHQUFHLENBQUMsS0FBSyxJQUFJLENBQUM7Z0JBQy9DLENBQUMsQ0FBQyxDQUNIO3FCQUNBLFNBQVMsRUFBRSxDQUFDO2FBQ2hCO1lBQUMsT0FBTyxDQUFDLEVBQUU7Z0JBQ1YsWUFBWTthQUNiO1NBQ0Y7UUFDRCxJQUFJLElBQUksR0FBRyxJQUFJLENBQUM7UUFDaEIsSUFBSTtZQUNGLElBQUksR0FBRyxNQUFNLElBQUksQ0FBQyxXQUFXLENBQUMsMEJBQTBCLENBQUMsT0FBTyxDQUFDLENBQUM7U0FDbkU7UUFBQyxPQUFPLENBQUMsRUFBRTtZQUNWLElBQUksQ0FBQyxvQkFBb0IsQ0FBQyxXQUFXLENBQUMsQ0FBQyxDQUFDLENBQUM7WUFDekMsT0FBTyxVQUFVLENBQUMsQ0FBQyxDQUFDLENBQUM7U0FDdEI7UUFFRCxPQUFPLElBQUksQ0FBQztJQUNkLENBQUM7SUFFRCxTQUFTLENBQUMsT0FBeUIsRUFBRSxJQUFpQjtRQUNwRCxPQUFPLElBQUksQ0FBQyxJQUFJLENBQUMsTUFBTSxDQUFDLE9BQU8sQ0FBQyxDQUFDLENBQUMsSUFBSSxDQUNwQyxJQUFJLENBQUMsQ0FBQyxDQUFDLEVBQ1AsR0FBRyxDQUFDLENBQUMsS0FBVSxFQUFFLEVBQUU7WUFDakIsT0FBTyxLQUFLLENBQUM7UUFDZixDQUFDLENBQUMsRUFDRixRQUFRLENBQUMsQ0FBQyxJQUFTLEVBQUUsRUFBRTtZQUNyQixPQUFPLEdBQUcsT0FBTyxDQUFDLEtBQUssQ0FBQztnQkFDdEIsVUFBVSxFQUFFLElBQUk7YUFDakIsQ0FBQyxDQUFDO1lBQ0gsT0FBTyxJQUFJLENBQUMsTUFBTSxDQUFDLE9BQU8sQ0FBQyxDQUFDO1FBQzlCLENBQUMsQ0FBQyxFQUNGLFVBQVUsQ0FBQyxDQUFDLEtBQXdCLEVBQUUsRUFBRTtZQUN0QyxJQUFJLENBQUMsb0JBQW9CLENBQUMsV0FBVyxDQUFDLEtBQUssQ0FBQyxDQUFDO1lBQzdDLE9BQU8sVUFBVSxDQUFDLEtBQUssQ0FBQyxDQUFDO1FBQzNCLENBQUMsQ0FBQyxDQUNILENBQUM7SUFDSixDQUFDOztpSUFyRFUsb0NBQW9DO3FJQUFwQyxvQ0FBb0M7MkZBQXBDLG9DQUFvQztrQkFEaEQsVUFBVSIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7XG4gIEh0dHBFcnJvclJlc3BvbnNlLFxuICBIdHRwRXZlbnQsXG4gIEh0dHBIYW5kbGVyLFxuICBIdHRwSW50ZXJjZXB0b3IsXG4gIEh0dHBSZXF1ZXN0XG59IGZyb20gJ0Bhbmd1bGFyL2NvbW1vbi9odHRwJztcbmltcG9ydCB7IEluamVjdGFibGUgfSBmcm9tICdAYW5ndWxhci9jb3JlJztcbmltcG9ydCB7IGZyb20sIE9ic2VydmFibGUsIHRocm93RXJyb3IgfSBmcm9tICdyeGpzJztcbmltcG9ydCB7IGNhdGNoRXJyb3IsIGZpcnN0LCBtYXAsIG1lcmdlTWFwLCB0YWtlIH0gZnJvbSAncnhqcy9vcGVyYXRvcnMnO1xuaW1wb3J0IHsgTW9ua2V5RWN4Q29uZmlnU2VydmljZSB9IGZyb20gJy4uL3NlcnZpY2VzJztcbmltcG9ydCB7IE1vbmtleUVjeEF1dGhlbnRpY2F0aW9uU2VydmljZSB9IGZyb20gJy4uL3NlcnZpY2VzL2F1dGgnO1xuaW1wb3J0IHsgTW9ua2V5RWN4RXJyb3JIYW5kbGluZ1NlcnZpY2UgfSBmcm9tICcuLi9zZXJ2aWNlcy9lcnJvcic7XG5cbkBJbmplY3RhYmxlKClcbmV4cG9ydCBjbGFzcyBNb25rZXlFY3hIdHRwQ29uZmlnSGVhZGVySW50ZXJjZXB0b3IgaW1wbGVtZW50cyBIdHRwSW50ZXJjZXB0b3Ige1xuICBjb25zdHJ1Y3RvcihcbiAgICBwcml2YXRlIGF1dGhTZXJ2aWNlOiBNb25rZXlFY3hBdXRoZW50aWNhdGlvblNlcnZpY2UsXG4gICAgcHJpdmF0ZSBlcnJvckhhbmRsaW5nU2VydmljZTogTW9ua2V5RWN4RXJyb3JIYW5kbGluZ1NlcnZpY2UsXG4gICAgcHJpdmF0ZSBjb25maWc6IE1vbmtleUVjeENvbmZpZ1NlcnZpY2VcbiAgKSB7XG4gICAgLy8gbm90IHRvIGRvXG4gIH1cblxuICBwcml2YXRlIGFzeW5jIGhhbmRsZShyZXF1ZXN0OiBIdHRwUmVxdWVzdDxhbnk+KSB7XG4gICAgY29uc3QgeyB1cmwgfSA9IHJlcXVlc3Q7XG4gICAgaWYgKHRoaXMuYXV0aFNlcnZpY2UuaXNUb2tlbk1hbmRhdG9yeSh1cmwpKSB7XG4gICAgICB0cnkge1xuICAgICAgICBhd2FpdCB0aGlzLmNvbmZpZ1xuICAgICAgICAgIC5jb25maWcoKVxuICAgICAgICAgIC5waXBlKFxuICAgICAgICAgICAgZmlyc3QoKHZhbDogYW55KSA9PiB7XG4gICAgICAgICAgICAgIHJldHVybiAhIXZhbCAmJiBKU09OLnN0cmluZ2lmeSh2YWwpICE9PSAne30nO1xuICAgICAgICAgICAgfSlcbiAgICAgICAgICApXG4gICAgICAgICAgLnRvUHJvbWlzZSgpO1xuICAgICAgfSBjYXRjaCAoZSkge1xuICAgICAgICAvLyBub3QgdG8gZG9cbiAgICAgIH1cbiAgICB9XG4gICAgbGV0IHJlc3AgPSBudWxsO1xuICAgIHRyeSB7XG4gICAgICByZXNwID0gYXdhaXQgdGhpcy5hdXRoU2VydmljZS5nZXRSZXF1ZXN0V2l0aEhlYWRlcnNBc3luYyhyZXF1ZXN0KTtcbiAgICB9IGNhdGNoIChlKSB7XG4gICAgICB0aGlzLmVycm9ySGFuZGxpbmdTZXJ2aWNlLmhhbmRsZUVycm9yKGUpO1xuICAgICAgcmV0dXJuIHRocm93RXJyb3IoZSk7XG4gICAgfVxuXG4gICAgcmV0dXJuIHJlc3A7XG4gIH1cblxuICBpbnRlcmNlcHQocmVxdWVzdDogSHR0cFJlcXVlc3Q8YW55PiwgbmV4dDogSHR0cEhhbmRsZXIpOiBPYnNlcnZhYmxlPEh0dHBFdmVudDxhbnk+PiB7XG4gICAgcmV0dXJuIGZyb20odGhpcy5oYW5kbGUocmVxdWVzdCkpLnBpcGUoXG4gICAgICB0YWtlKDEpLFxuICAgICAgbWFwKChldmVudDogYW55KSA9PiB7XG4gICAgICAgIHJldHVybiBldmVudDtcbiAgICAgIH0pLFxuICAgICAgbWVyZ2VNYXAoKHJlc3A6IGFueSkgPT4ge1xuICAgICAgICByZXF1ZXN0ID0gcmVxdWVzdC5jbG9uZSh7XG4gICAgICAgICAgc2V0SGVhZGVyczogcmVzcFxuICAgICAgICB9KTtcbiAgICAgICAgcmV0dXJuIG5leHQuaGFuZGxlKHJlcXVlc3QpO1xuICAgICAgfSksXG4gICAgICBjYXRjaEVycm9yKChlcnJvcjogSHR0cEVycm9yUmVzcG9uc2UpID0+IHtcbiAgICAgICAgdGhpcy5lcnJvckhhbmRsaW5nU2VydmljZS5oYW5kbGVFcnJvcihlcnJvcik7XG4gICAgICAgIHJldHVybiB0aHJvd0Vycm9yKGVycm9yKTtcbiAgICAgIH0pXG4gICAgKTtcbiAgfVxufVxuIl19
|
|
@@ -5257,37 +5257,26 @@ class MonkeyEcxHttpConfigErrorInterceptor {
|
|
|
5257
5257
|
handle(request, error) {
|
|
5258
5258
|
var _a;
|
|
5259
5259
|
return __awaiter(this, void 0, void 0, function* () {
|
|
5260
|
-
console.log('=====================6');
|
|
5261
5260
|
if (this.monkeyecxAuthenticationService.refreshShouldHappen(error)) {
|
|
5262
5261
|
yield ((_a = this.monkeyecxAuthenticationService) === null || _a === void 0 ? void 0 : _a.refreshToken());
|
|
5263
5262
|
const headers = yield this.monkeyecxAuthenticationService.getRequestWithHeadersAsync(request);
|
|
5264
5263
|
return headers;
|
|
5265
5264
|
}
|
|
5266
|
-
console.log('=====================7');
|
|
5267
5265
|
return throwError(null);
|
|
5268
5266
|
});
|
|
5269
5267
|
}
|
|
5270
5268
|
intercept(request, next) {
|
|
5271
|
-
console.log('=====================1');
|
|
5272
5269
|
return next.handle(request).pipe(map((event) => {
|
|
5273
5270
|
return event;
|
|
5274
5271
|
}), catchError((error) => {
|
|
5275
|
-
console.log('=====================2');
|
|
5276
|
-
console.log(error);
|
|
5277
5272
|
return from(this.handle(request, error)).pipe(take(1), map((event) => {
|
|
5278
|
-
console.log('=====================3');
|
|
5279
|
-
console.log(event);
|
|
5280
5273
|
return event;
|
|
5281
5274
|
}), mergeMap((resp) => {
|
|
5282
|
-
console.log('=====================4');
|
|
5283
|
-
console.log(resp);
|
|
5284
5275
|
request = request.clone({
|
|
5285
5276
|
setHeaders: resp
|
|
5286
5277
|
});
|
|
5287
5278
|
return next.handle(request);
|
|
5288
5279
|
}), catchError(() => {
|
|
5289
|
-
console.log('=====================5');
|
|
5290
|
-
console.log(error);
|
|
5291
5280
|
this.monkeyecxErrorHandlingService.handleError(error, 'refresh_token');
|
|
5292
5281
|
return throwError(error);
|
|
5293
5282
|
}));
|
|
@@ -5335,21 +5324,14 @@ class MonkeyEcxHttpConfigHeaderInterceptor {
|
|
|
5335
5324
|
});
|
|
5336
5325
|
}
|
|
5337
5326
|
intercept(request, next) {
|
|
5338
|
-
console.log('****************1');
|
|
5339
5327
|
return from(this.handle(request)).pipe(take(1), map((event) => {
|
|
5340
|
-
console.log('****************2');
|
|
5341
|
-
console.log(event);
|
|
5342
5328
|
return event;
|
|
5343
5329
|
}), mergeMap((resp) => {
|
|
5344
|
-
console.log('****************3');
|
|
5345
|
-
console.log(resp);
|
|
5346
5330
|
request = request.clone({
|
|
5347
5331
|
setHeaders: resp
|
|
5348
5332
|
});
|
|
5349
5333
|
return next.handle(request);
|
|
5350
5334
|
}), catchError((error) => {
|
|
5351
|
-
console.log('****************4');
|
|
5352
|
-
console.log(error);
|
|
5353
5335
|
this.errorHandlingService.handleError(error);
|
|
5354
5336
|
return throwError(error);
|
|
5355
5337
|
}));
|