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