[REF] webservice: server_environment should not be a required dependency

Author: dreispt

webservice/__manifest__.py

@@ -12,8 +12,8 @@
     "maintainers": ["etobella"],
     "author": "Creu Blanca, Camptocamp, Odoo Community Association (OCA)",
     "website": "https://github.com/OCA/web-api",
-    "depends": ["component", "server_environment"],
-    "external_dependencies": {"python": ["requests-oauthlib", "oauthlib", "responses"]},
+    "depends": ["component"],
+    "external_dependencies": {"python": ["requests-oauthlib", "oauthlib"]},
     "data": [
         "security/ir.model.access.csv",
         "security/ir_rule.xml",

webservice/models/webservice_backend.py

@@ -13,7 +13,7 @@
 
 class WebserviceBackend(models.Model):
     _name = "webservice.backend"
-    _inherit = ["collection.base", "server.env.techname.mixin", "server.env.mixin"]
+    _inherit = ["collection.base"]
     _description = "WebService Backend"
 
     name = fields.Char(required=True)
@@ -145,33 +145,3 @@ def button_authorize(self):
             "url": authorize_url,
             "target": "self",
         }
-
-    @property
-    def _server_env_fields(self):
-        base_fields = super()._server_env_fields
-        webservice_fields = {
-            "protocol": {},
-            "url": {},
-            "auth_type": {},
-            "username": {},
-            "password": {},
-            "api_key": {},
-            "api_key_header": {},
-            "content_type": {},
-            "oauth2_flow": {},
-            "oauth2_scope": {},
-            "oauth2_clientid": {},
-            "oauth2_client_secret": {},
-            "oauth2_authorization_url": {},
-            "oauth2_token_url": {},
-            "oauth2_audience": {},
-        }
-        webservice_fields.update(base_fields)
-        return webservice_fields
-
-    def _compute_server_env(self):
-        # OVERRIDE: reset ``oauth2_flow`` when ``auth_type`` is not "oauth2", even if
-        # defined otherwise in server env vars
-        res = super()._compute_server_env()
-        self.filtered(lambda r: r.auth_type != "oauth2").oauth2_flow = None
-        return res

webservice/tests/test_oauth2.py

@@ -2,19 +2,14 @@
 # @author Alexandre Fayolle <alexandre.fayolle@camptocamp.com>
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 import json
-import os
 import time
-from unittest import mock
 from urllib.parse import quote
 
 import responses
 from oauthlib.oauth2.rfc6749.errors import InvalidGrantError
 
 from odoo.tests import Form
 
-from odoo.addons.server_environment import server_env
-from odoo.addons.server_environment.models import server_env_mixin
-
 from .common import CommonWebService, mock_cursor
 
 
@@ -23,17 +18,6 @@ class TestWebServiceOauth2BackendApplication(CommonWebService):
     def _setup_records(cls):
         res = super()._setup_records()
         cls.url = "https://localhost.demo.odoo/"
-        os.environ["SERVER_ENV_CONFIG"] = "\n".join(
-            [
-                "[webservice_backend.test_oauth2_back]",
-                "auth_type = oauth2",
-                "oauth2_flow = backend_application",
-                "oauth2_clientid = some_client_id",
-                "oauth2_client_secret = shh_secret",
-                f"oauth2_token_url = {cls.url}oauth2/token",
-                f"oauth2_audience = {cls.url}",
-            ]
-        )
         cls.webservice = cls.env["webservice.backend"].create(
             {
                 "name": "WebService OAuth2",
@@ -172,18 +156,6 @@ class TestWebServiceOauth2WebApplication(CommonWebService):
     def _setup_records(cls):
         res = super()._setup_records()
         cls.url = "https://localhost.demo.odoo/"
-        os.environ["SERVER_ENV_CONFIG"] = "\n".join(
-            [
-                "[webservice_backend.test_oauth2_web]",
-                "auth_type = oauth2",
-                "oauth2_flow = web_application",
-                "oauth2_clientid = some_client_id",
-                "oauth2_client_secret = shh_secret",
-                f"oauth2_token_url = {cls.url}oauth2/token",
-                f"oauth2_audience = {cls.url}",
-                f"oauth2_authorization_url = {cls.url}authorize",
-            ]
-        )
         cls.webservice = cls.env["webservice.backend"].create(
             {
                 "name": "WebService OAuth2",
@@ -246,38 +218,6 @@ def test_fetch_token_from_auth(self):
         )
         self.assertEqual("cool_token", token["access_token"])
 
-    def test_oauth2_flow_compute_with_server_env(self):
-        """Check the ``compute`` method when updating server envs"""
-        ws = self.webservice
-        url = self.url
-        for auth_type, oauth2_flow in [
-            (tp, fl)
-            for tp in ws._fields["auth_type"].get_values(ws.env)
-            for fl in ws._fields["oauth2_flow"].get_values(ws.env)
-        ]:
-            # Update env with current ``auth_type`` and ``oauth2_flow``
-            with mock.patch.dict(
-                os.environ,
-                {
-                    "SERVER_ENV_CONFIG": f"""
-[webservice_backend.test_oauth2_web]
-auth_type = {auth_type}
-oauth2_flow = {oauth2_flow}
-oauth2_clientid = some_client_id
-oauth2_client_secret = shh_secret
-oauth2_token_url = {url}oauth2/token
-oauth2_audience = {url}
-oauth2_authorization_url = {url}/authorize
-""",
-                },
-            ):
-                server_env_mixin.serv_config = server_env._load_config()  # Reload vars
-                ws.invalidate_recordset()  # Avoid reading from cache
-                if auth_type == "oauth2":
-                    self.assertEqual(ws.oauth2_flow, oauth2_flow)
-                else:
-                    self.assertFalse(ws.oauth2_flow)
-
     def test_oauth2_flow_compute_with_ui(self):
         """Check the ``compute`` method when updating WS from UI"""
         ws = self.webservice