btwedutech/hoppscotch
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 6 Wiki Activity

chore: changed the returned status type for errors in the access-tokens (#4107)

Browse Source 
* chore: changed the returned status type for errors in the access-token interceptor

* chore: removed unused pagination args
This commit is contained in:
Balu Babu
2024-06-07 12:08:35 +05:30
committed by GitHub
parent 4bd23a8f4c
commit 465ea2b4e0
4 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
packages/hoppscotch-backend/src/guards/rest-pat-auth.guard.ts
View File

@@ -8,7 +8,7 @@ import { Request } from 'express';
import { AccessTokenService } from 'src/access-token/access-token.service';
import * as E from 'fp-ts/Either';
import { DateTime } from 'luxon';
import { ACCESS_TOKENS_EXPIRED, ACCESS_TOKENS_INVALID } from 'src/errors';
import { ACCESS_TOKEN_EXPIRED, ACCESS_TOKEN_INVALID } from 'src/errors';
import { createCLIErrorResponse } from 'src/access-token/helper';
@Injectable()
export class PATAuthGuard implements CanActivate {
@@ -19,14 +19,14 @@ export class PATAuthGuard implements CanActivate {
const token = this.extractTokenFromHeader(request);
if (!token) {
throw new BadRequestException(
createCLIErrorResponse(ACCESS_TOKENS_INVALID),
createCLIErrorResponse(ACCESS_TOKEN_INVALID),
);
}
const userAccessToken = await this.accessTokenService.getUserPAT(token);
if (E.isLeft(userAccessToken))
throw new BadRequestException(
createCLIErrorResponse(ACCESS_TOKENS_INVALID),
createCLIErrorResponse(ACCESS_TOKEN_INVALID),
);
request.user = userAccessToken.right.user;
@@ -37,7 +37,7 @@ export class PATAuthGuard implements CanActivate {
if (accessToken.expiresOn.toISOString() > today) return true;
throw new BadRequestException(
createCLIErrorResponse(ACCESS_TOKENS_EXPIRED),
createCLIErrorResponse(ACCESS_TOKEN_EXPIRED),
);
}