Просмотр исходного кода

Get crowi.aclService.getGuestModeValue() from api

Shun Miyazawa 4 лет назад
Родитель
Сommit
267296606e

+ 1 - 3
packages/app/src/client/services/AdminGeneralSecurityContainer.js

@@ -66,11 +66,9 @@ export default class AdminGeneralSecurityContainer extends Container {
     await this.retrieveSetupStratedies();
     const response = await this.appContainer.apiv3.get('/security-setting/');
 
-    const strictGuestModeValue = document.getElementById('admin-security-setting')?.getAttribute('guest-mode-value');
-
     const { generalSetting, shareLinkSetting, generalAuth } = response.data.securityParams;
     this.setState({
-      currentRestrictGuestMode: strictGuestModeValue ?? generalSetting.restrictGuestMode,
+      currentRestrictGuestMode: generalSetting.restrictGuestMode,
       currentPageDeletionAuthority: generalSetting.pageDeletionAuthority,
       currentPageCompleteDeletionAuthority: generalSetting.pageCompleteDeletionAuthority,
       currentPageRecursiveDeletionAuthority: generalSetting.pageRecursiveDeletionAuthority,

+ 1 - 4
packages/app/src/server/routes/admin.js

@@ -101,11 +101,8 @@ module.exports = function(crowi, app) {
   // app.get('/admin/security'                  , admin.security.index);
   actions.security = {};
   actions.security.index = function(req, res) {
-    const guestModeValue = aclService.getGuestModeValue();
 
-    return res.render('admin/security', {
-      guestModeValue,
-    });
+    return res.render('admin/security');
   };
 
   // app.get('/admin/markdown'                  , admin.markdown.index);

+ 3 - 1
packages/app/src/server/routes/apiv3/security-setting.js

@@ -365,9 +365,11 @@ module.exports = (crowi) => {
    */
   router.get('/', loginRequiredStrictly, adminRequired, async(req, res) => {
 
+    console.log('ゲストモード', crowi.aclService.getGuestModeValue());
+
     const securityParams = {
       generalSetting: {
-        restrictGuestMode: await crowi.configManager.getConfig('crowi', 'security:restrictGuestMode'),
+        restrictGuestMode: crowi.aclService.getGuestModeValue(),
         pageDeletionAuthority: await crowi.configManager.getConfig('crowi', 'security:pageDeletionAuthority'),
         pageCompleteDeletionAuthority: await crowi.configManager.getConfig('crowi', 'security:pageCompleteDeletionAuthority'),
         pageRecursiveDeletionAuthority: await crowi.configManager.getConfig('crowi', 'security:pageRecursiveDeletionAuthority'),