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

fix(workspace member) (#407)

Browse Source 
* fix(workspace member): After the space inviter is removed, it can still be invited again.

* fix(login): fix login bug
This commit is contained in:
山程漫悟
2026-02-26 14:47:57 +08:00
committed by GitHub
parent 2ef54168fc
commit c72ce381c0
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/app/repositories/workspace_repository.py
View File

@@ -115,6 +115,7 @@ class WorkspaceRepository:
self.db.query(Workspace)
.join(WorkspaceMember, Workspace.id == WorkspaceMember.workspace_id)
.filter(WorkspaceMember.user_id == user_id)
.filter(WorkspaceMember.is_active.is_(True))
.filter(Workspace.is_active.is_(True))
.order_by(Workspace.updated_at.desc())
.all()

2
api/app/schemas/token_schema.py
View File

@@ -26,6 +26,6 @@ class RefreshTokenRequest(BaseModel):
class TokenRequest(BaseModel):
email: EmailStr
password: str
invite: Optional[str] = None,
invite: Optional[str] = None
username: Optional[str] = None

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

@@ -70,10 +70,10 @@ def delete_workspace_member(
_check_workspace_admin_permission(db, workspace_id, user)
workspace_member = workspace_repository.get_member_by_id(db=db, member_id=member_id)
if not workspace_member:
raise BusinessException(f"工作空间成员 {member_id} 不存在", BizCode.WORKSPACE_MEMBER_NOT_FOUND)
raise BusinessException(f"工作空间成员 {member_id} 不存在", BizCode.WORKSPACE_NOT_FOUND)
if workspace_member.workspace_id != workspace_id:
raise BusinessException(f"工作空间成员 {member_id} 不存在于工作空间 {workspace_id}", BizCode.WORKSPACE_MEMBER_NOT_FOUND)
raise BusinessException(f"工作空间成员 {member_id} 不存在于工作空间 {workspace_id}", BizCode.WORKSPACE_NOT_FOUND)
try:
workspace_member.is_active = False