chore: rename CodexAuth::new() to create_dummy_codex_auth_for_testing() because it is not for general consumption (#1962)
`CodexAuth::new()` was the first method listed in `CodexAuth`, but it is only meant to be used by tests. Rename it to `create_dummy_chatgpt_auth_for_testing()` and move it to the end of the implementation. --- [//]: # (BEGIN SAPLING FOOTER) Stack created with [Sapling](https://sapling-scm.com). Best reviewed with [ReviewStack](https://reviewstack.dev/openai/codex/pull/1962). * #1971 * #1970 * #1966 * #1965 * __->__ #1962
This commit is contained in:
@@ -1,8 +1,5 @@
|
|||||||
#![allow(clippy::expect_used)]
|
#![allow(clippy::expect_used, clippy::unwrap_used)]
|
||||||
#![allow(clippy::unwrap_used)]
|
|
||||||
use std::path::PathBuf;
|
|
||||||
|
|
||||||
use chrono::Utc;
|
|
||||||
use codex_core::Codex;
|
use codex_core::Codex;
|
||||||
use codex_core::CodexSpawnOk;
|
use codex_core::CodexSpawnOk;
|
||||||
use codex_core::ModelProviderInfo;
|
use codex_core::ModelProviderInfo;
|
||||||
@@ -13,10 +10,7 @@ use codex_core::protocol::InputItem;
|
|||||||
use codex_core::protocol::Op;
|
use codex_core::protocol::Op;
|
||||||
use codex_core::protocol::SessionConfiguredEvent;
|
use codex_core::protocol::SessionConfiguredEvent;
|
||||||
use codex_core::spawn::CODEX_SANDBOX_NETWORK_DISABLED_ENV_VAR;
|
use codex_core::spawn::CODEX_SANDBOX_NETWORK_DISABLED_ENV_VAR;
|
||||||
use codex_login::AuthDotJson;
|
|
||||||
use codex_login::AuthMode;
|
|
||||||
use codex_login::CodexAuth;
|
use codex_login::CodexAuth;
|
||||||
use codex_login::TokenData;
|
|
||||||
use core_test_support::load_default_config_for_test;
|
use core_test_support::load_default_config_for_test;
|
||||||
use core_test_support::load_sse_fixture_with_id;
|
use core_test_support::load_sse_fixture_with_id;
|
||||||
use core_test_support::wait_for_event;
|
use core_test_support::wait_for_event;
|
||||||
@@ -556,19 +550,5 @@ async fn env_var_overrides_loaded_auth() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
fn create_dummy_codex_auth() -> CodexAuth {
|
fn create_dummy_codex_auth() -> CodexAuth {
|
||||||
CodexAuth::new(
|
CodexAuth::create_dummy_chatgpt_auth_for_testing()
|
||||||
None,
|
|
||||||
AuthMode::ChatGPT,
|
|
||||||
PathBuf::new(),
|
|
||||||
Some(AuthDotJson {
|
|
||||||
openai_api_key: None,
|
|
||||||
tokens: Some(TokenData {
|
|
||||||
id_token: Default::default(),
|
|
||||||
access_token: "Access Token".to_string(),
|
|
||||||
refresh_token: "test".to_string(),
|
|
||||||
account_id: Some("account_id".to_string()),
|
|
||||||
}),
|
|
||||||
last_refresh: Some(Utc::now()),
|
|
||||||
}),
|
|
||||||
)
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -51,21 +51,6 @@ impl PartialEq for CodexAuth {
|
|||||||
}
|
}
|
||||||
|
|
||||||
impl CodexAuth {
|
impl CodexAuth {
|
||||||
pub fn new(
|
|
||||||
api_key: Option<String>,
|
|
||||||
mode: AuthMode,
|
|
||||||
auth_file: PathBuf,
|
|
||||||
auth_dot_json: Option<AuthDotJson>,
|
|
||||||
) -> Self {
|
|
||||||
let auth_dot_json = Arc::new(Mutex::new(auth_dot_json));
|
|
||||||
Self {
|
|
||||||
api_key,
|
|
||||||
mode,
|
|
||||||
auth_file,
|
|
||||||
auth_dot_json,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn from_api_key(api_key: String) -> Self {
|
pub fn from_api_key(api_key: String) -> Self {
|
||||||
Self {
|
Self {
|
||||||
api_key: Some(api_key),
|
api_key: Some(api_key),
|
||||||
@@ -142,6 +127,28 @@ impl CodexAuth {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Consider this private to integration tests.
|
||||||
|
pub fn create_dummy_chatgpt_auth_for_testing() -> Self {
|
||||||
|
let auth_dot_json = AuthDotJson {
|
||||||
|
openai_api_key: None,
|
||||||
|
tokens: Some(TokenData {
|
||||||
|
id_token: Default::default(),
|
||||||
|
access_token: "Access Token".to_string(),
|
||||||
|
refresh_token: "test".to_string(),
|
||||||
|
account_id: Some("account_id".to_string()),
|
||||||
|
}),
|
||||||
|
last_refresh: Some(Utc::now()),
|
||||||
|
};
|
||||||
|
|
||||||
|
let auth_dot_json = Arc::new(Mutex::new(Some(auth_dot_json)));
|
||||||
|
Self {
|
||||||
|
api_key: None,
|
||||||
|
mode: AuthMode::ChatGPT,
|
||||||
|
auth_file: PathBuf::new(),
|
||||||
|
auth_dot_json,
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Loads the available auth information from the auth.json or OPENAI_API_KEY environment variable.
|
// Loads the available auth information from the auth.json or OPENAI_API_KEY environment variable.
|
||||||
|
|||||||
Reference in New Issue
Block a user