Merge pull request #26 from IIM-Creative-Technology/dev

Release v0.2

Author: ColinEspinas

apps/api/package.json

@@ -14,6 +14,7 @@
   },
   "devDependencies": {
     "@types/jest": "^27.5.1",
+    "@types/jsonwebtoken": "^8.5.8",
     "@types/node": "^17.0.33",
     "eslint-config-custom": "*",
     "jest": "^28.1.0",
@@ -28,10 +29,12 @@
     "@prisma/client": "^3.14.0",
     "@tinyhttp/app": "^2.0.20",
     "@tinyhttp/cors": "^2.0.0",
+    "@tinyhttp/jwt": "^1.3.1",
     "@tinyhttp/logger": "^1.3.0",
     "argon2": "^0.28.5",
-    "dotenv": "^16.0.1",
     "express-validator": "^6.14.0",
-    "milliparsec": "^2.2.1"
+    "jsonwebtoken": "^8.5.1",
+    "milliparsec": "^2.2.1",
+    "socket.io": "^4.5.1"
   }
 }

apps/api/src/auth/auth-handler.ts

@@ -0,0 +1,81 @@
+import type { Request, Response } from '@tinyhttp/app';
+import { PrismaClient } from '@prisma/client';
+import { hash, verify } from 'argon2';
+import jwt from 'jsonwebtoken';
+import { validateBody, sendError } from '../utils/errors';
+
+const getHandler = (prisma: PrismaClient) => {
+  const signIn = async (req: Request, res: Response) => {
+    if (validateBody(req, res)) return;
+
+    type userData = { email: string, password: string }
+    const { email, password: unhashed }: userData = req.body;
+
+    const foundUser = await prisma.user.findUnique({
+      where: {
+        email,
+      },
+    });
+
+    if (!foundUser) {
+      sendError(res, 401, [{ msg: 'Invalid sign in' }]);
+      return;
+    }
+
+    const { id, password: hashed, ...user } = foundUser;
+
+    const isAuthenticated = await verify(hashed, unhashed);
+    if (!isAuthenticated) {
+      sendError(res, 401, [{ msg: 'Invalid sign in' }]);
+      return;
+    }
+
+    const token = jwt.sign({ id }, process.env.JWT_SECRET ?? 'secret');
+    res.status(201).json({
+      user: {
+        ...user,
+        token,
+      },
+    });
+  };
+
+  const signUp = async (req: Request, res: Response) => {
+    if (validateBody(req, res)) return;
+
+    type userData = { email: string, name: string, password: string }
+    const { email, name, password: unhashed }: userData = req.body;
+
+    const password = await hash(unhashed);
+
+    try {
+      const { id, ...user } = await prisma.user.create({
+        data: {
+          email,
+          password,
+          name,
+        },
+      });
+      const token = jwt.sign({ id }, process.env.JWT_SECRET ?? 'secret');
+      res.status(201).json({
+        user: {
+          token,
+          ...user,
+        },
+      });
+    } catch (err) {
+      sendError(res, 400, [
+        {
+          value: email,
+          msg: 'Email already in use',
+        },
+      ]);
+    }
+  };
+
+  return {
+    signIn,
+    signUp,
+  };
+};
+
+export { getHandler };

apps/api/src/auth/auth-routes.ts

@@ -0,0 +1,26 @@
+import type { App } from '@tinyhttp/app';
+import type { PrismaClient } from '@prisma/client';
+import type { Server } from 'socket.io';
+import { body } from 'express-validator';
+import { getHandler } from './auth-handler';
+// import { requireAuth } from '../util/middleware.js';
+
+const authRoutes = (app: App, io: Server, prisma: PrismaClient) => {
+  const handler = getHandler(prisma);
+
+  app.post(
+    '/signin',
+    body('email').notEmpty().isEmail().normalizeEmail(),
+    body('password').notEmpty(),
+    handler.signIn,
+  );
+  app.post(
+    '/signup',
+    body('email').isEmail().normalizeEmail(),
+    body('name').notEmpty().trim().escape(),
+    body('password').isLength({ min: 6 }),
+    handler.signUp,
+  );
+};
+
+export { authRoutes };

apps/api/src/column/column-handler.ts

