[MIG] fastapi_auth_partner: Migration to 18.0

paradoxxxzero · sebastienbeau · commit d3c2ae3cd7ac · 2026-03-27T00:09:21.000+01:00
diff --git a/fastapi_auth_partner/__manifest__.py b/fastapi_auth_partner/__manifest__.py
@@ -6,7 +6,7 @@
 {
     "name": "Fastapi Auth Partner",
     "summary": """This provides an implementation of auth_partner for FastAPI""",
-    "version": "16.0.1.0.0",
+    "version": "18.0.1.0.0",
     "license": "AGPL-3",
     "author": "Akretion,Odoo Community Association (OCA)",
     "website": "https://github.com/OCA/rest-framework",
@@ -16,6 +16,7 @@
     ],
     "data": [
         "security/res_group.xml",
+        "security/ir_rule.xml",
         "security/ir.model.access.csv",
         "views/auth_partner_view.xml",
         "views/auth_directory_view.xml",
diff --git a/fastapi_auth_partner/dependencies.py b/fastapi_auth_partner/dependencies.py
@@ -3,8 +3,7 @@
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
 
 import logging
-import sys
-from typing import Any
+from typing import Annotated, Any
 
 from itsdangerous import URLSafeTimedSerializer
 from starlette.status import HTTP_401_UNAUTHORIZED
@@ -17,11 +16,6 @@
 
 from fastapi import Cookie, Depends, HTTPException, Request, Response
 
-if sys.version_info >= (3, 9):
-    from typing import Annotated
-else:
-    from typing import Annotated
-
 _logger = logging.getLogger(__name__)
 
 
diff --git a/fastapi_auth_partner/models/auth_partner.py b/fastapi_auth_partner/models/auth_partner.py
@@ -3,7 +3,7 @@
 # @author Florian Mounier <florian.mounier@akretion.com>
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
-from odoo import _, models
+from odoo import models
 from odoo.exceptions import AccessDenied, UserError
 from odoo.http import request
 
@@ -16,11 +16,13 @@ def local_impersonate(self):
         self.ensure_one()
 
         if not self.env.user._is_admin():
-            raise AccessDenied(_("Only admin can impersonate locally"))
+            raise AccessDenied(self.env._("Only admin can impersonate locally"))
 
         if not hasattr(request, "future_response"):
             raise UserError(
-                _("Please install base_future_response for local impersonate to work")
+                self.env._(
+                    "Please install base_future_response for local impersonate to work"
+                )
             )
 
         for endpoint in self.directory_id.fastapi_endpoint_ids:
@@ -31,8 +33,8 @@ def local_impersonate(self):
             "type": "ir.actions.client",
             "tag": "display_notification",
             "params": {
-                "title": _("Impersonation successful"),
-                "message": _("You are now impersonating %s\n%%s") % self.login,
+                "title": self.env._("Impersonation successful"),
+                "message": self.env._("You are now impersonating %s\n%%s") % self.login,
                 "links": [
                     {
                         "label": f"{endpoint.app.title()} api docs",
diff --git a/fastapi_auth_partner/routers/auth.py b/fastapi_auth_partner/routers/auth.py
@@ -3,18 +3,12 @@
 # @author Florian Mounier <florian.mounier@akretion.com>
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
-import sys
-
-if sys.version_info >= (3, 9):
-    from typing import Annotated
-else:
-    from typing import Annotated
-
 from datetime import datetime, timedelta, timezone
+from typing import Annotated
 
 from itsdangerous import URLSafeTimedSerializer
 
-from odoo import _, fields, models, tools
+from odoo import fields, models, tools
 from odoo.api import Environment
 from odoo.exceptions import ValidationError
 
@@ -157,23 +151,34 @@ class AuthService(models.AbstractModel):
     directory_id = fields.Many2one("auth.directory")
 
     def new(self, vals, **kwargs):
+        # As we are in an abstract model, we need to bypass cache since it's
+        # based on the record id (and there is none)
+        endpoint = vals.pop("endpoint_id")
+
         rec = super().new(vals, **kwargs)
         # Can't have computed / related field in AbstractModel
+        rec.endpoint_id = endpoint
         rec.directory_id = rec.endpoint_id.directory_id
         # Auto add endpoint context for mail context
-        return rec.with_context(_fastapi_endpoint_id=vals["endpoint_id"].id)
+        return rec.with_context(_fastapi_endpoint_id=endpoint.id)
 
     def _get_auth_from_partner(self, partner):
         return partner._get_auth_partner_for_directory(self.directory_id)
 
     def _signup(self, data):
         auth_partner = (
-            self.env["auth.partner"].sudo()._signup(self.directory_id, **data.dict())
+            self.env["auth.partner"]
+            .sudo()
+            ._signup(self.directory_id, **data.model_dump())
         )
         return auth_partner
 
     def _login(self, data):
-        return self.env["auth.partner"].sudo()._login(self.directory_id, **data.dict())
+        return (
+            self.env["auth.partner"]
+            .sudo()
+            ._login(self.directory_id, **data.model_dump())
+        )
 
     def _impersonate(self, token):
         return self.env["auth.partner"].sudo()._impersonating(self.directory_id, token)
@@ -224,7 +229,7 @@ def _prepare_cookie_payload(self, partner):
     def _prepare_cookie(self, partner):
         secret = self.directory_id.cookie_secret_key or self.directory_id.secret_key
         if not secret:
-            raise ValidationError(_("No cookie secret key defined"))
+            raise ValidationError(self.env._("No cookie secret key defined"))
         payload = self._prepare_cookie_payload(partner)
         value = URLSafeTimedSerializer(secret).dumps(payload)
         exp = (
diff --git a/fastapi_auth_partner/security/ir_rule.xml b/fastapi_auth_partner/security/ir_rule.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+    <record model="ir.rule" id="res_partner_api_rule">
+        <field name="name">Auth API (res_partner)</field>
+        <field name="model_id" ref="base.model_res_partner" />
+        <field name="groups" eval="[(4, ref('auth_partner.group_auth_partner_api'))]" />
+        <field name="domain_force">[('id','=', authenticated_partner_id)]</field>
+        <field name="perm_read" eval="True" />
+        <field name="perm_create" eval="False" />
+        <field name="perm_write" eval="False" />
+        <field name="perm_unlink" eval="False" />
+    </record>
+
+    <record model="ir.rule" id="auth_partner_api_rule">
+        <field name="name">Auth API (auth_partner)</field>
+        <field name="model_id" ref="auth_partner.model_auth_partner" />
+        <field name="groups" eval="[(4, ref('auth_partner.group_auth_partner_api'))]" />
+        <field
+            name="domain_force"
+        >[('partner_id','=', authenticated_partner_id)]</field>
+        <field name="perm_read" eval="True" />
+        <field name="perm_create" eval="False" />
+        <field name="perm_write" eval="False" />
+        <field name="perm_unlink" eval="False" />
+    </record>
+</odoo>
diff --git a/fastapi_auth_partner/tests/test_auth.py b/fastapi_auth_partner/tests/test_auth.py
@@ -2,7 +2,6 @@
 # @author Sébastien BEAU <sebastien.beau@akretion.com>
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
-import json
 from contextlib import contextmanager
 from functools import partial
 
@@ -45,26 +44,22 @@ def _register_partner(self):
         with self._create_test_client() as test_client, self.new_mails() as new_mails:
             response: Response = test_client.post(
                 "/auth/register",
-                content=json.dumps(
-                    {
-                        "name": "Loriot",
-                        "login": "loriot@example.org",
-                        "password": "supersecret",
-                    }
-                ),
+                json={
+                    "name": "Loriot",
+                    "login": "loriot@example.org",
+                    "password": "supersecret",
+                },
             )
         self.assertEqual(response.status_code, status.HTTP_201_CREATED, response.text)
         return response, new_mails
 
     def _login(self, test_client, password="supersecret"):
         response: Response = test_client.post(
             "/auth/login",
-            content=json.dumps(
-                {
-                    "login": "loriot@example.org",
-                    "password": password,
-                }
-            ),
+            json={
+                "login": "loriot@example.org",
+                "password": password,
+            },
         )
         self.assertEqual(response.status_code, status.HTTP_200_OK, response.text)
         return response
@@ -105,7 +100,7 @@ def test_request_reset_password(self):
         with self._create_test_client() as test_client, self.new_mails() as new_mails:
             response: Response = test_client.post(
                 "/auth/request_reset_password",
-                content=json.dumps({"login": "loriot@example.org"}),
+                json={"login": "loriot@example.org"},
             )
             self.assertEqual(response.status_code, status.HTTP_200_OK, response.text)
             self.assertFalse(
@@ -121,12 +116,10 @@ def test_request_reset_password(self):
             token = str(new_mails.body).split("token=")[1].split('">')[0]
             response: Response = test_client.post(
                 "/auth/set_password",
-                content=json.dumps(
-                    {
-                        "password": "megasecret",
-                        "token": token,
-                    }
-                ),
+                json={
+                    "password": "megasecret",
+                    "token": token,
+                },
             )
             self.assertEqual(response.status_code, status.HTTP_200_OK, response.text)
 
@@ -155,7 +148,7 @@ def test_validate_email(self):
         with self._create_test_client() as test_client:
             response: Response = test_client.post(
                 "/auth/validate_email",
-                content=json.dumps({"token": token}),
+                json={"token": token},
             )
         self.assertEqual(response.status_code, status.HTTP_200_OK, response.text)
 
diff --git a/fastapi_auth_partner/tests/test_fastapi_auth_partner_demo.py b/fastapi_auth_partner/tests/test_fastapi_auth_partner_demo.py
@@ -4,23 +4,18 @@
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
 
 import json
-import sys
+from typing import Annotated
 
 from odoo import tests
+from odoo.tools import mute_logger
 
 from odoo.addons.base.models.res_partner import Partner
 from odoo.addons.fastapi_auth_partner.dependencies import AuthPartner
-
-from fastapi import Depends, status
-
-if sys.version_info >= (3, 9):
-    from typing import Annotated
-else:
-    from typing import Annotated
-
 from odoo.addons.fastapi_auth_partner.routers.auth import auth_router
 from odoo.addons.fastapi_auth_partner.schemas import AuthPartnerResponse
 
+from fastapi import Depends, status
+
 
 @auth_router.get("/auth/whoami-public-or-partner")
 def whoami_public_or_partner(
@@ -48,6 +43,7 @@ def _register_partner(self):
         return self.url_open(
             "/fastapi_auth_partner_demo/auth/register",
             timeout=1000,
+            headers={"Content-Type": "application/json"},
             data=json.dumps(
                 {
                     "name": "Loriot",
@@ -75,6 +71,7 @@ def test_profile(self):
             {"login": "loriot@example.org", "mail_verified": False},
         )
 
+    @mute_logger("odoo.http", "odoo.addons.base.models.assetsbundle")
     def test_profile_forbidden(self):
         """A end-to-end test with negative authentication."""
         resp = self.url_open("/fastapi_auth_partner_demo/auth/profile")
diff --git a/fastapi_auth_partner/views/fastapi_endpoint_view.xml b/fastapi_auth_partner/views/fastapi_endpoint_view.xml
@@ -6,13 +6,10 @@
         <field name="arch" type="xml">
             <span name="configuration" position="after">
                 <group name="Auth Configuration">
-                    <field name="is_auth_partner" invisible="1" />
                     <field
                         name="directory_id"
-                        attrs="{
-                            'invisible': [('is_auth_partner', '=', False)],
-                            'required': [('is_auth_partner', '=', True)]
-                        }"
+                        invisible="not is_auth_partner"
+                        required="is_auth_partner"
                     />
                 </group>
             </span>
diff --git a/fastapi_auth_partner/wizards/wizard_auth_partner_impersonate_view.xml b/fastapi_auth_partner/wizards/wizard_auth_partner_impersonate_view.xml
@@ -7,7 +7,6 @@
               Please choose an endpoint:
                 <group>
                 <field name="auth_partner_id" readonly="1" />
-                <field name="auth_directory_id" invisible="1" />
                 <field
                     name="fastapi_endpoint_id"
                     domain="[('directory_id', '=', auth_directory_id)]"
