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

package/dist/shared/{better-auth.Dmhe30iW.d.mts → better-auth.CGukGrxT.d.cts}

@@ -1,4 +1,4 @@
-import { G as GenericEndpointContext } from './better-auth.D-oLmHIj.mjs';
+import { G as GenericEndpointContext } from './better-auth.BcU1Kjyq.cjs';
 
 declare function generateState(c: GenericEndpointContext, link?: {
     email: string;

package/dist/shared/{better-auth.CsSpq0zL.cjs → better-auth.CHUzBidy.cjs}

@@ -2,15 +2,15 @@
 
 const zod = require('zod');
 const betterCall = require('better-call');
-const refreshToken = require('./better-auth.BDYXUcLv.cjs');
+const refreshToken = require('./better-auth.Dg0siV5C.cjs');
 const cookies_index = require('../cookies/index.cjs');
-const schema$1 = require('./better-auth.C5H9XEzZ.cjs');
+const schema$1 = require('./better-auth.DcWKCjjf.cjs');
 require('./better-auth.DiSjtgs9.cjs');
 require('./better-auth.GpOOav9x.cjs');
 require('defu');
 const date = require('./better-auth.C1hdVENX.cjs');
 const pluginHelper = require('./better-auth.DNqtHmvg.cjs');
-const hasPermission = require('./better-auth.CApEjVDP.cjs');
+const hasPermission = require('./better-auth.BW8BpneG.cjs');
 
 const ADMIN_ERROR_CODES = {
   FAILED_TO_CREATE_USER: "Failed to create user",
@@ -165,7 +165,7 @@ const admin = (options) => {
             userId: ctx.context.session.user.id,
             role: ctx.context.session.user.role,
             options: opts,
-            permission: {
+            permissions: {
               user: ["set-role"]
             }
           });
@@ -257,7 +257,7 @@ const admin = (options) => {
               userId: session.user.id,
               role: session.user.role,
               options: opts,
-              permission: {
+              permissions: {
                 user: ["create"]
               }
             });
@@ -384,7 +384,7 @@ const admin = (options) => {
             userId: ctx.context.session.user.id,
             role: session.user.role,
             options: opts,
-            permission: {
+            permissions: {
               user: ["list"]
             }
           });
@@ -479,7 +479,7 @@ const admin = (options) => {
             userId: ctx.context.session.user.id,
             role: session.user.role,
             options: opts,
-            permission: {
+            permissions: {
               session: ["list"]
             }
           });
@@ -537,7 +537,7 @@ const admin = (options) => {
             userId: ctx.context.session.user.id,
             role: session.user.role,
             options: opts,
-            permission: {
+            permissions: {
               user: ["ban"]
             }
           });
@@ -612,7 +612,7 @@ const admin = (options) => {
             userId: ctx.context.session.user.id,
             role: session.user.role,
             options: opts,
-            permission: {
+            permissions: {
               user: ["ban"]
             }
           });
@@ -684,7 +684,7 @@ const admin = (options) => {
             userId: ctx.context.session.user.id,
             role: ctx.context.session.user.role,
             options: opts,
-            permission: {
+            permissions: {
               user: ["impersonate"]
             }
           });
@@ -720,9 +720,13 @@ const admin = (options) => {
           }
           const authCookies = ctx.context.authCookies;
           cookies_index.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
           );
@@ -772,13 +776,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 betterCall.APIError("INTERNAL_SERVER_ERROR", {
               message: "Failed to find admin session"
             });
           }
-          await cookies_index.setSessionCookie(ctx, adminSession);
+          await ctx.context.internalAdapter.deleteSession(
+            session.session.token
+          );
+          await cookies_index.setSessionCookie(ctx, adminSession, !!dontRememberMeCookie);
           return ctx.json(adminSession);
         }
       ),
@@ -823,7 +831,7 @@ const admin = (options) => {
             userId: ctx.context.session.user.id,
             role: session.user.role,
             options: opts,
-            permission: {
+            permissions: {
               session: ["revoke"]
             }
           });
@@ -881,7 +889,7 @@ const admin = (options) => {
             userId: ctx.context.session.user.id,
             role: session.user.role,
             options: opts,
-            permission: {
+            permissions: {
               session: ["revoke"]
             }
           });
@@ -937,7 +945,7 @@ const admin = (options) => {
             userId: ctx.context.session.user.id,
             role: session.user.role,
             options: opts,
-            permission: {
+            permissions: {
               user: ["delete"]
             }
           });
@@ -995,7 +1003,7 @@ const admin = (options) => {
             userId: ctx.context.session.user.id,
             role: ctx.context.session.user.role,
             options: opts,
-            permission: {
+            permissions: {
               user: ["set-password"]
             }
           });
@@ -1021,10 +1029,20 @@ const admin = (options) => {
         {
           method: "POST",
           body: zod.z.object({
-            permission: zod.z.record(zod.z.string(), zod.z.array(zod.z.string())),
             userId: zod.z.coerce.string().optional(),
             role: zod.z.string().optional()
-          }),
+          }).and(
+            zod.z.union([
+              zod.z.object({
+                permission: zod.z.record(zod.z.string(), zod.z.array(zod.z.string())),
+                permissions: zod.z.undefined()
+              }),
+              zod.z.object({
+                permission: zod.z.undefined(),
+                permissions: zod.z.record(zod.z.string(), zod.z.array(zod.z.string()))
+              })
+            ])
+          ),
           metadata: {
             openapi: {
               description: "Check if the user has permission",
@@ -1035,11 +1053,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"]
                     }
                   }
                 }
@@ -1072,9 +1095,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 betterCall.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 refreshToken.getSessionFromCtx(ctx);
@@ -1093,7 +1116,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,