monkey-front-core 0.0.306 → 0.0.308

package/fesm2020/monkey-front-core.mjs

@@ -2680,7 +2680,7 @@ class MonkeyEcxCommonsService {
         this.__onZipCodeDataChanged$ = new BehaviorSubject(null);
         this.__oni18nDataChanged$ = new BehaviorSubject(null);
         this.__onDoSearch$ = new BehaviorSubject({});
-        this.__tokenCredentials = undefined;
+        this.__tokenCredentials = null;
         this.__schedule = null;
         this.__callbackPagination = () => {
             // eslint-disable-next-line no-console
@@ -3656,25 +3656,33 @@ class MonkeyEcxTokenStorageService {
         token$.next(token);
     }
     async getAllTokens() {
-        const { store, monkeyecxConfigService } = this;
-        const username = localStorage.getItem('username');
-        let data = {
-            username: username || '',
-            program: ''
-        };
-        if (username) {
-            data = await store.select(select({ username })).pipe(take(1)).toPromise();
-            delete data?.me;
+        try {
+            const { store, monkeyecxConfigService } = this;
+            const username = localStorage.getItem('username');
+            let data = {
+                username: username || '',
+                program: ''
+            };
+            if (username) {
+                data = await store.select(select({ username })).pipe(take(1)).toPromise();
+                delete data?.me;
+            }
+            const config = await monkeyecxConfigService.config()
+                .pipe(first((val) => {
+                return !!val && JSON.stringify(val) !== '{}';
+            }))
+                .toPromise();
+            if (data && !data?.program && config?.program) {
+                data.program = config?.program?.token;
+            }
+            return data;
         }
-        const config = await monkeyecxConfigService.config()
-            .pipe(first((val) => {
-            return !!val && JSON.stringify(val) !== '{}';
-        }))
-            .toPromise();
-        if (data && !data?.program && config?.program) {
-            data.program = config?.program?.token;
+        catch (e) {
+            console.log('=======');
+            console.log(e);
+            console.log('=======');
         }
-        return data;
+        return null;
     }
     setAllMe(me) {
         const { me$, store } = this;
@@ -3795,7 +3803,7 @@ class MonkeyEcxSecurityDirective {
         this.cdr = cdr;
         this.roles = [];
         this.byExclusion = false;
-        this.tokenCredentials = undefined;
+        this.tokenCredentials = null;
         // not to do
     }
     getRole() {
@@ -4057,7 +4065,7 @@ class MonkeyEcxAuthenticationService {
             console.error('refreshShouldHappen needs to be declared!');
             return false;
         };
-        this.refreshToken = () => {
+        this.refreshToken = async () => {
             console.error('refreshToken needs to be declared!');
             return null;
         };
@@ -5303,24 +5311,43 @@ class MonkeyEcxHttpConfigErrorInterceptor {
         this.monkeyecxErrorHandlingService = monkeyecxErrorHandlingService;
         // no to do
     }
+    async handle(request, error) {
+        console.log('== interceptor error 4');
+        console.log(request.url);
+        if (this.monkeyecxAuthenticationService.refreshShouldHappen(error)) {
+            console.log('== interceptor error 5');
+            await this.monkeyecxAuthenticationService?.refreshToken();
+            console.log('== interceptor error 6');
+            const headers = await this.monkeyecxAuthenticationService.getRequestWithHeadersAsync(request);
+            console.log('== interceptor error 7');
+            console.log('headers');
+            console.log(headers);
+            return headers;
+        }
+        return throwError(error);
+    }
     intercept(request, next) {
+        console.log('== interceptor error 1');
         return next.handle(request).pipe(map((event) => {
+            console.log('== interceptor error 2');
             return event;
         }), catchError((error) => {
-            if (this.monkeyecxAuthenticationService.refreshShouldHappen(error)) {
-                return this.monkeyecxAuthenticationService?.refreshToken()?.pipe(take(1), map(() => {
-                    return this.monkeyecxAuthenticationService.getRequestWithHeaders(request);
-                }), mergeMap((resp) => {
-                    return next.handle(resp).pipe(catchError((error) => {
-                        this.monkeyecxErrorHandlingService.handleError(error, 'refresh_token');
-                        return throwError(null);
-                    }));
-                }), catchError((error) => {
-                    this.monkeyecxErrorHandlingService.handleError(error, 'refresh_token');
-                    return throwError(null);
-                })) || throwError(error);
-            }
-            return throwError(error);
+            console.log('== interceptor error 3');
+            return from(this.handle(request, error)).pipe(take(1), map((event) => {
+                return event;
+            }), mergeMap((resp) => {
+                console.log('== interceptor error 8');
+                console.log(resp);
+                request = request.clone({
+                    setHeaders: resp
+                });
+                return next.handle(request);
+            }), catchError((error) => {
+                console.log('== interceptor error 9');
+                console.log(error);
+                this.monkeyecxErrorHandlingService.handleError(error, 'refresh_token');
+                return throwError(error);
+            }));
         }));
     }
 }
@@ -5339,6 +5366,8 @@ class MonkeyEcxHttpConfigHeaderInterceptor {
     }
     async handle(request) {
         const { url } = request;
+        console.log('== interceptor header 2');
+        console.log(url);
         if (this.authService.isTokenMandatory(url)) {
             try {
                 await this.config
@@ -5352,20 +5381,29 @@ class MonkeyEcxHttpConfigHeaderInterceptor {
                 // not to do
             }
         }
+        console.log('== interceptor header 3');
         let resp = null;
         try {
+            console.log('== interceptor header 4');
             resp = await this.authService.getRequestWithHeadersAsync(request);
+            console.log('resp');
+            console.log(resp);
         }
         catch (e) {
+            console.log('== interceptor header 5');
+            console.log(e);
             this.errorHandlingService.handleError(e);
             return throwError(e);
         }
         return resp;
     }
     intercept(request, next) {
+        console.log('== interceptor header 1');
         return from(this.handle(request)).pipe(take(1), map((event) => {
             return event;
         }), mergeMap((resp) => {
+            console.log('== interceptor header 6');
+            console.log(resp);
             request = request.clone({
                 setHeaders: resp
             });