Skip to content

Commit ab03153

Browse files
dblythydblythy
committed
run linting
1 parent a3855f1 commit ab03153

14 files changed

+79
-86
lines changed

‎spec/CloudCode.spec.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4117,7 +4117,7 @@ describe('custom HTTP codes', () => {
41174117
}
41184118
});
41194119

4120-
expect(request.status).toBe(201);
4120+
expect(request.status).toBe(201);
41214121
});
41224122

41234123
it('should set custom headers in save hook', async () => {
@@ -4311,4 +4311,4 @@ describe('custom HTTP codes', () => {
43114311

43124312
expect(response.headers.get('X-Custom-Header')).toBe('custom-value');
43134313
});
4314-
})
4314+
})

‎src/PromiseRouter.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
import Parse from 'parse/node';
99
import express from 'express';
1010
import log from './logger';
11-
import { inspect } from 'util';
1211
const Layer = require('express/lib/router/layer');
1312

1413
function validateParameter(key, value) {

‎src/Routers/ClassesRouter.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ export class ClassesRouter extends PromiseRouter {
4545
req.info.context,
4646
triggerResponse
4747
);
48-
return triggerResponse.toResponseObject({response});
48+
return triggerResponse.toResponseObject({ response });
4949
}
5050

5151
// Returns a promise for a {response} object.

‎src/Routers/FunctionsRouter.js

Lines changed: 22 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// FunctionsRouter.js
22

33
var Parse = require('parse/node').Parse,
4-
triggers = require('../triggers');
4+
triggers = require('../triggers');
55

