From b33ae16c003c646f44ca6c3525a4c39598f78416 Mon Sep 17 00:00:00 2001 From: pycook Date: Wed, 16 Aug 2023 13:00:30 +0800 Subject: [PATCH] Delete user without soft delete --- cmdb-api/api/lib/perm/acl/user.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/cmdb-api/api/lib/perm/acl/user.py b/cmdb-api/api/lib/perm/acl/user.py index 942fae7..bd6fb18 100644 --- a/cmdb-api/api/lib/perm/acl/user.py +++ b/cmdb-api/api/lib/perm/acl/user.py @@ -39,9 +39,12 @@ class UserCRUD(object): @classmethod def add(cls, **kwargs): - existed = User.get_by(username=kwargs['username'], email=kwargs['email']) + existed = User.get_by(username=kwargs['username']) existed and abort(400, ErrFormat.user_exists.format(kwargs['username'])) + existed = User.get_by(username=kwargs['email']) + existed and abort(400, ErrFormat.user_exists.format(kwargs['email'])) + kwargs['nickname'] = kwargs.get('nickname') or kwargs['username'] kwargs['block'] = 0 kwargs['key'], kwargs['secret'] = cls.gen_key_secret() @@ -103,7 +106,7 @@ class UserCRUD(object): origin = user.to_dict() - user.soft_delete() + user.delete() UserCache.clean(user)