yvachot/FlaskALED
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update: Route admin/delete/user

Browse source
This commit is contained in:
Yûki VACHOT 2022-01-14 00:34:12 +01:00
parent b42aa64c57
commit a9324fb35a
2 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
backend/application/responses.py
View file

@ -12,7 +12,6 @@ def send_error(status_code, message, token=None):
status=status_code, status=status_code,
mimetype='application/json' mimetype='application/json'
) )
res.headers['Access-Control-Allow-Origin'] = app.config.get('ALLOW_ORIGIN')
if token is not None: if token is not None:
res.set_cookie('SESSIONID', token) res.set_cookie('SESSIONID', token)
return res return res
@ -29,7 +28,6 @@ def send_message(message, data, token=None, token_delete=False):
status=200, status=200,
mimetype='application/json' mimetype='application/json'
) )
res.headers['Access-Control-Allow-Origin'] = app.config.get('ALLOW_ORIGIN')
if token is not None: if token is not None:
res.set_cookie('SESSIONID', token) res.set_cookie('SESSIONID', token)
if token_delete: if token_delete:

16
backend/application/routes.py
View file

@ -1,10 +1,12 @@
from flask import request, Blueprint from flask import request, Blueprint
from flask_cors import CORS
from .responses import send_message, send_error from .responses import send_message, send_error
from .api_functions import db_login, db_register, db_user_update, db_create_log, db_user_delete, db_admin_update_user, \ from .api_functions import db_login, db_register, db_user_update, db_create_log, db_user_delete, db_admin_update_user, \
db_users db_users
from .sessionJWT import create_auth_token, check_auth_token from .sessionJWT import create_auth_token, check_auth_token
bp = Blueprint('myapp', __name__) bp = Blueprint('myapp', __name__)
CORS(bp, supports_credentials=True, origins=['http://127.0.0.1:4200', 'http://localhost:4200'])
# Login # Login
@ -117,13 +119,13 @@ def user_delete():
ip = request.remote_addr ip = request.remote_addr
user_id = token['payload']['id'] user_id = token['payload']['id']
res = db_user_delete(ip, user_id) res = db_user_delete(ip, user_id)
if res['status'] == 1: if res['status'] != 0:
return send_error(500, res['message']) return send_error(500, res['message'])
elif res['status'] == 0: else:
db_create_log( db_create_log(
ip=ip, ip=ip,
action='logout', action='delete',
message='User disconnected.', message='User deleted.',
has_succeeded=True, has_succeeded=True,
status_code=0, status_code=0,
table='users', table='users',
@ -269,15 +271,15 @@ def admin_update_user():
# Admin : Delete User # Admin : Delete User
@bp.route('/api/admin/delete/user', methods=['DELETE']) @bp.route('/api/admin/delete/user/<id>', methods=['DELETE'])
def admin_delete_user(): def admin_delete_user(id):
token = check_auth_token(request) token = check_auth_token(request)
if token['success']: if token['success']:
ip = request.remote_addr ip = request.remote_addr
user_id = token['payload']['id'] user_id = token['payload']['id']
is_admin = token['payload']['is_admin'] is_admin = token['payload']['is_admin']
if is_admin: if is_admin:
post_json = request.json post_json = {'id': id}
post_user_id_delete = None post_user_id_delete = None
fields = '' fields = ''
if 'id' in post_json: if 'id' in post_json: