From 743fc60bd42ddd8bcebea9e09000b8bfbdf688ad Mon Sep 17 00:00:00 2001 From: "oxide-renovate[bot]" <146848827+oxide-renovate[bot]@users.noreply.github.com> Date: Fri, 29 May 2026 04:08:44 +0000 Subject: [PATCH 1/3] Update dependency rust to v1.96.0 --- rust-toolchain.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rust-toolchain.toml b/rust-toolchain.toml index d71e80a..b7fa951 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -3,5 +3,5 @@ # https://github.com/oxidecomputer/dropshot/blob/main/rust-toolchain.toml [toolchain] -channel = "1.95.0" +channel = "1.96.0" components = ["clippy", "rustfmt"] From 70929f2d9c0d5b8b155ad955f6b6db6d19768347 Mon Sep 17 00:00:00 2001 From: Peter Tripp Date: Tue, 9 Jun 2026 15:11:01 -0400 Subject: [PATCH 2/3] Clippy fixes --- v-api/src/endpoints/login/oauth/remote/google.rs | 5 ++--- v-api/src/endpoints/login/oauth/remote/zendesk.rs | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/v-api/src/endpoints/login/oauth/remote/google.rs b/v-api/src/endpoints/login/oauth/remote/google.rs index d1a131f..8b0f527 100644 --- a/v-api/src/endpoints/login/oauth/remote/google.rs +++ b/v-api/src/endpoints/login/oauth/remote/google.rs @@ -62,9 +62,8 @@ impl GoogleOAuthProvider { revocation_endpoint: Some("https://oauth2.googleapis.com/revoke".to_string()), }, }); - let authz_code_pkce_flow_info = config - .proxy_web - .and_then(|proxy| authz_code_flow_info.as_ref().map(|web| (web, proxy))) + let authz_code_pkce_flow_info = authz_code_flow_info.as_ref().zip(config + .proxy_web) .map(|(web, proxy)| OAuthProviderAuthorizationCodePkceInfo { client_id: proxy.client_id, redirect_endpoint: proxy.redirect_uri, diff --git a/v-api/src/endpoints/login/oauth/remote/zendesk.rs b/v-api/src/endpoints/login/oauth/remote/zendesk.rs index 283645c..8f6650a 100644 --- a/v-api/src/endpoints/login/oauth/remote/zendesk.rs +++ b/v-api/src/endpoints/login/oauth/remote/zendesk.rs @@ -60,9 +60,8 @@ impl ZendeskOAuthProvider { revocation_endpoint: None, }, }); - let authz_code_pkce_flow_info = config - .proxy_web - .and_then(|proxy| authz_code_flow_info.as_ref().map(|web| (web, proxy))) + let authz_code_pkce_flow_info = authz_code_flow_info.as_ref().zip(config + .proxy_web) .map(|(web, proxy)| OAuthProviderAuthorizationCodePkceInfo { client_id: proxy.client_id, redirect_endpoint: proxy.redirect_uri, From c1814d4896b107e0f01956695022f6c442b6b40e Mon Sep 17 00:00:00 2001 From: Peter Tripp Date: Tue, 9 Jun 2026 15:14:29 -0400 Subject: [PATCH 3/3] Cargo fmt --- .../src/endpoints/login/oauth/remote/google.rs | 18 ++++++++++-------- .../endpoints/login/oauth/remote/zendesk.rs | 18 ++++++++++-------- 2 files changed, 20 insertions(+), 16 deletions(-) diff --git a/v-api/src/endpoints/login/oauth/remote/google.rs b/v-api/src/endpoints/login/oauth/remote/google.rs index 8b0f527..932a8e5 100644 --- a/v-api/src/endpoints/login/oauth/remote/google.rs +++ b/v-api/src/endpoints/login/oauth/remote/google.rs @@ -62,14 +62,16 @@ impl GoogleOAuthProvider { revocation_endpoint: Some("https://oauth2.googleapis.com/revoke".to_string()), }, }); - let authz_code_pkce_flow_info = authz_code_flow_info.as_ref().zip(config - .proxy_web) - .map(|(web, proxy)| OAuthProviderAuthorizationCodePkceInfo { - client_id: proxy.client_id, - redirect_endpoint: proxy.redirect_uri, - proxy_port: proxy.proxy_port, - web: web.clone(), - }); + let authz_code_pkce_flow_info = + authz_code_flow_info + .as_ref() + .zip(config.proxy_web) + .map(|(web, proxy)| OAuthProviderAuthorizationCodePkceInfo { + client_id: proxy.client_id, + redirect_endpoint: proxy.redirect_uri, + proxy_port: proxy.proxy_port, + web: web.clone(), + }); let device_code_flow_info = config.device.map(|device| OAuthProviderDeviceInfo { client_id: device.client_id, auth_url_endpoint: format!("{}/login/oauth/google/device", public_url), diff --git a/v-api/src/endpoints/login/oauth/remote/zendesk.rs b/v-api/src/endpoints/login/oauth/remote/zendesk.rs index 8f6650a..4706422 100644 --- a/v-api/src/endpoints/login/oauth/remote/zendesk.rs +++ b/v-api/src/endpoints/login/oauth/remote/zendesk.rs @@ -60,14 +60,16 @@ impl ZendeskOAuthProvider { revocation_endpoint: None, }, }); - let authz_code_pkce_flow_info = authz_code_flow_info.as_ref().zip(config - .proxy_web) - .map(|(web, proxy)| OAuthProviderAuthorizationCodePkceInfo { - client_id: proxy.client_id, - redirect_endpoint: proxy.redirect_uri, - proxy_port: proxy.proxy_port, - web: web.clone(), - }); + let authz_code_pkce_flow_info = + authz_code_flow_info + .as_ref() + .zip(config.proxy_web) + .map(|(web, proxy)| OAuthProviderAuthorizationCodePkceInfo { + client_id: proxy.client_id, + redirect_endpoint: proxy.redirect_uri, + proxy_port: proxy.proxy_port, + web: web.clone(), + }); Self { authz_code_flow_info,