From 5ea774f883f1ac71ca98906a5ec5811b7e55e132 Mon Sep 17 00:00:00 2001 From: Christophe Simonis Date: Thu, 13 Oct 2011 16:33:39 +0200 Subject: [IMP] use authenticate() method to log the user in bzr revid: chs@openerp.com-20111013143339-dtasfi7kvvn7wusq --- addons/web/controllers/main.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'addons/web/controllers/main.py') diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py index 2432edc71ea..c4cde50e06f 100644 --- a/addons/web/controllers/main.py +++ b/addons/web/controllers/main.py @@ -265,14 +265,16 @@ class Session(openerpweb.Controller): _cp_path = "/web/session" @openerpweb.jsonrequest - def login(self, req, db, login, password): + def authenticate(self, req, db, login, password, base_location=None): wsgienv = req.httprequest.environ + release = web.common.release env = dict( - host='%s://%s' % (wsgienv['wsgi.url_scheme'], wsgienv['HTTP_HOST']), - referrer=wsgienv.get('HTTP_REFERER'), + base_location=base_location, + HTTP_HOST=wsgienv['HTTP_HOST'], REMOTE_ADDR=wsgienv['REMOTE_ADDR'], + user_agent="%s / %s" % (release.name, release.version), ) - req.session.login(db, login, password, env) + req.session.authenticate(db, login, password, env) ctx = req.session.get_context() if req.session._uid else {} return { -- cgit v1.2.3