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.

feat(chat): allow bots to create chats (#5261)

Wolf Mermelstein77425d439ca7
diff --git a/crates/chat/src/inbound/http/extractors.rs b/crates/chat/src/inbound/http/extractors.rs
index b74fbc211b..f3dc5eb384 100644
--- a/crates/chat/src/inbound/http/extractors.rs
+++ b/crates/chat/src/inbound/http/extractors.rs
@@ -11,8 +11,8 @@ use axum::http::StatusCode;
use axum::http::request::Parts;
use axum::response::IntoResponse;
use macro_authorization::{
- MacroAuthorizationExtractor, MacroAuthorizationRejection, MacroAuthorizationService,
- MacroAuthorizationState, UserOrInternal,
+ ActingUser, MacroAuthorizationExtractor, MacroAuthorizationRejection,
+ MacroAuthorizationService, MacroAuthorizationState,
};
use roles_and_permissions::domain::model::PermissionId;
use roles_and_permissions::domain::port::UserRolesAndPermissionsService;
@@ -104,7 +104,7 @@ where
async fn from_request_parts(parts: &mut Parts, state: &S) -> Result<Self, Self::Rejection> {
let user =
- MacroAuthorizationExtractor::<Auth, UserOrInternal>::from_request_parts(parts, state)
+ MacroAuthorizationExtractor::<Auth, ActingUser>::from_request_parts(parts, state)
.await
.map_err(ChatModelAccessRejection::Unauthorized)?;
let user = &user.authorization.user;
diff --git a/crates/chat/src/inbound/http/router.rs b/crates/chat/src/inbound/http/router.rs
index 2855b09f5c..5b5675c1f9 100644
--- a/crates/chat/src/inbound/http/router.rs
+++ b/crates/chat/src/inbound/http/router.rs
@@ -13,7 +13,7 @@ use entity_access::domain::models::{EditAccessLevel, OwnerAccessLevel, ViewAcces
use entity_access::domain::ports::EntityAccessService;
use entity_access::inbound::axum_extractors::ChatAccessLevelExtractor;
use macro_authorization::{
- MacroAuthorizationExtractor, MacroAuthorizationService, MacroAuthorizationState, UserOrInternal,
+ ActingUser, MacroAuthorizationExtractor, MacroAuthorizationService, MacroAuthorizationState,
};
use model::response::StringIDResponse;
use models_permissions::share_permission::SharePermissionV2;
@@ -217,7 +217,7 @@ pub async fn create_chat_handler<
P: UserRolesAndPermissionsService,
>(
State(state): State<ChatRouterState<S, Svc, Auth, P>>,
- user: MacroAuthorizationExtractor<Auth, UserOrInternal>,
+ user: MacroAuthorizationExtractor<Auth, ActingUser>,
// 402 on no perms
_access: ChatModelAccess<Auth, P>,
Json(req): Json<CreateChatRequest>,