From 26348b1aa6d280f3846ad241703f69c1320808e8 Mon Sep 17 00:00:00 2001
From: H4CK3R-01 <resiaknairolf@gmail.com>
Date: Mon, 14 Mar 2022 07:51:24 +0100
Subject: [PATCH] - Improved api return content - Check if user exists already

---
 webservice/api.py | 29 +++++++++++++++++------------
 1 file changed, 17 insertions(+), 12 deletions(-)

diff --git a/webservice/api.py b/webservice/api.py
index 7c5611c..837f55b 100644
--- a/webservice/api.py
+++ b/webservice/api.py
@@ -16,7 +16,7 @@ def users():
     for i in User.query.all():
         res.append(i.as_dict())
 
-    return jsonify(res)
+    return jsonify({"status": 200, "data": res})
 
 
 @api.route('/login', methods=['POST'])
@@ -27,15 +27,16 @@ def login():
 
     user = User.filter_by(username=username).first()
     if check_password(user.password, password):
-        return True  # TODO Return token
+        # TODO Return token
+        return jsonify({"status": 200, "text": "Successfully logged in"})
     else:
-        return False
+        return jsonify({"status": 500, "text": "Unable to login"})
 
 
 @api.route('/logout', methods=['GET'])
 def logout():
     # TODO
-    pass
+    return jsonify({"status": 200, "text": "Successfully logged out"})
 
 
 @api.route('/register', methods=['POST'])
@@ -44,12 +45,16 @@ def register():
     username = request_data['username']
     password = request_data['password']
 
-    user = User(
-        username=username,
-        password=hash_password(password),
-        admin=False
-    )
-    db.session.add(user)
-    db.session.commit()
+    if User.filter_by(username=username).first() is None:
+        # Username doesn't exist yet
+        user = User(
+            username=username,
+            password=hash_password(password),
+            admin=False
+        )
+        db.session.add(user)
+        db.session.commit()
 
-    pass
+        return jsonify({"status": 200, "text": "Successfully registered user", "data": user.as_dict()})
+    else:
+        return jsonify({"status": 500, "text": "Username already exist"})