diff --git a/auth/roles.yaml b/auth/roles.yaml index b4c35079..3227f325 100644 --- a/auth/roles.yaml +++ b/auth/roles.yaml @@ -70,7 +70,7 @@ users: admin: admin kopylov: pilot user1: pilot - user2: expired # «Брусника» — пробный доступ закрыт 2026-07-09 (аналогично praktika) — NoAccessScreen variant="trial" + user2: pilot # «Брусника» — доступ восстановлен 2026-07-13 (снят trial-expire от 2026-07-09) user3: pilot user4: pilot user5: pilot diff --git a/backend/tests/test_rbac.py b/backend/tests/test_rbac.py index 169e57ab..3c2435dc 100644 --- a/backend/tests/test_rbac.py +++ b/backend/tests/test_rbac.py @@ -114,9 +114,7 @@ def test_get_role_known_users() -> None: assert auth_mod.get_role("admin") == "admin" assert auth_mod.get_role("kopylov") == "pilot" for n in range(1, 11): - # user2 = «Брусника»: пробный доступ закрыт 2026-07-09 (roles.yaml) - expected = "expired" if n == 2 else "pilot" - assert auth_mod.get_role(f"user{n}") == expected + assert auth_mod.get_role(f"user{n}") == "pilot" def test_get_role_unknown_user_raises() -> None: diff --git a/tradein-mvp/backend/tests/test_rbac.py b/tradein-mvp/backend/tests/test_rbac.py index 6ff637b9..74c393e3 100644 --- a/tradein-mvp/backend/tests/test_rbac.py +++ b/tradein-mvp/backend/tests/test_rbac.py @@ -132,9 +132,7 @@ def test_get_role_known_users() -> None: assert auth_mod.get_role("admin") == "admin" assert auth_mod.get_role("kopylov") == "pilot" for n in range(1, 11): - # user2 = «Брусника»: пробный доступ закрыт 2026-07-09 (roles.yaml) - expected = "expired" if n == 2 else "pilot" - assert auth_mod.get_role(f"user{n}") == expected + assert auth_mod.get_role(f"user{n}") == "pilot" def test_get_role_unknown_user_raises() -> None: @@ -322,7 +320,7 @@ def test_rbac_expired_denied_on_non_admin_api(client: TestClient) -> None: """#R2-H3: revoked (role=expired, paths:[] deny:/**) НЕ достаёт non-admin API. Раньше rbac_guard гейтил только /admin/* → expired имел полный non-admin доступ (POST /search экспорт листингов и т.д.). Теперь scope-blocked → 403.""" - for user in ("user2", "praktika"): # оба role=expired (trial отозван) + for user in ("praktika",): # role=expired (trial отозван; user2 восстановлен 2026-07-13) for path in ("/api/v1/search", "/api/v1/trade-in/dummy"): resp = client.get(path, headers={"X-Authenticated-User": user}) assert resp.status_code == 403, f"{user} {path}: {resp.status_code}" @@ -332,10 +330,10 @@ def test_rbac_expired_denied_on_non_admin_api(client: TestClient) -> None: def test_rbac_expired_allowed_on_bootstrap(client: TestClient) -> None: """expired ДОЛЖЕН достучаться до /me (получить role=expired → trial-экран) и /brand/* (брендинг trial-экрана) — иначе UX сломан. Bootstrap-исключение.""" - resp_me = client.get("/api/v1/me", headers={"X-Authenticated-User": "user2"}) + resp_me = client.get("/api/v1/me", headers={"X-Authenticated-User": "praktika"}) assert resp_me.status_code == 200, resp_me.text assert resp_me.json()["role"] == "expired" - resp_brand = client.get("/api/v1/brand/dummy", headers={"X-Authenticated-User": "user2"}) + resp_brand = client.get("/api/v1/brand/dummy", headers={"X-Authenticated-User": "praktika"}) assert resp_brand.status_code == 200, resp_brand.text