adai/MemoryBear
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(workspace): make delete workspace member async and invalidate user tokens

Browse Source
This commit is contained in:
Timebomb2018
2026-04-28 15:04:13 +08:00
parent 8d88df391d
commit d3058ce379
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
api/app/controllers/workspace_controller.py
View File

@@ -221,7 +221,7 @@ def update_workspace_members(
@router.delete("/members/{member_id}", response_model=ApiResponse) @router.delete("/members/{member_id}", response_model=ApiResponse)
@cur_workspace_access_guard() @cur_workspace_access_guard()
def delete_workspace_member( async def delete_workspace_member(
member_id: uuid.UUID, member_id: uuid.UUID,
db: Session = Depends(get_db), db: Session = Depends(get_db),
current_user: User = Depends(get_current_user), current_user: User = Depends(get_current_user),
@@ -230,7 +230,7 @@ def delete_workspace_member(
workspace_id = current_user.current_workspace_id workspace_id = current_user.current_workspace_id
api_logger.info(f"用户 {current_user.username} 请求删除工作空间 {workspace_id} 的成员 {member_id}") api_logger.info(f"用户 {current_user.username} 请求删除工作空间 {workspace_id} 的成员 {member_id}")
workspace_service.delete_workspace_member( await workspace_service.delete_workspace_member(
db=db, db=db,
workspace_id=workspace_id, workspace_id=workspace_id,
member_id=member_id, member_id=member_id,

6
api/app/services/workspace_service.py
View File

@@ -20,6 +20,7 @@ from app.models.workspace_model import (
) )
from app.repositories import workspace_repository from app.repositories import workspace_repository
from app.repositories.workspace_invite_repository import WorkspaceInviteRepository from app.repositories.workspace_invite_repository import WorkspaceInviteRepository
from app.services.session_service import SessionService
from app.schemas.workspace_schema import ( from app.schemas.workspace_schema import (
InviteAcceptRequest, InviteAcceptRequest,
InviteValidateResponse, InviteValidateResponse,
@@ -58,7 +59,7 @@ def switch_workspace(
raise BusinessException(f"切换工作空间失败: {str(e)}", BizCode.INTERNAL_ERROR) raise BusinessException(f"切换工作空间失败: {str(e)}", BizCode.INTERNAL_ERROR)
def delete_workspace_member( async def delete_workspace_member(
db: Session, db: Session,
workspace_id: uuid.UUID, workspace_id: uuid.UUID,
member_id: uuid.UUID, member_id: uuid.UUID,
@@ -80,6 +81,9 @@ def delete_workspace_member(
workspace_member.user.current_workspace_id = None workspace_member.user.current_workspace_id = None
db.commit() db.commit()
business_logger.info(f"用户 {user.username} 成功删除工作空间 {workspace_id} 的成员 {member_id}") business_logger.info(f"用户 {user.username} 成功删除工作空间 {workspace_id} 的成员 {member_id}")
# 使被删除成员的所有 token 立即失效
await SessionService.invalidate_all_user_tokens(str(workspace_member.user_id))
except Exception as e: except Exception as e:
db.rollback() db.rollback()
business_logger.error(f"删除工作空间成员失败 - 工作空间: {workspace_id}, 成员: {member_id}, 错误: {str(e)}") business_logger.error(f"删除工作空间成员失败 - 工作空间: {workspace_id}, 成员: {member_id}, 错误: {str(e)}")