From e7a94cb9902c556852144935d5a80a9631dd0b2f Mon Sep 17 00:00:00 2001 From: Shun Miyazawa Date: Wed, 11 Sep 2024 07:16:45 +0000 Subject: [PATCH] fix validation --- apps/app/src/server/routes/apiv3/page/index.ts | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/apps/app/src/server/routes/apiv3/page/index.ts b/apps/app/src/server/routes/apiv3/page/index.ts index 0a3fa3e190a..90668306e4e 100644 --- a/apps/app/src/server/routes/apiv3/page/index.ts +++ b/apps/app/src/server/routes/apiv3/page/index.ts @@ -291,12 +291,9 @@ module.exports = (crowi) => { pageId, path, findAll, revisionId, shareLinkId, } = req.query; - if (isSharedPage && path != null) { - return res.apiv3Err(new ErrorV3('Either parameter of (pageId or path) or (pageId and shareLinkId) is required.', 'invalid-request')); - } - - if (!isSharedPage && (pageId == null && path == null)) { - return res.apiv3Err(new ErrorV3('Either parameter of (pageId or path) or (pageId and shareLinkId) is required.', 'invalid-request')); + const isValid = (shareLinkId != null && pageId != null && path == null) || (shareLinkId == null && (pageId != null || path != null)); + if (!isValid) { + return res.apiv3Err(new Error('Either parameter of (pageId or path) or (pageId and shareLinkId) is required.'), 400); } let page;