Merge pull request #554 from refly-ai/fix/share-publish-errors

fix(api): properly handle edges cases for sharing and duplication
refly-ai · Mar 5, 2025 · 009ede9 · 009ede9
2 parents 5686c36 + 623fdd0
commit 009ede9
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 10 deletions.
diff --git a/apps/api/src/common/elasticsearch.service.ts b/apps/api/src/common/elasticsearch.service.ts
@@ -225,10 +225,13 @@ export class ElasticsearchService implements OnModuleInit {
 
   async duplicateResource(resourceId: string, newId: string, user: User): Promise<void> {
     try {
-      const { body } = await this.client.get<{ _source: ResourceDocument }>({
-        index: indexConfig.resource.index,
-        id: resourceId,
-      });
+      const { body } = await this.client.get<{ _source: ResourceDocument }>(
+        {
+          index: indexConfig.resource.index,
+          id: resourceId,
+        },
+        { ignore: [404] },
+      );
 
       if (!body?._source) {
         this.logger.warn(`Resource ${resourceId} not found`);
@@ -253,10 +256,13 @@ export class ElasticsearchService implements OnModuleInit {
 
   async duplicateDocument(documentId: string, newId: string, user: User): Promise<void> {
     try {
-      const { body } = await this.client.get<{ _source: DocumentDocument }>({
-        index: indexConfig.document.index,
-        id: documentId,
-      });
+      const { body } = await this.client.get<{ _source: DocumentDocument }>(
+        {
+          index: indexConfig.document.index,
+          id: documentId,
+        },
+        { ignore: [404] },
+      );
 
       if (!body?._source) {
         this.logger.warn(`Document ${documentId} not found`);

diff --git a/apps/api/src/misc/misc.service.ts b/apps/api/src/misc/misc.service.ts
@@ -223,6 +223,9 @@ export class MiscService implements OnModuleInit {
    * @param storageKey - The storage key of the file to publish
    */
   async publishFile(storageKey: string) {
+    if (!storageKey) {
+      return '';
+    }
     const stream = await this.minioClient('private').getObject(storageKey);
     await this.minioClient('public').putObject(storageKey, stream);
     return this.generateFileURL({ visibility: 'public', storageKey });

diff --git a/apps/api/src/share/share.service.ts b/apps/api/src/share/share.service.ts
@@ -140,8 +140,10 @@ export class ShareService {
     }
 
     // Publish minimap
-    const minimapUrl = await this.miscService.publishFile(canvas.minimapStorageKey);
-    canvasData.minimapUrl = minimapUrl;
+    if (canvas.minimapStorageKey) {
+      const minimapUrl = await this.miscService.publishFile(canvas.minimapStorageKey);
+      canvasData.minimapUrl = minimapUrl;
+    }
 
     // Upload public canvas data to Minio
     const { storageKey } = await this.miscService.uploadBuffer(user, {
@@ -310,6 +312,7 @@ export class ShareService {
         if (!originalUrl.startsWith(privateStaticEndpoint)) return null;
 
         const storageKey = originalUrl.replace(`${privateStaticEndpoint}/`, '');
+        if (!storageKey) return null;
 
         try {
           // Publish the file to public bucket