* refactor(providers): make server-configured providers admin-managed, not client-overridable A server-configured provider is now authoritative: the operator owns its API key and base URL, and the client cannot override either. This collapses the tri-state (server key / client base URL / client key) that was the root of a recurring "missing API key" bug class — when the settings UI echoed a base URL with an empty key, routes that treated "any base URL ⇒ fully client-configured" dropped the server key. #533 patched that per-route via canUseServerApiKeyForBaseUrl; this removes the guard entirely by fixing the design. Server: - resolve*ApiKey/BaseUrl ignore client values when the provider is server- configured; add isServerConfiguredProvider(section, id); drop canUseServerApiKeyForBaseUrl + normalizeProviderBaseUrl. - getServer*Providers() no longer return base URLs — only allowed models (LLM/image) and the managed flag (presence) — so an internal gateway/proxy endpoint is never exposed to the client. - routes (chat/image/video/tts/asr/pdf + verify-*) resolve managed providers purely server-side; SSRF validation now applies only to unmanaged (client) base URLs. Client: - drop serverBaseUrl from ProviderSettings, the settings store, request-building (TTS base URL no longer echoes the server URL) and voice resolution. - settings UI renders managed providers read-only: the key/base-URL override inputs and region toggles are hidden, leaving the "managed by server" notice. Tradeoff: overriding a server provider's key with your own for the same provider is removed; add a separate custom provider instead. Closes #620. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com> * chore(providers): refresh managed-provider copy, drop dead audio-settings, add #620 e2e - serverConfiguredNotice now says the provider is managed and not editable here, pointing users to add a separate provider for their own credentials (7 locales). - delete components/settings/audio-settings.tsx — unreferenced dead code. - add e2e/tests/managed-provider-620.spec.ts: managed provider hides the key/base-URL inputs; unmanaged provider keeps them. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com> * feat(providers): lock the model catalog for managed providers with a pinned list When the operator pins an allowed model list (MODELS env/yaml ⇒ serverModels), the model catalog is admin-managed too: the LLM provider panel shows the pinned models read-only with a "Server" badge and no add / reset / edit / delete affordances. Without a pinned list the server manages only credentials and the user keeps curating models. This removes the prior inconsistency where the settings panel let you add models to a pinned managed provider that the generation toolbar then filtered out. e2e: the managed-openai case now also asserts the catalog is locked. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com> * fix(providers): ignore (not reject) client overrides for managed web-search; clear legacy serverBaseUrl Addresses review feedback on #624: 1. Managed web-search providers now ignore a client-sent key/baseUrl instead of validating and rejecting it. A server-configured provider is admin-owned, so the server config is authoritative and a stale client base URL is dropped rather than 400-ing the request. The allowlist validation still runs for unmanaged providers, where the client base URL is actually used. 2. Drop the removed `serverBaseUrl` field from persisted localStorage on rehydrate (settings version 2 -> 3, stripped in both migrate and merge), so old clients don't keep a stale server URL in client state. Tests: web-search route test split into unmanaged-rejects-allowlist and managed-ignores-client-baseUrl; settings rehydrate test asserts a legacy serverBaseUrl is stripped. Full suite 381 pass; e2e 2 pass. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com> --------- Co-authored-by: Claude Opus 4.8 <noreply@anthropic.com> Co-authored-by: 杨慎 <117187635+cosarah@users.noreply.github.com>
52 lines
1.5 KiB
TypeScript
52 lines
1.5 KiB
TypeScript
import type { ProviderId, ModelInfo, ProviderType } from '@/lib/types/provider';
|
|
|
|
export type SettingsSection =
|
|
| 'general'
|
|
| 'providers'
|
|
| 'agents'
|
|
| 'tts'
|
|
| 'asr'
|
|
| 'pdf'
|
|
| 'image'
|
|
| 'video'
|
|
| 'web-search';
|
|
|
|
/**
|
|
* Unified provider configuration stored in JSON format
|
|
* Stores all provider-specific settings and metadata in one object
|
|
* Both built-in and custom providers use the same structure
|
|
*/
|
|
export interface ProviderSettings {
|
|
// Configuration
|
|
apiKey: string;
|
|
baseUrl: string;
|
|
models: ModelInfo[]; // All models (user can edit/delete any)
|
|
|
|
// Metadata (same for built-in and custom providers)
|
|
name: string;
|
|
type: ProviderType;
|
|
defaultBaseUrl?: string;
|
|
icon?: string;
|
|
requiresApiKey: boolean;
|
|
isBuiltIn: boolean; // true for built-in providers, false for custom
|
|
|
|
// Server-side configuration (set by fetchServerProviders).
|
|
// A server-configured provider is admin-managed: the operator owns its key
|
|
// and base URL, and the client cannot override them. The server base URL is
|
|
// deliberately NOT exposed to the client.
|
|
isServerConfigured?: boolean; // Server manages this provider's credentials
|
|
serverModels?: string[]; // Server-restricted model list (if set)
|
|
}
|
|
|
|
/**
|
|
* Provider configurations storage format
|
|
* Key: providerId, Value: ProviderSettings
|
|
*/
|
|
export type ProvidersConfig = Record<ProviderId, ProviderSettings>;
|
|
|
|
export interface EditingModel {
|
|
providerId: ProviderId;
|
|
modelIndex: number | null; // null for new model
|
|
model: ModelInfo;
|
|
}
|