Replace the API-key SPA model with the session-cookie auth from PR1: - client.ts: stop sending X-Api-Key; attach X-Csrf on mutating verbs (POST/PUT/ PATCH/DELETE); add suppressUnauthorizedSignal to skip the global 401 signal on expected wrong-credentials 401s (login / change-password). - api/auth.ts: hand-written wire types (AuthConfig/AuthSession/MachineKey — the auth surface is IgnoreApi, deliberately not in generated types) + endpoint fns (getAuthConfig/getAuthSession/login/setup/logout/changePassword/getMachineKey); keep the notifyUnauthorized/subscribeUnauthorized 401 signal; add clearLegacyStoredApiKey. Legacy get/set/clearStoredApiKey retained ONLY so the still-shipping ApiKeyScreen (machine-key slice) compiles without a cross-slice conflict — the client no longer reads them. - AuthGate.tsx: boot gate wrapping <App/> outside the shell (mints no URL, deep links survive login). checking -> setup | login | ready | error, with a safe default AuthContext so App.test.tsx renders without a provider; config-fetch failure lands on an explicit error+Retry, never a blank screen. - LoginScreen / SetupScreen: shell-less centered cards; inline 401 / 409 handling; SSO button + local-form gating from AuthConfig. - UnauthorizedBanner: rewritten to prompt re-login (passive; consults the unsaved-changes guard before flipping the gate). - UserMenu: TopBar sign-out (guard -> logout -> signOut), mounted next to ConnectMenu. - main.tsx: wrap <AuthGate><App/></AuthGate> inside StrictMode. Tests: client/auth/AuthGate/LoginScreen/SetupScreen/UnauthorizedBanner/UserMenu (723 pass). Lint + build green. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
45 lines
1.7 KiB
TypeScript
45 lines
1.7 KiB
TypeScript
import { useContext, useEffect, useState } from 'react';
|
|
import { LogIn, X } from 'lucide-react';
|
|
import { subscribeUnauthorized } from './api';
|
|
import { AuthContext } from './AuthGate';
|
|
import { canLeaveCurrentScreen } from './navigationGuard';
|
|
|
|
// Shell-level pointer shown when any `/api` request returns 401 (#295 session-auth). Rather than teach
|
|
// every screen's error path to special-case 401, the request client emits one app-wide signal (auth.ts)
|
|
// and this single banner subscribes — DRY, and it renders regardless of which screen triggered it.
|
|
//
|
|
// It stays PASSIVE: a background 401 must not yank the user mid-edit, so it only surfaces the banner. The
|
|
// "Sign in" affordance consults the unsaved-changes guard before flipping the gate to the login screen, so
|
|
// a dirty draft isn't silently discarded.
|
|
export function UnauthorizedBanner() {
|
|
const [visible, setVisible] = useState(false);
|
|
const { requireLogin } = useContext(AuthContext);
|
|
|
|
useEffect(() => subscribeUnauthorized(() => setVisible(true)), []);
|
|
|
|
if (!visible) {
|
|
return null;
|
|
}
|
|
|
|
const signIn = () => {
|
|
if (!canLeaveCurrentScreen()) {
|
|
return;
|
|
}
|
|
setVisible(false);
|
|
requireLogin();
|
|
};
|
|
|
|
return (
|
|
<div className="ctv-auth-banner" role="alert">
|
|
<LogIn aria-hidden="true" size={15} />
|
|
<span className="ctv-auth-banner-text">Your session has expired or you are signed out.</span>
|
|
<button className="ctv-auth-banner-link ctv-press" onClick={signIn} type="button">
|
|
Sign in
|
|
</button>
|
|
<button aria-label="Dismiss" className="ctv-auth-banner-dismiss ctv-press" onClick={() => setVisible(false)} type="button">
|
|
<X aria-hidden="true" size={14} />
|
|
</button>
|
|
</div>
|
|
);
|
|
}
|