@posiwise/common-services 0.1.53 → 0.1.55

package/fesm2022/posiwise-common-services.mjs

@@ -7,28 +7,28 @@ import { AppConfigService } from '@posiwise/app-config-service';
 import { DOCUMENT, CommonModule } from '@angular/common';
 import * as i1$3 from '@angular/common/http';
 import { HttpErrorResponse, HttpHeaders } from '@angular/common/http';
-import { throwError, tap, of, BehaviorSubject, timer } from 'rxjs';
-import { catchError, mergeMap, map, switchMap, tap as tap$1, distinctUntilChanged } from 'rxjs/operators';
-import * as i1$2 from 'ngx-toastr';
+import { throwError, of, tap, BehaviorSubject, timer } from 'rxjs';
+import { catchError, switchMap, map, mergeMap, tap as tap$1, distinctUntilChanged } from 'rxjs/operators';
 import { HelperService } from '@posiwise/helper-service';
+import * as i1$2 from 'ngx-toastr';
+import { getUser, UserActionTypes, SetUser, appReducers } from '@posiwise/app-store';
 import * as i1$4 from '@ngrx/effects';
 import { Actions, createEffect, ofType, EffectsModule } from '@ngrx/effects';
-import { getUser, UserActionTypes, SetUser, appReducers } from '@posiwise/app-store';
 import * as i2 from '@ngrx/store';
 import { StoreModule } from '@ngrx/store';
-import { MAIN_API_PREFIX, USER_PATH, INTEGRATIONS_API_PREFIX, USER_IMPERSONATED_TOKEN, USER_IMPERSONATED_PHONEGAP_TOKEN, TOKEN_KEY, TOKEN_HEADER_KEY, NEWSLETTER_CONFIRMATION_PATH, NEWSLETTER_UNSUBSCRIBE_PATH, CAPTCHA_VALIDATION_PATH, SOCIAL_LOGIN_PATH, PERMISSION_NAMES, ADMIN_SUB_MENU_WHITELIST, AB_TEST_ACTIONS, GEO_PATH, PROJECT_PATH, PRODUCT_PATH, CONTACT_US_PATH, INCIDENTS_PATH, INCIDENTS_PATH_ADMIN, NEWSLETTERS_PATH, NEWSLETTER_SUBSCRIPTION_PATH, ADMIN_FAQS_PATH, FAQS_PATH, ORGANIZATIONS_PATH, GLOBAL_SUBSCRIPTION_CONFIGS_PATH, GLOBAL_CONFIGS_PATH, USER_LOGIN_NOTIFICATION, FEEDBACK_QUESTIONS_PATH, USER_FEEDBACKS_PATH, CUSTOMER_SUPPORT_PATH, ADMIN_TAG_PATH, ADMIN_TAG_CATEGORIES_PATH, ADMIN_PATH, QUALIFICATIONS_PATH, SOCKET_TYPE } from '@posiwise/common-utilities';
+import { INTEGRATIONS_API_PREFIX, MAIN_API_PREFIX, USER_PATH, USER_IMPERSONATED_TOKEN, USER_IMPERSONATED_PHONEGAP_TOKEN, TOKEN_KEY, TOKEN_HEADER_KEY, NEWSLETTER_CONFIRMATION_PATH, NEWSLETTER_UNSUBSCRIBE_PATH, CAPTCHA_VALIDATION_PATH, SOCIAL_LOGIN_PATH, PERMISSION_NAMES, ADMIN_SUB_MENU_WHITELIST, AB_TEST_ACTIONS, GEO_PATH, PROJECT_PATH, PRODUCT_PATH, CONTACT_US_PATH, INCIDENTS_PATH, INCIDENTS_PATH_ADMIN, NEWSLETTERS_PATH, NEWSLETTER_SUBSCRIPTION_PATH, ADMIN_FAQS_PATH, FAQS_PATH, ORGANIZATIONS_PATH, GLOBAL_SUBSCRIPTION_CONFIGS_PATH, GLOBAL_CONFIGS_PATH, USER_LOGIN_NOTIFICATION, FEEDBACK_QUESTIONS_PATH, USER_FEEDBACKS_PATH, CUSTOMER_SUPPORT_PATH, ADMIN_TAG_PATH, ADMIN_TAG_CATEGORIES_PATH, ADMIN_PATH, QUALIFICATIONS_PATH, SOCKET_TYPE } from '@posiwise/common-utilities';
 import swal from 'sweetalert2';
 import cloneDeep from 'lodash/cloneDeep';
 import pickBy from 'lodash/pickBy';
 import * as i2$1 from 'ngx-cookie';
 import { UntypedFormControl, UntypedFormGroup } from '@angular/forms';
-import { NgbDateParserFormatter } from '@ng-bootstrap/ng-bootstrap';
 import isNumber from 'lodash/isNumber';
 import moment from 'moment';
