OCA · dreispt · Apr 28, 2024 · Apr 28, 2024
diff --git a/setup/webservice_server_env/odoo/addons/webservice_server_env b/setup/webservice_server_env/odoo/addons/webservice_server_env
@@ -0,0 +1 @@
+../../../../webservice_server_env
diff --git a/setup/webservice_server_env/setup.py b/setup/webservice_server_env/setup.py
@@ -0,0 +1,6 @@
+import setuptools
+
+setuptools.setup(
+    setup_requires=['setuptools-odoo'],
+    odoo_addon=True,
+)
diff --git a/webservice/README.rst b/webservice/README.rst
@@ -7,7 +7,7 @@ WebService
    !! This file is generated by oca-gen-addon-readme !!
    !! changes will be overwritten.                   !!
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-   !! source digest: sha256:c507ac3d223fcff3d1e2326f1bc4f9545c332e0adc575150a75a0dbdad6b6de8
+   !! source digest: sha256:77cd684d9df69962ed068a14d4892bf9eebcd347756836feca24d040891f68de
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |badge1| image:: https://img.shields.io/badge/maturity-Production%2FStable-green.png

diff --git a/webservice/__manifest__.py b/webservice/__manifest__.py
@@ -6,15 +6,14 @@
 
 {
     "name": "WebService",
-    "summary": """
-        Defines webservice abstract definition to be used generally""",
+    "summary": "Defines webservice abstract definition to be used generally",
     "version": "16.0.1.2.0",
     "license": "AGPL-3",
     "development_status": "Production/Stable",
     "maintainers": ["etobella"],
     "author": "Creu Blanca, Camptocamp, Odoo Community Association (OCA)",
     "website": "https://github.com/OCA/web-api",
-    "depends": ["component", "server_environment"],
+    "depends": ["component"],
     "data": [
         "security/ir.model.access.csv",
         "security/ir_rule.xml",

diff --git a/webservice/models/webservice_backend.py b/webservice/models/webservice_backend.py
@@ -9,7 +9,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)
@@ -80,19 +80,3 @@ def _get_adapter(self):
             return work.component(
                 usage="webservice.request", webservice_protocol=self.protocol
             )
-
-    @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": {},
-        }
-        webservice_fields.update(base_fields)
-        return webservice_fields
diff --git a/webservice/static/description/index.html b/webservice/static/description/index.html
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
@@ -366,7 +367,7 @@ <h1 class="title">WebService</h1>
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!! source digest: sha256:c507ac3d223fcff3d1e2326f1bc4f9545c332e0adc575150a75a0dbdad6b6de8
+!! source digest: sha256:77cd684d9df69962ed068a14d4892bf9eebcd347756836feca24d040891f68de
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
 <p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Production/Stable" src="https://img.shields.io/badge/maturity-Production%2FStable-green.png" /></a> <a class="reference external image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/web-api/tree/16.0/webservice"><img alt="OCA/web-api" src="https://img.shields.io/badge/github-OCA%2Fweb--api-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/web-api-16-0/web-api-16-0-webservice"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external image-reference" href="https://runboat.odoo-community.org/builds?repo=OCA/web-api&amp;target_branch=16.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
 <p>This module creates WebService frameworks to be used globally</p>

