monkey-front-core 0.0.195 → 0.0.198

package/fesm2020/monkey-front-core.mjs

@@ -10,7 +10,7 @@ import * as moment_ from 'moment';
 import * as i1$2 from 'ngx-cookie-service';
 import * as i1$3 from '@angular/router';
 import { NavigationStart, NavigationEnd, NavigationError, NavigationCancel } from '@angular/router';
-import { BehaviorSubject, Subscription, throwError, interval, concat, of, Subject } from 'rxjs';
+import { BehaviorSubject, Subscription, throwError, interval, concat, of, Subject, from } from 'rxjs';
 import { filter, take, takeWhile, map, catchError, first, takeUntil, mergeMap, finalize } from 'rxjs/operators';
 import { NG_VALUE_ACCESSOR } from '@angular/forms';
 import { TemplatePortal } from '@angular/cdk/portal';
@@ -2220,8 +2220,8 @@ class MonkeyEcxCommonsService {
         const { config, feature } = args;
         try {
             if (!MonkeyEcxUtils.persistNullEmptyUndefined(feature) ||
-                !MonkeyEcxUtils.persistNullEmptyUndefined(config?.program?.settings?.[feature])) {
-                return false;
+                !MonkeyEcxUtils.persistNullEmptyUndefined(config?.program?.settings)) {
+                return true;
             }
             return !config?.program?.settings?.[feature];
         }
@@ -3467,6 +3467,10 @@ class MonkeyEcxAuthenticationService {
             console.error('isCompanyAuthorized needs to be declared!');
             return false;
         };
+        this.isTokenMandatory = (url) => {
+            console.error('isTokenMandatory needs to be declared!');
+            return false;
+        };
         this.getRequestWithHeaders = (request) => {
             console.error('getRequestWithHeaders needs to be declared!');
             return null;
@@ -3491,6 +3495,7 @@ class MonkeyEcxAuthenticationService {
         this.redirectLoginWelcomeBack =
             args?.redirectLoginWelcomeBack || this.redirectLoginWelcomeBack.bind(this);
         this.isAuthorized = args?.isAuthorized || this.isAuthorized.bind(this);
+        this.isTokenMandatory = args?.isTokenMandatory || this.isTokenMandatory.bind(this);
         this.isCompanyAuthorized = args?.isCompanyAuthorized || this.isCompanyAuthorized.bind(this);
         this.getRequestWithHeaders =
             args?.getRequestWithHeaders || this.getRequestWithHeaders.bind(this);
@@ -4483,7 +4488,7 @@ class MonkeyEcxFeatureByProgramDirective {
         const { feature, config } = this;
         let display = 'none';
         if (!MonkeyEcxUtils.persistNullEmptyUndefined(feature) ||
-            !MonkeyEcxUtils.persistNullEmptyUndefined(config?.program?.settings?.[feature])) {
+            !MonkeyEcxUtils.persistNullEmptyUndefined(config?.program?.settings)) {
             return;
         }
         const disabled = config?.program?.settings?.[feature];
@@ -4670,13 +4675,31 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.1.1", ngImpor
         }], ctorParameters: function () { return [{ type: MonkeyEcxAuthenticationService }, { type: MonkeyEcxErrorHandlingService }]; } });
 
 class MonkeyEcxHttpConfigHeaderInterceptor {
-    constructor(monkeyecxAuthenticationService, monkeyecxErrorHandlingService) {
-        this.monkeyecxAuthenticationService = monkeyecxAuthenticationService;
-        this.monkeyecxErrorHandlingService = monkeyecxErrorHandlingService;
+    constructor(authService, errorHandlingService, config) {
+        this.authService = authService;
+        this.errorHandlingService = errorHandlingService;
+        this.config = config;
         // not to do
     }
-    intercept(request, next) {
-        return this.monkeyecxAuthenticationService?.getRequestWithHeadersOb(request)?.pipe(take(1), map((event) => {
+    async handle(request, next) {
+        const { url } = request;
+        if (this.authService.isTokenMandatory(url)) {
+            try {
+                const config = await this.config
+                    .config()
+                    .pipe(take(1))
+                    .toPromise();
+                if (!config) {
+                    await this.onValidateConfig();
+                }
+            }
+            catch (error) {
+                // not to do
+            }
+        }
+        return this.authService
+            .getRequestWithHeadersOb(request)
+            .pipe(take(1), map((event) => {
             return event;
         }), mergeMap((resp) => {
             request = request.clone({
@@ -4684,16 +4707,40 @@ class MonkeyEcxHttpConfigHeaderInterceptor {
             });
             return next.handle(request);
         }), catchError((error) => {
-            this.monkeyecxErrorHandlingService.handleError(error);
+            this.errorHandlingService.handleError(error);
             return throwError(error);
-        })) || throwError('getRequestWithHeadersOb undefined');
+        }))
+            .toPromise();
+    }
+    onValidateConfig() {
+        return new Promise((resolve) => {
+            let count = 0;
+            const interval = setInterval(async () => {
+                count += 1;
+                if (count > 20) {
+                    clearInterval(interval);
+                    resolve(null);
+                }
+                const config = await this.config
+                    .config()
+                    .pipe(take(1))
+                    .toPromise();
+                if (config) {
+                    clearInterval(interval);
+                    resolve(null);
+                }
+            }, 200);
+        });
+    }
+    intercept(request, next) {
+        return from(this.handle(request, next));
     }
 }
-MonkeyEcxHttpConfigHeaderInterceptor.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: MonkeyEcxHttpConfigHeaderInterceptor, deps: [{ token: MonkeyEcxAuthenticationService }, { token: MonkeyEcxErrorHandlingService }], target: i0.ɵɵFactoryTarget.Injectable });
+MonkeyEcxHttpConfigHeaderInterceptor.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: MonkeyEcxHttpConfigHeaderInterceptor, deps: [{ token: MonkeyEcxAuthenticationService }, { token: MonkeyEcxErrorHandlingService }, { token: MonkeyEcxConfigService }], target: i0.ɵɵFactoryTarget.Injectable });
 MonkeyEcxHttpConfigHeaderInterceptor.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: MonkeyEcxHttpConfigHeaderInterceptor });
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: MonkeyEcxHttpConfigHeaderInterceptor, decorators: [{
             type: Injectable
-        }], ctorParameters: function () { return [{ type: MonkeyEcxAuthenticationService }, { type: MonkeyEcxErrorHandlingService }]; } });
+        }], ctorParameters: function () { return [{ type: MonkeyEcxAuthenticationService }, { type: MonkeyEcxErrorHandlingService }, { type: MonkeyEcxConfigService }]; } });
 
 /* eslint-disable max-len */
 class MonkeyEcxHttpConfigQueueInterceptor {