From 49a24b95ac077c337574b775f3ff55298ac38758 Mon Sep 17 00:00:00 2001
From: daphtya <davidpanjaitan1@gmail.com>
Date: Fri, 26 Apr 2019 02:31:52 +0700
Subject: [PATCH] page admin return null if not exist

---
 modules/login.py | 3 +--
 modules/page.py  | 7 ++++++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/modules/login.py b/modules/login.py
index 221a767..7aa6f33 100644
--- a/modules/login.py
+++ b/modules/login.py
@@ -67,13 +67,12 @@ def get_user_from_token(user):
         "data": user #sends back all information about user except password
     })
     
-@login_route.route("/api/get-user-public", methods=["POST"])
+@login_route.route("/api/get-user-public", methods=["POST"]) 
 def get_user_from_id():
     req = request.get_json()
     user_id = req.get("user_id")
     user = db.User.objecs.with_id(user_id)
     del user.password
-    del user.username
     del user.page_list
     del user.role
     return jsonify({
diff --git a/modules/page.py b/modules/page.py
index 4650bc5..f9323c5 100644
--- a/modules/page.py
+++ b/modules/page.py
@@ -39,7 +39,12 @@ def get_page():
             if return_admin:
                 admins = db.User.objects(page_list__in = [vdata.id])
                 if len(admins) > 0:
-                    resp["admin"] = admins[0]
+                    admin = admins[0]
+                    del admin.password
+                    del admin.page_list
+                    resp["admin"] = admin
+                else:
+                    resp["admin"] = None
 
             return jsonify(resp)
         else:
-- 
GitLab