WESEEK Kaito 6 лет назад
Родитель
Сommit
0b30151545

+ 2 - 2
src/client/js/services/AdminSecurityContainer.js

@@ -77,7 +77,7 @@ export default class AdminSecurityContainer extends Container {
    * @return {string} Appearance
    * @return {string} Appearance
    */
    */
   async updateRestrictGuestMode() {
   async updateRestrictGuestMode() {
-    const response = await this.appContainer.apiv3.put('/security-setting/guestMode', {
+    const response = await this.appContainer.apiv3.put('/security-setting/guest-mode', {
       restrictGuestMode: this.state.currentRestrictGuestMode,
       restrictGuestMode: this.state.currentRestrictGuestMode,
     });
     });
     const { securitySettingParams } = response.data;
     const { securitySettingParams } = response.data;
@@ -90,7 +90,7 @@ export default class AdminSecurityContainer extends Container {
    * @return {string} pageDeletion
    * @return {string} pageDeletion
    */
    */
   async updatePageCompleteDeletionAuthority() {
   async updatePageCompleteDeletionAuthority() {
-    const response = await this.appContainer.apiv3.put('/security-setting/pageDeletion', {
+    const response = await this.appContainer.apiv3.put('/security-setting/page-deletion', {
       pageCompleteDeletionAuthority: this.state.currentPageCompleteDeletionAuthority,
       pageCompleteDeletionAuthority: this.state.currentPageCompleteDeletionAuthority,
     });
     });
     const { securitySettingParams } = response.data;
     const { securitySettingParams } = response.data;

+ 7 - 6
src/server/routes/apiv3/security-setting.js

@@ -11,6 +11,7 @@ const { body } = require('express-validator/check');
 const ErrorV3 = require('../../models/vo/error-apiv3');
 const ErrorV3 = require('../../models/vo/error-apiv3');
 
 
 const validator = {
 const validator = {
+  // TODO correct validator
   guestMode: [
   guestMode: [
     body('restrictGuestMode').isString(),
     body('restrictGuestMode').isString(),
   ],
   ],
@@ -68,7 +69,7 @@ module.exports = (crowi) => {
   /**
   /**
    * @swagger
    * @swagger
    *
    *
-   *    /security-setting/guestMode:
+   *    /security-setting/guest-mode:
    *      put:
    *      put:
    *        tags: [SecuritySetting]
    *        tags: [SecuritySetting]
    *        description: Update restrictGuestMode
    *        description: Update restrictGuestMode
@@ -92,7 +93,7 @@ module.exports = (crowi) => {
    *                    status:
    *                    status:
    *                      $ref: '#/components/schemas/GuestModeParams'
    *                      $ref: '#/components/schemas/GuestModeParams'
    */
    */
-  router.put('/guestMode', loginRequiredStrictly, adminRequired, csrf, validator.guestMode, ApiV3FormValidator, async(req, res) => {
+  router.put('/guest-mode', loginRequiredStrictly, adminRequired, csrf, validator.guestMode, ApiV3FormValidator, async(req, res) => {
     const requestParams = {
     const requestParams = {
       'security:restrictGuestMode': req.body.restrictGuestMode,
       'security:restrictGuestMode': req.body.restrictGuestMode,
     };
     };
@@ -105,16 +106,16 @@ module.exports = (crowi) => {
       return res.apiv3({ securitySettingParams });
       return res.apiv3({ securitySettingParams });
     }
     }
     catch (err) {
     catch (err) {
-      const msg = 'Error occurred in updating layout and theme';
+      const msg = 'Error occurred in updating restrict guest mode';
       logger.error('Error', err);
       logger.error('Error', err);
-      return res.apiv3Err(new ErrorV3(msg, 'update-layoutTheme-failed'));
+      return res.apiv3Err(new ErrorV3(msg, 'update-restrictGuestMode-failed'));
     }
     }
   });
   });
 
 
   /**
   /**
    * @swagger
    * @swagger
    *
    *
-   *    /security-setting/pageDeletion:
+   *    /security-setting/page-deletion:
    *      put:
    *      put:
    *        tags: [SecuritySetting]
    *        tags: [SecuritySetting]
    *        description: Update pageDeletion Setting
    *        description: Update pageDeletion Setting
@@ -138,7 +139,7 @@ module.exports = (crowi) => {
    *                    status:
    *                    status:
    *                      $ref: '#/components/schemas/PageDeletionParams'
    *                      $ref: '#/components/schemas/PageDeletionParams'
    */
    */
-  router.put('/pageDeletion', loginRequiredStrictly, adminRequired, csrf, validator.pageDeletion, ApiV3FormValidator, async(req, res) => {
+  router.put('/page-deletion', loginRequiredStrictly, adminRequired, csrf, validator.pageDeletion, ApiV3FormValidator, async(req, res) => {
     const requestParams = {
     const requestParams = {
       'security:pageCompleteDeletionAuthority': req.body.pageCompleteDeletionAuthority,
       'security:pageCompleteDeletionAuthority': req.body.pageCompleteDeletionAuthority,
     };
     };