Python
/
uv
mirror of https://github.com/astral-sh/uv
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

auth: use the globally constructed client builder (#16979) 

## Summary

Instead of each subcommand instantiating its own `BaseClientBuilder`,
let's use the globally constructed one.


## Test Plan

Existing tests.
This commit is contained in:
Zsolt Dollenstein 2025-12-04 20:04:33 +00:00 committed by GitHub
parent 0c5391a7c7
commit fb5de2228c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 29 additions and 104 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
crates/uv/src/commands/auth/helper.rs
View File

@ -12,7 +12,7 @@ use uv_preview::{Preview, PreviewFeatures};
use uv_redacted::DisplaySafeUrl;
use uv_warnings::warn_user;
use crate::{commands::ExitStatus, printer::Printer, settings::NetworkSettings};
use crate::{commands::ExitStatus, printer::Printer};
/// Request format for the Bazel credential helper protocol.
#[derive(Debug, Deserialize)]
@ -60,8 +60,8 @@ impl TryFrom<Credentials> for BazelCredentialResponse {
async fn credentials_for_url(
url: &DisplaySafeUrl,
client_builder: BaseClientBuilder<'_>,
preview: Preview,
network_settings: &NetworkSettings,
) -> Result<Option<Credentials>> {
let pyx_store = PyxTokenStore::from_settings()?;
@ -85,16 +85,9 @@ async fn credentials_for_url(
.unwrap_or(url.to_string())
);
}
let client = BaseClientBuilder::new(
network_settings.connectivity,
network_settings.native_tls,
network_settings.allow_insecure_host.clone(),
preview,
network_settings.timeout,
network_settings.retries,
)
.auth_integration(uv_client::AuthIntegration::NoAuthMiddleware)
.build();
let client = client_builder
.auth_integration(uv_client::AuthIntegration::NoAuthMiddleware)
.build();
let token = pyx_store
.access_token(client.for_host(pyx_store.api()).raw_client(), 0)
.await
@ -123,8 +116,8 @@ async fn credentials_for_url(
///
/// Full spec is [available here](https://github.com/bazelbuild/proposals/blob/main/designs/2022-06-07-bazel-credential-helpers.md)
pub(crate) async fn helper(
client_builder: BaseClientBuilder<'_>,
preview: Preview,
network_settings: &NetworkSettings,
printer: Printer,
) -> Result<ExitStatus> {
if !preview.is_enabled(PreviewFeatures::AUTH_HELPER) {
@ -138,7 +131,7 @@ pub(crate) async fn helper(
// TODO: make this logic generic over the protocol by providing `request.uri` from a
// trait - that should help with adding new protocols
let credentials = credentials_for_url(&request.uri, preview, network_settings).await?;
let credentials = credentials_for_url(&request.uri, client_builder, preview).await?;
let response = serde_json::to_string(
&credentials

16
crates/uv/src/commands/auth/login.rs
View File

@ -17,7 +17,6 @@ use uv_preview::Preview;
use crate::commands::ExitStatus;
use crate::printer::Printer;
use crate::settings::NetworkSettings;
// We retry no more than this many times when polling for login status.
const STATUS_RETRY_LIMIT: u32 = 60;
@ -28,7 +27,7 @@ pub(crate) async fn login(
username: Option<String>,
password: Option<String>,
token: Option<String>,
network_settings: &NetworkSettings,
client_builder: BaseClientBuilder<'_>,
printer: Printer,
preview: Preview,
) -> Result<ExitStatus> {
@ -41,16 +40,9 @@ pub(crate) async fn login(
bail!("Cannot specify a password when logging in to pyx");
}
let client = BaseClientBuilder::new(
network_settings.connectivity,
network_settings.native_tls,
network_settings.allow_insecure_host.clone(),
preview,
network_settings.timeout,
network_settings.retries,
)
.auth_integration(AuthIntegration::NoAuthMiddleware)
.build();
let client = client_builder
.auth_integration(AuthIntegration::NoAuthMiddleware)
.build();
let access_token = pyx_login_with_browser(&pyx_store, &client, &printer).await?;
let jwt = PyxJwt::decode(&access_token)?;

18
crates/uv/src/commands/auth/logout.rs
View File

@ -9,7 +9,6 @@ use uv_distribution_types::IndexUrl;
use uv_pep508::VerbatimUrl;
use uv_preview::Preview;
use crate::settings::NetworkSettings;
use crate::{commands::ExitStatus, printer::Printer};
/// Logout from a service.
@ -18,13 +17,13 @@ use crate::{commands::ExitStatus, printer::Printer};
pub(crate) async fn logout(
service: Service,
username: Option<String>,
network_settings: &NetworkSettings,
client_builder: BaseClientBuilder<'_>,
printer: Printer,
preview: Preview,
) -> Result<ExitStatus> {
let pyx_store = PyxTokenStore::from_settings()?;
if pyx_store.is_known_domain(service.url()) {
return pyx_logout(&pyx_store, network_settings, printer, preview).await;
return pyx_logout(&pyx_store, client_builder, printer).await;
}
let backend = AuthBackend::from_settings(preview).await?;
@ -93,20 +92,11 @@ pub(crate) async fn logout(
/// Log out via the [`PyxTokenStore`], invalidating the existing tokens.
async fn pyx_logout(
store: &PyxTokenStore,
network_settings: &NetworkSettings,
client_builder: BaseClientBuilder<'_>,
printer: Printer,
preview: Preview,
) -> Result<ExitStatus> {
// Initialize the client.
let client = BaseClientBuilder::new(
network_settings.connectivity,
network_settings.native_tls,
network_settings.allow_insecure_host.clone(),
preview,
network_settings.timeout,
network_settings.retries,
)
.build();
let client = client_builder.build();
// Retrieve the token store.
let Some(tokens) = store.read().await? else {

16
crates/uv/src/commands/auth/token.rs
View File

@ -11,13 +11,12 @@ use uv_preview::Preview;
use crate::commands::ExitStatus;
use crate::commands::auth::login;
use crate::printer::Printer;
use crate::settings::NetworkSettings;
/// Show the token that will be used for a service.
pub(crate) async fn token(
service: Service,
username: Option<String>,
network_settings: &NetworkSettings,
client_builder: BaseClientBuilder<'_>,
printer: Printer,
preview: Preview,
) -> Result<ExitStatus> {
@ -26,16 +25,9 @@ pub(crate) async fn token(
if username.is_some() {
bail!("Cannot specify a username when logging in to pyx");
}
let client = BaseClientBuilder::new(
network_settings.connectivity,
network_settings.native_tls,
network_settings.allow_insecure_host.clone(),
preview,
network_settings.timeout,
network_settings.retries,
)
.auth_integration(AuthIntegration::NoAuthMiddleware)
.build();
let client = client_builder
.auth_integration(AuthIntegration::NoAuthMiddleware)
.build();
pyx_refresh(&pyx_store, &client, printer).await?;
return Ok(ExitStatus::Success);

29
crates/uv/src/lib.rs
View File

@ -479,12 +479,7 @@ async fn run(mut cli: Cli) -> Result<ExitStatus> {
command: AuthCommand::Login(args),
}) => {
// Resolve the settings from the command-line arguments and workspace configuration.
let args = settings::AuthLoginSettings::resolve(
args,
&cli.top_level.global_args,
filesystem.as_ref(),
&environment,
);
let args = settings::AuthLoginSettings::resolve(args);
show_settings!(args);
commands::auth_login(
@ -492,7 +487,7 @@ async fn run(mut cli: Cli) -> Result<ExitStatus> {
args.username,
args.password,
args.token,
&args.network_settings,
client_builder,
printer,
globals.preview,
)
@ -502,18 +497,13 @@ async fn run(mut cli: Cli) -> Result<ExitStatus> {
command: AuthCommand::Logout(args),
}) => {
// Resolve the settings from the command-line arguments and workspace configuration.
let args = settings::AuthLogoutSettings::resolve(
args,
&cli.top_level.global_args,
filesystem.as_ref(),
&environment,
);
let args = settings::AuthLogoutSettings::resolve(args);
show_settings!(args);
commands::auth_logout(
args.service,
args.username,
&args.network_settings,
client_builder,
printer,
globals.preview,
)
@ -523,18 +513,13 @@ async fn run(mut cli: Cli) -> Result<ExitStatus> {
command: AuthCommand::Token(args),
}) => {
// Resolve the settings from the command-line arguments and workspace configuration.
let args = settings::AuthTokenSettings::resolve(
args,
&cli.top_level.global_args,
filesystem.as_ref(),
&environment,
);
let args = settings::AuthTokenSettings::resolve(args);
show_settings!(args);
commands::auth_token(
args.service,
args.username,
&args.network_settings,
client_builder,
printer,
globals.preview,
)
@ -558,7 +543,7 @@ async fn run(mut cli: Cli) -> Result<ExitStatus> {
match args.command {
AuthHelperCommand::Get => {
commands::auth_helper(globals.preview, &globals.network_settings, printer).await
commands::auth_helper(client_builder, globals.preview, printer).await
}
}
}

33
crates/uv/src/settings.rs
View File

@ -3877,23 +3877,14 @@ impl PublishSettings {
pub(crate) struct AuthLogoutSettings {
pub(crate) service: Service,
pub(crate) username: Option<String>,
// Both CLI and configuration.
pub(crate) network_settings: NetworkSettings,
}
impl AuthLogoutSettings {
/// Resolve the [`AuthLogoutSettings`] from the CLI and filesystem configuration.
pub(crate) fn resolve(
args: AuthLogoutArgs,
global_args: &GlobalArgs,
filesystem: Option<&FilesystemOptions>,
environment: &EnvironmentOptions,
) -> Self {
pub(crate) fn resolve(args: AuthLogoutArgs) -> Self {
Self {
service: args.service,
username: args.username,
network_settings: NetworkSettings::resolve(global_args, filesystem, environment),
}
}
}
@ -3903,23 +3894,14 @@ impl AuthLogoutSettings {
pub(crate) struct AuthTokenSettings {
pub(crate) service: Service,
pub(crate) username: Option<String>,
// Both CLI and configuration.
pub(crate) network_settings: NetworkSettings,
}
impl AuthTokenSettings {
/// Resolve the [`AuthTokenSettings`] from the CLI and filesystem configuration.
pub(crate) fn resolve(
args: AuthTokenArgs,
global_args: &GlobalArgs,
filesystem: Option<&FilesystemOptions>,
environment: &EnvironmentOptions,
) -> Self {
pub(crate) fn resolve(args: AuthTokenArgs) -> Self {
Self {
service: args.service,
username: args.username,
network_settings: NetworkSettings::resolve(global_args, filesystem, environment),
}
}
}
@ -3931,25 +3913,16 @@ pub(crate) struct AuthLoginSettings {
pub(crate) username: Option<String>,
pub(crate) password: Option<String>,
pub(crate) token: Option<String>,
// Both CLI and configuration.
pub(crate) network_settings: NetworkSettings,
}
impl AuthLoginSettings {
/// Resolve the [`AuthLoginSettings`] from the CLI and filesystem configuration.
pub(crate) fn resolve(
args: AuthLoginArgs,
global_args: &GlobalArgs,
filesystem: Option<&FilesystemOptions>,
environment: &EnvironmentOptions,
) -> Self {
pub(crate) fn resolve(args: AuthLoginArgs) -> Self {
Self {
service: args.service,
username: args.username,
password: args.password,
token: args.token,
network_settings: NetworkSettings::resolve(global_args, filesystem, environment),
}
}
}