+import { NgbDateParserFormatter } from '@ng-bootstrap/ng-bootstrap';
 import { webSocket } from 'rxjs/webSocket';
-import * as Sentry from '@sentry/angular-ivy';
 import { StatusCodes } from 'http-status-codes';
 import { fromError } from 'stacktrace-js';
+import * as Sentry from '@sentry/angular-ivy';
 
 class ScriptLoaderService {
     constructor(document) {
@@ -384,6 +384,56 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.3.11", ngImpo
             type: Injectable
         }], ctorParameters: () => [{ type: i1$3.HttpClient }, { type: i0.Injector }] });
 
+class IntegrationsApiHttpService extends BaseHttpService {
+    constructor(http, injector) {
+        super(http, injector);
+    }
+    getConfig() {
+        this.injector.get(AppConfigService).appConfig$.subscribe(config => {
+            this.baseUrl = isDevMode()
+                ? INTEGRATIONS_API_PREFIX
+                : config?.['links']?.integrations_api;
+        });
+    }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "17.3.11", ngImport: i0, type: IntegrationsApiHttpService, deps: [{ token: i1$3.HttpClient }, { token: i0.Injector }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "17.3.11", ngImport: i0, type: IntegrationsApiHttpService, providedIn: 'root' }); }
+}
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.3.11", ngImport: i0, type: IntegrationsApiHttpService, decorators: [{
+            type: Injectable,
+            args: [{
+                    providedIn: 'root'
+                }]
+        }], ctorParameters: () => [{ type: i1$3.HttpClient }, { type: i0.Injector }] });
+
+class LocalStorage {
+    getItem$(key) {
+        return of(localStorage.getItem(key));
+    }
+    setItem$(key, value) {
+        return of(localStorage.setItem(key, value));
+    }
+    removeItem$(key) {
+        return of(localStorage.removeItem(key));
+    }
+    clear$() {
+        return of(localStorage.clear());
+    }
+    clearAll() {
+        return localStorage.clear();
+    }
+    getItem(key) {
+        return localStorage.getItem(key);
+    }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "17.3.11", ngImport: i0, type: LocalStorage, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "17.3.11", ngImport: i0, type: LocalStorage, providedIn: 'root' }); }
+}
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.3.11", ngImport: i0, type: LocalStorage, decorators: [{
+            type: Injectable,
+            args: [{
+                    providedIn: 'root'
+                }]
+        }] });
+
 class MainApiHttpService extends BaseHttpService {
     constructor(http, injector) {
         super(http, injector);
@@ -500,76 +550,6 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.3.11", ngImpo
                 }]
         }], ctorParameters: () => [{ type: MainApiHttpService }, { type: i2.Store }, { type: i1.Router }] });
 
-/* NgRx */
-class UserEffects {
-    constructor(userService) {
-        this.userService = userService;
-        this.actions$ = inject(Actions);
-        this.loadUser$ = createEffect(() => {
-            return this.actions$.pipe(ofType(UserActionTypes.GET_USER), 
-            // take(1),
-            mergeMap(() => this.userService.getUserInfo().pipe(map(response => new SetUser(response))
-            // catchError(err => of(new userActions.LoadFail(err)))
-            )));
-        });
-    }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "17.3.11", ngImport: i0, type: UserEffects, deps: [{ token: UserService }], target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "17.3.11", ngImport: i0, type: UserEffects }); }
-}
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.3.11", ngImport: i0, type: UserEffects, decorators: [{
-            type: Injectable
-        }], ctorParameters: () => [{ type: UserService }] });
-
-class LocalStorage {
-    getItem$(key) {
-        return of(localStorage.getItem(key));
-    }
-    setItem$(key, value) {
-        return of(localStorage.setItem(key, value));
-    }
-    removeItem$(key) {
-        return of(localStorage.removeItem(key));
-    }
-    clear$() {
-        return of(localStorage.clear());
-    }
-    clearAll() {
-        return localStorage.clear();
-    }
-    getItem(key) {
-        return localStorage.getItem(key);
-    }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "17.3.11", ngImport: i0, type: LocalStorage, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "17.3.11", ngImport: i0, type: LocalStorage, providedIn: 'root' }); }
-}
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.3.11", ngImport: i0, type: LocalStorage, decorators: [{
-            type: Injectable,
-            args: [{
-                    providedIn: 'root'
-                }]
-        }] });
-
-class IntegrationsApiHttpService extends BaseHttpService {
-    constructor(http, injector) {
-        super(http, injector);
-    }
-    getConfig() {
-        this.injector.get(AppConfigService).appConfig$.subscribe(config => {
-            this.baseUrl = isDevMode()
-                ? INTEGRATIONS_API_PREFIX
-                : config?.['links']?.integrations_api;
-        });
-    }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "17.3.11", ngImport: i0, type: IntegrationsApiHttpService, deps: [{ token: i1$3.HttpClient }, { token: i0.Injector }], target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "17.3.11", ngImport: i0, type: IntegrationsApiHttpService, providedIn: 'root' }); }
-}
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.3.11", ngImport: i0, type: IntegrationsApiHttpService, decorators: [{
-            type: Injectable,
-            args: [{
-                    providedIn: 'root'
-                }]
-        }], ctorParameters: () => [{ type: i1$3.HttpClient }, { type: i0.Injector }] });
-
 class AuthService {
     constructor(localStorage, router, http, userService, toastr, appConfigService, integrationsApi, document) {
         this.localStorage = localStorage;
@@ -581,10 +561,10 @@ class AuthService {
         this.integrationsApi = integrationsApi;
         this.document = document;
         this.platformSubject = new BehaviorSubject('');
-        this.platform$ = this.platformSubject.asObservable();
         this.twitterEndpoint = '/twitter';
         this.header_key = 'browser';
         this.platform = '';
+        this.platform$ = this.platformSubject.asObservable();
         // Set Header Key
         this.setHeaderKey();
     }
@@ -847,6 +827,26 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.3.11", ngImpo
                     args: [DOCUMENT]
                 }] }] });
 
