feat: Add comprehensive admin team management functionality with new permissions and endpoints
This commit is contained in:
@@ -34,6 +34,13 @@ async fn main() -> Result<(), Box<dyn Error>> {
|
|||||||
PermissionsEnum::DeleteUsers,
|
PermissionsEnum::DeleteUsers,
|
||||||
PermissionsEnum::UpdateUsers,
|
PermissionsEnum::UpdateUsers,
|
||||||
PermissionsEnum::ActivateUsers,
|
PermissionsEnum::ActivateUsers,
|
||||||
|
// Full admin permissions
|
||||||
|
PermissionsEnum::ManageAllUsers,
|
||||||
|
PermissionsEnum::ManageAllRoles,
|
||||||
|
PermissionsEnum::ManageAllPermissions,
|
||||||
|
PermissionsEnum::ManageAllTeams,
|
||||||
|
PermissionsEnum::ViewAllSensitiveData,
|
||||||
|
PermissionsEnum::AccessAdminDashboard,
|
||||||
PermissionsEnum::ReadListRoles,
|
PermissionsEnum::ReadListRoles,
|
||||||
PermissionsEnum::ReadDetailRoles,
|
PermissionsEnum::ReadDetailRoles,
|
||||||
PermissionsEnum::CreateRoles,
|
PermissionsEnum::CreateRoles,
|
||||||
|
|||||||
@@ -107,6 +107,14 @@ impl fmt::Display for PermissionsEnum {
|
|||||||
PermissionsEnum::UpdateMentors => "Update Mentors",
|
PermissionsEnum::UpdateMentors => "Update Mentors",
|
||||||
PermissionsEnum::VerifyMentors => "Verify Mentors",
|
PermissionsEnum::VerifyMentors => "Verify Mentors",
|
||||||
PermissionsEnum::DeleteMentors => "Delete Mentors",
|
PermissionsEnum::DeleteMentors => "Delete Mentors",
|
||||||
|
|
||||||
|
// Administrator permissions
|
||||||
|
PermissionsEnum::ManageAllUsers => "Manage All Users",
|
||||||
|
PermissionsEnum::ManageAllRoles => "Manage All Roles",
|
||||||
|
PermissionsEnum::ManageAllPermissions => "Manage All Permissions",
|
||||||
|
PermissionsEnum::ManageAllTeams => "Manage All Teams",
|
||||||
|
PermissionsEnum::ViewAllSensitiveData => "View All Sensitive Data",
|
||||||
|
PermissionsEnum::AccessAdminDashboard => "Access Admin Dashboard",
|
||||||
};
|
};
|
||||||
write!(f, "{permission_str}")
|
write!(f, "{permission_str}")
|
||||||
}
|
}
|
||||||
@@ -164,6 +172,14 @@ impl PermissionsEnum {
|
|||||||
PermissionsEnum::UpdateMentors => "a7b8c9d0-1234-5678-0123-789012345678".to_string(),
|
PermissionsEnum::UpdateMentors => "a7b8c9d0-1234-5678-0123-789012345678".to_string(),
|
||||||
PermissionsEnum::VerifyMentors => "b8c9d0e1-2345-6789-1234-890123456789".to_string(),
|
PermissionsEnum::VerifyMentors => "b8c9d0e1-2345-6789-1234-890123456789".to_string(),
|
||||||
PermissionsEnum::DeleteMentors => "c9d0e1f2-3456-7890-2345-901234567890".to_string(),
|
PermissionsEnum::DeleteMentors => "c9d0e1f2-3456-7890-2345-901234567890".to_string(),
|
||||||
|
|
||||||
|
// Administrator permissions
|
||||||
|
PermissionsEnum::ManageAllUsers => "d0e1f2a3-4567-8901-2345-0123456789ab".to_string(),
|
||||||
|
PermissionsEnum::ManageAllRoles => "e1f2a3b4-5678-9012-3456-1234567890ab".to_string(),
|
||||||
|
PermissionsEnum::ManageAllPermissions => "f2a3b4c5-6789-0123-4567-2345678901ab".to_string(),
|
||||||
|
PermissionsEnum::ManageAllTeams => "a3b4c5d6-7890-1234-5678-3456789012ab".to_string(),
|
||||||
|
PermissionsEnum::ViewAllSensitiveData => "b4c5d6e7-8901-2345-6789-4567890123ab".to_string(),
|
||||||
|
PermissionsEnum::AccessAdminDashboard => "c5d6e7f8-9012-3456-7890-5678901234ab".to_string(),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -224,6 +240,14 @@ impl PermissionsEnum {
|
|||||||
PermissionsEnum::UpdateMentors,
|
PermissionsEnum::UpdateMentors,
|
||||||
PermissionsEnum::VerifyMentors,
|
PermissionsEnum::VerifyMentors,
|
||||||
PermissionsEnum::DeleteMentors,
|
PermissionsEnum::DeleteMentors,
|
||||||
|
|
||||||
|
// Administrator permissions
|
||||||
|
PermissionsEnum::ManageAllUsers,
|
||||||
|
PermissionsEnum::ManageAllRoles,
|
||||||
|
PermissionsEnum::ManageAllPermissions,
|
||||||
|
PermissionsEnum::ManageAllTeams,
|
||||||
|
PermissionsEnum::ViewAllSensitiveData,
|
||||||
|
PermissionsEnum::AccessAdminDashboard,
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,217 @@
|
|||||||
|
use crate::{AppState, MetaRequestDto};
|
||||||
|
use crate::{
|
||||||
|
MessageResponseDto, ResponseListSuccessDto, ResponseSuccessDto,
|
||||||
|
TeamsCreateRequestDto, TeamsUpdateRequestDto, TeamInviteRequestDto,
|
||||||
|
TeamAcceptInvitationRequestDto, TeamMemberDto, TeamsSearchQueryDto,
|
||||||
|
AdminTeamsListItemDto, AdminTeamsDetailItemDto, PermissionsEnum
|
||||||
|
};
|
||||||
|
use axum::response::Response;
|
||||||
|
use axum::extract::Path;
|
||||||
|
use axum::http::HeaderMap;
|
||||||
|
use axum::response::IntoResponse;
|
||||||
|
use axum::{Extension, Json};
|
||||||
|
use super::teams_service::{TeamsServiceTrait, TeamsService};
|
||||||
|
use axum::Router;
|
||||||
|
|
||||||
|
/// Helper function for admin endpoints requiring specific permissions
|
||||||
|
async fn with_admin_perms<F, Fut>(
|
||||||
|
headers: HeaderMap,
|
||||||
|
state: Extension<AppState>,
|
||||||
|
f: F,
|
||||||
|
) -> Response
|
||||||
|
where
|
||||||
|
F: FnOnce(crate::Claims, AppState) -> Fut,
|
||||||
|
Fut: std::future::Future<Output = Response> + Send,
|
||||||
|
{
|
||||||
|
match crate::permissions_guard(headers, state, vec![PermissionsEnum::ManageAllTeams]).await {
|
||||||
|
Ok((claims, state)) => f(claims, state).await,
|
||||||
|
Err(response) => response,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[utoipa::path(
|
||||||
|
get,
|
||||||
|
security(
|
||||||
|
("Bearer" = [])
|
||||||
|
),
|
||||||
|
path = "/v1/admin/teams",
|
||||||
|
params(
|
||||||
|
("page" = Option<i64>, Query, description = "Page number"),
|
||||||
|
("per_page" = Option<i64>, Query, description = "Items per page"),
|
||||||
|
("search" = Option<String>, Query, description = "Search keyword"),
|
||||||
|
("sort_by" = Option<String>, Query, description = "Sort by field"),
|
||||||
|
("order" = Option<String>, Query, description = "Order ASC or DESC"),
|
||||||
|
("filter" = Option<String>, Query, description = "Filter value"),
|
||||||
|
("filter_by" = Option<String>, Query, description = "Field to filter by"),
|
||||||
|
),
|
||||||
|
responses(
|
||||||
|
(status = 200, description = "Get all teams (admin)", body = ResponseListSuccessDto<Vec<AdminTeamsListItemDto>>)
|
||||||
|
),
|
||||||
|
tag = "Admin - Teams"
|
||||||
|
)]
|
||||||
|
pub async fn get_all_teams(
|
||||||
|
headers: HeaderMap,
|
||||||
|
Extension(state): Extension<AppState>,
|
||||||
|
axum::extract::Query(meta): axum::extract::Query<MetaRequestDto>,
|
||||||
|
) -> Response {
|
||||||
|
with_admin_perms(headers, Extension(state), move |_claims, state| {
|
||||||
|
TeamsService::get_admin_team_list(&state, meta)
|
||||||
|
}).await
|
||||||
|
}
|
||||||
|
|
||||||
|
#[utoipa::path(
|
||||||
|
get,
|
||||||
|
security(
|
||||||
|
("Bearer" = [])
|
||||||
|
),
|
||||||
|
path = "/v1/admin/teams/{id}",
|
||||||
|
params(
|
||||||
|
("id" = String, Path, description = "Team ID")
|
||||||
|
),
|
||||||
|
responses(
|
||||||
|
(status = 200, description = "Get team by ID (admin)", body = ResponseSuccessDto<AdminTeamsDetailItemDto>)
|
||||||
|
),
|
||||||
|
tag = "Admin - Teams"
|
||||||
|
)]
|
||||||
|
pub async fn get_team_by_id(
|
||||||
|
headers: HeaderMap,
|
||||||
|
Extension(state): Extension<AppState>,
|
||||||
|
Path(id): Path<String>,
|
||||||
|
) -> Response {
|
||||||
|
with_admin_perms(headers, Extension(state), move |_claims, state| {
|
||||||
|
TeamsService::get_admin_team_by_id(&state, id)
|
||||||
|
}).await
|
||||||
|
}
|
||||||
|
|
||||||
|
#[utoipa::path(
|
||||||
|
get,
|
||||||
|
security(
|
||||||
|
("Bearer" = [])
|
||||||
|
),
|
||||||
|
path = "/v1/admin/teams/{id}/members",
|
||||||
|
params(
|
||||||
|
("id" = String, Path, description = "Team ID")
|
||||||
|
),
|
||||||
|
responses(
|
||||||
|
(status = 200, description = "Get team members (admin)", body = ResponseSuccessDto<Vec<TeamMemberDto>>)
|
||||||
|
),
|
||||||
|
tag = "Admin - Teams"
|
||||||
|
)]
|
||||||
|
pub async fn get_team_members(
|
||||||
|
headers: HeaderMap,
|
||||||
|
Extension(state): Extension<AppState>,
|
||||||
|
Path(id): Path<String>,
|
||||||
|
) -> Response {
|
||||||
|
with_admin_perms(headers, Extension(state), move |_claims, state| {
|
||||||
|
TeamsService::get_admin_team_members(&state, id)
|
||||||
|
}).await
|
||||||
|
}
|
||||||
|
|
||||||
|
#[utoipa::path(
|
||||||
|
post,
|
||||||
|
security(
|
||||||
|
("Bearer" = [])
|
||||||
|
),
|
||||||
|
path = "/v1/admin/teams",
|
||||||
|
request_body = TeamsCreateRequestDto,
|
||||||
|
responses(
|
||||||
|
(status = 200, description = "Create team (admin)", body = ResponseSuccessDto<serde_json::Value>)
|
||||||
|
),
|
||||||
|
tag = "Admin - Teams"
|
||||||
|
)]
|
||||||
|
pub async fn create_team(
|
||||||
|
headers: HeaderMap,
|
||||||
|
Extension(state): Extension<AppState>,
|
||||||
|
Json(payload): Json<TeamsCreateRequestDto>,
|
||||||
|
) -> impl IntoResponse {
|
||||||
|
with_admin_perms(headers, Extension(state), move |claims, state| {
|
||||||
|
TeamsService::create_team(&state, claims, payload)
|
||||||
|
}).await
|
||||||
|
}
|
||||||
|
|
||||||
|
#[utoipa::path(
|
||||||
|
put,
|
||||||
|
security(
|
||||||
|
("Bearer" = [])
|
||||||
|
),
|
||||||
|
path = "/v1/admin/teams/{id}",
|
||||||
|
params(
|
||||||
|
("id" = String, Path, description = "Team ID")
|
||||||
|
),
|
||||||
|
request_body = TeamsUpdateRequestDto,
|
||||||
|
responses(
|
||||||
|
(status = 200, description = "Update team (admin)", body = MessageResponseDto)
|
||||||
|
),
|
||||||
|
tag = "Admin - Teams"
|
||||||
|
)]
|
||||||
|
pub async fn update_team(
|
||||||
|
headers: HeaderMap,
|
||||||
|
Extension(state): Extension<AppState>,
|
||||||
|
Path(id): Path<String>,
|
||||||
|
Json(payload): Json<TeamsUpdateRequestDto>,
|
||||||
|
) -> impl IntoResponse {
|
||||||
|
with_admin_perms(headers, Extension(state), move |claims, state| {
|
||||||
|
TeamsService::update_team(&state, claims, id, payload)
|
||||||
|
}).await
|
||||||
|
}
|
||||||
|
|
||||||
|
#[utoipa::path(
|
||||||
|
delete,
|
||||||
|
security(
|
||||||
|
("Bearer" = [])
|
||||||
|
),
|
||||||
|
path = "/v1/admin/teams/{id}",
|
||||||
|
params(
|
||||||
|
("id" = String, Path, description = "Team ID")
|
||||||
|
),
|
||||||
|
responses(
|
||||||
|
(status = 200, description = "Delete team (admin)", body = MessageResponseDto)
|
||||||
|
),
|
||||||
|
tag = "Admin - Teams"
|
||||||
|
)]
|
||||||
|
pub async fn delete_team(
|
||||||
|
headers: HeaderMap,
|
||||||
|
Extension(state): Extension<AppState>,
|
||||||
|
Path(id): Path<String>,
|
||||||
|
) -> impl IntoResponse {
|
||||||
|
with_admin_perms(headers, Extension(state), move |claims, state| {
|
||||||
|
TeamsService::delete_team(&state, claims, id)
|
||||||
|
}).await
|
||||||
|
}
|
||||||
|
|
||||||
|
#[utoipa::path(
|
||||||
|
post,
|
||||||
|
security(
|
||||||
|
("Bearer" = [])
|
||||||
|
),
|
||||||
|
path = "/v1/admin/teams/{id}/invite",
|
||||||
|
params(
|
||||||
|
("id" = String, Path, description = "Team ID")
|
||||||
|
),
|
||||||
|
request_body = TeamInviteRequestDto,
|
||||||
|
responses(
|
||||||
|
(status = 200, description = "Invite team members (admin)", body = ResponseSuccessDto<serde_json::Value>)
|
||||||
|
),
|
||||||
|
tag = "Admin - Teams"
|
||||||
|
)]
|
||||||
|
pub async fn invite_team_members(
|
||||||
|
headers: HeaderMap,
|
||||||
|
Extension(state): Extension<AppState>,
|
||||||
|
Path(team_id): Path<String>,
|
||||||
|
Json(payload): Json<TeamInviteRequestDto>,
|
||||||
|
) -> impl IntoResponse {
|
||||||
|
with_admin_perms(headers, Extension(state), move |claims, state| {
|
||||||
|
TeamsService::invite_team_members(&state, claims, team_id, payload)
|
||||||
|
}).await
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn admin_teams_router() -> Router {
|
||||||
|
Router::new()
|
||||||
|
.route("/", axum::routing::get(get_all_teams))
|
||||||
|
.route("/:id", axum::routing::get(get_team_by_id))
|
||||||
|
.route("/:id/members", axum::routing::get(get_team_members))
|
||||||
|
.route("/", axum::routing::post(create_team))
|
||||||
|
.route("/:id", axum::routing::put(update_team))
|
||||||
|
.route("/:id", axum::routing::delete(delete_team))
|
||||||
|
.route("/:id/invite", axum::routing::post(invite_team_members))
|
||||||
|
}
|
||||||
@@ -1,9 +1,11 @@
|
|||||||
|
pub mod admin_teams_controller;
|
||||||
pub mod teams_controller;
|
pub mod teams_controller;
|
||||||
pub mod teams_dto;
|
pub mod teams_dto;
|
||||||
pub mod teams_repository;
|
pub mod teams_repository;
|
||||||
pub mod teams_schema;
|
pub mod teams_schema;
|
||||||
pub mod teams_service;
|
pub mod teams_service;
|
||||||
|
|
||||||
|
pub use admin_teams_controller::*;
|
||||||
pub use teams_controller::*;
|
pub use teams_controller::*;
|
||||||
pub use teams_dto::*;
|
pub use teams_dto::*;
|
||||||
pub use teams_repository::*;
|
pub use teams_repository::*;
|
||||||
@@ -11,7 +13,13 @@ pub use teams_schema::*;
|
|||||||
pub use teams_service::*;
|
pub use teams_service::*;
|
||||||
|
|
||||||
use axum::Router;
|
use axum::Router;
|
||||||
|
use crate::teams_controller::*;
|
||||||
|
use crate::admin_teams_controller::*;
|
||||||
|
|
||||||
pub fn teams_router() -> Router {
|
pub fn teams_router() -> Router {
|
||||||
Router::new()
|
Router::new()
|
||||||
|
// Public routes
|
||||||
|
.merge(teams_controller::teams_router())
|
||||||
|
// Admin routes
|
||||||
|
.merge(admin_teams_controller::admin_teams_router())
|
||||||
}
|
}
|
||||||
@@ -12,6 +12,7 @@ use axum::http::HeaderMap;
|
|||||||
use axum::response::IntoResponse;
|
use axum::response::IntoResponse;
|
||||||
use axum::{Extension, Json};
|
use axum::{Extension, Json};
|
||||||
use super::teams_service::{TeamsServiceTrait, TeamsService};
|
use super::teams_service::{TeamsServiceTrait, TeamsService};
|
||||||
|
use axum::Router;
|
||||||
|
|
||||||
// Helper function for endpoints requiring authentication without specific permissions
|
// Helper function for endpoints requiring authentication without specific permissions
|
||||||
async fn authenticated<F, Fut>(
|
async fn authenticated<F, Fut>(
|
||||||
@@ -394,3 +395,21 @@ pub async fn get_admin_team_members(
|
|||||||
response
|
response
|
||||||
}).await
|
}).await
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pub fn teams_router() -> Router {
|
||||||
|
Router::new()
|
||||||
|
.route("/", axum::routing::get(get_team_list))
|
||||||
|
.route("/:id", axum::routing::get(get_team_by_id))
|
||||||
|
.route("/create", axum::routing::post(post_create_team))
|
||||||
|
.route("/update/:id", axum::routing::put(put_update_team))
|
||||||
|
.route("/delete/:id", axum::routing::delete(delete_team))
|
||||||
|
.route("/:id/invite", axum::routing::post(post_invite_team_members))
|
||||||
|
.route("/accept/:token", axum::routing::post(post_accept_invitation))
|
||||||
|
.route("/search", axum::routing::get(get_public_team_search))
|
||||||
|
.route("/:id/members", axum::routing::get(get_team_members))
|
||||||
|
.route("/:id/leave", axum::routing::post(post_leave_team))
|
||||||
|
.route("/leave-me", axum::routing::post(post_leave_current_team))
|
||||||
|
.route("/admin", axum::routing::get(get_admin_team_list))
|
||||||
|
.route("/admin/:id", axum::routing::get(get_admin_team_by_id))
|
||||||
|
.route("/admin/:id/members", axum::routing::get(get_admin_team_members))
|
||||||
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user