Skip to content

armgit / macro

Public Imported from GitHub
0

Macro is a unified workspace for teams: email, chat, docs, tasks, agents, calls, and CRM — @-linked together with shared AI memory.

chore: remove attach_user_permissions (#5051)

Will Hutchinsonb6e331479bf2
diff --git a/crates/macro_middleware/Cargo.toml b/crates/macro_middleware/Cargo.toml
index 906e94768b..90dd8bf1d8 100644
--- a/crates/macro_middleware/Cargo.toml
+++ b/crates/macro_middleware/Cargo.toml
@@ -5,7 +5,7 @@ publish = false
version = "0.1.0"
[features]
-all = ["cloud_storage", "tracking", "user_permissions"]
+all = ["cloud_storage", "tracking"]
cloud_storage = [
"dep:entity_access_db_utils",
"dep:macro_user_id",
@@ -15,7 +15,6 @@ cloud_storage = [
default = ["all"]
macro_db_client = ["dep:macro_db_client", "dep:sqlx"]
tracking = ["dep:ip_extractor"]
-user_permissions = ["dep:macro_user_id", "macro_db_client"]
[dependencies]
anyhow = { workspace = true }
diff --git a/crates/macro_middleware/src/lib.rs b/crates/macro_middleware/src/lib.rs
index d8da5cd2b8..f981d498f6 100644
--- a/crates/macro_middleware/src/lib.rs
+++ b/crates/macro_middleware/src/lib.rs
@@ -8,13 +8,10 @@ use axum::{
#[cfg(feature = "cloud_storage")]
pub mod cloud_storage;
-#[cfg(feature = "user_permissions")]
-pub mod user_permissions;
-
#[cfg(feature = "tracking")]
pub mod tracking;
-#[cfg(any(feature = "cloud_storage", feature = "user_permissions"))]
+#[cfg(feature = "cloud_storage")]
mod error_handler;
/// Wraps all POST/PUT/PATCH/DELETE requests in a tokio task to prevent failure in the event the
diff --git a/crates/macro_middleware/src/user_permissions/attach_user_permissions.rs b/crates/macro_middleware/src/user_permissions/attach_user_permissions.rs
deleted file mode 100644
index 5e11cad3dd..0000000000
--- a/crates/macro_middleware/src/user_permissions/attach_user_permissions.rs
+++ /dev/null
@@ -1,83 +0,0 @@
-use crate::error_handler::error_handler;
-use axum::{
- Extension, RequestPartsExt,
- extract::{FromRef, FromRequestParts, Request, State, rejection::ExtensionRejection},
- http::{StatusCode, request::Parts},
- middleware::Next,
- response::{IntoResponse, Response},
-};
-use model::user::UserContext;
-use sqlx::PgPool;
-use std::collections::HashSet;
-use thiserror::Error;
-
-#[derive(Debug)]
-pub struct PermissionsExtractor(pub HashSet<String>);
-
-#[derive(Debug, Error)]
-pub enum PermissionErr {
- #[error("Internal server error")]
- DbErr(#[from] anyhow::Error),
- #[error("Internal servier error")]
- Extension(#[from] ExtensionRejection),
-}
-
-impl IntoResponse for PermissionErr {
- fn into_response(self) -> Response {
- (StatusCode::INTERNAL_SERVER_ERROR, self.to_string()).into_response()
- }
-}
-
-impl<S> FromRequestParts<S> for PermissionsExtractor
-where
- S: Send + Sync + 'static,
- PgPool: FromRef<S>,
-{
- type Rejection = PermissionErr;
-
- async fn from_request_parts(parts: &mut Parts, state: &S) -> Result<Self, Self::Rejection> {
- let user_ctx: Extension<UserContext> = parts.extract_with_state(state).await?;
- let db = PgPool::from_ref(state);
-
- let permissions =
- macro_db_client::user::get_permissions::get_user_permissions(&db, &user_ctx.user_id)
- .await?;
-
- Ok(Self(permissions))
- }
-}
-
-/// Attaches user permissions to the UserContext
-#[tracing::instrument(skip(db, user_context, req, next), fields(user_id=?user_context.user_id))]
-pub async fn handler(
- State(db): State<PgPool>,
- user_context: Extension<UserContext>,
- mut req: Request,
- next: Next,
-) -> Result<Response, Response> {
- let permissions = match macro_db_client::user::get_permissions::get_user_permissions(
- &db,
- &user_context.user_id,
- )
- .await
- {
- Ok(permissions) => permissions,
- Err(e) => {
- tracing::error!(error=?e, user_id=?user_context.user_id, "unable to get user permissions");
- return Err(error_handler(
- "unable to get user permissions",
- StatusCode::INTERNAL_SERVER_ERROR,
- ));
- }
- };
-
- // Attach user permissions to the UserContext
- req.extensions_mut().insert(UserContext {
- user_id: user_context.user_id.clone(),
- fusion_user_id: user_context.fusion_user_id.clone(),
- permissions: Some(permissions),
- organization_id: user_context.organization_id,
- });
-
- Ok(next.run(req).await)
-}
diff --git a/crates/macro_middleware/src/user_permissions/mod.rs b/crates/macro_middleware/src/user_permissions/mod.rs
deleted file mode 100644
index 15e6e92a71..0000000000
--- a/crates/macro_middleware/src/user_permissions/mod.rs
+++ /dev/null
@@ -1 +0,0 @@
-pub mod attach_user_permissions;
diff --git a/services/document_storage_service/Cargo.toml b/services/document_storage_service/Cargo.toml
index e87c7f3af4..39e586e27a 100644
--- a/services/document_storage_service/Cargo.toml
+++ b/services/document_storage_service/Cargo.toml
@@ -117,7 +117,6 @@ 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 = [
"cloud_storage",
- "user_permissions",
] }
macro_queues = { path = "../../crates/macro_queues" }
macro_service_urls = { path = "../../crates/macro_service_urls" }
@@ -142,9 +141,9 @@ models_properties = { path = "../../crates/models_properties" }
models_soup = { path = "../../crates/models_soup", features = ["schema"] }
notification = { path = "../../crates/notification" }
opensearch_client = { path = "../../crates/opensearch_client" }
+projects_hex = { path = "../../crates/projects", package = "projects" }
properties = { path = "../../crates/properties" }
properties_service = { path = "../../crates/properties_service" }
-projects_hex = { path = "../../crates/projects", package = "projects" }
rate_limit = { path = "../../crates/rate_limit", default-features = false, features = [
"axum",
] }
diff --git a/services/mcp_service/Cargo.toml b/services/mcp_service/Cargo.toml
index b578dbcd7f..5034b018eb 100644
--- a/services/mcp_service/Cargo.toml
+++ b/services/mcp_service/Cargo.toml
@@ -14,39 +14,44 @@ name = "mcp_service_doppler_config"
path = "src/doppler_config.rs"
[dependencies]
-ai_usage = { path = "../../crates/ai_usage" }
ai_tools = { path = "../../crates/ai_tools" }
ai_toolset = { path = "../../crates/ai_toolset" }
+ai_usage = { path = "../../crates/ai_usage" }
anyhow = { workspace = true }
aws-sdk-secretsmanager = { workspace = true }
aws-sdk-sqs = { workspace = true }
axum = { workspace = true, features = ["tower-log"] }
-call = { path = "../../crates/call", default-features = false, features = ["ports"] }
-chat = { path = "../../crates/chat", features = ["ai_tools", "outbound"] }
+call = { path = "../../crates/call", default-features = false, features = [
+ "ports",
+] }
channels = { path = "../../crates/channels", features = ["outbound"] }
+chat = { path = "../../crates/chat", features = ["ai_tools", "outbound"] }
crm = { path = "../../crates/crm" }
+database_env_vars = { path = "../../crates/database_env_vars" }
documents = { path = "../../crates/documents", features = ["ai_tools"] }
+doppler-config = { workspace = true }
email = { path = "../../crates/email", features = ["outbound"] }
email_service_client = { path = "../../crates/email_service_client" }
entity_access = { path = "../../crates/entity_access" }
entity_access_management = { path = "../../crates/entity_access_management" }
foreign_entity = { path = "../../crates/foreign_entity" }
-frecency = { path = "../../crates/frecency", features = ["outbound", "postgres"] }
+frecency = { path = "../../crates/frecency", features = [
+ "outbound",
+ "postgres",
+] }
fusionauth = { path = "../../crates/fusionauth" }
http = { workspace = true }
lexical_client = { path = "../../crates/lexical_client" }
-mcp_auth_proxy = { path = "../mcp_auth_proxy" }
macro_auth = { path = "../../crates/macro_auth" }
macro_aws_config = { path = "../../crates/macro_aws_config", features = ["s3"] }
-macro_entrypoint = { path = "../../crates/macro_entrypoint" }
macro_config = { path = "../../crates/macro_config" }
+macro_entrypoint = { path = "../../crates/macro_entrypoint" }
macro_env = { path = "../../crates/macro_env" }
macro_env_var = { path = "../../crates/macro_env_var" }
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_user_id = { path = "../../crates/macro_user_id" }
+mcp_auth_proxy = { path = "../mcp_auth_proxy" }
notification = { path = "../../crates/notification", features = ["ai_tool"] }
prompt = { path = "../../crates/prompt" }
readonly_pool = { path = "../../crates/readonly_pool" }