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 middleware (#5030)
Will Hutchinson22b24cac8c35
diff --git a/crates/macro_middleware/src/auth/attach_user.rs b/crates/macro_middleware/src/auth/attach_user.rsdeleted file mode 100644index 70bf9a5a16..0000000000--- a/crates/macro_middleware/src/auth/attach_user.rs+++ /dev/null@@ -1,113 +0,0 @@-use std::collections::HashMap;--use axum::{- Json,- extract::{Request, State},- http::StatusCode,- middleware::Next,- response::{IntoResponse, Response},-};-use macro_auth::{- error::MacroAuthError,- headers::AccessTokenExtractor,- middleware::decode_jwt::{JwtToken, JwtValidationArgs},-};--use macro_env_var::maybe_env_vars;-use model::{response::ErrorResponse, user::UserContext};--maybe_env_vars! {- struct LocalUserId;- struct LocalFusionUserId;-}--/// Attempts to decode the JWT and attach user to the request context-/// If there is no JWT to decode, the user context remains empty-pub async fn handler(- access_token: Result<AccessTokenExtractor, StatusCode>,- State(jwt_validation_args): State<JwtValidationArgs>, // used for macro-access-token validation- mut req: Request,- next: Next,-) -> Result<Response, Response> {- if cfg!(feature = "local_auth") {- req.extensions_mut().insert(UserContext {- user_id: LocalUserId::new()- .map(|user_id| user_id.to_string())- .unwrap_or_else(|| "macro|[email protected]".to_string()),- fusion_user_id: LocalFusionUserId::new()- .map(|fusion_user_id| fusion_user_id.to_string())- .unwrap_or_else(|| "set me!".to_string()),- organization_id: Some(1),- permissions: None,- });-- return Ok(next.run(req).await);- }-- let query_params: HashMap<String, String> = req- .uri()- .query()- .map(|q| {- url::form_urlencoded::parse(q.as_bytes())- .into_owned()- .collect()- })- .unwrap_or_default();-- let access_token = if let Some(macro_api_token) = query_params.get("macro-api-token") {- tracing::trace!("macro-api-token found in query params");- macro_api_token.to_string()- } else {- match access_token {- Ok(access_token) => access_token.as_ref().to_string(),- Err(e) => {- tracing::trace!(error=?e, "unable to get macro access token");- return Ok(next.run(req).await);- }- }- };-- let jwt = macro_auth::middleware::decode_jwt::handler(&jwt_validation_args, &access_token)- .map_err(|e| match e {- MacroAuthError::JwtExpired => (- StatusCode::UNAUTHORIZED,- Json(ErrorResponse {- message: "jwt expired".into(),- }),- )- .into_response(),- _ => {- tracing::error!(error=?e, "unable to decode jwt");- (- StatusCode::UNAUTHORIZED,- Json(ErrorResponse {- message: "unauthorized".into(),- }),- )- .into_response()- }- })?;-- let (user_id, fusion_user_id, organization_id) = match jwt {- JwtToken::MacroAccessToken(token) => (- token.macro_user_id,- token.root_macro_id.unwrap_or(token.fusion_user_id),- token.macro_organization_id,- ),- JwtToken::MacroApiToken(token) => (- token.macro_user_id,- token.fusion_user_id,- token.macro_organization_id,- ),- };-- // Attach user to the UserContext and to the request- req.extensions_mut().insert(UserContext {- user_id,- fusion_user_id,- organization_id,- permissions: None,- });-- Ok(next.run(req).await)-}diff --git a/crates/macro_middleware/src/auth/decode_jwt.rs b/crates/macro_middleware/src/auth/decode_jwt.rsdeleted file mode 100644index 4335e8be58..0000000000--- a/crates/macro_middleware/src/auth/decode_jwt.rs+++ /dev/null@@ -1,29 +0,0 @@-use axum::{- extract::{Query, Request, State},- http::StatusCode,- middleware::Next,- response::Response,-};-pub use decode_jwt::{DecodeJwtError, DecodedJwt, JwtContext, Params};-use macro_auth::{headers::AccessTokenExtractor, middleware::decode_jwt::JwtValidationArgs};--/// Axum middleware that decodes the JWT and attaches the user context to the request.-///-/// If in your request the user requires to be authenticated for all use cases, you can use this-/// middleware. Otherwise, you should be using the `attach_user` middleware.-pub async fn handler(- access_token: Result<AccessTokenExtractor, StatusCode>,- jwt_validation_args: State<JwtValidationArgs>,- Query(params): Query<Params>,- mut req: Request,- next: Next,-) -> Result<Response, DecodeJwtError> {- let decoded = DecodedJwt::new(access_token, params, &jwt_validation_args)?;-- req.extensions_mut().insert(decoded.user_context);- if let Some(jwt_context) = decoded.jwt_context {- req.extensions_mut().insert(jwt_context);- }-- Ok(next.run(req).await)-}diff --git a/crates/macro_middleware/src/auth/ensure_user_exists.rs b/crates/macro_middleware/src/auth/ensure_user_exists.rsdeleted file mode 100644index 93b9de9f3e..0000000000--- a/crates/macro_middleware/src/auth/ensure_user_exists.rs+++ /dev/null@@ -1,17 +0,0 @@-use axum::{Extension, extract::Request, http::StatusCode, middleware::Next, response::Response};--use model::user::UserContext;--/// Ensures that the user has been attached to the context-pub async fn handler(- user_context: Extension<UserContext>,- req: Request,- next: Next,-) -> Result<Response, StatusCode> {- if user_context.user_id.is_empty() {- tracing::warn!("user id is empty");- return Err(StatusCode::UNAUTHORIZED);- }-- Ok(next.run(req).await)-}diff --git a/crates/macro_middleware/src/auth/initialize_user_context.rs b/crates/macro_middleware/src/auth/initialize_user_context.rsdeleted file mode 100644index f3d406c863..0000000000--- a/crates/macro_middleware/src/auth/initialize_user_context.rs+++ /dev/null@@ -1,9 +0,0 @@-use axum::{extract::Request, middleware::Next, response::Response};--use model::user::UserContext;--/// Initializes the UserContext.-pub async fn handler(mut req: Request, next: Next) -> Result<Response, Response> {- req.extensions_mut().insert(UserContext::default());- Ok(next.run(req).await)-}diff --git a/crates/macro_middleware/src/auth/mod.rs b/crates/macro_middleware/src/auth/mod.rsindex e51c2fbe02..5ef3632672 100644--- a/crates/macro_middleware/src/auth/mod.rs+++ b/crates/macro_middleware/src/auth/mod.rs@@ -1,5 +1 @@-pub mod attach_user;-pub mod decode_jwt;-pub mod ensure_user_exists;-pub mod initialize_user_context;pub mod internal_access;diff --git a/services/document_storage_service/Cargo.toml b/services/document_storage_service/Cargo.tomlindex 3eaa03a403..e87c7f3af4 100644--- a/services/document_storage_service/Cargo.toml+++ b/services/document_storage_service/Cargo.toml@@ -29,7 +29,7 @@ default = [delete_document_worker = []graphql = ["dep:async-graphql", "dep:async-graphql-axum", "dep:complete_graph"]local = ["local_auth"]-local_auth = ["macro_authorization/local_auth", "macro_middleware/local_auth"]+local_auth = ["macro_authorization/local_auth"]location_check = [][dependencies]@@ -116,7 +116,6 @@ macro_env = { path = "../../crates/macro_env" }macro_env_var = { path = "../../crates/macro_env_var" }macro_event_broker = { path = "../../crates/macro_event_broker" }macro_middleware = { path = "../../crates/macro_middleware", default-features = false, features = [- "auth","cloud_storage","user_permissions",] }diff --git a/services/document_storage_service/src/api/mod.rs b/services/document_storage_service/src/api/mod.rsindex 992b151054..90732d1322 100644--- a/services/document_storage_service/src/api/mod.rs+++ b/services/document_storage_service/src/api/mod.rs@@ -243,18 +243,6 @@ fn api_router(state: ApiContext) -> Router {"/crm",crm::inbound::axum_router::crm_router(state.crm_state.clone()),)- .layer(- // NOTE: this will still be needed until we add in `MacroAuthorizationExtractor` support for all crates- ServiceBuilder::new()- .layer(axum::middleware::from_fn(- macro_middleware::auth::initialize_user_context::handler,- ))- .layer(axum::middleware::from_fn_with_state(- state.jwt_validation_args.clone(),- macro_middleware::auth::attach_user::handler,- )),- )- // Merge after the user-auth layer so webhook calls authenticate only with the bot token..merge(bots::inbound::channel_webhook_router::channel_bot_webhook_router(state.channel_bot_webhook_state.clone(),diff --git a/services/email_service/Cargo.toml b/services/email_service/Cargo.tomlindex ee03a40ba6..bbcbc5a08b 100644--- a/services/email_service/Cargo.toml+++ b/services/email_service/Cargo.toml@@ -70,7 +70,7 @@ default = ["sfs_delete",]gmail_webhook_auth = []-local_auth = ["macro_middleware/local_auth"]+local_auth = ["macro_authorization/local_auth"]local_queue = []sfs_map = []sfs_delete = []@@ -121,9 +121,7 @@ macro_event_broker = { path = "../../crates/macro_event_broker" }mailparse = "0.16.1"macro_env_var = { path = "../../crates/macro_env_var" }macro_queues = { path = "../../crates/macro_queues" }-macro_middleware = { path = "../../crates/macro_middleware", default-features = false, features = [- "auth", "cloud_storage"-] }+macro_middleware = { path = "../../crates/macro_middleware", default-features = false }last_online_tracker = { path = "../../crates/last_online_tracker" }notification = { path = "../../crates/notification" }macro_user_id = { path = "../../crates/macro_user_id" }diff --git a/services/email_service/src/api/mod.rs b/services/email_service/src/api/mod.rsindex 89ca61fa12..074344ea43 100644--- a/services/email_service/src/api/mod.rs+++ b/services/email_service/src/api/mod.rs@@ -48,25 +48,7 @@ pub async fn setup_and_serve(state: ApiContext) -> anyhow::Result<()> {fn api_router(state: ApiContext) -> Router<ApiContext> {Router::new()- .nest(- "/email",- email::router(state.clone()).layer(axum::middleware::from_fn_with_state(- state.clone(),- macro_middleware::auth::decode_jwt::handler,- )),- )+ .nest("/email", email::router(state)).nest("/gmail", gmail::router())- .nest(- "/internal",- internal::router().layer(- ServiceBuilder::new()- .layer(axum::middleware::from_fn_with_state(- state,- macro_middleware::auth::internal_access::handler,- ))- .layer(axum::middleware::from_fn(- macro_middleware::auth::initialize_user_context::handler,- )),- ),- )+ .nest("/internal", internal::router())}