Macro is a unified workspace for teams: email, chat, docs, tasks, agents, calls, and CRM — @-linked together with shared AI memory.
TypeScript agentaiai-agentsall-in-onecrmcrm-systememaillinearmcpmessagingnotesnotionofficerustslackslack-alternativestartupstartup-toolstypescriptworkspace
chore: remove legacy internal auth (#5043)
Will Hutchinson3f0918e55968
diff --git a/.github/workspace-dep-closures.json b/.github/workspace-dep-closures.jsonindex f4cde2c200..8b6edeb6a5 100644--- a/.github/workspace-dep-closures.json+++ b/.github/workspace-dep-closures.json@@ -43,7 +43,6 @@"crates/contacts","crates/cowlike","crates/crm",- "crates/decode_jwt","crates/document_sub_type","crates/documents","crates/email",@@ -58,7 +57,6 @@"crates/foreign_entity","crates/frecency","crates/invite_email",- "crates/ip_extractor","crates/item_filters","crates/last_online_tracker","crates/lexical_client",@@ -72,7 +70,6 @@"crates/macro_env_var","crates/macro_event_broker","crates/macro_event_topics",- "crates/macro_middleware","crates/macro_queues","crates/macro_service_urls","crates/macro_sync_service_jwt",@@ -208,7 +205,6 @@"crates/contacts","crates/cowlike","crates/crm",- "crates/decode_jwt","crates/document_sub_type","crates/documents","crates/email",@@ -223,7 +219,6 @@"crates/foreign_entity","crates/frecency","crates/invite_email",- "crates/ip_extractor","crates/item_filters","crates/last_online_tracker","crates/lexical_client",@@ -237,7 +232,6 @@"crates/macro_env_var","crates/macro_event_broker","crates/macro_event_topics",- "crates/macro_middleware","crates/macro_queues","crates/macro_service_urls","crates/macro_sync_service_jwt",@@ -660,7 +654,6 @@"crates/contacts","crates/cowlike","crates/crm",- "crates/decode_jwt","crates/document_sub_type","crates/documents","crates/email",@@ -675,7 +668,6 @@"crates/foreign_entity","crates/frecency","crates/invite_email",- "crates/ip_extractor","crates/item_filters","crates/last_online_tracker","crates/lexical_client",@@ -689,7 +681,6 @@"crates/macro_env_var","crates/macro_event_broker","crates/macro_event_topics",- "crates/macro_middleware","crates/macro_queues","crates/macro_service_urls","crates/macro_sync_service_jwt",@@ -1093,21 +1084,16 @@"crates/contacts","crates/cowlike","crates/database_env_vars",- "crates/decode_jwt","crates/document_sub_type",- "crates/entity_access_db_utils",- "crates/ip_extractor","crates/macro_auth","crates/macro_authorization","crates/macro_aws_config","crates/macro_config","crates/macro_config_derive","crates/macro_cors",- "crates/macro_db_client","crates/macro_entrypoint","crates/macro_env","crates/macro_env_var",- "crates/macro_middleware","crates/macro_queues","crates/macro_service_urls","crates/macro_user_id",@@ -1118,21 +1104,14 @@"crates/model_file_type","crates/model_user","crates/models_bulk_upload",- "crates/models_dcs",- "crates/models_entity_access_management",- "crates/models_opensearch","crates/models_pagination","crates/models_permissions",- "crates/models_properties",- "crates/models_team","crates/non_empty","crates/prompt","crates/rate_limit","crates/remote_env_var","crates/secretsmanager_client","crates/sqs_worker",- "crates/system_properties",- "crates/user_quota","crates/workspace-hack","services/contacts_service"],@@ -1147,7 +1126,6 @@"crates/cowlike","crates/crm","crates/database_env_vars",- "crates/decode_jwt","crates/document_sub_type","crates/email","crates/email_db_client",@@ -1382,7 +1360,6 @@"crates/contacts","crates/cowlike","crates/crm",- "crates/decode_jwt","crates/document_storage_service_client","crates/document_sub_type","crates/documents",@@ -1501,7 +1478,6 @@"crates/contacts","crates/cowlike","crates/crm",- "crates/decode_jwt","crates/document_sub_type","crates/documents","crates/dynamodb_client",@@ -1682,7 +1658,6 @@"crates/contacts","crates/cowlike","crates/crm",- "crates/decode_jwt","crates/document_sub_type","crates/documents","crates/email",@@ -1696,20 +1671,17 @@"crates/foreign_entity","crates/frecency","crates/invite_email",- "crates/ip_extractor","crates/item_filters","crates/last_online_tracker","crates/lexical_client","crates/macro_auth","crates/macro_authorization","crates/macro_aws_config",- "crates/macro_db_client","crates/macro_entrypoint","crates/macro_env","crates/macro_env_var","crates/macro_event_broker","crates/macro_event_topics",- "crates/macro_middleware","crates/macro_service_urls","crates/macro_sync_service_jwt","crates/macro_user_id",@@ -1723,7 +1695,6 @@"crates/model_user","crates/models_ai_projection","crates/models_bulk_upload",- "crates/models_dcs","crates/models_email","crates/models_entity_access_management","crates/models_opensearch",@@ -1733,7 +1704,6 @@"crates/models_search","crates/models_search_cursor","crates/models_soup",- "crates/models_team","crates/non_empty","crates/notification","crates/opensearch_client",@@ -1752,7 +1722,6 @@"crates/system_properties","crates/task_dedup","crates/unfurl",- "crates/user_quota","crates/workspace-hack","services/document_upload_finalizer_handler"],@@ -1772,7 +1741,6 @@"crates/contacts","crates/cowlike","crates/crm",- "crates/decode_jwt","crates/document_sub_type","crates/documents","crates/email",@@ -1786,20 +1754,17 @@"crates/foreign_entity","crates/frecency","crates/invite_email",- "crates/ip_extractor","crates/item_filters","crates/last_online_tracker","crates/lexical_client","crates/macro_auth","crates/macro_authorization","crates/macro_aws_config",- "crates/macro_db_client","crates/macro_entrypoint","crates/macro_env","crates/macro_env_var","crates/macro_event_broker","crates/macro_event_topics",- "crates/macro_middleware","crates/macro_service_urls","crates/macro_sync_service_jwt","crates/macro_user_id",@@ -1813,7 +1778,6 @@"crates/model_user","crates/models_ai_projection","crates/models_bulk_upload",- "crates/models_dcs","crates/models_email","crates/models_entity_access_management","crates/models_opensearch",@@ -1823,7 +1787,6 @@"crates/models_search","crates/models_search_cursor","crates/models_soup",- "crates/models_team","crates/non_empty","crates/notification","crates/opensearch_client",@@ -1842,7 +1805,6 @@"crates/system_properties","crates/task_dedup","crates/unfurl",- "crates/user_quota","crates/workspace-hack"],"docx_unzip_handler": [@@ -2148,7 +2110,6 @@"crates/contacts","crates/cowlike","crates/crm",- "crates/decode_jwt","crates/document_storage_service_client","crates/document_sub_type","crates/email",@@ -2535,7 +2496,6 @@"crates/contacts","crates/cowlike","crates/crm",- "crates/decode_jwt","crates/document_sub_type","crates/documents","crates/email",@@ -2551,20 +2511,17 @@"crates/fusionauth","crates/github","crates/invite_email",- "crates/ip_extractor","crates/item_filters","crates/last_online_tracker","crates/lexical_client","crates/macro_auth","crates/macro_authorization","crates/macro_aws_config",- "crates/macro_db_client","crates/macro_entrypoint","crates/macro_env","crates/macro_env_var","crates/macro_event_broker","crates/macro_event_topics",- "crates/macro_middleware","crates/macro_service_urls","crates/macro_sync_service_jwt","crates/macro_user_id",@@ -2578,7 +2535,6 @@"crates/model_user","crates/models_ai_projection","crates/models_bulk_upload",- "crates/models_dcs","crates/models_email","crates/models_entity_access_management","crates/models_opensearch",@@ -2588,7 +2544,6 @@"crates/models_search","crates/models_search_cursor","crates/models_soup",- "crates/models_team","crates/non_empty","crates/notification","crates/opensearch_client",@@ -2607,7 +2562,6 @@"crates/system_properties","crates/task_dedup","crates/unfurl",- "crates/user_quota","crates/workspace-hack"],"gmail_client": [@@ -2855,7 +2809,6 @@"crates/ai_usage","crates/attachment","crates/cowlike",- "crates/decode_jwt","crates/document_sub_type","crates/entity_access_db_utils","crates/ip_extractor",@@ -3232,7 +3185,6 @@"crates/ai_usage","crates/attachment","crates/cowlike",- "crates/decode_jwt","crates/document_sub_type","crates/entity_access_db_utils","crates/ip_extractor",@@ -3380,7 +3332,6 @@"crates/cowlike","crates/crm","crates/database_env_vars",- "crates/decode_jwt","crates/document_sub_type","crates/documents","crates/email",@@ -3396,7 +3347,6 @@"crates/frecency","crates/fusionauth","crates/invite_email",- "crates/ip_extractor","crates/item_filters","crates/last_online_tracker","crates/lexical_client",@@ -3412,7 +3362,6 @@"crates/macro_env_var","crates/macro_event_broker","crates/macro_event_topics",- "crates/macro_middleware","crates/macro_queues","crates/macro_service_urls","crates/macro_sync_service_jwt",@@ -3487,7 +3436,6 @@"crates/contacts","crates/cowlike","crates/crm",- "crates/decode_jwt","crates/document_sub_type","crates/documents","crates/email",@@ -3502,7 +3450,6 @@"crates/foreign_entity","crates/frecency","crates/invite_email",- "crates/ip_extractor","crates/item_filters","crates/last_online_tracker","crates/lexical_client",@@ -3516,7 +3463,6 @@"crates/macro_env_var","crates/macro_event_broker","crates/macro_event_topics",- "crates/macro_middleware","crates/macro_queues","crates/macro_service_urls","crates/macro_sync_service_jwt",@@ -3957,7 +3903,6 @@"crates/channel_sender","crates/cowlike","crates/database_env_vars",- "crates/decode_jwt","crates/document_sub_type","crates/email_formatting","crates/entity_access_db_utils",@@ -4367,7 +4312,6 @@"crates/cowlike","crates/crm","crates/database_env_vars",- "crates/decode_jwt","crates/document_sub_type","crates/documents","crates/email",@@ -4382,7 +4326,6 @@"crates/foreign_entity","crates/frecency","crates/invite_email",- "crates/ip_extractor","crates/item_filters","crates/last_online_tracker","crates/lexical_client",@@ -4399,7 +4342,6 @@"crates/macro_env_var","crates/macro_event_broker","crates/macro_event_topics",- "crates/macro_middleware","crates/macro_queues","crates/macro_service_urls","crates/macro_sync_service_jwt",@@ -4471,7 +4413,6 @@"crates/contacts","crates/cowlike","crates/crm",- "crates/decode_jwt","crates/document_sub_type","crates/email","crates/email_db_client",@@ -4560,7 +4501,6 @@"crates/contacts","crates/cowlike","crates/crm",- "crates/decode_jwt","crates/document_sub_type","crates/email","crates/email_db_client",@@ -4571,7 +4511,6 @@"crates/filter_ast","crates/frecency","crates/invite_email",- "crates/ip_extractor","crates/item_filters","crates/last_online_tracker","crates/macro_auth",@@ -4582,7 +4521,6 @@"crates/macro_env_var","crates/macro_event_broker","crates/macro_event_topics",- "crates/macro_middleware","crates/macro_service_urls","crates/macro_user_id","crates/macro_uuid",@@ -5102,6 +5040,15 @@"crates/workspace-hack"],"sync_service_hex": [+ "crates/cowlike",+ "crates/macro_auth",+ "crates/macro_authorization",+ "crates/macro_env",+ "crates/macro_env_var",+ "crates/macro_user_id",+ "crates/model-error-response",+ "crates/model_user",+ "crates/remote_env_var","crates/sync_service","crates/workspace-hack"],@@ -5130,7 +5077,6 @@"crates/contacts","crates/cowlike","crates/crm",- "crates/decode_jwt","crates/document_sub_type","crates/email","crates/email_db_client",@@ -5142,20 +5088,17 @@"crates/filter_ast","crates/frecency","crates/invite_email",- "crates/ip_extractor","crates/item_filters","crates/last_online_tracker","crates/lexical_client","crates/macro_auth","crates/macro_authorization","crates/macro_aws_config",- "crates/macro_db_client","crates/macro_entrypoint","crates/macro_env","crates/macro_env_var","crates/macro_event_broker","crates/macro_event_topics",- "crates/macro_middleware","crates/macro_service_urls","crates/macro_user_id","crates/macro_uuid",@@ -5168,7 +5111,6 @@"crates/model_user","crates/models_ai_projection","crates/models_bulk_upload",- "crates/models_dcs","crates/models_email","crates/models_entity_access_management","crates/models_opensearch",@@ -5178,7 +5120,6 @@"crates/models_search","crates/models_search_cursor","crates/models_soup",- "crates/models_team","crates/non_empty","crates/notification","crates/opensearch_client",@@ -5195,7 +5136,6 @@"crates/system_properties","crates/task_dedup","crates/unfurl",- "crates/user_quota","crates/workspace-hack"],"teams": [@@ -5459,7 +5399,6 @@"crates/contacts","crates/cowlike","crates/crm",- "crates/decode_jwt","crates/document_sub_type","crates/documents","crates/email",@@ -5473,20 +5412,17 @@"crates/foreign_entity","crates/frecency","crates/invite_email",- "crates/ip_extractor","crates/item_filters","crates/last_online_tracker","crates/lexical_client","crates/macro_auth","crates/macro_authorization","crates/macro_aws_config",- "crates/macro_db_client","crates/macro_entrypoint","crates/macro_env","crates/macro_env_var","crates/macro_event_broker","crates/macro_event_topics",- "crates/macro_middleware","crates/macro_service_urls","crates/macro_sync_service_jwt","crates/macro_user_id",@@ -5500,7 +5436,6 @@"crates/model_user","crates/models_ai_projection","crates/models_bulk_upload",- "crates/models_dcs","crates/models_email","crates/models_entity_access_management","crates/models_opensearch",@@ -5510,7 +5445,6 @@"crates/models_search","crates/models_search_cursor","crates/models_soup",- "crates/models_team","crates/non_empty","crates/notification","crates/opensearch_client",@@ -5529,7 +5463,6 @@"crates/system_properties","crates/task_dedup","crates/unfurl",- "crates/user_quota","crates/webhook","crates/workspace-hack"],diff --git a/Cargo.lock b/Cargo.lockindex 022948e596..ff7f956aab 100644--- a/Cargo.lock+++ b/Cargo.lock@@ -3137,7 +3137,6 @@ dependencies = ["macro_entrypoint","macro_env","macro_env_var",- "macro_middleware","macro_queues","macro_service_urls","macro_user_id",@@ -8379,11 +8378,9 @@ dependencies = ["anyhow","axum","axum-extra",- "decode_jwt","entity_access_db_utils","http-body-util","ip_extractor",- "macro_auth","macro_db_client","macro_env","macro_env_var",@@ -8402,7 +8399,6 @@ dependencies = ["tokio","tower 0.5.3","tracing",- "url","urlencoding","uuid","workspace-hack",@@ -8709,7 +8705,6 @@ dependencies = ["macro_env","macro_env_var","macro_event_broker",- "macro_middleware","macro_queues","macro_service_urls","macro_user_id",@@ -12522,7 +12517,6 @@ dependencies = ["macro_db_client","macro_env","macro_env_var",- "macro_middleware","macro_user_id","model","models_email",@@ -13929,6 +13923,7 @@ name = "sync_service_hex"version = "0.1.0"dependencies = ["axum",+ "macro_authorization","serde","utoipa","workspace-hack",@@ -14047,7 +14042,6 @@ dependencies = ["macro_entrypoint","macro_env","macro_env_var",- "macro_middleware","macro_service_urls","model-entity","reqwest 0.13.4",diff --git a/apps/web/src/lib/service-clients/service-storage/openapi.json b/apps/web/src/lib/service-clients/service-storage/openapi.jsonindex dafe5030ae..2152428732 100644--- a/apps/web/src/lib/service-clients/service-storage/openapi.json+++ b/apps/web/src/lib/service-clients/service-storage/openapi.json@@ -9228,11 +9228,8 @@}}},- "400": {- "description": "Malformed request or missing internal auth header"- },"401": {- "description": "Invalid internal auth header"+ "description": "Authentication required (JSON error response)"}}}diff --git a/crates/macro_middleware/Cargo.toml b/crates/macro_middleware/Cargo.tomlindex c743886542..906e94768b 100644--- a/crates/macro_middleware/Cargo.toml+++ b/crates/macro_middleware/Cargo.toml@@ -5,8 +5,7 @@ publish = falseversion = "0.1.0"[features]-all = ["auth", "cloud_storage", "tracking", "user_permissions"]-auth = ["dep:decode_jwt", "dep:macro_auth", "dep:url"]+all = ["cloud_storage", "tracking", "user_permissions"]cloud_storage = ["dep:entity_access_db_utils","dep:macro_user_id",@@ -14,7 +13,6 @@ cloud_storage = ["macro_db_client",]default = ["all"]-local_auth = ["decode_jwt/local_auth"]macro_db_client = ["dep:macro_db_client", "dep:sqlx"]tracking = ["dep:ip_extractor"]user_permissions = ["dep:macro_user_id", "macro_db_client"]@@ -23,11 +21,9 @@ user_permissions = ["dep:macro_user_id", "macro_db_client"]anyhow = { workspace = true }axum = { workspace = true, features = ["macros"] }axum-extra = { workspace = true }-decode_jwt = { path = "../decode_jwt", optional = true }entity_access_db_utils = { path = "../entity_access_db_utils", optional = true }http-body-util = { workspace = true }ip_extractor = { path = "../ip_extractor", optional = true }-macro_auth = { path = "../macro_auth", optional = true }macro_db_client = { path = "../macro_db_client", optional = true }macro_env = { path = "../macro_env" }macro_env_var = { path = "../macro_env_var" }@@ -45,7 +41,6 @@ thiserror = { workspace = true }tokio = { workspace = true }tower = { workspace = true }tracing = { workspace = true }-url = { workspace = true, optional = true }uuid = { workspace = true }workspace-hack = { version = "0.1", path = "../workspace-hack" }diff --git a/crates/macro_middleware/src/auth/internal_access.rs b/crates/macro_middleware/src/auth/internal_access.rsdeleted file mode 100644index e11c0eb73f..0000000000--- a/crates/macro_middleware/src/auth/internal_access.rs+++ /dev/null@@ -1,127 +0,0 @@-use axum::{- extract::{FromRef, FromRequestParts, OptionalFromRequestParts, Request},- http::{HeaderMap, StatusCode, request::Parts},- middleware::Next,- response::Response,-};-use macro_auth::InternalApiKey;-use model::user::UserContext;-use std::borrow::Cow;--/// The header key for the internal api key-static INTERNAL_API_KEY_HEADER: &str = "x-internal-auth-key";-static INTERNAL_MACRO_USER_ID_HEADER: &str = "x-internal-macro-user-id";-static INTERNAL_MACRO_ORGANIZATION_ID_HEADER: &str = "x-internal-macro-organization-id";-static INTERNAL_FUSIONAUTH_USER_ID_HEADER: &str = "x-internal-fusionauth-user-id";--/// Sentinel value which represensts that we were able to validate the internal auth key in the header of the request-#[derive(Debug)]-pub struct ValidInternalKey(());--impl<S> FromRequestParts<S> for ValidInternalKey-where- InternalApiKey: FromRef<S>,- S: Send + Sync + 'static,-{- type Rejection = (StatusCode, Cow<'static, str>);-- #[tracing::instrument(ret, err(Debug), skip(parts, state))]- async fn from_request_parts(parts: &mut Parts, state: &S) -> Result<Self, Self::Rejection> {- let Some(auth_token) = parts- .headers- .get(INTERNAL_API_KEY_HEADER)- .and_then(|header| header.to_str().ok())- else {- return Err((- StatusCode::BAD_REQUEST,- format!("missing {} header", INTERNAL_API_KEY_HEADER).into(),- ));- };-- let expected_key = <InternalApiKey>::from_ref(state);-- // TODO: this should be constant time eq to prevent DOS attacks- (expected_key.as_ref() == auth_token)- .then_some(ValidInternalKey(()))- .ok_or((StatusCode::UNAUTHORIZED, Cow::Borrowed("Unauthorized")))- }-}--impl<S> OptionalFromRequestParts<S> for ValidInternalKey-where- InternalApiKey: FromRef<S>,- S: Send + Sync + 'static,-{- type Rejection = std::convert::Infallible;-- async fn from_request_parts(- parts: &mut Parts,- state: &S,- ) -> Result<Option<Self>, Self::Rejection> {- Ok(- <Self as FromRequestParts<S>>::from_request_parts(parts, state)- .await- .ok(),- )- }-}--/// Validates that the INTERNAL_API_KEY_HEADER header is-/// provided and valid-#[axum::debug_middleware(state = InternalApiKey)]-pub async fn handler(- _valid_internal_key: ValidInternalKey,- mut req: Request,- next: Next,-) -> Result<Response, Response> {- let headers = req.headers();-- let user_context_components = get_user_context_components(headers);-- if let Some(user_context_components) = user_context_components {- tracing::trace!(- user_id=?user_context_components.user_id,- fusion_user_id=?user_context_components.fusion_user_id,- organization_id=?user_context_components.organization_id,- "attaching user context"- );-- req.extensions_mut().insert(UserContext {- user_id: user_context_components.user_id.unwrap_or_default(),- fusion_user_id: user_context_components.fusion_user_id.unwrap_or_default(),- organization_id: user_context_components.organization_id,- ..Default::default()- });- }-- Ok(next.run(req).await)-}--struct UserContextComponents {- user_id: Option<String>,- fusion_user_id: Option<String>,- organization_id: Option<i32>,-}--fn get_user_context_components(headers: &HeaderMap) -> Option<UserContextComponents> {- let user_id = headers- .get(INTERNAL_MACRO_USER_ID_HEADER)- .and_then(|header| header.to_str().ok());- let fusion_user_id = headers- .get(INTERNAL_FUSIONAUTH_USER_ID_HEADER)- .and_then(|header| header.to_str().ok());- let organization_id = headers- .get(INTERNAL_MACRO_ORGANIZATION_ID_HEADER)- .and_then(|header| header.to_str().ok())- .and_then(|header| header.parse::<i32>().ok());-- if user_id.is_none() && fusion_user_id.is_none() && organization_id.is_none() {- return None;- }-- Some(UserContextComponents {- user_id: user_id.map(|user_id| user_id.to_string()),- fusion_user_id: fusion_user_id.map(|fusion_user_id| fusion_user_id.to_string()),- organization_id,- })-}diff --git a/crates/macro_middleware/src/auth/mod.rs b/crates/macro_middleware/src/auth/mod.rsdeleted file mode 100644index 5ef3632672..0000000000--- a/crates/macro_middleware/src/auth/mod.rs+++ /dev/null@@ -1 +0,0 @@-pub mod internal_access;diff --git a/crates/macro_middleware/src/lib.rs b/crates/macro_middleware/src/lib.rsindex daaa762fb3..d8da5cd2b8 100644--- a/crates/macro_middleware/src/lib.rs+++ b/crates/macro_middleware/src/lib.rs@@ -8,9 +8,6 @@ use axum::{#[cfg(feature = "cloud_storage")]pub mod cloud_storage;-#[cfg(feature = "auth")]-pub mod auth;-#[cfg(feature = "user_permissions")]pub mod user_permissions;diff --git a/crates/search_service/Cargo.toml b/crates/search_service/Cargo.tomlindex aec5696f2c..b6022ea99f 100644--- a/crates/search_service/Cargo.toml+++ b/crates/search_service/Cargo.toml@@ -42,9 +42,6 @@ system_properties = { path = "../system_properties" }readonly_pool = { path = "../readonly_pool" }macro_env = { path = "../macro_env" }macro_env_var = { path = "../macro_env_var" }-macro_middleware = { path = "../macro_middleware", default-features = false, features = [- "auth",-] }macro_user_id = { path = "../macro_user_id" }model = { path = "../model" }models_email = { path = "../models_email" }diff --git a/crates/sync_service/Cargo.toml b/crates/sync_service/Cargo.tomlindex fb30bf2371..b751f1f01e 100644--- a/crates/sync_service/Cargo.toml+++ b/crates/sync_service/Cargo.toml@@ -6,10 +6,11 @@ version = "0.1.0"[features]default = []-inbound = ["dep:axum", "dep:utoipa"]+inbound = ["dep:axum", "dep:macro_authorization", "dep:utoipa"][dependencies]axum = { workspace = true, optional = true }+macro_authorization = { path = "../macro_authorization", optional = true, default-features = false, features = ["axum"] }serde = { workspace = true }utoipa = { workspace = true, optional = true }workspace-hack = { version = "0.1", path = "../workspace-hack" }diff --git a/crates/sync_service/src/inbound/axum_router.rs b/crates/sync_service/src/inbound/axum_router.rsindex 1c0283945d..230a5f162c 100644--- a/crates/sync_service/src/inbound/axum_router.rs+++ b/crates/sync_service/src/inbound/axum_router.rs@@ -2,36 +2,49 @@ use std::sync::Arc;use axum::{Json, Router,- extract::State,+ extract::{FromRef, State},http::StatusCode,response::{IntoResponse, Response},routing::post,};+use macro_authorization::{+ MacroAuthorizationExtractor, MacroAuthorizationService, MacroAuthorizationState,+};+use crate::domain::{models::{BulkWakeupRequest, BulkWakeupResponse},ports::SyncWakeupService,};-pub struct SyncServiceRouterState<Svc> {+pub struct SyncServiceRouterState<Svc, Auth> {pub service: Arc<Svc>,+ pub authorization_state: MacroAuthorizationState<Auth>,}-impl<Svc> Clone for SyncServiceRouterState<Svc> {+impl<Svc, Auth> Clone for SyncServiceRouterState<Svc, Auth> {fn clone(&self) -> Self {Self {service: self.service.clone(),+ authorization_state: self.authorization_state.clone(),}}}-pub fn sync_service_router<Svc, S>(state: SyncServiceRouterState<Svc>) -> Router<S>+impl<Svc, Auth> FromRef<SyncServiceRouterState<Svc, Auth>> for MacroAuthorizationState<Auth> {+ fn from_ref(state: &SyncServiceRouterState<Svc, Auth>) -> Self {+ state.authorization_state.clone()+ }+}++pub fn sync_service_router<Svc, Auth, S>(state: SyncServiceRouterState<Svc, Auth>) -> Router<S>whereSvc: SyncWakeupService,+ Auth: MacroAuthorizationService,S: Send + Sync + 'static,{Router::new()- .route("/wakeup", post(bulk_wakeup_handler::<Svc>))+ .route("/wakeup", post(bulk_wakeup_handler::<Svc, Auth>)).with_state(state)}@@ -43,16 +56,17 @@ whererequest_body = BulkWakeupRequest,responses((status = 202, description = "Wakeups accepted for fire-and-forget dispatch", body = BulkWakeupResponse),- (status = 400, description = "Malformed request or missing internal auth header"),- (status = 401, description = "Invalid internal auth header"),+ (status = 401, description = "Authentication required (JSON error response)"),))]-pub async fn bulk_wakeup_handler<Svc>(- State(state): State<SyncServiceRouterState<Svc>>,+pub async fn bulk_wakeup_handler<Svc, Auth>(+ State(state): State<SyncServiceRouterState<Svc, Auth>>,+ _user: MacroAuthorizationExtractor<Auth>,Json(request): Json<BulkWakeupRequest>,) -> ResponsewhereSvc: SyncWakeupService,+ Auth: MacroAuthorizationService,{let dispatched = state.service.bulk_wakeup(request.document_ids);diff --git a/crates/task_dedup/Cargo.toml b/crates/task_dedup/Cargo.tomlindex 82fac6f8b3..f07cd8145a 100644--- a/crates/task_dedup/Cargo.toml+++ b/crates/task_dedup/Cargo.toml@@ -28,7 +28,6 @@ backfill = ["dep:macro_aws_config","dep:macro_entrypoint","dep:macro_env",- "dep:macro_middleware","dep:secretsmanager_client","dep:tokio","dep:macro_env_var"@@ -62,9 +61,6 @@ clap = { workspace = true, optional = true }macro_aws_config = { path = "../macro_aws_config", optional = true }macro_entrypoint = { path = "../macro_entrypoint", optional = true }macro_env = { path = "../macro_env", optional = true }-macro_middleware = { path = "../macro_middleware", default-features = false, features = [- "auth",-], optional = true }secretsmanager_client = { path = "../secretsmanager_client", optional = true }tokio = { workspace = true, features = ["macros",diff --git a/services/contacts_service/Cargo.toml b/services/contacts_service/Cargo.tomlindex 7793cf922a..c65337b0e5 100644--- a/services/contacts_service/Cargo.toml+++ b/services/contacts_service/Cargo.toml@@ -29,9 +29,6 @@ macro_aws_config = { path = "../../crates/macro_aws_config" }macro_cors = { path = "../../crates/macro_cors" }macro_entrypoint = { path = "../../crates/macro_entrypoint" }macro_env = { path = "../../crates/macro_env" }-macro_middleware = { path = "../../crates/macro_middleware", default-features = false, features = [- "auth",-] }macro_user_id = { path = "../../crates/macro_user_id" }model = { path = "../../crates/model" }rate_limit = { path = "../../crates/rate_limit", features = ["axum"] }diff --git a/services/document_storage_service/src/api/documents/get_document.rs b/services/document_storage_service/src/api/documents/get_document.rsindex c8a6200474..1441d79a42 100644--- a/services/document_storage_service/src/api/documents/get_document.rs+++ b/services/document_storage_service/src/api/documents/get_document.rs@@ -1,4 +1,6 @@+use crate::api::context::AuthorizationService;use axum::{Extension, Json, extract::Path, http::StatusCode, response::IntoResponse};+use macro_authorization::InternalMacroAuthorizationExtractor;use model::document::DocumentBasic;use model::response::GenericErrorResponse;use serde::Deserialize;@@ -24,8 +26,9 @@ pub struct Params {(status = 500, body=GenericErrorResponse),))]-#[tracing::instrument(skip(document_basic))]+#[tracing::instrument(skip(document_basic, _auth))]pub async fn get_document_basic_handler(+ _auth: InternalMacroAuthorizationExtractor<AuthorizationService>,Extension(document_basic): Extension<DocumentBasic>,Path(Params { document_id }): Path<Params>,) -> impl IntoResponse {diff --git a/services/document_storage_service/src/api/documents/get_documents_metadata.rs b/services/document_storage_service/src/api/documents/get_documents_metadata.rsindex edf31776f5..98f8c7348a 100644--- a/services/document_storage_service/src/api/documents/get_documents_metadata.rs+++ b/services/document_storage_service/src/api/documents/get_documents_metadata.rs@@ -1,17 +1,19 @@-use crate::api::context::ApiContext;+use crate::api::context::{ApiContext, AuthorizationService};use axum::Json;use axum::extract::State;use axum::http::StatusCode;use axum::response::IntoResponse;+use macro_authorization::InternalMacroAuthorizationExtractor;use macro_db_client::notification::get_basic_cloud_storage_documents_metadata;use model::document_storage_service_internal::{DocumentMetadata, GetDocumentsMetadataRequest, GetDocumentsMetadataResponse,};use model::response::GenericResponse;-#[tracing::instrument(skip(ctx), fields(document_count = ?request.document_ids.len()))]+#[tracing::instrument(skip(ctx, _auth), fields(document_count = ?request.document_ids.len()))]pub async fn handler(State(ctx): State<ApiContext>,+ _auth: InternalMacroAuthorizationExtractor<AuthorizationService>,Json(request): Json<GetDocumentsMetadataRequest>,) -> impl IntoResponse {// Validate inputdiff --git a/services/document_storage_service/src/api/documents/put_document_update.rs b/services/document_storage_service/src/api/documents/put_document_update.rsindex 010d76ef01..05c618495c 100644--- a/services/document_storage_service/src/api/documents/put_document_update.rs+++ b/services/document_storage_service/src/api/documents/put_document_update.rs@@ -1,9 +1,10 @@-use crate::api::context::ApiContext;+use crate::api::context::{ApiContext, AuthorizationService};use axum::{extract::{Path, State},http::StatusCode,response::IntoResponse,};+use macro_authorization::InternalMacroAuthorizationExtractor;use model::response::{EmptyResponse, GenericErrorResponse};#[derive(serde::Deserialize)]@@ -11,11 +12,11 @@ pub struct Params {pub document_id: String,}-/// Gets a particular document by its id+/// Updates a particular document by its id.#[utoipa::path(tag = "document",- get,- path = "/documents/{document_id}/update",+ put,+ path = "/internal/documents/{document_id}/update",operation_id = "put_document_update",params(("document_id" = String, Path, description = "Document ID")@@ -27,9 +28,10 @@ pub struct Params {(status = 500, body=GenericErrorResponse),))]-#[tracing::instrument(skip(ctx))]+#[tracing::instrument(skip(ctx, _auth))]pub async fn handler(State(ctx): State<ApiContext>,+ _auth: InternalMacroAuthorizationExtractor<AuthorizationService>,Path(Params { document_id }): Path<Params>,) -> impl IntoResponse {let res = macro_db_client::document::update::update_document(&ctx.db, &document_id).await;diff --git a/services/document_storage_service/src/api/internal/associate_github_installations.rs b/services/document_storage_service/src/api/internal/associate_github_installations.rsindex 3fa1bc9018..be107fe23c 100644--- a/services/document_storage_service/src/api/internal/associate_github_installations.rs+++ b/services/document_storage_service/src/api/internal/associate_github_installations.rs@@ -1,10 +1,11 @@-use crate::api::context::ApiContext;+use crate::api::context::{ApiContext, AuthorizationService};use axum::{extract::{Path, State},http::StatusCode,response::{IntoResponse, Response},};use github::domain::ports::GithubSyncService;+use macro_authorization::InternalMacroAuthorizationExtractor;use model::response::{EmptyResponse, GenericErrorResponse};#[derive(serde::Deserialize)]@@ -29,9 +30,10 @@ pub struct Params {(status = 500, body = GenericErrorResponse),))]-#[tracing::instrument(skip(ctx), err(Debug))]+#[tracing::instrument(skip(ctx, _auth), err(Debug))]pub async fn associate_github_installations_handler(State(ctx): State<ApiContext>,+ _auth: InternalMacroAuthorizationExtractor<AuthorizationService>,Path(Params { github_user_id }): Path<Params>,) -> Result<Response, Response> {ctx.github_sync_servicediff --git a/services/document_storage_service/src/api/internal/mod.rs b/services/document_storage_service/src/api/internal/mod.rsindex 6df8980980..1907552b19 100644--- a/services/document_storage_service/src/api/internal/mod.rs+++ b/services/document_storage_service/src/api/internal/mod.rs@@ -23,14 +23,15 @@ use axum::{Router,routing::{delete, get, post, put},};+use macro_authorization::InternalMacroAuthorizationExtractor;use macro_middleware::cloud_storage::{document::ensure_document_exists, thread::ensure_thread_exists,};mod associate_github_installations;-/// Internal routes. All routes are authenticated via the internal_access middleware-/// These routes are not part of the public Swagger documentation and should never be+/// Internal routes authenticate through extractors on each handler.+/// These routes are not part of the public Swagger documentation.pub fn router(state: ApiContext) -> Router<ApiContext> {let ensure_document_exists_middleware =axum::middleware::from_fn_with_state(state.clone(), ensure_document_exists::handler);@@ -184,5 +185,11 @@ pub fn router(state: ApiContext) -> Router<ApiContext> {"/github/installations/{github_user_id}/associate",post(associate_github_installations::associate_github_installations_handler),)- .route("/health", get(async move || "healthy"))+ .route("/health", get(health_handler))+}++async fn health_handler(+ _auth: InternalMacroAuthorizationExtractor<AuthorizationService>,+) -> &'static str {+ "healthy"}diff --git a/services/document_storage_service/src/api/middleware/internal_access.rs b/services/document_storage_service/src/api/middleware/internal_access.rsdeleted file mode 100644index 2587d93297..0000000000--- a/services/document_storage_service/src/api/middleware/internal_access.rs+++ /dev/null@@ -1,91 +0,0 @@-use crate::api::{- MACRO_DOCUMENT_STORAGE_SERVICE_AUTH_HEADER_KEY, MACRO_INTERNAL_USER_ID,- MACRO_INTERNAL_USER_ID_HEADER_KEY, context::DocumentStorageServiceAuthKey,-};-use axum::{- extract::{Request, State},- http::StatusCode,- middleware::Next,- response::{IntoResponse, Response},-};-use model::user::UserContext;-use reqwest::header::ToStrError;-use thiserror::Error;-use tracing::Level;--#[cfg(test)]-mod tests;--#[derive(Debug, Error)]-pub(crate) enum InternalAccessErr {- #[error(- "The {} header value was not provided",- MACRO_DOCUMENT_STORAGE_SERVICE_AUTH_HEADER_KEY- )]- MissingHeader,- #[error("Failed to parse header value to ascii {0:?}")]- NonAsciiBytes(#[from] ToStrError),- #[error("Received invalid header value {0}")]- InvalidHeaderValue(String),-}--impl IntoResponse for InternalAccessErr {- fn into_response(self) -> Response {- let status = match &self {- InternalAccessErr::MissingHeader | InternalAccessErr::NonAsciiBytes(_) => {- StatusCode::BAD_REQUEST- }- InternalAccessErr::InvalidHeaderValue(_) => StatusCode::UNAUTHORIZED,- };- (status, self.to_string()).into_response()- }-}--/// Validates that the x-document-storage-service-auth-key header is-/// provided and valid-#[axum::debug_middleware]-#[tracing::instrument(skip_all, err(level = Level::WARN))]-pub(in crate::api) async fn handler(- State(auth_key): State<DocumentStorageServiceAuthKey>,- mut req: Request,- next: Next,-) -> Result<Response, InternalAccessErr> {- let auth_token_header = req- .headers()- .get(MACRO_DOCUMENT_STORAGE_SERVICE_AUTH_HEADER_KEY)- .map(|header| header.to_str())- .transpose()?;-- let Some(auth_token) = auth_token_header else {- tracing::error!(- "missing {} header on request to {}",- MACRO_DOCUMENT_STORAGE_SERVICE_AUTH_HEADER_KEY,- req.uri()- );- tracing::info!("{:?}", req.headers());-- return Err(InternalAccessErr::MissingHeader);- };- if auth_token != auth_key.as_ref() {- return Err(InternalAccessErr::InvalidHeaderValue(- auth_token.to_string(),- ));- }-- let user_id: String = req- .headers()- .get(MACRO_INTERNAL_USER_ID_HEADER_KEY)- .and_then(|header| header.to_str().ok())- .map(|header| header.to_string())- .unwrap_or(MACRO_INTERNAL_USER_ID.to_string());-- // Attach user_id to the UserContext- req.extensions_mut().insert(UserContext {- user_id,- fusion_user_id: "".to_string(), // not needed in this use case- permissions: None,- organization_id: None,- });-- Ok(next.run(req).await)-}diff --git a/services/document_storage_service/src/api/middleware/internal_access/tests.rs b/services/document_storage_service/src/api/middleware/internal_access/tests.rsdeleted file mode 100644index ea43b85807..0000000000--- a/services/document_storage_service/src/api/middleware/internal_access/tests.rs+++ /dev/null@@ -1,93 +0,0 @@-use axum::Router;-use axum::body::Body;-use axum::routing::get;-use http_body_util::BodyExt;-use tower::ServiceExt;--use super::*;--fn make_app() -> Router {- Router::new().route("/", get(async || "hello world")).layer(- axum::middleware::from_fn_with_state(- DocumentStorageServiceAuthKey::Comptime("my-secret-value"),- handler,- ),- )-}--#[tokio::test]-async fn it_catches_missing_header() {- let res = make_app()- .oneshot(Request::builder().uri("/").body(Body::empty()).unwrap())- .await- .unwrap();-- // we didn't provide the header value- assert_eq!(res.status(), StatusCode::BAD_REQUEST);- let body = res.into_body().collect().await.unwrap().to_bytes();- let text = String::from_utf8(body.into()).unwrap();- assert_eq!(text, InternalAccessErr::MissingHeader.to_string());-}--#[tokio::test]-async fn it_catches_non_ascii() {- let header = "🦀🦀🦀🦀🦀🦀🦀🦀";- let res = make_app()- .oneshot(- Request::builder()- .uri("/")- .header(MACRO_DOCUMENT_STORAGE_SERVICE_AUTH_HEADER_KEY, header)- .body(Body::empty())- .unwrap(),- )- .await- .unwrap();-- assert_eq!(res.status(), StatusCode::BAD_REQUEST);- let body = res.into_body().collect().await.unwrap().to_bytes();- let text = String::from_utf8(body.into()).unwrap();- assert!(text.contains("Failed to parse"))-}--#[tokio::test]-async fn it_fails_with_invalid_header() {- let header = "wrong_header";- let res = make_app()- .oneshot(- Request::builder()- .uri("/")- .header(MACRO_DOCUMENT_STORAGE_SERVICE_AUTH_HEADER_KEY, header)- .body(Body::empty())- .unwrap(),- )- .await- .unwrap();-- assert_eq!(res.status(), StatusCode::UNAUTHORIZED);- let body = res.into_body().collect().await.unwrap().to_bytes();- let text = String::from_utf8(body.into()).unwrap();- assert_eq!(- text,- InternalAccessErr::InvalidHeaderValue(header.to_string()).to_string()- );-}--#[tokio::test]-async fn it_works_with_correct_header() {- let header = "my-secret-value";- let res = make_app()- .oneshot(- Request::builder()- .uri("/")- .header(MACRO_DOCUMENT_STORAGE_SERVICE_AUTH_HEADER_KEY, header)- .body(Body::empty())- .unwrap(),- )- .await- .unwrap();-- assert_eq!(res.status(), StatusCode::OK);- let body = res.into_body().collect().await.unwrap().to_bytes();- let text = String::from_utf8(body.into()).unwrap();- assert_eq!(text, "hello world");-}diff --git a/services/document_storage_service/src/api/middleware/mod.rs b/services/document_storage_service/src/api/middleware/mod.rsindex ed197de4f1..dac16df881 100644--- a/services/document_storage_service/src/api/middleware/mod.rs+++ b/services/document_storage_service/src/api/middleware/mod.rs@@ -1,2 +1 @@pub mod ensure_user_is_onboarded;-pub mod internal_access;diff --git a/services/document_storage_service/src/api/mod.rs b/services/document_storage_service/src/api/mod.rsindex 90732d1322..72afafaaba 100644--- a/services/document_storage_service/src/api/mod.rs+++ b/services/document_storage_service/src/api/mod.rs@@ -48,10 +48,6 @@ mod threads;// Constants// auth based constants-pub static MACRO_DOCUMENT_STORAGE_SERVICE_AUTH_HEADER_KEY: &str =- "x-document-storage-service-auth-key";-pub static MACRO_INTERNAL_USER_ID_HEADER_KEY: &str = "x-document-storage-service-user-id";-pub const MACRO_INTERNAL_USER_ID: &str = "macro|[email protected]";pub async fn setup_and_serve(state: ApiContext) -> anyhow::Result<()> {@@ -201,6 +197,7 @@ fn api_router(state: ApiContext) -> Router {sync_service_hex::inbound::axum_router::sync_service_router(sync_service_hex::inbound::axum_router::SyncServiceRouterState {service: state.sync_service_client.clone(),+ authorization_state: state.authorization_state.clone(),},),)@@ -262,19 +259,13 @@ fn api_router(state: ApiContext) -> Router {sync_service_hex::inbound::axum_router::sync_service_router(sync_service_hex::inbound::axum_router::SyncServiceRouterState {service: state.sync_service_client.clone(),+ authorization_state: state.authorization_state.clone(),},),)- .layer(- ServiceBuilder::new()- .layer(axum::middleware::from_fn_with_state(- state.clone(),- middleware::internal_access::handler,- ))- .layer(axum::middleware::from_fn(- macro_middleware::connection_drop_prevention_handler,- )),- ),+ .layer(ServiceBuilder::new().layer(axum::middleware::from_fn(+ macro_middleware::connection_drop_prevention_handler,+ ))),).nest("/recents", recents::router()).nest("/saved_views", saved_views::router())diff --git a/services/document_storage_service/src/api/notification/get_document_notification_users.rs b/services/document_storage_service/src/api/notification/get_document_notification_users.rsindex 2664bb1945..1b102bf1d4 100644--- a/services/document_storage_service/src/api/notification/get_document_notification_users.rs+++ b/services/document_storage_service/src/api/notification/get_document_notification_users.rs@@ -1,7 +1,9 @@+use crate::api::context::AuthorizationService;use axum::Json;use axum::extract::State;use axum::response::Response;use axum::{extract::Path, http::StatusCode, response::IntoResponse};+use macro_authorization::InternalMacroAuthorizationExtractor;use model::response::GenericErrorResponse;use sqlx::PgPool;@@ -25,9 +27,10 @@ pub struct Params {(status = 500, body=GenericErrorResponse),))]-#[tracing::instrument(skip(db))]+#[tracing::instrument(skip(db, _auth))]pub async fn handler(State(db): State<PgPool>,+ _auth: InternalMacroAuthorizationExtractor<AuthorizationService>,Path(Params { document_id }): Path<Params>,) -> Result<Response, Response> {let users =diff --git a/services/document_storage_service/src/api/notification/get_project_notification_users.rs b/services/document_storage_service/src/api/notification/get_project_notification_users.rsindex d1d9cea513..103fc58551 100644--- a/services/document_storage_service/src/api/notification/get_project_notification_users.rs+++ b/services/document_storage_service/src/api/notification/get_project_notification_users.rs@@ -1,7 +1,9 @@+use crate::api::context::AuthorizationService;use axum::Json;use axum::extract::State;use axum::response::Response;use axum::{extract::Path, http::StatusCode, response::IntoResponse};+use macro_authorization::InternalMacroAuthorizationExtractor;use model::response::GenericErrorResponse;use sqlx::PgPool;@@ -25,9 +27,10 @@ pub struct Params {(status = 500, body=GenericErrorResponse),))]-#[tracing::instrument(skip(db))]+#[tracing::instrument(skip(db, _auth))]pub async fn handler(State(db): State<PgPool>,+ _auth: InternalMacroAuthorizationExtractor<AuthorizationService>,Path(Params { project_id }): Path<Params>,) -> Result<Response, Response> {let users =diff --git a/services/document_storage_service/src/api/notification/mod.rs b/services/document_storage_service/src/api/notification/mod.rsindex f23d8fb2a9..68f5990009 100644--- a/services/document_storage_service/src/api/notification/mod.rs+++ b/services/document_storage_service/src/api/notification/mod.rs@@ -5,8 +5,8 @@ use crate::api::context::ApiContext;pub(in crate::api) mod get_document_notification_users;pub(in crate::api) mod get_project_notification_users;-/// Notifications router is nested under the internal router-/// This means that the notifications calls are only accessible via internal api key+/// Notifications router nested under the internal router.+/// Each notification handler authenticates requests with an internal API key extractor.pub fn router() -> Router<ApiContext> {Router::new().route(diff --git a/services/document_storage_service/src/api/user/delete_user_items.rs b/services/document_storage_service/src/api/user/delete_user_items.rsindex 710467c33f..5c853e3609 100644--- a/services/document_storage_service/src/api/user/delete_user_items.rs+++ b/services/document_storage_service/src/api/user/delete_user_items.rs@@ -1,9 +1,10 @@-use crate::api::context::ApiContext;+use crate::api::context::{ApiContext, AuthorizationService};use axum::{extract::{Path, State},http::StatusCode,response::{IntoResponse, Response},};+use macro_authorization::InternalMacroAuthorizationExtractor;use model::response::{EmptyResponse, GenericErrorResponse};#[derive(serde::Deserialize)]@@ -25,9 +26,10 @@ pub struct Params {(status = 500, body=GenericErrorResponse),))]-#[tracing::instrument(skip(ctx))]+#[tracing::instrument(skip(ctx, _auth))]pub async fn delete_user_items_handler(State(ctx): State<ApiContext>,+ _auth: InternalMacroAuthorizationExtractor<AuthorizationService>,Path(Params { user_id }): Path<Params>,) -> Result<Response, Response> {tracing::info!("deleting user dss items");diff --git a/services/image_proxy_service/Cargo.toml b/services/image_proxy_service/Cargo.tomlindex 84d19c16fc..41cc42378a 100644--- a/services/image_proxy_service/Cargo.toml+++ b/services/image_proxy_service/Cargo.toml@@ -30,7 +30,6 @@ macro_cors = { path = "../../crates/macro_cors" }macro_entrypoint = { path = "../../crates/macro_entrypoint" }macro_env = { path = "../../crates/macro_env" }macro_middleware = { path = "../../crates/macro_middleware", default-features = false, features = [- "auth","tracking",] }model = { path = "../../crates/model" }diff --git a/services/mcp_service/Cargo.toml b/services/mcp_service/Cargo.tomlindex 2c84831e3b..b578dbcd7f 100644--- a/services/mcp_service/Cargo.toml+++ b/services/mcp_service/Cargo.toml@@ -46,11 +46,6 @@ macro_event_broker = { path = "../../crates/macro_event_broker" }macro_queues = { path = "../../crates/macro_queues" }database_env_vars = { path = "../../crates/database_env_vars" }doppler-config = { workspace = true }-macro_middleware = { path = "../../crates/macro_middleware", default-features = false, features = [- "auth",- "cloud_storage",- "user_permissions",-] }macro_user_id = { path = "../../crates/macro_user_id" }notification = { path = "../../crates/notification", features = ["ai_tool"] }prompt = { path = "../../crates/prompt" }diff --git a/services/notification_service/Cargo.toml b/services/notification_service/Cargo.tomlindex 2220806262..1f598bf052 100644--- a/services/notification_service/Cargo.toml+++ b/services/notification_service/Cargo.toml@@ -40,9 +40,7 @@ macro_cors = { path = "../../crates/macro_cors" }macro_entrypoint = { path = "../../crates/macro_entrypoint" }macro_env = { path = "../../crates/macro_env" }macro_env_var = { path = "../../crates/macro_env_var" }-macro_middleware = { path = "../../crates/macro_middleware", default-features = false, features = [- "auth",-] }+macro_middleware = { path = "../../crates/macro_middleware", default-features = false }macro_queues = { path = "../../crates/macro_queues" }macro_tower_layers = { path = "../../crates/macro_tower_layers" }macro_user_id = { path = "../../crates/macro_user_id" }