+/* NgRx */
+class UserEffects {
+    constructor(userService) {
+        this.userService = userService;
+        this.actions$ = inject(Actions);
+        this.loadUser$ = createEffect(() => {
+            return this.actions$.pipe(ofType(UserActionTypes.GET_USER), 
+            // take(1),
+            mergeMap(() => this.userService.getUserInfo().pipe(map(response => new SetUser(response))
+            // catchError(err => of(new userActions.LoadFail(err)))
+            )));
+        });
+    }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "17.3.11", ngImport: i0, type: UserEffects, deps: [{ token: UserService }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "17.3.11", ngImport: i0, type: UserEffects }); }
+}
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.3.11", ngImport: i0, type: UserEffects, decorators: [{
+            type: Injectable
+        }], ctorParameters: () => [{ type: UserService }] });
+
 class CommonServicesModule {
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "17.3.11", ngImport: i0, type: CommonServicesModule, deps: [], target: i0.ɵɵFactoryTarget.NgModule }); }
     static { this.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "14.0.0", version: "17.3.11", ngImport: i0, type: CommonServicesModule, imports: [CommonModule, i1$4.EffectsRootModule, i2.StoreRootModule] }); }
@@ -882,41 +882,60 @@ class PermissionService {
             // Returning true if user has a given permission
             // E.g., Pages.Role.CloudOlive.SalesManager
             // or Pages.Beta or Pages.Alpha
-            if (user['auth']?.['granted'][permissionName]) {
-                return true;
-            }
-            if (productKey) {
-                // filters the permission only for the selected product.
-                let filteredPermissions = pickBy(cloneDeep(user['auth']['granted']), (_value, key) => {
-                    return key.includes(productKey);
-                });
-                // add Pages.Product.{permission_key}
-                filteredPermissions = {
-                    ...{ [`Pages.Product.${permission_key}`]: true },
-                    ...filteredPermissions
-                };
-                // E.g., Pages.Product.CloudOlive.CloudOlive_MspKey
-                return filteredPermissions[permissionName] || false;
-            }
+            return this.hasProductPermission(user, permissionName, productKey, permission_key);
             // no valid permission was detected for this user
-            return false;
         }
         // user not logged-in
         return false;
     }
