fix(notifications): stop replacing a chosen UnifiedPush distributor on restart

This commit is contained in:
Erwan Leboucher committed 2026-08-31 23:00:20 +02:00
1 parent 10737b1034
commit 7caa72be4f
2 files changed
+9 -7

No files matched your search

@@ -212,15 +212,15 @@ describe('UnifiedPush distributor state helpers', () => {
expect(unifiedPushApi.setDistributor).toHaveBeenCalledOnce();
});
it('replaces a stale selected distributor with the first available one', async () => {
it('never replaces an explicitly chosen distributor that the scan did not list', async () => {
unifiedPushApi.setDistributor.mockResolvedValue(undefined);
await expect(
ensureUnifiedPushDistributorSelection(
['org.unifiedpush.distributor.ntfy', 'org.unifiedpush.distributor.nextpush'],
'org.unifiedpush.distributor.removed'
)
).resolves.toBe('org.unifiedpush.distributor.ntfy');
expect(unifiedPushApi.setDistributor).toHaveBeenCalledWith('org.unifiedpush.distributor.ntfy');
).resolves.toBe('');
expect(unifiedPushApi.setDistributor).not.toHaveBeenCalled();
});
it('persists a selected distributor through the transport helper', async () => {
@@ -165,11 +165,13 @@ export async function ensureUnifiedPushDistributorSelection(
distributors: string[],
selectedDistributor: string
): Promise<string> {
const distributor =
selectedDistributor && distributors.includes(selectedDistributor)
? selectedDistributor
: distributors[0];
if (selectedDistributor) {
if (!distributors.includes(selectedDistributor)) return '';
await saveUnifiedPushDistributor(selectedDistributor);
return selectedDistributor;
}
const distributor = distributors[0];
if (!distributor) return '';
await saveUnifiedPushDistributor(distributor);