From d3a7707e8fe841d25f5513a25c0191825cb2934f Mon Sep 17 00:00:00 2001
From: EINDEX <snowstarlbk@gmail.com>
Date: Sun, 17 Sep 2023 18:39:47 +0800
Subject: [PATCH] fix: open id issue

Signed-off-by: EINDEX <snowstarlbk@gmail.com>
---
 src/memos/__tests__/utils.test.ts | 43 +++----------------------------
 src/memos/utils.ts                |  3 ---
 2 files changed, 4 insertions(+), 42 deletions(-)

diff --git a/src/memos/__tests__/utils.test.ts b/src/memos/__tests__/utils.test.ts
index bc7f8aa..dd24f31 100644
--- a/src/memos/__tests__/utils.test.ts
+++ b/src/memos/__tests__/utils.test.ts
@@ -29,7 +29,7 @@ def hello():
       relationList: [],
     };
 
-    const res = memoContentGenerate(memo, "host", "openId", "TODO");
+    const res = memoContentGenerate(memo, "host", "TODO");
     expect(res[0]["content"]).toBe(codeBody);
   });
 
@@ -61,46 +61,11 @@ def hello():
       relationList: [],
     };
 
-    const res = memoContentGenerate(memo, "host", "openId", "TODO");
+    const res = memoContentGenerate(memo, "host", "TODO");
     expect(res[0].children?.length).toBe(1);
     expect(res[0].children![0].content).toBe("![memos.png](host/o/r/1)");
   });
 
-  it("private resources could rending with openId", () => {
-    const memo: Memo = {
-      id: 1,
-      rowStatus: "NORMAL",
-      creatorId: 1,
-      createdTs: 1690045876,
-      updatedTs: 1690079500,
-      displayTs: 1690045876,
-      content: "test",
-      visibility: "PRIVATE",
-      pinned: false,
-      creatorName: "eindex",
-      creatorUsername: "eindex",
-      resourceList: [
-        {
-          id: 1,
-          createdTs: 1690079497,
-          updatedTs: 1690079497,
-          filename: "memos.png",
-          externalLink: "",
-          type: "image/png",
-          size: 1539508,
-          linkedMemoAmount: 1,
-        },
-      ],
-      relationList: [],
-    };
-
-    const res = memoContentGenerate(memo, "host", "openId", "TODO");
-    expect(res[0].children?.length).toBe(1);
-    expect(res[0].children![0].content).toBe(
-      "![memos.png](host/o/r/1?openId=openId)"
-    );
-  });
-
   it("private resources have external link should using external link", () => {
     const memo: Memo = {
       id: 1,
@@ -129,7 +94,7 @@ def hello():
       relationList: [],
     };
 
-    const res = memoContentGenerate(memo, "host", "openId", "TODO");
+    const res = memoContentGenerate(memo, "host", "TODO");
     expect(res[0].children?.length).toBe(1);
     expect(res[0].children![0].content).toBe("![memos.png](link)");
   });
@@ -162,7 +127,7 @@ def hello():
       relationList: [],
     };
 
-    const res = memoContentGenerate(memo, "host", "openId", "TODO");
+    const res = memoContentGenerate(memo, "host", "TODO");
     expect(res[0].children?.length).toBe(1);
     expect(res[0].children![0].content).toBe("![memos.png](link)");
   });
diff --git a/src/memos/utils.ts b/src/memos/utils.ts
index b5c3870..c2f12f4 100644
--- a/src/memos/utils.ts
+++ b/src/memos/utils.ts
@@ -19,7 +19,6 @@ export const formatContentWhenPush = (content: string) => {
 export const memoContentGenerate = (
   memo: Memo,
   host: string,
-  openId: string,
   preferredTodo: string,
   withProperties: boolean = false
 ): IBatchBlock[] => {
@@ -43,8 +42,6 @@ export const memoContentGenerate = (
         link = resource.externalLink;
       }else if(memo.visibility.toLowerCase() == Visibility.Public.toLowerCase()){
         link = `${host}/o/r/${resource.id}`;
-      }else{
-        link = `${host}/o/r/${resource.id}?openId=${openId}`;
       }
       children.push({content: `![${resource.filename}](${link})`});
     }