From 3cf2e1d7c34bdd93b6ce89c60f337be6723d4577 Mon Sep 17 00:00:00 2001 From: Henry Oswald Date: Mon, 21 May 2018 10:11:47 +0100 Subject: [PATCH] add null checks and new body parser --- services/filestore/app.coffee | 5 +++-- services/filestore/app/coffee/PersistorManager.coffee | 2 +- services/filestore/package.json | 3 ++- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/services/filestore/app.coffee b/services/filestore/app.coffee index f7ef31e687..426996eccf 100644 --- a/services/filestore/app.coffee +++ b/services/filestore/app.coffee @@ -1,4 +1,5 @@ express = require('express') +bodyParser = require "body-parser" logger = require('logger-sharelatex') logger.initialize("filestore") settings = require("settings-sharelatex") @@ -61,7 +62,7 @@ app.use (req, res, next) -> app.get "/project/:project_id/file/:file_id", keyBuilder.userFileKey, fileController.getFile app.post "/project/:project_id/file/:file_id", keyBuilder.userFileKey, fileController.insertFile -app.put "/project/:project_id/file/:file_id", keyBuilder.userFileKey, express.bodyParser(), fileController.copyFile +app.put "/project/:project_id/file/:file_id", keyBuilder.userFileKey, bodyParser.json(), fileController.copyFile app.del "/project/:project_id/file/:file_id", keyBuilder.userFileKey, fileController.deleteFile app.get "/template/:template_id/v/:version/:format", keyBuilder.templateFileKey, fileController.getFile @@ -72,7 +73,7 @@ app.post "/template/:template_id/v/:version/:format", keyBuilder.templateFileKey app.get "/project/:project_id/public/:public_file_id", keyBuilder.publicFileKey, fileController.getFile app.post "/project/:project_id/public/:public_file_id", keyBuilder.publicFileKey, fileController.insertFile -app.put "/project/:project_id/public/:public_file_id", keyBuilder.publicFileKey, express.bodyParser(), fileController.copyFile +app.put "/project/:project_id/public/:public_file_id", keyBuilder.publicFileKey, bodyParser.json(), fileController.copyFile app.del "/project/:project_id/public/:public_file_id", keyBuilder.publicFileKey, fileController.deleteFile app.get "/project/:project_id/size", keyBuilder.publicProjectKey, fileController.directorySize diff --git a/services/filestore/app/coffee/PersistorManager.coffee b/services/filestore/app/coffee/PersistorManager.coffee index aa5c80599d..a3b08420a6 100644 --- a/services/filestore/app/coffee/PersistorManager.coffee +++ b/services/filestore/app/coffee/PersistorManager.coffee @@ -2,7 +2,7 @@ settings = require("settings-sharelatex") logger = require("logger-sharelatex") # assume s3 if none specified -settings.filestore.backend ||= "s3" +settings?.filestore?.backend ||= "s3" logger.log backend:settings.filestore.backend, "Loading backend" diff --git a/services/filestore/package.json b/services/filestore/package.json index 85ea112dd6..897d195b63 100644 --- a/services/filestore/package.json +++ b/services/filestore/package.json @@ -41,7 +41,8 @@ "settings-sharelatex": "git+https://github.com/sharelatex/settings-sharelatex.git#v1.0.0", "stream-buffers": "~0.2.5", "underscore": "~1.5.2", - "mocha": "^4.0.1" + "mocha": "^4.0.1", + "body-parser": "^1.2.0" }, "devDependencies": { "sinon": "",