ryoji-s 2 лет назад
Родитель
Сommit
e12a28e8ab

+ 13 - 10
apps/app/src/server/routes/apiv3/bookmark-folder.ts

@@ -90,16 +90,19 @@ module.exports = (crowi) => {
       const returnValue: BookmarkFolderItems[] = [];
 
       // serialize page
-      folders.forEach((folder: BookmarkFolderItems) => {
-        folder.bookmarks.forEach((bookmark: BookmarkedPage) => {
-          if (bookmark.page != null && bookmark.page instanceof Page) {
-            const lastUpdateUser = bookmark.page.lastUpdateUser;
-
-            bookmark.page = serializePageSecurely(bookmark.page);
-
-            bookmark.page.lastUpdateUser = lastUpdateUser;
-          }
-        });
+      folders.map((folder: BookmarkFolderItems) => {
+        return {
+          ...folder,
+          bookmarks: folder.bookmarks.map((bookmark: BookmarkedPage) => {
+            if (bookmark.page != null && bookmark.page instanceof Page) {
+              return {
+                ...bookmark,
+                page: serializePageSecurely(bookmark.page),
+              };
+            }
+            return bookmark;
+          }),
+        };
       });
 
       const promises = folders.map(async(folder: BookmarkFolderItems) => {

+ 7 - 6
apps/app/src/server/routes/apiv3/bookmarks.js

@@ -215,14 +215,15 @@ module.exports = (crowi) => {
         },
       });
 
-      userRootBookmarks.forEach((bookmark) => {
+      // serialize page
+      userRootBookmarks.map((bookmark) => {
         if (bookmark.page != null && bookmark.page instanceof Page) {
-          const lastUpdateUser = bookmark.page.lastUpdateUser;
-
-          bookmark.page = serializePageSecurely(bookmark.page);
-
-          bookmark.page.lastUpdateUser = lastUpdateUser;
+          return {
+            ...bookmark,
+            page: serializePageSecurely(bookmark.page),
+          };
         }
+        return bookmark;
       });
 
       return res.apiv3({ userRootBookmarks });