monkey-front-core 0.0.305 → 0.0.307

package/fesm2020/monkey-front-core.mjs

@@ -4015,10 +4015,9 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.1.1", ngImpor
                 }]
         }], ctorParameters: function () { return [{ type: i1.MonkeyStyleGuideSnackbarService }, { type: i1$1.TranslateService }]; } });
 
-/* eslint-disable no-console */
 class MonkeyEcxAuthenticationService {
     constructor() {
-        this.hadAtLeastOneLogin = () => {
+        this.hadAtLeastOneLogin = async () => {
             console.error('hadAtLeastOneLogin needs to be declared!');
             return null;
         };
@@ -4030,11 +4029,11 @@ class MonkeyEcxAuthenticationService {
             console.error('redirectLoginWelcomeBack needs to be declared!');
             return null;
         };
-        this.isAuthorized = () => {
+        this.isAuthorized = async () => {
             console.error('isAuthorized needs to be declared!');
             return false;
         };
-        this.isCompanyAuthorized = () => {
+        this.isCompanyAuthorized = async () => {
             console.error('isCompanyAuthorized needs to be declared!');
             return false;
         };
@@ -4050,11 +4049,15 @@ class MonkeyEcxAuthenticationService {
             console.error('getRequestWithHeadersOb needs to be declared!');
             return null;
         };
+        this.getRequestWithHeadersAsync = async (request) => {
+            console.error('getRequestWithHeadersAsync needs to be declared!');
+            return null;
+        };
         this.refreshShouldHappen = (response) => {
             console.error('refreshShouldHappen needs to be declared!');
             return false;
         };
-        this.refreshToken = () => {
+        this.refreshToken = async () => {
             console.error('refreshToken needs to be declared!');
             return null;
         };
@@ -4070,6 +4073,8 @@ class MonkeyEcxAuthenticationService {
         this.isCompanyAuthorized = args?.isCompanyAuthorized || this.isCompanyAuthorized.bind(this);
         this.getRequestWithHeaders =
             args?.getRequestWithHeaders || this.getRequestWithHeaders.bind(this);
+        this.getRequestWithHeadersAsync =
+            args?.getRequestWithHeadersAsync || this.getRequestWithHeadersAsync.bind(this);
         this.getRequestWithHeadersOb = args?.getRequestWithHeadersOb.bind(this);
         this.refreshShouldHappen = args?.refreshShouldHappen || this.refreshShouldHappen.bind(this);
         this.refreshToken = args?.refreshToken || this.refreshToken.bind(this);
@@ -4087,10 +4092,10 @@ class MonkeyEcxAuthGuardCompany {
         this.monkeyecxAuthenticationService = monkeyecxAuthenticationService;
         // not to do
     }
-    canActivate() {
+    async canActivate() {
         const { monkeyecxAuthenticationService } = this;
-        if (this.monkeyecxAuthenticationService.isAuthorized()) {
-            if (monkeyecxAuthenticationService.isCompanyAuthorized()) {
+        if (await this.monkeyecxAuthenticationService.isAuthorized()) {
+            if (await monkeyecxAuthenticationService.isCompanyAuthorized()) {
                 return true;
             }
             this.monkeyecxAuthenticationService.redirectApp();
@@ -4112,12 +4117,12 @@ class MonkeyEcxAuthGuardLogin {
         this.monkeyecxAuthenticationService = monkeyecxAuthenticationService;
         // not to do
     }
-    canActivate() {
-        if (this.monkeyecxAuthenticationService.isAuthorized()) {
+    async canActivate() {
+        if (await this.monkeyecxAuthenticationService.isAuthorized()) {
             this.monkeyecxAuthenticationService.redirectApp();
             return false;
         }
-        if (this.monkeyecxAuthenticationService.hadAtLeastOneLogin()) {
+        if (await this.monkeyecxAuthenticationService.hadAtLeastOneLogin()) {
             this.monkeyecxAuthenticationService.redirectLoginWelcomeBack();
             return false;
         }
@@ -4136,9 +4141,9 @@ class MonkeyEcxAuthGuard {
         this.monkeyecxAuthenticationService = monkeyecxAuthenticationService;
         // not to do
     }
-    canActivate() {
+    async canActivate() {
         const { monkeyecxAuthenticationService } = this;
-        if (monkeyecxAuthenticationService.isAuthorized()) {
+        if (await monkeyecxAuthenticationService.isAuthorized()) {
             return true;
         }
         monkeyecxAuthenticationService.redirectLoginWelcomeBack();
@@ -5298,24 +5303,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);
+            }));
         }));
     }
 }
@@ -5334,6 +5358,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
@@ -5347,21 +5373,29 @@ class MonkeyEcxHttpConfigHeaderInterceptor {
                 // not to do
             }
         }
-        const resp = await this.authService
-            .getRequestWithHeadersOb(request)
-            .pipe(take(1), map((event) => {
-            return event;
-        }), catchError((error) => {
-            this.errorHandlingService.handleError(error);
-            return throwError(error);
-        }))
-            .toPromise();
+        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
             });