From 763b142db70ce77952cb46cfccf84d9800f15651 Mon Sep 17 00:00:00 2001 From: RaNaN Date: Mon, 11 Mar 2013 19:49:20 +0100 Subject: websocket login via session, websocket pushes server status, webui renders server status --- module/remote/wsbackend/ApiHandler.py | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) (limited to 'module/remote/wsbackend/ApiHandler.py') diff --git a/module/remote/wsbackend/ApiHandler.py b/module/remote/wsbackend/ApiHandler.py index eec546d47..e985e10be 100644 --- a/module/remote/wsbackend/ApiHandler.py +++ b/module/remote/wsbackend/ApiHandler.py @@ -55,18 +55,9 @@ class ApiHandler(AbstractHandler): return # handle_call already sent the result if func == 'login': - user = self.api.checkAuth(*args, **kwargs) - if user: - req.api = self.api.withUserContext(user.uid) - return self.send_result(req, self.OK, True) - - else: - return self.send_result(req, self.OK, False) - + return self.do_login(req, args, kwargs) elif func == 'logout': - req.api = None - return self.send_result(req, self.OK, True) - + return self.do_logout(req) else: if not req.api: return self.send_result(req, self.FORBIDDEN, "Forbidden") -- cgit v1.2.3