Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions endpoint/demo/endpoint_demo.xml
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,17 @@ result = {"response": Response(request.params.get("your_name", ""))}
<field name="auth_type">public</field>
<field name="exec_as_user_id" ref="base.user_demo" />
<field name="code_snippet">
result = {"payload": "Method used:" + request.httprequest.method}
</field>
</record>

<record id="endpoint_demo_8" model="endpoint.endpoint">
<field name="name">Demo Endpoint 8</field>
<field name="route">/demo/auth_bearer</field>
<field name="request_method">GET</field>
<field name="exec_mode">code</field>
<field name="auth_type">bearer</field>
<field name="code_snippet">
result = {"payload": "Method used:" + request.httprequest.method}
</field>
</record>
Expand Down
2 changes: 2 additions & 0 deletions endpoint/models/endpoint_mixin.py
Original file line number Diff line number Diff line change
Expand Up @@ -229,6 +229,8 @@ def _validate_request(self, request):
):
self._logger.error("_validate_request: UnsupportedMediaType")
raise werkzeug.exceptions.UnsupportedMediaType()
if self.auth_type == "bearer":
request.env["ir.http"]._auth_method_bearer()

def _get_handler(self):
try:
Expand Down
1 change: 1 addition & 0 deletions endpoint/readme/CONTRIBUTORS.md
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
- Simone Orsi \<<simone.orsi@camptocamp.com>\>
- 张飞虎 \<<feihu.zhang@orado.cn>\>
23 changes: 23 additions & 0 deletions endpoint/tests/test_endpoint_controller.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

import json
import os
from datetime import datetime, timedelta
from unittest import skipIf

from odoo.tests.common import HttpCase
Expand Down Expand Up @@ -77,3 +78,25 @@ def test_call6(self):
def test_call7(self):
response = self.url_open("/demo/bad_method", data="ok")
self.assertEqual(response.status_code, 405)

def test_call8(self):
response = self.url_open("/demo/auth_bearer")
self.assertEqual(response.status_code, 401)

response = self.url_open(
"/demo/auth_bearer", headers={"Authorization": "Bearer bad_key"}
)
self.assertEqual(response.status_code, 401)

expiration_date = datetime.today() + timedelta(days=1)
demo_user = self.env.ref("base.user_demo")
api_key = (
self.env["res.users.apikeys"]
.with_user(demo_user)
._generate(None, "Test api key", expiration_date)
)
demo_user.api_key_ids.flush_model()
response = self.url_open(
"/demo/auth_bearer", headers={"Authorization": f"Bearer {api_key}"}
)
self.assertEqual(response.status_code, 200)
13 changes: 12 additions & 1 deletion endpoint/views/endpoint_view.xml
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,11 @@
</group>
</page>
<page name="code" string="Code" invisible="exec_mode != 'code'">
<field name="code_snippet" widget="ace" />
<field
name="code_snippet"
widget="ace"
options="{'mode':'python'}"
/>
</page>
<page
name="code_help"
Expand Down Expand Up @@ -125,6 +129,13 @@
name="inactive"
domain="[('active', '=', False)]"
/>
<group>
<filter
name="group_route_group"
string="Group"
context="{'group_by':'route_group'}"
/>
</group>
</search>
</field>
</record>
Expand Down
2 changes: 1 addition & 1 deletion endpoint_route_handler/models/endpoint_route_handler.py
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ def _selection_route_type(self):
return [("http", "HTTP"), ("json", "JSON")]

def _selection_auth_type(self):
return [("public", "Public"), ("user_endpoint", "User")]
return [("public", "Public"), ("user_endpoint", "User"), ("bearer", "Bearer")]

def _selection_request_method(self):
return [
Expand Down
6 changes: 6 additions & 0 deletions endpoint_route_handler/tests/test_endpoint.py
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,12 @@ def test_as_tool_base_data(self):
self.assertTrue(first_hash)
new_route.route += "/new"
self.assertNotEqual(new_route.endpoint_hash, first_hash)
self.assertIn("http", dict(new_route._selection_route_type()))
self.assertIn("POST", dict(new_route._selection_request_method()))
self.assertIn("bearer", dict(new_route._selection_auth_type()))
self.assertIn(
"application/json", dict(new_route._selection_request_content_type())
)

@mute_logger("odoo.addons.base.models.ir_http")
def test_as_tool_register_single_controller(self):
Expand Down