From 25c0051fd4ab807d2ad770d7164ed9f951252497 Mon Sep 17 00:00:00 2001
From: Jackson Harper <jacksonh@gmail.com>
Date: Wed, 18 Oct 2023 10:14:35 +0800
Subject: [PATCH] Only use signed URLs for PDF attachments

---
 packages/api/src/resolvers/article/index.ts      |  6 +-----
 packages/api/src/routers/svc/email_attachment.ts |  6 +-----
 packages/api/src/utils/uploads.ts                | 16 ----------------
 3 files changed, 2 insertions(+), 26 deletions(-)

diff --git a/packages/api/src/resolvers/article/index.ts b/packages/api/src/resolvers/article/index.ts
index bf7dc89f9..bd016a345 100644
--- a/packages/api/src/resolvers/article/index.ts
+++ b/packages/api/src/resolvers/article/index.ts
@@ -98,10 +98,7 @@ import {
   parsePreparedContent,
 } from '../../utils/parser'
 import { parseSearchQuery, sortParamsToSort } from '../../utils/search'
-import {
-  getStorageFileDetails,
-  makeStorageFilePublic,
-} from '../../utils/uploads'
+import { getStorageFileDetails } from '../../utils/uploads'
 import { itemTypeForContentType } from '../upload_files'
 
 export enum ArticleFormat {
@@ -310,7 +307,6 @@ export const createArticleResolver = authorized<
             pubsub
           )
         }
-        await makeStorageFilePublic(uploadFileData.id, uploadFileData.fileName)
       }
 
       let libraryItemToReturn: LibraryItem
diff --git a/packages/api/src/routers/svc/email_attachment.ts b/packages/api/src/routers/svc/email_attachment.ts
index b9bf3c77c..926317f4e 100644
--- a/packages/api/src/routers/svc/email_attachment.ts
+++ b/packages/api/src/routers/svc/email_attachment.ts
@@ -143,11 +143,7 @@ export function emailAttachmentRouter() {
         return res.status(400).send('BAD REQUEST')
       }
 
-      const uploadFileUrlOverride = await makeStorageFilePublic(
-        uploadFileData.id,
-        uploadFileData.fileName
-      )
-
+      const uploadFileUrlOverride = `https://omnivore.app/attachments/${uploadFileId}/${uploadFile.fileName}`
       const uploadFileHash = uploadFileDetails.md5Hash
       const itemType =
         uploadFile.contentType === 'application/pdf'
diff --git a/packages/api/src/utils/uploads.ts b/packages/api/src/utils/uploads.ts
index 34bfb5854..1cfeb1ff8 100644
--- a/packages/api/src/utils/uploads.ts
+++ b/packages/api/src/utils/uploads.ts
@@ -81,22 +81,6 @@ export const generateDownloadSignedUrl = async (
   return url
 }
 
-export const makeStorageFilePublic = async (
-  id: string,
-  fileName: string
-): Promise<string> => {
-  // if (env.dev.isLocal) {
-  //   return 'http://localhost:3000/public/' + id + '/' + fileName
-  // }
-
-  // Makes the file public
-  const filePathName = generateUploadFilePathName(id, fileName)
-  await storage.bucket(bucketName).file(filePathName).makePublic()
-
-  const fileObj = storage.bucket(bucketName).file(filePathName)
-  return fileObj.publicUrl()
-}
-
 export const getStorageFileDetails = async (
   id: string,
   fileName: string