gitops/optimclaw
1
0
Fork 0
mirror of https://github.com/outbackdingo/optimclaw.git synced 2026-08-31 08:39:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Support direct hosted OAuth callbacks with proxy auth token (#1684)

Browse Source 
* Support direct hosted OAuth callbacks with proxy auth token

* Make OAuth env tests panic-safe

* Preserve public OAuth field compatibility

* Fix OAuth proxy token whitespace fallback
This commit is contained in:
Henry Park
2026-03-26 16:45:31 -07:00
committed by GitHub
parent dd0a0e10ab
commit 5b95d22218
5 changed files with 689 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/extensions/manager.rs
+7 -6
View File
@@ -403,9 +403,10 @@ pub struct ExtensionManager {
/// when running in gateway mode, consumed by the web gateway's
/// `/oauth/callback` handler.
pending_oauth_flows: crate::cli::oauth_defaults::PendingOAuthRegistry,
/// Gateway auth token for authenticating with the platform token exchange proxy.
/// Read once at construction from `GATEWAY_AUTH_TOKEN` env var.
gateway_token: Option<String>,
/// OAuth proxy auth token for authenticating with the hosted token exchange proxy.
/// Resolved once at construction from `IRONCLAW_OAUTH_PROXY_AUTH_TOKEN`,
/// then `GATEWAY_AUTH_TOKEN` as a backward-compatible fallback.
oauth_proxy_auth_token: Option<String>,
/// Relay config captured at startup. Used by `auth_channel_relay` and
/// `activate_channel_relay` instead of re-reading env vars.
relay_config: Option<crate::config::RelayConfig>,
@@ -535,7 +536,7 @@ impl ExtensionManager {
activation_errors: RwLock::new(HashMap::new()),
sse_manager: RwLock::new(None),
pending_oauth_flows: crate::cli::oauth_defaults::new_pending_oauth_registry(),
gateway_token: std::env::var("GATEWAY_AUTH_TOKEN").ok(),
oauth_proxy_auth_token: crate::cli::oauth_defaults::oauth_proxy_auth_token(),
relay_config: crate::config::RelayConfig::from_env(),
relay_event_tx: Arc::new(tokio::sync::Mutex::new(None)),
relay_signing_secret_cache: Arc::new(std::sync::Mutex::new(None)),
@@ -2788,7 +2789,7 @@ impl ExtensionManager {
user_id: user_id.to_string(),
secrets: Arc::clone(&self.secrets),
sse_manager: self.sse_manager.read().await.clone(),
gateway_token: self.gateway_token.clone(),
gateway_token: self.oauth_proxy_auth_token.clone(),
token_exchange_extra_params,
client_id_secret_name: if server.oauth.is_none() {
Some(server.client_id_secret_name())
@@ -3305,7 +3306,7 @@ impl ExtensionManager {
user_id: user_id.to_string(),
secrets: Arc::clone(&self.secrets),
sse_manager: self.sse_manager.read().await.clone(),
gateway_token: self.gateway_token.clone(),
gateway_token: self.oauth_proxy_auth_token.clone(),
token_exchange_extra_params: std::collections::HashMap::new(),
client_id_secret_name: None,
created_at: std::time::Instant::now(),