better-auth 0.3.5-beta.2 → 0.3.5-beta.4

package/dist/client/plugins.d.ts

@@ -2,8 +2,8 @@ import * as nanostores from 'nanostores';
 import { A as AccessControl, S as StatementsPrimitive, R as Role } from '../statement-CfnyN34h.js';
 import * as _better_fetch_fetch from '@better-fetch/fetch';
 import { BetterFetchOption } from '@better-fetch/fetch';
-import { o as organization, f as Organization, M as Member, I as Invitation, u as username, m as magicLink, d as phoneNumber, e as anonymous } from '../index-BYsLBcLO.js';
-export { g as getPasskeyActions, c as passkeyClient, a as twoFactorClient } from '../index-BYsLBcLO.js';
+import { o as organization, f as Organization, M as Member, I as Invitation, u as username, m as magicLink, d as phoneNumber, e as anonymous } from '../index-DrWKVr9E.js';
+export { g as getPasskeyActions, c as passkeyClient, a as twoFactorClient } from '../index-DrWKVr9E.js';
 import { P as Prettify } from '../helper-DPDj8Nix.js';
 import { F as FieldAttribute, B as BetterAuthOptions, b as BetterAuthPlugin } from '../index-DUQYmBZY.js';
 import '../index-QaO4zgiz.js';

package/dist/{index-BYsLBcLO.d.ts → index-DrWKVr9E.d.ts}

@@ -843,10 +843,10 @@ declare const organization: <O extends OrganizationOptions>(options?: O) => {
                     organizationId: string;
                     role: "member" | "admin" | "owner";
                 }[];
-                id?: string | undefined;
-                name?: string | undefined;
-                createdAt?: Date | undefined;
-                slug?: string | undefined;
+                id: string;
+                name: string;
+                createdAt: Date;
+                slug: string;
                 metadata?: any;
                 logo?: string | undefined;
             } | null>;
@@ -1031,10 +1031,10 @@ declare const organization: <O extends OrganizationOptions>(options?: O) => {
                     organizationId: string;
                     role: "member" | "admin" | "owner";
                 }[];
-                id?: string | undefined;
-                name?: string | undefined;
-                createdAt?: Date | undefined;
-                slug?: string | undefined;
+                id: string;
+                name: string;
+                createdAt: Date;
+                slug: string;
                 metadata?: any;
                 logo?: string | undefined;
             } | null>;

package/dist/plugins.d.ts

@@ -1,4 +1,4 @@
-export { A as AnonymousOptions, O as OrganizationOptions, b as Passkey, P as PasskeyOptions, U as UserWithPhoneNumber, e as anonymous, g as getPasskeyActions, m as magicLink, o as organization, p as passkey, c as passkeyClient, d as phoneNumber, t as twoFactor, a as twoFactorClient, u as username } from './index-BYsLBcLO.js';
+export { A as AnonymousOptions, O as OrganizationOptions, b as Passkey, P as PasskeyOptions, U as UserWithPhoneNumber, e as anonymous, g as getPasskeyActions, m as magicLink, o as organization, p as passkey, c as passkeyClient, d as phoneNumber, t as twoFactor, a as twoFactorClient, u as username } from './index-DrWKVr9E.js';
 export { i as ac } from './index-DfAHOgpj.js';
 import { H as HookEndpointContext } from './index-DUQYmBZY.js';
 export { e as AuthEndpoint, f as AuthMiddleware, b as BetterAuthPlugin, P as PluginSchema, d as createAuthEndpoint, c as createAuthMiddleware, o as optionsMiddleware } from './index-DUQYmBZY.js';

package/dist/plugins.js

