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

package/dist/plugins/index.mjs

@@ -1,13 +1,13 @@
-export { o as organization, p as parseRoles } from '../shared/better-auth.DPBQN9Fs.mjs';
-export { twoFactor } from './two-factor/index.mjs';
+export { o as organization, p as parseRoles } from '../shared/better-auth.Dn_Ms1Uf.mjs';
+export { TWO_FACTOR_ERROR_CODES, twoFactor } from './two-factor/index.mjs';
 export { username } from './username/index.mjs';
 export { bearer } from './bearer/index.mjs';
-import { a as createAuthEndpoint, g as getSessionFromCtx, s as sessionMiddleware, c as createAuthMiddleware } from '../shared/better-auth.D4jH-sJA.mjs';
-export { H as HIDE_METADATA, O as optionsMiddleware } from '../shared/better-auth.D4jH-sJA.mjs';
+import { a as createAuthEndpoint, g as getSessionFromCtx, s as sessionMiddleware, c as createAuthMiddleware } from '../shared/better-auth.CWwVo_61.mjs';
+export { H as HIDE_METADATA, O as optionsMiddleware } from '../shared/better-auth.CWwVo_61.mjs';
 export { magicLink } from './magic-link/index.mjs';
 export { phoneNumber } from './phone-number/index.mjs';
 export { anonymous } from './anonymous/index.mjs';
-export { a as admin } from '../shared/better-auth.D9VnBkRI.mjs';
+export { a as admin } from '../shared/better-auth.Bm9HxIzE.mjs';
 export { genericOAuth } from './generic-oauth/index.mjs';
 export { getJwtToken, jwt } from './jwt/index.mjs';
 export { multiSession } from './multi-session/index.mjs';
@@ -25,9 +25,9 @@ import { z } from 'zod';
 import { g as getDate } from '../shared/better-auth.CW6D9eSx.mjs';
 import '../shared/better-auth.8zoxzg-F.mjs';
 import '@better-auth/utils/hmac';
-import { m as mergeSchema } from '../shared/better-auth.CepcSj5H.mjs';
-import '../shared/better-auth.DH3YjMQH.mjs';
-import { g as getIp } from '../shared/better-auth.BrOpzmqo.mjs';
+import { m as mergeSchema } from '../shared/better-auth.Cc72UxUH.mjs';
+import '../shared/better-auth.Cqykj82J.mjs';
+import { g as getIp } from '../shared/better-auth.iKoUsdFE.mjs';
 import 'defu';
 import '@better-auth/utils/random';
 import '@noble/ciphers/chacha';
@@ -42,19 +42,19 @@ import '../shared/better-auth.B4Qoxdgc.mjs';
 import 'kysely';
 import { p as parseJSON } from '../shared/better-auth.ffWeg50w.mjs';
 import { s as safeJSONParse } from '../shared/better-auth.tB5eU6EY.mjs';
-import { g as generateId } from '../shared/better-auth.BUPPRXfK.mjs';
 import { role } from './access/index.mjs';
-export { T as TWO_FACTOR_ERROR_CODES } from '../shared/better-auth.BcoSd9tC.mjs';
+export { haveIBeenPwned } from './haveibeenpwned/index.mjs';
+export { oneTimeToken } from './one-time-token/index.mjs';
 export { t as twoFactorClient } from '../shared/better-auth.Ddw8bVyV.mjs';
 import '../shared/better-auth.DdzSJf-n.mjs';
-import '../shared/better-auth.DiG4KL2x.mjs';
+import '../shared/better-auth.OuYYTHC7.mjs';
 import './organization/access/index.mjs';
 import '../cookies/index.mjs';
 import '../shared/better-auth.VTXNLFMT.mjs';
+import '../shared/better-auth.BUPPRXfK.mjs';
 import '../crypto/index.mjs';
 import '../shared/better-auth.OT3XFeFk.mjs';
 import '../shared/better-auth.DDEbWX-S.mjs';
-import '../shared/better-auth.ClTSOgiD.mjs';
 import '@better-auth/utils/otp';
 import '../shared/better-auth.YwDQhoPc.mjs';
 import '../social-providers/index.mjs';
@@ -64,7 +64,7 @@ import '../shared/better-auth.BdyOG_p4.mjs';
 import 'jose/errors';
 import '@better-auth/utils/binary';
 import '../shared/better-auth.DQI8AD7d.mjs';
