Shun Miyazawa 3 месяцев назад
Родитель
Сommit
f6f37dc0b8

+ 1 - 1
apps/app/src/server/routes/apiv3/page/index.ts

@@ -101,7 +101,7 @@ module.exports = (crowi: Crowi) => {
 
 
   const validator = {
   const validator = {
     getPage: [
     getPage: [
-      query('pageId').optional().isString(),
+      query('pageId').isMongoId().optional().isString(),
       query('path').optional().isString(),
       query('path').optional().isString(),
       query('findAll').optional().isBoolean(),
       query('findAll').optional().isBoolean(),
       query('shareLinkId').optional().isMongoId(),
       query('shareLinkId').optional().isMongoId(),

+ 3 - 3
apps/app/src/server/service/page/find-page-and-meta-data-by-viewer.ts

@@ -50,8 +50,8 @@ export async function findPageAndMetaDataByViewer(
   if (page == null) {
   if (page == null) {
     const count =
     const count =
       pageId != null
       pageId != null
-        ? await Page.count({ _id: pageId })
-        : await Page.count({ path });
+        ? await Page.count({ _id: { $eq: pageId } })
+        : await Page.count({ path: { $eq: path } });
     const isForbidden = count > 0;
     const isForbidden = count > 0;
     return {
     return {
       data: null,
       data: null,
@@ -84,7 +84,7 @@ export async function findPageAndMetaDataByViewer(
     { countDocuments; findByPageIdAndUserId }
     { countDocuments; findByPageIdAndUserId }
   >('Bookmark');
   >('Bookmark');
   const bookmarkCount: number = await Bookmark.countDocuments({
   const bookmarkCount: number = await Bookmark.countDocuments({
-    page: pageId,
+    page: { $eq: pageId },
   });
   });
 
 
   const pageInfo = {
   const pageInfo = {