monkey-front-core 0.0.306 → 0.0.308

package/fesm2015/monkey-front-core.mjs

@@ -2683,7 +2683,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
@@ -3653,25 +3653,33 @@ class MonkeyEcxTokenStorageService {
     getAllTokens() {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
-            const { store, monkeyecxConfigService } = this;
-            const username = localStorage.getItem('username');
-            let data = {
-                username: username || '',
-                program: ''
-            };
-            if (username) {
-                data = yield store.select(select({ username })).pipe(take(1)).toPromise();
-                data === null || data === void 0 ? true : delete data.me;
+            try {
+                const { store, monkeyecxConfigService } = this;
+                const username = localStorage.getItem('username');
+                let data = {
+                    username: username || '',
+                    program: ''
+                };
+                if (username) {
+                    data = yield store.select(select({ username })).pipe(take(1)).toPromise();
+                    data === null || data === void 0 ? true : delete data.me;
+                }
+                const config = yield monkeyecxConfigService.config()
+                    .pipe(first((val) => {
+                    return !!val && JSON.stringify(val) !== '{}';
+                }))
+                    .toPromise();
+                if (data && !(data === null || data === void 0 ? void 0 : data.program) && (config === null || config === void 0 ? void 0 : config.program)) {
+                    data.program = (_a = config === null || config === void 0 ? void 0 : config.program) === null || _a === void 0 ? void 0 : _a.token;
+                }
+                return data;
             }
-            const config = yield monkeyecxConfigService.config()
-                .pipe(first((val) => {
-                return !!val && JSON.stringify(val) !== '{}';
-            }))
-                .toPromise();
-            if (data && !(data === null || data === void 0 ? void 0 : data.program) && (config === null || config === void 0 ? void 0 : config.program)) {
-                data.program = (_a = config === null || config === void 0 ? void 0 : config.program) === null || _a === void 0 ? void 0 : _a.token;
+            catch (e) {
+                console.log('=======');
+                console.log(e);
+                console.log('=======');
             }
-            return data;
+            return null;
         });
     }
     setAllMe(me) {
@@ -3787,7 +3795,7 @@ class MonkeyEcxSecurityDirective {
         this.cdr = cdr;
         this.roles = [];
         this.byExclusion = false;
-        this.tokenCredentials = undefined;
+        this.tokenCredentials = null;
         // not to do
     }
     getRole() {
@@ -4054,10 +4062,10 @@ class MonkeyEcxAuthenticationService {
             console.error('refreshShouldHappen needs to be declared!');
             return false;
         };
-        this.refreshToken = () => {
+        this.refreshToken = () => __awaiter(this, void 0, void 0, function* () {
             console.error('refreshToken needs to be declared!');
             return null;
-        };
+        });
         // not to do
     }
     init(args) {
@@ -5235,25 +5243,46 @@ class MonkeyEcxHttpConfigErrorInterceptor {
         this.monkeyecxErrorHandlingService = monkeyecxErrorHandlingService;
         // no to do
     }
+    handle(request, error) {
+        var _a;
+        return __awaiter(this, void 0, void 0, function* () {
+            console.log('== interceptor error 4');
+            console.log(request.url);
+            if (this.monkeyecxAuthenticationService.refreshShouldHappen(error)) {
+                console.log('== interceptor error 5');
+                yield ((_a = this.monkeyecxAuthenticationService) === null || _a === void 0 ? void 0 : _a.refreshToken());
+                console.log('== interceptor error 6');
+                const headers = yield 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) => {
-            var _a, _b;
-            if (this.monkeyecxAuthenticationService.refreshShouldHappen(error)) {
-                return ((_b = (_a = this.monkeyecxAuthenticationService) === null || _a === void 0 ? void 0 : _a.refreshToken()) === null || _b === void 0 ? void 0 : _b.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);
+            }));
         }));
     }
 }
@@ -5273,6 +5302,8 @@ class MonkeyEcxHttpConfigHeaderInterceptor {
     handle(request) {
         return __awaiter(this, void 0, void 0, function* () {
             const { url } = request;
+            console.log('== interceptor header 2');
+            console.log(url);
             if (this.authService.isTokenMandatory(url)) {
                 try {
                     yield this.config
@@ -5286,11 +5317,17 @@ class MonkeyEcxHttpConfigHeaderInterceptor {
                     // not to do
                 }
             }
+            console.log('== interceptor header 3');
             let resp = null;
             try {
+                console.log('== interceptor header 4');
                 resp = yield 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);
             }
@@ -5298,9 +5335,12 @@ class MonkeyEcxHttpConfigHeaderInterceptor {
         });
     }
     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
             });