Skip to content

Use constants instead of magic strings for trigger names. #670

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

Merged
merged 1 commit into from
Feb 26, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions src/RestWrite.js
Original file line number Diff line number Diff line change
Expand Up @@ -133,8 +133,7 @@ RestWrite.prototype.runBeforeTrigger = function() {
updatedObject.set(Parse._decode(undefined, this.data));

return Promise.resolve().then(() => {
return triggers.maybeRunTrigger(
'beforeSave', this.auth, updatedObject, originalObject, this.config.applicationId);
return triggers.maybeRunTrigger(triggers.Types.beforeSave, this.auth, updatedObject, originalObject, this.config.applicationId);
}).then((response) => {
if (response && response.object) {
this.data = response.object;
Expand Down Expand Up @@ -789,7 +788,7 @@ RestWrite.prototype.runAfterTrigger = function() {
originalObject = triggers.inflate(extraData, this.originalData);
}

triggers.maybeRunTrigger('afterSave', this.auth, inflatedObject, originalObject, this.config.applicationId);
triggers.maybeRunTrigger(triggers.Types.afterSave, this.auth, inflatedObject, originalObject, this.config.applicationId);
};

// A helper to figure out what location this operation happens at.
Expand Down
12 changes: 6 additions & 6 deletions src/cloud-code/Parse.Cloud.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
var Parse = require("parse/node");
var triggers = require("../triggers");
import { Parse } from 'parse/node';
import * as triggers from '../triggers';

function validateClassNameForTriggers(className) {
const restrictedClassNames = [ '_Session' ];
Expand All @@ -23,22 +23,22 @@ ParseCloud.define = function(functionName, handler, validationHandler) {

ParseCloud.beforeSave = function(parseClass, handler) {
var className = getClassName(parseClass);
triggers.addTrigger('beforeSave', className, handler, Parse.applicationId);
triggers.addTrigger(triggers.Types.beforeSave, className, handler, Parse.applicationId);
};

ParseCloud.beforeDelete = function(parseClass, handler) {
var className = getClassName(parseClass);
triggers.addTrigger('beforeDelete', className, handler, Parse.applicationId);
triggers.addTrigger(triggers.Types.beforeDelete, className, handler, Parse.applicationId);
};

ParseCloud.afterSave = function(parseClass, handler) {
var className = getClassName(parseClass);
triggers.addTrigger('afterSave', className, handler, Parse.applicationId);
triggers.addTrigger(triggers.Types.afterSave, className, handler, Parse.applicationId);
};

ParseCloud.afterDelete = function(parseClass, handler) {
var className = getClassName(parseClass);
triggers.addTrigger('afterDelete', className, handler, Parse.applicationId);
triggers.addTrigger(triggers.Types.afterDelete, className, handler, Parse.applicationId);
};

ParseCloud._removeHook = function(category, name, type, applicationId) {
Expand Down
13 changes: 6 additions & 7 deletions src/rest.js
Original file line number Diff line number Diff line change
Expand Up @@ -39,17 +39,16 @@ function del(config, auth, className, objectId) {
var inflatedObject;

return Promise.resolve().then(() => {
if (triggers.getTrigger(className, 'beforeDelete', config.applicationId) ||
triggers.getTrigger(className, 'afterDelete', config.applicationId) ||
if (triggers.getTrigger(className, triggers.Types.beforeDelete, config.applicationId) ||
triggers.getTrigger(className, triggers.Types.afterDelete, config.applicationId) ||
className == '_Session') {
return find(config, auth, className, {objectId: objectId})
.then((response) => {
if (response && response.results && response.results.length) {
response.results[0].className = className;
cache.clearUser(response.results[0].sessionToken);
inflatedObject = Parse.Object.fromJSON(response.results[0]);
return triggers.maybeRunTrigger('beforeDelete',
auth, inflatedObject, null, config.applicationId);
return triggers.maybeRunTrigger(triggers.Types.beforeDelete, auth, inflatedObject, null, config.applicationId);
}
throw new Parse.Error(Parse.Error.OBJECT_NOT_FOUND,
'Object not found for delete.');
Expand All @@ -76,7 +75,7 @@ function del(config, auth, className, objectId) {
objectId: objectId
}, options);
}).then(() => {
triggers.maybeRunTrigger('afterDelete', auth, inflatedObject, null, config.applicationId);
triggers.maybeRunTrigger(triggers.Types.afterDelete, auth, inflatedObject, null, config.applicationId);
return Promise.resolve();
});
}
Expand All @@ -96,8 +95,8 @@ function update(config, auth, className, objectId, restObject) {
enforceRoleSecurity('update', className, auth);

return Promise.resolve().then(() => {
if (triggers.getTrigger(className, 'beforeSave', config.applicationId) ||
triggers.getTrigger(className, 'afterSave', config.applicationId)) {
if (triggers.getTrigger(className, triggers.Types.beforeSave, config.applicationId) ||
triggers.getTrigger(className, triggers.Types.afterSave, config.applicationId)) {
return find(config, auth, className, {objectId: objectId});
}
return Promise.resolve({});
Expand Down
4 changes: 1 addition & 3 deletions src/triggers.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ export const Types = {
};

const baseStore = function() {

let Validators = {};
let Functions = {};
let Triggers = Object.keys(Types).reduce(function(base, key){
Expand All @@ -23,7 +22,7 @@ const baseStore = function() {
Validators,
Triggers
});
}
};

const _triggerStore = {};

Expand Down Expand Up @@ -59,7 +58,6 @@ export function _unregister(a,b,c,d) {
}
}


export function getTrigger(className, triggerType, applicationId) {
if (!applicationId) {
throw "Missing ApplicationID";
Expand Down