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
Improve and refactor server for accounts, workspaces and workspace accounts
Hakan Shehud7a9885ff486
diff --git a/server/prisma/migrations/20240729154432_nodes/migration.sql b/server/prisma/migrations/20240729154432_nodes/migration.sqldeleted file mode 100644index bde593f6..00000000--- a/server/prisma/migrations/20240729154432_nodes/migration.sql+++ /dev/null@@ -1,16 +0,0 @@--- CreateTable-CREATE TABLE "nodes" (- "id" VARCHAR(30) NOT NULL,- "workspace_id" VARCHAR(30) NOT NULL,- "parent_id" VARCHAR(30),- "type" VARCHAR(30) NOT NULL,- "attrs" JSONB,- "content" JSONB,- "created_at" TIMESTAMPTZ(6) NOT NULL,- "created_by" VARCHAR(30) NOT NULL,- "updated_at" TIMESTAMPTZ(6),- "updated_by" VARCHAR(30),- "version_id" VARCHAR(30) NOT NULL,-- CONSTRAINT "nodes_pkey" PRIMARY KEY ("id")-);diff --git a/server/prisma/migrations/20240729132547_workspaces/migration.sql b/server/prisma/migrations/20240730163521_init_db/migration.sqlsimilarity index 63%rename from server/prisma/migrations/20240729132547_workspaces/migration.sqlrename to server/prisma/migrations/20240730163521_init_db/migration.sqlindex 8ec04e03..e61f4962 100644--- a/server/prisma/migrations/20240729132547_workspaces/migration.sql+++ b/server/prisma/migrations/20240730163521_init_db/migration.sql@@ -5,7 +5,7 @@ CREATE TABLE "accounts" ("email" VARCHAR(256) NOT NULL,"avatar" VARCHAR(256),"password" VARCHAR(256),- "attrs" JSONB DEFAULT 'null',+ "attrs" JSONB,"created_at" TIMESTAMPTZ(6) NOT NULL,"updated_at" TIMESTAMPTZ(6),"status" INTEGER NOT NULL,@@ -17,12 +17,15 @@ CREATE TABLE "accounts" (CREATE TABLE "workspaces" ("id" VARCHAR(30) NOT NULL,"name" VARCHAR(256) NOT NULL,- "attrs" JSONB DEFAULT 'null',+ "description" VARCHAR(256),+ "avatar" VARCHAR(256),+ "attrs" JSONB,"created_at" TIMESTAMPTZ(6) NOT NULL,"created_by" VARCHAR(30) NOT NULL,"updated_at" TIMESTAMPTZ(6),"updated_by" VARCHAR(30),"status" INTEGER NOT NULL,+ "version_id" VARCHAR(30) NOT NULL,CONSTRAINT "workspaces_pkey" PRIMARY KEY ("id"));@@ -31,16 +34,35 @@ CREATE TABLE "workspaces" (CREATE TABLE "workspace_accounts" ("workspace_id" VARCHAR(30) NOT NULL,"account_id" VARCHAR(30) NOT NULL,+ "user_node_id" VARCHAR(30) NOT NULL,"role" INTEGER NOT NULL,- "attrs" JSONB DEFAULT 'null',+ "attrs" JSONB,"created_at" TIMESTAMPTZ(6) NOT NULL,"created_by" VARCHAR(30) NOT NULL,"updated_at" TIMESTAMPTZ(6),"updated_by" VARCHAR(30),"status" INTEGER NOT NULL,+ "version_id" VARCHAR(30) NOT NULL,CONSTRAINT "workspace_accounts_pkey" PRIMARY KEY ("workspace_id","account_id"));+-- CreateTable+CREATE TABLE "nodes" (+ "id" VARCHAR(30) NOT NULL,+ "workspace_id" VARCHAR(30) NOT NULL,+ "parent_id" VARCHAR(30),+ "type" VARCHAR(30) NOT NULL,+ "attrs" JSONB,+ "content" JSONB,+ "created_at" TIMESTAMPTZ(6) NOT NULL,+ "created_by" VARCHAR(30) NOT NULL,+ "updated_at" TIMESTAMPTZ(6),+ "updated_by" VARCHAR(30),+ "version_id" VARCHAR(30) NOT NULL,++ CONSTRAINT "nodes_pkey" PRIMARY KEY ("id")+);+-- CreateIndexCREATE UNIQUE INDEX "IX_accounts_email" ON "accounts"("email");diff --git a/server/prisma/schema.prisma b/server/prisma/schema.prismaindex da848365..94c0e620 100644--- a/server/prisma/schema.prisma+++ b/server/prisma/schema.prisma@@ -13,7 +13,7 @@ model accounts {email String @unique(map: "IX_accounts_email") @db.VarChar(256)avatar String? @db.VarChar(256)password String? @db.VarChar(256)- attrs Json? @default("null")+ attrs Json?createdAt DateTime @db.Timestamptz(6) @map("created_at")updatedAt DateTime? @db.Timestamptz(6) @map("updated_at")status Int@@ -22,14 +22,17 @@ model accounts {}model workspaces {- id String @id @db.VarChar(30)- name String @db.VarChar(256)- attrs Json? @default("null")- createdAt DateTime @db.Timestamptz(6) @map("created_at")- createdBy String @db.VarChar(30) @map("created_by")- updatedAt DateTime? @db.Timestamptz(6) @map("updated_at")- updatedBy String? @db.VarChar(30) @map("updated_by")- status Int+ id String @id @db.VarChar(30)+ name String @db.VarChar(256)+ description String? @db.VarChar(256)+ avatar String? @db.VarChar(256)+ attrs Json?+ createdAt DateTime @db.Timestamptz(6) @map("created_at")+ createdBy String @db.VarChar(30) @map("created_by")+ updatedAt DateTime? @db.Timestamptz(6) @map("updated_at")+ updatedBy String? @db.VarChar(30) @map("updated_by")+ status Int+ versionId String @db.VarChar(30) @map("version_id")@@map("workspaces")}@@ -37,13 +40,15 @@ model workspaces {model workspaceAccounts {workspaceId String @db.VarChar(30) @map("workspace_id")accountId String @db.VarChar(30) @map("account_id")+ userNodeId String @db.VarChar(30) @map("user_node_id")role Int- attrs Json? @default("null")+ attrs Json?createdAt DateTime @db.Timestamptz(6) @map("created_at")createdBy String @db.VarChar(30) @map("created_by")updatedAt DateTime? @db.Timestamptz(6) @map("updated_at")updatedBy String? @db.VarChar(30) @map("updated_by")status Int+ versionId String @db.VarChar(30) @map("version_id")@@map("workspace_accounts")@@id([workspaceId, accountId])diff --git a/server/src/index.ts b/server/src/index.tsindex 6e166582..9081a3b3 100644--- a/server/src/index.ts+++ b/server/src/index.ts@@ -3,6 +3,7 @@ import cors from 'cors';import {accounts} from "@/routes/accounts";import {workspaces} from "@/routes/workspaces";import {transactions} from "@/routes/transactions";+import {authMiddleware} from "@/middlewares/auth";const app = express();const port = 3000;@@ -20,10 +21,11 @@ app.post('/v1/accounts/login/email', accounts.loginWithEmail);app.post('/v1/accounts/register/email', accounts.registerWithEmail);//workspaces-app.post('/v1/workspaces', workspaces.createWorkspace);-app.put('/v1/workspaces/:id', workspaces.updateWorkspace);-app.delete('/v1/workspaces/:id', workspaces.deleteWorkspace);-app.get('/v1/workspaces/:id', workspaces.getWorkspace);+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);//transactionsapp.post('/v1/transactions', transactions.applyTransactions);diff --git a/server/src/lib/id.ts b/server/src/lib/id.tsindex 3a880a7b..67e0236a 100644--- a/server/src/lib/id.ts+++ b/server/src/lib/id.ts@@ -8,5 +8,7 @@ export function generateId(type: IdType) {export enum IdType {Account = 'ac',- Workspace = 'wc'+ Workspace = 'wc',+ User = 'us',+ Version = 've'}\ No newline at end of filediff --git a/server/src/middlewares/auth.ts b/server/src/middlewares/auth.tsnew file mode 100644index 00000000..33ad0143--- /dev/null+++ b/server/src/middlewares/auth.ts@@ -0,0 +1,32 @@+import jwt from 'jsonwebtoken';+import {ApiError, NeuronNextFunction, NeuronRequest, NeuronResponse} from "@/types/api";++const JwtSecretKey = process.env.JWT_SECRET ?? '';+const JwtAudience = process.env.JWT_AUDIENCE ?? '';+const JwtIssuer = process.env.JWT_ISSUER ?? '';++export function authMiddleware(req: NeuronRequest, res: NeuronResponse, next: NeuronNextFunction) {+ const token = req.header('Authorization')?.split(' ')[1];++ if (!token) {+ return res.status(401).json({+ code: ApiError.Unauthorized,+ message: 'Access Denied: No Token Provided!'+ });+ }++ try {+ const decoded = jwt.verify(token, JwtSecretKey, {+ issuer: JwtIssuer,+ audience: JwtAudience,+ });++ req.accountId = decoded.sub as string;+ next();+ } catch (err) {+ res.status(400).json({+ code: ApiError.Unauthorized,+ message: 'Invalid Token'+ });+ }+}\ No newline at end of filediff --git a/server/src/routes/workspaces.ts b/server/src/routes/workspaces.tsindex 6e04aa08..1dd4db0a 100644--- a/server/src/routes/workspaces.ts+++ b/server/src/routes/workspaces.ts@@ -1,42 +1,141 @@-import {Request, Response} from "express";-import {WorkspaceInput} from "@/types/workspaces";-import {ApiError} from "@/types/api";+import {+ Workspace,+ WorkspaceAccount,+ WorkspaceAccountStatus,+ WorkspaceInput, WorkspaceOutput,+ WorkspaceRole,+ WorkspaceStatus+} from "@/types/workspaces";+import {ApiError, NeuronRequest, NeuronResponse} from "@/types/api";import {generateId, IdType} from "@/lib/id";import {prisma} from "@/data/db";+import {Node} from "@/types/nodes";-async function createWorkspace(req: Request, res: Response) {+async function createWorkspace(req: NeuronRequest, res: NeuronResponse) {const input: WorkspaceInput = req.body;+ if (!req.accountId) {+ return res+ .status(401)+ .json({+ code: ApiError.Unauthorized,+ message: "Unauthorized."+ });+ }+if (!input.name) {- return res.status(400).json({- code: ApiError.MissingRequiredFields,- message: "Missing required fields."- });+ return res+ .status(400)+ .json({+ code: ApiError.MissingRequiredFields,+ message: "Missing required fields."+ });}- const workspace = await prisma- .workspaces- .create({- data: {- id: generateId(IdType.Workspace),- name: input.name,- createdAt: new Date(),- createdBy: 'user-id',- status: 1,+ const account = await prisma+ .accounts+ .findUnique({+ where: {+ id: req.accountId}});- return res.json({+ if (!account) {+ return res+ .status(404)+ .json({+ code: ApiError.ResourceNotFound,+ message: "Account not found."+ });+ }++ const workspace: Workspace = {+ id: generateId(IdType.Workspace),+ name: input.name,+ description: input.description,+ avatar: input.avatar,+ createdAt: new Date(),+ createdBy: req.accountId,+ status: WorkspaceStatus.Active,+ versionId: generateId(IdType.Version)+ };++ const userNodeId = generateId(IdType.User);+ const userNode: Node = {+ id: userNodeId,+ workspaceId: workspace.id,+ type: 'user',+ attrs: {+ id: account.id,+ name: account.name,+ avatar: account.avatar+ },+ createdAt: new Date(),+ createdBy: userNodeId,+ versionId: generateId(IdType.Version)+ }++ const workspaceAccount: WorkspaceAccount = {+ accountId: req.accountId,+ workspaceId: workspace.id,+ userNodeId: userNodeId,+ role: WorkspaceRole.Owner,+ createdAt: new Date(),+ createdBy: req.accountId,+ status: WorkspaceAccountStatus.Active,+ versionId: generateId(IdType.Version)+ }++ await prisma+ .$transaction(+[+ prisma+ .workspaces+ .create({+ data: workspace+ }),+ prisma+ .nodes+ .create({+ data: userNode+ }),+ prisma+ .workspaceAccounts+ .create({+ data: workspaceAccount+ })+ ]+ );++ const output: WorkspaceOutput = {id: workspace.id,name: workspace.name,- createdAt: workspace.createdAt- });+ description: workspace.description,+ avatar: workspace.avatar,+ versionId: workspace.versionId,+ accountId: account.id,+ role: workspaceAccount.role,+ userNodeId: userNodeId+ };++ return res+ .status(200)+ .json(output);}-async function updateWorkspace(req: Request, res: Response) {+async function updateWorkspace(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."+ });+ }+const workspace = await prisma.workspaces.findUnique({@@ -46,10 +145,39 @@ async function updateWorkspace(req: Request, res: Response) {});if (!workspace) {- return res.status(404).json({- code: ApiError.ResourceNotFound,- message: "Workspace not found."+ return res+ .status(404)+ .json({+ code: ApiError.ResourceNotFound,+ message: "Workspace not found."+ });+ }++ 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.role !== WorkspaceRole.Owner) {+ return res+ .status(403)+ .json({+ code: ApiError.Forbidden,+ message: "Forbidden."+ });}const updatedWorkspace = await prisma@@ -61,20 +189,38 @@ async function updateWorkspace(req: Request, res: Response) {data: {name: input.name,updatedAt: new Date(),- updatedBy: 'user-id'+ updatedBy: req.accountId}});- return res.json({+ const output: WorkspaceOutput = {id: updatedWorkspace.id,name: updatedWorkspace.name,- createdAt: updatedWorkspace.createdAt- });+ description: updatedWorkspace.description,+ avatar: updatedWorkspace.avatar,+ versionId: updatedWorkspace.versionId,+ accountId: req.accountId,+ role: workspaceAccount.role,+ userNodeId: workspaceAccount.userNodeId+ }++ return res+ .status(200)+ .json(output);}-async function deleteWorkspace(req: Request, res: Response) {+async function deleteWorkspace(req: NeuronRequest, res: NeuronResponse) {const id = req.params.id;+ if (!req.accountId) {+ return res+ .status(401)+ .json({+ code: ApiError.Unauthorized,+ message: "Unauthorized."+ });+ }+const workspace = await prisma.workspaces.findUnique({@@ -84,10 +230,30 @@ async function deleteWorkspace(req: Request, res: Response) {});if (!workspace) {- return res.status(404).json({- code: ApiError.ResourceNotFound,- message: "Workspace not found."+ return res+ .status(404)+ .json({+ code: ApiError.ResourceNotFound,+ message: "Workspace not found."+ });+ }++ const workspaceAccount = await prisma+ .workspaceAccounts+ .findFirst({+ where: {+ workspaceId: id,+ accountId: req.accountId+ }});++ if (!workspaceAccount) {+ return res+ .status(403)+ .json({+ code: ApiError.Forbidden,+ message: "Forbidden."+ });}await prisma@@ -98,16 +264,25 @@ async function deleteWorkspace(req: Request, res: Response) {}});- return res.json({- id: workspace.id,- name: workspace.name,- createdAt: workspace.createdAt- });+ return res+ .status(200)+ .json({+ id: workspace.id+ });}-async function getWorkspace(req: Request, res: Response) {+async function getWorkspace(req: NeuronRequest, res: NeuronResponse) {const id = req.params.id;+ if (!req.accountId) {+ return res+ .status(401)+ .json({+ code: ApiError.Unauthorized,+ message: "Unauthorized."+ });+ }+const workspace = await prisma.workspaces.findUnique({@@ -117,20 +292,108 @@ async function getWorkspace(req: Request, res: Response) {});if (!workspace) {- return res.status(404).json({- code: ApiError.ResourceNotFound,- message: "Workspace not found."+ return res+ .status(404)+ .json({+ code: ApiError.ResourceNotFound,+ message: "Workspace not found."+ });+ }++ const workspaceAccount = await prisma+ .workspaceAccounts+ .findFirst({+ where: {+ workspaceId: id,+ accountId: req.accountId+ }});++ if (!workspaceAccount) {+ return res+ .status(403)+ .json({+ code: ApiError.Forbidden,+ message: "Forbidden."+ });}- return res.json({+ const output: WorkspaceOutput = {id: workspace.id,name: workspace.name,- createdAt: workspace.createdAt- });+ description: workspace.description,+ avatar: workspace.avatar,+ versionId: workspace.versionId,+ accountId: req.accountId,+ role: workspaceAccount.role,+ userNodeId: workspaceAccount.userNodeId+ }++ return res+ .status(200)+ .json(output);+}++export async function getWorkspaces(req: NeuronRequest, res: NeuronResponse) {+ if (!req.accountId) {+ return res+ .status(401)+ .json({+ code: ApiError.Unauthorized,+ message: "Unauthorized."+ });+ }++ const workspaceAccounts = await prisma+ .workspaceAccounts+ .findMany({+ where: {+ accountId: req.accountId+ }+ });++ const workspaceIds = workspaceAccounts.map((wa) => wa.workspaceId);+ const workspaces = await prisma+ .workspaces+ .findMany({+ where: {+ id: {+ in: workspaceIds+ }+ }+ });++ const outputs: WorkspaceOutput[] = [];++ for (const workspace of workspaces) {+ const workspaceAccount = workspaceAccounts+ .find((wa) => wa.workspaceId === workspace.id);++ if (!workspaceAccount) {+ continue;+ }++ const output: WorkspaceOutput = {+ id: workspace.id,+ name: workspace.name,+ description: workspace.description,+ avatar: workspace.avatar,+ versionId: workspace.versionId,+ accountId: req.accountId,+ role: workspaceAccount.role,+ userNodeId: workspaceAccount.userNodeId+ }++ outputs.push(output);+ }++ return res+ .status(200)+ .json(outputs);}export const workspaces = {+ getWorkspaces,createWorkspace,updateWorkspace,deleteWorkspace,diff --git a/server/src/types/api.ts b/server/src/types/api.tsindex da740507..360172d8 100644--- a/server/src/types/api.ts+++ b/server/src/types/api.ts@@ -1,3 +1,5 @@+import { Request, Response, NextFunction } from "express";+export enum ApiError {GoogleAuthFailed = "GoogleAuthFailed",UserPendingActivation = "UserPendingActivation",@@ -5,5 +7,16 @@ export enum ApiError {EmailAlreadyExists = "EmailAlreadyExists",EmailOrPasswordIncorrect = "EmailOrPasswordIncorrect",MissingRequiredFields = "MissingRequiredFields",- ResourceNotFound = "ResourceNotFound"+ ResourceNotFound = "ResourceNotFound",+ Unauthorized = "Unauthorized",+ Forbidden = "Forbidden",}+++export type NeuronRequest = Request & {+ accountId?: string | null;+};++export type NeuronResponse = Response;++export type NeuronNextFunction = NextFunction;\ No newline at end of filediff --git a/server/src/types/nodes.ts b/server/src/types/nodes.tsindex b60c90e4..40e7123d 100644--- a/server/src/types/nodes.ts+++ b/server/src/types/nodes.ts@@ -1,4 +1,13 @@-export type NodeInput = {+export type Node = {id: string;+ workspaceId: string;+ parentId?: string;type: string;+ attrs: any;+ content?: any;+ createdAt: Date;+ createdBy: string;+ updatedAt?: Date | null;+ updatedBy?: string | null;+ versionId: string;};\ No newline at end of filediff --git a/server/src/types/workspaces.ts b/server/src/types/workspaces.tsindex 38475b83..defdc5e7 100644--- a/server/src/types/workspaces.ts+++ b/server/src/types/workspaces.ts@@ -3,25 +3,57 @@ export enum WorkspaceStatus {Inactive = 2}+export enum WorkspaceRole {+ Owner = 1,+ Admin = 2,+ Collaborator = 3,+ Viewer = 4+}++export enum WorkspaceAccountStatus {+ Active = 1,+ Inactive = 2+}+export type Workspace = {id: string;name: string;description?: string | null;+ avatar?: string | null;createdAt: Date;createdBy: string;updatedAt?: Date | null;updatedBy?: string | null;status: WorkspaceStatus;+ versionId: string;+};++export type WorkspaceAccount = {+ workspaceId: string;+ accountId: string;+ userNodeId: string;+ role: WorkspaceRole;+ createdAt: Date;+ createdBy: string;+ updatedAt?: Date | null;+ updatedBy?: string | null;+ status: WorkspaceAccountStatus,+ versionId: string;};export type WorkspaceInput = {name: string;description?: string | null;+ avatar?: string | null;};export type WorkspaceOutput = {id: string;name: string;description?: string | null;- createdAt: Date;+ avatar?: string | null;+ versionId: string;+ accountId: string;+ role: WorkspaceRole;+ userNodeId: string;};\ No newline at end of file