@powerhousedao/switchboard 6.1.0-dev.9 → 6.1.0

package/test/attachments/auth.test.ts

@@ -60,7 +60,7 @@ function makeAuthService(
 }
 
 describe("requireAuth", () => {
-  it("returns the original handler unchanged when authService is undefined", async () => {
+  it("returns the original handler unchanged when authService is undefined", () => {
     const handler: NodeHandler = vi.fn();
     const wrapped = requireAuth(undefined, handler);
     expect(wrapped).toBe(handler);
@@ -77,11 +77,13 @@ describe("requireAuth", () => {
   });
 
   it("returns 401 with { error: 'Authentication required' } when Authorization header is missing", async () => {
-    const { service, spy } = makeAuthService(async () => ({
-      user: undefined,
-      admins: [],
-      auth_enabled: true,
-    }));
+    const { service, spy } = makeAuthService(() =>
+      Promise.resolve({
+        user: undefined,
+        admins: [],
+        auth_enabled: true,
+      }),
+    );
     const handler = vi.fn<NodeHandler>();
     const wrapped = requireAuth(service, handler);
 
@@ -96,12 +98,13 @@ describe("requireAuth", () => {
   });
 
   it("forwards a Response from AuthService (status, content-type, body) for an invalid bearer token", async () => {
-    const { service } = makeAuthService(
-      async () =>
+    const { service } = makeAuthService(() =>
+      Promise.resolve(
         new Response(JSON.stringify({ error: "Verification failed" }), {
           status: 401,
           headers: { "content-type": "application/json" },
         }),
+      ),
     );
     const handler = vi.fn<NodeHandler>();
     const wrapped = requireAuth(service, handler);
@@ -119,12 +122,13 @@ describe("requireAuth", () => {
   });
 
   it("forwards a Response with a non-JSON content-type verbatim", async () => {
-    const { service } = makeAuthService(
-      async () =>
+    const { service } = makeAuthService(() =>
+      Promise.resolve(
         new Response("nope", {
           status: 403,
           headers: { "content-type": "text/plain" },
         }),
+      ),
     );
     const handler = vi.fn<NodeHandler>();
     const wrapped = requireAuth(service, handler);
@@ -142,11 +146,13 @@ describe("requireAuth", () => {
   });
 
   it("invokes the handler and leaves the response untouched on a valid bearer token", async () => {
-    const { service } = makeAuthService(async () => ({
-      user: { address: "0x123", chainId: 1, networkId: "mainnet" },
-      admins: [],
-      auth_enabled: true,
-    }));
+    const { service } = makeAuthService(() =>
+      Promise.resolve({
+        user: { address: "0x123", chainId: 1, networkId: "mainnet" },
+        admins: [],
+        auth_enabled: true,
+      }),
+    );
     const handler = vi.fn<NodeHandler>();
     const wrapped = requireAuth(service, handler);
 
@@ -166,6 +172,7 @@ describe("requireAuth", () => {
 
   it("returns 500 with a sanitized body when AuthService throws", async () => {
     const { service } = makeAuthService(async () => {
+      await Promise.resolve();
       throw new Error("transient Renown failure: secret-internal-detail");
     });
     const handler = vi.fn<NodeHandler>();
@@ -187,11 +194,13 @@ describe("requireAuth", () => {
   });
 
   it("calls authService.verifyBearer with the incoming authorization header", async () => {
-    const { service, spy } = makeAuthService(async () => ({
-      user: { address: "0x1", chainId: 1, networkId: "mainnet" },
-      admins: [],
-      auth_enabled: true,
-    }));
+    const { service, spy } = makeAuthService(() =>
+      Promise.resolve({
+        user: { address: "0x1", chainId: 1, networkId: "mainnet" },
+        admins: [],
+        auth_enabled: true,
+      }),
+    );
     const wrapped = requireAuth(service, vi.fn());
 
     await wrapped(
@@ -204,11 +213,13 @@ describe("requireAuth", () => {
   });
 
   it("calls verifyBearer with undefined when no authorization header is present", async () => {
-    const { service, spy } = makeAuthService(async () => ({
-      user: undefined,
-      admins: [],
-      auth_enabled: true,
-    }));
+    const { service, spy } = makeAuthService(() =>
+      Promise.resolve({
+        user: undefined,
+        admins: [],
+        auth_enabled: true,
+      }),
+    );
     const wrapped = requireAuth(service, vi.fn());
 
     await wrapped(makeReq({ headers: {} }), makeRes());

package/test/attachments/index.test.ts

@@ -61,11 +61,13 @@ function makeRes() {
 
 describe("mountAuthenticatedNodeRoute", () => {
   it("wraps the handler with auth enforcement when authService is defined", async () => {
-    const verifyBearer = vi.fn(async () => ({
-      user: undefined,
-      admins: [],
-      auth_enabled: true,
-    }));
+    const verifyBearer = vi.fn(() =>
+      Promise.resolve({
+        user: undefined,
+        admins: [],
+        auth_enabled: true,
+      }),
+    );
     const authService = { verifyBearer } as unknown as AuthService;
     const { api, captured } = makeFakeApi(authService);
     const inner = vi.fn();
@@ -88,11 +90,13 @@ describe("mountAuthenticatedNodeRoute", () => {
   });
 
   it("invokes the inner handler when verifyBearer returns a valid user", async () => {
-    const verifyBearer = vi.fn(async () => ({
-      user: { address: "0x1", chainId: 1, networkId: "mainnet" },
-      admins: [],
-      auth_enabled: true,
-    }));
+    const verifyBearer = vi.fn(() =>
+      Promise.resolve({
+        user: { address: "0x1", chainId: 1, networkId: "mainnet" },
+        admins: [],
+        auth_enabled: true,
+      }),
+    );
     const authService = { verifyBearer } as unknown as AuthService;
     const { api, captured } = makeFakeApi(authService);
     const inner = vi.fn();

package/test/attachments/service-config.test.ts

@@ -61,9 +61,9 @@ describe("deriveAttachmentServiceConfig", () => {
     const calls: Array<{ expiresIn: number; aud: string }> = [];
     const renown = {
       user: { address: "0xabc" },
-      getBearerToken: async (opts: { expiresIn: number; aud: string }) => {
+      getBearerToken: (opts: { expiresIn: number; aud: string }) => {
         calls.push(opts);
-        return "tok-for-" + opts.aud;
+        return Promise.resolve("tok-for-" + opts.aud);
       },
     } as unknown as IRenown;
 
@@ -80,7 +80,7 @@ describe("deriveAttachmentServiceConfig", () => {
   it("returns undefined token when renown has no user identity", async () => {
     const renown = {
       user: null,
-      getBearerToken: async () => "should-not-be-called",
+      getBearerToken: () => Promise.resolve("should-not-be-called"),
     } as unknown as IRenown;
 
     const { jwtHandler } = deriveAttachmentServiceConfig({}, 4001, renown);

package/dist/utils-BVNg1DRI.mjs.map

@@ -1 +0,0 @@
-{"version":3,"file":"utils-BVNg1DRI.mjs","sources":["../src/utils.mts"],"sourcesContent":["import type { IReactorClient } from \"@powerhousedao/reactor\";\nimport {\n  reactorDriveCreateDocument,\n  reactorDriveCreateState,\n} from \"@powerhousedao/reactor-drive\";\nimport type { DocumentDriveDocument } from \"@powerhousedao/shared/document-drive\";\nimport {\n  driveCreateDocument,\n  driveCreateState,\n} from \"@powerhousedao/shared/document-drive\";\nimport type { DriveInput } from \"@powerhousedao/shared/document-drive\";\nimport { generateId } from \"@powerhousedao/shared/document-model\";\n\nexport async function addDefaultDrive(\n  client: IReactorClient,\n  drive: DriveInput,\n  serverPort: number,\n) {\n  let driveId = drive.id;\n  if (!driveId || driveId.length === 0) {\n    driveId = drive.slug;\n  }\n\n  if (!driveId || driveId.length === 0) {\n    throw new Error(\"Invalid Drive Id\");\n  }\n\n  // check if the drive already exists\n  let existingDrive;\n  try {\n    existingDrive = await client.get(driveId);\n  } catch {\n    //\n  }\n\n  // already exists, return the existing drive url\n  if (existingDrive) {\n    return `http://localhost:${serverPort}/d/${driveId}`;\n  }\n\n  const { global } = driveCreateState();\n  const document = driveCreateDocument({\n    global: {\n      ...global,\n      name: drive.global.name,\n      icon: drive.global.icon ?? global.icon,\n    },\n    local: {\n      availableOffline: drive.local?.availableOffline ?? false,\n      sharingType: drive.local?.sharingType ?? \"public\",\n      listeners: drive.local?.listeners ?? [],\n      triggers: drive.local?.triggers ?? [],\n    },\n  });\n\n  if (drive.id && drive.id.length > 0) {\n    document.header.id = drive.id;\n  }\n  if (drive.slug && drive.slug.length > 0) {\n    document.header.slug = drive.slug;\n  }\n  if (drive.global.name) {\n    document.header.name = drive.global.name;\n  }\n  if (drive.preferredEditor) {\n    document.header.meta = { preferredEditor: drive.preferredEditor };\n  }\n\n  try {\n    await client.create(document);\n  } catch (e) {\n    const errorMessage = e instanceof Error ? e.message : String(e);\n    if (!errorMessage.includes(\"already exists\")) {\n      throw e;\n    }\n  }\n\n  return `http://localhost:${serverPort}/d/${driveId}`;\n}\n\nexport async function addDefaultReactorDrive(\n  client: IReactorClient,\n  drive: DriveInput,\n  serverPort: number,\n) {\n  let driveId = drive.id;\n  if (!driveId || driveId.length === 0) {\n    driveId = drive.slug;\n  }\n\n  if (!driveId || driveId.length === 0) {\n    throw new Error(\"Invalid Drive Id\");\n  }\n\n  let existingDrive;\n  try {\n    existingDrive = await client.get(driveId);\n  } catch {\n    //\n  }\n\n  if (existingDrive) {\n    return `http://localhost:${serverPort}/d/${driveId}`;\n  }\n\n  const { global, local } = reactorDriveCreateState();\n  const document = reactorDriveCreateDocument({\n    global: {\n      ...global,\n      name: drive.global.name,\n      icon: drive.global.icon ?? global.icon,\n    },\n    local: {\n      ...local,\n      availableOffline: drive.local?.availableOffline ?? local.availableOffline,\n      sharingType: drive.local?.sharingType ?? local.sharingType,\n    },\n  });\n\n  if (drive.id && drive.id.length > 0) {\n    document.header.id = drive.id;\n  }\n  if (drive.slug && drive.slug.length > 0) {\n    document.header.slug = drive.slug;\n  }\n  if (drive.global.name) {\n    document.header.name = drive.global.name;\n  }\n  if (drive.preferredEditor) {\n    document.header.meta = { preferredEditor: drive.preferredEditor };\n  }\n\n  try {\n    await client.create(document);\n  } catch (e) {\n    const errorMessage = e instanceof Error ? e.message : String(e);\n    if (!errorMessage.includes(\"already exists\")) {\n      throw e;\n    }\n  }\n\n  return `http://localhost:${serverPort}/d/${driveId}`;\n}\n\nexport function isPostgresUrl(url: string) {\n  return url.startsWith(\"postgresql\") || url.startsWith(\"postgres\");\n}\n"],"names":[],"mappings":";;;;;;AAaA,eAAsB,gBACpB,QACA,OACA,YACA;CACA,IAAI,UAAU,MAAM;AACpB,KAAI,CAAC,WAAW,QAAQ,WAAW,EACjC,WAAU,MAAM;AAGlB,KAAI,CAAC,WAAW,QAAQ,WAAW,EACjC,OAAM,IAAI,MAAM,mBAAmB;CAIrC,IAAI;AACJ,KAAI;AACF,kBAAgB,MAAM,OAAO,IAAI,QAAQ;SACnC;AAKR,KAAI,cACF,QAAO,oBAAoB,WAAW,KAAK;CAG7C,MAAM,EAAE,WAAW,kBAAkB;CACrC,MAAM,WAAW,oBAAoB;EACnC,QAAQ;GACN,GAAG;GACH,MAAM,MAAM,OAAO;GACnB,MAAM,MAAM,OAAO,QAAQ,OAAO;GACnC;EACD,OAAO;GACL,kBAAkB,MAAM,OAAO,oBAAoB;GACnD,aAAa,MAAM,OAAO,eAAe;GACzC,WAAW,MAAM,OAAO,aAAa,EAAE;GACvC,UAAU,MAAM,OAAO,YAAY,EAAE;GACtC;EACF,CAAC;AAEF,KAAI,MAAM,MAAM,MAAM,GAAG,SAAS,EAChC,UAAS,OAAO,KAAK,MAAM;AAE7B,KAAI,MAAM,QAAQ,MAAM,KAAK,SAAS,EACpC,UAAS,OAAO,OAAO,MAAM;AAE/B,KAAI,MAAM,OAAO,KACf,UAAS,OAAO,OAAO,MAAM,OAAO;AAEtC,KAAI,MAAM,gBACR,UAAS,OAAO,OAAO,EAAE,iBAAiB,MAAM,iBAAiB;AAGnE,KAAI;AACF,QAAM,OAAO,OAAO,SAAS;UACtB,GAAG;AAEV,MAAI,EADiB,aAAa,QAAQ,EAAE,UAAU,OAAO,EAAE,EAC7C,SAAS,iBAAiB,CAC1C,OAAM;;AAIV,QAAO,oBAAoB,WAAW,KAAK;;AAG7C,eAAsB,uBACpB,QACA,OACA,YACA;CACA,IAAI,UAAU,MAAM;AACpB,KAAI,CAAC,WAAW,QAAQ,WAAW,EACjC,WAAU,MAAM;AAGlB,KAAI,CAAC,WAAW,QAAQ,WAAW,EACjC,OAAM,IAAI,MAAM,mBAAmB;CAGrC,IAAI;AACJ,KAAI;AACF,kBAAgB,MAAM,OAAO,IAAI,QAAQ;SACnC;AAIR,KAAI,cACF,QAAO,oBAAoB,WAAW,KAAK;CAG7C,MAAM,EAAE,QAAQ,UAAU,yBAAyB;CACnD,MAAM,WAAW,2BAA2B;EAC1C,QAAQ;GACN,GAAG;GACH,MAAM,MAAM,OAAO;GACnB,MAAM,MAAM,OAAO,QAAQ,OAAO;GACnC;EACD,OAAO;GACL,GAAG;GACH,kBAAkB,MAAM,OAAO,oBAAoB,MAAM;GACzD,aAAa,MAAM,OAAO,eAAe,MAAM;GAChD;EACF,CAAC;AAEF,KAAI,MAAM,MAAM,MAAM,GAAG,SAAS,EAChC,UAAS,OAAO,KAAK,MAAM;AAE7B,KAAI,MAAM,QAAQ,MAAM,KAAK,SAAS,EACpC,UAAS,OAAO,OAAO,MAAM;AAE/B,KAAI,MAAM,OAAO,KACf,UAAS,OAAO,OAAO,MAAM,OAAO;AAEtC,KAAI,MAAM,gBACR,UAAS,OAAO,OAAO,EAAE,iBAAiB,MAAM,iBAAiB;AAGnE,KAAI;AACF,QAAM,OAAO,OAAO,SAAS;UACtB,GAAG;AAEV,MAAI,EADiB,aAAa,QAAQ,EAAE,UAAU,OAAO,EAAE,EAC7C,SAAS,iBAAiB,CAC1C,OAAM;;AAIV,QAAO,oBAAoB,WAAW,KAAK;;AAG7C,SAAgB,cAAc,KAAa;AACzC,QAAO,IAAI,WAAW,aAAa,IAAI,IAAI,WAAW,WAAW","debug_id":"62094c88-5d64-5b09-a31f-23862e9c8977"}