antontranelis/utopia-ui
1
0
Fork 0
mirror of https://github.com/utopia-os/utopia-ui.git synced 2025-12-13 07:46:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

hotfix to fix permission issue

Browse Source
This commit is contained in:
Anton Tranelis 2024-10-29 23:46:36 +01:00
parent a4d3285829
commit c37bc2cb57
3 changed files with 23 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/Components/Map/hooks/usePermissions.tsx
View File

@ -96,22 +96,27 @@ function usePermissionsManager(initialPermissions: Permission[]): {
); );
}; };
if (permissions.length === 0) return true; // Bedingung für leere Berechtigungen nur, wenn NICHT item und create
else if (user && user.role === adminRole) return true; if (permissions.length === 0 && !(collectionName === "item" && action === "create")) return true;
else if (user && user.role.id === adminRole) return true;
else { else {
return permissions.some(p => return permissions.some(p =>
p.action === action && p.action === action &&
p.collection === collectionName && p.collection === collectionName &&
( (
(p.policy === user?.role && // Neue Bedingung für "item" und "create"
(collectionName === "item" && action === "create" && layer?.public_edit_items === true) ||
( (
!item || evaluatePermissions(p.permissions) (p.policy.name === user?.role.name &&
)) || (
(p.policy == null && !item || evaluatePermissions(p.permissions)
( )) ||
(layer?.public_edit_items || item?.layer?.public_edit_items) && (p.policy == null &&
(!item || evaluatePermissions(p.permissions)) (
)) (layer?.public_edit_items || item?.layer?.public_edit_items) &&
(!item || evaluatePermissions(p.permissions))
))
)
) )
); );
} }
@ -119,6 +124,10 @@ function usePermissionsManager(initialPermissions: Permission[]): {
[permissions, user] [permissions, user]
); );
return { permissions, setPermissionApi, setPermissionData, setAdminRole, hasUserPermission }; return { permissions, setPermissionApi, setPermissionData, setAdminRole, hasUserPermission };
} }

4
src/types.ts
View File

@ -130,7 +130,7 @@ export interface UserApi {
export type UserItem = { export type UserItem = {
id?: string; id?: string;
role?: string; role?: any;
email?: string; email?: string;
password?: string; password?: string;
profile?: Profile; profile?: Profile;
@ -158,7 +158,7 @@ export type PermissionCondition = {
export type Permission = { export type Permission = {
id?: string; id?: string;
policy: string; policy: any;
collection: string; collection: string;
action: PermissionAction; action: PermissionAction;
permissions?: { // Optional, für spezifische Bedingungen wie `user_created` permissions?: { // Optional, für spezifische Bedingungen wie `user_created`