MirrorSave
/
budibase
mirror of https://github.com/Budibase/budibase.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Updating to make sure a relative URL is always used for attachments.

This commit is contained in:
mike12345567 2021-04-09 13:49:16 +01:00
parent d508b905be
commit 30a7303762
3 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/server/src/api/controllers/deploy/utils.js
View File

@ -5,6 +5,7 @@ const fetch = require("node-fetch")
const PouchDB = require("../../../db") const PouchDB = require("../../../db")
const CouchDB = require("pouchdb") const CouchDB = require("pouchdb")
const { upload } = require("../../../utilities/fileSystem") const { upload } = require("../../../utilities/fileSystem")
const { attachmentsRelativeURL } = require("../../../utilities")
// TODO: everything in this file is to be removed // TODO: everything in this file is to be removed
@ -55,6 +56,7 @@ exports.prepareUpload = async function({ s3Key, bucket, metadata, file }) {
return { return {
size: file.size, size: file.size,
name: file.name, name: file.name,
url: attachmentsRelativeURL(response.Key),
extension: [...file.name.split(".")].pop(), extension: [...file.name.split(".")].pop(),
key: response.Key, key: response.Key,
} }

8
packages/server/src/utilities/index.js
View File

@ -1,7 +1,7 @@
const env = require("../environment") const env = require("../environment")
const { DocumentTypes, SEPARATOR } = require("../db/utils") const { DocumentTypes, SEPARATOR } = require("../db/utils")
const CouchDB = require("../db") const CouchDB = require("../db")
const { OBJ_STORE_DIRECTORY } = require("../constants") const { OBJ_STORE_DIRECTORY, ObjectStoreBuckets } = require("../constants")
const BB_CDN = "https://cdn.app.budi.live/assets" const BB_CDN = "https://cdn.app.budi.live/assets"
const APP_PREFIX = DocumentTypes.APP + SEPARATOR const APP_PREFIX = DocumentTypes.APP + SEPARATOR
@ -157,3 +157,9 @@ exports.clientLibraryPath = appId => {
return `/api/assets/client` return `/api/assets/client`
} }
} }
exports.attachmentsRelativeURL = attachmentKey => {
return exports.checkSlashesInUrl(
`/${ObjectStoreBuckets.APPS}/${attachmentKey}`
)
}

6
packages/server/src/utilities/rowProcessor.js
View File

@ -2,7 +2,7 @@ const { ObjectStoreBuckets } = require("../constants")
const linkRows = require("../db/linkedRows") const linkRows = require("../db/linkedRows")
const { cloneDeep } = require("lodash/fp") const { cloneDeep } = require("lodash/fp")
const { FieldTypes, AutoFieldSubTypes } = require("../constants") const { FieldTypes, AutoFieldSubTypes } = require("../constants")
const { checkSlashesInUrl } = require("./index") const { attachmentsRelativeURL } = require("./index")
const BASE_AUTO_ID = 1 const BASE_AUTO_ID = 1
@ -187,9 +187,7 @@ exports.outputProcessing = async (appId, table, rows) => {
continue continue
} }
row[property].forEach(attachment => { row[property].forEach(attachment => {
attachment.url = checkSlashesInUrl( attachment.url = attachmentsRelativeURL(attachment.key)
`${ObjectStoreBuckets.APPS}/${attachment.key}`
)
}) })
} }
} }