feat: enhance supported_editor logic and add SQL logging in entity methods

Author: Ajit Kumar

server/apis/plugin.js

@@ -269,9 +269,12 @@ router.get('{/:pluginId}', async (req, res) => {
         where.push([Plugin.STATUS, status]);
       }
 
+      const origin = req.headers.origin || req.headers.referer;
+      const allowAllEditors = Boolean(origin?.startsWith(process.env.HOST));
+
       if (supported_editor && ['ace', 'cm', 'all'].includes(supported_editor)) {
         where.push([Plugin.SUPPORTED_EDITOR, supported_editor]);
-      } else {
+      } else if (!supported_editor && !allowAllEditors) {
         where.push([Plugin.SUPPORTED_EDITOR, 'all'], 'OR', [Plugin.SUPPORTED_EDITOR, 'ace']);
       }
     }

server/entities/entity.js

@@ -81,6 +81,8 @@ class Entity {
       operator,
     });
 
+    console.log('Generated SQL:', sql, 'Values:', values);
+
     return Entity.execSql(sql, values, this);
   }
 
@@ -281,21 +283,38 @@ class Entity {
    */
   static formatWhere(where, operator = 'AND', values = []) {
     let result = '';
+    let closeBracket = false;
     const [firstClause] = where;
+
     if (!Array.isArray(firstClause)) {
       where = [where];
     }
+
     where.forEach((condition, i) => {
       if (typeof condition === 'string') {
         return;
       }
 
-      const nextCondition = where[i + 1];
-      result += ` ${formatCondition(condition)}`;
+      const nextOperator = where[i + 1];
+
+      if (nextOperator && typeof nextOperator === 'string') {
+        console.log('Next operator:', nextOperator);
+        let clause = ` ${formatCondition(condition)} ${nextOperator} `;
+
+        if (!closeBracket && /OR/i.test(nextOperator)) {
+          clause = ` ( ${clause}`;
+          closeBracket = true;
+        }
+
+        result += clause;
+      } else {
+        result += ` ${formatCondition(condition)} `;
+        if (closeBracket) {
+          result += ') ';
+          closeBracket = false;
+        }
 
-      if (nextCondition) {
-        const thisOperator = typeof nextCondition === 'string' ? nextCondition : operator;
-        result += ` ${thisOperator} `;
+        result += ` ${operator} `;
       }
     });