feat: add Bearer support

examples/common_nestjs_remix/apps/api/src/auth/api/auth.controller.ts

@@ -1,3 +1,4 @@
+import { UUIDType } from "src/common/index";
 import {
   Body,
   Controller,
@@ -73,16 +74,17 @@ export class AuthController {
     return null;
   }
 
+  @Public()
   @UseGuards(RefreshTokenGuard)
   @Post("refresh")
   @Validate({
     response: nullResponse(),
   })
   async refreshTokens(
     @Res({ passthrough: true }) response: Response,
-    @Req() request: Request,
+    @Req() request: Request & { refreshToken: UUIDType },
   ): Promise<null> {
-    const refreshToken = request.cookies["refresh_token"];
+    const refreshToken = request["refreshToken"];
 
     if (!refreshToken) {
       throw new UnauthorizedException("Refresh token not found");

examples/common_nestjs_remix/apps/api/src/auth/strategy/jwt.strategy.ts

@@ -9,6 +9,7 @@ export class JwtStrategy extends PassportStrategy(Strategy) {
   constructor(private configService: ConfigService) {
     super({
       jwtFromRequest: ExtractJwt.fromExtractors([
+        ExtractJwt.fromAuthHeaderAsBearerToken(),
         (request) => request?.cookies?.access_token,
       ]),
       ignoreExpiration: false,

examples/common_nestjs_remix/apps/api/src/common/guards/jwt-auth-guard.ts

@@ -1,12 +1,13 @@
 import {
-  Injectable,
   CanActivate,
   ExecutionContext,
+  Injectable,
   UnauthorizedException,
 } from "@nestjs/common";
 import { ConfigService } from "@nestjs/config";
 import { Reflector } from "@nestjs/core";
 import { JwtService } from "@nestjs/jwt";
+import { extractToken } from "src/utils/extract-token";
 
 @Injectable()
 export class JwtAuthGuard implements CanActivate {
@@ -27,7 +28,7 @@ export class JwtAuthGuard implements CanActivate {
     }
 
     const request = context.switchToHttp().getRequest();
-    const token = request.cookies["access_token"];
+    const token = extractToken(request, "access_token");
 
     if (!token) {
       throw new UnauthorizedException("Access token not found");
@@ -37,7 +38,9 @@ export class JwtAuthGuard implements CanActivate {
       const payload = await this.jwtService.verifyAsync(token, {
         secret: this.configService.get<string>("jwt.secret"),
       });
+
       request["user"] = payload;
+
       return true;
     } catch {
       throw new UnauthorizedException("Invalid access token");

examples/common_nestjs_remix/apps/api/src/common/guards/refresh-token-guard.ts

@@ -4,8 +4,9 @@ import {
   ExecutionContext,
   UnauthorizedException,
 } from "@nestjs/common";
-import { ConfigService } from "@nestjs/config";
 import { JwtService } from "@nestjs/jwt";
+import { ConfigService } from "@nestjs/config";
+import { extractToken } from "src/utils/extract-token";
 
 @Injectable()
 export class RefreshTokenGuard implements CanActivate {
@@ -16,10 +17,10 @@ export class RefreshTokenGuard implements CanActivate {
 
   async canActivate(context: ExecutionContext): Promise<boolean> {
     const request = context.switchToHttp().getRequest();
-    const refreshToken = request.cookies["refresh_token"];
+    const refreshToken = extractToken(request, "refresh_token");
 
     if (!refreshToken) {
-      throw new UnauthorizedException("No refresh token provided");
+      throw new UnauthorizedException("Refresh token not found");
     }
 
     try {
@@ -28,6 +29,7 @@ export class RefreshTokenGuard implements CanActivate {
       });
 
       request["user"] = payload;
+      request["refreshToken"] = refreshToken;
 
       return true;
     } catch {

examples/common_nestjs_remix/apps/api/src/common/index.ts

@@ -1,4 +1,4 @@
-import { TSchema, Type } from "@sinclair/typebox";
+import { Static, TSchema, Type } from "@sinclair/typebox";
 import { PostgresJsDatabase } from "drizzle-orm/postgres-js";
 import * as schema from "src/storage/schema";
 
@@ -13,6 +13,7 @@ export class BaseResponse<T> {
 }
 
 export const UUIDSchema = Type.String({ format: "uuid" });
+export type UUIDType = Static<typeof UUIDSchema>;
 
 export function baseResponse(data: TSchema) {
   if (data.type === "array") {

examples/common_nestjs_remix/apps/api/src/utils/extract-token.ts

@@ -0,0 +1,16 @@
+import { Request } from "express";
+
+export function extractToken(
+  request: Request,
+  cookieName: "refresh_token" | "access_token",
+): string | null {
+  if (request.cookies && request.cookies[cookieName]) {
+    return request.cookies[cookieName];
+  }
+
+  if (request.headers.authorization?.startsWith("Bearer ")) {
+    return request.headers.authorization.split(" ")[1];
+  }
+
+  return null;
+}