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:
@@ -1,5 +1,6 @@
|
||||
export { AppProvider } from "./src/context/AppProvider";
|
||||
export { Admin } from "./src/components/Admin";
|
||||
export { Admin, ProfileRoutes } from "./src/components/Admin";
|
||||
export type { AdminProps, ProfileRoute } from "./src/components/Admin";
|
||||
export { useAppContext } from "./src/context/AppContext";
|
||||
export { useResource } from "./src/context/useResource";
|
||||
export { ListCellRenderer, DetailFieldRenderer, applyDisplayFormat } from "./src/components/fields";
|
||||
@@ -11,4 +12,4 @@ export { useItemSse } from "./src/hooks/useItemSse";
|
||||
export { sanitizePayload } from "./src/utils/sanitize-payload";
|
||||
export type { FkResolver } from "./src/utils/sanitize-payload";
|
||||
export type { FilterComponentProps } from "./src/context/useResource";
|
||||
export type { SpecConfiguration, ResourceConfig, FieldConfig, FKFieldConfig, ResourceRelationship } from "./src/types";
|
||||
export type { SpecConfiguration, ResourceConfig, FieldConfig, FKFieldConfig, ResourceRelationship, ProfileOperation, ProfileComponents, AuthConfig } from "./src/types";
|
||||
|
||||
@@ -1,14 +1,15 @@
|
||||
import React from "react";
|
||||
import { Routes, Route, Navigate } from "react-router-dom";
|
||||
import { Box, CircularProgress } from "@mui/material";
|
||||
import React, { useEffect, useState } from "react";
|
||||
import { Routes, Route, Navigate, useLocation, useNavigate } from "react-router-dom";
|
||||
import { Box, CircularProgress, Alert } from "@mui/material";
|
||||
import { useAppContext } from "../context/AppContext";
|
||||
import { Layout } from "./Layout";
|
||||
import { ResourceList } from "./ResourceList";
|
||||
import { ResourceForm } from "./ResourceForm";
|
||||
import { ResourceDetail } from "./ResourceDetail";
|
||||
import { ValidationAlert } from "./ValidationAlert";
|
||||
import { getApi } from "../hooks/useApi";
|
||||
|
||||
interface AdminProps {
|
||||
export interface AdminProps {
|
||||
basePath: string;
|
||||
}
|
||||
|
||||
@@ -42,7 +43,8 @@ export function Admin({ basePath }: AdminProps) {
|
||||
{warnings.length > 0 && <ValidationAlert errors={[]} warnings={warnings} />}
|
||||
<Layout resources={topLevel} basePath={basePath}>
|
||||
<Routes>
|
||||
<Route index element={<Navigate to={`${basePath}/${topLevel[0].name}`} replace />} />
|
||||
<Route index element={<Navigate to={`${basePath}/${topLevel[0]?.name ?? "profile"}`} replace />} />
|
||||
|
||||
{topLevel.map((r) => (
|
||||
<React.Fragment key={r.name}>
|
||||
<Route path={r.name} element={<ResourceList resource={r} basePath={basePath} />} />
|
||||
@@ -60,3 +62,181 @@ export function Admin({ basePath }: AdminProps) {
|
||||
</>
|
||||
);
|
||||
}
|
||||
|
||||
export interface ProfileRoute {
|
||||
path: string;
|
||||
method: string;
|
||||
operationId: string;
|
||||
summary?: string;
|
||||
}
|
||||
|
||||
/** Derive a friendly profile route path from the operation's spec path.
|
||||
* e.g. "/users/me" → "me", "/users/me/" → "me" */
|
||||
function friendlyProfilePath(specPath: string): string {
|
||||
return specPath.replace(/^\/[^/]+\/?/, "").replace(/\/+$/, "");
|
||||
}
|
||||
|
||||
export function ProfileRoutes() {
|
||||
const { profileOperations, profileComponents } = useAppContext();
|
||||
const ops = profileOperations;
|
||||
const getOp = ops.find((o) => o.method === "GET");
|
||||
const location = useLocation();
|
||||
const navigate = useNavigate();
|
||||
|
||||
console.log("[ProfileRoutes] render pathname=%s ops=%o", location.pathname, ops.map(o => o.path));
|
||||
|
||||
// Redirect /:username to /me (only "me" and "me/edit" are valid)
|
||||
const match = location.pathname.match(/^\/profile\/(.+)$/);
|
||||
const username = match ? match[1] : "";
|
||||
console.log("[ProfileRoutes] match=%o username=%s", match && match[1], username);
|
||||
if (username !== "me" && username !== "me/edit") {
|
||||
console.log("[ProfileRoutes] redirecting to /profile/me");
|
||||
navigate("/profile/me", { replace: true });
|
||||
return null;
|
||||
}
|
||||
|
||||
const isEdit = username === "me/edit";
|
||||
const mode = isEdit ? "edit" as const : "view" as const;
|
||||
console.log("[ProfileRoutes] mode=%s", mode);
|
||||
|
||||
const op = ops.find((o) => {
|
||||
if (isEdit && (o.method === "PUT" || o.method === "PATCH")) return true;
|
||||
if (!isEdit && o.method === "GET") return true;
|
||||
return false;
|
||||
});
|
||||
|
||||
if (!op) return null;
|
||||
|
||||
let Component: React.ComponentType<any> | undefined;
|
||||
if (mode === "view" && profileComponents.view) {
|
||||
Component = profileComponents.view;
|
||||
} else if (mode === "edit" && profileComponents.edit) {
|
||||
Component = profileComponents.edit;
|
||||
}
|
||||
|
||||
if (!Component) return null;
|
||||
|
||||
return (
|
||||
<ProfileComponentWrapper
|
||||
Component={Component}
|
||||
mode={mode}
|
||||
operation={op}
|
||||
getOperation={getOp}
|
||||
/>
|
||||
);
|
||||
}
|
||||
|
||||
function ProfileComponentWrapper({
|
||||
Component,
|
||||
mode,
|
||||
operation,
|
||||
getOperation,
|
||||
}: {
|
||||
Component: React.ComponentType<any>;
|
||||
mode: "view" | "create" | "edit";
|
||||
operation: { path: string; method: string };
|
||||
getOperation?: { path: string };
|
||||
}) {
|
||||
const navigate = useNavigate();
|
||||
const [data, setData] = useState<any>(null);
|
||||
const [loading, setLoading] = useState(mode !== "create");
|
||||
const [error, setError] = useState<string | null>(null);
|
||||
console.log("[ProfileComponentWrapper] render mode=%s fetchPath=%s", mode, getOperation?.path ?? operation.path);
|
||||
|
||||
const fetchPath = getOperation?.path ?? operation.path;
|
||||
|
||||
const fetchData = async () => {
|
||||
console.log("[ProfileComponentWrapper] fetchData START path=%s", fetchPath);
|
||||
setLoading(true);
|
||||
setError(null);
|
||||
try {
|
||||
const res = await getApi().get(fetchPath);
|
||||
console.log("[ProfileComponentWrapper] fetchData SUCCESS", res.data);
|
||||
setData(res.data);
|
||||
} catch (e: any) {
|
||||
console.log("[ProfileComponentWrapper] fetchData ERROR", e.message, e.response?.status);
|
||||
setError(e.response?.data?.detail ?? e.message ?? "Failed to load profile");
|
||||
} finally {
|
||||
setLoading(false);
|
||||
}
|
||||
};
|
||||
|
||||
useEffect(() => {
|
||||
if (mode !== "create") {
|
||||
console.log("[ProfileComponentWrapper] useEffect calling fetchData");
|
||||
fetchData();
|
||||
}
|
||||
}, [fetchPath, mode]);
|
||||
|
||||
const handleSubmit = async (formData: Record<string, any>) => {
|
||||
console.log("[ProfileComponentWrapper] handleSubmit START");
|
||||
setLoading(true);
|
||||
setError(null);
|
||||
try {
|
||||
if (mode === "create") {
|
||||
await getApi().post(operation.path, formData);
|
||||
} else {
|
||||
await getApi()({ method: operation.method.toLowerCase(), url: operation.path, data: formData });
|
||||
}
|
||||
console.log("[ProfileComponentWrapper] handleSubmit SUCCESS, navigating to /profile/me");
|
||||
const base = friendlyProfilePath(operation.path);
|
||||
navigate(`/profile/${base}`, { replace: true });
|
||||
} catch (e: any) {
|
||||
console.log("[ProfileComponentWrapper] handleSubmit ERROR", e.message, e.response?.status);
|
||||
setError(e.response?.data?.detail ?? e.message ?? "Operation failed");
|
||||
} finally {
|
||||
setLoading(false);
|
||||
}
|
||||
};
|
||||
|
||||
if (loading && !data && mode !== "create") {
|
||||
return (
|
||||
<Box sx={{ display: "flex", justifyContent: "center", mt: 4 }}>
|
||||
<CircularProgress />
|
||||
</Box>
|
||||
);
|
||||
}
|
||||
|
||||
if (error && !data && mode !== "create") {
|
||||
return (
|
||||
<Box sx={{ maxWidth: 480, mx: "auto", mt: 4 }}>
|
||||
<Alert severity="error">{error}</Alert>
|
||||
</Box>
|
||||
);
|
||||
}
|
||||
|
||||
const props: Record<string, any> = {};
|
||||
|
||||
if (mode === "view") {
|
||||
if (data) {
|
||||
props.name = data.name;
|
||||
props.username = data.username;
|
||||
props.email = data.email;
|
||||
}
|
||||
props.onEdit = () => navigate("/profile/me/edit");
|
||||
props.loading = loading;
|
||||
}
|
||||
|
||||
if (mode === "create") {
|
||||
props.defaultUsername = data?.username;
|
||||
props.defaultEmail = data?.email;
|
||||
props.onBack = () => window.history.back();
|
||||
props.onSubmit = handleSubmit;
|
||||
props.loading = loading;
|
||||
props.error = error;
|
||||
}
|
||||
|
||||
if (mode === "edit") {
|
||||
if (data) {
|
||||
props.name = data.name;
|
||||
props.username = data.username;
|
||||
props.email = data.email;
|
||||
}
|
||||
props.onBack = () => window.history.back();
|
||||
props.onSubmit = handleSubmit;
|
||||
props.loading = loading;
|
||||
props.error = error;
|
||||
}
|
||||
|
||||
return <Component {...props} />;
|
||||
}
|
||||
@@ -39,4 +39,4 @@ export function Layout({ resources, basePath, children }: LayoutProps) {
|
||||
</Box>
|
||||
</Box>
|
||||
);
|
||||
}
|
||||
}
|
||||
@@ -107,4 +107,4 @@ export function SideMenu({ resources, basePath, mobileOpen, onClose }: SideMenuP
|
||||
);
|
||||
}
|
||||
|
||||
export { drawerWidth };
|
||||
export { drawerWidth };
|
||||
@@ -1,9 +1,12 @@
|
||||
import { createContext, useContext } from "react";
|
||||
import type { ResourceConfig, SpecConfiguration, ValidationMessage } from "../types";
|
||||
import type { AuthConfig, ProfileComponents, ProfileOperation, ResourceConfig, SpecConfiguration, ValidationMessage } from "../types";
|
||||
|
||||
export interface AppContextValue {
|
||||
config: SpecConfiguration;
|
||||
resources: ResourceConfig[];
|
||||
profileOperations: ProfileOperation[];
|
||||
profileComponents: ProfileComponents;
|
||||
authConfig: AuthConfig;
|
||||
schemas: Record<string, any>;
|
||||
loading: boolean;
|
||||
errors: ValidationMessage[];
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import React, { useEffect, useState, useMemo } from "react";
|
||||
import type { SpecConfiguration, ResourceConfig, ValidationMessage } from "../types";
|
||||
import type { AuthConfig, ProfileOperation, SpecConfiguration, ResourceConfig, ValidationMessage } from "../types";
|
||||
import { AppContext } from "./AppContext";
|
||||
import { loadSpec } from "../spec-loader";
|
||||
import { validateSpec } from "../spec-validator";
|
||||
@@ -11,13 +11,58 @@ interface AppProviderProps {
|
||||
children: React.ReactNode;
|
||||
}
|
||||
|
||||
function extractAuthConfig(spec: any): AuthConfig {
|
||||
const bearer: Record<string, any> =
|
||||
spec?.components?.securitySchemes?.bearerAuth ?? {};
|
||||
return {
|
||||
serverUrl: bearer["x-server-url"] ?? "",
|
||||
loginPath: bearer["x-login-path"] ?? "/login",
|
||||
registerPath: bearer["x-register-path"] ?? "/register",
|
||||
logoutPath: bearer["x-logout-path"] ?? "/logout",
|
||||
mePath: bearer["x-me-path"] ?? "/me",
|
||||
introspectPath: bearer["x-introspect-path"] ?? "/introspect",
|
||||
};
|
||||
}
|
||||
|
||||
function extractProfileOperations(spec: any): ProfileOperation[] {
|
||||
const ops: ProfileOperation[] = [];
|
||||
const paths = spec.paths ?? {};
|
||||
for (const [path, methods] of Object.entries<Record<string, any>>(paths)) {
|
||||
for (const [method, operation] of Object.entries(methods)) {
|
||||
if (method.startsWith("x-")) continue;
|
||||
if (operation["x-profile"] === true) {
|
||||
ops.push({
|
||||
path,
|
||||
method: method.toUpperCase(),
|
||||
operationId: operation.operationId ?? "",
|
||||
summary: operation.summary,
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
return ops;
|
||||
}
|
||||
|
||||
const DEFAULT_AUTH_CONFIG: AuthConfig = {
|
||||
serverUrl: "",
|
||||
loginPath: "/login",
|
||||
registerPath: "/register",
|
||||
logoutPath: "/logout",
|
||||
mePath: "/me",
|
||||
introspectPath: "/introspect",
|
||||
};
|
||||
|
||||
export function AppProvider({ specConfiguration, children }: AppProviderProps) {
|
||||
const [loading, setLoading] = useState(true);
|
||||
const [resources, setResources] = useState<ResourceConfig[]>([]);
|
||||
const [profileOperations, setProfileOperations] = useState<ProfileOperation[]>([]);
|
||||
const [authConfig, setAuthConfig] = useState<AuthConfig>(DEFAULT_AUTH_CONFIG);
|
||||
const [schemas, setSchemas] = useState<Record<string, any>>({});
|
||||
const [errors, setErrors] = useState<ValidationMessage[]>([]);
|
||||
const [warnings, setWarnings] = useState<ValidationMessage[]>([]);
|
||||
|
||||
const profileComponents = specConfiguration.profileComponents ?? {};
|
||||
|
||||
useEffect(() => {
|
||||
let cancelled = false;
|
||||
|
||||
@@ -36,6 +81,8 @@ export function AppProvider({ specConfiguration, children }: AppProviderProps) {
|
||||
setErrors(errs);
|
||||
setWarnings(warns);
|
||||
setSchemas(spec.components?.schemas ?? {});
|
||||
setProfileOperations(extractProfileOperations(spec));
|
||||
setAuthConfig(extractAuthConfig(spec));
|
||||
}
|
||||
|
||||
if (errs.length === 0) {
|
||||
@@ -72,12 +119,15 @@ export function AppProvider({ specConfiguration, children }: AppProviderProps) {
|
||||
() => ({
|
||||
config: specConfiguration,
|
||||
resources,
|
||||
profileOperations,
|
||||
profileComponents,
|
||||
authConfig,
|
||||
schemas,
|
||||
loading,
|
||||
errors,
|
||||
warnings,
|
||||
}),
|
||||
[specConfiguration, resources, schemas, loading, errors, warnings]
|
||||
[specConfiguration, resources, profileOperations, profileComponents, authConfig, schemas, loading, errors, warnings]
|
||||
);
|
||||
|
||||
return React.createElement(AppContext.Provider, { value }, children);
|
||||
|
||||
@@ -1,13 +1,16 @@
|
||||
import axios, { AxiosInstance } from "axios";
|
||||
import { tokenStore } from "../../../react-auth/token";
|
||||
|
||||
let apiClient: AxiosInstance | null = null;
|
||||
let _onUnauthorized: (() => void) | undefined;
|
||||
|
||||
export function initApi(baseUrl: string, getToken?: () => string | null): AxiosInstance {
|
||||
export function initApi(baseUrl: string, getToken?: () => string | null, onUnauthorized?: () => void): AxiosInstance {
|
||||
if (apiClient && apiClient.defaults.baseURL === baseUrl) {
|
||||
_onUnauthorized = onUnauthorized;
|
||||
return apiClient;
|
||||
}
|
||||
|
||||
_onUnauthorized = onUnauthorized;
|
||||
|
||||
apiClient = axios.create({
|
||||
baseURL: baseUrl,
|
||||
headers: { "Content-Type": "application/json" },
|
||||
@@ -24,11 +27,12 @@ export function initApi(baseUrl: string, getToken?: () => string | null): AxiosI
|
||||
apiClient.interceptors.response.use(
|
||||
(res) => res,
|
||||
(error) => {
|
||||
if (error.response?.status === 401 && getToken) {
|
||||
const currentToken = getToken();
|
||||
if (currentToken) {
|
||||
tokenStore.clear();
|
||||
}
|
||||
if (error.response?.status === 401) {
|
||||
console.log("[useApi] 401 from %s %s - dispatching auth:unauthorized", error.config?.method, error.config?.url);
|
||||
window.dispatchEvent(new CustomEvent("auth:unauthorized"));
|
||||
_onUnauthorized?.();
|
||||
} else {
|
||||
console.log("[useApi] non-401 error %s from %s %s", error.response?.status, error.config?.method, error.config?.url);
|
||||
}
|
||||
return Promise.reject(error);
|
||||
}
|
||||
|
||||
@@ -45,6 +45,11 @@ export function validateSpec(spec: OpenApiSpec, specConfig?: SpecConfiguration):
|
||||
const hasSSE = pathObj?.get?.["x-sse"] === true;
|
||||
if (hasSSE) continue;
|
||||
|
||||
// Skip paths where all operations are profile-only (x-profile: true).
|
||||
const pathMethods = Object.entries(pathObj).filter(([k]) => !k.startsWith("x-") && k !== "parameters");
|
||||
const allProfile = pathMethods.length > 0 && pathMethods.every(([, op]: any) => op["x-profile"] === true);
|
||||
if (allProfile) continue;
|
||||
|
||||
if (isItemPath || isSubResource) {
|
||||
const responseRef = getResponseSchemaRef(pathObj);
|
||||
if (responseRef) {
|
||||
|
||||
@@ -80,6 +80,13 @@ export function buildResourceConfigs(spec: OpenApiSpec): ResourceConfig[] {
|
||||
for (const path of sortedPaths) {
|
||||
const segments = getSegments(path);
|
||||
const pathObj = paths[path];
|
||||
|
||||
// Skip paths where ALL non-parameter operations are profile-only (x-profile: true).
|
||||
// These are handled by Admin.tsx profile routes, not as CRUD resources.
|
||||
const pathMethods = Object.entries(pathObj).filter(([k]) => !k.startsWith("x-") && k !== "parameters");
|
||||
const allProfile = pathMethods.length > 0 && pathMethods.every(([, op]: any) => op["x-profile"] === true);
|
||||
if (allProfile) continue;
|
||||
|
||||
const lastSeg = segments[segments.length - 1];
|
||||
const isItemPath = /^\{.*\}$/.test(lastSeg);
|
||||
const paramIdx = segments.findIndex(
|
||||
|
||||
@@ -6,12 +6,37 @@ export interface ResourceConfiguration {
|
||||
};
|
||||
}
|
||||
|
||||
export interface ProfileComponents {
|
||||
create?: React.ComponentType<any>;
|
||||
edit?: React.ComponentType<any>;
|
||||
view?: React.ComponentType<any>;
|
||||
}
|
||||
|
||||
export interface SpecConfiguration {
|
||||
specUrl: string;
|
||||
baseApiUrl?: string;
|
||||
title?: string;
|
||||
getToken?: () => string | null;
|
||||
resourceConfig?: Record<string, ResourceConfiguration>;
|
||||
profileComponents?: ProfileComponents;
|
||||
}
|
||||
|
||||
/** Auth server config extracted from securitySchemes extensions. */
|
||||
export interface AuthConfig {
|
||||
serverUrl: string;
|
||||
loginPath: string;
|
||||
registerPath: string;
|
||||
logoutPath: string;
|
||||
mePath: string;
|
||||
introspectPath: string;
|
||||
}
|
||||
|
||||
/** Represents a single operation marked with `x-profile: true` in the spec. */
|
||||
export interface ProfileOperation {
|
||||
path: string;
|
||||
method: string;
|
||||
operationId: string;
|
||||
summary?: string;
|
||||
}
|
||||
|
||||
export interface ValidationMessage {
|
||||
|
||||
Reference in New Issue
Block a user