MR comments
- fixed order of import in user_service.py - added error handling for user delete
This commit is contained in:
parent
09f1d2e00a
commit
5206c78998
2 changed files with 15 additions and 13 deletions
|
@ -1,11 +1,7 @@
|
|||
import copy
|
||||
from areas.apps.models import App
|
||||
|
||||
from database import db
|
||||
from areas.apps import AppRole
|
||||
from areas.apps.models import App, AppRole
|
||||
from helpers import KratosApi
|
||||
|
||||
|
||||
class UserService:
|
||||
@staticmethod
|
||||
def get_users():
|
||||
|
@ -75,9 +71,12 @@ class UserService:
|
|||
@staticmethod
|
||||
def delete_user(id):
|
||||
app_role = AppRole.query.filter_by(user_id=id).all()
|
||||
try:
|
||||
for ar in app_role:
|
||||
db.session.delete(ar)
|
||||
db.session.commit()
|
||||
except:
|
||||
raise Exception('Exception during user roles deletion for userId: {}').__format__(id)
|
||||
|
||||
@staticmethod
|
||||
def __insertAppRoleToUser(userId, userRes):
|
||||
|
|
|
@ -50,8 +50,11 @@ def put_user(id):
|
|||
@jwt_required()
|
||||
@cross_origin()
|
||||
def delete_user(id):
|
||||
try:
|
||||
res = KratosApi.delete("/identities/{}".format(id))
|
||||
UserService.delete_user(id)
|
||||
if res.status_code == 204:
|
||||
UserService.delete_user(id)
|
||||
return jsonify(), res.status_code
|
||||
return jsonify(res.json()), res.status_code
|
||||
except:
|
||||
return jsonify({"message":"There was an error deleting user"}), 404
|
||||
|
|
Loading…
Reference in a new issue