i/Aether
1
0
Fork 0
mirror of https://github.com/fawney19/Aether.git synced 2026-09-12 22:20:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat(providers): expand OAuth account management

Browse Source 
Add Claude Code manual and cookie authorization, including redacted batch tasks. Harden OAuth imports, duplicate replacement, provider dialogs, and related account-management tests.
This commit is contained in:
elky
2026-07-27 15:53:28 +08:00
parent 531cf11025
commit 550cc36760
55 changed files with 4957 additions and 403 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/aether-admin/src/provider/state.rs
+56
View File
@@ -38,6 +38,17 @@ pub fn provider_oauth_pkce_s256(verifier: &str) -> String {
pub fn parse_provider_oauth_callback_params(callback_url: &str) -> BTreeMap<String, String> {
let mut merged = BTreeMap::new();
let raw_callback_url = callback_url.trim();
if !raw_callback_url.contains("://") {
if let Some((code, state)) = raw_callback_url.split_once('#') {
let code = code.trim();
let state = state.strip_prefix("state=").unwrap_or(state).trim();
if !code.is_empty() && !code.contains('=') && !state.is_empty() {
merged.insert("code".to_string(), code.to_string());
merged.insert("state".to_string(), state.to_string());
return merged;
}
}
}
let parsed_url = Url::parse(raw_callback_url).or_else(|_| {
Url::parse(&format!(
"https://aether.local/{}",
@@ -262,6 +273,36 @@ pub fn enrich_admin_provider_oauth_auth_config(
],
);
if provider_type.trim().eq_ignore_ascii_case("claude_code") {
if let Some(organization_uuid) = token_payload_object
.get("organization")
.and_then(Value::as_object)
.and_then(|value| value.get("uuid"))
.cloned()
{
auth_config
.entry("org_uuid".to_string())
.or_insert(organization_uuid);
}
if let Some(account) = token_payload_object
.get("account")
.and_then(Value::as_object)
{
if let Some(account_uuid) = account.get("uuid").cloned() {
auth_config
.entry("account_uuid".to_string())
.or_insert(account_uuid);
}
if let Some(email) = account.get("email_address").cloned() {
auth_config
.entry("email_address".to_string())
.or_insert_with(|| email.clone());
auth_config.entry("email".to_string()).or_insert(email);
}
}
return;
}
if !provider_type_uses_openai_chatgpt_identity(provider_type) {
return;
}
@@ -407,6 +448,21 @@ mod tests {
assert_eq!(params.get("state").map(String::as_str), Some("nonce-value"));
}
#[test]
fn parse_provider_oauth_callback_params_reads_raw_claude_code_and_state() {
for (input, expected_state) in [
("claude-code#nonce-value", "nonce-value"),
("claude-code#state=nonce-value", "nonce-value"),
] {
let params = parse_provider_oauth_callback_params(input);
assert_eq!(params.get("code").map(String::as_str), Some("claude-code"));
assert_eq!(
params.get("state").map(String::as_str),
Some(expected_state)
);
}
}
#[test]
fn parse_provider_oauth_callback_params_reads_relative_show_auth_token_url() {
let params = parse_provider_oauth_callback_params(