chore: extend FastifyRequest to handle headers

mdatelle · mdatelle · commit 7e2bcc9fac47 · 2025-03-10T10:23:23.000-04:00
diff --git a/api/src/types/fastify.ts b/api/src/types/fastify.ts
@@ -7,5 +7,6 @@ import type {
 export type FastifyInstance = BaseFastifyInstance;
 export interface FastifyRequest extends BaseFastifyRequest {
     cookies: Record<string, string | undefined>;
+    headers: Record<string, string | undefined>;
 }
 export type FastifyReply = BaseFastifyReply;
diff --git a/api/src/unraid-api/auth/auth.service.ts b/api/src/unraid-api/auth/auth.service.ts
@@ -53,8 +53,8 @@ export class AuthService {
         try {
             if (
                 !this.validateCsrfToken(
-                    (request.headers['x-csrf-token'] as string | undefined) ||
-                        ((request.query as { csrf_token?: string })?.csrf_token as string | undefined)
+                    request.headers['x-csrf-token'] ||
+                        (request.query as { csrf_token?: string })?.csrf_token
                 )
             ) {
                 throw new UnauthorizedException('Invalid CSRF token');
diff --git a/api/src/unraid-api/auth/cookie.strategy.ts b/api/src/unraid-api/auth/cookie.strategy.ts
@@ -1,4 +1,4 @@
-import { Injectable, Logger } from '@nestjs/common';
+import { Injectable } from '@nestjs/common';
 import { PassportStrategy } from '@nestjs/passport';
 
 import { Strategy } from 'passport-custom';
@@ -11,13 +11,12 @@ const strategyName = 'user-cookie';
 @Injectable()
 export class UserCookieStrategy extends PassportStrategy(Strategy, strategyName) {
     static key = strategyName;
-    private readonly logger = new Logger(UserCookieStrategy.name);
 
     constructor(private authService: AuthService) {
         super();
     }
 
-    public validate = async (req: FastifyRequest): Promise<any> => {
-        return this.authService.validateCookiesCasbin(req);
+    public validate = async (request: FastifyRequest): Promise<any> => {
+        return this.authService.validateCookiesCasbin(request);
     };
 }

Original file line number	Diff line number	Diff line change
`@@ -7,5 +7,6 @@ import type {`
`7`	`7`	`export type FastifyInstance = BaseFastifyInstance;`
`8`	`8`	`export interface FastifyRequest extends BaseFastifyRequest {`
`9`	`9`	`cookies: Record<string, string \| undefined>;`
	`10`	`+ headers: Record<string, string \| undefined>;`
`10`	`11`	`}`
`11`	`12`	`export type FastifyReply = BaseFastifyReply;`