From 3b201d63fe55c4c0b405fd031dce1d6433e9f570 Mon Sep 17 00:00:00 2001 From: Mathis Date: Mon, 15 Jul 2024 12:16:51 +0200 Subject: [PATCH] refactor(auth): simplify AdminGuard constructor and register it in AuthModule The AdminGuard constructor is being simplified by using constructor parameter properties, rather than previously setting properties via Reflector in the constructor's body. Additionally, AuthModule now includes AdminGuard in its providers. --- src/auth/auth.guard.ts | 12 ++++-------- src/auth/auth.module.ts | 3 ++- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/src/auth/auth.guard.ts b/src/auth/auth.guard.ts index defebc3..93422b6 100644 --- a/src/auth/auth.guard.ts +++ b/src/auth/auth.guard.ts @@ -49,14 +49,10 @@ export class UserGuard implements CanActivate { @Injectable() export class AdminGuard implements CanActivate { - private readonly credentialService: CredentialsService; - private readonly databaseService: DrizzleService; - - constructor() { - const reflector = new Reflector(); - this.credentialService = reflector.get('CredentialsService', UserGuard); - this.databaseService = reflector.get('DrizzleService', UserGuard); - } + constructor( + private readonly credentialService: CredentialsService, + private readonly databaseService: DrizzleService + ) {} async canActivate( context: ExecutionContext, diff --git a/src/auth/auth.module.ts b/src/auth/auth.module.ts index 72c2206..a384b07 100644 --- a/src/auth/auth.module.ts +++ b/src/auth/auth.module.ts @@ -3,10 +3,11 @@ import { CredentialsModule } from "src/credentials/credentials.module"; import { DrizzleModule } from "src/drizzle/drizzle.module"; import { AuthController } from "./auth.controller"; import { AuthService } from "./auth.service"; +import { AdminGuard } from "src/auth/auth.guard"; @Module({ imports: [DrizzleModule, CredentialsModule], - providers: [AuthService], + providers: [AuthService, AdminGuard], controllers: [AuthController], }) export class AuthModule {}