diff --git a/src/shared/guards/gitea-webhook-auth.guard.ts b/src/shared/guards/gitea-webhook-auth.guard.ts index 1506cfa..a1fd68f 100644 --- a/src/shared/guards/gitea-webhook-auth.guard.ts +++ b/src/shared/guards/gitea-webhook-auth.guard.ts @@ -45,7 +45,7 @@ export class GiteaWebhookAuthGuard implements CanActivate { throw new BadRequestException('Missing authorization header'); } - if (authHeader !== `Bearer ${auth}`) { + if (authHeader !== `SecretKey ${auth}`) { this.logger.error('Invalid authorization header'); throw new ForbiddenException('Invalid authorization'); } diff --git a/src/shared/request/tokenRequestValidator.middleware.ts b/src/shared/request/tokenRequestValidator.middleware.ts index 24f7aae..a5a0194 100644 --- a/src/shared/request/tokenRequestValidator.middleware.ts +++ b/src/shared/request/tokenRequestValidator.middleware.ts @@ -22,7 +22,11 @@ export class TokenValidatorMiddleware implements NestMiddleware { const [type, idToken] = request.headers.authorization.split(' ') ?? []; - if (type !== 'Bearer' || !idToken) { + if (type !== 'Bearer') { + return next(); + } + + if (!idToken) { throw new UnauthorizedException('Invalid or missing JWT!'); }