Use Prettier JS (#5017)

* Adds prettier

* Run lint before tests
This commit is contained in:
Florent Vilmart
2018-09-01 13:58:06 -04:00
committed by GitHub
parent 189cd259ee
commit d83a0b6808
240 changed files with 41098 additions and 29020 deletions

View File

@@ -11,7 +11,7 @@ import { logger } from '../logger';
function parseObject(obj) {
if (Array.isArray(obj)) {
return obj.map((item) => {
return obj.map(item => {
return parseObject(item);
});
} else if (obj && obj.__type == 'Date') {
@@ -30,12 +30,20 @@ function parseParams(params) {
}
export class FunctionsRouter extends PromiseRouter {
mountRoutes() {
this.route('POST', '/functions/:functionName', FunctionsRouter.handleCloudFunction);
this.route('POST', '/jobs/:jobName', promiseEnforceMasterKeyAccess, function(req) {
return FunctionsRouter.handleCloudJob(req);
});
this.route(
'POST',
'/functions/:functionName',
FunctionsRouter.handleCloudFunction
);
this.route(
'POST',
'/jobs/:jobName',
promiseEnforceMasterKeyAccess,
function(req) {
return FunctionsRouter.handleCloudJob(req);
}
);
this.route('POST', '/jobs', promiseEnforceMasterKeyAccess, function(req) {
return FunctionsRouter.handleCloudJob(req);
});
@@ -57,27 +65,32 @@ export class FunctionsRouter extends PromiseRouter {
headers: req.config.headers,
ip: req.config.ip,
jobName,
message: jobHandler.setMessage.bind(jobHandler)
message: jobHandler.setMessage.bind(jobHandler),
};
return jobHandler.setRunning(jobName, params).then((jobStatus) => {
request.jobId = jobStatus.objectId
return jobHandler.setRunning(jobName, params).then(jobStatus => {
request.jobId = jobStatus.objectId;
// run the function async
process.nextTick(() => {
Promise.resolve().then(() => {
return jobFunction(request);
}).then((result) => {
jobHandler.setSucceeded(result);
}, (error) => {
jobHandler.setFailed(error);
});
Promise.resolve()
.then(() => {
return jobFunction(request);
})
.then(
result => {
jobHandler.setSucceeded(result);
},
error => {
jobHandler.setFailed(error);
}
);
});
return {
headers: {
'X-Parse-Job-Status-Id': jobStatus.objectId
'X-Parse-Job-Status-Id': jobStatus.objectId,
},
response: {}
}
response: {},
};
});
}
@@ -86,8 +99,8 @@ export class FunctionsRouter extends PromiseRouter {
success: function(result) {
resolve({
response: {
result: Parse._encode(result)
}
result: Parse._encode(result),
},
});
},
error: function(message) {
@@ -106,17 +119,23 @@ export class FunctionsRouter extends PromiseRouter {
}
reject(new Parse.Error(code, message));
},
message: message
}
message: message,
};
}
static handleCloudFunction(req) {
const functionName = req.params.functionName;
const applicationId = req.config.applicationId;
const theFunction = triggers.getFunction(functionName, applicationId);
const theValidator = triggers.getValidator(req.params.functionName, applicationId);
const theValidator = triggers.getValidator(
req.params.functionName,
applicationId
);
if (!theFunction) {
throw new Parse.Error(Parse.Error.SCRIPT_FAILED, `Invalid function: "${functionName}"`);
throw new Parse.Error(
Parse.Error.SCRIPT_FAILED,
`Invalid function: "${functionName}"`
);
}
let params = Object.assign({}, req.body, req.query);
params = parseParams(params);
@@ -128,53 +147,65 @@ export class FunctionsRouter extends PromiseRouter {
log: req.config.loggerController,
headers: req.config.headers,
ip: req.config.ip,
functionName
functionName,
};
if (theValidator && typeof theValidator === "function") {
if (theValidator && typeof theValidator === 'function') {
var result = theValidator(request);
if (!result) {
throw new Parse.Error(Parse.Error.VALIDATION_ERROR, 'Validation failed.');
throw new Parse.Error(
Parse.Error.VALIDATION_ERROR,
'Validation failed.'
);
}
}
return new Promise(function (resolve, reject) {
const userString = (req.auth && req.auth.user) ? req.auth.user.id : undefined;
return new Promise(function(resolve, reject) {
const userString =
req.auth && req.auth.user ? req.auth.user.id : undefined;
const cleanInput = logger.truncateLogMessage(JSON.stringify(params));
const { success, error, message } = FunctionsRouter.createResponseObject((result) => {
try {
const cleanResult = logger.truncateLogMessage(JSON.stringify(result.response.result));
logger.info(
`Ran cloud function ${functionName} for user ${userString} with:\n Input: ${cleanInput }\n Result: ${cleanResult }`,
{
functionName,
params,
user: userString,
}
);
resolve(result);
} catch (e) {
reject(e);
const { success, error, message } = FunctionsRouter.createResponseObject(
result => {
try {
const cleanResult = logger.truncateLogMessage(
JSON.stringify(result.response.result)
);
logger.info(
`Ran cloud function ${functionName} for user ${userString} with:\n Input: ${cleanInput}\n Result: ${cleanResult}`,
{
functionName,
params,
user: userString,
}
);
resolve(result);
} catch (e) {
reject(e);
}
},
error => {
try {
logger.error(
`Failed running cloud function ${functionName} for user ${userString} with:\n Input: ${cleanInput}\n Error: ` +
JSON.stringify(error),
{
functionName,
error,
params,
user: userString,
}
);
reject(error);
} catch (e) {
reject(e);
}
}
}, (error) => {
try {
logger.error(
`Failed running cloud function ${functionName} for user ${userString} with:\n Input: ${cleanInput}\n Error: ` + JSON.stringify(error),
{
functionName,
error,
params,
user: userString
}
);
reject(error);
} catch (e) {
reject(e);
}
});
return Promise.resolve().then(() => {
return theFunction(request, { message });
}).then(success, error);
);
return Promise.resolve()
.then(() => {
return theFunction(request, { message });
})
.then(success, error);
});
}
}