better-auth 1.2.6-beta.7 → 1.2.7-beta.1

package/dist/plugins/jwt/index.cjs

@@ -3,13 +3,13 @@
 const schema$1 = require('../../shared/better-auth.BG6vHVNT.cjs');
 const jose = require('jose');
 require('better-call');
-const refreshToken = require('../../shared/better-auth.BDYXUcLv.cjs');
+const refreshToken = require('../../shared/better-auth.Dg0siV5C.cjs');
 require('zod');
 const index = require('../../shared/better-auth.ANpbi45u.cjs');
 require('../../shared/better-auth.DiSjtgs9.cjs');
 require('@better-auth/utils/base64');
 require('@better-auth/utils/hmac');
-const schema = require('../../shared/better-auth.C5H9XEzZ.cjs');
+const schema = require('../../shared/better-auth.DcWKCjjf.cjs');
 require('../../shared/better-auth.GpOOav9x.cjs');
 require('defu');
 const crypto_index = require('../../crypto/index.cjs');
@@ -84,9 +84,6 @@ async function getJwtToken(ctx, options) {
     const privateWebKey2 = await jose.exportJWK(privateKey2);
     const stringifiedPrivateWebKey = JSON.stringify(privateWebKey2);
     let jwk = {
-      id: ctx.context.generateId({
-        model: "jwks"
-      }),
       publicKey: JSON.stringify(publicWebKey),
       privateKey: privateKeyEncryptionEnabled ? JSON.stringify(
         await crypto_index.symmetricEncrypt({
@@ -114,7 +111,9 @@ async function getJwtToken(ctx, options) {
   const jwt2 = await new jose.SignJWT(payload).setProtectedHeader({
     alg: options?.jwks?.keyPairConfig?.alg ?? "EdDSA",
     kid: key.id
-  }).setIssuedAt().setIssuer(options?.jwt?.issuer ?? ctx.context.options.baseURL).setAudience(options?.jwt?.audience ?? ctx.context.options.baseURL).setExpirationTime(options?.jwt?.expirationTime ?? "15m").setSubject(ctx.context.session.user.id).sign(privateKey);
+  }).setIssuedAt().setIssuer(options?.jwt?.issuer ?? ctx.context.options.baseURL).setAudience(options?.jwt?.audience ?? ctx.context.options.baseURL).setExpirationTime(options?.jwt?.expirationTime ?? "15m").setSubject(
+    await options?.jwt?.getSubject?.(ctx.context.session) ?? ctx.context.session.user.id
+  ).sign(privateKey);
   return jwt2;
 }
 const jwt = (options) => {
@@ -129,8 +128,8 @@ const jwt = (options) => {
             openapi: {
               description: "Get the JSON Web Key Set",
               responses: {
-                200: {
-                  description: "Success",
+                "200": {
+                  description: "JSON Web Key Set retrieved successfully",
                   content: {
                     "application/json": {
                       schema: {
@@ -138,31 +137,59 @@ const jwt = (options) => {
                         properties: {
                           keys: {
                             type: "array",
+                            description: "Array of public JSON Web Keys",
                             items: {
                               type: "object",
                               properties: {
                                 kid: {
-                                  type: "string"
+                                  type: "string",
+                                  description: "Key ID uniquely identifying the key, corresponds to the 'id' from the stored Jwk"
                                 },
                                 kty: {
-                                  type: "string"
-                                },
-                                use: {
-                                  type: "string"
+                                  type: "string",
+                                  description: "Key type (e.g., 'RSA', 'EC', 'OKP')"
                                 },
                                 alg: {
-                                  type: "string"
+                                  type: "string",
+                                  description: "Algorithm intended for use with the key (e.g., 'EdDSA', 'RS256')"
+                                },
+                                use: {
+                                  type: "string",
+                                  description: "Intended use of the public key (e.g., 'sig' for signature)",
+                                  enum: ["sig"],
+                                  nullable: true
                                 },
                                 n: {
-                                  type: "string"
+                                  type: "string",
+                                  description: "Modulus for RSA keys (base64url-encoded)",
+                                  nullable: true
                                 },
                                 e: {
-                                  type: "string"
+                                  type: "string",
+                                  description: "Exponent for RSA keys (base64url-encoded)",
+                                  nullable: true
+                                },
+                                crv: {
+                                  type: "string",
+                                  description: "Curve name for elliptic curve keys (e.g., 'Ed25519', 'P-256')",
+                                  nullable: true
+                                },
+                                x: {
+                                  type: "string",
+                                  description: "X coordinate for elliptic curve keys (base64url-encoded)",
+                                  nullable: true
+                                },
+                                y: {
+                                  type: "string",
+                                  description: "Y coordinate for elliptic curve keys (base64url-encoded)",
+                                  nullable: true
                                 }
-                              }
+                              },
+                              required: ["kid", "kty", "alg"]
                             }
                           }
-                        }
+                        },
+                        required: ["keys"]
                       }
                     }
                   }
@@ -188,9 +215,6 @@ const jwt = (options) => {
             const stringifiedPrivateWebKey = JSON.stringify(privateWebKey);
             const privateKeyEncryptionEnabled = !options?.jwks?.disablePrivateKeyEncryption;
             let jwk = {
-              id: ctx.context.generateId({
-                model: "jwks"
-              }),
               publicKey: JSON.stringify({ alg, ...publicWebKey }),
               privateKey: privateKeyEncryptionEnabled ? JSON.stringify(
                 await crypto_index.symmetricEncrypt({

package/dist/plugins/jwt/index.d.cts

@@ -1,8 +1,8 @@
 import * as better_call from 'better-call';
-import { U as User, S as Session, I as InferOptionSchema, H as HookEndpointContext, G as GenericEndpointContext } from '../../shared/better-auth.BiQsvaIP.cjs';
-import '../../shared/better-auth.Bi8FQwDD.cjs';
+import { U as User, S as Session, I as InferOptionSchema, H as HookEndpointContext, G as GenericEndpointContext } from '../../shared/better-auth.BcU1Kjyq.cjs';
+import '../../shared/better-auth.CYegVoq1.cjs';
 import 'zod';
-import '../../shared/better-auth.B2Fw1vhH.cjs';
+import '../../shared/better-auth.DTiSPWEk.cjs';
 import 'jose';
 import 'kysely';
 import 'better-sqlite3';
@@ -65,7 +65,13 @@ interface JwtOptions {
         disablePrivateKeyEncryption?: boolean;
     };
     jwt?: {
+        /**
+         * The issuer of the JWT
+         */
         issuer?: string;
+        /**
+         * The audience of the JWT
+         */
         audience?: string;
         /**
          * Set the "exp" (Expiration Time) Claim.
@@ -91,10 +97,22 @@ interface JwtOptions {
          * @default 15m
          */
         expirationTime?: number | string | Date;
+        /**
+         * A function that is called to define the payload of the JWT
+         */
         definePayload?: (session: {
             user: User & Record<string, any>;
             session: Session & Record<string, any>;
         }) => Promise<Record<string, any>> | Record<string, any>;
+        /**
+         * A function that is called to get the subject of the JWT
+         *
+         * @default session.user.id
+         */
+        getSubject?: (session: {
+            user: User & Record<string, any>;
+            session: Session & Record<string, any>;
+        }) => Promise<string> | string;
     };
     /**
      * Custom schema for the admin plugin
@@ -140,7 +158,7 @@ declare const jwt: (options?: JwtOptions) => {
                     openapi: {
                         description: string;
                         responses: {
-                            200: {
+                            "200": {
                                 description: string;
                                 content: {
                                     "application/json": {
@@ -149,31 +167,59 @@ declare const jwt: (options?: JwtOptions) => {
                                             properties: {
                                                 keys: {
                                                     type: string;
+                                                    description: string;
                                                     items: {
                                                         type: string;
                                                         properties: {
                                                             kid: {
                                                                 type: string;
+                                                                description: string;
                                                             };
                                                             kty: {
                                                                 type: string;
+                                                                description: string;
                                                             };
-                                                            use: {
+                                                            alg: {
                                                                 type: string;
+                                                                description: string;
                                                             };
-                                                            alg: {
+                                                            use: {
                                                                 type: string;
+                                                                description: string;
+                                                                enum: string[];
+                                                                nullable: boolean;
                                                             };
                                                             n: {
                                                                 type: string;
+                                                                description: string;
+                                                                nullable: boolean;
                                                             };
                                                             e: {
                                                                 type: string;
+                                                                description: string;
+                                                                nullable: boolean;
+                                                            };
+                                                            crv: {
+                                                                type: string;
+                                                                description: string;
+                                                                nullable: boolean;
+                                                            };
+                                                            x: {
+                                                                type: string;
+                                                                description: string;
+                                                                nullable: boolean;
+                                                            };
+                                                            y: {
+                                                                type: string;
+                                                                description: string;
+                                                                nullable: boolean;
                                                             };
                                                         };
+                                                        required: string[];
                                                     };
                                                 };
                                             };
+                                            required: string[];
                                         };
                                     };
                                 };

package/dist/plugins/jwt/index.d.mts

@@ -1,8 +1,8 @@
 import * as better_call from 'better-call';
-import { U as User, S as Session, I as InferOptionSchema, H as HookEndpointContext, G as GenericEndpointContext } from '../../shared/better-auth.D-oLmHIj.mjs';
-import '../../shared/better-auth.Bi8FQwDD.mjs';
+import { U as User, S as Session, I as InferOptionSchema, H as HookEndpointContext, G as GenericEndpointContext } from '../../shared/better-auth.DQ7OSJbI.mjs';
+import '../../shared/better-auth.CYegVoq1.mjs';
 import 'zod';
-import '../../shared/better-auth.bKwabe3I.mjs';
+import '../../shared/better-auth.B88xucNq.mjs';
 import 'jose';
 import 'kysely';
 import 'better-sqlite3';
@@ -65,7 +65,13 @@ interface JwtOptions {
         disablePrivateKeyEncryption?: boolean;
     };
     jwt?: {
+        /**
+         * The issuer of the JWT
+         */
         issuer?: string;
+        /**
+         * The audience of the JWT
+         */
         audience?: string;
         /**
          * Set the "exp" (Expiration Time) Claim.
@@ -91,10 +97,22 @@ interface JwtOptions {
          * @default 15m
          */
         expirationTime?: number | string | Date;
+        /**
+         * A function that is called to define the payload of the JWT
+         */
         definePayload?: (session: {
             user: User & Record<string, any>;
             session: Session & Record<string, any>;
         }) => Promise<Record<string, any>> | Record<string, any>;
+        /**
+         * A function that is called to get the subject of the JWT
+         *
+         * @default session.user.id
+         */
+        getSubject?: (session: {
+            user: User & Record<string, any>;
+            session: Session & Record<string, any>;
+        }) => Promise<string> | string;
     };
     /**
      * Custom schema for the admin plugin
@@ -140,7 +158,7 @@ declare const jwt: (options?: JwtOptions) => {
                     openapi: {
                         description: string;
                         responses: {
-                            200: {
+                            "200": {
                                 description: string;
                                 content: {
                                     "application/json": {
@@ -149,31 +167,59 @@ declare const jwt: (options?: JwtOptions) => {
                                             properties: {
                                                 keys: {
                                                     type: string;
+                                                    description: string;
                                                     items: {
                                                         type: string;
                                                         properties: {
                                                             kid: {
                                                                 type: string;
+                                                                description: string;
                                                             };
                                                             kty: {
                                                                 type: string;
+                                                                description: string;
                                                             };
-                                                            use: {
+                                                            alg: {
                                                                 type: string;
+                                                                description: string;
                                                             };
-                                                            alg: {
+                                                            use: {
                                                                 type: string;
+                                                                description: string;
+                                                                enum: string[];
+                                                                nullable: boolean;
                                                             };
                                                             n: {
                                                                 type: string;
+                                                                description: string;
+                                                                nullable: boolean;
                                                             };
                                                             e: {
                                                                 type: string;
+                                                                description: string;
+                                                                nullable: boolean;
+                                                            };
+                                                            crv: {
+                                                                type: string;
+                                                                description: string;
+                                                                nullable: boolean;
+                                                            };
+                                                            x: {
+                                                                type: string;
+                                                                description: string;
+                                                                nullable: boolean;
+                                                            };
+                                                            y: {
+                                                                type: string;
+                                                                description: string;
+                                                                nullable: boolean;
                                                             };
                                                         };
+                                                        required: string[];
                                                     };
                                                 };
                                             };
+                                            required: string[];
                                         };
                                     };
                                 };

package/dist/plugins/jwt/index.d.ts

@@ -1,8 +1,8 @@
 import * as better_call from 'better-call';
-import { U as User, S as Session, I as InferOptionSchema, H as HookEndpointContext, G as GenericEndpointContext } from '../../shared/better-auth.DU2QNVc_.js';
-import '../../shared/better-auth.Bi8FQwDD.js';
+import { U as User, S as Session, I as InferOptionSchema, H as HookEndpointContext, G as GenericEndpointContext } from '../../shared/better-auth.CA2hFK4N.js';
+import '../../shared/better-auth.CYegVoq1.js';
 import 'zod';
-import '../../shared/better-auth.BANAxdkL.js';
+import '../../shared/better-auth.DNTAFSt1.js';
 import 'jose';
 import 'kysely';
 import 'better-sqlite3';
@@ -65,7 +65,13 @@ interface JwtOptions {
         disablePrivateKeyEncryption?: boolean;
     };
     jwt?: {
+        /**
+         * The issuer of the JWT
+         */
         issuer?: string;
+        /**
+         * The audience of the JWT
+         */
         audience?: string;
         /**
          * Set the "exp" (Expiration Time) Claim.
@@ -91,10 +97,22 @@ interface JwtOptions {
          * @default 15m
          */
         expirationTime?: number | string | Date;
+        /**
+         * A function that is called to define the payload of the JWT
+         */
         definePayload?: (session: {
             user: User & Record<string, any>;
             session: Session & Record<string, any>;
         }) => Promise<Record<string, any>> | Record<string, any>;
+        /**
+         * A function that is called to get the subject of the JWT
+         *
+         * @default session.user.id
+         */
+        getSubject?: (session: {
+            user: User & Record<string, any>;
+            session: Session & Record<string, any>;
+        }) => Promise<string> | string;
     };
     /**
      * Custom schema for the admin plugin
@@ -140,7 +158,7 @@ declare const jwt: (options?: JwtOptions) => {
                     openapi: {
                         description: string;
                         responses: {
-                            200: {
+                            "200": {
                                 description: string;
                                 content: {
                                     "application/json": {
@@ -149,31 +167,59 @@ declare const jwt: (options?: JwtOptions) => {
                                             properties: {
                                                 keys: {
                                                     type: string;
+                                                    description: string;
                                                     items: {
                                                         type: string;
                                                         properties: {
                                                             kid: {
                                                                 type: string;
+                                                                description: string;
                                                             };
                                                             kty: {
                                                                 type: string;
+                                                                description: string;
                                                             };
-                                                            use: {
+                                                            alg: {
                                                                 type: string;
+                                                                description: string;
                                                             };
-                                                            alg: {
+                                                            use: {
                                                                 type: string;
+                                                                description: string;
+                                                                enum: string[];
+                                                                nullable: boolean;
                                                             };
                                                             n: {
                                                                 type: string;
+                                                                description: string;
+                                                                nullable: boolean;
                                                             };
                                                             e: {
                                                                 type: string;
+                                                                description: string;
+                                                                nullable: boolean;
+                                                            };
+                                                            crv: {
+                                                                type: string;
+                                                                description: string;
+                                                                nullable: boolean;
+                                                            };
+                                                            x: {
+                                                                type: string;
+                                                                description: string;
+                                                                nullable: boolean;
+                                                            };
+                                                            y: {
+                                                                type: string;
+                                                                description: string;
+                                                                nullable: boolean;
                                                             };
                                                         };
+                                                        required: string[];
                                                     };
                                                 };
                                             };
+                                            required: string[];
                                         };
                                     };
                                 };

package/dist/plugins/jwt/index.mjs

@@ -1,14 +1,14 @@
 import { s as schema } from '../../shared/better-auth.fsvwNeUx.mjs';
 import { generateKeyPair, exportJWK, importJWK, SignJWT } from 'jose';
 import 'better-call';
-import { c as createAuthMiddleware, a as createAuthEndpoint, s as sessionMiddleware } from '../../shared/better-auth.D4jH-sJA.mjs';
+import { c as createAuthMiddleware, a as createAuthEndpoint, s as sessionMiddleware } from '../../shared/better-auth.CWwVo_61.mjs';
 import 'zod';
 import { B as BetterAuthError } from '../../shared/better-auth.DdzSJf-n.mjs';
 import '../../shared/better-auth.8zoxzg-F.mjs';
 import '@better-auth/utils/base64';
 import '@better-auth/utils/hmac';
-import { m as mergeSchema } from '../../shared/better-auth.CepcSj5H.mjs';
-import '../../shared/better-auth.DH3YjMQH.mjs';
+import { m as mergeSchema } from '../../shared/better-auth.Cc72UxUH.mjs';
+import '../../shared/better-auth.Cqykj82J.mjs';
 import 'defu';
 import { symmetricEncrypt, symmetricDecrypt } from '../../crypto/index.mjs';
 import '../../cookies/index.mjs';
@@ -82,9 +82,6 @@ async function getJwtToken(ctx, options) {
     const privateWebKey2 = await exportJWK(privateKey2);
     const stringifiedPrivateWebKey = JSON.stringify(privateWebKey2);
     let jwk = {
-      id: ctx.context.generateId({
-        model: "jwks"
-      }),
       publicKey: JSON.stringify(publicWebKey),
       privateKey: privateKeyEncryptionEnabled ? JSON.stringify(
         await symmetricEncrypt({
@@ -112,7 +109,9 @@ async function getJwtToken(ctx, options) {
   const jwt2 = await new SignJWT(payload).setProtectedHeader({
     alg: options?.jwks?.keyPairConfig?.alg ?? "EdDSA",
     kid: key.id
-  }).setIssuedAt().setIssuer(options?.jwt?.issuer ?? ctx.context.options.baseURL).setAudience(options?.jwt?.audience ?? ctx.context.options.baseURL).setExpirationTime(options?.jwt?.expirationTime ?? "15m").setSubject(ctx.context.session.user.id).sign(privateKey);
+  }).setIssuedAt().setIssuer(options?.jwt?.issuer ?? ctx.context.options.baseURL).setAudience(options?.jwt?.audience ?? ctx.context.options.baseURL).setExpirationTime(options?.jwt?.expirationTime ?? "15m").setSubject(
+    await options?.jwt?.getSubject?.(ctx.context.session) ?? ctx.context.session.user.id
+  ).sign(privateKey);
   return jwt2;
 }
 const jwt = (options) => {
@@ -127,8 +126,8 @@ const jwt = (options) => {
             openapi: {
               description: "Get the JSON Web Key Set",
               responses: {
-                200: {
-                  description: "Success",
+                "200": {
+                  description: "JSON Web Key Set retrieved successfully",
                   content: {
                     "application/json": {
                       schema: {
@@ -136,31 +135,59 @@ const jwt = (options) => {
                         properties: {
                           keys: {
                             type: "array",
+                            description: "Array of public JSON Web Keys",
                             items: {
                               type: "object",
                               properties: {
                                 kid: {
-                                  type: "string"
+                                  type: "string",
+                                  description: "Key ID uniquely identifying the key, corresponds to the 'id' from the stored Jwk"
                                 },
                                 kty: {
-                                  type: "string"
-                                },
-                                use: {
-                                  type: "string"
+                                  type: "string",
+                                  description: "Key type (e.g., 'RSA', 'EC', 'OKP')"
                                 },
                                 alg: {
-                                  type: "string"
+                                  type: "string",
+                                  description: "Algorithm intended for use with the key (e.g., 'EdDSA', 'RS256')"
+                                },
+                                use: {
+                                  type: "string",
+                                  description: "Intended use of the public key (e.g., 'sig' for signature)",
+                                  enum: ["sig"],
+                                  nullable: true
                                 },
                                 n: {
-                                  type: "string"
+                                  type: "string",
+                                  description: "Modulus for RSA keys (base64url-encoded)",
+                                  nullable: true
                                 },
                                 e: {
-                                  type: "string"
+                                  type: "string",
+                                  description: "Exponent for RSA keys (base64url-encoded)",
+                                  nullable: true
+                                },
+                                crv: {
+                                  type: "string",
+                                  description: "Curve name for elliptic curve keys (e.g., 'Ed25519', 'P-256')",
+                                  nullable: true
+                                },
+                                x: {
+                                  type: "string",
+                                  description: "X coordinate for elliptic curve keys (base64url-encoded)",
+                                  nullable: true
+                                },
+                                y: {
+                                  type: "string",
+                                  description: "Y coordinate for elliptic curve keys (base64url-encoded)",
+                                  nullable: true
                                 }
-                              }
+                              },
+                              required: ["kid", "kty", "alg"]
                             }
                           }
-                        }
+                        },
+                        required: ["keys"]
                       }
                     }
                   }
@@ -186,9 +213,6 @@ const jwt = (options) => {
             const stringifiedPrivateWebKey = JSON.stringify(privateWebKey);
             const privateKeyEncryptionEnabled = !options?.jwks?.disablePrivateKeyEncryption;
             let jwk = {
-              id: ctx.context.generateId({
-                model: "jwks"
-              }),
               publicKey: JSON.stringify({ alg, ...publicWebKey }),
               privateKey: privateKeyEncryptionEnabled ? JSON.stringify(
                 await symmetricEncrypt({

package/dist/plugins/magic-link/index.cjs

@@ -1,7 +1,7 @@
 'use strict';
 
 const zod = require('zod');
-const refreshToken = require('../../shared/better-auth.BDYXUcLv.cjs');
+const refreshToken = require('../../shared/better-auth.Dg0siV5C.cjs');
 const betterCall = require('better-call');
 const cookies_index = require('../../cookies/index.cjs');
 require('@better-auth/utils/hash');
@@ -15,7 +15,7 @@ require('@better-auth/utils');
 require('@better-auth/utils/hex');
 require('@noble/hashes/utils');
 const random = require('../../shared/better-auth.CYeOI8C-.cjs');
-require('../../shared/better-auth.C5H9XEzZ.cjs');
+require('../../shared/better-auth.DcWKCjjf.cjs');
 require('../../shared/better-auth.DiSjtgs9.cjs');
 require('../../shared/better-auth.GpOOav9x.cjs');
 require('defu');
@@ -26,12 +26,12 @@ require('../../shared/better-auth.C1hdVENX.cjs');
 require('../../shared/better-auth.ANpbi45u.cjs');
 require('@better-auth/utils/random');
 require('../../shared/better-auth.QbbyHMYf.cjs');
+require('../../shared/better-auth.D3mtHEZg.cjs');
 require('../../shared/better-auth.Bg6iw3ig.cjs');
 require('@better-auth/utils/hmac');
 require('../../shared/better-auth.BMYo0QR-.cjs');
 require('../../shared/better-auth.C-R0J0n1.cjs');
 require('jose/errors');
-require('../../shared/better-auth.D3mtHEZg.cjs');
 require('@better-auth/utils/binary');
 
 const magicLink = (options) => {