chore: fix the build breakage that came from a merge race (#10239)
I think I needed to rebase on top of https://github.com/openai/codex/pull/10167 before merging https://github.com/openai/codex/pull/10208.
This commit is contained in:
parent
1ce722ed2e
commit
40bf11bd52
3 changed files with 1 additions and 6 deletions
1
codex-rs/Cargo.lock
generated
1
codex-rs/Cargo.lock
generated
|
|
@ -1298,7 +1298,6 @@ version = "0.0.0"
|
|||
dependencies = [
|
||||
"async-trait",
|
||||
"base64",
|
||||
"codex-app-server-protocol",
|
||||
"codex-backend-client",
|
||||
"codex-core",
|
||||
"codex-otel",
|
||||
|
|
|
|||
|
|
@ -9,7 +9,6 @@ workspace = true
|
|||
|
||||
[dependencies]
|
||||
async-trait = { workspace = true }
|
||||
codex-app-server-protocol = { workspace = true }
|
||||
codex-backend-client = { workspace = true }
|
||||
codex-core = { workspace = true }
|
||||
codex-otel = { workspace = true }
|
||||
|
|
|
|||
|
|
@ -8,7 +8,6 @@
|
|||
//! requirements before Codex will run.
|
||||
|
||||
use async_trait::async_trait;
|
||||
use codex_app_server_protocol::AuthMode;
|
||||
use codex_backend_client::Client as BackendClient;
|
||||
use codex_core::AuthManager;
|
||||
use codex_core::auth::CodexAuth;
|
||||
|
|
@ -120,9 +119,7 @@ impl CloudRequirementsService {
|
|||
|
||||
async fn fetch(&self) -> Option<ConfigRequirementsToml> {
|
||||
let auth = self.auth_manager.auth().await?;
|
||||
if !(auth.mode == AuthMode::ChatGPT
|
||||
&& auth.account_plan_type() == Some(PlanType::Enterprise))
|
||||
{
|
||||
if !(auth.is_chatgpt_auth() && auth.account_plan_type() == Some(PlanType::Enterprise)) {
|
||||
return None;
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue