Auth: username+password, email+password and API key everywhere; key returns carry username and email
POST /auth/login (form and JSON) now accepts the username in the email field, like HTTP Basic and POST /auth/token always did; the token endpoint no longer lowercases the identifier before the username lookup, fixing mixed-case usernames. The login field is relabelled and type=text so browsers accept a username.
Every JSON return of the personal API key now also returns the account username and email: the profile JSON gains a can_view_api_key-gated email beside api_key (username already rides profile_user), and POST /profile/regenerate-api-key returns {api_key, username, email}. A client holding only its DEVPLACE_API_KEY value can now fetch its full account via GET /profile in one call.
Documented fully: authentication prose page (three credentials, precedence, DEVPLACE_API_KEY, account fetch, separate DevRant/WebSocket auth domains), new auth-token docs_api card, regenerated-key sample, conventions, README, CLAUDE.md, OpenAPI description, corrected profile key hint. Summary in changes.md (left unversioned per request).
Tests: username/mixed-case/uppercase-email login and token cases, API-key account fetch via X-API-KEY and Bearer, owner/admin vs stranger/guest email gating, regenerate shape, browser login by username. Failing-first observed red, green after.
This commit is contained in:
@@ -273,3 +273,122 @@ def test_login_failure_json_leaks_no_key(app_server):
|
||||
)
|
||||
assert response.status_code == 401
|
||||
assert "api_key" not in response.text
|
||||
|
||||
|
||||
def _member_mixed_case():
|
||||
_counter_audit_log[0] += 1
|
||||
name = f"AuMix{int(time.time() * 1000)}{_counter_audit_log[0]}"
|
||||
s = requests.Session()
|
||||
s.post(
|
||||
f"{BASE_URL}/auth/signup",
|
||||
data={
|
||||
"username": name,
|
||||
"email": f"{name.lower()}@t.dev",
|
||||
"password": "secret123",
|
||||
"confirm_password": "secret123",
|
||||
"birth_date": "1990-01-01",
|
||||
"accept_terms": "1",
|
||||
},
|
||||
allow_redirects=True,
|
||||
)
|
||||
return s, name
|
||||
|
||||
|
||||
def test_login_json_accepts_username(seeded_db):
|
||||
_, name = _member()
|
||||
row = _db_user(name)
|
||||
response = requests.post(
|
||||
f"{BASE_URL}/auth/login",
|
||||
headers=JSON_audit_log,
|
||||
data={"email": name, "password": "secret123"},
|
||||
allow_redirects=False,
|
||||
)
|
||||
assert response.status_code == 200, response.text[:300]
|
||||
body = response.json()
|
||||
assert body["ok"] is True
|
||||
assert body["data"]["username"] == name
|
||||
assert body["data"]["email"] == f"{name}@t.dev"
|
||||
assert body["data"]["api_key"] == row["api_key"]
|
||||
|
||||
|
||||
def test_login_form_accepts_username(seeded_db):
|
||||
_, name = _member()
|
||||
session = requests.Session()
|
||||
response = session.post(
|
||||
f"{BASE_URL}/auth/login",
|
||||
data={"email": name, "password": "secret123"},
|
||||
allow_redirects=False,
|
||||
)
|
||||
assert response.status_code in (200, 302, 303), response.text[:300]
|
||||
assert session.cookies.get("session")
|
||||
profile = session.get(f"{BASE_URL}/profile", allow_redirects=False)
|
||||
assert profile.status_code == 200, profile.text[:300]
|
||||
|
||||
|
||||
def test_login_json_accepts_mixed_case_username(seeded_db):
|
||||
_, name = _member_mixed_case()
|
||||
response = requests.post(
|
||||
f"{BASE_URL}/auth/login",
|
||||
headers=JSON_audit_log,
|
||||
data={"email": name, "password": "secret123"},
|
||||
allow_redirects=False,
|
||||
)
|
||||
assert response.status_code == 200, response.text[:300]
|
||||
body = response.json()
|
||||
assert body["data"]["username"] == name
|
||||
assert body["data"]["email"] == f"{name.lower()}@t.dev"
|
||||
assert body["data"]["api_key"]
|
||||
|
||||
|
||||
def test_login_json_accepts_uppercase_email(seeded_db):
|
||||
_, name = _member()
|
||||
response = requests.post(
|
||||
f"{BASE_URL}/auth/login",
|
||||
headers=JSON_audit_log,
|
||||
data={"email": f"{name.upper()}@T.DEV", "password": "secret123"},
|
||||
allow_redirects=False,
|
||||
)
|
||||
assert response.status_code == 200, response.text[:300]
|
||||
assert response.json()["data"]["username"] == name
|
||||
|
||||
|
||||
def test_login_wrong_password_for_username_leaks_no_key(seeded_db):
|
||||
_, name = _member()
|
||||
response = requests.post(
|
||||
f"{BASE_URL}/auth/login",
|
||||
headers=JSON_audit_log,
|
||||
data={"email": name, "password": "wrongpassword"},
|
||||
allow_redirects=False,
|
||||
)
|
||||
assert response.status_code == 401
|
||||
assert "api_key" not in response.text
|
||||
|
||||
|
||||
def test_api_key_profile_returns_account_info(seeded_db):
|
||||
_, name = _member()
|
||||
row = _db_user(name)
|
||||
response = requests.get(
|
||||
f"{BASE_URL}/profile",
|
||||
headers={**JSON_audit_log, "X-API-KEY": row["api_key"]},
|
||||
allow_redirects=False,
|
||||
)
|
||||
assert response.status_code == 200, response.text[:300]
|
||||
body = response.json()
|
||||
assert body["api_key"] == row["api_key"]
|
||||
assert body["email"] == f"{name}@t.dev"
|
||||
assert body["profile_user"]["username"] == name
|
||||
assert body["profile_user"]["uid"] == row["uid"]
|
||||
|
||||
|
||||
def test_bearer_api_key_profile_returns_account_info(seeded_db):
|
||||
_, name = _member()
|
||||
row = _db_user(name)
|
||||
response = requests.get(
|
||||
f"{BASE_URL}/profile",
|
||||
headers={**JSON_audit_log, "Authorization": f"Bearer {row['api_key']}"},
|
||||
allow_redirects=False,
|
||||
)
|
||||
assert response.status_code == 200, response.text[:300]
|
||||
body = response.json()
|
||||
assert body["email"] == f"{name}@t.dev"
|
||||
assert body["profile_user"]["username"] == name
|
||||
|
||||
@@ -58,6 +58,41 @@ def test_token_accepts_username_as_identifier(app_server):
|
||||
assert r.json()["access_token"]
|
||||
|
||||
|
||||
def _signup_mixed_case(password="secret123"):
|
||||
_counter_token[0] += 1
|
||||
name = f"TokMix{int(time.time() * 1000)}{_counter_token[0]}"
|
||||
email = f"{name.lower()}@t.dev"
|
||||
requests.post(
|
||||
f"{BASE_URL}/auth/signup",
|
||||
data={
|
||||
"username": name,
|
||||
"email": email,
|
||||
"password": password,
|
||||
"confirm_password": password,
|
||||
"birth_date": "1990-01-01",
|
||||
"accept_terms": "1",
|
||||
},
|
||||
allow_redirects=True,
|
||||
)
|
||||
return name, email, password
|
||||
|
||||
|
||||
def test_token_accepts_mixed_case_username(app_server):
|
||||
name, email, password = _signup_mixed_case()
|
||||
r = requests.post(f"{BASE_URL}/auth/token", data={"email": name, "password": password})
|
||||
assert r.status_code == 200, r.text[:300]
|
||||
assert r.json()["access_token"]
|
||||
|
||||
|
||||
def test_token_accepts_uppercase_email(app_server):
|
||||
name, email, password = _signup()
|
||||
r = requests.post(
|
||||
f"{BASE_URL}/auth/token", data={"email": email.upper(), "password": password}
|
||||
)
|
||||
assert r.status_code == 200, r.text[:300]
|
||||
assert r.json()["access_token"]
|
||||
|
||||
|
||||
def test_token_via_json_body(app_server):
|
||||
name, email, password = _signup()
|
||||
r = requests.post(
|
||||
|
||||
@@ -762,4 +762,39 @@ def test_stranger_gets_no_key(app_server, seeded_db):
|
||||
assert body["api_key"] is None
|
||||
|
||||
|
||||
def test_owner_gets_email_alongside_key(app_server, seeded_db):
|
||||
session, name = _privacy_member("keye")
|
||||
body = _profile_json_body(session, name)
|
||||
assert body["can_view_api_key"] is True
|
||||
assert body["api_key"]
|
||||
assert body["email"] == f"{name}@t.dev"
|
||||
assert body["profile_user"]["username"] == name
|
||||
|
||||
|
||||
def test_admin_gets_email_alongside_member_key(app_server, seeded_db):
|
||||
_, name = _privacy_member("keym")
|
||||
body = _profile_json_body(_admin_session(), name)
|
||||
assert body["can_view_api_key"] is True
|
||||
assert body["api_key"]
|
||||
assert body["email"] == f"{name}@t.dev"
|
||||
|
||||
|
||||
def test_stranger_gets_no_email(app_server, seeded_db):
|
||||
_, name = _privacy_member("keyn")
|
||||
stranger, _ = _privacy_member("keyw")
|
||||
body = _profile_json_body(stranger, name)
|
||||
assert body["can_view_api_key"] is False
|
||||
assert body["api_key"] is None
|
||||
assert body["email"] is None
|
||||
|
||||
|
||||
def test_guest_gets_no_email(app_server, seeded_db):
|
||||
body = requests.get(
|
||||
f"{BASE_URL}/profile/alice_test",
|
||||
headers={"Accept": "application/json"},
|
||||
).json()
|
||||
assert body["can_view_api_key"] is False
|
||||
assert body["email"] is None
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -51,3 +51,13 @@ def test_regenerate_invalidates_old_key(app_server):
|
||||
allow_redirects=False,
|
||||
)
|
||||
assert new.status_code in (302, 200)
|
||||
|
||||
|
||||
def test_regenerate_returns_username_and_email(app_server):
|
||||
session, name, email, _ = _signup_api_auth()
|
||||
resp = session.post(f"{BASE_URL}/profile/regenerate-api-key")
|
||||
assert resp.status_code == 200, resp.text[:300]
|
||||
body = resp.json()
|
||||
assert body["api_key"]
|
||||
assert body["username"] == name
|
||||
assert body["email"] == email
|
||||
|
||||
Reference in New Issue
Block a user