Skip to content

Commit da3dc3e

Browse files
committed
fix tests
1 parent fd9d103 commit da3dc3e

File tree

3 files changed

+23
-6
lines changed

3 files changed

+23
-6
lines changed

src/Triggers/QueryTrigger.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import { getTrigger, Types } from "./TriggerStore";
2-
import { getRequestObject } from './Trigger';
1+
import { getTrigger, } from "./TriggerStore";
2+
import { getRequestObject, Types } from './Trigger';
33
import { resolveError, toJSONwithObjects } from "./Utils";
44
import { maybeRunValidator } from "./Validator";
55
import { logTriggerAfterHook, logTriggerSuccessBeforeHook } from "./Logger";

src/Triggers/Trigger.js

+16-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { getTrigger, Types } from "./TriggerStore";
22
import { maybeRunValidator } from "./Validator";
33
import { logTriggerAfterHook, logTriggerErrorBeforeHook } from "./Logger";
4-
import { toJSONwithObjects } from "./Utils";
4+
import { toJSONwithObjects, resolveError } from "./Utils";
55

66
export function getRequestObject(
77
triggerType,
@@ -114,7 +114,10 @@ export async function maybeRunTrigger(
114114
err,
115115
config.logLevels.triggerBeforeError
116116
);
117-
throw err;
117+
throw resolveError(err, {
118+
code: Parse.Error.SCRIPT_FAILED,
119+
message: 'Script failed.',
120+
});
118121
}
119122
}
120123

@@ -151,3 +154,14 @@ function processTriggerResponse(request, response) {
151154

152155
return {};
153156
}
157+
158+
export async function runTrigger(trigger, name, request, auth) {
159+
if (!trigger) {
160+
return;
161+
}
162+
await maybeRunValidator(request, name, auth);
163+
if (request.skipWithMasterKey) {
164+
return;
165+
}
166+
return await trigger(request);
167+
}

src/triggers.js

+5-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import { _unregisterAll, getTrigger, Types, triggerExists, addTrigger, addFunction, getFunction, getJob, runLiveQueryEventHandlers } from "./Triggers/TriggerStore";
2-
import { maybeRunTrigger, getRequestObject } from "./Triggers/Trigger";
1+
import { _unregisterAll, getTrigger, Types, triggerExists, addTrigger, addFunction, getFunction, getJob, runLiveQueryEventHandlers, addLiveQueryEventHandler, addJob } from "./Triggers/TriggerStore";
2+
import { maybeRunTrigger, getRequestObject, runTrigger } from "./Triggers/Trigger";
33
import { getClassName, inflate, resolveError, toJSONwithObjects } from "./Triggers/Utils";
44
import { maybeRunQueryTrigger,maybeRunAfterFindTrigger } from "./Triggers/QueryTrigger";
55
import { maybeRunValidator } from "./Triggers/Validator";
@@ -10,6 +10,7 @@ export {
1010
_unregisterAll,
1111
getTrigger,
1212
maybeRunTrigger,
13+
runTrigger,
1314
Types,
1415
triggerExists,
1516
getClassName,
@@ -23,6 +24,8 @@ export {
2324
maybeRunFileTrigger,
2425
getRequestObject,
2526
getJob,
27+
addJob,
28+
addLiveQueryEventHandler,
2629
maybeRunGlobalConfigTrigger,
2730
maybeRunAfterFindTrigger,
2831
toJSONwithObjects,

0 commit comments

Comments
 (0)