Garry's Opinionated OpenClaw/Hermes Agent Brain
TypeScript
fix: a member removed while its email is set keeps no email (adversarial review)
garrytana4a3e8a4838b
diff --git a/src/core/access/members.ts b/src/core/access/members.tsindex 02e0b1735f..2b8c7ddd30 100644--- a/src/core/access/members.ts+++ b/src/core/access/members.ts@@ -233,7 +233,8 @@ export async function setMemberEmail(engine: BrainEngine, rawId: unknown, rawEmaconst email = rawEmail === null ? null : assertMemberEmail(rawEmail);if (email === member.email) return { member, changed: false };if (email !== null) await assertEmailFree(engine, email, member.id);- await engine.executeRaw('UPDATE access_members SET email = $2, updated_at = now() WHERE id = $1', [member.id, email]).catch(error => refuseEmailRace(engine, error, email, member.id));+ const updated = await engine.executeRaw<{ id: string }>('UPDATE access_members SET email = $2, updated_at = now() WHERE id = $1 AND tombstoned_at IS NULL RETURNING id', [member.id, email]).catch(error => refuseEmailRace(engine, error, email, member.id));+ if (!updated.length) throw retired(member.id, 'Add a new member id instead.', 'A removed member stays removed; its email was cleared when it was removed.');return { member: (await getMember(engine, member.id))!, changed: true };}diff --git a/test/access-members.test.ts b/test/access-members.test.tsindex 821faee408..e2bff904c7 100644--- a/test/access-members.test.ts+++ b/test/access-members.test.ts@@ -214,5 +214,16 @@ for (const kind of testBackends()) {for (const r of add) if (r.status === 'rejected') expect(await refusal(Promise.reject(r.reason))).toEqual({ code: 'access_member_invalid', reason: 'email_taken' });expect((await listMembers(engine)).filter(m => m.id === 'kim-example' || m.id === 'lee-example')).toHaveLength(1);});++ test('GST-1158: a member removed while its email is being set is refused as retired and keeps no email', async () => {+ await addMember(engine, 'mia-example');+ const racing = Object.create(engine, { executeRaw: { value: async (sql: string, params?: unknown[]) => {+ if (sql.startsWith('UPDATE access_members SET email')) await removeMember(engine, 'mia-example');+ return engine.executeRaw(sql, params);+ } } }) as BrainEngine;+ expect(await refusal(setMemberEmail(racing, 'mia-example', '[email protected]'))).toEqual({ code: 'access_member_id_retired' });+ expect(await getMember(engine, 'mia-example')).toMatchObject({ status: 'removed', email: null });+ expect((await addMember(engine, 'mia2-example', { email: '[email protected]' })).member.email).toBe('[email protected]');+ });});}