diff --git a/backend/windmill-api/src/lib.rs b/backend/windmill-api/src/lib.rs index 37139b923f..4734b3a3ab 100644 --- a/backend/windmill-api/src/lib.rs +++ b/backend/windmill-api/src/lib.rs @@ -437,7 +437,17 @@ pub async fn run_server( jobs::workspace_unauthed_service().layer(cors.clone()), ) .route("/slack", post(slack_approvals::slack_app_callback_handler)) - .nest("/teams", teams_ee::teams_service()) + .nest("/teams", { + #[cfg(feature = "enterprise")] + { + teams_ee::teams_service() + } + + #[cfg(not(feature = "enterprise"))] + { + Router::new() + } + }) .route( "/w/:workspace_id/jobs/slack_approval/:job_id", get(slack_approvals::request_slack_approval), diff --git a/backend/windmill-api/src/oauth2_ee.rs b/backend/windmill-api/src/oauth2_ee.rs index 4648873431..49d2155cf3 100644 --- a/backend/windmill-api/src/oauth2_ee.rs +++ b/backend/windmill-api/src/oauth2_ee.rs @@ -80,9 +80,10 @@ pub struct AllClients { } #[cfg(feature = "oauth2")] -pub fn build_oauth_clients( +pub async fn build_oauth_clients( _base_url: &str, _oauths_from_config: Option>, + _db: &DB, ) -> anyhow::Result { // Implementation is not open source return Ok(AllClients { diff --git a/backend/windmill-api/src/teams_ee.rs b/backend/windmill-api/src/teams_ee.rs new file mode 120000 index 0000000000..c8842352e7 --- /dev/null +++ b/backend/windmill-api/src/teams_ee.rs @@ -0,0 +1 @@ +/Users/alex/windmill/dev/repos/windmill/../windmill-ee-private//windmill-api/src/teams_ee.rs \ No newline at end of file diff --git a/backend/windmill-common/src/lib.rs b/backend/windmill-common/src/lib.rs index 1b963323dd..b342890faa 100644 --- a/backend/windmill-common/src/lib.rs +++ b/backend/windmill-common/src/lib.rs @@ -36,8 +36,8 @@ pub mod job_s3_helpers_ee; pub mod jobs; pub mod more_serde; pub mod oauth2; -#[cfg(feature = "enterprise")] -pub mod teams_ee; +// #[cfg(feature = "enterprise")] +// pub mod teams_ee; pub mod otel_ee; pub mod queue; pub mod s3_helpers;