@posiwise/common-services 0.2.5 → 0.2.7

package/fesm2022/posiwise-common-services.mjs

@@ -1478,9 +1478,7 @@ 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 sop = this.evaluateBooleanExpression(expr);
-        console.log("Usama", sop, eval(expr));
-        return eval(expr); // NOSONAR
+        return this.evaluateBooleanExpression(expr);
     }
     /** Safe boolean expression parser - replaces eval() for CSP compliance. */
     evaluateBooleanExpression(expr) {
@@ -1517,17 +1515,23 @@ 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 d = 0;
-            for (let j = 1; j < expr.length - 1; j++) {
+            for (let j = 0; j < expr.length; j++) {
                 if (expr[j] === '(')
                     d++;
-                if (expr[j] === ')')
+                else if (expr[j] === ')')
                     d--;
+                if (d === 0) {
+                    if (j === expr.length - 1) {
+                        return this.evaluateBooleanExpression(expr.substring(1, expr.length - 1));
+                    }
+                    break;
+                }
                 if (d < 0)
-                    return false;
+                    break;
             }
-            return this.evaluateBooleanExpression(expr.substring(1, expr.length - 1));
         }
         return false;
     }
@@ -1535,6 +1539,8 @@ class PermissionService {
         if (typeof permission !== 'boolean') {
             permission.split(' ').forEach(x => {
                 const raw = x.trim();
+                if (!raw)
+                    return;
                 if (['||', '&&', '(', ')'].includes(raw)) {
                     expr += ` ${raw} `;
                 }