From 6716937735314a17d358104a570d1a4a7378da68 Mon Sep 17 00:00:00 2001
From: Guillaume Dorce <polynux.dev@gmail.com>
Date: Fri, 2 Sep 2022 09:58:41 +0200
Subject: [PATCH] serve public files

---
 src/api/posts/deletePost.ts  | 3 +--
 src/api/posts/editPost.ts    | 2 +-
 src/api/posts/likePost.ts    | 3 +--
 src/api/posts/newPost.ts     | 2 +-
 src/api/posts/unlikePost.ts  | 3 +--
 src/index.ts                 | 3 +++
 src/types/express/index.d.ts | 2 +-
 7 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/api/posts/deletePost.ts b/src/api/posts/deletePost.ts
index 0defa0d..fb8f048 100644
--- a/src/api/posts/deletePost.ts
+++ b/src/api/posts/deletePost.ts
@@ -4,8 +4,7 @@ import { Request, Response } from 'express';
 export default async (req: Request, res: Response) => {
   try {
     const id = parseInt(req.params.id);
-    const userId = 1; // hardcoded for now, use userId from token
-    const deletedPost = await deletePost(id, userId);
+    const deletedPost = await deletePost(id, req.userId);
     if (deletedPost instanceof Error) {
       return res.status(403).send(deletedPost.message);
     }
diff --git a/src/api/posts/editPost.ts b/src/api/posts/editPost.ts
index f0d433e..7a28d04 100644
--- a/src/api/posts/editPost.ts
+++ b/src/api/posts/editPost.ts
@@ -6,7 +6,7 @@ import { Request, Response } from 'express';
 export default async (req: Request, res: Response) => {
   try {
     req.body.id = parseInt(req.params.id);
-    req.body.authorId = 1; // hardcoded for now, use userId from token
+    req.body.authorId = req.userId;
     const post: Post = Post.parse(req.body);
     const editedPost: PrismaPost | null | Error = await editPost(post);
     if (editedPost === null) {
diff --git a/src/api/posts/likePost.ts b/src/api/posts/likePost.ts
index 5634d3d..0de2455 100644
--- a/src/api/posts/likePost.ts
+++ b/src/api/posts/likePost.ts
@@ -4,8 +4,7 @@ import { Request, Response } from 'express';
 export default async (req: Request, res: Response) => {
   try {
     const id = parseInt(req.params.id);
-    const userId = 1; // hardcoded for now, use userId from token
-    const likedPost = await likePost(id, userId);
+    const likedPost = await likePost(id, req.userId);
     if (likedPost instanceof Error) {
       return res.status(403).send(likedPost.message);
     }
diff --git a/src/api/posts/newPost.ts b/src/api/posts/newPost.ts
index 0d3f3d8..39bde35 100644
--- a/src/api/posts/newPost.ts
+++ b/src/api/posts/newPost.ts
@@ -5,7 +5,7 @@ import { Request, Response } from 'express';
 
 export default async (req: Request, res: Response) => {
   try {
-    req.body.authorId = 1; // hardcoded for now, use userId from token
+    req.body.authorId = req.userId;
     const post: Post = Post.parse(req.body);
     const newPost: PrismaPost = await createPost(post);
 
diff --git a/src/api/posts/unlikePost.ts b/src/api/posts/unlikePost.ts
index 791963b..6a88fb6 100644
--- a/src/api/posts/unlikePost.ts
+++ b/src/api/posts/unlikePost.ts
@@ -4,8 +4,7 @@ import { Request, Response } from 'express';
 export default async (req: Request, res: Response) => {
   try {
     const postId = parseInt(req.params.id);
-    const userId = 1; // hardcoded for now, use userId from token
-    const likedPost = await unlikePost(postId, userId);
+    const likedPost = await unlikePost(postId, req.userId);
     if (likedPost instanceof Error) {
       return res.status(403).send(likedPost.message);
     }
diff --git a/src/index.ts b/src/index.ts
index 0836ef1..944bb7d 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -4,6 +4,7 @@ import api from '@/api';
 import { config as envConfig } from 'dotenv';
 import { deleteExpiredTokens } from '@/controller/AuthController';
 import ms from 'ms';
+import path from 'path';
 
 envConfig();
 
@@ -40,6 +41,8 @@ app.use(cors());
 app.use(json({ limit: '50mb' }));
 app.use(urlencoded({ extended: true, limit: '50mb' }));
 
+app.use(express.static(path.join(__dirname, '../public')));
+
 app.use('/api', api);
 
 app.listen(port, () => {
diff --git a/src/types/express/index.d.ts b/src/types/express/index.d.ts
index 91b1e6f..69a86aa 100644
--- a/src/types/express/index.d.ts
+++ b/src/types/express/index.d.ts
@@ -3,7 +3,7 @@ export {};
 declare global {
   namespace Express {
     export interface Request {
-      userId?: number;
+      userId: number;
     }
   }
 }