Skip to content

feat: allow author of page with write:pages permission to delete the page they created #7647

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

feat: allow author of page with write:pages permission to delete the page they created #7647

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 4 additions & 1 deletion client/themes/default/components/page.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -559,11 +559,14 @@ export default {
tocDecoded () {
return JSON.parse(Buffer.from(this.toc, 'base64').toString())
},
currentUserId: get('user/id'),
tocPosition: get('site/tocPosition'),
hasAdminPermission: get('page/[email protected]'),
hasWritePagesPermission: get('page/[email protected]'),
hasManagePagesPermission: get('page/[email protected]'),
hasDeletePagesPermission: get('page/[email protected]'),
hasDeletePagesPermission() {
return get('page/[email protected]').call(this) || (this.authorId === this.currentUserId && this.hasWritePagesPermission)
},
hasReadSourcePermission: get('page/[email protected]'),
hasReadHistoryPermission: get('page/[email protected]'),
hasAnyPagePermissions () {
Expand Down
2 changes: 1 addition & 1 deletion server/graph/schemas/page.graphql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ type PageMutation {

delete(
id: Int!
): DefaultResponse @auth(requires: ["delete:pages", "manage:system"])
): DefaultResponse @auth(requires: ["delete:pages", "write:pages", "manage:system"])

deleteTag(
id: Int!
Expand Down
11 changes: 9 additions & 2 deletions server/models/pages.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -795,10 +795,17 @@ module.exports = class Page extends Model {
}

// -> Check for page access
if (!WIKI.auth.checkAccess(opts.user, ['delete:pages'], {
const isTheAuthorAndHasWritePermission = page.authorId === opts.user.id && WIKI.auth.checkAccess(opts.user, ['write:pages'], {
locale: page.locale,
path: page.path
})) {
})

const hasDeletePermission = WIKI.auth.checkAccess(opts.user, ['delete:pages'], {
locale: page.locale,
path: page.path
})

if (!isTheAuthorAndHasWritePermission && !hasDeletePermission) {
throw new WIKI.Error.PageDeleteForbidden()
}

Expand Down