web socket api handler

1 files changed, 12 insertions, 23 deletions

diff --git a/module/web/api_app.py b/module/web/api_app.py
index b2d7fa5b6..c3237c743 100644
--- a/module/web/api_app.py
+++ b/module/web/api_app.py
@@ -10,19 +10,8 @@ from bottle import route, request, response, HTTPError
 from utils import set_session, get_user_api
 from webinterface import PYLOAD
 
-from module.common.json_layer import json
-from module.utils import remove_chars, to_dict
-from module.lib.SafeEval import const_eval as literal_eval
-from module.Api import BaseObject
-
-# json encoder that accepts TBase objects
-class TBaseEncoder(json.JSONEncoder):
-
-    def default(self, o):
-        if isinstance(o, BaseObject):
-            return to_dict(o)
-        return json.JSONEncoder.default(self, o)
-
+from module.remote.json_converter import loads, dumps
+from module.utils import remove_chars
 
 def add_header(r):
     r.headers.replace("Content-type", "application/json")
@@ -43,10 +32,10 @@ def call_api(func, args=""):
 
     api = get_user_api(s)
     if not api:
-        return HTTPError(403, json.dumps("Forbidden"))
+        return HTTPError(403, dumps("Forbidden"))
 
     if not PYLOAD.isAuthorized(func, api.user):
-        return HTTPError(401, json.dumps("Unauthorized"))
+        return HTTPError(401, dumps("Unauthorized"))
 
     args = args.split("/")[1:]
     kwargs = {}
@@ -59,23 +48,23 @@ def call_api(func, args=""):
         return callApi(func, *args, **kwargs)
     except Exception, e:
         print_exc()
-        return HTTPError(500, json.dumps({"error": e.message, "traceback": format_exc()}))
+        return HTTPError(500, dumps({"error": e.message, "traceback": format_exc()}))
 
 # Better error codes on invalid input
 
 def callApi(func, *args, **kwargs):
     if not hasattr(PYLOAD.EXTERNAL, func) or func.startswith("_"):
         print "Invalid API call", func
-        return HTTPError(404, json.dumps("Not Found"))
+        return HTTPError(404, dumps("Not Found"))
 
     # TODO: encoding
-    result = getattr(PYLOAD, func)(*[literal_eval(x) for x in args],
-                                   **dict([(x, literal_eval(y)) for x, y in kwargs.iteritems()]))
+    result = getattr(PYLOAD, func)(*[loads(x) for x in args],
+                                   **dict([(x, loads(y)) for x, y in kwargs.iteritems()]))
 
     # null is invalid json response
     if result is None: result = True
 
-    return json.dumps(result, cls=TBaseEncoder)
+    return dumps(result)
 
 
 #post -> username, password
@@ -89,17 +78,17 @@ def login():
     user = PYLOAD.checkAuth(username, password)
 
     if not user:
-        return json.dumps(False)
+        return dumps(False)
 
     s = set_session(request, user)
 
     # get the session id by dirty way, documentations seems wrong
     try:
         sid = s._headers["cookie_out"].split("=")[1].split(";")[0]
-        return json.dumps(sid)
+        return dumps(sid)
     except:
         print "Could not get session"
-        return json.dumps(True)
+        return dumps(True)
 
 
 @route("/api/logout")