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
Implement workspace users invite
Hakan Shehuf1199bb562ba
diff --git a/desktop/src/components/workspaces/workspace-settings-dialog.tsx b/desktop/src/components/workspaces/workspace-settings-dialog.tsxindex 02763251..d6bbdb0b 100644--- a/desktop/src/components/workspaces/workspace-settings-dialog.tsx+++ b/desktop/src/components/workspaces/workspace-settings-dialog.tsx@@ -4,7 +4,8 @@ import { Tabs, TabsContent, TabsList, TabsTrigger } from '@/components/ui/tabs';import { Icon } from '@/components/ui/icon';import { Avatar } from '@/components/ui/avatar';import { useWorkspace } from '@/contexts/workspace';-import { WorkspaceUpdate } from './workspace-update';+import { WorkspaceUpdate } from '@/components/workspaces/workspace-update';+import { WorkspaceUsers } from '@/components/workspaces/workspace-users';interface WorkspaceSettingsDialogProps {open: boolean;@@ -47,10 +48,10 @@ export const WorkspaceSettingsDialog = ({<TabsTriggerkey={`tab-trigger-collaborators`}className="w-full justify-start p-2 hover:bg-gray-50"- value="collaborators"+ value="users"><Icon name="group-line" className="mr-2" />- Collaborators+ Users</TabsTrigger><TabsTriggerkey={`tab-trigger-delete`}@@ -72,9 +73,9 @@ export const WorkspaceSettingsDialog = ({<TabsContentkey="tab-content-collaborators"className="focus-visible:ring-0 focus-visible:ring-offset-0"- value="collaborators"+ value="users">- <p>Coming soon.</p>+ <WorkspaceUsers /></TabsContent><TabsContentkey="tab-content-delete"diff --git a/desktop/src/components/workspaces/workspace-update.tsx b/desktop/src/components/workspaces/workspace-update.tsxindex fcad8cb8..eaef145a 100644--- a/desktop/src/components/workspaces/workspace-update.tsx+++ b/desktop/src/components/workspaces/workspace-update.tsx@@ -66,53 +66,49 @@ export const WorkspaceUpdate = () => {};return (- <div className="container flex flex-row justify-center">- <div className="w-full max-w-[700px]">- <Form {...form}>- <form- className="flex flex-col"- onSubmit={form.handleSubmit(handleSubmit)}- >- <div className="flex-grow space-y-4 py-2 pb-4">- <FormField- control={form.control}- name="name"- render={({ field }) => (- <FormItem className="flex-1">- <FormLabel>Name *</FormLabel>- <FormControl>- <Input placeholder="Name" {...field} />- </FormControl>- <FormMessage />- </FormItem>- )}- />- <FormField- control={form.control}- name="description"- render={({ field }) => (- <FormItem>- <FormLabel>Description</FormLabel>- <FormControl>- <Textarea- placeholder="Write a short description about the workspace"- {...field}- />- </FormControl>- <FormMessage />- </FormItem>- )}- />- </div>- <div className="flex flex-row justify-end gap-2">- <Button type="submit" disabled={isPending}>- {isPending && <Spinner className="mr-1" />}- Save- </Button>- </div>- </form>- </Form>- </div>- </div>+ <Form {...form}>+ <form+ className="flex flex-col"+ onSubmit={form.handleSubmit(handleSubmit)}+ >+ <div className="flex-grow space-y-4 py-2 pb-4">+ <FormField+ control={form.control}+ name="name"+ render={({ field }) => (+ <FormItem className="flex-1">+ <FormLabel>Name *</FormLabel>+ <FormControl>+ <Input placeholder="Name" {...field} />+ </FormControl>+ <FormMessage />+ </FormItem>+ )}+ />+ <FormField+ control={form.control}+ name="description"+ render={({ field }) => (+ <FormItem>+ <FormLabel>Description</FormLabel>+ <FormControl>+ <Textarea+ placeholder="Write a short description about the workspace"+ {...field}+ />+ </FormControl>+ <FormMessage />+ </FormItem>+ )}+ />+ </div>+ <div className="flex flex-row justify-end gap-2">+ <Button type="submit" disabled={isPending}>+ {isPending && <Spinner className="mr-1" />}+ Save+ </Button>+ </div>+ </form>+ </Form>);};diff --git a/desktop/src/components/workspaces/workspace-user-invite.tsx b/desktop/src/components/workspaces/workspace-user-invite.tsxnew file mode 100644index 00000000..7b5c8475--- /dev/null+++ b/desktop/src/components/workspaces/workspace-user-invite.tsx@@ -0,0 +1,99 @@+import React from 'react';+import { Icon } from '@/components/ui/icon';+import { isValidEmail } from '@/lib/utils';+import { Button } from '@/components/ui/button';+import { useWorkspaceAccountsInviteMutation } from '@/mutations/use-workspace-accounts-invite-mutation';+import { Spinner } from '@/components/ui/spinner';+import { parseApiError } from '@/lib/axios';+import { toast } from '@/components/ui/use-toast';++export const WorkspaceUserInvite = () => {+ const [input, setInput] = React.useState('');+ const [emails, setEmails] = React.useState<string[]>([]);+ const { mutate, isPending } = useWorkspaceAccountsInviteMutation();++ return (+ <div className="flex flex-col space-y-2">+ <div className="flex flex-row items-center gap-2">+ <div>+ <p>Invite with email</p>+ <p className="text-sm text-muted-foreground">+ Write the email addresses of the people you want to invite+ </p>+ </div>+ </div>+ <div className="flex flex-row items-center gap-1">+ <div className="flex h-9 w-full flex-row gap-2 rounded-md border border-input bg-background p-1 text-sm shadow-sm transition-colors placeholder:text-muted-foreground">+ {emails.map((email) => (+ <p+ key={email}+ className="flex h-full flex-row items-center gap-1 border border-gray-200 bg-gray-100 p-0.5 px-1 text-primary shadow"+ >+ <span>{email}</span>+ <Icon+ name="close-line"+ className="text-muted-foreground hover:cursor-pointer hover:text-primary"+ onClick={() => {+ setEmails((emails) => emails.filter((e) => e !== email));+ }}+ />+ </p>+ ))}+ <input+ value={input}+ className="flex-grow px-1 focus-visible:outline-none"+ onChange={(e) => setInput(e.target.value)}+ placeholder="Enter email addresses"+ onKeyUp={(e) => {+ if (e.key === 'Enter') {+ if (!input.length) {+ return;+ }++ if (emails.includes(input)) {+ return;+ }++ if (!isValidEmail(input)) {+ return;+ }++ setEmails((emails) => [...emails, input]);+ setInput('');+ }+ }}+ />+ </div>+ <Button+ variant="outline"+ className="w-32"+ disabled={isPending || emails.length == 0}+ onClick={() => {+ if (isPending) {+ return;+ }++ mutate(+ {+ emails: emails,+ },+ {+ onError: (error) => {+ const apiError = parseApiError(error);+ toast({+ title: 'Failed to login',+ description: apiError.message,+ variant: 'destructive',+ });+ },+ },+ );+ }}+ >+ {isPending && <Spinner className="mr-1" />}+ Invite+ </Button>+ </div>+ </div>+ );+};diff --git a/desktop/src/components/workspaces/workspace-user-role-dropdown.tsx b/desktop/src/components/workspaces/workspace-user-role-dropdown.tsxnew file mode 100644index 00000000..7f0230f6--- /dev/null+++ b/desktop/src/components/workspaces/workspace-user-role-dropdown.tsx@@ -0,0 +1,115 @@+import React from 'react';+import {+ DropdownMenu,+ DropdownMenuContent,+ DropdownMenuItem,+ DropdownMenuTrigger,+} from '@/components/ui/dropdown-menu';+import { WorkspaceRole } from '@/types/workspaces';+import { Spinner } from '@/components/ui/spinner';+import { Icon } from '@/components/ui/icon';+import { useWorkspaceAccountRoleUpdateMutation } from '@/mutations/use-workspace-account-role-update-mutation';+import { parseApiError } from '@/lib/axios';+import { toast } from '@/components/ui/use-toast';++interface WorkspaceRoleItem {+ name: string;+ value: WorkspaceRole;+ description: string;+ enabled: boolean;+}++const roles: WorkspaceRoleItem[] = [+ {+ name: 'Owner',+ value: WorkspaceRole.Owner,+ description: 'Owner',+ enabled: false,+ },+ {+ name: 'Admin',+ value: WorkspaceRole.Admin,+ description: 'Administration access',+ enabled: true,+ },+ {+ name: 'Collaborator',+ value: WorkspaceRole.Collaborator,+ description: 'Can contribute in content',+ enabled: true,+ },+];++interface WorkspaceUserRoleDropdownProps {+ accountId: string;+ value: number;+}++export const WorkspaceUserRoleDropdown = ({+ accountId,+ value,+}: WorkspaceUserRoleDropdownProps) => {+ const { mutate, isPending } = useWorkspaceAccountRoleUpdateMutation();+ const currentRole = roles.find((role) => role.value === value);++ return (+ <DropdownMenu>+ <DropdownMenuTrigger asChild>+ <p className="flex cursor-pointer flex-row items-center p-1 text-sm text-muted-foreground hover:bg-gray-50">+ {currentRole?.name}+ {isPending ? (+ <Spinner className="ml-2 text-muted-foreground" />+ ) : (+ <Icon+ name="arrow-down-s-line"+ className="ml-2 h-4 w-4 text-muted-foreground"+ />+ )}+ </p>+ </DropdownMenuTrigger>+ <DropdownMenuContent>+ {roles.map((role) => (+ <DropdownMenuItem+ key={role.value}+ onSelect={() => {+ if (isPending) {+ return;+ }++ mutate(+ {+ accountId,+ role: role.value,+ },+ {+ onError: (error) => {+ const apiError = parseApiError(error);+ toast({+ title: 'Failed to update role',+ description: apiError.message,+ variant: 'destructive',+ });+ },+ },+ );+ }}+ >+ <div className="flex w-full flex-row items-center justify-between">+ <div className="flex w-full flex-col">+ <p className="mb-1 text-sm font-medium leading-none">+ {role.name}+ </p>+ <p className="text-sm text-muted-foreground">+ {role.description}+ </p>+ </div>+ {value === role.value && (+ <Icon name="check-line" className="mr-2 h-4 w-4" />+ )}+ </div>+ </DropdownMenuItem>+ ))}+ </DropdownMenuContent>+ </DropdownMenu>+ );+};diff --git a/desktop/src/components/workspaces/workspace-users.tsx b/desktop/src/components/workspaces/workspace-users.tsxnew file mode 100644index 00000000..7ce3f0d3--- /dev/null+++ b/desktop/src/components/workspaces/workspace-users.tsx@@ -0,0 +1,65 @@+import React from 'react';+import { useWorkspaceUsersQuery } from '@/queries/use-workspace-users-query';+import { Separator } from '@/components/ui/separator';+import { WorkspaceUserInvite } from '@/components/workspaces/workspace-user-invite';+import { Avatar } from '@/components/ui/avatar';+import { Spinner } from '@/components/ui/spinner';+import { InView } from 'react-intersection-observer';+import { WorkspaceUserRoleDropdown } from '@/components/workspaces/workspace-user-role-dropdown';++export const WorkspaceUsers = () => {+ const { data, isPending, hasNextPage, fetchNextPage, isFetchingNextPage } =+ useWorkspaceUsersQuery();++ if (isPending) {+ return null;+ }++ return (+ <div className="flex flex-col space-y-4">+ <WorkspaceUserInvite />+ <Separator />+ <div>+ <p>Users</p>+ <p className="text-sm text-muted-foreground">+ The list of all users on the workspaces+ </p>+ </div>+ <div className="flex flex-col gap-2">+ {data.map((user) => {+ const name: string = user.attributes.name ?? 'Unknown';+ const email: string = user.attributes.email ?? ' ';+ const avatar: string | null | undefined = user.attributes.avatar;+ const role: number = user.attributes.role;+ const accountId: string = user.attributes.accountId;++ if (!accountId || !role) {+ return null;+ }++ return (+ <div key={user.id} className="flex items-center space-x-3">+ <Avatar id={user.id} name={name} avatar={avatar} />+ <div className="flex-grow">+ <p className="text-sm font-medium leading-none">{name}</p>+ <p className="text-sm text-muted-foreground">{email}</p>+ </div>+ <WorkspaceUserRoleDropdown accountId={accountId} value={role} />+ </div>+ );+ })}+ <div className="flex items-center justify-center space-x-3">+ {isFetchingNextPage && <Spinner />}+ </div>+ <InView+ rootMargin="200px"+ onChange={(inView) => {+ if (inView && hasNextPage && !isFetchingNextPage) {+ fetchNextPage();+ }+ }}+ ></InView>+ </div>+ </div>+ );+};diff --git a/desktop/src/lib/utils.ts b/desktop/src/lib/utils.tsindex 5a5a4d6b..78f4fe6e 100644--- a/desktop/src/lib/utils.ts+++ b/desktop/src/lib/utils.ts@@ -135,6 +135,29 @@ export const isValidUrl = (url: string) => {}};+const emailRegex =+ /^[-!#$%&'*+/0-9=?A-Z^_a-z`{|}~](\.?[-!#$%&'*+/0-9=?A-Z^_a-z`{|}~])*@[a-zA-Z0-9](-*\.?[a-zA-Z0-9])*\.[a-zA-Z](-?[a-zA-Z0-9])+$/;+export const isValidEmail = (email: string) => {+ if (!email) return false;++ const emailParts = email.split('@');++ if (emailParts.length !== 2) return false;++ const account = emailParts[0];+ const address = emailParts[1];++ if (account.length > 64) return false;++ if (address.length > 255) return false;++ const domainParts = address.split('.');++ if (domainParts.some((part) => part.length > 63)) return false;++ return emailRegex.test(email);+};+export const getDisplayedDates = (month: Date,): {diff --git a/desktop/src/mutations/use-workspace-account-role-update-mutation.tsx b/desktop/src/mutations/use-workspace-account-role-update-mutation.tsxnew file mode 100644index 00000000..e23d0bf8--- /dev/null+++ b/desktop/src/mutations/use-workspace-account-role-update-mutation.tsx@@ -0,0 +1,40 @@+import { useAxios } from '@/contexts/axios';+import { useWorkspace } from '@/contexts/workspace';+import { WorkspaceAccountRoleUpdateOutput } from '@/types/workspaces';+import { useMutation } from '@tanstack/react-query';++interface UpdateWorkspaceAccountRoleInput {+ accountId: string;+ role: number;+}++export const useWorkspaceAccountRoleUpdateMutation = () => {+ const workspace = useWorkspace();+ const axios = useAxios();++ return useMutation({+ mutationFn: async (input: UpdateWorkspaceAccountRoleInput) => {+ const { data } = await axios.put<WorkspaceAccountRoleUpdateOutput>(+ `v1/workspaces/${workspace.id}/accounts/${input.accountId}`,+ {+ role: input.role,+ },+ );++ const query = workspace.schema+ .updateTable('nodes')+ .set({+ attributes: JSON.stringify(data.user.attributes),+ updated_at: data.user.updatedAt,+ updated_by: data.user.updatedBy,+ version_id: data.user.versionId,+ server_updated_at: data.user.updatedAt,+ server_version_id: data.user.versionId,+ })+ .where('id', '=', data.user.id)+ .compile();++ await workspace.mutate(query);+ },+ });+};diff --git a/desktop/src/mutations/use-workspace-accounts-invite-mutation.tsx b/desktop/src/mutations/use-workspace-accounts-invite-mutation.tsxnew file mode 100644index 00000000..d98eb260--- /dev/null+++ b/desktop/src/mutations/use-workspace-accounts-invite-mutation.tsx@@ -0,0 +1,47 @@+import { useAxios } from '@/contexts/axios';+import { useWorkspace } from '@/contexts/workspace';+import { CreateNode } from '@/electron/schemas/workspace';+import { WorkspaceAccountsInviteOutput } from '@/types/workspaces';+import { useMutation } from '@tanstack/react-query';++interface InviteWorkspaceAccountsInput {+ emails: string[];+}++export const useWorkspaceAccountsInviteMutation = () => {+ const workspace = useWorkspace();+ const axios = useAxios();++ return useMutation({+ mutationFn: async (input: InviteWorkspaceAccountsInput) => {+ const { data } = await axios.post<WorkspaceAccountsInviteOutput>(+ `v1/workspaces/${workspace.id}/accounts`,+ input,+ );++ const usersToCreate: CreateNode[] = data.users.map((user) => {+ return {+ id: user.id,+ attributes: JSON.stringify(user.attributes),+ state: user.state,+ created_at: user.createdAt,+ created_by: user.createdBy,+ updated_at: user.updatedAt,+ updated_by: user.updatedBy,+ server_created_at: user.serverCreatedAt,+ server_updated_at: user.serverUpdatedAt,+ server_version_id: user.versionId,+ version_id: user.versionId,+ };+ });++ const query = workspace.schema+ .insertInto('nodes')+ .values(usersToCreate)+ .onConflict((cb) => cb.doNothing())+ .compile();++ await workspace.mutate(query);+ },+ });+};diff --git a/desktop/src/queries/use-workspace-users-query.tsx b/desktop/src/queries/use-workspace-users-query.tsxnew file mode 100644index 00000000..b97e47f4--- /dev/null+++ b/desktop/src/queries/use-workspace-users-query.tsx@@ -0,0 +1,59 @@+import { useWorkspace } from '@/contexts/workspace';+import { SelectNode } from '@/electron/schemas/workspace';+import { NodeTypes } from '@/lib/constants';+import { mapNode } from '@/lib/nodes';+import { LocalNode } from '@/types/nodes';+import { InfiniteData, useInfiniteQuery } from '@tanstack/react-query';+import { QueryResult } from 'kysely';++const USERS_PER_PAGE = 50;++export const useWorkspaceUsersQuery = () => {+ const workspace = useWorkspace();++ return useInfiniteQuery<+ QueryResult<SelectNode>,+ Error,+ LocalNode[],+ string[],+ number+ >({+ queryKey: ['workspace', 'users', workspace.id],+ initialPageParam: 0,+ getNextPageParam: (+ lastPage: QueryResult<SelectNode>,+ pages,+ ): number | undefined => {+ if (lastPage && lastPage.rows) {+ const userCount = lastPage.rows.length;++ if (userCount >= USERS_PER_PAGE) {+ return pages.length;+ }+ }+ return undefined;+ },+ queryFn: async ({ queryKey, pageParam }) => {+ const offset = pageParam * USERS_PER_PAGE;+ const query = workspace.schema+ .selectFrom('nodes')+ .selectAll()+ .where('type', '=', NodeTypes.User)+ .orderBy('created_at asc')+ .offset(offset)+ .limit(USERS_PER_PAGE)+ .compile();++ return await workspace.queryAndSubscribe({+ key: queryKey,+ page: pageParam,+ query,+ });+ },+ select: (data: InfiniteData<QueryResult<SelectNode>>): LocalNode[] => {+ const pages = data?.pages ?? [];+ const rows = pages.map((page) => page.rows).flat();+ return rows.map(mapNode);+ },+ });+};diff --git a/desktop/src/types/workspaces.ts b/desktop/src/types/workspaces.tsindex 2a1d320a..3c1183e3 100644--- a/desktop/src/types/workspaces.ts+++ b/desktop/src/types/workspaces.ts@@ -24,6 +24,14 @@ export type WorkspaceSyncData = {nodeReactions: ServerNodeReaction[];};+export type WorkspaceAccountsInviteOutput = {+ users: ServerNode[];+};++export type WorkspaceAccountRoleUpdateOutput = {+ user: ServerNode;+};+export type SidebarNode = {id: string;type: string;diff --git a/server/src/consumers/node-changes.ts b/server/src/consumers/node-changes.tsindex 71e2c56e..ca620fad 100644--- a/server/src/consumers/node-changes.ts+++ b/server/src/consumers/node-changes.ts@@ -150,12 +150,14 @@ const mapNode = (node: NodeChangeData): ServerNode => {index: node.index,attributes: JSON.parse(node.attributes),state: node.state,- createdAt: node.created_at,+ createdAt: new Date(node.created_at),createdBy: node.created_by,- updatedAt: node.updated_at,+ updatedAt: node.updated_at ? new Date(node.updated_at) : null,updatedBy: node.updated_by,versionId: node.version_id,- serverCreatedAt: node.server_created_at,- serverUpdatedAt: node.server_updated_at,+ serverCreatedAt: new Date(node.server_created_at),+ serverUpdatedAt: node.server_updated_at+ ? new Date(node.server_updated_at)+ : null,};};diff --git a/server/src/consumers/node-permission-changes.ts b/server/src/consumers/node-permission-changes.tsindex 690c4995..917740c5 100644--- a/server/src/consumers/node-permission-changes.ts+++ b/server/src/consumers/node-permission-changes.ts@@ -161,12 +161,14 @@ const mapNodePermission = (collaboratorId: reaction.collaborator_id,permission: reaction.permission,workspaceId: reaction.workspace_id,- createdAt: reaction.created_at,+ createdAt: new Date(reaction.created_at),createdBy: reaction.created_by,- updatedAt: reaction.updated_at,+ updatedAt: reaction.updated_at ? new Date(reaction.updated_at) : null,updatedBy: reaction.updated_by,versionId: reaction.version_id,- serverCreatedAt: reaction.server_created_at,- serverUpdatedAt: reaction.server_updated_at,+ serverCreatedAt: new Date(reaction.server_created_at),+ serverUpdatedAt: reaction.server_updated_at+ ? new Date(reaction.server_updated_at)+ : null,};};diff --git a/server/src/consumers/node-reaction-changes.ts b/server/src/consumers/node-reaction-changes.tsindex 0f937a71..f1dd389b 100644--- a/server/src/consumers/node-reaction-changes.ts+++ b/server/src/consumers/node-reaction-changes.ts@@ -126,7 +126,7 @@ const mapNodeReaction = (reactorId: reaction.reactor_id,reaction: reaction.reaction,workspaceId: reaction.workspace_id,- createdAt: reaction.created_at,- serverCreatedAt: reaction.server_created_at,+ createdAt: new Date(reaction.created_at),+ serverCreatedAt: new Date(reaction.server_created_at),};};diff --git a/server/src/lib/nodes.ts b/server/src/lib/nodes.tsnew file mode 100644index 00000000..dc7d71fc--- /dev/null+++ b/server/src/lib/nodes.ts@@ -0,0 +1,21 @@+import { SelectNode } from '@/data/schema';+import { ServerNode } from '@/types/nodes';++export const mapNode = (node: SelectNode): ServerNode => {+ return {+ id: node.id,+ parentId: node.parent_id,+ workspaceId: node.workspace_id,+ type: node.type,+ index: node.index,+ attributes: node.attributes,+ state: node.state,+ createdAt: node.created_at,+ createdBy: node.created_by,+ versionId: node.version_id,+ updatedAt: node.updated_at,+ updatedBy: node.updated_by,+ serverCreatedAt: node.server_created_at,+ serverUpdatedAt: node.server_updated_at,+ };+};diff --git a/server/src/lib/utils.ts b/server/src/lib/utils.tsindex ff6ec16a..8ae709a1 100644--- a/server/src/lib/utils.ts+++ b/server/src/lib/utils.ts@@ -17,3 +17,16 @@ export const compareString = (a?: string | null, b?: string | null): number => {return -1;};++export const getNameFromEmail = (email: string): string => {+ // Extract the part before the @ symbol+ const namePart = email.split('@')[0];++ // Split by dots, underscores, and dashes, then capitalize each part+ const displayName = namePart+ .split(/[._-]+/) // Split by dot, underscore, or dash+ .map((part) => part.charAt(0).toUpperCase() + part.slice(1)) // Capitalize each part+ .join(' '); // Join the parts with a space++ return displayName;+};diff --git a/server/src/routes/accounts.ts b/server/src/routes/accounts.tsindex e1b7355d..f61d2e6a 100644--- a/server/src/routes/accounts.ts+++ b/server/src/routes/accounts.ts@@ -23,9 +23,11 @@ export const accountsRouter = Router();accountsRouter.post('/register/email', async (req: Request, res: Response) => {const input: EmailRegisterInput = req.body;+ const email = input.email.toLowerCase();+let existingAccount = await database.selectFrom('accounts')- .where('email', '=', input.email)+ .where('email', '=', email).executeTakeFirst();if (existingAccount) {@@ -42,7 +44,7 @@ accountsRouter.post('/register/email', async (req: Request, res: Response) => {.values({id: NeuronId.generate(NeuronId.Type.Account),name: input.name,- email: input.email,+ email: email,password: password,status: AccountStatus.Active,created_at: new Date(),@@ -68,9 +70,11 @@ accountsRouter.post('/register/email', async (req: Request, res: Response) => {accountsRouter.post('/login/email', async (req: Request, res: Response) => {const input: EmailLoginInput = req.body;+ const email = input.email.toLowerCase();+let account = await database.selectFrom('accounts')- .where('email', '=', input.email)+ .where('email', '=', email).selectAll().executeTakeFirst();diff --git a/server/src/routes/sync.ts b/server/src/routes/sync.tsindex c4098666..cb152ac4 100644--- a/server/src/routes/sync.ts+++ b/server/src/routes/sync.ts@@ -3,6 +3,7 @@ import { database } from '@/data/database';import { Router } from 'express';import { ServerNode, ServerNodeReaction } from '@/types/nodes';import { compareString } from '@/lib/utils';+import { mapNode } from '@/lib/nodes';export const syncRouter = Router();@@ -23,24 +24,7 @@ syncRouter.get(.execute();const nodes: ServerNode[] = nodeRows- .map((node) => {- return {- id: node.id,- parentId: node.parent_id,- workspaceId: node.workspace_id,- type: node.type,- index: node.index,- attributes: node.attributes,- state: node.state,- createdAt: node.created_at.toISOString(),- createdBy: node.created_by,- versionId: node.version_id,- updatedAt: node.updated_at?.toISOString(),- updatedBy: node.updated_by,- serverCreatedAt: node.server_created_at.toISOString(),- serverUpdatedAt: node.server_updated_at?.toISOString(),- };- })+ .map((node) => mapNode(node)).sort((a, b) => compareString(a.id, b.id));const nodeReactions: ServerNodeReaction[] = nodeReactionRows.map(@@ -50,8 +34,8 @@ syncRouter.get(reactorId: nodeReaction.reactor_id,reaction: nodeReaction.reaction,workspaceId: nodeReaction.workspace_id,- createdAt: nodeReaction.created_at.toISOString(),- serverCreatedAt: nodeReaction.server_created_at.toISOString(),+ createdAt: nodeReaction.created_at,+ serverCreatedAt: nodeReaction.server_created_at,};},);diff --git a/server/src/routes/workspaces.ts b/server/src/routes/workspaces.tsindex 9f31cd27..6a635ef1 100644--- a/server/src/routes/workspaces.ts+++ b/server/src/routes/workspaces.ts@@ -1,6 +1,8 @@import {Workspace,WorkspaceAccount,+ WorkspaceAccountRoleUpdateInput,+ WorkspaceAccountsInviteInput,WorkspaceAccountStatus,WorkspaceInput,WorkspaceOutput,@@ -12,7 +14,18 @@ import { NeuronId } from '@/lib/id';import { database } from '@/data/database';import { Router } from 'express';import * as Y from 'yjs';-import { fromUint8Array } from 'js-base64';+import { fromUint8Array, toUint8Array } from 'js-base64';+import {+ CreateAccount,+ CreateNode,+ CreateWorkspaceAccount,+ SelectNode,+ SelectWorkspaceAccount,+} from '@/data/schema';+import { getNameFromEmail } from '@/lib/utils';+import { AccountStatus } from '@/types/accounts';+import { ServerNode } from '@/types/nodes';+import { mapNode } from '@/lib/nodes';export const workspacesRouter = Router();@@ -68,6 +81,9 @@ workspacesRouter.post('/', async (req: NeuronRequest, res: NeuronResponse) => {userAttributesMap.set('type', 'user');userAttributesMap.set('name', account.name);userAttributesMap.set('avatar', account.avatar);+ userAttributesMap.set('email', account.email);+ userAttributesMap.set('role', WorkspaceRole.Owner);+ userAttributesMap.set('accountId', account.id);});const userAttributes = JSON.stringify(userAttributesMap.toJSON());@@ -393,3 +409,368 @@ workspacesRouter.get('/', async (req: NeuronRequest, res: NeuronResponse) => {return res.status(200).json(outputs);});++workspacesRouter.post(+ '/:id/accounts',+ async (req: NeuronRequest, res: NeuronResponse) => {+ const id = req.params.id;+ const input: WorkspaceAccountsInviteInput = req.body;++ if (!input.emails || input.emails.length === 0) {+ return res.status(400).json({+ code: ApiError.BadRequest,+ message: 'BadRequest.',+ });+ }++ if (!req.accountId) {+ return res.status(401).json({+ code: ApiError.Unauthorized,+ message: 'Unauthorized.',+ });+ }++ const workspace = await database+ .selectFrom('workspaces')+ .selectAll()+ .where('id', '=', id)+ .executeTakeFirst();++ if (!workspace) {+ return res.status(404).json({+ code: ApiError.ResourceNotFound,+ message: 'Workspace not found.',+ });+ }++ const workspaceAccount = await database+ .selectFrom('workspace_accounts')+ .selectAll()+ .where('workspace_id', '=', id)+ .where('account_id', '=', req.accountId)+ .executeTakeFirst();++ if (!workspaceAccount) {+ return res.status(403).json({+ code: ApiError.Forbidden,+ message: 'Forbidden.',+ });+ }++ if (+ workspaceAccount.role !== WorkspaceRole.Owner &&+ workspaceAccount.role !== WorkspaceRole.Admin+ ) {+ return res.status(403).json({+ code: ApiError.Forbidden,+ message: 'Forbidden.',+ });+ }++ const existingAccounts = await database+ .selectFrom('accounts')+ .selectAll()+ .where('email', 'in', input.emails)+ .execute();++ let existingWorkspaceAccounts: SelectWorkspaceAccount[] = [];+ let existingUsers: SelectNode[] = [];+ if (existingAccounts.length > 0) {+ const existingAccountIds = existingAccounts.map((account) => account.id);+ existingWorkspaceAccounts = await database+ .selectFrom('workspace_accounts')+ .selectAll()+ .where((eb) =>+ eb.and([+ eb('account_id', 'in', existingAccountIds),+ eb('workspace_id', '=', workspace.id),+ ]),+ )+ .execute();+ }++ if (existingWorkspaceAccounts.length > 0) {+ const existingUserIds = existingWorkspaceAccounts.map(+ (workspaceAccount) => workspaceAccount.user_id,+ );+ existingUsers = await database+ .selectFrom('nodes')+ .selectAll()+ .where('id', 'in', existingUserIds)+ .execute();+ }++ const accountsToCreate: CreateAccount[] = [];+ const workspaceAccountsToCreate: CreateWorkspaceAccount[] = [];+ const usersToCreate: CreateNode[] = [];++ const users: ServerNode[] = [];+ for (const email of input.emails) {+ let account = existingAccounts.find((account) => account.email === email);++ if (!account) {+ account = {+ id: NeuronId.generate(NeuronId.Type.Account),+ name: getNameFromEmail(email),+ email: email,+ avatar: null,+ attrs: null,+ password: null,+ status: AccountStatus.Pending,+ created_at: new Date(),+ updated_at: null,+ };++ accountsToCreate.push({+ id: account.id,+ email: account.email,+ name: account.name,+ status: account.status,+ created_at: account.created_at,+ });+ }++ const existingWorkspaceAccount = existingWorkspaceAccounts.find(+ (workspaceAccount) => workspaceAccount.account_id === account!.id,+ );++ if (existingWorkspaceAccount) {+ const existingUser = existingUsers.find(+ (user) => user.id === existingWorkspaceAccount.user_id,+ );+ if (!existingUser) {+ return res.status(500).json({+ code: ApiError.InternalServerError,+ message: 'Something went wrong.',+ });+ }++ users.push(mapNode(existingUser));+ continue;+ }++ const userId = NeuronId.generate(NeuronId.Type.User);+ const userVersionId = NeuronId.generate(NeuronId.Type.Version);+ const userDoc = new Y.Doc({+ guid: userId,+ });++ const userAttributesMap = userDoc.getMap('attributes');+ userDoc.transact(() => {+ userAttributesMap.set('type', 'user');+ userAttributesMap.set('name', account!.name);+ userAttributesMap.set('avatar', account!.avatar);+ userAttributesMap.set('email', account!.email);+ userAttributesMap.set('role', WorkspaceRole.Collaborator);+ userAttributesMap.set('accountId', account!.id);+ });++ const userAttributes = JSON.stringify(userAttributesMap.toJSON());+ const userState = fromUint8Array(Y.encodeStateAsUpdate(userDoc));++ workspaceAccountsToCreate.push({+ account_id: account!.id,+ workspace_id: workspace.id,+ user_id: userId,+ role: WorkspaceRole.Collaborator,+ created_at: new Date(),+ created_by: req.accountId,+ status: WorkspaceAccountStatus.Active,+ version_id: NeuronId.generate(NeuronId.Type.Version),+ });++ const user: ServerNode = {+ id: userId,+ type: 'user',+ attributes: JSON.parse(userAttributes),+ state: userState,+ createdAt: new Date(),+ createdBy: workspaceAccount.user_id,+ serverCreatedAt: new Date(),+ versionId: userVersionId,+ workspaceId: workspace.id,+ index: null,+ };++ usersToCreate.push({+ id: user.id,+ attributes: userAttributes,+ state: userState,+ created_at: user.createdAt,+ created_by: user.createdBy,+ server_created_at: user.serverCreatedAt,+ version_id: user.versionId,+ workspace_id: user.workspaceId,+ });++ users.push(user);+ }++ if (+ accountsToCreate.length > 0 ||+ workspaceAccountsToCreate.length > 0 ||+ usersToCreate.length > 0+ ) {+ await database.transaction().execute(async (trx) => {+ if (accountsToCreate.length > 0) {+ await trx.insertInto('accounts').values(accountsToCreate).execute();+ }++ if (workspaceAccountsToCreate.length > 0) {+ await trx+ .insertInto('workspace_accounts')+ .values(workspaceAccountsToCreate)+ .execute();+ }++ if (usersToCreate.length > 0) {+ await trx.insertInto('nodes').values(usersToCreate).execute();+ }+ });+ }++ return res.status(200).json({+ users: users,+ });+ },+);++workspacesRouter.put(+ '/:id/accounts/:accountId',+ async (req: NeuronRequest, res: NeuronResponse) => {+ const id = req.params.id;+ const accountId = req.params.accountId;+ const input: WorkspaceAccountRoleUpdateInput = req.body;++ if (!req.accountId) {+ return res.status(401).json({+ code: ApiError.Unauthorized,+ message: 'Unauthorized.',+ });+ }++ const workspace = await database+ .selectFrom('workspaces')+ .selectAll()+ .where('id', '=', id)+ .executeTakeFirst();++ if (!workspace) {+ return res.status(404).json({+ code: ApiError.ResourceNotFound,+ message: 'Workspace not found.',+ });+ }++ const workspaceAccounts = await database+ .selectFrom('workspace_accounts')+ .selectAll()+ .where('workspace_id', '=', id)+ .where('account_id', 'in', [req.accountId, accountId])+ .execute();++ const currentWorkspaceAccount = workspaceAccounts.find(+ (workspaceAccount) => workspaceAccount.account_id === req.accountId,+ );++ if (!currentWorkspaceAccount) {+ return res.status(403).json({+ code: ApiError.Forbidden,+ message: 'Forbidden.',+ });+ }++ if (+ currentWorkspaceAccount.role !== WorkspaceRole.Owner &&+ currentWorkspaceAccount.role !== WorkspaceRole.Admin+ ) {+ return res.status(403).json({+ code: ApiError.Forbidden,+ message: 'Forbidden.',+ });+ }++ const workspaceAccountToUpdate = workspaceAccounts.find(+ (workspaceAccount) => workspaceAccount.account_id === accountId,+ );++ if (!workspaceAccountToUpdate) {+ return res.status(404).json({+ code: ApiError.ResourceNotFound,+ message: 'NotFound.',+ });+ }++ const user = await database+ .selectFrom('nodes')+ .selectAll()+ .where('id', '=', workspaceAccountToUpdate.user_id)+ .executeTakeFirst();++ if (!user) {+ return res.status(404).json({+ code: ApiError.ResourceNotFound,+ message: 'NotFound.',+ });+ }++ const userDoc = new Y.Doc({+ guid: user.id,+ });++ Y.applyUpdate(userDoc, toUint8Array(user.state));++ const userAttributesMap = userDoc.getMap('attributes');+ userAttributesMap.set('role', input.role);++ const userAttributes = JSON.stringify(userAttributesMap.toJSON());+ const encodedState = fromUint8Array(Y.encodeStateAsUpdate(userDoc));+ const updatedAt = new Date();++ const userNode: ServerNode = {+ id: user.id,+ type: user.type,+ workspaceId: user.workspace_id,+ index: null,+ parentId: null,+ attributes: JSON.parse(userAttributes),+ state: encodedState,+ createdAt: user.created_at,+ createdBy: user.created_by,+ serverCreatedAt: user.server_created_at,+ serverUpdatedAt: updatedAt,+ versionId: NeuronId.generate(NeuronId.Type.Version),+ updatedAt: updatedAt,+ updatedBy: currentWorkspaceAccount.user_id,+ };++ await database.transaction().execute(async (trx) => {+ await database+ .updateTable('workspace_accounts')+ .set({+ role: input.role,+ updated_at: new Date(),+ updated_by: currentWorkspaceAccount.account_id,+ version_id: NeuronId.generate(NeuronId.Type.Version),+ })+ .execute();++ await database+ .updateTable('nodes')+ .set({+ attributes: userAttributes,+ state: encodedState,+ server_updated_at: updatedAt,+ updated_at: updatedAt,+ updated_by: currentWorkspaceAccount.user_id,+ version_id: userNode.versionId,+ })+ .where('id', '=', userNode.id)+ .execute();+ });++ return res.status(200).json({+ user: userNode,+ });+ },+);diff --git a/server/src/types/api.ts b/server/src/types/api.tsindex 52d8c74d..8f764d23 100644--- a/server/src/types/api.ts+++ b/server/src/types/api.ts@@ -10,6 +10,7 @@ export enum ApiError {ResourceNotFound = 'ResourceNotFound',Unauthorized = 'Unauthorized',Forbidden = 'Forbidden',+ BadRequest = 'BadRequest',}export type NeuronRequest = Request & {diff --git a/server/src/types/nodes.ts b/server/src/types/nodes.tsindex 0692148c..e37b1b76 100644--- a/server/src/types/nodes.ts+++ b/server/src/types/nodes.ts@@ -6,13 +6,13 @@ export type ServerNode = {index: string | null;attributes: ServerNodeAttributes | null;state: string;- createdAt: string;+ createdAt: Date;createdBy: string;- updatedAt?: string | null;+ updatedAt?: Date | null;updatedBy?: string | null;versionId: string;- serverCreatedAt: string;- serverUpdatedAt?: string | null;+ serverCreatedAt: Date;+ serverUpdatedAt?: Date | null;};export type ServerNodeAttributes = {@@ -28,13 +28,13 @@ export type ServerNodePermission = {collaboratorId: string;permission: string;workspaceId: string;- createdAt: string;+ createdAt: Date;createdBy: string;- updatedAt?: string | null;+ updatedAt?: Date | null;updatedBy?: string | null;versionId: string;- serverCreatedAt: string;- serverUpdatedAt?: string | null;+ serverCreatedAt: Date;+ serverUpdatedAt?: Date | null;};export type ServerNodeReaction = {@@ -42,8 +42,8 @@ export type ServerNodeReaction = {reactorId: string;reaction: string;workspaceId: string;- createdAt: string;- serverCreatedAt: string;+ createdAt: Date;+ serverCreatedAt: Date;};export type NodeBlock = {diff --git a/server/src/types/workspaces.ts b/server/src/types/workspaces.tsindex 4a55053b..68bf97a5 100644--- a/server/src/types/workspaces.ts+++ b/server/src/types/workspaces.ts@@ -57,3 +57,11 @@ export type WorkspaceOutput = {role: WorkspaceRole;userId: string;};++export type WorkspaceAccountsInviteInput = {+ emails: string[];+};++export type WorkspaceAccountRoleUpdateInput = {+ role: WorkspaceRole;+};