Third sweep, 20 more sites: the rest of AdminUsers (the access-request and invite clusters), Scheduler, SettingsPanel, SetupWizard, About, Feed, KeyGate, OnboardingWizard -- and, importantly, four platform components that were still hand-rolling their own buttons: Modal's close, Banner's dismiss, SidePanel's two toggles and QueryState's retry. A platform layer that bypasses its own primitive is the same defect one level up. Hand-rolled buttons with their own geometry: 110 -> 39; Button call sites 37 -> 106. What is left is deliberate, and it is the list Button's own docstring excludes plus two families this pass refused to force: video overlay controls painted on white/N, drag handles, chip removers, accent-solid pills, the bg-card family on the signed-out screen, and sites whose paint is conditional (`suspended ? warn : neutral`) or otherwise has no variant yet. Forcing those through a className override would be unsafe without tailwind-merge, which is exactly the hazard this sprint documented. 3x tsc, eslint, knip, prettier, 689 vitest green; UAT on Settings and the About dialog (its close button and full-width CTA are both migrated), clean console.
170 lines
6.1 KiB
TypeScript
170 lines
6.1 KiB
TypeScript
import { useState } from "react";
|
|
import { qk } from "../lib/queryKeys";
|
|
import { useTranslation } from "react-i18next";
|
|
import { useQuery, useQueryClient } from "@tanstack/react-query";
|
|
import { AlertTriangle, Lock, ShieldCheck } from "lucide-react";
|
|
import { api, HttpError } from "../lib/api";
|
|
import * as e2ee from "../lib/e2ee";
|
|
import { Button } from "./ui/Button";
|
|
import { inputCls } from "./ui/form";
|
|
|
|
// Secure-messaging key gate: first-run setup (choose a passphrase) or unlock on this device.
|
|
// Self-contained — on success it updates the shared e2ee unlock state, so any observing view
|
|
// (the Messages page, a dock window) swaps out of the gate automatically. In unlock mode it also
|
|
// offers a forgotten-passphrase reset (the only escape from the set-once wall).
|
|
export default function KeyGate({ meId, compact = false }: { meId: number; compact?: boolean }) {
|
|
const { t } = useTranslation();
|
|
const qc = useQueryClient();
|
|
const keyQ = useQuery({
|
|
queryKey: qk.messageKey(),
|
|
queryFn: api.messageMyKey,
|
|
staleTime: 60_000,
|
|
});
|
|
const configured = keyQ.data?.configured ?? false;
|
|
// Password accounts must re-verify to reset (guards a hijacked session); Google-only accounts
|
|
// have no password to check. Reactive passive observer of the App-owned qk.me() query (enabled:
|
|
// false — App does the fetching), so hasPassword stays correct even if me resolves after mount.
|
|
const meQ = useQuery({ queryKey: qk.me(), queryFn: api.me, enabled: false });
|
|
const hasPassword = meQ.data?.has_password ?? false;
|
|
|
|
const [view, setView] = useState<"gate" | "reset">("gate");
|
|
const [pass, setPass] = useState("");
|
|
const [confirm, setConfirm] = useState("");
|
|
const [curPass, setCurPass] = useState("");
|
|
const [err, setErr] = useState<string | null>(null);
|
|
const [busy, setBusy] = useState(false);
|
|
|
|
async function submit() {
|
|
setErr(null);
|
|
if (pass.length < 6) return setErr(t("messages.passTooShort"));
|
|
if (!configured && pass !== confirm) return setErr(t("messages.passMismatch"));
|
|
setBusy(true);
|
|
try {
|
|
if (configured) {
|
|
await e2ee.unlock(meId, pass, keyQ.data!);
|
|
} else {
|
|
const payload = await e2ee.setup(meId, pass);
|
|
await api.setupMessageKey(payload);
|
|
}
|
|
qc.invalidateQueries({ queryKey: qk.messageKey() });
|
|
} catch {
|
|
setErr(configured ? t("messages.wrongPass") : t("messages.setupFailed"));
|
|
} finally {
|
|
setBusy(false);
|
|
}
|
|
}
|
|
|
|
function toReset() {
|
|
setErr(null);
|
|
setPass("");
|
|
setConfirm("");
|
|
setView("reset");
|
|
}
|
|
function cancelReset() {
|
|
setErr(null);
|
|
setCurPass("");
|
|
setView("gate");
|
|
}
|
|
|
|
async function doReset() {
|
|
setErr(null);
|
|
if (hasPassword && !curPass) return setErr(t("messages.resetNeedPass"));
|
|
setBusy(true);
|
|
try {
|
|
await api.resetMessageKey(hasPassword ? curPass : undefined);
|
|
// Server key + dead history are gone; wipe this device's identity too so the gate re-appears
|
|
// in setup mode. Invalidate last so the refetch sees configured:false.
|
|
await e2ee.resetLocal(meId);
|
|
setCurPass("");
|
|
setView("gate");
|
|
qc.invalidateQueries({ queryKey: qk.messageKey() });
|
|
} catch (e) {
|
|
setErr(e instanceof HttpError && e.detail ? e.detail : t("messages.resetFailed"));
|
|
} finally {
|
|
setBusy(false);
|
|
}
|
|
}
|
|
|
|
if (keyQ.isLoading)
|
|
return <div className="p-6 text-center text-muted text-sm">{t("common.loading")}</div>;
|
|
|
|
if (view === "reset")
|
|
return (
|
|
<div className={`glass rounded-2xl space-y-3 ${compact ? "p-3" : "p-4"}`}>
|
|
<div className="flex items-center gap-2">
|
|
<AlertTriangle className="w-5 h-5 text-danger shrink-0" />
|
|
<div className="font-semibold text-sm">{t("messages.resetTitle")}</div>
|
|
</div>
|
|
<p className="text-sm text-muted">{t("messages.resetWarn")}</p>
|
|
{hasPassword && (
|
|
<input
|
|
type="password"
|
|
autoComplete="current-password"
|
|
value={curPass}
|
|
onChange={(e) => setCurPass(e.target.value)}
|
|
placeholder={t("messages.resetCurrentPass")}
|
|
className={inputCls}
|
|
/>
|
|
)}
|
|
{err && <div className="text-sm text-danger">{err}</div>}
|
|
<div className="flex gap-2">
|
|
<Button variant="outline" onClick={cancelReset} disabled={busy}>
|
|
{t("common.cancel")}
|
|
</Button>
|
|
<Button
|
|
variant="danger"
|
|
onClick={doReset}
|
|
disabled={busy}
|
|
icon={<AlertTriangle className="w-4 h-4" />}
|
|
>
|
|
{t("messages.resetButton")}
|
|
</Button>
|
|
</div>
|
|
</div>
|
|
);
|
|
|
|
return (
|
|
<div className={`glass rounded-2xl space-y-3 ${compact ? "p-3" : "p-4"}`}>
|
|
<div className="flex items-center gap-2">
|
|
<ShieldCheck className="w-5 h-5 text-accent shrink-0" />
|
|
<div className="font-semibold text-sm">
|
|
{configured ? t("messages.unlockTitle") : t("messages.setupTitle")}
|
|
</div>
|
|
</div>
|
|
{!compact && (
|
|
<p className="text-sm text-muted">
|
|
{configured ? t("messages.unlockBody") : t("messages.setupBody")}
|
|
</p>
|
|
)}
|
|
<input
|
|
type="password"
|
|
value={pass}
|
|
onChange={(e) => setPass(e.target.value)}
|
|
onKeyDown={(e) => e.key === "Enter" && configured && submit()}
|
|
placeholder={t("messages.passphrase")}
|
|
className={inputCls}
|
|
/>
|
|
{!configured && (
|
|
<input
|
|
type="password"
|
|
value={confirm}
|
|
onChange={(e) => setConfirm(e.target.value)}
|
|
placeholder={t("messages.passphraseConfirm")}
|
|
className={inputCls}
|
|
/>
|
|
)}
|
|
{err && <div className="text-sm text-danger">{err}</div>}
|
|
<Button variant="primary" size="md" onClick={submit} disabled={busy || !pass}>
|
|
<Lock className="w-4 h-4" />
|
|
{configured ? t("messages.unlock") : t("messages.setUp")}
|
|
</Button>
|
|
{configured && (
|
|
<button onClick={toReset} className="block text-xs text-muted hover:text-fg">
|
|
{t("messages.forgotPass")}
|
|
</button>
|
|
)}
|
|
{!configured && !compact && <p className="text-xs text-muted">{t("messages.setupWarn")}</p>}
|
|
</div>
|
|
);
|
|
}
|