+    hasProductPermission(user, permissionName, productKey, permission_key) {
+        if (permissionName?.includes('||')) {
+            const parts = permissionName.split('||').map(p => p.trim());
+            for (const part of parts) {
+                if (user['auth']?.['granted'][part]) {
+                    return true;
+                }
+            }
+        }
+        else if (user['auth']?.['granted'][permissionName]) {
+            return true;
+        }
+        if (productKey) {
+            // filters the permission only for the selected product.
+            let filteredPermissions = pickBy(cloneDeep(user['auth']['granted']), (_value, key) => {
+                return key.includes(productKey);
+            });
+            // add Pages.Product.{permission_key}
+            filteredPermissions = {
+                ...{ [`Pages.Product.${permission_key}`]: true },
+                ...filteredPermissions
+            };
+            // E.g., Pages.Product.CloudOlive.CloudOlive_MspKey
+            return filteredPermissions[permissionName] || false;
+        }
+        return false;
+    }
     getFormattedPermissionName(permissionName, productSlug) {
         const selectedProduct = PermissionService?.selectedProduct || this.getCurrentProduct();
         const subscriptionSlug = selectedProduct?.subscription_slug;
         let slugToCheck;
         if (!productSlug) {
-            slugToCheck = `Pages.Product.${subscriptionSlug}.`;
+            if (permissionName.includes('Pages.Product.')) {
+                slugToCheck = `Pages.Product.${subscriptionSlug}.`;
+            }
+            if (permissionName.includes('Pages.Role.')) {
+                slugToCheck = `Pages.Role.${subscriptionSlug}.`;
+            }
         }
         else {
             slugToCheck = productSlug;
         }
-        if (!permissionName.includes(slugToCheck)) {
+        if (!permissionName.includes(slugToCheck) && permissionName.includes('Pages.Product.')) {
             permissionName = permissionName.replace('Pages.Product.', slugToCheck);
         }
+        if (permissionName.includes('Pages.Role.') && !permissionName.includes(slugToCheck)) {
+            permissionName = permissionName.replace('Pages.Role.', slugToCheck);
+        }
         return permissionName;
     }
     getPermissionTreeDataByRole(data) {
@@ -939,7 +958,6 @@ class PermissionService {
         if (!permission) {
             return false;
         }
-        console.log(permission, productKey, permission_key, productSlug);
         // -   `SuperAdmin`             =>  God-like power - Most privileged
         // -   `SubscriptionSuperOwner` =>  Some of the features under Admin Menu
         // -   `SubscriptionSuperAdmin` =>  Some of the features under Admin Menu
@@ -965,27 +983,23 @@ class PermissionService {
         if (permission === PERMISSION_NAMES.SubscriptionSuperOwner) {
             return this.isUserSubscriptionSuperOwner() || this.isSuperAdmin();
         }
-        if (typeof permission === "string" &&
+        if (typeof permission === 'string' &&
             ADMIN_SUB_MENU_WHITELIST.some(v => permission.includes(v)) &&
             (this.isUserSubscriptionSuperAdmin() || this.isUserSubscriptionSuperOwner())) {
             return true;
         }
-        // The following evaluates a complex permission
-        // Eg: `( ${BASIC_PERMISSIONS.MspKey} || ${BASIC_PERMISSIONS.SaaSKey} ) && ${BASIC_PERMISSIONS.Beta}`
-        if (typeof permission !== "boolean") {
-            permission.split(' ').forEach(x => {
-                let raw = x;
-                if (x.includes('Pages')) {
-                    if (productKey) {
-                        raw = `this.isGranted('${x}', '${productKey}', '${permission_key}', '${productSlug}')`;
-                    }
-                    else {
-                        raw = `this.isGranted('${x}')`;
-                    }
-                }
-                expr += `${raw} `;
-            }, this);
-        }
+        const tokens = (permission || '').toString().split(' ').filter(Boolean);
+        tokens.forEach(token => {
+            const rawToken = token.trim();
+            if (rawToken === '||' || rawToken === '&&' || rawToken === '(' || rawToken === ')') {
+                expr += ` ${rawToken} `;
+            }
+            else {
+                // it's a permission name (either 'SubscriptionAdmin', 'Pages.Role.MarketingManager', etc.)
+                const evaluated = this.isGranted(rawToken, productKey, permission_key, productSlug);
+                expr += ` ${evaluated} `;
+            }
+        });
         // eslint-disable-next-line no-eval
         // NOSONAR: Trusted eval function is handled safely here
         return eval(expr); // NOSONAR
@@ -1034,8 +1048,7 @@ class PermissionService {
         if (!product) {
             product = this.getCurrentProduct();
         }
-        const selectedProduct = PermissionService?.selectedProduct;
-        const subscriptionSlug = selectedProduct?.subscription_slug;
+        const subscriptionSlug = product?.subscription_slug;
         return (!!this.user.auth.granted[`Pages.Product.${subscriptionSlug}.${product.permission_key}.${product.feature_key}.SubscriptionSuperAdmin`] ||
             !!this.user.auth.granted[`Pages.Product.${subscriptionSlug}.${product.permission_key}.${product.feature_key}.SubscriptionSuperOwner`]);
     }
@@ -1963,11 +1976,11 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.3.11", ngImpo
 class GroupService {
     constructor(api) {
         this.api = api;
-        this.ADMIN_PATH = ADMIN_PATH;
         this.subscription_endpoint = '/subscriptions/';
         this.group_communications_endpoint = '/group_communications/';
         this.group_definitions_endpoint = '/group_definitions/';
         this.groups_endpoint = '/groups/';
+        this.ADMIN_PATH = ADMIN_PATH;
     }
     // ------------------------------------------------------------
     // Subscription Service
@@ -2202,8 +2215,8 @@ class NotificationService {
         this.api = api;
         this.toastrService = toastrService;
         this.socketService = socketService;
-        this.endpoint = 'notes_read';
         this.notificationSubject$ = new BehaviorSubject([]);
+        this.endpoint = 'notes_read';
     }
     getNotifications(paging) {
         return this.api.getWithParams(`/notes?show_on_dashboard=true`, {