Skip to content

Open-source and local-first Slack and Notion alternative that puts you in control of your data

Validator improvements

Hakan Shehu36f028c3d95a
diff --git a/desktop/src/lib/constants.ts b/desktop/src/lib/constants.ts
index d46003b7..01e3d371 100644
--- a/desktop/src/lib/constants.ts
+++ b/desktop/src/lib/constants.ts
@@ -49,8 +49,8 @@ export const SortDirections = {
};
export const NodeRole = {
- Owner: 'owner',
Admin: 'admin',
+ Editor: 'editor',
Collaborator: 'collaborator',
Viewer: 'viewer',
};
diff --git a/desktop/src/main/handlers/mutations/chat-create.ts b/desktop/src/main/handlers/mutations/chat-create.ts
index 615c90ce..88b5abea 100644
--- a/desktop/src/main/handlers/mutations/chat-create.ts
+++ b/desktop/src/main/handlers/mutations/chat-create.ts
@@ -26,8 +26,8 @@ export class ChatCreateMutationHandler
SELECT id
FROM nodes
WHERE type = ${NodeTypes.Chat}
- AND json_extract(attributes, '$.collaborators.${sql.raw(input.userId)}') = 'owner'
- AND json_extract(attributes, '$.collaborators.${sql.raw(input.otherUserId)}') = 'owner'
+ AND json_extract(attributes, '$.collaborators.${sql.raw(input.userId)}') is not null
+ AND json_extract(attributes, '$.collaborators.${sql.raw(input.otherUserId)}') is not null
`.compile(workspaceDatabase);
const existingChats = await workspaceDatabase.executeQuery(query);
@@ -55,8 +55,8 @@ export class ChatCreateMutationHandler
attributesMap.set('collaborators', new Y.Map());
const collaboratorsMap = attributesMap.get('collaborators') as Y.Map<any>;
- collaboratorsMap.set(input.userId, NodeRole.Owner);
- collaboratorsMap.set(input.otherUserId, NodeRole.Owner);
+ collaboratorsMap.set(input.userId, NodeRole.Collaborator);
+ collaboratorsMap.set(input.otherUserId, NodeRole.Collaborator);
});
const attributes = JSON.stringify(attributesMap.toJSON());
diff --git a/desktop/src/main/handlers/mutations/space-create.ts b/desktop/src/main/handlers/mutations/space-create.ts
index bf51db6a..d718d6d9 100644
--- a/desktop/src/main/handlers/mutations/space-create.ts
+++ b/desktop/src/main/handlers/mutations/space-create.ts
@@ -38,7 +38,7 @@ export class SpaceCreateMutationHandler
const collaboratorsMap = new Y.Map<string>();
spaceAttributesMap.set('collaborators', collaboratorsMap);
- collaboratorsMap.set(input.userId, NodeRole.Owner);
+ collaboratorsMap.set(input.userId, NodeRole.Editor);
});
const spaceAttributes = JSON.stringify(spaceAttributesMap.toJSON());
diff --git a/desktop/src/renderer/components/collaborators/node-collaborator-role-dropdown.tsx b/desktop/src/renderer/components/collaborators/node-collaborator-role-dropdown.tsx
index eedc0346..ac3d05f6 100644
--- a/desktop/src/renderer/components/collaborators/node-collaborator-role-dropdown.tsx
+++ b/desktop/src/renderer/components/collaborators/node-collaborator-role-dropdown.tsx
@@ -15,24 +15,30 @@ interface NodeCollaboratorRole {
}
const roles: NodeCollaboratorRole[] = [
- {
- name: 'Owner',
- value: 'owner',
- description: 'Owner',
- enabled: false,
- },
{
name: 'Admin',
value: 'admin',
description: 'Administration access',
enabled: true,
},
+ {
+ name: 'Editor',
+ value: 'editor',
+ description: 'Editing access',
+ enabled: true,
+ },
{
name: 'Collaborator',
value: 'collaborator',
description: 'Can contribute in content',
enabled: true,
},
+ {
+ name: 'Viewer',
+ value: 'viewer',
+ description: 'Can view content',
+ enabled: true,
+ },
];
interface NodeCollaboratorRoleDropdownProps {
diff --git a/server/src/lib/constants.ts b/server/src/lib/constants.ts
index 9e0607ed..50c41712 100644
--- a/server/src/lib/constants.ts
+++ b/server/src/lib/constants.ts
@@ -18,39 +18,32 @@ export const NodeTypes = {
};
export const NodeRoles = {
- Owner: 'owner',
Admin: 'admin',
+ Editor: 'editor',
Collaborator: 'collaborator',
Viewer: 'viewer',
};
-export const nodeRoleHierarchy = [
- NodeRoles.Owner,
- NodeRoles.Admin,
- NodeRoles.Collaborator,
- NodeRoles.Viewer,
-];
-
-export const hasOwnerAccess = (role: string): boolean => {
- return role === NodeRoles.Owner;
+export const hasAdminAccess = (role: string): boolean => {
+ return role === NodeRoles.Admin;
};
-export const hasAdminAccess = (role: string): boolean => {
- return role === NodeRoles.Owner || role === NodeRoles.Admin;
+export const hasEditorAccess = (role: string): boolean => {
+ return role === NodeRoles.Admin || role === NodeRoles.Editor;
};
export const hasCollaboratorAccess = (role: string): boolean => {
return (
- role === NodeRoles.Owner ||
role === NodeRoles.Admin ||
+ role === NodeRoles.Editor ||
role === NodeRoles.Collaborator
);
};
export const hasViewerAccess = (role: string): boolean => {
return (
- role === NodeRoles.Owner ||
role === NodeRoles.Admin ||
+ role === NodeRoles.Editor ||
role === NodeRoles.Collaborator ||
role === NodeRoles.Viewer
);
diff --git a/server/src/lib/nodes.ts b/server/src/lib/nodes.ts
index 2e52a9dd..53d9f136 100644
--- a/server/src/lib/nodes.ts
+++ b/server/src/lib/nodes.ts
@@ -25,6 +25,16 @@ export const mapNode = (node: SelectNode): ServerNode => {
};
};
+export const fetchNode = async (nodeId: string): Promise<SelectNode | null> => {
+ const result = await database
+ .selectFrom('nodes')
+ .selectAll()
+ .where('id', '=', nodeId)
+ .executeTakeFirst();
+
+ return result ?? null;
+};
+
export const fetchNodeAncestors = async (
nodeId: string,
): Promise<SelectNode[]> => {
@@ -59,7 +69,10 @@ export const fetchNodeCollaborators = async (
const collaboratorsMap = new Map<string, string>();
for (const ancestor of ancestors) {
- const collaborators = extractCollaborators(ancestor.attributes);
+ const collaborators = (ancestor.attributes.collaborators ?? {}) as Record<
+ string,
+ string
+ >;
for (const [collaboratorId, role] of Object.entries(collaborators)) {
collaboratorsMap.set(collaboratorId, role);
}
@@ -83,16 +96,7 @@ export const fetchNodeRole = async (
return null;
}
- let role: string | null = null;
- for (const ancestor of ancestors) {
- const collaborators = extractCollaborators(ancestor.attributes);
- const collaboratorRole = collaborators[collaboratorId];
- if (collaboratorRole) {
- role = collaboratorRole;
- }
- }
-
- return role;
+ return extractNodeRole(ancestors, collaboratorId);
};
export const fetchWorkspaceUsers = async (
@@ -107,8 +111,18 @@ export const fetchWorkspaceUsers = async (
return result.map((row) => row.id);
};
-export const extractCollaborators = (
- attribues: ServerNodeAttributes,
-): Record<string, string> => {
- return attribues.collaborators ?? {};
+export const extractNodeRole = (
+ ancestors: SelectNode[],
+ collaboratorId: string,
+): string | null => {
+ let role: string | null = null;
+ for (const ancestor of ancestors) {
+ const collaborators = ancestor.attributes.collaborators ?? {};
+ const collaboratorRole = collaborators[collaboratorId];
+ if (collaboratorRole) {
+ role = collaboratorRole;
+ }
+ }
+
+ return role;
};
diff --git a/server/src/lib/workspaces.ts b/server/src/lib/workspaces.ts
index 4d25d329..7ab49614 100644
--- a/server/src/lib/workspaces.ts
+++ b/server/src/lib/workspaces.ts
@@ -10,6 +10,7 @@ import * as Y from 'yjs';
import { fromUint8Array } from 'js-base64';
import { NodeCreatedEvent } from '@/types/events';
import { enqueueEvent } from '@/queues/events';
+import { NodeRoles } from './constants';
export const createDefaultWorkspace = async (account: SelectAccount) => {
const createdAt = new Date();
@@ -117,7 +118,7 @@ const buildSpaceNodeCreate = (
'collaborators',
) as Y.Map<string>;
- collaboratorsMap.set(userId, WorkspaceRole.Owner);
+ collaboratorsMap.set(userId, NodeRoles.Admin);
});
const attributes = JSON.stringify(attributesMap.toJSON());
diff --git a/server/src/validators/board-view-validator.ts b/server/src/validators/board-view-validator.ts
index 1c2c77f6..f4ce2a6f 100644
--- a/server/src/validators/board-view-validator.ts
+++ b/server/src/validators/board-view-validator.ts
@@ -1,8 +1,9 @@
import { SelectWorkspaceUser } from '@/data/schema';
-import { hasAdminAccess } from '@/lib/constants';
+import { hasAdminAccess, hasEditorAccess } from '@/lib/constants';
import { fetchNodeRole } from '@/lib/nodes';
import { ServerNode, ServerNodeAttributes } from '@/types/nodes';
import { Validator } from '@/types/validators';
+import { isEqual } from 'lodash';
export class BoardViewValidator implements Validator {
async canCreate(
@@ -18,7 +19,11 @@ export class BoardViewValidator implements Validator {
return false;
}
- return hasAdminAccess(role);
+ if (attributes.collaborators) {
+ return hasAdminAccess(role);
+ }
+
+ return hasEditorAccess(role);
}
async canUpdate(
@@ -26,31 +31,27 @@ export class BoardViewValidator implements Validator {
node: ServerNode,
attributes: ServerNodeAttributes,
): Promise<boolean> {
- if (!attributes.parentId || attributes.parentId !== node.parentId) {
- return false;
- }
-
const role = await fetchNodeRole(node.id, workspaceUser.id);
if (!role) {
return false;
}
- return hasAdminAccess(role);
+ if (!isEqual(node.attributes.collaborators, attributes.collaborators)) {
+ return hasAdminAccess(role);
+ }
+
+ return hasEditorAccess(role);
}
async canDelete(
workspaceUser: SelectWorkspaceUser,
node: ServerNode,
): Promise<boolean> {
- if (!node.parentId) {
- return false;
- }
-
- const role = await fetchNodeRole(node.parentId, workspaceUser.id);
+ const role = await fetchNodeRole(node.id, workspaceUser.id);
if (!role) {
return false;
}
- return hasAdminAccess(role);
+ return hasEditorAccess(role);
}
}
diff --git a/server/src/validators/calendar-view-validator.ts b/server/src/validators/calendar-view-validator.ts
index f0a04cf8..5cbe6b17 100644
--- a/server/src/validators/calendar-view-validator.ts
+++ b/server/src/validators/calendar-view-validator.ts
@@ -1,8 +1,9 @@
import { SelectWorkspaceUser } from '@/data/schema';
-import { hasAdminAccess } from '@/lib/constants';
+import { hasAdminAccess, hasEditorAccess } from '@/lib/constants';
import { fetchNodeRole } from '@/lib/nodes';
import { ServerNode, ServerNodeAttributes } from '@/types/nodes';
import { Validator } from '@/types/validators';
+import { isEqual } from 'lodash';
export class CalendarViewValidator implements Validator {
async canCreate(
@@ -19,7 +20,11 @@ export class CalendarViewValidator implements Validator {
return false;
}
- return hasAdminAccess(role);
+ if (attributes.collaborators) {
+ return hasAdminAccess(role);
+ }
+
+ return hasEditorAccess(role);
}
async canUpdate(
@@ -27,32 +32,27 @@ export class CalendarViewValidator implements Validator {
node: ServerNode,
attributes: ServerNodeAttributes,
): Promise<boolean> {
- if (!attributes.parentId || attributes.parentId !== node.parentId) {
- return false;
- }
-
const role = await fetchNodeRole(node.id, workspaceUser.id);
if (!role) {
return false;
}
- return hasAdminAccess(role);
+ if (!isEqual(node.attributes.collaborators, attributes.collaborators)) {
+ return hasAdminAccess(role);
+ }
+
+ return hasEditorAccess(role);
}
async canDelete(
workspaceUser: SelectWorkspaceUser,
node: ServerNode,
): Promise<boolean> {
- if (!node.parentId) {
- return false;
- }
-
- const parentId = node.parentId;
- const role = await fetchNodeRole(parentId, workspaceUser.id);
+ const role = await fetchNodeRole(node.id, workspaceUser.id);
if (!role) {
return false;
}
- return hasAdminAccess(role);
+ return hasEditorAccess(role);
}
}
diff --git a/server/src/validators/channel-validator.ts b/server/src/validators/channel-validator.ts
index 4d05f2ea..57d337ca 100644
--- a/server/src/validators/channel-validator.ts
+++ b/server/src/validators/channel-validator.ts
@@ -1,9 +1,9 @@
-import { database } from '@/data/database';
import { SelectWorkspaceUser } from '@/data/schema';
-import { hasAdminAccess, NodeRoles, NodeTypes } from '@/lib/constants';
-import { extractCollaborators, fetchNodeRole } from '@/lib/nodes';
+import { hasAdminAccess, hasEditorAccess } from '@/lib/constants';
+import { fetchNodeRole } from '@/lib/nodes';
import { ServerNode, ServerNodeAttributes } from '@/types/nodes';
import { Validator } from '@/types/validators';
+import { isEqual } from 'lodash';
export class ChannelValidator implements Validator {
async canCreate(
@@ -14,27 +14,17 @@ export class ChannelValidator implements Validator {
return false;
}
- const parent = await database
- .selectFrom('nodes')
- .selectAll()
- .where('id', '=', attributes.parentId)
- .executeTakeFirst();
-
- if (!parent) {
- return false;
- }
-
- if (parent.type !== NodeTypes.Space) {
+ const parentId = attributes.parentId;
+ const role = await fetchNodeRole(parentId, workspaceUser.id);
+ if (!role) {
return false;
}
- const collaborators = extractCollaborators(parent);
- const role = collaborators[workspaceUser.id];
- if (role !== NodeRoles.Owner && role !== NodeRoles.Admin) {
- return false;
+ if (attributes.collaborators) {
+ return hasAdminAccess(role);
}
- return true;
+ return hasEditorAccess(role);
}
async canUpdate(
@@ -42,16 +32,16 @@ export class ChannelValidator implements Validator {
node: ServerNode,
attributes: ServerNodeAttributes,
): Promise<boolean> {
- if (!attributes.parentId || attributes.parentId !== node.parentId) {
- return false;
- }
-
const role = await fetchNodeRole(node.id, workspaceUser.id);
if (!role) {
return false;
}
- return hasAdminAccess(role);
+ if (!isEqual(node.attributes.collaborators, attributes.collaborators)) {
+ return hasAdminAccess(role);
+ }
+
+ return hasEditorAccess(role);
}
async canDelete(
@@ -63,6 +53,6 @@ export class ChannelValidator implements Validator {
return false;
}
- return hasAdminAccess(role);
+ return hasEditorAccess(role);
}
}
diff --git a/server/src/validators/chat-validator.ts b/server/src/validators/chat-validator.ts
index 324ad6ea..cfc25a40 100644
--- a/server/src/validators/chat-validator.ts
+++ b/server/src/validators/chat-validator.ts
@@ -1,6 +1,4 @@
import { SelectWorkspaceUser } from '@/data/schema';
-import { hasOwnerAccess, NodeRoles } from '@/lib/constants';
-import { extractCollaborators } from '@/lib/nodes';
import { ServerNode, ServerNodeAttributes } from '@/types/nodes';
import { Validator } from '@/types/validators';
import { WorkspaceRole } from '@/types/workspaces';
@@ -14,8 +12,8 @@ export class ChatValidator implements Validator {
return false;
}
- const collaborators = extractCollaborators(attributes);
- if (collaborators[workspaceUser.id] !== NodeRoles.Owner) {
+ const collaborators = attributes.collaborators ?? {};
+ if (!collaborators[workspaceUser.id]) {
return false;
}
@@ -27,25 +25,13 @@ export class ChatValidator implements Validator {
node: ServerNode,
attributes: ServerNodeAttributes,
): Promise<boolean> {
- const collaborators = extractCollaborators(attributes);
- const role = collaborators[workspaceUser.id];
- if (role !== NodeRoles.Owner && role !== NodeRoles.Admin) {
- return false;
- }
-
- return true;
+ return false;
}
async canDelete(
workspaceUser: SelectWorkspaceUser,
node: ServerNode,
): Promise<boolean> {
- const collaborators = extractCollaborators(node.attributes);
- const role = collaborators[workspaceUser.id];
- if (!role) {
- return false;
- }
-
- return hasOwnerAccess(role);
+ return false;
}
}
diff --git a/server/src/validators/database-validator.ts b/server/src/validators/database-validator.ts
index 4c4238c2..1c430653 100644
--- a/server/src/validators/database-validator.ts
+++ b/server/src/validators/database-validator.ts
@@ -1,6 +1,5 @@
import { SelectWorkspaceUser } from '@/data/schema';
-import { hasAdminAccess, hasCollaboratorAccess } from '@/lib/constants';
-import { getIdType, IdType } from '@/lib/id';
+import { hasEditorAccess } from '@/lib/constants';
import { fetchNodeRole } from '@/lib/nodes';
import { ServerNode, ServerNodeAttributes } from '@/types/nodes';
import { Validator } from '@/types/validators';
@@ -15,17 +14,12 @@ export class DatabaseValidator implements Validator {
}
const parentId = attributes.parentId;
- const parentIdType = getIdType(parentId);
const role = await fetchNodeRole(parentId, workspaceUser.id);
if (!role) {
return false;
}
- if (parentIdType === IdType.Space) {
- return hasAdminAccess(role);
- }
-
- return hasCollaboratorAccess(role);
+ return hasEditorAccess(role);
}
async canUpdate(
@@ -33,37 +27,23 @@ export class DatabaseValidator implements Validator {
node: ServerNode,
attributes: ServerNodeAttributes,
): Promise<boolean> {
- if (!attributes.parentId || attributes.parentId !== node.parentId) {
- return false;
- }
-
const role = await fetchNodeRole(node.id, workspaceUser.id);
if (!role) {
return false;
}
- return hasCollaboratorAccess(role);
+ return hasEditorAccess(role);
}
async canDelete(
workspaceUser: SelectWorkspaceUser,
node: ServerNode,
): Promise<boolean> {
- if (!node.parentId) {
- return false;
- }
-
- const parentId = node.parentId;
- const parentIdType = getIdType(parentId);
- const role = await fetchNodeRole(parentId, workspaceUser.id);
+ const role = await fetchNodeRole(node.id, workspaceUser.id);
if (!role) {
return false;
}
- if (parentIdType === IdType.Space) {
- return hasAdminAccess(role);
- }
-
- return hasCollaboratorAccess(role);
+ return hasEditorAccess(role);
}
}
diff --git a/server/src/validators/field-validator.ts b/server/src/validators/field-validator.ts
index d4256fa8..da5ef71c 100644
--- a/server/src/validators/field-validator.ts
+++ b/server/src/validators/field-validator.ts
@@ -1,5 +1,5 @@
import { SelectWorkspaceUser } from '@/data/schema';
-import { hasAdminAccess } from '@/lib/constants';
+import { hasAdminAccess, hasEditorAccess } from '@/lib/constants';
import { fetchNodeRole } from '@/lib/nodes';
import { ServerNode, ServerNodeAttributes } from '@/types/nodes';
import { Validator } from '@/types/validators';
@@ -18,7 +18,7 @@ export class FieldValidator implements Validator {
return false;
}
- return hasAdminAccess(role);
+ return hasEditorAccess(role);
}
async canUpdate(
@@ -26,31 +26,23 @@ export class FieldValidator implements Validator {
node: ServerNode,
attributes: ServerNodeAttributes,
): Promise<boolean> {
- if (!attributes.parentId || attributes.parentId !== node.parentId) {
- return false;
- }
-
const role = await fetchNodeRole(node.id, workspaceUser.id);
if (!role) {
return false;
}
- return hasAdminAccess(role);
+ return hasEditorAccess(role);
}
async canDelete(
workspaceUser: SelectWorkspaceUser,
node: ServerNode,
): Promise<boolean> {
- if (!node.parentId) {
- return false;
- }
-
- const role = await fetchNodeRole(node.parentId, workspaceUser.id);
+ const role = await fetchNodeRole(node.id, workspaceUser.id);
if (!role) {
return false;
}
- return hasAdminAccess(role);
+ return hasEditorAccess(role);
}
}
diff --git a/server/src/validators/file-validator.ts b/server/src/validators/file-validator.ts
index 777faabc..f592a94d 100644
--- a/server/src/validators/file-validator.ts
+++ b/server/src/validators/file-validator.ts
@@ -1,6 +1,6 @@
import { SelectWorkspaceUser } from '@/data/schema';
-import { hasAdminAccess } from '@/lib/constants';
-import { fetchNodeRole } from '@/lib/nodes';
+import { hasEditorAccess, NodeTypes } from '@/lib/constants';
+import { extractNodeRole, fetchNodeAncestors } from '@/lib/nodes';
import { ServerNode, ServerNodeAttributes } from '@/types/nodes';
import { Validator } from '@/types/validators';
@@ -13,12 +13,29 @@ export class FileValidator implements Validator {
return false;
}
- const role = await fetchNodeRole(attributes.parentId, workspaceUser.id);
+ const ancestors = await fetchNodeAncestors(attributes.parentId);
+ if (ancestors.length === 0) {
+ return false;
+ }
+
+ const parent = ancestors.find(
+ (ancestor) => ancestor.id === attributes.parentId,
+ );
+
+ if (!parent) {
+ return false;
+ }
+
+ if (parent.type === NodeTypes.File) {
+ return parent.created_by === workspaceUser.id;
+ }
+
+ const role = extractNodeRole(ancestors, workspaceUser.id);
if (!role) {
return false;
}
- return hasAdminAccess(role);
+ return hasEditorAccess(role);
}
async canUpdate(
@@ -26,16 +43,33 @@ export class FileValidator implements Validator {
node: ServerNode,
attributes: ServerNodeAttributes,
): Promise<boolean> {
- if (!attributes.parentId || attributes.parentId !== node.parentId) {
+ if (!attributes.parentId) {
return false;
}
- const role = await fetchNodeRole(node.id, workspaceUser.id);
+ const ancestors = await fetchNodeAncestors(attributes.parentId);
+ if (ancestors.length === 0) {
+ return false;
+ }
+
+ const parent = ancestors.find(
+ (ancestor) => ancestor.id === attributes.parentId,
+ );
+
+ if (!parent) {
+ return false;
+ }
+
+ if (parent.type === NodeTypes.File) {
+ return parent.created_by === workspaceUser.id;
+ }
+
+ const role = extractNodeRole(ancestors, workspaceUser.id);
if (!role) {
return false;
}
- return hasAdminAccess(role);
+ return hasEditorAccess(role);
}
async canDelete(
@@ -46,11 +80,25 @@ export class FileValidator implements Validator {
return false;
}
- const role = await fetchNodeRole(node.parentId, workspaceUser.id);
+ const ancestors = await fetchNodeAncestors(node.parentId);
+ if (ancestors.length === 0) {
+ return false;
+ }
+
+ const parent = ancestors.find((ancestor) => ancestor.id === node.parentId);
+ if (!parent) {
+ return false;
+ }
+
+ if (parent.type === NodeTypes.File) {
+ return parent.created_by === workspaceUser.id;
+ }
+
+ const role = extractNodeRole(ancestors, workspaceUser.id);
if (!role) {
return false;
}
- return hasAdminAccess(role);
+ return hasEditorAccess(role);
}
}
diff --git a/server/src/validators/folder-validator.ts b/server/src/validators/folder-validator.ts
index ee342518..f8988567 100644
--- a/server/src/validators/folder-validator.ts
+++ b/server/src/validators/folder-validator.ts
@@ -1,9 +1,9 @@
import { SelectWorkspaceUser } from '@/data/schema';
-import { hasAdminAccess, hasCollaboratorAccess } from '@/lib/constants';
-import { getIdType, IdType } from '@/lib/id';
+import { hasAdminAccess, hasEditorAccess } from '@/lib/constants';
import { fetchNodeRole } from '@/lib/nodes';
import { ServerNode, ServerNodeAttributes } from '@/types/nodes';
import { Validator } from '@/types/validators';
+import { isEqual } from 'lodash';
export class FolderValidator implements Validator {
async canCreate(
@@ -15,17 +15,16 @@ export class FolderValidator implements Validator {
}
const parentId = attributes.parentId;
- const parentIdType = getIdType(parentId);
const role = await fetchNodeRole(parentId, workspaceUser.id);
if (!role) {
return false;
}
- if (parentIdType === IdType.Space) {
+ if (attributes.collaborators) {
return hasAdminAccess(role);
}
- return hasCollaboratorAccess(role);
+ return hasEditorAccess(role);
}
async canUpdate(
@@ -33,37 +32,27 @@ export class FolderValidator implements Validator {
node: ServerNode,
attributes: ServerNodeAttributes,
): Promise<boolean> {
- if (!attributes.parentId || attributes.parentId !== node.parentId) {
- return false;
- }
-
const role = await fetchNodeRole(node.id, workspaceUser.id);
if (!role) {
return false;
}
- return hasCollaboratorAccess(role);
+ if (!isEqual(node.attributes.collaborators, attributes.collaborators)) {
+ return hasAdminAccess(role);
+ }
+
+ return hasEditorAccess(role);
}
async canDelete(
workspaceUser: SelectWorkspaceUser,
node: ServerNode,
): Promise<boolean> {
- if (!node.parentId) {
- return false;
- }
-
- const parentId = node.parentId;
- const parentIdType = getIdType(parentId);
- const role = await fetchNodeRole(parentId, workspaceUser.id);
+ const role = await fetchNodeRole(node.id, workspaceUser.id);
if (!role) {
return false;
}
- if (parentIdType === IdType.Space) {
- return hasAdminAccess(role);
- }
-
- return hasCollaboratorAccess(role);
+ return hasEditorAccess(role);
}
}
diff --git a/server/src/validators/message-validator.ts b/server/src/validators/message-validator.ts
index c6f12ff5..54c54edc 100644
--- a/server/src/validators/message-validator.ts
+++ b/server/src/validators/message-validator.ts
@@ -28,10 +28,6 @@ export class MessageValidator implements Validator {
node: ServerNode,
attributes: ServerNodeAttributes,
): Promise<boolean> {
- if (!attributes.parentId || attributes.parentId !== node.parentId) {
- return false;
- }
-
if (
!isEqual(attributes.content, node.attributes.content) &&
node.createdBy !== workspaceUser.id
diff --git a/server/src/validators/page-validator.ts b/server/src/validators/page-validator.ts
index f70dd1aa..2769b387 100644
--- a/server/src/validators/page-validator.ts
+++ b/server/src/validators/page-validator.ts
@@ -1,6 +1,6 @@
import { SelectWorkspaceUser } from '@/data/schema';
-import { hasAdminAccess, hasCollaboratorAccess } from '@/lib/constants';
-import { getIdType, IdType } from '@/lib/id';
+import { hasAdminAccess, hasEditorAccess } from '@/lib/constants';
+import { isEqual } from 'lodash';
import { fetchNodeRole } from '@/lib/nodes';
import { ServerNode, ServerNodeAttributes } from '@/types/nodes';
import { Validator } from '@/types/validators';
@@ -15,17 +15,16 @@ export class PageValidator implements Validator {
}
const parentId = attributes.parentId;
- const parentIdType = getIdType(parentId);
const role = await fetchNodeRole(parentId, workspaceUser.id);
if (!role) {
return false;
}
- if (parentIdType === IdType.Space) {
+ if (attributes.collaborators) {
return hasAdminAccess(role);
}
- return hasCollaboratorAccess(role);
+ return hasEditorAccess(role);
}
async canUpdate(
@@ -33,37 +32,27 @@ export class PageValidator implements Validator {
node: ServerNode,
attributes: ServerNodeAttributes,
): Promise<boolean> {
- if (!attributes.parentId || attributes.parentId !== node.parentId) {
- return false;
- }
-
const role = await fetchNodeRole(node.id, workspaceUser.id);
if (!role) {
return false;
}
- return hasCollaboratorAccess(role);
+ if (!isEqual(node.attributes.collaborators, attributes.collaborators)) {
+ return hasAdminAccess(role);
+ }
+
+ return hasEditorAccess(role);
}
async canDelete(
workspaceUser: SelectWorkspaceUser,
node: ServerNode,
): Promise<boolean> {
- if (!node.parentId) {
- return false;
- }
-
- const parentId = node.parentId;
- const parentIdType = getIdType(parentId);
- const role = await fetchNodeRole(parentId, workspaceUser.id);
+ const role = await fetchNodeRole(node.id, workspaceUser.id);
if (!role) {
return false;
}
- if (parentIdType === IdType.Space) {
- return hasAdminAccess(role);
- }
-
- return hasCollaboratorAccess(role);
+ return hasEditorAccess(role);
}
}
diff --git a/server/src/validators/record-validator.ts b/server/src/validators/record-validator.ts
index 363b4153..2b26d073 100644
--- a/server/src/validators/record-validator.ts
+++ b/server/src/validators/record-validator.ts
@@ -1,6 +1,5 @@
import { SelectWorkspaceUser } from '@/data/schema';
-import { hasAdminAccess, hasCollaboratorAccess } from '@/lib/constants';
-import { getIdType, IdType } from '@/lib/id';
+import { hasCollaboratorAccess, hasEditorAccess } from '@/lib/constants';
import { fetchNodeRole } from '@/lib/nodes';
import { ServerNode, ServerNodeAttributes } from '@/types/nodes';
import { Validator } from '@/types/validators';
@@ -15,16 +14,11 @@ export class RecordValidator implements Validator {
}
const parentId = attributes.parentId;
- const parentIdType = getIdType(parentId);
const role = await fetchNodeRole(parentId, workspaceUser.id);
if (!role) {
return false;
}
- if (parentIdType === IdType.Space) {
- return hasAdminAccess(role);
- }
-
return hasCollaboratorAccess(role);
}
@@ -33,8 +27,8 @@ export class RecordValidator implements Validator {
node: ServerNode,
attributes: ServerNodeAttributes,
): Promise<boolean> {
- if (!attributes.parentId || attributes.parentId !== node.parentId) {
- return false;
+ if (node.createdBy === workspaceUser.id) {
+ return true;
}
const role = await fetchNodeRole(node.id, workspaceUser.id);
@@ -42,28 +36,22 @@ export class RecordValidator implements Validator {
return false;
}
- return hasCollaboratorAccess(role);
+ return hasEditorAccess(role);
}
async canDelete(
workspaceUser: SelectWorkspaceUser,
node: ServerNode,
): Promise<boolean> {
- if (!node.parentId) {
- return false;
+ if (node.createdBy === workspaceUser.id) {
+ return true;
}
- const parentId = node.parentId;
- const parentIdType = getIdType(parentId);
- const role = await fetchNodeRole(parentId, workspaceUser.id);
+ const role = await fetchNodeRole(node.id, workspaceUser.id);
if (!role) {
return false;
}
- if (parentIdType === IdType.Space) {
- return hasAdminAccess(role);
- }
-
- return hasCollaboratorAccess(role);
+ return hasEditorAccess(role);
}
}
diff --git a/server/src/validators/select-option-validator.ts b/server/src/validators/select-option-validator.ts
index cabb228e..356bb583 100644
--- a/server/src/validators/select-option-validator.ts
+++ b/server/src/validators/select-option-validator.ts
@@ -1,8 +1,9 @@
import { SelectWorkspaceUser } from '@/data/schema';
-import { hasAdminAccess } from '@/lib/constants';
+import { hasAdminAccess, hasEditorAccess } from '@/lib/constants';
import { fetchNodeRole } from '@/lib/nodes';
import { ServerNode, ServerNodeAttributes } from '@/types/nodes';
import { Validator } from '@/types/validators';
+import { isEqual } from 'lodash';
export class SelectOptionValidator implements Validator {
async canCreate(
@@ -13,12 +14,17 @@ export class SelectOptionValidator implements Validator {
return false;
}
- const role = await fetchNodeRole(attributes.parentId, workspaceUser.id);
+ const parentId = attributes.parentId;
+ const role = await fetchNodeRole(parentId, workspaceUser.id);
if (!role) {
return false;
}
- return hasAdminAccess(role);
+ if (attributes.collaborators) {
+ return hasAdminAccess(role);
+ }
+
+ return hasEditorAccess(role);
}
async canUpdate(
@@ -26,32 +32,27 @@ export class SelectOptionValidator implements Validator {
node: ServerNode,
attributes: ServerNodeAttributes,
): Promise<boolean> {
- if (!attributes.parentId || attributes.parentId !== node.parentId) {
- return false;
- }
-
const role = await fetchNodeRole(node.id, workspaceUser.id);
if (!role) {
return false;
}
- return hasAdminAccess(role);
+ if (!isEqual(node.attributes.collaborators, attributes.collaborators)) {
+ return hasAdminAccess(role);
+ }
+
+ return hasEditorAccess(role);
}
async canDelete(
workspaceUser: SelectWorkspaceUser,
node: ServerNode,
): Promise<boolean> {
- if (!node.parentId) {
- return false;
- }
-
- const parentId = node.parentId;
- const role = await fetchNodeRole(node.parentId, workspaceUser.id);
+ const role = await fetchNodeRole(node.id, workspaceUser.id);
if (!role) {
return false;
}
- return hasAdminAccess(role);
+ return hasEditorAccess(role);
}
}
diff --git a/server/src/validators/space-validator.ts b/server/src/validators/space-validator.ts
index d34b63fe..a3694570 100644
--- a/server/src/validators/space-validator.ts
+++ b/server/src/validators/space-validator.ts
@@ -1,6 +1,5 @@
import { SelectWorkspaceUser } from '@/data/schema';
-import { NodeRoles } from '@/lib/constants';
-import { extractCollaborators } from '@/lib/nodes';
+import { hasAdminAccess, hasEditorAccess, NodeRoles } from '@/lib/constants';
import { ServerNode, ServerNodeAttributes } from '@/types/nodes';
import { Validator } from '@/types/validators';
import { WorkspaceRole } from '@/types/workspaces';
@@ -14,12 +13,10 @@ export class SpaceValidator implements Validator {
return false;
}
- const collaborators = extractCollaborators(attributes);
- if (collaborators[workspaceUser.id] !== NodeRoles.Owner) {
- return false;
- }
+ const collaborators = attributes.collaborators ?? {};
+ const role = collaborators[workspaceUser.id];
- return true;
+ return hasAdminAccess(role);
}
async canUpdate(
@@ -27,25 +24,25 @@ export class SpaceValidator implements Validator {
node: ServerNode,
attributes: ServerNodeAttributes,
): Promise<boolean> {
- const collaborators = extractCollaborators(node.attributes);
+ const collaborators = attributes.collaborators ?? {};
const role = collaborators[workspaceUser.id];
- if (role !== NodeRoles.Owner && role !== NodeRoles.Admin) {
+ if (!role) {
return false;
}
- return true;
+ return hasEditorAccess(role);
}
async canDelete(
workspaceUser: SelectWorkspaceUser,
node: ServerNode,
): Promise<boolean> {
- const collaborators = extractCollaborators(node.attributes);
+ const collaborators = node.attributes.collaborators ?? {};
const role = collaborators[workspaceUser.id];
- if (role !== NodeRoles.Owner && role !== NodeRoles.Admin) {
+ if (!role) {
return false;
}
- return true;
+ return hasAdminAccess(role);
}
}
diff --git a/server/src/validators/table-view-validator.ts b/server/src/validators/table-view-validator.ts
index faabd82a..2303f0c8 100644
--- a/server/src/validators/table-view-validator.ts
+++ b/server/src/validators/table-view-validator.ts
@@ -1,9 +1,9 @@
import { SelectWorkspaceUser } from '@/data/schema';
-import { hasAdminAccess, hasCollaboratorAccess } from '@/lib/constants';
-import { getIdType, IdType } from '@/lib/id';
+import { hasAdminAccess, hasEditorAccess } from '@/lib/constants';
import { fetchNodeRole } from '@/lib/nodes';
import { ServerNode, ServerNodeAttributes } from '@/types/nodes';
import { Validator } from '@/types/validators';
+import { isEqual } from 'lodash';
export class TableViewValidator implements Validator {
async canCreate(
@@ -14,18 +14,16 @@ export class TableViewValidator implements Validator {
return false;
}
- const parentId = attributes.parentId;
- const parentIdType = getIdType(parentId);
- const role = await fetchNodeRole(parentId, workspaceUser.id);
+ const role = await fetchNodeRole(attributes.parentId, workspaceUser.id);
if (!role) {
return false;
}
- if (parentIdType === IdType.Space) {
+ if (attributes.collaborators) {
return hasAdminAccess(role);
}
- return hasCollaboratorAccess(role);
+ return hasEditorAccess(role);
}
async canUpdate(
@@ -33,37 +31,27 @@ export class TableViewValidator implements Validator {
node: ServerNode,
attributes: ServerNodeAttributes,
): Promise<boolean> {
- if (!attributes.parentId || attributes.parentId !== node.parentId) {
- return false;
- }
-
const role = await fetchNodeRole(node.id, workspaceUser.id);
if (!role) {
return false;
}
- return hasCollaboratorAccess(role);
+ if (!isEqual(node.attributes.collaborators, attributes.collaborators)) {
+ return hasAdminAccess(role);
+ }
+
+ return hasEditorAccess(role);
}
async canDelete(
workspaceUser: SelectWorkspaceUser,
node: ServerNode,
): Promise<boolean> {
- if (!node.parentId) {
- return false;
- }
-
- const parentId = node.parentId;
- const parentIdType = getIdType(parentId);
- const role = await fetchNodeRole(parentId, workspaceUser.id);
+ const role = await fetchNodeRole(node.id, workspaceUser.id);
if (!role) {
return false;
}
- if (parentIdType === IdType.Space) {
- return hasAdminAccess(role);
- }
-
- return hasCollaboratorAccess(role);
+ return hasEditorAccess(role);
}
}