Revert "Merge pull request #4048 from AlejandroGispert/fix/3981-login-email-case"

This reverts commit b6341596bf, reversing
changes made to 07356323c1.
This commit is contained in:
Francis Cao committed 2026-04-07 11:26:58 -07:00
1 parent 6b13b1cc13
commit 54d3c43300
3 files changed
+23 -37

No files matched your search

+6 -9
View File
@@ -24,10 +24,7 @@ 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(),
@@ -66,15 +63,15 @@ export async function POST(
}
if (username && auth.user.isAdmin) {
data.username = username.toLowerCase();
data.username = username;
}
// Check when username changes
if (data.username && user.username !== data.username) {
const existingUser = await getUserByUsername(username);
const user = await getUserByUsername(username);
if (existingUser && existingUser.id !== userId) {
return badRequest({ message: "User already exists" });
if (user) {
return badRequest({ message: 'User already exists' });
}
}
@@ -100,7 +97,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);
+3 -5
View File
@@ -28,17 +28,15 @@ 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.toLowerCase(),
username,
password: hashPassword(password),
role: role ?? ROLES.user,
});
+14 -23
View File
@@ -1,8 +1,8 @@
import { Prisma } from "@/generated/prisma/client";
import { ROLES } from "@/lib/constants";
import { getRandomChars } from "@/lib/generate";
import prisma from "@/lib/prisma";
import type { QueryFilters, Role } from "@/lib/types";
import { Prisma } from '@/generated/prisma/client';
import { ROLES } from '@/lib/constants';
import { getRandomChars } from '@/lib/generate';
import prisma from '@/lib/prisma';
import type { QueryFilters, Role } from '@/lib/types';
import UserFindManyArgs = Prisma.UserFindManyArgs;
@@ -11,10 +11,7 @@ export interface GetUserOptions {
showDeleted?: boolean;
}
async function findUser(
criteria: Prisma.UserFindUniqueArgs,
options: GetUserOptions = {},
) {
async function findUser(criteria: Prisma.UserFindUniqueArgs, options: GetUserOptions = {}) {
const { includePassword = false, showDeleted = false } = options;
return prisma.client.user.findUnique({
@@ -44,33 +41,27 @@ export async function getUser(userId: string, options: GetUserOptions = {}) {
);
}
export async function getUserByUsername(
username: string,
options: GetUserOptions = {},
) {
return findUser({ where: { username: username.toLowerCase() } }, options);
export async function getUserByUsername(username: string, options: GetUserOptions = {}) {
return findUser({ where: { username } }, options);
}
export async function getUsers(
criteria: UserFindManyArgs,
filters: QueryFilters = {},
) {
export async function getUsers(criteria: UserFindManyArgs, filters: QueryFilters = {}) {
const { search } = filters;
const where: Prisma.UserWhereInput = {
...criteria.where,
...prisma.getSearchParameters(search, [{ username: "contains" }]),
...prisma.getSearchParameters(search, [{ username: 'contains' }]),
deletedAt: null,
};
return prisma.pagedQuery(
"user",
'user',
{
...criteria,
where,
},
{
orderBy: "createdAt",
orderBy: 'createdAt',
sortDescending: true,
...filters,
},
@@ -119,7 +110,7 @@ export async function deleteUser(userId: string) {
let websiteIds = [];
if (websites.length > 0) {
websiteIds = websites.map((a) => a.id);
websiteIds = websites.map(a => a.id);
}
const teams = await client.team.findMany({
@@ -133,7 +124,7 @@ export async function deleteUser(userId: string) {
},
});
const teamIds = teams.map((a) => a.id);
const teamIds = teams.map(a => a.id);
if (cloudMode) {
return transaction([