Update: Finished Implementing (Not tested)

This commit is contained in:
Yûki VACHOT 2022-01-31 10:07:12 +01:00
parent 566c476456
commit 3d65dd45de

View file

@ -74,7 +74,8 @@ def register():
if post_email != '' and post_password != '' and post_nickname != '': if post_email != '' and post_password != '' and post_nickname != '':
ip = request.remote_addr ip = request.remote_addr
# res = db_register(ip, post_email, post_nickname, post_password) # res = db_register(ip, post_email, post_nickname, post_password)
res = request_post('register', {'ip': ip, 'email': post_email, 'nickname': post_nickname, 'password': post_password}).json() res = request_post('register', {'ip': ip, 'email': post_email, 'nickname': post_nickname,
'password': post_password}).json()
if res['status'] == 1: if res['status'] == 1:
return send_error(500, res['message']) return send_error(500, res['message'])
elif res['status'] == 0: elif res['status'] == 0:
@ -91,16 +92,8 @@ def logout():
token = check_auth_token(request) token = check_auth_token(request)
if token['success']: if token['success']:
ip = request.remote_addr ip = request.remote_addr
request_post('logout', {'ip': ip}).json()
message = 'User disconnected.' message = 'User disconnected.'
request_post('log', {
'ip': ip,
'action': 'logout',
'message': message,
'has_succeeded': True,
'status_code': 0,
'table': 'users',
'id_user': token['payload']['id']
})
return send_message(message, None, token_delete=True) return send_message(message, None, token_delete=True)
else: else:
return send_error(500, token['message']) return send_error(500, token['message'])
@ -130,7 +123,8 @@ def user_update():
ip = request.remote_addr ip = request.remote_addr
user_id = token['payload']['id'] user_id = token['payload']['id']
# res = db_user_update(ip, user_id, post_nickname, post_password) # res = db_user_update(ip, user_id, post_nickname, post_password)
res = request_post('user/update', {'ip': ip, 'user_id': user_id, 'nickname': post_nickname, 'password': post_password}).json() res = request_post('user/update', {'ip': ip, 'user_id': user_id, 'nickname': post_nickname,
'password': post_password}).json()
if res['status'] == 1: if res['status'] == 1:
return send_error(500, res['message']) return send_error(500, res['message'])
elif res['status'] == 0: elif res['status'] == 0:
@ -151,19 +145,10 @@ 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)
res = request_post('user/update', {'ip': ip, 'user_id': user_id}).json() res = request_post('user/delete', {'ip': ip, 'user_id': user_id}).json()
if res['status'] != 0: if res['status'] != 0:
return send_error(500, res['message']) return send_error(500, res['message'])
else: else:
request_post('log', {
'ip': ip,
'action': 'user/delete',
'message': 'User deleted.',
'has_succeeded': True,
'status_code': 0,
'table': 'users',
'id_user': token['payload']['id']
})
return send_message(res['message'], None, token_delete=True) return send_message(res['message'], None, token_delete=True)
else: else:
return send_error(500, token['message']) return send_error(500, token['message'])
@ -206,28 +191,17 @@ def admin_create_user():
if post_email is not None or post_nickname is not None or post_password is not None or post_is_admin is not None: if post_email is not None or post_nickname is not None or post_password is not None or post_is_admin is not None:
if post_email != '' and post_nickname != '' and post_password != '' and str(post_is_admin) != '': if post_email != '' and post_nickname != '' and post_password != '' and str(post_is_admin) != '':
res = db_register(ip, post_email, post_nickname, post_password, is_admin=post_is_admin) # res = db_register(ip, post_email, post_nickname, post_password, is_admin=post_is_admin)
res = request_post('admin/create/user', {
'ip': ip,
'email': post_email,
'nickname': post_nickname,
'password': post_password,
'is_admin': post_is_admin
})
if res['status'] == 1: if res['status'] == 1:
db_create_log(
ip=ip,
action='admin/create/user',
message=res['message'],
has_succeeded=False,
status_code=res['status'],
table='users',
id_user=user_id
)
return send_error(500, res['message']) return send_error(500, res['message'])
elif res['status'] == 0: elif res['status'] == 0:
db_create_log(
ip=ip,
action='admin/create/user',
message=res['message'],
has_succeeded=True,
status_code=res['status'],
table='users',
id_user=user_id
)
return send_message(res['message'], res['data']) return send_message(res['message'], res['data'])
else: else:
return send_error(400, 'Empty email and/or nickname and/or password and/or is_admin fields.') return send_error(400, 'Empty email and/or nickname and/or password and/or is_admin fields.')
@ -270,28 +244,16 @@ def admin_update_user():
if post_user_id_delete is not None and (post_is_admin is not None or post_password is not None): if post_user_id_delete is not None and (post_is_admin is not None or post_password is not None):
if str(post_is_admin) != '' and post_password != '' and str(post_user_id_delete) != '': if str(post_is_admin) != '' and post_password != '' and str(post_user_id_delete) != '':
ip = request.remote_addr ip = request.remote_addr
res = db_admin_update_user(ip, post_user_id_delete, post_is_admin, post_password) # res = db_admin_update_user(ip, post_user_id_delete, post_is_admin, post_password)
res = request_put('admin/update/user', {
'ip': ip,
'user_id_delete': post_user_id_delete,
'is_admin': post_is_admin,
'password': post_password
})
if res['status'] == 1: if res['status'] == 1:
db_create_log(
ip=ip,
action='admin/update/user',
message=res['message'],
has_succeeded=False,
status_code=res['status'],
table='users',
id_user=user_id
)
return send_error(500, res['message']) return send_error(500, res['message'])
elif res['status'] == 0: elif res['status'] == 0:
db_create_log(
ip=ip,
action='admin/update/user',
message=res['message'],
has_succeeded=True,
status_code=res['status'],
table='users',
id_user=user_id
)
return send_message(res['message'], res['data']) return send_message(res['message'], res['data'])
else: else:
return send_error(400, 'Empty is_admin and/or password fields.') return send_error(400, 'Empty is_admin and/or password fields.')
@ -309,7 +271,7 @@ 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 = {'id': id} post_json = {'id': id}
@ -321,28 +283,12 @@ def admin_delete_user(id):
fields += 'id' fields += 'id'
if post_user_id_delete is not None: if post_user_id_delete is not None:
if str(post_user_id_delete) != '': if str(post_user_id_delete) != '':
res = db_user_delete(ip, int(post_user_id_delete)) # res = db_user_delete(ip, int(post_user_id_delete))
res = request_delete('admin/delete/user',
{'ip': ip, 'user_id_delete': post_user_id_delete, 'is_admin': is_admin})
if res['status'] == 1: if res['status'] == 1:
db_create_log(
ip=ip,
action='admin/delete/user',
message=res['message'],
has_succeeded=False,
status_code=res['status'],
table='users',
id_user=user_id
)
return send_error(500, res['message']) return send_error(500, res['message'])
else: else:
db_create_log(
ip=ip,
action='admin/delete/user',
message=res['message'],
has_succeeded=True,
status_code=res['status'],
table='users',
id_user=user_id
)
return send_message(res['message'], None) return send_message(res['message'], None)
else: else:
return send_error(400, 'Empty id field.') return send_error(400, 'Empty id field.')
@ -366,7 +312,17 @@ def users():
get_id = request.args.get('id') get_id = request.args.get('id')
get_is_admin = request.args.get('is_admin') get_is_admin = request.args.get('is_admin')
get_order_by = request.args.get('order_by') get_order_by = request.args.get('order_by')
res = db_users(ip, user_id, get_query, get_by, get_id, get_is_admin, get_order_by) # res = db_users(ip, user_id, get_query, get_by, get_id, get_is_admin, get_order_by)
res = request_get(
'users'
f'?ip={ip}'
f'&user_id={user_id}'
f'&q={get_query}'
f'&by={get_by}'
f'&id={get_id}'
f'&is_admin={get_is_admin}'
f'&order_by={get_order_by}'
)
if res['status'] == 1: if res['status'] == 1:
return send_error(500, res['message']) return send_error(500, res['message'])
else: else: