Skip to content

Commit 4d18974

Browse files
committed
fix(guard): move getRequest to instance method for overriding
1 parent da84632 commit 4d18974

File tree

3 files changed

+10
-26
lines changed

3 files changed

+10
-26
lines changed

src/guards/auth.guard.ts

+5-1
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,18 @@ export class AuthGuard implements CanActivate {
2121
private readonly reflector: Reflector
2222
) {}
2323

24+
getRequest(context: ExecutionContext): any {
25+
return context.switchToHttp().getRequest()
26+
}
27+
2428
async canActivate(context: ExecutionContext): Promise<boolean> {
2529
const isPublic: boolean = this.reflector.get<boolean>(META_PUBLIC, context.getHandler())
2630

2731
if (isPublic) {
2832
return true
2933
}
3034

31-
const request = context.switchToHttp().getRequest()
35+
const request = this.getRequest(context)
3236
const jwt = this.extractJwt(request.headers)
3337

3438
try {

src/guards/execution.request.ts

-23
This file was deleted.

src/guards/resource.guard.ts

+5-2
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ import {
2222
import { META_RESOURCE } from '../decorators/resource.decorator'
2323
import { META_FETCH_RESOURCES } from '../decorators/fetch.resources.decorator'
2424
import { META_PUBLIC } from '../decorators/public.decorator'
25-
import { getRequest } from './execution.request'
2625
import { PriviledgedRequest } from '../@types/request'
2726

2827
@Injectable()
@@ -35,6 +34,10 @@ export class ResourceGuard implements CanActivate {
3534
private readonly reflector: Reflector
3635
) {}
3736

37+
getRequest(context: ExecutionContext): any {
38+
return context.switchToHttp().getRequest()
39+
}
40+
3841
async canActivate(context: ExecutionContext): Promise<boolean> {
3942
const isPublic = this.reflector.get<boolean>(META_PUBLIC, context.getHandler())
4043

@@ -43,7 +46,7 @@ export class ResourceGuard implements CanActivate {
4346
return true
4447
}
4548

46-
const request = getRequest(context)
49+
const request = this.getRequest(context)
4750

4851
const resourceType = this.reflector.get<string>(META_RESOURCE, context.getClass())
4952

0 commit comments

Comments
 (0)