Fix: context for afterFind (#7078)

* Fix: context for afterFind * Update CHANGELOG.md Co-authored-by: Manuel <[email protected]>
parse-community · Dec 18, 2020 · 41a052c · 41a052c
1 parent 97c3046
commit 41a052c
Show file tree

Hide file tree

Showing 5 changed files with 60 additions and 10 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,7 @@ __BREAKING CHANGES:__
 - NEW: Added file upload restriction. File upload is now only allowed for authenticated users by default for improved security. To allow file upload also for Anonymous Users or Public, set the `fileUpload` parameter in the [Parse Server Options](https://parseplatform.org/parse-server/api/master/ParseServerOptions.html). [#7071](https://github.com/parse-community/parse-server/pull/7071). Thanks to [dblythy](https://github.com/dblythy).
 ___
 - IMPROVE: Optimize queries on classes with pointer permissions. [#7061](https://github.com/parse-community/parse-server/pull/7061). Thanks to [Pedro Diaz](https://github.com/pdiaz)
+- FIX: request.context for afterFind triggers. [#7078](https://github.com/parse-community/parse-server/pull/7078). Thanks to [dblythy](https://github.com/dblythy)
 
 ### 4.5.0
 [Full Changelog](https://github.com/parse-community/parse-server/compare/4.4.0...4.5.0)

diff --git a/spec/CloudCode.spec.js b/spec/CloudCode.spec.js
@@ -3157,4 +3157,14 @@ describe('afterLogin hook', () => {
 
     await Parse.Cloud.run('contextTest', {}, { context: { a: 'a' } });
   });
+
+  it('afterFind should have access to context', async () => {
+    Parse.Cloud.afterFind('TestObject', req => {
+      expect(req.context.a).toEqual('a');
+    });
+    const obj = new TestObject();
+    await obj.save();
+    const query = new Parse.Query(TestObject);
+    await query.find({ context: { a: 'a' } });
+  });
 });
diff --git a/src/RestQuery.js b/src/RestQuery.js
@@ -25,7 +25,8 @@ function RestQuery(
   restWhere = {},
   restOptions = {},
   clientSDK,
-  runAfterFind = true
+  runAfterFind = true,
+  context
 ) {
   this.config = config;
   this.auth = auth;
@@ -36,6 +37,7 @@ function RestQuery(
   this.runAfterFind = runAfterFind;
   this.response = null;
   this.findOptions = {};
+  this.context = context || {};
 
   if (!this.auth.isMaster) {
     if (this.className == '_Session') {
@@ -222,7 +224,16 @@ RestQuery.prototype.each = function (callback) {
       return !finished;
     },
     async () => {
-      const query = new RestQuery(config, auth, className, restWhere, restOptions, clientSDK);
+      const query = new RestQuery(
+        config,
+        auth,
+        className,
+        restWhere,
+        restOptions,
+        clientSDK,
+        this.runAfterFind,
+        this.context
+      );
       const { results } = await query.execute();
       results.forEach(callback);
       finished = results.length < restOptions.limit;
@@ -772,7 +783,8 @@ RestQuery.prototype.runAfterFindTrigger = function () {
       this.className,
       this.response.results,
       this.config,
-      parseQuery
+      parseQuery,
+      this.context
     )
     .then(results => {
       // Ensure we properly set the className back

diff --git a/src/rest.js b/src/rest.js
@@ -39,7 +39,16 @@ function find(config, auth, className, restWhere, restOptions, clientSDK, contex
     .then(result => {
       restWhere = result.restWhere || restWhere;
       restOptions = result.restOptions || restOptions;
-      const query = new RestQuery(config, auth, className, restWhere, restOptions, clientSDK);
+      const query = new RestQuery(
+        config,
+        auth,
+        className,
+        restWhere,
+        restOptions,
+        clientSDK,
+        true,
+        context
+      );
       return query.execute();
     });
 }
@@ -62,7 +71,16 @@ const get = (config, auth, className, objectId, restOptions, clientSDK, context)
     .then(result => {
       restWhere = result.restWhere || restWhere;
       restOptions = result.restOptions || restOptions;
-      const query = new RestQuery(config, auth, className, restWhere, restOptions, clientSDK);
+      const query = new RestQuery(
+        config,
+        auth,
+        className,
+        restWhere,
+        restOptions,
+        clientSDK,
+        true,
+        context
+      );
       return query.execute();
     });
 };
@@ -187,7 +205,8 @@ function update(config, auth, className, restWhere, restObject, clientSDK, conte
           restWhere,
           undefined,
           undefined,
-          false
+          false,
+          context
         ).execute({
           op: 'update',
         });

diff --git a/src/triggers.js b/src/triggers.js
@@ -237,12 +237,12 @@ export function getRequestObject(
   if (originalParseObject) {
     request.original = originalParseObject;
   }
-
   if (
     triggerType === Types.beforeSave ||
     triggerType === Types.afterSave ||
     triggerType === Types.beforeDelete ||
-    triggerType === Types.afterDelete
+    triggerType === Types.afterDelete ||
+    triggerType === Types.afterFind
   ) {
     // Set a copy of the context on the request object.
     request.context = Object.assign({}, context);
@@ -388,13 +388,21 @@ function logTriggerErrorBeforeHook(triggerType, className, input, auth, error) {
   );
 }
 
-export function maybeRunAfterFindTrigger(triggerType, auth, className, objects, config, query) {
+export function maybeRunAfterFindTrigger(
+  triggerType,
+  auth,
+  className,
+  objects,
+  config,
+  query,
+  context
+) {
   return new Promise((resolve, reject) => {
     const trigger = getTrigger(className, triggerType, config.applicationId);
     if (!trigger) {
       return resolve();
     }
-    const request = getRequestObject(triggerType, auth, null, null, config);
+    const request = getRequestObject(triggerType, auth, null, null, config, context);
     if (query) {
       request.query = query;
     }