fix(social-client): lowercase parsed @domain in sendFriendRequest

Hostnames are case-insensitive (RFC 4343), and both right-hand
sides of the routing comparisons (window.location.host and
URL.host) are already canonical lowercase. The user-typed domain
substring was compared with strict ===, so ORBIT.ddns.net
failed to match an existing connected peer and popped a spurious
Connect Instance modal. Normalize at parse time.
This commit is contained in:
Jannis Braun
2026-04-25 19:20:07 +02:00
parent b5b48e407e
commit fba1f0b87d
2 changed files with 89 additions and 1 deletions
@@ -0,0 +1,87 @@
import { describe, it, expect, beforeEach, vi } from 'vitest';
const homeSendRequest = vi.fn(async () => ({ success: true, requestId: 'req-home' }));
const remoteSendRequest = vi.fn(async () => ({ success: true, requestId: 'req-remote' }));
const homeRequests = vi.fn(async () => []);
const remoteRequests = vi.fn(async () => []);
vi.mock('../api/client', () => ({
api: {
social: {
sendRequest: (...args: unknown[]) => homeSendRequest(...args),
requests: () => homeRequests(),
},
},
}));
const remoteApi = {
social: {
sendRequest: (...args: unknown[]) => remoteSendRequest(...args),
requests: () => remoteRequests(),
},
};
vi.mock('./instanceStore', () => ({
useInstanceStore: {
getState: () => ({
instances: [
{
origin: 'https://orbit.ddns.net',
status: 'connected',
api: remoteApi,
},
],
}),
},
}));
vi.mock('../utils/assetUrls', () => ({
normalizeUserAssets: (u: unknown) => u,
}));
import { useSocialStore } from './socialStore';
describe('socialStore.sendFriendRequest — case-insensitive domain routing', () => {
beforeEach(() => {
homeSendRequest.mockClear();
remoteSendRequest.mockClear();
homeRequests.mockClear();
remoteRequests.mockClear();
// window.location.host in jsdom defaults to 'localhost:3000' or similar.
// Override it for routing tests.
Object.defineProperty(window, 'location', {
configurable: true,
value: { ...window.location, host: 'local.test', hostname: 'local.test' },
});
});
it('sends to the home API when the typed domain matches window.location.host exactly', async () => {
await useSocialStore.getState().sendFriendRequest('bob@local.test');
expect(homeSendRequest).toHaveBeenCalledWith('bob');
expect(remoteSendRequest).not.toHaveBeenCalled();
});
it('sends to the home API when the typed domain matches with mixed case', async () => {
await useSocialStore.getState().sendFriendRequest('bob@LOCAL.TEST');
expect(homeSendRequest).toHaveBeenCalledWith('bob');
expect(remoteSendRequest).not.toHaveBeenCalled();
});
it('routes to a connected remote instance when the typed domain matches its origin host', async () => {
await useSocialStore.getState().sendFriendRequest('bob@orbit.ddns.net');
expect(remoteSendRequest).toHaveBeenCalledWith('bob');
expect(homeSendRequest).not.toHaveBeenCalled();
});
it('routes to a connected remote instance when the typed domain has mixed case', async () => {
await useSocialStore.getState().sendFriendRequest('bob@ORBIT.ddns.net');
expect(remoteSendRequest).toHaveBeenCalledWith('bob');
expect(homeSendRequest).not.toHaveBeenCalled();
});
it('sends bare handle (no @) directly to the home API', async () => {
await useSocialStore.getState().sendFriendRequest('bob');
expect(homeSendRequest).toHaveBeenCalledWith('bob');
expect(remoteSendRequest).not.toHaveBeenCalled();
});
});
+2 -1
View File
@@ -218,7 +218,8 @@ export const useSocialStore = create<SocialState>((set, get) => ({
res = await api.social.sendRequest(username); res = await api.social.sendRequest(username);
} else { } else {
const baseName = username.slice(0, atIndex); const baseName = username.slice(0, atIndex);
const domain = username.slice(atIndex + 1); // Hostnames are case-insensitive; comparison RHS is canonical lowercase.
const domain = username.slice(atIndex + 1).toLowerCase();
// Check if domain matches home instance // Check if domain matches home instance
if (domain === window.location.host) { if (domain === window.location.host) {