From dc71e066d0c642e607c90426fc3a52271577f4a1 Mon Sep 17 00:00:00 2001
From: Enric Tobella <etobella@creublanca.es>
Date: Thu, 27 Dec 2018 00:30:55 +0100
Subject: [PATCH] [FIX] base_remote: Do not raise Error on login failure

---
 base_remote/__manifest__.py      |  2 +-
 base_remote/models/base.py       |  4 +++-
 base_remote/models/res_users.py  | 10 +++-------
 base_remote/tests/test_remote.py |  7 ++-----
 4 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/base_remote/__manifest__.py b/base_remote/__manifest__.py
index f0dd4aa93..f80f540cc 100644
--- a/base_remote/__manifest__.py
+++ b/base_remote/__manifest__.py
@@ -3,7 +3,7 @@
 
 {
     'name': "Remote Base",
-    'version': '11.0.1.0.3',
+    'version': '11.0.1.0.4',
     'category': 'Generic Modules/Base',
     'author': "Creu Blanca, Odoo Community Association (OCA)",
     'website': 'http://github.com/OCA/server-tools',
diff --git a/base_remote/models/base.py b/base_remote/models/base.py
index 87bf5fd42..b7c9b2fc6 100644
--- a/base_remote/models/base.py
+++ b/base_remote/models/base.py
@@ -13,5 +13,7 @@ class Base(models.AbstractModel):
         try:
             remote_addr = current_thread().environ["REMOTE_ADDR"]
         except KeyError:
-            remote_addr = False
+            return self.env['res.remote']
+        except AttributeError:
+            return self.env['res.remote']
         return self.env['res.remote']._get_remote(remote_addr)
diff --git a/base_remote/models/res_users.py b/base_remote/models/res_users.py
index da2d46a1c..77fab1b6e 100644
--- a/base_remote/models/res_users.py
+++ b/base_remote/models/res_users.py
@@ -3,7 +3,6 @@
 
 from threading import current_thread
 from odoo import api, models, SUPERUSER_ID
-from odoo.exceptions import AccessDenied
 from odoo.service import wsgi_server
 
 
@@ -30,12 +29,9 @@ class ResUsers(models.Model):
         with cls.pool.cursor() as cr:
             env = api.Environment(cr, SUPERUSER_ID, {})
             remote = env["res.users"].remote
-            remote.ensure_one()
-        result = method()
-        if not result:
-            # Force exception to record auth failure
-            raise AccessDenied()
-        return result
+            if remote:
+                remote.ensure_one()
+        return method()
 
     # Override all auth-related core methods
     @classmethod
diff --git a/base_remote/tests/test_remote.py b/base_remote/tests/test_remote.py
index 056e3a00a..33876950d 100644
--- a/base_remote/tests/test_remote.py
+++ b/base_remote/tests/test_remote.py
@@ -1,8 +1,6 @@
 # Copyright 2018 Creu Blanca
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
 
-from xmlrpc.client import Fault
-
 from mock import patch
 from werkzeug.utils import redirect
 
@@ -56,9 +54,8 @@ class TestRemote(HttpCase):
         """Test Login Failure"""
         data1 = self.data_demo
         data1['password'] = 'Failure!'
-        with self.assertRaises(Fault):
-            self.assertFalse(self.xmlrpc_common.authenticate(
-                self.env.cr.dbname, data1["login"], data1["password"], {}))
+        self.assertFalse(self.xmlrpc_common.authenticate(
+            self.env.cr.dbname, data1["login"], data1["password"], {}))
         with self.cursor() as cr:
             env = self.env(cr)
             self.assertTrue(