From 4d30607cca85ebd1b71a8f1fe40bc0d580e7e829 Mon Sep 17 00:00:00 2001
From: Florian Sylvain <floriansylvainpro@gmail.com>
Date: Thu, 26 Jan 2023 21:33:29 +0100
Subject: [PATCH] Refact and code cleaning

---
 src/app.ts | 59 +++++++++++++++++++++++++++++-------------------------
 1 file changed, 32 insertions(+), 27 deletions(-)

diff --git a/src/app.ts b/src/app.ts
index 002e977..b219188 100644
--- a/src/app.ts
+++ b/src/app.ts
@@ -6,30 +6,8 @@ import cors from 'cors'
 import cookieParser from 'cookie-parser'
 import { getJwtSecret } from './utils/jwt.js'
 
-function initEnvVariables() {
-    dotenv.config()
-    const varsToCheck = ['API_PORT', 'FRONT_ORIGIN']
-
-    varsToCheck.forEach(varName => {
-        const variable = process.env[varName]
-
-        if (variable == undefined || variable === '') {
-            console.error(`Missing '${varName}' in .env`)
-            process.exit()
-        }
-    })
-}
-
-initEnvVariables()
-
 const app = express()
 const appRouter = express.Router()
-const port = process.env.API_PORT
-
-app.use(cors({ origin: process.env.FRONT_ORIGIN, credentials: true }))
-app.use(cookieParser())
-app.use(express.json())
-app.use(express.urlencoded({ extended: false }))
 
 const authMiddleware: RequestHandler = function (req, res, next) {
     const token = req.cookies.jwt
@@ -48,11 +26,38 @@ const authMiddleware: RequestHandler = function (req, res, next) {
     next()
 }
 
-appRouter.get('/', authMiddleware, async (req, res, next) => {
+const appRouterGet: RequestHandler = (req, res) => {
     res.send({ code: 200, message: "SnippetsManager v1.0" })
-})
+}
 
-appRouter.use(userRouter)
-app.use('/v1/', appRouter)
+function initEnvVariables() {
+    dotenv.config()
+    const varsToCheck = ['API_PORT', 'FRONT_ORIGIN']
 
-app.listen(port, () => console.log(`Listening on port ${port}`))
\ No newline at end of file
+    varsToCheck.forEach(varName => {
+        const variable = process.env[varName]
+
+        if (variable == undefined || variable === '') {
+            console.error(`Missing '${varName}' in .env`)
+            process.exit()
+        }
+    })
+}
+
+function startServer(): void {
+    initEnvVariables()
+
+    app.use(cors({ origin: process.env.FRONT_ORIGIN, credentials: true }))
+    app.use(cookieParser())
+    app.use(express.json())
+    app.use(express.urlencoded({ extended: false }))
+
+    appRouter.get('/', authMiddleware, appRouterGet)
+
+    appRouter.use(userRouter)
+    app.use('/v1/', appRouter)
+
+    app.listen(process.env.API_PORT, () => console.log(`Listening on port ${process.env.API_PORT}`))
+}
+
+startServer()
\ No newline at end of file