Compare commits

...
10 changed files with 298 additions and 19 deletions

No files matched your search

@@ -0,0 +1,64 @@
import test from 'node:test';
import assert from 'node:assert/strict';
import en from '../locales/en.ts';
import ru from '../locales/ru.ts';
import es from '../locales/es.ts';
import zhCN from '../locales/zh-CN.ts';
import zhTW from '../locales/zh-TW.ts';
const keys = [
'cloudSync.provider.disconnect',
'cloudSync.provider.disconnect.confirmTitle',
'cloudSync.provider.disconnect.confirmMessage',
'cloudSync.provider.disconnect.confirmAction',
'cloudSync.provider.disconnect.toastTitle',
'cloudSync.provider.disconnect.cloudRemains',
'cloudSync.provider.disconnect.failed',
] as const;
test('disconnect copy exists in every bundled locale', () => {
for (const [locale, messages] of Object.entries({ en, ru, es, zhCN, zhTW })) {
for (const key of keys) {
assert.equal(typeof messages[key], 'string', `${locale} is missing ${key}`);
assert.notEqual(messages[key], '', `${locale} has empty ${key}`);
}
}
});
test('disconnect confirm copy states that saved provider credentials are removed', () => {
// The confirm dialog must explain the data consequence of disconnecting:
// locally saved endpoint + credentials removal, not just "stops syncing".
const expected = [
[en, 'will be removed'],
[es, 'eliminarán'],
[ru, 'будут удалены'],
[zhCN, '删除'],
[zhTW, '刪除'],
] as const;
for (const [messages, fragment] of expected) {
assert.ok(
(messages['cloudSync.provider.disconnect.confirmMessage'] as string).includes(fragment),
`confirmMessage should mention credential removal: ${fragment}`,
);
}
});
test('disconnect toast copy explains the cloud copy is retained', () => {
for (const [locale, messages] of Object.entries({ en, ru, es, zhCN, zhTW })) {
assert.ok(
(messages['cloudSync.provider.disconnect.cloudRemains'] as string).includes(
'{name}',
),
`${locale} cloudRemains hint should reference the provider name`,
);
}
});
test('disconnect copy distinguishes login cleanup from retained local data', () => {
assert.match(en['cloudSync.provider.disconnect.confirmMessage'], /backup history and sync encryption password stay here/);
assert.doesNotMatch(en['cloudSync.provider.disconnect.cloudRemains'], /change.*password/);
for (const messages of [en, ru, es, zhCN, zhTW]) {
assert.ok(messages['cloudSync.provider.disconnect.failed'].includes('{name}'));
}
});
+4 -1
View File
@@ -314,8 +314,11 @@ export const enTerminalMessages: Messages = {
'cloudSync.provider.connecting': 'Connecting...',
'cloudSync.provider.disconnect': 'Disconnect',
'cloudSync.provider.disconnect.confirmTitle': 'Disconnect "{name}"?',
'cloudSync.provider.disconnect.confirmMessage': 'This device will stop syncing with {name}. Your local vault stays on this computer.',
'cloudSync.provider.disconnect.confirmMessage': 'This device will stop syncing with {name}. Its saved address and login credentials will be removed. Your local vault, backup history and sync encryption password stay here. If system credential storage is unavailable, plugin credentials may need manual removal.',
'cloudSync.provider.disconnect.confirmAction': 'Disconnect',
'cloudSync.provider.disconnect.toastTitle': 'Disconnected',
'cloudSync.provider.disconnect.cloudRemains': 'Encrypted sync copies may still exist in your {name} storage. To remove them, delete the sync files there. Disconnecting does not clear this device for handover.',
'cloudSync.provider.disconnect.failed': 'Could not finish disconnecting from {name}. Saved connection details may remain. Please try again.',
'cloudSync.provider.webdav': 'WebDAV',
'cloudSync.provider.webdav.desc': 'Connect to a self-hosted WebDAV endpoint',
'cloudSync.provider.s3': 'S3 Compatible',
+4 -1
View File
@@ -313,8 +313,11 @@ export const esTerminalMessages: Messages = {
'cloudSync.provider.connecting': 'Conectando...',
'cloudSync.provider.disconnect': 'Desconectar',
'cloudSync.provider.disconnect.confirmTitle': '¿Desconectar "{name}"?',
'cloudSync.provider.disconnect.confirmMessage': 'Este dispositivo dejará de sincronizar con {name}. La bóveda local permanecerá en este equipo.',
'cloudSync.provider.disconnect.confirmMessage': 'Este dispositivo dejará de sincronizar con {name}. Se eliminarán su dirección y credenciales de acceso guardadas. La bóveda local, las copias de seguridad y la contraseña de cifrado de sincronización permanecerán aquí. Si el almacén de credenciales del sistema no está disponible, puede ser necesario eliminar manualmente las credenciales de los complementos.',
'cloudSync.provider.disconnect.confirmAction': 'Desconectar',
'cloudSync.provider.disconnect.toastTitle': 'Desconectado',
'cloudSync.provider.disconnect.cloudRemains': 'Las copias de sincronización cifradas pueden seguir en tu almacenamiento de {name}. Para eliminarlas, borra los archivos de sincronización allí. Desconectar no prepara este dispositivo para entregarlo a otra persona.',
'cloudSync.provider.disconnect.failed': 'No se pudo completar la desconexión de {name}. Los datos de conexión guardados podrían permanecer. Inténtalo de nuevo.',
'cloudSync.provider.webdav': 'WebDAV',
'cloudSync.provider.webdav.desc': 'Conectar a un endpoint WebDAV autoalojado',
'cloudSync.provider.s3': 'Compatible con S3',
+4 -1
View File
@@ -332,8 +332,11 @@ export const ruTerminalMessages: Messages = {
'cloudSync.provider.connecting': 'Подключение...',
'cloudSync.provider.disconnect': 'Отключить',
'cloudSync.provider.disconnect.confirmTitle': 'Отключить "{name}"?',
'cloudSync.provider.disconnect.confirmMessage': 'Это устройство перестанет синхронизироваться с {name}. Локальное хранилище останется на этом компьютере.',
'cloudSync.provider.disconnect.confirmMessage': 'Это устройство перестанет синхронизироваться с {name}. Сохранённый адрес и данные для входа будут удалены. Локальное хранилище, резервные копии и пароль шифрования синхронизации останутся здесь. Если системное хранилище учётных данных недоступно, данные для входа плагинов может потребоваться удалить вручную.',
'cloudSync.provider.disconnect.confirmAction': 'Отключить',
'cloudSync.provider.disconnect.toastTitle': 'Отключено',
'cloudSync.provider.disconnect.cloudRemains': 'Зашифрованные копии синхронизации могут остаться в хранилище {name}. Чтобы удалить их, удалите там файлы синхронизации. Отключение не очищает устройство для передачи другому человеку.',
'cloudSync.provider.disconnect.failed': 'Не удалось завершить отключение от {name}. Сохранённые данные подключения могут остаться. Повторите попытку.',
'cloudSync.provider.webdav': 'WebDAV',
'cloudSync.provider.webdav.desc': 'Подключение к самостоятельно размещённому WebDAV endpoint',
'cloudSync.provider.s3': 'Совместимое с S3',
+4 -1
View File
@@ -717,8 +717,11 @@ export const zhCNVaultMessages: Messages = {
'cloudSync.provider.connecting': '连接中...',
'cloudSync.provider.disconnect': '断开连接',
'cloudSync.provider.disconnect.confirmTitle': '断开 “{name}”?',
'cloudSync.provider.disconnect.confirmMessage': '此设备将停止与 {name} 同步。本地保险库仍保留在这台电脑上。',
'cloudSync.provider.disconnect.confirmMessage': '此设备将停止与 {name} 同步,并删除本机保存的该服务商地址与登录凭据。本地主机库、备份历史和同步加密密码仍会保留。若系统凭据存储不可用,插件凭据可能需要手动删除。',
'cloudSync.provider.disconnect.confirmAction': '断开连接',
'cloudSync.provider.disconnect.toastTitle': '已断开连接',
'cloudSync.provider.disconnect.cloudRemains': '云端的加密同步副本可能仍保存在 {name} 存储中。如需清除,请到该服务商删除同步文件。断开连接不代表设备已完成交接清理。',
'cloudSync.provider.disconnect.failed': '未能完成与 {name} 的断开连接,保存的连接资料可能仍在,请重试。',
'cloudSync.provider.webdav': 'WebDAV',
'cloudSync.provider.webdav.desc': '连接到自建 WebDAV 端点',
'cloudSync.provider.s3': 'S3 兼容存储',
+4 -1
View File
@@ -717,8 +717,11 @@ export const zhTWVaultMessages: Messages = {
'cloudSync.provider.connecting': '連線中...',
'cloudSync.provider.disconnect': '中斷連線',
'cloudSync.provider.disconnect.confirmTitle': '中斷「{name}」?',
'cloudSync.provider.disconnect.confirmMessage': '此裝置將停止與 {name} 同步。本機保險庫仍保留在這台電腦上。',
'cloudSync.provider.disconnect.confirmMessage': '此裝置將停止與 {name} 同步,並刪除本機保存的該服務商位址與登入憑證。本機主機庫、備份歷史和同步加密密碼仍會保留。若系統憑證儲存無法使用,外掛憑證可能需要手動刪除。',
'cloudSync.provider.disconnect.confirmAction': '中斷連線',
'cloudSync.provider.disconnect.toastTitle': '已中斷連線',
'cloudSync.provider.disconnect.cloudRemains': '雲端的加密同步副本可能仍保存在 {name} 儲存空間中。如需清除,請到該服務商刪除同步檔案。中斷連線不代表裝置已完成交接清理。',
'cloudSync.provider.disconnect.failed': '未能完成與 {name} 的中斷連線,保存的連線資料可能仍在,請重試。',
'cloudSync.provider.webdav': 'WebDAV',
'cloudSync.provider.webdav.desc': '連線到自建 WebDAV 端點',
'cloudSync.provider.s3': 'S3 相容儲存',
@@ -0,0 +1,94 @@
import assert from 'node:assert/strict';
import test from 'node:test';
import React from 'react';
import { I18nProvider } from '../application/i18n/I18nProvider';
import { createDomRenderer, dispatchDomEvent, flushEffects, installDomEnvironment, runWithAct } from './test-support/renderReactDom';
test('provider disconnect waits for completion, reports failure and permits retry', async () => {
const dom = installDomEnvironment();
const globals = {
localStorage: dom.window.localStorage,
MutationObserver: dom.window.MutationObserver,
NodeFilter: dom.window.NodeFilter,
HTMLInputElement: dom.window.HTMLInputElement,
};
const previous = new Map(Object.keys(globals).map((key) => [key, Object.getOwnPropertyDescriptor(globalThis, key)]));
for (const [key, value] of Object.entries(globals)) Object.defineProperty(globalThis, key, { configurable: true, value });
const { ProviderCard } = await import('./cloud-sync/CloudSyncControls');
const { toast } = await import('./ui/toast');
const renderer = await createDomRenderer(dom.document);
const notices: string[] = [];
const info = toast.info;
const error = toast.error;
toast.info = (message) => { notices.push(`info:${message}`); };
toast.error = (message) => { notices.push(`error:${message}`); };
let finish: (() => void) | undefined;
let fail = true;
let calls = 0;
try {
await renderer.render(
<I18nProvider locale="en">
<ProviderCard provider="webdav" name="WebDAV" icon={null} isConnected isSyncing={false}
onConnect={() => {}} onSync={() => {}}
onDisconnect={() => {
calls += 1;
if (fail) throw new Error('fixture failure');
return new Promise<void>((resolve) => { finish = resolve; });
}} />
</I18nProvider>,
);
const click = async (node: Element) => {
await dispatchDomEvent(node, new dom.window.MouseEvent('click', { bubbles: true }));
await flushEffects();
};
const button = dom.document.querySelector('button[aria-label="Disconnect"]');
assert.ok(button);
assert.equal(button.textContent, 'Disconnect');
await click(button);
let dialog = dom.document.querySelector('[role="dialog"]');
assert.ok(dialog);
assert.match(dialog.textContent ?? '', /backup history and sync encryption password stay here/);
const confirm = () => {
const node = [...dom.document.querySelectorAll('[role="dialog"] button')].find((el) => el.textContent === 'Disconnect');
assert.ok(node);
return node as HTMLButtonElement;
};
await click(confirm());
assert.equal(calls, 1);
assert.equal(notices.length, 1);
assert.match(notices[0], /^error:Could not finish disconnecting from WebDAV/);
assert.ok(dom.document.querySelector('[role="dialog"]'));
assert.equal(confirm().disabled, false);
fail = false;
await click(confirm());
assert.equal(calls, 2);
assert.equal(confirm().disabled, true);
assert.equal(notices.length, 1);
await runWithAct(async () => { finish?.(); });
await flushEffects();
assert.equal(dom.document.querySelector('[role="dialog"]'), null);
assert.equal(notices.length, 2);
assert.match(notices[1], /^info:Encrypted sync copies may still exist in your WebDAV storage/);
assert.doesNotMatch(notices[1], /\{name\}/);
// Cancelling a new confirmation never calls the disconnect callback.
await click(button);
dialog = dom.document.querySelector('[role="dialog"]');
assert.ok(dialog);
const cancel = [...dialog.querySelectorAll('button')].find((el) => el.textContent === 'Cancel');
assert.ok(cancel);
await click(cancel);
assert.equal(calls, 2);
} finally {
toast.info = info;
toast.error = error;
await renderer.unmount();
// Radix restores focus on a timer after unmount. Keep the DOM globals
// installed until that cleanup has dispatched its final event.
await new Promise((resolve) => setTimeout(resolve, 0));
for (const [key, descriptor] of previous) {
if (descriptor) Object.defineProperty(globalThis, key, descriptor);
else Reflect.deleteProperty(globalThis, key);
}
dom.cleanup();
}
});
+23 -5
View File
@@ -279,7 +279,7 @@ interface ProviderCardProps {
onEdit?: () => void;
onConnect: () => void;
onCancelConnect?: () => void;
onDisconnect: () => void;
onDisconnect: () => void | Promise<void>;
onSync: () => void;
extraActions?: React.ReactNode;
}
@@ -304,6 +304,7 @@ export const ProviderCard: React.FC<ProviderCardProps> = ({
}) => {
const { t } = useI18n();
const [disconnectConfirmOpen, setDisconnectConfirmOpen] = useState(false);
const [disconnecting, setDisconnecting] = useState(false);
const formatLastSyncLabel = (timestamp?: number): string => {
if (!timestamp) return t('cloudSync.lastSync.never');
const now = Date.now();
@@ -411,10 +412,12 @@ export const ProviderCard: React.FC<ProviderCardProps> = ({
size="sm"
variant="ghost"
onClick={() => setDisconnectConfirmOpen(true)}
className="text-muted-foreground hover:text-red-500"
disabled={disconnecting}
className="gap-1 text-muted-foreground hover:text-red-500"
aria-label={t('cloudSync.provider.disconnect')}
>
<CloudOff size={14} />
{t('cloudSync.provider.disconnect')}
</Button>
</>
) : isConnecting && onCancelConnect ? (
@@ -445,10 +448,25 @@ export const ProviderCard: React.FC<ProviderCardProps> = ({
message={t('cloudSync.provider.disconnect.confirmMessage', { name })}
confirmLabel={t('cloudSync.provider.disconnect.confirmAction')}
destructive
onOpenChange={setDisconnectConfirmOpen}
busy={disconnecting}
onOpenChange={(open) => {
if (!disconnecting) setDisconnectConfirmOpen(open);
}}
onConfirm={() => {
setDisconnectConfirmOpen(false);
onDisconnect();
setDisconnecting(true);
void Promise.resolve()
.then(() => onDisconnect())
.then(() => {
setDisconnectConfirmOpen(false);
toast.info(t('cloudSync.provider.disconnect.cloudRemains', { name }), {
title: t('cloudSync.provider.disconnect.toastTitle'),
duration: 8000,
});
})
.catch(() => {
toast.error(t('cloudSync.provider.disconnect.failed', { name }));
})
.finally(() => setDisconnecting(false));
}}
/>
</div>
@@ -18,7 +18,7 @@ import type {
SyncPayload,
WebDAVConfig,
} from '../../../domain/sync';
import { normalizeDurablePluginSyncCredentialRef } from '../../../domain/sync';
import { normalizeDurablePluginSyncCredentialRef, providerConnectionStorageKey } from '../../../domain/sync';
import { isPluginCloudProviderId } from '../../../domain/cloudProviderIds';
import type {
ProviderSyncAnchor,
@@ -518,19 +518,20 @@ export function cancelProviderAuthAttemptImpl(this: any,provider: CloudProvider,
export async function disconnectProviderImpl(this: any,provider: CloudProvider): Promise<void> {
this.cancelProviderAuthAttempt(provider);
const adapter = this.adapters.get(provider);
if (adapter) {
adapter.signOut();
this.adapters.delete(provider);
}
++this.providerDecryptSeq[provider];
this.state.providers[provider] = {
const disconnected: ProviderConnection = {
provider,
status: 'disconnected',
};
await this.saveProviderConnection(provider, this.state.providers[provider]);
await this.saveProviderConnection(provider, disconnected);
// A quota failure returns false from storage without rejecting the save.
// Confirm the connection was cleared before reporting disconnect success.
const stored = this.loadFromStorage(providerConnectionStorageKey(provider));
if (!stored || stored.status !== 'disconnected'
|| ['tokens', 'config', 'credential', 'account'].some((key) => Object.prototype.hasOwnProperty.call(stored, key))) {
throw new Error('Could not remove saved provider connection');
}
// Explicit disconnect removes the dynamic provider from the restart registry.
// Missing plugins with preserved config remain registered and are not coerced away.
unregisterPluginProviderIdImpl.call(this, provider);
@@ -538,6 +539,12 @@ export async function disconnectProviderImpl(this: any,provider: CloudProvider):
// an unrelated snapshot or convergent baseline.
clearProviderMergeStateImpl.call(this, provider);
this.removeFromStorage(this.providerAccountIdKey(provider));
const adapter = this.adapters.get(provider);
if (adapter) {
adapter.signOut();
this.adapters.delete(provider);
}
this.state.providers[provider] = disconnected;
// Drop OS-backed sync secrets so disconnect does not leave reusable passwords.
if (isPluginCloudProviderId(provider)) {
try {
@@ -0,0 +1,81 @@
import assert from 'node:assert/strict';
import test from 'node:test';
import { providerConnectionStorageKey, type ProviderConnection } from '../../../domain/sync';
import { disconnectProviderImpl } from './authMethods';
import { saveProviderConnectionImpl } from './stateAndSecurityMethods';
function harness(failure?: 'throw' | 'quota') {
const original: ProviderConnection = {
provider: 'webdav', status: 'connected',
config: { endpoint: 'https://fixture.invalid', username: 'fixture', password: 'fixture', authType: 'basic' },
};
const storage = new Map<string, unknown>([
[providerConnectionStorageKey('webdav'), original],
['backup-history', ['fixture-backup']],
['sync-password', 'fixture-password'],
['auto-sync', true],
['base', {}], ['convergent-base', {}], ['anchor', {}], ['account', 'fixture'],
]);
let notifications = 0;
let signOuts = 0;
let fail = failure;
const adapter = { signOut: () => { signOuts += 1; } };
const manager = {
adapters: new Map([['webdav', adapter]]),
providerDecryptSeq: { webdav: 0 },
providerWriteSeq: { webdav: 0 },
state: { providers: { webdav: original }, syncState: 'IDLE' },
cancelProviderAuthAttempt() {},
loadFromStorage: (key: string) => storage.get(key) ?? null,
saveToStorage(key: string, value: unknown) {
if (fail === 'throw') throw new Error('storage denied');
if (fail === 'quota') return false;
storage.set(key, value);
return true;
},
removeFromStorage: (key: string) => { storage.delete(key); },
syncBaseKey: () => 'base',
convergentProviderBaselineKey: () => 'convergent-base',
clearSyncAnchor: () => { storage.delete('anchor'); },
providerAccountIdKey: () => 'account',
exitBlockedState() {},
notifyStateChange: () => { notifications += 1; },
async saveProviderConnection(_provider: string, connection: ProviderConnection) {
await saveProviderConnectionImpl.call(manager, 'webdav', connection);
},
};
return {
manager, storage, original,
recover: () => { fail = undefined; },
notifications: () => notifications,
signOuts: () => signOuts,
};
}
test('disconnect clears provider connection and merge state while retaining local data', async () => {
const h = harness();
await disconnectProviderImpl.call(h.manager, 'webdav');
assert.deepEqual(h.storage.get(providerConnectionStorageKey('webdav')), { provider: 'webdav', status: 'disconnected' });
for (const key of ['base', 'convergent-base', 'anchor', 'account']) assert.equal(h.storage.has(key), false);
assert.deepEqual(h.storage.get('backup-history'), ['fixture-backup']);
assert.equal(h.storage.get('sync-password'), 'fixture-password');
assert.equal(h.storage.get('auto-sync'), true);
assert.equal(h.notifications(), 1);
assert.equal(h.signOuts(), 1);
});
for (const failure of ['throw', 'quota'] as const) {
test(`disconnect rejects ${failure} save failures and allows retry`, async () => {
const h = harness(failure);
await assert.rejects(disconnectProviderImpl.call(h.manager, 'webdav'));
assert.equal(h.storage.get(providerConnectionStorageKey('webdav')), h.original);
assert.equal(h.manager.state.providers.webdav, h.original);
assert.equal(h.notifications(), 0);
assert.equal(h.signOuts(), 0);
h.recover();
await disconnectProviderImpl.call(h.manager, 'webdav');
assert.equal(h.manager.state.providers.webdav.status, 'disconnected');
assert.equal(h.signOuts(), 1);
assert.equal(h.notifications(), 1);
});
}