wire spec-driven auth: remove VITE_AUTH_BASE_URL, reorder providers
- main.jsx: remove VITE_AUTH_BASE_URL env var; add AppContent that reads authConfig from useAppContext() and passes to AuthProvider; reorder: AppProvider -> AuthProvider -> BrowserRouter - sync react-openapi: AuthConfig type, extractAuthConfig, loading fix - sync react-auth: authConfig prop, config-driven paths, server logout
This commit is contained in:
@@ -1,11 +1,12 @@
|
||||
import { createContext, useContext } from "react";
|
||||
import type { ProfileComponents, ProfileOperation, 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 { ProfileOperation, 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,6 +11,19 @@ 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 ?? {};
|
||||
@@ -30,10 +43,20 @@ function extractProfileOperations(spec: any): ProfileOperation[] {
|
||||
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[]>([]);
|
||||
@@ -59,6 +82,7 @@ export function AppProvider({ specConfiguration, children }: AppProviderProps) {
|
||||
setWarnings(warns);
|
||||
setSchemas(spec.components?.schemas ?? {});
|
||||
setProfileOperations(extractProfileOperations(spec));
|
||||
setAuthConfig(extractAuthConfig(spec));
|
||||
}
|
||||
|
||||
if (errs.length === 0) {
|
||||
@@ -97,12 +121,13 @@ export function AppProvider({ specConfiguration, children }: AppProviderProps) {
|
||||
resources,
|
||||
profileOperations,
|
||||
profileComponents,
|
||||
authConfig,
|
||||
schemas,
|
||||
loading,
|
||||
errors,
|
||||
warnings,
|
||||
}),
|
||||
[specConfiguration, resources, profileOperations, profileComponents, 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