monkey-front-core 0.0.318 → 0.0.320
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 -15
- package/esm2020/lib/core/interceptors/monkeyecx-http-config-header.interceptor.mjs +1 -12
- package/esm2020/lib/core/services/commons/monkeyecx-commons.service.mjs +2 -8
- package/esm2020/lib/core/services/storage/monkeyecx-token-storage.service.mjs +2 -15
- package/fesm2015/monkey-front-core.mjs +62 -108
- package/fesm2015/monkey-front-core.mjs.map +1 -1
- package/fesm2020/monkey-front-core.mjs +2 -46
- package/fesm2020/monkey-front-core.mjs.map +1 -1
- package/lib/core/services/commons/monkeyecx-commons.service.d.ts +1 -1
- package/monkey-front-core-0.0.320.tgz +0 -0
- package/package.json +1 -1
- package/monkey-front-core-0.0.318.tgz +0 -0
|
@@ -2889,19 +2889,13 @@ class MonkeyEcxCommonsService {
|
|
|
2889
2889
|
this.__handledError = null;
|
|
2890
2890
|
this.flagValidator = false;
|
|
2891
2891
|
}
|
|
2892
|
-
|
|
2892
|
+
resolve(route, state, otherArgs) {
|
|
2893
2893
|
if (JSON.stringify(route?.queryParams) === '{}') {
|
|
2894
2894
|
this.__data = null;
|
|
2895
2895
|
this.__page = null;
|
|
2896
2896
|
}
|
|
2897
2897
|
this.__requestPaged = null;
|
|
2898
2898
|
this.flagValidator = true;
|
|
2899
|
-
if (this.tokenStorage) {
|
|
2900
|
-
console.log('resolve commmons');
|
|
2901
|
-
this.__tokenCredentials = await this.tokenStorage.getToken();
|
|
2902
|
-
console.log('this.__tokenCredentials');
|
|
2903
|
-
console.log(this.__tokenCredentials);
|
|
2904
|
-
}
|
|
2905
2899
|
const pend = this.allowedSecurityAccessByPendency(otherArgs?.pendency);
|
|
2906
2900
|
const allowedByProgram = this.allowedSecurityAccessByFeature(otherArgs?.featureByProgram);
|
|
2907
2901
|
if (this.allowedSecurityAccess(otherArgs?.security) &&
|
|
@@ -3667,27 +3661,18 @@ class MonkeyEcxTokenStorageService {
|
|
|
3667
3661
|
token$.next(token);
|
|
3668
3662
|
}
|
|
3669
3663
|
async getAllTokens() {
|
|
3670
|
-
console.log('111111');
|
|
3671
3664
|
try {
|
|
3672
3665
|
const { store, monkeyecxConfigService } = this;
|
|
3673
|
-
console.log('22222');
|
|
3674
3666
|
const username = localStorage.getItem('username');
|
|
3675
|
-
console.log('33333');
|
|
3676
3667
|
let data = {
|
|
3677
3668
|
username: username || '',
|
|
3678
3669
|
program: ''
|
|
3679
3670
|
};
|
|
3680
|
-
console.log('4444');
|
|
3681
3671
|
if (username) {
|
|
3682
|
-
console.log('5555');
|
|
3683
3672
|
data = await store.select(select({ username })).pipe(take(1)).toPromise();
|
|
3684
|
-
console.log('data');
|
|
3685
|
-
console.log(data);
|
|
3686
3673
|
}
|
|
3687
|
-
console.log('6666');
|
|
3688
3674
|
const config = await monkeyecxConfigService.config()
|
|
3689
3675
|
.pipe(take(1)).toPromise();
|
|
3690
|
-
console.log('7777');
|
|
3691
3676
|
const handledData = {
|
|
3692
3677
|
...data
|
|
3693
3678
|
};
|
|
@@ -3695,14 +3680,10 @@ class MonkeyEcxTokenStorageService {
|
|
|
3695
3680
|
handledData.program = config?.program?.token;
|
|
3696
3681
|
}
|
|
3697
3682
|
delete handledData?.me;
|
|
3698
|
-
console.log('handledData');
|
|
3699
|
-
console.log(handledData);
|
|
3700
3683
|
return handledData;
|
|
3701
3684
|
}
|
|
3702
3685
|
catch (e) {
|
|
3703
|
-
|
|
3704
|
-
console.log(e);
|
|
3705
|
-
console.log('=======');
|
|
3686
|
+
// not to do
|
|
3706
3687
|
}
|
|
3707
3688
|
return null;
|
|
3708
3689
|
}
|
|
@@ -5334,39 +5315,25 @@ class MonkeyEcxHttpConfigErrorInterceptor {
|
|
|
5334
5315
|
// no to do
|
|
5335
5316
|
}
|
|
5336
5317
|
async handle(request, error) {
|
|
5337
|
-
console.log('== interceptor error 4');
|
|
5338
|
-
console.log(request.url);
|
|
5339
5318
|
if (this.monkeyecxAuthenticationService.refreshShouldHappen(error)) {
|
|
5340
|
-
console.log('== interceptor error 5');
|
|
5341
5319
|
await this.monkeyecxAuthenticationService?.refreshToken();
|
|
5342
|
-
console.log('== interceptor error 6');
|
|
5343
5320
|
const headers = await this.monkeyecxAuthenticationService.getRequestWithHeadersAsync(request);
|
|
5344
|
-
console.log('== interceptor error 7');
|
|
5345
|
-
console.log('headers');
|
|
5346
|
-
console.log(headers);
|
|
5347
5321
|
return headers;
|
|
5348
5322
|
}
|
|
5349
5323
|
return throwError(error);
|
|
5350
5324
|
}
|
|
5351
5325
|
intercept(request, next) {
|
|
5352
|
-
console.log('== interceptor error 1');
|
|
5353
5326
|
return next.handle(request).pipe(map((event) => {
|
|
5354
|
-
console.log('== interceptor error 2');
|
|
5355
5327
|
return event;
|
|
5356
5328
|
}), catchError((error) => {
|
|
5357
|
-
console.log('== interceptor error 3');
|
|
5358
5329
|
return from(this.handle(request, error)).pipe(take(1), map((event) => {
|
|
5359
5330
|
return event;
|
|
5360
5331
|
}), mergeMap((resp) => {
|
|
5361
|
-
console.log('== interceptor error 8');
|
|
5362
|
-
console.log(resp);
|
|
5363
5332
|
request = request.clone({
|
|
5364
5333
|
setHeaders: resp
|
|
5365
5334
|
});
|
|
5366
5335
|
return next.handle(request);
|
|
5367
5336
|
}), catchError((error) => {
|
|
5368
|
-
console.log('== interceptor error 9');
|
|
5369
|
-
console.log(error);
|
|
5370
5337
|
this.monkeyecxErrorHandlingService.handleError(error, 'refresh_token');
|
|
5371
5338
|
return throwError(error);
|
|
5372
5339
|
}));
|
|
@@ -5388,8 +5355,6 @@ class MonkeyEcxHttpConfigHeaderInterceptor {
|
|
|
5388
5355
|
}
|
|
5389
5356
|
async handle(request) {
|
|
5390
5357
|
const { url } = request;
|
|
5391
|
-
console.log('== interceptor header 2');
|
|
5392
|
-
console.log(url);
|
|
5393
5358
|
if (this.authService.isTokenMandatory(url)) {
|
|
5394
5359
|
try {
|
|
5395
5360
|
await this.config
|
|
@@ -5403,29 +5368,20 @@ class MonkeyEcxHttpConfigHeaderInterceptor {
|
|
|
5403
5368
|
// not to do
|
|
5404
5369
|
}
|
|
5405
5370
|
}
|
|
5406
|
-
console.log('== interceptor header 3');
|
|
5407
5371
|
let resp = null;
|
|
5408
5372
|
try {
|
|
5409
|
-
console.log('== interceptor header 4');
|
|
5410
5373
|
resp = await this.authService.getRequestWithHeadersAsync(request);
|
|
5411
|
-
console.log('resp');
|
|
5412
|
-
console.log(resp);
|
|
5413
5374
|
}
|
|
5414
5375
|
catch (e) {
|
|
5415
|
-
console.log('== interceptor header 5');
|
|
5416
|
-
console.log(e);
|
|
5417
5376
|
this.errorHandlingService.handleError(e);
|
|
5418
5377
|
return throwError(e);
|
|
5419
5378
|
}
|
|
5420
5379
|
return resp;
|
|
5421
5380
|
}
|
|
5422
5381
|
intercept(request, next) {
|
|
5423
|
-
console.log('== interceptor header 1');
|
|
5424
5382
|
return from(this.handle(request)).pipe(take(1), map((event) => {
|
|
5425
5383
|
return event;
|
|
5426
5384
|
}), mergeMap((resp) => {
|
|
5427
|
-
console.log('== interceptor header 6');
|
|
5428
|
-
console.log(resp);
|
|
5429
5385
|
request = request.clone({
|
|
5430
5386
|
setHeaders: resp
|
|
5431
5387
|
});
|