fix: correct webhook url on agent settings page (#232)

Author: hugodutka

internal/api/src/routes/agents/setup-slack.test.ts

@@ -10,7 +10,8 @@ const serve = () => {
     bindings: {
       accessUrl: new URL("https://test.blink.so"),
       matchRequestHost: undefined,
-      createRequestURL: undefined,
+      createRequestURL: (id) =>
+        new URL(`https://test.blink.so/api/webhook/${id}`),
     },
   });
 };

internal/api/src/routes/devhook.test.ts

@@ -13,21 +13,6 @@ test("devhook url with createRequestURL", async () => {
   );
 });
 
-test("devhook url with path-based routing", async () => {
-  const { helpers, bindings } = await serve({
-    bindings: {
-      createRequestURL: undefined,
-    },
-  });
-  const { client } = await helpers.createUser();
-
-  const id = crypto.randomUUID();
-
-  const url = await client.devhook.getUrl(id);
-  const expectedUrl = new URL(`api/webhook/${id}`, bindings.accessUrl);
-  expect(url).toBe(expectedUrl.toString());
-});
-
 test("devhook routes require auth by default", async () => {
   const { url } = await serve();
   const id = crypto.randomUUID();

internal/api/src/server-helper.ts

@@ -77,18 +77,17 @@ export const createWebhookURL = (
   requestId: string,
   path: string
 ): string => {
-  // Normalize path to always start with /
-  const normalizedPath = path.startsWith("/") ? path : `/${path}`;
-
-  if (env.createRequestURL) {
-    const baseUrl = env.createRequestURL(requestId);
-    return new URL(normalizedPath, baseUrl).toString();
+  if (!env.createRequestURL) {
+    throw new Error(
+      "createRequestURL is not configured - unable to create webhook URL"
+    );
   }
-
-  // Path-based webhook mode: /api/webhook/{request_id}/{path}
-  const baseUrl = getAccessUrlBase(env.accessUrl);
-  return new URL(
-    `api/webhook/${requestId}${normalizedPath}`,
-    baseUrl
-  ).toString();
+  // Normalize path to never start with /
+  const normalizedPath = path.replace(/^\/+/, "");
+  const baseUrl = env.createRequestURL(requestId);
+  // Ensure the base URL ends with /
+  if (!baseUrl.pathname.endsWith("/")) {
+    baseUrl.pathname += "/";
+  }
+  return new URL(normalizedPath, baseUrl).toString();
 };

internal/site/app/(app)/[organization]/layout.tsx

@@ -1,8 +1,9 @@
-import { auth } from "@/app/(auth)/auth";
-import { getQuerier } from "@/lib/database";
+import Client from "@blink.so/api";
 import * as convert from "@blink.so/database/convert";
 import { notFound, redirect } from "next/navigation";
 import { cache } from "react";
+import { auth, getSessionToken } from "@/app/(auth)/auth";
+import { getQuerier } from "@/lib/database";
 
 export default async function OrganizationLayout({
   children,
@@ -29,7 +30,7 @@ export const getOrganization = cache(
       return notFound();
     }
     const baseURL = new URL(
-      process.env.NEXT_PUBLIC_BASE_URL! ?? "http://localhost:3000"
+      process.env.NEXT_PUBLIC_BASE_URL! ?? "http://localhost:3005"
     );
     return convert.organization(baseURL, organization);
   }
@@ -46,7 +47,7 @@ export const getOrganizationByID = cache(
       return notFound();
     }
     const baseURL = new URL(
-      process.env.NEXT_PUBLIC_BASE_URL! ?? "http://localhost:3000"
+      process.env.NEXT_PUBLIC_BASE_URL! ?? "http://localhost:3005"
     );
     return convert.organization(baseURL, organization);
   }
@@ -74,51 +75,26 @@ export const getAgent = cache(
 export const getAgentOrNull = cache(
   async (organizationName: string, agentName: string) => {
     const session = await auth();
+    const token = await getSessionToken();
+    const baseURL = process.env.NEXT_PUBLIC_BASE_URL ?? "http://localhost:3005";
+    const client = new Client({
+      baseURL,
+      authToken: token,
+    });
     const userID = session?.user?.id;
     const db = await getQuerier();
-    const agent = await db.selectAgentByNameForUser({
+    const agentFromDB = await db.selectAgentByNameForUser({
       organizationName,
       agentName,
       userID,
     });
-    if (!agent) {
+    if (!agentFromDB) {
       return null;
     }
-    // Get the production deployment target's request_id
-    const productionTarget = await db.selectAgentDeploymentTargetByName(
-      agent.id,
-      "production"
-    );
-    const requestURL = productionTarget?.request_id
-      ? new URL(`https://${productionTarget.request_id}.blink.host/`)
-      : undefined;
-
-    // Get user permission for the agent
-    let userPermission: "read" | "write" | "admin" | undefined;
-    if (userID) {
-      const org = await db.selectOrganizationForUser({
-        organizationID: agent.organization_id,
-        userID,
-      });
-      // Org owners and admins get admin permission
-      if (
-        org?.membership &&
-        (org.membership.role === "owner" || org.membership.role === "admin")
-      ) {
-        userPermission = "admin";
-      } else {
-        userPermission = await db.getAgentPermissionForUser({
-          agentId: agent.id,
-          userId: userID,
-          orgRole: org?.membership?.role,
-        });
-        // If permission is undefined, user doesn't have access
-        if (userPermission === undefined) {
-          return null;
-        }
-      }
+    const agent = await client.agents.get(agentFromDB.id);
+    if (!agent) {
+      return null;
     }
-
-    return convert.agent(agent, requestURL, userPermission);
+    return agent;
   }
 );

internal/site/app/(auth)/auth.ts

@@ -27,13 +27,17 @@ declare module "next-auth" {
   }
 }
 
+export async function getSessionToken() {
+  const cookieStore = await cookies();
+  return cookieStore.get(SESSION_COOKIE_NAME)?.value;
+}
+
 /**
  * Server-side auth helper function that decodes session from cookies.
  * This replaces the NextAuth auth() function.
  */
 export async function auth() {
-  const cookieStore = await cookies();
-  const token = cookieStore.get(SESSION_COOKIE_NAME)?.value;
+  const token = await getSessionToken();
 
   if (!token) return null;
 

packages/server/src/devhook.ts

@@ -4,6 +4,7 @@ import { Worker as DevhookWorker } from "@blink.so/compute-protocol-worker";
 import type Querier from "@blink.so/database/querier";
 import { validate as uuidValidate } from "uuid";
 import { WebSocket, WebSocketServer } from "ws";
+import { getAccessUrlBase } from "../../../internal/api/src/server-helper";
 
 type DevhookSession = {
   id: string;
@@ -72,7 +73,10 @@ export const createDevhookSupport = (opts: {
         url.hostname = `${id}.${wildcard.baseHost}`;
         return url;
       }
-    : undefined;
+    : (id: string): URL => {
+        const baseUrl = getAccessUrlBase(accessUrl);
+        return new URL(`api/webhook/${id}/`, baseUrl);
+      };
 
   const toUint8Array = (data: WebSocket.RawData): Uint8Array => {
     if (Array.isArray(data)) {