use prepare_response() for format json response

diff --git a/PLC/RestAPI.py b/PLC/RestAPI.py
index 1e4f8ed..e82ea3a 100644 (file)
--- a/PLC/RestAPI.py
+++ b/PLC/RestAPI.py
@@ -16,6 +16,10 @@ get_response = """
 </body></html>
 """
 
+def prepare_response(result):
+    response = {'response': result}
+    return jsonify(response)
+
 @app.route('/')
 def api_root():
     return 'Welcome'
@@ -24,13 +28,15 @@ def api_root():
 def AuthCheck():
     if request.method == 'POST':
         args = [request.json.get('auth')]
-        return api.call(None, 'AuthCheck', *args)
+        result = api.call(request.remote_addr, 'AuthCheck', *args)
+        return prepare_response(result)
     return get_response
       
 @app.route('/roles', methods=['GET', 'POST'])
 def GetRoles():
     if request.method == 'POST':
-        logger.error(request.data) 
-        return jsonify(**request.json)
+        args = [request.json.get('auth')]
+        result = api.call(request.remote_addr, 'AuthCheck', *args)
+        return jsonify(result)
     return get_response