better-auth 0.3.4-beta.1 → 0.3.4-beta.3

package/dist/adapters/drizzle.d.ts

@@ -1,8 +1,8 @@
-import { A as Adapter } from '../index-DUb6fNdH.js';
+import { A as Adapter } from '../index-C9daNPfT.js';
+import 'zod';
 import 'kysely';
 import '../index-CT4RHCuS.js';
 import 'arctic';
-import 'zod';
 import '../helper-DPDj8Nix.js';
 import 'better-call';
 import 'better-sqlite3';

package/dist/adapters/drizzle.js

@@ -72,7 +72,8 @@ var getAuthTables = (options) => {
           defaultValue: () => /* @__PURE__ */ new Date(),
           required: true
         },
-        ...user?.fields
+        ...user?.fields,
+        ...options.user?.additionalFields
       },
       order: 0
     },
@@ -100,7 +101,8 @@ var getAuthTables = (options) => {
           },
           required: true
         },
-        ...session?.fields
+        ...session?.fields,
+        ...options.session?.additionalFields
       },
       order: 1
     },

package/dist/adapters/mongodb.d.ts

@@ -1,9 +1,9 @@
 import { Db } from 'mongodb';
-import { W as Where } from '../index-DUb6fNdH.js';
+import { W as Where } from '../index-C9daNPfT.js';
+import 'zod';
 import 'kysely';
 import '../index-CT4RHCuS.js';
 import 'arctic';
-import 'zod';
 import '../helper-DPDj8Nix.js';
 import 'better-call';
 import 'better-sqlite3';

package/dist/adapters/prisma.d.ts

@@ -1,8 +1,8 @@
-import { A as Adapter } from '../index-DUb6fNdH.js';
+import { A as Adapter } from '../index-C9daNPfT.js';
+import 'zod';
 import 'kysely';
 import '../index-CT4RHCuS.js';
 import 'arctic';
-import 'zod';
 import '../helper-DPDj8Nix.js';
 import 'better-call';
 import 'better-sqlite3';

package/dist/api.d.ts

@@ -1,6 +1,6 @@
-export { f as AuthEndpoint, g as AuthMiddleware, n as callbackOAuth, L as changePassword, e as createAuthEndpoint, d as createAuthMiddleware, D as createEmailVerificationToken, V as csrfMiddleware, N as deleteUser, Q as error, y as forgetPassword, z as forgetPasswordCallback, O as getCSRFToken, l as getEndpoints, p as getSession, q as getSessionFromCtx, u as listSessions, T as ok, o as optionsMiddleware, C as resetPassword, v as revokeSession, w as revokeSessions, r as router, E as sendVerificationEmail, t as sessionMiddleware, M as setPassword, m as signInEmail, s as signInOAuth, x as signOut, U as signUpEmail, K as updateUser, J as verifyEmail } from './index-DUb6fNdH.js';
-import 'zod';
+export { f as AuthEndpoint, g as AuthMiddleware, u as callbackOAuth, Q as changePassword, e as createAuthEndpoint, d as createAuthMiddleware, L as createEmailVerificationToken, _ as csrfMiddleware, U as deleteUser, X as error, E as forgetPassword, J as forgetPasswordCallback, V as getCSRFToken, q as getEndpoints, v as getSession, w as getSessionFromCtx, y as listSessions, Y as ok, o as optionsMiddleware, K as resetPassword, z as revokeSession, C as revokeSessions, r as router, M as sendVerificationEmail, x as sessionMiddleware, T as setPassword, t as signInEmail, s as signInOAuth, D as signOut, Z as signUpEmail, O as updateUser, N as verifyEmail } from './index-C9daNPfT.js';
 import './helper-DPDj8Nix.js';
+import 'zod';
 export { APIError } from 'better-call';
 import 'kysely';
 import './index-CT4RHCuS.js';

package/dist/api.js

@@ -773,13 +773,14 @@ var oAuthProviderList = Object.keys(oAuthProviders);
 // src/utils/state.ts
 import { generateState as generateStateOAuth } from "oslo/oauth2";
 import { z as z2 } from "zod";
