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

package/dist/shared/better-auth.BfG24BjZ.cjs

@@ -0,0 +1,118 @@
+'use strict';
+
+const index = require('./better-auth.DjryM8pE.cjs');
+
+const memoryAdapter = (db, config) => index.createAdapter({
+  config: {
+    adapterId: "memory",
+    adapterName: "Memory Adapter",
+    usePlural: false,
+    debugLogs: config?.debugLogs || false,
+    customTransformInput(props) {
+      if (props.options.advanced?.database?.useNumberId && props.field === "id" && props.action === "create") {
+        return db[props.model].length + 1;
+      }
+      return props.data;
+    }
+  },
+  adapter: ({ getFieldName, options }) => {
+    function convertWhereClause(where, table) {
+      return table.filter((record) => {
+        return where.every((clause) => {
+          let { field, value, operator } = clause;
+          if (operator === "in") {
+            if (!Array.isArray(value)) {
+              throw new Error("Value must be an array");
+            }
+            return value.includes(record[field]);
+          } else if (operator === "contains") {
+            return record[field].includes(value);
+          } else if (operator === "starts_with") {
+            return record[field].startsWith(value);
+          } else if (operator === "ends_with") {
+            return record[field].endsWith(value);
+          } else {
+            return record[field] === value;
+          }
+        });
+      });
+    }
+    return {
+      create: async ({ model, data }) => {
+        if (options.advanced?.database?.useNumberId) {
+          data.id = db[model].length + 1;
+        }
+        db[model].push(data);
+        return data;
+      },
+      findOne: async ({ model, where }) => {
+        const table = db[model];
+        const res = convertWhereClause(where, table);
+        const record = res[0] || null;
+        return record;
+      },
+      findMany: async ({ model, where, sortBy, limit, offset }) => {
+        let table = db[model];
+        if (where) {
+          table = convertWhereClause(where, table);
+        }
+        if (sortBy) {
+          table = table.sort((a, b) => {
+            const field = getFieldName({ model, field: sortBy.field });
+            if (sortBy.direction === "asc") {
+              return a[field] > b[field] ? 1 : -1;
+            } else {
+              return a[field] < b[field] ? 1 : -1;
+            }
+          });
+        }
+        if (offset !== void 0) {
+          table = table.slice(offset);
+        }
+        if (limit !== void 0) {
+          table = table.slice(0, limit);
+        }
+        return table;
+      },
+      count: async ({ model }) => {
+        return db[model].length;
+      },
+      update: async ({ model, where, update }) => {
+        const table = db[model];
+        const res = convertWhereClause(where, table);
+        res.forEach((record) => {
+          Object.assign(record, update);
+        });
+        return res[0] || null;
+      },
+      delete: async ({ model, where }) => {
+        const table = db[model];
+        const res = convertWhereClause(where, table);
+        db[model] = table.filter((record) => !res.includes(record));
+      },
+      deleteMany: async ({ model, where }) => {
+        const table = db[model];
+        const res = convertWhereClause(where, table);
+        let count = 0;
+        db[model] = table.filter((record) => {
+          if (res.includes(record)) {
+            count++;
+            return false;
+          }
+          return !res.includes(record);
+        });
+        return count;
+      },
+      updateMany({ model, where, update }) {
+        const table = db[model];
+        const res = convertWhereClause(where, table);
+        res.forEach((record) => {
+          Object.assign(record, update);
+        });
+        return res[0] || null;
+      }
+    };
+  }
+});
+
+exports.memoryAdapter = memoryAdapter;

package/dist/shared/{better-auth.A3TjrU8G.mjs → better-auth.Bk5IMdhM.mjs}

@@ -1,6 +1,6 @@
 import { g as getDate } from './better-auth.CW6D9eSx.mjs';
-import { d as parseSessionOutput, b as parseUserOutput } from './better-auth.CepcSj5H.mjs';
-import { g as getIp } from './better-auth.BrOpzmqo.mjs';
+import { d as parseSessionOutput, b as parseUserOutput } from './better-auth.Cc72UxUH.mjs';
+import { g as getIp } from './better-auth.iKoUsdFE.mjs';
 import { s as safeJSONParse } from './better-auth.tB5eU6EY.mjs';
 import { g as generateId } from './better-auth.BUPPRXfK.mjs';
 import 'zod';
