@flowerforce/flowerbase 1.1.2-beta.1 → 1.1.2-beta.2

package/dist/features/functions/controller.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"controller.d.ts","sourceRoot":"","sources":["../../../src/features/functions/controller.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAA;AAGhD;;;;;GAKG;AACH,eAAO,MAAM,mBAAmB,EAAE,kBA0FjC,CAAA"}
+{"version":3,"file":"controller.d.ts","sourceRoot":"","sources":["../../../src/features/functions/controller.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAA;AAGhD;;;;;GAKG;AACH,eAAO,MAAM,mBAAmB,EAAE,kBAkGjC,CAAA"}

package/dist/features/functions/controller.js

@@ -70,6 +70,7 @@ const functionsController = (app_1, _a) => __awaiter(void 0, [app_1, _a], void 0
         const { query, user } = req;
         const { baas_request, stitch_request } = query;
         const config = JSON.parse(Buffer.from(baas_request || stitch_request || '', 'base64').toString('utf8'));
+        console.log("🚀 ~ functionsController ~ baas_request:", baas_request, query, Buffer.from(baas_request || stitch_request || '', 'base64'), Buffer.from(baas_request || stitch_request || '', 'base64').toString('utf8'), config);
         const [{ database, collection }] = config.arguments;
         const app = state_1.StateManager.select('app');
         const services = state_1.StateManager.select('services');

package/dist/services/mongodb-atlas/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/services/mongodb-atlas/index.ts"],"names":[],"mappings":"AAKA,OAAO,EAAyC,oBAAoB,EAAE,MAAM,SAAS,CAAA;AAmpBrF,QAAA,MAAM,YAAY,EAAE,oBAmBlB,CAAA;AAEF,eAAe,YAAY,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/services/mongodb-atlas/index.ts"],"names":[],"mappings":"AAKA,OAAO,EAAyC,oBAAoB,EAAE,MAAM,SAAS,CAAA;AAspBrF,QAAA,MAAM,YAAY,EAAE,oBAmBlB,CAAA;AAEF,eAAe,YAAY,CAAA"}

package/dist/services/mongodb-atlas/index.js

@@ -292,14 +292,15 @@ const getOperators = (collection, { rules = {}, collName, user, run_as_system })
             const { filters, roles } = rules[collName] || {};
             // Apply access filters to initial change stream pipeline
             const formattedQuery = (0, utils_2.getFormattedQuery)(filters, {}, user);
+            const firstStep = formattedQuery.length ? {
+                $match: {
+                    $and: formattedQuery
+                }
+            } : undefined;
             const formattedPipeline = [
-                {
-                    $match: {
-                        $and: formattedQuery
-                    }
-                },
+                firstStep,
                 ...pipeline
-            ];
+            ].filter(Boolean);
             const result = collection.watch(formattedPipeline, options);
             const originalOn = result.on.bind(result);
             /**
@@ -348,7 +349,7 @@ const getOperators = (collection, { rules = {}, collName, user, run_as_system })
         if (isClient) {
             throw new Error("Aggregate operator from cliente is not implemented! Move it to a function");
         }
-        if (run_as_system) {
+        if (run_as_system || !isClient) {
             return collection.aggregate(pipeline, options);
         }
         (0, utils_2.checkDenyOperation)(rules, collection.collectionName, model_1.CRUD_OPERATIONS.READ);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@flowerforce/flowerbase",
-  "version": "1.1.2-beta.1",
+  "version": "1.1.2-beta.2",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/features/functions/controller.ts

@@ -78,6 +78,14 @@ export const functionsController: FunctionController = async (
     const config: Base64Function = JSON.parse(
       Buffer.from(baas_request || stitch_request || '', 'base64').toString('utf8')
     )
+
+    console.log("🚀 ~ functionsController ~ baas_request:",
+      baas_request,
+      query,
+      Buffer.from(baas_request || stitch_request || '', 'base64'),
+      Buffer.from(baas_request || stitch_request || '', 'base64').toString('utf8'),
+      config
+    )
     const [{ database, collection }] = config.arguments
     const app = StateManager.select('app')
     const services = StateManager.select('services')

package/src/services/mongodb-atlas/index.ts

@@ -342,14 +342,17 @@ const getOperators: GetOperatorsFunction = (
 
       // Apply access filters to initial change stream pipeline
       const formattedQuery = getFormattedQuery(filters, {}, user)
+
+      const firstStep = formattedQuery.length ? {
+        $match: {
+          $and: formattedQuery
+        }
+      } : undefined
+
       const formattedPipeline = [
-        {
-          $match: {
-            $and: formattedQuery
-          }
-        },
+        firstStep,
         ...pipeline
-      ]
+      ].filter(Boolean) as Document[]
 
       const result = collection.watch(formattedPipeline, options)
       const originalOn = result.on.bind(result)
@@ -426,7 +429,7 @@ const getOperators: GetOperatorsFunction = (
     if (isClient) {
       throw new Error("Aggregate operator from cliente is not implemented! Move it to a function")
     }
-    if (run_as_system) {
+    if (run_as_system || !isClient) {
       return collection.aggregate(pipeline, options)
     }
     checkDenyOperation(rules, collection.collectionName, CRUD_OPERATIONS.READ)