-function generateState(callbackURL, currentURL, dontRememberMe) {
+function generateState(callbackURL, currentURL, dontRememberMe, additionalFields) {
   const code = generateStateOAuth();
   const state = JSON.stringify({
     code,
     callbackURL,
     currentURL,
-    dontRememberMe
+    dontRememberMe,
+    additionalFields
   });
   return { state, code };
 }
@@ -788,7 +789,8 @@ function parseState(state) {
     code: z2.string(),
     callbackURL: z2.string().optional(),
     currentURL: z2.string().optional(),
-    dontRememberMe: z2.boolean().optional()
+    dontRememberMe: z2.boolean().optional(),
+    additionalFields: z2.record(z2.string()).optional()
   }).safeParse(JSON.parse(state));
   return data;
 }
@@ -833,35 +835,6 @@ function deleteSessionCookie(ctx) {
 
 // src/api/routes/session.ts
 import { z as z3 } from "zod";
-
-// src/utils/get-request-ip.ts
-function getIp(req) {
-  const testIP = "127.0.0.1";
-  if (process.env.NODE_ENV === "test") {
-    return testIP;
-  }
-  const headers = [
-    "x-client-ip",
-    "x-forwarded-for",
-    "cf-connecting-ip",
-    "fastly-client-ip",
-    "x-real-ip",
-    "x-cluster-client-ip",
-    "x-forwarded",
-    "forwarded-for",
-    "forwarded"
-  ];
-  for (const header of headers) {
-    const value = req.headers.get(header);
-    if (typeof value === "string") {
-      const ip = value.split(",")[0].trim();
-      if (ip) return ip;
-    }
-  }
-  return null;
-}
-
-// src/api/routes/session.ts
 var getSession = () => createAuthEndpoint(
   "/session",
   {
@@ -1245,6 +1218,40 @@ var verificationSchema = z5.object({
   expiresAt: z5.date(),
   identifier: z5.string()
 });
+function getAllFields(options, table) {
+  let schema = {
+    ...table === "user" ? options.user?.additionalFields : {},
+    ...table === "session" ? options.session?.additionalFields : {}
+  };
+  for (const plugin of options.plugins || []) {
+    if (plugin.schema && plugin.schema[table]) {
+      schema = {
+        ...schema,
+        ...plugin.schema[table].fields
+      };
+    }
+  }
+  return schema;
+}
+function parseInputData(data, schema) {
+  const fields = schema.fields;
+  const parsedData = {};
+  for (const key in fields) {
+    if (key in data) {
+      parsedData[key] = data[key];
+      continue;
+    }
+    if (fields[key].defaultValue) {
+      parsedData[key] = fields[key].defaultValue;
+      continue;
+    }
+  }
+  return parsedData;
+}
+function parseUserInput(options, user) {
+  const schema = getAllFields(options, "user");
+  return parseInputData(user || {}, { fields: schema });
+}
 
 // src/crypto/random.ts
 function byteToBinary(byte) {
@@ -2177,7 +2184,7 @@ var ok = createAuthEndpoint(
 // src/api/routes/sign-up.ts
 import { z as z11 } from "zod";
 import { APIError as APIError9 } from "better-call";
-var signUpEmail = createAuthEndpoint(
+var signUpEmail = () => createAuthEndpoint(
   "/sign-up/email",
   {
     method: "POST",
@@ -2189,7 +2196,8 @@ var signUpEmail = createAuthEndpoint(
       email: z11.string(),
       password: z11.string(),
       image: z11.string().optional(),
-      callbackURL: z11.string().optional()
+      callbackURL: z11.string().optional(),
+      additionalFields: z11.record(z11.string(), z11.any()).optional()
     })
   },
   async (ctx) => {
@@ -2199,6 +2207,7 @@ var signUpEmail = createAuthEndpoint(
       });
     }
     const { name, email, password, image } = ctx.body;
+    const additionalFields = ctx.body.additionalFields;
     const isValidEmail = z11.string().email().safeParse(email);
     if (!isValidEmail.success) {
       throw new APIError9("BAD_REQUEST", {
@@ -2225,6 +2234,10 @@ var signUpEmail = createAuthEndpoint(
         message: "User already exists"
       });
     }
+    const additionalData = parseUserInput(
+      ctx.context.options,
+      additionalFields
+    );
     const createdUser = await ctx.context.internalAdapter.createUser({
       id: generateRandomString(32, alphabet("a-z", "0-9", "A-Z")),
       email: email.toLowerCase(),
@@ -2232,7 +2245,8 @@ var signUpEmail = createAuthEndpoint(
       image,
       emailVerified: false,
       createdAt: /* @__PURE__ */ new Date(),
-      updatedAt: /* @__PURE__ */ new Date()
+      updatedAt: /* @__PURE__ */ new Date(),
+      ...additionalData
     });
     if (!createdUser) {
       throw new APIError9("BAD_REQUEST", {
@@ -2291,6 +2305,33 @@ var signUpEmail = createAuthEndpoint(
 // src/api/index.ts
 import chalk from "chalk";
 
+// src/utils/get-request-ip.ts
+function getIp(req) {
+  const testIP = "127.0.0.1";
+  if (process.env.NODE_ENV === "test") {
+    return testIP;
+  }
+  const headers = [
+    "x-client-ip",
+    "x-forwarded-for",
+    "cf-connecting-ip",
+    "fastly-client-ip",
+    "x-real-ip",
+    "x-cluster-client-ip",
+    "x-forwarded",
+    "forwarded-for",
+    "forwarded"
+  ];
+  for (const header of headers) {
+    const value = req.headers.get(header);
+    if (typeof value === "string") {
+      const ip = value.split(",")[0].trim();
+      if (ip) return ip;
+    }
+  }
+  return null;
+}
+
 // src/api/rate-limiter.ts
 function shouldRateLimit(max, window2, rateLimitData) {
   const now = Date.now();
@@ -2487,7 +2528,7 @@ function getEndpoints(ctx, options) {
     getCSRFToken,
     getSession: getSession(),
     signOut,
-    signUpEmail,
+    signUpEmail: signUpEmail(),
     signInEmail,
     forgetPassword,
     resetPassword,

package/dist/cli.js

@@ -345,7 +345,8 @@ var getAuthTables = (options) => {
           defaultValue: () => /* @__PURE__ */ new Date(),
           required: true
         },
-        ...user?.fields
+        ...user?.fields,
+        ...options.user?.additionalFields
       },
       order: 0
     },
@@ -373,7 +374,8 @@ var getAuthTables = (options) => {
           },
           required: true
         },
-        ...session?.fields
+        ...session?.fields,
+        ...options.session?.additionalFields
       },
       order: 1
     },

package/dist/client/plugins.d.ts

@@ -2,18 +2,18 @@ import * as nanostores from 'nanostores';
 import { A as AccessControl, S as StatementsPrimitive, R as Role } from '../statement-CfnyN34h.js';
 import * as _better_fetch_fetch from '@better-fetch/fetch';
 import { BetterFetchOption } from '@better-fetch/fetch';
-import { o as organization, f as Organization, M as Member, I as Invitation, u as username, m as magicLink, d as phoneNumber, e as anonymous } from '../index-BToGSxVf.js';
-export { g as getPasskeyActions, c as passkeyClient, a as twoFactorClient } from '../index-BToGSxVf.js';
+import { o as organization, f as Organization, M as Member, I as Invitation, u as username, m as magicLink, d as phoneNumber, e as anonymous } from '../index-CUhY6myj.js';
+export { g as getPasskeyActions, c as passkeyClient, a as twoFactorClient } from '../index-CUhY6myj.js';
 import { P as Prettify } from '../helper-DPDj8Nix.js';
+import { F as FieldAttribute, B as BetterAuthOptions, c as BetterAuthPlugin } from '../index-C9daNPfT.js';
 import '../index-CT4RHCuS.js';
 import 'arctic';
 import 'zod';
 import 'better-call';
-import '../index-DUb6fNdH.js';
+import '@simplewebauthn/types';
 import 'kysely';
 import 'better-sqlite3';
 import 'mysql2';
-import '@simplewebauthn/types';
 
 interface OrganizationClientOptions {
     ac: AccessControl;
@@ -161,4 +161,94 @@ declare const anonymousClient: () => {
     };
 };
 
-export { anonymousClient, magicLinkClient, organizationClient, phoneNumberClient, usernameClient };
+declare const inferAdditionalFields: <T, S extends {
+    user?: {
+        [key: string]: FieldAttribute;
+    };
+    session?: {
+        [key: string]: FieldAttribute;
+    };
+} = {}>(schema?: S) => {
+    id: "additional-fields-client";
+    $InferServerPlugin: ((T extends BetterAuthOptions ? T : T extends {
+        options: BetterAuthOptions;
+    } ? T["options"] : never) extends never ? S extends {
+        user?: {
+            [key: string]: FieldAttribute;
+        };
+        session?: {
+            [key: string]: FieldAttribute;
+        };
+    } ? {
+        id: "additional-fields-client";
+        schema: {
+            user: {
+                fields: S["user"] extends object ? S["user"] : {};
+            };
+            session: {
+                fields: S["session"] extends object ? S["session"] : {};
+            };
+        };
+    } : never : (T extends BetterAuthOptions ? T : T extends {
+        options: BetterAuthOptions;
+    } ? T["options"] : never) extends BetterAuthOptions ? {
+        id: "additional-fields";
+        schema: {
+            user: {
+                fields: (T extends BetterAuthOptions ? T : T extends {
+                    options: BetterAuthOptions;
+                } ? T["options"] : never)["user"] extends {
+                    additionalFields: infer U;
+                } ? U : {};
+            };
+            session: {
+                fields: (T extends BetterAuthOptions ? T : T extends {
+                    options: BetterAuthOptions;
+                } ? T["options"] : never)["session"] extends {
+                    additionalFields: infer U;
+                } ? U : {};
+            };
+        };
+    } : never) extends BetterAuthPlugin ? (T extends BetterAuthOptions ? T : T extends {
+        options: BetterAuthOptions;
+    } ? T["options"] : never) extends never ? S extends {
+        user?: {
+            [key: string]: FieldAttribute;
+        };
+        session?: {
+            [key: string]: FieldAttribute;
+        };
+    } ? {
+        id: "additional-fields-client";
+        schema: {
+            user: {
+                fields: S["user"] extends object ? S["user"] : {};
+            };
+            session: {
+                fields: S["session"] extends object ? S["session"] : {};
+            };
+        };
+    } : never : (T extends BetterAuthOptions ? T : T extends {
+        options: BetterAuthOptions;
+    } ? T["options"] : never) extends BetterAuthOptions ? {
+        id: "additional-fields";
+        schema: {
+            user: {
+                fields: (T extends BetterAuthOptions ? T : T extends {
+                    options: BetterAuthOptions;
+                } ? T["options"] : never)["user"] extends {
+                    additionalFields: infer U;
+                } ? U : {};
+            };
+            session: {
+                fields: (T extends BetterAuthOptions ? T : T extends {
+                    options: BetterAuthOptions;
+                } ? T["options"] : never)["session"] extends {
+                    additionalFields: infer U;
+                } ? U : {};
+            };
+        };
+    } : never : undefined;
+};
+
+export { anonymousClient, inferAdditionalFields, magicLinkClient, organizationClient, phoneNumberClient, usernameClient };

package/dist/client/plugins.js

@@ -504,9 +504,18 @@ var anonymousClient = () => {
     }
   };
 };
+
+// src/plugins/additional-fields/client.ts
+var inferAdditionalFields = (schema) => {
+  return {
+    id: "additional-fields-client",
+    $InferServerPlugin: {}
+  };
+};
 export {
   anonymousClient,
   getPasskeyActions,
+  inferAdditionalFields,
   magicLinkClient,
   organizationClient,
   passkeyClient,

package/dist/client.d.ts

@@ -6,7 +6,7 @@ import { BetterFetch, BetterFetchError, BetterFetchOption } from '@better-fetch/
 import { U as UnionToIntersection, P as Prettify, S as StripEmptyObjects } from './helper-DPDj8Nix.js';
 import { ClientOptions, InferClientAPI, InferActions, InferAdditionalFromClient, InferSessionFromClient, InferUserFromClient, BetterAuthClientPlugin, IsSignal } from './types.js';
 export { AtomListener, InferPluginsFromClient } from './types.js';
-import './index-DUb6fNdH.js';
+import './index-C9daNPfT.js';
 import 'kysely';
 import './index-CT4RHCuS.js';
 import 'arctic';