refactor: update JwtAuthGuard constructor and canActivate method

Selleo · Jul 11, 2024 · ff805e4 · ff805e4
1 parent 28b97ca
commit ff805e4
Show file tree

Hide file tree

Showing 8 changed files with 22 additions and 6 deletions.
diff --git a/examples/common_nestjs_remix/apps/api/src/auth/api/auth.controller.ts b/examples/common_nestjs_remix/apps/api/src/auth/api/auth.controller.ts
@@ -25,8 +25,8 @@ import {
   CreateAccountBody,
   createAccountSchema,
 } from "../schemas/create-account.schema";
-import { LoginBody, loginSchema } from "../schemas/login";
-import { RefreshTokenBody } from "../schemas/refresh-token";
+import { LoginBody, loginSchema } from "../schemas/login.schema";
+import { RefreshTokenBody } from "../schemas/refresh-token.schema";
 import { TokenService } from "../token.service";
 import { Public } from "src/utils/decorators/public.decorator";
 

diff --git a/..._remix/apps/api/src/auth/schemas/login.ts → ...apps/api/src/auth/schemas/login.schema.ts b/..._remix/apps/api/src/auth/schemas/login.ts → ...apps/api/src/auth/schemas/login.schema.ts
diff --git a/...pps/api/src/auth/schemas/refresh-token.ts → .../src/auth/schemas/refresh-token.schema.ts b/...pps/api/src/auth/schemas/refresh-token.ts → .../src/auth/schemas/refresh-token.schema.ts
diff --git a/examples/common_nestjs_remix/apps/api/src/users/api/users.controller.ts b/examples/common_nestjs_remix/apps/api/src/users/api/users.controller.ts
@@ -18,14 +18,17 @@ import { CurrentUser } from "src/utils/decorators/user.decorator";
 import {
   ChangePasswordBody,
   changePasswordSchema,
-} from "../schemas/change-password";
-import { UpdateUserBody, updateUserSchema } from "../schemas/update-user";
+} from "../schemas/change-password.schema";
+import {
+  UpdateUserBody,
+  updateUserSchema,
+} from "../schemas/update-user.schema";
 import {
   AllUsersResponse,
   allUsersSchema,
   UserResponse,
   userSchema,
-} from "../schemas/user";
+} from "../schemas/user.schema";
 import { UsersService } from "../users.service";
 
 @Controller("users")

diff --git a/.../api/src/users/schemas/change-password.ts → ...c/users/schemas/change-password.schema.ts b/.../api/src/users/schemas/change-password.ts → ...c/users/schemas/change-password.schema.ts
diff --git a/...apps/api/src/users/schemas/update-user.ts → ...i/src/users/schemas/update-user.schema.ts b/...apps/api/src/users/schemas/update-user.ts → ...i/src/users/schemas/update-user.schema.ts
diff --git a/..._remix/apps/api/src/users/schemas/user.ts → ...apps/api/src/users/schemas/user.schema.ts b/..._remix/apps/api/src/users/schemas/user.ts → ...apps/api/src/users/schemas/user.schema.ts
diff --git a/examples/common_nestjs_remix/apps/api/src/utils/guards/jwt-auth-guard.ts b/examples/common_nestjs_remix/apps/api/src/utils/guards/jwt-auth-guard.ts
@@ -4,13 +4,26 @@ import {
   ExecutionContext,
   UnauthorizedException,
 } from "@nestjs/common";
+import { Reflector } from "@nestjs/core";
 import { JwtService } from "@nestjs/jwt";
 
 @Injectable()
 export class JwtAuthGuard implements CanActivate {
-  constructor(private jwtService: JwtService) {}
+  constructor(
+    private jwtService: JwtService,
+    private reflector: Reflector,
+  ) {}
 
   async canActivate(context: ExecutionContext): Promise<boolean> {
+    const isPublic = this.reflector.getAllAndOverride<boolean>("isPublic", [
+      context.getHandler(),
+      context.getClass(),
+    ]);
+
+    if (isPublic) {
+      return true;
+    }
+
     const request = context.switchToHttp().getRequest();
     const token = request.cookies["access_token"];