diff options
| author |  RaNaN <Mast3rRaNaN@hotmail.de>
| 2013-03-11 19:49:20 +0100 |
|---|---|---|
| committer | RaNaN <Mast3rRaNaN@hotmail.de>
| 2013-03-11 19:50:54 +0100 |
| commit | 763b142db70ce77952cb46cfccf84d9800f15651 (patch) | |
| tree | d2636e48766d365bd8a9d079de603b127ab88744 /module/remote/wsbackend/ApiHandler.py | |
| parent | Merge pull request #33 from stickell/patch-3 (diff) | |
| download | pyload-763b142db70ce77952cb46cfccf84d9800f15651.tar.xz | |
websocket login via session, websocket pushes server status, webui renders server status
Diffstat (limited to 'module/remote/wsbackend/ApiHandler.py')
| -rw-r--r-- | module/remote/wsbackend/ApiHandler.py | 13 |
1 files changed, 2 insertions, 11 deletions
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") |