valknar/llmx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore: make CodexAuth::api_key a private field (#1965)

Browse Source 
Force callers to access this information via `get_token()` rather than
messing with it directly.

---
[//]: # (BEGIN SAPLING FOOTER)
Stack created with [Sapling](https://sapling-scm.com). Best reviewed
with [ReviewStack](https://reviewstack.dev/openai/codex/pull/1965).
* #1971
* #1970
* #1966
* __->__ #1965
* #1962
This commit is contained in:
Michael Bolin
2025-08-07 16:40:01 -07:00
committed by GitHub
parent db76f32888
commit 02c9c2ecad
2 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
codex-rs/cli/src/login.rs
View File

@@ -49,9 +49,9 @@ pub async fn run_login_status(cli_config_overrides: CliConfigOverrides) -> ! {
match load_auth(&config.codex_home) { match load_auth(&config.codex_home) {
Ok(Some(auth)) => match auth.mode { Ok(Some(auth)) => match auth.mode {
AuthMode::ApiKey => { AuthMode::ApiKey => match auth.get_token().await {
if let Some(api_key) = auth.api_key.as_deref() { Ok(api_key) => {
eprintln!("Logged in using an API key - {}", safe_format_key(api_key)); eprintln!("Logged in using an API key - {}", safe_format_key(&api_key));
if let Ok(env_api_key) = env::var(OPENAI_API_KEY_ENV_VAR) { if let Ok(env_api_key) = env::var(OPENAI_API_KEY_ENV_VAR) {
if env_api_key == api_key { if env_api_key == api_key {
@@ -60,11 +60,13 @@ pub async fn run_login_status(cli_config_overrides: CliConfigOverrides) -> ! {
); );
} }
} }
} else { std::process::exit(0);
eprintln!("Logged in using an API key");
} }
std::process::exit(0); Err(e) => {
} eprintln!("Unexpected error retrieving API key: {e}");
std::process::exit(1);
}
},
AuthMode::ChatGPT => { AuthMode::ChatGPT => {
eprintln!("Logged in using ChatGPT"); eprintln!("Logged in using ChatGPT");
std::process::exit(0); std::process::exit(0);

3
codex-rs/login/src/lib.rs
View File

@@ -38,8 +38,9 @@ pub enum AuthMode {
#[derive(Debug, Clone)] #[derive(Debug, Clone)]
pub struct CodexAuth { pub struct CodexAuth {
pub api_key: Option<String>,
pub mode: AuthMode, pub mode: AuthMode,
api_key: Option<String>,
auth_dot_json: Arc<Mutex<Option<AuthDotJson>>>, auth_dot_json: Arc<Mutex<Option<AuthDotJson>>>,
auth_file: PathBuf, auth_file: PathBuf,
} }