From d6a3b8c6d36b62e7e6b3ac146ef9a57a557ff4c6 Mon Sep 17 00:00:00 2001 From: Francis Cao Date: Mon, 17 Aug 2026 10:39:49 -0700 Subject: [PATCH] fix(auth): lowercase existing usernames for pre-3.2 accounts Co-authored-by: NoiceHax --- .../24_lowercase_username/migration.sql | 24 ++++++++ src/queries/prisma/user.test.ts | 60 +++++++++++++++++++ src/tracker/index.d.ts | 6 +- 3 files changed, 86 insertions(+), 4 deletions(-) create mode 100644 prisma/migrations/24_lowercase_username/migration.sql create mode 100644 src/queries/prisma/user.test.ts diff --git a/prisma/migrations/24_lowercase_username/migration.sql b/prisma/migrations/24_lowercase_username/migration.sql new file mode 100644 index 000000000..f130e5b51 --- /dev/null +++ b/prisma/migrations/24_lowercase_username/migration.sql @@ -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") + ); diff --git a/src/queries/prisma/user.test.ts b/src/queries/prisma/user.test.ts new file mode 100644 index 000000000..50674514c --- /dev/null +++ b/src/queries/prisma/user.test.ts @@ -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, + }, + }); + }); +}); diff --git a/src/tracker/index.d.ts b/src/tracker/index.d.ts index ab909a0e6..925e075cd 100644 --- a/src/tracker/index.d.ts +++ b/src/tracker/index.d.ts @@ -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; /**