feat: login working and cookie being set

Author: gare-dev

.github/workflows/ci.yml

@@ -0,0 +1,52 @@
+name: CI Monorepo
+
+on:
+ push:
+  branches: [develop, master]
+ pull_request:
+  branches: [develop, master]
+
+jobs:
+ test-client:
+  name: Test Client
+  runs-on: ubuntu-latest
+  defaults:
+   run:
+    working-directory: ./client
+
+  steps:
+   - name: Checkout repository
+     uses: actions/checkout@v3
+
+   - name: Setup Node.js
+     uses: actions/setup-node@v3
+     with:
+      node-version: 18
+
+   - name: Install dependencies
+     run: npm install
+
+   - name: Run client tests
+     run: npm test
+
+ test-server:
+  name: Test Server
+  runs-on: ubuntu-latest
+  defaults:
+   run:
+    working-directory: ./server
+
+  steps:
+   - name: Checkout repository
+     uses: actions/checkout@v3
+
+   - name: Setup Node.js
+     uses: actions/setup-node@v3
+     with:
+      node-version: 18
+
+   - name: Install dependencies
+     run: npm install
+
+   - name: Run server tests
+     run: npm test

package-lock.json

@@ -14,12 +14,16 @@
     "bcrypt": "^6.0.0",
     "cors": "^2.8.5",
     "express": "^5.1.0",
+    "jsonwebtoken": "^9.0.2",
+    "memory-cache": "^0.2.0",
     "zod": "^4.0.13"
   },
   "devDependencies": {
     "@types/bcrypt": "^6.0.0",
     "@types/cors": "^2.8.19",
     "@types/express": "^5.0.3",
+    "@types/jsonwebtoken": "^9.0.10",
+    "@types/memory-cache": "^0.2.6",
     "@types/node": "^24.1.0",
     "jest": "^30.0.5",
     "prisma": "^6.12.0",

server/package.json

@@ -1,14 +1,11 @@
 import prisma from "../db/connect";
-import bcrypt from "bcrypt"
 import { CreateUserDTO, LoginUser, PublicUserDTO } from "../db/models/UsersModel";
 
 export class UserRepository {
     async create(user: Omit<CreateUserDTO, "idUser">): Promise<PublicUserDTO> {
-        const createdUser = await prisma.users.create({
+        return this.toPublicDTO(await prisma.users.create({
             data: user
-        });
-        return this.toPublicDTO(createdUser)
-
+        }));
     }
 
     async findByEmail(email: string): Promise<PublicUserDTO | null> {
@@ -17,17 +14,10 @@ export class UserRepository {
         })
     }
 
-    async loginUser(email: string, password: string): Promise<LoginUser | null> {
-        const user = await prisma.users.findUnique({
+    async loginUser(email: string,): Promise<CreateUserDTO | null> {
+        return await prisma.users.findUnique({
             where: { email: email }
         })
-
-        if (user) {
-            if (await bcrypt.compare(password, user.password)) {
-                return { name: user.name, email: user.email }
-            }
-        }
-        return null
     }
 
     private toPublicDTO(user: CreateUserDTO): PublicUserDTO {

server/src/repositories/UserRepository.ts

@@ -2,10 +2,11 @@ import express, { Request, Response } from "express"
 import { UserService } from "../services/UserService"
 import { UserRepository } from "../repositories/UserRepository"
 import { validateLogin, validateUser } from "../../utils/validateUser"
-import { CustomError, InvalidRequest } from "../errors/HttpError"
+import { InvalidRequest } from "../errors/HttpError"
+import { JWTClass } from "../../utils/jwt"
 
 const router = express.Router()
-const service = new UserService(new UserRepository())
+const service = new UserService(new UserRepository(), new JWTClass(process.env.JWT_TOKEN!))
 
 router.post("/user", async (req: Request, res: Response) => {
     const { email, name, password } = req.body
@@ -35,20 +36,24 @@ router.post('/auth/login', async (req: Request, res: Response) => {
     const validLogin = validateLogin({ email, password })
 
     if (validLogin.error) {
-        return new InvalidRequest("Invalid login.", 400, "INVALID_LOGIN", validLogin.error.issues.map(err => ({
+        throw new InvalidRequest("Invalid login.", 400, "INVALID_LOGIN", validLogin.error.issues.map(err => ({
             fields: err.path.join('.'),
             message: err.message
         })))
     }
-    const login = await service.loginUser(email, password)
-
-    if (login) {
-        return res.status(200).json({
+    const token = await service.loginUser(email, password)
+
+    return res.
+        cookie('token', token, {
+            httpOnly: true,
+            sameSite: "strict",
+            path: "/",
+            secure: true
+        }).status(200).json({
             message: "User logged in successfully.",
-            token: "TOKEN"
+            code: "USER_LOGGED"
         })
-    }
-    throw new CustomError("Incorrect email or password.", 401, "INCORRECT_LOGIN")
+
 })
 
 export default router

server/src/routes/UserRoutes.ts

@@ -2,16 +2,21 @@ import { CreateUserDTO } from "../db/models/UsersModel";
 import { CustomError } from "../errors/HttpError";
 import { UserRepository } from "../repositories/UserRepository";
 import hashPassword from "../../utils/hashPassword"
+import bcrypt from "bcrypt"
+import { JWTClass } from "../../utils/jwt"
 
 
 export class UserService {
-    constructor(private repository: UserRepository) { }
+    constructor(
+        private repository: UserRepository,
+        private jwtHandler: JWTClass
+    ) { }
 
     async createUser(user: Omit<CreateUserDTO, "idUser">) {
         const existing = await this.repository.findByEmail(user.email)
 
         if (existing) {
-            return new CustomError("Email already used.", 400, "REPEATED_EMAIL")
+            throw new CustomError("Email already used.", 400, "REPEATED_EMAIL")
         }
 
         const newUser = await this.repository.create({
@@ -24,10 +29,11 @@ export class UserService {
     }
 
     async loginUser(email: string, password: string) {
-        const login = await this.repository.loginUser(email, password)
+        const user = await this.repository.loginUser(email)
 
-        if (login) return login
-
-        return null
+        if (!user || !(await bcrypt.compare(password, user.password))) {
+            throw new CustomError("Incorrect email or password.", 401, "INCORRECT_LOGIN")
+        }
+        return this.jwtHandler.generateJWT({ email: user.email })
     }
 }