Dark-Alex-17/coyote
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

refactor: main.rs resolve_oauth_client uses new dispatcher

Browse Source
This commit is contained in:
Dark-Alex-17
2026-07-20 13:05:57 -06:00
parent cdc40f7302
commit 420447275c
2 changed files with 35 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/client/oauth.rs
+5 -16
View File
@@ -600,25 +600,12 @@ pub fn get_oauth_provider_for_client(
}
}
pub fn resolve_provider_type(client_name: &str, clients: &[ClientConfig]) -> Option<&'static str> {
for client_config in clients {
let (config_name, provider_type, auth) = client_config_info(client_config);
if config_name == client_name {
if auth == Some("oauth") && get_oauth_provider(provider_type).is_some() {
return Some(provider_type);
}
return None;
}
}
None
}
pub fn list_oauth_capable_clients(clients: &[ClientConfig]) -> Vec<String> {
clients
.iter()
.filter_map(|client_config| {
let (name, provider_type, auth) = client_config_info(client_config);
if auth == Some("oauth") && get_oauth_provider(provider_type).is_some() {
let (name, _, auth) = client_config_info(client_config);
if auth == Some("oauth") {
Some(name.to_string())
} else {
None
@@ -627,7 +614,9 @@ pub fn list_oauth_capable_clients(clients: &[ClientConfig]) -> Vec<String> {
.collect()
}
fn client_config_info(client_config: &ClientConfig) -> (&str, &'static str, Option<&str>) {
pub(crate) fn client_config_info(
client_config: &ClientConfig,
) -> (&str, &'static str, Option<&str>) {
match client_config {
ClientConfig::ClaudeConfig(c) => (
c.name.as_deref().unwrap_or("claude"),
src/main.rs
+30 -22
View File
@@ -769,28 +769,36 @@ fn resolve_oauth_client(
explicit: Option<&str>,
clients: &[ClientConfig],
) -> Result<(String, Box<dyn OAuthProvider>)> {
if let Some(name) = explicit {
let provider_type = oauth::resolve_provider_type(name, clients)
.ok_or_else(|| anyhow!("Client '{name}' not found or doesn't support OAuth"))?;
let provider = oauth::get_oauth_provider(provider_type).unwrap();
return Ok((name.to_string(), provider));
}
let find_by_name = |name: &str| -> Option<&ClientConfig> {
clients.iter().find(|cc| {
let (n, _, auth) = oauth::client_config_info(cc);
n == name && auth == Some("oauth")
})
};
let candidates = oauth::list_oauth_capable_clients(clients);
match candidates.len() {
0 => bail!("No OAuth-capable clients configured."),
1 => {
let name = &candidates[0];
let provider_type = oauth::resolve_provider_type(name, clients).unwrap();
let provider = oauth::get_oauth_provider(provider_type).unwrap();
Ok((name.clone(), provider))
let target = if let Some(name) = explicit {
find_by_name(name)
.ok_or_else(|| anyhow!("Client '{name}' not found or doesn't support OAuth"))?
} else {
let candidates = oauth::list_oauth_capable_clients(clients);
match candidates.len() {
0 => bail!("No OAuth-capable clients configured."),
1 => find_by_name(&candidates[0]).unwrap(),
_ => {
let choice = Select::new("Select a client to authenticate:", candidates.clone())
.prompt()?;
find_by_name(&choice)
.ok_or_else(|| anyhow!("Selected client '{choice}' not found"))?
}
}
_ => {
let choice =
Select::new("Select a client to authenticate:", candidates.clone()).prompt()?;
let provider_type = oauth::resolve_provider_type(&choice, clients).unwrap();
let provider = oauth::get_oauth_provider(provider_type).unwrap();
Ok((choice, provider))
}
}
};
let name = oauth::client_config_info(target).0.to_string();
let provider = oauth::get_oauth_provider_for_client(target, &client::ALL_PROVIDER_MODELS)
.ok_or_else(|| {
anyhow!(
"Could not build OAuth provider for '{name}' (no oauth config in models.yaml or user config)"
)
})?;
Ok((name, provider))
}