monkeytypegame/monkeytype
1
1
Fork 0
mirror of https://github.com/monkeytypegame/monkeytype.git synced 2025-11-09 21:51:29 +08:00
Code Issues Projects Releases Packages Wiki Activity

return available:boolean from checkName

Browse source
This commit is contained in:
Christian Fehmer 2025-09-11 12:26:26 +02:00
parent 0646c44a1b
commit 4a66caa7b6
No known key found for this signature in database
GPG key ID: FE53784A69964062
6 changed files with 20 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
backend/__tests__/api/controllers/user.spec.ts
View file

@ -239,7 +239,7 @@ describe("user controller test", () => {
//THEN
expect(body).toEqual({
message: "Check username",
data: { availability: "available" },
data: { available: true },
});
expect(userIsNameAvailableMock).toHaveBeenCalledWith("bob", "");
});
@ -257,7 +257,7 @@ describe("user controller test", () => {
//THEN
expect(body).toEqual({
message: "Check username",
data: { availability: "taken" },
data: { available: false },
});
expect(userIsNameAvailableMock).toHaveBeenCalledWith("bob", "");
@ -275,7 +275,7 @@ describe("user controller test", () => {
//THEN
expect(body).toEqual({
message: "Check username",
data: { availability: "available" },
data: { available: true },
});
expect(userIsNameAvailableMock).toHaveBeenCalledWith("bob", uid);
});

2
backend/src/api/controllers/user.ts
View file

@ -438,7 +438,7 @@ export async function checkName(
const available = await UserDAL.isNameAvailable(name, uid);
return new MonkeyResponse("Check username", {
availability: available ? "available" : "taken",
available,
});
}

9
frontend/src/ts/modals/google-sign-up.ts
View file

@ -159,10 +159,11 @@ validateWithIndicator(nameInputEl, {
params: { name: name },
});
return checkNameResponse.status === 200 &&
checkNameResponse.body.data.availability === "available"
? true
: "Name not available";
return (
(checkNameResponse.status === 200 &&
checkNameResponse.body.data.available) ||
"Name not available"
);
},
debounceDelay: 1000,
callback: (result) => {

9
frontend/src/ts/modals/simple-modals.ts
View file

@ -480,10 +480,11 @@ list.updateName = new SimpleModal({
params: { name: newName },
});
return checkNameResponse.status === 200 &&
checkNameResponse.body.data.availability === "available"
? true
: "Name not available";
return (
(checkNameResponse.status === 200 &&
checkNameResponse.body.data.available) ||
"Name not available"
);
},
debounceDelay: 1000,
},

9
frontend/src/ts/pages/login.ts
View file

@ -68,10 +68,11 @@ validateWithIndicator(nameInputEl, {
params: { name: name },
});
return checkNameResponse.status === 200 &&
checkNameResponse.body.data.availability === "available"
? true
: "Name not available";
return (
(checkNameResponse.status === 200 &&
checkNameResponse.body.data.available) ||
"Name not available"
);
},
debounceDelay: 1000,
callback: (result) => {

2
packages/contracts/src/users.ts
View file

@ -61,7 +61,7 @@ export type CheckNamePathParameters = z.infer<
export const CheckNameResponseSchema = responseWithData(
z.object({
availability: z.enum(["available", "taken"]),
available: z.boolean(),
})
);
export type CheckNameResponse = z.infer<typeof CheckNameResponseSchema>;