add a default client as a temporary solution

apps/demo/CHANGELOG.md

@@ -1,5 +1,16 @@
 # @authhero/demo
 
+## 0.4.0
+
+### Minor Changes
+
+- add a fallback client as a temporary solution
+
+### Patch Changes
+
+- Updated dependencies
+  - [email protected]
+
 ## 0.3.0
 
 ### Minor Changes

apps/demo/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@authhero/demo",
   "private": true,
-  "version": "0.3.0",
+  "version": "0.4.0",
   "scripts": {
     "dev": "bun --watch src/bun.ts"
   },
@@ -10,7 +10,7 @@
     "@hono/swagger-ui": "^0.4.1",
     "@hono/zod-openapi": "^0.18.0",
     "@peculiar/x509": "^1.12.3",
-    "authhero": "^0.17.0",
+    "authhero": "^0.19.0",
     "hono": "^4.6.11",
     "hono-openapi-middlewares": "^1.0.11",
     "kysely-bun-sqlite": "^0.3.2",

packages/authhero/CHANGELOG.md

@@ -1,5 +1,11 @@
 # authhero
 
+## 0.19.0
+
+### Minor Changes
+
+- add a fallback client as a temporary solution
+
 ## 0.18.0
 
 ### Minor Changes

packages/authhero/package.json

@@ -1,6 +1,6 @@
 {
   "name": "authhero",
-  "version": "0.18.0",
+  "version": "0.19.0",
   "files": [
     "dist"
   ],

packages/authhero/src/authentication-flows/authorization-code.ts

@@ -7,6 +7,7 @@ import { Bindings, Variables } from "../types";
 import { computeCodeChallenge } from "../utils/crypto";
 import { SILENT_AUTH_MAX_AGE, SILENT_COOKIE_NAME } from "../constants";
 import { serializeCookie } from "oslo/cookie";
+import { getClient } from "../helpers/client";
 
 export const authorizationCodeGrantParamsSchema = z
   .object({
@@ -39,11 +40,7 @@ export async function authorizationCodeGrant(
   ctx: Context<{ Bindings: Bindings; Variables: Variables }>,
   params: AuthorizationCodeGrantTypeParams,
 ) {
-  const client = await ctx.env.data.clients.get(params.client_id);
-
-  if (!client) {
-    throw new HTTPException(403, { message: "Invalid client credentials" });
-  }
+  const client = await getClient(ctx.env, params.client_id);
 
   const code = await ctx.env.data.codes.get(
     client.tenant.id,

packages/authhero/src/helpers/client.ts

@@ -0,0 +1,62 @@
+import { HTTPException } from "hono/http-exception";
+import { Client, connectionSchema } from "authhero";
+import { Bindings } from "../types";
+
+export async function getClient(
+  env: Bindings,
+  clientId: string,
+): Promise<Client> {
+  const client = await env.data.clients.get(clientId);
+  if (!client) {
+    throw new HTTPException(403, { message: "Client not found" });
+  }
+
+  // Temporarily assume that this is the default client.
+  const defaultClient = await env.data.clients.get("DEFAULT_CLIENT");
+
+  const connections = defaultClient
+    ? client.connections
+        .map((connection) => {
+          const defaultConnection = defaultClient?.connections?.find(
+            (c) => c.name === connection.name,
+          );
+
+          const mergedConnection = connectionSchema.parse({
+            ...(defaultConnection || {}),
+            ...connection,
+            options: {
+              ...(defaultConnection?.options || {}),
+              ...connection.options,
+            },
+          });
+
+          return mergedConnection;
+        })
+        .filter((c) => c)
+    : client.connections;
+
+  return {
+    ...client,
+    web_origins: [
+      ...(defaultClient?.web_origins || []),
+      ...(client.web_origins || []),
+      `${env.ISSUER}u/login`,
+    ],
+    allowed_logout_urls: [
+      ...(defaultClient?.allowed_logout_urls || []),
+      ...(client.allowed_logout_urls || []),
+      env.ISSUER,
+    ],
+    callbacks: [
+      ...(defaultClient?.callbacks || []),
+      ...(client.callbacks || []),
+      `${env.ISSUER}u/info`,
+    ],
+    connections,
+    domains: [...(client.domains || []), ...(defaultClient?.domains || [])],
+    tenant: {
+      ...(defaultClient?.tenant || {}),
+      ...client.tenant,
+    },
+  };
+}

packages/authhero/test/routes/oauth2/token.spec.ts

@@ -336,7 +336,7 @@ describe("token", () => {
         expect(response.status).toBe(403);
         const body = await response.text();
 
-        expect(body).toBe("Invalid client credentials");
+        expect(body).toBe("Client not found");
       });
 
       it("should return a 403 if the code is expired", async () => {