i/Aether
1
0
Fork 0
mirror of https://github.com/fawney19/Aether.git synced 2026-09-02 01:10:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: bypass oauth cache for forced refresh

Browse Source
This commit is contained in:
fawney19
2026-04-27 23:04:31 +08:00
parent ed17147281
commit 05b8b8a442
1 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
crates/aether-provider-transport/src/oauth_refresh.rs
View File

@@ -355,9 +355,12 @@ impl LocalOAuthRefreshCoordinator {
_ => None, _ => None,
}; };
let refresh_result = adapter let refresh_entry = if force_refresh {
.refresh(executor, transport, cached_entry.as_ref()) None
.await; } else {
cached_entry.as_ref()
};
let refresh_result = adapter.refresh(executor, transport, refresh_entry).await;
if let (Some(lock), Some(lease)) = (distributed_lock, distributed_lease.as_ref()) { if let (Some(lock), Some(lease)) = (distributed_lock, distributed_lease.as_ref()) {
if let Err(err) = lock.release(lease).await { if let Err(err) = lock.release(lease).await {
tracing::warn!( tracing::warn!(
@@ -434,6 +437,7 @@ mod tests {
#[derive(Debug)] #[derive(Debug)]
struct TestAdapter { struct TestAdapter {
refresh_hits: Arc<AtomicUsize>, refresh_hits: Arc<AtomicUsize>,
refresh_with_entry_hits: Arc<AtomicUsize>,
} }
#[async_trait] #[async_trait]
@@ -478,9 +482,12 @@ mod tests {
&self, &self,
_executor: &dyn LocalOAuthHttpExecutor, _executor: &dyn LocalOAuthHttpExecutor,
_transport: &GatewayProviderTransportSnapshot, _transport: &GatewayProviderTransportSnapshot,
_entry: Option<&CachedOAuthEntry>, entry: Option<&CachedOAuthEntry>,
) -> Result<Option<CachedOAuthEntry>, LocalOAuthRefreshError> { ) -> Result<Option<CachedOAuthEntry>, LocalOAuthRefreshError> {
self.refresh_hits.fetch_add(1, Ordering::SeqCst); self.refresh_hits.fetch_add(1, Ordering::SeqCst);
if entry.is_some() {
self.refresh_with_entry_hits.fetch_add(1, Ordering::SeqCst);
}
Ok(Some(CachedOAuthEntry { Ok(Some(CachedOAuthEntry {
provider_type: "test-oauth".to_string(), provider_type: "test-oauth".to_string(),
auth_header_name: "authorization".to_string(), auth_header_name: "authorization".to_string(),
@@ -547,9 +554,11 @@ mod tests {
#[tokio::test] #[tokio::test]
async fn coordinator_reuses_runtime_cached_refresh_result() { async fn coordinator_reuses_runtime_cached_refresh_result() {
let refresh_hits = Arc::new(AtomicUsize::new(0)); let refresh_hits = Arc::new(AtomicUsize::new(0));
let refresh_with_entry_hits = Arc::new(AtomicUsize::new(0));
let coordinator = let coordinator =
LocalOAuthRefreshCoordinator::with_adapters_for_tests(vec![Arc::new(TestAdapter { LocalOAuthRefreshCoordinator::with_adapters_for_tests(vec![Arc::new(TestAdapter {
refresh_hits: Arc::clone(&refresh_hits), refresh_hits: Arc::clone(&refresh_hits),
refresh_with_entry_hits: Arc::clone(&refresh_with_entry_hits),
})]); })]);
let transport = sample_transport(); let transport = sample_transport();
let executor = ReqwestLocalOAuthHttpExecutor::new(reqwest::Client::new()); let executor = ReqwestLocalOAuthHttpExecutor::new(reqwest::Client::new());
@@ -597,9 +606,11 @@ mod tests {
#[tokio::test] #[tokio::test]
async fn coordinator_force_refresh_bypasses_runtime_cache() { async fn coordinator_force_refresh_bypasses_runtime_cache() {
let refresh_hits = Arc::new(AtomicUsize::new(0)); let refresh_hits = Arc::new(AtomicUsize::new(0));
let refresh_with_entry_hits = Arc::new(AtomicUsize::new(0));
let coordinator = let coordinator =
LocalOAuthRefreshCoordinator::with_adapters_for_tests(vec![Arc::new(TestAdapter { LocalOAuthRefreshCoordinator::with_adapters_for_tests(vec![Arc::new(TestAdapter {
refresh_hits: Arc::clone(&refresh_hits), refresh_hits: Arc::clone(&refresh_hits),
refresh_with_entry_hits: Arc::clone(&refresh_with_entry_hits),
})]); })]);
let transport = sample_transport(); let transport = sample_transport();
let executor = ReqwestLocalOAuthHttpExecutor::new(reqwest::Client::new()); let executor = ReqwestLocalOAuthHttpExecutor::new(reqwest::Client::new());
@@ -616,5 +627,6 @@ mod tests {
assert!(first.and_then(|result| result.refreshed_entry).is_some()); assert!(first.and_then(|result| result.refreshed_entry).is_some());
assert!(forced.and_then(|result| result.refreshed_entry).is_some()); assert!(forced.and_then(|result| result.refreshed_entry).is_some());
assert_eq!(refresh_hits.load(Ordering::SeqCst), 2); assert_eq!(refresh_hits.load(Ordering::SeqCst), 2);
assert_eq!(refresh_with_entry_hits.load(Ordering::SeqCst), 0);
} }
} }