fix: init onboard no theme setting
Browse files- src/utils/auth.ts +8 -26
src/utils/auth.ts
CHANGED
|
@@ -296,26 +296,19 @@ export function getOpenRouterApiKeyWithSource(): {
|
|
| 296 |
: { key: null, source: 'none' }
|
| 297 |
}
|
| 298 |
|
| 299 |
-
export function getConfiguredAuthProvider(): 'anthropic' | 'openrouter' | 'openai' | 'local' {
|
| 300 |
// First try to get from cache for performance
|
| 301 |
const storedProvider = getGlobalConfig().authProvider
|
| 302 |
if (storedProvider) {
|
| 303 |
return storedProvider
|
| 304 |
}
|
| 305 |
|
| 306 |
-
|
| 307 |
-
|
| 308 |
-
case 'openrouter':
|
| 309 |
-
return 'openrouter'
|
| 310 |
-
case 'openai':
|
| 311 |
-
return 'openai'
|
| 312 |
-
default:
|
| 313 |
-
return 'anthropic'
|
| 314 |
-
}
|
| 315 |
}
|
| 316 |
|
| 317 |
// Read authProvider directly from file to bypass cache
|
| 318 |
-
export function getConfiguredAuthProviderFromFile(): 'anthropic' | 'openrouter' | 'openai' | 'local' {
|
| 319 |
try {
|
| 320 |
// eslint-disable-next-line @typescript-eslint/no-require-imports
|
| 321 |
const { readFileSync } = require('fs') as typeof import('fs')
|
|
@@ -323,27 +316,16 @@ export function getConfiguredAuthProviderFromFile(): 'anthropic' | 'openrouter'
|
|
| 323 |
const config = JSON.parse(raw) as {
|
| 324 |
authProvider?: 'anthropic' | 'openrouter' | 'openai' | 'local'
|
| 325 |
}
|
| 326 |
-
console.log('[getConfiguredAuthProviderFromFile] Config from file:', config.authProvider)
|
| 327 |
|
| 328 |
if (config.authProvider) {
|
| 329 |
return config.authProvider
|
| 330 |
}
|
| 331 |
} catch (error) {
|
| 332 |
-
|
| 333 |
-
// Ignore errors, fall through to default
|
| 334 |
-
}
|
| 335 |
-
|
| 336 |
-
// Fallback to API provider
|
| 337 |
-
const provider = getAPIProvider()
|
| 338 |
-
console.log('[getConfiguredAuthProviderFromFile] Fallback to API provider:', provider)
|
| 339 |
-
switch (provider) {
|
| 340 |
-
case 'openrouter':
|
| 341 |
-
return 'openrouter'
|
| 342 |
-
case 'openai':
|
| 343 |
-
return 'openai'
|
| 344 |
-
default:
|
| 345 |
-
return 'anthropic'
|
| 346 |
}
|
|
|
|
|
|
|
|
|
|
| 347 |
}
|
| 348 |
|
| 349 |
export type OpenAIAuthTokens = {
|
|
|
|
| 296 |
: { key: null, source: 'none' }
|
| 297 |
}
|
| 298 |
|
| 299 |
+
export function getConfiguredAuthProvider(): 'anthropic' | 'openrouter' | 'openai' | 'local' | null {
|
| 300 |
// First try to get from cache for performance
|
| 301 |
const storedProvider = getGlobalConfig().authProvider
|
| 302 |
if (storedProvider) {
|
| 303 |
return storedProvider
|
| 304 |
}
|
| 305 |
|
| 306 |
+
// No explicit authProvider configured, return null
|
| 307 |
+
return null
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 308 |
}
|
| 309 |
|
| 310 |
// Read authProvider directly from file to bypass cache
|
| 311 |
+
export function getConfiguredAuthProviderFromFile(): 'anthropic' | 'openrouter' | 'openai' | 'local' | null {
|
| 312 |
try {
|
| 313 |
// eslint-disable-next-line @typescript-eslint/no-require-imports
|
| 314 |
const { readFileSync } = require('fs') as typeof import('fs')
|
|
|
|
| 316 |
const config = JSON.parse(raw) as {
|
| 317 |
authProvider?: 'anthropic' | 'openrouter' | 'openai' | 'local'
|
| 318 |
}
|
|
|
|
| 319 |
|
| 320 |
if (config.authProvider) {
|
| 321 |
return config.authProvider
|
| 322 |
}
|
| 323 |
} catch (error) {
|
| 324 |
+
// Ignore errors
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 325 |
}
|
| 326 |
+
|
| 327 |
+
// No explicit authProvider configured, return null
|
| 328 |
+
return null
|
| 329 |
}
|
| 330 |
|
| 331 |
export type OpenAIAuthTokens = {
|