Open-source and local-first Slack and Notion alternative that puts you in control of your data
TypeScript chatchat-applicationcrdteditorelectronknowledge-baselocal-firstnotionnotion-alternativerealtime-collaborationself-hostedslacksqliteteam-collaborationwikiyjs
Refactor node reaction permission check
Hakan Shehu99b3189fc3f4
diff --git a/apps/desktop/src/main/services/workspaces/node-reaction-service.ts b/apps/desktop/src/main/services/workspaces/node-reaction-service.tsindex 497884d5..e1564e53 100644--- a/apps/desktop/src/main/services/workspaces/node-reaction-service.ts+++ b/apps/desktop/src/main/services/workspaces/node-reaction-service.ts@@ -1,13 +1,14 @@import {- canCreateNodeReaction,createDebugger,CreateNodeReactionMutation,CreateNodeReactionMutationData,DeleteNodeReactionMutation,DeleteNodeReactionMutationData,generateId,+ getNodeModel,IdType,SyncNodeReactionData,+ CanReactNodeContext,} from '@colanode/core';import { WorkspaceService } from '@/main/services/workspaces/workspace-service';@@ -15,7 +16,7 @@ import { eventBus } from '@/shared/lib/event-bus';import { mapNode, mapNodeReaction } from '@/main/lib/mappers';import { SelectNodeReaction } from '@/main/databases/workspace';import { MutationErrorCode, MutationError } from '@/shared/mutations';-import { fetchNode } from '@/main/lib/utils';+import { fetchNodeTree } from '@/main/lib/utils';export class NodeReactionService {private readonly debug = createDebugger('desktop:service:node-reaction');@@ -26,19 +27,6 @@ export class NodeReactionService {}public async createNodeReaction(nodeId: string, reaction: string) {- const node = await this.workspace.database- .selectFrom('nodes')- .selectAll()- .where('id', '=', nodeId)- .executeTakeFirst();-- if (!node) {- throw new MutationError(- MutationErrorCode.NodeNotFound,- 'Node not found or has been deleted.'- );- }-const existingNodeReaction = await this.workspace.database.selectFrom('node_reactions').selectAll()@@ -53,24 +41,35 @@ export class NodeReactionService {};}- const root = await fetchNode(this.workspace.database, node.root_id);- if (!root) {+ const tree = await fetchNodeTree(this.workspace.database, nodeId);+ if (!tree) {throw new MutationError(- MutationErrorCode.RootNotFound,- 'There was an error while fetching the root. Please make sure you have access to this root.'+ MutationErrorCode.NodeNotFound,+ 'Node not found or has been deleted.');}- if (- !canCreateNodeReaction({- user: {- userId: this.workspace.userId,- role: this.workspace.role,- },- node: mapNode(node),- root: mapNode(root),- })- ) {+ const node = tree[tree.length - 1]!;+ if (!node) {+ throw new MutationError(+ MutationErrorCode.NodeNotFound,+ 'Node not found or has been deleted.'+ );+ }++ const model = getNodeModel(node.type);+ const context: CanReactNodeContext = {+ user: {+ id: this.workspace.userId,+ role: this.workspace.role,+ accountId: this.workspace.accountId,+ workspaceId: this.workspace.id,+ },+ tree: tree.map(mapNode),+ node: mapNode(node),+ };++ if (!model.canReact(context)) {throw new MutationError(MutationErrorCode.NodeReactionCreateForbidden,"You don't have permission to react to this node."diff --git a/apps/server/src/lib/node-reactions.ts b/apps/server/src/lib/node-reactions.tsindex a2187a65..d3399353 100644--- a/apps/server/src/lib/node-reactions.ts+++ b/apps/server/src/lib/node-reactions.ts@@ -1,49 +1,47 @@import {- canCreateNodeReaction,- canDeleteNodeReaction,+ CanReactNodeContext,CreateNodeReactionMutation,DeleteNodeReactionMutation,+ getNodeModel,} from '@colanode/core';import { eventBus } from '@/lib/event-bus';import { database } from '@/data/database';import { SelectUser } from '@/data/schema';-import { mapNode } from '@/lib/nodes';+import { fetchNodeTree, mapNode } from '@/lib/nodes';export const createNodeReaction = async (user: SelectUser,mutation: CreateNodeReactionMutation): Promise<boolean> => {- const node = await database- .selectFrom('nodes')- .selectAll()- .where('id', '=', mutation.data.nodeId)- .executeTakeFirst();+ const tree = await fetchNodeTree(mutation.data.nodeId);+ if (!tree) {+ return false;+ }+ const node = tree[tree.length - 1]!;if (!node) {return false;}- const root = await database- .selectFrom('nodes')- .selectAll()- .where('id', '=', node.root_id)- .executeTakeFirst();-+ const root = tree[0]!;if (!root) {return false;}- if (- !canCreateNodeReaction({- user: {- userId: user.id,- role: user.role,- },- root: mapNode(root),- node: mapNode(node),- })- ) {+ const model = getNodeModel(node.type);+ const context: CanReactNodeContext = {+ user: {+ id: user.id,+ role: user.role,+ accountId: user.account_id,+ workspaceId: user.workspace_id,+ },+ tree: tree.map(mapNode),+ node: mapNode(node),+ };++ if (!model.canReact(context)) {return false;}@@ -85,36 +83,34 @@ export const deleteNodeReaction = async (user: SelectUser,mutation: DeleteNodeReactionMutation): Promise<boolean> => {- const node = await database- .selectFrom('nodes')- .selectAll()- .where('id', '=', mutation.data.nodeId)- .executeTakeFirst();+ const tree = await fetchNodeTree(mutation.data.nodeId);+ if (!tree) {+ return false;+ }+ const node = tree[tree.length - 1]!;if (!node) {return false;}- const root = await database- .selectFrom('nodes')- .selectAll()- .where('id', '=', node.root_id)- .executeTakeFirst();-+ const root = tree[0]!;if (!root) {return false;}- if (- !canDeleteNodeReaction({- user: {- userId: user.id,- role: user.role,- },- root: mapNode(root),- node: mapNode(node),- })- ) {+ const model = getNodeModel(node.type);+ const context: CanReactNodeContext = {+ user: {+ id: user.id,+ role: user.role,+ accountId: user.account_id,+ workspaceId: user.workspace_id,+ },+ tree: tree.map(mapNode),+ node: mapNode(node),+ };++ if (!model.canReact(context)) {return false;}diff --git a/packages/core/src/lib/permissions.ts b/packages/core/src/lib/permissions.tsindex b07aa22e..830c82e1 100644--- a/packages/core/src/lib/permissions.ts+++ b/packages/core/src/lib/permissions.ts@@ -1,4 +1,4 @@-import { extractNodeRole, Node, WorkspaceRole, NodeRole } from '../index';+import { WorkspaceRole, NodeRole } from '../index';export type UserInput = {userId: string;@@ -65,37 +65,3 @@ export const hasNodeRole = (currentRole: NodeRole, targetRole: NodeRole) => {return false;};--export type CanCreateNodeReactionInput = {- user: UserInput;- root: Node;- node: Node;-};--export const canCreateNodeReaction = (- input: CanCreateNodeReactionInput-): boolean => {- const rootRole = extractNodeRole(input.root, input.user.userId);- if (!rootRole) {- return false;- }-- return hasNodeRole(rootRole, 'viewer');-};--export type CanDeleteNodeReactionInput = {- user: UserInput;- root: Node;- node: Node;-};--export const canDeleteNodeReaction = (- input: CanDeleteNodeReactionInput-): boolean => {- const rootRole = extractNodeRole(input.root, input.user.userId);- if (!rootRole) {- return false;- }-- return hasNodeRole(rootRole, 'viewer');-};diff --git a/packages/core/src/registry/nodes/channel.ts b/packages/core/src/registry/nodes/channel.tsindex 6ce1a406..b1322413 100644--- a/packages/core/src/registry/nodes/channel.ts+++ b/packages/core/src/registry/nodes/channel.ts@@ -58,6 +58,9 @@ export const channelModel: NodeModel = {return hasNodeRole(role, 'admin');},+ canReact: () => {+ return false;+ },getName: (_: string,attributes: NodeAttributesdiff --git a/packages/core/src/registry/nodes/chat.ts b/packages/core/src/registry/nodes/chat.tsindex 5bf9090b..35fdf18f 100644--- a/packages/core/src/registry/nodes/chat.ts+++ b/packages/core/src/registry/nodes/chat.ts@@ -43,6 +43,9 @@ export const chatModel: NodeModel = {canDelete: () => {return false;},+ canReact: () => {+ return false;+ },getName: (): string | null | undefined => {return undefined;},diff --git a/packages/core/src/registry/nodes/core.ts b/packages/core/src/registry/nodes/core.tsindex 90d8dfb1..f6c59ad1 100644--- a/packages/core/src/registry/nodes/core.ts+++ b/packages/core/src/registry/nodes/core.ts@@ -45,6 +45,12 @@ export type CanDeleteNodeContext = {node: Node;};+export interface CanReactNodeContext {+ user: NodeMutationUser;+ tree: Node[];+ node: Node;+}+export interface NodeModel {type: string;attributesSchema: ZodSchema;@@ -53,6 +59,7 @@ export interface NodeModel {canUpdateAttributes: (context: CanUpdateAttributesContext) => boolean;canUpdateDocument: (context: CanUpdateDocumentContext) => boolean;canDelete: (context: CanDeleteNodeContext) => boolean;+ canReact: (context: CanReactNodeContext) => boolean;getName: (id: string,attributes: NodeAttributesdiff --git a/packages/core/src/registry/nodes/database-view.ts b/packages/core/src/registry/nodes/database-view.tsindex 612283a1..2012dfa6 100644--- a/packages/core/src/registry/nodes/database-view.ts+++ b/packages/core/src/registry/nodes/database-view.ts@@ -131,6 +131,9 @@ export const databaseViewModel: NodeModel = {return hasNodeRole(role, 'editor');},+ canReact: () => {+ return false;+ },getName: (_, attributes) => {if (attributes.type !== 'database_view') {return undefined;diff --git a/packages/core/src/registry/nodes/database.ts b/packages/core/src/registry/nodes/database.tsindex 3a2be2dd..1877e198 100644--- a/packages/core/src/registry/nodes/database.ts+++ b/packages/core/src/registry/nodes/database.ts@@ -58,6 +58,9 @@ export const databaseModel: NodeModel = {return hasNodeRole(role, 'editor');},+ canReact: () => {+ return false;+ },getName: (_, attributes) => {if (attributes.type !== 'database') {return undefined;diff --git a/packages/core/src/registry/nodes/file.ts b/packages/core/src/registry/nodes/file.tsindex 2dfd724e..7e2409cd 100644--- a/packages/core/src/registry/nodes/file.ts+++ b/packages/core/src/registry/nodes/file.ts@@ -78,6 +78,9 @@ export const fileModel: NodeModel = {return hasNodeRole(role, 'editor');},+ canReact: () => {+ return false;+ },getName: (_, attributes) => {if (attributes.type !== 'file') {return null;diff --git a/packages/core/src/registry/nodes/folder.ts b/packages/core/src/registry/nodes/folder.tsindex 629b0420..e3503639 100644--- a/packages/core/src/registry/nodes/folder.ts+++ b/packages/core/src/registry/nodes/folder.ts@@ -56,6 +56,9 @@ export const folderModel: NodeModel = {return hasNodeRole(role, 'admin');},+ canReact: () => {+ return false;+ },getName: (_, attributes) => {if (attributes.type !== 'folder') {return undefined;diff --git a/packages/core/src/registry/nodes/message.ts b/packages/core/src/registry/nodes/message.tsindex 484a91f8..5b6ee042 100644--- a/packages/core/src/registry/nodes/message.ts+++ b/packages/core/src/registry/nodes/message.ts@@ -62,6 +62,18 @@ export const messageModel: NodeModel = {context.node.createdBy === context.user.id || hasNodeRole(role, 'admin'));},+ canReact: (context) => {+ if (context.tree.length === 0) {+ return false;+ }++ const role = extractNodeRole(context.tree, context.user.id);+ if (!role) {+ return false;+ }++ return hasNodeRole(role, 'viewer');+ },getName: (_, attributes) => {if (attributes.type !== 'message') {return undefined;diff --git a/packages/core/src/registry/nodes/page.ts b/packages/core/src/registry/nodes/page.tsindex 8284242c..d6b7755e 100644--- a/packages/core/src/registry/nodes/page.ts+++ b/packages/core/src/registry/nodes/page.ts@@ -67,6 +67,9 @@ export const pageModel: NodeModel = {return hasNodeRole(role, 'admin');},+ canReact: () => {+ return false;+ },getName: (_, attributes) => {if (attributes.type !== 'page') {return undefined;diff --git a/packages/core/src/registry/nodes/record.ts b/packages/core/src/registry/nodes/record.tsindex f791c6ad..f24340ee 100644--- a/packages/core/src/registry/nodes/record.ts+++ b/packages/core/src/registry/nodes/record.ts@@ -82,6 +82,9 @@ export const recordModel: NodeModel = {return hasNodeRole(role, 'admin');},+ canReact: () => {+ return false;+ },getName: (_, attributes) => {if (attributes.type !== 'record') {return undefined;diff --git a/packages/core/src/registry/nodes/space.ts b/packages/core/src/registry/nodes/space.tsindex 75cc26e6..429eb66e 100644--- a/packages/core/src/registry/nodes/space.ts+++ b/packages/core/src/registry/nodes/space.ts@@ -70,6 +70,9 @@ export const spaceModel: NodeModel = {return hasNodeRole(role, 'admin');},+ canReact: () => {+ return false;+ },getName: (_, attributes) => {if (attributes.type !== 'space') {return undefined;