chore(core): rename req to request in onAuth (#1144)

Author: NathanFlurry

packages/core/fixtures/driver-test-suite/auth.ts

@@ -4,7 +4,7 @@ import { actor, UserError } from "@rivetkit/core";
 export const authActor = actor({
 	state: { requests: 0 },
 	onAuth: (opts) => {
-		const { req, intents, params } = opts;
+		const { request, intents, params } = opts;
 		const apiKey = (params as any)?.apiKey;
 		if (!apiKey) {
 			throw new UserError("API key required", { code: "missing_auth" });
@@ -29,7 +29,7 @@ export const authActor = actor({
 export const intentAuthActor = actor({
 	state: { value: 0 },
 	onAuth: (opts) => {
-		const { req, intents, params } = opts;
+		const { request, intents, params } = opts;
 		console.log("intents", intents, params);
 		const role = (params as any)?.role;
 

packages/core/fixtures/driver-test-suite/request-access-auth.ts

@@ -6,25 +6,25 @@ import { actor } from "@rivetkit/core";
  */
 export const requestAccessAuthActor = actor({
 	onAuth: ({
-		req,
+		request,
 		intents,
 		params,
 	}: {
-		req: Request;
+		request: Request;
 		intents: Set<string>;
 		params?: { trackRequest?: boolean };
 	}) => {
 		if (params?.trackRequest) {
 			// Extract request info and return it as auth data
 			const headers: Record<string, string> = {};
-			req.headers.forEach((value, key) => {
+			request.headers.forEach((value, key) => {
 				headers[key] = value;
 			});
 
 			return {
 				hasRequest: true,
-				requestUrl: req.url,
-				requestMethod: req.method,
+				requestUrl: request.url,
+				requestMethod: request.method,
 				requestHeaders: headers,
 				intents: Array.from(intents),
 			};

packages/core/fixtures/driver-test-suite/request-access.ts

@@ -39,23 +39,27 @@ export const requestAccessActor = actor({
 			request,
 		}: { params?: { trackRequest?: boolean }; request?: Request },
 	) => {
-		if (params?.trackRequest && request) {
-			c.state.createConnStateRequest.hasRequest = true;
-			c.state.createConnStateRequest.requestUrl = request.url;
-			c.state.createConnStateRequest.requestMethod = request.method;
-
-			// Store select headers
-			const headers: Record<string, string> = {};
-			request.headers.forEach((value, key) => {
-				headers[key] = value;
-			});
-			c.state.createConnStateRequest.requestHeaders = headers;
-		}
+		// In createConnState, the state isn't available yet.
 
 		return {
 			trackRequest: params?.trackRequest || false,
+			requestInfo:
+				params?.trackRequest && request
+					? {
+							hasRequest: true,
+							requestUrl: request.url,
+							requestMethod: request.method,
+							requestHeaders: Object.fromEntries(request.headers.entries()),
+						}
+					: null,
 		};
 	},
+	onConnect: (c, conn) => {
+		// Copy request info from connection state if it was tracked
+		if (conn.state.requestInfo) {
+			c.state.createConnStateRequest = conn.state.requestInfo;
+		}
+	},
 	onBeforeConnect: (c, { request, params }) => {
 		if (params?.trackRequest) {
 			if (request) {

packages/core/src/actor/config.ts

@@ -228,7 +228,7 @@ export interface Actions<S, CP, CS, V, I, AD, DB extends AnyDatabaseProvider> {
 export type AuthIntent = "get" | "create" | "connect" | "action" | "message";
 
 export interface OnAuthOptions<CP = unknown> {
-	req: Request;
+	request: Request;
 	/**
 	 * @experimental
 	 */

packages/core/src/driver-test-suite/tests/request-access.ts

@@ -171,12 +171,14 @@ export function runRequestAccessTests(driverTestConfig: DriverTestConfig) {
 			const data = await response.json();
 
 			// Verify request info from onFetch
-			expect(data.hasRequest).toBe(true);
-			expect(data.requestUrl).toContain("/test-path");
-			expect(data.requestMethod).toBe("POST");
-			expect(data.requestHeaders).toBeDefined();
-			expect(data.requestHeaders["content-type"]).toBe("application/json");
-			expect(data.requestHeaders["x-test-header"]).toBe("test-value");
+			expect((data as any).hasRequest).toBe(true);
+			expect((data as any).requestUrl).toContain("/test-path");
+			expect((data as any).requestMethod).toBe("POST");
+			expect((data as any).requestHeaders).toBeDefined();
+			expect((data as any).requestHeaders["content-type"]).toBe(
+				"application/json",
+			);
+			expect((data as any).requestHeaders["x-test-header"]).toBe("test-value");
 		});
 
 		test("should have access to request object in onWebSocket", async (c) => {

packages/core/src/manager/auth.ts

@@ -72,7 +72,7 @@ export async function authenticateRequest(
 
 	try {
 		const dataOrPromise = actorDefinition.config.onAuth({
-			req: c.req.raw,
+			request: c.req.raw,
 			intents,
 			params,
 		});