monkey-front-core 0.0.305 → 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 +20 -10
- package/esm2020/lib/core/services/auth/monkeyecx-auth-guard-company.service.mjs +4 -4
- package/esm2020/lib/core/services/auth/monkeyecx-auth-guard-login.service.mjs +4 -4
- package/esm2020/lib/core/services/auth/monkeyecx-auth-guard.service.mjs +3 -3
- package/esm2020/lib/core/services/auth/monkeyecx-authentication.service.mjs +11 -6
- package/fesm2015/monkey-front-core.mjs +98 -56
- package/fesm2015/monkey-front-core.mjs.map +1 -1
- package/fesm2020/monkey-front-core.mjs +70 -36
- 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/interceptors/monkeyecx-http-config-header.interceptor.d.ts +2 -2
- package/lib/core/services/auth/monkeyecx-auth-guard-company.service.d.ts +1 -2
- package/lib/core/services/auth/monkeyecx-auth-guard-login.service.d.ts +1 -2
- package/lib/core/services/auth/monkeyecx-auth-guard.service.d.ts +1 -2
- package/lib/core/services/auth/monkeyecx-authentication.service.d.ts +7 -5
- package/monkey-front-core-0.0.307.tgz +0 -0
- package/package.json +1 -1
- package/monkey-front-core-0.0.305.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,21 +29,29 @@ export class MonkeyEcxHttpConfigHeaderInterceptor {
|
|
|
27
29
|
// not to do
|
|
28
30
|
}
|
|
29
31
|
}
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
}
|
|
38
|
-
|
|
32
|
+
console.log('== interceptor header 3');
|
|
33
|
+
let resp = null;
|
|
34
|
+
try {
|
|
35
|
+
console.log('== interceptor header 4');
|
|
36
|
+
resp = await this.authService.getRequestWithHeadersAsync(request);
|
|
37
|
+
console.log('resp');
|
|
38
|
+
console.log(resp);
|
|
39
|
+
}
|
|
40
|
+
catch (e) {
|
|
41
|
+
console.log('== interceptor header 5');
|
|
42
|
+
console.log(e);
|
|
43
|
+
this.errorHandlingService.handleError(e);
|
|
44
|
+
return throwError(e);
|
|
45
|
+
}
|
|
39
46
|
return resp;
|
|
40
47
|
}
|
|
41
48
|
intercept(request, next) {
|
|
49
|
+
console.log('== interceptor header 1');
|
|
42
50
|
return from(this.handle(request)).pipe(take(1), map((event) => {
|
|
43
51
|
return event;
|
|
44
52
|
}), mergeMap((resp) => {
|
|
53
|
+
console.log('== interceptor header 6');
|
|
54
|
+
console.log(resp);
|
|
45
55
|
request = request.clone({
|
|
46
56
|
setHeaders: resp
|
|
47
57
|
});
|
|
@@ -57,4 +67,4 @@ MonkeyEcxHttpConfigHeaderInterceptor.ɵprov = i0.ɵɵngDeclareInjectable({ minVe
|
|
|
57
67
|
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: MonkeyEcxHttpConfigHeaderInterceptor, decorators: [{
|
|
58
68
|
type: Injectable
|
|
59
69
|
}], ctorParameters: function () { return [{ type: i1.MonkeyEcxAuthenticationService }, { type: i2.MonkeyEcxErrorHandlingService }, { type: i3.MonkeyEcxConfigService }]; } });
|
|
60
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
70
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibW9ua2V5ZWN4LWh0dHAtY29uZmlnLWhlYWRlci5pbnRlcmNlcHRvci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uL3Byb2plY3RzL21vbmtleS1mcm9udC1jb3JlL3NyYy9saWIvY29yZS9pbnRlcmNlcHRvcnMvbW9ua2V5ZWN4LWh0dHAtY29uZmlnLWhlYWRlci5pbnRlcmNlcHRvci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFPQSxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sZUFBZSxDQUFDO0FBQzNDLE9BQU8sRUFBRSxJQUFJLEVBQWMsVUFBVSxFQUFFLE1BQU0sTUFBTSxDQUFDO0FBQ3BELE9BQU8sRUFBRSxVQUFVLEVBQUUsS0FBSyxFQUFFLEdBQUcsRUFBRSxRQUFRLEVBQUUsSUFBSSxFQUFFLE1BQU0sZ0JBQWdCLENBQUM7Ozs7O0FBTXhFLE1BQU0sT0FBTyxvQ0FBb0M7SUFDL0MsWUFDVSxXQUEyQyxFQUMzQyxvQkFBbUQsRUFDbkQsTUFBOEI7UUFGOUIsZ0JBQVcsR0FBWCxXQUFXLENBQWdDO1FBQzNDLHlCQUFvQixHQUFwQixvQkFBb0IsQ0FBK0I7UUFDbkQsV0FBTSxHQUFOLE1BQU0sQ0FBd0I7UUFFdEMsWUFBWTtJQUNkLENBQUM7SUFFTyxLQUFLLENBQUMsTUFBTSxDQUFDLE9BQXlCO1FBQzVDLE1BQU0sRUFBRSxHQUFHLEVBQUUsR0FBRyxPQUFPLENBQUM7UUFDeEIsT0FBTyxDQUFDLEdBQUcsQ0FBQyx5QkFBeUIsQ0FBQyxDQUFDO1FBQ3ZDLE9BQU8sQ0FBQyxHQUFHLENBQUMsR0FBRyxDQUFDLENBQUM7UUFDakIsSUFBSSxJQUFJLENBQUMsV0FBVyxDQUFDLGdCQUFnQixDQUFDLEdBQUcsQ0FBQyxFQUFFO1lBQzFDLElBQUk7Z0JBQ0YsTUFBTSxJQUFJLENBQUMsTUFBTTtxQkFDZCxNQUFNLEVBQUU7cUJBQ1IsSUFBSSxDQUNILEtBQUssQ0FBQyxDQUFDLEdBQVEsRUFBRSxFQUFFO29CQUNqQixPQUFPLENBQUMsQ0FBQyxHQUFHLElBQUksSUFBSSxDQUFDLFNBQVMsQ0FBQyxHQUFHLENBQUMsS0FBSyxJQUFJLENBQUM7Z0JBQy9DLENBQUMsQ0FBQyxDQUNIO3FCQUNBLFNBQVMsRUFBRSxDQUFDO2FBQ2hCO1lBQUMsT0FBTyxDQUFDLEVBQUU7Z0JBQ1YsWUFBWTthQUNiO1NBQ0Y7UUFDRCxPQUFPLENBQUMsR0FBRyxDQUFDLHlCQUF5QixDQUFDLENBQUM7UUFDdkMsSUFBSSxJQUFJLEdBQUcsSUFBSSxDQUFDO1FBQ2hCLElBQUk7WUFDRixPQUFPLENBQUMsR0FBRyxDQUFDLHlCQUF5QixDQUFDLENBQUM7WUFDdkMsSUFBSSxHQUFHLE1BQU0sSUFBSSxDQUFDLFdBQVcsQ0FBQywwQkFBMEIsQ0FBQyxPQUFPLENBQUMsQ0FBQztZQUNsRSxPQUFPLENBQUMsR0FBRyxDQUFDLE1BQU0sQ0FBQyxDQUFDO1lBQ3BCLE9BQU8sQ0FBQyxHQUFHLENBQUMsSUFBSSxDQUFDLENBQUM7U0FDbkI7UUFBQyxPQUFPLENBQUMsRUFBRTtZQUNWLE9BQU8sQ0FBQyxHQUFHLENBQUMseUJBQXlCLENBQUMsQ0FBQztZQUN2QyxPQUFPLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQyxDQUFDO1lBQ2YsSUFBSSxDQUFDLG9CQUFvQixDQUFDLFdBQVcsQ0FBQyxDQUFDLENBQUMsQ0FBQztZQUN6QyxPQUFPLFVBQVUsQ0FBQyxDQUFDLENBQUMsQ0FBQztTQUN0QjtRQUVELE9BQU8sSUFBSSxDQUFDO0lBQ2QsQ0FBQztJQUVELFNBQVMsQ0FBQyxPQUF5QixFQUFFLElBQWlCO1FBQ3BELE9BQU8sQ0FBQyxHQUFHLENBQUMseUJBQXlCLENBQUMsQ0FBQztRQUN2QyxPQUFPLElBQUksQ0FBQyxJQUFJLENBQUMsTUFBTSxDQUFDLE9BQU8sQ0FBQyxDQUFDLENBQUMsSUFBSSxDQUNwQyxJQUFJLENBQUMsQ0FBQyxDQUFDLEVBQ1AsR0FBRyxDQUFDLENBQUMsS0FBVSxFQUFFLEVBQUU7WUFDakIsT0FBTyxLQUFLLENBQUM7UUFDZixDQUFDLENBQUMsRUFDRixRQUFRLENBQUMsQ0FBQyxJQUFTLEVBQUUsRUFBRTtZQUNyQixPQUFPLENBQUMsR0FBRyxDQUFDLHlCQUF5QixDQUFDLENBQUM7WUFDdkMsT0FBTyxDQUFDLEdBQUcsQ0FBQyxJQUFJLENBQUMsQ0FBQztZQUNsQixPQUFPLEdBQUcsT0FBTyxDQUFDLEtBQUssQ0FBQztnQkFDdEIsVUFBVSxFQUFFLElBQUk7YUFDakIsQ0FBQyxDQUFDO1lBQ0gsT0FBTyxJQUFJLENBQUMsTUFBTSxDQUFDLE9BQU8sQ0FBQyxDQUFDO1FBQzlCLENBQUMsQ0FBQyxFQUNGLFVBQVUsQ0FBQyxDQUFDLEtBQXdCLEVBQUUsRUFBRTtZQUN0QyxJQUFJLENBQUMsb0JBQW9CLENBQUMsV0FBVyxDQUFDLEtBQUssQ0FBQyxDQUFDO1lBQzdDLE9BQU8sVUFBVSxDQUFDLEtBQUssQ0FBQyxDQUFDO1FBQzNCLENBQUMsQ0FBQyxDQUNILENBQUM7SUFDSixDQUFDOztpSUFoRVUsb0NBQW9DO3FJQUFwQyxvQ0FBb0M7MkZBQXBDLG9DQUFvQztrQkFEaEQsVUFBVSIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7XG4gIEh0dHBFcnJvclJlc3BvbnNlLFxuICBIdHRwRXZlbnQsXG4gIEh0dHBIYW5kbGVyLFxuICBIdHRwSW50ZXJjZXB0b3IsXG4gIEh0dHBSZXF1ZXN0XG59IGZyb20gJ0Bhbmd1bGFyL2NvbW1vbi9odHRwJztcbmltcG9ydCB7IEluamVjdGFibGUgfSBmcm9tICdAYW5ndWxhci9jb3JlJztcbmltcG9ydCB7IGZyb20sIE9ic2VydmFibGUsIHRocm93RXJyb3IgfSBmcm9tICdyeGpzJztcbmltcG9ydCB7IGNhdGNoRXJyb3IsIGZpcnN0LCBtYXAsIG1lcmdlTWFwLCB0YWtlIH0gZnJvbSAncnhqcy9vcGVyYXRvcnMnO1xuaW1wb3J0IHsgTW9ua2V5RWN4Q29uZmlnU2VydmljZSB9IGZyb20gJy4uL3NlcnZpY2VzJztcbmltcG9ydCB7IE1vbmtleUVjeEF1dGhlbnRpY2F0aW9uU2VydmljZSB9IGZyb20gJy4uL3NlcnZpY2VzL2F1dGgnO1xuaW1wb3J0IHsgTW9ua2V5RWN4RXJyb3JIYW5kbGluZ1NlcnZpY2UgfSBmcm9tICcuLi9zZXJ2aWNlcy9lcnJvcic7XG5cbkBJbmplY3RhYmxlKClcbmV4cG9ydCBjbGFzcyBNb25rZXlFY3hIdHRwQ29uZmlnSGVhZGVySW50ZXJjZXB0b3IgaW1wbGVtZW50cyBIdHRwSW50ZXJjZXB0b3Ige1xuICBjb25zdHJ1Y3RvcihcbiAgICBwcml2YXRlIGF1dGhTZXJ2aWNlOiBNb25rZXlFY3hBdXRoZW50aWNhdGlvblNlcnZpY2UsXG4gICAgcHJpdmF0ZSBlcnJvckhhbmRsaW5nU2VydmljZTogTW9ua2V5RWN4RXJyb3JIYW5kbGluZ1NlcnZpY2UsXG4gICAgcHJpdmF0ZSBjb25maWc6IE1vbmtleUVjeENvbmZpZ1NlcnZpY2VcbiAgKSB7XG4gICAgLy8gbm90IHRvIGRvXG4gIH1cblxuICBwcml2YXRlIGFzeW5jIGhhbmRsZShyZXF1ZXN0OiBIdHRwUmVxdWVzdDxhbnk+KSB7XG4gICAgY29uc3QgeyB1cmwgfSA9IHJlcXVlc3Q7XG4gICAgY29uc29sZS5sb2coJz09IGludGVyY2VwdG9yIGhlYWRlciAyJyk7XG4gICAgY29uc29sZS5sb2codXJsKTtcbiAgICBpZiAodGhpcy5hdXRoU2VydmljZS5pc1Rva2VuTWFuZGF0b3J5KHVybCkpIHtcbiAgICAgIHRyeSB7XG4gICAgICAgIGF3YWl0IHRoaXMuY29uZmlnXG4gICAgICAgICAgLmNvbmZpZygpXG4gICAgICAgICAgLnBpcGUoXG4gICAgICAgICAgICBmaXJzdCgodmFsOiBhbnkpID0+IHtcbiAgICAgICAgICAgICAgcmV0dXJuICEhdmFsICYmIEpTT04uc3RyaW5naWZ5KHZhbCkgIT09ICd7fSc7XG4gICAgICAgICAgICB9KVxuICAgICAgICAgIClcbiAgICAgICAgICAudG9Qcm9taXNlKCk7XG4gICAgICB9IGNhdGNoIChlKSB7XG4gICAgICAgIC8vIG5vdCB0byBkb1xuICAgICAgfVxuICAgIH1cbiAgICBjb25zb2xlLmxvZygnPT0gaW50ZXJjZXB0b3IgaGVhZGVyIDMnKTtcbiAgICBsZXQgcmVzcCA9IG51bGw7XG4gICAgdHJ5IHtcbiAgICAgIGNvbnNvbGUubG9nKCc9PSBpbnRlcmNlcHRvciBoZWFkZXIgNCcpO1xuICAgICAgcmVzcCA9IGF3YWl0IHRoaXMuYXV0aFNlcnZpY2UuZ2V0UmVxdWVzdFdpdGhIZWFkZXJzQXN5bmMocmVxdWVzdCk7XG4gICAgICBjb25zb2xlLmxvZygncmVzcCcpO1xuICAgICAgY29uc29sZS5sb2cocmVzcCk7XG4gICAgfSBjYXRjaCAoZSkge1xuICAgICAgY29uc29sZS5sb2coJz09IGludGVyY2VwdG9yIGhlYWRlciA1Jyk7XG4gICAgICBjb25zb2xlLmxvZyhlKTtcbiAgICAgIHRoaXMuZXJyb3JIYW5kbGluZ1NlcnZpY2UuaGFuZGxlRXJyb3IoZSk7XG4gICAgICByZXR1cm4gdGhyb3dFcnJvcihlKTtcbiAgICB9XG5cbiAgICByZXR1cm4gcmVzcDtcbiAgfVxuXG4gIGludGVyY2VwdChyZXF1ZXN0OiBIdHRwUmVxdWVzdDxhbnk+LCBuZXh0OiBIdHRwSGFuZGxlcik6IE9ic2VydmFibGU8SHR0cEV2ZW50PGFueT4+IHtcbiAgICBjb25zb2xlLmxvZygnPT0gaW50ZXJjZXB0b3IgaGVhZGVyIDEnKTtcbiAgICByZXR1cm4gZnJvbSh0aGlzLmhhbmRsZShyZXF1ZXN0KSkucGlwZShcbiAgICAgIHRha2UoMSksXG4gICAgICBtYXAoKGV2ZW50OiBhbnkpID0+IHtcbiAgICAgICAgcmV0dXJuIGV2ZW50O1xuICAgICAgfSksXG4gICAgICBtZXJnZU1hcCgocmVzcDogYW55KSA9PiB7XG4gICAgICAgIGNvbnNvbGUubG9nKCc9PSBpbnRlcmNlcHRvciBoZWFkZXIgNicpO1xuICAgICAgICBjb25zb2xlLmxvZyhyZXNwKTtcbiAgICAgICAgcmVxdWVzdCA9IHJlcXVlc3QuY2xvbmUoe1xuICAgICAgICAgIHNldEhlYWRlcnM6IHJlc3BcbiAgICAgICAgfSk7XG4gICAgICAgIHJldHVybiBuZXh0LmhhbmRsZShyZXF1ZXN0KTtcbiAgICAgIH0pLFxuICAgICAgY2F0Y2hFcnJvcigoZXJyb3I6IEh0dHBFcnJvclJlc3BvbnNlKSA9PiB7XG4gICAgICAgIHRoaXMuZXJyb3JIYW5kbGluZ1NlcnZpY2UuaGFuZGxlRXJyb3IoZXJyb3IpO1xuICAgICAgICByZXR1cm4gdGhyb3dFcnJvcihlcnJvcik7XG4gICAgICB9KVxuICAgICk7XG4gIH1cbn1cbiJdfQ==
|
|
@@ -6,10 +6,10 @@ export class MonkeyEcxAuthGuardCompany {
|
|
|
6
6
|
this.monkeyecxAuthenticationService = monkeyecxAuthenticationService;
|
|
7
7
|
// not to do
|
|
8
8
|
}
|
|
9
|
-
canActivate() {
|
|
9
|
+
async canActivate() {
|
|
10
10
|
const { monkeyecxAuthenticationService } = this;
|
|
11
|
-
if (this.monkeyecxAuthenticationService.isAuthorized()) {
|
|
12
|
-
if (monkeyecxAuthenticationService.isCompanyAuthorized()) {
|
|
11
|
+
if (await this.monkeyecxAuthenticationService.isAuthorized()) {
|
|
12
|
+
if (await monkeyecxAuthenticationService.isCompanyAuthorized()) {
|
|
13
13
|
return true;
|
|
14
14
|
}
|
|
15
15
|
this.monkeyecxAuthenticationService.redirectApp();
|
|
@@ -25,4 +25,4 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.1.1", ngImpor
|
|
|
25
25
|
type: Injectable,
|
|
26
26
|
args: [{ providedIn: 'root' }]
|
|
27
27
|
}], ctorParameters: function () { return [{ type: i1.MonkeyEcxAuthenticationService }]; } });
|
|
28
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
28
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibW9ua2V5ZWN4LWF1dGgtZ3VhcmQtY29tcGFueS5zZXJ2aWNlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vLi4vLi4vcHJvamVjdHMvbW9ua2V5LWZyb250LWNvcmUvc3JjL2xpYi9jb3JlL3NlcnZpY2VzL2F1dGgvbW9ua2V5ZWN4LWF1dGgtZ3VhcmQtY29tcGFueS5zZXJ2aWNlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSxlQUFlLENBQUM7OztBQUszQyxNQUFNLE9BQU8seUJBQXlCO0lBQ3BDLFlBQW9CLDhCQUE4RDtRQUE5RCxtQ0FBOEIsR0FBOUIsOEJBQThCLENBQWdDO1FBQ2hGLFlBQVk7SUFDZCxDQUFDO0lBRUQsS0FBSyxDQUFDLFdBQVc7UUFDZixNQUFNLEVBQUUsOEJBQThCLEVBQUUsR0FBRyxJQUFJLENBQUM7UUFFaEQsSUFBSSxNQUFNLElBQUksQ0FBQyw4QkFBOEIsQ0FBQyxZQUFZLEVBQUUsRUFBRTtZQUM1RCxJQUFJLE1BQU0sOEJBQThCLENBQUMsbUJBQW1CLEVBQUUsRUFBRTtnQkFDOUQsT0FBTyxJQUFJLENBQUM7YUFDYjtZQUNELElBQUksQ0FBQyw4QkFBOEIsQ0FBQyxXQUFXLEVBQUUsQ0FBQztZQUNsRCxPQUFPLEtBQUssQ0FBQztTQUNkO1FBRUQsOEJBQThCLENBQUMsd0JBQXdCLEVBQUUsQ0FBQztRQUUxRCxPQUFPLEtBQUssQ0FBQztJQUNmLENBQUM7O3NIQW5CVSx5QkFBeUI7MEhBQXpCLHlCQUF5QixjQURaLE1BQU07MkZBQ25CLHlCQUF5QjtrQkFEckMsVUFBVTttQkFBQyxFQUFFLFVBQVUsRUFBRSxNQUFNLEVBQUUiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBJbmplY3RhYmxlIH0gZnJvbSAnQGFuZ3VsYXIvY29yZSc7XG5pbXBvcnQgeyBDYW5BY3RpdmF0ZSB9IGZyb20gJ0Bhbmd1bGFyL3JvdXRlcic7XG5pbXBvcnQgeyBNb25rZXlFY3hBdXRoZW50aWNhdGlvblNlcnZpY2UgfSBmcm9tICcuL21vbmtleWVjeC1hdXRoZW50aWNhdGlvbi5zZXJ2aWNlJztcblxuQEluamVjdGFibGUoeyBwcm92aWRlZEluOiAncm9vdCcgfSlcbmV4cG9ydCBjbGFzcyBNb25rZXlFY3hBdXRoR3VhcmRDb21wYW55IGltcGxlbWVudHMgQ2FuQWN0aXZhdGUge1xuICBjb25zdHJ1Y3Rvcihwcml2YXRlIG1vbmtleWVjeEF1dGhlbnRpY2F0aW9uU2VydmljZTogTW9ua2V5RWN4QXV0aGVudGljYXRpb25TZXJ2aWNlKSB7XG4gICAgLy8gbm90IHRvIGRvXG4gIH1cblxuICBhc3luYyBjYW5BY3RpdmF0ZSgpOiBQcm9taXNlPGJvb2xlYW4+IHtcbiAgICBjb25zdCB7IG1vbmtleWVjeEF1dGhlbnRpY2F0aW9uU2VydmljZSB9ID0gdGhpcztcblxuICAgIGlmIChhd2FpdCB0aGlzLm1vbmtleWVjeEF1dGhlbnRpY2F0aW9uU2VydmljZS5pc0F1dGhvcml6ZWQoKSkge1xuICAgICAgaWYgKGF3YWl0IG1vbmtleWVjeEF1dGhlbnRpY2F0aW9uU2VydmljZS5pc0NvbXBhbnlBdXRob3JpemVkKCkpIHtcbiAgICAgICAgcmV0dXJuIHRydWU7XG4gICAgICB9XG4gICAgICB0aGlzLm1vbmtleWVjeEF1dGhlbnRpY2F0aW9uU2VydmljZS5yZWRpcmVjdEFwcCgpO1xuICAgICAgcmV0dXJuIGZhbHNlO1xuICAgIH1cblxuICAgIG1vbmtleWVjeEF1dGhlbnRpY2F0aW9uU2VydmljZS5yZWRpcmVjdExvZ2luV2VsY29tZUJhY2soKTtcblxuICAgIHJldHVybiBmYWxzZTtcbiAgfVxufVxuIl19
|
|
@@ -6,12 +6,12 @@ export class MonkeyEcxAuthGuardLogin {
|
|
|
6
6
|
this.monkeyecxAuthenticationService = monkeyecxAuthenticationService;
|
|
7
7
|
// not to do
|
|
8
8
|
}
|
|
9
|
-
canActivate() {
|
|
10
|
-
if (this.monkeyecxAuthenticationService.isAuthorized()) {
|
|
9
|
+
async canActivate() {
|
|
10
|
+
if (await this.monkeyecxAuthenticationService.isAuthorized()) {
|
|
11
11
|
this.monkeyecxAuthenticationService.redirectApp();
|
|
12
12
|
return false;
|
|
13
13
|
}
|
|
14
|
-
if (this.monkeyecxAuthenticationService.hadAtLeastOneLogin()) {
|
|
14
|
+
if (await this.monkeyecxAuthenticationService.hadAtLeastOneLogin()) {
|
|
15
15
|
this.monkeyecxAuthenticationService.redirectLoginWelcomeBack();
|
|
16
16
|
return false;
|
|
17
17
|
}
|
|
@@ -24,4 +24,4 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.1.1", ngImpor
|
|
|
24
24
|
type: Injectable,
|
|
25
25
|
args: [{ providedIn: 'root' }]
|
|
26
26
|
}], ctorParameters: function () { return [{ type: i1.MonkeyEcxAuthenticationService }]; } });
|
|
27
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
27
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibW9ua2V5ZWN4LWF1dGgtZ3VhcmQtbG9naW4uc2VydmljZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uLy4uL3Byb2plY3RzL21vbmtleS1mcm9udC1jb3JlL3NyYy9saWIvY29yZS9zZXJ2aWNlcy9hdXRoL21vbmtleWVjeC1hdXRoLWd1YXJkLWxvZ2luLnNlcnZpY2UudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLGVBQWUsQ0FBQzs7O0FBSzNDLE1BQU0sT0FBTyx1QkFBdUI7SUFDbEMsWUFBb0IsOEJBQThEO1FBQTlELG1DQUE4QixHQUE5Qiw4QkFBOEIsQ0FBZ0M7UUFDaEYsWUFBWTtJQUNkLENBQUM7SUFFRCxLQUFLLENBQUMsV0FBVztRQUNmLElBQUksTUFBTSxJQUFJLENBQUMsOEJBQThCLENBQUMsWUFBWSxFQUFFLEVBQUU7WUFDNUQsSUFBSSxDQUFDLDhCQUE4QixDQUFDLFdBQVcsRUFBRSxDQUFDO1lBQ2xELE9BQU8sS0FBSyxDQUFDO1NBQ2Q7UUFDRCxJQUFJLE1BQU0sSUFBSSxDQUFDLDhCQUE4QixDQUFDLGtCQUFrQixFQUFFLEVBQUU7WUFDbEUsSUFBSSxDQUFDLDhCQUE4QixDQUFDLHdCQUF3QixFQUFFLENBQUM7WUFDL0QsT0FBTyxLQUFLLENBQUM7U0FDZDtRQUNELE9BQU8sSUFBSSxDQUFDO0lBQ2QsQ0FBQzs7b0hBZlUsdUJBQXVCO3dIQUF2Qix1QkFBdUIsY0FEVixNQUFNOzJGQUNuQix1QkFBdUI7a0JBRG5DLFVBQVU7bUJBQUMsRUFBRSxVQUFVLEVBQUUsTUFBTSxFQUFFIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgSW5qZWN0YWJsZSB9IGZyb20gJ0Bhbmd1bGFyL2NvcmUnO1xuaW1wb3J0IHsgQ2FuQWN0aXZhdGUgfSBmcm9tICdAYW5ndWxhci9yb3V0ZXInO1xuaW1wb3J0IHsgTW9ua2V5RWN4QXV0aGVudGljYXRpb25TZXJ2aWNlIH0gZnJvbSAnLi9tb25rZXllY3gtYXV0aGVudGljYXRpb24uc2VydmljZSc7XG5cbkBJbmplY3RhYmxlKHsgcHJvdmlkZWRJbjogJ3Jvb3QnIH0pXG5leHBvcnQgY2xhc3MgTW9ua2V5RWN4QXV0aEd1YXJkTG9naW4gaW1wbGVtZW50cyBDYW5BY3RpdmF0ZSB7XG4gIGNvbnN0cnVjdG9yKHByaXZhdGUgbW9ua2V5ZWN4QXV0aGVudGljYXRpb25TZXJ2aWNlOiBNb25rZXlFY3hBdXRoZW50aWNhdGlvblNlcnZpY2UpIHtcbiAgICAvLyBub3QgdG8gZG9cbiAgfVxuXG4gIGFzeW5jIGNhbkFjdGl2YXRlKCk6IFByb21pc2U8Ym9vbGVhbj4ge1xuICAgIGlmIChhd2FpdCB0aGlzLm1vbmtleWVjeEF1dGhlbnRpY2F0aW9uU2VydmljZS5pc0F1dGhvcml6ZWQoKSkge1xuICAgICAgdGhpcy5tb25rZXllY3hBdXRoZW50aWNhdGlvblNlcnZpY2UucmVkaXJlY3RBcHAoKTtcbiAgICAgIHJldHVybiBmYWxzZTtcbiAgICB9XG4gICAgaWYgKGF3YWl0IHRoaXMubW9ua2V5ZWN4QXV0aGVudGljYXRpb25TZXJ2aWNlLmhhZEF0TGVhc3RPbmVMb2dpbigpKSB7XG4gICAgICB0aGlzLm1vbmtleWVjeEF1dGhlbnRpY2F0aW9uU2VydmljZS5yZWRpcmVjdExvZ2luV2VsY29tZUJhY2soKTtcbiAgICAgIHJldHVybiBmYWxzZTtcbiAgICB9XG4gICAgcmV0dXJuIHRydWU7XG4gIH1cbn1cbiJdfQ==
|
|
@@ -6,9 +6,9 @@ export class MonkeyEcxAuthGuard {
|
|
|
6
6
|
this.monkeyecxAuthenticationService = monkeyecxAuthenticationService;
|
|
7
7
|
// not to do
|
|
8
8
|
}
|
|
9
|
-
canActivate() {
|
|
9
|
+
async canActivate() {
|
|
10
10
|
const { monkeyecxAuthenticationService } = this;
|
|
11
|
-
if (monkeyecxAuthenticationService.isAuthorized()) {
|
|
11
|
+
if (await monkeyecxAuthenticationService.isAuthorized()) {
|
|
12
12
|
return true;
|
|
13
13
|
}
|
|
14
14
|
monkeyecxAuthenticationService.redirectLoginWelcomeBack();
|
|
@@ -23,4 +23,4 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.1.1", ngImpor
|
|
|
23
23
|
providedIn: 'root'
|
|
24
24
|
}]
|
|
25
25
|
}], ctorParameters: function () { return [{ type: i1.MonkeyEcxAuthenticationService }]; } });
|
|
26
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
26
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibW9ua2V5ZWN4LWF1dGgtZ3VhcmQuc2VydmljZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uLy4uL3Byb2plY3RzL21vbmtleS1mcm9udC1jb3JlL3NyYy9saWIvY29yZS9zZXJ2aWNlcy9hdXRoL21vbmtleWVjeC1hdXRoLWd1YXJkLnNlcnZpY2UudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLGVBQWUsQ0FBQzs7O0FBTzNDLE1BQU0sT0FBTyxrQkFBa0I7SUFDN0IsWUFBb0IsOEJBQThEO1FBQTlELG1DQUE4QixHQUE5Qiw4QkFBOEIsQ0FBZ0M7UUFDaEYsWUFBWTtJQUNkLENBQUM7SUFFRCxLQUFLLENBQUMsV0FBVztRQUNmLE1BQU0sRUFBRSw4QkFBOEIsRUFBRSxHQUFHLElBQUksQ0FBQztRQUVoRCxJQUFJLE1BQU0sOEJBQThCLENBQUMsWUFBWSxFQUFFLEVBQUU7WUFDdkQsT0FBTyxJQUFJLENBQUM7U0FDYjtRQUVELDhCQUE4QixDQUFDLHdCQUF3QixFQUFFLENBQUM7UUFFMUQsT0FBTyxLQUFLLENBQUM7SUFDZixDQUFDOzsrR0FmVSxrQkFBa0I7bUhBQWxCLGtCQUFrQixjQUZqQixNQUFNOzJGQUVQLGtCQUFrQjtrQkFIOUIsVUFBVTttQkFBQztvQkFDVixVQUFVLEVBQUUsTUFBTTtpQkFDbkIiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBJbmplY3RhYmxlIH0gZnJvbSAnQGFuZ3VsYXIvY29yZSc7XG5pbXBvcnQgeyBDYW5BY3RpdmF0ZSB9IGZyb20gJ0Bhbmd1bGFyL3JvdXRlcic7XG5pbXBvcnQgeyBNb25rZXlFY3hBdXRoZW50aWNhdGlvblNlcnZpY2UgfSBmcm9tICcuL21vbmtleWVjeC1hdXRoZW50aWNhdGlvbi5zZXJ2aWNlJztcblxuQEluamVjdGFibGUoe1xuICBwcm92aWRlZEluOiAncm9vdCdcbn0pXG5leHBvcnQgY2xhc3MgTW9ua2V5RWN4QXV0aEd1YXJkIGltcGxlbWVudHMgQ2FuQWN0aXZhdGUge1xuICBjb25zdHJ1Y3Rvcihwcml2YXRlIG1vbmtleWVjeEF1dGhlbnRpY2F0aW9uU2VydmljZTogTW9ua2V5RWN4QXV0aGVudGljYXRpb25TZXJ2aWNlKSB7XG4gICAgLy8gbm90IHRvIGRvXG4gIH1cblxuICBhc3luYyBjYW5BY3RpdmF0ZSgpOiBQcm9taXNlPGJvb2xlYW4+IHtcbiAgICBjb25zdCB7IG1vbmtleWVjeEF1dGhlbnRpY2F0aW9uU2VydmljZSB9ID0gdGhpcztcblxuICAgIGlmIChhd2FpdCBtb25rZXllY3hBdXRoZW50aWNhdGlvblNlcnZpY2UuaXNBdXRob3JpemVkKCkpIHtcbiAgICAgIHJldHVybiB0cnVlO1xuICAgIH1cblxuICAgIG1vbmtleWVjeEF1dGhlbnRpY2F0aW9uU2VydmljZS5yZWRpcmVjdExvZ2luV2VsY29tZUJhY2soKTtcblxuICAgIHJldHVybiBmYWxzZTtcbiAgfVxufVxuIl19
|
|
@@ -1,9 +1,8 @@
|
|
|
1
|
-
/* eslint-disable no-console */
|
|
2
1
|
import { Injectable } from '@angular/core';
|
|
3
2
|
import * as i0 from "@angular/core";
|
|
4
3
|
export class MonkeyEcxAuthenticationService {
|
|
5
4
|
constructor() {
|
|
6
|
-
this.hadAtLeastOneLogin = () => {
|
|
5
|
+
this.hadAtLeastOneLogin = async () => {
|
|
7
6
|
console.error('hadAtLeastOneLogin needs to be declared!');
|
|
8
7
|
return null;
|
|
9
8
|
};
|
|
@@ -15,11 +14,11 @@ export class MonkeyEcxAuthenticationService {
|
|
|
15
14
|
console.error('redirectLoginWelcomeBack needs to be declared!');
|
|
16
15
|
return null;
|
|
17
16
|
};
|
|
18
|
-
this.isAuthorized = () => {
|
|
17
|
+
this.isAuthorized = async () => {
|
|
19
18
|
console.error('isAuthorized needs to be declared!');
|
|
20
19
|
return false;
|
|
21
20
|
};
|
|
22
|
-
this.isCompanyAuthorized = () => {
|
|
21
|
+
this.isCompanyAuthorized = async () => {
|
|
23
22
|
console.error('isCompanyAuthorized needs to be declared!');
|
|
24
23
|
return false;
|
|
25
24
|
};
|
|
@@ -35,11 +34,15 @@ export class MonkeyEcxAuthenticationService {
|
|
|
35
34
|
console.error('getRequestWithHeadersOb needs to be declared!');
|
|
36
35
|
return null;
|
|
37
36
|
};
|
|
37
|
+
this.getRequestWithHeadersAsync = async (request) => {
|
|
38
|
+
console.error('getRequestWithHeadersAsync needs to be declared!');
|
|
39
|
+
return null;
|
|
40
|
+
};
|
|
38
41
|
this.refreshShouldHappen = (response) => {
|
|
39
42
|
console.error('refreshShouldHappen needs to be declared!');
|
|
40
43
|
return false;
|
|
41
44
|
};
|
|
42
|
-
this.refreshToken = () => {
|
|
45
|
+
this.refreshToken = async () => {
|
|
43
46
|
console.error('refreshToken needs to be declared!');
|
|
44
47
|
return null;
|
|
45
48
|
};
|
|
@@ -55,6 +58,8 @@ export class MonkeyEcxAuthenticationService {
|
|
|
55
58
|
this.isCompanyAuthorized = args?.isCompanyAuthorized || this.isCompanyAuthorized.bind(this);
|
|
56
59
|
this.getRequestWithHeaders =
|
|
57
60
|
args?.getRequestWithHeaders || this.getRequestWithHeaders.bind(this);
|
|
61
|
+
this.getRequestWithHeadersAsync =
|
|
62
|
+
args?.getRequestWithHeadersAsync || this.getRequestWithHeadersAsync.bind(this);
|
|
58
63
|
this.getRequestWithHeadersOb = args?.getRequestWithHeadersOb.bind(this);
|
|
59
64
|
this.refreshShouldHappen = args?.refreshShouldHappen || this.refreshShouldHappen.bind(this);
|
|
60
65
|
this.refreshToken = args?.refreshToken || this.refreshToken.bind(this);
|
|
@@ -66,4 +71,4 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.1.1", ngImpor
|
|
|
66
71
|
type: Injectable,
|
|
67
72
|
args: [{ providedIn: 'root' }]
|
|
68
73
|
}], ctorParameters: function () { return []; } });
|
|
69
|
-
//# 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":"AAEA,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;;AAI3C,MAAM,OAAO,8BAA8B;IACzC;QAIA,uBAAkB,GAAG,KAAK,IAAI,EAAE;YAC9B,OAAO,CAAC,KAAK,CAAC,0CAA0C,CAAC,CAAC;YAC1D,OAAO,IAAI,CAAC;QACd,CAAC,CAAC;QAEF,gBAAW,GAAG,GAAG,EAAE;YACjB,OAAO,CAAC,KAAK,CAAC,mCAAmC,CAAC,CAAC;YACnD,OAAO,IAAI,CAAC;QACd,CAAC,CAAC;QAEF,6BAAwB,GAAG,GAAG,EAAE;YAC9B,OAAO,CAAC,KAAK,CAAC,gDAAgD,CAAC,CAAC;YAChE,OAAO,IAAI,CAAC;QACd,CAAC,CAAC;QAEF,iBAAY,GAAG,KAAK,IAAI,EAAE;YACxB,OAAO,CAAC,KAAK,CAAC,oCAAoC,CAAC,CAAC;YACpD,OAAO,KAAK,CAAC;QACf,CAAC,CAAC;QAEF,wBAAmB,GAAG,KAAK,IAAI,EAAE;YAC/B,OAAO,CAAC,KAAK,CAAC,2CAA2C,CAAC,CAAC;YAC3D,OAAO,KAAK,CAAC;QACf,CAAC,CAAC;QAEF,qBAAgB,GAAG,CAAC,GAAW,EAAW,EAAE;YAC1C,OAAO,CAAC,KAAK,CAAC,wCAAwC,CAAC,CAAC;YACxD,OAAO,KAAK,CAAC;QACf,CAAC,CAAC;QAEF,0BAAqB,GAAG,CAAC,OAAyB,EAA0B,EAAE;YAC5E,OAAO,CAAC,KAAK,CAAC,6CAA6C,CAAC,CAAC;YAC7D,OAAO,IAAI,CAAC;QACd,CAAC,CAAC;QAEF,4BAAuB,GAAG,CAAC,OAAyB,EAAyB,EAAE;YAC7E,OAAO,CAAC,KAAK,CAAC,+CAA+C,CAAC,CAAC;YAC/D,OAAO,IAAI,CAAC;QACd,CAAC,CAAC;QAEF,+BAA0B,GAAG,KAAK,EAAE,OAAyB,EAAE,EAAE;YAC/D,OAAO,CAAC,KAAK,CAAC,kDAAkD,CAAC,CAAC;YAClE,OAAO,IAAI,CAAC;QACd,CAAC,CAAC;QAEF,wBAAmB,GAAG,CAAC,QAA2B,EAAW,EAAE;YAC7D,OAAO,CAAC,KAAK,CAAC,2CAA2C,CAAC,CAAC;YAC3D,OAAO,KAAK,CAAC;QACf,CAAC,CAAC;QAEF,iBAAY,GAAG,KAAK,IAAI,EAAE;YACxB,OAAO,CAAC,KAAK,CAAC,oCAAoC,CAAC,CAAC;YACpD,OAAO,IAAI,CAAC;QACd,CAAC,CAAC;QAxDA,YAAY;IACd,CAAC;IAyDD,IAAI,CAAC,IAYJ;QACC,IAAI,CAAC,kBAAkB,GAAG,IAAI,EAAE,kBAAkB,IAAI,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACzF,IAAI,CAAC,WAAW,GAAG,IAAI,EAAE,WAAW,IAAI,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACpE,IAAI,CAAC,wBAAwB;YAC3B,IAAI,EAAE,wBAAwB,IAAI,IAAI,CAAC,wBAAwB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC7E,IAAI,CAAC,YAAY,GAAG,IAAI,EAAE,YAAY,IAAI,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACvE,IAAI,CAAC,gBAAgB,GAAG,IAAI,EAAE,gBAAgB,IAAI,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACnF,IAAI,CAAC,mBAAmB,GAAG,IAAI,EAAE,mBAAmB,IAAI,IAAI,CAAC,mBAAmB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC5F,IAAI,CAAC,qBAAqB;YACxB,IAAI,EAAE,qBAAqB,IAAI,IAAI,CAAC,qBAAqB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACvE,IAAI,CAAC,0BAA0B;YAC7B,IAAI,EAAE,0BAA0B,IAAI,IAAI,CAAC,0BAA0B,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACjF,IAAI,CAAC,uBAAuB,GAAG,IAAI,EAAE,uBAAuB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACxE,IAAI,CAAC,mBAAmB,GAAG,IAAI,EAAE,mBAAmB,IAAI,IAAI,CAAC,mBAAmB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC5F,IAAI,CAAC,YAAY,GAAG,IAAI,EAAE,YAAY,IAAI,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACzE,CAAC;;2HAvFU,8BAA8B;+HAA9B,8BAA8B,cADjB,MAAM;2FACnB,8BAA8B;kBAD1C,UAAU;mBAAC,EAAE,UAAU,EAAE,MAAM,EAAE","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"]}
|
|
@@ -4012,13 +4012,12 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.1.1", ngImpor
|
|
|
4012
4012
|
}]
|
|
4013
4013
|
}], ctorParameters: function () { return [{ type: i1.MonkeyStyleGuideSnackbarService }, { type: i1$1.TranslateService }]; } });
|
|
4014
4014
|
|
|
4015
|
-
/* eslint-disable no-console */
|
|
4016
4015
|
class MonkeyEcxAuthenticationService {
|
|
4017
4016
|
constructor() {
|
|
4018
|
-
this.hadAtLeastOneLogin = () => {
|
|
4017
|
+
this.hadAtLeastOneLogin = () => __awaiter(this, void 0, void 0, function* () {
|
|
4019
4018
|
console.error('hadAtLeastOneLogin needs to be declared!');
|
|
4020
4019
|
return null;
|
|
4021
|
-
};
|
|
4020
|
+
});
|
|
4022
4021
|
this.redirectApp = () => {
|
|
4023
4022
|
console.error('redirectApp needs to be declared!');
|
|
4024
4023
|
return null;
|
|
@@ -4027,14 +4026,14 @@ class MonkeyEcxAuthenticationService {
|
|
|
4027
4026
|
console.error('redirectLoginWelcomeBack needs to be declared!');
|
|
4028
4027
|
return null;
|
|
4029
4028
|
};
|
|
4030
|
-
this.isAuthorized = () => {
|
|
4029
|
+
this.isAuthorized = () => __awaiter(this, void 0, void 0, function* () {
|
|
4031
4030
|
console.error('isAuthorized needs to be declared!');
|
|
4032
4031
|
return false;
|
|
4033
|
-
};
|
|
4034
|
-
this.isCompanyAuthorized = () => {
|
|
4032
|
+
});
|
|
4033
|
+
this.isCompanyAuthorized = () => __awaiter(this, void 0, void 0, function* () {
|
|
4035
4034
|
console.error('isCompanyAuthorized needs to be declared!');
|
|
4036
4035
|
return false;
|
|
4037
|
-
};
|
|
4036
|
+
});
|
|
4038
4037
|
this.isTokenMandatory = (url) => {
|
|
4039
4038
|
console.error('isTokenMandatory needs to be declared!');
|
|
4040
4039
|
return false;
|
|
@@ -4047,14 +4046,18 @@ class MonkeyEcxAuthenticationService {
|
|
|
4047
4046
|
console.error('getRequestWithHeadersOb needs to be declared!');
|
|
4048
4047
|
return null;
|
|
4049
4048
|
};
|
|
4049
|
+
this.getRequestWithHeadersAsync = (request) => __awaiter(this, void 0, void 0, function* () {
|
|
4050
|
+
console.error('getRequestWithHeadersAsync needs to be declared!');
|
|
4051
|
+
return null;
|
|
4052
|
+
});
|
|
4050
4053
|
this.refreshShouldHappen = (response) => {
|
|
4051
4054
|
console.error('refreshShouldHappen needs to be declared!');
|
|
4052
4055
|
return false;
|
|
4053
4056
|
};
|
|
4054
|
-
this.refreshToken = () => {
|
|
4057
|
+
this.refreshToken = () => __awaiter(this, void 0, void 0, function* () {
|
|
4055
4058
|
console.error('refreshToken needs to be declared!');
|
|
4056
4059
|
return null;
|
|
4057
|
-
};
|
|
4060
|
+
});
|
|
4058
4061
|
// not to do
|
|
4059
4062
|
}
|
|
4060
4063
|
init(args) {
|
|
@@ -4067,6 +4070,8 @@ class MonkeyEcxAuthenticationService {
|
|
|
4067
4070
|
this.isCompanyAuthorized = (args === null || args === void 0 ? void 0 : args.isCompanyAuthorized) || this.isCompanyAuthorized.bind(this);
|
|
4068
4071
|
this.getRequestWithHeaders =
|
|
4069
4072
|
(args === null || args === void 0 ? void 0 : args.getRequestWithHeaders) || this.getRequestWithHeaders.bind(this);
|
|
4073
|
+
this.getRequestWithHeadersAsync =
|
|
4074
|
+
(args === null || args === void 0 ? void 0 : args.getRequestWithHeadersAsync) || this.getRequestWithHeadersAsync.bind(this);
|
|
4070
4075
|
this.getRequestWithHeadersOb = args === null || args === void 0 ? void 0 : args.getRequestWithHeadersOb.bind(this);
|
|
4071
4076
|
this.refreshShouldHappen = (args === null || args === void 0 ? void 0 : args.refreshShouldHappen) || this.refreshShouldHappen.bind(this);
|
|
4072
4077
|
this.refreshToken = (args === null || args === void 0 ? void 0 : args.refreshToken) || this.refreshToken.bind(this);
|
|
@@ -4085,16 +4090,18 @@ class MonkeyEcxAuthGuardCompany {
|
|
|
4085
4090
|
// not to do
|
|
4086
4091
|
}
|
|
4087
4092
|
canActivate() {
|
|
4088
|
-
|
|
4089
|
-
|
|
4090
|
-
if (monkeyecxAuthenticationService.
|
|
4091
|
-
|
|
4093
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
4094
|
+
const { monkeyecxAuthenticationService } = this;
|
|
4095
|
+
if (yield this.monkeyecxAuthenticationService.isAuthorized()) {
|
|
4096
|
+
if (yield monkeyecxAuthenticationService.isCompanyAuthorized()) {
|
|
4097
|
+
return true;
|
|
4098
|
+
}
|
|
4099
|
+
this.monkeyecxAuthenticationService.redirectApp();
|
|
4100
|
+
return false;
|
|
4092
4101
|
}
|
|
4093
|
-
|
|
4102
|
+
monkeyecxAuthenticationService.redirectLoginWelcomeBack();
|
|
4094
4103
|
return false;
|
|
4095
|
-
}
|
|
4096
|
-
monkeyecxAuthenticationService.redirectLoginWelcomeBack();
|
|
4097
|
-
return false;
|
|
4104
|
+
});
|
|
4098
4105
|
}
|
|
4099
4106
|
}
|
|
4100
4107
|
MonkeyEcxAuthGuardCompany.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: MonkeyEcxAuthGuardCompany, deps: [{ token: MonkeyEcxAuthenticationService }], target: i0.ɵɵFactoryTarget.Injectable });
|
|
@@ -4110,15 +4117,17 @@ class MonkeyEcxAuthGuardLogin {
|
|
|
4110
4117
|
// not to do
|
|
4111
4118
|
}
|
|
4112
4119
|
canActivate() {
|
|
4113
|
-
|
|
4114
|
-
this.monkeyecxAuthenticationService.
|
|
4115
|
-
|
|
4116
|
-
|
|
4117
|
-
|
|
4118
|
-
this.monkeyecxAuthenticationService.
|
|
4119
|
-
|
|
4120
|
-
|
|
4121
|
-
|
|
4120
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
4121
|
+
if (yield this.monkeyecxAuthenticationService.isAuthorized()) {
|
|
4122
|
+
this.monkeyecxAuthenticationService.redirectApp();
|
|
4123
|
+
return false;
|
|
4124
|
+
}
|
|
4125
|
+
if (yield this.monkeyecxAuthenticationService.hadAtLeastOneLogin()) {
|
|
4126
|
+
this.monkeyecxAuthenticationService.redirectLoginWelcomeBack();
|
|
4127
|
+
return false;
|
|
4128
|
+
}
|
|
4129
|
+
return true;
|
|
4130
|
+
});
|
|
4122
4131
|
}
|
|
4123
4132
|
}
|
|
4124
4133
|
MonkeyEcxAuthGuardLogin.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: MonkeyEcxAuthGuardLogin, deps: [{ token: MonkeyEcxAuthenticationService }], target: i0.ɵɵFactoryTarget.Injectable });
|
|
@@ -4134,12 +4143,14 @@ class MonkeyEcxAuthGuard {
|
|
|
4134
4143
|
// not to do
|
|
4135
4144
|
}
|
|
4136
4145
|
canActivate() {
|
|
4137
|
-
|
|
4138
|
-
|
|
4139
|
-
|
|
4140
|
-
|
|
4141
|
-
|
|
4142
|
-
|
|
4146
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
4147
|
+
const { monkeyecxAuthenticationService } = this;
|
|
4148
|
+
if (yield monkeyecxAuthenticationService.isAuthorized()) {
|
|
4149
|
+
return true;
|
|
4150
|
+
}
|
|
4151
|
+
monkeyecxAuthenticationService.redirectLoginWelcomeBack();
|
|
4152
|
+
return false;
|
|
4153
|
+
});
|
|
4143
4154
|
}
|
|
4144
4155
|
}
|
|
4145
4156
|
MonkeyEcxAuthGuard.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: MonkeyEcxAuthGuard, deps: [{ token: MonkeyEcxAuthenticationService }], target: i0.ɵɵFactoryTarget.Injectable });
|
|
@@ -5224,25 +5235,46 @@ class MonkeyEcxHttpConfigErrorInterceptor {
|
|
|
5224
5235
|
this.monkeyecxErrorHandlingService = monkeyecxErrorHandlingService;
|
|
5225
5236
|
// no to do
|
|
5226
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
|
+
}
|
|
5227
5256
|
intercept(request, next) {
|
|
5257
|
+
console.log('== interceptor error 1');
|
|
5228
5258
|
return next.handle(request).pipe(map((event) => {
|
|
5259
|
+
console.log('== interceptor error 2');
|
|
5229
5260
|
return event;
|
|
5230
5261
|
}), catchError((error) => {
|
|
5231
|
-
|
|
5232
|
-
|
|
5233
|
-
return
|
|
5234
|
-
|
|
5235
|
-
|
|
5236
|
-
|
|
5237
|
-
|
|
5238
|
-
|
|
5239
|
-
|
|
5240
|
-
|
|
5241
|
-
|
|
5242
|
-
|
|
5243
|
-
|
|
5244
|
-
|
|
5245
|
-
|
|
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
|
+
}));
|
|
5246
5278
|
}));
|
|
5247
5279
|
}
|
|
5248
5280
|
}
|
|
@@ -5262,6 +5294,8 @@ class MonkeyEcxHttpConfigHeaderInterceptor {
|
|
|
5262
5294
|
handle(request) {
|
|
5263
5295
|
return __awaiter(this, void 0, void 0, function* () {
|
|
5264
5296
|
const { url } = request;
|
|
5297
|
+
console.log('== interceptor header 2');
|
|
5298
|
+
console.log(url);
|
|
5265
5299
|
if (this.authService.isTokenMandatory(url)) {
|
|
5266
5300
|
try {
|
|
5267
5301
|
yield this.config
|
|
@@ -5275,22 +5309,30 @@ class MonkeyEcxHttpConfigHeaderInterceptor {
|
|
|
5275
5309
|
// not to do
|
|
5276
5310
|
}
|
|
5277
5311
|
}
|
|
5278
|
-
|
|
5279
|
-
|
|
5280
|
-
|
|
5281
|
-
|
|
5282
|
-
|
|
5283
|
-
|
|
5284
|
-
|
|
5285
|
-
}
|
|
5286
|
-
|
|
5312
|
+
console.log('== interceptor header 3');
|
|
5313
|
+
let resp = null;
|
|
5314
|
+
try {
|
|
5315
|
+
console.log('== interceptor header 4');
|
|
5316
|
+
resp = yield this.authService.getRequestWithHeadersAsync(request);
|
|
5317
|
+
console.log('resp');
|
|
5318
|
+
console.log(resp);
|
|
5319
|
+
}
|
|
5320
|
+
catch (e) {
|
|
5321
|
+
console.log('== interceptor header 5');
|
|
5322
|
+
console.log(e);
|
|
5323
|
+
this.errorHandlingService.handleError(e);
|
|
5324
|
+
return throwError(e);
|
|
5325
|
+
}
|
|
5287
5326
|
return resp;
|
|
5288
5327
|
});
|
|
5289
5328
|
}
|
|
5290
5329
|
intercept(request, next) {
|
|
5330
|
+
console.log('== interceptor header 1');
|
|
5291
5331
|
return from(this.handle(request)).pipe(take(1), map((event) => {
|
|
5292
5332
|
return event;
|
|
5293
5333
|
}), mergeMap((resp) => {
|
|
5334
|
+
console.log('== interceptor header 6');
|
|
5335
|
+
console.log(resp);
|
|
5294
5336
|
request = request.clone({
|
|
5295
5337
|
setHeaders: resp
|
|
5296
5338
|
});
|