fix: make signin email case-insensitive

Closes #3981
This commit is contained in:
Alejandro Gispert committed 2026-02-22 07:18:00 +01:00
1 parent 2260520ae5
commit 2ab58700b2
3 files changed
+61 -39

No files matched your search

+25 -14
View File
@@ -1,12 +1,20 @@
import { z } from 'zod';
import { hashPassword } from '@/lib/password';
import { parseRequest } from '@/lib/request';
import { badRequest, json, ok, unauthorized } from '@/lib/response';
import { userRoleParam } from '@/lib/schema';
import { canDeleteUser, canUpdateUser, canViewUser } from '@/permissions';
import { deleteUser, getUser, getUserByUsername, updateUser } from '@/queries/prisma';
import { z } from "zod";
import { hashPassword } from "@/lib/password";
import { parseRequest } from "@/lib/request";
import { badRequest, json, ok, unauthorized } from "@/lib/response";
import { userRoleParam } from "@/lib/schema";
import { canDeleteUser, canUpdateUser, canViewUser } from "@/permissions";
import {
deleteUser,
getUser,
getUserByUsername,
updateUser,
} from "@/queries/prisma";
export async function GET(request: Request, { params }: { params: Promise<{ userId: string }> }) {
export async function GET(
request: Request,
{ params }: { params: Promise<{ userId: string }> },
) {
const { auth, error } = await parseRequest(request);
if (error) {
@@ -24,7 +32,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().max(255).optional(),
@@ -59,15 +70,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" });
}
}
@@ -93,7 +104,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);
+13 -11
View File
@@ -1,11 +1,11 @@
import { z } from 'zod';
import { ROLES } from '@/lib/constants';
import { uuid } from '@/lib/crypto';
import { hashPassword } from '@/lib/password';
import { parseRequest } from '@/lib/request';
import { badRequest, json, unauthorized } from '@/lib/response';
import { canCreateUser } from '@/permissions';
import { createUser, getUserByUsername } from '@/queries/prisma';
import { z } from "zod";
import { ROLES } from "@/lib/constants";
import { uuid } from "@/lib/crypto";
import { hashPassword } from "@/lib/password";
import { parseRequest } from "@/lib/request";
import { badRequest, json, unauthorized } from "@/lib/response";
import { canCreateUser } from "@/permissions";
import { createUser, getUserByUsername } from "@/queries/prisma";
export async function POST(request: Request) {
const schema = z.object({
@@ -27,15 +27,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,
});