itizawa 5 лет назад
Родитель
Сommit
8fd554d345
2 измененных файлов с 25 добавлено и 9 удалено
  1. 1 1
      src/client/js/components/PageHistory.jsx
  2. 24 8
      src/server/routes/apiv3/revisions.js

+ 1 - 1
src/client/js/components/PageHistory.jsx

@@ -37,7 +37,7 @@ class PageHistory extends React.Component {
     let res;
     try {
       this.setState({ isLoading: true });
-      res = await appContainer.apiv3Get(`/revisions/${pageId}`, { share_link_id: shareLinkId });
+      res = await appContainer.apiv3Get('/revisions/list', { pageId, share_link_id: shareLinkId });
     }
     catch (err) {
       logger.error(err);

+ 24 - 8
src/server/routes/apiv3/revisions.js

@@ -3,7 +3,10 @@ const loggerFactory = require('@alias/logger');
 const logger = loggerFactory('growi:routes:apiv3:pages'); // eslint-disable-line no-unused-vars
 
 const express = require('express');
+const certifySharedPage = require('../../middlewares/certify-shared-page');
+const accessTokenParser = require('../../middlewares/access-token-parser');
 
+const ErrorV3 = require('../../models/vo/error-apiv3');
 
 const router = express.Router();
 
@@ -16,11 +19,12 @@ module.exports = (crowi) => {
   const loginRequired = require('../../middlewares/login-required')(crowi, true);
 
   const Page = crowi.model('Page');
+  const Revision = crowi.model('Revision');
 
   /**
    * @swagger
    *
-   *    /revisions/{id}:
+   *    /revisions/:
    *      get:
    *        tags: [Revisions]
    *        description: Get revisions by page id
@@ -29,14 +33,26 @@ module.exports = (crowi) => {
    *            description: Return revisions belong to page
    *
    */
-  router.get('/{id}', loginRequired, async(req, res) => {
-    console.log('hoge');
-    console.log(req.query);
+  router.get('/list', certifySharedPage, accessTokenParser, loginRequired, async(req, res) => {
+    const { pageId } = req.query;
+    const { isSharedPage } = req;
+
+    // check whether accessible
+    if (!isSharedPage && !(await Page.isAccessiblePageByViewer(pageId, 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 revisions = await Revision.findRevisionIdList(page.path);
+      return res.apiv3({ revisions });
+    }
+    catch (err) {
+      const msg = 'Error occurred in getting revisions by poge id';
+      logger.error('Error', err);
+      return res.apiv3Err(new ErrorV3(msg, 'faild-to-find-revisions'), 403);
+    }
 
-    const { id } = req.query;
-    console.log(id);
-
-    return res.apiv3({ id });
   });
 
   return router;