PyPI - imio.smartweb.core - Versions diffs - 1.2.13__tar.gz → 1.2.15__tar.gz - Mend

Files changed (702) hide show

{imio.smartweb.core-1.2.13 → imio.smartweb.core-1.2.15}/src/imio/smartweb/core/tests/test_rest.py RENAMED Viewed

@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
+from base64 import b64encode
 from freezegun import freeze_time
 from imio.smartweb.core import config
 from imio.smartweb.core.contents.rest.base import BaseEndpoint
@@ -8,16 +9,20 @@ from imio.smartweb.core.contents.rest.events.endpoint import EventsEndpoint
 from imio.smartweb.core.contents.rest.news.endpoint import NewsEndpoint
 from imio.smartweb.core.testing import IMIO_SMARTWEB_CORE_ACCEPTANCE_TESTING
 from imio.smartweb.core.testing import ImioSmartwebTestCase
+from imio.smartweb.core.tests.utils import FakeResponse
 from imio.smartweb.core.tests.utils import get_json
 from plone import api
 from plone.app.testing import setRoles
 from plone.app.testing import TEST_USER_ID
+from plone.app.testing import TEST_USER_PASSWORD
 from plone.restapi.testing import RelativeSession
 from unittest.mock import patch
 from urllib.parse import urlparse
 from urllib.parse import parse_qs
 from zope.component import queryMultiAdapter
+from zope.event import notify
 from zope.publisher.browser import TestRequest
+from ZPublisher.pubevents import PubStart
 import json
 import requests_mock
@@ -73,6 +78,21 @@ class SectionsFunctionalTest(ImioSmartwebTestCase):
     def tearDown(self):
         self.api_session.close()
+    def traverse(self, path="/plone", method="GET"):
+        request = self.layer["request"]
+        request.environ["PATH_INFO"] = path
+        request.environ["PATH_TRANSLATED"] = path
+        request.environ["HTTP_ACCEPT"] = "application/json"
+        request.environ["REQUEST_METHOD"] = method
+        request.other["ACTUAL_URL"] = ""
+        request.other["URL"] = ""
+        request.method = method
+        request.form = {}
+        auth = f"{TEST_USER_ID}:{TEST_USER_PASSWORD}"
+        request._auth = "Basic %s" % b64encode(auth.encode("utf8")).decode("utf8")
+        notify(PubStart(request))
+        return request.traverse(path)
     @freeze_time("2021-09-14 8:00:00")
     def test_convert_cached_image_scales(self):
         endpoint = BaseEndpoint(self.portal, self.request)
@@ -366,3 +386,96 @@ class SectionsFunctionalTest(ImioSmartwebTestCase):
         self.rest_events.display_map = True
         view = queryMultiAdapter((self.rest_events, self.request), name="view")
         self.assertIn('display-map="True"', view())
+    @patch("imio.smartweb.core.rest.authentic_sources.get_wca_token")
+    @patch("imio.smartweb.core.rest.authentic_sources.requests.request")
+    @patch("imio.smartweb.core.rest.authentic_sources.get_default_view_url")
+    def test_request_forwarder(self, mock_view_url, mock_request, mock_get_wca_token):
+        mock_view_url.return_value = "http://view-url"
+        mock_get_wca_token.return_value = "kamoulox"
+        mock_request.return_value = FakeResponse(
+            status_code=200,
+            headers={"test-header": "True"},
+        )
+        # traversal stack
+        service = self.traverse("/plone/@news_request_forwarder/belleville/@search")
+        self.assertListEqual(service.traversal_stack, ["belleville", "@search"])
+        # add_smartweb_urls
+        json_data = {}
+        self.assertEqual(service.add_smartweb_urls(json_data), json_data)
+        json_data = {"foo": "bar"}
+        self.assertEqual(service.add_smartweb_urls(json_data), json_data)
+        json_data = {"items": []}
+        self.assertEqual(service.add_smartweb_urls(json_data), json_data)
+        json_data = {"items": [{"@id": "http://news/my-news"}]}
+        self.assertEqual(service.add_smartweb_urls(json_data), json_data)
+        json_data = {"items": [{"@id": "http://news/my-news", "UID": "12345678"}]}
+        json_result = service.add_smartweb_urls(json_data)
+        self.assertIn("smartweb_url", json_result["items"][0])
+        self.assertEqual(
+            json_data["items"][0]["smartweb_url"], "http://view-url#/content?u=12345678"
+        )
+        # add_missing_metadatas
+        params = {}
+        self.assertEqual(
+            service.add_missing_metadatas(params), {"metadata_fields": ["id", "UID"]}
+        )
+        params = {"fullobjects": 1}
+        self.assertEqual(service.add_missing_metadatas(params), params)
+        params = {"metadata_fields": ["other", "UID"]}
+        self.assertEqual(
+            service.add_missing_metadatas(params),
+            {"metadata_fields": ["other", "UID", "id"]},
+        )
+        params = {"metadata_fields": ["other", "id"]}
+        self.assertEqual(
+            service.add_missing_metadatas(params),
+            {"metadata_fields": ["other", "id", "UID"]},
+        )
+        # reply
+        response = service.reply()
+        mock_request.assert_called_with(
+            "GET",
+            "http://localhost:8080/Plone/belleville/@search",
+            params={"metadata_fields": ["id", "UID"]},
+            headers={"Accept": "application/json", "Authorization": "kamoulox"},
+            json={},
+        )
+        self.assertEqual(response, {})
+        self.assertEqual(self.request.response.status, 200)
+        self.assertEqual(self.request.response.headers, {"test-header": "True"})
+        service = self.traverse(
+            "/plone/@events_request_forwarder/belleville/", method="POST"
+        )
+        service.reply()
+        mock_request.assert_called_with(
+            "POST",
+            "http://localhost:8080/Plone/belleville",
+            params={},
+            headers={"Accept": "application/json", "Authorization": "kamoulox"},
+            json={},
+        )
+        mock_request.side_effect = None
+        mock_request.return_value = FakeResponse(status_code=204)
+        service = self.traverse(
+            "/plone/@events_request_forwarder/belleville/", method="PATCH"
+        )
+        response = service.reply()
+        self.assertEqual(response, "")
+        self.assertEqual(self.request.response.status, 204)
+        self.assertEqual(
+            self.api_session.get("/@directory_request_forwarder/foo/bar").text, ""
+        )
+        self.assertEqual(
+            self.api_session.get("/@events_request_forwarder/foo/bar").text, ""
+        )
+        self.assertEqual(
+            self.api_session.get("/@news_request_forwarder/foo/bar").text, ""
+        )

