monkey-front-core 0.0.317 → 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/esm2020/lib/store/reducers/monkeyecx-seeder.reducer.mjs +36 -25
- package/fesm2015/monkey-front-core.mjs +30 -60
- package/fesm2015/monkey-front-core.mjs.map +1 -1
- package/fesm2020/monkey-front-core.mjs +36 -66
- 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.317.tgz +0 -0
|
@@ -2455,39 +2455,50 @@ const seederReducer = (keys) => {
|
|
|
2455
2455
|
return (reducer) => {
|
|
2456
2456
|
return (state, action) => {
|
|
2457
2457
|
const handledState = reducer(state, action);
|
|
2458
|
-
let data = handledState;
|
|
2459
2458
|
if (action.type === INIT || action.type === UPDATE) {
|
|
2460
|
-
|
|
2461
|
-
if (storageValue) {
|
|
2462
|
-
try {
|
|
2463
|
-
const handled = {
|
|
2464
|
-
...handledState,
|
|
2465
|
-
...JSON.parse(atob(storageValue))
|
|
2466
|
-
};
|
|
2467
|
-
return handled;
|
|
2468
|
-
}
|
|
2469
|
-
catch {
|
|
2470
|
-
localStorage.removeItem('mecx-store');
|
|
2471
|
-
}
|
|
2472
|
-
}
|
|
2473
|
-
data = null;
|
|
2459
|
+
let data = null;
|
|
2474
2460
|
try {
|
|
2475
|
-
|
|
2476
|
-
|
|
2477
|
-
...data,
|
|
2478
|
-
[key]: handledState[key]
|
|
2479
|
-
};
|
|
2480
|
-
});
|
|
2481
|
-
const handled = JSON.stringify(data);
|
|
2461
|
+
const storage = localStorage.getItem('mecx-store');
|
|
2462
|
+
const handled = atob(storage || '');
|
|
2482
2463
|
if (handled !== '{}') {
|
|
2483
|
-
|
|
2464
|
+
const storageValue = JSON.parse(atob(storage || ''));
|
|
2465
|
+
keys.forEach((key) => {
|
|
2466
|
+
let value = null;
|
|
2467
|
+
if (storageValue?.[key]) {
|
|
2468
|
+
value = {
|
|
2469
|
+
[key]: storageValue?.[key]
|
|
2470
|
+
};
|
|
2471
|
+
}
|
|
2472
|
+
data = {
|
|
2473
|
+
...data,
|
|
2474
|
+
...value
|
|
2475
|
+
};
|
|
2476
|
+
});
|
|
2484
2477
|
}
|
|
2478
|
+
return data;
|
|
2485
2479
|
}
|
|
2486
2480
|
catch (e) {
|
|
2487
2481
|
localStorage.removeItem('mecx-store');
|
|
2482
|
+
return handledState;
|
|
2488
2483
|
}
|
|
2489
2484
|
}
|
|
2490
|
-
|
|
2485
|
+
let data = null;
|
|
2486
|
+
try {
|
|
2487
|
+
keys.forEach((key) => {
|
|
2488
|
+
data = {
|
|
2489
|
+
...data,
|
|
2490
|
+
[key]: handledState[key]
|
|
2491
|
+
};
|
|
2492
|
+
});
|
|
2493
|
+
const handled = JSON.stringify(data);
|
|
2494
|
+
if (handled !== '{}') {
|
|
2495
|
+
localStorage.setItem('mecx-store', btoa(JSON.stringify(data)));
|
|
2496
|
+
}
|
|
2497
|
+
}
|
|
2498
|
+
catch (e) {
|
|
2499
|
+
localStorage.removeItem('mecx-store');
|
|
2500
|
+
}
|
|
2501
|
+
return handledState;
|
|
2491
2502
|
};
|
|
2492
2503
|
};
|
|
2493
2504
|
};
|
|
@@ -2886,10 +2897,7 @@ class MonkeyEcxCommonsService {
|
|
|
2886
2897
|
this.__requestPaged = null;
|
|
2887
2898
|
this.flagValidator = true;
|
|
2888
2899
|
if (this.tokenStorage) {
|
|
2889
|
-
console.log('resolve commmons');
|
|
2890
2900
|
this.__tokenCredentials = await this.tokenStorage.getToken();
|
|
2891
|
-
console.log('this.__tokenCredentials');
|
|
2892
|
-
console.log(this.__tokenCredentials);
|
|
2893
2901
|
}
|
|
2894
2902
|
const pend = this.allowedSecurityAccessByPendency(otherArgs?.pendency);
|
|
2895
2903
|
const allowedByProgram = this.allowedSecurityAccessByFeature(otherArgs?.featureByProgram);
|
|
@@ -3656,27 +3664,18 @@ class MonkeyEcxTokenStorageService {
|
|
|
3656
3664
|
token$.next(token);
|
|
3657
3665
|
}
|
|
3658
3666
|
async getAllTokens() {
|
|
3659
|
-
console.log('111111');
|
|
3660
3667
|
try {
|
|
3661
3668
|
const { store, monkeyecxConfigService } = this;
|
|
3662
|
-
console.log('22222');
|
|
3663
3669
|
const username = localStorage.getItem('username');
|
|
3664
|
-
console.log('33333');
|
|
3665
3670
|
let data = {
|
|
3666
3671
|
username: username || '',
|
|
3667
3672
|
program: ''
|
|
3668
3673
|
};
|
|
3669
|
-
console.log('4444');
|
|
3670
3674
|
if (username) {
|
|
3671
|
-
console.log('5555');
|
|
3672
3675
|
data = await store.select(select({ username })).pipe(take(1)).toPromise();
|
|
3673
|
-
console.log('data');
|
|
3674
|
-
console.log(data);
|
|
3675
3676
|
}
|
|
3676
|
-
console.log('6666');
|
|
3677
3677
|
const config = await monkeyecxConfigService.config()
|
|
3678
3678
|
.pipe(take(1)).toPromise();
|
|
3679
|
-
console.log('7777');
|
|
3680
3679
|
const handledData = {
|
|
3681
3680
|
...data
|
|
3682
3681
|
};
|
|
@@ -3684,14 +3683,10 @@ class MonkeyEcxTokenStorageService {
|
|
|
3684
3683
|
handledData.program = config?.program?.token;
|
|
3685
3684
|
}
|
|
3686
3685
|
delete handledData?.me;
|
|
3687
|
-
console.log('handledData');
|
|
3688
|
-
console.log(handledData);
|
|
3689
3686
|
return handledData;
|
|
3690
3687
|
}
|
|
3691
3688
|
catch (e) {
|
|
3692
|
-
|
|
3693
|
-
console.log(e);
|
|
3694
|
-
console.log('=======');
|
|
3689
|
+
// not to do
|
|
3695
3690
|
}
|
|
3696
3691
|
return null;
|
|
3697
3692
|
}
|
|
@@ -5323,39 +5318,25 @@ class MonkeyEcxHttpConfigErrorInterceptor {
|
|
|
5323
5318
|
// no to do
|
|
5324
5319
|
}
|
|
5325
5320
|
async handle(request, error) {
|
|
5326
|
-
console.log('== interceptor error 4');
|
|
5327
|
-
console.log(request.url);
|
|
5328
5321
|
if (this.monkeyecxAuthenticationService.refreshShouldHappen(error)) {
|
|
5329
|
-
console.log('== interceptor error 5');
|
|
5330
5322
|
await this.monkeyecxAuthenticationService?.refreshToken();
|
|
5331
|
-
console.log('== interceptor error 6');
|
|
5332
5323
|
const headers = await this.monkeyecxAuthenticationService.getRequestWithHeadersAsync(request);
|
|
5333
|
-
console.log('== interceptor error 7');
|
|
5334
|
-
console.log('headers');
|
|
5335
|
-
console.log(headers);
|
|
5336
5324
|
return headers;
|
|
5337
5325
|
}
|
|
5338
5326
|
return throwError(error);
|
|
5339
5327
|
}
|
|
5340
5328
|
intercept(request, next) {
|
|
5341
|
-
console.log('== interceptor error 1');
|
|
5342
5329
|
return next.handle(request).pipe(map((event) => {
|
|
5343
|
-
console.log('== interceptor error 2');
|
|
5344
5330
|
return event;
|
|
5345
5331
|
}), catchError((error) => {
|
|
5346
|
-
console.log('== interceptor error 3');
|
|
5347
5332
|
return from(this.handle(request, error)).pipe(take(1), map((event) => {
|
|
5348
5333
|
return event;
|
|
5349
5334
|
}), mergeMap((resp) => {
|
|
5350
|
-
console.log('== interceptor error 8');
|
|
5351
|
-
console.log(resp);
|
|
5352
5335
|
request = request.clone({
|
|
5353
5336
|
setHeaders: resp
|
|
5354
5337
|
});
|
|
5355
5338
|
return next.handle(request);
|
|
5356
5339
|
}), catchError((error) => {
|
|
5357
|
-
console.log('== interceptor error 9');
|
|
5358
|
-
console.log(error);
|
|
5359
5340
|
this.monkeyecxErrorHandlingService.handleError(error, 'refresh_token');
|
|
5360
5341
|
return throwError(error);
|
|
5361
5342
|
}));
|
|
@@ -5377,8 +5358,6 @@ class MonkeyEcxHttpConfigHeaderInterceptor {
|
|
|
5377
5358
|
}
|
|
5378
5359
|
async handle(request) {
|
|
5379
5360
|
const { url } = request;
|
|
5380
|
-
console.log('== interceptor header 2');
|
|
5381
|
-
console.log(url);
|
|
5382
5361
|
if (this.authService.isTokenMandatory(url)) {
|
|
5383
5362
|
try {
|
|
5384
5363
|
await this.config
|
|
@@ -5392,29 +5371,20 @@ class MonkeyEcxHttpConfigHeaderInterceptor {
|
|
|
5392
5371
|
// not to do
|
|
5393
5372
|
}
|
|
5394
5373
|
}
|
|
5395
|
-
console.log('== interceptor header 3');
|
|
5396
5374
|
let resp = null;
|
|
5397
5375
|
try {
|
|
5398
|
-
console.log('== interceptor header 4');
|
|
5399
5376
|
resp = await this.authService.getRequestWithHeadersAsync(request);
|
|
5400
|
-
console.log('resp');
|
|
5401
|
-
console.log(resp);
|
|
5402
5377
|
}
|
|
5403
5378
|
catch (e) {
|
|
5404
|
-
console.log('== interceptor header 5');
|
|
5405
|
-
console.log(e);
|
|
5406
5379
|
this.errorHandlingService.handleError(e);
|
|
5407
5380
|
return throwError(e);
|
|
5408
5381
|
}
|
|
5409
5382
|
return resp;
|
|
5410
5383
|
}
|
|
5411
5384
|
intercept(request, next) {
|
|
5412
|
-
console.log('== interceptor header 1');
|
|
5413
5385
|
return from(this.handle(request)).pipe(take(1), map((event) => {
|
|
5414
5386
|
return event;
|
|
5415
5387
|
}), mergeMap((resp) => {
|
|
5416
|
-
console.log('== interceptor header 6');
|
|
5417
|
-
console.log(resp);
|
|
5418
5388
|
request = request.clone({
|
|
5419
5389
|
setHeaders: resp
|
|
5420
5390
|
});
|