@next-safe-action/adapter-better-auth 0.1.0 → 0.1.2

package/README.md

@@ -3,7 +3,7 @@
   <a href="https://github.com/next-safe-action/next-safe-action/packages/adapter-better-auth"><h1>adapter-better-auth</h1></a>
 </div>
 
-This adapter offers a way to seamlessly integrate [next-safe-action](https://github.com/next-safe-action/next-safe-action) with [Better Auth](https://www.better-auth.com). It provides a `betterAuthMiddleware()` function that fetches the session, blocks unauthenticated requests, and injects fully-typed `{ user, session }` data into the action context.
+This adapter offers a way to seamlessly integrate [next-safe-action](https://github.com/next-safe-action/next-safe-action) with [Better Auth](https://www.better-auth.com). It provides a `betterAuth()` function that fetches the session, blocks unauthenticated requests, and injects fully-typed `{ user, session }` data into the action context.
 
 ## Requirements
 
@@ -37,12 +37,12 @@ export const auth = betterAuth({
 ```ts
 // src/lib/safe-action.ts
 import { createSafeActionClient } from "next-safe-action";
-import { betterAuthMiddleware } from "@next-safe-action/adapter-better-auth";
+import { betterAuth } from "@next-safe-action/adapter-better-auth";
 import { auth } from "./auth";
 
 export const actionClient = createSafeActionClient();
 
-export const authClient = actionClient.use(betterAuthMiddleware(auth));
+export const authClient = actionClient.use(betterAuth(auth));
 ```
 
 ### 3. Use it in your actions
@@ -71,7 +71,7 @@ export const updateProfile = authClient
 
 ## How it works
 
-`betterAuthMiddleware()` creates a pre-validation middleware for the safe action client's `.use()` chain:
+`betterAuth()` creates a pre-validation middleware for the safe action client's `.use()` chain:
 
 1. **Fetches the session** by calling `auth.api.getSession({ headers: await headers() })`
 2. **Blocks unauthenticated requests** by calling `unauthorized()` from `next/navigation` when no session exists
@@ -100,12 +100,12 @@ Pass an `authorize` callback to customize the authorization flow. The session is
 
 ```ts
 import { unauthorized } from "next/navigation";
-import { betterAuthMiddleware } from "@next-safe-action/adapter-better-auth";
+import { betterAuth } from "@next-safe-action/adapter-better-auth";
 import { auth } from "./auth";
 
 // Role-based access
 export const adminClient = actionClient.use(
-	betterAuthMiddleware(auth, {
+	betterAuth(auth, {
 		authorize: ({ sessionData, next }) => {
 			if (!sessionData || sessionData.user.role !== "admin") {
 				unauthorized();
@@ -143,7 +143,7 @@ export const auth = betterAuth({
 
 ## API reference
 
-### `betterAuthMiddleware(auth, opts?)`
+### `betterAuth(auth, opts?)`
 
 Creates a middleware function for use with the safe action client's `.use()` method.
 
@@ -158,7 +158,7 @@ Creates a middleware function for use with the safe action client's `.use()` met
 
 - `BetterAuthContext<Options>`: the context shape added by the middleware (`{ auth: { user, session } }`)
 - `AuthorizeFn<Options, NextCtx>`: the `authorize` callback signature
-- `BetterAuthMiddlewareOpts<Options, NextCtx>`: the options object type for `betterAuthMiddleware`
+- `BetterAuthOpts<Options, NextCtx>`: the options object type for `betterAuth`
 
 ## Documentation
 

package/dist/index.d.mts

@@ -1,9 +1,9 @@
-import { Auth, BetterAuthOptions } from "better-auth";
 import { MiddlewareFn, MiddlewareResult } from "next-safe-action";
+import { Auth, BetterAuthOptions } from "better-auth";
 
 //#region src/index.types.d.ts
 /**
- * The default context shape added by `betterAuthMiddleware`.
+ * The default context shape added by `betterAuth`.
  * Contains `auth.user` and `auth.session`, fully typed from the better-auth instance.
  */
 type BetterAuthContext<O extends BetterAuthOptions> = {
@@ -11,21 +11,20 @@ type BetterAuthContext<O extends BetterAuthOptions> = {
 };
 /**
  * Authorize callback signature for custom authorization logic.
- * Receives the auth instance, pre-fetched session data, current context, and the `next` function.
+ * Receives the pre-fetched session data, current context, and the `next` function.
  */
-type AuthorizeFn<O extends BetterAuthOptions, NC extends object> = (args: {
-  auth: Auth<O>;
+type AuthorizeFn<O extends BetterAuthOptions, NC extends object, Ctx extends object = object> = (args: {
   sessionData: Auth<O>["$Infer"]["Session"] | null;
-  ctx: object;
+  ctx: Ctx;
   next: <C extends object>(opts?: {
     ctx?: C;
   }) => Promise<MiddlewareResult<any, C>>;
 }) => Promise<MiddlewareResult<any, NC>>;
 /**
- * Options for `betterAuthMiddleware`.
+ * Options for `betterAuth`.
  */
-type BetterAuthMiddlewareOpts<O extends BetterAuthOptions, NC extends object> = {
-  authorize: AuthorizeFn<O, NC>;
+type BetterAuthOpts<O extends BetterAuthOptions, NC extends object, Ctx extends object = object> = {
+  authorize: AuthorizeFn<O, NC, Ctx>;
 };
 //#endregion
 //#region src/index.d.ts
@@ -43,10 +42,10 @@ type BetterAuthMiddlewareOpts<O extends BetterAuthOptions, NC extends object> =
  * @example
  * ```ts
  * // Default: fetch session, unauthorized() if absent
- * actionClient.use(betterAuthMiddleware(auth));
+ * actionClient.use(betterAuth(auth));
  *
  * // Custom: check role
- * actionClient.use(betterAuthMiddleware(auth, {
+ * actionClient.use(betterAuth(auth, {
  *   authorize: ({ sessionData, next }) => {
  *     if (!sessionData || sessionData.user.role !== "admin") {
  *       unauthorized();
@@ -56,8 +55,8 @@ type BetterAuthMiddlewareOpts<O extends BetterAuthOptions, NC extends object> =
  * }));
  * ```
  */
-declare function betterAuthMiddleware<O extends BetterAuthOptions>(auth: Auth<O>): MiddlewareFn<any, any, object, BetterAuthContext<O>>;
-declare function betterAuthMiddleware<O extends BetterAuthOptions, NC extends object>(auth: Auth<O>, opts: BetterAuthMiddlewareOpts<O, NC>): MiddlewareFn<any, any, object, NC>;
+declare function betterAuth<O extends BetterAuthOptions>(auth: Auth<O>): MiddlewareFn<any, any, object, BetterAuthContext<O>>;
+declare function betterAuth<O extends BetterAuthOptions, NC extends object, Ctx extends object>(auth: Auth<O>, opts: BetterAuthOpts<O, NC, Ctx>): MiddlewareFn<any, any, Ctx, NC>;
 //#endregion
-export { type AuthorizeFn, type BetterAuthContext, type BetterAuthMiddlewareOpts, betterAuthMiddleware };
+export { type AuthorizeFn, type BetterAuthContext, type BetterAuthOpts, betterAuth };
 //# sourceMappingURL=index.d.mts.map

package/dist/index.mjs

@@ -1,11 +1,11 @@
+import { createMiddleware } from "next-safe-action";
 import { headers } from "next/headers.js";
 import { unauthorized } from "next/navigation.js";
 //#region src/index.ts
-function betterAuthMiddleware(auth, opts) {
-	return async ({ ctx, next }) => {
+function betterAuth(auth, opts) {
+	return createMiddleware().define(async ({ ctx, next }) => {
 		const sessionData = await auth.api.getSession({ headers: await headers() });
 		if (opts?.authorize) return opts.authorize({
-			auth,
 			sessionData,
 			ctx,
 			next
@@ -15,9 +15,9 @@ function betterAuthMiddleware(auth, opts) {
 			user: sessionData.user,
 			session: sessionData.session
 		} } });
-	};
+	});
 }
 //#endregion
-export { betterAuthMiddleware };
+export { betterAuth };
 
 //# sourceMappingURL=index.mjs.map

package/dist/index.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"index.mjs","names":[],"sources":["../src/index.ts"],"sourcesContent":["import type { Auth, BetterAuthOptions } from \"better-auth\";\nimport type { MiddlewareFn } from \"next-safe-action\";\nimport { headers } from \"next/headers\";\nimport { unauthorized } from \"next/navigation\";\nimport type { BetterAuthContext, BetterAuthMiddlewareOpts } from \"./index.types\";\n\n/**\n * Creates a next-safe-action middleware that integrates with better-auth.\n *\n * Default behavior: fetches the session via `auth.api.getSession()`, calls `unauthorized()` if\n * no session exists, and injects `{ auth: { user, session } }` into the action context.\n *\n * Pass an `authorize` callback to customize the authorization flow. The session is pre-fetched\n * and passed to the callback, so common customizations (e.g. role checks) don't need to re-fetch.\n *\n * Note: `unauthorized()` requires `experimental.authInterrupts: true` in your `next.config.ts` file.\n *\n * @example\n * ```ts\n * // Default: fetch session, unauthorized() if absent\n * actionClient.use(betterAuthMiddleware(auth));\n *\n * // Custom: check role\n * actionClient.use(betterAuthMiddleware(auth, {\n *   authorize: ({ sessionData, next }) => {\n *     if (!sessionData || sessionData.user.role !== \"admin\") {\n *       unauthorized();\n *     }\n *     return next({ ctx: { auth: sessionData } });\n *   },\n * }));\n * ```\n */\nexport function betterAuthMiddleware<O extends BetterAuthOptions>(\n\tauth: Auth<O>\n): MiddlewareFn<any, any, object, BetterAuthContext<O>>;\nexport function betterAuthMiddleware<O extends BetterAuthOptions, NC extends object>(\n\tauth: Auth<O>,\n\topts: BetterAuthMiddlewareOpts<O, NC>\n): MiddlewareFn<any, any, object, NC>;\nexport function betterAuthMiddleware<O extends BetterAuthOptions>(\n\tauth: Auth<O>,\n\topts?: BetterAuthMiddlewareOpts<O, any>\n) {\n\treturn async ({ ctx, next }: any) => {\n\t\tconst sessionData = await auth.api.getSession({ headers: await headers() });\n\n\t\tif (opts?.authorize) {\n\t\t\treturn opts.authorize({ auth, sessionData, ctx, next });\n\t\t}\n\n\t\tif (!sessionData) {\n\t\t\tunauthorized();\n\t\t}\n\n\t\treturn next({ ctx: { auth: { user: sessionData.user, session: sessionData.session } } });\n\t};\n}\n\nexport type { AuthorizeFn, BetterAuthContext, BetterAuthMiddlewareOpts } from \"./index.types\";\n"],"mappings":";;;AAwCA,SAAgB,qBACf,MACA,MACC;AACD,QAAO,OAAO,EAAE,KAAK,WAAgB;EACpC,MAAM,cAAc,MAAM,KAAK,IAAI,WAAW,EAAE,SAAS,MAAM,SAAS,EAAE,CAAC;AAE3E,MAAI,MAAM,UACT,QAAO,KAAK,UAAU;GAAE;GAAM;GAAa;GAAK;GAAM,CAAC;AAGxD,MAAI,CAAC,YACJ,eAAc;AAGf,SAAO,KAAK,EAAE,KAAK,EAAE,MAAM;GAAE,MAAM,YAAY;GAAM,SAAS,YAAY;GAAS,EAAE,EAAE,CAAC"}
+{"version":3,"file":"index.mjs","names":[],"sources":["../src/index.ts"],"sourcesContent":["import type { Auth, BetterAuthOptions } from \"better-auth\";\nimport { createMiddleware } from \"next-safe-action\";\nimport type { MiddlewareFn } from \"next-safe-action\";\nimport { headers } from \"next/headers\";\nimport { unauthorized } from \"next/navigation\";\nimport type { BetterAuthContext, BetterAuthOpts } from \"./index.types\";\n\n/**\n * Creates a next-safe-action middleware that integrates with better-auth.\n *\n * Default behavior: fetches the session via `auth.api.getSession()`, calls `unauthorized()` if\n * no session exists, and injects `{ auth: { user, session } }` into the action context.\n *\n * Pass an `authorize` callback to customize the authorization flow. The session is pre-fetched\n * and passed to the callback, so common customizations (e.g. role checks) don't need to re-fetch.\n *\n * Note: `unauthorized()` requires `experimental.authInterrupts: true` in your `next.config.ts` file.\n *\n * @example\n * ```ts\n * // Default: fetch session, unauthorized() if absent\n * actionClient.use(betterAuth(auth));\n *\n * // Custom: check role\n * actionClient.use(betterAuth(auth, {\n *   authorize: ({ sessionData, next }) => {\n *     if (!sessionData || sessionData.user.role !== \"admin\") {\n *       unauthorized();\n *     }\n *     return next({ ctx: { auth: sessionData } });\n *   },\n * }));\n * ```\n */\nexport function betterAuth<O extends BetterAuthOptions>(\n\tauth: Auth<O>\n): MiddlewareFn<any, any, object, BetterAuthContext<O>>;\nexport function betterAuth<O extends BetterAuthOptions, NC extends object, Ctx extends object>(\n\tauth: Auth<O>,\n\topts: BetterAuthOpts<O, NC, Ctx>\n): MiddlewareFn<any, any, Ctx, NC>;\nexport function betterAuth<O extends BetterAuthOptions>(\n\tauth: Auth<O>,\n\topts?: BetterAuthOpts<O, any, any>\n) {\n\treturn createMiddleware().define(async ({ ctx, next }) => {\n\t\tconst sessionData = await auth.api.getSession({ headers: await headers() });\n\n\t\tif (opts?.authorize) {\n\t\t\treturn opts.authorize({ sessionData, ctx, next });\n\t\t}\n\n\t\tif (!sessionData) {\n\t\t\tunauthorized();\n\t\t}\n\n\t\treturn next({ ctx: { auth: { user: sessionData.user, session: sessionData.session } } });\n\t});\n}\n\nexport type { AuthorizeFn, BetterAuthContext, BetterAuthOpts } from \"./index.types\";\n"],"mappings":";;;;AAyCA,SAAgB,WACf,MACA,MACC;AACD,QAAO,kBAAkB,CAAC,OAAO,OAAO,EAAE,KAAK,WAAW;EACzD,MAAM,cAAc,MAAM,KAAK,IAAI,WAAW,EAAE,SAAS,MAAM,SAAS,EAAE,CAAC;AAE3E,MAAI,MAAM,UACT,QAAO,KAAK,UAAU;GAAE;GAAa;GAAK;GAAM,CAAC;AAGlD,MAAI,CAAC,YACJ,eAAc;AAGf,SAAO,KAAK,EAAE,KAAK,EAAE,MAAM;GAAE,MAAM,YAAY;GAAM,SAAS,YAAY;GAAS,EAAE,EAAE,CAAC;GACvF"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@next-safe-action/adapter-better-auth",
-  "version": "0.1.0",
+  "version": "0.1.2",
   "private": false,
   "description": "Better Auth adapter for next-safe-action.",
   "main": "./dist/index.mjs",