Browse Source

fix: update config key for disabling user pages to use camelCase

Shun Miyazawa 2 months ago
parent
commit
8d37440125

+ 1 - 3
apps/app/src/pages/[[...path]]/page-data-props.ts

@@ -164,9 +164,7 @@ export async function getPageDataForInitial(
     { pageId, path: resolvedPagePath, user },
     { pageId, path: resolvedPagePath, user },
   );
   );
 
 
-  const disableUserPages = configManager.getConfig(
-    'security:disable-user-pages',
-  );
+  const disableUserPages = configManager.getConfig('security:disableUserPages');
 
 
   if (disableUserPages && pageWithMeta.data != null) {
   if (disableUserPages && pageWithMeta.data != null) {
     const pagePath = pageWithMeta.data.path;
     const pagePath = pageWithMeta.data.path;

+ 1 - 3
apps/app/src/pages/_search/get-server-side-props/index.ts

@@ -31,9 +31,7 @@ const getServerSideConfigurationProps: GetServerSideProps<
         showPageLimitationL: configManager.getConfig(
         showPageLimitationL: configManager.getConfig(
           'customize:showPageLimitationL',
           'customize:showPageLimitationL',
         ),
         ),
-        disableUserPages: configManager.getConfig(
-          'security:disable-user-pages',
-        ),
+        disableUserPages: configManager.getConfig('security:disableUserPages'),
       },
       },
     },
     },
   };
   };

+ 1 - 3
apps/app/src/pages/general-page/configuration-props.ts

@@ -120,9 +120,7 @@ export const getServerSideGeneralPageProps: GetServerSideProps<
         isEnabledAttachTitleHeader: configManager.getConfig(
         isEnabledAttachTitleHeader: configManager.getConfig(
           'customize:isEnabledAttachTitleHeader',
           'customize:isEnabledAttachTitleHeader',
         ),
         ),
-        disableUserPages: configManager.getConfig(
-          'security:disable-user-pages',
-        ),
+        disableUserPages: configManager.getConfig('security:disableUserPages'),
       },
       },
     },
     },
   };
   };

+ 1 - 1
apps/app/src/server/routes/apiv3/bookmarks.ts

