aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorlonkaars <l.leblansch@gmail.com>2021-03-07 19:36:51 +0100
committerlonkaars <l.leblansch@gmail.com>2021-03-07 19:36:51 +0100
commit0fe7edb60f31843a249a728cd3ecf7b35ae747c1 (patch)
treec13b5372fba579fd4ac36563cc08317719abc6a2
parent2cee762c6134ef0d5807f76459e3133a78e16488 (diff)
updated token_login
-rw-r--r--.gitignore1
-rw-r--r--api/auth/login_token.py2
-rw-r--r--api/user/preferences.py8
3 files changed, 5 insertions, 6 deletions
diff --git a/.gitignore b/.gitignore
index 673452f..0bd72f9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -33,4 +33,5 @@ node_modules/
# voerbak
voerbak/voerbak
voerbak/*.o
+voerbak/tests/*
diff --git a/api/auth/login_token.py b/api/auth/login_token.py
index 67b2a42..0c0b57c 100644
--- a/api/auth/login_token.py
+++ b/api/auth/login_token.py
@@ -5,7 +5,7 @@ from auth.token import validate_token, hash_token
def token_login(token):
hashed = hash_token({ "token": token, "expirationDate": 0 })
user_id = cursor.execute("select user_id from users where valid_tokens like ?", [f"%{hashed['token']}%"]).fetchone()
- return None if not user_id else user_id
+ return None if len(user_id) == 0 else user_id[0]
token = Blueprint('token', __name__)
diff --git a/api/user/preferences.py b/api/user/preferences.py
index a6ac2e2..4ee48bf 100644
--- a/api/user/preferences.py
+++ b/api/user/preferences.py
@@ -11,14 +11,12 @@ def index():
token = request.cookies.get("token") or ""
if not token: return "", 401
- login = token_login(token)
+ login = token_login(token) or ""
if not login: return "", 403
- user_prefs = cursor.execute("SELECT preferences FROM users WHERE user_id = ?", [login]).fetchone()
- return {
- "preferences": user_prefs[0]
- }
+ user_prefs = cursor.execute("select preferences from users where user_id = ?", [login]).fetchone()
+ return { "preferences": user_prefs[0] }, 200
dynamic_route = ["/user", preferences]