Cleanup in User code
This commit is contained in:
1 parent
628d210156
commit
3aaa14c986
2 files changed
+16
-31
No files matched your search
@@ -4,11 +4,12 @@ from flask import request, abort
|
||||
|
||||
from flasgger import swag_from
|
||||
|
||||
from app.doc.user_swag import login_swagger, logout_swagger, delete_swagger
|
||||
from app.doc.user_swag import login_swagger, logout_swagger, delete_swagger, register_swagger
|
||||
|
||||
from app.services.user_service import UserService
|
||||
|
||||
@bp_user.route('/register', methods=['POST'])
|
||||
@swag_from(register_swagger)
|
||||
def register():
|
||||
username = request.json.get('username')
|
||||
displayname = request.json.get('displayname')
|
||||
@@ -40,13 +41,9 @@ def login():
|
||||
@jwt_required()
|
||||
def logout():
|
||||
jwt = get_jwt()
|
||||
|
||||
jti = jwt['jti']
|
||||
exp = jwt['exp']
|
||||
|
||||
user_id = get_jwt_identity()
|
||||
|
||||
result, status_code = UserService.logout(jti, exp, user_id)
|
||||
result, status_code = UserService.logout(jwt, user_id)
|
||||
|
||||
return result, status_code
|
||||
|
||||
@@ -62,10 +59,7 @@ def update_username():
|
||||
result, status_code = UserService.update_username(user_id, new_username)
|
||||
|
||||
jwt = get_jwt()
|
||||
|
||||
jti = jwt['jti']
|
||||
exp = jwt['exp']
|
||||
UserService.logout(jti, exp, user_id)
|
||||
UserService.logout(jwt, user_id)
|
||||
|
||||
return result, status_code
|
||||
|
||||
@@ -81,10 +75,7 @@ def update_displayname():
|
||||
result, status_code = UserService.update_username(user_id, new_displayname)
|
||||
|
||||
jwt = get_jwt()
|
||||
|
||||
jti = jwt['jti']
|
||||
exp = jwt['exp']
|
||||
UserService.logout(jti, exp, user_id)
|
||||
UserService.logout(jwt, user_id)
|
||||
|
||||
return result, status_code
|
||||
|
||||
@@ -100,10 +91,7 @@ def update_email():
|
||||
result, status_code = UserService.update_email(username, new_mail)
|
||||
|
||||
jwt = get_jwt()
|
||||
|
||||
jti = jwt['jti']
|
||||
exp = jwt['exp']
|
||||
UserService.logout(jti, exp, username)
|
||||
UserService.logout(jwt, username)
|
||||
|
||||
return result, status_code
|
||||
|
||||
@@ -120,10 +108,7 @@ def update_password():
|
||||
result, status_code = UserService.update_password(username, new_password)
|
||||
|
||||
jwt = get_jwt()
|
||||
|
||||
jti = jwt['jti']
|
||||
exp = jwt['exp']
|
||||
UserService.logout(jti, exp, username)
|
||||
UserService.logout(jwt, username)
|
||||
|
||||
return result, status_code
|
||||
|
||||
@@ -136,9 +121,6 @@ def delete_user():
|
||||
result, status_code = UserService.delete_user(user_id)
|
||||
|
||||
jwt = get_jwt()
|
||||
|
||||
jti = jwt['jti']
|
||||
exp = jwt['exp']
|
||||
UserService.logout(jti, exp, user_id)
|
||||
UserService.logout(jwt, user_id)
|
||||
|
||||
return result, status_code
|
||||
Reference in new issue
Block a user