mirror of
https://github.com/YspCoder/clawgo.git
synced 2026-05-18 01:17:30 +08:00
feat: align cliproxyapi providers and auto fallback
This commit is contained in:
@@ -275,10 +275,16 @@ func iflowBaseURLForAttempt(base *HTTPProvider, attempt authAttempt) string {
|
||||
return normalizeIFlowBaseURL(raw)
|
||||
}
|
||||
if attempt.session.Token != nil {
|
||||
if raw := strings.TrimSpace(asString(attempt.session.Token["base_url"])); raw != "" {
|
||||
if raw := firstNonEmpty(
|
||||
strings.TrimSpace(asString(attempt.session.Token["base_url"])),
|
||||
strings.TrimSpace(asString(attempt.session.Token["base-url"])),
|
||||
); raw != "" {
|
||||
return normalizeIFlowBaseURL(raw)
|
||||
}
|
||||
if raw := strings.TrimSpace(asString(attempt.session.Token["resource_url"])); raw != "" {
|
||||
if raw := firstNonEmpty(
|
||||
strings.TrimSpace(asString(attempt.session.Token["resource_url"])),
|
||||
strings.TrimSpace(asString(attempt.session.Token["resource-url"])),
|
||||
); raw != "" {
|
||||
return normalizeIFlowBaseURL(raw)
|
||||
}
|
||||
}
|
||||
@@ -309,10 +315,11 @@ func normalizeIFlowBaseURL(raw string) string {
|
||||
|
||||
func iflowAttemptAPIKey(attempt authAttempt) string {
|
||||
if attempt.session != nil && attempt.session.Token != nil {
|
||||
if v := strings.TrimSpace(asString(attempt.session.Token["api_key"])); v != "" {
|
||||
return v
|
||||
}
|
||||
if v := strings.TrimSpace(asString(attempt.session.Token["apiKey"])); v != "" {
|
||||
if v := firstNonEmpty(
|
||||
strings.TrimSpace(asString(attempt.session.Token["api_key"])),
|
||||
strings.TrimSpace(asString(attempt.session.Token["api-key"])),
|
||||
strings.TrimSpace(asString(attempt.session.Token["apiKey"])),
|
||||
); v != "" {
|
||||
return v
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user