From 351a3c883f751a8e027ae21d130c75eb6bc1b604 Mon Sep 17 00:00:00 2001
From: Bereket Engida <86073083+Bekacru@users.noreply.github.com>
Date: Wed, 16 Oct 2024 09:05:02 +0300
Subject: [PATCH] fix: custom account-fields (#190)

* fix: custom account-fields

* fix: type
---
 .../src/api/routes/sign-up.test.ts            | 32 +++++++++++++++++++
 .../better-auth/src/api/routes/sign-up.ts     |  1 -
 .../better-auth/src/plugins/username/index.ts | 10 +-----
 3 files changed, 33 insertions(+), 10 deletions(-)
 create mode 100644 packages/better-auth/src/api/routes/sign-up.test.ts

diff --git a/packages/better-auth/src/api/routes/sign-up.test.ts b/packages/better-auth/src/api/routes/sign-up.test.ts
new file mode 100644
index 0000000000..37ccd61b13
--- /dev/null
+++ b/packages/better-auth/src/api/routes/sign-up.test.ts
@@ -0,0 +1,32 @@
+import { describe, expect } from "vitest";
+import { getTestInstance } from "../../test-utils/test-instance";
+
+describe("sign-up with custom fields", async (it) => {
+	it("should work with custom fields on account table", async () => {
+		const { auth, db } = await getTestInstance(
+			{
+				account: {
+					fields: {
+						providerId: "provider_id",
+						accountId: "account_id",
+					},
+				},
+			},
+			{
+				disableTestUser: true,
+			},
+		);
+		const res = await auth.api.signUpEmail({
+			body: {
+				email: "email@test.com",
+				password: "password",
+				name: "name",
+			},
+		});
+		expect(res.user).toBeDefined();
+		const accounts = await db.findMany({
+			model: "account",
+		});
+		expect(accounts).toHaveLength(1);
+	});
+});
diff --git a/packages/better-auth/src/api/routes/sign-up.ts b/packages/better-auth/src/api/routes/sign-up.ts
index a56b94dc76..2688bae6fd 100644
--- a/packages/better-auth/src/api/routes/sign-up.ts
+++ b/packages/better-auth/src/api/routes/sign-up.ts
@@ -134,7 +134,6 @@ export const signUpEmail = <O extends BetterAuthOptions>() =>
 				{
 					user: createdUser,
 					session,
-					error: null,
 				},
 				{
 					body: body.callbackURL
diff --git a/packages/better-auth/src/plugins/username/index.ts b/packages/better-auth/src/plugins/username/index.ts
index d9eb0eb934..d51fa228e4 100644
--- a/packages/better-auth/src/plugins/username/index.ts
+++ b/packages/better-auth/src/plugins/username/index.ts
@@ -122,15 +122,7 @@ export const username = () => {
 						...ctx,
 						_flag: "json",
 					});
-					if (res.error) {
-						return ctx.json(null, {
-							status: 400,
-							body: {
-								message: res.error,
-								status: 400,
-							},
-						});
-					}
+
 					const updated = await ctx.context.internalAdapter.updateUserByEmail(
 						res.user?.email,
 						{