fix custom provider API key validation fallback (#773)
Co-authored-by: zuolingxuan <zuolingxuan@bytedance.com>
This commit is contained in:
Lingxuan Zuo
committed by
GitHub
Unverified
GitHub
parent
e640316382
commit
91c735c9f4
@@ -121,6 +121,193 @@ describe('validateApiKeyWithProvider', () => {
|
||||
);
|
||||
});
|
||||
|
||||
it('falls back to /chat/completions when /models returns a non-auth 405 error', async () => {
|
||||
proxyAwareFetch
|
||||
.mockResolvedValueOnce(
|
||||
new Response(JSON.stringify({ error: { message: 'Method Not Allowed' } }), {
|
||||
status: 405,
|
||||
headers: { 'Content-Type': 'application/json' },
|
||||
})
|
||||
)
|
||||
.mockResolvedValueOnce(
|
||||
new Response(JSON.stringify({ error: { message: 'Unknown model' } }), {
|
||||
status: 400,
|
||||
headers: { 'Content-Type': 'application/json' },
|
||||
})
|
||||
);
|
||||
|
||||
const { validateApiKeyWithProvider } = await import('@electron/services/providers/provider-validation');
|
||||
const result = await validateApiKeyWithProvider('custom', 'sk-chat-fallback', {
|
||||
baseUrl: 'https://chat.example.com/v1',
|
||||
apiProtocol: 'openai-completions',
|
||||
});
|
||||
|
||||
expect(result).toMatchObject({ valid: true });
|
||||
expect(proxyAwareFetch).toHaveBeenNthCalledWith(
|
||||
1,
|
||||
'https://chat.example.com/v1/models?limit=1',
|
||||
expect.anything(),
|
||||
);
|
||||
expect(proxyAwareFetch).toHaveBeenNthCalledWith(
|
||||
2,
|
||||
'https://chat.example.com/v1/chat/completions',
|
||||
expect.objectContaining({
|
||||
method: 'POST',
|
||||
})
|
||||
);
|
||||
});
|
||||
|
||||
it('does not mask auth-like 400 errors behind a fallback probe', async () => {
|
||||
proxyAwareFetch.mockResolvedValueOnce(
|
||||
new Response(JSON.stringify({ error: { message: 'Invalid API key provided' } }), {
|
||||
status: 400,
|
||||
headers: { 'Content-Type': 'application/json' },
|
||||
})
|
||||
);
|
||||
|
||||
const { validateApiKeyWithProvider } = await import('@electron/services/providers/provider-validation');
|
||||
const result = await validateApiKeyWithProvider('custom', 'sk-bad-key', {
|
||||
baseUrl: 'https://chat.example.com/v1',
|
||||
apiProtocol: 'openai-completions',
|
||||
});
|
||||
|
||||
expect(result).toMatchObject({ valid: false, error: 'Invalid API key provided', status: 400 });
|
||||
expect(proxyAwareFetch).toHaveBeenCalledTimes(1);
|
||||
});
|
||||
|
||||
it('treats incorrect api key wording as an auth failure', async () => {
|
||||
proxyAwareFetch.mockResolvedValueOnce(
|
||||
new Response(JSON.stringify({ error: { message: 'Incorrect API key provided' } }), {
|
||||
status: 400,
|
||||
headers: { 'Content-Type': 'application/json' },
|
||||
})
|
||||
);
|
||||
|
||||
const { validateApiKeyWithProvider } = await import('@electron/services/providers/provider-validation');
|
||||
const result = await validateApiKeyWithProvider('custom', 'sk-bad-key-incorrect', {
|
||||
baseUrl: 'https://chat.example.com/v1',
|
||||
apiProtocol: 'openai-completions',
|
||||
});
|
||||
|
||||
expect(result).toMatchObject({ valid: false, error: 'Incorrect API key provided', status: 400 });
|
||||
expect(proxyAwareFetch).toHaveBeenCalledTimes(1);
|
||||
});
|
||||
|
||||
it('treats auth-like error codes on /models as invalid without fallback', async () => {
|
||||
proxyAwareFetch.mockResolvedValueOnce(
|
||||
new Response(JSON.stringify({ error: { message: 'Bad Request', code: 'invalid_api_key' } }), {
|
||||
status: 400,
|
||||
headers: { 'Content-Type': 'application/json' },
|
||||
})
|
||||
);
|
||||
|
||||
const { validateApiKeyWithProvider } = await import('@electron/services/providers/provider-validation');
|
||||
const result = await validateApiKeyWithProvider('custom', 'sk-bad-key-code', {
|
||||
baseUrl: 'https://chat.example.com/v1',
|
||||
apiProtocol: 'openai-completions',
|
||||
});
|
||||
|
||||
expect(result).toMatchObject({ valid: false, error: 'Bad Request', status: 400 });
|
||||
expect(proxyAwareFetch).toHaveBeenCalledTimes(1);
|
||||
});
|
||||
|
||||
it('keeps non-auth invalid_request style 400 probe responses as valid', async () => {
|
||||
proxyAwareFetch
|
||||
.mockResolvedValueOnce(
|
||||
new Response(JSON.stringify({ error: { message: 'Method Not Allowed' } }), {
|
||||
status: 405,
|
||||
headers: { 'Content-Type': 'application/json' },
|
||||
})
|
||||
)
|
||||
.mockResolvedValueOnce(
|
||||
new Response(JSON.stringify({ error: { message: 'invalid_request_error: invalid model' } }), {
|
||||
status: 400,
|
||||
headers: { 'Content-Type': 'application/json' },
|
||||
})
|
||||
);
|
||||
|
||||
const { validateApiKeyWithProvider } = await import('@electron/services/providers/provider-validation');
|
||||
const result = await validateApiKeyWithProvider('custom', 'sk-invalid-model-ok', {
|
||||
baseUrl: 'https://chat.example.com/v1',
|
||||
apiProtocol: 'openai-completions',
|
||||
});
|
||||
|
||||
expect(result).toMatchObject({ valid: true, status: 400 });
|
||||
});
|
||||
|
||||
it('treats auth-like error codes on probe responses as invalid after fallback', async () => {
|
||||
proxyAwareFetch
|
||||
.mockResolvedValueOnce(
|
||||
new Response(JSON.stringify({ error: { message: 'Method Not Allowed' } }), {
|
||||
status: 405,
|
||||
headers: { 'Content-Type': 'application/json' },
|
||||
})
|
||||
)
|
||||
.mockResolvedValueOnce(
|
||||
new Response(JSON.stringify({ error: { message: 'Bad Request', code: 'invalid_api_key' } }), {
|
||||
status: 400,
|
||||
headers: { 'Content-Type': 'application/json' },
|
||||
})
|
||||
);
|
||||
|
||||
const { validateApiKeyWithProvider } = await import('@electron/services/providers/provider-validation');
|
||||
const result = await validateApiKeyWithProvider('custom', 'sk-bad-key-probe-code', {
|
||||
baseUrl: 'https://responses.example.com/v1',
|
||||
apiProtocol: 'openai-responses',
|
||||
});
|
||||
|
||||
expect(result).toMatchObject({ valid: false, error: 'Bad Request', status: 400 });
|
||||
expect(proxyAwareFetch).toHaveBeenNthCalledWith(
|
||||
2,
|
||||
'https://responses.example.com/v1/responses',
|
||||
expect.objectContaining({
|
||||
method: 'POST',
|
||||
})
|
||||
);
|
||||
});
|
||||
|
||||
it('keeps token-limit style 400 probe responses as valid', async () => {
|
||||
proxyAwareFetch
|
||||
.mockResolvedValueOnce(
|
||||
new Response(JSON.stringify({ error: { message: 'Method Not Allowed' } }), {
|
||||
status: 405,
|
||||
headers: { 'Content-Type': 'application/json' },
|
||||
})
|
||||
)
|
||||
.mockResolvedValueOnce(
|
||||
new Response(JSON.stringify({ error: { message: 'max tokens exceeded' } }), {
|
||||
status: 400,
|
||||
headers: { 'Content-Type': 'application/json' },
|
||||
})
|
||||
);
|
||||
|
||||
const { validateApiKeyWithProvider } = await import('@electron/services/providers/provider-validation');
|
||||
const result = await validateApiKeyWithProvider('custom', 'sk-token-limit-ok', {
|
||||
baseUrl: 'https://responses.example.com/v1',
|
||||
apiProtocol: 'openai-responses',
|
||||
});
|
||||
|
||||
expect(result).toMatchObject({ valid: true, status: 400 });
|
||||
});
|
||||
|
||||
it('does not mask localized auth-like 400 errors behind a fallback probe', async () => {
|
||||
proxyAwareFetch.mockResolvedValueOnce(
|
||||
new Response(JSON.stringify({ error: { message: '无效密钥' } }), {
|
||||
status: 400,
|
||||
headers: { 'Content-Type': 'application/json' },
|
||||
})
|
||||
);
|
||||
|
||||
const { validateApiKeyWithProvider } = await import('@electron/services/providers/provider-validation');
|
||||
const result = await validateApiKeyWithProvider('custom', 'sk-bad-key-cn', {
|
||||
baseUrl: 'https://chat.example.com/v1',
|
||||
apiProtocol: 'openai-completions',
|
||||
});
|
||||
|
||||
expect(result).toMatchObject({ valid: false, error: '无效密钥', status: 400 });
|
||||
expect(proxyAwareFetch).toHaveBeenCalledTimes(1);
|
||||
});
|
||||
|
||||
it('does not duplicate endpoint suffix when baseUrl already points to /responses', async () => {
|
||||
proxyAwareFetch
|
||||
.mockResolvedValueOnce(
|
||||
@@ -154,4 +341,66 @@ describe('validateApiKeyWithProvider', () => {
|
||||
expect.anything(),
|
||||
);
|
||||
});
|
||||
|
||||
it('falls back to /responses when /models returns a non-auth 400 error', async () => {
|
||||
proxyAwareFetch
|
||||
.mockResolvedValueOnce(
|
||||
new Response(JSON.stringify({ error: { message: 'Bad Request' } }), {
|
||||
status: 400,
|
||||
headers: { 'Content-Type': 'application/json' },
|
||||
})
|
||||
)
|
||||
.mockResolvedValueOnce(
|
||||
new Response(JSON.stringify({ error: { message: 'Unknown model' } }), {
|
||||
status: 400,
|
||||
headers: { 'Content-Type': 'application/json' },
|
||||
})
|
||||
);
|
||||
|
||||
const { validateApiKeyWithProvider } = await import('@electron/services/providers/provider-validation');
|
||||
const result = await validateApiKeyWithProvider('custom', 'sk-response-fallback', {
|
||||
baseUrl: 'https://responses.example.com/v1',
|
||||
apiProtocol: 'openai-responses',
|
||||
});
|
||||
|
||||
expect(result).toMatchObject({ valid: true });
|
||||
expect(proxyAwareFetch).toHaveBeenNthCalledWith(
|
||||
2,
|
||||
'https://responses.example.com/v1/responses',
|
||||
expect.objectContaining({
|
||||
method: 'POST',
|
||||
})
|
||||
);
|
||||
});
|
||||
|
||||
it('treats localized auth-like 400 probe responses as invalid after fallback', async () => {
|
||||
proxyAwareFetch
|
||||
.mockResolvedValueOnce(
|
||||
new Response(JSON.stringify({ error: { message: 'Method Not Allowed' } }), {
|
||||
status: 405,
|
||||
headers: { 'Content-Type': 'application/json' },
|
||||
})
|
||||
)
|
||||
.mockResolvedValueOnce(
|
||||
new Response(JSON.stringify({ error: { message: '鉴权失败' } }), {
|
||||
status: 400,
|
||||
headers: { 'Content-Type': 'application/json' },
|
||||
})
|
||||
);
|
||||
|
||||
const { validateApiKeyWithProvider } = await import('@electron/services/providers/provider-validation');
|
||||
const result = await validateApiKeyWithProvider('custom', 'sk-response-cn-auth', {
|
||||
baseUrl: 'https://responses.example.com/v1',
|
||||
apiProtocol: 'openai-responses',
|
||||
});
|
||||
|
||||
expect(result).toMatchObject({ valid: false, error: '鉴权失败', status: 400 });
|
||||
expect(proxyAwareFetch).toHaveBeenNthCalledWith(
|
||||
2,
|
||||
'https://responses.example.com/v1/responses',
|
||||
expect.objectContaining({
|
||||
method: 'POST',
|
||||
})
|
||||
);
|
||||
});
|
||||
});
|
||||
|
||||
Reference in New Issue
Block a user