66
import PromiseRouter from '../PromiseRouter';
77
import { promiseEnforceMasterKeyAccess, promiseEnsureIdempotency } from '../middlewares';
@@ -107,14 +107,14 @@ export class FunctionsRouter extends PromiseRouter {
107107
const functionName = req.params.functionName;
108108
const applicationId = req.config.applicationId;
109109
const theFunction = triggers.getFunction(functionName, applicationId);
110-
110+
111111
if (!theFunction) {
112112
throw new Parse.Error(Parse.Error.SCRIPT_FAILED, `Invalid function: "${functionName}"`);
113113
}
114114

115115
let params = Object.assign({}, req.body, req.query);
116116
params = parseParams(params, req.config);
117-
117+
118118
const request = {
119119
params,
120120
master: req.auth?.isMaster,
@@ -128,18 +128,18 @@ export class FunctionsRouter extends PromiseRouter {
128128
};
129129

130130
const response = new TriggerResponse();
131-
131+
132132
const userString = req.auth.user?.id;
133-
133+
134134
try {
135-
// Run the optional validator
136-
await triggers.maybeRunValidator(request, functionName, req.auth);
137-
138-
// Execute the function
139-
const result = await theFunction(request, response);
140-
141-
if (req.config.logLevels.cloudFunctionSuccess !== 'silent') {
142-
const cleanInput = logger.truncateLogMessage(JSON.stringify(params));
135+
// Run the optional validator
136+
await triggers.maybeRunValidator(request, functionName, req.auth);
137+
138+
// Execute the function
139+
const result = await theFunction(request, response);
140+
141+
if (req.config.logLevels.cloudFunctionSuccess !== 'silent') {
142+
const cleanInput = logger.truncateLogMessage(JSON.stringify(params));
143143
const cleanResult = logger.truncateLogMessage(JSON.stringify(result.response?.result));
144144
logger[req.config.logLevels.cloudFunctionSuccess](
145145
`Ran cloud function ${functionName} for user ${userString} with:\n Input: ${cleanInput}\n Result: ${cleanResult}`,
@@ -150,15 +150,14 @@ export class FunctionsRouter extends PromiseRouter {
150150
}
151151
);
152152
}
153-
154-
return response.toResponseObject({
155-
response: {
156-
result: Parse._encode(result),
157-
}
158-
});
159-
} catch (error) {
160-
console.log(error);
161-
error = triggers.resolveError(error);
153+
154+
return response.toResponseObject({
155+
response: {
156+
result: Parse._encode(result),
157+
}
158+
});
159+
} catch (err) {
160+
const error = triggers.resolveError(err);
162161
if (req.config.logLevels.cloudFunctionError !== 'silent') {
163162
const cleanInput = logger.truncateLogMessage(JSON.stringify(params));
164163
logger[req.config.logLevels.cloudFunctionError](
@@ -174,5 +173,5 @@ export class FunctionsRouter extends PromiseRouter {
174173
throw error;
175174
}
176175
}
177-
176+
178177
}

‎src/Routers/UsersRouter.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -317,7 +317,7 @@ export class UsersRouter extends ClassesRouter {
317317
}
318318
await req.config.authDataManager.runAfterFind(req, user.authData);
319319

320-
return beforeLoginResponse.toResponseObject({response: user});
320+
return beforeLoginResponse.toResponseObject({ response: user });
321321
}
322322

323323
/**

‎src/Triggers/ConfigTrigger.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
import {getRequestObject} from './Trigger';
1+
import { getRequestObject } from './Trigger';
22
import { maybeRunValidator } from "./Validator";
33
import { logTriggerSuccessBeforeHook, logTriggerErrorBeforeHook } from './Logger';
4-
import {getClassName} from './Utils';
5-
import {getTrigger} from './TriggerStore';
4+
import { getClassName } from './Utils';
5+
import { getTrigger } from './TriggerStore';
66
export async function maybeRunGlobalConfigTrigger(triggerType, auth, configObject, originalConfigObject, config, context) {
77
const GlobalConfigClassName = getClassName(Parse.Config);
88
const configTrigger = getTrigger(GlobalConfigClassName, triggerType, config.applicationId);
@@ -36,4 +36,4 @@ export async function maybeRunGlobalConfigTrigger(triggerType, auth, configObjec
3636
}
3737
}
3838
return configObject;
39-
}
39+
}

‎src/Triggers/FileTrigger.js

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
import {getClassName} from './Utils';
2-
import {getTrigger} from './TriggerStore';
3-
import {logTriggerSuccessBeforeHook, logTriggerErrorBeforeHook} from './Logger';
4-
import {maybeRunValidator} from './Validator';
1+
import { getClassName } from './Utils';
2+
import { getTrigger } from './TriggerStore';
3+
import { logTriggerSuccessBeforeHook, logTriggerErrorBeforeHook } from './Logger';
4+
import { maybeRunValidator } from './Validator';
55

66
export function getRequestFileObject(triggerType, auth, fileObject, config) {
77
const request = {
@@ -34,31 +34,31 @@ export async function maybeRunFileTrigger(triggerType, fileObject, config, auth,
3434
if (typeof fileTrigger !== 'function') {
3535
return fileObject;
3636
}
37-
try {
38-
const request = getRequestFileObject(triggerType, auth, fileObject, config);
39-
await maybeRunValidator(request, `${triggerType}.${FileClassName}`, auth);
40-
if (request.skipWithMasterKey) {
41-
return fileObject;
42-
}
43-
const result = await fileTrigger(request, responseObject);
44-
logTriggerSuccessBeforeHook(
45-
triggerType,
46-
'Parse.File',
47-
{ ...fileObject.file.toJSON(), fileSize: fileObject.fileSize },
48-
result,
49-
auth,
50-
config.logLevels.triggerBeforeSuccess
51-
);
52-
return result || fileObject;
53-
} catch (error) {
54-
logTriggerErrorBeforeHook(
55-
triggerType,
56-
'Parse.File',
57-
{ ...fileObject.file.toJSON(), fileSize: fileObject.fileSize },
58-
auth,
59-
error,
60-
config.logLevels.triggerBeforeError
61-
);
62-
throw error;
37+
try {
38+
const request = getRequestFileObject(triggerType, auth, fileObject, config);
39+
await maybeRunValidator(request, `${triggerType}.${FileClassName}`, auth);
40+
if (request.skipWithMasterKey) {
41+
return fileObject;
6342
}
64-
}
43+
const result = await fileTrigger(request, responseObject);
44+
logTriggerSuccessBeforeHook(
45+
triggerType,
46+
'Parse.File',
47+
{ ...fileObject.file.toJSON(), fileSize: fileObject.fileSize },
48+
result,
49+
auth,
50+
config.logLevels.triggerBeforeSuccess
51+
);
52+
return result || fileObject;
53+
} catch (error) {
54+
logTriggerErrorBeforeHook(
55+
triggerType,
56+
'Parse.File',
57+
{ ...fileObject.file.toJSON(), fileSize: fileObject.fileSize },
58+
auth,
59+
error,
60+
config.logLevels.triggerBeforeError
61+
);
62+
throw error;
63+
}
64+
}

‎src/Triggers/Logger.js

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,15 @@
1+
import logger from '../logger';
12
export function logTriggerAfterHook(triggerType, className, input, auth, logLevel) {
23
if (logLevel === 'silent') {
34
return;
45
}
56
const cleanInput = logger.truncateLogMessage(JSON.stringify(input));
67
logger[logLevel](
7-
`${triggerType} triggered for ${className} for user ${userIdForLog(
8-
auth
9-
)}:\n Input: ${cleanInput}`,
8+
`${triggerType} triggered for ${className} for user ${auth?.user?.id}:\n Input: ${cleanInput}`,
109
{
1110
className,
1211
triggerType,
13-
user: userIdForLog(auth),
12+
user: auth?.user?.id,
1413
}
1514
);
1615
}
@@ -22,13 +21,11 @@ export function logTriggerSuccessBeforeHook(triggerType, className, input, resul
2221
const cleanInput = logger.truncateLogMessage(JSON.stringify(input));
2322
const cleanResult = logger.truncateLogMessage(JSON.stringify(result));
2423
logger[logLevel](
25-
`${triggerType} triggered for ${className} for user ${userIdForLog(
26-
auth
27-
)}:\n Input: ${cleanInput}\n Result: ${cleanResult}`,
24+
`${triggerType} triggered for ${className} for user ${auth?.user?.id}:\n Input: ${cleanInput}\n Result: ${cleanResult}`,
2825
{
2926
className,
3027
triggerType,
31-
user: userIdForLog(auth),
28+
user: auth?.user?.id,
3229
}
3330
);
3431
}
@@ -39,14 +36,12 @@ export function logTriggerErrorBeforeHook(triggerType, className, input, auth, e
3936
}
4037
const cleanInput = logger.truncateLogMessage(JSON.stringify(input));
4138
logger[logLevel](
42-
`${triggerType} failed for ${className} for user ${userIdForLog(
43-
auth
44-
)}:\n Input: ${cleanInput}\n Error: ${JSON.stringify(error)}`,
39+
`${triggerType} failed for ${className} for user ${auth?.user?.id}:\n Input: ${cleanInput}\n Error: ${JSON.stringify(error)}`,
4540
{
4641
className,
4742
triggerType,
4843
error,
49-
user: userIdForLog(auth),
44+
user: auth?.user?.id,
5045
}
5146
);
52-
}
47+
}

‎src/Triggers/QueryTrigger.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { getTrigger, Types } from "./TriggerStore";
2-
import {getRequestObject} from './Trigger';
2+
import { getRequestObject } from './Trigger';
33
import { resolveError, toJSONwithObjects } from "./Utils";
44
import { maybeRunValidator } from "./Validator";
55
import { logTriggerAfterHook, logTriggerSuccessBeforeHook } from "./Logger";
@@ -250,4 +250,4 @@ function getRequestQueryObject(triggerType, auth, query, count, config, context,
250250
request['installationId'] = auth.installationId;
251251
}
252252
return request;
253-
}
253+
}

‎src/Triggers/Trigger.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,4 +150,4 @@ function processTriggerResponse(request, response) {
150150
}
151151

152152
return {};
153-
}
153+
}

‎src/Triggers/TriggerResponse.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,4 @@ export default class TriggerResponse {
1515
location: response.location,
1616
};
1717
}
18-
}
18+
}

‎src/Triggers/TriggerStore.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,4 +176,4 @@ export function getValidator(functionName, applicationId) {
176176

177177
export function getJob(jobName, applicationId) {
178178
return get(Category.Jobs, jobName, applicationId);
179-
}
179+
}

‎src/Triggers/Validator.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import {getValidator} from './TriggerStore'
2-
import {resolveError} from './Utils'
1+
import { getValidator } from './TriggerStore'
2+
import { resolveError } from './Utils'
33
export function maybeRunValidator(request, functionName, auth) {
44
const theValidator = getValidator(functionName, Parse.applicationId);
55
if (!theValidator) {
@@ -195,4 +195,4 @@ async function builtInTriggerValidator(options, request, auth) {
195195
}
196196
await Promise.all(optionPromises);
197197
}
198-
}
198+
}

‎src/triggers.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { _unregisterAll, getTrigger, Types, triggerExists, addTrigger, addFuncti
22
import { maybeRunTrigger, getRequestObject } from "./Triggers/Trigger";
33
import { getClassName, inflate, resolveError, toJSONwithObjects } from "./Triggers/Utils";
44
import { maybeRunQueryTrigger,maybeRunAfterFindTrigger } from "./Triggers/QueryTrigger";
5-
import {maybeRunValidator} from "./Triggers/Validator";
5+
import { maybeRunValidator } from "./Triggers/Validator";
66
import { maybeRunFileTrigger } from "./Triggers/FileTrigger";
77
import { maybeRunGlobalConfigTrigger } from "./Triggers/ConfigTrigger";
88

@@ -27,4 +27,4 @@ export {
2727
maybeRunAfterFindTrigger,
2828
toJSONwithObjects,
2929
runLiveQueryEventHandlers
30-
}
30+
}

0 commit comments

Comments
 (0)