Add support for deleting namespaces (users, organizations)
Fixes #102 Fixes #105
This commit is contained in:
parent
a74e94fb67
commit
73eb66eac5
23 changed files with 407 additions and 33 deletions
|
@ -11,7 +11,8 @@ from flask import request, make_response, jsonify
|
|||
|
||||
import features
|
||||
|
||||
from app import app, avatar, superusers, authentication, config_provider, license_validator
|
||||
from app import (app, avatar, superusers, authentication, config_provider, license_validator,
|
||||
all_queues)
|
||||
from auth import scopes
|
||||
from auth.auth_context import get_authenticated_user
|
||||
from auth.permissions import SuperUserPermission
|
||||
|
@ -366,7 +367,7 @@ class SuperUserManagement(ApiResource):
|
|||
if superusers.is_superuser(username):
|
||||
abort(403)
|
||||
|
||||
model.user.delete_user(user)
|
||||
model.user.delete_user(user, all_queues, force=True)
|
||||
return 'Deleted', 204
|
||||
|
||||
abort(403)
|
||||
|
@ -500,7 +501,7 @@ class SuperUserOrganizationManagement(ApiResource):
|
|||
if SuperUserPermission().can():
|
||||
org = model.organization.get_organization(name)
|
||||
|
||||
model.user.delete_user(org)
|
||||
model.user.delete_user(org, all_queues)
|
||||
return 'Deleted', 204
|
||||
|
||||
abort(403)
|
||||
|
|
Reference in a new issue