better-auth 1.4.0-beta.1 → 1.4.0-beta.2

package/dist/shared/{better-auth.B3bZoclS.d.mts → better-auth.B_xbPKKL.d.mts}

@@ -355,8 +355,8 @@ declare const createFieldAttribute: <T extends FieldType, C extends Omit<FieldAt
     };
     returned?: boolean;
     required?: boolean;
-    unique?: boolean;
-    sortable?: boolean;
+    defaultValue?: Primitive | (() => Primitive);
+    onUpdate?: () => Primitive;
     references?: {
         /**
          * The model to reference.
@@ -372,13 +372,13 @@ declare const createFieldAttribute: <T extends FieldType, C extends Omit<FieldAt
          */
         onDelete?: "no action" | "restrict" | "cascade" | "set null" | "set default";
     };
-    defaultValue?: Primitive | (() => Primitive);
-    fieldName?: string;
-    onUpdate?: () => Primitive;
+    unique?: boolean;
     validator?: {
         input?: ZodType;
         output?: ZodType;
     };
+    fieldName?: string;
+    sortable?: boolean;
     type: T;
 };
 type InferValueType<T extends FieldType> = T extends "string" ? string : T extends "number" ? number : T extends "boolean" ? boolean : T extends "date" ? Date : T extends `${infer T}[]` ? T extends "string" ? string[] : number[] : T extends Array<any> ? T[number] : never;
