@posiwise/common-services 0.2.2 → 0.2.4

package/fesm2022/posiwise-common-services.mjs

@@ -1478,24 +1478,15 @@ 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;
+        return this.evaluateBooleanExpression(expr);
     }
     /** Safe boolean expression parser - replaces eval() for CSP compliance. */
     evaluateBooleanExpression(expr) {
         expr = expr.replace(/\s+/g, ' ').trim();
-        if (!expr)
+        if (!expr) {
+            console.warn('[evaluateBooleanExpression] empty expr', { expr: `"${expr}"` });
             return false;
+        }
         if (expr === 'true')
             return true;
         if (expr === 'false')
@@ -1510,7 +1501,9 @@ class PermissionService {
             else if (depth === 0 && expr.substring(i, i + 2) === '||') {
                 const left = expr.substring(0, i).trim();
                 const right = expr.substring(i + 2).trim();
-                return (this.evaluateBooleanExpression(left) || this.evaluateBooleanExpression(right));
+                const result = this.evaluateBooleanExpression(left) || this.evaluateBooleanExpression(right);
+                console.debug('[evaluateBooleanExpression] ||', { expr, left, right, result });
+                return result;
             }
         }
         depth = 0;
@@ -1523,35 +1516,41 @@ class PermissionService {
             else if (depth === 0 && expr.substring(i, i + 2) === '&&') {
                 const left = expr.substring(0, i).trim();
                 const right = expr.substring(i + 2).trim();
-                return (this.evaluateBooleanExpression(left) && this.evaluateBooleanExpression(right));
+                const result = this.evaluateBooleanExpression(left) && this.evaluateBooleanExpression(right);
+                console.debug('[evaluateBooleanExpression] &&', { expr, left, right, result });
+                return result;
             }
         }
-        // Strip matching outer parens - only when first ( and last ) are a pair
+        // Strip matching outer parens - only when first ( and last ) are a pair (fix for nested)
         if (expr.startsWith('(') && expr.endsWith(')')) {
-            let depth = 0;
+            let d = 0;
             for (let j = 0; j < expr.length; j++) {
                 if (expr[j] === '(')
-                    depth++;
+                    d++;
                 else if (expr[j] === ')')
-                    depth--;
-                if (depth === 0) {
+                    d--;
+                if (d === 0) {
                     if (j === expr.length - 1) {
-                        return this.evaluateBooleanExpression(expr.substring(1, expr.length - 1));
+                        const inner = expr.substring(1, expr.length - 1);
+                        const result = this.evaluateBooleanExpression(inner);
+                        console.debug('[evaluateBooleanExpression] strip parens', { expr, inner, result });
+                        return result;
                     }
-                    break; // First ( doesn't wrap entire expr
+                    break;
                 }
-                if (depth < 0)
+                if (d < 0)
                     break;
             }
         }
-        // Unrecognized token - treat as false for safety
-        console.warn('[PermissionService] evaluateBooleanExpression: unrecognized expr', { expr });
+        console.warn('[evaluateBooleanExpression] unrecognized', { 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} `;
                 }