fix: oauth userId missing

Author: Bekacru

packages/better-auth/src/db/internal-adapter.ts

@@ -24,13 +24,16 @@ export const createInternalAdapter = (
 		createOAuthUser: async (user: User, account: Omit<Account, "userId">) => {
 			try {
 				const createdUser = await createWithHooks(user, "user");
-				const createdAccount = await createWithHooks(account, "account");
-				return {
-					user: createdUser,
-					account: {
-						...createdAccount,
+				const createdAccount = await createWithHooks(
+					{
+						...account,
 						userId: createdUser.id || user.id,
 					},
+					"account",
+				);
+				return {
+					user: createdUser,
+					account: createdAccount,
 				};
 			} catch (e) {
 				console.log(e);

packages/better-auth/src/db/with-hooks.ts

@@ -47,7 +47,7 @@ export function getWithHooks(
 				? await adapter.create<T>({
 						model: table.tableName,
 						data: {
-							id: generateId(),
+							id: actualData.id || generateId(),
 							...convertToDB(table.fields, actualData),
 						},
 					})