From 599108b21979039117ffe1de1817e71644a20fb4 Mon Sep 17 00:00:00 2001 From: lonkaars Date: Fri, 12 Mar 2021 08:55:40 +0100 Subject: cleaner endpoint names --- api/user/preferences.py | 27 +++++++++++++++++++++++++-- api/user/status.py | 27 +++++++++++++++++++++++++++ api/user/updatePreferences.py | 32 -------------------------------- api/user/updateStatus.py | 27 --------------------------- 4 files changed, 52 insertions(+), 61 deletions(-) create mode 100644 api/user/status.py delete mode 100644 api/user/updatePreferences.py delete mode 100644 api/user/updateStatus.py (limited to 'api/user') diff --git a/api/user/preferences.py b/api/user/preferences.py index 5d46f5f..bfbfe66 100644 --- a/api/user/preferences.py +++ b/api/user/preferences.py @@ -3,10 +3,13 @@ from db import cursor from auth.login_token import token_login import json +def format_preferences(preferences): #TODO: remove excess properties (create preferences class?) + return json.dumps(preferences) or "" + preferences = Blueprint('preferences', __name__) -@preferences.route('/preferences') -def index(): +@preferences.route('/preferences', methods = ["GET"]) +def get_preferences(): data = request.get_json() token = request.cookies.get("token") or "" @@ -19,5 +22,25 @@ def index(): user_prefs = cursor.execute("select preferences from users where user_id = ?", [login]).fetchone() return { "preferences": json.loads(user_prefs[0]) }, 200 +@preferences.route('/preferences', methods = ["POST"]) +def index(): + data = request.get_json() + + new_preferences = data.get("newPreferences") or "" + token = request.cookies.get("token") or "" + + if not token: return "", 401 + login = token_login(token) or "" + + if not login: return "", 403 + + formatted_json = format_preferences(new_preferences) + if not formatted_json: return "", 400 + + cursor.execute("update users set preferences = ? where user_id = ?", [formatted_json, login]) + connection.commit() + + return "", 200 + dynamic_route = ["/user", preferences] diff --git a/api/user/status.py b/api/user/status.py new file mode 100644 index 0000000..e2895d5 --- /dev/null +++ b/api/user/status.py @@ -0,0 +1,27 @@ +from flask import Blueprint, request +from db import cursor, connection +from auth.login_token import token_login +import json + +status = Blueprint('user_status', __name__) + +@status.route('/status', methods = ['POST']) +def index(): + data = request.get_json() + + status = data.get("status") or "" + token = request.cookies.get("token") or "" + + if not token: return "", 401 + login = token_login(token) or "" + + if not login: return "", 403 + if not status: return "", 400 + + cursor.execute("update users set status = ? where user_id = ?", [status[0:200], login]) + connection.commit() + + return "", 200 + +dynamic_route = ["/user", status] + diff --git a/api/user/updatePreferences.py b/api/user/updatePreferences.py deleted file mode 100644 index 2eb6512..0000000 --- a/api/user/updatePreferences.py +++ /dev/null @@ -1,32 +0,0 @@ -from flask import Blueprint, request -from db import cursor, connection -from auth.login_token import token_login -import json - -def format_preferences(preferences): #TODO: remove excess properties (create preferences class?) - return json.dumps(preferences) or "" - -updatePreferences = Blueprint('updatePreferences', __name__) - -@updatePreferences.route('/updatePreferences', methods = ['POST']) -def index(): - data = request.get_json() - - new_preferences = data.get("newPreferences") or "" - token = request.cookies.get("token") or "" - - if not token: return "", 401 - login = token_login(token) or "" - - if not login: return "", 403 - - formatted_json = format_preferences(new_preferences) - if not formatted_json: return "", 400 - - cursor.execute("update users set preferences = ? where user_id = ?", [formatted_json, login]) - connection.commit() - - return "", 200 - -dynamic_route = ["/user", updatePreferences] - diff --git a/api/user/updateStatus.py b/api/user/updateStatus.py deleted file mode 100644 index de32e95..0000000 --- a/api/user/updateStatus.py +++ /dev/null @@ -1,27 +0,0 @@ -from flask import Blueprint, request -from db import cursor, connection -from auth.login_token import token_login -import json - -updateStatus = Blueprint('updateStatus', __name__) - -@updateStatus.route('/updateStatus', methods = ['POST']) -def index(): - data = request.get_json() - - status = data.get("status") or "" - token = request.cookies.get("token") or "" - - if not token: return "", 401 - login = token_login(token) or "" - - if not login: return "", 403 - if not status: return "", 400 - - cursor.execute("update users set status = ? where user_id = ?", [status[0:200], login]) - connection.commit() - - return "", 200 - -dynamic_route = ["/user", updateStatus] - -- cgit v1.2.3