Merge pull request #8 from CS3219-AY2425S1/PEER-208-Lockout-Measure

PEER-208 Add Lockout measures

Author: SeeuSim

backend/user/docker-compose.yml

@@ -26,7 +26,7 @@ services:
       dockerfile: ./express.Dockerfile
       target: build
     ports:
-      - "8001:8001"
+      - "9000:8001"
     command: node dist/index.js
     depends_on:
       postgres:

backend/user/drizzle/0000_initial_schema.sql

@@ -1,4 +1,10 @@
-CREATE TABLE IF NOT EXISTS "tableName" (
+CREATE TABLE IF NOT EXISTS "users" (
 	"id" uuid PRIMARY KEY DEFAULT gen_random_uuid() NOT NULL,
-	CONSTRAINT "tableName_id_unique" UNIQUE("id")
+	"email" varchar(255) NOT NULL,
+	"username" varchar(255) NOT NULL,
+	"first_name" varchar(255) NOT NULL,
+	"last_name" varchar(255) NOT NULL,
+	"password" varchar(255) NOT NULL,
+	CONSTRAINT "users_email_unique" UNIQUE("email"),
+	CONSTRAINT "users_username_unique" UNIQUE("username")
 );

backend/user/drizzle/0001_add_lockout_schema.sql

@@ -0,0 +1,2 @@
+ALTER TABLE "users" ADD COLUMN "failed_attempts" smallint DEFAULT 0;--> statement-breakpoint
+ALTER TABLE "users" ADD COLUMN "unlock_time" timestamp (6) with time zone;

backend/user/drizzle/0001_clammy_grandmaster.sql

@@ -1,11 +1,11 @@
 {
-  "id": "bfb0f47d-1ebe-47d4-b979-8fe9d6305cd4",
+  "id": "5dc3ebe6-ff0a-454d-b059-92180971dcfa",
   "prevId": "00000000-0000-0000-0000-000000000000",
   "version": "7",
   "dialect": "postgresql",
   "tables": {
-    "public.tableName": {
-      "name": "tableName",
+    "public.users": {
+      "name": "users",
       "schema": "",
       "columns": {
         "id": {
@@ -14,17 +14,54 @@
           "primaryKey": true,
           "notNull": true,
           "default": "gen_random_uuid()"
+        },
+        "email": {
+          "name": "email",
+          "type": "varchar(255)",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "username": {
+          "name": "username",
+          "type": "varchar(255)",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "first_name": {
+          "name": "first_name",
+          "type": "varchar(255)",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "last_name": {
+          "name": "last_name",
+          "type": "varchar(255)",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "password": {
+          "name": "password",
+          "type": "varchar(255)",
+          "primaryKey": false,
+          "notNull": true
         }
       },
       "indexes": {},
       "foreignKeys": {},
       "compositePrimaryKeys": {},
       "uniqueConstraints": {
-        "tableName_id_unique": {
-          "name": "tableName_id_unique",
+        "users_email_unique": {
+          "name": "users_email_unique",
           "nullsNotDistinct": false,
           "columns": [
-            "id"
+            "email"
+          ]
+        },
+        "users_username_unique": {
+          "name": "users_username_unique",
+          "nullsNotDistinct": false,
+          "columns": [
+            "username"
           ]
         }
       }

backend/user/drizzle/meta/0000_snapshot.json

@@ -1,6 +1,6 @@
 {
-  "id": "ecf4404b-9642-42c5-b6d6-deeaeaca7a77",
-  "prevId": "bfb0f47d-1ebe-47d4-b979-8fe9d6305cd4",
+  "id": "f5be5ec3-9d76-437e-a011-372a55170295",
+  "prevId": "5dc3ebe6-ff0a-454d-b059-92180971dcfa",
   "version": "7",
   "dialect": "postgresql",
   "tables": {
@@ -44,6 +44,19 @@
           "type": "varchar(255)",
           "primaryKey": false,
           "notNull": true
+        },
+        "failed_attempts": {
+          "name": "failed_attempts",
+          "type": "smallint",
+          "primaryKey": false,
+          "notNull": false,
+          "default": 0
+        },
+        "unlock_time": {
+          "name": "unlock_time",
+          "type": "timestamp (6) with time zone",
+          "primaryKey": false,
+          "notNull": false
         }
       },
       "indexes": {},

backend/user/drizzle/meta/0001_snapshot.json

@@ -5,15 +5,15 @@
     {
       "idx": 0,
       "version": "7",
-      "when": 1726382290778,
+      "when": 1726749267171,
       "tag": "0000_initial_schema",
       "breakpoints": true
     },
     {
       "idx": 1,
       "version": "7",
-      "when": 1726678203279,
-      "tag": "0001_clammy_grandmaster",
+      "when": 1726811697689,
+      "tag": "0001_add_lockout_schema",
       "breakpoints": true
     }
   ]

backend/user/drizzle/meta/_journal.json

@@ -9,6 +9,7 @@
     "fmt": "prettier --config .prettierrc src --write",
     "db:generate": "drizzle-kit generate",
     "db:migrate": "tsx drizzle.migrate.mts",
+    "db:inspect": "drizzle-kit studio",
     "test": "echo \"Error: no test specified\" && exit 1"
   },
   "keywords": [],
@@ -19,19 +20,26 @@
     "bcrypt": "^5.1.1",
     "drizzle-orm": "^0.33.0",
     "express": "^4.21.0",
+    "express-rate-limit": "^7.4.0",
+    "helmet": "^7.1.0",
+    "http-status-codes": "^2.3.0",
     "jsonwebtoken": "^9.0.2",
     "pino": "^9.4.0",
     "pino-http": "^10.3.0",
     "postgres": "^3.4.4"
   },
   "devDependencies": {
+    "@swc/core": "^1.7.26",
+    "@swc/helpers": "^0.5.13",
     "@types/bcrypt": "^5.0.2",
     "@types/express": "^4.17.21",
     "@types/jsonwebtoken": "^9.0.6",
     "@types/node": "^22.5.5",
     "drizzle-kit": "^0.24.2",
     "nodemon": "^3.1.4",
     "pino-pretty": "^11.2.2",
-    "ts-node": "^10.9.2"
+    "regenerator-runtime": "^0.14.1",
+    "ts-node": "^10.9.2",
+    "tsconfig-paths": "^4.2.0"
   }
 }

backend/user/package.json

@@ -0,0 +1,31 @@
+import type { Request, Response } from 'express';
+import { StatusCodes } from 'http-status-codes';
+
+import { loginService } from '@/services/auth';
+import type { ILoginPayload } from '@/services/auth/types';
+
+export async function login(req: Request, res: Response) {
+  const { username, password }: Partial<ILoginPayload> = req.body;
+  if (!username || !password) {
+    return res.status(StatusCodes.UNPROCESSABLE_ENTITY).json('Malformed Request');
+  }
+  const { code, data, error } = await loginService({ username, password });
+  if (error || code !== StatusCodes.OK || !data) {
+    const sanitizedErr = error?.message ?? 'An error occurred.';
+    return res.status(code).json(sanitizedErr);
+  }
+  return res
+    .status(StatusCodes.OK)
+    .cookie('jwtToken', data.cookie, { httpOnly: true })
+    .json(data.user);
+}
+
+export async function logout(_req: Request, res: Response) {
+  return res
+    .clearCookie('jwtToken', {
+      secure: true,
+      sameSite: 'none',
+    })
+    .status(StatusCodes.OK)
+    .json('User has been logged out.');
+}