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

Handle trailing backslash properly (#4559)

Browse Source 
**Summary**

This PR fixes an issue in the device code login flow where trailing
slashes in the issuer URL could cause malformed URLs during codex token
exchange step


**Test**


Before the changes

`Error logging in with device code: device code exchange failed: error
decoding response body`

After the changes

`Successfully logged in`
This commit is contained in:
rakesh-oai
2025-10-01 10:32:09 -07:00
committed by GitHub
parent dde615f482
commit 699c121606
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -148,19 +148,20 @@ 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 = format!("{}/api/accounts", opts.issuer.trim_end_matches('/')); let base_url = opts.issuer.trim_end_matches('/');
let api_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, &api_base_url, &opts.client_id).await?;
println!( println!(
"To authenticate, visit: {}/deviceauth/authorize and enter code: {}", "To authenticate, visit: {}/deviceauth/authorize and enter code: {}",
auth_base_url, uc.user_code api_base_url, uc.user_code
); );
let code_resp = poll_for_token( let code_resp = poll_for_token(
&client, &client,
&auth_base_url, &api_base_url,
&uc.device_auth_id, &uc.device_auth_id,
&uc.user_code, &uc.user_code,
uc.interval, uc.interval,
@@ -172,10 +173,10 @@ pub async fn run_device_code_login(opts: ServerOptions) -> std::io::Result<()> {
code_challenge: code_resp.code_challenge, code_challenge: code_resp.code_challenge,
}; };
println!("authorization code received"); println!("authorization code received");
let redirect_uri = format!("{}/deviceauth/callback", opts.issuer.trim_end_matches('/')); let redirect_uri = format!("{base_url}/deviceauth/callback");
let tokens = crate::server::exchange_code_for_tokens( let tokens = crate::server::exchange_code_for_tokens(
&opts.issuer, base_url,
&opts.client_id, &opts.client_id,
&redirect_uri, &redirect_uri,
&pkce, &pkce,