From 3c75a23e75eb68a6d6e24bd8f78537f7ceb1bc82 Mon Sep 17 00:00:00 2001
From: Hongbo Wu <hongbo@omnivore.app>
Date: Tue, 24 Oct 2023 12:02:58 +0800
Subject: [PATCH 1/2] fix: showing original url instead of signed url for pdf
 files in search api response

---
 packages/api/src/entity/library_item.ts          | 4 ++++
 packages/api/src/resolvers/function_resolvers.ts | 2 +-
 packages/api/src/utils/helpers.ts                | 1 -
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/packages/api/src/entity/library_item.ts b/packages/api/src/entity/library_item.ts
index 416c65b68..31383da62 100644
--- a/packages/api/src/entity/library_item.ts
+++ b/packages/api/src/entity/library_item.ts
@@ -129,6 +129,10 @@ export class LibraryItem {
   @JoinColumn({ name: 'upload_file_id' })
   uploadFile?: UploadFile
 
+  // get upload_file_id without loading the uploadFile entity
+  @Column('text', { nullable: true })
+  uploadFileId?: string
+
   @Column('enum', { enum: ContentReaderType, default: ContentReaderType.WEB })
   contentReader!: ContentReaderType
 
diff --git a/packages/api/src/resolvers/function_resolvers.ts b/packages/api/src/resolvers/function_resolvers.ts
index bc58b54bf..ca145815e 100644
--- a/packages/api/src/resolvers/function_resolvers.ts
+++ b/packages/api/src/resolvers/function_resolvers.ts
@@ -465,7 +465,7 @@ export const functionResolvers = {
     async url(item: SearchItem, _: unknown, ctx: WithDataSourcesContext) {
       if (
         (item.pageType == PageType.File || item.pageType == PageType.Book) &&
-        ctx.uid &&
+        ctx.claims &&
         item.uploadFileId
       ) {
         const upload = await findUploadFileById(item.uploadFileId)
diff --git a/packages/api/src/utils/helpers.ts b/packages/api/src/utils/helpers.ts
index dadcfe171..bdfe443c1 100644
--- a/packages/api/src/utils/helpers.ts
+++ b/packages/api/src/utils/helpers.ts
@@ -268,7 +268,6 @@ export const libraryItemToSearchItem = (item: LibraryItem): SearchItem => ({
   ),
   image: item.thumbnail,
   highlights: item.highlights?.map(highlightDataToHighlight),
-  uploadFileId: item.uploadFile?.id,
   wordsCount: item.wordCount,
 })
 

From 056bf9ebf198d85a1dacfdcc65fa429ea01f24a1 Mon Sep 17 00:00:00 2001
From: Hongbo Wu <hongbo@omnivore.app>
Date: Tue, 24 Oct 2023 13:12:59 +0800
Subject: [PATCH 2/2] fix update sql

---
 packages/api/src/entity/library_item.ts | 2 +-
 packages/api/src/services/save_page.ts  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/api/src/entity/library_item.ts b/packages/api/src/entity/library_item.ts
index 31383da62..07f4ccd05 100644
--- a/packages/api/src/entity/library_item.ts
+++ b/packages/api/src/entity/library_item.ts
@@ -129,7 +129,7 @@ export class LibraryItem {
   @JoinColumn({ name: 'upload_file_id' })
   uploadFile?: UploadFile
 
-  // get upload_file_id without loading the uploadFile entity
+  // get upload_file_id without joining relations
   @Column('text', { nullable: true })
   uploadFileId?: string
 
diff --git a/packages/api/src/services/save_page.ts b/packages/api/src/services/save_page.ts
index 3e82374d7..fa9110565 100644
--- a/packages/api/src/services/save_page.ts
+++ b/packages/api/src/services/save_page.ts
@@ -242,7 +242,7 @@ export const parsedContentToLibraryItem = ({
     publishedAt: validatedDate(
       publishedAt || parsedContent?.publishedDate || undefined
     ),
-    uploadFile: { id: uploadFileId ?? undefined },
+    uploadFileId: uploadFileId || undefined,
     readingProgressTopPercent: 0,
     readingProgressHighestReadAnchor: 0,
     state: state