@@ -5588,7 +5588,7 @@ declare function getEndpoints<Option extends BetterAuthOptions>(ctx: Promise<Aut
                     user?: string | undefined;
                 } | undefined;
             } & {
-                method: "GET" | "POST";
+                method: "POST" | "GET";
             } & {
                 query?: {
                     code?: string | undefined;
@@ -5619,7 +5619,7 @@ declare function getEndpoints<Option extends BetterAuthOptions>(ctx: Promise<Aut
                 response: void;
             } : void>;
             options: {
-                method: ("GET" | "POST")[];
+                method: ("POST" | "GET")[];
                 body: z.ZodOptional<z.ZodObject<{
                     code: z.ZodOptional<z.ZodString>;
                     error: z.ZodOptional<z.ZodString>;
@@ -9280,7 +9280,7 @@ declare const router: <Option extends BetterAuthOptions>(ctx: AuthContext, optio
                     user?: string | undefined;
                 } | undefined;
             } & {
-                method: "GET" | "POST";
+                method: "POST" | "GET";
             } & {
                 query?: {
                     code?: string | undefined;
@@ -9311,7 +9311,7 @@ declare const router: <Option extends BetterAuthOptions>(ctx: AuthContext, optio
                 response: void;
             } : void>;
             options: {
-                method: ("GET" | "POST")[];
+                method: ("POST" | "GET")[];
                 body: z.ZodOptional<z.ZodObject<{
                     code: z.ZodOptional<z.ZodString>;
                     error: z.ZodOptional<z.ZodString>;
@@ -17408,17 +17408,21 @@ type FilterActions<API> = Omit<API, API extends {
 type InferSessionAPI<API> = API extends {
     [key: string]: infer E;
 } ? UnionToIntersection<E extends Endpoint ? E["path"] extends "/get-session" ? {
-    getSession: <R extends boolean>(context: {
+    getSession: <R extends boolean, H extends boolean = false>(context: {
         headers: Headers;
         query?: {
             disableCookieCache?: boolean;
             disableRefresh?: boolean;
         };
         asResponse?: R;
-    }) => false extends R ? Promise<PrettifyDeep<Awaited<ReturnType<E>>>> & {
+        returnHeaders?: H;
+    }) => false extends R ? H extends true ? Promise<{
+        headers: Headers;
+        response: PrettifyDeep<Awaited<ReturnType<E>>>;
+    }> : Promise<PrettifyDeep<Awaited<ReturnType<E>>> & {
         options: E["options"];
         path: E["path"];
-    } : Promise<Response>;
+    }> : Promise<Response>;
 } : never : never> : never;
 type InferAPI<API> = InferSessionAPI<API> & FilteredAPI<API>;
 

package/dist/shared/{better-auth.DNOixpmw.d.mts → better-auth.Bbkp5JKM.d.mts}

@@ -1,4 +1,4 @@
-import { G as GenericEndpointContext, I as InferOptionSchema, H as HookEndpointContext, d as AuthContext } from './better-auth.B3bZoclS.mjs';
+import { G as GenericEndpointContext, I as InferOptionSchema, H as HookEndpointContext, d as AuthContext } from './better-auth.B_xbPKKL.mjs';
 import { Statements } from '../plugins/access/index.mjs';
 import * as zod_v4_core from 'zod/v4/core';
 import * as z from 'zod';

package/dist/shared/{better-auth.4_1BfAo1.cjs → better-auth.BkcRiga0.cjs}

@@ -38,7 +38,7 @@ function getSessionAtom($fetch) {
 
 const getClientConfig = (options) => {
   const isCredentialsSupported = "credentials" in Request.prototype;
-  const baseURL = url.getBaseURL(options?.baseURL, options?.basePath);
+  const baseURL = url.getBaseURL(options?.baseURL, options?.basePath) ?? "/api/auth";
   const pluginsFetchPlugins = options?.plugins?.flatMap((plugin) => plugin.fetchPlugins).filter((pl) => pl !== void 0) || [];
   const lifeCyclePlugin = {
     id: "lifecycle-hooks",

package/dist/shared/{better-auth.4EzI70WC.mjs → better-auth.C1TnI_Rz.mjs}

@@ -138,7 +138,9 @@ const createInternalAdapter = (adapter, ctx) => {
         const parsed = safeJSONParse(cached);
         if (!parsed) return;
         const sessionTTL = Math.max(
-          Math.floor(new Date(parsed.session.expiresAt).getTime() - now) / 1e3,
+          Math.floor(
+            (new Date(parsed.session.expiresAt).getTime() - now) / 1e3
+          ),
           0
         );
         await secondaryStorage.set(

package/dist/shared/{better-auth.BIcpessK.d.cts → better-auth.CLmuULOM.d.cts}

@@ -355,8 +355,8 @@ declare const createFieldAttribute: <T extends FieldType, C extends Omit<FieldAt
     };
     returned?: boolean;
     required?: boolean;
-    unique?: boolean;
-    sortable?: boolean;
+    defaultValue?: Primitive | (() => Primitive);
+    onUpdate?: () => Primitive;
     references?: {
         /**
          * The model to reference.
@@ -372,13 +372,13 @@ declare const createFieldAttribute: <T extends FieldType, C extends Omit<FieldAt
          */
         onDelete?: "no action" | "restrict" | "cascade" | "set null" | "set default";
     };
-    defaultValue?: Primitive | (() => Primitive);
-    fieldName?: string;
-    onUpdate?: () => Primitive;
+    unique?: boolean;
     validator?: {
         input?: ZodType;
         output?: ZodType;
     };
+    fieldName?: string;
+    sortable?: boolean;
     type: T;
 };
 type InferValueType<T extends FieldType> = T extends "string" ? string : T extends "number" ? number : T extends "boolean" ? boolean : T extends "date" ? Date : T extends `${infer T}[]` ? T extends "string" ? string[] : number[] : T extends Array<any> ? T[number] : never;
@@ -5588,7 +5588,7 @@ declare function getEndpoints<Option extends BetterAuthOptions>(ctx: Promise<Aut
                     user?: string | undefined;
                 } | undefined;
             } & {
-                method: "GET" | "POST";
+                method: "POST" | "GET";
             } & {
                 query?: {
                     code?: string | undefined;
@@ -5619,7 +5619,7 @@ declare function getEndpoints<Option extends BetterAuthOptions>(ctx: Promise<Aut
                 response: void;
             } : void>;
             options: {
-                method: ("GET" | "POST")[];
+                method: ("POST" | "GET")[];
                 body: z.ZodOptional<z.ZodObject<{
                     code: z.ZodOptional<z.ZodString>;
                     error: z.ZodOptional<z.ZodString>;
@@ -9280,7 +9280,7 @@ declare const router: <Option extends BetterAuthOptions>(ctx: AuthContext, optio
                     user?: string | undefined;
                 } | undefined;
             } & {
-                method: "GET" | "POST";
+                method: "POST" | "GET";
             } & {
                 query?: {
                     code?: string | undefined;
@@ -9311,7 +9311,7 @@ declare const router: <Option extends BetterAuthOptions>(ctx: AuthContext, optio
                 response: void;
             } : void>;
             options: {
-                method: ("GET" | "POST")[];
+                method: ("POST" | "GET")[];
                 body: z.ZodOptional<z.ZodObject<{
                     code: z.ZodOptional<z.ZodString>;
                     error: z.ZodOptional<z.ZodString>;
@@ -17408,17 +17408,21 @@ type FilterActions<API> = Omit<API, API extends {
 type InferSessionAPI<API> = API extends {
     [key: string]: infer E;
 } ? UnionToIntersection<E extends Endpoint ? E["path"] extends "/get-session" ? {
-    getSession: <R extends boolean>(context: {
+    getSession: <R extends boolean, H extends boolean = false>(context: {
         headers: Headers;
         query?: {
             disableCookieCache?: boolean;
             disableRefresh?: boolean;
         };
         asResponse?: R;
-    }) => false extends R ? Promise<PrettifyDeep<Awaited<ReturnType<E>>>> & {
+        returnHeaders?: H;
+    }) => false extends R ? H extends true ? Promise<{
+        headers: Headers;
+        response: PrettifyDeep<Awaited<ReturnType<E>>>;
+    }> : Promise<PrettifyDeep<Awaited<ReturnType<E>>> & {
         options: E["options"];
         path: E["path"];
-    } : Promise<Response>;
+    }> : Promise<Response>;
 } : never : never> : never;
 type InferAPI<API> = InferSessionAPI<API> & FilteredAPI<API>;
 

package/dist/shared/{better-auth.DFFLg_0h.mjs → better-auth.CV6SLN2A.mjs}

@@ -1,6 +1,6 @@
 import * as z from 'zod';
 import { APIError } from 'better-call';
-import './better-auth.C4cxDzG3.mjs';
+import './better-auth.DsRTWTq9.mjs';
 import { c as createAuthMiddleware, g as getSessionFromCtx, a as createAuthEndpoint, B as BASE_ERROR_CODES } from './better-auth.CBY7cUGy.mjs';
 import { s as setSessionCookie, d as deleteSessionCookie } from './better-auth.fV_ra52g.mjs';
 import { m as mergeSchema, d as parseUserOutput } from './better-auth.Dlh8OCID.mjs';

package/dist/shared/{better-auth.BKhlUl4L.mjs → better-auth.CnD_hzZ_.mjs}

@@ -1,13 +1,13 @@
 import { checkEndpointConflicts, getEndpoints, router } from '../api/index.mjs';
 import { defu } from 'defu';
 import { hashToBase64, verifyPassword, hashPassword } from '../crypto/index.mjs';
-import { a as getAdapter, c as createInternalAdapter, e as getMigrations } from './better-auth.4EzI70WC.mjs';
+import { a as getAdapter, c as createInternalAdapter, e as getMigrations } from './better-auth.C1TnI_Rz.mjs';
 import { g as getAuthTables } from './better-auth.Cjw1GDsh.mjs';
 import { n as runWithAdapter } from './better-auth.Dlh8OCID.mjs';
 import 'zod';
 import { g as getCookies, c as createCookieGetter } from './better-auth.fV_ra52g.mjs';
 import { a as logger, c as createLogger } from './better-auth.C4g12FAA.mjs';
-import { U as socialProviders } from './better-auth.C4cxDzG3.mjs';
+import { U as socialProviders } from './better-auth.DsRTWTq9.mjs';
 import { g as generateId } from './better-auth.BUPPRXfK.mjs';
 import 'better-call';
 import '@better-auth/utils/hash';

package/dist/shared/{better-auth.BK2FHZMq.d.mts → better-auth.CreeZQ__.d.mts}

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

package/dist/shared/{better-auth.B5_hCdeH.cjs → better-auth.CvVm_hFg.cjs}

@@ -1,6 +1,6 @@
 'use strict';
 
-const proxy = require('./better-auth.4_1BfAo1.cjs');
+const proxy = require('./better-auth.BkcRiga0.cjs');
 const misc = require('./better-auth.BLDOwz3i.cjs');
 
 function createAuthClient(options) {

package/dist/shared/{better-auth.BgUht1zc.cjs → better-auth.CveVqL58.cjs}

@@ -2,7 +2,7 @@
 
 const session = require('./better-auth.CAcHGnwq.cjs');
 require('better-call');
-require('./better-auth.C0eUWmDH.cjs');
+require('./better-auth.BDdoXh_7.cjs');
 const z = require('zod');
 require('./better-auth.B6fIklBU.cjs');
 require('@better-auth/utils/base64');

package/dist/shared/{better-auth.T_KylejJ.d.cts → better-auth.CxLMKBFr.d.cts}

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

package/dist/shared/{better-auth.BF7a6yeC.d.ts → better-auth.DBmu12iE.d.ts}

@@ -1,4 +1,4 @@
-import { n as BetterAuthPlugin, B as BetterAuthOptions, T as InferFieldsInputClient, Q as InferFieldsOutput, U as User, S as Session, c as Auth } from './better-auth.BpnW3Y7U.js';
+import { n as BetterAuthPlugin, B as BetterAuthOptions, T as InferFieldsInputClient, Q as InferFieldsOutput, U as User, S as Session, c as Auth } from './better-auth.BQv0wGSb.js';
 import { BetterFetchOption, BetterFetchResponse, BetterFetch, BetterFetchPlugin } from '@better-fetch/fetch';
 import { WritableAtom, Atom } from 'nanostores';
 import { U as UnionToIntersection, H as HasRequiredKeys, a as Prettify, L as LiteralString, S as StripEmptyObjects } from './better-auth.DTtXpZYr.js';

package/dist/shared/{better-auth.B_r2AcFE.cjs → better-auth.DIAGL28F.cjs}

@@ -3,7 +3,7 @@
 const z = require('zod');
 const jose = require('jose');
 const betterCall = require('better-call');
-require('./better-auth.C0eUWmDH.cjs');
+require('./better-auth.BDdoXh_7.cjs');
 const session = require('./better-auth.CAcHGnwq.cjs');
 require('./better-auth.B6fIklBU.cjs');
 const base64 = require('@better-auth/utils/base64');

package/dist/shared/{better-auth.PwYG2bh2.cjs → better-auth.DIPz2ymP.cjs}

@@ -140,7 +140,9 @@ const createInternalAdapter = (adapter, ctx) => {
         const parsed = json.safeJSONParse(cached);
         if (!parsed) return;
         const sessionTTL = Math.max(
-          Math.floor(new Date(parsed.session.expiresAt).getTime() - now) / 1e3,
+          Math.floor(
+            (new Date(parsed.session.expiresAt).getTime() - now) / 1e3
+          ),
           0
         );
         await secondaryStorage.set(

package/dist/shared/{better-auth.SCAGFnmj.mjs → better-auth.DL8idXrv.mjs}

@@ -1,4 +1,4 @@
-import { g as getClientConfig, c as createDynamicPathProxy } from './better-auth.C6XqSToF.mjs';
+import { g as getClientConfig, c as createDynamicPathProxy } from './better-auth.3naUdTMW.mjs';
 import { c as capitalizeFirstLetter } from './better-auth.D-2CmEwz.mjs';
 
 function createAuthClient(options) {

package/dist/shared/{better-auth.D2Ya06I8.mjs → better-auth.DWm9SJv0.mjs}

@@ -1,14 +1,14 @@
 import * as z from 'zod';
 import { APIError } from 'better-call';
 import { a as createAuthEndpoint, g as getSessionFromCtx, s as sessionMiddleware, c as createAuthMiddleware } from './better-auth.CBY7cUGy.mjs';
-import './better-auth.C4cxDzG3.mjs';
+import './better-auth.DsRTWTq9.mjs';
 import './better-auth.CiuwFiHM.mjs';
 import { base64Url } from '@better-auth/utils/base64';
 import '@better-auth/utils/hmac';
 import './better-auth.C4g12FAA.mjs';
 import '@better-auth/utils/binary';
 import { m as mergeSchema } from './better-auth.Dlh8OCID.mjs';
-import './better-auth.CREk28fc.mjs';
+import './better-auth.Dx5-aWCB.mjs';
 import '../plugins/organization/access/index.mjs';
 import '@better-auth/utils/random';
 import { createHash } from '@better-auth/utils/hash';

package/dist/shared/{better-auth.DFAe0eEY.d.mts → better-auth.DabBNJnG.d.mts}

@@ -1,4 +1,4 @@
-import { n as BetterAuthPlugin, B as BetterAuthOptions, T as InferFieldsInputClient, Q as InferFieldsOutput, U as User, S as Session, c as Auth } from './better-auth.B3bZoclS.mjs';
+import { n as BetterAuthPlugin, B as BetterAuthOptions, T as InferFieldsInputClient, Q as InferFieldsOutput, U as User, S as Session, c as Auth } from './better-auth.B_xbPKKL.mjs';
 import { BetterFetchOption, BetterFetchResponse, BetterFetch, BetterFetchPlugin } from '@better-fetch/fetch';
 import { WritableAtom, Atom } from 'nanostores';
 import { U as UnionToIntersection, H as HasRequiredKeys, a as Prettify, L as LiteralString, S as StripEmptyObjects } from './better-auth.DTtXpZYr.mjs';

package/dist/shared/{better-auth.Dfaw6tuq.d.cts → better-auth.DqKvGWll.d.cts}

@@ -1,4 +1,4 @@
-import { n as BetterAuthPlugin, B as BetterAuthOptions, T as InferFieldsInputClient, Q as InferFieldsOutput, U as User, S as Session, c as Auth } from './better-auth.BIcpessK.cjs';
+import { n as BetterAuthPlugin, B as BetterAuthOptions, T as InferFieldsInputClient, Q as InferFieldsOutput, U as User, S as Session, c as Auth } from './better-auth.CLmuULOM.cjs';
 import { BetterFetchOption, BetterFetchResponse, BetterFetch, BetterFetchPlugin } from '@better-fetch/fetch';
 import { WritableAtom, Atom } from 'nanostores';
 import { U as UnionToIntersection, H as HasRequiredKeys, a as Prettify, L as LiteralString, S as StripEmptyObjects } from './better-auth.DTtXpZYr.cjs';

package/dist/shared/{better-auth.C4cxDzG3.mjs → better-auth.DsRTWTq9.mjs}

@@ -6656,7 +6656,12 @@ function toAuthEndpoints(endpoints, ctx) {
         }
         internalContext = defuReplaceArrays(rest, internalContext);
       } else if (before) {
-        return before;
+        return context?.asResponse ? toResponse(before, {
+          headers: context?.headers
+        }) : context?.returnHeaders ? {
+          headers: context?.headers,
+          response: before
+        } : before;
       }
       internalContext.asResponse = false;
       internalContext.returnHeaders = true;

package/dist/shared/{better-auth.CREk28fc.mjs → better-auth.Dx5-aWCB.mjs}

@@ -1,6 +1,6 @@
 import { c as createAuthMiddleware, s as sessionMiddleware } from './better-auth.CBY7cUGy.mjs';
 import 'better-call';
-import './better-auth.C4cxDzG3.mjs';
+import './better-auth.DsRTWTq9.mjs';
 import * as z from 'zod';
 import './better-auth.CiuwFiHM.mjs';
 import '@better-auth/utils/base64';

package/dist/shared/{better-auth.CT1UdMDg.d.ts → better-auth.XB1l7SdM.d.ts}

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

package/dist/shared/{better-auth.CVJiT-QN.mjs → better-auth.aytbwQG-.mjs}

@@ -1,7 +1,7 @@
 import { APIError } from 'better-call';
 import * as z from 'zod';
 import { a as createAuthEndpoint, g as getSessionFromCtx, s as sessionMiddleware, B as BASE_ERROR_CODES, j as requestOnlySessionMiddleware } from './better-auth.CBY7cUGy.mjs';
-import './better-auth.C4cxDzG3.mjs';
+import './better-auth.DsRTWTq9.mjs';
 import './better-auth.CiuwFiHM.mjs';
 import '@better-auth/utils/base64';
 import '@better-auth/utils/hmac';
@@ -11,7 +11,7 @@ import { g as getCurrentAdapter } from './better-auth.Dlh8OCID.mjs';
 import { g as getDate } from './better-auth.CW6D9eSx.mjs';
 import { B as BetterAuthError } from './better-auth.DdzSJf-n.mjs';
 import { p as parseJSON } from './better-auth.ffWeg50w.mjs';
-import { o as orgMiddleware, a as orgSessionMiddleware, t as teamSchema } from './better-auth.CREk28fc.mjs';
+import { o as orgMiddleware, a as orgSessionMiddleware, t as teamSchema } from './better-auth.Dx5-aWCB.mjs';
 import { s as setSessionCookie } from './better-auth.fV_ra52g.mjs';
 import { defaultRoles } from '../plugins/organization/access/index.mjs';
 import { c as cacheAllRoles, h as hasPermissionFn } from './better-auth.DaEBQJp_.mjs';
@@ -70,7 +70,8 @@ const getOrgAdapter = (context, options) => {
         data: {
           ...data.organization,
           metadata: data.organization.metadata ? JSON.stringify(data.organization.metadata) : void 0
-        }
+        },
+        forceAllowId: true
       });
       return {
         ...organization,
@@ -348,12 +349,13 @@ const getOrgAdapter = (context, options) => {
       });
       return organizationId;
     },
-    setActiveOrganization: async (sessionToken, organizationId) => {
+    setActiveOrganization: async (sessionToken, organizationId, ctx) => {
       const session = await context.internalAdapter.updateSession(
         sessionToken,
         {
           activeOrganizationId: organizationId
-        }
+        },
+        ctx
       );
       return session;
     },
@@ -609,12 +611,13 @@ const getOrgAdapter = (context, options) => {
       });
       return invitation;
     },
-    setActiveTeam: async (sessionToken, teamId) => {
+    setActiveTeam: async (sessionToken, teamId, ctx) => {
       const session = await context.internalAdapter.updateSession(
         sessionToken,
         {
           activeTeamId: teamId
-        }
+        },
+        ctx
       );
       return session;
     },
@@ -1381,7 +1384,8 @@ const acceptInvitation = (options) => createAuthEndpoint(
         const teamId = teamIds[0];
         const updatedSession = await adapter.setActiveTeam(
           session.session.token,
-          teamId
+          teamId,
+          ctx
         );
         await setSessionCookie(ctx, {
           session: updatedSession,
@@ -1397,7 +1401,8 @@ const acceptInvitation = (options) => createAuthEndpoint(
     });
     await adapter.setActiveOrganization(
       session.session.token,
-      invitation.organizationId
+      invitation.organizationId,
+      ctx
     );
     if (!acceptedI) {
       return ctx.json(null, {
@@ -2095,7 +2100,7 @@ const removeMember = (options) => createAuthEndpoint(
     }
     await adapter.deleteMember(toBeRemovedMember.id);
     if (session.user.id === toBeRemovedMember.userId && session.session.activeOrganizationId === toBeRemovedMember.organizationId) {
-      await adapter.setActiveOrganization(session.session.token, null);
+      await adapter.setActiveOrganization(session.session.token, null, ctx);
     }
     if (options?.organizationHooks?.afterRemoveMember) {
       await options?.organizationHooks.afterRemoveMember({
@@ -2429,7 +2434,7 @@ const leaveOrganization = (options) => createAuthEndpoint(
     }
     await adapter.deleteMember(member.id);
     if (session.session.activeOrganizationId === ctx.body.organizationId) {
-      await adapter.setActiveOrganization(session.session.token, null);
+      await adapter.setActiveOrganization(session.session.token, null, ctx);
     }
     return ctx.json(member);
   }
@@ -2769,13 +2774,15 @@ const createOrganization = (options) => {
       if (ctx.context.session && !ctx.body.keepCurrentActiveOrganization) {
         await adapter.setActiveOrganization(
           ctx.context.session.session.token,
-          organization.id
+          organization.id,
+          ctx
         );
       }
       if (teamMember && ctx.context.session && !ctx.body.keepCurrentActiveOrganization) {
         await adapter.setActiveTeam(
           ctx.context.session.session.token,
-          teamMember.teamId
+          teamMember.teamId,
+          ctx
         );
       }
       return ctx.json({
@@ -3014,7 +3021,7 @@ const deleteOrganization = (options) => {
         });
       }
       if (organizationId === session.session.activeOrganizationId) {
-        await adapter.setActiveOrganization(session.session.token, null);
+        await adapter.setActiveOrganization(session.session.token, null, ctx);
       }
       const org = await adapter.findOrganizationById(organizationId);
       if (!org) {
@@ -3102,7 +3109,7 @@ const getFullOrganization = (options) => createAuthEndpoint(
       organizationId: organization.id
     });
     if (!isMember) {
-      await adapter.setActiveOrganization(session.session.token, null);
+      await adapter.setActiveOrganization(session.session.token, null, ctx);
       throw new APIError("FORBIDDEN", {
         message: ORGANIZATION_ERROR_CODES.USER_IS_NOT_A_MEMBER_OF_THE_ORGANIZATION
       });
@@ -3156,7 +3163,8 @@ const setActiveOrganization = (options) => {
         }
         const updatedSession2 = await adapter.setActiveOrganization(
           session.session.token,
-          null
+          null,
+          ctx
         );
         await setSessionCookie(ctx, {
           session: updatedSession2,
@@ -3190,7 +3198,7 @@ const setActiveOrganization = (options) => {
         organizationId
       });
       if (!isMember) {
-        await adapter.setActiveOrganization(session.session.token, null);
+        await adapter.setActiveOrganization(session.session.token, null, ctx);
         throw new APIError("FORBIDDEN", {
           message: ORGANIZATION_ERROR_CODES.USER_IS_NOT_A_MEMBER_OF_THE_ORGANIZATION
         });
@@ -3203,7 +3211,8 @@ const setActiveOrganization = (options) => {
       }
       const updatedSession = await adapter.setActiveOrganization(
         session.session.token,
-        organization.id
+        organization.id,
+        ctx
       );
       await setSessionCookie(ctx, {
         session: updatedSession,
@@ -3830,7 +3839,8 @@ const setActiveTeam = (options) => createAuthEndpoint(
       }
       const updatedSession2 = await adapter.setActiveTeam(
         session.session.token,
-        null
+        null,
+        ctx
       );
       await setSessionCookie(ctx, {
         session: updatedSession2,
@@ -3866,7 +3876,8 @@ const setActiveTeam = (options) => createAuthEndpoint(
     }
     const updatedSession = await adapter.setActiveTeam(
       session.session.token,
-      team.id
+      team.id,
+      ctx
     );
     await setSessionCookie(ctx, {
       session: updatedSession,