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

fix(antigravity): preserve imported account email

Browse Source
This commit is contained in:
ZheFox
2026-09-03 22:22:33 +08:00
parent 7b612b8b5a
commit 4cf47b1dee
2 changed files with 44 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/aether-gateway/src/handlers/admin/provider/oauth/dispatch/batch/parse.rs
+38 -1
View File
@@ -808,6 +808,14 @@ pub(super) fn apply_admin_provider_oauth_batch_import_hints(
return;
}
if provider_type == "antigravity" {
// The Google refresh-token response does not include the account email.
// Preserve the identity supplied by the imported Antigravity credentials so
// account naming and duplicate detection can use it after token exchange.
if let Some(email) = entry.email.as_ref() {
auth_config
.entry("email".to_string())
.or_insert_with(|| json!(email));
}
if let Some(project_id) = entry.project_id.as_ref() {
auth_config
.entry("project_id".to_string())
@@ -1433,7 +1441,7 @@ mod tests {
fn applies_antigravity_project_and_user_agent_hints_to_auth_config() {
let entries = parse_admin_provider_oauth_batch_import_entries(
"antigravity",
r#"{"refreshToken":"rt-1","cloudaicompanionProject":{"id":"project-antigravity-2"},"userAgent":"antigravity"}"#,
r#"{"refreshToken":"rt-1","email":"anti@example.com","cloudaicompanionProject":{"id":"project-antigravity-2"},"userAgent":"antigravity"}"#,
);
let mut auth_config = serde_json::Map::new();
@@ -1444,6 +1452,35 @@ mod tests {
Some(&json!("project-antigravity-2"))
);
assert_eq!(auth_config.get("user_agent"), Some(&json!("antigravity")));
assert_eq!(auth_config.get("email"), Some(&json!("anti@example.com")));
}
#[test]
fn antigravity_batch_import_keeps_json_email_for_key_naming() {
let entries = parse_admin_provider_oauth_batch_import_entries(
"antigravity",
r#"{"access_token":"at-1","refresh_token":"rt-1","email":"anti@example.com","project_id":"project-antigravity-3","type":"antigravity"}"#,
);
// Simulate Google's refresh-token response, which carries no email.
let mut auth_config = json!({
"provider_type": "antigravity",
"refresh_token": "rt-1",
})
.as_object()
.cloned()
.expect("auth config should be an object");
apply_admin_provider_oauth_batch_import_hints("antigravity", &entries[0], &mut auth_config);
assert_eq!(auth_config.get("email"), Some(&json!("anti@example.com")));
assert_eq!(
super::super::super::helpers::admin_provider_oauth_key_name_from_auth_config(
"antigravity",
&auth_config,
Some(0),
),
"antigravity_anti@example.com"
);
}
#[test]
apps/aether-gateway/src/handlers/admin/provider/oauth/dispatch/import.rs
+6 -1
View File
@@ -460,6 +460,9 @@ fn apply_single_import_hints(
.or_insert_with(|| json!(project_id));
}
for (target, keys) in [
// Antigravity token responses omit the account email, so retain the
// identity carried by the imported credential payload.
("email", &["email", "oauth_email"][..]),
(
"client_version",
&[
@@ -1461,7 +1464,8 @@ mod tests {
},
"clientVersion": "1.99.0",
"sessionId": "session-antigravity-1",
"userAgent": "antigravity"
"userAgent": "antigravity",
"email": "anti@example.com"
})
.as_object()
.cloned()
@@ -1470,6 +1474,7 @@ mod tests {
apply_single_import_hints("antigravity", &payload, &mut auth_config);
assert_eq!(auth_config.get("email"), Some(&json!("anti@example.com")));
assert_eq!(
auth_config.get("project_id"),
Some(&json!("project-antigravity-1"))