mirror of
https://github.com/umami-software/umami.git
synced 2026-05-30 06:47:25 +00:00
Merge pull request #4142 from nielskaspers/fix/issue-3981-case-insensitive-login
fix: make username login case-insensitive
This commit is contained in:
@@ -63,14 +63,14 @@ 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(data.username);
|
||||
|
||||
if (user) {
|
||||
if (existingUser && existingUser.id !== userId) {
|
||||
return badRequest({ message: 'User already exists' });
|
||||
}
|
||||
}
|
||||
|
||||
@@ -36,7 +36,7 @@ export async function POST(request: Request) {
|
||||
|
||||
const user = await createUser({
|
||||
id: id || uuid(),
|
||||
username,
|
||||
username: username.toLowerCase(),
|
||||
password: hashPassword(password),
|
||||
role: role ?? ROLES.user,
|
||||
});
|
||||
|
||||
@@ -46,7 +46,7 @@ export async function getUser(userId: string, options: GetUserOptions = {}) {
|
||||
}
|
||||
|
||||
export async function getUserByUsername(username: string, options: GetUserOptions = {}) {
|
||||
return findUser({ where: { username } }, options);
|
||||
return findUser({ where: { username: username.toLowerCase() } }, options);
|
||||
}
|
||||
|
||||
export async function getUsers(criteria: UserFindManyArgs, filters: QueryFilters = {}) {
|
||||
|
||||
Reference in New Issue
Block a user