monkey-front-core 0.0.304 → 0.0.306

package/fesm2020/monkey-front-core.mjs

@@ -2552,7 +2552,7 @@ const selectState = createFeatureSelector(featureKey);
 const selectAll = createSelector(selectState, selectAll$1);
 const select = (props) => {
     return createSelector(selectAll, (entities) => {
-        return entities.filter((_) => {
+        return entities.find((_) => {
             return _.username === props.username;
         });
     });
@@ -2583,6 +2583,31 @@ var index = /*#__PURE__*/Object.freeze({
     selectors: index$1
 });
 
+class Link {
+    constructor(data) {
+        this.href = data?.href;
+        this.type = data?.type;
+        this.templated = data?.templated;
+    }
+}
+class MonkeyEcxModel {
+    getAction(type, replaceOptions) {
+        const { _links } = this;
+        if (!_links)
+            return null;
+        let link = _links[type.toLowerCase()];
+        link = new Link(link);
+        if (link && replaceOptions && link?.templated) {
+            const { from, to } = replaceOptions;
+            link = new Link({
+                ...link,
+                href: `${link.href}`.replace(from, to),
+            });
+        }
+        return link;
+    }
+}
+
 class MonkeyEcxRequestPagedHandling {
     constructor(url, pagedParams, links, samePage = false) {
         this.samePage = false;
@@ -2624,31 +2649,6 @@ class MonkeyEcxRequestPagedHandling {
     }
 }
 
-class Link {
-    constructor(data) {
-        this.href = data?.href;
-        this.type = data?.type;
-        this.templated = data?.templated;
-    }
-}
-class MonkeyEcxModel {
-    getAction(type, replaceOptions) {
-        const { _links } = this;
-        if (!_links)
-            return null;
-        let link = _links[type.toLowerCase()];
-        link = new Link(link);
-        if (link && replaceOptions && link?.templated) {
-            const { from, to } = replaceOptions;
-            link = new Link({
-                ...link,
-                href: `${link.href}`.replace(from, to),
-            });
-        }
-        return link;
-    }
-}
-
 class LinksModel extends MonkeyEcxModel {
     constructor(data) {
         super();
@@ -2680,7 +2680,7 @@ class MonkeyEcxCommonsService {
         this.__onZipCodeDataChanged$ = new BehaviorSubject(null);
         this.__oni18nDataChanged$ = new BehaviorSubject(null);
         this.__onDoSearch$ = new BehaviorSubject({});
-        this.__tokenCredentials = null;
+        this.__tokenCredentials = undefined;
         this.__schedule = null;
         this.__callbackPagination = () => {
             // eslint-disable-next-line no-console
@@ -2689,9 +2689,9 @@ class MonkeyEcxCommonsService {
         this.__isAbleToDoPagination = {};
         this.handleInit();
     }
-    handleInit() {
+    async handleInit() {
         if (this.tokenStorage) {
-            this.__tokenCredentials = this.tokenStorage.getToken();
+            this.__tokenCredentials = await this.tokenStorage.getToken();
         }
         if (this.otherArgs?.router) {
             const { clearOnChangeRoute } = this.otherArgs?.schedule?.options || {
@@ -2874,7 +2874,7 @@ class MonkeyEcxCommonsService {
         this.__handledError = null;
         this.flagValidator = false;
     }
-    resolve(route, state, otherArgs) {
+    async resolve(route, state, otherArgs) {
         if (JSON.stringify(route?.queryParams) === '{}') {
             this.__data = null;
             this.__page = null;
@@ -2882,7 +2882,10 @@ class MonkeyEcxCommonsService {
         this.__requestPaged = null;
         this.flagValidator = true;
         if (this.tokenStorage) {
-            this.__tokenCredentials = this.tokenStorage.getToken();
+            console.log('resolve commmons');
+            this.__tokenCredentials = await this.tokenStorage.getToken();
+            console.log('this.__tokenCredentials');
+            console.log(this.__tokenCredentials);
         }
         const pend = this.allowedSecurityAccessByPendency(otherArgs?.pendency);
         const allowedByProgram = this.allowedSecurityAccessByFeature(otherArgs?.featureByProgram);
@@ -3652,18 +3655,26 @@ class MonkeyEcxTokenStorageService {
         }
         token$.next(token);
     }
-    getAllTokens() {
-        const { token, config } = this;
-        const handledToken = {
-            ...token
+    async getAllTokens() {
+        const { store, monkeyecxConfigService } = this;
+        const username = localStorage.getItem('username');
+        let data = {
+            username: username || '',
+            program: ''
         };
-        Object.entries(token || {}).forEach(([key, value]) => {
-            handledToken[key] = localStorage.getItem(key);
-        });
-        if (!handledToken?.program && config?.program) {
-            handledToken.program = config?.program?.token;
+        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 handledToken;
+        return data;
     }
     setAllMe(me) {
         const { me$, store } = this;
@@ -3690,9 +3701,17 @@ class MonkeyEcxTokenStorageService {
         localStorage.setItem('me', JSON.stringify(previousMe));
         me$.next(previousMe);
     }
-    getAllMe() {
-        const me = localStorage.getItem('me');
-        return JSON.parse(me || '{}');
+    async getAllMe() {
+        const { store } = this;
+        const username = localStorage.getItem('username');
+        let data = {
+            username: username || '',
+            program: ''
+        };
+        if (username) {
+            data = await store.select(select({ username })).pipe(take(1)).toPromise();
+        }
+        return data?.me;
     }
     tokenHasChanged() {
         return this.token$.asObservable();
@@ -3776,7 +3795,7 @@ class MonkeyEcxSecurityDirective {
         this.cdr = cdr;
         this.roles = [];
         this.byExclusion = false;
-        this.tokenCredentials = null;
+        this.tokenCredentials = undefined;
         // not to do
     }
     getRole() {
@@ -3809,15 +3828,17 @@ class MonkeyEcxSecurityDirective {
         this.elementRef.nativeElement.style.display = display;
         this.cdr.detectChanges();
     }
+    async handleData() {
+        this.tokenCredentials = await this.tokenStorageService.getToken();
+        this.handleAccess();
+    }
     ngOnInit() {
         this.elementRef.nativeElement.style.display = 'none';
         this.cdr.detectChanges();
         this.tokenStorageService.tokenHasChanged().subscribe(() => {
-            this.tokenCredentials = this.tokenStorageService.getToken();
-            this.handleAccess();
+            this.handleData();
         });
-        this.tokenCredentials = this.tokenStorageService.getToken();
-        this.handleAccess();
+        this.handleData();
     }
 }
 MonkeyEcxSecurityDirective.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: MonkeyEcxSecurityDirective, deps: [{ token: i0.ElementRef }, { token: MonkeyEcxTokenStorageService }, { token: i0.ChangeDetectorRef }], target: i0.ɵɵFactoryTarget.Directive });
@@ -3825,7 +3846,7 @@ MonkeyEcxSecurityDirective.ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "12.0
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: MonkeyEcxSecurityDirective, decorators: [{
             type: Directive,
             args: [{
-                    selector: '[monkeyecxSecurity]',
+                    selector: '[monkeyecxSecurity]'
                 }]
         }], ctorParameters: function () { return [{ type: i0.ElementRef }, { type: MonkeyEcxTokenStorageService }, { type: i0.ChangeDetectorRef }]; }, propDecorators: { roles: [{
                 type: Input,
@@ -3994,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;
         };
@@ -4009,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;
         };
@@ -4029,6 +4049,10 @@ 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;
@@ -4049,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);
@@ -4066,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();
@@ -4091,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;
         }
@@ -4115,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();
@@ -4315,10 +4341,10 @@ class MonkeyEcxHttpErrorHandlingService extends MonkeyEcxCommonsService {
             this.showMessage(customMessage, error, mkc);
         }
     }
-    handleError(error, mkc) {
+    async handleError(error, mkc) {
         const { router, tokenStorage } = this;
         const { status } = error;
-        const { companyType } = tokenStorage?.getToken() || { companyType: '' };
+        const { companyType } = await tokenStorage?.getToken() || { companyType: '' };
         const routes = {
             403: 'forbidden',
             500: 'service-problems',
@@ -5326,15 +5352,14 @@ 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();
+        let resp = null;
+        try {
+            resp = await this.authService.getRequestWithHeadersAsync(request);
+        }
+        catch (e) {
+            this.errorHandlingService.handleError(e);
+            return throwError(e);
+        }
         return resp;
     }
     intercept(request, next) {