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,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);
|
||||
|
||||
Reference in New Issue
Block a user