Skip to content

Commit 508bd5a

Browse files
authored
Merge pull request #10549 from growilabs/feat/174781-hide-user-pages-new-global-setting
feat: New setting definition for hiding user pages
2 parents b228a07 + 8b0fbfa commit 508bd5a

File tree

2 files changed

+11
-0
lines changed

2 files changed

+11
-0
lines changed

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ const validator = {
3232
'Deny', 'Readonly',
3333
]),
3434
body('pageCompleteDeletionAuthority').if(value => value != null).isString().isIn(Object.values(PageDeleteConfigValue)),
35+
body('hideUserPages').if(value => value != null).isBoolean(),
3536
body('hideRestrictedByOwner').if(value => value != null).isBoolean(),
3637
body('hideRestrictedByGroup').if(value => value != null).isBoolean(),
3738
body('isUsersHomepageDeletionEnabled').if(value => value != null).isBoolean(),
@@ -139,6 +140,9 @@ const validator = {
139140
* pageCompleteDeletionAuthority:
140141
* type: string
141142
* description: type of pageDeletionAuthority
143+
* hideUserPages:
144+
* type: boolean
145+
* description: hide all user pages from general users
142146
* hideRestrictedByOwner:
143147
* type: boolean
144148
* description: enable hide by owner
@@ -467,6 +471,7 @@ module.exports = (crowi) => {
467471
pageRecursiveCompleteDeletionAuthority: await configManager.getConfig('security:pageRecursiveCompleteDeletionAuthority'),
468472
isAllGroupMembershipRequiredForPageCompleteDeletion:
469473
await configManager.getConfig('security:isAllGroupMembershipRequiredForPageCompleteDeletion'),
474+
hideUserPages: await configManager.getConfig('security:user-pages:isHidden'),
470475
hideRestrictedByOwner: await configManager.getConfig('security:list-policy:hideRestrictedByOwner'),
471476
hideRestrictedByGroup: await configManager.getConfig('security:list-policy:hideRestrictedByGroup'),
472477
isUsersHomepageDeletionEnabled: await configManager.getConfig('security:user-homepage-deletion:isEnabled'),
@@ -747,6 +752,7 @@ module.exports = (crowi) => {
747752
'security:pageCompleteDeletionAuthority': req.body.pageCompleteDeletionAuthority,
748753
'security:pageRecursiveCompleteDeletionAuthority': req.body.pageRecursiveCompleteDeletionAuthority,
749754
'security:isAllGroupMembershipRequiredForPageCompleteDeletion': req.body.isAllGroupMembershipRequiredForPageCompleteDeletion,
755+
'security:user-pages:isHidden': req.body.hideUserPages,
750756
'security:list-policy:hideRestrictedByOwner': req.body.hideRestrictedByOwner,
751757
'security:list-policy:hideRestrictedByGroup': req.body.hideRestrictedByGroup,
752758
'security:user-homepage-deletion:isEnabled': req.body.isUsersHomepageDeletionEnabled,
@@ -783,6 +789,7 @@ module.exports = (crowi) => {
783789
pageRecursiveCompleteDeletionAuthority: await configManager.getConfig('security:pageRecursiveCompleteDeletionAuthority'),
784790
isAllGroupMembershipRequiredForPageCompleteDeletion:
785791
await configManager.getConfig('security:isAllGroupMembershipRequiredForPageCompleteDeletion'),
792+
hideUserPages: await configManager.getConfig('security:user-pages:isHidden'),
786793
hideRestrictedByOwner: await configManager.getConfig('security:list-policy:hideRestrictedByOwner'),
787794
hideRestrictedByGroup: await configManager.getConfig('security:list-policy:hideRestrictedByGroup'),
788795
isUsersHomepageDeletionEnabled: await configManager.getConfig('security:user-homepage-deletion:isEnabled'),

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,7 @@ export const CONFIG_KEYS = [
112112
'security:pageRecursiveDeletionAuthority',
113113
'security:pageRecursiveCompleteDeletionAuthority',
114114
'security:isAllGroupMembershipRequiredForPageCompleteDeletion',
115+
'security:user-pages:isHidden',
115116
'security:user-homepage-deletion:isEnabled',
116117
'security:user-homepage-deletion:isForceDeleteUserHomepageOnUserDeletion',
117118
'security:isRomUserAllowedToComment',
@@ -661,6 +662,9 @@ export const CONFIG_DEFINITIONS = {
661662
'security:isAllGroupMembershipRequiredForPageCompleteDeletion': defineConfig<boolean>({
662663
defaultValue: true,
663664
}),
665+
'security:user-pages:isHidden': defineConfig<boolean>({
666+
defaultValue: false,
667+
}),
664668
'security:user-homepage-deletion:isEnabled': defineConfig<boolean>({
665669
defaultValue: false,
666670
}),

0 commit comments

Comments
 (0)