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

Merge pull request #13558 from Budibase/revert-13557-fix/pre-sign-client-lib 

Revert "Changing client library to be retrieved via pre-signed URL for Cloud"
This commit is contained in:
Michael Drury 2024-04-24 17:12:50 +01:00 committed by GitHub
parent 36aacd4d11 2187d25711
commit adcbb3dd1e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
packages/backend-core/src/objectStore/buckets/app.ts
View File

@ -13,16 +13,23 @@ export function clientLibraryPath(appId: string) {
* due to issues with the domain we were unable to continue doing this - keeping
* incase we are able to switch back to CDN path again in future.
*/
function cloudClientLibraryUrl(appId: string) {
export function clientLibraryCDNUrl(appId: string, version: string) {
let file = clientLibraryPath(appId)
return objectStore.getPresignedUrl(env.APPS_BUCKET_NAME, file)
if (env.CLOUDFRONT_CDN) {
// append app version to bust the cache
if (version) {
file += `?v=${version}`
}
// don't need to use presigned for client with cloudfront
// file is public
return cloudfront.getUrl(file)
} else {
return objectStore.getPresignedUrl(env.APPS_BUCKET_NAME, file)
}
}
export function clientLibraryUrl(appId: string, version: string) {
let tenantId, qsParams: { appId: string; version: string; tenantId?: string }
if (env.isProd() && !env.SELF_HOSTED) {
return cloudClientLibraryUrl(appId)
}
try {
tenantId = getTenantId()
} finally {