Private
Public Access
ksmithandClaude Sonnet 5
84dc99d1a1
is_private was previously only settable at room creation. RoomUpdate now
accepts it, update_room() applies it, and PATCH /api/rooms/{id} allows a
site admin to make the change even for a room they haven't joined (in
addition to the existing room owner/admin gate) -- require_room_role
normally 403s a non-member before the role check ever runs, so this is a
deliberate bypass for site admins specifically.
Flipping the flag has no effect on existing members either direction
(confirmed is_private is only ever checked at self-serve join time) --
it purely controls Browse Rooms visibility and future self-joins.
Frontend: RoomInfoPanel's "Room settings" section is now visible to room
owner, room admin, or site admin (was owner-only), with a privacy toggle
reusing NewRoomModal's existing toggle-switch UI. "Delete room" stays
owner-only, now nested inside that wider section rather than gating the
whole thing.
Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
413 lines
17 KiB
Python
413 lines
17 KiB
Python
import uuid
|
|
|
|
from sqlalchemy import select
|
|
|
|
from app.models import Room, RoomMembership, RoomRole, User
|
|
from tests.conftest import login_as, register_and_login
|
|
|
|
|
|
async def test_create_room_requires_auth(client):
|
|
resp = await client.post("/api/rooms", json={"name": "general"})
|
|
assert resp.status_code == 401
|
|
|
|
|
|
async def test_create_room_creates_owner_membership(client, db_session):
|
|
user = await register_and_login(client, db_session, username="alice")
|
|
resp = await client.post("/api/rooms", json={"name": "general", "description": "chat"})
|
|
assert resp.status_code == 201
|
|
room = resp.json()
|
|
assert room["name"] == "general"
|
|
assert room["owner_id"] == user["id"]
|
|
|
|
result = await db_session.execute(
|
|
select(RoomMembership).where(RoomMembership.room_id == uuid.UUID(room["id"]))
|
|
)
|
|
membership = result.scalar_one()
|
|
assert membership.user_id == uuid.UUID(user["id"])
|
|
assert membership.role == RoomRole.owner
|
|
|
|
|
|
async def test_my_rooms_tiebreaks_identical_created_at_by_id(client, db_session):
|
|
# Two rooms sharing the exact same created_at (bulk-created/migrated
|
|
# rooms, or just an unlucky timing collision) must still come back in a
|
|
# single, stable order every call -- see list_member_rooms's order_by
|
|
# comment. Without a secondary sort key, a second fetch (e.g. from a
|
|
# different device) isn't guaranteed to return ties in the same order.
|
|
await register_and_login(client, db_session, username="alice")
|
|
room_a = (await client.post("/api/rooms", json={"name": "room-a"})).json()
|
|
room_b = (await client.post("/api/rooms", json={"name": "room-b"})).json()
|
|
|
|
result = await db_session.execute(
|
|
select(Room).where(Room.id.in_([uuid.UUID(room_a["id"]), uuid.UUID(room_b["id"])]))
|
|
)
|
|
rooms_by_id = {str(r.id): r for r in result.scalars().all()}
|
|
rooms_by_id[room_a["id"]].created_at = rooms_by_id[room_b["id"]].created_at
|
|
await db_session.commit()
|
|
|
|
resp = await client.get("/api/rooms/mine")
|
|
assert resp.status_code == 200
|
|
ids = [r["id"] for r in resp.json() if r["id"] in (room_a["id"], room_b["id"])]
|
|
assert ids == sorted([room_a["id"], room_b["id"]])
|
|
|
|
|
|
async def test_list_rooms_excludes_private(client, db_session):
|
|
user = await register_and_login(client, db_session, username="alice")
|
|
await client.post("/api/rooms", json={"name": "open-room"})
|
|
|
|
private_room = Room(
|
|
name="secret-room", is_private=True, owner_id=uuid.UUID(user["id"])
|
|
)
|
|
db_session.add(private_room)
|
|
await db_session.commit()
|
|
|
|
resp = await client.get("/api/rooms")
|
|
assert resp.status_code == 200
|
|
names = {r["name"] for r in resp.json()}
|
|
assert "open-room" in names
|
|
assert "secret-room" not in names
|
|
|
|
|
|
async def test_join_room_idempotent(client, db_session):
|
|
await register_and_login(client, db_session, username="alice")
|
|
create_resp = await client.post("/api/rooms", json={"name": "general"})
|
|
room_id = create_resp.json()["id"]
|
|
|
|
await client.post("/api/auth/logout")
|
|
await register_and_login(client, db_session, username="bob")
|
|
|
|
resp1 = await client.post(f"/api/rooms/{room_id}/join")
|
|
assert resp1.status_code == 200
|
|
resp2 = await client.post(f"/api/rooms/{room_id}/join")
|
|
assert resp2.status_code == 200
|
|
|
|
|
|
async def test_join_nonexistent_room_404(client, db_session):
|
|
await register_and_login(client, db_session, username="alice")
|
|
resp = await client.post(f"/api/rooms/{uuid.uuid4()}/join")
|
|
assert resp.status_code == 404
|
|
|
|
|
|
async def test_join_private_room_400(client, db_session):
|
|
user = await register_and_login(client, db_session, username="alice")
|
|
private_room = Room(
|
|
name="secret-room", is_private=True, owner_id=uuid.UUID(user["id"])
|
|
)
|
|
db_session.add(private_room)
|
|
await db_session.commit()
|
|
await db_session.refresh(private_room)
|
|
|
|
resp = await client.post(f"/api/rooms/{private_room.id}/join")
|
|
assert resp.status_code == 400
|
|
|
|
|
|
async def test_create_private_room_excluded_from_open_list_but_in_mine(client, db_session):
|
|
await register_and_login(client, db_session, username="alice")
|
|
resp = await client.post("/api/rooms", json={"name": "secret", "is_private": True})
|
|
assert resp.status_code == 201
|
|
assert resp.json()["is_private"] is True
|
|
|
|
open_names = {r["name"] for r in (await client.get("/api/rooms")).json()}
|
|
assert "secret" not in open_names
|
|
|
|
mine = (await client.get("/api/rooms/mine")).json()
|
|
assert mine[0]["name"] == "secret"
|
|
assert mine[0]["role"] == "owner"
|
|
|
|
|
|
async def test_update_room_requires_admin(client, db_session):
|
|
await register_and_login(client, db_session, username="alice")
|
|
room_id = (await client.post("/api/rooms", json={"name": "general"})).json()["id"]
|
|
|
|
await client.post("/api/auth/logout")
|
|
await register_and_login(client, db_session, username="bob")
|
|
await client.post(f"/api/rooms/{room_id}/join")
|
|
|
|
resp = await client.patch(f"/api/rooms/{room_id}", json={"description": "nope"})
|
|
assert resp.status_code == 403
|
|
|
|
await client.post("/api/auth/logout")
|
|
await login_as(client, "alice")
|
|
resp = await client.patch(f"/api/rooms/{room_id}", json={"description": "updated"})
|
|
assert resp.status_code == 200
|
|
assert resp.json()["description"] == "updated"
|
|
|
|
|
|
async def test_update_room_is_private_toggles_open_room_visibility(client, db_session):
|
|
# #48: owner can flip an already-created room's privacy after the fact.
|
|
await register_and_login(client, db_session, username="alice")
|
|
room_id = (await client.post("/api/rooms", json={"name": "general"})).json()["id"]
|
|
assert "general" in {r["name"] for r in (await client.get("/api/rooms")).json()}
|
|
|
|
resp = await client.patch(f"/api/rooms/{room_id}", json={"is_private": True})
|
|
assert resp.status_code == 200
|
|
assert resp.json()["is_private"] is True
|
|
assert "general" not in {r["name"] for r in (await client.get("/api/rooms")).json()}
|
|
|
|
resp = await client.patch(f"/api/rooms/{room_id}", json={"is_private": False})
|
|
assert resp.status_code == 200
|
|
assert resp.json()["is_private"] is False
|
|
assert "general" in {r["name"] for r in (await client.get("/api/rooms")).json()}
|
|
|
|
|
|
async def test_update_room_is_private_allowed_for_room_admin_not_just_owner(client, db_session):
|
|
alice = await register_and_login(client, db_session, username="alice")
|
|
room_id = (await client.post("/api/rooms", json={"name": "general"})).json()["id"]
|
|
|
|
await client.post("/api/auth/logout")
|
|
bob = await register_and_login(client, db_session, username="bob")
|
|
await client.post(f"/api/rooms/{room_id}/join")
|
|
|
|
await client.post("/api/auth/logout")
|
|
await login_as(client, "alice")
|
|
resp = await client.patch(
|
|
f"/api/rooms/{room_id}/members/{bob['id']}", json={"role": "admin"}
|
|
)
|
|
assert resp.status_code == 200
|
|
|
|
await client.post("/api/auth/logout")
|
|
await login_as(client, "bob")
|
|
resp = await client.patch(f"/api/rooms/{room_id}", json={"is_private": True})
|
|
assert resp.status_code == 200
|
|
assert resp.json()["is_private"] is True
|
|
|
|
|
|
async def test_update_room_is_private_allowed_for_site_admin_non_member(client, db_session):
|
|
await register_and_login(client, db_session, username="alice")
|
|
room_id = (await client.post("/api/rooms", json={"name": "general"})).json()["id"]
|
|
|
|
await client.post("/api/auth/logout")
|
|
admin = await register_and_login(client, db_session, username="carol")
|
|
user = await db_session.get(User, uuid.UUID(admin["id"]))
|
|
user.is_site_admin = True
|
|
await db_session.commit()
|
|
|
|
# Never joined "general" -- ordinarily require_room_role would 403 this
|
|
# as "Not a member of this room" before even checking role.
|
|
resp = await client.patch(f"/api/rooms/{room_id}", json={"is_private": True})
|
|
assert resp.status_code == 200
|
|
assert resp.json()["is_private"] is True
|
|
|
|
|
|
async def test_delete_room_owner_only(client, db_session):
|
|
await register_and_login(client, db_session, username="alice")
|
|
room_id = (await client.post("/api/rooms", json={"name": "general"})).json()["id"]
|
|
|
|
await client.post("/api/auth/logout")
|
|
await register_and_login(client, db_session, username="bob")
|
|
await client.post(f"/api/rooms/{room_id}/join")
|
|
|
|
resp = await client.delete(f"/api/rooms/{room_id}")
|
|
assert resp.status_code == 403
|
|
|
|
await client.post("/api/auth/logout")
|
|
await login_as(client, "alice")
|
|
resp = await client.delete(f"/api/rooms/{room_id}")
|
|
assert resp.status_code == 204
|
|
|
|
result = await db_session.execute(
|
|
select(RoomMembership).where(RoomMembership.room_id == uuid.UUID(room_id))
|
|
)
|
|
assert result.scalar_one_or_none() is None
|
|
|
|
|
|
async def test_leave_room(client, db_session):
|
|
await register_and_login(client, db_session, username="alice")
|
|
room_id = (await client.post("/api/rooms", json={"name": "general"})).json()["id"]
|
|
|
|
resp = await client.post(f"/api/rooms/{room_id}/leave")
|
|
assert resp.status_code == 400 # owner must transfer first
|
|
|
|
await client.post("/api/auth/logout")
|
|
await register_and_login(client, db_session, username="bob")
|
|
await client.post(f"/api/rooms/{room_id}/join")
|
|
resp = await client.post(f"/api/rooms/{room_id}/leave")
|
|
assert resp.status_code == 204
|
|
|
|
resp = await client.get(f"/api/rooms/{room_id}/messages")
|
|
assert resp.status_code == 403 # no longer a member
|
|
|
|
|
|
async def test_remove_member(client, db_session):
|
|
await register_and_login(client, db_session, username="alice")
|
|
room_id = (await client.post("/api/rooms", json={"name": "general"})).json()["id"]
|
|
|
|
await client.post("/api/auth/logout")
|
|
bob = await register_and_login(client, db_session, username="bob")
|
|
await client.post(f"/api/rooms/{room_id}/join")
|
|
|
|
await client.post("/api/auth/logout")
|
|
await login_as(client, "alice")
|
|
resp = await client.delete(f"/api/rooms/{room_id}/members/{bob['id']}")
|
|
assert resp.status_code == 204
|
|
|
|
resp = await client.delete(f"/api/rooms/{room_id}/members/{bob['id']}")
|
|
assert resp.status_code == 404
|
|
|
|
|
|
async def test_admin_cannot_remove_another_admin(client, db_session):
|
|
await register_and_login(client, db_session, username="alice")
|
|
room_id = (await client.post("/api/rooms", json={"name": "general"})).json()["id"]
|
|
|
|
await client.post("/api/auth/logout")
|
|
bob = await register_and_login(client, db_session, username="bob")
|
|
await client.post(f"/api/rooms/{room_id}/join")
|
|
|
|
await client.post("/api/auth/logout")
|
|
carol = await register_and_login(client, db_session, username="carol")
|
|
await client.post(f"/api/rooms/{room_id}/join")
|
|
|
|
await client.post("/api/auth/logout")
|
|
await login_as(client, "alice")
|
|
resp = await client.patch(f"/api/rooms/{room_id}/members/{bob['id']}", json={"role": "admin"})
|
|
assert resp.status_code == 200
|
|
assert resp.json()["role"] == "admin"
|
|
resp = await client.patch(f"/api/rooms/{room_id}/members/{carol['id']}", json={"role": "admin"})
|
|
assert resp.status_code == 200
|
|
|
|
await client.post("/api/auth/logout")
|
|
await login_as(client, "bob")
|
|
resp = await client.delete(f"/api/rooms/{room_id}/members/{carol['id']}")
|
|
assert resp.status_code == 403
|
|
|
|
|
|
async def test_cannot_remove_owner(client, db_session):
|
|
await register_and_login(client, db_session, username="alice")
|
|
room_id = (await client.post("/api/rooms", json={"name": "general"})).json()["id"]
|
|
|
|
await client.post("/api/auth/logout")
|
|
bob = await register_and_login(client, db_session, username="bob")
|
|
await client.post(f"/api/rooms/{room_id}/join")
|
|
|
|
await client.post("/api/auth/logout")
|
|
await login_as(client, "alice")
|
|
await client.patch(f"/api/rooms/{room_id}/members/{bob['id']}", json={"role": "admin"})
|
|
|
|
resp = await client.delete(f"/api/rooms/{room_id}/members/{(await client.get('/api/auth/me')).json()['id']}")
|
|
assert resp.status_code == 400
|
|
|
|
|
|
async def test_transfer_ownership(client, db_session):
|
|
await register_and_login(client, db_session, username="alice")
|
|
room_id = (await client.post("/api/rooms", json={"name": "general"})).json()["id"]
|
|
|
|
await client.post("/api/auth/logout")
|
|
bob = await register_and_login(client, db_session, username="bob")
|
|
await client.post(f"/api/rooms/{room_id}/join")
|
|
|
|
await client.post("/api/auth/logout")
|
|
await login_as(client, "alice")
|
|
resp = await client.post(
|
|
f"/api/rooms/{room_id}/transfer-ownership", json={"new_owner_user_id": bob["id"]}
|
|
)
|
|
assert resp.status_code == 200
|
|
assert resp.json()["owner_id"] == bob["id"]
|
|
|
|
resp = await client.post(f"/api/rooms/{room_id}/leave")
|
|
assert resp.status_code == 204 # alice is admin now, not owner, so she can leave
|
|
|
|
result = await db_session.execute(
|
|
select(RoomMembership).where(
|
|
RoomMembership.room_id == uuid.UUID(room_id), RoomMembership.user_id == uuid.UUID(bob["id"])
|
|
)
|
|
)
|
|
assert result.scalar_one().role == RoomRole.owner
|
|
|
|
|
|
async def test_change_member_role_owner_only(client, db_session):
|
|
await register_and_login(client, db_session, username="alice")
|
|
room_id = (await client.post("/api/rooms", json={"name": "general"})).json()["id"]
|
|
|
|
await client.post("/api/auth/logout")
|
|
bob = await register_and_login(client, db_session, username="bob")
|
|
await client.post(f"/api/rooms/{room_id}/join")
|
|
resp = await client.patch(f"/api/rooms/{room_id}/members/{bob['id']}", json={"role": "admin"})
|
|
assert resp.status_code == 403 # bob is a plain member, not owner
|
|
|
|
|
|
def _fake_send_email(monkeypatch):
|
|
calls = []
|
|
|
|
async def fake(db, to, subject, body):
|
|
calls.append({"to": to, "subject": subject, "body": body})
|
|
|
|
monkeypatch.setattr("app.services.room_service.send_email", fake)
|
|
return calls
|
|
|
|
|
|
async def test_add_member_directly(client, db_session, monkeypatch):
|
|
calls = _fake_send_email(monkeypatch)
|
|
await register_and_login(client, db_session, username="alice")
|
|
room_id = (await client.post("/api/rooms", json={"name": "general"})).json()["id"]
|
|
|
|
await client.post("/api/auth/logout")
|
|
bob = await register_and_login(client, db_session, username="bob")
|
|
|
|
await client.post("/api/auth/logout")
|
|
await login_as(client, "alice")
|
|
resp = await client.post(f"/api/rooms/{room_id}/members", json={"user_id": bob["id"]})
|
|
assert resp.status_code == 201, resp.text
|
|
assert resp.json()["username"] == "bob"
|
|
assert resp.json()["role"] == "member"
|
|
|
|
result = await db_session.execute(
|
|
select(RoomMembership).where(
|
|
RoomMembership.room_id == uuid.UUID(room_id), RoomMembership.user_id == uuid.UUID(bob["id"])
|
|
)
|
|
)
|
|
assert result.scalar_one().role == RoomRole.member
|
|
|
|
assert len(calls) == 1
|
|
assert calls[0]["to"] == bob["email"]
|
|
assert "added" in calls[0]["subject"].lower()
|
|
|
|
|
|
async def test_add_member_requires_admin_role(client, db_session, monkeypatch):
|
|
_fake_send_email(monkeypatch)
|
|
await register_and_login(client, db_session, username="alice")
|
|
room_id = (await client.post("/api/rooms", json={"name": "general"})).json()["id"]
|
|
|
|
await client.post("/api/auth/logout")
|
|
bob = await register_and_login(client, db_session, username="bob")
|
|
await client.post(f"/api/rooms/{room_id}/join")
|
|
|
|
carol = await register_and_login(client, db_session, username="carol")
|
|
|
|
resp = await client.post(f"/api/rooms/{room_id}/members", json={"user_id": carol["id"]})
|
|
assert resp.status_code == 403
|
|
|
|
|
|
async def test_add_member_already_member_conflict(client, db_session, monkeypatch):
|
|
_fake_send_email(monkeypatch)
|
|
await register_and_login(client, db_session, username="alice")
|
|
room_id = (await client.post("/api/rooms", json={"name": "general"})).json()["id"]
|
|
|
|
await client.post("/api/auth/logout")
|
|
bob = await register_and_login(client, db_session, username="bob")
|
|
await client.post(f"/api/rooms/{room_id}/join")
|
|
|
|
await client.post("/api/auth/logout")
|
|
await login_as(client, "alice")
|
|
resp = await client.post(f"/api/rooms/{room_id}/members", json={"user_id": bob["id"]})
|
|
assert resp.status_code == 409
|
|
|
|
|
|
async def test_add_member_unknown_user_404(client, db_session, monkeypatch):
|
|
_fake_send_email(monkeypatch)
|
|
await register_and_login(client, db_session, username="alice")
|
|
room_id = (await client.post("/api/rooms", json={"name": "general"})).json()["id"]
|
|
|
|
resp = await client.post(f"/api/rooms/{room_id}/members", json={"user_id": str(uuid.uuid4())})
|
|
assert resp.status_code == 404
|
|
|
|
|
|
async def test_list_room_members(client, db_session):
|
|
await register_and_login(client, db_session, username="alice")
|
|
room_id = (await client.post("/api/rooms", json={"name": "general"})).json()["id"]
|
|
|
|
resp = await client.get(f"/api/rooms/{room_id}/members")
|
|
assert resp.status_code == 200
|
|
members = resp.json()
|
|
assert len(members) == 1
|
|
assert members[0]["username"] == "alice"
|
|
assert members[0]["role"] == "owner"
|