From 42e4fd728a20f0acfda75950aaafa1239eff11c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sean=20Luca=20Kr=C3=BCger?= Date: Thu, 12 Jun 2025 19:23:26 +0200 Subject: [PATCH] fix(organization): organization with no members error (#2999) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * fix: handle empty userIds in getOrgAdapter to prevent errors * refactor: remove unnecessary whitespace in getOrgAdapter function * refactor: simplify user fetching logic in getOrgAdapter function --------- Co-authored-by: Sean Luca Krüger --- .../better-auth/src/plugins/organization/adapter.ts | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/packages/better-auth/src/plugins/organization/adapter.ts b/packages/better-auth/src/plugins/organization/adapter.ts index 70a3fc4680..0774ba05b7 100644 --- a/packages/better-auth/src/plugins/organization/adapter.ts +++ b/packages/better-auth/src/plugins/organization/adapter.ts @@ -350,11 +350,14 @@ export const getOrgAdapter = ( if (!org) return null; const userIds = members.map((member) => member.userId); - const users = await adapter.findMany({ - model: "user", - where: [{ field: "id", value: userIds, operator: "in" }], - limit: options?.membershipLimit || 100, - }); + const users = + userIds.length > 0 + ? await adapter.findMany({ + model: "user", + where: [{ field: "id", value: userIds, operator: "in" }], + limit: options?.membershipLimit || 100, + }) + : []; const userMap = new Map(users.map((user) => [user.id, user])); const membersWithUsers = members.map((member) => {