Skip to content

Commit e3de688

Browse files
author
mdatelle
committed
refactor: change cookie validation method name
1 parent 170dc8a commit e3de688

File tree

3 files changed

+8
-8
lines changed

3 files changed

+8
-8
lines changed

api/src/unraid-api/auth/auth.service.spec.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ describe('AuthService', () => {
8181
const mockRequest = createMockRequest({
8282
headers: { 'x-csrf-token': 'valid-token' },
8383
});
84-
const result = await authService.validateCookiesCasbin(mockRequest);
84+
const result = await authService.validateCookiesWithCsrfToken(mockRequest);
8585

8686
expect(result).toEqual(mockUser);
8787
});
@@ -93,7 +93,7 @@ describe('AuthService', () => {
9393
const mockRequest = createMockRequest({
9494
headers: { 'x-csrf-token': 'valid-token' },
9595
});
96-
await expect(authService.validateCookiesCasbin(mockRequest)).rejects.toThrow(
96+
await expect(authService.validateCookiesWithCsrfToken(mockRequest)).rejects.toThrow(
9797
UnauthorizedException
9898
);
9999
});
@@ -104,7 +104,7 @@ describe('AuthService', () => {
104104
vi.spyOn(authService, 'validateCsrfToken').mockReturnValue(true);
105105

106106
const mockRequest = createMockRequest();
107-
await expect(authService.validateCookiesCasbin(mockRequest)).rejects.toThrow(
107+
await expect(authService.validateCookiesWithCsrfToken(mockRequest)).rejects.toThrow(
108108
UnauthorizedException
109109
);
110110
});
@@ -117,7 +117,7 @@ describe('AuthService', () => {
117117

118118
const addRoleSpy = vi.spyOn(authzService, 'addRoleForUser');
119119
const mockRequest = createMockRequest();
120-
const result = await authService.validateCookiesCasbin(mockRequest);
120+
const result = await authService.validateCookiesWithCsrfToken(mockRequest);
121121

122122
expect(result).toEqual(mockUser);
123123
expect(addRoleSpy).toHaveBeenCalledWith(mockUser.id, 'guest');
@@ -129,7 +129,7 @@ describe('AuthService', () => {
129129
const mockRequest = createMockRequest({
130130
headers: { 'x-csrf-token': 'invalid-token' },
131131
});
132-
await expect(authService.validateCookiesCasbin(mockRequest)).rejects.toThrow(
132+
await expect(authService.validateCookiesWithCsrfToken(mockRequest)).rejects.toThrow(
133133
new UnauthorizedException('Invalid CSRF token')
134134
);
135135
});
@@ -143,7 +143,7 @@ describe('AuthService', () => {
143143
const mockRequest = createMockRequest({
144144
query: { csrf_token: 'valid-token' },
145145
});
146-
const result = await authService.validateCookiesCasbin(mockRequest);
146+
const result = await authService.validateCookiesWithCsrfToken(mockRequest);
147147

148148
expect(result).toEqual(mockUser);
149149
});

api/src/unraid-api/auth/auth.service.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ export class AuthService {
4949
}
5050
}
5151

52-
async validateCookiesCasbin(request: FastifyRequest): Promise<UserAccount> {
52+
async validateCookiesWithCsrfToken(request: FastifyRequest): Promise<UserAccount> {
5353
try {
5454
if (!this.validateCsrfToken(request.headers['x-csrf-token'] || request.query.csrf_token)) {
5555
throw new UnauthorizedException('Invalid CSRF token');

api/src/unraid-api/auth/cookie.strategy.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,6 @@ export class UserCookieStrategy extends PassportStrategy(Strategy, strategyName)
1717
}
1818

1919
public validate = async (request: FastifyRequest): Promise<any> => {
20-
return this.authService.validateCookiesCasbin(request);
20+
return this.authService.validateCookiesWithCsrfToken(request);
2121
};
2222
}

0 commit comments

Comments
 (0)