devsyncwrld/backspace
1
0
Fork 0
Code Issues Pull Requests Actions 26 Packages Projects Releases Wiki Activity

fix(dm): owner-only group DM ops accept federated target identification

Browse Source 
Transferring ownership or kicking a member surfaced "Target user is not a
member of this DM channel" whenever the target was a federated user.

Root cause: the client passed `canonical.id` from `useCanonicalUserView`,
which returns the user's HOME id when the home view is in the userViews
cache. After owner-routing the request to the owner instance, that
instance's `dm_members.userId` (its own local replicated id) never
matched the home id, so `isDmMember` returned false. The same failure
mode applied across any cross-instance scenario where the
channel-serving instance and the owner-serving instance disagree on the
local replicated user id for the same federated user.

Fix: both endpoints now accept federated identification, mirroring the
existing pattern on `POST /api/dm/:id/members`:

- `POST /api/dm/:id/transfer` body: `{ newOwnerId? } | { homeUserId, homeInstance }`.
  Federated args win when both are supplied (strictly more specific).
- `DELETE /api/dm/:id/members/:targetUserId` reads optional
  `?homeInstance=<origin>` query; when present, the URL segment is
  treated as a homeUserId and resolved via `resolveOrCreateReplicatedUser`.

Client `api.dm.kickMember` and `api.dm.transferOwnership` gain an
optional `federated` argument; `DmRosterPanel` and `MobileGroupDmInfo`
pass it whenever the target has `homeUserId` + `homeInstance` populated.

Adds 5 server tests (3 transfer + 2 kick) covering federated targets,
the federated-wins-over-local precedence rule, and federated-non-member
rejection. Updates 2 client routing tests and 2 DmRosterPanel test
assertions for the new signature. Updates `docs/systems/dm-system.md`
and `docs/systems/api.md`.

