fix(auth): lowercase existing usernames for pre-3.2 accounts
Co-authored-by: NoiceHax <yashasprakash021@gmail.com>
This commit is contained in:
1 parent
dd6b5ddf3a
commit
d6a3b8c6d3
3 files changed
+86
-4
No files matched your search
@@ -0,0 +1,24 @@
|
||||
-- Rename only soft-deleted rows that block lowercasing a live username.
|
||||
UPDATE "user" AS d
|
||||
SET "username" = CONCAT(LEFT(d."username", 246), '-', SUBSTRING(MD5(d."user_id"::text) FROM 1 FOR 8))
|
||||
WHERE d."deleted_at" IS NOT NULL
|
||||
AND EXISTS (
|
||||
SELECT 1
|
||||
FROM "user" AS a
|
||||
WHERE a."deleted_at" IS NULL
|
||||
AND a."user_id" <> d."user_id"
|
||||
AND a."username" <> LOWER(a."username")
|
||||
AND LOWER(a."username") = LOWER(d."username")
|
||||
);
|
||||
|
||||
-- Lowercase live usernames unless another live row would still collide.
|
||||
UPDATE "user" AS u
|
||||
SET "username" = LOWER(u."username")
|
||||
WHERE u."deleted_at" IS NULL
|
||||
AND u."username" <> LOWER(u."username")
|
||||
AND NOT EXISTS (
|
||||
SELECT 1
|
||||
FROM "user" AS c
|
||||
WHERE c."user_id" <> u."user_id"
|
||||
AND LOWER(c."username") = LOWER(u."username")
|
||||
);
|
||||
@@ -0,0 +1,60 @@
|
||||
import { beforeEach, describe, expect, test, vi } from 'vitest';
|
||||
import { getUserByUsername } from './user';
|
||||
|
||||
const { findUniqueMock } = vi.hoisted(() => ({
|
||||
findUniqueMock: vi.fn(),
|
||||
}));
|
||||
|
||||
vi.mock('@/lib/prisma', () => ({
|
||||
default: {
|
||||
client: {
|
||||
user: {
|
||||
findUnique: findUniqueMock,
|
||||
},
|
||||
},
|
||||
},
|
||||
}));
|
||||
|
||||
describe('getUserByUsername', () => {
|
||||
beforeEach(() => {
|
||||
findUniqueMock.mockReset();
|
||||
findUniqueMock.mockResolvedValue(null);
|
||||
});
|
||||
|
||||
test('normalizes usernames to lowercase before lookup', async () => {
|
||||
await getUserByUsername('KaKi87', { includePassword: true });
|
||||
|
||||
expect(findUniqueMock).toHaveBeenCalledWith({
|
||||
where: {
|
||||
username: 'kaki87',
|
||||
deletedAt: null,
|
||||
},
|
||||
select: {
|
||||
id: true,
|
||||
username: true,
|
||||
password: true,
|
||||
role: true,
|
||||
createdAt: true,
|
||||
twoFactorRequired: true,
|
||||
},
|
||||
});
|
||||
});
|
||||
|
||||
test('can include deleted users while still lowercasing the username', async () => {
|
||||
await getUserByUsername('KaKi87', { showDeleted: true });
|
||||
|
||||
expect(findUniqueMock).toHaveBeenCalledWith({
|
||||
where: {
|
||||
username: 'kaki87',
|
||||
},
|
||||
select: {
|
||||
id: true,
|
||||
username: true,
|
||||
password: false,
|
||||
role: true,
|
||||
createdAt: true,
|
||||
twoFactorRequired: true,
|
||||
},
|
||||
});
|
||||
});
|
||||
});
|
||||
Vendored
+2
-4
@@ -19,10 +19,8 @@ export type TrackedProperties = {
|
||||
/**
|
||||
* Page referrer
|
||||
*
|
||||
* @description extracted from `document.referrer` on page load, or the previous
|
||||
* in-app URL on client-side navigation. Same-origin referrers are sent as
|
||||
* root-relative paths so the site's own domain is never saved as a referrer.
|
||||
* @example 'https://analytics.umami.is/docs/getting-started', '/docs/getting-started'
|
||||
* @description extracted from `document.referrer`
|
||||
* @example 'https://analytics.umami.is/docs/getting-started'
|
||||
*/
|
||||
referrer?: string;
|
||||
/**
|
||||
|
||||
Reference in new issue
Block a user