From 849253faba49fd79917780e49bcba9de85df81d8 Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Wed, 24 Apr 2024 15:37:47 +0100
Subject: [PATCH 1/3] Bringing back the old mechanism of returning the client
 library through a pre-signed URL, rather than always serving through the
 service.

---
 .../backend-core/src/objectStore/buckets/app.ts | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

diff --git a/packages/backend-core/src/objectStore/buckets/app.ts b/packages/backend-core/src/objectStore/buckets/app.ts
index 43bc965c65..74fdd2e92a 100644
--- a/packages/backend-core/src/objectStore/buckets/app.ts
+++ b/packages/backend-core/src/objectStore/buckets/app.ts
@@ -13,23 +13,16 @@ 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.
  */
-export function clientLibraryCDNUrl(appId: string, version: string) {
+export function cloudClientLibraryUrl(appId: string, version: string) {
   let file = clientLibraryPath(appId)
-  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)
-  }
+  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, version)
+  }
   try {
     tenantId = getTenantId()
   } finally {

From f76abb0ca93434b4047f544434430046812e62a7 Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Wed, 24 Apr 2024 15:59:11 +0100
Subject: [PATCH 2/3] Getting rid of linting error.

---
 packages/backend-core/src/objectStore/buckets/app.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/backend-core/src/objectStore/buckets/app.ts b/packages/backend-core/src/objectStore/buckets/app.ts
index 74fdd2e92a..3ad575150e 100644
--- a/packages/backend-core/src/objectStore/buckets/app.ts
+++ b/packages/backend-core/src/objectStore/buckets/app.ts
@@ -13,7 +13,7 @@ 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.
  */
-export function cloudClientLibraryUrl(appId: string, version: string) {
+function cloudClientLibraryUrl(appId: string) {
   let file = clientLibraryPath(appId)
   return objectStore.getPresignedUrl(env.APPS_BUCKET_NAME, file)
 }
@@ -21,7 +21,7 @@ export function cloudClientLibraryUrl(appId: string, version: string) {
 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, version)
+    return cloudClientLibraryUrl(appId)
   }
   try {
     tenantId = getTenantId()

From 2187d25711241bbc1525868b531f2aa683b0509c Mon Sep 17 00:00:00 2001
From: Michael Drury <me@michaeldrury.co.uk>
Date: Wed, 24 Apr 2024 17:12:36 +0100
Subject: [PATCH 3/3] Revert "Changing client library to be retrieved via
 pre-signed URL for Cloud"

---
 .../backend-core/src/objectStore/buckets/app.ts | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/packages/backend-core/src/objectStore/buckets/app.ts b/packages/backend-core/src/objectStore/buckets/app.ts
index 3ad575150e..43bc965c65 100644
--- a/packages/backend-core/src/objectStore/buckets/app.ts
+++ b/packages/backend-core/src/objectStore/buckets/app.ts
@@ -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 {