-import '../shared/better-auth.cOCrlspr.mjs';
+import '../shared/better-auth.bkwPl2G4.mjs';
 import './admin/access/index.mjs';
 import '../shared/better-auth.fsvwNeUx.mjs';
 import '../api/index.mjs';
@@ -302,7 +302,143 @@ function createApiKey({
           description: "Whether the key has rate limiting enabled. Server Only Property."
         }).optional(),
         permissions: z.record(z.string(), z.array(z.string())).optional()
-      })
+      }),
+      metadata: {
+        openapi: {
+          description: "Create a new API key for a user",
+          responses: {
+            "200": {
+              description: "API key created successfully",
+              content: {
+                "application/json": {
+                  schema: {
+                    type: "object",
+                    properties: {
+                      id: {
+                        type: "string",
+                        description: "Unique identifier of the API key"
+                      },
+                      createdAt: {
+                        type: "string",
+                        format: "date-time",
+                        description: "Creation timestamp"
+                      },
+                      updatedAt: {
+                        type: "string",
+                        format: "date-time",
+                        description: "Last update timestamp"
+                      },
+                      name: {
+                        type: "string",
+                        nullable: true,
+                        description: "Name of the API key"
+                      },
+                      prefix: {
+                        type: "string",
+                        nullable: true,
+                        description: "Prefix of the API key"
+                      },
+                      start: {
+                        type: "string",
+                        nullable: true,
+                        description: "Starting characters of the key (if configured)"
+                      },
+                      key: {
+                        type: "string",
+                        description: "The full API key (only returned on creation)"
+                      },
+                      enabled: {
+                        type: "boolean",
+                        description: "Whether the key is enabled"
+                      },
+                      expiresAt: {
+                        type: "string",
+                        format: "date-time",
+                        nullable: true,
+                        description: "Expiration timestamp"
+                      },
+                      userId: {
+                        type: "string",
+                        description: "ID of the user owning the key"
+                      },
+                      lastRefillAt: {
+                        type: "string",
+                        format: "date-time",
+                        nullable: true,
+                        description: "Last refill timestamp"
+                      },
+                      lastRequest: {
+                        type: "string",
+                        format: "date-time",
+                        nullable: true,
+                        description: "Last request timestamp"
+                      },
+                      metadata: {
+                        type: "object",
+                        nullable: true,
+                        additionalProperties: true,
+                        description: "Metadata associated with the key"
+                      },
+                      rateLimitMax: {
+                        type: "number",
+                        nullable: true,
+                        description: "Maximum requests in time window"
+                      },
+                      rateLimitTimeWindow: {
+                        type: "number",
+                        nullable: true,
+                        description: "Rate limit time window in milliseconds"
+                      },
+                      remaining: {
+                        type: "number",
+                        nullable: true,
+                        description: "Remaining requests"
+                      },
+                      refillAmount: {
+                        type: "number",
+                        nullable: true,
+                        description: "Amount to refill"
+                      },
+                      refillInterval: {
+                        type: "number",
+                        nullable: true,
+                        description: "Refill interval in milliseconds"
+                      },
+                      rateLimitEnabled: {
+                        type: "boolean",
+                        description: "Whether rate limiting is enabled"
+                      },
+                      requestCount: {
+                        type: "number",
+                        description: "Current request count in window"
+                      },
+                      permissions: {
+                        type: "object",
+                        nullable: true,
+                        additionalProperties: {
+                          type: "array",
+                          items: { type: "string" }
+                        },
+                        description: "Permissions associated with the key"
+                      }
+                    },
+                    required: [
+                      "id",
+                      "createdAt",
+                      "updatedAt",
+                      "key",
+                      "enabled",
+                      "userId",
+                      "rateLimitEnabled",
+                      "requestCount"
+                    ]
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
     },
     async (ctx) => {
       const {
@@ -415,7 +551,6 @@ function createApiKey({
       const defaultPermissions = opts.permissions?.defaultPermissions ? typeof opts.permissions.defaultPermissions === "function" ? await opts.permissions.defaultPermissions(user.id, ctx) : opts.permissions.defaultPermissions : void 0;
       const permissionsToApply = permissions ? JSON.stringify(permissions) : defaultPermissions ? JSON.stringify(defaultPermissions) : void 0;
       let data = {
-        id: generateId(),
         createdAt: /* @__PURE__ */ new Date(),
         updatedAt: /* @__PURE__ */ new Date(),
         name: name ?? null,
@@ -433,7 +568,7 @@ function createApiKey({
         remaining: remaining || refillAmount || null,
         refillAmount: refillAmount ?? null,
         refillInterval: refillInterval ?? null,
-        rateLimitEnabled: rateLimitEnabled ?? true,
+        rateLimitEnabled: rateLimitEnabled ?? opts.rateLimit.enabled === void 0 ? true : opts.rateLimit.enabled,
         requestCount: 0,
         //@ts-ignore - we intentionally save the permissions as string on DB.
         permissions: permissionsToApply
@@ -472,7 +607,47 @@ function deleteApiKey({
           description: "The id of the Api Key"
         })
       }),
-      use: [sessionMiddleware]
+      use: [sessionMiddleware],
+      metadata: {
+        openapi: {
+          description: "Delete an existing API key",
+          requestBody: {
+            content: {
+              "application/json": {
+                schema: {
+                  type: "object",
+                  properties: {
+                    keyId: {
+                      type: "string",
+                      description: "The id of the API key to delete"
+                    }
+                  },
+                  required: ["keyId"]
+                }
+              }
+            }
+          },
+          responses: {
+            "200": {
+              description: "API key deleted successfully",
+              content: {
+                "application/json": {
+                  schema: {
+                    type: "object",
+                    properties: {
+                      success: {
+                        type: "boolean",
+                        description: "Indicates if the API key was successfully deleted"
+                      }
+                    },
+                    required: ["success"]
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
     },
     async (ctx) => {
       const { keyId } = ctx.body;
@@ -533,7 +708,135 @@ function getApiKey({
           description: "The id of the Api Key"
         })
       }),
-      use: [sessionMiddleware]
+      use: [sessionMiddleware],
+      metadata: {
+        openapi: {
+          description: "Retrieve an existing API key by ID",
+          responses: {
+            "200": {
+              description: "API key retrieved successfully",
+              content: {
+                "application/json": {
+                  schema: {
+                    type: "object",
+                    properties: {
+                      id: {
+                        type: "string",
+                        description: "ID"
+                      },
+                      name: {
+                        type: "string",
+                        nullable: true,
+                        description: "The name of the key"
+                      },
+                      start: {
+                        type: "string",
+                        nullable: true,
+                        description: "Shows the first few characters of the API key, including the prefix. This allows you to show those few characters in the UI to make it easier for users to identify the API key."
+                      },
+                      prefix: {
+                        type: "string",
+                        nullable: true,
+                        description: "The API Key prefix. Stored as plain text."
+                      },
+                      userId: {
+                        type: "string",
+                        description: "The owner of the user id"
+                      },
+                      refillInterval: {
+                        type: "number",
+                        nullable: true,
+                        description: "The interval in which the `remaining` count is refilled by day. Example: 1 // every day"
+                      },
+                      refillAmount: {
+                        type: "number",
+                        nullable: true,
+                        description: "The amount to refill"
+                      },
+                      lastRefillAt: {
+                        type: "string",
+                        format: "date-time",
+                        nullable: true,
+                        description: "The last refill date"
+                      },
+                      enabled: {
+                        type: "boolean",
+                        description: "Sets if key is enabled or disabled",
+                        default: true
+                      },
+                      rateLimitEnabled: {
+                        type: "boolean",
+                        description: "Whether the key has rate limiting enabled"
+                      },
+                      rateLimitTimeWindow: {
+                        type: "number",
+                        nullable: true,
+                        description: "The duration in milliseconds"
+                      },
+                      rateLimitMax: {
+                        type: "number",
+                        nullable: true,
+                        description: "Maximum amount of requests allowed within a window"
+                      },
+                      requestCount: {
+                        type: "number",
+                        description: "The number of requests made within the rate limit time window"
+                      },
+                      remaining: {
+                        type: "number",
+                        nullable: true,
+                        description: "Remaining requests (every time api key is used this should updated and should be updated on refill as well)"
+                      },
+                      lastRequest: {
+                        type: "string",
+                        format: "date-time",
+                        nullable: true,
+                        description: "When last request occurred"
+                      },
+                      expiresAt: {
+                        type: "string",
+                        format: "date-time",
+                        nullable: true,
+                        description: "Expiry date of a key"
+                      },
+                      createdAt: {
+                        type: "string",
+                        format: "date-time",
+                        description: "created at"
+                      },
+                      updatedAt: {
+                        type: "string",
+                        format: "date-time",
+                        description: "updated at"
+                      },
+                      metadata: {
+                        type: "object",
+                        nullable: true,
+                        additionalProperties: true,
+                        description: "Extra metadata about the apiKey"
+                      },
+                      permissions: {
+                        type: "string",
+                        nullable: true,
+                        description: "Permissions for the api key (stored as JSON string)"
+                      }
+                    },
+                    required: [
+                      "id",
+                      "userId",
+                      "enabled",
+                      "rateLimitEnabled",
+                      "requestCount",
+                      "createdAt",
+                      "updatedAt"
+                    ]
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
     },
     async (ctx) => {
       const { id } = ctx.query;
@@ -617,7 +920,135 @@ function updateApiKey({
           description: "Maximum amount of requests allowed within a window. Once the `maxRequests` is reached, the request will be rejected until the `timeWindow` has passed, at which point the `timeWindow` will be reset."
         }).optional(),
         permissions: z.record(z.string(), z.array(z.string())).optional().nullable()
-      })
+      }),
+      metadata: {
+        openapi: {
+          description: "Retrieve an existing API key by ID",
+          responses: {
+            "200": {
+              description: "API key retrieved successfully",
+              content: {
+                "application/json": {
+                  schema: {
+                    type: "object",
+                    properties: {
+                      id: {
+                        type: "string",
+                        description: "ID"
+                      },
+                      name: {
+                        type: "string",
+                        nullable: true,
+                        description: "The name of the key"
+                      },
+                      start: {
+                        type: "string",
+                        nullable: true,
+                        description: "Shows the first few characters of the API key, including the prefix. This allows you to show those few characters in the UI to make it easier for users to identify the API key."
+                      },
+                      prefix: {
+                        type: "string",
+                        nullable: true,
+                        description: "The API Key prefix. Stored as plain text."
+                      },
+                      userId: {
+                        type: "string",
+                        description: "The owner of the user id"
+                      },
+                      refillInterval: {
+                        type: "number",
+                        nullable: true,
+                        description: "The interval in which the `remaining` count is refilled by day. Example: 1 // every day"
+                      },
+                      refillAmount: {
+                        type: "number",
+                        nullable: true,
+                        description: "The amount to refill"
+                      },
+                      lastRefillAt: {
+                        type: "string",
+                        format: "date-time",
+                        nullable: true,
+                        description: "The last refill date"
+                      },
+                      enabled: {
+                        type: "boolean",
+                        description: "Sets if key is enabled or disabled",
+                        default: true
+                      },
+                      rateLimitEnabled: {
+                        type: "boolean",
+                        description: "Whether the key has rate limiting enabled"
+                      },
+                      rateLimitTimeWindow: {
+                        type: "number",
+                        nullable: true,
+                        description: "The duration in milliseconds"
+                      },
+                      rateLimitMax: {
+                        type: "number",
+                        nullable: true,
+                        description: "Maximum amount of requests allowed within a window"
+                      },
+                      requestCount: {
+                        type: "number",
+                        description: "The number of requests made within the rate limit time window"
+                      },
+                      remaining: {
+                        type: "number",
+                        nullable: true,
+                        description: "Remaining requests (every time api key is used this should updated and should be updated on refill as well)"
+                      },
+                      lastRequest: {
+                        type: "string",
+                        format: "date-time",
+                        nullable: true,
+                        description: "When last request occurred"
+                      },
+                      expiresAt: {
+                        type: "string",
+                        format: "date-time",
+                        nullable: true,
+                        description: "Expiry date of a key"
+                      },
+                      createdAt: {
+                        type: "string",
+                        format: "date-time",
+                        description: "created at"
+                      },
+                      updatedAt: {
+                        type: "string",
+                        format: "date-time",
+                        description: "updated at"
+                      },
+                      metadata: {
+                        type: "object",
+                        nullable: true,
+                        additionalProperties: true,
+                        description: "Extra metadata about the apiKey"
+                      },
+                      permissions: {
+                        type: "string",
+                        nullable: true,
+                        description: "Permissions for the api key (stored as JSON string)"
+                      }
+                    },
+                    required: [
+                      "id",
+                      "userId",
+                      "enabled",
+                      "rateLimitEnabled",
+                      "requestCount",
+                      "createdAt",
+                      "updatedAt"
+                    ]
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
     },
     async (ctx) => {
       const {
@@ -1095,7 +1526,138 @@ function listApiKeys({
     "/api-key/list",
     {
       method: "GET",
-      use: [sessionMiddleware]
+      use: [sessionMiddleware],
+      metadata: {
+        openapi: {
+          description: "List all API keys for the authenticated user",
+          responses: {
+            "200": {
+              description: "API keys retrieved successfully",
+              content: {
+                "application/json": {
+                  schema: {
+                    type: "array",
+                    items: {
+                      type: "object",
+                      properties: {
+                        id: {
+                          type: "string",
+                          description: "ID"
+                        },
+                        name: {
+                          type: "string",
+                          nullable: true,
+                          description: "The name of the key"
+                        },
+                        start: {
+                          type: "string",
+                          nullable: true,
+                          description: "Shows the first few characters of the API key, including the prefix. This allows you to show those few characters in the UI to make it easier for users to identify the API key."
+                        },
+                        prefix: {
+                          type: "string",
+                          nullable: true,
+                          description: "The API Key prefix. Stored as plain text."
+                        },
+                        userId: {
+                          type: "string",
+                          description: "The owner of the user id"
+                        },
+                        refillInterval: {
+                          type: "number",
+                          nullable: true,
+                          description: "The interval in which the `remaining` count is refilled by day. Example: 1 // every day"
+                        },
+                        refillAmount: {
+                          type: "number",
+                          nullable: true,
+                          description: "The amount to refill"
+                        },
+                        lastRefillAt: {
+                          type: "string",
+                          format: "date-time",
+                          nullable: true,
+                          description: "The last refill date"
+                        },
+                        enabled: {
+                          type: "boolean",
+                          description: "Sets if key is enabled or disabled",
+                          default: true
+                        },
+                        rateLimitEnabled: {
+                          type: "boolean",
+                          description: "Whether the key has rate limiting enabled"
+                        },
+                        rateLimitTimeWindow: {
+                          type: "number",
+                          nullable: true,
+                          description: "The duration in milliseconds"
+                        },
+                        rateLimitMax: {
+                          type: "number",
+                          nullable: true,
+                          description: "Maximum amount of requests allowed within a window"
+                        },
+                        requestCount: {
+                          type: "number",
+                          description: "The number of requests made within the rate limit time window"
+                        },
+                        remaining: {
+                          type: "number",
+                          nullable: true,
+                          description: "Remaining requests (every time api key is used this should updated and should be updated on refill as well)"
+                        },
+                        lastRequest: {
+                          type: "string",
+                          format: "date-time",
+                          nullable: true,
+                          description: "When last request occurred"
+                        },
+                        expiresAt: {
+                          type: "string",
+                          format: "date-time",
+                          nullable: true,
+                          description: "Expiry date of a key"
+                        },
+                        createdAt: {
+                          type: "string",
+                          format: "date-time",
+                          description: "created at"
+                        },
+                        updatedAt: {
+                          type: "string",
+                          format: "date-time",
+                          description: "updated at"
+                        },
+                        metadata: {
+                          type: "object",
+                          nullable: true,
+                          additionalProperties: true,
+                          description: "Extra metadata about the apiKey"
+                        },
+                        permissions: {
+                          type: "string",
+                          nullable: true,
+                          description: "Permissions for the api key (stored as JSON string)"
+                        }
+                      },
+                      required: [
+                        "id",
+                        "userId",
+                        "enabled",
+                        "rateLimitEnabled",
+                        "requestCount",
+                        "createdAt",
+                        "updatedAt"
+                      ]
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
     },
     async (ctx) => {
       const session = ctx.context.session;
@@ -1245,7 +1807,7 @@ const apiKey = (options) => {
     minimumNameLength: options?.minimumNameLength ?? 1,
     enableMetadata: options?.enableMetadata ?? false,
     rateLimit: {
-      enabled: options?.rateLimit?.enabled ?? true,
+      enabled: options?.rateLimit?.enabled === void 0 ? true : options?.rateLimit?.enabled,
       timeWindow: options?.rateLimit?.timeWindow ?? 1e3 * 60 * 60 * 24,
       maxRequests: options?.rateLimit?.maxRequests ?? 10
     },