starred/windmill
1
0
Fork 0
mirror of https://github.com/windmill-labs/windmill.git synced 2026-09-09 08:03:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: the guest plan gate fails closed on non-enterprise builds; settings report the effective switch

Browse Source
This commit is contained in:
Ruben Fiszel
2026-09-02 17:17:49 +00:00
parent 6e2f7d1530
commit 87a3ed9766
4 changed files with 24 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/windmill-api-workspaces/src/workspaces.rs
+7 -1
View File
@@ -1099,6 +1099,10 @@ async fn get_settings(
if let Some(git_sync) = settings.git_sync.as_mut() {
redact_git_sync_webhook_secrets(git_sync);
}
// The effective value, not the column: a switch left on by a plan that no longer
// admits guests must not read as open when every gate says shut.
settings.guest_access_enabled =
settings.guest_access_enabled && windmill_common::workspaces::guest_access_licensed().await;
Ok(Json(settings))
}
@@ -1135,8 +1139,10 @@ async fn get_public_settings(
.await
.map_err(|e| Error::internal_err(format!("getting public settings: {e:#}")))?;
let settings = not_found_if_none(settings, "workspace settings", &w_id)?;
let mut settings = not_found_if_none(settings, "workspace settings", &w_id)?;
tx.commit().await?;
settings.guest_access_enabled =
settings.guest_access_enabled && windmill_common::workspaces::guest_access_licensed().await;
Ok(Json(settings))
}