Skip to content

Commit

Permalink
Check for http request for resource and role (#121)
Browse files Browse the repository at this point in the history
  • Loading branch information
ferrerojosh committed Mar 23, 2022
1 parent b2761d3 commit d7d92d7
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 1 deletion.
2 changes: 1 addition & 1 deletion src/guards/auth.guard.ts
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ export class AuthGuard implements CanActivate {
if (!request) {
return true;
}

const jwt =
this.extractJwtFromCookie(request.cookies) ??
this.extractJwt(request.headers);
Expand Down
5 changes: 5 additions & 0 deletions src/guards/resource.guard.ts
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,11 @@ export class ResourceGuard implements CanActivate {
// Extract request/response
const [request, response] = extractRequest(context);

// if is not an HTTP request ignore this guard
if (!request) {
return true;
}

if (!request.user && isUnprotected) {
this.logger.verbose(`Route has no user, and is public, allowed`);
return true;
Expand Down
5 changes: 5 additions & 0 deletions src/guards/role.guard.ts
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,11 @@ export class RoleGuard implements CanActivate {
const [request] = extractRequest(context);
const { accessTokenJWT } = request;

// if is not an HTTP request ignore this guard
if (!request) {
return true;
}

if (!accessTokenJWT) {
// No access token attached, auth guard should have attached the necessary token
this.logger.warn(
Expand Down

0 comments on commit d7d92d7

Please sign in to comment.