Pass context in beforeDelete, afterDelete, beforeFind and Parse.Cloud.run.

spec/CloudCode.spec.js

@@ -2968,4 +2968,56 @@ describe('afterLogin hook', () => {
     obj.set("obj2", obj2);
     await obj.save(null, { context: { a: 'a' } });
   });
+
+  it('should have access to context as saveAll argument', async () => {
+    Parse.Cloud.beforeSave('TestObject', (req) => {
+      expect(req.context.a).toEqual('a');
+    });
+    Parse.Cloud.afterSave('TestObject', (req) => {
+      expect(req.context.a).toEqual('a');
+    });
+    const obj = new TestObject();
+    await Parse.Object.saveAll([obj], { context: { a: 'a' }});
+  });
+
+  it('should have access to context as destroyAll argument', async () => {
+    Parse.Cloud.beforeDelete('TestObject', (req) => {
+      expect(req.context.a).toEqual('a');
+    });
+    Parse.Cloud.afterDelete('TestObject', (req) => {
+      expect(req.context.a).toEqual('a');
+    });
+    const obj = new TestObject();
+    await Parse.Object.saveAll([obj]);
+    await Parse.Object.destroyAll([obj], { context: { a: 'a' } });
+  });
+
+  it('should have access to context as destroy a object', async () => {
+    Parse.Cloud.beforeDelete('TestObject', (req) => {
+      expect(req.context.a).toEqual('a');
+    });
+    Parse.Cloud.afterDelete('TestObject', (req) => {
+      expect(req.context.a).toEqual('a');
+    });
+    const obj = new TestObject();
+    await obj.save();
+    await obj.destroy({ context: { a: 'a' } });
+  });
+
+  it('should have access to context in beforeFind hook', async () => {
+    Parse.Cloud.beforeFind('TestObject', (req) => {
+      expect(req.context.a).toEqual('a');
+    });
+    const query = new Parse.Query('TestObject');
+    return query.find({ context: { a: 'a' } });
+  });
+
+  it('should have access to context when cloud function is called.', async () => {
+    Parse.Cloud.define('contextTest', async (req) => {
+      expect(req.context.a).toEqual('a');
+      return {};
+    });
+
+    await Parse.Cloud.run('contextTest', {}, { context: { a: 'a' } });
+  });
 });

spec/ParseACL.spec.js

@@ -929,6 +929,6 @@ describe('Parse.ACL', () => {
       }
     });
 
-    rest.create(config, auth.nobody(config), '_User', anonUser);
+    rest.create(config, auth.nobody(config), '_User', anonUser, null, {});
   });
 });

spec/RestQuery.spec.js

@@ -436,7 +436,7 @@ describe('RestQuery.each', () => {
     });
 
     rest
-      .create(config, nobody, 'TestObject2', { todelete: true, tokeep: true })
+      .create(config, nobody, 'TestObject2', { todelete: true, tokeep: true }, null, {})
       .then(response => {
         expect(response.response.toadd).toBeTruthy();
         expect(response.response.tokeep).toBeTruthy();

spec/rest.spec.js

@@ -184,7 +184,7 @@ describe('rest create', () => {
     });
 
     rest
-      .create(config, auth.nobody(config), 'MyClass', obj)
+      .create(config, auth.nobody(config), 'MyClass', obj, null, {})
       .then(() => database.adapter.find('MyClass', { fields: {} }, {}, {}))
       .then((results) => {
         expect(results.length).toEqual(1);
@@ -199,7 +199,9 @@ describe('rest create', () => {
           auth.nobody(config),
           'MyClass',
           { objectId: mob.objectId },
-          obj
+          obj,
+          null,
+          {}
         );
       })
       .then(() => database.adapter.find('MyClass', { fields: {} }, {}, {}))

src/Auth.js

@@ -377,7 +377,10 @@ const createSession = function(
         master(config),
         '_Session',
         null,
-        sessionData
+        sessionData,
+        null,
+        null,
+        {}
       ).execute(),
   };
 };

src/Controllers/PushController.js

@@ -85,7 +85,10 @@ export class PushController {
             master(config),
             '_Installation',
             restQuery.restWhere,
-            restUpdate
+            restUpdate,
+            null,
+            null,
+            {}
           );
           write.runOptions.many = true;
           return write.execute();
@@ -115,7 +118,10 @@ export class PushController {
             master(config),
             '_Audience',
             { objectId: audienceId },
-            updateAudience
+            updateAudience,
+            null,
+            null,
+            {}
           );
           write.execute();
         }

