fix: never send an API key to the provider it wasn't entered for (v1.0.2)
All checks were successful
CI — Test & Build / Test & Build (push) Successful in 1m33s

A stored key carried no record of which provider it belonged to. Options
saves {provider, model} without the key whenever the field is blank (which
it always is after a save, since it shows the encrypted badge instead), so
switching provider left the previous provider's key attached to the new one.
Every call then failed with that provider's own "Invalid API Key" while the
UI still showed a key as configured.

- types.ts: new `keyProvider` storage field, added to CONFIG_STORAGE_KEYS
- background.ts: keyProviderMismatch() guards the chat, COPY_AS and
  stored-key LIST_MODELS paths; absent keyProvider (pre-upgrade) is allowed
- Options.tsx: stamps keyProvider on every save; drops the encrypted badge
  and requires a new key when the saved one belongs to another provider or
  is rejected; save-time guard messages are now actually rendered (they were
  gated on modelsStatus === 'error' and never drew, so Save looked dead)
- providers.ts: providerLabel(); settings hint appended to 401/403 only;
  listModels reports keyRejected and labels errors with the display name
- Anthropic: send anthropic-dangerous-direct-browser-access on the chat path

Docs: CLAUDE.md version-bump rule corrected — wxt.config.ts reads
pkg.version, so package.json is the only place to edit.

typecheck clean, 58/58 tests, build clean (281.72 kB, manifest 1.0.2).

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
This commit is contained in:
john kevin asprec
2026-07-23 15:50:07 +08:00
parent d5a2f4a0be
commit 6aee260533
9 changed files with 176 additions and 45 deletions

View File

@@ -1,8 +1,9 @@
import { defineBackground } from 'wxt/utils/define-background';
import { CONFIG_STORAGE_KEYS } from '@lib/types';
import type { AnalyzePayload, LexAIConfig, LexAIResponse } from '@lib/types';
import { CONTEXT_MENU_ENTRIES, findContextMenuEntry, resolvePromptPersona } from '@lib/actions';
import { decryptApiKey, migratePlaintextApiKey } from '@lib/crypto';
import { callProvider, getSystemPrompt, listModels } from '@lib/providers';
import { callProvider, getSystemPrompt, listModels, providerLabel } from '@lib/providers';
// Resolve the usable API key from stored config: prefer the encrypted path,
// fall back to plaintext for backward compat. Returns null if none is set.
@@ -16,10 +17,19 @@ async function resolveApiKey(config: LexAIConfig): Promise<string | null> {
return apiKey.trim();
}
// Options can save a provider change without touching the stored key, which
// leaves e.g. an OpenAI key attached to Groq — every call then fails with the
// provider's own "Invalid API Key". Detect it here and say what to do instead.
// `keyProvider` is absent for keys saved by older builds: unknown, so allow it.
function keyProviderMismatch(config: LexAIConfig, provider: string): string | null {
if (!config.keyProvider || config.keyProvider === provider) return null;
return `Your saved API key was entered for ${providerLabel(config.keyProvider)}, but the selected provider is ${providerLabel(provider)}. Open LexAI Settings and enter a ${providerLabel(provider)} API key.`;
}
// ─── Main handler ─────────────────────────────────────────────────────────────
async function handleAnalyzeText(payload: AnalyzePayload): Promise<LexAIResponse> {
const stored = await chrome.storage.local.get(['provider', 'apiKey', 'apiKeyEnc', 'encKey', 'model']);
const stored = await chrome.storage.local.get([...CONFIG_STORAGE_KEYS]);
const config = stored as LexAIConfig;
// Prompt requests from the toolbar/context menu carry no explicit params —
@@ -45,6 +55,9 @@ async function handleAnalyzeText(payload: AnalyzePayload): Promise<LexAIResponse
return { error: 'No API key configured. Please open LexAI settings (click the extension icon).' };
}
const mismatch = keyProviderMismatch(config, config.provider || 'openai');
if (mismatch) return { error: mismatch };
const resolvedConfig: LexAIConfig = {
...config,
apiKey,
@@ -113,7 +126,7 @@ export default defineBackground(() => {
if (message.type === 'COPY_AS') {
const { text, format } = message as { text: string; format: string };
chrome.storage.local.get(['provider', 'apiKey', 'apiKeyEnc', 'encKey', 'model'])
chrome.storage.local.get([...CONFIG_STORAGE_KEYS])
.then(async (stored) => {
const config = stored as LexAIConfig;
const apiKey = await resolveApiKey(config);
@@ -121,6 +134,11 @@ export default defineBackground(() => {
sendResponse({ error: 'No API key configured. Please open LexAI settings.' });
return;
}
const mismatch = keyProviderMismatch(config, config.provider || 'openai');
if (mismatch) {
sendResponse({ error: mismatch });
return;
}
const resolvedConfig: LexAIConfig = { ...config, apiKey };
const systemPrompt = `Reformat the following text as ${format}. Return only the reformatted result, no explanation.`;
return callProvider(resolvedConfig, text, systemPrompt);
@@ -143,7 +161,11 @@ export default defineBackground(() => {
}
let apiKey = inlineKey;
if (!apiKey) {
const stored = await chrome.storage.local.get(['apiKey', 'apiKeyEnc', 'encKey']);
// Stored-key path: refuse to send a key that belongs to a different
// provider — it would come back as that provider's "invalid key".
const stored = await chrome.storage.local.get(['apiKey', 'apiKeyEnc', 'encKey', 'keyProvider']);
const mismatch = keyProviderMismatch(stored as LexAIConfig, provider);
if (mismatch) return { error: mismatch, keyRejected: true };
apiKey = (await resolveApiKey(stored as LexAIConfig)) ?? undefined;
}
if (!apiKey && provider !== 'openrouter') {