Skip to content

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

Refactoring and improvements

Hakan Shehu5c7a0eeb6bcb
diff --git a/desktop/src/components/workspaces/container-header.tsx b/desktop/src/components/workspaces/container-header.tsx
new file mode 100644
index 00000000..dfae93aa
--- /dev/null
+++ b/desktop/src/components/workspaces/container-header.tsx
@@ -0,0 +1,20 @@
+import React from 'react';
+import { Node } from '@/types/nodes';
+import { Avatar } from '@/components/ui/avatar';
+
+interface ContainerHeaderProps {
+ node: Node;
+}
+
+export const ContainerHeader = ({ node }: ContainerHeaderProps) => {
+ const name = node.attrs.name ?? 'Untitled';
+ const avatar = node.attrs.avatar;
+ return (
+ <div className="mb-1 flex h-12 items-center justify-between border-b-2 border-gray-100 p-2 text-foreground/80">
+ <div className="flex flex-row items-center gap-2">
+ <Avatar id={node.id} name={name} avatar={avatar} className="h-6 w-6" />
+ <p>{name}</p>
+ </div>
+ </div>
+ );
+};
diff --git a/desktop/src/components/workspaces/container.tsx b/desktop/src/components/workspaces/container.tsx
index 7a594b5c..646737be 100644
--- a/desktop/src/components/workspaces/container.tsx
+++ b/desktop/src/components/workspaces/container.tsx
@@ -1,29 +1,30 @@
-import React from "react";
-import { observer } from "mobx-react-lite";
-import { useWorkspace } from "@/contexts/workspace";
-import {match} from "ts-pattern";
-import {NodeTypes} from "@/lib/constants";
-import {PageContainerNode} from "@/components/pages/page-container-node";
-import {ChannelContainerNode} from "@/components/channels/channel-container-node";
+import React from 'react';
+import { observer } from 'mobx-react-lite';
+import { useWorkspace } from '@/contexts/workspace';
+import { match } from 'ts-pattern';
+import { NodeTypes } from '@/lib/constants';
+import { PageContainerNode } from '@/components/pages/page-container-node';
+import { ChannelContainerNode } from '@/components/channels/channel-container-node';
+import { ContainerHeader } from '@/components/workspaces/container-header';
interface ContainerProps {
nodeId: string;
}
-export const Container = observer(({nodeId}: ContainerProps) => {
+export const Container = observer(({ nodeId }: ContainerProps) => {
const workspace = useWorkspace();
- const node = workspace.getNodes().find(node => node.id === nodeId);
+ const node = workspace.getNodes().find((node) => node.id === nodeId);
if (node == null) {
- return <p>Node not found.</p>
+ return <p>Node not found.</p>;
}
return (
- <div className="flex flex-col">
- <p className="h-12">Header</p>
+ <div className="flex h-full w-full flex-col">
+ <ContainerHeader node={node} />
{match(node.type)
.with(NodeTypes.Channel, () => <ChannelContainerNode node={node} />)
.with(NodeTypes.Page, () => <PageContainerNode node={node} />)
.otherwise(null)}
</div>
- )
-});
\ No newline at end of file
+ );
+});
diff --git a/desktop/src/electron/database/global/index.ts b/desktop/src/electron/database/global/index.ts
index 93cba192..9c0c3572 100644
--- a/desktop/src/electron/database/global/index.ts
+++ b/desktop/src/electron/database/global/index.ts
@@ -101,11 +101,22 @@ export class GlobalDatabase {
email: account.email,
avatar: account.avatar,
token: account.token,
+ deviceId: account.device_id,
}));
};
addAccount = async (account: Account) => {
- await this.database.insertInto('accounts').values(account).execute();
+ await this.database
+ .insertInto('accounts')
+ .values({
+ id: account.id,
+ name: account.name,
+ avatar: account.avatar,
+ email: account.email,
+ token: account.token,
+ device_id: account.deviceId,
+ })
+ .execute();
};
getWorkspaces = async (): Promise<Workspace[]> => {
diff --git a/desktop/src/electron/database/global/migrations.ts b/desktop/src/electron/database/global/migrations.ts
index a93664e0..bfc8ae9a 100644
--- a/desktop/src/electron/database/global/migrations.ts
+++ b/desktop/src/electron/database/global/migrations.ts
@@ -5,6 +5,7 @@ const createAccountsTable: Migration = {
await db.schema
.createTable('accounts')
.addColumn('id', 'text', (col) => col.notNull().primaryKey())
+ .addColumn('device_id', 'text', (col) => col.notNull())
.addColumn('name', 'text', (col) => col.notNull())
.addColumn('email', 'text', (col) => col.notNull())
.addColumn('avatar', 'text')
diff --git a/desktop/src/electron/database/global/schema.ts b/desktop/src/electron/database/global/schema.ts
index 7a654fe6..912c5bb9 100644
--- a/desktop/src/electron/database/global/schema.ts
+++ b/desktop/src/electron/database/global/schema.ts
@@ -4,6 +4,7 @@ export interface AccountsTableSchema {
email: string;
avatar: string | null;
token: string;
+ device_id: string;
}
export interface WorkspacesTableSchema {
diff --git a/desktop/src/types/accounts.ts b/desktop/src/types/accounts.ts
index 0b09d891..51460ea2 100644
--- a/desktop/src/types/accounts.ts
+++ b/desktop/src/types/accounts.ts
@@ -11,4 +11,5 @@ export type Account = {
email: string;
avatar?: string | null;
token: string;
+ deviceId: string;
};
diff --git a/server/prisma/migrations/20240805122702_add_account_devices/migration.sql b/server/prisma/migrations/20240805122702_add_account_devices/migration.sql
new file mode 100644
index 00000000..391b6929
--- /dev/null
+++ b/server/prisma/migrations/20240805122702_add_account_devices/migration.sql
@@ -0,0 +1,15 @@
+-- CreateTable
+CREATE TABLE "account_devices" (
+ "id" VARCHAR(30) NOT NULL,
+ "account_id" VARCHAR(30) NOT NULL,
+ "type" INTEGER NOT NULL,
+ "version" VARCHAR(30) NOT NULL,
+ "platform" VARCHAR(30),
+ "cpu" VARCHAR(30),
+ "hostname" VARCHAR(30),
+ "created_at" TIMESTAMPTZ(6) NOT NULL,
+ "last_online_at" TIMESTAMPTZ(6),
+ "last_active_at" TIMESTAMPTZ(6),
+
+ CONSTRAINT "account_devices_pkey" PRIMARY KEY ("id")
+);
diff --git a/server/prisma/schema.prisma b/server/prisma/schema.prisma
index 5a3cb5ed..fb6d8f86 100644
--- a/server/prisma/schema.prisma
+++ b/server/prisma/schema.prisma
@@ -74,3 +74,18 @@ model nodes {
@@map("nodes")
}
+
+model accountDevices {
+ id String @id @db.VarChar(30)
+ account_id String @db.VarChar(30)
+ type Int
+ version String @db.VarChar(30) @map("version")
+ platform String? @db.VarChar(30)
+ cpu String? @db.VarChar(30)
+ hostname String? @db.VarChar(30)
+ createdAt DateTime @db.Timestamptz(6) @map("created_at")
+ lastOnlineAt DateTime? @db.Timestamptz(6) @map("last_online_at")
+ lastActiveAt DateTime? @db.Timestamptz(6) @map("last_active_at")
+
+ @@map("account_devices")
+}
diff --git a/server/src/index.ts b/server/src/index.ts
index cf3671bb..28574627 100644
--- a/server/src/index.ts
+++ b/server/src/index.ts
@@ -1,8 +1,8 @@
import express, { Request, Response } from 'express';
import cors from 'cors';
-import { accounts } from '@/routes/accounts';
-import { workspaces } from '@/routes/workspaces';
-import { transactions } from '@/routes/transactions';
+import { accountsRouter } from '@/routes/accounts';
+import { workspacesRouter } from '@/routes/workspaces';
+import { transactionsRouter } from '@/routes/transactions';
import { authMiddleware } from '@/middlewares/auth';
const app = express();
@@ -15,21 +15,9 @@ app.get('/', (req: Request, res: Response) => {
res.send('Neuron');
});
-//accounts
-app.post('/v1/accounts/login/google', accounts.loginWithGoogle);
-app.post('/v1/accounts/login/email', accounts.loginWithEmail);
-app.post('/v1/accounts/register/email', accounts.registerWithEmail);
-
-//workspaces
-app.get('/v1/workspaces', authMiddleware, workspaces.getWorkspaces);
-app.post('/v1/workspaces', authMiddleware, workspaces.createWorkspace);
-app.put('/v1/workspaces/:id', authMiddleware, workspaces.updateWorkspace);
-app.delete('/v1/workspaces/:id', authMiddleware, workspaces.deleteWorkspace);
-app.get('/v1/workspaces/:id', authMiddleware, workspaces.getWorkspace);
-app.get('/v1/workspaces/:id/nodes', authMiddleware, workspaces.getNodes);
-
-//transactions
-app.post('/v1/transactions', transactions.applyTransactions);
+app.use('/v1/accounts', accountsRouter);
+app.use('/v1/workspaces', authMiddleware, workspacesRouter);
+app.use('/v1/transactions', authMiddleware, transactionsRouter);
app.listen(port, () => {
console.log(`Server is running at http://localhost:${port}`);
diff --git a/server/src/lib/id.ts b/server/src/lib/id.ts
index 8a76dd65..c6b7e412 100644
--- a/server/src/lib/id.ts
+++ b/server/src/lib/id.ts
@@ -2,13 +2,55 @@ import { monotonicFactory } from 'ulid';
const ulid = monotonicFactory();
-export const generateId = (type: IdType) => {
- return ulid().toLowerCase() + type;
-};
-
-export enum IdType {
+enum IdType {
Account = 'ac',
Workspace = 'wc',
User = 'us',
Version = 've',
+ Transaction = 'tr',
+ Space = 'sp',
+ Page = 'pg',
+ Channel = 'ch',
+ Node = 'nd',
+ Message = 'ms',
+ Device = 'dv',
+}
+
+export class NeuronId {
+ public static generate(type: IdType): string {
+ return ulid().toLowerCase() + type;
+ }
+
+ public static is(id: string, type: IdType): boolean {
+ return id.endsWith(type);
+ }
+
+ public static getType(id: string): IdType {
+ return id.substring(id.length - 2) as IdType;
+ }
+
+ public static getIdTypeFromNode(nodeType: string): IdType {
+ switch (nodeType) {
+ case 'account':
+ return IdType.Account;
+ case 'workspace':
+ return IdType.Workspace;
+ case 'user':
+ return IdType.User;
+ case 'version':
+ return IdType.Version;
+ case 'transaction':
+ return IdType.Transaction;
+ case 'space':
+ return IdType.Space;
+ case 'page':
+ return IdType.Page;
+ case 'channel':
+ return IdType.Channel;
+ default:
+ return IdType.Node;
+ }
+ }
+
+ public static Type = IdType;
}
diff --git a/server/src/routes/accounts.ts b/server/src/routes/accounts.ts
index 8fa02022..7f3a2901 100644
--- a/server/src/routes/accounts.ts
+++ b/server/src/routes/accounts.ts
@@ -1,4 +1,4 @@
-import { Request, Response } from 'express';
+import { Request, Response, Router } from 'express';
import {
AccountStatus,
EmailLoginInput,
@@ -9,7 +9,7 @@ import {
} from '@/types/accounts';
import axios from 'axios';
import { ApiError } from '@/types/api';
-import { generateId, IdType } from '@/lib/id';
+import { NeuronId } from '@/lib/id';
import jwt from 'jsonwebtoken';
import { prisma } from '@/data/db';
import bcrypt from 'bcrypt';
@@ -21,73 +21,9 @@ const JwtAudience = process.env.JWT_AUDIENCE ?? '';
const JwtIssuer = process.env.JWT_ISSUER ?? '';
const SaltRounds = 10;
-const buildLoginOutput = async (
- id: string,
- name: string,
- email: string,
-): Promise<LoginOutput> => {
- const signOptions: jwt.SignOptions = {
- issuer: JwtIssuer,
- audience: JwtAudience,
- subject: id,
- expiresIn: '1y',
- };
-
- const payload = {
- name: name,
- email: email,
- };
-
- const token = jwt.sign(payload, JwtSecretKey, signOptions);
+export const accountsRouter = Router();
- const accountWorkspaces = await prisma.workspaceAccounts.findMany({
- where: {
- accountId: id,
- },
- });
-
- const workspaceIds = accountWorkspaces.map((wa) => wa.workspaceId);
- const workspaces = await prisma.workspaces.findMany({
- where: {
- id: {
- in: workspaceIds,
- },
- },
- });
-
- const workspaceOutputs: WorkspaceOutput[] = [];
- for (const accountWorkspace of accountWorkspaces) {
- const workspace = workspaces.find(
- (w) => w.id === accountWorkspace.workspaceId,
- );
- if (!workspace) {
- continue;
- }
-
- workspaceOutputs.push({
- id: workspace.id,
- name: workspace.name,
- role: accountWorkspace.role,
- userNodeId: accountWorkspace.userNodeId,
- versionId: accountWorkspace.versionId,
- accountId: accountWorkspace.accountId,
- avatar: workspace.avatar,
- description: workspace.description,
- });
- }
-
- return {
- account: {
- token,
- id,
- name,
- email,
- },
- workspaces: workspaceOutputs,
- };
-};
-
-const registerWithEmail = async (req: Request, res: Response) => {
+accountsRouter.post('/register/email', async (req: Request, res: Response) => {
const input: EmailRegisterInput = req.body;
let existingAccount = await prisma.accounts.findUnique({
where: {
@@ -106,7 +42,7 @@ const registerWithEmail = async (req: Request, res: Response) => {
const password = await bcrypt.hash(input.password, salt);
const account = await prisma.accounts.create({
data: {
- id: generateId(IdType.Account),
+ id: NeuronId.generate(NeuronId.Type.Account),
name: input.name,
email: input.email,
password: password,
@@ -122,9 +58,9 @@ const registerWithEmail = async (req: Request, res: Response) => {
);
return res.status(200).json(output);
-};
+});
-const loginWithEmail = async (req: Request, res: Response) => {
+accountsRouter.post('/login/email', async (req: Request, res: Response) => {
const input: EmailLoginInput = req.body;
let account = await prisma.accounts.findUnique({
where: {
@@ -167,9 +103,9 @@ const loginWithEmail = async (req: Request, res: Response) => {
account.email,
);
return res.status(200).json(output);
-};
+});
-const loginWithGoogle = async (req: Request, res: Response) => {
+accountsRouter.post('/login/google', async (req: Request, res: Response) => {
const input: GoogleLoginInput = req.body;
const url = `${GoogleUserInfoUrl}?access_token=${input.access_token}`;
const userInfoResponse = await axios.get(url);
@@ -227,7 +163,7 @@ const loginWithGoogle = async (req: Request, res: Response) => {
const newAccount = await prisma.accounts.create({
data: {
- id: generateId(IdType.Account),
+ id: NeuronId.generate(NeuronId.Type.Account),
name: googleUser.name,
email: googleUser.email,
status: AccountStatus.Active,
@@ -241,10 +177,81 @@ const loginWithGoogle = async (req: Request, res: Response) => {
newAccount.email,
);
return res.status(200).json(output);
-};
+});
-export const accounts = {
- loginWithGoogle,
- loginWithEmail,
- registerWithEmail,
+const buildLoginOutput = async (
+ id: string,
+ name: string,
+ email: string,
+): Promise<LoginOutput> => {
+ const signOptions: jwt.SignOptions = {
+ issuer: JwtIssuer,
+ audience: JwtAudience,
+ subject: id,
+ expiresIn: '1y',
+ };
+
+ const payload = {
+ name: name,
+ email: email,
+ };
+
+ const token = jwt.sign(payload, JwtSecretKey, signOptions);
+
+ const accountWorkspaces = await prisma.workspaceAccounts.findMany({
+ where: {
+ accountId: id,
+ },
+ });
+
+ const workspaceIds = accountWorkspaces.map((wa) => wa.workspaceId);
+ const workspaces = await prisma.workspaces.findMany({
+ where: {
+ id: {
+ in: workspaceIds,
+ },
+ },
+ });
+
+ const workspaceOutputs: WorkspaceOutput[] = [];
+ for (const accountWorkspace of accountWorkspaces) {
+ const workspace = workspaces.find(
+ (w) => w.id === accountWorkspace.workspaceId,
+ );
+ if (!workspace) {
+ continue;
+ }
+
+ workspaceOutputs.push({
+ id: workspace.id,
+ name: workspace.name,
+ role: accountWorkspace.role,
+ userNodeId: accountWorkspace.userNodeId,
+ versionId: accountWorkspace.versionId,
+ accountId: accountWorkspace.accountId,
+ avatar: workspace.avatar,
+ description: workspace.description,
+ });
+ }
+
+ const accountDevice = await prisma.accountDevices.create({
+ data: {
+ id: NeuronId.generate(NeuronId.Type.Device),
+ account_id: id,
+ type: 1,
+ createdAt: new Date(),
+ version: '0.1.0',
+ },
+ });
+
+ return {
+ account: {
+ token,
+ id,
+ name,
+ email,
+ deviceId: accountDevice.id,
+ },
+ workspaces: workspaceOutputs,
+ };
};
diff --git a/server/src/routes/transactions.ts b/server/src/routes/transactions.ts
index 58df340b..f2f0fab7 100644
--- a/server/src/routes/transactions.ts
+++ b/server/src/routes/transactions.ts
@@ -1,9 +1,11 @@
-import { Request, Response } from 'express';
+import { Request, Response, Router } from 'express';
import { Transaction } from '@/types/transactions';
import { Node } from '@/types/nodes';
import { prisma } from '@/data/db';
-const applyTransactions = async (req: Request, res: Response) => {
+export const transactionsRouter = Router();
+
+transactionsRouter.post('/', async (req: Request, res: Response) => {
const transactions: Transaction[] = req.body.transactions;
const appliedTransactionIds: string[] = [];
@@ -58,8 +60,4 @@ const applyTransactions = async (req: Request, res: Response) => {
res.json({
appliedTransactionIds,
});
-};
-
-export const transactions = {
- applyTransactions,
-};
+});
diff --git a/server/src/routes/workspaces.ts b/server/src/routes/workspaces.ts
index 0bed0101..eb81ef1e 100644
--- a/server/src/routes/workspaces.ts
+++ b/server/src/routes/workspaces.ts
@@ -8,12 +8,14 @@ import {
WorkspaceStatus,
} from '@/types/workspaces';
import { ApiError, NeuronRequest, NeuronResponse } from '@/types/api';
-import { generateId, IdType } from '@/lib/id';
+import { NeuronId } from '@/lib/id';
import { prisma } from '@/data/db';
-import { Request, Response } from 'express';
+import { Request, Response, Router } from 'express';
import { Node } from '@/types/nodes';
-const createWorkspace = async (req: NeuronRequest, res: NeuronResponse) => {
+export const workspacesRouter = Router();
+
+workspacesRouter.post('/', async (req: NeuronRequest, res: NeuronResponse) => {
const input: WorkspaceInput = req.body;
if (!req.accountId) {
@@ -44,17 +46,17 @@ const createWorkspace = async (req: NeuronRequest, res: NeuronResponse) => {
}
const workspace: Workspace = {
- id: generateId(IdType.Workspace),
+ id: NeuronId.generate(NeuronId.Type.Workspace),
name: input.name,
description: input.description,
avatar: input.avatar,
createdAt: new Date(),
createdBy: req.accountId,
status: WorkspaceStatus.Active,
- versionId: generateId(IdType.Version),
+ versionId: NeuronId.generate(NeuronId.Type.Version),
};
- const userNodeId = generateId(IdType.User);
+ const userNodeId = NeuronId.generate(NeuronId.Type.User);
const workspaceAccount: WorkspaceAccount = {
accountId: req.accountId,
workspaceId: workspace.id,
@@ -63,7 +65,7 @@ const createWorkspace = async (req: NeuronRequest, res: NeuronResponse) => {
createdAt: new Date(),
createdBy: req.accountId,
status: WorkspaceAccountStatus.Active,
- versionId: generateId(IdType.Version),
+ versionId: NeuronId.generate(NeuronId.Type.Version),
};
await prisma.$transaction([
@@ -82,7 +84,7 @@ const createWorkspace = async (req: NeuronRequest, res: NeuronResponse) => {
},
createdAt: new Date(),
createdBy: userNodeId,
- versionId: generateId(IdType.Version),
+ versionId: NeuronId.generate(NeuronId.Type.Version),
},
}),
prisma.workspaceAccounts.create({
@@ -102,127 +104,133 @@ const createWorkspace = async (req: NeuronRequest, res: NeuronResponse) => {
};
return res.status(200).json(output);
-};
-
-const updateWorkspace = async (req: NeuronRequest, res: NeuronResponse) => {
- const id = req.params.id;
- const input: WorkspaceInput = req.body;
+});
+
+workspacesRouter.put(
+ '/:id',
+ async (req: NeuronRequest, res: NeuronResponse) => {
+ const id = req.params.id;
+ const input: WorkspaceInput = req.body;
+
+ if (!req.accountId) {
+ return res.status(401).json({
+ code: ApiError.Unauthorized,
+ message: 'Unauthorized.',
+ });
+ }
- if (!req.accountId) {
- return res.status(401).json({
- code: ApiError.Unauthorized,
- message: 'Unauthorized.',
+ const workspace = await prisma.workspaces.findUnique({
+ where: {
+ id: id,
+ },
});
- }
- const workspace = await prisma.workspaces.findUnique({
- where: {
- id: id,
- },
- });
+ if (!workspace) {
+ return res.status(404).json({
+ code: ApiError.ResourceNotFound,
+ message: 'Workspace not found.',
+ });
+ }
- if (!workspace) {
- return res.status(404).json({
- code: ApiError.ResourceNotFound,
- message: 'Workspace not found.',
+ const workspaceAccount = await prisma.workspaceAccounts.findFirst({
+ where: {
+ workspaceId: id,
+ accountId: req.accountId,
+ },
});
- }
- const workspaceAccount = await prisma.workspaceAccounts.findFirst({
- where: {
- workspaceId: id,
- accountId: req.accountId,
- },
- });
+ if (!workspaceAccount) {
+ return res.status(403).json({
+ code: ApiError.Forbidden,
+ message: 'Forbidden.',
+ });
+ }
- if (!workspaceAccount) {
- return res.status(403).json({
- code: ApiError.Forbidden,
- message: 'Forbidden.',
- });
- }
+ if (workspaceAccount.role !== WorkspaceRole.Owner) {
+ return res.status(403).json({
+ code: ApiError.Forbidden,
+ message: 'Forbidden.',
+ });
+ }
- if (workspaceAccount.role !== WorkspaceRole.Owner) {
- return res.status(403).json({
- code: ApiError.Forbidden,
- message: 'Forbidden.',
+ const updatedWorkspace = await prisma.workspaces.update({
+ where: {
+ id: id,
+ },
+ data: {
+ name: input.name,
+ updatedAt: new Date(),
+ updatedBy: req.accountId,
+ },
});
- }
- const updatedWorkspace = await prisma.workspaces.update({
- where: {
- id: id,
- },
- data: {
- name: input.name,
- updatedAt: new Date(),
- updatedBy: req.accountId,
- },
- });
+ const output: WorkspaceOutput = {
+ id: updatedWorkspace.id,
+ name: updatedWorkspace.name,
+ description: updatedWorkspace.description,
+ avatar: updatedWorkspace.avatar,
+ versionId: updatedWorkspace.versionId,
+ accountId: req.accountId,
+ role: workspaceAccount.role,
+ userNodeId: workspaceAccount.userNodeId,
+ };
- const output: WorkspaceOutput = {
- id: updatedWorkspace.id,
- name: updatedWorkspace.name,
- description: updatedWorkspace.description,
- avatar: updatedWorkspace.avatar,
- versionId: updatedWorkspace.versionId,
- accountId: req.accountId,
- role: workspaceAccount.role,
- userNodeId: workspaceAccount.userNodeId,
- };
+ return res.status(200).json(output);
+ },
+);
- return res.status(200).json(output);
-};
+workspacesRouter.delete(
+ '/:id',
+ async (req: NeuronRequest, res: NeuronResponse) => {
+ const id = req.params.id;
-const deleteWorkspace = async (req: NeuronRequest, res: NeuronResponse) => {
- const id = req.params.id;
+ if (!req.accountId) {
+ return res.status(401).json({
+ code: ApiError.Unauthorized,
+ message: 'Unauthorized.',
+ });
+ }
- if (!req.accountId) {
- return res.status(401).json({
- code: ApiError.Unauthorized,
- message: 'Unauthorized.',
+ const workspace = await prisma.workspaces.findUnique({
+ where: {
+ id: id,
+ },
});
- }
- const workspace = await prisma.workspaces.findUnique({
- where: {
- id: id,
- },
- });
+ if (!workspace) {
+ return res.status(404).json({
+ code: ApiError.ResourceNotFound,
+ message: 'Workspace not found.',
+ });
+ }
- if (!workspace) {
- return res.status(404).json({
- code: ApiError.ResourceNotFound,
- message: 'Workspace not found.',
+ const workspaceAccount = await prisma.workspaceAccounts.findFirst({
+ where: {
+ workspaceId: id,
+ accountId: req.accountId,
+ },
});
- }
- const workspaceAccount = await prisma.workspaceAccounts.findFirst({
- where: {
- workspaceId: id,
- accountId: req.accountId,
- },
- });
+ if (!workspaceAccount) {
+ return res.status(403).json({
+ code: ApiError.Forbidden,
+ message: 'Forbidden.',
+ });
+ }
- if (!workspaceAccount) {
- return res.status(403).json({
- code: ApiError.Forbidden,
- message: 'Forbidden.',
+ await prisma.workspaces.delete({
+ where: {
+ id: id,
+ },
});
- }
- await prisma.workspaces.delete({
- where: {
- id: id,
- },
- });
-
- return res.status(200).json({
- id: workspace.id,
- });
-};
+ return res.status(200).json({
+ id: workspace.id,
+ });
+ },
+);
-const getWorkspace = async (req: NeuronRequest, res: NeuronResponse) => {
+workspacesRouter.get(':id', async (req: NeuronRequest, res: NeuronResponse) => {
const id = req.params.id;
if (!req.accountId) {
@@ -271,9 +279,9 @@ const getWorkspace = async (req: NeuronRequest, res: NeuronResponse) => {
};
return res.status(200).json(output);
-};
+});
-const getWorkspaces = async (req: NeuronRequest, res: NeuronResponse) => {
+workspacesRouter.get('/', async (req: NeuronRequest, res: NeuronResponse) => {
if (!req.accountId) {
return res.status(401).json({
code: ApiError.Unauthorized,
@@ -322,9 +330,9 @@ const getWorkspaces = async (req: NeuronRequest, res: NeuronResponse) => {
}
return res.status(200).json(outputs);
-};
+});
-const getNodes = async (req: Request, res: Response) => {
+workspacesRouter.get('/:id/nodes', async (req: Request, res: Response) => {
const workspaceId = req.params.id as string;
const from = req.query.from as string;
const nodes = await getNodesFromDatabase(workspaceId, from);
@@ -349,7 +357,7 @@ const getNodes = async (req: Request, res: Response) => {
res.status(200).json({
nodes: outputs,
});
-};
+});
const getNodesFromDatabase = async (
workspaceId: string,
@@ -382,12 +390,3 @@ const getNodesFromDatabase = async (
});
}
};
-
-export const workspaces = {
- getWorkspaces,
- createWorkspace,
- updateWorkspace,
- deleteWorkspace,
- getWorkspace,
- getNodes,
-};
diff --git a/server/src/types/accounts.ts b/server/src/types/accounts.ts
index d871a5ca..d569ada6 100644
--- a/server/src/types/accounts.ts
+++ b/server/src/types/accounts.ts
@@ -35,6 +35,7 @@ export type AccountOutput = {
email: string;
avatar?: string | null;
token: string;
+ deviceId: string;
};
export enum AccountStatus {