fix(functions): add apikey compatibility header

apps/cli-go/internal/functions/serve/templates/main.ts

@@ -96,15 +96,40 @@ const functionsConfig: Record<string, FunctionConfig> = (() => {
   }
 })();
 
+/* --- JWT verification --- */
+export function extractBearerToken(rawToken: string) {
+  const tokenParts = rawToken.split(' ')
+  const [bearer, token] = tokenParts
+  if (bearer !== 'Bearer' || tokenParts.length !== 2) {
+    return null
+  }
+
+  return token
+}
+
 function getAuthToken(req: Request) {
   const authHeader = req.headers.get("authorization");
-  if (!authHeader) {
+  const sbApiKeyCompatibilityToken = req.headers.get("sb-api-key")
+
+  // NOTE:(kallebysantos) Kong on legacy CLI stack pass it down as 'Bearer Token' format
+  const cleanSbApiKeyCompatibilityToken = sbApiKeyCompatibilityToken.replace('Bearer', '').trim()
+
+  if (!authHeader && !cleanSbApiKeyCompatibilityToken) {
     throw new Error("Missing authorization header");
   }
-  const [bearer, token] = authHeader.split(" ");
-  if (bearer !== "Bearer") {
+
+  // NOTE:(kallebysantos) Compatibility mode is triggered when all conditions match:
+  // - API proxy mints a temp token
+  // - Original bearer is not present or is ApiKey
+  const bearerToken = extractBearerToken(authHeader ?? '')
+  const token = (!bearerToken || bearerToken.startsWith('sb_'))
+    ? cleanSbApiKeyCompatibilityToken
+    : bearerToken
+
+  if (!token) {
     throw new Error(`Auth header is not 'Bearer {token}'`);
   }
+
   return token;
 }
 
@@ -180,6 +205,19 @@ async function shouldUsePackageJsonDiscovery({ entrypointPath, importMapPath }:
   return true
 }
 
+export function prepareUserRequest(req: Request): Request {
+  const clonedURL = new URL(req.url)
+  const forwardedHost = req.headers.get('x-forwarded-host')
+  clonedURL.hostname = forwardedHost ?? clonedURL.hostname
+  const clonedReq = new Request(clonedURL, req.clone())
+
+  // remove custom api headers
+  clonedReq.headers.delete('sb-api-key')
+  EdgeRuntime.applySupabaseTag(req, clonedReq)
+
+  return clonedReq
+}
+
 Deno.serve({
   handler: async (req: Request) => {
     const url = new URL(req.url);
@@ -279,7 +317,8 @@ Deno.serve({
         staticPatterns,
       });
 
-      return await worker.fetch(req);
+      const userReq = prepareUserRequest(req)
+      return await worker.fetch(userReq);
     } catch (e) {
       console.error(e);
 

apps/cli-go/internal/start/templates/kong.yml

@@ -182,10 +182,10 @@ services:
         config:
           add:
             headers:
-              - "Authorization: {{ .BearerToken }}"
+              - "sb-api-key: {{ .BearerToken }}"
           replace:
             headers:
-              - "Authorization: {{ .BearerToken }}"
+              - "sb-api-key: {{ .BearerToken }}"
   # Management API endpoints
   - name: well-known-oauth
     _comment: "GoTrue: /.well-known/oauth-authorization-server -> http://auth:9999/.well-known/oauth-authorization-server"

packages/stack/src/ApiProxy.ts

@@ -28,22 +28,29 @@ export interface ProxyConfig {
   readonly serviceRoleJwt: string;
 }
 
-function transformAuthorization(headers: Headers.Headers, config: ProxyConfig): Headers.Headers {
+function transformAuthorization(
+  headers: Headers.Headers,
+  config: ProxyConfig,
+  useCustomHeader = false,
+): Headers.Headers {
   const auth = headers["authorization"];
   const apikey = headers["apikey"];
 
+  const transformHeaderName = useCustomHeader ? "sb-api-key" : "authorization";
+  const transformPrefix = useCustomHeader ? "" : "Bearer ";
+
   if (auth !== undefined && !auth.startsWith("Bearer sb_")) {
     return headers;
   }
 
   if (apikey === config.publishableKey) {
-    return Headers.set(headers, "authorization", `Bearer ${config.anonJwt}`);
+    return Headers.set(headers, transformHeaderName, transformPrefix + config.anonJwt);
   }
   if (apikey === config.secretKey) {
-    return Headers.set(headers, "authorization", `Bearer ${config.serviceRoleJwt}`);
+    return Headers.set(headers, transformHeaderName, transformPrefix + config.serviceRoleJwt);
   }
   if (apikey !== undefined && apikey !== "") {
-    return Headers.set(headers, "authorization", apikey);
+    return Headers.set(headers, transformHeaderName, apikey);
   }
 
   return headers;
@@ -103,6 +110,7 @@ interface ProxyHandlerOptions {
   readonly stripPrefix?: string;
   readonly backendPath?: string;
   readonly transformAuth?: boolean;
+  readonly transformAuthCustomHeader?: boolean;
   readonly extraHeaders?: Record<string, string>;
 }
 
@@ -126,7 +134,7 @@ function makeProxyHandler(
 
       let outHeaders = req.headers;
       if (opts.transformAuth === true) {
-        outHeaders = transformAuthorization(outHeaders, config);
+        outHeaders = transformAuthorization(outHeaders, config, opts.transformAuthCustomHeader);
       }
       outHeaders = addProxyHeaders(outHeaders, Option.getOrUndefined(req.remoteAddress));
 
@@ -254,6 +262,7 @@ export class ApiProxy extends Context.Service<
               backendPort: config.edgeRuntimePort,
               stripPrefix: "/functions/v1",
               transformAuth: true,
+              transformAuthCustomHeader: true,
             }),
           ),
           HttpRouter.route(

packages/stack/src/ApiProxy.unit.test.ts

@@ -223,13 +223,28 @@ describe("ApiProxy", () => {
     expect(body.path).toBe("/users");
   });
 
-  test("/functions/v1/test strips prefix and transforms auth", async () => {
-    const res = await fetch(`${proxyUrl}/functions/v1/test`, {
-      headers: { apikey: SECRET_KEY },
+  describe("/functions/v1/ test strips prefix and transforms auth", () => {
+    test("transforms to custom header", async () => {
+      const res = await fetch(`${proxyUrl}/functions/v1/test`, {
+        headers: { apikey: SECRET_KEY },
+      });
+      const body = (await res.json()) as { path: string; headers: Record<string, string> };
+      expect(body.path).toBe("/test");
+      expect(body.headers["sb-api-key"]).toBe(SERVICE_ROLE_JWT);
+    });
+
+    test("transforms to custom header without replacing original auth", async () => {
+      const res = await fetch(`${proxyUrl}/functions/v1/test`, {
+        headers: {
+          apikey: SECRET_KEY,
+          authorization: `Bearer ${SECRET_KEY}`,
+        },
+      });
+      const body = (await res.json()) as { path: string; headers: Record<string, string> };
+      expect(body.path).toBe("/test");
+      expect(body.headers["authorization"]).toBe(`Bearer ${SECRET_KEY}`);
+      expect(body.headers["sb-api-key"]).toBe(SERVICE_ROLE_JWT);
     });
-    const body = (await res.json()) as { path: string; headers: Record<string, string> };
-    expect(body.path).toBe("/test");
-    expect(body.headers["authorization"]).toBe(`Bearer ${SERVICE_ROLE_JWT}`);
   });
 
   test("strips upstream content-encoding metadata from proxied function responses", async () => {