src/Controllers/UserController.js

@@ -74,7 +74,7 @@ export class UserController extends AdaptableController {
       if (result.results.length) {
         return Promise.resolve(result.results.length[0]);
       }
-      return rest.update(this.config, masterAuth, '_User', query, updateFields);
+      return rest.update(this.config, masterAuth, '_User', query, updateFields, null, {});
     });
   }
 
@@ -298,7 +298,9 @@ function updateUserPassword(userId, password, config) {
     { objectId: userId },
     {
       password: password,
-    }
+    },
+    null,
+    {}
   );
 }
 

src/GraphQL/helpers/objectsMutations.js

@@ -5,7 +5,7 @@ const createObject = async (className, fields, config, auth, info) => {
     fields = {};
   }
 
-  return (await rest.create(config, auth, className, fields, info.clientSDK))
+  return (await rest.create(config, auth, className, fields, info.clientSDK, info.context))
     .response;
 };
 
@@ -27,12 +27,13 @@ const updateObject = async (
     className,
     { objectId },
     fields,
-    info.clientSDK
+    info.clientSDK,
+    info.context
   )).response;
 };
 
 const deleteObject = async (className, objectId, config, auth, info) => {
-  await rest.del(config, auth, className, objectId, info.clientSDK);
+  await rest.del(config, auth, className, objectId, info.context);
   return true;
 };
 

src/GraphQL/helpers/objectsQueries.js