Server: 965 tests pass (was 960). Web: 362 tests pass (was 360).
This commit is contained in:
Jannis Braun
2026-05-10 22:09:14 +02:00
parent 9279ac78e5
commit b6842c5590
11 changed files with 442 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/web/src/api/client.ts
+48 -9
View File
@@ -24,6 +24,7 @@ import type {
CreateDmRequest,
AddDmMemberRequest,
CreateGroupDmRequest,
TransferOwnershipRequest,
CreateDmMessageRequest,
Friend,
FriendRequest,
@@ -184,14 +185,36 @@ export class BackspaceApiClient {
updateMetadata: (channelId: string, body: { name?: string | null; icon?: string | null }) => Promise<DmChannel>;
/**
* Owner-only: kick a member from a group DM.
* Routes via getApiForOrigin(getOwnerInstanceForDm(channelId)) — see updateMetadata.
*
* Routes via getApiForOrigin(getOwnerInstanceForDm(channelId)) — see
* updateMetadata. The optional `federated` arg is required when the
* target is a federated user: the channel-serving instance and the
* owner-serving instance disagree on the local replicated user id, and
* the home view surfaced through `userViews` carries the home id, not
* the owner instance's local id. When `federated` is supplied, the
* server resolves it via `resolveOrCreateReplicatedUser`. Without it,
* `targetUserId` is treated as a local id on the owner instance.
*/
kickMember: (channelId: string, targetUserId: string) => Promise<{ success: boolean }>;
kickMember: (
channelId: string,
targetUserId: string,
federated?: { homeUserId: string; homeInstance: string },
) => Promise<{ success: boolean }>;
/**
* Owner-only: transfer group DM ownership to another member without leaving.
* Routes via getApiForOrigin(getOwnerInstanceForDm(channelId)) — see updateMetadata.
*
* Routes via getApiForOrigin(getOwnerInstanceForDm(channelId)) — see
* updateMetadata. The optional `federated` arg is required for
* federated targets, mirroring `kickMember`. When supplied, the server
* uses `resolveOrCreateReplicatedUser(homeUserId, homeInstance)` to
* find the local user row. Without it, `newOwnerId` is treated as a
* local id on the owner instance.
*/
transferOwnership: (channelId: string, newOwnerId: string) => Promise<DmChannel>;
transferOwnership: (
channelId: string,
newOwnerId: string,
federated?: { homeUserId: string; homeInstance: string },
) => Promise<DmChannel>;
spaceInvite: (body: SpaceInviteRequest) => Promise<SpaceInviteResponse>;
};
@@ -518,15 +541,31 @@ export class BackspaceApiClient {
if (target !== this) return target.dm.updateMetadata(channelId, body);
return request<DmChannel>('PATCH', `/dm/${channelId}`, body);
},
kickMember: (channelId, targetUserId) => {
kickMember: (channelId, targetUserId, federated) => {
const target = getApiForOrigin(getOwnerInstanceForDm(channelId));
if (target !== this) return target.dm.kickMember(channelId, targetUserId);
if (target !== this) return target.dm.kickMember(channelId, targetUserId, federated);
// For federated targets, the URL segment carries the homeUserId and
// the `homeInstance` query string signals federated resolution. The
// server route resolves via `resolveOrCreateReplicatedUser`. For
// local targets, the URL segment is the local user id (legacy form)
// and no query is appended.
if (federated) {
const homeId = encodeURIComponent(federated.homeUserId);
const homeInst = encodeURIComponent(federated.homeInstance);
return request<{ success: boolean }>(
'DELETE',
`/dm/${channelId}/members/${homeId}?homeInstance=${homeInst}`,
);
}
return request<{ success: boolean }>('DELETE', `/dm/${channelId}/members/${targetUserId}`);
},
transferOwnership: (channelId, newOwnerId) => {
transferOwnership: (channelId, newOwnerId, federated) => {
const target = getApiForOrigin(getOwnerInstanceForDm(channelId));
if (target !== this) return target.dm.transferOwnership(channelId, newOwnerId);
return request<DmChannel>('POST', `/dm/${channelId}/transfer`, { newOwnerId });
if (target !== this) return target.dm.transferOwnership(channelId, newOwnerId, federated);
const body: TransferOwnershipRequest = federated
? { homeUserId: federated.homeUserId, homeInstance: federated.homeInstance }
: { newOwnerId };
return request<DmChannel>('POST', `/dm/${channelId}/transfer`, body);
},
spaceInvite: (body) =>
request<SpaceInviteResponse>('POST', '/dm/space-invite', body),
packages/web/src/components/layout/DmRosterPanel.test.tsx
+14 -5
View File
@@ -106,9 +106,16 @@ const apiTransferOwnership = vi.fn().mockResolvedValue({});
vi.mock('../../api/client', () => ({
api: {
dm: {
kickMember: (channelId: string, userId: string) => apiKickMember(channelId, userId),
transferOwnership: (channelId: string, userId: string) =>
apiTransferOwnership(channelId, userId),
kickMember: (
channelId: string,
userId: string,
federated?: { homeUserId: string; homeInstance: string },
) => apiKickMember(channelId, userId, federated),
transferOwnership: (
channelId: string,
userId: string,
federated?: { homeUserId: string; homeInstance: string },
) => apiTransferOwnership(channelId, userId, federated),
},
},
}));
@@ -343,7 +350,8 @@ describe('DmRosterPanel — action wiring', () => {
await waitFor(() => {
expect(apiKickMember).toHaveBeenCalledTimes(1);
});
expect(apiKickMember).toHaveBeenCalledWith('dm-1', 'tgt');
// Local target → federated arg is undefined.
expect(apiKickMember).toHaveBeenCalledWith('dm-1', 'tgt', undefined);
});
it('transfer action: opens confirm dialog, then calls api.dm.transferOwnership on confirm', async () => {
@@ -367,7 +375,8 @@ describe('DmRosterPanel — action wiring', () => {
await waitFor(() => {
expect(apiTransferOwnership).toHaveBeenCalledTimes(1);
});
expect(apiTransferOwnership).toHaveBeenCalledWith('dm-1', 'tgt');
// Local target → federated arg is undefined.
expect(apiTransferOwnership).toHaveBeenCalledWith('dm-1', 'tgt', undefined);
});
it('remove-friend action: calls socialStore.removeFriend with the row user id', async () => {
packages/web/src/components/layout/DmRosterPanel.tsx
+16 -2
View File
@@ -121,7 +121,17 @@ export function DmRosterPanel() {
if (!pendingKick) return;
setSubmitting(true);
try {
await api.dm.kickMember(dmChannel.id, pendingKick.id);
// Pass federated identity when the target is a federated user.
// `pendingKick.id` may be the home id (when the home view is in the
// userViews cache) OR a local id from any instance — neither is
// guaranteed to match the OWNER instance's local replicated id. The
// owner instance resolves home id + home instance via
// `resolveOrCreateReplicatedUser`, which is the only deterministic
// way to find the right `dm_members.userId` row across instances.
const federated = pendingKick.homeUserId && pendingKick.homeInstance
? { homeUserId: pendingKick.homeUserId, homeInstance: pendingKick.homeInstance }
: undefined;
await api.dm.kickMember(dmChannel.id, pendingKick.id, federated);
addToast(
`Removed ${pendingKick.displayName ?? parseFederatedUsername(pendingKick.username).baseName} from the group`,
'success',
@@ -143,7 +153,11 @@ export function DmRosterPanel() {
if (!pendingTransfer) return;
setSubmitting(true);
try {
await api.dm.transferOwnership(dmChannel.id, pendingTransfer.id);
// See confirmKick for the rationale on federated identity.
const federated = pendingTransfer.homeUserId && pendingTransfer.homeInstance
? { homeUserId: pendingTransfer.homeUserId, homeInstance: pendingTransfer.homeInstance }
: undefined;
await api.dm.transferOwnership(dmChannel.id, pendingTransfer.id, federated);
addToast(
`Ownership transferred to ${pendingTransfer.displayName ?? parseFederatedUsername(pendingTransfer.username).baseName}`,
'success',
packages/web/src/components/layout/MobileGroupDmInfo.tsx
+10 -2
View File
@@ -332,7 +332,11 @@ export function MobileGroupDmInfo({ params }: MobileGroupDmInfoProps) {
if (!pendingKick || !channelId) return;
setSubmittingMemberAction(true);
try {
await api.dm.kickMember(channelId, pendingKick.id);
// See DmRosterPanel.confirmKick for federated identity rationale.
const federated = pendingKick.homeUserId && pendingKick.homeInstance
? { homeUserId: pendingKick.homeUserId, homeInstance: pendingKick.homeInstance }
: undefined;
await api.dm.kickMember(channelId, pendingKick.id, federated);
addToast(
`Removed ${pendingKick.displayName ?? parseFederatedUsername(pendingKick.username).baseName} from the group`,
'success',
@@ -354,7 +358,11 @@ export function MobileGroupDmInfo({ params }: MobileGroupDmInfoProps) {
if (!pendingTransfer || !channelId) return;
setSubmittingMemberAction(true);
try {
await api.dm.transferOwnership(channelId, pendingTransfer.id);
// See DmRosterPanel.confirmKick for federated identity rationale.
const federated = pendingTransfer.homeUserId && pendingTransfer.homeInstance
? { homeUserId: pendingTransfer.homeUserId, homeInstance: pendingTransfer.homeInstance }
: undefined;
await api.dm.transferOwnership(channelId, pendingTransfer.id, federated);
addToast(
`Ownership transferred to ${pendingTransfer.displayName ?? parseFederatedUsername(pendingTransfer.username).baseName}`,
'success',
packages/web/src/utils/groupDm.ownerRouting.test.ts
+37 -2
View File
@@ -160,7 +160,25 @@ describe('group DM owner routing — api.dm.* (Task 5.2)', () => {
await api.dm.kickMember('dm-1', 'target-user');
expect(mockGetApiForOrigin).toHaveBeenCalledWith('https://orbit.test');
expect(remoteClient.dm.kickMember).toHaveBeenCalledWith('dm-1', 'target-user');
// Third arg is the optional federated identity (undefined when target is local)
expect(remoteClient.dm.kickMember).toHaveBeenCalledWith('dm-1', 'target-user', undefined);
});
it('after transfer: api.dm.kickMember forwards federated identity when supplied', async () => {
useSpaceStore.setState({
dmChannels: [{ ...baseDm, ownerHomeInstance: 'https://orbit.test' }],
});
await api.dm.kickMember('dm-1', 'target-user', {
homeUserId: 'target-home-id',
homeInstance: 'https://orbit.test',
});
expect(mockGetApiForOrigin).toHaveBeenCalledWith('https://orbit.test');
expect(remoteClient.dm.kickMember).toHaveBeenCalledWith('dm-1', 'target-user', {
homeUserId: 'target-home-id',
homeInstance: 'https://orbit.test',
});
});
it('after transfer: api.dm.transferOwnership routes to new owner instance', async () => {
@@ -171,7 +189,24 @@ describe('group DM owner routing — api.dm.* (Task 5.2)', () => {
await api.dm.transferOwnership('dm-1', 'next-owner');
expect(mockGetApiForOrigin).toHaveBeenCalledWith('https://orbit.test');
expect(remoteClient.dm.transferOwnership).toHaveBeenCalledWith('dm-1', 'next-owner');
expect(remoteClient.dm.transferOwnership).toHaveBeenCalledWith('dm-1', 'next-owner', undefined);
});
it('after transfer: api.dm.transferOwnership forwards federated identity when supplied', async () => {
useSpaceStore.setState({
dmChannels: [{ ...baseDm, ownerHomeInstance: 'https://orbit.test' }],
});
await api.dm.transferOwnership('dm-1', 'next-owner', {
homeUserId: 'next-owner-home-id',
homeInstance: 'https://orbit.test',
});
expect(mockGetApiForOrigin).toHaveBeenCalledWith('https://orbit.test');
expect(remoteClient.dm.transferOwnership).toHaveBeenCalledWith('dm-1', 'next-owner', {
homeUserId: 'next-owner-home-id',
homeInstance: 'https://orbit.test',
});
});
it('non-owner-only op (sendMessage) is unaffected by ownerHomeInstance', async () => {