diff --git a/package-lock.json b/package-lock.json index 3b4adbb..0804ad1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -16,9 +16,11 @@ "@node-rs/argon2": "^2.0.2", "@prisma/adapter-mariadb": "^7.1.0", "@prisma/client": "^7.1.0", + "class-transformer": "^0.5.1", "class-validator": "^0.14.3", "cookie-parser": "^1.4.7", "dotenv": "^17.2.3", + "express-session": "^1.18.2", "helmet": "^8.1.0", "prisma": "^7.1.0", "reflect-metadata": "^0.2.2", @@ -4896,6 +4898,12 @@ "dev": true, "license": "MIT" }, + "node_modules/class-transformer": { + "version": "0.5.1", + "resolved": "https://registry.npmjs.org/class-transformer/-/class-transformer-0.5.1.tgz", + "integrity": "sha512-SQa1Ws6hUbfC98vKGxZH3KFY0Y1lm5Zm0SY8XX9zbK7FJCyVEac3ATW0RIpwzW+oOfmHE5PMPufDG9hCfoEOMw==", + "license": "MIT" + }, "node_modules/class-validator": { "version": "0.14.3", "resolved": "https://registry.npmjs.org/class-validator/-/class-validator-0.14.3.tgz", @@ -5950,6 +5958,46 @@ "url": "https://opencollective.com/express" } }, + "node_modules/express-session": { + "version": "1.18.2", + "resolved": "https://registry.npmjs.org/express-session/-/express-session-1.18.2.tgz", + "integrity": "sha512-SZjssGQC7TzTs9rpPDuUrR23GNZ9+2+IkA/+IJWmvQilTr5OSliEHGF+D9scbIpdC6yGtTI0/VhaHoVes2AN/A==", + "license": "MIT", + "dependencies": { + "cookie": "0.7.2", + "cookie-signature": "1.0.7", + "debug": "2.6.9", + "depd": "~2.0.0", + "on-headers": "~1.1.0", + "parseurl": "~1.3.3", + "safe-buffer": "5.2.1", + "uid-safe": "~2.1.5" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/express-session/node_modules/cookie-signature": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.7.tgz", + "integrity": "sha512-NXdYc3dLr47pBkpUCHtKSwIOQXLVn8dZEuywboCOJY/osA0wFSLlSawr3KN8qXJEyX66FcONTH8EIlVuK0yyFA==", + "license": "MIT" + }, + "node_modules/express-session/node_modules/debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "license": "MIT", + "dependencies": { + "ms": "2.0.0" + } + }, + "node_modules/express-session/node_modules/ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", + "license": "MIT" + }, "node_modules/exsolve": { "version": "1.0.8", "resolved": "https://registry.npmjs.org/exsolve/-/exsolve-1.0.8.tgz", @@ -8586,6 +8634,15 @@ "node": ">= 0.8" } }, + "node_modules/on-headers": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/on-headers/-/on-headers-1.1.0.tgz", + "integrity": "sha512-737ZY3yNnXy37FHkQxPzt4UZ2UWPWiCZWLvFZ4fu5cueciegX0zGPnrlY6bwRg4FdQOe9YU8MkmJwGhoMybl8A==", + "license": "MIT", + "engines": { + "node": ">= 0.8" + } + }, "node_modules/once": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", @@ -9136,6 +9193,15 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/random-bytes": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/random-bytes/-/random-bytes-1.0.0.tgz", + "integrity": "sha512-iv7LhNVO047HzYR3InF6pUcUsPQiHTM1Qal51DcGSuZFBil1aBBWG5eHPNek7bvILMaYJ/8RU1e8w1AMdHmLQQ==", + "license": "MIT", + "engines": { + "node": ">= 0.8" + } + }, "node_modules/randombytes": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz", @@ -10537,6 +10603,18 @@ "node": ">=8" } }, + "node_modules/uid-safe": { + "version": "2.1.5", + "resolved": "https://registry.npmjs.org/uid-safe/-/uid-safe-2.1.5.tgz", + "integrity": "sha512-KPHm4VL5dDXKz01UuEd88Df+KzynaohSL9fBh096KWAxSKZQDI2uBrVqtvRM4rwrIrRRKsdLNML/lnaaVSRioA==", + "license": "MIT", + "dependencies": { + "random-bytes": "~1.0.0" + }, + "engines": { + "node": ">= 0.8" + } + }, "node_modules/uint8array-extras": { "version": "1.5.0", "resolved": "https://registry.npmjs.org/uint8array-extras/-/uint8array-extras-1.5.0.tgz", diff --git a/package.json b/package.json index 5aa3176..0099035 100644 --- a/package.json +++ b/package.json @@ -30,9 +30,11 @@ "@node-rs/argon2": "^2.0.2", "@prisma/adapter-mariadb": "^7.1.0", "@prisma/client": "^7.1.0", + "class-transformer": "^0.5.1", "class-validator": "^0.14.3", "cookie-parser": "^1.4.7", "dotenv": "^17.2.3", + "express-session": "^1.18.2", "helmet": "^8.1.0", "prisma": "^7.1.0", "reflect-metadata": "^0.2.2", diff --git a/src/application/ports/user.port.ts b/src/application/ports/user.port.ts index f08c99b..8198aa7 100644 --- a/src/application/ports/user.port.ts +++ b/src/application/ports/user.port.ts @@ -1 +1,6 @@ -export interface IUserService {} +import { Result } from '@/result'; +import { User } from '@/domain/user/user.model'; + +export interface IUserService { + findById(id: string): Promise>; +} diff --git a/src/application/services/user.service.ts b/src/application/services/user.service.ts index 9916d3f..bf0e4b1 100644 --- a/src/application/services/user.service.ts +++ b/src/application/services/user.service.ts @@ -1,6 +1,8 @@ import { type IUserRepository } from '@/domain/user/user-repository.interface'; import { IUserService } from '@/application/ports/user.port'; import { Inject, Injectable } from '@nestjs/common'; +import { Result } from '@/result'; +import { User } from '@/domain/user/user.model'; @Injectable() export class UserService implements IUserService { @@ -9,4 +11,8 @@ export class UserService implements IUserService { constructor(@Inject('REPO.USER') _userRepository: IUserRepository) { this.userRepository = _userRepository; } + + async findById(id: string): Promise> { + return this.userRepository.findById(id); + } } diff --git a/src/main.ts b/src/main.ts index 96dd0c3..b3398d5 100644 --- a/src/main.ts +++ b/src/main.ts @@ -37,14 +37,15 @@ async function bootstrap() { app.use( session({ secret: process.env.SESSION_SECRET, - resave: false, + resave: true, saveUninitialized: false, + rolling: true, // Reset maxAge on every request cookie: { // For cross-site requests (frontend != backend) browsers require SameSite='None' and Secure=true sameSite: isProduction ? 'none' : 'lax', secure: isProduction, httpOnly: true, - maxAge: 1000 * 60 * 60 * 1, // One hour + maxAge: 1000 * 60 * 60 * 24, // 24 hours }, }), ); diff --git a/src/presentation/controllers/user.controller.ts b/src/presentation/controllers/user.controller.ts index ad8c2a6..5caca95 100644 --- a/src/presentation/controllers/user.controller.ts +++ b/src/presentation/controllers/user.controller.ts @@ -1,4 +1,54 @@ -import { Controller } from '@nestjs/common'; +import { SessionData } from '@/types/session.types'; +import { UserDTO } from '@/presentation/dtos/user.dto'; +import { IUserService } from '@/application/ports/user.port'; +import { User } from '@/domain/user/user.model'; +import { Result } from '@/result'; +import { + Controller, + Get, + Inject, + NotFoundException, + Session, + UnauthorizedException, +} from '@nestjs/common'; @Controller('user') -export class UserController {} +export class UserController { + private readonly userService: IUserService; + + constructor(@Inject('SERVICE.USER') _userService: IUserService) { + this.userService = _userService; + } + + @Get('profile') + async getProfile( + @Session() session: SessionData, + ): Promise<{ user: UserDTO }> { + if (!session || !session.user) { + throw new UnauthorizedException('No active session'); + } + + const result: Result = await this.userService.findById( + session.user.id, + ); + if (result._tag === 'Failure' || !result.data) { + throw new NotFoundException('User not found'); + } + + const freshUser = result.data; + session.user = freshUser; + + return { user: this.toUserDto(freshUser) }; + } + + private toUserDto(user: User): UserDTO { + const dto = new UserDTO(); + dto.id = user.id; + dto.name = user.name; + dto.email = user.email; + dto.role = user.role; + dto.createdAt = user.createdAt; + dto.updatedAt = user.updatedAt; + return dto; + } +}