monkey-front-core 0.0.216 → 0.0.219
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 +31 -10
- package/fesm2015/monkey-front-core.mjs +26 -6
- package/fesm2015/monkey-front-core.mjs.map +1 -1
- package/fesm2020/monkey-front-core.mjs +26 -6
- package/fesm2020/monkey-front-core.mjs.map +1 -1
- package/lib/core/interceptors/monkeyecx-http-config-header.interceptor.d.ts +3 -1
- package/monkey-front-core-0.0.219.tgz +0 -0
- package/package.json +3 -3
- package/monkey-front-core-0.0.216.tgz +0 -0
|
@@ -1,16 +1,18 @@
|
|
|
1
1
|
import { Injectable } from '@angular/core';
|
|
2
|
-
import { from } from 'rxjs';
|
|
3
|
-
import { first } 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
|
-
import * as i2 from "../services";
|
|
6
|
+
import * as i2 from "../services/error";
|
|
7
|
+
import * as i3 from "../services";
|
|
7
8
|
export class MonkeyEcxHttpConfigHeaderInterceptor {
|
|
8
|
-
constructor(authService, config) {
|
|
9
|
+
constructor(authService, errorHandlingService, config) {
|
|
9
10
|
this.authService = authService;
|
|
11
|
+
this.errorHandlingService = errorHandlingService;
|
|
10
12
|
this.config = config;
|
|
11
13
|
// not to do
|
|
12
14
|
}
|
|
13
|
-
async handle(request
|
|
15
|
+
async handle(request) {
|
|
14
16
|
const { url } = request;
|
|
15
17
|
if (this.authService.isTokenMandatory(url)) {
|
|
16
18
|
try {
|
|
@@ -25,15 +27,34 @@ export class MonkeyEcxHttpConfigHeaderInterceptor {
|
|
|
25
27
|
// not to do
|
|
26
28
|
}
|
|
27
29
|
}
|
|
28
|
-
|
|
30
|
+
const resp = await this.authService
|
|
31
|
+
.getRequestWithHeadersOb(request)
|
|
32
|
+
.pipe(take(1), map((event) => {
|
|
33
|
+
return event;
|
|
34
|
+
}), catchError((error) => {
|
|
35
|
+
this.errorHandlingService.handleError(error);
|
|
36
|
+
return throwError(error);
|
|
37
|
+
}))
|
|
38
|
+
.toPromise();
|
|
39
|
+
return resp;
|
|
29
40
|
}
|
|
30
41
|
intercept(request, next) {
|
|
31
|
-
return from(this.handle(request,
|
|
42
|
+
return from(this.handle(request)).pipe(take(1), map((event) => {
|
|
43
|
+
return event;
|
|
44
|
+
}), mergeMap((resp) => {
|
|
45
|
+
request = request.clone({
|
|
46
|
+
setHeaders: resp
|
|
47
|
+
});
|
|
48
|
+
return next.handle(request);
|
|
49
|
+
}), catchError((error) => {
|
|
50
|
+
this.errorHandlingService.handleError(error);
|
|
51
|
+
return throwError(error);
|
|
52
|
+
}));
|
|
32
53
|
}
|
|
33
54
|
}
|
|
34
|
-
MonkeyEcxHttpConfigHeaderInterceptor.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: MonkeyEcxHttpConfigHeaderInterceptor, deps: [{ token: i1.MonkeyEcxAuthenticationService }, { token: i2.MonkeyEcxConfigService }], target: i0.ɵɵFactoryTarget.Injectable });
|
|
55
|
+
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 });
|
|
35
56
|
MonkeyEcxHttpConfigHeaderInterceptor.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: MonkeyEcxHttpConfigHeaderInterceptor });
|
|
36
57
|
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: MonkeyEcxHttpConfigHeaderInterceptor, decorators: [{
|
|
37
58
|
type: Injectable
|
|
38
|
-
}], ctorParameters: function () { return [{ type: i1.MonkeyEcxAuthenticationService }, { type: i2.MonkeyEcxConfigService }]; } });
|
|
39
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
59
|
+
}], ctorParameters: function () { return [{ type: i1.MonkeyEcxAuthenticationService }, { type: i2.MonkeyEcxErrorHandlingService }, { type: i3.MonkeyEcxConfigService }]; } });
|
|
60
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibW9ua2V5ZWN4LWh0dHAtY29uZmlnLWhlYWRlci5pbnRlcmNlcHRvci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uL3Byb2plY3RzL21vbmtleS1mcm9udC1jb3JlL3NyYy9saWIvY29yZS9pbnRlcmNlcHRvcnMvbW9ua2V5ZWN4LWh0dHAtY29uZmlnLWhlYWRlci5pbnRlcmNlcHRvci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sZUFBZSxDQUFDO0FBUTNDLE9BQU8sRUFBRSxJQUFJLEVBQWMsVUFBVSxFQUFFLE1BQU0sTUFBTSxDQUFDO0FBQ3BELE9BQU8sRUFBRSxVQUFVLEVBQUUsS0FBSyxFQUFFLEdBQUcsRUFBRSxRQUFRLEVBQUUsSUFBSSxFQUFFLE1BQU0sZ0JBQWdCLENBQUM7Ozs7O0FBTXhFLE1BQU0sT0FBTyxvQ0FBb0M7SUFDL0MsWUFDVSxXQUEyQyxFQUMzQyxvQkFBbUQsRUFDbkQsTUFBOEI7UUFGOUIsZ0JBQVcsR0FBWCxXQUFXLENBQWdDO1FBQzNDLHlCQUFvQixHQUFwQixvQkFBb0IsQ0FBK0I7UUFDbkQsV0FBTSxHQUFOLE1BQU0sQ0FBd0I7UUFFdEMsWUFBWTtJQUNkLENBQUM7SUFFTyxLQUFLLENBQUMsTUFBTSxDQUFDLE9BQXlCO1FBQzVDLE1BQU0sRUFBRSxHQUFHLEVBQUUsR0FBRyxPQUFPLENBQUM7UUFFeEIsSUFBSSxJQUFJLENBQUMsV0FBVyxDQUFDLGdCQUFnQixDQUFDLEdBQUcsQ0FBQyxFQUFFO1lBQzFDLElBQUk7Z0JBQ0YsTUFBTSxJQUFJLENBQUMsTUFBTTtxQkFDZCxNQUFNLEVBQUU7cUJBQ1IsSUFBSSxDQUNILEtBQUssQ0FBQyxDQUFDLEdBQVEsRUFBRSxFQUFFO29CQUNqQixPQUFPLENBQUMsQ0FBQyxHQUFHLElBQUksSUFBSSxDQUFDLFNBQVMsQ0FBQyxHQUFHLENBQUMsS0FBSyxJQUFJLENBQUM7Z0JBQy9DLENBQUMsQ0FBQyxDQUNIO3FCQUNBLFNBQVMsRUFBRSxDQUFDO2FBQ2hCO1lBQUMsT0FBTyxDQUFDLEVBQUU7Z0JBQ1YsWUFBWTthQUNiO1NBQ0Y7UUFFRCxNQUFNLElBQUksR0FBRyxNQUFNLElBQUksQ0FBQyxXQUFXO2FBQ2hDLHVCQUF1QixDQUFDLE9BQU8sQ0FBQzthQUNoQyxJQUFJLENBQ0gsSUFBSSxDQUFDLENBQUMsQ0FBQyxFQUNQLEdBQUcsQ0FBQyxDQUFDLEtBQVUsRUFBRSxFQUFFO1lBQ2pCLE9BQU8sS0FBSyxDQUFDO1FBQ2YsQ0FBQyxDQUFDLEVBQ0YsVUFBVSxDQUFDLENBQUMsS0FBd0IsRUFBRSxFQUFFO1lBQ3RDLElBQUksQ0FBQyxvQkFBb0IsQ0FBQyxXQUFXLENBQUMsS0FBSyxDQUFDLENBQUM7WUFDN0MsT0FBTyxVQUFVLENBQUMsS0FBSyxDQUFDLENBQUM7UUFDM0IsQ0FBQyxDQUFDLENBQ0g7YUFDQSxTQUFTLEVBQUUsQ0FBQztRQUVmLE9BQU8sSUFBSSxDQUFDO0lBQ2QsQ0FBQztJQUVELFNBQVMsQ0FBQyxPQUF5QixFQUFFLElBQWlCO1FBQ3BELE9BQU8sSUFBSSxDQUFDLElBQUksQ0FBQyxNQUFNLENBQUMsT0FBTyxDQUFDLENBQUMsQ0FBQyxJQUFJLENBQ3BDLElBQUksQ0FBQyxDQUFDLENBQUMsRUFDUCxHQUFHLENBQUMsQ0FBQyxLQUFVLEVBQUUsRUFBRTtZQUNqQixPQUFPLEtBQUssQ0FBQztRQUNmLENBQUMsQ0FBQyxFQUNGLFFBQVEsQ0FBQyxDQUFDLElBQVMsRUFBRSxFQUFFO1lBQ3JCLE9BQU8sR0FBRyxPQUFPLENBQUMsS0FBSyxDQUFDO2dCQUN0QixVQUFVLEVBQUUsSUFBSTthQUNqQixDQUFDLENBQUM7WUFDSCxPQUFPLElBQUksQ0FBQyxNQUFNLENBQUMsT0FBTyxDQUFDLENBQUM7UUFDOUIsQ0FBQyxDQUFDLEVBQ0YsVUFBVSxDQUFDLENBQUMsS0FBd0IsRUFBRSxFQUFFO1lBQ3RDLElBQUksQ0FBQyxvQkFBb0IsQ0FBQyxXQUFXLENBQUMsS0FBSyxDQUFDLENBQUM7WUFDN0MsT0FBTyxVQUFVLENBQUMsS0FBSyxDQUFDLENBQUM7UUFDM0IsQ0FBQyxDQUFDLENBQ0gsQ0FBQztJQUNKLENBQUM7O2lJQTdEVSxvQ0FBb0M7cUlBQXBDLG9DQUFvQzsyRkFBcEMsb0NBQW9DO2tCQURoRCxVQUFVIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgSW5qZWN0YWJsZSB9IGZyb20gJ0Bhbmd1bGFyL2NvcmUnO1xuaW1wb3J0IHtcbiAgSHR0cEVycm9yUmVzcG9uc2UsXG4gIEh0dHBFdmVudCxcbiAgSHR0cEhhbmRsZXIsXG4gIEh0dHBJbnRlcmNlcHRvcixcbiAgSHR0cFJlcXVlc3Rcbn0gZnJvbSAnQGFuZ3VsYXIvY29tbW9uL2h0dHAnO1xuaW1wb3J0IHsgZnJvbSwgT2JzZXJ2YWJsZSwgdGhyb3dFcnJvciB9IGZyb20gJ3J4anMnO1xuaW1wb3J0IHsgY2F0Y2hFcnJvciwgZmlyc3QsIG1hcCwgbWVyZ2VNYXAsIHRha2UgfSBmcm9tICdyeGpzL29wZXJhdG9ycyc7XG5pbXBvcnQgeyBNb25rZXlFY3hFcnJvckhhbmRsaW5nU2VydmljZSB9IGZyb20gJy4uL3NlcnZpY2VzL2Vycm9yJztcbmltcG9ydCB7IE1vbmtleUVjeEF1dGhlbnRpY2F0aW9uU2VydmljZSB9IGZyb20gJy4uL3NlcnZpY2VzL2F1dGgnO1xuaW1wb3J0IHsgTW9ua2V5RWN4Q29uZmlnU2VydmljZSB9IGZyb20gJy4uL3NlcnZpY2VzJztcblxuQEluamVjdGFibGUoKVxuZXhwb3J0IGNsYXNzIE1vbmtleUVjeEh0dHBDb25maWdIZWFkZXJJbnRlcmNlcHRvciBpbXBsZW1lbnRzIEh0dHBJbnRlcmNlcHRvciB7XG4gIGNvbnN0cnVjdG9yKFxuICAgIHByaXZhdGUgYXV0aFNlcnZpY2U6IE1vbmtleUVjeEF1dGhlbnRpY2F0aW9uU2VydmljZSxcbiAgICBwcml2YXRlIGVycm9ySGFuZGxpbmdTZXJ2aWNlOiBNb25rZXlFY3hFcnJvckhhbmRsaW5nU2VydmljZSxcbiAgICBwcml2YXRlIGNvbmZpZzogTW9ua2V5RWN4Q29uZmlnU2VydmljZVxuICApIHtcbiAgICAvLyBub3QgdG8gZG9cbiAgfVxuXG4gIHByaXZhdGUgYXN5bmMgaGFuZGxlKHJlcXVlc3Q6IEh0dHBSZXF1ZXN0PGFueT4pIHtcbiAgICBjb25zdCB7IHVybCB9ID0gcmVxdWVzdDtcblxuICAgIGlmICh0aGlzLmF1dGhTZXJ2aWNlLmlzVG9rZW5NYW5kYXRvcnkodXJsKSkge1xuICAgICAgdHJ5IHtcbiAgICAgICAgYXdhaXQgdGhpcy5jb25maWdcbiAgICAgICAgICAuY29uZmlnKClcbiAgICAgICAgICAucGlwZShcbiAgICAgICAgICAgIGZpcnN0KCh2YWw6IGFueSkgPT4ge1xuICAgICAgICAgICAgICByZXR1cm4gISF2YWwgJiYgSlNPTi5zdHJpbmdpZnkodmFsKSAhPT0gJ3t9JztcbiAgICAgICAgICAgIH0pXG4gICAgICAgICAgKVxuICAgICAgICAgIC50b1Byb21pc2UoKTtcbiAgICAgIH0gY2F0Y2ggKGUpIHtcbiAgICAgICAgLy8gbm90IHRvIGRvXG4gICAgICB9XG4gICAgfVxuXG4gICAgY29uc3QgcmVzcCA9IGF3YWl0IHRoaXMuYXV0aFNlcnZpY2VcbiAgICAgIC5nZXRSZXF1ZXN0V2l0aEhlYWRlcnNPYihyZXF1ZXN0KVxuICAgICAgLnBpcGUoXG4gICAgICAgIHRha2UoMSksXG4gICAgICAgIG1hcCgoZXZlbnQ6IGFueSkgPT4ge1xuICAgICAgICAgIHJldHVybiBldmVudDtcbiAgICAgICAgfSksXG4gICAgICAgIGNhdGNoRXJyb3IoKGVycm9yOiBIdHRwRXJyb3JSZXNwb25zZSkgPT4ge1xuICAgICAgICAgIHRoaXMuZXJyb3JIYW5kbGluZ1NlcnZpY2UuaGFuZGxlRXJyb3IoZXJyb3IpO1xuICAgICAgICAgIHJldHVybiB0aHJvd0Vycm9yKGVycm9yKTtcbiAgICAgICAgfSlcbiAgICAgIClcbiAgICAgIC50b1Byb21pc2UoKTtcblxuICAgIHJldHVybiByZXNwO1xuICB9XG5cbiAgaW50ZXJjZXB0KHJlcXVlc3Q6IEh0dHBSZXF1ZXN0PGFueT4sIG5leHQ6IEh0dHBIYW5kbGVyKTogT2JzZXJ2YWJsZTxIdHRwRXZlbnQ8YW55Pj4ge1xuICAgIHJldHVybiBmcm9tKHRoaXMuaGFuZGxlKHJlcXVlc3QpKS5waXBlKFxuICAgICAgdGFrZSgxKSxcbiAgICAgIG1hcCgoZXZlbnQ6IGFueSkgPT4ge1xuICAgICAgICByZXR1cm4gZXZlbnQ7XG4gICAgICB9KSxcbiAgICAgIG1lcmdlTWFwKChyZXNwOiBhbnkpID0+IHtcbiAgICAgICAgcmVxdWVzdCA9IHJlcXVlc3QuY2xvbmUoe1xuICAgICAgICAgIHNldEhlYWRlcnM6IHJlc3BcbiAgICAgICAgfSk7XG4gICAgICAgIHJldHVybiBuZXh0LmhhbmRsZShyZXF1ZXN0KTtcbiAgICAgIH0pLFxuICAgICAgY2F0Y2hFcnJvcigoZXJyb3I6IEh0dHBFcnJvclJlc3BvbnNlKSA9PiB7XG4gICAgICAgIHRoaXMuZXJyb3JIYW5kbGluZ1NlcnZpY2UuaGFuZGxlRXJyb3IoZXJyb3IpO1xuICAgICAgICByZXR1cm4gdGhyb3dFcnJvcihlcnJvcik7XG4gICAgICB9KVxuICAgICk7XG4gIH1cbn1cbiJdfQ==
|
|
@@ -4637,12 +4637,13 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.1.1", ngImpor
|
|
|
4637
4637
|
}], ctorParameters: function () { return [{ type: MonkeyEcxAuthenticationService }, { type: MonkeyEcxErrorHandlingService }]; } });
|
|
4638
4638
|
|
|
4639
4639
|
class MonkeyEcxHttpConfigHeaderInterceptor {
|
|
4640
|
-
constructor(authService, config) {
|
|
4640
|
+
constructor(authService, errorHandlingService, config) {
|
|
4641
4641
|
this.authService = authService;
|
|
4642
|
+
this.errorHandlingService = errorHandlingService;
|
|
4642
4643
|
this.config = config;
|
|
4643
4644
|
// not to do
|
|
4644
4645
|
}
|
|
4645
|
-
handle(request
|
|
4646
|
+
handle(request) {
|
|
4646
4647
|
return __awaiter(this, void 0, void 0, function* () {
|
|
4647
4648
|
const { url } = request;
|
|
4648
4649
|
if (this.authService.isTokenMandatory(url)) {
|
|
@@ -4658,18 +4659,37 @@ class MonkeyEcxHttpConfigHeaderInterceptor {
|
|
|
4658
4659
|
// not to do
|
|
4659
4660
|
}
|
|
4660
4661
|
}
|
|
4661
|
-
|
|
4662
|
+
const resp = yield this.authService
|
|
4663
|
+
.getRequestWithHeadersOb(request)
|
|
4664
|
+
.pipe(take(1), map((event) => {
|
|
4665
|
+
return event;
|
|
4666
|
+
}), catchError((error) => {
|
|
4667
|
+
this.errorHandlingService.handleError(error);
|
|
4668
|
+
return throwError(error);
|
|
4669
|
+
}))
|
|
4670
|
+
.toPromise();
|
|
4671
|
+
return resp;
|
|
4662
4672
|
});
|
|
4663
4673
|
}
|
|
4664
4674
|
intercept(request, next) {
|
|
4665
|
-
return from(this.handle(request,
|
|
4675
|
+
return from(this.handle(request)).pipe(take(1), map((event) => {
|
|
4676
|
+
return event;
|
|
4677
|
+
}), mergeMap((resp) => {
|
|
4678
|
+
request = request.clone({
|
|
4679
|
+
setHeaders: resp
|
|
4680
|
+
});
|
|
4681
|
+
return next.handle(request);
|
|
4682
|
+
}), catchError((error) => {
|
|
4683
|
+
this.errorHandlingService.handleError(error);
|
|
4684
|
+
return throwError(error);
|
|
4685
|
+
}));
|
|
4666
4686
|
}
|
|
4667
4687
|
}
|
|
4668
|
-
MonkeyEcxHttpConfigHeaderInterceptor.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: MonkeyEcxHttpConfigHeaderInterceptor, deps: [{ token: MonkeyEcxAuthenticationService }, { token: MonkeyEcxConfigService }], target: i0.ɵɵFactoryTarget.Injectable });
|
|
4688
|
+
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 });
|
|
4669
4689
|
MonkeyEcxHttpConfigHeaderInterceptor.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: MonkeyEcxHttpConfigHeaderInterceptor });
|
|
4670
4690
|
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: MonkeyEcxHttpConfigHeaderInterceptor, decorators: [{
|
|
4671
4691
|
type: Injectable
|
|
4672
|
-
}], ctorParameters: function () { return [{ type: MonkeyEcxAuthenticationService }, { type: MonkeyEcxConfigService }]; } });
|
|
4692
|
+
}], ctorParameters: function () { return [{ type: MonkeyEcxAuthenticationService }, { type: MonkeyEcxErrorHandlingService }, { type: MonkeyEcxConfigService }]; } });
|
|
4673
4693
|
|
|
4674
4694
|
/* eslint-disable max-len */
|
|
4675
4695
|
class MonkeyEcxHttpConfigQueueInterceptor {
|