diff --git a/lib/crates/fabro-server/src/server.rs b/lib/crates/fabro-server/src/server.rs index d90c16c7c..9714a5d39 100644 --- a/lib/crates/fabro-server/src/server.rs +++ b/lib/crates/fabro-server/src/server.rs @@ -63,7 +63,8 @@ use fabro_store::{ }; use fabro_types::settings::run::RunMode; use fabro_types::settings::server::{ - GithubIntegrationSettings, GithubIntegrationStrategy, ServerAuthMethod, + GithubIntegrationSettings, GithubIntegrationStrategy, ServerAuthLayer, ServerAuthMethod, + ServerLayer, }; use fabro_types::settings::{ InterpString, ServerSettings as ResolvedServerSettings, SettingsLayer, @@ -2580,10 +2581,19 @@ fn default_test_app_state_config( } fn ensure_test_auth_methods(settings: &Arc>) { - settings - .write() - .expect("test settings lock poisoned") - .ensure_test_auth_methods(); + let mut settings = settings.write().expect("test settings lock poisoned"); + if settings + .server + .as_ref() + .and_then(|server| server.auth.as_ref()) + .and_then(|auth| auth.methods.as_ref()) + .is_some() + { + return; + } + let server = settings.server.get_or_insert_with(ServerLayer::default); + let auth = server.auth.get_or_insert_with(ServerAuthLayer::default); + auth.methods = Some(vec![ServerAuthMethod::DevToken]); } pub fn create_app_state_with_store(