@@ -74,7 +74,8 @@ const getObject = async (
     className,
     objectId,
     options,
-    info.clientSDK
+    info.clientSDK,
+    info.context
   );
 
   if (!response.results || response.results.length == 0) {
@@ -142,7 +143,8 @@ const findObjects = async (
         className,
         where,
         preCountOptions,
-        info.clientSDK
+        info.clientSDK,
+        info.context
       )
     ).count;
     if ((skip || 0) + limit < preCount) {
@@ -222,7 +224,8 @@ const findObjects = async (
       className,
       where,
       options,
-      info.clientSDK
+      info.clientSDK,
+      info.context
     );
     results = findResult.results;
     count = findResult.count;

src/GraphQL/loaders/usersQueries.js

@@ -55,7 +55,8 @@ const getUserFromSessionToken = async (
     '_Session',
     { sessionToken },
     options,
-    info.clientVersion
+    info.clientVersion,
+    info.context,
   );
   if (
     !response.results ||

src/ParseServerRESTController.js

@@ -107,6 +107,7 @@ function ParseServerRESTController(applicationId, router) {
           info: {
             applicationId: applicationId,
             sessionToken: options.sessionToken,
+            context: options.context || {}, // Add context
           },
           query,
         };

src/Push/PushQueue.js

@@ -35,7 +35,7 @@ export class PushQueue {
         return rest.find(config, auth, '_Installation', where, {
           limit: 0,
           count: true,
-        });
+        }, null, {});
       })
       .then(({ results, count }) => {
         if (!results || count == 0) {

src/Push/PushWorker.js

@@ -49,7 +49,7 @@ export class PushWorker {
     delete query.where;
     pushStatus = pushStatusHandler(config, pushStatus.objectId);
     return rest
-      .find(config, auth, '_Installation', where, query)
+      .find(config, auth, '_Installation', where, query, null, {})
       .then(({ results }) => {
         if (results.length == 0) {
           return;

src/RestWrite.js

@@ -32,6 +32,7 @@ function RestWrite(
   data,
   originalData,
   clientSDK,
+  context,
   action
 ) {
   if (auth.isReadOnly) {
@@ -46,18 +47,12 @@ function RestWrite(
   this.clientSDK = clientSDK;
   this.storage = {};
   this.runOptions = {};
-  this.context = {};
+  this.context = context;
 
   if (action) {
     this.runOptions.action = action;
   }
 
-  // Parse context
-  if (data._context && data._context instanceof Object) {
-    this.context = data._context;
-    delete data._context;
-  }
-
   if (!query) {
     if (this.config.allowCustomObjectId) {
       if (

src/Routers/AggregateRouter.js

@@ -69,7 +69,8 @@ export class AggregateRouter extends ClassesRouter {
         this.className(req),
         body.where,
         options,
-        req.info.clientSDK
+        req.info.clientSDK,
+        req.info.context,
       )
       .then(response => {
         for (const result of response.results) {

src/Routers/AudiencesRouter.js

@@ -21,7 +21,8 @@ export class AudiencesRouter extends ClassesRouter {
         '_Audience',
         body.where,
         options,
-        req.info.clientSDK
+        req.info.clientSDK,
+        req.info.context,
       )
       .then(response => {
         response.results.forEach(item => {

src/Routers/ClassesRouter.js

@@ -40,7 +40,8 @@ export class ClassesRouter extends PromiseRouter {
         this.className(req),
         body.where,
         options,
-        req.info.clientSDK
+        req.info.clientSDK,
+        req.info.context,
       )
       .then(response => {
         return { response: response };
@@ -120,7 +121,8 @@ export class ClassesRouter extends PromiseRouter {
       req.auth,
       this.className(req),
       req.body,
-      req.info.clientSDK
+      req.info.clientSDK,
+      req.info.context
     );
   }
 
@@ -132,7 +134,8 @@ export class ClassesRouter extends PromiseRouter {
       this.className(req),
       where,
       req.body,
-      req.info.clientSDK
+      req.info.clientSDK,
+      req.info.context
     );
   }
 
@@ -143,7 +146,7 @@ export class ClassesRouter extends PromiseRouter {
         req.auth,
         this.className(req),
         req.params.objectId,
-        req.info.clientSDK
+        req.info.context
       )
       .then(() => {
         return { response: {} };

src/Routers/CloudCodeRouter.js

@@ -57,7 +57,7 @@ export class CloudCodeRouter extends PromiseRouter {
 
   static getJobs(req) {
     return rest
-      .find(req.config, req.auth, '_JobSchedule', {}, {})
+      .find(req.config, req.auth, '_JobSchedule', {}, {}, null, {})
       .then(scheduledJobs => {
         return {
           response: scheduledJobs.results,
@@ -69,7 +69,7 @@ export class CloudCodeRouter extends PromiseRouter {
     const config = req.config;
     const jobs = triggers.getJobs(config.applicationId) || {};
     return rest
-      .find(req.config, req.auth, '_JobSchedule', {}, {})
+      .find(req.config, req.auth, '_JobSchedule', {}, {}, null, {})
       .then(scheduledJobs => {
         return {
           response: {
@@ -88,7 +88,8 @@ export class CloudCodeRouter extends PromiseRouter {
       req.auth,
       '_JobSchedule',
       formatJobSchedule(job_schedule),
-      req.client
+      req.client,
+      req.info.context,
     );
   }
 
@@ -102,7 +103,9 @@ export class CloudCodeRouter extends PromiseRouter {
         req.auth,
         '_JobSchedule',
         { objectId },
-        formatJobSchedule(job_schedule)
+        formatJobSchedule(job_schedule),
+        null,
+        req.info.context,
       )
       .then(response => {
         return {
@@ -114,7 +117,7 @@ export class CloudCodeRouter extends PromiseRouter {
   static deleteJob(req) {
     const { objectId } = req.params;
     return rest
-      .del(req.config, req.auth, '_JobSchedule', objectId)
+      .del(req.config, req.auth, '_JobSchedule', objectId, req.info.context)
       .then(response => {
         return {
           response,

src/Routers/FunctionsRouter.js

@@ -148,6 +148,7 @@ export class FunctionsRouter extends PromiseRouter {
       headers: req.config.headers,
       ip: req.config.ip,
       functionName,
+      context: req.info.context,
     };
 
     if (theValidator && typeof theValidator === 'function') {

src/Routers/IAPValidationRouter.js

@@ -51,7 +51,8 @@ function getFileForProductIdentifier(productIdentifier, req) {
       '_Product',
       { productIdentifier: productIdentifier },
       undefined,
-      req.info.clientSDK
+      req.info.clientSDK,
+      req.info.context,
     )
     .then(function(result) {
       const products = result.results;