Merge pull request #4048 from AlejandroGispert/fix/3981-login-email-case
fix: make signin email case-insensitive
This commit is contained in:
3 files changed
+37
-23
No files matched your search
@@ -24,7 +24,10 @@ export async function GET(request: Request, { params }: { params: Promise<{ user
|
||||
return json(user);
|
||||
}
|
||||
|
||||
export async function POST(request: Request, { params }: { params: Promise<{ userId: string }> }) {
|
||||
export async function POST(
|
||||
request: Request,
|
||||
{ params }: { params: Promise<{ userId: string }> },
|
||||
) {
|
||||
const schema = z.object({
|
||||
username: z.string().max(255).optional(),
|
||||
password: z.string().min(8).max(255).optional(),
|
||||
@@ -63,15 +66,15 @@ export async function POST(request: Request, { params }: { params: Promise<{ use
|
||||
}
|
||||
|
||||
if (username && auth.user.isAdmin) {
|
||||
data.username = username;
|
||||
data.username = username.toLowerCase();
|
||||
}
|
||||
|
||||
// Check when username changes
|
||||
if (data.username && user.username !== data.username) {
|
||||
const user = await getUserByUsername(username);
|
||||
const existingUser = await getUserByUsername(username);
|
||||
|
||||
if (user) {
|
||||
return badRequest({ message: 'User already exists' });
|
||||
if (existingUser && existingUser.id !== userId) {
|
||||
return badRequest({ message: "User already exists" });
|
||||
}
|
||||
}
|
||||
|
||||
@@ -97,7 +100,7 @@ export async function DELETE(
|
||||
}
|
||||
|
||||
if (userId === auth.user.id) {
|
||||
return badRequest({ message: 'You cannot delete yourself.' });
|
||||
return badRequest({ message: "You cannot delete yourself." });
|
||||
}
|
||||
|
||||
await deleteUser(userId);
|
||||
|
||||
@@ -28,15 +28,17 @@ export async function POST(request: Request) {
|
||||
|
||||
const { id, username, password, role } = body;
|
||||
|
||||
const existingUser = await getUserByUsername(username, { showDeleted: true });
|
||||
const existingUser = await getUserByUsername(username, {
|
||||
showDeleted: true,
|
||||
});
|
||||
|
||||
if (existingUser) {
|
||||
return badRequest({ message: 'User already exists' });
|
||||
return badRequest({ message: "User already exists" });
|
||||
}
|
||||
|
||||
const user = await createUser({
|
||||
id: id || uuid(),
|
||||
username,
|
||||
username: username.toLowerCase(),
|
||||
password: hashPassword(password),
|
||||
role: role ?? ROLES.user,
|
||||
});
|
||||
|
||||
Reference in new issue
Block a user