Skip to content
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions xet_client/src/cas_client/auth.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ use std::time::{SystemTime, UNIX_EPOCH};
use derivative::Derivative;
use reqwest_middleware::ClientWithMiddleware;
use thiserror::Error;
use tracing::info;

use crate::common::auth::CredentialHelper;

Expand Down Expand Up @@ -193,6 +194,7 @@ impl TokenProvider {
let (new_token, new_expiry) = self.refresher.refresh().await?;
self.token = new_token;
self.expiration = new_expiry;
info!(new_expiry = new_expiry, "Token refreshed");
}
Ok(self.token.clone())
}
Expand Down
16 changes: 5 additions & 11 deletions xet_client/src/common/http_client.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ use reqwest::header::{AUTHORIZATION, COOKIE, HeaderValue, SET_COOKIE};
use reqwest::{Request, Response};
use reqwest_middleware::{ClientBuilder, ClientWithMiddleware, Middleware, Next};
use tokio::sync::Mutex;
use tracing::{Instrument, info, info_span, warn};
use tracing::{Instrument, debug, info, info_span, warn};
use xet_runtime::core::{XetRuntime, xet_config};
use xet_runtime::error_printer::{ErrorPrinter, OptionPrinter};

Expand Down Expand Up @@ -303,16 +303,10 @@ impl AuthMiddleware {
/// don't have a valid token and thus any calls would fail.
async fn get_token(&self) -> Result<String> {
let mut provider = self.token_provider.lock().await;
provider
.get_valid_token()
.await
.map_err(|err| {
warn!(?err, "Token refresh failed");
ClientError::AuthError(err)
})
.inspect(|_token| {
info!("Token refresh successful for CAS authentication");
})
provider.get_valid_token().await.map_err(|err| {
warn!(?err, "Token refresh failed");
ClientError::AuthError(err)
})
}
}

Expand Down
Loading