Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: afterSave trigger removes pointer in Parse object #7913

Merged
merged 16 commits into from
May 20, 2022
26 changes: 26 additions & 0 deletions spec/CloudCode.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -1598,6 +1598,32 @@ describe('Cloud Code', () => {
expect(obj.get('count')).toBe(0);
});

it('Pointer should not be cleared by triggers', async () => {
dblythy marked this conversation as resolved.
Show resolved Hide resolved
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 () => {
dblythy marked this conversation as resolved.
Show resolved Hide resolved
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();
Expand Down
22 changes: 22 additions & 0 deletions spec/RestQuery.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -429,4 +429,26 @@ describe('RestQuery.each', () => {
done();
});
});

it('test afterSave should not affect save response', async () => {
Parse.Cloud.beforeSave('TestObject2', ({ object }) => {
object.set('addedBeforeSave', true);
});
Parse.Cloud.afterSave('TestObject2', ({ object }) => {
object.set('addedAfterSave', true);
object.unset('initialToRemove');
});
const { response } = await rest.create(config, nobody, 'TestObject2', {
initialSave: true,
initialToRemove: true,
});
expect(Object.keys(response).sort()).toEqual([
'addedAfterSave',
'addedBeforeSave',
'createdAt',
'initialToRemove',
'objectId',
'updatedAt',
]);
});
});
9 changes: 7 additions & 2 deletions src/Controllers/SchemaController.js
Original file line number Diff line number Diff line change
Expand Up @@ -150,11 +150,15 @@ const defaultColumns: { [string]: SchemaFields } = Object.freeze({
},
});

const requiredColumns = Object.freeze({
const requiredColumnsForWrite = Object.freeze({
_Product: ['productIdentifier', 'icon', 'order', 'title', 'subtitle'],
_Role: ['name', 'ACL'],
});

const requiredColumnsForRead = Object.freeze({
dblythy marked this conversation as resolved.
Show resolved Hide resolved
_User: ['username'],
});

dblythy marked this conversation as resolved.
Show resolved Hide resolved
const invalidColumns = ['length'];

const systemClasses = Object.freeze([
Expand Down Expand Up @@ -1269,7 +1273,7 @@ export default class SchemaController {

// Validates that all the properties are set for the object
validateRequiredColumns(className: string, object: any, query: any) {
const columns = requiredColumns[className];
const columns = requiredColumnsForWrite[className];
if (!columns || columns.length == 0) {
return Promise.resolve(this);
}
Expand Down Expand Up @@ -1600,4 +1604,5 @@ export {
convertSchemaToAdapterSchema,
VolatileClassesSchemas,
SchemaController,
requiredColumnsForRead,
};
18 changes: 17 additions & 1 deletion src/RestWrite.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ var ClientSDK = require('./ClientSDK');
import RestQuery from './RestQuery';
import _ from 'lodash';
import logger from './logger';
import { requiredColumnsForRead } from './Controllers/SchemaController';

// query and data are both provided in REST API format. So data
// types are encoded by plain old objects.
Expand Down Expand Up @@ -1556,7 +1557,7 @@ RestWrite.prototype.runAfterSaveTrigger = function () {
this.response.response = result;
} else {
this.response.response = this._updateResponseWithData(
(result || updatedObject)._toFullJSON(),
mtrezza marked this conversation as resolved.
Show resolved Hide resolved
(result || updatedObject).toJSON(),
this.data
);
}
Expand Down Expand Up @@ -1665,6 +1666,21 @@ RestWrite.prototype._updateResponseWithData = function (response, data) {
this.storage.fieldsChangedByTrigger.push(key);
}
}
const skipKeys = [
'objectId',
'createdAt',
'updatedAt',
...(requiredColumnsForRead[this.className] || []),
];
for (const key in response) {
if (skipKeys.includes(key)) {
continue;
}
const value = response[key];
if (value == null || (value.__type && value.__type === 'Pointer') || data[key] === value) {
delete response[key];
}
}
if (_.isEmpty(this.storage.fieldsChangedByTrigger)) {
return response;
}
Expand Down