Skip to content
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions apps/app/src/server/routes/apiv3/security-settings/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ const validator = {
'Deny', 'Readonly',
]),
body('pageCompleteDeletionAuthority').if(value => value != null).isString().isIn(Object.values(PageDeleteConfigValue)),
body('hideUserPages').if(value => value != null).isBoolean(),
body('hideRestrictedByOwner').if(value => value != null).isBoolean(),
body('hideRestrictedByGroup').if(value => value != null).isBoolean(),
body('isUsersHomepageDeletionEnabled').if(value => value != null).isBoolean(),
Expand Down Expand Up @@ -139,6 +140,9 @@ const validator = {
* pageCompleteDeletionAuthority:
* type: string
* description: type of pageDeletionAuthority
* hideUserPages:
* type: boolean
* description: hide all user pages from general users
* hideRestrictedByOwner:
* type: boolean
* description: enable hide by owner
Expand Down Expand Up @@ -467,6 +471,7 @@ module.exports = (crowi) => {
pageRecursiveCompleteDeletionAuthority: await configManager.getConfig('security:pageRecursiveCompleteDeletionAuthority'),
isAllGroupMembershipRequiredForPageCompleteDeletion:
await configManager.getConfig('security:isAllGroupMembershipRequiredForPageCompleteDeletion'),
hideUserPages: await configManager.getConfig('security:user-pages:areHidden'),
hideRestrictedByOwner: await configManager.getConfig('security:list-policy:hideRestrictedByOwner'),
hideRestrictedByGroup: await configManager.getConfig('security:list-policy:hideRestrictedByGroup'),
isUsersHomepageDeletionEnabled: await configManager.getConfig('security:user-homepage-deletion:isEnabled'),
Expand Down Expand Up @@ -747,6 +752,7 @@ module.exports = (crowi) => {
'security:pageCompleteDeletionAuthority': req.body.pageCompleteDeletionAuthority,
'security:pageRecursiveCompleteDeletionAuthority': req.body.pageRecursiveCompleteDeletionAuthority,
'security:isAllGroupMembershipRequiredForPageCompleteDeletion': req.body.isAllGroupMembershipRequiredForPageCompleteDeletion,
'security:user-pages:areHidden': req.body.hideUserPages,
'security:list-policy:hideRestrictedByOwner': req.body.hideRestrictedByOwner,
'security:list-policy:hideRestrictedByGroup': req.body.hideRestrictedByGroup,
'security:user-homepage-deletion:isEnabled': req.body.isUsersHomepageDeletionEnabled,
Expand Down Expand Up @@ -783,6 +789,7 @@ module.exports = (crowi) => {
pageRecursiveCompleteDeletionAuthority: await configManager.getConfig('security:pageRecursiveCompleteDeletionAuthority'),
isAllGroupMembershipRequiredForPageCompleteDeletion:
await configManager.getConfig('security:isAllGroupMembershipRequiredForPageCompleteDeletion'),
hideUserPages: await configManager.getConfig('security:user-pages:areHidden'),
hideRestrictedByOwner: await configManager.getConfig('security:list-policy:hideRestrictedByOwner'),
hideRestrictedByGroup: await configManager.getConfig('security:list-policy:hideRestrictedByGroup'),
isUsersHomepageDeletionEnabled: await configManager.getConfig('security:user-homepage-deletion:isEnabled'),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,7 @@ export const CONFIG_KEYS = [
'security:pageRecursiveDeletionAuthority',
'security:pageRecursiveCompleteDeletionAuthority',
'security:isAllGroupMembershipRequiredForPageCompleteDeletion',
'security:user-pages:areHidden',
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

慣習的に、is で始まる命名はよく見るけど are からは始めないかなあ

'security:user-homepage-deletion:isEnabled',
'security:user-homepage-deletion:isForceDeleteUserHomepageOnUserDeletion',
'security:isRomUserAllowedToComment',
Expand Down Expand Up @@ -661,6 +662,9 @@ export const CONFIG_DEFINITIONS = {
'security:isAllGroupMembershipRequiredForPageCompleteDeletion': defineConfig<boolean>({
defaultValue: true,
}),
'security:user-pages:areHidden': defineConfig<boolean>({
defaultValue: false,
}),
'security:user-homepage-deletion:isEnabled': defineConfig<boolean>({
defaultValue: false,
}),
Expand Down