summaryrefslogtreecommitdiff
path: root/odoo/service/common.py
diff options
context:
space:
mode:
Diffstat (limited to 'odoo/service/common.py')
-rw-r--r--odoo/service/common.py13
1 files changed, 4 insertions, 9 deletions
diff --git a/odoo/service/common.py b/odoo/service/common.py
index 42ec4ca3738..fa435c5197a 100644
--- a/odoo/service/common.py
+++ b/odoo/service/common.py
@@ -7,8 +7,6 @@ import odoo.tools
from odoo.exceptions import AccessDenied
from odoo.tools.translate import _
-from . import security
-
_logger = logging.getLogger(__name__)
RPC_VERSION_1 = {
@@ -19,17 +17,14 @@ RPC_VERSION_1 = {
}
def exp_login(db, login, password):
- # TODO: legacy indirection through 'security', should use directly
- # the res.users model
- res = security.login(db, login, password)
- msg = res and 'successful login' or 'bad login or password'
- _logger.info("%s from '%s' using database '%s'", msg, login, db.lower())
- return res or False
+ return exp_authenticate(db, login, password, None)
def exp_authenticate(db, login, password, user_agent_env):
+ if user_agent_env is None:
+ user_agent_env = {}
res_users = odoo.registry(db)['res.users']
try:
- return res_users.authenticate(db, login, password, user_agent_env)
+ return res_users.authenticate(db, login, password, {**user_agent_env, 'interactive': False})
except AccessDenied:
return False