search function working :tada:

1 files changed, 23 insertions, 15 deletions

diff --git a/api/user/info.py b/api/user/info.py
index edb7743..3d4f4fb 100644
--- a/api/user/info.py
+++ b/api/user/info.py
@@ -3,6 +3,17 @@ from db import cursor
 from auth.login_token import token_login
 import json
 
+def format_user(user_id):
+    user = cursor.execute("select username, user_id, country, type, registered, avatar from users where user_id = ?", [user_id]).fetchone()
+    return {
+        "username": user[0],
+        "id": user[1],
+        "country": user[2],
+        "type": user[3],
+        "registered": user[4],
+        "avatar": user[5],
+    }
+
 info = Blueprint('info', __name__)
 
 @info.route('/info', methods = ['GET', 'POST'])
@@ -11,29 +22,26 @@ def index():
     data = json.loads(data_string)
 
     username = data.get("username") or ""
-    id = data.get("id") or ""
+    user_id = data.get("id") or ""
     token = request.cookies.get("token") or ""
 
     if not username and \
-       not id and \
+       not user_id and \
        not token:
            return "", 400
 
-    if token: id = token_login(token)
+    if token:
+        user_id = token_login(token)
+    elif username:
+        temp_user_id = cursor.execute("select user_id from users where username = ?", [username]).fetchone()
+        if temp_user_id:
+            user_id = temp_user_id[0]
 
-    if username:
-        user = cursor.execute("select username, user_id, country, type, registered, avatar from users where username = ?", [username]).fetchone()
-    else:
-        user = cursor.execute("select username, user_id, country, type, registered, avatar from users where user_id = ?", [id]).fetchone()
+    user = format_user(user_id)
+
+    if not user: return "", 403
 
     #TODO: rating uitrekenen zodra er game functionaliteit is
-    return {
-        "username": user[0],
-        "id": user[1],
-        "country": user[2],
-        "type": user[3],
-        "registered": user[4],
-        "avatar": user[5],
-    }
+    return user
 
 dynamic_route = ["/user", info]