diff --git a/webservice_server_env/README.rst b/webservice_server_env/README.rst
@@ -0,0 +1,86 @@
+=============================
+WebService Server Environment
+=============================
+
+.. 
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+   !! This file is generated by oca-gen-addon-readme !!
+   !! changes will be overwritten.                   !!
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+   !! source digest: sha256:3259abecb5f2052be5402be6eaa2e4a70ee6d401a3b9e1d6fd58499b13c36099
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+.. |badge1| image:: https://img.shields.io/badge/maturity-Production%2FStable-green.png
+    :target: https://odoo-community.org/page/development-status
+    :alt: Production/Stable
+.. |badge2| image:: https://img.shields.io/badge/licence-AGPL--3-blue.png
+    :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
+    :alt: License: AGPL-3
+.. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fweb--api-lightgray.png?logo=github
+    :target: https://github.com/OCA/web-api/tree/16.0/webservice_server_env
+    :alt: OCA/web-api
+.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png
+    :target: https://translation.odoo-community.org/projects/web-api-16-0/web-api-16-0-webservice_server_env
+    :alt: Translate me on Weblate
+.. |badge5| image:: https://img.shields.io/badge/runboat-Try%20me-875A7B.png
+    :target: https://runboat.odoo-community.org/builds?repo=OCA/web-api&target_branch=16.0
+    :alt: Try me on Runboat
+
+|badge1| |badge2| |badge3| |badge4| |badge5|
+
+Glue module to make Server Environment features available for the Webservice addon.
+
+**Table of contents**
+
+.. contents::
+   :local:
+
+Bug Tracker
+===========
+
+Bugs are tracked on `GitHub Issues <https://github.com/OCA/web-api/issues>`_.
+In case of trouble, please check there if your issue has already been reported.
+If you spotted it first, help us to smash it by providing a detailed and welcomed
+`feedback <https://github.com/OCA/web-api/issues/new?body=module:%20webservice_server_env%0Aversion:%2016.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
+
+Do not contact contributors directly about support or help with technical issues.
+
+Credits
+=======
+
+Authors
+~~~~~~~
+
+* Creu Blanca
+* Camptocamp
+
+Contributors
+~~~~~~~~~~~~
+
+* Enric Tobella <[email protected]>
+* Daniel Reis <[email protected]>
+
+Maintainers
+~~~~~~~~~~~
+
+This module is maintained by the OCA.
+
+.. image:: https://odoo-community.org/logo.png
+   :alt: Odoo Community Association
+   :target: https://odoo-community.org
+
+OCA, or the Odoo Community Association, is a nonprofit organization whose
+mission is to support the collaborative development of Odoo features and
+promote its widespread use.
+
+.. |maintainer-etobella| image:: https://github.com/etobella.png?size=40px
+    :target: https://github.com/etobella
+    :alt: etobella
+
+Current `maintainer <https://odoo-community.org/page/maintainer-role>`__:
+
+|maintainer-etobella| 
+
+This module is part of the `OCA/web-api <https://github.com/OCA/web-api/tree/16.0/webservice_server_env>`_ project on GitHub.
+
+You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.
diff --git a/webservice_server_env/__init__.py b/webservice_server_env/__init__.py
@@ -0,0 +1,2 @@
+from . import components
+from . import models
diff --git a/webservice_server_env/__manifest__.py b/webservice_server_env/__manifest__.py
@@ -0,0 +1,18 @@
+# Copyright 2020 Creu Blanca
+# Copyright 2022 Camptocamp SA
+# @author Simone Orsi <[email protected]>
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+
+{
+    "name": "WebService Server Environment",
+    "summary": "Use Server Environment feature to manage Webservice configs",
+    "version": "16.0.1.0.0",
+    "license": "AGPL-3",
+    "development_status": "Production/Stable",
+    "maintainers": ["etobella"],
+    "author": "Creu Blanca, Camptocamp, Odoo Community Association (OCA)",
+    "website": "https://github.com/OCA/web-api",
+    "depends": ["webservice", "server_environment"],
+    "auto_install": True,
+}
diff --git a/webservice_server_env/models/__init__.py b/webservice_server_env/models/__init__.py
@@ -0,0 +1 @@
+from . import webservice_backend
diff --git a/webservice_server_env/models/webservice_backend.py b/webservice_server_env/models/webservice_backend.py
@@ -0,0 +1,28 @@
+# Copyright 2020 Creu Blanca
+# Copyright 2022 Camptocamp SA
+# @author Simone Orsi <[email protected]>
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from odoo import models
+
+
+class WebserviceBackend(models.Model):
+
+    _name = "webservice.backend"
+    _inherit = ["server.env.techname.mixin", "server.env.mixin"]
+
+    @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": {},
+        }
+        webservice_fields.update(base_fields)
+        return webservice_fields
diff --git a/webservice_server_env/readme/CONTRIBUTORS.rst b/webservice_server_env/readme/CONTRIBUTORS.rst
@@ -0,0 +1,2 @@
+* Enric Tobella <[email protected]>
+* Daniel Reis <[email protected]>
diff --git a/webservice_server_env/readme/DESCRIPTION.rst b/webservice_server_env/readme/DESCRIPTION.rst
@@ -0,0 +1 @@
+Glue module to make Server Environment features available for the Webservice addon.
diff --git a/webservice_server_env/static/description/icon.png b/webservice_server_env/static/description/icon.png
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		* Enric Tobella <[email protected]>
		* Daniel Reis <[email protected]>
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Glue module to make Server Environment features available for the Webservice addon.