Merge PR OCA#1160 into 14.0

Signed-off-by ivs-cetmix

Author: OCA-git-bot

website_require_login/models/ir_http.py

@@ -8,6 +8,8 @@
 from odoo import models
 from odoo.http import request
 
+from odoo.addons.website.models import ir_http
+
 
 class IrHttp(models.AbstractModel):
     _inherit = "ir.http"
@@ -16,6 +18,9 @@ class IrHttp(models.AbstractModel):
     def _dispatch(cls):
         res = super(IrHttp, cls)._dispatch()
         # if not website request - skip
+        if not ir_http.get_request_website():
+            return res
+
         website = request.env["website"].sudo().get_current_website()
         if not website:
             return res

website_require_login/tests/test_ir_http.py

@@ -6,6 +6,8 @@
 from odoo.tests import HttpCase
 from odoo.tools import mute_logger
 
+from odoo.addons.bus.controllers.main import BusController
+
 
 class TestIrHttp(HttpCase):
     def setUp(self):
@@ -70,3 +72,37 @@ def test_dispatch_failed_transaction(self):
                 ),
             )
         self.assertEqual(response.status_code, 200)
+
+    def test_dispatch_no_website(self):
+        """If the request is not `website`, do not interfere."""
+        # Arrange
+        path = "/longpolling/poll"
+        routing = BusController().poll.routing
+        self.auth_url = self.env["website.auth.url"].create(
+            {
+                "website_id": self.website.id,
+                "path": path,
+            }
+        )
+        # pre-condition
+        self.assertFalse(routing.get("website"))
+        self.assertIn(path, routing.get("routes", dict()))
+
+        # Act
+        response = self.url_open(
+            path,
+            headers={
+                "Content-Type": "application/json",
+            },
+            data=json.dumps(
+                {
+                    "params": {
+                        "channels": ["Test channel"],
+                        "last": 0,
+                    },
+                }
+            ),
+        )
+
+        # Assert
+        self.assertEqual(response.status_code, 200)