Merge branch 'master' into production

This commit is contained in:
HF 2020-01-04 05:44:34 +01:00
commit b18c55ccc4
2 changed files with 2 additions and 4 deletions

View File

@ -38,7 +38,6 @@
"express": "^4.15.3",
"express-limiter": "^1.6.0",
"express-session": "^1.15.2",
"express-validator": "^3.2.0",
"global": "^4.3.2",
"hammerjs": "^2.0.8",
"http-proxy-agent": "^2.1.0",
@ -83,7 +82,6 @@
"three": "^0.112.1",
"three-trackballcontrols-ts": "^0.1.2",
"url-search-params-polyfill": "^7.0.0",
"validator": "^7.0.0",
"visibilityjs": "^1.2.4",
"winston": "^2.3.1",
"ws": "^7.1.2"

View File

@ -137,10 +137,10 @@ router.post('/', upload.single('image'), async (req, res, next) => {
} else if (!imageaction) {
error = 'No imageaction given';
} else if (!canvasident) {
error = 'No imageaction given';
error = 'No canvas specified';
}
if (error !== null) {
res.status(403).json(error);
res.status(403).send(error);
return;
}
const x = parseInt(req.body.x, 10);