From 52f6599748ef61219112111dc5db71f3342b076d Mon Sep 17 00:00:00 2001 From: RaNaN Date: Thu, 8 Aug 2013 17:38:35 +0200 Subject: adapted account api to multi user, fixed http referer bug --- pyload/remote/wsbackend/AbstractHandler.py | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) (limited to 'pyload/remote/wsbackend/AbstractHandler.py') diff --git a/pyload/remote/wsbackend/AbstractHandler.py b/pyload/remote/wsbackend/AbstractHandler.py index 8012d6cd8..f540435c4 100644 --- a/pyload/remote/wsbackend/AbstractHandler.py +++ b/pyload/remote/wsbackend/AbstractHandler.py @@ -18,6 +18,8 @@ from mod_pywebsocket.msgutil import send_message from mod_pywebsocket.util import get_class_logger + +from pyload.Api import User from pyload.remote.json_converter import loads, dumps @@ -115,7 +117,16 @@ class AbstractHandler: return tuple(o) def do_login(self, req, args, kwargs): - user = self.api.checkAuth(*args, **kwargs) + user = None + # Cookies login when one argument is given + if len(args) == 1: + s = self.load_session(args) + else: + s = self.api.checkAuth(*args, **kwargs) + if s: + uid = s.get('uid', None) + user = User(uid=uid) + if user: req.api = self.api.withUserContext(user.uid) return self.send_result(req, self.OK, True) -- cgit v1.2.3