@@ -258,7 +258,7 @@ module.exports = (crowi) => {
           .exec();
           .exec();
 
 
         const disabledUserPage = configManager.getConfig(
         const disabledUserPage = configManager.getConfig(
-          'security:disable-user-pages',
+          'security:disableUserPages',
         );
         );
 
 
         const filteredBookmarks = disabledUserPage
         const filteredBookmarks = disabledUserPage

+ 1 - 1
apps/app/src/server/routes/apiv3/page-listing.ts

@@ -160,7 +160,7 @@ const routerFactory = (crowi: Crowi): Router => {
         'security:list-policy:hideRestrictedByGroup',
         'security:list-policy:hideRestrictedByGroup',
       );
       );
       const disableUserPages = await configManager.getConfig(
       const disableUserPages = await configManager.getConfig(
-        'security:disable-user-pages',
+        'security:disableUserPages',
       );
       );
 
 
       try {
       try {

+ 1 - 1
apps/app/src/server/routes/apiv3/page/index.ts

@@ -198,7 +198,7 @@ module.exports = (crowi: Crowi) => {
         req.query;
         req.query;
 
 
       const disableUserPages = crowi.configManager.getConfig(
       const disableUserPages = crowi.configManager.getConfig(
-        'security:disable-user-pages',
+        'security:disableUserPages',
       );
       );
 
 
       const respondWithSinglePage = async (
       const respondWithSinglePage = async (

+ 1 - 1
apps/app/src/server/routes/apiv3/pages/index.js

@@ -194,7 +194,7 @@ module.exports = (crowi) => {
         'security:list-policy:hideRestrictedByGroup',
         'security:list-policy:hideRestrictedByGroup',
       );
       );
       const disableUserPages = configManager.getConfig(
       const disableUserPages = configManager.getConfig(
-        'security:disable-user-pages',
+        'security:disableUserPages',
       );
       );
 
 
       /**
       /**

+ 3 - 3
apps/app/src/server/routes/apiv3/security-settings/index.js

@@ -512,7 +512,7 @@ module.exports = (crowi) => {
             'security:list-policy:hideRestrictedByGroup',
             'security:list-policy:hideRestrictedByGroup',
           ),
           ),
           disableUserPages: await configManager.getConfig(
           disableUserPages: await configManager.getConfig(
-            'security:disable-user-pages',
+            'security:disableUserPages',
           ),
           ),
           isUsersHomepageDeletionEnabled: await configManager.getConfig(
           isUsersHomepageDeletionEnabled: await configManager.getConfig(
             'security:user-homepage-deletion:isEnabled',
             'security:user-homepage-deletion:isEnabled',
@@ -1004,7 +1004,7 @@ module.exports = (crowi) => {
           req.body.hideRestrictedByOwner,
           req.body.hideRestrictedByOwner,
         'security:list-policy:hideRestrictedByGroup':
         'security:list-policy:hideRestrictedByGroup':
           req.body.hideRestrictedByGroup,
           req.body.hideRestrictedByGroup,
-        'security:disable-user-pages': req.body.disableUserPages,
+        'security:disableUserPages': req.body.disableUserPages,
         'security:user-homepage-deletion:isEnabled':
         'security:user-homepage-deletion:isEnabled':
           req.body.isUsersHomepageDeletionEnabled,
           req.body.isUsersHomepageDeletionEnabled,
         // Validate user-homepage-deletion config
         // Validate user-homepage-deletion config
@@ -1078,7 +1078,7 @@ module.exports = (crowi) => {
             'security:list-policy:hideRestrictedByGroup',
             'security:list-policy:hideRestrictedByGroup',
           ),
           ),
           disableUserPages: await configManager.getConfig(
           disableUserPages: await configManager.getConfig(
-            'security:disable-user-pages',
+            'security:disableUserPages',
           ),
           ),
           isUsersHomepageDeletionEnabled: await configManager.getConfig(
           isUsersHomepageDeletionEnabled: await configManager.getConfig(
             'security:user-homepage-deletion:isEnabled',
             'security:user-homepage-deletion:isEnabled',

+ 2 - 2
apps/app/src/server/service/config-manager/config-definition.ts

@@ -115,7 +115,7 @@ export const CONFIG_KEYS = [
   'security:pageRecursiveDeletionAuthority',
   'security:pageRecursiveDeletionAuthority',
   'security:pageRecursiveCompleteDeletionAuthority',
   'security:pageRecursiveCompleteDeletionAuthority',
   'security:isAllGroupMembershipRequiredForPageCompleteDeletion',
   'security:isAllGroupMembershipRequiredForPageCompleteDeletion',
-  'security:disable-user-pages',
+  'security:disableUserPages',
   'security:user-homepage-deletion:isEnabled',
   'security:user-homepage-deletion:isEnabled',
   'security:user-homepage-deletion:isForceDeleteUserHomepageOnUserDeletion',
   'security:user-homepage-deletion:isForceDeleteUserHomepageOnUserDeletion',
   'security:isRomUserAllowedToComment',
   'security:isRomUserAllowedToComment',
@@ -679,7 +679,7 @@ export const CONFIG_DEFINITIONS = {
     defineConfig<boolean>({
     defineConfig<boolean>({
       defaultValue: true,
       defaultValue: true,
     }),
     }),
-  'security:disable-user-pages': defineConfig<boolean>({
+  'security:disableUserPages': defineConfig<boolean>({
     defaultValue: false,
     defaultValue: false,
   }),
   }),
   'security:user-homepage-deletion:isEnabled': defineConfig<boolean>({
   'security:user-homepage-deletion:isEnabled': defineConfig<boolean>({

+ 1 - 1
apps/app/src/server/service/page/index.ts

@@ -799,7 +799,7 @@ class PageService implements IPageService {
   getExcludedPathsBySystem(): string[] {
   getExcludedPathsBySystem(): string[] {
     const excludedPaths: string[] = [];
     const excludedPaths: string[] = [];
 
 
-    if (configManager.getConfig('security:disable-user-pages')) {
+    if (configManager.getConfig('security:disableUserPages')) {
       excludedPaths.push('/user');
       excludedPaths.push('/user');
     }
     }