Merge pull request #526 from topcoder-platform/hotfix/post-release-2.2.1

[HOTFIX] [DEV] Post release 2.2.1

Author: maxceem

migrations/20200401_increase_path_length_attachments.sql

@@ -0,0 +1,4 @@
+-- UPDATE EXISTING project_attachments table
+--     modify column `path`
+
+ALTER TABLE project_attachments  ALTER COLUMN "path" TYPE character varying(2048);

src/models/projectAttachment.js

@@ -17,7 +17,7 @@ module.exports = function defineProjectAttachment(sequelize, DataTypes) {
     size: { type: DataTypes.INTEGER, allowNull: true }, // size in MB
     category: { type: DataTypes.STRING, allowNull: true }, // size in MB
     description: { type: DataTypes.STRING, allowNull: true },
-    path: { type: DataTypes.STRING, allowNull: false },
+    path: { type: DataTypes.STRING(2048), allowNull: false },
     contentType: { type: DataTypes.STRING, allowNull: true },
     allowedUsers: DataTypes.ARRAY({ type: DataTypes.INTEGER, allowNull: true }),
     deletedAt: { type: DataTypes.DATE, allowNull: true },

src/routes/attachments/get.js

@@ -19,17 +19,20 @@ const permissions = tcMiddleware.permissions;
  * @returns {Array<Promise>} The array of two promises, first one if the attachment object promise,
  *                           The second promise is for the file pre-signed url (if attachment type is file)
  */
-const getPreSignedUrl = (req, attachment) => {
+const getPreSignedUrl = async (req, attachment) => {
+  // If the attachment is a link return it as-is without getting the pre-signed url
   if (attachment.type === ATTACHMENT_TYPES.LINK) {
-    // If the attachment is a link return it as-is without getting the pre-signed url
     return [attachment, ''];
-  }  // The attachment is a file
-    // In development/test mode, if file upload is disabled, we return the dummy attachment object
-  if (_.includes(['development', 'test'], process.env.NODE_ENV) && config.get('enableFileUpload') === 'false') {
+  }
+
+  // The attachment is a file
+  // In development mode, if file upload is disabled, we return the dummy attachment object
+  if (_.includes(['development'], process.env.NODE_ENV) && config.get('enableFileUpload') === 'false') {
     return [attachment, 'dummy://url'];
   }
-      // Not in development mode or file upload is not disabled
-  return [attachment, util.getFileDownloadUrl(req, attachment.path)];
+  // Not in development mode or file upload is not disabled
+  const url = await util.getFileDownloadUrl(req, attachment.path);
+  return [attachment, url];
 };
 
 module.exports = [