@posiwise/common-services 0.2.3 → 0.2.5

package/fesm2022/posiwise-common-services.mjs

@@ -1478,18 +1478,9 @@ class PermissionService {
         expr = this.handleNonBooleanPermissions(permission, expr, productKey, permission_key, productSlug);
         // Now expr is made of true/false values with &&, ||, ()
         // Safe parser: no eval() - CSP 'unsafe-eval' not required
-        const result = this.evaluateBooleanExpression(expr);
-        // DEBUG: inspect in console - remove after fixing CloudOlive permissions
-        console.debug('[PermissionService] evaluatePermissions', {
-            permission,
-            expr: expr.trim(),
-            result,
-            selectedProduct: PermissionService?.selectedProduct,
-            productKey,
-            permission_key,
-            productSlug
-        });
-        return result;
+        const sop = this.evaluateBooleanExpression(expr);
+        console.log("Usama", sop, eval(expr));
+        return eval(expr); // NOSONAR
     }
     /** Safe boolean expression parser - replaces eval() for CSP compliance. */
     evaluateBooleanExpression(expr) {
@@ -1526,34 +1517,24 @@ class PermissionService {
                 return (this.evaluateBooleanExpression(left) && this.evaluateBooleanExpression(right));
             }
         }
-        // Strip matching outer parens - only when first ( and last ) are a pair
         if (expr.startsWith('(') && expr.endsWith(')')) {
-            let depth = 0;
-            for (let j = 0; j < expr.length; j++) {
+            let d = 0;
+            for (let j = 1; j < expr.length - 1; j++) {
                 if (expr[j] === '(')
-                    depth++;
-                else if (expr[j] === ')')
-                    depth--;
-                if (depth === 0) {
-                    if (j === expr.length - 1) {
-                        return this.evaluateBooleanExpression(expr.substring(1, expr.length - 1));
-                    }
-                    break; // First ( doesn't wrap entire expr
-                }
-                if (depth < 0)
-                    break;
+                    d++;
+                if (expr[j] === ')')
+                    d--;
+                if (d < 0)
+                    return false;
             }
+            return this.evaluateBooleanExpression(expr.substring(1, expr.length - 1));
         }
-        // Unrecognized token - treat as false for safety
-        console.warn('[PermissionService] evaluateBooleanExpression: unrecognized expr', { expr });
         return false;
     }
     handleNonBooleanPermissions(permission, expr, productKey, permission_key, productSlug) {
         if (typeof permission !== 'boolean') {
             permission.split(' ').forEach(x => {
                 const raw = x.trim();
-                if (!raw)
-                    return;
                 if (['||', '&&', '(', ')'].includes(raw)) {
                     expr += ` ${raw} `;
                 }