fix: return correct response when revert is used in beforeSave (parse-community#7839)

Author: dblythy

spec/CloudCode.spec.js

@@ -1652,22 +1652,6 @@ describe('Cloud Code', () => {
     expect(obj.get('foo')).toBe('bar');
   });
 
-  it('create role with name and ACL and a beforeSave', async () => {
-    Parse.Cloud.beforeSave(Parse.Role, ({ object }) => {
-      return object;
-    });
-
-    const obj = new Parse.Role('TestRole', new Parse.ACL({ '*': { read: true, write: true } }));
-    await obj.save();
-
-    expect(obj.getACL()).toEqual(new Parse.ACL({ '*': { read: true, write: true } }));
-    expect(obj.get('name')).toEqual('TestRole');
-    await obj.fetch();
-
-    expect(obj.getACL()).toEqual(new Parse.ACL({ '*': { read: true, write: true } }));
-    expect(obj.get('name')).toEqual('TestRole');
-  });
-
   it('can unset in afterSave', async () => {
     Parse.Cloud.beforeSave('TestObject', ({ object }) => {
       if (!object.existed()) {
@@ -1718,32 +1702,6 @@ describe('Cloud Code', () => {
     expect(obj.get('count')).toBe(0);
   });
 
-  it('pointer should not be cleared by triggers', async () => {
-    Parse.Cloud.afterSave('MyObject', () => {});
-    const foo = await new Parse.Object('Test', { foo: 'bar' }).save();
-    const obj = await new Parse.Object('MyObject', { foo }).save();
-    const foo2 = obj.get('foo');
-    expect(foo2.get('foo')).toBe('bar');
-  });
-
-  it('can set a pointer in triggers', async () => {
-    Parse.Cloud.beforeSave('MyObject', () => {});
-    Parse.Cloud.afterSave(
-      'MyObject',
-      async ({ object }) => {
-        const foo = await new Parse.Object('Test', { foo: 'bar' }).save();
-        object.set({ foo });
-        await object.save(null, { useMasterKey: true });
-      },
-      {
-        skipWithMasterKey: true,
-      }
-    );
-    const obj = await new Parse.Object('MyObject').save();
-    const foo2 = obj.get('foo');
-    expect(foo2.get('foo')).toBe('bar');
-  });
-
   it('beforeSave should not sanitize database', async done => {
     const { adapter } = Config.get(Parse.applicationId).database;
     const spy = spyOn(adapter, 'findOneAndUpdate').and.callThrough();

src/RestWrite.js

@@ -84,10 +84,7 @@ function RestWrite(config, auth, className, query, data, originalData, clientSDK
   // Shared SchemaController to be reused to reduce the number of loadSchema() calls per request
   // Once set the schemaData should be immutable
   this.validSchemaController = null;
-  this.pendingOps = {
-    operations: null,
-    identifier: null,
-  };
+  this.pendingOps = {};
 }
 
 // A convenient method to perform all the steps of processing the
@@ -236,13 +233,10 @@ RestWrite.prototype.runBeforeSaveTrigger = function () {
   }
 
   const { originalObject, updatedObject } = this.buildParseObjects();
-  const identifier = updatedObject._getStateIdentifier();
+
   const stateController = Parse.CoreManager.getObjectStateController();
-  const [pending] = stateController.getPendingOps(identifier);
-  this.pendingOps = {
-    operations: { ...pending },
-    identifier,
-  };
+  const [pending] = stateController.getPendingOps(updatedObject._getStateIdentifier());
+  this.pendingOps = { ...pending };
 
   return Promise.resolve()
     .then(() => {
@@ -1674,11 +1668,11 @@ RestWrite.prototype.runAfterSaveTrigger = function () {
     .then(result => {
       const jsonReturned = result && !result._toFullJSON;
       if (jsonReturned) {
-        this.pendingOps.operations = {};
+        this.pendingOps = {};
         this.response.response = result;
       } else {
         this.response.response = this._updateResponseWithData(
-          (result || updatedObject).toJSON(),
+          (result || updatedObject)._toFullJSON(),
           this.data
         );
       }
@@ -1778,35 +1772,15 @@ RestWrite.prototype.cleanUserAuthData = function () {
 };
 
 RestWrite.prototype._updateResponseWithData = function (response, data) {
+  const { updatedObject } = this.buildParseObjects();
   const stateController = Parse.CoreManager.getObjectStateController();
-  const [pending] = stateController.getPendingOps(this.pendingOps.identifier);
-  for (const key in this.pendingOps.operations) {
+  const [pending] = stateController.getPendingOps(updatedObject._getStateIdentifier());
+  for (const key in this.pendingOps) {
     if (!pending[key]) {
       data[key] = this.originalData ? this.originalData[key] : { __op: 'Delete' };
       this.storage.fieldsChangedByTrigger.push(key);
     }
   }
-  const skipKeys = [...(requiredColumns.read[this.className] || [])];
-  if (!this.query) {
-    skipKeys.push('objectId', 'createdAt');
-  } else {
-    skipKeys.push('updatedAt');
-    delete response.objectId;
-  }
-  for (const key in response) {
-    if (skipKeys.includes(key)) {
-      continue;
-    }
-    const value = response[key];
-    if (
-      value == null ||
-      (value.__type && value.__type === 'Pointer') ||
-      util.isDeepStrictEqual(data[key], value) ||
-      util.isDeepStrictEqual((this.originalData || {})[key], value)
-    ) {
-      delete response[key];
-    }
-  }
   if (_.isEmpty(this.storage.fieldsChangedByTrigger)) {
     return response;
   }