@@ -0,0 +1,105 @@
+import type { Request, Response } from '@tinyhttp/app';
+import { PrismaClient } from '@prisma/client';
+import { sendError, validateBody } from '../utils/errors';
+
+const getHandler = (prisma: PrismaClient) => {
+  const getColumns = async (req: Request, res: Response) => {
+    res.json(await prisma.column.findMany({
+      include: {
+        project: true,
+        tasks: true,
+      },
+    }));
+  };
+
+  const getColumn = async (req: Request, res: Response) => {
+    res.json(await prisma.column.findUnique({
+      where: {
+        id: +req.params.id,
+      },
+      include: {
+        project: true,
+        tasks: true,
+      },
+    }));
+  };
+
+  const createColumn = async (req: Request, res: Response) => {
+    if (validateBody(req, res)) return;
+
+    type columnData = { name: string, projectId: number }
+    const { name, projectId }: columnData = req.body;
+
+    try {
+      const newColumn = await prisma.column.create({
+        data: {
+          name,
+          project: {
+            connect: {
+              id: projectId,
+            },
+          },
+        },
+      });
+      res.json(newColumn);
+    } catch (err) {
+      sendError(res, 400, [
+        {
+          msg: 'Could not create column',
+        },
+      ]);
+    }
+  };
+
+  const updateColumn = async (req: Request, res: Response) => {
+    if (validateBody(req, res)) return;
+
+    type columnData = { name: string, projectId: number }
+    const { name, projectId }: columnData = req.body;
+
+    try {
+      const updatedProject = await prisma.column.update({
+        where: {
+          id: +req.params.id,
+        },
+        data: {
+          name: name ?? undefined,
+          projectId: projectId ?? undefined,
+        },
+      });
+      res.json(updatedProject);
+    } catch (err) {
+      sendError(res, 400, [
+        {
+          msg: 'Could not update column',
+        },
+      ]);
+    }
+  };
+
+  const deleteColumn = async (req: Request, res: Response) => {
+    try {
+      res.json(await prisma.column.delete({
+        where: {
+          id: +req.params.id,
+        },
+      }));
+    } catch (err) {
+      sendError(res, 400, [
+        {
+          msg: 'Could not delete column',
+        },
+      ]);
+    }
+  };
+
+  return {
+    getColumns,
+    getColumn,
+    createColumn,
+    updateColumn,
+    deleteColumn,
+  };
+};
+
+export { getHandler };

apps/api/src/column/column-routes.ts

@@ -0,0 +1,21 @@
+import type { App } from '@tinyhttp/app';
+import type { PrismaClient } from '@prisma/client';
+import { body } from 'express-validator';
+import type { Server } from 'socket.io';
+import { getHandler } from './column-handler';
+
+const projectRoutes = (app: App, io: Server, prisma: PrismaClient) => {
+  const handler = getHandler(prisma);
+
+  app.get('/projects', handler.getColumns);
+  app.get('/projects/:id', handler.getColumn);
+  app.post(
+    '/projects',
+    body('name').notEmpty().trim().escape(),
+    handler.createColumn,
+  );
+  app.patch('/projects/:id', handler.updateColumn);
+  app.delete('/projects/:id', handler.deleteColumn);
+};
+
+export { projectRoutes };

apps/api/src/create-api.ts

@@ -1,22 +1,34 @@
+import { Server } from 'socket.io';
+import http from 'http';
 import { App } from '@tinyhttp/app';
 import { cors } from '@tinyhttp/cors';
+import { jwt } from '@tinyhttp/jwt';
 import { json } from 'milliparsec';
 import type { PrismaClient } from '@prisma/client';
+import { logger } from '@tinyhttp/logger';
 import { userRoutes } from './user/user-routes';
+import { projectRoutes } from './project/project-routes';
+import { authRoutes } from './auth/auth-routes';
+import { taskRoutes } from './task/task-routes';
 
-const createApi = (prisma: unknown) => {
+const createApi = (prisma: PrismaClient) => {
   const app = new App();
+  const server = http.createServer();
+  server.on('request', app.attach);
+  const io = new Server(server);
 
   app
+    .use(jwt({ secret: process.env.JWT_SECRET ?? 'secret', algorithm: 'HS256' }))
     .use(cors())
-    .use((req, res, next) => (req.headers['content-type'] === 'application/json' ? json()(req, res, next) : next()));
+    .use((req, res, next) => (req.headers['content-type'] === 'application/json' ? json()(req, res, next) : next()))
+    .use(logger());
 
-  userRoutes(app, prisma as PrismaClient);
-  // authRoutes(app, ajv, prisma)
-  // profileRoutes(app, ajv, prisma)
-  // articleRoutes(app, ajv, prisma)
+  authRoutes(app, io, prisma);
+  userRoutes(app, io, prisma);
+  projectRoutes(app, io, prisma);
+  taskRoutes(app, io, prisma);
 
-  return app;
+  return server;
 };
 
 export { createApi };