fix(server): throw when fileStorage configuration missing

src/services/fileStorage.js

@@ -8,17 +8,6 @@ const path = require('path')
 const mime = require('mime-types')
 const logger = require('@pubsweet/logger')
 
-const {
-  accessKeyId,
-  secretAccessKey,
-  bucket,
-  protocol,
-  host,
-  port,
-  maximumWidthForSmallImages,
-  maximumWidthForMediumImages,
-} = config.get('fileStorage')
-
 const {
   convertFileStreamIntoBuffer,
   getFileExtension,
@@ -33,6 +22,14 @@ let s3
 
 const healthCheck = () => {
   try {
+    if (!s3) {
+      throw new Error(
+        's3 does not exist! Probably configuration is missing/invalid',
+      )
+    }
+
+    const { bucket } = config.get('fileStorage')
+
     return new Promise((resolve, reject) => {
       s3.getBucketLogging({ Bucket: bucket }, (err, data) => {
         if (err) {
@@ -55,6 +52,21 @@ if (
   config.has('pubsweet-server.useFileStorage') &&
   config.get('pubsweet-server.useFileStorage')
 ) {
+  if (!config.has('fileStorage')) {
+    throw new Error(
+      'you have declared that you will use file storage but fileStorage configuration is missing',
+    )
+  }
+
+  const {
+    accessKeyId,
+    secretAccessKey,
+    bucket,
+    protocol,
+    host,
+    port,
+  } = config.get('fileStorage')
+
   if (!protocol) {
     throw new Error(
       'missing required protocol param for initializing file storage',
@@ -104,6 +116,11 @@ const createImageVersions = async (
   isSVG,
 ) => {
   try {
+    const {
+      maximumWidthForSmallImages,
+      maximumWidthForMediumImages,
+    } = config.get('fileStorage')
+
     const mediumWidth = maximumWidthForMediumImages
       ? parseInt(maximumWidthForMediumImages, 10)
       : 640
@@ -155,6 +172,13 @@ const createImageVersions = async (
 }
 
 const getURL = async (objectKey, options = {}) => {
+  if (!s3) {
+    throw new Error(
+      's3 does not exist! Probably configuration is missing/invalid',
+    )
+  }
+
+  const { bucket } = config.get('fileStorage')
   const { expiresIn } = options
 
   const s3Params = {
@@ -167,6 +191,13 @@ const getURL = async (objectKey, options = {}) => {
 }
 
 const uploadFileHandler = (fileStream, filename, mimetype) => {
+  if (!s3) {
+    throw new Error(
+      's3 does not exist! Probably configuration is missing/invalid',
+    )
+  }
+
+  const { bucket } = config.get('fileStorage')
   const params = {
     Bucket: bucket,
     Key: filename, // file name you want to save as
@@ -371,6 +402,13 @@ const upload = async (fileStream, filename, options = {}) => {
 }
 
 const getFileInfo = key => {
+  if (!s3) {
+    throw new Error(
+      's3 does not exist! Probably configuration is missing/invalid',
+    )
+  }
+
+  const { bucket } = config.get('fileStorage')
   const params = {
     Bucket: bucket,
     Key: key,
@@ -388,6 +426,13 @@ const getFileInfo = key => {
 }
 
 const list = () => {
+  if (!s3) {
+    throw new Error(
+      's3 does not exist! Probably configuration is missing/invalid',
+    )
+  }
+
+  const { bucket } = config.get('fileStorage')
   const params = {
     Bucket: bucket,
   }
@@ -405,6 +450,14 @@ const list = () => {
 
 // Accepts an array of object keys
 const deleteFiles = objectKeys => {
+  if (!s3) {
+    throw new Error(
+      's3 does not exist! Probably configuration is missing/invalid',
+    )
+  }
+
+  const { bucket } = config.get('fileStorage')
+
   if (objectKeys.length === 0) {
     throw new Error('the provided array of keys if empty')
   }
@@ -433,6 +486,13 @@ const deleteFiles = objectKeys => {
 }
 
 const download = (key, localPath) => {
+  if (!s3) {
+    throw new Error(
+      's3 does not exist! Probably configuration is missing/invalid',
+    )
+  }
+
+  const { bucket } = config.get('fileStorage')
   const fileStream = fs.createWriteStream(localPath)
   const s3Stream = s3.getObject({ Bucket: bucket, Key: key }).createReadStream()