@@ -16,13 +16,13 @@ import '@better-auth/utils';
 import '@better-auth/utils/hex';
 import '@noble/hashes/utils';
 import './better-auth.B4Qoxdgc.mjs';
-import { a as logger, c as createLogger } from './better-auth.DH3YjMQH.mjs';
+import { l as logger, c as createLogger } from './better-auth.Cqykj82J.mjs';
 import './better-auth.8zoxzg-F.mjs';
 import '@better-auth/utils/random';
 import { g as getAuthTables } from './better-auth.DORkW_Ge.mjs';
 import { B as BetterAuthError } from './better-auth.DdzSJf-n.mjs';
-import { c as createKyselyAdapter, k as kyselyAdapter } from './better-auth.BnRFp-t0.mjs';
-import { m as memoryAdapter } from './better-auth.DC8JQbiE.mjs';
+import { c as createKyselyAdapter, k as kyselyAdapter } from './better-auth.1DR6suCQ.mjs';
+import { m as memoryAdapter } from './better-auth.DURsStt9.mjs';
 import 'kysely';
 
 function getWithHooks(adapter, ctx) {
@@ -229,6 +229,9 @@ const createInternalAdapter = (adapter, ctx) => {
         model: "user",
         where
       });
+      if (typeof total === "string") {
+        return parseInt(total);
+      }
       return total;
     },
     deleteUser: async (userId) => {
@@ -729,10 +732,10 @@ const createInternalAdapter = (adapter, ctx) => {
       });
       return account;
     },
