better-auth 1.3.1 → 1.3.2

package/dist/shared/{better-auth.CnqHgquB.cjs → better-auth.CeY8lCIq.cjs}

@@ -2,7 +2,7 @@
 
 const betterCall = require('better-call');
 const z = require('zod/v4');
-const socialProviders_index = require('./better-auth.DG2FJeYI.cjs');
+const socialProviders_index = require('./better-auth.CU2ZnFFo.cjs');
 require('./better-auth.DiSjtgs9.cjs');
 require('@better-auth/utils/base64');
 require('@better-auth/utils/hmac');
@@ -11,7 +11,7 @@ require('./better-auth.BIMq4RPW.cjs');
 const date = require('./better-auth.C1hdVENX.cjs');
 const index = require('./better-auth.ANpbi45u.cjs');
 const parser = require('./better-auth.DhsGZ30Q.cjs');
-const schema = require('./better-auth.B8mbk3HM.cjs');
+const schema = require('./better-auth.CSftMZoM.cjs');
 const cookies_index = require('../cookies/index.cjs');
 require('./better-auth.CXhVNgXP.cjs');
 require('defu');
@@ -328,6 +328,25 @@ const getOrgAdapter = (context, options) => {
       });
       return organization;
     },
+    checkMembership: async ({
+      userId,
+      organizationId
+    }) => {
+      const member = await adapter.findOne({
+        model: "member",
+        where: [
+          {
+            field: "userId",
+            value: userId
+          },
+          {
+            field: "organizationId",
+            value: organizationId
+          }
+        ]
+      });
+      return member;
+    },
     /**
      * @requires db
      */
@@ -2512,23 +2531,26 @@ const setActiveOrganization = (options) => {
         }
         organizationId = sessionOrgId;
       }
-      const organization = await adapter.findFullOrganization({
-        organizationId,
-        isSlug: !!ctx.body.organizationSlug
+      const isMember = await adapter.checkMembership({
+        userId: session.user.id,
+        organizationId
       });
-      const isMember = organization?.members.find(
-        (member) => member.userId === session.user.id
-      );
       if (!isMember) {
         await adapter.setActiveOrganization(session.session.token, null);
         throw new betterCall.APIError("FORBIDDEN", {
           message: ORGANIZATION_ERROR_CODES.USER_IS_NOT_A_MEMBER_OF_THE_ORGANIZATION
         });
       }
+      let organization = await adapter.findOrganizationById(organizationId);
       if (!organization) {
-        throw new betterCall.APIError("BAD_REQUEST", {
-          message: ORGANIZATION_ERROR_CODES.ORGANIZATION_NOT_FOUND
-        });
+        if (ctx.body.organizationSlug) {
+          organization = await adapter.findOrganizationBySlug(organizationId);
+        }
+        if (!organization) {
+          throw new betterCall.APIError("BAD_REQUEST", {
+            message: ORGANIZATION_ERROR_CODES.ORGANIZATION_NOT_FOUND
+          });
+        }
       }
       const updatedSession = await adapter.setActiveOrganization(
         session.session.token,