mirror of
https://github.com/openai/codex.git
synced 2026-05-15 00:32:51 +00:00
## Why Agent Identity sessions can represent Business and Enterprise ChatGPT workspaces, but cloud requirements were skipped before fetch. That meant workspace-managed requirements were not loaded for Agent Identity even when the JWT carried the same account identity and plan information that normal ChatGPT token auth exposes. This PR now sits on top of the Agent Identity stack through [#19764](https://github.com/openai/codex/pull/19764). Because [#19763](https://github.com/openai/codex/pull/19763) moved task registration into Agent Identity auth loading, cloud requirements no longer needs a separate runtime-initialization step before building the backend client. ## What changed - Stop skipping `CodexAuth::AgentIdentity` in the cloud requirements loader. - Share the cloud requirements eligibility check between startup load and background cache refresh. - Rely on eagerly loaded Agent Identity auth so backend requests can attach task-scoped `AgentAssertion` headers. - Decode Agent Identity JWT `plan_type` as the auth-layer plan type, then convert it through a shared `auth::PlanType` -> `account::PlanType` mapping. - Add the missing serde alias for the `education` plan string and add coverage for raw Agent Identity plan aliases such as `hc` and `education`. ## Testing - `cargo test -p codex-agent-identity -p codex-login -p codex-cloud-requirements -p codex-protocol`
142 lines
4.0 KiB
Rust
142 lines
4.0 KiB
Rust
use serde::Deserialize;
|
|
use serde::Serialize;
|
|
use thiserror::Error;
|
|
|
|
#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
|
|
#[serde(untagged)]
|
|
pub enum PlanType {
|
|
Known(KnownPlan),
|
|
Unknown(String),
|
|
}
|
|
|
|
impl PlanType {
|
|
pub fn from_raw_value(raw: &str) -> Self {
|
|
match raw.to_ascii_lowercase().as_str() {
|
|
"free" => Self::Known(KnownPlan::Free),
|
|
"go" => Self::Known(KnownPlan::Go),
|
|
"plus" => Self::Known(KnownPlan::Plus),
|
|
"pro" => Self::Known(KnownPlan::Pro),
|
|
"prolite" => Self::Known(KnownPlan::ProLite),
|
|
"team" => Self::Known(KnownPlan::Team),
|
|
"self_serve_business_usage_based" => {
|
|
Self::Known(KnownPlan::SelfServeBusinessUsageBased)
|
|
}
|
|
"business" => Self::Known(KnownPlan::Business),
|
|
"enterprise_cbp_usage_based" => Self::Known(KnownPlan::EnterpriseCbpUsageBased),
|
|
"enterprise" | "hc" => Self::Known(KnownPlan::Enterprise),
|
|
"education" | "edu" => Self::Known(KnownPlan::Edu),
|
|
_ => Self::Unknown(raw.to_string()),
|
|
}
|
|
}
|
|
}
|
|
|
|
#[derive(Debug, Clone, Copy, PartialEq, Eq, Serialize, Deserialize)]
|
|
#[serde(rename_all = "lowercase")]
|
|
pub enum KnownPlan {
|
|
Free,
|
|
Go,
|
|
Plus,
|
|
Pro,
|
|
ProLite,
|
|
Team,
|
|
#[serde(rename = "self_serve_business_usage_based")]
|
|
SelfServeBusinessUsageBased,
|
|
Business,
|
|
#[serde(rename = "enterprise_cbp_usage_based")]
|
|
EnterpriseCbpUsageBased,
|
|
#[serde(alias = "hc")]
|
|
Enterprise,
|
|
#[serde(alias = "education")]
|
|
Edu,
|
|
}
|
|
|
|
impl KnownPlan {
|
|
pub fn display_name(self) -> &'static str {
|
|
match self {
|
|
Self::Free => "Free",
|
|
Self::Go => "Go",
|
|
Self::Plus => "Plus",
|
|
Self::Pro => "Pro",
|
|
Self::ProLite => "Pro Lite",
|
|
Self::Team => "Team",
|
|
Self::SelfServeBusinessUsageBased => "Self Serve Business Usage Based",
|
|
Self::Business => "Business",
|
|
Self::EnterpriseCbpUsageBased => "Enterprise CBP Usage Based",
|
|
Self::Enterprise => "Enterprise",
|
|
Self::Edu => "Edu",
|
|
}
|
|
}
|
|
|
|
pub fn raw_value(self) -> &'static str {
|
|
match self {
|
|
Self::Free => "free",
|
|
Self::Go => "go",
|
|
Self::Plus => "plus",
|
|
Self::Pro => "pro",
|
|
Self::ProLite => "prolite",
|
|
Self::Team => "team",
|
|
Self::SelfServeBusinessUsageBased => "self_serve_business_usage_based",
|
|
Self::Business => "business",
|
|
Self::EnterpriseCbpUsageBased => "enterprise_cbp_usage_based",
|
|
Self::Enterprise => "enterprise",
|
|
Self::Edu => "edu",
|
|
}
|
|
}
|
|
|
|
pub fn is_workspace_account(self) -> bool {
|
|
matches!(
|
|
self,
|
|
Self::Team
|
|
| Self::SelfServeBusinessUsageBased
|
|
| Self::Business
|
|
| Self::EnterpriseCbpUsageBased
|
|
| Self::Enterprise
|
|
| Self::Edu
|
|
)
|
|
}
|
|
}
|
|
|
|
#[derive(Debug, Clone, PartialEq, Eq, Error)]
|
|
#[error("{message}")]
|
|
pub struct RefreshTokenFailedError {
|
|
pub reason: RefreshTokenFailedReason,
|
|
pub message: String,
|
|
}
|
|
|
|
impl RefreshTokenFailedError {
|
|
pub fn new(reason: RefreshTokenFailedReason, message: impl Into<String>) -> Self {
|
|
Self {
|
|
reason,
|
|
message: message.into(),
|
|
}
|
|
}
|
|
}
|
|
|
|
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
|
|
pub enum RefreshTokenFailedReason {
|
|
Expired,
|
|
Exhausted,
|
|
Revoked,
|
|
Other,
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod tests {
|
|
use super::KnownPlan;
|
|
use super::PlanType;
|
|
use pretty_assertions::assert_eq;
|
|
|
|
#[test]
|
|
fn plan_type_deserializes_raw_aliases() {
|
|
assert_eq!(
|
|
serde_json::from_str::<PlanType>("\"hc\"").expect("hc should deserialize"),
|
|
PlanType::Known(KnownPlan::Enterprise)
|
|
);
|
|
assert_eq!(
|
|
serde_json::from_str::<PlanType>("\"education\"")
|
|
.expect("education should deserialize"),
|
|
PlanType::Known(KnownPlan::Edu)
|
|
);
|
|
}
|
|
}
|