Skip to content

Commit 5e4cecd

Browse files
nlutsenkonlutsenko
committed
Use constants instead of magic strings for trigger names.
1 parent 1945313 commit 5e4cecd

File tree

4 files changed

+15
-19
lines changed

4 files changed

+15
-19
lines changed

‎src/RestWrite.js‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -133,8 +133,7 @@ RestWrite.prototype.runBeforeTrigger = function() {
133133
updatedObject.set(Parse._decode(undefined, this.data));
134134

135135
return Promise.resolve().then(() => {
136-
return triggers.maybeRunTrigger(
137-
'beforeSave', this.auth, updatedObject, originalObject, this.config.applicationId);
136+
return triggers.maybeRunTrigger(triggers.Types.beforeSave, this.auth, updatedObject, originalObject, this.config.applicationId);
138137
}).then((response) => {
139138
if (response && response.object) {
140139
this.data = response.object;
@@ -789,7 +788,7 @@ RestWrite.prototype.runAfterTrigger = function() {
789788
originalObject = triggers.inflate(extraData, this.originalData);
790789
}
791790

792-
triggers.maybeRunTrigger('afterSave', this.auth, inflatedObject, originalObject, this.config.applicationId);
791+
triggers.maybeRunTrigger(triggers.Types.afterSave, this.auth, inflatedObject, originalObject, this.config.applicationId);
793792
};
794793

795794
// A helper to figure out what location this operation happens at.

‎src/cloud-code/Parse.Cloud.js‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
var Parse = require("parse/node");
2-
var triggers = require("../triggers");
1+
import { Parse } from 'parse/node';
2+
import * as triggers from '../triggers';
33

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

2424
ParseCloud.beforeSave = function(parseClass, handler) {
2525
var className = getClassName(parseClass);
26-
triggers.addTrigger('beforeSave', className, handler, Parse.applicationId);
26+
triggers.addTrigger(triggers.Types.beforeSave, className, handler, Parse.applicationId);
2727
};
2828

2929
ParseCloud.beforeDelete = function(parseClass, handler) {
3030
var className = getClassName(parseClass);
31-
triggers.addTrigger('beforeDelete', className, handler, Parse.applicationId);
31+
triggers.addTrigger(triggers.Types.beforeDelete, className, handler, Parse.applicationId);
3232
};
3333

3434
ParseCloud.afterSave = function(parseClass, handler) {
3535
var className = getClassName(parseClass);
36-
triggers.addTrigger('afterSave', className, handler, Parse.applicationId);
36+
triggers.addTrigger(triggers.Types.afterSave, className, handler, Parse.applicationId);
3737
};
3838

3939
ParseCloud.afterDelete = function(parseClass, handler) {
4040
var className = getClassName(parseClass);
41-
triggers.addTrigger('afterDelete', className, handler, Parse.applicationId);
41+
triggers.addTrigger(triggers.Types.afterDelete, className, handler, Parse.applicationId);
4242
};
4343

4444
ParseCloud._removeHook = function(category, name, type, applicationId) {

‎src/rest.js‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -39,17 +39,16 @@ function del(config, auth, className, objectId) {
3939
var inflatedObject;
4040

4141
return Promise.resolve().then(() => {
42-
if (triggers.getTrigger(className, 'beforeDelete', config.applicationId) ||
43-
triggers.getTrigger(className, 'afterDelete', config.applicationId) ||
42+
if (triggers.getTrigger(className, triggers.Types.beforeDelete, config.applicationId) ||
43+
triggers.getTrigger(className, triggers.Types.afterDelete, config.applicationId) ||
4444
className == '_Session') {
4545
return find(config, auth, className, {objectId: objectId})
4646
.then((response) => {
4747
if (response && response.results && response.results.length) {
4848
response.results[0].className = className;
4949
cache.clearUser(response.results[0].sessionToken);
5050
inflatedObject = Parse.Object.fromJSON(response.results[0]);
51-
return triggers.maybeRunTrigger('beforeDelete',
52-
auth, inflatedObject, null, config.applicationId);
51+
return triggers.maybeRunTrigger(triggers.Types.beforeDelete, auth, inflatedObject, null, config.applicationId);
5352
}
5453
throw new Parse.Error(Parse.Error.OBJECT_NOT_FOUND,
5554
'Object not found for delete.');
@@ -76,7 +75,7 @@ function del(config, auth, className, objectId) {
7675
objectId: objectId
7776
}, options);
7877
}).then(() => {
79-
triggers.maybeRunTrigger('afterDelete', auth, inflatedObject, null, config.applicationId);
78+
triggers.maybeRunTrigger(triggers.Types.afterDelete, auth, inflatedObject, null, config.applicationId);
8079
return Promise.resolve();
8180
});
8281
}
@@ -96,8 +95,8 @@ function update(config, auth, className, objectId, restObject) {
9695
enforceRoleSecurity('update', className, auth);
9796

9897
return Promise.resolve().then(() => {
99-
if (triggers.getTrigger(className, 'beforeSave', config.applicationId) ||
100-
triggers.getTrigger(className, 'afterSave', config.applicationId)) {
98+
if (triggers.getTrigger(className, triggers.Types.beforeSave, config.applicationId) ||
99+
triggers.getTrigger(className, triggers.Types.afterSave, config.applicationId)) {
101100
return find(config, auth, className, {objectId: objectId});
102101
}
103102
return Promise.resolve({});

‎src/triggers.js‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ export const Types = {
1010
};
1111

1212
const baseStore = function() {
13-
1413
let Validators = {};
1514
let Functions = {};
1615
let Triggers = Object.keys(Types).reduce(function(base, key){
@@ -23,7 +22,7 @@ const baseStore = function() {
2322
Validators,
2423
Triggers
2524
});
26-
}
25+
};
2726

2827
const _triggerStore = {};
2928

@@ -59,7 +58,6 @@ export function _unregister(a,b,c,d) {
5958
}
6059
}
6160

62-
6361
export function getTrigger(className, triggerType, applicationId) {
6462
if (!applicationId) {
6563
throw "Missing ApplicationID";

0 commit comments

Comments
 (0)