@@ -2654,69 +2654,69 @@ var getOrgAdapter = (adapter, options) => {
      * @requires db
      */
     findFullOrganization: async (orgId, db) => {
-      async function base() {
-        const org = await adapter.findOne({
-          model: "organization",
-          where: [
-            {
-              field: "id",
-              value: orgId
-            }
-          ]
-        });
-        const invitations = await adapter.findMany({
-          model: "invitation",
-          where: [
-            {
-              field: "organizationId",
-              value: orgId
-            }
-          ]
-        });
-        const members = await adapter.findMany({
-          model: "member",
-          where: [
-            {
-              field: "organizationId",
-              value: orgId
-            }
-          ]
-        });
-        const membersWithUsers = await Promise.all(
-          members.map(async (member) => {
-            const user = await adapter.findOne({
-              model: "user",
-              where: [
-                {
-                  field: "id",
-                  value: member.userId
-                }
-              ]
-            });
-            if (!user) {
-              throw new BetterAuthError(
-                "Unexpected error: User not found for member"
-              );
-            }
-            return {
-              ...member,
-              user: {
-                id: user.id,
-                name: user.name,
-                email: user.email,
-                image: user.image
-              }
-            };
-          })
-        );
-        const fullOrg = {
-          ...org,
-          invitations,
-          members: membersWithUsers
-        };
-        return fullOrg;
+      const org = await adapter.findOne({
+        model: "organization",
+        where: [
+          {
+            field: "id",
+            value: orgId
+          }
+        ]
+      });
+      if (!org) {
+        return null;
       }
-      return base();
+      const invitations = await adapter.findMany({
+        model: "invitation",
+        where: [
+          {
+            field: "organizationId",
+            value: orgId
+          }
+        ]
+      });
+      const members = await adapter.findMany({
+        model: "member",
+        where: [
+          {
+            field: "organizationId",
+            value: orgId
+          }
+        ]
+      });
+      const membersWithUsers = await Promise.all(
+        members.map(async (member) => {
+          const user = await adapter.findOne({
+            model: "user",
+            where: [
+              {
+                field: "id",
+                value: member.userId
+              }
+            ]
+          });
+          if (!user) {
+            throw new BetterAuthError(
+              "Unexpected error: User not found for member"
+            );
+          }
+          return {
+            ...member,
+            user: {
+              id: user.id,
+              name: user.name,
+              email: user.email,
+              image: user.image
+            }
+          };
+        })
+      );
+      const fullOrg = {
+        ...org,
+        invitations,
+        members: membersWithUsers
+      };
+      return fullOrg;
     },
     listOrganizations: async (userId) => {
       const members = await adapter.findMany({
@@ -5278,7 +5278,7 @@ var username = () => {
             await ctx.context.password.hash(ctx.body.password);
             ctx.context.logger.error("User not found", { username });
             throw new APIError23("UNAUTHORIZED", {
-              message: "Invalid email or password"
+              message: "Invalid username or password"
             });
           }
           const account = await ctx.context.adapter.findOne({
@@ -5296,7 +5296,7 @@ var username = () => {
           });
           if (!account) {
             throw new APIError23("UNAUTHORIZED", {
-              message: "Invalid email or password"
+              message: "Invalid username or password"
             });
           }
           const currentPassword = account?.password;
@@ -5313,7 +5313,7 @@ var username = () => {
           if (!validPassword) {
             ctx.context.logger.error("Invalid password");
             throw new APIError23("UNAUTHORIZED", {
-              message: "Invalid email or password"
+              message: "Invalid username or password"
             });
           }
           const session = await ctx.context.internalAdapter.createSession(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "better-auth",
-  "version": "0.3.5-beta.2",
+  "version": "0.3.5-beta.4",
   "description": "The most comprehensive authentication library for TypeScript.",
   "type": "module",
   "main": "./dist/index.js",
@@ -83,7 +83,7 @@
     "@simplewebauthn/browser": "^10.0.0",
     "@simplewebauthn/server": "^10.0.1",
     "arctic": "2.0.0-next.9",
-    "better-call": "0.2.5-beta.4",
+    "better-call": "0.2.5-beta.5",
     "c12": "^1.11.2",
     "chalk": "^5.3.0",
     "commander": "^12.1.0",