Merge branch 'spectrum-bbui-table' of github.com:Budibase/budibase into spectrum-bbui-table

packages/server/src/api/controllers/deploy/utils.js

@@ -51,11 +51,11 @@ exports.prepareUpload = async function({ s3Key, bucket, metadata, file }) {
     type: file.type,
   })
 
+  // don't store a URL, work this out on the way out as the URL could change
   return {
     size: file.size,
     name: file.name,
     extension: [...file.name.split(".")].pop(),
-    url: response.Location,
     key: response.Key,
   }
 }

packages/server/src/utilities/rowProcessor.js

@@ -1,8 +1,8 @@
-const env = require("../environment")
-const { OBJ_STORE_DIRECTORY } = require("../constants")
+const { ObjectStoreBuckets } = require("../constants")
 const linkRows = require("../db/linkedRows")
 const { cloneDeep } = require("lodash/fp")
 const { FieldTypes, AutoFieldSubTypes } = require("../constants")
+const { checkSlashesInUrl } = require("./index")
 
 const BASE_AUTO_ID = 1
 
@@ -180,7 +180,6 @@ exports.outputProcessing = async (appId, table, rows) => {
     rows
   )
   // update the attachments URL depending on hosting
-  if (env.isProd() && env.SELF_HOSTED) {
   for (let [property, column] of Object.entries(table.schema)) {
     if (column.type === FieldTypes.ATTACHMENT) {
       for (let row of outputRows) {
@@ -188,12 +187,12 @@ exports.outputProcessing = async (appId, table, rows) => {
           continue
         }
         row[property].forEach(attachment => {
-            attachment.url = `${OBJ_STORE_DIRECTORY}/${appId}/${attachment.url}`
-            attachment.url = attachment.url.replace("//", "/")
+          attachment.url = checkSlashesInUrl(
+            `${ObjectStoreBuckets.APPS}/${attachment.key}`
+          )
         })
       }
     }
   }
-  }
   return wasArray ? outputRows : outputRows[0]
 }