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(teams): allows admins to perform team membership CRUD (#4494)

Will Hutchinson455eaf2ec410
diff --git a/rust/cloud-storage/teams/src/domain/team_repo.rs b/rust/cloud-storage/teams/src/domain/team_repo.rs
index f4fcb26a95..1a1abe237f 100644
--- a/rust/cloud-storage/teams/src/domain/team_repo.rs
+++ b/rust/cloud-storage/teams/src/domain/team_repo.rs
@@ -295,14 +295,14 @@ pub trait TeamService: Clone + Send + Sync + 'static {
/// Returns the team invites created.
fn invite_users_to_team(
&self,
- entity_access_receipt: EntityAccessReceipt<OwnerTeamRole>,
+ entity_access_receipt: EntityAccessReceipt<AdminTeamRole>,
invites: non_empty::NonEmpty<&[Email<Lowercase<'_>>]>,
) -> impl Future<Output = Result<Vec<TeamInvite<'_>>, InviteUsersToTeamError>> + Send;
/// Remove user from a team.
fn remove_user_from_team(
&self,
- entity_access_receipt: EntityAccessReceipt<OwnerTeamRole>,
+ entity_access_receipt: EntityAccessReceipt<AdminTeamRole>,
user_id: &MacroUserIdStr<'_>,
) -> impl Future<Output = Result<(), RemoveUserFromTeamError>> + Send;
@@ -316,7 +316,7 @@ pub trait TeamService: Clone + Send + Sync + 'static {
/// Deletes a team invite from a team.
fn delete_team_invite(
&self,
- entity_access_receipt: EntityAccessReceipt<OwnerTeamRole>,
+ entity_access_receipt: EntityAccessReceipt<AdminTeamRole>,
team_invite_id: &uuid::Uuid,
) -> impl Future<Output = Result<(), RemoveTeamInviteError>> + Send;
diff --git a/rust/cloud-storage/teams/src/domain/team_service.rs b/rust/cloud-storage/teams/src/domain/team_service.rs
index 4be6108656..1857a8ee58 100644
--- a/rust/cloud-storage/teams/src/domain/team_service.rs
+++ b/rust/cloud-storage/teams/src/domain/team_service.rs
@@ -385,7 +385,7 @@ where
#[tracing::instrument(skip(self), err)]
async fn invite_users_to_team(
&self,
- entity_access_receipt: EntityAccessReceipt<OwnerTeamRole>,
+ entity_access_receipt: EntityAccessReceipt<AdminTeamRole>,
invites: non_empty::NonEmpty<&[Email<Lowercase<'_>>]>,
) -> Result<Vec<TeamInvite<'_>>, InviteUsersToTeamError> {
let team_id =
@@ -483,7 +483,7 @@ where
#[tracing::instrument(skip(self), err)]
async fn remove_user_from_team(
&self,
- entity_access_receipt: EntityAccessReceipt<OwnerTeamRole>,
+ entity_access_receipt: EntityAccessReceipt<AdminTeamRole>,
user_id: &MacroUserIdStr<'_>,
) -> Result<(), RemoveUserFromTeamError> {
let team_id =
@@ -647,7 +647,7 @@ where
#[tracing::instrument(skip(self), err)]
async fn delete_team_invite(
&self,
- entity_access_receipt: EntityAccessReceipt<OwnerTeamRole>,
+ entity_access_receipt: EntityAccessReceipt<AdminTeamRole>,
team_invite_id: &uuid::Uuid,
) -> Result<(), RemoveTeamInviteError> {
let team_id =
diff --git a/rust/cloud-storage/teams/src/domain/team_service/test.rs b/rust/cloud-storage/teams/src/domain/team_service/test.rs
index 46452b02a4..b57ae99c72 100644
--- a/rust/cloud-storage/teams/src/domain/team_service/test.rs
+++ b/rust/cloud-storage/teams/src/domain/team_service/test.rs
@@ -8,7 +8,7 @@ use std::{
};
use entity_access::domain::models::{
- AdminTeamRole, EntityAccessReceipt, EntityType, OwnerTeamRole, RequiredPermission,
+ AdminTeamRole, EntityAccessReceipt, EntityType, RequiredPermission,
};
use macro_user_id::{email::Email, lowercased::Lowercase, user_id::MacroUserIdStr};
use notification::domain::{
@@ -960,7 +960,7 @@ async fn test_invite_marks_sent_only_for_successful_notifications() {
];
let invites = non_empty::NonEmpty::new(invites.as_slice()).unwrap();
- let receipt = test_team_receipt::<OwnerTeamRole>(team_id, &invited_by);
+ let receipt = test_team_receipt::<AdminTeamRole>(team_id, &invited_by);
let result = service
.invite_users_to_team(receipt, invites)
.await
@@ -1002,7 +1002,7 @@ async fn test_invite_does_not_call_mark_sent_when_all_notifications_fail() {
];
let invites = non_empty::NonEmpty::new(invites.as_slice()).unwrap();
- let receipt = test_team_receipt::<OwnerTeamRole>(team_id, &invited_by);
+ let receipt = test_team_receipt::<AdminTeamRole>(team_id, &invited_by);
service
.invite_users_to_team(receipt, invites)
.await
@@ -1043,7 +1043,7 @@ async fn test_invite_marks_all_sent_when_all_notifications_succeed() {
];
let invites = non_empty::NonEmpty::new(invites.as_slice()).unwrap();
- let receipt = test_team_receipt::<OwnerTeamRole>(team_id, &invited_by);
+ let receipt = test_team_receipt::<AdminTeamRole>(team_id, &invited_by);
service
.invite_users_to_team(receipt, invites)
.await
@@ -1293,7 +1293,7 @@ async fn test_invite_users_to_team_backfills_legacy_team_subscription() {
.lowercase(),
];
let invites = non_empty::NonEmpty::new(invites.as_slice()).unwrap();
- let receipt = test_team_receipt::<OwnerTeamRole>(team_id, &owner_id);
+ let receipt = test_team_receipt::<AdminTeamRole>(team_id, &owner_id);
service
.invite_users_to_team(receipt, invites)
@@ -1554,7 +1554,7 @@ async fn test_remove_user_from_team_decrements_customer_seat_count() {
service
.remove_user_from_team(
- test_team_receipt::<OwnerTeamRole>(team_id, &owner_id),
+ test_team_receipt::<AdminTeamRole>(team_id, &owner_id),
&member_id,
)
.await
@@ -1613,7 +1613,7 @@ async fn test_remove_user_from_team_rolls_back_remove_when_customer_decrement_fa
let err = service
.remove_user_from_team(
- test_team_receipt::<OwnerTeamRole>(team_id, &owner_id),
+ test_team_receipt::<AdminTeamRole>(team_id, &owner_id),
&member_id,
)
.await
@@ -1725,7 +1725,7 @@ async fn test_remove_user_from_team_rolls_back_customer_and_remove_when_channel_
let err = service
.remove_user_from_team(
- test_team_receipt::<OwnerTeamRole>(team_id, &owner_id),
+ test_team_receipt::<AdminTeamRole>(team_id, &owner_id),
&member_id,
)
.await
diff --git a/rust/cloud-storage/teams/src/inbound/axum_router/delete_team_invite.rs b/rust/cloud-storage/teams/src/inbound/axum_router/delete_team_invite.rs
index 2aac9e938a..b99936ce1f 100644
--- a/rust/cloud-storage/teams/src/inbound/axum_router/delete_team_invite.rs
+++ b/rust/cloud-storage/teams/src/inbound/axum_router/delete_team_invite.rs
@@ -1,6 +1,6 @@
use axum::extract::{Path, State};
use entity_access::{
- domain::{models::OwnerTeamRole, ports::EntityAccessService},
+ domain::{models::AdminTeamRole, ports::EntityAccessService},
inbound::axum_extractors::MacroUserTeamExtractor,
};
use model_error_response::ErrorResponse;
@@ -34,7 +34,7 @@ pub struct Param {
)]
#[tracing::instrument(skip_all, err)]
pub async fn handler<T: TeamService, Eas: EntityAccessService>(
- access: MacroUserTeamExtractor<OwnerTeamRole, Eas>,
+ access: MacroUserTeamExtractor<AdminTeamRole, Eas>,
State(state): State<TeamRouterState<T, Eas>>,
Path(Param { team_invite_id }): Path<Param>,
) -> Result<(), RemoveTeamInviteError> {
diff --git a/rust/cloud-storage/teams/src/inbound/axum_router/invite_to_team.rs b/rust/cloud-storage/teams/src/inbound/axum_router/invite_to_team.rs
index b438a0431b..b03bf29431 100644
--- a/rust/cloud-storage/teams/src/inbound/axum_router/invite_to_team.rs
+++ b/rust/cloud-storage/teams/src/inbound/axum_router/invite_to_team.rs
@@ -1,6 +1,6 @@
use axum::{Json, extract::State, http::StatusCode};
use entity_access::{
- domain::{models::OwnerTeamRole, ports::EntityAccessService},
+ domain::{models::AdminTeamRole, ports::EntityAccessService},
inbound::axum_extractors::MacroUserTeamExtractor,
};
use macro_user_id::{email::Email, lowercased::Lowercase};
@@ -89,7 +89,7 @@ impl axum::response::IntoResponse for InviteToTeamError {
)]
#[tracing::instrument(skip_all, err)]
pub async fn handler<T: TeamService, Eas: EntityAccessService>(
- access: MacroUserTeamExtractor<OwnerTeamRole, Eas>,
+ access: MacroUserTeamExtractor<AdminTeamRole, Eas>,
State(state): State<TeamRouterState<T, Eas>>,
Json(req): Json<InviteToTeamRequest>,
) -> Result<StatusCode, InviteToTeamError> {
diff --git a/rust/cloud-storage/teams/src/inbound/axum_router/remove_user_from_team.rs b/rust/cloud-storage/teams/src/inbound/axum_router/remove_user_from_team.rs
index 80a04ef4b8..1a11da53e6 100644
--- a/rust/cloud-storage/teams/src/inbound/axum_router/remove_user_from_team.rs
+++ b/rust/cloud-storage/teams/src/inbound/axum_router/remove_user_from_team.rs
@@ -1,6 +1,6 @@
use axum::extract::{Path, State};
use entity_access::{
- domain::{models::OwnerTeamRole, ports::EntityAccessService},
+ domain::{models::AdminTeamRole, ports::EntityAccessService},
inbound::axum_extractors::MacroUserTeamExtractor,
};
use macro_user_id::user_id::MacroUserIdStr;
@@ -34,7 +34,7 @@ pub struct Param {
)]
#[tracing::instrument(skip_all, err)]
pub async fn handler<T: TeamService, Eas: EntityAccessService>(
- access: MacroUserTeamExtractor<OwnerTeamRole, Eas>,
+ access: MacroUserTeamExtractor<AdminTeamRole, Eas>,
State(state): State<TeamRouterState<T, Eas>>,
Path(Param { remove_user_id }): Path<Param>,
) -> Result<(), RemoveUserFromTeamError> {