Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions server/mergin/auth/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -210,12 +210,12 @@ def generate_username(cls, email: str) -> Optional[str]:
text(
"""
SELECT
replace(username, :username, '0')::int AS suffix
replace(lower(username), :username, '0')::int AS suffix
FROM "user"
WHERE
username = :username OR
username SIMILAR TO :username_like
ORDER BY replace(username, :username, '0')::int DESC
lower(username) = :username OR
lower(username) SIMILAR TO :username_like
ORDER BY replace(lower(username), :username, '0')::int DESC
LIMIT 1;
"""
),
Expand Down
7 changes: 7 additions & 0 deletions server/mergin/tests/test_auth.py
Original file line number Diff line number Diff line change
Expand Up @@ -856,6 +856,13 @@ def test_username_generation(client):
== "verylonglonglonglonglo"
)

# test username generation with existing user, case insensitive
user = add_user("Testuser")
assert User.generate_username("Testuser@example.com") == "testuser1"
assert User.generate_username("testuser@example.com") == "testuser1"
user = add_user("testuser1")
assert User.generate_username("Testuser@example.com") == "testuser2"


def test_server_usage(client):
"""Test server usage endpoint"""
Expand Down
Loading