Merge pull request #10730 from growilabs/imprv/177492-exclude-user-pages-from-bookmark-data-when-user-pages-are-hidden

imprv: Exclude user pages from bookmark data when user pages are hidden

apps/app/src/server/routes/apiv3/bookmarks.ts

@@ -1,6 +1,10 @@
 import type { IUserHasId } from '@growi/core';
 import { SCOPE } from '@growi/core/dist/interfaces';
 import { serializeUserSecurely } from '@growi/core/dist/models/serializers';
+import {
+  isUserPage,
+  isUsersTopPage,
+} from '@growi/core/dist/utils/page-path-utils';
 import mongoose, { type HydratedDocument } from 'mongoose';
 
 import { SupportedAction, SupportedTargetModel } from '~/interfaces/activity';
@@ -10,6 +14,7 @@ import { generateAddActivityMiddleware } from '~/server/middlewares/add-activity
 import type { BookmarkDocument, BookmarkModel } from '~/server/models/bookmark';
 import type { PageDocument, PageModel } from '~/server/models/page';
 import { serializeBookmarkSecurely } from '~/server/models/serializers/bookmark-serializer';
+import { configManager } from '~/server/service/config-manager';
 import { preNotifyService } from '~/server/service/pre-notify';
 import loggerFactory from '~/utils/logger';
 
@@ -237,11 +242,12 @@ module.exports = (crowi) => {
           'bookmarks',
           { owner: userId },
         );
+
         const userRootBookmarks = await Bookmark.find({
           _id: { $nin: bookmarkIdsInFolders },
           user: userId,
         })
-          .populate({
+          .populate<{ page: PageDocument }>({
             path: 'page',
             model: 'Page',
             populate: {
@@ -251,8 +257,20 @@ module.exports = (crowi) => {
           })
           .exec();
 
+        const isHidingUserPages = configManager.getConfig(
+          'security:isHidingUserPages',
+        );
+
+        const filteredBookmarks = isHidingUserPages
+          ? userRootBookmarks.filter(
+              (bookmark) =>
+                !isUserPage(bookmark.page.path) &&
+                !isUsersTopPage(bookmark.page.path),
+            )
+          : userRootBookmarks;
+
         // serialize Bookmark
-        const serializedUserRootBookmarks = userRootBookmarks.map((bookmark) =>
+        const serializedUserRootBookmarks = filteredBookmarks.map((bookmark) =>
           serializeBookmarkSecurely(bookmark),
         );