feat: merge opus comfyui and login updates
This commit is contained in:
@@ -15,6 +15,13 @@ describe('accountConnection helpers', () => {
|
||||
capabilities: { proxyOnly: true },
|
||||
accessToken: 'api-token-ignored-by-explicit-mode',
|
||||
})).toBe('session');
|
||||
expect(resolveAccountCredentialMode({
|
||||
extraConfig: '{"credentialMode":"apikey"}',
|
||||
accessToken: 'api-key-is-still-stored-as-access-token',
|
||||
})).toBe('apikey');
|
||||
expect(resolveAccountCredentialMode({
|
||||
extra_config: '{"credentialMode":"session"}',
|
||||
})).toBe('session');
|
||||
expect(resolveAccountCredentialMode({})).toBe('apikey');
|
||||
});
|
||||
|
||||
|
||||
@@ -2,6 +2,21 @@ export function resolveAccountCredentialMode(account: any): 'session' | 'apikey'
|
||||
const rawMode = String(account?.credentialMode || '').trim().toLowerCase();
|
||||
if (rawMode === 'apikey') return 'apikey';
|
||||
if (rawMode === 'session') return 'session';
|
||||
const rawExtraConfig = typeof account?.extraConfig === 'string'
|
||||
? account.extraConfig
|
||||
: typeof account?.extra_config === 'string'
|
||||
? account.extra_config
|
||||
: '';
|
||||
if (rawExtraConfig.trim()) {
|
||||
try {
|
||||
const parsed = JSON.parse(rawExtraConfig);
|
||||
const parsedMode = String(parsed?.credentialMode || '').trim().toLowerCase();
|
||||
if (parsedMode === 'apikey') return 'apikey';
|
||||
if (parsedMode === 'session') return 'session';
|
||||
} catch {
|
||||
// Ignore invalid legacy extra_config and continue with older fallbacks.
|
||||
}
|
||||
}
|
||||
if (typeof account?.capabilities?.proxyOnly === 'boolean') {
|
||||
return account.capabilities.proxyOnly ? 'apikey' : 'session';
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user