monkey-front-core 0.0.306 → 0.0.307
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 +35 -16
- package/esm2020/lib/core/interceptors/monkeyecx-http-config-header.interceptor.mjs +12 -1
- package/esm2020/lib/core/services/auth/monkeyecx-authentication.service.mjs +2 -2
- package/fesm2015/monkey-front-core.mjs +49 -17
- package/fesm2015/monkey-front-core.mjs.map +1 -1
- package/fesm2020/monkey-front-core.mjs +45 -15
- package/fesm2020/monkey-front-core.mjs.map +1 -1
- package/lib/core/interceptors/monkeyecx-http-config-error.interceptor.d.ts +1 -0
- package/lib/core/services/auth/monkeyecx-authentication.service.d.ts +1 -1
- package/monkey-front-core-0.0.307.tgz +0 -0
- package/package.json +1 -1
- package/monkey-front-core-0.0.306.tgz +0 -0
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { Injectable } from '@angular/core';
|
|
2
|
-
import { throwError } from 'rxjs';
|
|
2
|
+
import { from, throwError } from 'rxjs';
|
|
3
3
|
import { catchError, map, mergeMap, take } from 'rxjs/operators';
|
|
4
4
|
import * as i0 from "@angular/core";
|
|
5
5
|
import * as i1 from "../services/auth";
|
|
@@ -10,24 +10,43 @@ export class MonkeyEcxHttpConfigErrorInterceptor {
|
|
|
10
10
|
this.monkeyecxErrorHandlingService = monkeyecxErrorHandlingService;
|
|
11
11
|
// no to do
|
|
12
12
|
}
|
|
13
|
+
async handle(request, error) {
|
|
14
|
+
console.log('== interceptor error 4');
|
|
15
|
+
console.log(request.url);
|
|
16
|
+
if (this.monkeyecxAuthenticationService.refreshShouldHappen(error)) {
|
|
17
|
+
console.log('== interceptor error 5');
|
|
18
|
+
await this.monkeyecxAuthenticationService?.refreshToken();
|
|
19
|
+
console.log('== interceptor error 6');
|
|
20
|
+
const headers = await this.monkeyecxAuthenticationService.getRequestWithHeadersAsync(request);
|
|
21
|
+
console.log('== interceptor error 7');
|
|
22
|
+
console.log('headers');
|
|
23
|
+
console.log(headers);
|
|
24
|
+
return headers;
|
|
25
|
+
}
|
|
26
|
+
return throwError(error);
|
|
27
|
+
}
|
|
13
28
|
intercept(request, next) {
|
|
29
|
+
console.log('== interceptor error 1');
|
|
14
30
|
return next.handle(request).pipe(map((event) => {
|
|
31
|
+
console.log('== interceptor error 2');
|
|
15
32
|
return event;
|
|
16
33
|
}), catchError((error) => {
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
})
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
34
|
+
console.log('== interceptor error 3');
|
|
35
|
+
return from(this.handle(request, error)).pipe(take(1), map((event) => {
|
|
36
|
+
return event;
|
|
37
|
+
}), mergeMap((resp) => {
|
|
38
|
+
console.log('== interceptor error 8');
|
|
39
|
+
console.log(resp);
|
|
40
|
+
request = request.clone({
|
|
41
|
+
setHeaders: resp
|
|
42
|
+
});
|
|
43
|
+
return next.handle(request);
|
|
44
|
+
}), catchError((error) => {
|
|
45
|
+
console.log('== interceptor error 9');
|
|
46
|
+
console.log(error);
|
|
47
|
+
this.monkeyecxErrorHandlingService.handleError(error, 'refresh_token');
|
|
48
|
+
return throwError(error);
|
|
49
|
+
}));
|
|
31
50
|
}));
|
|
32
51
|
}
|
|
33
52
|
}
|
|
@@ -36,4 +55,4 @@ MonkeyEcxHttpConfigErrorInterceptor.ɵprov = i0.ɵɵngDeclareInjectable({ minVer
|
|
|
36
55
|
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: MonkeyEcxHttpConfigErrorInterceptor, decorators: [{
|
|
37
56
|
type: Injectable
|
|
38
57
|
}], ctorParameters: function () { return [{ type: i1.MonkeyEcxAuthenticationService }, { type: i2.MonkeyEcxErrorHandlingService }]; } });
|
|
39
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
58
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"monkeyecx-http-config-error.interceptor.js","sourceRoot":"","sources":["../../../../../../projects/monkey-front-core/src/lib/core/interceptors/monkeyecx-http-config-error.interceptor.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  HttpErrorResponse,\n  HttpEvent,\n  HttpHandler,\n  HttpInterceptor,\n  HttpRequest\n} from '@angular/common/http';\nimport { Injectable } from '@angular/core';\nimport { from, Observable, throwError } from 'rxjs';\nimport { catchError, map, mergeMap, take } from 'rxjs/operators';\nimport { MonkeyEcxAuthenticationService } from '../services/auth';\nimport { MonkeyEcxErrorHandlingService } from '../services/error';\n\nexport interface Headers {\n  name: string;\n  value: string;\n}\n\n@Injectable()\nexport class MonkeyEcxHttpConfigErrorInterceptor implements HttpInterceptor {\n  constructor(\n    private monkeyecxAuthenticationService: MonkeyEcxAuthenticationService,\n    private monkeyecxErrorHandlingService: MonkeyEcxErrorHandlingService\n  ) {\n    // no to do\n  }\n\n  private async handle(request: HttpRequest<any>, error: HttpErrorResponse) {\n    console.log('== interceptor error 4');\n    console.log(request.url);\n    if (this.monkeyecxAuthenticationService.refreshShouldHappen(error)) {\n      console.log('== interceptor error 5');\n      await this.monkeyecxAuthenticationService?.refreshToken();\n      console.log('== interceptor error 6');\n      const headers = await this.monkeyecxAuthenticationService.getRequestWithHeadersAsync(request);\n      console.log('== interceptor error 7');\n      console.log('headers');\n      console.log(headers);\n      return headers;\n    }\n    return throwError(error);\n  }\n\n  intercept(request: HttpRequest<any>, next: HttpHandler): Observable<HttpEvent<any>> {\n    console.log('== interceptor error 1');\n    return next.handle(request).pipe(\n      map((event: HttpEvent<any>) => {\n        console.log('== interceptor error 2');\n        return event;\n      }),\n      catchError((error: HttpErrorResponse) => {\n        console.log('== interceptor error 3');\n        return from(this.handle(request, error)).pipe(\n          take(1),\n          map((event: any) => {\n            return event;\n          }),\n          mergeMap((resp: any) => {\n            console.log('== interceptor error 8');\n            console.log(resp);\n            request = request.clone({\n              setHeaders: resp\n            });\n            return next.handle(request);\n          }),\n          catchError((error: HttpErrorResponse) => {\n            console.log('== interceptor error 9');\n            console.log(error);\n            this.monkeyecxErrorHandlingService.handleError(error, 'refresh_token');\n            return throwError(error);\n          })\n        );\n      })\n    );\n  }\n\n  /* intercept(request: HttpRequest<any>, next: HttpHandler): Observable<HttpEvent<any>> {\n    return next.handle(request).pipe(\n      map((event: HttpEvent<any>) => {\n        return event;\n      }),\n      catchError((error: HttpErrorResponse) => {\n        if (this.monkeyecxAuthenticationService.refreshShouldHappen(error)) {\n          return this.monkeyecxAuthenticationService?.refreshToken()?.pipe(\n            take(1),\n            map(() => {\n              return this.monkeyecxAuthenticationService.getRequestWithHeaders(request);\n            }),\n            mergeMap((resp: any) => {\n              return next.handle(resp).pipe(\n                catchError((error: any) => {\n                  this.monkeyecxErrorHandlingService.handleError(error, 'refresh_token');\n                  return throwError(null);\n                })\n              );\n            }),\n            catchError((error: any) => {\n              this.monkeyecxErrorHandlingService.handleError(error, 'refresh_token');\n              return throwError(null);\n            })\n          ) || throwError(error);\n        }\n        return throwError(error);\n      })\n    );\n  } */\n}\n"]}
|
|
@@ -14,6 +14,8 @@ export class MonkeyEcxHttpConfigHeaderInterceptor {
|
|
|
14
14
|
}
|
|
15
15
|
async handle(request) {
|
|
16
16
|
const { url } = request;
|
|
17
|
+
console.log('== interceptor header 2');
|
|
18
|
+
console.log(url);
|
|
17
19
|
if (this.authService.isTokenMandatory(url)) {
|
|
18
20
|
try {
|
|
19
21
|
await this.config
|
|
@@ -27,20 +29,29 @@ export class MonkeyEcxHttpConfigHeaderInterceptor {
|
|
|
27
29
|
// not to do
|
|
28
30
|
}
|
|
29
31
|
}
|
|
32
|
+
console.log('== interceptor header 3');
|
|
30
33
|
let resp = null;
|
|
31
34
|
try {
|
|
35
|
+
console.log('== interceptor header 4');
|
|
32
36
|
resp = await this.authService.getRequestWithHeadersAsync(request);
|
|
37
|
+
console.log('resp');
|
|
38
|
+
console.log(resp);
|
|
33
39
|
}
|
|
34
40
|
catch (e) {
|
|
41
|
+
console.log('== interceptor header 5');
|
|
42
|
+
console.log(e);
|
|
35
43
|
this.errorHandlingService.handleError(e);
|
|
36
44
|
return throwError(e);
|
|
37
45
|
}
|
|
38
46
|
return resp;
|
|
39
47
|
}
|
|
40
48
|
intercept(request, next) {
|
|
49
|
+
console.log('== interceptor header 1');
|
|
41
50
|
return from(this.handle(request)).pipe(take(1), map((event) => {
|
|
42
51
|
return event;
|
|
43
52
|
}), mergeMap((resp) => {
|
|
53
|
+
console.log('== interceptor header 6');
|
|
54
|
+
console.log(resp);
|
|
44
55
|
request = request.clone({
|
|
45
56
|
setHeaders: resp
|
|
46
57
|
});
|
|
@@ -56,4 +67,4 @@ MonkeyEcxHttpConfigHeaderInterceptor.ɵprov = i0.ɵɵngDeclareInjectable({ minVe
|
|
|
56
67
|
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: MonkeyEcxHttpConfigHeaderInterceptor, decorators: [{
|
|
57
68
|
type: Injectable
|
|
58
69
|
}], ctorParameters: function () { return [{ type: i1.MonkeyEcxAuthenticationService }, { type: i2.MonkeyEcxErrorHandlingService }, { type: i3.MonkeyEcxConfigService }]; } });
|
|
59
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
70
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibW9ua2V5ZWN4LWh0dHAtY29uZmlnLWhlYWRlci5pbnRlcmNlcHRvci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uL3Byb2plY3RzL21vbmtleS1mcm9udC1jb3JlL3NyYy9saWIvY29yZS9pbnRlcmNlcHRvcnMvbW9ua2V5ZWN4LWh0dHAtY29uZmlnLWhlYWRlci5pbnRlcmNlcHRvci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFPQSxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sZUFBZSxDQUFDO0FBQzNDLE9BQU8sRUFBRSxJQUFJLEVBQWMsVUFBVSxFQUFFLE1BQU0sTUFBTSxDQUFDO0FBQ3BELE9BQU8sRUFBRSxVQUFVLEVBQUUsS0FBSyxFQUFFLEdBQUcsRUFBRSxRQUFRLEVBQUUsSUFBSSxFQUFFLE1BQU0sZ0JBQWdCLENBQUM7Ozs7O0FBTXhFLE1BQU0sT0FBTyxvQ0FBb0M7SUFDL0MsWUFDVSxXQUEyQyxFQUMzQyxvQkFBbUQsRUFDbkQsTUFBOEI7UUFGOUIsZ0JBQVcsR0FBWCxXQUFXLENBQWdDO1FBQzNDLHlCQUFvQixHQUFwQixvQkFBb0IsQ0FBK0I7UUFDbkQsV0FBTSxHQUFOLE1BQU0sQ0FBd0I7UUFFdEMsWUFBWTtJQUNkLENBQUM7SUFFTyxLQUFLLENBQUMsTUFBTSxDQUFDLE9BQXlCO1FBQzVDLE1BQU0sRUFBRSxHQUFHLEVBQUUsR0FBRyxPQUFPLENBQUM7UUFDeEIsT0FBTyxDQUFDLEdBQUcsQ0FBQyx5QkFBeUIsQ0FBQyxDQUFDO1FBQ3ZDLE9BQU8sQ0FBQyxHQUFHLENBQUMsR0FBRyxDQUFDLENBQUM7UUFDakIsSUFBSSxJQUFJLENBQUMsV0FBVyxDQUFDLGdCQUFnQixDQUFDLEdBQUcsQ0FBQyxFQUFFO1lBQzFDLElBQUk7Z0JBQ0YsTUFBTSxJQUFJLENBQUMsTUFBTTtxQkFDZCxNQUFNLEVBQUU7cUJBQ1IsSUFBSSxDQUNILEtBQUssQ0FBQyxDQUFDLEdBQVEsRUFBRSxFQUFFO29CQUNqQixPQUFPLENBQUMsQ0FBQyxHQUFHLElBQUksSUFBSSxDQUFDLFNBQVMsQ0FBQyxHQUFHLENBQUMsS0FBSyxJQUFJLENBQUM7Z0JBQy9DLENBQUMsQ0FBQyxDQUNIO3FCQUNBLFNBQVMsRUFBRSxDQUFDO2FBQ2hCO1lBQUMsT0FBTyxDQUFDLEVBQUU7Z0JBQ1YsWUFBWTthQUNiO1NBQ0Y7UUFDRCxPQUFPLENBQUMsR0FBRyxDQUFDLHlCQUF5QixDQUFDLENBQUM7UUFDdkMsSUFBSSxJQUFJLEdBQUcsSUFBSSxDQUFDO1FBQ2hCLElBQUk7WUFDRixPQUFPLENBQUMsR0FBRyxDQUFDLHlCQUF5QixDQUFDLENBQUM7WUFDdkMsSUFBSSxHQUFHLE1BQU0sSUFBSSxDQUFDLFdBQVcsQ0FBQywwQkFBMEIsQ0FBQyxPQUFPLENBQUMsQ0FBQztZQUNsRSxPQUFPLENBQUMsR0FBRyxDQUFDLE1BQU0sQ0FBQyxDQUFDO1lBQ3BCLE9BQU8sQ0FBQyxHQUFHLENBQUMsSUFBSSxDQUFDLENBQUM7U0FDbkI7UUFBQyxPQUFPLENBQUMsRUFBRTtZQUNWLE9BQU8sQ0FBQyxHQUFHLENBQUMseUJBQXlCLENBQUMsQ0FBQztZQUN2QyxPQUFPLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQyxDQUFDO1lBQ2YsSUFBSSxDQUFDLG9CQUFvQixDQUFDLFdBQVcsQ0FBQyxDQUFDLENBQUMsQ0FBQztZQUN6QyxPQUFPLFVBQVUsQ0FBQyxDQUFDLENBQUMsQ0FBQztTQUN0QjtRQUVELE9BQU8sSUFBSSxDQUFDO0lBQ2QsQ0FBQztJQUVELFNBQVMsQ0FBQyxPQUF5QixFQUFFLElBQWlCO1FBQ3BELE9BQU8sQ0FBQyxHQUFHLENBQUMseUJBQXlCLENBQUMsQ0FBQztRQUN2QyxPQUFPLElBQUksQ0FBQyxJQUFJLENBQUMsTUFBTSxDQUFDLE9BQU8sQ0FBQyxDQUFDLENBQUMsSUFBSSxDQUNwQyxJQUFJLENBQUMsQ0FBQyxDQUFDLEVBQ1AsR0FBRyxDQUFDLENBQUMsS0FBVSxFQUFFLEVBQUU7WUFDakIsT0FBTyxLQUFLLENBQUM7UUFDZixDQUFDLENBQUMsRUFDRixRQUFRLENBQUMsQ0FBQyxJQUFTLEVBQUUsRUFBRTtZQUNyQixPQUFPLENBQUMsR0FBRyxDQUFDLHlCQUF5QixDQUFDLENBQUM7WUFDdkMsT0FBTyxDQUFDLEdBQUcsQ0FBQyxJQUFJLENBQUMsQ0FBQztZQUNsQixPQUFPLEdBQUcsT0FBTyxDQUFDLEtBQUssQ0FBQztnQkFDdEIsVUFBVSxFQUFFLElBQUk7YUFDakIsQ0FBQyxDQUFDO1lBQ0gsT0FBTyxJQUFJLENBQUMsTUFBTSxDQUFDLE9BQU8sQ0FBQyxDQUFDO1FBQzlCLENBQUMsQ0FBQyxFQUNGLFVBQVUsQ0FBQyxDQUFDLEtBQXdCLEVBQUUsRUFBRTtZQUN0QyxJQUFJLENBQUMsb0JBQW9CLENBQUMsV0FBVyxDQUFDLEtBQUssQ0FBQyxDQUFDO1lBQzdDLE9BQU8sVUFBVSxDQUFDLEtBQUssQ0FBQyxDQUFDO1FBQzNCLENBQUMsQ0FBQyxDQUNILENBQUM7SUFDSixDQUFDOztpSUFoRVUsb0NBQW9DO3FJQUFwQyxvQ0FBb0M7MkZBQXBDLG9DQUFvQztrQkFEaEQsVUFBVSIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7XG4gIEh0dHBFcnJvclJlc3BvbnNlLFxuICBIdHRwRXZlbnQsXG4gIEh0dHBIYW5kbGVyLFxuICBIdHRwSW50ZXJjZXB0b3IsXG4gIEh0dHBSZXF1ZXN0XG59IGZyb20gJ0Bhbmd1bGFyL2NvbW1vbi9odHRwJztcbmltcG9ydCB7IEluamVjdGFibGUgfSBmcm9tICdAYW5ndWxhci9jb3JlJztcbmltcG9ydCB7IGZyb20sIE9ic2VydmFibGUsIHRocm93RXJyb3IgfSBmcm9tICdyeGpzJztcbmltcG9ydCB7IGNhdGNoRXJyb3IsIGZpcnN0LCBtYXAsIG1lcmdlTWFwLCB0YWtlIH0gZnJvbSAncnhqcy9vcGVyYXRvcnMnO1xuaW1wb3J0IHsgTW9ua2V5RWN4Q29uZmlnU2VydmljZSB9IGZyb20gJy4uL3NlcnZpY2VzJztcbmltcG9ydCB7IE1vbmtleUVjeEF1dGhlbnRpY2F0aW9uU2VydmljZSB9IGZyb20gJy4uL3NlcnZpY2VzL2F1dGgnO1xuaW1wb3J0IHsgTW9ua2V5RWN4RXJyb3JIYW5kbGluZ1NlcnZpY2UgfSBmcm9tICcuLi9zZXJ2aWNlcy9lcnJvcic7XG5cbkBJbmplY3RhYmxlKClcbmV4cG9ydCBjbGFzcyBNb25rZXlFY3hIdHRwQ29uZmlnSGVhZGVySW50ZXJjZXB0b3IgaW1wbGVtZW50cyBIdHRwSW50ZXJjZXB0b3Ige1xuICBjb25zdHJ1Y3RvcihcbiAgICBwcml2YXRlIGF1dGhTZXJ2aWNlOiBNb25rZXlFY3hBdXRoZW50aWNhdGlvblNlcnZpY2UsXG4gICAgcHJpdmF0ZSBlcnJvckhhbmRsaW5nU2VydmljZTogTW9ua2V5RWN4RXJyb3JIYW5kbGluZ1NlcnZpY2UsXG4gICAgcHJpdmF0ZSBjb25maWc6IE1vbmtleUVjeENvbmZpZ1NlcnZpY2VcbiAgKSB7XG4gICAgLy8gbm90IHRvIGRvXG4gIH1cblxuICBwcml2YXRlIGFzeW5jIGhhbmRsZShyZXF1ZXN0OiBIdHRwUmVxdWVzdDxhbnk+KSB7XG4gICAgY29uc3QgeyB1cmwgfSA9IHJlcXVlc3Q7XG4gICAgY29uc29sZS5sb2coJz09IGludGVyY2VwdG9yIGhlYWRlciAyJyk7XG4gICAgY29uc29sZS5sb2codXJsKTtcbiAgICBpZiAodGhpcy5hdXRoU2VydmljZS5pc1Rva2VuTWFuZGF0b3J5KHVybCkpIHtcbiAgICAgIHRyeSB7XG4gICAgICAgIGF3YWl0IHRoaXMuY29uZmlnXG4gICAgICAgICAgLmNvbmZpZygpXG4gICAgICAgICAgLnBpcGUoXG4gICAgICAgICAgICBmaXJzdCgodmFsOiBhbnkpID0+IHtcbiAgICAgICAgICAgICAgcmV0dXJuICEhdmFsICYmIEpTT04uc3RyaW5naWZ5KHZhbCkgIT09ICd7fSc7XG4gICAgICAgICAgICB9KVxuICAgICAgICAgIClcbiAgICAgICAgICAudG9Qcm9taXNlKCk7XG4gICAgICB9IGNhdGNoIChlKSB7XG4gICAgICAgIC8vIG5vdCB0byBkb1xuICAgICAgfVxuICAgIH1cbiAgICBjb25zb2xlLmxvZygnPT0gaW50ZXJjZXB0b3IgaGVhZGVyIDMnKTtcbiAgICBsZXQgcmVzcCA9IG51bGw7XG4gICAgdHJ5IHtcbiAgICAgIGNvbnNvbGUubG9nKCc9PSBpbnRlcmNlcHRvciBoZWFkZXIgNCcpO1xuICAgICAgcmVzcCA9IGF3YWl0IHRoaXMuYXV0aFNlcnZpY2UuZ2V0UmVxdWVzdFdpdGhIZWFkZXJzQXN5bmMocmVxdWVzdCk7XG4gICAgICBjb25zb2xlLmxvZygncmVzcCcpO1xuICAgICAgY29uc29sZS5sb2cocmVzcCk7XG4gICAgfSBjYXRjaCAoZSkge1xuICAgICAgY29uc29sZS5sb2coJz09IGludGVyY2VwdG9yIGhlYWRlciA1Jyk7XG4gICAgICBjb25zb2xlLmxvZyhlKTtcbiAgICAgIHRoaXMuZXJyb3JIYW5kbGluZ1NlcnZpY2UuaGFuZGxlRXJyb3IoZSk7XG4gICAgICByZXR1cm4gdGhyb3dFcnJvcihlKTtcbiAgICB9XG5cbiAgICByZXR1cm4gcmVzcDtcbiAgfVxuXG4gIGludGVyY2VwdChyZXF1ZXN0OiBIdHRwUmVxdWVzdDxhbnk+LCBuZXh0OiBIdHRwSGFuZGxlcik6IE9ic2VydmFibGU8SHR0cEV2ZW50PGFueT4+IHtcbiAgICBjb25zb2xlLmxvZygnPT0gaW50ZXJjZXB0b3IgaGVhZGVyIDEnKTtcbiAgICByZXR1cm4gZnJvbSh0aGlzLmhhbmRsZShyZXF1ZXN0KSkucGlwZShcbiAgICAgIHRha2UoMSksXG4gICAgICBtYXAoKGV2ZW50OiBhbnkpID0+IHtcbiAgICAgICAgcmV0dXJuIGV2ZW50O1xuICAgICAgfSksXG4gICAgICBtZXJnZU1hcCgocmVzcDogYW55KSA9PiB7XG4gICAgICAgIGNvbnNvbGUubG9nKCc9PSBpbnRlcmNlcHRvciBoZWFkZXIgNicpO1xuICAgICAgICBjb25zb2xlLmxvZyhyZXNwKTtcbiAgICAgICAgcmVxdWVzdCA9IHJlcXVlc3QuY2xvbmUoe1xuICAgICAgICAgIHNldEhlYWRlcnM6IHJlc3BcbiAgICAgICAgfSk7XG4gICAgICAgIHJldHVybiBuZXh0LmhhbmRsZShyZXF1ZXN0KTtcbiAgICAgIH0pLFxuICAgICAgY2F0Y2hFcnJvcigoZXJyb3I6IEh0dHBFcnJvclJlc3BvbnNlKSA9PiB7XG4gICAgICAgIHRoaXMuZXJyb3JIYW5kbGluZ1NlcnZpY2UuaGFuZGxlRXJyb3IoZXJyb3IpO1xuICAgICAgICByZXR1cm4gdGhyb3dFcnJvcihlcnJvcik7XG4gICAgICB9KVxuICAgICk7XG4gIH1cbn1cbiJdfQ==
|
|
@@ -42,7 +42,7 @@ export class MonkeyEcxAuthenticationService {
|
|
|
42
42
|
console.error('refreshShouldHappen needs to be declared!');
|
|
43
43
|
return false;
|
|
44
44
|
};
|
|
45
|
-
this.refreshToken = () => {
|
|
45
|
+
this.refreshToken = async () => {
|
|
46
46
|
console.error('refreshToken needs to be declared!');
|
|
47
47
|
return null;
|
|
48
48
|
};
|
|
@@ -71,4 +71,4 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.1.1", ngImpor
|
|
|
71
71
|
type: Injectable,
|
|
72
72
|
args: [{ providedIn: 'root' }]
|
|
73
73
|
}], ctorParameters: function () { return []; } });
|
|
74
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
74
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"monkeyecx-authentication.service.js","sourceRoot":"","sources":["../../../../../../../projects/monkey-front-core/src/lib/core/services/auth/monkeyecx-authentication.service.ts"],"names":[],"mappings":"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","sourcesContent":["/* eslint-disable no-console */\nimport { HttpErrorResponse, HttpRequest } from '@angular/common/http';\nimport { Injectable } from '@angular/core';\nimport { Observable } from 'rxjs';\n\n@Injectable({ providedIn: 'root' })\nexport class MonkeyEcxAuthenticationService {\n  constructor() {\n    // not to do\n  }\n\n  hadAtLeastOneLogin = async () => {\n    console.error('hadAtLeastOneLogin needs to be declared!');\n    return null;\n  };\n\n  redirectApp = () => {\n    console.error('redirectApp needs to be declared!');\n    return null;\n  };\n\n  redirectLoginWelcomeBack = () => {\n    console.error('redirectLoginWelcomeBack needs to be declared!');\n    return null;\n  };\n\n  isAuthorized = async () => {\n    console.error('isAuthorized needs to be declared!');\n    return false;\n  };\n\n  isCompanyAuthorized = async () => {\n    console.error('isCompanyAuthorized needs to be declared!');\n    return false;\n  };\n\n  isTokenMandatory = (url: string): boolean => {\n    console.error('isTokenMandatory needs to be declared!');\n    return false;\n  };\n\n  getRequestWithHeaders = (request: HttpRequest<any>): HttpRequest<any> | any => {\n    console.error('getRequestWithHeaders needs to be declared!');\n    return null;\n  };\n\n  getRequestWithHeadersOb = (request: HttpRequest<any>): Observable<any> | any => {\n    console.error('getRequestWithHeadersOb needs to be declared!');\n    return null;\n  };\n\n  getRequestWithHeadersAsync = async (request: HttpRequest<any>) => {\n    console.error('getRequestWithHeadersAsync needs to be declared!');\n    return null;\n  };\n\n  refreshShouldHappen = (response: HttpErrorResponse): boolean => {\n    console.error('refreshShouldHappen needs to be declared!');\n    return false;\n  };\n\n  refreshToken = async () => {\n    console.error('refreshToken needs to be declared!');\n    return null;\n  };\n\n  init(args: {\n    hadAtLeastOneLogin?: any;\n    redirectApp?: any;\n    redirectLoginWelcomeBack?: any;\n    isAuthorized?: any;\n    isTokenMandatory?: any;\n    isCompanyAuthorized?: any;\n    getRequestWithHeaders?: any;\n    getRequestWithHeadersAsync?: any;\n    getRequestWithHeadersOb?: any;\n    refreshShouldHappen?: any;\n    refreshToken?: any;\n  }) {\n    this.hadAtLeastOneLogin = args?.hadAtLeastOneLogin || this.hadAtLeastOneLogin.bind(this);\n    this.redirectApp = args?.redirectApp || this.redirectApp.bind(this);\n    this.redirectLoginWelcomeBack =\n      args?.redirectLoginWelcomeBack || this.redirectLoginWelcomeBack.bind(this);\n    this.isAuthorized = args?.isAuthorized || this.isAuthorized.bind(this);\n    this.isTokenMandatory = args?.isTokenMandatory || this.isTokenMandatory.bind(this);\n    this.isCompanyAuthorized = args?.isCompanyAuthorized || this.isCompanyAuthorized.bind(this);\n    this.getRequestWithHeaders =\n      args?.getRequestWithHeaders || this.getRequestWithHeaders.bind(this);\n    this.getRequestWithHeadersAsync =\n      args?.getRequestWithHeadersAsync || this.getRequestWithHeadersAsync.bind(this);\n    this.getRequestWithHeadersOb = args?.getRequestWithHeadersOb.bind(this);\n    this.refreshShouldHappen = args?.refreshShouldHappen || this.refreshShouldHappen.bind(this);\n    this.refreshToken = args?.refreshToken || this.refreshToken.bind(this);\n  }\n}\n"]}
|
|
@@ -4054,10 +4054,10 @@ class MonkeyEcxAuthenticationService {
|
|
|
4054
4054
|
console.error('refreshShouldHappen needs to be declared!');
|
|
4055
4055
|
return false;
|
|
4056
4056
|
};
|
|
4057
|
-
this.refreshToken = () => {
|
|
4057
|
+
this.refreshToken = () => __awaiter(this, void 0, void 0, function* () {
|
|
4058
4058
|
console.error('refreshToken needs to be declared!');
|
|
4059
4059
|
return null;
|
|
4060
|
-
};
|
|
4060
|
+
});
|
|
4061
4061
|
// not to do
|
|
4062
4062
|
}
|
|
4063
4063
|
init(args) {
|
|
@@ -5235,25 +5235,46 @@ class MonkeyEcxHttpConfigErrorInterceptor {
|
|
|
5235
5235
|
this.monkeyecxErrorHandlingService = monkeyecxErrorHandlingService;
|
|
5236
5236
|
// no to do
|
|
5237
5237
|
}
|
|
5238
|
+
handle(request, error) {
|
|
5239
|
+
var _a;
|
|
5240
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
5241
|
+
console.log('== interceptor error 4');
|
|
5242
|
+
console.log(request.url);
|
|
5243
|
+
if (this.monkeyecxAuthenticationService.refreshShouldHappen(error)) {
|
|
5244
|
+
console.log('== interceptor error 5');
|
|
5245
|
+
yield ((_a = this.monkeyecxAuthenticationService) === null || _a === void 0 ? void 0 : _a.refreshToken());
|
|
5246
|
+
console.log('== interceptor error 6');
|
|
5247
|
+
const headers = yield this.monkeyecxAuthenticationService.getRequestWithHeadersAsync(request);
|
|
5248
|
+
console.log('== interceptor error 7');
|
|
5249
|
+
console.log('headers');
|
|
5250
|
+
console.log(headers);
|
|
5251
|
+
return headers;
|
|
5252
|
+
}
|
|
5253
|
+
return throwError(error);
|
|
5254
|
+
});
|
|
5255
|
+
}
|
|
5238
5256
|
intercept(request, next) {
|
|
5257
|
+
console.log('== interceptor error 1');
|
|
5239
5258
|
return next.handle(request).pipe(map((event) => {
|
|
5259
|
+
console.log('== interceptor error 2');
|
|
5240
5260
|
return event;
|
|
5241
5261
|
}), catchError((error) => {
|
|
5242
|
-
|
|
5243
|
-
|
|
5244
|
-
return
|
|
5245
|
-
|
|
5246
|
-
|
|
5247
|
-
|
|
5248
|
-
|
|
5249
|
-
|
|
5250
|
-
|
|
5251
|
-
|
|
5252
|
-
|
|
5253
|
-
|
|
5254
|
-
|
|
5255
|
-
|
|
5256
|
-
|
|
5262
|
+
console.log('== interceptor error 3');
|
|
5263
|
+
return from(this.handle(request, error)).pipe(take(1), map((event) => {
|
|
5264
|
+
return event;
|
|
5265
|
+
}), mergeMap((resp) => {
|
|
5266
|
+
console.log('== interceptor error 8');
|
|
5267
|
+
console.log(resp);
|
|
5268
|
+
request = request.clone({
|
|
5269
|
+
setHeaders: resp
|
|
5270
|
+
});
|
|
5271
|
+
return next.handle(request);
|
|
5272
|
+
}), catchError((error) => {
|
|
5273
|
+
console.log('== interceptor error 9');
|
|
5274
|
+
console.log(error);
|
|
5275
|
+
this.monkeyecxErrorHandlingService.handleError(error, 'refresh_token');
|
|
5276
|
+
return throwError(error);
|
|
5277
|
+
}));
|
|
5257
5278
|
}));
|
|
5258
5279
|
}
|
|
5259
5280
|
}
|
|
@@ -5273,6 +5294,8 @@ class MonkeyEcxHttpConfigHeaderInterceptor {
|
|
|
5273
5294
|
handle(request) {
|
|
5274
5295
|
return __awaiter(this, void 0, void 0, function* () {
|
|
5275
5296
|
const { url } = request;
|
|
5297
|
+
console.log('== interceptor header 2');
|
|
5298
|
+
console.log(url);
|
|
5276
5299
|
if (this.authService.isTokenMandatory(url)) {
|
|
5277
5300
|
try {
|
|
5278
5301
|
yield this.config
|
|
@@ -5286,11 +5309,17 @@ class MonkeyEcxHttpConfigHeaderInterceptor {
|
|
|
5286
5309
|
// not to do
|
|
5287
5310
|
}
|
|
5288
5311
|
}
|
|
5312
|
+
console.log('== interceptor header 3');
|
|
5289
5313
|
let resp = null;
|
|
5290
5314
|
try {
|
|
5315
|
+
console.log('== interceptor header 4');
|
|
5291
5316
|
resp = yield this.authService.getRequestWithHeadersAsync(request);
|
|
5317
|
+
console.log('resp');
|
|
5318
|
+
console.log(resp);
|
|
5292
5319
|
}
|
|
5293
5320
|
catch (e) {
|
|
5321
|
+
console.log('== interceptor header 5');
|
|
5322
|
+
console.log(e);
|
|
5294
5323
|
this.errorHandlingService.handleError(e);
|
|
5295
5324
|
return throwError(e);
|
|
5296
5325
|
}
|
|
@@ -5298,9 +5327,12 @@ class MonkeyEcxHttpConfigHeaderInterceptor {
|
|
|
5298
5327
|
});
|
|
5299
5328
|
}
|
|
5300
5329
|
intercept(request, next) {
|
|
5330
|
+
console.log('== interceptor header 1');
|
|
5301
5331
|
return from(this.handle(request)).pipe(take(1), map((event) => {
|
|
5302
5332
|
return event;
|
|
5303
5333
|
}), mergeMap((resp) => {
|
|
5334
|
+
console.log('== interceptor header 6');
|
|
5335
|
+
console.log(resp);
|
|
5304
5336
|
request = request.clone({
|
|
5305
5337
|
setHeaders: resp
|
|
5306
5338
|
});
|