Fix validateRequest

Author: bh2smith

bun.lockb

@@ -24,7 +24,8 @@
     "dotenv": "^16.4.7",
     "eslint": "^9.16.0",
     "jest": "^29.7.0",
-    "prettier": "^3.4.1",
+    "next": "^15.0.3",
+    "prettier": "^3.4.2",
     "ts-jest": "^29.2.5",
     "typescript": "^5.7.2",
     "viem": "^2.21.53"

package.json

@@ -40,8 +40,8 @@ export interface BaseResponse {
   json(data: unknown, init?: { status?: number }): unknown;
 }
 
-export function createResponse(
-  responseData: unknown,
+export function fallbackResponder(
+  responseData: object,
   init?: { status?: number },
 ): BaseResponse {
   return {
@@ -60,25 +60,23 @@ export async function validateRequest<
   req: TRequest,
   // TODO(bh2smith): Use Bitte Wallet's safeSaltNonce as Default.
   safeSaltNonce: string,
+  responder?: (data: object, init?: { status?: number }) => TResponse,
 ): Promise<TResponse | null> {
+  const createResponse = responder ? responder : fallbackResponder;
   const metadataHeader = req.headers.get("mb-metadata");
   const metadata = JSON.parse(metadataHeader ?? "{}");
   const { accountId, evmAddress } = metadata;
   if (!accountId || !evmAddress) {
-    return createResponse(
-      { error: "Missing accountId or evmAddress in metadata" },
-      { status: 400 },
-    ) as TResponse;
+    const error = "Missing accountId or evmAddress in metadata";
+    console.error(error);
+    return createResponse({ error }, { status: 400 }) as TResponse;
   }
 
   const derivedSafeAddress = await getAdapterAddress(accountId, safeSaltNonce);
   if (derivedSafeAddress !== getAddress(evmAddress)) {
-    return createResponse(
-      {
-        error: `Invalid safeAddress in metadata: ${derivedSafeAddress} !== ${evmAddress}`,
-      },
-      { status: 401 },
-    ) as TResponse;
+    const error = `Invalid safeAddress in metadata: ${derivedSafeAddress} !== ${evmAddress}`;
+    console.error(error);
+    return createResponse({ error }, { status: 401 }) as TResponse;
   }
   return null;
 }

packages/agent-sdk/src/evm/index.ts

@@ -1,5 +1,10 @@
-import { signRequestFor, createResponse, validateRequest } from "../../src/evm";
+import {
+  signRequestFor,
+  fallbackResponder,
+  validateRequest,
+} from "../../src/evm";
 import { zeroAddress } from "viem";
+import { NextRequest, NextResponse } from "next/server";
 import type { BaseRequest } from "../../src/evm";
 
 // Mock external dependencies
@@ -64,11 +69,11 @@ describe("evm/index", () => {
     });
   });
 
-  describe("createResponse", () => {
+  describe("fallbackResponder", () => {
     it("creates a response with default status", () => {
       const responseData = { message: "Success" };
 
-      const response = createResponse(responseData);
+      const response = fallbackResponder(responseData);
 
       expect(response.json({}, {})).toEqual({
         data: responseData,
@@ -78,7 +83,7 @@ describe("evm/index", () => {
     it("creates a response with specified status", () => {
       const responseData = { message: "Error" };
 
-      const response = createResponse(responseData, { status: 400 });
+      const response = fallbackResponder(responseData, { status: 400 });
       expect(response.json({}, {})).toEqual({
         data: responseData,
         status: 400,
@@ -161,4 +166,48 @@ describe("evm/index", () => {
       });
     });
   });
+
+  describe("validateNextRequest", () => {
+    it("should validate a real request", async () => {
+      const request = new NextRequest(
+        new Request("https://example.com", {
+          method: "POST",
+          headers: new Headers({
+            "mb-metadata": JSON.stringify({
+              accountId: "max-normal.near",
+              evmAddress: zeroAddress,
+            }),
+          }),
+          body: JSON.stringify({ test: "data" }),
+        }),
+      );
+
+      const result = await validateNextRequest(request, "0");
+      // Get the response data
+      const responseData = await result?.json();
+
+      // Assert the status and response data separately
+      expect(result?.status).toBe(401);
+      expect(responseData).toEqual({
+        error: `Invalid safeAddress in metadata: 0x123 !== ${zeroAddress}`,
+      });
+    });
+  });
 });
+
+// TODO: Use in Next Agents.
+export async function validateNextRequest(
+  req: NextRequest,
+  safeSaltNonce?: string,
+): Promise<NextResponse | null> {
+  const result = await validateRequest<NextRequest, NextResponse>(
+    req,
+    safeSaltNonce || "0",
+    (data: unknown, init?: { status?: number }) =>
+      NextResponse.json(data, init),
+  );
+
+  console.log("validateNextRequest result:", result); // Add this line for debugging
+
+  return result;
+}