From 80b4c42f1d408bfd28a67ba9bf650f69e80c5063 Mon Sep 17 00:00:00 2001 From: Bereket Engida Date: Wed, 18 Dec 2024 09:38:57 +0300 Subject: [PATCH] chore: hook context returned type should be optional --- packages/better-auth/src/api/call.test.ts | 10 ++++------ packages/better-auth/src/api/call.ts | 3 ++- packages/better-auth/src/auth.ts | 2 +- packages/better-auth/src/client/client.test.ts | 4 ++-- packages/better-auth/src/types/context.ts | 2 +- 5 files changed, 10 insertions(+), 11 deletions(-) diff --git a/packages/better-auth/src/api/call.test.ts b/packages/better-auth/src/api/call.test.ts index 85d58d1d37..734acc7c99 100644 --- a/packages/better-auth/src/api/call.test.ts +++ b/packages/better-auth/src/api/call.test.ts @@ -95,13 +95,11 @@ describe("call", async () => { }); } if (query.testContext) { + ctx.query = { + message: query.testContext, + }; return { - context: { - // change context - query: { - message: query.testContext, - }, - }, + context: ctx, }; } }), diff --git a/packages/better-auth/src/api/call.ts b/packages/better-auth/src/api/call.ts index 54d3c4769b..e33828a224 100644 --- a/packages/better-auth/src/api/call.ts +++ b/packages/better-auth/src/api/call.ts @@ -1,4 +1,5 @@ import { + APIError, type Endpoint, type EndpointResponse, createEndpointCreator, @@ -25,7 +26,7 @@ export const createAuthMiddleware = createMiddlewareCreator({ */ createMiddleware(async () => { return {} as { - returned?: unknown; + returned?: APIError | Response | Record; endpoint: Endpoint; }; }), diff --git a/packages/better-auth/src/auth.ts b/packages/better-auth/src/auth.ts index 86f6766bf5..284d79e074 100644 --- a/packages/better-auth/src/auth.ts +++ b/packages/better-auth/src/auth.ts @@ -55,7 +55,7 @@ export const betterAuth = (options: O) => { user: PrettifyDeep>; }; } & InferPluginTypes, - $ErrorCodes: { + $ERROR_CODES: { ...errorCodes, ...BASE_ERROR_CODES, } as InferPluginErrorCodes & typeof BASE_ERROR_CODES, diff --git a/packages/better-auth/src/client/client.test.ts b/packages/better-auth/src/client/client.test.ts index eea33a19db..52d1154b20 100644 --- a/packages/better-auth/src/client/client.test.ts +++ b/packages/better-auth/src/client/client.test.ts @@ -9,8 +9,8 @@ import type { Ref } from "vue"; import type { ReadableAtom } from "nanostores"; import type { Session } from "../db/schema"; import { BetterFetchError } from "@better-fetch/fetch"; -import { passkeyClient, twoFactorClient } from "../plugins"; -import { organizationClient } from "./plugins"; +import { twoFactorClient } from "../plugins"; +import { organizationClient, passkeyClient } from "./plugins"; describe("run time proxy", async () => { it("proxy api should be called", async () => { diff --git a/packages/better-auth/src/types/context.ts b/packages/better-auth/src/types/context.ts index ac11fd558f..7dafde48c2 100644 --- a/packages/better-auth/src/types/context.ts +++ b/packages/better-auth/src/types/context.ts @@ -5,7 +5,7 @@ export type HookEndpointContext = {}> = ContextTools & { context: AuthContext & C & { - returned: APIError | Response | Record; + returned?: APIError | Response | Record; }; } & { body: any;