-    updateAccount: async (accountId, data, context) => {
+    updateAccount: async (id, data, context) => {
       const account = await updateWithHooks(
         data,
-        [{ field: "id", value: accountId }],
+        [{ field: "id", value: id }],
         "account",
         void 0,
         context
@@ -1026,7 +1029,7 @@ async function getMigrations(config) {
     }
   }
   const migrations = [];
-  function getType(field) {
+  function getType(field, fieldName) {
     const type = field.type;
     const typeMap = {
       string: {
@@ -1052,8 +1055,17 @@ async function getMigrations(config) {
         postgres: "timestamp",
         mysql: "datetime",
         mssql: "datetime"
+      },
+      id: {
+        postgres: config.advanced?.database?.useNumberId ? "serial" : "text",
+        mysql: config.advanced?.database?.useNumberId ? "integer" : "varchar(36)",
+        mssql: config.advanced?.database?.useNumberId ? "integer" : "varchar(36)",
+        sqlite: config.advanced?.database?.useNumberId ? "integer" : "text"
       }
     };
+    if (fieldName === "id" || field.references?.field === "id") {
+      return typeMap.id[dbType];
+    }
     if (dbType === "sqlite" && (type === "string[]" || type === "number[]")) {
       return "text";
     }
@@ -1068,7 +1080,7 @@ async function getMigrations(config) {
   if (toBeAdded.length) {
     for (const table of toBeAdded) {
       for (const [fieldName, field] of Object.entries(table.fields)) {
-        const type = getType(field);
+        const type = getType(field, fieldName);
         const exec = db.schema.alterTable(table.table).addColumn(fieldName, type, (col) => {
           col = field.required !== false ? col.notNull() : col;
           if (field.references) {
@@ -1089,11 +1101,19 @@ async function getMigrations(config) {
     for (const table of toBeCreated) {
       let dbT = db.schema.createTable(table.table).addColumn(
         "id",
-        dbType === "mysql" || dbType === "mssql" ? "varchar(36)" : "text",
-        (col) => col.primaryKey().notNull()
+        config.advanced?.database?.useNumberId ? dbType === "postgres" ? "serial" : "integer" : dbType === "mysql" || dbType === "mssql" ? "varchar(36)" : "text",
+        (col) => {
+          if (config.advanced?.database?.useNumberId) {
+            if (dbType === "postgres") {
+              return col.primaryKey().notNull();
+            }
+            return col.autoIncrement().primaryKey().notNull();
+          }
+          return col.primaryKey().notNull();
+        }
       );
       for (const [fieldName, field] of Object.entries(table.fields)) {
-        const type = getType(field);
+        const type = getType(field, fieldName);
         dbT = dbT.addColumn(fieldName, type, (col) => {
           col = field.required !== false ? col.notNull() : col;
           if (field.references) {

package/dist/shared/{better-auth.D9VnBkRI.mjs → better-auth.Bm9HxIzE.mjs}

@@ -1,14 +1,14 @@
 import { z } from 'zod';
 import { APIError } from 'better-call';
-import { c as createAuthMiddleware, g as getSessionFromCtx, a as createAuthEndpoint } from './better-auth.D4jH-sJA.mjs';
+import { c as createAuthMiddleware, g as getSessionFromCtx, a as createAuthEndpoint } from './better-auth.CWwVo_61.mjs';
 import { setSessionCookie, deleteSessionCookie } from '../cookies/index.mjs';
-import { m as mergeSchema } from './better-auth.CepcSj5H.mjs';
+import { m as mergeSchema } from './better-auth.Cc72UxUH.mjs';
 import './better-auth.8zoxzg-F.mjs';
-import './better-auth.DH3YjMQH.mjs';
+import './better-auth.Cqykj82J.mjs';
 import 'defu';
 import { g as getDate } from './better-auth.CW6D9eSx.mjs';
 import { g as getEndpointResponse } from './better-auth.DQI8AD7d.mjs';
-import { h as hasPermission } from './better-auth.cOCrlspr.mjs';
+import { h as hasPermission } from './better-auth.bkwPl2G4.mjs';
 
 const ADMIN_ERROR_CODES = {
   FAILED_TO_CREATE_USER: "Failed to create user",
@@ -163,7 +163,7 @@ const admin = (options) => {
             userId: ctx.context.session.user.id,
             role: ctx.context.session.user.role,
             options: opts,
-            permission: {
+            permissions: {
               user: ["set-role"]
             }
           });
@@ -255,7 +255,7 @@ const admin = (options) => {
               userId: session.user.id,
               role: session.user.role,
               options: opts,
-              permission: {
+              permissions: {
                 user: ["create"]
               }
             });
@@ -382,7 +382,7 @@ const admin = (options) => {
             userId: ctx.context.session.user.id,
             role: session.user.role,
             options: opts,
-            permission: {
+            permissions: {
               user: ["list"]
             }
           });
@@ -477,7 +477,7 @@ const admin = (options) => {
             userId: ctx.context.session.user.id,
             role: session.user.role,
             options: opts,
-            permission: {
+            permissions: {
               session: ["list"]
             }
           });
@@ -535,7 +535,7 @@ const admin = (options) => {
             userId: ctx.context.session.user.id,
             role: session.user.role,
             options: opts,
-            permission: {
+            permissions: {
               user: ["ban"]
             }
           });
@@ -610,7 +610,7 @@ const admin = (options) => {
             userId: ctx.context.session.user.id,
             role: session.user.role,
             options: opts,
-            permission: {
+            permissions: {
               user: ["ban"]
             }
           });
@@ -682,7 +682,7 @@ const admin = (options) => {
             userId: ctx.context.session.user.id,
             role: ctx.context.session.user.role,
             options: opts,
-            permission: {
+            permissions: {
               user: ["impersonate"]
             }
           });
@@ -718,9 +718,13 @@ const admin = (options) => {
           }
           const authCookies = ctx.context.authCookies;
           deleteSessionCookie(ctx);
+          const dontRememberMeCookie = await ctx.getSignedCookie(
+            ctx.context.authCookies.dontRememberToken.name,
+            ctx.context.secret
+          );
           await ctx.setSignedCookie(
             "admin_session",
-            ctx.context.session.session.token,
+            `${ctx.context.session.session.token}:${dontRememberMeCookie || ""}`,
             ctx.context.secret,
             authCookies.sessionToken.options
           );
@@ -770,13 +774,17 @@ const admin = (options) => {
               message: "Failed to find admin session"
             });
           }
-          const adminSession = await ctx.context.internalAdapter.findSession(adminCookie);
+          const [adminSessionToken, dontRememberMeCookie] = adminCookie?.split(":");
+          const adminSession = await ctx.context.internalAdapter.findSession(adminSessionToken);
           if (!adminSession || adminSession.session.userId !== user.id) {
             throw new APIError("INTERNAL_SERVER_ERROR", {
               message: "Failed to find admin session"
             });
           }
-          await setSessionCookie(ctx, adminSession);
+          await ctx.context.internalAdapter.deleteSession(
+            session.session.token
+          );
+          await setSessionCookie(ctx, adminSession, !!dontRememberMeCookie);
           return ctx.json(adminSession);
         }
       ),
@@ -821,7 +829,7 @@ const admin = (options) => {
             userId: ctx.context.session.user.id,
             role: session.user.role,
             options: opts,
-            permission: {
+            permissions: {
               session: ["revoke"]
             }
           });
@@ -879,7 +887,7 @@ const admin = (options) => {
             userId: ctx.context.session.user.id,
             role: session.user.role,
             options: opts,
-            permission: {
+            permissions: {
               session: ["revoke"]
             }
           });
@@ -935,7 +943,7 @@ const admin = (options) => {
             userId: ctx.context.session.user.id,
             role: session.user.role,
             options: opts,
-            permission: {
+            permissions: {
               user: ["delete"]
             }
           });
@@ -993,7 +1001,7 @@ const admin = (options) => {
             userId: ctx.context.session.user.id,
             role: ctx.context.session.user.role,
             options: opts,
-            permission: {
+            permissions: {
               user: ["set-password"]
             }
           });
@@ -1019,10 +1027,20 @@ const admin = (options) => {
         {
           method: "POST",
           body: z.object({
-            permission: z.record(z.string(), z.array(z.string())),
             userId: z.coerce.string().optional(),
             role: z.string().optional()
-          }),
+          }).and(
+            z.union([
+              z.object({
+                permission: z.record(z.string(), z.array(z.string())),
+                permissions: z.undefined()
+              }),
+              z.object({
+                permission: z.undefined(),
+                permissions: z.record(z.string(), z.array(z.string()))
+              })
+            ])
+          ),
           metadata: {
             openapi: {
               description: "Check if the user has permission",
@@ -1033,11 +1051,16 @@ const admin = (options) => {
                       type: "object",
                       properties: {
                         permission: {
+                          type: "object",
+                          description: "The permission to check",
+                          deprecated: true
+                        },
+                        permissions: {
                           type: "object",
                           description: "The permission to check"
                         }
                       },
-                      required: ["permission"]
+                      required: ["permissions"]
                     }
                   }
                 }
@@ -1070,9 +1093,9 @@ const admin = (options) => {
           }
         },
         async (ctx) => {
-          if (!ctx.body.permission || Object.keys(ctx.body.permission).length > 1) {
+          if (!ctx.body?.permission && !ctx.body?.permissions) {
             throw new APIError("BAD_REQUEST", {
-              message: "invalid permission check. you can only check one resource permission at a time."
+              message: "invalid permission check. no permission(s) were passed."
             });
           }
           const session = await getSessionFromCtx(ctx);
@@ -1091,7 +1114,7 @@ const admin = (options) => {
             userId: user.id,
             role: user.role,
             options,
-            permission: ctx.body.permission
+            permissions: ctx.body.permissions ?? ctx.body.permission
           });
           return ctx.json({
             error: null,

package/dist/shared/{better-auth.BRf6Iynu.d.ts → better-auth.Bwc-6kOr.d.ts}

@@ -1,4 +1,4 @@
-import { G as GenericEndpointContext } from './better-auth.DU2QNVc_.js';
+import { G as GenericEndpointContext } from './better-auth.CA2hFK4N.js';
 
 declare function generateState(c: GenericEndpointContext, link?: {
     email: string;