sinvo/docmost
1
0
Fork 0
mirror of https://github.com/docmost/docmost.git synced 2026-08-30 02:25:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix permission - WIP

Browse Source
This commit is contained in:
Philipinho
2025-12-23 23:05:04 +00:00
parent 68a838606a
commit f65726ae26
2 changed files with 167 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/server/src/core/page/services/page-permission.service.ts
+26 -39
View File
@@ -366,20 +366,19 @@ export class PagePermissionService {
}
}
/**
* Check if user has writer permission on ALL restricted ancestors of a page.
* Used for permission management operations.
*/
async hasWritePermission(userId: string, pageId: string): Promise<boolean> {
const restrictedAncestor =
await this.pagePermissionRepo.findRestrictedAncestor(pageId);
const hasRestriction =
await this.pagePermissionRepo.hasRestrictedAncestor(pageId);
if (!restrictedAncestor) {
return false;
if (!hasRestriction) {
return false; // no restrictions, defer to space permissions
}
const permission = await this.pagePermissionRepo.getUserPagePermission(
userId,
restrictedAncestor.pageId,
);
return permission?.role === PagePermissionRole.WRITER;
return this.pagePermissionRepo.canUserEditPage(userId, pageId);
}
async hasPageAccess(pageId: string): Promise<boolean> {
@@ -402,46 +401,34 @@ export class PagePermissionService {
/**
* Check if user can view a page.
* User must have permission (reader or writer) on EVERY restricted ancestor.
* Returns true if:
* - Page has no restricted ancestor: fall back to space permission
* - Page has restricted ancestor: user has reader or writer permission on that ancestor
* - No ancestors are restricted (defer to space permission)
* - User has permission on all restricted ancestors
*/
async canViewPage(userId: string, pageId: string): Promise<boolean> {
const restrictedAncestor =
await this.pagePermissionRepo.findRestrictedAncestor(pageId);
if (!restrictedAncestor) {
return true; // no page-level restriction, defer to space permission
}
const permission = await this.pagePermissionRepo.getUserPagePermission(
userId,
restrictedAncestor.pageId,
);
return !!permission; // has any permission (reader or writer)
return this.pagePermissionRepo.canUserAccessPage(userId, pageId);
}
/**
* Check if user can edit a page.
* User must have WRITER permission on EVERY restricted ancestor.
* Returns true if:
* - Page has no restricted ancestor: fall back to space permission
* - Page has restricted ancestor: user has writer permission on that ancestor
* - No ancestors are restricted (defer to space permission)
* - User has writer permission on all restricted ancestors
*/
async canEditPage(userId: string, pageId: string): Promise<boolean> {
const restrictedAncestor =
await this.pagePermissionRepo.findRestrictedAncestor(pageId);
return this.pagePermissionRepo.canUserEditPage(userId, pageId);
}
if (!restrictedAncestor) {
return true; // no page-level restriction, defer to space permission
}
const permission = await this.pagePermissionRepo.getUserPagePermission(
userId,
restrictedAncestor.pageId,
);
return permission?.role === PagePermissionRole.WRITER;
/**
* Filter page IDs to only those the user can access.
*/
async filterAccessiblePages(
pageIds: string[],
userId: string,
): Promise<string[]> {
return this.pagePermissionRepo.filterAccessiblePageIds(pageIds, userId);
}
/**