wip

Author: dblythy

spec/CloudCode.spec.js

@@ -200,39 +200,42 @@ describe('Cloud Code', () => {
       done();
     }
   });
-
-  it('beforeFind can return object without DB operation', async () => {
+  fit('beforeFind can return object without DB operation', async () => {
+    await reconfigureServer({ silent: false });
     Parse.Cloud.beforeFind('beforeFind', () => {
       return new Parse.Object('TestObject', { foo: 'bar' });
     });
-    Parse.Cloud.afterFind('beforeFind', () => {
-      throw 'afterFind should not run';
+    Parse.Cloud.afterFind('beforeFind', req => {
+      expect(req.objects).toBeDefined();
+      expect(req.objects[0].className).toBe('TestObject');
     });
     const newObj = await new Parse.Query('beforeFind').first();
     expect(newObj.className).toBe('TestObject');
     expect(newObj.toJSON()).toEqual({ foo: 'bar' });
     await newObj.save();
   });
 
-  it('beforeFind can return array of objects without DB operation', async () => {
+  fit('beforeFind can return array of objects without DB operation', async () => {
     Parse.Cloud.beforeFind('beforeFind', () => {
       return [new Parse.Object('TestObject', { foo: 'bar' })];
     });
-    Parse.Cloud.afterFind('beforeFind', () => {
-      throw 'afterFind should not run';
+    Parse.Cloud.afterFind('beforeFind', req => {
+      expect(req.objects).toBeDefined();
+      expect(req.objects[0].className).toBe('TestObject');
     });
     const newObj = await new Parse.Query('beforeFind').first();
     expect(newObj.className).toBe('TestObject');
     expect(newObj.toJSON()).toEqual({ foo: 'bar' });
     await newObj.save();
   });
 
-  it('beforeFind can return object for get query without DB operation', async () => {
+  fit('beforeFind can return object for get query without DB operation', async () => {
     Parse.Cloud.beforeFind('beforeFind', () => {
       return [new Parse.Object('TestObject', { foo: 'bar' })];
     });
-    Parse.Cloud.afterFind('beforeFind', () => {
-      throw 'afterFind should not run';
+    Parse.Cloud.afterFind('beforeFind', req => {
+      expect(req.objects).toBeDefined();
+      expect(req.objects[0].className).toBe('TestObject');
     });
     const newObj = await new Parse.Query('beforeFind').get('objId');
     expect(newObj.className).toBe('TestObject');

src/rest.js

@@ -23,76 +23,75 @@ function checkLiveQuery(className, config) {
   return config.liveQueryController && config.liveQueryController.hasLiveQuery(className);
 }
 
-// Returns a promise for an object with optional keys 'results' and 'count'.
-function find(config, auth, className, restWhere, restOptions, clientSDK, context) {
-  enforceRoleSecurity('find', className, auth);
-  return triggers
-    .maybeRunQueryTrigger(
-      triggers.Types.beforeFind,
+async function runFindTriggers(
+  config,
+  auth,
+  className,
+  restWhere,
+  restOptions,
+  clientSDK,
+  context,
+  isGet
+) {
+  const result = await triggers.maybeRunQueryTrigger(
+    triggers.Types.beforeFind,
+    className,
+    restWhere,
+    restOptions,
+    config,
+    auth,
+    context,
+    isGet
+  );
+  restWhere = result.restWhere || restWhere;
+  restOptions = result.restOptions || restOptions;
+  if (result?.objects) {
+    const objects = result.objects;
+    await triggers.maybeRunAfterFindTrigger(
+      triggers.Types.afterFind,
+      auth,
       className,
-      restWhere,
-      restOptions,
+      objects,
       config,
-      auth,
+      restWhere,
       context
-    )
-    .then(result => {
-      restWhere = result.restWhere || restWhere;
-      restOptions = result.restOptions || restOptions;
-      if (result?.objects) {
-        return {
-          results: result.objects.map(row => row._toFullJSON()),
-        };
-      }
-      const query = new RestQuery(
-        config,
-        auth,
-        className,
-        restWhere,
-        restOptions,
-        clientSDK,
-        true,
-        context
-      );
-      return query.execute();
-    });
+    );
+    return {
+      results: objects.map(row => row._toFullJSON()),
+    };
+  }
+  const query = new RestQuery(
+    config,
+    auth,
+    className,
+    restWhere,
+    restOptions,
+    clientSDK,
+    true,
+    context
+  );
+  return await query.execute();
 }
 
+// Returns a promise for an object with optional keys 'results' and 'count'.
+const find = (config, auth, className, restWhere, restOptions, clientSDK, context) => {
+  enforceRoleSecurity('find', className, auth);
+  return runFindTriggers(config, auth, className, restWhere, restOptions, clientSDK, context);
+};
+
 // get is just like find but only queries an objectId.
 const get = (config, auth, className, objectId, restOptions, clientSDK, context) => {
-  var restWhere = { objectId };
   enforceRoleSecurity('get', className, auth);
-  return triggers
-    .maybeRunQueryTrigger(
-      triggers.Types.beforeFind,
-      className,
-      restWhere,
-      restOptions,
-      config,
-      auth,
-      context,
-      true
-    )
-    .then(result => {
-      restWhere = result.restWhere || restWhere;
-      restOptions = result.restOptions || restOptions;
-      if (result?.objects) {
-        return {
-          results: result.objects.map(row => row._toFullJSON()),
-        };
-      }
-      const query = new RestQuery(
-        config,
-        auth,
-        className,
-        restWhere,
-        restOptions,
-        clientSDK,
-        true,
-        context
-      );
-      return query.execute();
-    });
+  return runFindTriggers(
+    config,
+    auth,
+    className,
+    { objectId },
+    restOptions,
+    clientSDK,
+    context,
+    true
+  );
 };
 
 // Returns a promise that doesn't resolve to any useful value.

src/triggers.js

@@ -454,6 +454,9 @@ export function maybeRunAfterFindTrigger(
     );
     request.objects = objects.map(object => {
       //setting the class name to transform into parse object
+      if (object instanceof Parse.Object) {
+        return object;
+      }
       object.className = className;
       return Parse.Object.fromJSON(object);
     });