auth-fixes (#12)
## Summary
Wire spec-driven auth into the frontend. Auth config (server URL, paths) is extracted from the served OpenAPI spec by `AppProvider`. `AuthProvider` receives the config as a prop. 401 responses from both the main API and the auth server dispatch an `auth:unauthorized` event that triggers redirect to `/login`. Fix `ProfileRoutes` URL duplication bug.
## Changes
### Auth config from spec
- **`main.jsx`** — `AppProvider` wraps everything, loads spec, exposes `authConfig`. `AuthProvider` receives `authConfig` from `useAppContext()`. `onUnauthorized` passed to both `AppProvider` and `AuthProvider` wires `navigate("/login")`.
### 401 handling
- **`AppProvider.tsx`** — remove `onUnauthorized` prop (handled by `AuthProvider`'s event listener instead, avoiding double-navigation).
- **`useApi.ts`** — 401 response interceptor dispatches `auth:unauthorized` CustomEvent on `window`.
### Profile routing fix
- **`Admin.tsx:ProfileRoutes`** — replace nested `<Routes>` (which caused `/profile/me/me` URL duplication with React Router v6) with `useLocation()`/`useNavigate()` conditional rendering. Only allows `/profile/me` and `/profile/me/edit`.
- **`Admin.tsx:ProfileComponentWrapper`** — replace `pushState() + reload()` with React Router `navigate()` for both `onEdit` and `handleSubmit`.
### Debug logging
- Temporary console logs at every navigation point for diagnosing remaining issues.
Reviewed-on: #12
Co-authored-by: Vishesh 'ironeagle' Bangotra <aetoskia@gmail.com>
Co-committed-by: Vishesh 'ironeagle' Bangotra <aetoskia@gmail.com>
This commit is contained in:
@@ -3,6 +3,15 @@ import { tokenStore } from "./token";
|
||||
import { createApiClient } from "./axios";
|
||||
import { AuthUser } from "./models";
|
||||
|
||||
export interface AuthServerConfig {
|
||||
serverUrl: string;
|
||||
loginPath: string;
|
||||
registerPath: string;
|
||||
logoutPath: string;
|
||||
mePath: string;
|
||||
introspectPath: string;
|
||||
}
|
||||
|
||||
interface AuthContextModel {
|
||||
currentUser: AuthUser | null;
|
||||
token: string | null;
|
||||
@@ -17,24 +26,26 @@ const AuthContext = createContext<AuthContextModel | undefined>(undefined);
|
||||
|
||||
export function AuthProvider({
|
||||
children,
|
||||
authBaseUrl,
|
||||
authConfig,
|
||||
onUnauthorized,
|
||||
}: {
|
||||
children: React.ReactNode;
|
||||
authBaseUrl: string;
|
||||
authConfig: AuthServerConfig;
|
||||
onUnauthorized?: () => void;
|
||||
}) {
|
||||
const [currentUser, setCurrentUser] = useState<AuthUser | null>(null);
|
||||
const [token, setToken] = useState<string | null>(tokenStore.get());
|
||||
const [loading, setLoading] = useState(false);
|
||||
const [error, setError] = useState<string | null>(null);
|
||||
|
||||
const auth = createApiClient(authBaseUrl);
|
||||
const auth = createApiClient(authConfig.serverUrl);
|
||||
|
||||
const login = async (username: string, password: string) => {
|
||||
try {
|
||||
setLoading(true);
|
||||
setError(null);
|
||||
|
||||
const res = await auth.post("/login", { username, password });
|
||||
const res = await auth.post(authConfig.loginPath, { username, password });
|
||||
const { access_token, user } = res.data;
|
||||
|
||||
tokenStore.set(access_token);
|
||||
@@ -52,7 +63,7 @@ export function AuthProvider({
|
||||
setLoading(true);
|
||||
setError(null);
|
||||
|
||||
await auth.post("/register", { username, password });
|
||||
await auth.post(authConfig.registerPath, { username, password });
|
||||
await login(username, password);
|
||||
} catch (e: any) {
|
||||
setError(e.response?.data?.detail ?? "Registration failed");
|
||||
@@ -61,25 +72,55 @@ export function AuthProvider({
|
||||
}
|
||||
};
|
||||
|
||||
const logout = () => {
|
||||
const logout = async () => {
|
||||
try {
|
||||
await auth.post(authConfig.logoutPath);
|
||||
} catch {
|
||||
// Server logout is best-effort; clear token locally regardless
|
||||
}
|
||||
tokenStore.clear();
|
||||
setToken(null);
|
||||
setCurrentUser(null);
|
||||
};
|
||||
|
||||
const fetchCurrentUser = async () => {
|
||||
if (!token) return;
|
||||
if (!token) { console.log("[AuthProvider] fetchCurrentUser SKIP no token"); return; }
|
||||
console.log("[AuthProvider] fetchCurrentUser calling %s%s", authConfig.serverUrl, authConfig.mePath);
|
||||
try {
|
||||
const me = await auth.get("/me");
|
||||
const me = await auth.get(authConfig.mePath);
|
||||
console.log("[AuthProvider] fetchCurrentUser SUCCESS", me.data);
|
||||
setCurrentUser({ ...me.data });
|
||||
} catch {
|
||||
logout();
|
||||
} catch (e: any) {
|
||||
console.log("[AuthProvider] fetchCurrentUser ERROR", e.message, e.response?.status);
|
||||
tokenStore.clear();
|
||||
setToken(null);
|
||||
setCurrentUser(null);
|
||||
onUnauthorized?.();
|
||||
}
|
||||
};
|
||||
|
||||
useEffect(() => {
|
||||
fetchCurrentUser();
|
||||
}, [token]);
|
||||
console.log("[AuthProvider] useEffect token=%s serverUrl=%s", token, authConfig.serverUrl);
|
||||
if (authConfig.serverUrl) {
|
||||
fetchCurrentUser();
|
||||
}
|
||||
}, [token, authConfig.serverUrl]);
|
||||
|
||||
useEffect(() => {
|
||||
const handler = () => {
|
||||
console.log("[AuthProvider] auth:unauthorized event received");
|
||||
tokenStore.clear();
|
||||
setToken(null);
|
||||
setCurrentUser(null);
|
||||
onUnauthorized?.();
|
||||
};
|
||||
console.log("[AuthProvider] adding auth:unauthorized listener");
|
||||
window.addEventListener("auth:unauthorized", handler);
|
||||
return () => {
|
||||
console.log("[AuthProvider] removing auth:unauthorized listener");
|
||||
window.removeEventListener("auth:unauthorized", handler);
|
||||
};
|
||||
}, [onUnauthorized]);
|
||||
|
||||
return (
|
||||
<AuthContext.Provider
|
||||
@@ -94,4 +135,4 @@ export function useAuth(): AuthContextModel {
|
||||
const ctx = useContext(AuthContext);
|
||||
if (!ctx) throw new Error("useAuth must be used inside AuthProvider");
|
||||
return ctx;
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user