@@ -2,6 +2,20 @@ Changelog
 =========
+1.2.15 (2023-11-30)
+-------------------
+- Handle empty responses in request forwarders
+  [laulaz]
+1.2.14 (2023-11-30)
+-------------------
+- Fix parameters in `POST` / `PATCH` / `DELETE` requests
+  [laulaz]
 1.2.13 (2023-11-29)
 -------------------

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: imio.smartweb.core
-Version: 1.2.13
+Version: 1.2.15
 Summary: Core product for iMio websites
 Home-page: https://github.com/imio/imio.smartweb.core
 Author: Christophe Boulanger
@@ -159,6 +159,20 @@ Changelog
 =========
+1.2.15 (2023-11-30)
+-------------------
+- Handle empty responses in request forwarders
+  [laulaz]
+1.2.14 (2023-11-30)
+-------------------
+- Fix parameters in `POST` / `PATCH` / `DELETE` requests
+  [laulaz]
 1.2.13 (2023-11-29)
 -------------------

@@ -16,7 +16,7 @@ long_description = "\n\n".join(
 setup(
     name="imio.smartweb.core",
-    version="1.2.13",
+    version="1.2.15",
     description="Core product for iMio websites",
     long_description=long_description,
     # Get more from https://pypi.org/classifiers/

@@ -39,20 +39,24 @@ class BaseRequestForwarder(Service):
         token = get_wca_token(self.client_id, self.client_secret)
         headers = {"Accept": "application/json", "Authorization": token}
         params = self.request.form
-        params = self.add_missing_metadatas(params)
+        if method == "GET":
+            params = self.add_missing_metadatas(params)
         data = json_body(self.request)
         # Forward the request to the authentic source
         auth_source_response = requests.request(
             method, url, params=params, headers=headers, json=data
         )
         response = self.request.response
         # Set the status code and headers from the authentic source server response
         response.setStatus(auth_source_response.status_code)
         for header, value in auth_source_response.headers.items():
             response.setHeader(header, value)
+        if auth_source_response.status_code == 204 or auth_source_response.text == "":
+            # Empty response
+            return ""
         return auth_source_response.json()
     def add_smartweb_urls(self, json_data):
@@ -65,7 +69,7 @@ class BaseRequestForwarder(Service):
                 # search endpoint)
                 default_view_url = get_default_view_url(self.request_type)
                 item_uid = item["UID"]
-                item_id = item["id"]
+                item_id = item.get("id", "content")
                 item["smartweb_url"] = f"{default_view_url}#/{item_id}?u={item_uid}"
         return json_data

@@ -94,3 +94,18 @@ def make_named_image(filename="plone.png"):
     with open(path, "rb") as f:
         image_data = f.read()
     return {"filename": filename, "data": image_data}
+class FakeResponse:
+    status_code = 404
+    headers = {}
+    text = "{}"
+    def __init__(self, status_code=None, headers=None):
+        if status_code:
+            self.status_code = status_code
+        if headers:
+            self.headers = headers
+    def json(self):
+        return json.loads(self.text)

imio.smartweb.core 1.2.13__tar.gz → 1.2.15__tar.gz

imio.smartweb.core 1.2.13tar.gz → 1.2.15tar.gz