diff options
| author | Christophe Besson <cbesson@gmail.com> | 2026-08-15 02:34:19 +0200 |
|---|---|---|
| committer | Christophe Besson <cbesson@gmail.com> | 2026-08-15 02:34:19 +0200 |
| commit | 84b032c65e17267d41e04605e79eea82a6f5a59f (patch) | |
| tree | eb7708a72944bb15540e103b4319242199af6fbb /packages/meshbay-hub | |
| parent | 5338894f7fec9e1a60affb0e2ff3b9797bcbc968 (diff) | |
| download | meshbay-84b032c65e17267d41e04605e79eea82a6f5a59f.tar.gz | |
feat(groups): editable description, and one source of operator authority
A description could only be set the moment a group was created, so every
group made before anyone thought of one stayed blank for good. The owner
can now edit it from the group's page, and PATCH /v1/groups/{id} takes it.
That endpoint takes the description and nothing else, deliberately. The
name, the visibility and the join policy are the terms members joined on;
a private group that can quietly become public is not the group they
agreed to be in. Changing those needs a decision about who gets told, not
a field on a form — there is a test saying so.
Separately, the legacy operator key is gone. `admin_pk_ed25519` in
node.toml named the operator before the roster existed and was kept so
that an existing deployment would keep working; nothing uses it, and a
second source of node authority is not something to carry around out of
politeness. Authority is the roster, read fresh on every check.
It is removed rather than ignored: a config that still names the key gets
a warning at startup pointing at the file. Dropping it in silence would
refuse invites and file deletion with a signature error that looks like a
bug somewhere else — which is exactly how finding M3 presented.
Two tests were verifying admin operations by naming a key in the context,
which was the legacy path. They now pair an operator into a roster, the
way an operator does. The authority test anchored on the deleted function
and passed vacuously once it disappeared; it states the invariant against
the verifier and the daemon instead.
Also defined .btn-secondary, used in four places and styled in none.
Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
Diffstat (limited to 'packages/meshbay-hub')
| -rw-r--r-- | packages/meshbay-hub/src/meshbay_hub/api/groups.py | 32 | ||||
| -rw-r--r-- | packages/meshbay-hub/src/meshbay_hub/static/app.js | 65 | ||||
| -rw-r--r-- | packages/meshbay-hub/src/meshbay_hub/static/i18n.js | 5 | ||||
| -rw-r--r-- | packages/meshbay-hub/src/meshbay_hub/static/style.css | 47 | ||||
| -rw-r--r-- | packages/meshbay-hub/tests/test_group_description.py | 103 |
5 files changed, 247 insertions, 5 deletions
diff --git a/packages/meshbay-hub/src/meshbay_hub/api/groups.py b/packages/meshbay-hub/src/meshbay_hub/api/groups.py index 43d72c3..83feeb4 100644 --- a/packages/meshbay-hub/src/meshbay_hub/api/groups.py +++ b/packages/meshbay-hub/src/meshbay_hub/api/groups.py @@ -276,6 +276,38 @@ async def create_group( return {"group_id": group.id, "name": group.name} +class GroupUpdateRequest(BaseModel): + description: str | None = None + + +@router.patch("/{group_id}") +async def update_group( + group_id: str, + body: GroupUpdateRequest, + current_user: User = Depends(require_user_scope), + db: AsyncSession = Depends(get_db), +): + """ + Change the group's description. Owner only. + + Only the description: name, visibility and join policy are what members + joined on the strength of, and a group that can quietly become public is a + different thing from the one they agreed to. Those need a decision about who + is told, not a PATCH. + """ + group = await db.get(Group, group_id) + if not group: + raise HTTPException(status_code=404, detail="Group not found") + if group.admin_id != current_user.id: + raise HTTPException(status_code=403, detail="Only the group owner can edit it") + + if body.description is not None: + desc = body.description.strip()[:512] + group.description = desc or None + await db.commit() + return {"group_id": group.id, "description": group.description or ""} + + @router.post("/{group_id}/members/{username}", status_code=201) async def add_group_member( group_id: str, diff --git a/packages/meshbay-hub/src/meshbay_hub/static/app.js b/packages/meshbay-hub/src/meshbay_hub/static/app.js index f9f6b55..fee21dc 100644 --- a/packages/meshbay-hub/src/meshbay_hub/static/app.js +++ b/packages/meshbay-hub/src/meshbay_hub/static/app.js @@ -255,6 +255,8 @@ const ICON_PATHS = { door: ['M13.5 3.5H6a1 1 0 0 0-1 1v15a1 1 0 0 0 1 1h7.5', 'M10.5 12H21', 'M17.8 8.8L21 12l-3.2 3.2'], clip: ['M20.5 11.8l-8.4 8.4a5.4 5.4 0 0 1-7.6-7.6l8.8-8.8a3.6 3.6 0 0 1 5.1 5.1l-8.8 8.8a1.8 1.8 0 0 1-2.5-2.5l8.1-8.1'], + pencil: ['M4 20h4l10.5-10.5a2.1 2.1 0 0 0-3-3L5 17v3', + 'M14.5 6.5l3 3'], check: ['M4.5 12.5l5 5 10-11'], chevron: ['M6 9.5l6 6 6-6'], close: ['M6 6l12 12M18 6L6 18'], @@ -871,11 +873,14 @@ async function pipelinedDownload(transport, gekKey, fileId, totalChunks, onChunk } function GroupPage({ groupId, group, token, username, userId, onRefreshAuth, - onJoined }) { + onJoined, onGroupUpdated }) { const [status, setStatus] = useState('idle'); const [entries, setEntries] = useState([]); const [error, setError] = useState(''); + const [editingDesc, setEditingDesc] = useState(false); + const [descDraft, setDescDraft] = useState(''); + const [savingDesc, setSavingDesc] = useState(false); const [sortKey, setSortKey] = useState('name'); const [sortAsc, setSortAsc] = useState(true); const [filter, setFilter] = useState(''); @@ -1143,6 +1148,22 @@ function GroupPage({ groupId, group, token, username, userId, onRefreshAuth, } }, [currentPath]); + const saveDescription = useCallback(async (e) => { + e.preventDefault(); + setSavingDesc(true); + try { + const r = await hubFetch(`/v1/groups/${groupId}`, { + method: 'PATCH', token, body: { description: descDraft }, + }); + if (onGroupUpdated) onGroupUpdated(groupId, { description: r.description }); + setEditingDesc(false); + } catch (err) { + setError(err.message); + } finally { + setSavingDesc(false); + } + }, [groupId, token, descDraft, onGroupUpdated]); + const deleteFile = useCallback(async (entry) => { const transport = transportRef.current; if (!transport || !transport.connected) return; @@ -1233,9 +1254,35 @@ function GroupPage({ groupId, group, token, username, userId, onRefreshAuth, <h2 style="margin-bottom:${group && group.description ? '4px' : '0'}"> ${group ? group.name : t('group.default_name')} </h2> - ${group && group.description && html` - <p class="group-desc">${group.description}</p> - `} + ${editingDesc + ? html` + <form class="group-desc-edit" onSubmit=${saveDescription}> + <textarea rows="2" maxlength="512" autofocus + placeholder="${t('group.desc_placeholder')}" + value=${descDraft} + onInput=${e => setDescDraft(e.target.value)}></textarea> + <div> + <button class="admin-btn" type="submit" disabled=${savingDesc}> + ${savingDesc ? '...' : t('group.desc_save')} + </button> + <button class="btn-secondary" type="button" + onClick=${() => setEditingDesc(false)}>${t('group.desc_cancel')}</button> + </div> + </form> + ` + : html` + ${group && group.description && html` + <p class="group-desc">${group.description}</p> + `} + ${group && group.is_admin && html` + <button class="link-btn" title=${t('group.desc_edit')} + onClick=${() => { setDescDraft(group.description || ''); + setEditingDesc(true); }}> + <${Icon} name="pencil" />${' '} + ${group.description ? t('group.desc_edit') : t('group.desc_add')} + </button> + `} + `} </div> <span class="status-badge ${statusClass}"> ${(status === 'discovering' || status === 'connecting' || status === 'fetching') @@ -2903,6 +2950,13 @@ function App() { fetchNotifications(); }, [user]); + // The group list lives here, so an edit made three components down has to come + // back up rather than be re-fetched: a reload would drop the WebRTC connection + // the page is holding. + const updateGroup = useCallback((gid, patch) => { + setGroups(prev => prev.map(g => (g.id === gid ? { ...g, ...patch } : g))); + }, []); + const markRead = useCallback((id) => { if (!user) return; // Drop it here and now. Waiting for the round trip leaves it on screen while @@ -3011,7 +3065,8 @@ function App() { page = html`<${GroupPage} groupId=${groupId} group=${group} token=${user.token} username=${user.username} userId=${user.userId} - onRefreshAuth=${refreshAuth} onJoined=${dismissGroupNotifications} />`; + onRefreshAuth=${refreshAuth} onJoined=${dismissGroupNotifications} + onGroupUpdated=${updateGroup} />`; } else if (route === '/admin') { page = (user.role === 'moderator' || user.role === 'admin') ? html`<${AdminPage} token=${user.token} />` diff --git a/packages/meshbay-hub/src/meshbay_hub/static/i18n.js b/packages/meshbay-hub/src/meshbay_hub/static/i18n.js index cca595d..a6281e2 100644 --- a/packages/meshbay-hub/src/meshbay_hub/static/i18n.js +++ b/packages/meshbay-hub/src/meshbay_hub/static/i18n.js @@ -278,6 +278,11 @@ const en = { + 'you normally talk. It works once, and it never passes through the hub.', 'members.invite_code_hint': 'They enter it the first time they open this group. ' + 'You do not need to be online then.', + 'group.desc_edit': 'Edit description', + 'group.desc_add': 'Add a description', + 'group.desc_save': 'Save', + 'group.desc_cancel': 'Cancel', + 'group.desc_placeholder': 'What this group is for — members see it on their home page.', 'group.join_code_title': 'This node needs to recognise you', 'group.join_code_hint': 'Ask whoever invited you for the one-time code, and enter ' + 'it here. After that this browser is recognised and you will not be asked again.', diff --git a/packages/meshbay-hub/src/meshbay_hub/static/style.css b/packages/meshbay-hub/src/meshbay_hub/static/style.css index fab4f55..f83b433 100644 --- a/packages/meshbay-hub/src/meshbay_hub/static/style.css +++ b/packages/meshbay-hub/src/meshbay_hub/static/style.css @@ -1157,6 +1157,53 @@ button:disabled { opacity: 0.5; cursor: not-allowed; } .admin-btn.danger:hover { border-color: var(--error); } .admin-btn:disabled { opacity: 0.4; cursor: not-allowed; } +/* Used in four places and never defined, so it rendered as a bare browser + button next to styled ones. Same shape as .admin-btn, quieter. */ +.btn-secondary { + padding: 4px 10px; + border: 1px solid transparent; + border-radius: 5px; + background: none; + color: var(--text-secondary); + font-size: 0.82em; + cursor: pointer; + white-space: nowrap; +} +.btn-secondary:hover { border-color: var(--border); color: var(--text); } +.btn-secondary:disabled { opacity: 0.4; cursor: not-allowed; } + +/* Text that acts as a button: the "add a description" affordance should not + compete with the group's name for attention. */ +.link-btn { + display: inline-flex; + align-items: center; + gap: 2px; + padding: 0; + border: none; + background: none; + color: var(--text-dim); + font-size: 0.8em; + cursor: pointer; +} +.link-btn:hover { color: var(--accent); } + +/* The header is a flex row, so a textarea in it collapses to its content + width unless told otherwise. */ +.group-desc-edit { margin: 4px 0 6px; width: min(460px, 60vw); min-width: 260px; } +.group-desc-edit textarea { + width: 100%; + padding: 6px 8px; + border: 1px solid var(--border); + border-radius: 5px; + background: var(--bg-surface); + color: var(--text); + font: inherit; + font-size: 0.85em; + resize: vertical; +} +.group-desc-edit textarea:focus { outline: none; border-color: var(--border-focus); } +.group-desc-edit div { display: flex; gap: 6px; margin-top: 4px; } + .admin-role-select { padding: 3px 6px; border: 1px solid var(--border); diff --git a/packages/meshbay-hub/tests/test_group_description.py b/packages/meshbay-hub/tests/test_group_description.py new file mode 100644 index 0000000..b18c90a --- /dev/null +++ b/packages/meshbay-hub/tests/test_group_description.py @@ -0,0 +1,103 @@ +""" +Editing a group's description. + +A description could only be set when the group was created, so every group made +before anyone thought to write one stayed blank for good. What is deliberately +*not* editable is as much the point: name, visibility and join policy are the +terms members joined on. +""" + +import base64 +import hashlib + +import pytest + + +def _auth_key(password: str, username: str) -> str: + salt = hashlib.sha256(f"meshbay:auth:v1:{username}".encode()).digest() + return base64.b64encode( + hashlib.pbkdf2_hmac("sha512", password.encode(), salt, 600_000, 32)).decode() + + +async def _user(client, username, password="a-long-enough-passphrase"): + await client.post("/v1/users/register", json={ + "username": username, "email": f"{username}@example.com", + "auth_key": _auth_key(password, username)}) + r = await client.post("/v1/users/login", json={ + "username": username, "auth_key": _auth_key(password, username)}) + return {"Authorization": f"Bearer {r.json()['access_token']}"} + + +async def _group(client, headers, name="described", **kw): + r = await client.post("/v1/groups", json={"name": name, **kw}, headers=headers) + return r.json()["group_id"] + + +@pytest.mark.asyncio +async def test_the_owner_can_write_a_description(client): + owner = await _user(client, "writer") + gid = await _group(client, owner) + + r = await client.patch(f"/v1/groups/{gid}", + json={"description": "host grenoble"}, headers=owner) + assert r.status_code == 200, r.text + + mine = await client.get("/v1/groups/mine", headers=owner) + group = next(g for g in mine.json()["groups"] if g["id"] == gid) + assert group["description"] == "host grenoble" + + +@pytest.mark.asyncio +async def test_a_member_cannot(client): + owner = await _user(client, "owner2") + member = await _user(client, "member2") + gid = await _group(client, owner, name="not-yours") + await client.post(f"/v1/groups/{gid}/members/member2", json={}, headers=owner) + + r = await client.patch(f"/v1/groups/{gid}", + json={"description": "mine now"}, headers=member) + assert r.status_code == 403 + + +@pytest.mark.asyncio +async def test_an_empty_description_clears_it(client): + owner = await _user(client, "clearer") + gid = await _group(client, owner, name="clearme", description="temporary") + + r = await client.patch(f"/v1/groups/{gid}", json={"description": " "}, + headers=owner) + assert r.status_code == 200 + assert r.json()["description"] == "" + + +@pytest.mark.asyncio +async def test_the_terms_members_joined_on_are_not_editable(client): + """ + A private group that could quietly become public is not the group its + members agreed to be in. Changing that needs a decision about who gets told, + so the endpoint ignores it rather than half-implementing it. + """ + owner = await _user(client, "sneaky") + gid = await _group(client, owner, name="private-please", visibility="private") + + await client.patch(f"/v1/groups/{gid}", + json={"description": "hi", "visibility": "public", + "join_policy": "open", "name": "renamed"}, + headers=owner) + + mine = await client.get("/v1/groups/mine", headers=owner) + group = next(g for g in mine.json()["groups"] if g["id"] == gid) + assert group["visibility"] == "private" + assert group["join_policy"] == "invite" + assert group["name"] == "private-please" + + +@pytest.mark.asyncio +async def test_a_long_description_is_truncated_not_refused(client): + owner = await _user(client, "verbose") + gid = await _group(client, owner, name="long") + + r = await client.patch(f"/v1/groups/{gid}", json={"description": "x" * 900}, + headers=owner) + assert r.status_code == 200 + assert len(r.json()["description"]) == 512 |