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

Fix Callback URL for staging and prod environments (#4533)

Browse Source 
# External (non-OpenAI) Pull Request Requirements

Before opening this Pull Request, please read the dedicated
"Contributing" markdown file or your PR may be closed:
https://github.com/openai/codex/blob/main/docs/contributing.md

If your PR conforms to our contribution guidelines, replace this text
with a detailed and high quality description of your changes.
This commit is contained in:
rakesh-oai
2025-09-30 19:57:37 -07:00
committed by GitHub
parent 5881c0d6d4
commit 349ef7edc6
2 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
codex-rs/login/src/device_code_auth.rs
View File

@@ -148,15 +148,14 @@ fn print_colored_warning_device_code() {
/// Full device code login flow. /// Full device code login flow.
pub async fn run_device_code_login(opts: ServerOptions) -> std::io::Result<()> { pub async fn run_device_code_login(opts: ServerOptions) -> std::io::Result<()> {
let client = reqwest::Client::new(); let client = reqwest::Client::new();
let auth_base_url = opts.issuer.trim_end_matches('/').to_owned(); let auth_base_url = format!("{}/api/accounts", opts.issuer.trim_end_matches('/'));
print_colored_warning_device_code(); print_colored_warning_device_code();
println!("⏳ Generating a new 9-digit device code for authentication...\n"); println!("⏳ Generating a new 9-digit device code for authentication...\n");
let uc = request_user_code(&client, &auth_base_url, &opts.client_id).await?; let uc = request_user_code(&client, &auth_base_url, &opts.client_id).await?;
println!( println!(
"To authenticate, visit: {}/deviceauth/authorize and enter code: {}", "To authenticate, visit: {}/deviceauth/authorize and enter code: {}",
opts.issuer.trim_end_matches('/'), auth_base_url, uc.user_code
uc.user_code
); );
let code_resp = poll_for_token( let code_resp = poll_for_token(

8
codex-rs/login/tests/suite/device_code_login.rs
View File

@@ -32,7 +32,7 @@ fn make_jwt(payload: serde_json::Value) -> String {
async fn mock_usercode_success(server: &MockServer) { async fn mock_usercode_success(server: &MockServer) {
Mock::given(method("POST")) Mock::given(method("POST"))
.and(path("/deviceauth/usercode")) .and(path("/api/accounts/deviceauth/usercode"))
.respond_with(ResponseTemplate::new(200).set_body_json(json!({ .respond_with(ResponseTemplate::new(200).set_body_json(json!({
"device_auth_id": "device-auth-123", "device_auth_id": "device-auth-123",
"user_code": "CODE-12345", "user_code": "CODE-12345",
@@ -45,7 +45,7 @@ async fn mock_usercode_success(server: &MockServer) {
async fn mock_usercode_failure(server: &MockServer, status: u16) { async fn mock_usercode_failure(server: &MockServer, status: u16) {
Mock::given(method("POST")) Mock::given(method("POST"))
.and(path("/deviceauth/usercode")) .and(path("/api/accounts/deviceauth/usercode"))
.respond_with(ResponseTemplate::new(status)) .respond_with(ResponseTemplate::new(status))
.mount(server) .mount(server)
.await; .await;
@@ -58,7 +58,7 @@ async fn mock_poll_token_two_step(
) { ) {
let c = counter.clone(); let c = counter.clone();
Mock::given(method("POST")) Mock::given(method("POST"))
.and(path("/deviceauth/token")) .and(path("/api/accounts/deviceauth/token"))
.respond_with(move |_: &Request| { .respond_with(move |_: &Request| {
let attempt = c.fetch_add(1, Ordering::SeqCst); let attempt = c.fetch_add(1, Ordering::SeqCst);
if attempt == 0 { if attempt == 0 {
@@ -214,7 +214,7 @@ async fn device_code_login_integration_handles_error_payload() {
// // /deviceauth/token → returns error payload with status 401 // // /deviceauth/token → returns error payload with status 401
mock_poll_token_single( mock_poll_token_single(
&mock_server, &mock_server,
"/deviceauth/token", "/api/accounts/deviceauth/token",
ResponseTemplate::new(401).set_body_json(json!({ ResponseTemplate::new(401).set_body_json(json!({
"error": "authorization_declined", "error": "authorization_declined",
"error_description": "Denied" "error_description": "Denied"