Skip to content

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

Add authorization checks in node collaborators

Hakan Shehu30e845d40373
diff --git a/apps/desktop/src/renderer/components/channels/channel-header.tsx b/apps/desktop/src/renderer/components/channels/channel-header.tsx
index fc2ad547..1636d730 100644
--- a/apps/desktop/src/renderer/components/channels/channel-header.tsx
+++ b/apps/desktop/src/renderer/components/channels/channel-header.tsx
@@ -12,7 +12,7 @@ interface ChannelHeaderProps {
role: NodeRole;
}
-export const ChannelHeader = ({ nodes, channel }: ChannelHeaderProps) => {
+export const ChannelHeader = ({ nodes, channel, role }: ChannelHeaderProps) => {
const container = useContainer();
return (
@@ -25,7 +25,11 @@ export const ChannelHeader = ({ nodes, channel }: ChannelHeaderProps) => {
)}
</div>
<div className="flex items-center gap-2">
- <NodeCollaboratorsPopover nodeId={channel.id} nodes={nodes} />
+ <NodeCollaboratorsPopover
+ nodeId={channel.id}
+ nodes={nodes}
+ role={role}
+ />
<ChannelSettings nodeId={channel.id} />
</div>
</div>
diff --git a/apps/desktop/src/renderer/components/chats/chat-container.tsx b/apps/desktop/src/renderer/components/chats/chat-container.tsx
index e02b1501..681becda 100644
--- a/apps/desktop/src/renderer/components/chats/chat-container.tsx
+++ b/apps/desktop/src/renderer/components/chats/chat-container.tsx
@@ -33,7 +33,7 @@ export const ChatContainer = ({ nodeId }: ChatContainerProps) => {
return (
<div className="flex h-full w-full flex-col">
- <ChatHeader chat={node} />
+ <ChatHeader chat={node} role={role} />
<ChatBody chat={node} role={role} />
</div>
);
diff --git a/apps/desktop/src/renderer/components/chats/chat-header.tsx b/apps/desktop/src/renderer/components/chats/chat-header.tsx
index 22f2c4a8..69374328 100644
--- a/apps/desktop/src/renderer/components/chats/chat-header.tsx
+++ b/apps/desktop/src/renderer/components/chats/chat-header.tsx
@@ -1,5 +1,5 @@
import { NodeCollaboratorsPopover } from '@/renderer/components/collaborators/node-collaborators-popover';
-import { ChatNode } from '@colanode/core';
+import { ChatNode, NodeRole } from '@colanode/core';
import { Header } from '@/renderer/components/ui/header';
import { NodeBreadcrumb } from '@/renderer/components/layouts/node-breadcrumb';
import { useContainer } from '@/renderer/contexts/container';
@@ -7,9 +7,10 @@ import { NodeFullscreenButton } from '@/renderer/components/layouts/node-fullscr
interface ChatHeaderProps {
chat: ChatNode;
+ role: NodeRole;
}
-export const ChatHeader = ({ chat }: ChatHeaderProps) => {
+export const ChatHeader = ({ chat, role }: ChatHeaderProps) => {
const container = useContainer();
return (
@@ -22,7 +23,11 @@ export const ChatHeader = ({ chat }: ChatHeaderProps) => {
)}
</div>
<div className="flex items-center gap-2">
- <NodeCollaboratorsPopover nodeId={chat.id} nodes={[chat]} />
+ <NodeCollaboratorsPopover
+ nodeId={chat.id}
+ nodes={[chat]}
+ role={role}
+ />
</div>
</div>
</Header>
diff --git a/apps/desktop/src/renderer/components/collaborators/node-collaborator-create.tsx b/apps/desktop/src/renderer/components/collaborators/node-collaborator-create.tsx
index d1a2e605..d6e69cda 100644
--- a/apps/desktop/src/renderer/components/collaborators/node-collaborator-create.tsx
+++ b/apps/desktop/src/renderer/components/collaborators/node-collaborator-create.tsx
@@ -31,7 +31,11 @@ export const NodeCollaboratorCreate = ({
excluded={existingCollaborators}
/>
<div className="flex justify-end space-x-2">
- <NodeCollaboratorRoleDropdown value={role} onChange={setRole} />
+ <NodeCollaboratorRoleDropdown
+ value={role}
+ onChange={setRole}
+ editable={true}
+ />
<Button
variant="default"
className="shrink-0"
diff --git a/apps/desktop/src/renderer/components/collaborators/node-collaborator-role-dropdown.tsx b/apps/desktop/src/renderer/components/collaborators/node-collaborator-role-dropdown.tsx
index 1240829f..9ad36a3f 100644
--- a/apps/desktop/src/renderer/components/collaborators/node-collaborator-role-dropdown.tsx
+++ b/apps/desktop/src/renderer/components/collaborators/node-collaborator-role-dropdown.tsx
@@ -43,14 +43,22 @@ const roles: NodeCollaboratorRole[] = [
interface NodeCollaboratorRoleDropdownProps {
value: string;
onChange: (value: string) => void;
+ editable: boolean;
}
export const NodeCollaboratorRoleDropdown = ({
value,
onChange,
+ editable,
}: NodeCollaboratorRoleDropdownProps) => {
const currentRole = roles.find((role) => role.value === value);
+ if (!editable) {
+ return (
+ <p className="p-1 text-sm text-muted-foreground">{currentRole?.name}</p>
+ );
+ }
+
return (
<DropdownMenu>
<DropdownMenuTrigger asChild>
diff --git a/apps/desktop/src/renderer/components/collaborators/node-collaborator.tsx b/apps/desktop/src/renderer/components/collaborators/node-collaborator.tsx
index 13f23978..00955d52 100644
--- a/apps/desktop/src/renderer/components/collaborators/node-collaborator.tsx
+++ b/apps/desktop/src/renderer/components/collaborators/node-collaborator.tsx
@@ -10,13 +10,15 @@ interface NodeCollaboratorProps {
nodeId: string;
collaboratorId: string;
role: NodeRole;
- removable?: boolean;
+ editable: boolean;
+ removable: boolean;
}
export const NodeCollaborator = ({
nodeId,
collaboratorId,
role,
+ editable,
removable,
}: NodeCollaboratorProps) => {
const workspace = useWorkspace();
@@ -52,6 +54,7 @@ export const NodeCollaborator = ({
<div className="flex flex-row items-center gap-1">
<NodeCollaboratorRoleDropdown
value={role}
+ editable={editable}
onChange={(newRole) => {
mutate({
input: {
diff --git a/apps/desktop/src/renderer/components/collaborators/node-collaborators-popover.tsx b/apps/desktop/src/renderer/components/collaborators/node-collaborators-popover.tsx
index 677e0942..498f3f34 100644
--- a/apps/desktop/src/renderer/components/collaborators/node-collaborators-popover.tsx
+++ b/apps/desktop/src/renderer/components/collaborators/node-collaborators-popover.tsx
@@ -5,15 +5,18 @@ import {
} from '@/renderer/components/ui/popover';
import { NodeCollaborators } from '@/renderer/components/collaborators/node-collaborators';
import { UserRoundPlus } from 'lucide-react';
-import { Node } from '@colanode/core';
+import { Node, NodeRole } from '@colanode/core';
+
interface NodeCollaboratorsPopoverProps {
nodeId: string;
nodes: Node[];
+ role: NodeRole;
}
export const NodeCollaboratorsPopover = ({
nodeId,
nodes,
+ role,
}: NodeCollaboratorsPopoverProps) => {
return (
<Popover>
@@ -21,7 +24,7 @@ export const NodeCollaboratorsPopover = ({
<UserRoundPlus className="size-5 cursor-pointer text-muted-foreground hover:text-foreground" />
</PopoverTrigger>
<PopoverContent className="mr-2 max-h-128 w-128 overflow-auto">
- <NodeCollaborators nodeId={nodeId} nodes={nodes} />
+ <NodeCollaborators nodeId={nodeId} nodes={nodes} role={role} />
</PopoverContent>
</Popover>
);
diff --git a/apps/desktop/src/renderer/components/collaborators/node-collaborators.tsx b/apps/desktop/src/renderer/components/collaborators/node-collaborators.tsx
index 42b20202..9712991a 100644
--- a/apps/desktop/src/renderer/components/collaborators/node-collaborators.tsx
+++ b/apps/desktop/src/renderer/components/collaborators/node-collaborators.tsx
@@ -2,17 +2,24 @@ import React from 'react';
import { Separator } from '@/renderer/components/ui/separator';
import { NodeCollaborator } from '@/renderer/components/collaborators/node-collaborator';
import { NodeCollaboratorCreate } from '@/renderer/components/collaborators/node-collaborator-create';
-import { extractNodeName, Node } from '@colanode/core';
+import {
+ extractNodeName,
+ hasEditorAccess,
+ Node,
+ NodeRole,
+} from '@colanode/core';
import { buildNodeCollaborators } from '@/lib/nodes';
interface NodeCollaboratorsProps {
nodeId: string;
nodes: Node[];
+ role: NodeRole;
}
export const NodeCollaborators = ({
nodeId,
nodes,
+ role,
}: NodeCollaboratorsProps) => {
const collaborators = buildNodeCollaborators(nodes);
const directCollaborators = collaborators.filter(
@@ -22,15 +29,20 @@ export const NodeCollaborators = ({
(collaborator) => collaborator.collaboratorId
);
+ const canEdit = hasEditorAccess(role);
const ancestors = nodes.reverse().filter((node) => node.id !== nodeId);
return (
<div className="flex flex-col gap-2">
- <NodeCollaboratorCreate
- nodeId={nodeId}
- existingCollaborators={directCollaboratorIds}
- />
- <Separator />
+ {canEdit && (
+ <React.Fragment>
+ <NodeCollaboratorCreate
+ nodeId={nodeId}
+ existingCollaborators={directCollaboratorIds}
+ />
+ <Separator />
+ </React.Fragment>
+ )}
<div className="space-y-3">
<h4 className="text-sm font-medium">Direct access</h4>
<div className="flex flex-col gap-3">
@@ -42,7 +54,8 @@ export const NodeCollaborators = ({
nodeId={nodeId}
collaboratorId={collaborator.collaboratorId}
role={collaborator.role}
- removable={true}
+ editable={canEdit}
+ removable={canEdit}
/>
))}
</React.Fragment>
@@ -75,6 +88,7 @@ export const NodeCollaborators = ({
nodeId={nodeId}
collaboratorId={collaborator.collaboratorId}
role={collaborator.role}
+ editable={canEdit}
removable={false}
/>
))}
diff --git a/apps/desktop/src/renderer/components/databases/database-header.tsx b/apps/desktop/src/renderer/components/databases/database-header.tsx
index 9e491b5e..152498e3 100644
--- a/apps/desktop/src/renderer/components/databases/database-header.tsx
+++ b/apps/desktop/src/renderer/components/databases/database-header.tsx
@@ -12,7 +12,11 @@ interface DatabaseHeaderProps {
role: NodeRole;
}
-export const DatabaseHeader = ({ nodes, database }: DatabaseHeaderProps) => {
+export const DatabaseHeader = ({
+ nodes,
+ database,
+ role,
+}: DatabaseHeaderProps) => {
const container = useContainer();
return (
@@ -25,7 +29,11 @@ export const DatabaseHeader = ({ nodes, database }: DatabaseHeaderProps) => {
)}
</div>
<div className="flex items-center gap-2">
- <NodeCollaboratorsPopover nodeId={database.id} nodes={nodes} />
+ <NodeCollaboratorsPopover
+ nodeId={database.id}
+ nodes={nodes}
+ role={role}
+ />
<DatabaseSettings nodeId={database.id} />
</div>
</div>
diff --git a/apps/desktop/src/renderer/components/files/file-header.tsx b/apps/desktop/src/renderer/components/files/file-header.tsx
index 6ba6eb61..906e7322 100644
--- a/apps/desktop/src/renderer/components/files/file-header.tsx
+++ b/apps/desktop/src/renderer/components/files/file-header.tsx
@@ -12,7 +12,7 @@ interface FileHeaderProps {
role: NodeRole;
}
-export const FileHeader = ({ nodes, file }: FileHeaderProps) => {
+export const FileHeader = ({ nodes, file, role }: FileHeaderProps) => {
const container = useContainer();
return (
@@ -25,7 +25,11 @@ export const FileHeader = ({ nodes, file }: FileHeaderProps) => {
)}
</div>
<div className="flex items-center gap-2">
- <NodeCollaboratorsPopover nodeId={file.id} nodes={nodes} />
+ <NodeCollaboratorsPopover
+ nodeId={file.id}
+ nodes={nodes}
+ role={role}
+ />
<FileSettings nodeId={file.id} />
</div>
</div>
diff --git a/apps/desktop/src/renderer/components/folders/folder-header.tsx b/apps/desktop/src/renderer/components/folders/folder-header.tsx
index aff8f40f..a200ef06 100644
--- a/apps/desktop/src/renderer/components/folders/folder-header.tsx
+++ b/apps/desktop/src/renderer/components/folders/folder-header.tsx
@@ -12,7 +12,7 @@ interface FolderHeaderProps {
role: NodeRole;
}
-export const FolderHeader = ({ nodes, folder }: FolderHeaderProps) => {
+export const FolderHeader = ({ nodes, folder, role }: FolderHeaderProps) => {
const container = useContainer();
return (
@@ -25,7 +25,11 @@ export const FolderHeader = ({ nodes, folder }: FolderHeaderProps) => {
)}
</div>
<div className="flex items-center gap-2">
- <NodeCollaboratorsPopover nodeId={folder.id} nodes={nodes} />
+ <NodeCollaboratorsPopover
+ nodeId={folder.id}
+ nodes={nodes}
+ role={role}
+ />
<FolderSettings nodeId={folder.id} />
</div>
</div>
diff --git a/apps/desktop/src/renderer/components/messages/message.tsx b/apps/desktop/src/renderer/components/messages/message.tsx
index 1bc05207..5a3c7f86 100644
--- a/apps/desktop/src/renderer/components/messages/message.tsx
+++ b/apps/desktop/src/renderer/components/messages/message.tsx
@@ -119,14 +119,16 @@ export const Message = ({ message, previousMessage }: MessageProps) => {
}}
/>
</li>
- <li className="flex h-8 w-7 cursor-pointer items-center justify-center hover:bg-gray-200">
- <Reply
- className="size-4 cursor-pointer"
- onClick={() => {
- conversation.onReply(message);
- }}
- />
- </li>
+ {conversation.canCreateMessage && (
+ <li className="flex h-8 w-7 cursor-pointer items-center justify-center hover:bg-gray-200">
+ <Reply
+ className="size-4 cursor-pointer"
+ onClick={() => {
+ conversation.onReply(message);
+ }}
+ />
+ </li>
+ )}
{canDelete && (
<li className="flex h-8 w-7 cursor-pointer items-center justify-center hover:bg-gray-200">
<MessageDeleteButton id={message.id} />
diff --git a/apps/desktop/src/renderer/components/pages/page-header.tsx b/apps/desktop/src/renderer/components/pages/page-header.tsx
index ccbc7efd..7116804c 100644
--- a/apps/desktop/src/renderer/components/pages/page-header.tsx
+++ b/apps/desktop/src/renderer/components/pages/page-header.tsx
@@ -12,7 +12,7 @@ interface PageHeaderProps {
role: NodeRole;
}
-export const PageHeader = ({ nodes, page }: PageHeaderProps) => {
+export const PageHeader = ({ nodes, page, role }: PageHeaderProps) => {
const container = useContainer();
return (
@@ -25,7 +25,11 @@ export const PageHeader = ({ nodes, page }: PageHeaderProps) => {
)}
</div>
<div className="flex items-center gap-2">
- <NodeCollaboratorsPopover nodeId={page.id} nodes={nodes} />
+ <NodeCollaboratorsPopover
+ nodeId={page.id}
+ nodes={nodes}
+ role={role}
+ />
<PageSettings nodeId={page.id} />
</div>
</div>
diff --git a/apps/desktop/src/renderer/components/records/record-header.tsx b/apps/desktop/src/renderer/components/records/record-header.tsx
index 65be0eb8..34d90020 100644
--- a/apps/desktop/src/renderer/components/records/record-header.tsx
+++ b/apps/desktop/src/renderer/components/records/record-header.tsx
@@ -12,7 +12,7 @@ interface RecordHeaderProps {
role: NodeRole;
}
-export const RecordHeader = ({ nodes, record }: RecordHeaderProps) => {
+export const RecordHeader = ({ nodes, record, role }: RecordHeaderProps) => {
const container = useContainer();
return (
@@ -25,7 +25,11 @@ export const RecordHeader = ({ nodes, record }: RecordHeaderProps) => {
)}
</div>
<div className="flex items-center gap-2">
- <NodeCollaboratorsPopover nodeId={record.id} nodes={nodes} />
+ <NodeCollaboratorsPopover
+ nodeId={record.id}
+ nodes={nodes}
+ role={role}
+ />
<RecordSettings nodeId={record.id} />
</div>
</div>
diff --git a/apps/desktop/src/renderer/components/spaces/space-settings-dialog.tsx b/apps/desktop/src/renderer/components/spaces/space-settings-dialog.tsx
index 74907821..c5ff2e50 100644
--- a/apps/desktop/src/renderer/components/spaces/space-settings-dialog.tsx
+++ b/apps/desktop/src/renderer/components/spaces/space-settings-dialog.tsx
@@ -3,7 +3,6 @@ import {
DialogContent,
DialogTitle,
} from '@/renderer/components/ui/dialog';
-
import {
Tabs,
TabsContent,
@@ -16,7 +15,8 @@ import { SpaceDeleteForm } from '@/renderer/components/spaces/space-delete-form'
import { Info, Trash2, Users } from 'lucide-react';
import { VisuallyHidden } from '@radix-ui/react-visually-hidden';
import { NodeCollaborators } from '@/renderer/components/collaborators/node-collaborators';
-import { SpaceNode } from '@colanode/core';
+import { extractNodeRole, hasAdminAccess, SpaceNode } from '@colanode/core';
+import { useWorkspace } from '@/renderer/contexts/workspace';
interface SpaceSettingsDialogProps {
space: SpaceNode;
@@ -31,6 +31,14 @@ export const SpaceSettingsDialog = ({
onOpenChange,
defaultTab,
}: SpaceSettingsDialogProps) => {
+ const workspace = useWorkspace();
+ const role = extractNodeRole([space], workspace.userId);
+ if (!role) {
+ return null;
+ }
+
+ const canDelete = hasAdminAccess(role);
+
return (
<Dialog open={open} onOpenChange={onOpenChange}>
<DialogContent className="md:min-h-3/4 md:max-h-3/4 p-3 md:h-3/4 md:w-3/4 md:max-w-full">
@@ -69,14 +77,16 @@ export const SpaceSettingsDialog = ({
<Users className="mr-2 size-4" />
Collaborators
</TabsTrigger>
- <TabsTrigger
- key={`tab-trigger-delete`}
- className="w-full justify-start p-2 hover:bg-gray-50"
- value="delete"
- >
- <Trash2 className="mr-2 size-4" />
- Delete
- </TabsTrigger>
+ {canDelete && (
+ <TabsTrigger
+ key={`tab-trigger-delete`}
+ className="w-full justify-start p-2 hover:bg-gray-50"
+ value="delete"
+ >
+ <Trash2 className="mr-2 size-4" />
+ Delete
+ </TabsTrigger>
+ )}
</TabsList>
<div className="overflow-auto p-4">
<TabsContent
@@ -91,20 +101,26 @@ export const SpaceSettingsDialog = ({
className="focus-visible:ring-0 focus-visible:ring-offset-0"
value="collaborators"
>
- <NodeCollaborators nodeId={space.id} nodes={[space]} />
- </TabsContent>
- <TabsContent
- key="tab-content-delete"
- className="focus-visible:ring-0 focus-visible:ring-offset-0"
- value="delete"
- >
- <SpaceDeleteForm
- id={space.id}
- onDeleted={() => {
- onOpenChange(false);
- }}
+ <NodeCollaborators
+ nodeId={space.id}
+ nodes={[space]}
+ role={role}
/>
</TabsContent>
+ {canDelete && (
+ <TabsContent
+ key="tab-content-delete"
+ className="focus-visible:ring-0 focus-visible:ring-offset-0"
+ value="delete"
+ >
+ <SpaceDeleteForm
+ id={space.id}
+ onDeleted={() => {
+ onOpenChange(false);
+ }}
+ />
+ </TabsContent>
+ )}
</div>
</Tabs>
</DialogContent>
diff --git a/apps/desktop/src/renderer/components/workspaces/workspace-user-role-dropdown.tsx b/apps/desktop/src/renderer/components/workspaces/workspace-user-role-dropdown.tsx
index bae1be54..7e32bc5a 100644
--- a/apps/desktop/src/renderer/components/workspaces/workspace-user-role-dropdown.tsx
+++ b/apps/desktop/src/renderer/components/workspaces/workspace-user-role-dropdown.tsx
@@ -64,7 +64,6 @@ export const WorkspaceUserRoleDropdown = ({
}: WorkspaceUserRoleDropdownProps) => {
const workspace = useWorkspace();
const { mutate, isPending } = useMutation();
- console.log('canEdit', canEdit);
const currentRole = roles.find((role) => role.value === value);