forked from github/plane
fix: workspace invitation delete for self hosted (#1475)
This commit is contained in:
parent
3906503c1b
commit
cc0701a823
@ -295,7 +295,6 @@ urlpatterns = [
|
|||||||
{
|
{
|
||||||
"delete": "destroy",
|
"delete": "destroy",
|
||||||
"get": "retrieve",
|
"get": "retrieve",
|
||||||
"get": "retrieve",
|
|
||||||
}
|
}
|
||||||
),
|
),
|
||||||
name="workspace",
|
name="workspace",
|
||||||
|
@ -118,9 +118,7 @@ class WorkSpaceViewSet(BaseViewSet):
|
|||||||
|
|
||||||
if len(name) > 80 or len(slug) > 48:
|
if len(name) > 80 or len(slug) > 48:
|
||||||
return Response(
|
return Response(
|
||||||
{
|
{"error": "The maximum length for name is 80 and for slug is 48"},
|
||||||
"error": "The maximum length for name is 80 and for slug is 48"
|
|
||||||
},
|
|
||||||
status=status.HTTP_400_BAD_REQUEST,
|
status=status.HTTP_400_BAD_REQUEST,
|
||||||
)
|
)
|
||||||
|
|
||||||
@ -444,6 +442,30 @@ class WorkspaceInvitationsViewset(BaseViewSet):
|
|||||||
.select_related("workspace", "workspace__owner", "created_by")
|
.select_related("workspace", "workspace__owner", "created_by")
|
||||||
)
|
)
|
||||||
|
|
||||||
|
def destroy(self, request, slug, pk):
|
||||||
|
try:
|
||||||
|
workspace_member_invite = WorkspaceMemberInvite.objects.get(
|
||||||
|
pk=pk, workspace__slug=slug
|
||||||
|
)
|
||||||
|
# delete the user if signup is disabled
|
||||||
|
if settings.DOCKERIZED and not settings.ENABLE_SIGNUP:
|
||||||
|
user = User.objects.filter(email=workspace_member_invite.email).first()
|
||||||
|
if user is not None:
|
||||||
|
user.delete()
|
||||||
|
workspace_member_invite.delete()
|
||||||
|
return Response(status=status.HTTP_204_NO_CONTENT)
|
||||||
|
except WorkspaceMemberInvite.DoesNotExist:
|
||||||
|
return Response(
|
||||||
|
{"error": "Workspace member invite does not exists"},
|
||||||
|
status=status.HTTP_400_BAD_REQUEST,
|
||||||
|
)
|
||||||
|
except Exception as e:
|
||||||
|
capture_exception(e)
|
||||||
|
return Response(
|
||||||
|
{"error": "Something went wrong please try again later"},
|
||||||
|
status=status.HTTP_400_BAD_REQUEST,
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
class UserWorkspaceInvitationsEndpoint(BaseViewSet):
|
class UserWorkspaceInvitationsEndpoint(BaseViewSet):
|
||||||
serializer_class = WorkSpaceMemberInviteSerializer
|
serializer_class = WorkSpaceMemberInviteSerializer
|
||||||
|
Loading…
Reference in New Issue
Block a user