Merge pull request novuhq#2513 from JoeyEamigh/2512-branded-image-cdn

feat: Support serving uploaded files from CDN
Vslekeystone · Jan 17, 2023 · 5d4f2c5 · 5d4f2c5
2 parents 1b4797b + fac16a0
commit 5d4f2c5
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/apps/api/src/.example.env b/apps/api/src/.example.env
@@ -29,6 +29,7 @@ S3_REGION=us-east-1
 AWS_ACCESS_KEY_ID=test
 AWS_SECRET_ACCESS_KEY=test
 NEW_RELIC_ENABLED=false
+CDN_URL=
 
 GLOBAL_CONTEXT_PATH=
 API_CONTEXT_PATH=

diff --git a/apps/api/src/app/shared/services/storage/storage.service.ts b/apps/api/src/app/shared/services/storage/storage.service.ts
@@ -95,11 +95,9 @@ export class S3StorageService implements StorageService {
 
     const signedUrl = await getSignedUrl(this.s3, command, { expiresIn: 3600 });
     const parsedUrl = new URL(signedUrl);
+    const path = process.env.CDN_URL ? `${process.env.CDN_URL}/${key}` : `${parsedUrl.origin}${parsedUrl.pathname}`;
 
-    return {
-      signedUrl,
-      path: `${parsedUrl.origin}${parsedUrl.pathname}`,
-    };
+    return { signedUrl, path };
   }
 }
 
@@ -159,11 +157,11 @@ export class GCSStorageService implements StorageService {
       });
 
     const parsedUrl = new URL(signedUrl);
+    const path = process.env.CDN_URL
+      ? `${process.env.CDN_URL}/${key}`
+      : `${process.env.GCS_DOMAIN}${parsedUrl.pathname}`;
 
-    return {
-      signedUrl,
-      path: `${process.env.GCS_DOMAIN}${parsedUrl.pathname}`,
-    };
+    return { signedUrl, path };
   }
 }
 
@@ -233,13 +231,14 @@ export class AzureBlobStorageService implements StorageService {
     ).toString();
 
     const signedUrl = `${blobClient.url}?${blobSAS}`;
+    const path = process.env.CDN_URL ? `${process.env.CDN_URL}/${key}` : `${blobClient.url}`;
     const additionalHeaders = {
       'x-ms-blob-type': 'BlockBlob',
     };
 
     return {
       signedUrl,
-      path: `${blobClient.url}`,
+      path,
       additionalHeaders: additionalHeaders,
     };
   }