multi-tenant relay und card-push to user

public/js/modules/caldav.js

@@ -222,24 +222,48 @@ function showConnectionLog(lines) {
 
 // ── Relay settings ──
 
+function setRelayStatus(text, kind = 'info') {
+    const el = $('relay-status');
+    if (!el) return;
+    if (!text) {
+        el.classList.add('hidden');
+        el.textContent = '';
+        el.style.borderColor = '';
+        el.style.color = '';
+        return;
+    }
+    el.classList.remove('hidden');
+    el.textContent = text;
+    if (kind === 'error') { el.style.borderColor = 'var(--t-danger)'; el.style.color = 'var(--t-danger)'; }
+    else if (kind === 'success') { el.style.borderColor = 'var(--t-accent)'; el.style.color = 'var(--t-accent)'; }
+    else { el.style.borderColor = 'var(--t-border)'; el.style.color = 'var(--t-muted)'; }
+}
+
 $('relay-save')?.addEventListener('click', async () => {
-    const relayStatus = $('relay-status');
-    const body = { url: $('relay-url')?.value || '' };
-    const key = $('relay-key')?.value;
-    if (key) body.key = key;
+    const body = {
+        url: $('relay-url')?.value || '',
+        username: $('relay-username')?.value || '',
+        key: $('relay-key')?.value || '',
+    };
+    setRelayStatus('saving...');
     await api('api/relay/settings', { method: 'POST', body });
-    if (relayStatus) { relayStatus.textContent = 'saved'; relayStatus.style.color = 'var(--t-accent)'; }
+    setRelayStatus('saved', 'success');
+    setTimeout(() => setRelayStatus(''), 1500);
 });
 
 $('relay-test')?.addEventListener('click', async () => {
-    const relayStatus = $('relay-status');
-    if (relayStatus) { relayStatus.textContent = 'testing...'; relayStatus.style.color = 'var(--t-dim)'; }
-    const res = await fetch('api/relay/poll', { method: 'POST', headers: { 'X-CSRF-Token': getCsrf() } }).then(r => r.json()).catch(() => null);
+    setRelayStatus('testing...');
+    const res = await fetch('api/relay/poll', {
+        method: 'POST',
+        headers: { 'Content-Type': 'application/json', 'X-CSRF-Token': getCsrf() },
+        body: JSON.stringify({ strict: true }),
+    }).then(r => r.json()).catch(() => null);
     if (res?.ok) {
-        if (relayStatus) { relayStatus.textContent = `ok — ${res.pulled} pulled`; relayStatus.style.color = 'var(--t-accent)'; }
+        setRelayStatus(`ok — ${res.pulled} pulled`, 'success');
         if (res.pulled) await window._reloadAll?.();
     } else {
-        if (relayStatus) { relayStatus.textContent = res?.error || 'failed'; relayStatus.style.color = 'var(--t-danger)'; }
+        const detail = res?.sent_username ? ` (sent username: ${res.sent_username})` : '';
+        setRelayStatus((res?.error || 'failed') + detail, 'error');
     }
 });
 
@@ -247,9 +271,14 @@ export async function loadRelaySettings() {
     const s = await api('api/relay/settings');
     if (!s) return;
     const urlInput = $('relay-url');
+    const userInput = $('relay-username');
     const keyInput = $('relay-key');
     if (urlInput) urlInput.value = s.url || '';
-    if (keyInput) keyInput.placeholder = s.has_key ? '(saved)' : 'shared secret';
+    if (userInput) userInput.value = s.username || '';
+    if (keyInput) {
+        keyInput.value = s.key || '';
+        keyInput.placeholder = 'shared secret';
+    }
 }
 
 $('cal-caldav-settings')?.addEventListener('click', openCaldavSettings);