github-starred/better-auth
2
0
Fork 0
mirror of https://github.com/better-auth/better-auth.git synced 2026-05-30 02:46:44 -05:00
Code Issues 2.5k Packages Projects Releases 112 Wiki Activity

fix: exclude current user from username update checks (#2612)

Browse Source 
* fix: exclude current user from username update checks

* fix lint

* explicitly check for the session

* fix test
This commit is contained in:
Kyle
2025-07-08 07:33:39 +12:00
committed by GitHub
parent b185143b83
commit 0989ebb13f
2 changed files with 49 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
packages/better-auth/src/plugins/username/index.ts
View File

@@ -274,7 +274,14 @@ export const username = (options?: UsernameOptions) => {
},
],
});
if (user) {
const blockChangeSignUp = ctx.path === "/sign-up/email" && user;
const blockChangeUpdateUser =
ctx.path === "/update-user" &&
user &&
ctx.context.session &&
user.id !== ctx.context.session.session.userId;
if (blockChangeSignUp || blockChangeUpdateUser) {
throw new APIError("UNPROCESSABLE_ENTITY", {
message: ERROR_CODES.USERNAME_IS_ALREADY_TAKEN,
});

43
packages/better-auth/src/plugins/username/username.test.ts
View File

@@ -4,7 +4,7 @@ import { username } from ".";
import { usernameClient } from "./client";
describe("username", async (it) => {
const { client, sessionSetter } = await getTestInstance(
const { client, sessionSetter, signInWithTestUser } = await getTestInstance(
{
plugins: [
username({
@@ -70,7 +70,7 @@ describe("username", async (it) => {
expect(session?.user.username).toBe("new_username_2.1");
});
it("should fail on duplicate username", async () => {
it("should fail on duplicate username in sign-up", async () => {
const res = await client.signUp.email({
email: "new-email-2@gamil.com",
username: "New_username_2.1",
@@ -80,6 +80,45 @@ describe("username", async (it) => {
expect(res.error?.status).toBe(422);
});
it("should fail on duplicate username in update-user if user is different", async () => {
const newHeaders = new Headers();
await client.signUp.email({
email: "new-email-2@gamil.com",
username: "duplicate-username",
password: "new_password",
name: "new-name",
fetchOptions: {
headers: newHeaders,
},
});
const { headers: testUserHeaders } = await signInWithTestUser();
const res = await client.updateUser({
username: "duplicate-username",
fetchOptions: {
headers: testUserHeaders,
},
});
expect(res.error?.status).toBe(422);
});
it("should succeed on duplicate username in update-user if user is the same", async () => {
await client.updateUser({
username: "New_username_2.1",
fetchOptions: {
headers,
},
});
const session = await client.getSession({
fetchOptions: {
headers,
throw: true,
},
});
expect(session?.user.username).toBe("new_username_2.1");
});
it("should fail on invalid username", async () => {
const res = await client.signUp.email({
email: "email-4@email.com",