adjust page_id

src/client/js/components/PageHistory.jsx

@@ -29,7 +29,7 @@ function PageHistory(props) {
     }
   }, [props.pageHistoryContainer]);
 
-  if (pageHistoryContainer.state.errorMessage) {
+  if (pageHistoryContainer.state.errorMessage != null) {
     return (
       <div className="my-5">
         <div className="text-danger">{pageHistoryContainer.state.errorMessage}</div>

src/client/js/services/PageHistoryContainer.js

@@ -55,7 +55,7 @@ export default class PageHistoryContainer extends Container {
       return;
     }
 
-    const res = await this.appContainer.apiv3Get('/revisions/list', { pageId, share_link_id: shareLinkId, selectedPage });
+    const res = await this.appContainer.apiv3Get('/revisions/list', { page_id: pageId, share_link_id: shareLinkId, selectedPage });
     const rev = res.data.docs;
 
     // set Pagination state
@@ -138,7 +138,7 @@ export default class PageHistoryContainer extends Container {
     }
 
     try {
-      const res = await this.appContainer.apiv3Get(`/revisions/${revision._id}`, { pageId, share_link_id: shareLinkId });
+      const res = await this.appContainer.apiv3Get(`/revisions/${revision._id}`, { page_id: pageId, share_link_id: shareLinkId });
       this.setState({
         revisions: this.state.revisions.map((rev) => {
           // comparing ObjectId

src/server/routes/apiv3/revisions.js

@@ -17,9 +17,9 @@ const PAGE_ITEMS = 30;
  *    name: Revisions
  */
 module.exports = (crowi) => {
-  const certifySharedPage = require('../../middlewares/certify-shared-file')(crowi);
+  const certifySharedPage = require('../../middlewares/certify-shared-page')(crowi);
   const accessTokenParser = require('../../middlewares/access-token-parser')(crowi);
-  const loginRequired = require('../../middlewares/login-required')(crowi);
+  const loginRequired = require('../../middlewares/login-required')(crowi, true);
   const apiV3FormValidator = require('../../middlewares/apiv3-form-validator')(crowi);
 
   const {
@@ -30,11 +30,11 @@ module.exports = (crowi) => {
 
   const validator = {
     retrieveRevisions: [
-      query('pageId').isMongoId().withMessage('pageId is required'),
+      query('page_id').isMongoId().withMessage('pageId is required'),
       query('selectedPage').isInt({ min: 0 }).withMessage('selectedPage must be int'),
     ],
     retrieveRevisionById: [
-      query('pageId').isMongoId().withMessage('pageId is required'),
+      query('page_id').isMongoId().withMessage('pageId is required'),
       param('id').isMongoId().withMessage('id is required'),
     ],
   };
@@ -58,18 +58,18 @@ module.exports = (crowi) => {
    *
    */
   router.get('/list', certifySharedPage, accessTokenParser, loginRequired, validator.retrieveRevisions, apiV3FormValidator, async(req, res) => {
-    const { pageId } = req.query;
+    const { page_id } = req.query;
     const { isSharedPage } = req;
 
     const selectedPage = parseInt(req.query.selectedPage) || 1;
 
     // check whether accessible
-    if (!isSharedPage && !(await Page.isAccessiblePageByViewer(pageId, req.user))) {
+    if (!isSharedPage && !(await Page.isAccessiblePageByViewer(page_id, req.user))) {
       return res.apiv3Err(new ErrorV3('Current user is not accessible to this page.', 'forbidden-page'), 403);
     }
 
     try {
-      const page = await Page.findOne({ _id: pageId });
+      const page = await Page.findOne({ _id: page_id });
 
       const paginateResult = await Revision.paginate(
         { path: page.path },
@@ -120,11 +120,11 @@ module.exports = (crowi) => {
    */
   router.get('/:id', certifySharedPage, accessTokenParser, loginRequired, validator.retrieveRevisionById, apiV3FormValidator, async(req, res) => {
     const revisionId = req.params.id;
-    const { pageId } = req.query;
+    const { page_id } = req.query;
     const { isSharedPage } = req;
 
     // check whether accessible
-    if (!isSharedPage && !(await Page.isAccessiblePageByViewer(pageId, req.user))) {
+    if (!isSharedPage && !(await Page.isAccessiblePageByViewer(page_id, req.user))) {
       return res.apiv3Err(new ErrorV3('Current user is not accessible to this page.', 'forbidden-page'), 403);
     }