openai/codex
1
0
Fork 0
mirror of https://github.com/openai/codex.git synced 2026-09-05 15:18:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Resolve auth rejection rebase conflicts

Browse Source
This commit is contained in:
radai
2026-06-22 14:36:38 -07:00
parent b902f87205
commit a1b508cfac
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
codex-rs/login/src/auth/auth_tests.rs
View File

@@ -1757,8 +1757,10 @@ async fn forced_server_auth_rejection_clears_stale_persistent_external_auth() {
codex_home.path().to_path_buf(),
/*enable_codex_api_key_env*/ false,
AuthCredentialsStoreMode::File,
/*forced_chatgpt_workspace_id*/ None,
/*chatgpt_base_url*/ None,
AuthKeyringBackendKind::default(),
/*auth_route_config*/ None,
)
.await;
let rejected_auth_fingerprint =

9
codex-rs/login/src/auth/manager.rs
View File

@@ -179,8 +179,13 @@ fn fingerprint_auth_dot_json(
ApiAuthMode::AgentIdentity => {
let record = auth_dot_json
.agent_identity
.as_deref()
.and_then(|jwt| AgentIdentityAuthRecord::from_agent_identity_jwt(jwt).ok())?;
.as_ref()
.and_then(|agent_identity| match agent_identity {
AgentIdentityStorage::Jwt(jwt) => {
AgentIdentityAuthRecord::from_agent_identity_jwt(jwt).ok()
}
AgentIdentityStorage::Record(record) => Some(record.clone()),
})?;
Some(fingerprint_agent_identity_record(
kind,
serde_json::to_vec(&record).ok()?.as_slice(),