🔧(y-provider) increase Node.js memory limit

By default, Node.js has a memory limit of
around 512MB, which can lead to out-of-memory
errors when processing large documents.
This commit increases the memory limit to
2GB for the y-provider server, allowing
it to handle larger documents without crashing.

CHANGELOG.md

@@ -6,15 +6,75 @@ and this project adheres to
 
 ## [Unreleased]
 
+### Added
+
+- 🚸(frontend) hint min char search users #2064
+
+### Changed
+
+- 💄(frontend) improve comments highlights #1961
+- ♿️(frontend) improve BoxButton a11y and native button semantics #2103
+- ♿️(frontend) improve language picker accessibility #2069
+
 ### Fixed
 
-- 🙈(docker) add \*\*/.next to .dockerignore #2034
+- 🐛(y-provider) destroy Y.Doc instances after each convert request #2129
+
+## [v4.8.3] - 2026-03-23
+
+### Changed
+
+- ♿️(frontend) improve version history list accessibility #2033
+- ♿(frontend) focus skip link on headings and skip grid dropzone #1983
+- ♿️(frontend) add sr-only format to export download button #2088
+- ♿️(frontend) announce formatting shortcuts for screen readers #2070
+- ✨(frontend) add markdown copy icon for Copy as Markdown option #2096
+- ♻️(backend) skip saving in database a document when payload is empty #2062
+- ♻️(frontend) refacto Version modal to fit with the design system #2091
+- ⚡️(frontend) add debounce WebSocket reconnect #2104
+
+### Fixed
+
+- ♿️(frontend) fix more options menu feedback for screen readers #2071
+- ♿️(frontend) fix more options menu feedback for screen readers #2071
+- 💫(frontend) fix the help button to the bottom in tree #2073
+- ♿️(frontend) fix aria-labels for table of contents #2065
+- 🐛(backend) allow using search endpoint without refresh token enabled #2097
+- 🐛(frontend) fix close panel when click on subdoc #2094
+- 🐛(frontend) fix leftpanel button in doc version #9238
+- 🐛(y-provider) fix loop when no cookies #2101
+
+## [v4.8.2] - 2026-03-19
+
+### Added
+
+- ✨(backend) add resource server api #1923
+- ✨(frontend) activate Find search #1834
+- ✨ handle searching on subdocuments #1834
+- ✨(backend) add search feature flags #1897
 
 ### Changed
 
 - ♿️(frontend) ensure doc title is h1 for accessibility #2006
+- ♿️(frontend) add nb accesses in share button aria-label #2017
+- ✨(backend) improve fallback logic on search endpoint #1834
+
+### Fixed
+
+- 🐛(frontend) fix image resizing when caption #2045
+- 🙈(docker) add \*\*/.next to .dockerignore #2034
 - ♿️(frontend) fix share modal heading hierarchy #2007
 - ♿️(frontend) fix Copy link toast accessibility for screen readers #2029
+- ♿️(frontend) fix modal aria-label and name #2014
+- ♿️(frontend) fix language dropdown ARIA for screen readers #2020
+- ♿️(frontend) fix waffle aria-label spacing for new-window links #2030
+- 🐛(backend) stop using add_sibling method to create sandbox document #2084
+- 🐛(backend) duplicate a document as last-sibling #2084
+
+### Removed
+
+- 🔥(api) remove `documents/<document_id>/descendants/` endpoint #1834
+- 🔥(api) remove pagination on `documents/search/` endpoint #1834
 
 ## [v4.8.1] - 2026-03-17
 
@@ -117,15 +177,12 @@ and this project adheres to
 - ✨(frontend) Add stat for Crisp #1824
 - ✨(auth) add silent login #1690
 - 🔧(project) add DJANGO_EMAIL_URL_APP environment variable #1825
-- ✨(frontend) activate Find search #1834
-- ✨ handle searching on subdocuments #1834
 
 ### Changed
 
 - ♿(frontend) improve accessibility:
   - ♿️(frontend) fix subdoc opening and emoji pick focus #1745
 - ✨(backend) add field for button label in email template #1817
-- ✨(backend) improve fallback logic on search endpoint #1834
 
 ### Fixed
 
@@ -1130,7 +1187,9 @@ and this project adheres to
 - ✨(frontend) Coming Soon page (#67)
 - 🚀 Impress, project to manage your documents easily and collaboratively.
 
-[unreleased]: https://github.com/suitenumerique/docs/compare/v4.8.1...main
+[unreleased]: https://github.com/suitenumerique/docs/compare/v4.8.3...main
+[v4.8.3]: https://github.com/suitenumerique/docs/releases/v4.8.3
+[v4.8.2]: https://github.com/suitenumerique/docs/releases/v4.8.2
 [v4.8.1]: https://github.com/suitenumerique/docs/releases/v4.8.1
 [v4.8.0]: https://github.com/suitenumerique/docs/releases/v4.8.0
 [v4.7.0]: https://github.com/suitenumerique/docs/releases/v4.7.0

Makefile

@@ -162,6 +162,10 @@ endif
 	@echo ""
 .PHONY: post-beautiful-bootstrap
 
+create-docker-network: ## create the docker network if it doesn't exist
+	@docker network create lasuite-network || true
+.PHONY: create-docker-network
+
 bootstrap: ## Prepare the project for local development
 bootstrap: \
 	pre-beautiful-bootstrap \
@@ -219,6 +223,7 @@ logs: ## display app-dev logs (follow mode)
 .PHONY: logs
 
 run-backend: ## Start only the backend application and all needed services
+	@$(MAKE) create-docker-network
 	@$(COMPOSE) up --force-recreate -d docspec
 	@$(COMPOSE) up --force-recreate -d celery-dev
 	@$(COMPOSE) up --force-recreate -d y-provider-development

docker/files/production/etc/nginx/conf.d/default.conf.template

@@ -47,6 +47,10 @@ server {
         try_files $uri @proxy_to_docs_backend;
     }
 
+    location /external_api {
+        try_files $uri @proxy_to_docs_backend;
+    }
+
     location /static {
         try_files $uri @proxy_to_docs_backend;
     }

docs/resource_server.md

@@ -0,0 +1,106 @@
+# Use Docs as a Resource Server
+
+Docs implements resource server, so it means it can be used from an external app to perform some operation using the dedicated API.
+
+> **Note:** This feature might be subject to future evolutions. The API endpoints, configuration options, and behavior may change in future versions.
+
+## Prerequisites
+
+In order to activate the resource server on Docs you need to setup the following environment variables
+
+```python
+OIDC_RESOURCE_SERVER_ENABLED=True
+OIDC_OP_URL=
+OIDC_OP_INTROSPECTION_ENDPOINT=
+OIDC_RS_CLIENT_ID=
+OIDC_RS_CLIENT_SECRET=
+OIDC_RS_AUDIENCE_CLAIM=
+OIDC_RS_ALLOWED_AUDIENCES=
+```
+
+It implements the resource server using `django-lasuite`, see the [documentation](https://github.com/suitenumerique/django-lasuite/blob/main/documentation/how-to-use-oidc-resource-server-backend.md)
+
+## Customise allowed routes
+
+Configure the `EXTERNAL_API` setting to control which routes and actions are available in the external API. Set it via the `EXTERNAL_API` environment variable (as JSON) or in Django settings.
+
+Default configuration:
+
+```python
+EXTERNAL_API = {
+    "documents": {
+        "enabled": True,
+        "actions": ["list", "retrieve", "create", "children"],
+    },
+    "document_access": {
+        "enabled": False,
+        "actions": [],
+    },
+    "document_invitation": {
+        "enabled": False,
+        "actions": [],
+    },
+    "users": {
+        "enabled": True,
+        "actions": ["get_me"],
+    },
+}
+```
+
+**Endpoints:**
+
+- `documents`: Controls `/external_api/v1.0/documents/`. Available actions: `list`, `retrieve`, `create`, `update`, `destroy`, `trashbin`, `children`,  `restore`, `move`,`versions_list`, `versions_detail`, `favorite_detail`,`link_configuration`, `attachment_upload`, `media_auth`, `ai_transform`, `ai_translate`, `ai_proxy`. Always allowed actions: `favorite_list`, `duplicate`.
+- `document_access`: `/external_api/v1.0/documents/{id}/accesses/`. Available actions: `list`, `retrieve`, `create`, `update`, `partial_update`, `destroy`
+- `document_invitation`: Controls `/external_api/v1.0/documents/{id}/invitations/`. Available actions: `list`, `retrieve`, `create`, `partial_update`, `destroy`
+- `users`: Controls `/external_api/v1.0/documents/`. Available actions: `get_me`.
+
+Each endpoint has `enabled` (boolean) and `actions` (list of allowed actions). Only actions explicitly listed are accessible.
+
+## Request Docs
+
+In order to request Docs from an external resource provider, you need to implement the basic setup of `django-lasuite` [Using the OIDC Authentication Backend to request a resource server](https://github.com/suitenumerique/django-lasuite/blob/main/documentation/how-to-use-oidc-call-to-resource-server.md)
+
+Then you can requests some routes that are available at `/external_api/v1.0/*`, here are some examples of what you can do.
+
+### Create a document
+
+Here is an example of a view that creates a document from a markdown file at the root level in Docs.
+
+```python
+    @method_decorator(refresh_oidc_access_token)
+    def create_document_from_markdown(self, request):
+        """
+        Create a new document from a Markdown file at root level.
+        """
+
+        # Get the access token from the session
+        access_token = request.session.get('oidc_access_token')
+
+        # Create a new document from a file
+        file_content = b"# Test Document\n\nThis is a test."
+        file = BytesIO(file_content)
+        file.name = "readme.md"
+
+        response = requests.post(
+            f"{settings.DOCS_API}/documents/",
+            {
+                "file": file,
+            },
+            format="multipart",
+        )
+
+        response.raise_for_status()
+        data = response.json()
+        return {"id": data["id"]}
+```
+
+### Get user information
+
+The same way, you can use the /me endpoint to get user information.
+
+```python
+response = requests.get(
+    "{settings.DOCS_API}/users/me/",
+    headers={"Authorization": f"Bearer {access_token}", "Content-Type": "application/json"},
+)
+```

docs/search.md

@@ -39,3 +39,14 @@ OIDC_STORE_REFRESH_TOKEN_KEY="<your-32-byte-encryption-key==>"
 
 `OIDC_STORE_REFRESH_TOKEN_KEY` must be a valid Fernet key (32 url-safe base64-encoded bytes).
 To create one, use the `bin/generate-oidc-store-refresh-token-key.sh` command.
+
+## Feature flags
+
+The Find search integration is controlled by two feature flags:
+- `flag_find_hybrid_search`
+- `flag_find_full_text_search`
+
+If a user has both flags activated the most advanced search is used (hybrid > full text > title).
+A user with no flag will default to the basic title search.
+
+Feature flags can be activated through the admin interface. 

env.d/development/common

@@ -51,9 +51,18 @@ LOGOUT_REDIRECT_URL=http://localhost:3000
 OIDC_REDIRECT_ALLOWED_HOSTS="localhost:8083,localhost:3000"
 OIDC_AUTH_REQUEST_EXTRA_PARAMS={"acr_values": "eidas1"}
 
+# Resource Server Backend
+OIDC_OP_URL=http://localhost:8083/realms/docs
+OIDC_OP_INTROSPECTION_ENDPOINT = http://nginx:8083/realms/docs/protocol/openid-connect/token/introspect
+OIDC_RESOURCE_SERVER_ENABLED=False
+OIDC_RS_CLIENT_ID=docs
+OIDC_RS_CLIENT_SECRET=ThisIsAnExampleKeyForDevPurposeOnly
+OIDC_RS_AUDIENCE_CLAIM="client_id"  # The claim used to identify the audience
+OIDC_RS_ALLOWED_AUDIENCES=""
+
 # Store OIDC tokens in the session. Needed by search/ endpoint.
-OIDC_STORE_ACCESS_TOKEN=True
-OIDC_STORE_REFRESH_TOKEN=True # Store the encrypted refresh token in the session.
+# OIDC_STORE_ACCESS_TOKEN=True
+# OIDC_STORE_REFRESH_TOKEN=True # Store the encrypted refresh token in the session.
 
 # Must be a valid Fernet key (32 url-safe base64-encoded bytes)
 # To create one, use the bin/fernetkey command.

renovate.json

@@ -60,10 +60,13 @@
       "groupName": "ignored js dependencies",
       "matchManagers": ["npm"],
       "matchPackageNames": [
+        "@react-pdf/renderer",
         "fetch-mock",
         "node",
         "node-fetch",
         "react-resizable-panels",
+        "stylelint",
+        "stylelint-config-standard",
         "workbox-webpack-plugin"
       ]
     }

src/backend/core/api/serializers.py

@@ -300,6 +300,15 @@ class DocumentSerializer(ListDocumentSerializer):
 
         return file
 
+    def update(self, instance, validated_data):
+        """
+        When no data is sent on the update, skip making the update in the database and return
+        directly the instance unchanged.
+        """
+        if not validated_data:
+            return instance  # No data provided, skip the update
+        return super().update(instance, validated_data)
+
     def save(self, **kwargs):
         """
         Process the content field to extract attachment keys and update the document's

src/backend/core/api/utils.py

@@ -6,8 +6,10 @@ from abc import ABC, abstractmethod
 from django.conf import settings
 from django.core.cache import cache
 from django.core.files.storage import default_storage
+from django.utils.decorators import method_decorator
 
 import botocore
+from lasuite.oidc_login.decorators import refresh_oidc_access_token
 from rest_framework.throttling import BaseThrottle
 
 
@@ -91,6 +93,19 @@ def generate_s3_authorization_headers(key):
     return request
 
 
+def conditional_refresh_oidc_token(func):
+    """
+    Conditionally apply refresh_oidc_access_token decorator.
+
+    The decorator is only applied if OIDC_STORE_REFRESH_TOKEN is True, meaning
+    we can actually refresh something. Broader settings checks are done in settings.py.
+    """
+    if settings.OIDC_STORE_REFRESH_TOKEN:
+        return method_decorator(refresh_oidc_access_token)(func)
+
+    return func
+
+
 class AIBaseRateThrottle(BaseThrottle, ABC):
     """Base throttle class for AI-related rate limiting with backoff."""
 

src/backend/core/api/viewsets.py

@@ -25,7 +25,6 @@ from django.db.models.functions import Greatest, Left, Length
 from django.http import Http404, StreamingHttpResponse
 from django.urls import reverse
 from django.utils import timezone
-from django.utils.decorators import method_decorator
 from django.utils.functional import cached_property
 from django.utils.http import content_disposition_header
 from django.utils.text import capfirst, slugify
@@ -33,11 +32,11 @@ from django.utils.translation import gettext_lazy as _
 
 import requests
 import rest_framework as drf
+import waffle
 from botocore.exceptions import ClientError
 from csp.constants import NONE
 from csp.decorators import csp_update
 from lasuite.malware_detection import malware_detection
-from lasuite.oidc_login.decorators import refresh_oidc_access_token
 from lasuite.tools.email import get_domain_from_email
 from pydantic import ValidationError as PydanticValidationError
 from rest_framework import filters, status, viewsets
@@ -71,6 +70,7 @@ from core.utils import (
     users_sharing_documents_with,
 )
 
+from ..enums import FeatureFlag, SearchType
 from . import permissions, serializers, utils
 from .filters import (
     DocumentFilter,
@@ -455,36 +455,45 @@ class DocumentViewSet(
 
     ### Additional Actions:
     1. **Trashbin**: List soft deleted documents for a document owner
-        Example: GET /documents/{id}/trashbin/
+        Example: GET /documents/trashbin/
 
-    2. **Children**: List or create child documents.
+    2. **Restore**: Restore a soft deleted document.
+        Example: POST /documents/{id}/restore/
+
+    3. **Move**: Move a document to another parent document.
+        Example: POST /documents/{id}/move/
+
+    4. **Duplicate**: Duplicate a document.
+        Example: POST /documents/{id}/duplicate/
+
+    5. **Children**: List or create child documents.
         Example: GET, POST /documents/{id}/children/
 
-    3. **Versions List**: Retrieve version history of a document.
+    6. **Versions List**: Retrieve version history of a document.
         Example: GET /documents/{id}/versions/
 
-    4. **Version Detail**: Get or delete a specific document version.
+    7. **Version Detail**: Get or delete a specific document version.
         Example: GET, DELETE /documents/{id}/versions/{version_id}/
 
-    5. **Favorite**: Get list of favorite documents for a user. Mark or unmark
+    8. **Favorite**: Get list of favorite documents for a user. Mark or unmark
         a document as favorite.
         Examples:
-        - GET /documents/favorite/
+        - GET /documents/favorite_list/
         - POST, DELETE /documents/{id}/favorite/
 
-    6. **Create for Owner**: Create a document via server-to-server on behalf of a user.
+    9. **Create for Owner**: Create a document via server-to-server on behalf of a user.
         Example: POST /documents/create-for-owner/
 
-    7. **Link Configuration**: Update document link configuration.
+    10. **Link Configuration**: Update document link configuration.
         Example: PUT /documents/{id}/link-configuration/
 
-    8. **Attachment Upload**: Upload a file attachment for the document.
+    11. **Attachment Upload**: Upload a file attachment for the document.
         Example: POST /documents/{id}/attachment-upload/
 
-    9. **Media Auth**: Authorize access to document media.
+    12. **Media Auth**: Authorize access to document media.
         Example: GET /documents/media-auth/
 
-    10. **AI Transform**: Apply a transformation action on a piece of text with AI.
+    13. **AI Transform**: Apply a transformation action on a piece of text with AI.
         Example: POST /documents/{id}/ai-transform/
         Expected data:
         - text (str): The input text.
@@ -492,7 +501,7 @@ class DocumentViewSet(
         Returns: JSON response with the processed text.
         Throttled by: AIDocumentRateThrottle, AIUserRateThrottle.
 
-    11. **AI Translate**: Translate a piece of text with AI.
+    14. **AI Translate**: Translate a piece of text with AI.
         Example: POST /documents/{id}/ai-translate/
         Expected data:
         - text (str): The input text.
@@ -500,7 +509,7 @@ class DocumentViewSet(
         Returns: JSON response with the translated text.
         Throttled by: AIDocumentRateThrottle, AIUserRateThrottle.
 
-    12. **AI Proxy**: Proxy an AI request to an external AI service.
+    15. **AI Proxy**: Proxy an AI request to an external AI service.
         Example: POST /api/v1.0/documents/<resource_id>/ai-proxy
 
     ### Ordering: created_at, updated_at, is_favorite, title
@@ -1350,7 +1359,7 @@ class DocumentViewSet(
             )
         else:
             duplicated_document = document_to_duplicate.add_sibling(
-                "right",
+                "last-sibling",
                 title=title,
                 content=base64_yjs_content,
                 attachments=attachments,
@@ -1404,7 +1413,7 @@ class DocumentViewSet(
         return duplicated_document
 
     @drf.decorators.action(detail=False, methods=["get"], url_path="search")
-    @method_decorator(refresh_oidc_access_token)
+    @utils.conditional_refresh_oidc_token
     def search(self, request, *args, **kwargs):
         """
         Returns an ordered list of documents best matching the search query parameter 'q'.
@@ -1414,6 +1423,9 @@ class DocumentViewSet(
         """
         params = serializers.SearchDocumentSerializer(data=request.query_params)
         params.is_valid(raise_exception=True)
+        search_type = self._get_search_type()
+        if search_type == SearchType.TITLE:
+            return self._title_search(request, params.validated_data, *args, **kwargs)
 
         indexer = get_document_indexer()
         if indexer is None:
@@ -1421,14 +1433,29 @@ class DocumentViewSet(
             return self._title_search(request, params.validated_data, *args, **kwargs)
 
         try:
-            return self._search_with_indexer(indexer, request, params=params)
+            return self._search_with_indexer(
+                indexer, request, params=params, search_type=search_type
+            )
         except requests.exceptions.RequestException as e:
             logger.error("Error while searching documents with indexer: %s", e)
             # fallback on title search if the indexer is not reached
             return self._title_search(request, params.validated_data, *args, **kwargs)
 
+    def _get_search_type(self) -> SearchType:
+        """
+        Returns the search type to use for the search endpoint based on feature flags.
+        If a user has both flags activated the most advanced search is used
+        (HYBRID > FULL_TEXT > TITLE).
+        A user with no flag will default to the basic title search.
+        """
+        if waffle.flag_is_active(self.request, FeatureFlag.FLAG_FIND_HYBRID_SEARCH):
+            return SearchType.HYBRID
+        if waffle.flag_is_active(self.request, FeatureFlag.FLAG_FIND_FULL_TEXT_SEARCH):
+            return SearchType.FULL_TEXT
+        return SearchType.TITLE
+
     @staticmethod
-    def _search_with_indexer(indexer, request, params):
+    def _search_with_indexer(indexer, request, params, search_type):
         """
         Returns a list of documents matching the query (q) according to the configured indexer.
         """
@@ -1436,6 +1463,7 @@ class DocumentViewSet(
 
         results = indexer.search(
             q=params.validated_data["q"],
+            search_type=search_type,
             token=request.session.get("oidc_access_token"),
             path=(
                 params.validated_data["path"]

src/backend/core/enums.py

@@ -3,7 +3,7 @@ Core application enums declaration
 """
 
 import re
-from enum import StrEnum
+from enum import Enum, StrEnum
 
 from django.conf import global_settings, settings
 from django.db import models
@@ -46,3 +46,24 @@ class DocumentAttachmentStatus(StrEnum):
 
     PROCESSING = "processing"
     READY = "ready"
+
+
+class SearchType(str, Enum):
+    """
+    Defines the possible search types for a document search query.
+        - TITLE: DRF based search in the title of the documents only.
+        - HYBRID and FULL_TEXT: more advanced search based on Find indexer.
+    """
+
+    TITLE = "title"
+    HYBRID = "hybrid"
+    FULL_TEXT = "full-text"
+
+
+class FeatureFlag(str, Enum):
+    """
+    Defines the possible feature flags for the application.
+    """
+
+    FLAG_FIND_HYBRID_SEARCH = "flag_find_hybrid_search"
+    FLAG_FIND_FULL_TEXT_SEARCH = "flag_find_full_text_search"

src/backend/core/external_api/permissions.py

@@ -0,0 +1,41 @@
+"""Resource Server Permissions for the Docs app."""
+
+from django.conf import settings
+
+from lasuite.oidc_resource_server.authentication import ResourceServerAuthentication
+from rest_framework import permissions
+
+
+class ResourceServerClientPermission(permissions.BasePermission):
+    """
+    Permission class for resource server views.
+    This provides a way to open the resource server views to a limited set of
+    Service Providers.
+    Note: we might add a more complex permission system in the future, based on
+    the Service Provider ID and the requested scopes.
+    """
+
+    def has_permission(self, request, view):
+        """
+        Check if the user is authenticated and the token introspection
+        provides an authorized Service Provider.
+        """
+        if not isinstance(
+            request.successful_authenticator, ResourceServerAuthentication
+        ):
+            # Not a resource server request
+            return False
+
+        # Check if the user is authenticated
+        if not request.user.is_authenticated:
+            return False
+        if (
+            hasattr(view, "resource_server_actions")
+            and view.action not in view.resource_server_actions
+        ):
+            return False
+
+        # When used as a resource server, the request has a token audience
+        return (
+            request.resource_server_token_audience in settings.OIDC_RS_ALLOWED_AUDIENCES
+        )

src/backend/core/external_api/viewsets.py

@@ -0,0 +1,91 @@
+"""Resource Server Viewsets for the Docs app."""
+
+from django.conf import settings
+
+from lasuite.oidc_resource_server.authentication import ResourceServerAuthentication
+
+from core.api.permissions import (
+    CanCreateInvitationPermission,
+    DocumentPermission,
+    IsSelf,
+    ResourceAccessPermission,
+)
+from core.api.viewsets import (
+    DocumentAccessViewSet,
+    DocumentViewSet,
+    InvitationViewset,
+    UserViewSet,
+)
+from core.external_api.permissions import ResourceServerClientPermission
+
+# pylint: disable=too-many-ancestors
+
+
+class ResourceServerRestrictionMixin:
+    """
+    Mixin for Resource Server Viewsets to provide shortcut to get
+    configured actions for a given resource.
+    """
+
+    def _get_resource_server_actions(self, resource_name):
+        """Get resource_server_actions from settings."""
+        external_api_config = settings.EXTERNAL_API.get(resource_name, {})
+        return list(external_api_config.get("actions", []))
+
+
+class ResourceServerDocumentViewSet(ResourceServerRestrictionMixin, DocumentViewSet):
+    """Resource Server Viewset for Documents."""
+
+    authentication_classes = [ResourceServerAuthentication]
+
+    permission_classes = [ResourceServerClientPermission & DocumentPermission]  # type: ignore
+
+    @property
+    def resource_server_actions(self):
+        """Build resource_server_actions from settings."""
+        return self._get_resource_server_actions("documents")
+
+
+class ResourceServerDocumentAccessViewSet(
+    ResourceServerRestrictionMixin, DocumentAccessViewSet
+):
+    """Resource Server Viewset for DocumentAccess."""
+
+    authentication_classes = [ResourceServerAuthentication]
+
+    permission_classes = [ResourceServerClientPermission & ResourceAccessPermission]  # type: ignore
+
+    @property
+    def resource_server_actions(self):
+        """Get resource_server_actions from settings."""
+        return self._get_resource_server_actions("document_access")
+
+
+class ResourceServerInvitationViewSet(
+    ResourceServerRestrictionMixin, InvitationViewset
+):
+    """Resource Server Viewset for Invitations."""
+
+    authentication_classes = [ResourceServerAuthentication]
+
+    permission_classes = [
+        ResourceServerClientPermission & CanCreateInvitationPermission
+    ]
+
+    @property
+    def resource_server_actions(self):
+        """Get resource_server_actions from settings."""
+        return self._get_resource_server_actions("document_invitation")
+
+
+class ResourceServerUserViewSet(ResourceServerRestrictionMixin, UserViewSet):
+    """Resource Server Viewset for User."""
+
+    authentication_classes = [ResourceServerAuthentication]
+
+    permission_classes = [ResourceServerClientPermission & IsSelf]  # type: ignore
+
+    @property
+    def resource_server_actions(self):
+        """Get resource_server_actions from settings."""
+        return self._get_resource_server_actions("users")

src/backend/core/models.py

@@ -285,8 +285,7 @@ class User(AbstractBaseUser, BaseModel, auth_models.PermissionsMixin):
                     )
                     return
 
-                sandbox_document = template_document.add_sibling(
-                    "right",
+                sandbox_document = Document.add_root(
                     title=template_document.title,
                     content=template_document.content,
                     attachments=template_document.attachments,

src/backend/core/services/search_indexers.py

@@ -13,6 +13,7 @@ from django.utils.module_loading import import_string
 import requests
 
 from core import models, utils
+from core.enums import SearchType
 
 logger = logging.getLogger(__name__)
 
@@ -68,7 +69,7 @@ def get_batch_accesses_by_users_and_teams(paths):
     return dict(access_by_document_path)
 
 
-def get_visited_document_ids_of(queryset, user):
+def get_visited_document_ids_of(queryset, user) -> tuple[str, ...]:
     """
     Returns the ids of the documents that have a linktrace to the user and NOT owned.
     It will be use to limit the opensearch responses to the public documents already
@@ -92,7 +93,7 @@ def get_visited_document_ids_of(queryset, user):
         .distinct("pk")
     )
 
-    return [str(id) for id in docs.values_list("pk", flat=True)]
+    return tuple(str(id) for id in docs.values_list("pk", flat=True))
 
 
 class BaseDocumentIndexer(ABC):
@@ -181,8 +182,16 @@ class BaseDocumentIndexer(ABC):
         Must be implemented by subclasses.
         """
 
-    # pylint: disable-next=too-many-arguments,too-many-positional-arguments
-    def search(self, q, token, visited=(), nb_results=None, path=None):
+    # pylint: disable=too-many-arguments, too-many-positional-arguments
+    def search(  # noqa : PLR0913
+        self,
+        q: str,
+        token: str,
+        visited: tuple[str, ...] = (),
+        nb_results: int = None,
+        path: str = None,
+        search_type: SearchType = None,
+    ):
         """
         Search for documents in Find app.
         Ensure the same default ordering as "Docs" list : -updated_at
@@ -200,6 +209,9 @@ class BaseDocumentIndexer(ABC):
                 Defaults to 50 if not specified.
             path (str, optional):
                 The parent path to search descendants of.
+            search_type (SearchType, optional):
+                Type of search to perform. Can be SearchType.HYBRID or SearchType.FULL_TEXT.
+                If None, the backend search service will use its default search behavior.
         """
         nb_results = nb_results or self.search_limit
         results = self.search_query(
@@ -211,6 +223,7 @@ class BaseDocumentIndexer(ABC):
                 "order_by": "updated_at",
                 "order_direction": "desc",
                 "path": path,
+                "search_type": search_type,
             },
             token=token,
         )
@@ -231,10 +244,25 @@ class FindDocumentIndexer(BaseDocumentIndexer):
     Document indexer that indexes and searches documents with La Suite Find app.
     """
 
-    # pylint: disable=too-many-arguments,too-many-positional-arguments
-    def search(self, q, token, visited=(), nb_results=None, path=None):
+    # pylint: disable=too-many-arguments, too-many-positional-arguments
+    def search(  # noqa : PLR0913
+        self,
+        q: str,
+        token: str,
+        visited: tuple[()] = (),
+        nb_results: int = None,
+        path: str = None,
+        search_type: SearchType = None,
+    ):
         """format Find search results"""
-        search_results = super().search(q, token, visited, nb_results, path)
+        search_results = super().search(
+            q=q,
+            token=token,
+            visited=visited,
+            nb_results=nb_results,
+            path=path,
+            search_type=search_type,
+        )
         return [
             {
                 **hit["_source"],

src/backend/core/tests/conftest.py

@@ -1,10 +1,15 @@
 """Fixtures for tests in the impress core application"""
 
+import base64
 from unittest import mock
 
 from django.core.cache import cache
 
 import pytest
+import responses
+
+from core import factories
+from core.tests.utils.urls import reload_urls
 
 USER = "user"
 TEAM = "team"
@@ -49,3 +54,92 @@ def indexer_settings_fixture(settings):
 
     # clear cache to prevent issues with other tests
     get_document_indexer.cache_clear()
+
+
+def resource_server_backend_setup(settings):
+    """
+    A fixture to create a user token for testing.
+    """
+    assert (
+        settings.OIDC_RS_BACKEND_CLASS
+        == "lasuite.oidc_resource_server.backend.ResourceServerBackend"
+    )
+
+    settings.OIDC_RESOURCE_SERVER_ENABLED = True
+    settings.OIDC_RS_CLIENT_ID = "some_client_id"
+    settings.OIDC_RS_CLIENT_SECRET = "some_client_secret"
+
+    settings.OIDC_OP_URL = "https://oidc.example.com"
+    settings.OIDC_VERIFY_SSL = False
+    settings.OIDC_TIMEOUT = 5
+    settings.OIDC_PROXY = None
+    settings.OIDC_OP_JWKS_ENDPOINT = "https://oidc.example.com/jwks"
+    settings.OIDC_OP_INTROSPECTION_ENDPOINT = "https://oidc.example.com/introspect"
+    settings.OIDC_RS_SCOPES = ["openid", "groups"]
+    settings.OIDC_RS_ALLOWED_AUDIENCES = ["some_service_provider"]
+
+
+@pytest.fixture
+def resource_server_backend_conf(settings):
+    """
+    A fixture to create a user token for testing.
+    """
+    resource_server_backend_setup(settings)
+    reload_urls()
+
+
+@pytest.fixture
+def resource_server_backend(settings):
+    """
+    A fixture to create a user token for testing.
+    Including a mocked introspection endpoint.
+    """
+    resource_server_backend_setup(settings)
+    reload_urls()
+
+    with responses.RequestsMock() as rsps:
+        rsps.add(
+            responses.POST,
+            "https://oidc.example.com/introspect",
+            json={
+                "iss": "https://oidc.example.com",
+                "aud": "some_client_id",  # settings.OIDC_RS_CLIENT_ID
+                "sub": "very-specific-sub",
+                "client_id": "some_service_provider",
+                "scope": "openid groups",
+                "active": True,
+            },
+        )
+
+        yield rsps
+
+
+@pytest.fixture
+def user_specific_sub():
+    """
+    A fixture to create a user token for testing.
+    """
+    user = factories.UserFactory(sub="very-specific-sub", full_name="External User")
+
+    yield user
+
+
+def build_authorization_bearer(token):
+    """
+    Build an Authorization Bearer header value from a token.
+
+    This can be used like this:
+    client.post(
+        ...
+        HTTP_AUTHORIZATION=f"Bearer {build_authorization_bearer('some_token')}",
+    )
+    """
+    return base64.b64encode(token.encode("utf-8")).decode("utf-8")
+
+
+@pytest.fixture
+def user_token():
+    """
+    A fixture to create a user token for testing.
+    """
+    return build_authorization_bearer("some_token")

src/backend/core/tests/documents/test_api_documents_duplicate.py

@@ -123,7 +123,7 @@ def test_api_documents_duplicate_success(index):
         image_refs[0][0]
     ]  # Only the first image key
     assert duplicated_document.get_parent() == document.get_parent()
-    assert duplicated_document.path == document.get_next_sibling().path
+    assert duplicated_document.path == document.get_last_sibling().path
 
     # Check that accesses were not duplicated.
     # The user who did the duplicate is forced as owner
@@ -180,6 +180,7 @@ def test_api_documents_duplicate_with_accesses_admin(role):
     client = APIClient()
     client.force_login(user)
 
+    documents_before = factories.DocumentFactory.create_batch(20)
     document = factories.DocumentFactory(
         users=[(user, role)],
         title="document with accesses",
@@ -187,6 +188,12 @@ def test_api_documents_duplicate_with_accesses_admin(role):
     user_access = factories.UserDocumentAccessFactory(document=document)
     team_access = factories.TeamDocumentAccessFactory(document=document)
 
+    documents_after = factories.DocumentFactory.create_batch(20)
+
+    all_documents = documents_before + [document] + documents_after
+
+    paths = {document.pk: document.path for document in all_documents}
+
     # Duplicate the document via the API endpoint requesting to duplicate accesses
     response = client.post(
         f"/api/v1.0/documents/{document.id!s}/duplicate/",
@@ -212,6 +219,10 @@ def test_api_documents_duplicate_with_accesses_admin(role):
     assert duplicated_accesses.get(user=user_access.user).role == user_access.role
     assert duplicated_accesses.get(team=team_access.team).role == team_access.role
 
+    for document in all_documents:
+        document.refresh_from_db()
+        assert document.path == paths[document.id]
+
 
 @pytest.mark.parametrize("role", ["editor", "reader"])
 def test_api_documents_duplicate_with_accesses_non_admin(role):

src/backend/core/tests/documents/test_api_documents_search.py

@@ -9,14 +9,23 @@ import responses
 from faker import Faker
 from rest_framework import response as drf_response
 from rest_framework.test import APIClient
+from waffle.testutils import override_flag
 
 from core import factories
+from core.enums import FeatureFlag, SearchType
 from core.services.search_indexers import get_document_indexer
 
 fake = Faker()
 pytestmark = pytest.mark.django_db
 
 
+@pytest.fixture(autouse=True)
+def enable_flag_find_hybrid_search():
+    """Enable flag_find_hybrid_search for all tests in this module."""
+    with override_flag(FeatureFlag.FLAG_FIND_HYBRID_SEARCH, active=True):
+        yield
+
+
 @mock.patch("core.services.search_indexers.FindDocumentIndexer.search_query")
 @responses.activate
 def test_api_documents_search_anonymous(search_query, indexer_settings):
@@ -46,6 +55,7 @@ def test_api_documents_search_anonymous(search_query, indexer_settings):
             "order_by": "updated_at",
             "order_direction": "desc",
             "path": None,
+            "search_type": SearchType.HYBRID,
         },
         "token": None,
     }
@@ -60,17 +70,20 @@ def test_api_documents_search_anonymous(search_query, indexer_settings):
 
 
 @mock.patch("core.api.viewsets.DocumentViewSet.list")
-def test_api_documents_search_fall_back_on_search_list(mock_list, indexer_settings):
+def test_api_documents_search_fall_back_on_search_list(mock_list, settings):
     """
     When indexer is not configured and no path is provided,
     should fall back on list method
     """
-    indexer_settings.SEARCH_URL = None
     assert get_document_indexer() is None
+    assert settings.OIDC_STORE_REFRESH_TOKEN is False
+    assert settings.OIDC_STORE_ACCESS_TOKEN is False
 
     user = factories.UserFactory()
     client = APIClient()
-    client.force_login(user)
+    client.force_login(
+        user, backend="core.authentication.backends.OIDCAuthenticationBackend"
+    )
 
     mocked_response = {
         "count": 0,
@@ -83,6 +96,8 @@ def test_api_documents_search_fall_back_on_search_list(mock_list, indexer_settin
     q = "alpha"
     response = client.get("/api/v1.0/documents/search/", data={"q": q})
 
+    assert response.status_code == 200
+
     assert mock_list.call_count == 1
     assert mock_list.call_args[0][0].GET.get("q") == q
     assert response.json() == mocked_response
@@ -90,18 +105,21 @@ def test_api_documents_search_fall_back_on_search_list(mock_list, indexer_settin
 
 @mock.patch("core.api.viewsets.DocumentViewSet._list_descendants")
 def test_api_documents_search_fallback_on_search_list_sub_docs(
-    mock_list_descendants, indexer_settings
+    mock_list_descendants, settings
 ):
     """
     When indexer is not configured and path parameter is provided,
     should call _list_descendants() method
     """
-    indexer_settings.SEARCH_URL = "http://find/api/v1.0/search"
-    assert get_document_indexer() is not None
+    assert get_document_indexer() is None
+    assert settings.OIDC_STORE_REFRESH_TOKEN is False
+    assert settings.OIDC_STORE_ACCESS_TOKEN is False
 
     user = factories.UserFactory()
     client = APIClient()
-    client.force_login(user)
+    client.force_login(
+        user, backend="core.authentication.backends.OIDCAuthenticationBackend"
+    )
 
     parent = factories.DocumentFactory(title="parent", users=[user])
 
@@ -118,9 +136,9 @@ def test_api_documents_search_fallback_on_search_list_sub_docs(
         "/api/v1.0/documents/search/", data={"q": q, "path": parent.path}
     )
 
-    assert mock_list_descendants.call_count == 1
-    assert mock_list_descendants.call_args[0][0].GET.get("q") == q
-    assert mock_list_descendants.call_args[0][0].GET.get("path") == parent.path
+    mock_list_descendants.assert_called_with(
+        mock.ANY, {"q": "alpha", "path": parent.path}
+    )
     assert response.json() == mocked_response
 
 
@@ -142,7 +160,9 @@ def test_api_documents_search_indexer_crashes(mock_title_search, indexer_setting
 
     user = factories.UserFactory()
     client = APIClient()
-    client.force_login(user)
+    client.force_login(
+        user, backend="core.authentication.backends.OIDCAuthenticationBackend"
+    )
 
     mocked_response = {
         "count": 0,
@@ -175,7 +195,9 @@ def test_api_documents_search_invalid_params(indexer_settings):
 
     user = factories.UserFactory()
     client = APIClient()
-    client.force_login(user)
+    client.force_login(
+        user, backend="core.authentication.backends.OIDCAuthenticationBackend"
+    )
 
     response = client.get("/api/v1.0/documents/search/")
 

src/backend/core/tests/documents/test_api_documents_search_feature_flag.py

@@ -0,0 +1,90 @@
+"""
+Tests for Find search feature flags
+"""
+
+from unittest import mock
+
+from django.http import HttpResponse
+
+import pytest
+import responses
+from rest_framework.test import APIClient
+from waffle.testutils import override_flag
+
+from core.enums import FeatureFlag, SearchType
+from core.services.search_indexers import get_document_indexer
+
+pytestmark = pytest.mark.django_db
+
+
+@responses.activate
+@mock.patch("core.api.viewsets.DocumentViewSet._title_search")
+@mock.patch("core.api.viewsets.DocumentViewSet._search_with_indexer")
+@pytest.mark.parametrize(
+    "activated_flags,"
+    "expected_search_type,"
+    "expected_search_with_indexer_called,"
+    "expected_title_search_called",
+    [
+        ([], SearchType.TITLE, False, True),
+        ([FeatureFlag.FLAG_FIND_HYBRID_SEARCH], SearchType.HYBRID, True, False),
+        (
+            [
+                FeatureFlag.FLAG_FIND_HYBRID_SEARCH,
+                FeatureFlag.FLAG_FIND_FULL_TEXT_SEARCH,
+            ],
+            SearchType.HYBRID,
+            True,
+            False,
+        ),
+        ([FeatureFlag.FLAG_FIND_FULL_TEXT_SEARCH], SearchType.FULL_TEXT, True, False),
+    ],
+)
+# pylint: disable=too-many-arguments, too-many-positional-arguments
+def test_api_documents_search_success(  # noqa : PLR0913
+    mock_search_with_indexer,
+    mock_title_search,
+    activated_flags,
+    expected_search_type,
+    expected_search_with_indexer_called,
+    expected_title_search_called,
+    indexer_settings,
+):
+    """
+    Test that the API endpoint for searching documents returns a successful response
+    with the expected search type according to the activated feature flags,
+    and that the appropriate search method is called.
+    """
+    assert get_document_indexer() is not None
+
+    mock_search_with_indexer.return_value = HttpResponse()
+    mock_title_search.return_value = HttpResponse()
+
+    with override_flag(
+        FeatureFlag.FLAG_FIND_HYBRID_SEARCH,
+        active=FeatureFlag.FLAG_FIND_HYBRID_SEARCH in activated_flags,
+    ):
+        with override_flag(
+            FeatureFlag.FLAG_FIND_FULL_TEXT_SEARCH,
+            active=FeatureFlag.FLAG_FIND_FULL_TEXT_SEARCH in activated_flags,
+        ):
+            response = APIClient().get(
+                "/api/v1.0/documents/search/", data={"q": "alpha"}
+            )
+
+    assert response.status_code == 200
+
+    if expected_search_with_indexer_called:
+        mock_search_with_indexer.assert_called_once()
+        assert (
+            mock_search_with_indexer.call_args.kwargs["search_type"]
+            == expected_search_type
+        )
+    else:
+        assert not mock_search_with_indexer.called
+
+    if expected_title_search_called:
+        assert SearchType.TITLE == expected_search_type
+        mock_title_search.assert_called_once()
+    else:
+        assert not mock_title_search.called

src/backend/core/tests/documents/test_api_documents_update.py

@@ -1,8 +1,10 @@
 """
 Tests for Documents API endpoint in impress's core app: update
 """
+# pylint: disable=too-many-lines
 
 import random
+from unittest.mock import patch
 
 from django.contrib.auth.models import AnonymousUser
 from django.core.cache import cache
@@ -17,6 +19,25 @@ from core.tests.conftest import TEAM, USER, VIA
 
 pytestmark = pytest.mark.django_db
 
+# A valid Yjs document derived from YDOC_HELLO_WORLD_BASE64 with "Hello" replaced by "World",
+# used in PATCH tests to guarantee a real content change distinct from what DocumentFactory
+# produces.
+YDOC_UPDATED_CONTENT_BASE64 = (
+    "AR717vLVDgAHAQ5kb2N1bWVudC1zdG9yZQMKYmxvY2tHcm91cAcA9e7y1Q4AAw5ibG9ja0NvbnRh"
+    "aW5lcgcA9e7y1Q4BAwdoZWFkaW5nBwD17vLVDgIGBgD17vLVDgMGaXRhbGljAnt9hPXu8tUOBAVX"
+    "b3JsZIb17vLVDgkGaXRhbGljBG51bGwoAPXu8tUOAg10ZXh0QWxpZ25tZW50AXcEbGVmdCgA9e7y"
+    "1Q4CBWxldmVsAX0BKAD17vLVDgECaWQBdyQwNGQ2MjM0MS04MzI2LTQyMzYtYTA4My00ODdlMjZm"
+    "YWQyMzAoAPXu8tUOAQl0ZXh0Q29sb3IBdwdkZWZhdWx0KAD17vLVDgEPYmFja2dyb3VuZENvbG9y"
+    "AXcHZGVmYXVsdIf17vLVDgEDDmJsb2NrQ29udGFpbmVyBwD17vLVDhADDmJ1bGxldExpc3RJdGVt"
+    "BwD17vLVDhEGBAD17vLVDhIBd4b17vLVDhMEYm9sZAJ7fYT17vLVDhQCb3KG9e7y1Q4WBGJvbGQE"
+    "bnVsbIT17vLVDhcCbGQoAPXu8tUOEQ10ZXh0QWxpZ25tZW50AXcEbGVmdCgA9e7y1Q4QAmlkAXck"
+    "ZDM1MWUwNjgtM2U1NS00MjI2LThlYTUtYWJiMjYzMTk4ZTJhKAD17vLVDhAJdGV4dENvbG9yAXcH"
+    "ZGVmYXVsdCgA9e7y1Q4QD2JhY2tncm91bmRDb2xvcgF3B2RlZmF1bHSH9e7y1Q4QAw5ibG9ja0Nv"
+    "bnRhaW5lcgcA9e7y1Q4eAwlwYXJhZ3JhcGgoAPXu8tUOHw10ZXh0QWxpZ25tZW50AXcEbGVmdCgA"
+    "9e7y1Q4eAmlkAXckODk3MDBjMDctZTBlMS00ZmUwLWFjYTItODQ5MzIwOWE3ZTQyKAD17vLVDh4J"
+    "dGV4dENvbG9yAXcHZGVmYXVsdCgA9e7y1Q4eD2JhY2tncm91bmRDb2xvcgF3B2RlZmF1bHQA"
+)
+
 
 @pytest.mark.parametrize("via_parent", [True, False])
 @pytest.mark.parametrize(
@@ -330,6 +351,7 @@ def test_api_documents_update_authenticated_no_websocket(settings):
     ws_resp = responses.get(endpoint_url, json={"count": 0, "exists": False})
 
     assert cache.get(f"docs:no-websocket:{document.id}") is None
+    old_path = document.path
 
     response = client.put(
         f"/api/v1.0/documents/{document.id!s}/",
@@ -338,6 +360,8 @@ def test_api_documents_update_authenticated_no_websocket(settings):
     )
     assert response.status_code == 200
 
+    document.refresh_from_db()
+    assert document.path == old_path
     assert cache.get(f"docs:no-websocket:{document.id}") == session_key
     assert ws_resp.call_count == 1
 
@@ -446,6 +470,7 @@ def test_api_documents_update_user_connected_to_websocket(settings):
     ws_resp = responses.get(endpoint_url, json={"count": 3, "exists": True})
 
     assert cache.get(f"docs:no-websocket:{document.id}") is None
+    old_path = document.path
 
     response = client.put(
         f"/api/v1.0/documents/{document.id!s}/",
@@ -453,6 +478,9 @@ def test_api_documents_update_user_connected_to_websocket(settings):
         format="json",
     )
     assert response.status_code == 200
+
+    document.refresh_from_db()
+    assert document.path == old_path
     assert cache.get(f"docs:no-websocket:{document.id}") is None
     assert ws_resp.call_count == 1
 
@@ -486,6 +514,7 @@ def test_api_documents_update_websocket_server_unreachable_fallback_to_no_websoc
     ws_resp = responses.get(endpoint_url, status=500)
 
     assert cache.get(f"docs:no-websocket:{document.id}") is None
+    old_path = document.path
 
     response = client.put(
         f"/api/v1.0/documents/{document.id!s}/",
@@ -494,6 +523,8 @@ def test_api_documents_update_websocket_server_unreachable_fallback_to_no_websoc
     )
     assert response.status_code == 200
 
+    document.refresh_from_db()
+    assert document.path == old_path
     assert cache.get(f"docs:no-websocket:{document.id}") == session_key
     assert ws_resp.call_count == 1
 
@@ -605,6 +636,7 @@ def test_api_documents_update_force_websocket_param_to_true(settings):
     ws_resp = responses.get(endpoint_url, status=500)
 
     assert cache.get(f"docs:no-websocket:{document.id}") is None
+    old_path = document.path
 
     response = client.put(
         f"/api/v1.0/documents/{document.id!s}/",
@@ -613,6 +645,8 @@ def test_api_documents_update_force_websocket_param_to_true(settings):
     )
     assert response.status_code == 200
 
+    document.refresh_from_db()
+    assert document.path == old_path
     assert cache.get(f"docs:no-websocket:{document.id}") is None
     assert ws_resp.call_count == 0
 
@@ -643,6 +677,7 @@ def test_api_documents_update_feature_flag_disabled(settings):
     ws_resp = responses.get(endpoint_url, status=500)
 
     assert cache.get(f"docs:no-websocket:{document.id}") is None
+    old_path = document.path
 
     response = client.put(
         f"/api/v1.0/documents/{document.id!s}/",
@@ -651,6 +686,8 @@ def test_api_documents_update_feature_flag_disabled(settings):
     )
     assert response.status_code == 200
 
+    document.refresh_from_db()
+    assert document.path == old_path
     assert cache.get(f"docs:no-websocket:{document.id}") is None
     assert ws_resp.call_count == 0
 
@@ -716,3 +753,724 @@ def test_api_documents_update_invalid_content():
     )
     assert response.status_code == 400
     assert response.json() == {"content": ["Invalid base64 content."]}
+
+
+# =============================================================================
+# PATCH tests
+# =============================================================================
+
+
+@pytest.mark.parametrize("via_parent", [True, False])
+@pytest.mark.parametrize(
+    "reach, role",
+    [
+        ("restricted", "reader"),
+        ("restricted", "editor"),
+        ("authenticated", "reader"),
+        ("authenticated", "editor"),
+        ("public", "reader"),
+    ],
+)
+def test_api_documents_patch_anonymous_forbidden(reach, role, via_parent):
+    """
+    Anonymous users should not be allowed to patch a document when link
+    configuration does not allow it.
+    """
+    if via_parent:
+        grand_parent = factories.DocumentFactory(link_reach=reach, link_role=role)
+        parent = factories.DocumentFactory(parent=grand_parent, link_reach="restricted")
+        document = factories.DocumentFactory(parent=parent, link_reach="restricted")
+    else:
+        document = factories.DocumentFactory(link_reach=reach, link_role=role)
+
+    old_document_values = serializers.DocumentSerializer(instance=document).data
+    new_content = YDOC_UPDATED_CONTENT_BASE64
+
+    response = APIClient().patch(
+        f"/api/v1.0/documents/{document.id!s}/",
+        {"content": new_content},
+        format="json",
+    )
+    assert response.status_code == 401
+    assert response.json() == {
+        "detail": "Authentication credentials were not provided."
+    }
+
+    document.refresh_from_db()
+    assert serializers.DocumentSerializer(instance=document).data == old_document_values
+
+
+@pytest.mark.parametrize("via_parent", [True, False])
+@pytest.mark.parametrize(
+    "reach,role",
+    [
+        ("public", "reader"),
+        ("authenticated", "reader"),
+        ("restricted", "reader"),
+        ("restricted", "editor"),
+    ],
+)
+def test_api_documents_patch_authenticated_unrelated_forbidden(reach, role, via_parent):
+    """
+    Authenticated users should not be allowed to patch a document to which
+    they are not related if the link configuration does not allow it.
+    """
+    user = factories.UserFactory(with_owned_document=True)
+
+    client = APIClient()
+    client.force_login(user)
+
+    if via_parent:
+        grand_parent = factories.DocumentFactory(link_reach=reach, link_role=role)
+        parent = factories.DocumentFactory(parent=grand_parent, link_reach="restricted")
+        document = factories.DocumentFactory(parent=parent, link_reach="restricted")
+    else:
+        document = factories.DocumentFactory(link_reach=reach, link_role=role)
+
+    old_document_values = serializers.DocumentSerializer(instance=document).data
+    new_content = YDOC_UPDATED_CONTENT_BASE64
+
+    response = client.patch(
+        f"/api/v1.0/documents/{document.id!s}/",
+        {"content": new_content},
+        format="json",
+    )
+
+    assert response.status_code == 403
+    assert response.json() == {
+        "detail": "You do not have permission to perform this action."
+    }
+
+    document.refresh_from_db()
+    assert serializers.DocumentSerializer(instance=document).data == old_document_values
+
+
+@pytest.mark.parametrize("via_parent", [True, False])
+@pytest.mark.parametrize(
+    "is_authenticated,reach,role",
+    [
+        (False, "public", "editor"),
+        (True, "public", "editor"),
+        (True, "authenticated", "editor"),
+    ],
+)
+def test_api_documents_patch_anonymous_or_authenticated_unrelated(
+    is_authenticated, reach, role, via_parent
+):
+    """
+    Anonymous and authenticated users should be able to patch a document to which
+    they are not related if the link configuration allows it.
+    """
+    client = APIClient()
+
+    if is_authenticated:
+        user = factories.UserFactory(with_owned_document=True)
+        client.force_login(user)
+
+    if via_parent:
+        grand_parent = factories.DocumentFactory(link_reach=reach, link_role=role)
+        parent = factories.DocumentFactory(parent=grand_parent, link_reach="restricted")
+        document = factories.DocumentFactory(parent=parent, link_reach="restricted")
+    else:
+        document = factories.DocumentFactory(link_reach=reach, link_role=role)
+
+    old_document_values = serializers.DocumentSerializer(instance=document).data
+    old_path = document.path
+    new_content = YDOC_UPDATED_CONTENT_BASE64
+
+    response = client.patch(
+        f"/api/v1.0/documents/{document.id!s}/",
+        {"content": new_content, "websocket": True},
+        format="json",
+    )
+    assert response.status_code == 200
+
+    # Using document.refresh_from_db does not wirk because the content is in cache.
+    # Force reloading it by fetching the document in the database.
+    document = models.Document.objects.get(id=document.id)
+    assert document.path == old_path
+    assert document.content == new_content
+    document_values = serializers.DocumentSerializer(instance=document).data
+    for key in [
+        "id",
+        "title",
+        "link_reach",
+        "link_role",
+        "creator",
+        "depth",
+        "numchild",
+        "path",
+    ]:
+        assert document_values[key] == old_document_values[key]
+
+
+@pytest.mark.parametrize("via_parent", [True, False])
+@pytest.mark.parametrize("via", VIA)
+def test_api_documents_patch_authenticated_reader(via, via_parent, mock_user_teams):
+    """Users who are reader of a document should not be allowed to patch it."""
+    user = factories.UserFactory(with_owned_document=True)
+
+    client = APIClient()
+    client.force_login(user)
+
+    if via_parent:
+        grand_parent = factories.DocumentFactory(link_reach="restricted")
+        parent = factories.DocumentFactory(parent=grand_parent, link_reach="restricted")
+        document = factories.DocumentFactory(parent=parent, link_reach="restricted")
+        access_document = grand_parent
+    else:
+        document = factories.DocumentFactory(link_reach="restricted")
+        access_document = document
+
+    if via == USER:
+        factories.UserDocumentAccessFactory(
+            document=access_document, user=user, role="reader"
+        )
+    elif via == TEAM:
+        mock_user_teams.return_value = ["lasuite", "unknown"]
+        factories.TeamDocumentAccessFactory(
+            document=access_document, team="lasuite", role="reader"
+        )
+
+    old_document_values = serializers.DocumentSerializer(instance=document).data
+    new_content = YDOC_UPDATED_CONTENT_BASE64
+
+    response = client.patch(
+        f"/api/v1.0/documents/{document.id!s}/",
+        {"content": new_content},
+        format="json",
+    )
+
+    assert response.status_code == 403
+    assert response.json() == {
+        "detail": "You do not have permission to perform this action."
+    }
+
+    document.refresh_from_db()
+    assert serializers.DocumentSerializer(instance=document).data == old_document_values
+
+
+@pytest.mark.parametrize("via_parent", [True, False])
+@pytest.mark.parametrize("role", ["editor", "administrator", "owner"])
+@pytest.mark.parametrize("via", VIA)
+def test_api_documents_patch_authenticated_editor_administrator_or_owner(
+    via, role, via_parent, mock_user_teams
+):
+    """A user who is editor, administrator or owner of a document should be allowed to patch it."""
+    user = factories.UserFactory(with_owned_document=True)
+
+    client = APIClient()
+    client.force_login(user)
+
+    if via_parent:
+        grand_parent = factories.DocumentFactory(link_reach="restricted")
+        parent = factories.DocumentFactory(parent=grand_parent, link_reach="restricted")
+        document = factories.DocumentFactory(parent=parent, link_reach="restricted")
+        access_document = grand_parent
+    else:
+        document = factories.DocumentFactory(link_reach="restricted")
+        access_document = document
+
+    if via == USER:
+        factories.UserDocumentAccessFactory(
+            document=access_document, user=user, role=role
+        )
+    elif via == TEAM:
+        mock_user_teams.return_value = ["lasuite", "unknown"]
+        factories.TeamDocumentAccessFactory(
+            document=access_document, team="lasuite", role=role
+        )
+
+    old_document_values = serializers.DocumentSerializer(instance=document).data
+    old_path = document.path
+    new_content = YDOC_UPDATED_CONTENT_BASE64
+
+    response = client.patch(
+        f"/api/v1.0/documents/{document.id!s}/",
+        {"content": new_content, "websocket": True},
+        format="json",
+    )
+    assert response.status_code == 200
+
+    # Using document.refresh_from_db does not wirk because the content is in cache.
+    # Force reloading it by fetching the document in the database.
+    document = models.Document.objects.get(id=document.id)
+    assert document.path == old_path
+    assert document.content == new_content
+    document_values = serializers.DocumentSerializer(instance=document).data
+    for key in [
+        "id",
+        "title",
+        "link_reach",
+        "link_role",
+        "creator",
+        "depth",
+        "numchild",
+        "path",
+        "nb_accesses_ancestors",
+        "nb_accesses_direct",
+    ]:
+        assert document_values[key] == old_document_values[key]
+
+
+@responses.activate
+def test_api_documents_patch_authenticated_no_websocket(settings):
+    """
+    When a user patches the document, not connected to the websocket and is the first to update,
+    the document should be updated.
+    """
+    user = factories.UserFactory(with_owned_document=True)
+    client = APIClient()
+    client.force_login(user)
+    session_key = client.session.session_key
+
+    document = factories.DocumentFactory(users=[(user, "editor")])
+    new_content = YDOC_UPDATED_CONTENT_BASE64
+
+    settings.COLLABORATION_API_URL = "http://example.com/"
+    settings.COLLABORATION_SERVER_SECRET = "secret-token"
+    settings.COLLABORATION_WS_NOT_CONNECTED_READY_ONLY = True
+    endpoint_url = (
+        f"{settings.COLLABORATION_API_URL}get-connections/"
+        f"?room={document.id}&sessionKey={session_key}"
+    )
+    ws_resp = responses.get(endpoint_url, json={"count": 0, "exists": False})
+
+    assert cache.get(f"docs:no-websocket:{document.id}") is None
+    old_path = document.path
+
+    response = client.patch(
+        f"/api/v1.0/documents/{document.id!s}/",
+        {"content": new_content},
+        format="json",
+    )
+    assert response.status_code == 200
+
+    # Using document.refresh_from_db does not work because the content is cached.
+    # Force reloading it by fetching the document from the database.
+    document = models.Document.objects.get(id=document.id)
+    assert document.path == old_path
+    assert document.content == new_content
+    assert cache.get(f"docs:no-websocket:{document.id}") == session_key
+    assert ws_resp.call_count == 1
+
+
+@responses.activate
+def test_api_documents_patch_authenticated_no_websocket_user_already_editing(settings):
+    """
+    When a user patches the document, not connected to the websocket and is not the first to
+    update, the document should not be updated.
+    """
+    user = factories.UserFactory(with_owned_document=True)
+    client = APIClient()
+    client.force_login(user)
+    session_key = client.session.session_key
+
+    document = factories.DocumentFactory(users=[(user, "editor")])
+    new_content = YDOC_UPDATED_CONTENT_BASE64
+
+    settings.COLLABORATION_API_URL = "http://example.com/"
+    settings.COLLABORATION_SERVER_SECRET = "secret-token"
+    settings.COLLABORATION_WS_NOT_CONNECTED_READY_ONLY = True
+    endpoint_url = (
+        f"{settings.COLLABORATION_API_URL}get-connections/"
+        f"?room={document.id}&sessionKey={session_key}"
+    )
+    ws_resp = responses.get(endpoint_url, json={"count": 0, "exists": False})
+
+    cache.set(f"docs:no-websocket:{document.id}", "other_session_key")
+
+    response = client.patch(
+        f"/api/v1.0/documents/{document.id!s}/",
+        {"content": new_content},
+        format="json",
+    )
+    assert response.status_code == 403
+    assert response.json() == {"detail": "You are not allowed to edit this document."}
+
+    assert ws_resp.call_count == 1
+
+
+@responses.activate
+def test_api_documents_patch_no_websocket_other_user_connected_to_websocket(settings):
+    """
+    When a user patches the document, not connected to the websocket and another user is connected
+    to the websocket, the document should not be updated.
+    """
+    user = factories.UserFactory(with_owned_document=True)
+    client = APIClient()
+    client.force_login(user)
+    session_key = client.session.session_key
+
+    document = factories.DocumentFactory(users=[(user, "editor")])
+    new_content = YDOC_UPDATED_CONTENT_BASE64
+
+    settings.COLLABORATION_API_URL = "http://example.com/"
+    settings.COLLABORATION_SERVER_SECRET = "secret-token"
+    settings.COLLABORATION_WS_NOT_CONNECTED_READY_ONLY = True
+    endpoint_url = (
+        f"{settings.COLLABORATION_API_URL}get-connections/"
+        f"?room={document.id}&sessionKey={session_key}"
+    )
+    ws_resp = responses.get(endpoint_url, json={"count": 3, "exists": False})
+
+    assert cache.get(f"docs:no-websocket:{document.id}") is None
+
+    response = client.patch(
+        f"/api/v1.0/documents/{document.id!s}/",
+        {"content": new_content},
+        format="json",
+    )
+    assert response.status_code == 403
+    assert response.json() == {"detail": "You are not allowed to edit this document."}
+    assert cache.get(f"docs:no-websocket:{document.id}") is None
+    assert ws_resp.call_count == 1
+
+
+@responses.activate
+def test_api_documents_patch_user_connected_to_websocket(settings):
+    """
+    When a user patches the document while connected to the websocket, the document should be
+    updated.
+    """
+    user = factories.UserFactory(with_owned_document=True)
+    client = APIClient()
+    client.force_login(user)
+    session_key = client.session.session_key
+
+    document = factories.DocumentFactory(users=[(user, "editor")])
+    new_content = YDOC_UPDATED_CONTENT_BASE64
+
+    settings.COLLABORATION_API_URL = "http://example.com/"
+    settings.COLLABORATION_SERVER_SECRET = "secret-token"
+    settings.COLLABORATION_WS_NOT_CONNECTED_READY_ONLY = True
+    endpoint_url = (
+        f"{settings.COLLABORATION_API_URL}get-connections/"
+        f"?room={document.id}&sessionKey={session_key}"
+    )
+    ws_resp = responses.get(endpoint_url, json={"count": 3, "exists": True})
+
+    assert cache.get(f"docs:no-websocket:{document.id}") is None
+    old_path = document.path
+
+    response = client.patch(
+        f"/api/v1.0/documents/{document.id!s}/",
+        {"content": new_content},
+        format="json",
+    )
+    assert response.status_code == 200
+
+    # Using document.refresh_from_db does not wirk because the content is in cache.
+    # Force reloading it by fetching the document in the database.
+    document = models.Document.objects.get(id=document.id)
+    assert document.path == old_path
+    assert document.content == new_content
+    assert cache.get(f"docs:no-websocket:{document.id}") is None
+    assert ws_resp.call_count == 1
+
+
+@responses.activate
+def test_api_documents_patch_websocket_server_unreachable_fallback_to_no_websocket(
+    settings,
+):
+    """
+    When the websocket server is unreachable, the patch should be applied like if the user was
+    not connected to the websocket.
+    """
+    user = factories.UserFactory(with_owned_document=True)
+    client = APIClient()
+    client.force_login(user)
+    session_key = client.session.session_key
+
+    document = factories.DocumentFactory(users=[(user, "editor")])
+    new_content = YDOC_UPDATED_CONTENT_BASE64
+
+    settings.COLLABORATION_API_URL = "http://example.com/"
+    settings.COLLABORATION_SERVER_SECRET = "secret-token"
+    settings.COLLABORATION_WS_NOT_CONNECTED_READY_ONLY = True
+    endpoint_url = (
+        f"{settings.COLLABORATION_API_URL}get-connections/"
+        f"?room={document.id}&sessionKey={session_key}"
+    )
+    ws_resp = responses.get(endpoint_url, status=500)
+
+    assert cache.get(f"docs:no-websocket:{document.id}") is None
+    old_path = document.path
+
+    response = client.patch(
+        f"/api/v1.0/documents/{document.id!s}/",
+        {"content": new_content},
+        format="json",
+    )
+    assert response.status_code == 200
+
+    # Using document.refresh_from_db does not work because the content is cached.
+    # Force reloading it by fetching the document from the database.
+    document = models.Document.objects.get(id=document.id)
+    assert document.path == old_path
+    assert document.content == new_content
+    assert cache.get(f"docs:no-websocket:{document.id}") == session_key
+    assert ws_resp.call_count == 1
+
+
+@responses.activate
+def test_api_documents_patch_websocket_server_unreachable_fallback_to_no_websocket_other_users(
+    settings,
+):
+    """
+    When the websocket server is unreachable, the behavior falls back to no-websocket.
+    If another user is already editing, the patch must be denied.
+    """
+    user = factories.UserFactory(with_owned_document=True)
+    client = APIClient()
+    client.force_login(user)
+    session_key = client.session.session_key
+
+    document = factories.DocumentFactory(users=[(user, "editor")])
+    new_content = YDOC_UPDATED_CONTENT_BASE64
+
+    settings.COLLABORATION_API_URL = "http://example.com/"
+    settings.COLLABORATION_SERVER_SECRET = "secret-token"
+    settings.COLLABORATION_WS_NOT_CONNECTED_READY_ONLY = True
+    endpoint_url = (
+        f"{settings.COLLABORATION_API_URL}get-connections/"
+        f"?room={document.id}&sessionKey={session_key}"
+    )
+    ws_resp = responses.get(endpoint_url, status=500)
+
+    cache.set(f"docs:no-websocket:{document.id}", "other_session_key")
+
+    response = client.patch(
+        f"/api/v1.0/documents/{document.id!s}/",
+        {"content": new_content},
+        format="json",
+    )
+    assert response.status_code == 403
+
+    assert cache.get(f"docs:no-websocket:{document.id}") == "other_session_key"
+    assert ws_resp.call_count == 1
+
+
+@responses.activate
+def test_api_documents_patch_websocket_server_room_not_found_fallback_to_no_websocket_other_users(
+    settings,
+):
+    """
+    When the WebSocket server does not have the room created, the logic should fallback to
+    no-WebSocket. If another user is already editing, the patch must be denied.
+    """
+    user = factories.UserFactory(with_owned_document=True)
+    client = APIClient()
+    client.force_login(user)
+    session_key = client.session.session_key
+
+    document = factories.DocumentFactory(users=[(user, "editor")])
+    new_content = YDOC_UPDATED_CONTENT_BASE64
+
+    settings.COLLABORATION_API_URL = "http://example.com/"
+    settings.COLLABORATION_SERVER_SECRET = "secret-token"
+    settings.COLLABORATION_WS_NOT_CONNECTED_READY_ONLY = True
+    endpoint_url = (
+        f"{settings.COLLABORATION_API_URL}get-connections/"
+        f"?room={document.id}&sessionKey={session_key}"
+    )
+    ws_resp = responses.get(endpoint_url, status=404)
+
+    cache.set(f"docs:no-websocket:{document.id}", "other_session_key")
+
+    response = client.patch(
+        f"/api/v1.0/documents/{document.id!s}/",
+        {"content": new_content},
+        format="json",
+    )
+    assert response.status_code == 403
+
+    assert cache.get(f"docs:no-websocket:{document.id}") == "other_session_key"
+    assert ws_resp.call_count == 1
+
+
+@responses.activate
+def test_api_documents_patch_force_websocket_param_to_true(settings):
+    """
+    When the websocket parameter is set to true, the patch should be applied without any check.
+    """
+    user = factories.UserFactory(with_owned_document=True)
+    client = APIClient()
+    client.force_login(user)
+    session_key = client.session.session_key
+
+    document = factories.DocumentFactory(users=[(user, "editor")])
+    new_content = YDOC_UPDATED_CONTENT_BASE64
+
+    settings.COLLABORATION_API_URL = "http://example.com/"
+    settings.COLLABORATION_SERVER_SECRET = "secret-token"
+    endpoint_url = (
+        f"{settings.COLLABORATION_API_URL}get-connections/"
+        f"?room={document.id}&sessionKey={session_key}"
+    )
+    ws_resp = responses.get(endpoint_url, status=500)
+
+    assert cache.get(f"docs:no-websocket:{document.id}") is None
+    old_path = document.path
+
+    response = client.patch(
+        f"/api/v1.0/documents/{document.id!s}/",
+        {"content": new_content, "websocket": True},
+        format="json",
+    )
+    assert response.status_code == 200
+
+    # Using document.refresh_from_db does not work because the content is cached.
+    # Force reloading it by fetching the document from the database.
+    document = models.Document.objects.get(id=document.id)
+    assert document.path == old_path
+    assert document.content == new_content
+    assert cache.get(f"docs:no-websocket:{document.id}") is None
+    assert ws_resp.call_count == 0
+
+
+@responses.activate
+def test_api_documents_patch_feature_flag_disabled(settings):
+    """
+    When the feature flag is disabled, the patch should be applied without any check.
+    """
+    user = factories.UserFactory(with_owned_document=True)
+    client = APIClient()
+    client.force_login(user)
+    session_key = client.session.session_key
+
+    document = factories.DocumentFactory(users=[(user, "editor")])
+    new_content = YDOC_UPDATED_CONTENT_BASE64
+
+    settings.COLLABORATION_API_URL = "http://example.com/"
+    settings.COLLABORATION_SERVER_SECRET = "secret-token"
+    settings.COLLABORATION_WS_NOT_CONNECTED_READY_ONLY = False
+    endpoint_url = (
+        f"{settings.COLLABORATION_API_URL}get-connections/"
+        f"?room={document.id}&sessionKey={session_key}"
+    )
+    ws_resp = responses.get(endpoint_url, status=500)
+
+    assert cache.get(f"docs:no-websocket:{document.id}") is None
+    old_path = document.path
+
+    response = client.patch(
+        f"/api/v1.0/documents/{document.id!s}/",
+        {"content": new_content},
+        format="json",
+    )
+    assert response.status_code == 200
+
+    # Using document.refresh_from_db does not work because the content is cached.
+    # Force reloading it by fetching the document from the database.
+    document = models.Document.objects.get(id=document.id)
+    assert document.path == old_path
+    assert document.content == new_content
+    assert cache.get(f"docs:no-websocket:{document.id}") is None
+    assert ws_resp.call_count == 0
+
+
+@pytest.mark.parametrize("via", VIA)
+def test_api_documents_patch_administrator_or_owner_of_another(via, mock_user_teams):
+    """
+    Being administrator or owner of a document should not grant authorization to patch
+    another document.
+    """
+    user = factories.UserFactory(with_owned_document=True)
+
+    client = APIClient()
+    client.force_login(user)
+
+    document = factories.DocumentFactory()
+    if via == USER:
+        factories.UserDocumentAccessFactory(
+            document=document, user=user, role=random.choice(["administrator", "owner"])
+        )
+    elif via == TEAM:
+        mock_user_teams.return_value = ["lasuite", "unknown"]
+        factories.TeamDocumentAccessFactory(
+            document=document,
+            team="lasuite",
+            role=random.choice(["administrator", "owner"]),
+        )
+
+    other_document = factories.DocumentFactory(title="Old title", link_role="reader")
+    old_document_values = serializers.DocumentSerializer(instance=other_document).data
+    new_content = YDOC_UPDATED_CONTENT_BASE64
+
+    response = client.patch(
+        f"/api/v1.0/documents/{other_document.id!s}/",
+        {"content": new_content},
+        format="json",
+    )
+
+    assert response.status_code == 403
+
+    other_document.refresh_from_db()
+    assert (
+        serializers.DocumentSerializer(instance=other_document).data
+        == old_document_values
+    )
+
+
+def test_api_documents_patch_invalid_content():
+    """
+    Patching a document with a non base64 encoded content should raise a validation error.
+    """
+    user = factories.UserFactory(with_owned_document=True)
+    client = APIClient()
+    client.force_login(user)
+
+    document = factories.DocumentFactory(users=[[user, "owner"]])
+
+    response = client.patch(
+        f"/api/v1.0/documents/{document.id!s}/",
+        {"content": "invalid content"},
+        format="json",
+    )
+    assert response.status_code == 400
+    assert response.json() == {"content": ["Invalid base64 content."]}
+
+
+@responses.activate
+def test_api_documents_patch_empty_body(settings):
+    """
+    Test when data is empty the document should not be updated.
+    The `updated_at` property should not change asserting that no update in the database is made.
+    """
+    user = factories.UserFactory()
+
+    client = APIClient()
+    client.force_login(user)
+    session_key = client.session.session_key
+
+    document = factories.DocumentFactory(users=[(user, "owner")], creator=user)
+    document_updated_at = document.updated_at
+
+    settings.COLLABORATION_API_URL = "http://example.com/"
+    settings.COLLABORATION_SERVER_SECRET = "secret-token"
+    settings.COLLABORATION_WS_NOT_CONNECTED_READY_ONLY = True
+    endpoint_url = (
+        f"{settings.COLLABORATION_API_URL}get-connections/"
+        f"?room={document.id}&sessionKey={session_key}"
+    )
+    ws_resp = responses.get(endpoint_url, json={"count": 3, "exists": True})
+
+    assert cache.get(f"docs:no-websocket:{document.id}") is None
+
+    old_document_values = serializers.DocumentSerializer(instance=document).data
+
+    with patch("core.models.Document.save") as mock_document_save:
+        response = client.patch(
+            f"/api/v1.0/documents/{document.id!s}/",
+            content_type="application/json",
+        )
+    mock_document_save.assert_not_called()
+    assert response.status_code == 200
+
+    document = models.Document.objects.get(id=document.id)
+    new_document_values = serializers.DocumentSerializer(instance=document).data
+    assert new_document_values == old_document_values
+    assert document_updated_at == document.updated_at
+    assert cache.get(f"docs:no-websocket:{document.id}") is None
+    assert ws_resp.call_count == 1

src/backend/core/tests/external_api/test_external_api_documents.py

@@ -0,0 +1,772 @@
+"""
+Tests for the Resource Server API for documents.
+
+Not testing external API endpoints that are already tested in the /api
+because the resource server viewsets inherit from the api viewsets.
+
+"""
+
+from datetime import timedelta
+from io import BytesIO
+from unittest.mock import patch
+
+from django.test import override_settings
+from django.utils import timezone
+
+import pytest
+from rest_framework.test import APIClient
+
+from core import factories, models
+from core.services import mime_types
+
+pytestmark = pytest.mark.django_db
+
+# pylint: disable=unused-argument
+
+
+def test_external_api_documents_retrieve_anonymous_public_standalone():
+    """
+    Anonymous users SHOULD NOT be allowed to retrieve a document from external
+    API if resource server is not enabled.
+    """
+    document = factories.DocumentFactory(link_reach="public")
+
+    response = APIClient().get(f"/external_api/v1.0/documents/{document.id!s}/")
+
+    assert response.status_code == 404
+
+
+def test_external_api_documents_list_connected_not_resource_server():
+    """
+    Connected users SHOULD NOT be allowed to list documents if resource server is not enabled.
+    """
+    user = factories.UserFactory()
+    client = APIClient()
+    client.force_login(user)
+
+    document = factories.DocumentFactory(link_reach=models.LinkReachChoices.RESTRICTED)
+    factories.UserDocumentAccessFactory(document=document, user=user, role="reader")
+
+    response = client.get("/external_api/v1.0/documents/")
+
+    assert response.status_code == 404
+
+
+def test_external_api_documents_list_connected_resource_server(
+    user_token, resource_server_backend, user_specific_sub
+):
+    """Connected users should be allowed to list documents from a resource server."""
+    client = APIClient()
+    client.credentials(HTTP_AUTHORIZATION=f"Bearer {user_token}")
+
+    document = factories.DocumentFactory(link_reach=models.LinkReachChoices.RESTRICTED)
+    factories.UserDocumentAccessFactory(
+        document=document, user=user_specific_sub, role="reader"
+    )
+
+    response = client.get("/external_api/v1.0/documents/")
+
+    assert response.status_code == 200
+
+
+def test_external_api_documents_list_connected_resource_server_with_invalid_token(
+    user_token, resource_server_backend
+):
+    """A user with an invalid sub SHOULD NOT be allowed to retrieve documents
+    from a resource server."""
+    client = APIClient()
+    client.credentials(HTTP_AUTHORIZATION=f"Bearer {user_token}")
+
+    response = client.get("/external_api/v1.0/documents/")
+
+    assert response.status_code == 401
+
+
+def test_external_api_documents_retrieve_connected_resource_server_with_wrong_abilities(
+    user_token, user_specific_sub, resource_server_backend
+):
+    """
+    A user with wrong abilities SHOULD NOT be allowed to retrieve a document from
+    a resource server.
+    """
+
+    client = APIClient()
+    client.credentials(HTTP_AUTHORIZATION=f"Bearer {user_token}")
+
+    document = factories.DocumentFactory(link_reach=models.LinkReachChoices.RESTRICTED)
+
+    response = client.get(f"/external_api/v1.0/documents/{document.id!s}/")
+
+    assert response.status_code == 403
+
+
+def test_external_api_documents_retrieve_connected_resource_server_using_access_token(
+    user_token, resource_server_backend, user_specific_sub
+):
+    """
+    A user with an access token SHOULD be allowed to retrieve a document from
+    a resource server.
+    """
+
+    client = APIClient()
+    client.credentials(HTTP_AUTHORIZATION=f"Bearer {user_token}")
+    document = factories.DocumentFactory(link_reach=models.LinkReachChoices.RESTRICTED)
+    factories.UserDocumentAccessFactory(
+        document=document, user=user_specific_sub, role=models.LinkRoleChoices.READER
+    )
+
+    response = client.get(f"/external_api/v1.0/documents/{document.id!s}/")
+
+    assert response.status_code == 200
+
+
+def test_external_api_documents_create_root_success(
+    user_token, resource_server_backend, user_specific_sub
+):
+    """
+    Users with an access token should be able to create a root document through the resource
+    server and should automatically be declared as the owner of the newly created document.
+    """
+    client = APIClient()
+    client.credentials(HTTP_AUTHORIZATION=f"Bearer {user_token}")
+
+    response = client.post(
+        "/external_api/v1.0/documents/",
+        {
+            "title": "Test Root Document",
+        },
+    )
+
+    assert response.status_code == 201
+
+    data = response.json()
+    document = models.Document.objects.get(id=data["id"])
+
+    assert document.title == "Test Root Document"
+    assert document.creator == user_specific_sub
+    assert document.accesses.filter(role="owner", user=user_specific_sub).exists()
+
+
+def test_external_api_documents_create_subdocument_owner_success(
+    user_token, resource_server_backend, user_specific_sub
+):
+    """
+    Users with an access token SHOULD BE able to create a sub-document through the resource
+    server when they have OWNER permissions on the parent document.
+    The creator is set to the authenticated user, and permissions are inherited
+    from the parent document.
+    """
+    client = APIClient()
+    client.credentials(HTTP_AUTHORIZATION=f"Bearer {user_token}")
+
+    # Create a parent document first
+    parent_document = factories.DocumentFactory(
+        link_reach=models.LinkReachChoices.RESTRICTED,
+        creator=user_specific_sub,
+    )
+    factories.UserDocumentAccessFactory(
+        document=parent_document,
+        user=user_specific_sub,
+        role=models.RoleChoices.OWNER,
+    )
+
+    response = client.post(
+        f"/external_api/v1.0/documents/{parent_document.id}/children/",
+        {
+            "title": "Test Sub Document",
+        },
+    )
+
+    assert response.status_code == 201
+
+    data = response.json()
+    document = models.Document.objects.get(id=data["id"])
+
+    assert document.title == "Test Sub Document"
+    assert document.creator == user_specific_sub
+    assert document.get_parent() == parent_document
+    # Child documents inherit permissions from parent, no direct access needed
+    assert not document.accesses.exists()
+
+
+def test_external_api_documents_create_subdocument_editor_success(
+    user_token, resource_server_backend, user_specific_sub
+):
+    """
+    Users with an access token SHOULD BE able to create a sub-document through the resource
+    server when they have EDITOR permissions on the parent document.
+    Permissions are inherited from the parent document.
+    """
+    client = APIClient()
+    client.credentials(HTTP_AUTHORIZATION=f"Bearer {user_token}")
+
+    # Create a parent document first
+    parent_document = factories.DocumentFactory(
+        link_reach=models.LinkReachChoices.RESTRICTED,
+    )
+    factories.UserDocumentAccessFactory(
+        document=parent_document,
+        user=user_specific_sub,
+        role=models.RoleChoices.EDITOR,
+    )
+
+    response = client.post(
+        f"/external_api/v1.0/documents/{parent_document.id}/children/",
+        {
+            "title": "Test Sub Document",
+        },
+    )
+
+    assert response.status_code == 201
+
+    data = response.json()
+    document = models.Document.objects.get(id=data["id"])
+
+    assert document.title == "Test Sub Document"
+    assert document.creator == user_specific_sub
+    assert document.get_parent() == parent_document
+    # Child documents inherit permissions from parent, no direct access needed
+    assert not document.accesses.exists()
+
+
+def test_external_api_documents_create_subdocument_reader_not_allowed(
+    user_token, resource_server_backend, user_specific_sub
+):
+    """
+    Users with an access token SHOULD NOT be able to create a sub-document through the resource
+    server when they have READER permissions on the parent document.
+    """
+    client = APIClient()
+    client.credentials(HTTP_AUTHORIZATION=f"Bearer {user_token}")
+
+    # Create a parent document first
+    parent_document = factories.DocumentFactory(
+        link_reach=models.LinkReachChoices.RESTRICTED,
+    )
+    factories.UserDocumentAccessFactory(
+        document=parent_document,
+        user=user_specific_sub,
+        role=models.RoleChoices.READER,
+    )
+
+    response = client.post(
+        f"/external_api/v1.0/documents/{parent_document.id}/children/",
+        {
+            "title": "Test Sub Document",
+        },
+    )
+
+    assert response.status_code == 403
+
+
+@patch("core.services.converter_services.Converter.convert")
+def test_external_api_documents_create_with_markdown_file_success(
+    mock_convert, user_token, resource_server_backend, user_specific_sub
+):
+    """
+    Users with an access token should be able to create documents through the resource
+    server by uploading a Markdown file and should automatically be declared as the owner
+    of the newly created document.
+    """
+
+    client = APIClient()
+    client.credentials(HTTP_AUTHORIZATION=f"Bearer {user_token}")
+
+    # Mock the conversion
+    converted_yjs = "base64encodedyjscontent"
+    mock_convert.return_value = converted_yjs
+
+    # Create a fake Markdown file
+    file_content = b"# Test Document\n\nThis is a test."
+    file = BytesIO(file_content)
+    file.name = "readme.md"
+
+    response = client.post(
+        "/external_api/v1.0/documents/",
+        {
+            "file": file,
+        },
+        format="multipart",
+    )
+
+    assert response.status_code == 201
+
+    data = response.json()
+    document = models.Document.objects.get(id=data["id"])
+
+    assert document.title == "readme.md"
+    assert document.content == converted_yjs
+    assert document.accesses.filter(role="owner", user=user_specific_sub).exists()
+
+    # Verify the converter was called correctly
+    mock_convert.assert_called_once_with(
+        file_content,
+        content_type=mime_types.MARKDOWN,
+        accept=mime_types.YJS,
+    )
+
+
+def test_external_api_documents_list_with_multiple_roles(
+    user_token, resource_server_backend, user_specific_sub
+):
+    """
+    List all documents accessible to a user with different roles and verify
+    that associated permissions are correctly returned in the response.
+    """
+    client = APIClient()
+    client.credentials(HTTP_AUTHORIZATION=f"Bearer {user_token}")
+
+    # Create documents with different roles for the user
+    owner_document = factories.DocumentFactory(
+        title="Owner Document",
+        link_reach=models.LinkReachChoices.RESTRICTED,
+        creator=user_specific_sub,
+    )
+    factories.UserDocumentAccessFactory(
+        document=owner_document,
+        user=user_specific_sub,
+        role=models.RoleChoices.OWNER,
+    )
+
+    editor_document = factories.DocumentFactory(
+        title="Editor Document",
+        link_reach=models.LinkReachChoices.RESTRICTED,
+    )
+    factories.UserDocumentAccessFactory(
+        document=editor_document,
+        user=user_specific_sub,
+        role=models.RoleChoices.EDITOR,
+    )
+
+    reader_document = factories.DocumentFactory(
+        title="Reader Document",
+        link_reach=models.LinkReachChoices.RESTRICTED,
+    )
+    factories.UserDocumentAccessFactory(
+        document=reader_document,
+        user=user_specific_sub,
+        role=models.RoleChoices.READER,
+    )
+
+    # Create a document the user should NOT have access to
+    other_document = factories.DocumentFactory(
+        title="Other Document",
+        link_reach=models.LinkReachChoices.RESTRICTED,
+    )
+    other_user = factories.UserFactory()
+    factories.UserDocumentAccessFactory(
+        document=other_document,
+        user=other_user,
+        role=models.RoleChoices.OWNER,
+    )
+
+    response = client.get("/external_api/v1.0/documents/")
+
+    assert response.status_code == 200
+    data = response.json()
+
+    # Verify the response contains results
+    assert "results" in data
+    results = data["results"]
+
+    # Verify user can see exactly 3 documents (owner, editor, reader)
+    result_ids = {result["id"] for result in results}
+    assert len(results) == 3
+    assert str(owner_document.id) in result_ids
+    assert str(editor_document.id) in result_ids
+    assert str(reader_document.id) in result_ids
+    assert str(other_document.id) not in result_ids
+
+    # Verify each document has correct user_role field indicating permission level
+    for result in results:
+        if result["id"] == str(owner_document.id):
+            assert result["title"] == "Owner Document"
+            assert result["user_role"] == models.RoleChoices.OWNER
+        elif result["id"] == str(editor_document.id):
+            assert result["title"] == "Editor Document"
+            assert result["user_role"] == models.RoleChoices.EDITOR
+        elif result["id"] == str(reader_document.id):
+            assert result["title"] == "Reader Document"
+            assert result["user_role"] == models.RoleChoices.READER
+
+
+def test_external_api_documents_duplicate_allowed(
+    user_token, resource_server_backend, user_specific_sub
+):
+    """
+    Connected users CAN DUPLICATE a document from a resource server
+    when they have the required permissions on the document,
+    as this action bypasses the permission checks.
+    """
+    client = APIClient()
+    client.credentials(HTTP_AUTHORIZATION=f"Bearer {user_token}")
+
+    document = factories.DocumentFactory(
+        link_reach=models.LinkReachChoices.RESTRICTED,
+        creator=user_specific_sub,
+    )
+    factories.UserDocumentAccessFactory(
+        document=document,
+        user=user_specific_sub,
+        role=models.RoleChoices.OWNER,
+    )
+
+    response = client.post(
+        f"/external_api/v1.0/documents/{document.id!s}/duplicate/",
+    )
+
+    assert response.status_code == 201
+
+
+# NOT allowed actions on resource server.
+
+
+def test_external_api_documents_put_not_allowed(
+    user_token, resource_server_backend, user_specific_sub
+):
+    """
+    Connected users SHOULD NOT be allowed to PUT a document from a resource server.
+    """
+    client = APIClient()
+    client.credentials(HTTP_AUTHORIZATION=f"Bearer {user_token}")
+
+    document = factories.DocumentFactory(
+        link_reach=models.LinkReachChoices.RESTRICTED,
+        creator=user_specific_sub,
+    )
+    factories.UserDocumentAccessFactory(
+        document=document,
+        user=user_specific_sub,
+        role=models.RoleChoices.OWNER,
+    )
+
+    response = client.put(
+        f"/external_api/v1.0/documents/{document.id!s}/", {"title": "new title"}
+    )
+
+    assert response.status_code == 403
+
+
+def test_external_api_document_delete_not_allowed(
+    user_token, resource_server_backend, user_specific_sub
+):
+    """
+    Connected users SHOULD NOT be allowed to delete a document from a resource server.
+    """
+    client = APIClient()
+    client.credentials(HTTP_AUTHORIZATION=f"Bearer {user_token}")
+
+    document = factories.DocumentFactory(
+        link_reach=models.LinkReachChoices.RESTRICTED,
+        creator=user_specific_sub,
+    )
+    factories.UserDocumentAccessFactory(
+        document=document,
+        user=user_specific_sub,
+        role=models.RoleChoices.OWNER,
+    )
+
+    response = client.delete(f"/external_api/v1.0/documents/{document.id!s}/")
+
+    assert response.status_code == 403
+
+
+def test_external_api_documents_move_not_allowed(
+    user_token, resource_server_backend, user_specific_sub
+):
+    """
+    Connected users SHOULD NOT be allowed to MOVE a document from a resource server.
+    """
+    client = APIClient()
+    client.credentials(HTTP_AUTHORIZATION=f"Bearer {user_token}")
+
+    document = factories.DocumentFactory(
+        link_reach=models.LinkReachChoices.RESTRICTED,
+        creator=user_specific_sub,
+    )
+    factories.UserDocumentAccessFactory(
+        document=document,
+        user=user_specific_sub,
+        role=models.RoleChoices.OWNER,
+    )
+
+    new_parent = factories.DocumentFactory(
+        link_reach=models.LinkReachChoices.RESTRICTED,
+        creator=user_specific_sub,
+    )
+    factories.UserDocumentAccessFactory(
+        document=new_parent,
+        user=user_specific_sub,
+        role=models.RoleChoices.OWNER,
+    )
+
+    response = client.post(
+        f"/external_api/v1.0/documents/{document.id!s}/move/",
+        {"target_document_id": new_parent.id},
+    )
+
+    assert response.status_code == 403
+
+
+def test_external_api_documents_restore_not_allowed(
+    user_token, resource_server_backend, user_specific_sub
+):
+    """
+    Connected users SHOULD NOT be allowed to restore a document from a resource server.
+    """
+    client = APIClient()
+    client.credentials(HTTP_AUTHORIZATION=f"Bearer {user_token}")
+
+    document = factories.DocumentFactory(
+        link_reach=models.LinkReachChoices.RESTRICTED,
+        creator=user_specific_sub,
+    )
+    factories.UserDocumentAccessFactory(
+        document=document,
+        user=user_specific_sub,
+        role=models.RoleChoices.OWNER,
+    )
+
+    response = client.post(f"/external_api/v1.0/documents/{document.id!s}/restore/")
+
+    assert response.status_code == 403
+
+
+@pytest.mark.parametrize("role", models.LinkRoleChoices.values)
+@pytest.mark.parametrize("reach", models.LinkReachChoices.values)
+def test_external_api_documents_trashbin_not_allowed(
+    role, reach, user_token, resource_server_backend, user_specific_sub
+):
+    """
+    Connected users SHOULD NOT be allowed to list documents from the trashbin,
+    regardless of the document link reach and user role, from a resource server.
+    """
+    client = APIClient()
+    client.credentials(HTTP_AUTHORIZATION=f"Bearer {user_token}")
+
+    document = factories.DocumentFactory(
+        link_reach=reach,
+        creator=user_specific_sub,
+        deleted_at=timezone.now(),
+    )
+    factories.UserDocumentAccessFactory(
+        document=document,
+        user=user_specific_sub,
+        role=role,
+    )
+
+    response = client.get("/external_api/v1.0/documents/trashbin/")
+
+    assert response.status_code == 403
+
+
+def test_external_api_documents_create_for_owner_not_allowed():
+    """
+    Authenticated users SHOULD NOT be allowed to call create documents
+    on behalf of other users.
+    This API endpoint is reserved for server-to-server calls.
+    """
+    user = factories.UserFactory()
+
+    client = APIClient()
+    client.force_login(user)
+
+    data = {
+        "title": "My Document",
+        "content": "Document content",
+        "sub": "123",
+        "email": "john.doe@example.com",
+    }
+
+    response = client.post(
+        "/external_api/v1.0/documents/create-for-owner/",
+        data,
+        format="json",
+    )
+
+    assert response.status_code == 401
+    assert not models.Document.objects.exists()
+
+
+# Test overrides
+
+
+@override_settings(
+    EXTERNAL_API={
+        "documents": {
+            "enabled": True,
+            "actions": ["list", "retrieve", "children", "trashbin"],
+        },
+    }
+)
+def test_external_api_documents_trashbin_can_be_allowed(
+    user_token, resource_server_backend, user_specific_sub
+):
+    """
+    Connected users SHOULD be allowed to list soft deleted documents from a resource server
+    when the trashbin action is enabled in EXTERNAL_API settings.
+    """
+    client = APIClient()
+    client.credentials(HTTP_AUTHORIZATION=f"Bearer {user_token}")
+
+    document = factories.DocumentFactory(link_reach=models.LinkReachChoices.RESTRICTED)
+    factories.UserDocumentAccessFactory(
+        document=document, user=user_specific_sub, role=models.RoleChoices.OWNER
+    )
+    document.soft_delete()
+
+    response = client.get("/external_api/v1.0/documents/trashbin/")
+
+    assert response.status_code == 200
+
+    content = response.json()
+    results = content.pop("results")
+    assert content == {
+        "count": 1,
+        "next": None,
+        "previous": None,
+    }
+    assert len(results) == 1
+
+
+@override_settings(
+    EXTERNAL_API={
+        "documents": {
+            "enabled": True,
+            "actions": ["list", "retrieve", "children", "destroy"],
+        },
+    }
+)
+def test_external_api_documents_delete_can_be_allowed(
+    user_token, resource_server_backend, user_specific_sub
+):
+    """
+    Connected users SHOULD be allowed to delete a document from a resource server
+    when the delete action is enabled in EXTERNAL_API settings.
+    """
+    client = APIClient()
+    client.credentials(HTTP_AUTHORIZATION=f"Bearer {user_token}")
+
+    document = factories.DocumentFactory(link_reach=models.LinkReachChoices.RESTRICTED)
+    factories.UserDocumentAccessFactory(
+        document=document, user=user_specific_sub, role=models.RoleChoices.OWNER
+    )
+
+    response = client.delete(f"/external_api/v1.0/documents/{document.id!s}/")
+
+    assert response.status_code == 204
+    # Verify the document is soft deleted
+    document.refresh_from_db()
+    assert document.deleted_at is not None
+
+
+@override_settings(
+    EXTERNAL_API={
+        "documents": {
+            "enabled": True,
+            "actions": [
+                "list",
+                "retrieve",
+                "children",
+                "update",
+            ],
+        },
+    }
+)
+def test_external_api_documents_update_can_be_allowed(
+    user_token, resource_server_backend, user_specific_sub
+):
+    """
+    Connected users SHOULD be allowed to update a document from a resource server
+    when the update action is enabled in EXTERNAL_API settings.
+    """
+    client = APIClient()
+    client.credentials(HTTP_AUTHORIZATION=f"Bearer {user_token}")
+
+    document = factories.DocumentFactory(link_reach=models.LinkReachChoices.RESTRICTED)
+    factories.UserDocumentAccessFactory(
+        document=document, user=user_specific_sub, role=models.RoleChoices.OWNER
+    )
+
+    original_title = document.title
+    response = client.put(
+        f"/external_api/v1.0/documents/{document.id!s}/", {"title": "new title"}
+    )
+
+    assert response.status_code == 200
+    # Verify the document is updated
+    document.refresh_from_db()
+    assert document.title == "new title"
+    assert document.title != original_title
+
+
+@override_settings(
+    EXTERNAL_API={
+        "documents": {
+            "enabled": True,
+            "actions": ["list", "retrieve", "children", "move"],
+        },
+    }
+)
+def test_external_api_documents_move_can_be_allowed(
+    user_token, resource_server_backend, user_specific_sub
+):
+    """
+    Connected users SHOULD be allowed to move a document from a resource server
+    when the move action is enabled in EXTERNAL_API settings and they
+    have the required permissions on the document and the target location.
+    """
+    client = APIClient()
+    client.credentials(HTTP_AUTHORIZATION=f"Bearer {user_token}")
+
+    parent = factories.DocumentFactory(
+        users=[(user_specific_sub, "owner")], teams=[("lasuite", "owner")]
+    )
+    # A document with no owner
+    document = factories.DocumentFactory(
+        parent=parent, users=[(user_specific_sub, "reader")]
+    )
+    target = factories.DocumentFactory()
+
+    response = client.post(
+        f"/external_api/v1.0/documents/{document.id!s}/move/",
+        data={"target_document_id": str(target.id), "position": "first-sibling"},
+    )
+
+    assert response.status_code == 200
+    assert response.json() == {"message": "Document moved successfully."}
+
+
+@override_settings(
+    EXTERNAL_API={
+        "documents": {
+            "enabled": True,
+            "actions": ["list", "retrieve", "children", "restore"],
+        },
+    }
+)
+def test_external_api_documents_restore_can_be_allowed(
+    user_token, resource_server_backend, user_specific_sub
+):
+    """
+    Connected users SHOULD be allowed to restore a recently soft-deleted document
+    from a resource server when the restore action is enabled in EXTERNAL_API
+    settings and they have the required permissions on the document.
+    """
+    client = APIClient()
+    client.credentials(HTTP_AUTHORIZATION=f"Bearer {user_token}")
+
+    now = timezone.now() - timedelta(days=15)
+    document = factories.DocumentFactory(deleted_at=now)
+    factories.UserDocumentAccessFactory(
+        document=document, user=user_specific_sub, role="owner"
+    )
+
+    response = client.post(f"/external_api/v1.0/documents/{document.id!s}/restore/")
+
+    assert response.status_code == 200
+    assert response.json() == {"detail": "Document has been successfully restored."}
+
+    document.refresh_from_db()
+    assert document.deleted_at is None
+    assert document.ancestors_deleted_at is None

src/backend/core/tests/external_api/test_external_api_documents_accesses.py

@@ -0,0 +1,681 @@
+"""
+Tests for the Resource Server API for documents accesses.
+
+Not testing external API endpoints that are already tested in the /api
+because the resource server viewsets inherit from the api viewsets.
+
+"""
+
+from django.test import override_settings
+
+import pytest
+import responses
+from rest_framework.test import APIClient
+
+from core import factories, models
+from core.api import serializers
+from core.tests.utils.urls import reload_urls
+
+pytestmark = pytest.mark.django_db
+
+# pylint: disable=unused-argument
+
+
+def test_external_api_document_accesses_anonymous_public_standalone():
+    """
+    Anonymous users SHOULD NOT be allowed to list document accesses
+    from external API if resource server is not enabled.
+    """
+    document = factories.DocumentFactory(
+        link_reach=models.LinkReachChoices.RESTRICTED,
+    )
+
+    response = APIClient().get(
+        f"/external_api/v1.0/documents/{document.id!s}/accesses/"
+    )
+
+    assert response.status_code == 404
+
+
+def test_external_api_document_accesses_list_connected_not_resource_server():
+    """
+    Connected users SHOULD NOT be allowed to list document accesses
+    if resource server is not enabled.
+    """
+    user = factories.UserFactory()
+    client = APIClient()
+    client.force_login(user)
+
+    document = factories.DocumentFactory(link_reach=models.LinkReachChoices.RESTRICTED)
+
+    response = APIClient().get(
+        f"/external_api/v1.0/documents/{document.id!s}/accesses/"
+    )
+
+    assert response.status_code == 404
+
+
+@override_settings(
+    EXTERNAL_API={
+        "documents": {
+            "enabled": True,
+            "actions": [
+                "list",
+                "retrieve",
+                "children",
+            ],
+        },
+        "document_access": {
+            "enabled": True,
+            "actions": [],
+        },
+    }
+)
+def test_external_api_document_accesses_list_not_allowed(
+    user_token, resource_server_backend, user_specific_sub
+):
+    """
+    Connected users SHOULD NOT be allowed to list the accesses of
+    a document from a resource server.
+    """
+    reload_urls()
+    client = APIClient()
+    client.credentials(HTTP_AUTHORIZATION=f"Bearer {user_token}")
+
+    document = factories.DocumentFactory(
+        link_reach=models.LinkReachChoices.RESTRICTED,
+        creator=user_specific_sub,
+    )
+    factories.UserDocumentAccessFactory(
+        document=document,
+        user=user_specific_sub,
+        role=models.RoleChoices.OWNER,
+    )
+
+    response = client.get(f"/external_api/v1.0/documents/{document.id!s}/accesses/")
+
+    assert response.status_code == 403
+
+
+@override_settings(
+    EXTERNAL_API={
+        "documents": {
+            "enabled": True,
+            "actions": [
+                "list",
+                "retrieve",
+                "children",
+            ],
+        },
+        "document_access": {
+            "enabled": True,
+            "actions": [],
+        },
+    }
+)
+def test_external_api_document_accesses_retrieve_not_allowed(
+    user_token, resource_server_backend, user_specific_sub
+):
+    """
+    Connected users SHOULD NOT be allowed to retrieve a specific access of
+    a document from a resource server.
+    """
+    reload_urls()
+
+    client = APIClient()
+    client.credentials(HTTP_AUTHORIZATION=f"Bearer {user_token}")
+
+    document = factories.DocumentFactory(
+        link_reach=models.LinkReachChoices.RESTRICTED,
+        creator=user_specific_sub,
+    )
+    factories.UserDocumentAccessFactory(
+        document=document,
+        user=user_specific_sub,
+        role=models.RoleChoices.OWNER,
+    )
+
+    access = factories.UserDocumentAccessFactory(document=document)
+
+    response = client.get(
+        f"/external_api/v1.0/documents/{document.id!s}/accesses/{access.id!s}/"
+    )
+
+    assert response.status_code == 403
+
+
+@override_settings(
+    EXTERNAL_API={
+        "documents": {
+            "enabled": True,
+            "actions": [
+                "list",
+                "retrieve",
+                "children",
+            ],
+        },
+        "document_access": {
+            "enabled": True,
+            "actions": [],
+        },
+    }
+)
+def test_external_api_documents_accesses_create_not_allowed(
+    user_token, resource_server_backend, user_specific_sub
+):
+    """
+    Connected users SHOULD NOT be allowed to create an access for a document
+    from a resource server.
+    """
+    reload_urls()
+
+    client = APIClient()
+    client.credentials(HTTP_AUTHORIZATION=f"Bearer {user_token}")
+
+    document = factories.DocumentFactory(
+        link_reach=models.LinkReachChoices.RESTRICTED,
+        creator=user_specific_sub,
+    )
+    factories.UserDocumentAccessFactory(
+        document=document,
+        user=user_specific_sub,
+        role=models.RoleChoices.OWNER,
+    )
+
+    other_user = factories.UserFactory()
+
+    response = client.post(
+        f"/external_api/v1.0/documents/{document.id!s}/accesses/",
+        {"user_id": other_user.id, "role": models.RoleChoices.READER},
+    )
+
+    assert response.status_code == 403
+
+
+@override_settings(
+    EXTERNAL_API={
+        "documents": {
+            "enabled": True,
+            "actions": [
+                "list",
+                "retrieve",
+                "children",
+            ],
+        },
+        "document_access": {
+            "enabled": True,
+            "actions": [],
+        },
+    }
+)
+def test_external_api_document_accesses_update_not_allowed(
+    user_token, resource_server_backend, user_specific_sub
+):
+    """
+    Connected users SHOULD NOT be allowed to update an access for a
+    document from a resource server through PUT.
+    """
+    reload_urls()
+
+    client = APIClient()
+    client.credentials(HTTP_AUTHORIZATION=f"Bearer {user_token}")
+
+    document = factories.DocumentFactory(
+        link_reach=models.LinkReachChoices.RESTRICTED,
+        creator=user_specific_sub,
+    )
+    factories.UserDocumentAccessFactory(
+        document=document,
+        user=user_specific_sub,
+        role=models.RoleChoices.OWNER,
+    )
+
+    other_user = factories.UserFactory()
+    access = factories.UserDocumentAccessFactory(
+        document=document, user=other_user, role=models.RoleChoices.READER
+    )
+
+    response = client.put(
+        f"/external_api/v1.0/documents/{document.id!s}/accesses/{access.id!s}/",
+        {"role": models.RoleChoices.EDITOR},
+    )
+
+    assert response.status_code == 403
+
+
+@override_settings(
+    EXTERNAL_API={
+        "documents": {
+            "enabled": True,
+            "actions": [
+                "list",
+                "retrieve",
+                "children",
+            ],
+        },
+        "document_access": {
+            "enabled": True,
+            "actions": [],
+        },
+    }
+)
+def test_external_api_document_accesses_partial_update_not_allowed(
+    user_token, resource_server_backend, user_specific_sub
+):
+    """
+    Connected users SHOULD NOT be allowed to update an access
+    for a document from a resource server through PATCH.
+    """
+    reload_urls()
+
+    client = APIClient()
+    client.credentials(HTTP_AUTHORIZATION=f"Bearer {user_token}")
+
+    document = factories.DocumentFactory(
+        link_reach=models.LinkReachChoices.RESTRICTED,
+        creator=user_specific_sub,
+    )
+    factories.UserDocumentAccessFactory(
+        document=document,
+        user=user_specific_sub,
+        role=models.RoleChoices.OWNER,
+    )
+
+    other_user = factories.UserFactory()
+    access = factories.UserDocumentAccessFactory(
+        document=document, user=other_user, role=models.RoleChoices.READER
+    )
+
+    response = client.patch(
+        f"/external_api/v1.0/documents/{document.id!s}/accesses/{access.id!s}/",
+        {"role": models.RoleChoices.EDITOR},
+    )
+
+    assert response.status_code == 403
+
+
+@override_settings(
+    EXTERNAL_API={
+        "documents": {
+            "enabled": True,
+            "actions": [
+                "list",
+                "retrieve",
+                "children",
+            ],
+        },
+        "document_access": {
+            "enabled": True,
+            "actions": [],
+        },
+    }
+)
+def test_external_api_documents_accesses_delete_not_allowed(
+    user_token, resource_server_backend, user_specific_sub
+):
+    """
+    Connected users SHOULD NOT be allowed to delete an access for
+    a document from a resource server.
+    """
+    reload_urls()
+
+    client = APIClient()
+    client.credentials(HTTP_AUTHORIZATION=f"Bearer {user_token}")
+
+    document = factories.DocumentFactory(
+        link_reach=models.LinkReachChoices.RESTRICTED,
+        creator=user_specific_sub,
+    )
+    access = factories.UserDocumentAccessFactory(
+        document=document,
+        user=user_specific_sub,
+        role=models.RoleChoices.OWNER,
+    )
+
+    response = client.delete(
+        f"/external_api/v1.0/documents/{document.id!s}/accesses/{access.id!s}/",
+    )
+
+    assert response.status_code == 403
+
+
+# Overrides
+
+
+@override_settings(
+    EXTERNAL_API={
+        "documents": {
+            "enabled": True,
+            "actions": [
+                "list",
+                "retrieve",
+                "children",
+            ],
+        },
+        "document_access": {
+            "enabled": True,
+            "actions": ["list", "retrieve"],
+        },
+    }
+)
+def test_external_api_document_accesses_list_can_be_allowed(
+    user_token, resource_server_backend, user_specific_sub
+):
+    """
+    Connected users SHOULD be allowed to list the accesses of a document from a resource server
+    when the list action is enabled in EXTERNAL_API document_access settings.
+    """
+
+    reload_urls()
+    client = APIClient()
+    client.credentials(HTTP_AUTHORIZATION=f"Bearer {user_token}")
+
+    document = factories.DocumentFactory(
+        link_reach=models.LinkReachChoices.RESTRICTED, creator=user_specific_sub
+    )
+    user_access = factories.UserDocumentAccessFactory(
+        document=document, user=user_specific_sub, role=models.RoleChoices.OWNER
+    )
+    # Create additional accesses
+    other_user = factories.UserFactory()
+    other_access = factories.UserDocumentAccessFactory(
+        document=document, user=other_user, role=models.RoleChoices.READER
+    )
+
+    response = client.get(f"/external_api/v1.0/documents/{document.id!s}/accesses/")
+
+    assert response.status_code == 200
+    data = response.json()
+
+    access_ids = [entry["id"] for entry in data]
+    assert str(user_access.id) in access_ids
+    assert str(other_access.id) in access_ids
+
+
+@override_settings(
+    EXTERNAL_API={
+        "documents": {
+            "enabled": True,
+            "actions": [
+                "list",
+                "retrieve",
+                "children",
+            ],
+        },
+        "document_access": {
+            "enabled": True,
+            "actions": ["list", "retrieve"],
+        },
+    }
+)
+def test_external_api_document_accesses_retrieve_can_be_allowed(
+    user_token,
+    resource_server_backend,
+    user_specific_sub,
+):
+    """
+    A user who is related to a document SHOULD be allowed to retrieve the
+    associated document user accesses.
+    """
+    reload_urls()
+
+    client = APIClient()
+    client.credentials(HTTP_AUTHORIZATION=f"Bearer {user_token}")
+
+    document = factories.DocumentFactory()
+    access = factories.UserDocumentAccessFactory(
+        document=document, user=user_specific_sub, role=models.RoleChoices.OWNER
+    )
+
+    response = client.get(
+        f"/external_api/v1.0/documents/{document.id!s}/accesses/{access.id!s}/",
+    )
+    data = response.json()
+
+    assert response.status_code == 200
+    assert data["id"] == str(access.id)
+
+
+@override_settings(
+    EXTERNAL_API={
+        "documents": {
+            "enabled": True,
+            "actions": [
+                "list",
+                "retrieve",
+                "children",
+            ],
+        },
+        "document_access": {
+            "enabled": True,
+            "actions": ["list", "create"],
+        },
+    }
+)
+def test_external_api_document_accesses_create_can_be_allowed(
+    user_token,
+    resource_server_backend,
+    user_specific_sub,
+):
+    """
+    A user who is related to a document SHOULD be allowed to create
+    a user access for the document.
+    """
+    reload_urls()
+
+    client = APIClient()
+    client.credentials(HTTP_AUTHORIZATION=f"Bearer {user_token}")
+
+    document = factories.DocumentFactory()
+    factories.UserDocumentAccessFactory(
+        document=document, user=user_specific_sub, role=models.RoleChoices.OWNER
+    )
+
+    other_user = factories.UserFactory()
+
+    response = client.post(
+        f"/external_api/v1.0/documents/{document.id!s}/accesses/",
+        data={"user_id": other_user.id, "role": models.RoleChoices.READER},
+    )
+    data = response.json()
+
+    assert response.status_code == 201
+    assert data["role"] == models.RoleChoices.READER
+    assert str(data["user"]["id"]) == str(other_user.id)
+
+
+@override_settings(
+    EXTERNAL_API={
+        "documents": {
+            "enabled": True,
+            "actions": [
+                "list",
+                "retrieve",
+                "children",
+            ],
+        },
+        "document_access": {
+            "enabled": True,
+            "actions": ["list", "update"],
+        },
+    }
+)
+def test_external_api_document_accesses_update_can_be_allowed(
+    user_token,
+    resource_server_backend,
+    user_specific_sub,
+    settings,
+):
+    """
+    A user who is related to a document SHOULD be allowed to update
+    a user access for the document through PUT.
+    """
+    reload_urls()
+
+    client = APIClient()
+    client.credentials(HTTP_AUTHORIZATION=f"Bearer {user_token}")
+
+    document = factories.DocumentFactory()
+    factories.UserDocumentAccessFactory(
+        document=document, user=user_specific_sub, role=models.RoleChoices.OWNER
+    )
+
+    other_user = factories.UserFactory()
+    access = factories.UserDocumentAccessFactory(
+        document=document, user=other_user, role=models.RoleChoices.READER
+    )
+
+    # Add the reset-connections endpoint to the existing mock
+    settings.COLLABORATION_API_URL = "http://example.com/"
+    settings.COLLABORATION_SERVER_SECRET = "secret-token"
+    endpoint_url = (
+        f"{settings.COLLABORATION_API_URL}reset-connections/?room={document.id}"
+    )
+    resource_server_backend.add(
+        responses.POST,
+        endpoint_url,
+        json={},
+        status=200,
+    )
+
+    old_values = serializers.DocumentAccessSerializer(instance=access).data
+
+    # Update only the role field
+    response = client.put(
+        f"/external_api/v1.0/documents/{document.id!s}/accesses/{access.id!s}/",
+        {**old_values, "role": models.RoleChoices.EDITOR},  #  type: ignore
+        format="json",
+    )
+
+    assert response.status_code == 200
+    data = response.json()
+    assert data["role"] == models.RoleChoices.EDITOR
+    assert str(data["user"]["id"]) == str(other_user.id)
+
+
+@override_settings(
+    EXTERNAL_API={
+        "documents": {
+            "enabled": True,
+            "actions": [
+                "list",
+                "retrieve",
+                "children",
+            ],
+        },
+        "document_access": {
+            "enabled": True,
+            "actions": ["list", "partial_update"],
+        },
+    }
+)
+def test_external_api_document_accesses_partial_update_can_be_allowed(
+    user_token,
+    resource_server_backend,
+    user_specific_sub,
+    settings,
+):
+    """
+    A user who is related to a document SHOULD be allowed to update
+    a user access for the document through PATCH.
+    """
+    reload_urls()
+
+    client = APIClient()
+    client.credentials(HTTP_AUTHORIZATION=f"Bearer {user_token}")
+
+    document = factories.DocumentFactory()
+    factories.UserDocumentAccessFactory(
+        document=document, user=user_specific_sub, role=models.RoleChoices.OWNER
+    )
+
+    other_user = factories.UserFactory()
+    access = factories.UserDocumentAccessFactory(
+        document=document, user=other_user, role=models.RoleChoices.READER
+    )
+
+    # Add the reset-connections endpoint to the existing mock
+    settings.COLLABORATION_API_URL = "http://example.com/"
+    settings.COLLABORATION_SERVER_SECRET = "secret-token"
+    endpoint_url = (
+        f"{settings.COLLABORATION_API_URL}reset-connections/?room={document.id}"
+    )
+    resource_server_backend.add(
+        responses.POST,
+        endpoint_url,
+        json={},
+        status=200,
+    )
+
+    response = client.patch(
+        f"/external_api/v1.0/documents/{document.id!s}/accesses/{access.id!s}/",
+        data={"role": models.RoleChoices.EDITOR},
+    )
+    data = response.json()
+
+    assert response.status_code == 200
+    assert data["role"] == models.RoleChoices.EDITOR
+    assert str(data["user"]["id"]) == str(other_user.id)
+
+
+@override_settings(
+    EXTERNAL_API={
+        "documents": {
+            "enabled": True,
+            "actions": [
+                "list",
+                "retrieve",
+                "children",
+            ],
+        },
+        "document_access": {
+            "enabled": True,
+            "actions": ["list", "destroy"],
+        },
+    }
+)
+def test_external_api_documents_accesses_delete_can_be_allowed(
+    user_token, resource_server_backend, user_specific_sub, settings
+):
+    """
+    Connected users SHOULD be allowed to delete an access for
+    a document from a resource server when the destroy action is
+    enabled in settings.
+    """
+    reload_urls()
+
+    client = APIClient()
+    client.credentials(HTTP_AUTHORIZATION=f"Bearer {user_token}")
+
+    document = factories.DocumentFactory(
+        link_reach=models.LinkReachChoices.RESTRICTED,
+        creator=user_specific_sub,
+    )
+    factories.UserDocumentAccessFactory(
+        document=document,
+        user=user_specific_sub,
+        role=models.RoleChoices.OWNER,
+    )
+    other_user = factories.UserFactory()
+    other_access = factories.UserDocumentAccessFactory(
+        document=document, user=other_user, role=models.RoleChoices.READER
+    )
+
+    # Add the reset-connections endpoint to the existing mock
+    settings.COLLABORATION_API_URL = "http://example.com/"
+    settings.COLLABORATION_SERVER_SECRET = "secret-token"
+    endpoint_url = (
+        f"{settings.COLLABORATION_API_URL}reset-connections/?room={document.id}"
+    )
+    resource_server_backend.add(
+        responses.POST,
+        endpoint_url,
+        json={},
+        status=200,
+    )
+
+    response = client.delete(
+        f"/external_api/v1.0/documents/{document.id!s}/accesses/{other_access.id!s}/",
+    )
+
+    assert response.status_code == 204

src/backend/core/tests/external_api/test_external_api_documents_ai.py

@@ -0,0 +1,273 @@
+"""
+Tests for the Resource Server API for document AI features.
+
+Not testing external API endpoints that are already tested in the /api
+because the resource server viewsets inherit from the api viewsets.
+
+"""
+
+from unittest.mock import MagicMock, patch
+
+from django.test import override_settings
+
+import pytest
+from rest_framework.test import APIClient
+
+from core import factories, models
+from core.tests.documents.test_api_documents_ai_proxy import (  # pylint: disable=unused-import
+    ai_settings,
+)
+
+pytestmark = pytest.mark.django_db
+
+# pylint: disable=unused-argument
+
+
+def test_external_api_documents_ai_transform_not_allowed(
+    user_token, resource_server_backend, user_specific_sub
+):
+    """
+    Connected users SHOULD NOT be allowed to access AI transform endpoints
+    from a resource server by default.
+    """
+
+    document = factories.DocumentFactory(
+        link_reach=models.LinkReachChoices.RESTRICTED,
+        creator=user_specific_sub,
+    )
+
+    client = APIClient()
+    client.credentials(HTTP_AUTHORIZATION=f"Bearer {user_token}")
+
+    response = client.post(
+        f"/external_api/v1.0/documents/{document.id!s}/ai-transform/",
+        {"text": "hello", "action": "prompt"},
+    )
+
+    assert response.status_code == 403
+    assert response.json() == {
+        "detail": "You do not have permission to perform this action."
+    }
+
+
+def test_external_api_documents_ai_translate_not_allowed(
+    user_token, resource_server_backend, user_specific_sub
+):
+    """
+    Connected users SHOULD NOT be allowed to access AI translate endpoints
+    from a resource server by default.
+    """
+
+    document = factories.DocumentFactory(
+        link_reach=models.LinkReachChoices.RESTRICTED,
+        creator=user_specific_sub,
+    )
+
+    client = APIClient()
+    client.credentials(HTTP_AUTHORIZATION=f"Bearer {user_token}")
+
+    response = client.post(
+        f"/external_api/v1.0/documents/{document.id!s}/ai-translate/",
+        {"text": "hello", "language": "es"},
+    )
+
+    assert response.status_code == 403
+    assert response.json() == {
+        "detail": "You do not have permission to perform this action."
+    }
+
+
+def test_external_api_documents_ai_proxy_not_allowed(
+    user_token, resource_server_backend, user_specific_sub
+):
+    """
+    Connected users SHOULD NOT be allowed to access AI proxy endpoints
+    from a resource server by default.
+    """
+
+    document = factories.DocumentFactory(
+        link_reach=models.LinkReachChoices.RESTRICTED,
+        creator=user_specific_sub,
+    )
+
+    client = APIClient()
+    client.credentials(HTTP_AUTHORIZATION=f"Bearer {user_token}")
+
+    response = client.post(
+        f"/external_api/v1.0/documents/{document.id!s}/ai-proxy/",
+        b"{}",
+        content_type="application/json",
+    )
+
+    assert response.status_code == 403
+    assert response.json() == {
+        "detail": "You do not have permission to perform this action."
+    }
+
+
+# Overrides
+
+
+@override_settings(
+    EXTERNAL_API={
+        "documents": {
+            "enabled": True,
+            "actions": [
+                "list",
+                "retrieve",
+                "children",
+                "ai_transform",
+            ],
+        },
+    }
+)
+@pytest.mark.usefixtures("ai_settings")
+@patch("openai.resources.chat.completions.Completions.create")
+def test_external_api_documents_ai_transform_can_be_allowed(
+    mock_create, user_token, resource_server_backend, user_specific_sub
+):
+    """
+    Users SHOULD be allowed to transform a document using AI when the
+    corresponding action is enabled via EXTERNAL_API settings.
+    """
+    client = APIClient()
+    client.credentials(HTTP_AUTHORIZATION=f"Bearer {user_token}")
+
+    document = factories.DocumentFactory(
+        link_reach=models.LinkReachChoices.RESTRICTED, favorited_by=[user_specific_sub]
+    )
+    factories.UserDocumentAccessFactory(
+        document=document, user=user_specific_sub, role=models.RoleChoices.OWNER
+    )
+
+    mock_create.return_value = MagicMock(
+        choices=[MagicMock(message=MagicMock(content="Salut"))]
+    )
+
+    url = f"/external_api/v1.0/documents/{document.id!s}/ai-transform/"
+    response = client.post(url, {"text": "Hello", "action": "prompt"})
+
+    assert response.status_code == 200
+    assert response.json() == {"answer": "Salut"}
+    # pylint: disable=line-too-long
+    mock_create.assert_called_once_with(
+        model="llama",
+        messages=[
+            {
+                "role": "system",
+                "content": (
+                    "Answer the prompt using markdown formatting for structure and emphasis. "
+                    "Return the content directly without wrapping it in code blocks or markdown delimiters. "
+                    "Preserve the language and markdown formatting. "
+                    "Do not provide any other information. "
+                    "Preserve the language."
+                ),
+            },
+            {"role": "user", "content": "Hello"},
+        ],
+    )
+
+
+@override_settings(
+    EXTERNAL_API={
+        "documents": {
+            "enabled": True,
+            "actions": [
+                "list",
+                "retrieve",
+                "children",
+                "ai_translate",
+            ],
+        },
+    }
+)
+@pytest.mark.usefixtures("ai_settings")
+@patch("openai.resources.chat.completions.Completions.create")
+def test_external_api_documents_ai_translate_can_be_allowed(
+    mock_create, user_token, resource_server_backend, user_specific_sub
+):
+    """
+    Users SHOULD be allowed to translate a document using AI when the
+    corresponding action is enabled via EXTERNAL_API settings.
+    """
+    client = APIClient()
+    client.credentials(HTTP_AUTHORIZATION=f"Bearer {user_token}")
+
+    document = factories.DocumentFactory(
+        link_reach=models.LinkReachChoices.RESTRICTED, favorited_by=[user_specific_sub]
+    )
+    factories.UserDocumentAccessFactory(
+        document=document, user=user_specific_sub, role=models.RoleChoices.OWNER
+    )
+
+    mock_create.return_value = MagicMock(
+        choices=[MagicMock(message=MagicMock(content="Salut"))]
+    )
+
+    url = f"/external_api/v1.0/documents/{document.id!s}/ai-translate/"
+    response = client.post(url, {"text": "Hello", "language": "es-co"})
+
+    assert response.status_code == 200
+    assert response.json() == {"answer": "Salut"}
+    mock_create.assert_called_once_with(
+        model="llama",
+        messages=[
+            {
+                "role": "system",
+                "content": (
+                    "Keep the same html structure and formatting. "
+                    "Translate the content in the html to the "
+                    "specified language Colombian Spanish. "
+                    "Check the translation for accuracy and make any necessary corrections. "
+                    "Do not provide any other information."
+                ),
+            },
+            {"role": "user", "content": "Hello"},
+        ],
+    )
+
+
+@override_settings(
+    EXTERNAL_API={
+        "documents": {
+            "enabled": True,
+            "actions": [
+                "list",
+                "retrieve",
+                "children",
+                "ai_proxy",
+            ],
+        },
+    }
+)
+@pytest.mark.usefixtures("ai_settings")
+@patch("core.services.ai_services.AIService.stream")
+def test_external_api_documents_ai_proxy_can_be_allowed(
+    mock_stream, user_token, resource_server_backend, user_specific_sub
+):
+    """
+    Users SHOULD be allowed to use the AI proxy endpoint when the
+    corresponding action is enabled via EXTERNAL_API settings.
+    """
+    client = APIClient()
+    client.credentials(HTTP_AUTHORIZATION=f"Bearer {user_token}")
+
+    document = factories.DocumentFactory(
+        link_reach=models.LinkReachChoices.RESTRICTED, creator=user_specific_sub
+    )
+    factories.UserDocumentAccessFactory(
+        document=document, user=user_specific_sub, role=models.RoleChoices.OWNER
+    )
+
+    mock_stream.return_value = iter(["data: response\n"])
+
+    url = f"/external_api/v1.0/documents/{document.id!s}/ai-proxy/"
+    response = client.post(
+        url,
+        b"{}",
+        content_type="application/json",
+    )
+
+    assert response.status_code == 200
+    assert response["Content-Type"] == "text/event-stream"  # type: ignore
+    mock_stream.assert_called_once()

src/backend/core/tests/external_api/test_external_api_documents_attachment_upload.py

@@ -0,0 +1,121 @@
+"""
+Tests for the Resource Server API for document attachments.
+
+Not testing external API endpoints that are already tested in the /api
+because the resource server viewsets inherit from the api viewsets.
+
+"""
+
+import re
+import uuid
+from urllib.parse import parse_qs, urlparse
+
+from django.core.files.uploadedfile import SimpleUploadedFile
+from django.test import override_settings
+
+import pytest
+from rest_framework.test import APIClient
+
+from core import factories, models
+
+pytestmark = pytest.mark.django_db
+
+# pylint: disable=unused-argument
+
+
+def test_external_api_documents_attachment_upload_not_allowed(
+    user_token, resource_server_backend, user_specific_sub
+):
+    """
+    Connected users SHOULD NOT be allowed to upload attachments to a document
+    from a resource server.
+    """
+
+    client = APIClient()
+    client.credentials(HTTP_AUTHORIZATION=f"Bearer {user_token}")
+
+    pixel = (
+        b"\x89PNG\r\n\x1a\n\x00\x00\x00\rIHDR\x00\x00\x00\x01\x00\x00\x00\x01\x08\x06\x00"
+        b"\x00\x00\x1f\x15\xc4\x89\x00\x00\x00\nIDATx\x9cc\xf8\xff\xff?\x00\x05\xfe\x02\xfe"
+        b"\xa7V\xbd\xfa\x00\x00\x00\x00IEND\xaeB`\x82"
+    )
+
+    document = factories.DocumentFactory(
+        link_reach=models.LinkReachChoices.RESTRICTED,
+        creator=user_specific_sub,
+    )
+    file = SimpleUploadedFile(name="test.png", content=pixel, content_type="image/png")
+
+    response = client.post(
+        f"/external_api/v1.0/documents/{document.id!s}/attachment-upload/",
+        {"file": file},
+        format="multipart",
+    )
+
+    assert response.status_code == 403
+    assert response.json() == {
+        "detail": "You do not have permission to perform this action."
+    }
+
+
+@override_settings(
+    EXTERNAL_API={
+        "documents": {
+            "enabled": True,
+            "actions": [
+                "list",
+                "retrieve",
+                "children",
+                "attachment_upload",
+            ],
+        },
+    }
+)
+def test_external_api_documents_attachment_upload_can_be_allowed(
+    user_token, resource_server_backend, user_specific_sub
+):
+    """
+    Connected users SHOULD be allowed to upload attachments to a document
+    from a resource server when the attachment-upload action is enabled in EXTERNAL_API settings.
+    """
+
+    client = APIClient()
+    client.credentials(HTTP_AUTHORIZATION=f"Bearer {user_token}")
+
+    pixel = (
+        b"\x89PNG\r\n\x1a\n\x00\x00\x00\rIHDR\x00\x00\x00\x01\x00\x00\x00\x01\x08\x06\x00"
+        b"\x00\x00\x1f\x15\xc4\x89\x00\x00\x00\nIDATx\x9cc\xf8\xff\xff?\x00\x05\xfe\x02\xfe"
+        b"\xa7V\xbd\xfa\x00\x00\x00\x00IEND\xaeB`\x82"
+    )
+
+    document = factories.DocumentFactory(
+        link_reach=models.LinkReachChoices.RESTRICTED,
+        creator=user_specific_sub,
+    )
+    factories.UserDocumentAccessFactory(
+        document=document,
+        user=user_specific_sub,
+        role=models.RoleChoices.OWNER,
+    )
+
+    file = SimpleUploadedFile(name="test.png", content=pixel, content_type="image/png")
+
+    response = client.post(
+        f"/external_api/v1.0/documents/{document.id!s}/attachment-upload/",
+        {"file": file},
+        format="multipart",
+    )
+
+    assert response.status_code == 201
+
+    pattern = re.compile(rf"^{document.id!s}/attachments/(.*)\.png")
+    url_parsed = urlparse(response.json()["file"])
+    assert url_parsed.path == f"/api/v1.0/documents/{document.id!s}/media-check/"
+    query = parse_qs(url_parsed.query)
+    assert query["key"][0] is not None
+    file_path = query["key"][0]
+    match = pattern.search(file_path)
+    file_id = match.group(1)  # type: ignore
+
+    # Validate that file_id is a valid UUID
+    uuid.UUID(file_id)

src/backend/core/tests/external_api/test_external_api_documents_favorite.py

@@ -0,0 +1,157 @@
+"""
+Tests for the Resource Server API for document favorites.
+
+Not testing external API endpoints that are already tested in the /api
+because the resource server viewsets inherit from the api viewsets.
+
+"""
+
+from django.test import override_settings
+
+import pytest
+from rest_framework.test import APIClient
+
+from core import factories, models
+
+pytestmark = pytest.mark.django_db
+
+# pylint: disable=unused-argument
+
+
+def test_external_api_documents_favorites_list_allowed(
+    user_token, resource_server_backend, user_specific_sub
+):
+    """
+    Connected users SHOULD be allowed to list their favorites
+    from a resource server, as favorite_list() bypasses permissions.
+    """
+
+    client = APIClient()
+    client.credentials(HTTP_AUTHORIZATION=f"Bearer {user_token}")
+
+    document = factories.UserDocumentAccessFactory(
+        user=user_specific_sub,
+        role=models.RoleChoices.READER,
+        document__favorited_by=[user_specific_sub],
+    ).document
+
+    response = client.get("/external_api/v1.0/documents/favorite_list/")
+
+    assert response.status_code == 200
+    data = response.json()
+    assert data["count"] == 1
+    assert data["results"][0]["id"] == str(document.id)
+
+
+def test_external_api_documents_favorite_add_not_allowed(
+    user_token, resource_server_backend, user_specific_sub
+):
+    """
+    By default the "favorite" action is not permitted on the external API.
+    POST to the endpoint must return 403.
+    """
+    client = APIClient()
+    client.credentials(HTTP_AUTHORIZATION=f"Bearer {user_token}")
+
+    document = factories.DocumentFactory(link_reach=models.LinkReachChoices.RESTRICTED)
+
+    factories.UserDocumentAccessFactory(
+        document=document, user=user_specific_sub, role=models.RoleChoices.OWNER
+    )
+
+    response = client.post(f"/external_api/v1.0/documents/{document.id!s}/favorite/")
+    assert response.status_code == 403
+
+
+def test_external_api_documents_favorite_delete_not_allowed(
+    user_token, resource_server_backend, user_specific_sub
+):
+    """
+    By default the "favorite" action is not permitted on the external API.
+    DELETE to the endpoint must return 403.
+    """
+    client = APIClient()
+    client.credentials(HTTP_AUTHORIZATION=f"Bearer {user_token}")
+
+    document = factories.DocumentFactory(link_reach=models.LinkReachChoices.RESTRICTED)
+    factories.UserDocumentAccessFactory(
+        document=document, user=user_specific_sub, role=models.RoleChoices.OWNER
+    )
+
+    response = client.delete(f"/external_api/v1.0/documents/{document.id!s}/favorite/")
+    assert response.status_code == 403
+
+
+# Overrides
+
+
+@override_settings(
+    EXTERNAL_API={
+        "documents": {
+            "enabled": True,
+            "actions": [
+                "list",
+                "retrieve",
+                "children",
+                "favorite",
+            ],
+        },
+    }
+)
+def test_external_api_documents_favorite_add_can_be_allowed(
+    user_token, resource_server_backend, user_specific_sub
+):
+    """
+    Users SHOULD be allowed to POST to the favorite endpoint when the
+    corresponding action is enabled via EXTERNAL_API settings.
+    """
+    client = APIClient()
+    client.credentials(HTTP_AUTHORIZATION=f"Bearer {user_token}")
+
+    document = factories.DocumentFactory(link_reach=models.LinkReachChoices.RESTRICTED)
+    factories.UserDocumentAccessFactory(
+        document=document, user=user_specific_sub, role=models.RoleChoices.OWNER
+    )
+
+    response = client.post(f"/external_api/v1.0/documents/{document.id!s}/favorite/")
+    assert response.status_code == 201
+    assert models.DocumentFavorite.objects.filter(
+        document=document, user=user_specific_sub
+    ).exists()
+
+
+@override_settings(
+    EXTERNAL_API={
+        "documents": {
+            "enabled": True,
+            "actions": [
+                "list",
+                "retrieve",
+                "children",
+                "favorite",
+            ],
+        },
+    }
+)
+def test_external_api_documents_favorite_delete_can_be_allowed(
+    user_token, resource_server_backend, user_specific_sub
+):
+    """
+    Users SHOULD be allowed to DELETE from the favorite endpoint when the
+    corresponding action is enabled via EXTERNAL_API settings.
+    """
+    client = APIClient()
+    client.credentials(HTTP_AUTHORIZATION=f"Bearer {user_token}")
+
+    document = factories.DocumentFactory(
+        link_reach=models.LinkReachChoices.RESTRICTED, favorited_by=[user_specific_sub]
+    )
+    factories.UserDocumentAccessFactory(
+        document=document, user=user_specific_sub, role=models.RoleChoices.OWNER
+    )
+
+    response = client.delete(f"/external_api/v1.0/documents/{document.id!s}/favorite/")
+    assert response.status_code == 204
+    assert not models.DocumentFavorite.objects.filter(
+        document=document, user=user_specific_sub
+    ).exists()

src/backend/core/tests/external_api/test_external_api_documents_invitation.py

@@ -0,0 +1,474 @@
+"""
+Tests for the Resource Server API for invitations.
+
+Not testing external API endpoints that are already tested in the /api
+because the resource server viewsets inherit from the api viewsets.
+
+"""
+
+from django.test import override_settings
+
+import pytest
+from rest_framework.test import APIClient
+
+from core import factories, models
+from core.tests.utils.urls import reload_urls
+
+pytestmark = pytest.mark.django_db
+
+# pylint: disable=unused-argument
+
+
+def test_external_api_document_invitations_anonymous_public_standalone():
+    """
+    Anonymous users SHOULD NOT be allowed to list invitations from external
+    API if resource server is not enabled.
+    """
+    invitation = factories.InvitationFactory()
+    response = APIClient().get(
+        f"/external_api/v1.0/documents/{invitation.document.id!s}/invitations/"
+    )
+
+    assert response.status_code == 404
+
+
+def test_external_api_document_invitations_list_connected_not_resource_server():
+    """
+    Connected users SHOULD NOT be allowed to list document invitations
+    if resource server is not enabled.
+    """
+    user = factories.UserFactory()
+    client = APIClient()
+    client.force_login(user)
+
+    invitation = factories.InvitationFactory()
+    response = APIClient().get(
+        f"/external_api/v1.0/documents/{invitation.document.id!s}/invitations/"
+    )
+
+    assert response.status_code == 404
+
+
+@override_settings(
+    EXTERNAL_API={
+        "documents": {
+            "enabled": True,
+            "actions": [
+                "list",
+                "retrieve",
+                "children",
+            ],
+        },
+        "document_invitation": {
+            "enabled": True,
+            "actions": [],
+        },
+    },
+)
+def test_external_api_document_invitations_list_not_allowed(
+    user_token, resource_server_backend, user_specific_sub
+):
+    """
+    Connected users SHOULD NOT be allowed to list document invitations
+    by default.
+    """
+    reload_urls()
+
+    client = APIClient()
+    client.credentials(HTTP_AUTHORIZATION=f"Bearer {user_token}")
+
+    invitation = factories.InvitationFactory()
+    response = client.get(
+        f"/external_api/v1.0/documents/{invitation.document.id!s}/invitations/"
+    )
+
+    assert response.status_code == 403
+
+
+@override_settings(
+    EXTERNAL_API={
+        "documents": {
+            "enabled": True,
+            "actions": [
+                "list",
+                "retrieve",
+                "children",
+            ],
+        },
+        "document_invitation": {
+            "enabled": True,
+            "actions": [],
+        },
+    },
+)
+def test_external_api_document_invitations_retrieve_not_allowed(
+    user_token, resource_server_backend, user_specific_sub
+):
+    """
+    Connected users SHOULD NOT be allowed to retrieve a document invitation
+    by default.
+    """
+    reload_urls()
+
+    client = APIClient()
+    client.credentials(HTTP_AUTHORIZATION=f"Bearer {user_token}")
+
+    invitation = factories.InvitationFactory()
+    document = invitation.document
+
+    response = client.get(
+        f"/external_api/v1.0/documents/{document.id!s}/invitations/{invitation.id!s}/"
+    )
+
+    assert response.status_code == 403
+
+
+@override_settings(
+    EXTERNAL_API={
+        "documents": {
+            "enabled": True,
+            "actions": [
+                "list",
+                "retrieve",
+                "children",
+            ],
+        },
+        "document_invitation": {
+            "enabled": True,
+            "actions": [],
+        },
+    },
+)
+def test_external_api_document_invitations_create_not_allowed(
+    user_token, resource_server_backend, user_specific_sub
+):
+    """
+    Connected users SHOULD NOT be allowed to create a document invitation
+    by default.
+    """
+    reload_urls()
+
+    client = APIClient()
+    client.credentials(HTTP_AUTHORIZATION=f"Bearer {user_token}")
+
+    document = factories.DocumentFactory()
+    factories.UserDocumentAccessFactory(
+        document=document, user=user_specific_sub, role=models.RoleChoices.OWNER
+    )
+
+    response = client.post(
+        f"/external_api/v1.0/documents/{document.id!s}/invitations/",
+        {"email": "invited@example.com", "role": models.RoleChoices.READER},
+        format="json",
+    )
+
+    assert response.status_code == 403
+
+
+@override_settings(
+    EXTERNAL_API={
+        "documents": {
+            "enabled": True,
+            "actions": [
+                "list",
+                "retrieve",
+                "children",
+            ],
+        },
+        "document_invitation": {
+            "enabled": True,
+            "actions": ["list", "retrieve"],
+        },
+    },
+)
+def test_external_api_document_invitations_partial_update_not_allowed(
+    user_token, resource_server_backend, user_specific_sub
+):
+    """
+    Connected users SHOULD NOT be allowed to partially update a document invitation
+    by default.
+    """
+    reload_urls()
+
+    client = APIClient()
+    client.credentials(HTTP_AUTHORIZATION=f"Bearer {user_token}")
+
+    document = factories.DocumentFactory()
+    factories.UserDocumentAccessFactory(
+        document=document, user=user_specific_sub, role=models.RoleChoices.OWNER
+    )
+    invitation = factories.InvitationFactory(
+        document=document, role=models.RoleChoices.READER
+    )
+
+    response = client.patch(
+        f"/external_api/v1.0/documents/{document.id!s}/invitations/{invitation.id!s}/",
+        {"role": models.RoleChoices.EDITOR},
+        format="json",
+    )
+
+    assert response.status_code == 403
+
+
+@override_settings(
+    EXTERNAL_API={
+        "documents": {
+            "enabled": True,
+            "actions": [
+                "list",
+                "retrieve",
+                "children",
+            ],
+        },
+        "document_invitation": {
+            "enabled": True,
+            "actions": ["list", "retrieve"],
+        },
+    },
+)
+def test_external_api_document_invitations_delete_not_allowed(
+    user_token, resource_server_backend, user_specific_sub
+):
+    """
+    Connected users SHOULD NOT be allowed to delete a document invitation
+    by default.
+    """
+    reload_urls()
+
+    client = APIClient()
+    client.credentials(HTTP_AUTHORIZATION=f"Bearer {user_token}")
+
+    document = factories.DocumentFactory()
+    factories.UserDocumentAccessFactory(
+        document=document, user=user_specific_sub, role=models.RoleChoices.OWNER
+    )
+    invitation = factories.InvitationFactory(document=document)
+
+    response = client.delete(
+        f"/external_api/v1.0/documents/{document.id!s}/invitations/{invitation.id!s}/",
+    )
+
+    assert response.status_code == 403
+
+
+# Overrides
+
+
+@override_settings(
+    EXTERNAL_API={
+        "documents": {
+            "enabled": True,
+            "actions": [
+                "list",
+                "retrieve",
+                "children",
+            ],
+        },
+        "document_invitation": {
+            "enabled": True,
+            "actions": ["list", "retrieve"],
+        },
+    },
+)
+def test_external_api_document_invitations_list_can_be_allowed(
+    user_token, resource_server_backend, user_specific_sub
+):
+    """
+    Connected users SHOULD be allowed to list document invitations
+    when the action is explicitly enabled.
+
+    """
+    reload_urls()
+
+    client = APIClient()
+    client.credentials(HTTP_AUTHORIZATION=f"Bearer {user_token}")
+
+    document = factories.DocumentFactory()
+    factories.UserDocumentAccessFactory(
+        document=document, user=user_specific_sub, role=models.RoleChoices.OWNER
+    )
+    invitation = factories.InvitationFactory(document=document)
+    response = client.get(f"/external_api/v1.0/documents/{document.id!s}/invitations/")
+
+    assert response.status_code == 200
+    data = response.json()
+    assert data["count"] == 1
+    assert data["results"][0]["id"] == str(invitation.id)
+
+
+@override_settings(
+    EXTERNAL_API={
+        "documents": {
+            "enabled": True,
+            "actions": [
+                "list",
+                "retrieve",
+                "children",
+            ],
+        },
+        "document_invitation": {
+            "enabled": True,
+            "actions": ["list", "retrieve"],
+        },
+    },
+)
+def test_external_api_document_invitations_retrieve_can_be_allowed(
+    user_token, resource_server_backend, user_specific_sub
+):
+    """
+    Connected users SHOULD be allowed to retrieve a document invitation
+    when the action is explicitly enabled.
+    """
+    reload_urls()
+
+    client = APIClient()
+    client.credentials(HTTP_AUTHORIZATION=f"Bearer {user_token}")
+
+    document = factories.DocumentFactory()
+    factories.UserDocumentAccessFactory(
+        document=document, user=user_specific_sub, role=models.RoleChoices.OWNER
+    )
+    invitation = factories.InvitationFactory(document=document)
+
+    response = client.get(
+        f"/external_api/v1.0/documents/{document.id!s}/invitations/{invitation.id!s}/"
+    )
+
+    assert response.status_code == 200
+    data = response.json()
+    assert data["id"] == str(invitation.id)
+
+
+@override_settings(
+    EXTERNAL_API={
+        "documents": {
+            "enabled": True,
+            "actions": [
+                "list",
+                "retrieve",
+                "children",
+            ],
+        },
+        "document_invitation": {
+            "enabled": True,
+            "actions": ["list", "retrieve", "create"],
+        },
+    },
+)
+def test_external_api_document_invitations_create_can_be_allowed(
+    user_token, resource_server_backend, user_specific_sub
+):
+    """
+    Connected users SHOULD be allowed to create a document invitation
+    when the create action is explicitly enabled.
+    """
+    reload_urls()
+
+    client = APIClient()
+    client.credentials(HTTP_AUTHORIZATION=f"Bearer {user_token}")
+
+    document = factories.DocumentFactory()
+    factories.UserDocumentAccessFactory(
+        document=document, user=user_specific_sub, role=models.RoleChoices.OWNER
+    )
+
+    response = client.post(
+        f"/external_api/v1.0/documents/{document.id!s}/invitations/",
+        {"email": "invited@example.com", "role": models.RoleChoices.READER},
+        format="json",
+    )
+
+    assert response.status_code == 201
+    data = response.json()
+    assert data["email"] == "invited@example.com"
+    assert data["role"] == models.RoleChoices.READER
+    assert str(data["document"]) == str(document.id)
+
+
+@override_settings(
+    EXTERNAL_API={
+        "documents": {
+            "enabled": True,
+            "actions": [
+                "list",
+                "retrieve",
+                "children",
+            ],
+        },
+        "document_invitation": {
+            "enabled": True,
+            "actions": ["list", "retrieve", "partial_update"],
+        },
+    },
+)
+def test_external_api_document_invitations_partial_update_can_be_allowed(
+    user_token, resource_server_backend, user_specific_sub
+):
+    """
+    Connected users SHOULD be allowed to partially update a document invitation
+    when the partial_update action is explicitly enabled.
+    """
+    reload_urls()
+
+    client = APIClient()
+    client.credentials(HTTP_AUTHORIZATION=f"Bearer {user_token}")
+
+    document = factories.DocumentFactory()
+    factories.UserDocumentAccessFactory(
+        document=document, user=user_specific_sub, role=models.RoleChoices.OWNER
+    )
+    invitation = factories.InvitationFactory(
+        document=document, role=models.RoleChoices.READER
+    )
+
+    response = client.patch(
+        f"/external_api/v1.0/documents/{document.id!s}/invitations/{invitation.id!s}/",
+        {"role": models.RoleChoices.EDITOR},
+        format="json",
+    )
+
+    assert response.status_code == 200
+    data = response.json()
+    assert data["role"] == models.RoleChoices.EDITOR
+    assert data["email"] == invitation.email
+
+
+@override_settings(
+    EXTERNAL_API={
+        "documents": {
+            "enabled": True,
+            "actions": [
+                "list",
+                "retrieve",
+                "children",
+            ],
+        },
+        "document_invitation": {
+            "enabled": True,
+            "actions": ["list", "retrieve", "destroy"],
+        },
+    },
+)
+def test_external_api_document_invitations_delete_can_be_allowed(
+    user_token, resource_server_backend, user_specific_sub
+):
+    """
+    Connected users SHOULD be allowed to delete a document invitation
+    when the destroy action is explicitly enabled.
+    """
+    reload_urls()
+
+    client = APIClient()
+    client.credentials(HTTP_AUTHORIZATION=f"Bearer {user_token}")
+
+    document = factories.DocumentFactory()
+    factories.UserDocumentAccessFactory(
+        document=document, user=user_specific_sub, role=models.RoleChoices.OWNER
+    )
+    invitation = factories.InvitationFactory(document=document)
+
+    response = client.delete(
+        f"/external_api/v1.0/documents/{document.id!s}/invitations/{invitation.id!s}/",
+    )
+
+    assert response.status_code == 204

src/backend/core/tests/external_api/test_external_api_documents_link_configuration.py

@@ -0,0 +1,105 @@
+"""
+Tests for the Resource Server API for document link configurations.
+
+Not testing external API endpoints that are already tested in the /api
+because the resource server viewsets inherit from the api viewsets.
+
+"""
+
+from unittest.mock import patch
+
+from django.test import override_settings
+
+import pytest
+from rest_framework.test import APIClient
+
+from core import factories, models
+
+pytestmark = pytest.mark.django_db
+
+# pylint: disable=unused-argument
+
+
+def test_external_api_documents_link_configuration_not_allowed(
+    user_token, resource_server_backend, user_specific_sub
+):
+    """
+    Connected users SHOULD NOT be allowed to update the link configuration of a document
+    from a resource server.
+    """
+
+    client = APIClient()
+    client.credentials(HTTP_AUTHORIZATION=f"Bearer {user_token}")
+
+    document = factories.DocumentFactory(
+        link_reach=models.LinkReachChoices.RESTRICTED,
+        creator=user_specific_sub,
+    )
+    factories.UserDocumentAccessFactory(
+        document=document,
+        user=user_specific_sub,
+        role=models.RoleChoices.OWNER,
+    )
+
+    response = client.put(
+        f"/external_api/v1.0/documents/{document.id!s}/link-configuration/"
+    )
+
+    assert response.status_code == 403
+
+
+@override_settings(
+    EXTERNAL_API={
+        "documents": {
+            "enabled": True,
+            "actions": [
+                "list",
+                "retrieve",
+                "children",
+                "link_configuration",
+            ],
+        },
+    },
+    COLLABORATION_API_URL="http://example.com/",
+    COLLABORATION_SERVER_SECRET="secret-token",
+)
+@patch("core.services.collaboration_services.CollaborationService.reset_connections")
+def test_external_api_documents_link_configuration_can_be_allowed(
+    mock_reset, user_token, resource_server_backend, user_specific_sub
+):
+    """
+    Connected users SHOULD be allowed to update the link configuration of a document
+    from a resource server when the corresponding action is enabled in EXTERNAL_API settings.
+    """
+
+    client = APIClient()
+    client.credentials(HTTP_AUTHORIZATION=f"Bearer {user_token}")
+
+    document = factories.DocumentFactory(
+        link_reach=models.LinkReachChoices.RESTRICTED,
+        creator=user_specific_sub,
+    )
+    factories.UserDocumentAccessFactory(
+        document=document,
+        user=user_specific_sub,
+        role=models.RoleChoices.OWNER,
+    )
+
+    # attempt to change reach/role to a valid combination
+    new_data = {
+        "link_reach": models.LinkReachChoices.PUBLIC,
+        "link_role": models.LinkRoleChoices.EDITOR,
+    }
+
+    response = client.put(
+        f"/external_api/v1.0/documents/{document.id!s}/link-configuration/",
+        new_data,
+        format="json",
+    )
+
+    assert response.status_code == 200
+
+    # verify the document was updated in the database
+    document.refresh_from_db()
+    assert document.link_reach == models.LinkReachChoices.PUBLIC
+    assert document.link_role == models.LinkRoleChoices.EDITOR

src/backend/core/tests/external_api/test_external_api_documents_media_auth.py

@@ -0,0 +1,94 @@
+"""
+Tests for the Resource Server API for document media authentication.
+
+Not testing external API endpoints that are already tested in the /api
+because the resource server viewsets inherit from the api viewsets.
+
+"""
+
+from io import BytesIO
+from uuid import uuid4
+
+from django.core.files.storage import default_storage
+from django.test import override_settings
+from django.utils import timezone
+
+import pytest
+from freezegun import freeze_time
+from rest_framework.test import APIClient
+
+from core import factories, models
+from core.enums import DocumentAttachmentStatus
+
+pytestmark = pytest.mark.django_db
+
+# pylint: disable=unused-argument
+
+
+def test_external_api_documents_media_auth_not_allowed(
+    user_token, resource_server_backend, user_specific_sub
+):
+    """
+    Connected users SHOULD NOT be allowed to access media auth endpoints
+    from a resource server by default.
+    """
+
+    client = APIClient()
+    client.credentials(HTTP_AUTHORIZATION=f"Bearer {user_token}")
+
+    response = client.get("/external_api/v1.0/documents/media-auth/")
+
+    assert response.status_code == 403
+
+
+@override_settings(
+    EXTERNAL_API={
+        "documents": {
+            "enabled": True,
+            "actions": [
+                "list",
+                "retrieve",
+                "children",
+                "media_auth",
+            ],
+        },
+    }
+)
+def test_external_api_documents_media_auth_can_be_allowed(
+    user_token, resource_server_backend, user_specific_sub
+):
+    """
+    Connected users SHOULD be allowed to access media auth endpoints
+    from a resource server when the media-auth action is enabled in EXTERNAL_API settings.
+    """
+
+    client = APIClient()
+    client.credentials(HTTP_AUTHORIZATION=f"Bearer {user_token}")
+
+    document_id = uuid4()
+    filename = f"{uuid4()!s}.jpg"
+    key = f"{document_id!s}/attachments/{filename:s}"
+    media_url = f"http://localhost/media/{key:s}"
+
+    default_storage.connection.meta.client.put_object(
+        Bucket=default_storage.bucket_name,
+        Key=key,
+        Body=BytesIO(b"my prose"),
+        ContentType="text/plain",
+        Metadata={"status": DocumentAttachmentStatus.READY},
+    )
+
+    document = factories.DocumentFactory(
+        id=document_id, link_reach=models.LinkReachChoices.RESTRICTED, attachments=[key]
+    )
+    factories.UserDocumentAccessFactory(
+        document=document, user=user_specific_sub, role=models.RoleChoices.READER
+    )
+
+    now = timezone.now()
+    with freeze_time(now):
+        response = client.get(
+            "/external_api/v1.0/documents/media-auth/", HTTP_X_ORIGINAL_URL=media_url
+        )
+
+    assert response.status_code == 200

src/backend/core/tests/external_api/test_external_api_documents_versions.py

@@ -0,0 +1,163 @@
+"""
+Tests for the Resource Server API for document versions.
+
+Not testing external API endpoints that are already tested in the /api
+because the resource server viewsets inherit from the api viewsets.
+
+"""
+
+import time
+
+from django.test import override_settings
+
+import pytest
+from rest_framework.test import APIClient
+
+from core import factories, models
+
+pytestmark = pytest.mark.django_db
+
+# pylint: disable=unused-argument
+
+
+def test_external_api_documents_versions_list_not_allowed(
+    user_token, resource_server_backend, user_specific_sub
+):
+    """
+    Connected users SHOULD NOT be allowed to list the versions of a document
+    from a resource server by default.
+    """
+
+    client = APIClient()
+    client.credentials(HTTP_AUTHORIZATION=f"Bearer {user_token}")
+
+    document = factories.DocumentFactory(
+        link_reach=models.LinkReachChoices.RESTRICTED,
+        creator=user_specific_sub,
+    )
+    factories.UserDocumentAccessFactory(
+        document=document,
+        user=user_specific_sub,
+        role=models.RoleChoices.OWNER,
+    )
+
+    response = client.get(f"/external_api/v1.0/documents/{document.id!s}/versions/")
+
+    assert response.status_code == 403
+
+
+def test_external_api_documents_versions_detail_not_allowed(
+    user_token, resource_server_backend, user_specific_sub
+):
+    """
+    Connected users SHOULD NOT be allowed to retrieve a specific version of a document
+    from a resource server by default.
+    """
+    client = APIClient()
+    client.credentials(HTTP_AUTHORIZATION=f"Bearer {user_token}")
+
+    document = factories.DocumentFactory(link_reach=models.LinkReachChoices.RESTRICTED)
+    factories.UserDocumentAccessFactory(
+        document=document, user=user_specific_sub, role=models.RoleChoices.OWNER
+    )
+
+    response = client.get(
+        f"/external_api/v1.0/documents/{document.id!s}/versions/1234/"
+    )
+
+    assert response.status_code == 403
+
+
+# Overrides
+
+
+@override_settings(
+    EXTERNAL_API={
+        "documents": {
+            "enabled": True,
+            "actions": ["list", "retrieve", "children", "versions_list"],
+        },
+    }
+)
+def test_external_api_documents_versions_list_can_be_allowed(
+    user_token, resource_server_backend, user_specific_sub
+):
+    """
+    Connected users SHOULD be allowed to list version of a document from a resource server
+    when the versions action is enabled in EXTERNAL_API settings.
+    """
+    client = APIClient()
+    client.credentials(HTTP_AUTHORIZATION=f"Bearer {user_token}")
+
+    document = factories.DocumentFactory(link_reach=models.LinkReachChoices.RESTRICTED)
+    factories.UserDocumentAccessFactory(
+        document=document, user=user_specific_sub, role=models.RoleChoices.OWNER
+    )
+
+    # Add new versions to the document
+    for i in range(3):
+        document.content = f"new content {i:d}"
+        document.save()
+
+    response = client.get(f"/external_api/v1.0/documents/{document.id!s}/versions/")
+
+    assert response.status_code == 200
+
+    content = response.json()
+    assert content["count"] == 2
+
+
+@override_settings(
+    EXTERNAL_API={
+        "documents": {
+            "enabled": True,
+            "actions": [
+                "list",
+                "retrieve",
+                "children",
+                "versions_list",
+                "versions_detail",
+            ],
+        },
+    }
+)
+def test_external_api_documents_versions_detail_can_be_allowed(
+    user_token, resource_server_backend, user_specific_sub
+):
+    """
+    Connected users SHOULD be allowed to retrieve a specific version of a document
+    from a resource server when the versions_detail action is enabled.
+    """
+    client = APIClient()
+    client.credentials(HTTP_AUTHORIZATION=f"Bearer {user_token}")
+
+    document = factories.DocumentFactory(link_reach=models.LinkReachChoices.RESTRICTED)
+    factories.UserDocumentAccessFactory(
+        document=document, user=user_specific_sub, role=models.RoleChoices.OWNER
+    )
+
+    # ensure access datetime is earlier than versions (minio precision is one second)
+    time.sleep(1)
+
+    # create several versions, spacing them out to get distinct LastModified values
+    for i in range(3):
+        document.content = f"new content {i:d}"
+        document.save()
+        time.sleep(1)
+
+    # call the list endpoint and verify basic structure
+    response = client.get(f"/external_api/v1.0/documents/{document.id!s}/versions/")
+    assert response.status_code == 200
+
+    content = response.json()
+    # count should reflect two saved versions beyond the original
+    assert content.get("count") == 2
+
+    # pick the first version returned by the list (should be accessible)
+    version_id = content.get("versions")[0]["version_id"]
+
+    detailed_response = client.get(
+        f"/external_api/v1.0/documents/{document.id!s}/versions/{version_id}/"
+    )
+    assert detailed_response.status_code == 200
+    assert detailed_response.json()["content"] == "new content 1"

src/backend/core/tests/external_api/test_external_api_users.py

@@ -0,0 +1,158 @@
+"""
+Tests for the Resource Server API for users.
+
+Not testing external API endpoints that are already tested in the /api
+because the resource server viewsets inherit from the api viewsets.
+
+"""
+
+import pytest
+from rest_framework.test import APIClient
+
+from core import factories
+from core.api import serializers
+from core.tests.utils.urls import reload_urls
+
+pytestmark = pytest.mark.django_db
+
+# pylint: disable=unused-argument
+
+
+def test_external_api_users_me_anonymous_public_standalone():
+    """
+    Anonymous users SHOULD NOT be allowed to retrieve their own user information from external
+    API if resource server is not enabled.
+    """
+    reload_urls()
+    response = APIClient().get("/external_api/v1.0/users/me/")
+
+    assert response.status_code == 404
+
+
+def test_external_api_users_me_connected_not_allowed():
+    """
+    Connected users SHOULD NOT be allowed to retrieve their own user information from external
+    API if resource server is not enabled.
+    """
+    reload_urls()
+    user = factories.UserFactory()
+    client = APIClient()
+    client.force_login(user)
+
+    response = client.get("/external_api/v1.0/users/me/")
+
+    assert response.status_code == 404
+
+
+def test_external_api_users_me_connected_allowed(
+    user_token, resource_server_backend, user_specific_sub
+):
+    """
+    Connected users SHOULD be allowed to retrieve their own user information from external API
+    if resource server is enabled.
+    """
+    client = APIClient()
+    client.credentials(HTTP_AUTHORIZATION=f"Bearer {user_token}")
+
+    response = client.get("/external_api/v1.0/users/me/")
+
+    assert response.status_code == 200
+    data = response.json()
+    assert data["id"] == str(user_specific_sub.id)
+    assert data["email"] == user_specific_sub.email
+
+
+def test_external_api_users_me_connected_with_invalid_token_not_allowed(
+    user_token, resource_server_backend
+):
+    """
+    Connected users SHOULD NOT be allowed to retrieve their own user information from external API
+    if resource server is enabled with an invalid token.
+    """
+    client = APIClient()
+    client.credentials(HTTP_AUTHORIZATION=f"Bearer {user_token}")
+
+    response = client.get("/external_api/v1.0/users/me/")
+
+    assert response.status_code == 401
+
+
+# Non allowed actions on resource server.
+
+
+def test_external_api_users_list_not_allowed(
+    user_token, resource_server_backend, user_specific_sub
+):
+    """
+    Connected users SHOULD NOT be allowed to list users from a resource server.
+    """
+    client = APIClient()
+    client.credentials(HTTP_AUTHORIZATION=f"Bearer {user_token}")
+
+    response = client.get("/external_api/v1.0/users/")
+
+    assert response.status_code == 403
+
+
+def test_external_api_users_retrieve_not_allowed(
+    user_token, resource_server_backend, user_specific_sub
+):
+    """
+    Connected users SHOULD NOT be allowed to retrieve a specific user from a resource server.
+    """
+    client = APIClient()
+    client.credentials(HTTP_AUTHORIZATION=f"Bearer {user_token}")
+
+    other_user = factories.UserFactory()
+
+    response = client.get(f"/external_api/v1.0/users/{other_user.id!s}/")
+
+    assert response.status_code == 403
+
+
+def test_external_api_users_put_patch_not_allowed(
+    user_token, resource_server_backend, user_specific_sub
+):
+    """
+    Connected users SHOULD NOT be allowed to update or patch a user from a resource server.
+    """
+    client = APIClient()
+    client.credentials(HTTP_AUTHORIZATION=f"Bearer {user_token}")
+
+    other_user = factories.UserFactory()
+
+    new_user_values = {
+        k: v
+        for k, v in serializers.UserSerializer(
+            instance=factories.UserFactory()
+        ).data.items()
+        if v is not None
+    }
+    response = client.put(
+        f"/external_api/v1.0/users/{other_user.id!s}/", new_user_values
+    )
+
+    assert response.status_code == 403
+
+    response = client.patch(
+        f"/external_api/v1.0/users/{other_user.id!s}/",
+        {"email": "new_email@example.com"},
+    )
+
+    assert response.status_code == 403
+
+
+def test_external_api_users_delete_not_allowed(
+    user_token, resource_server_backend, user_specific_sub
+):
+    """
+    Connected users SHOULD NOT be allowed to delete a user from a resource server.
+    """
+    client = APIClient()
+    client.credentials(HTTP_AUTHORIZATION=f"Bearer {user_token}")
+
+    other_user = factories.UserFactory()
+
+    response = client.delete(f"/external_api/v1.0/users/{other_user.id!s}/")
+
+    assert response.status_code == 403

src/backend/core/tests/test_api_users.py

@@ -48,7 +48,7 @@ def test_api_users_list_query_email():
     Only results with a Levenstein distance less than 3 with the query should be returned.
     We want to match by Levenstein distance because we want to prevent typing errors.
     """
-    user = factories.UserFactory()
+    user = factories.UserFactory(email="user@example.com", full_name="Example User")
 
     client = APIClient()
     client.force_login(user)
@@ -83,7 +83,7 @@ def test_api_users_list_query_email_with_internationalized_domain_names():
     Authenticated users should be able to list users and filter by email.
     It should work even if the email address contains an internationalized domain name.
     """
-    user = factories.UserFactory()
+    user = factories.UserFactory(email="user@example.com", full_name="Example User")
 
     client = APIClient()
     client.force_login(user)
@@ -123,7 +123,7 @@ def test_api_users_list_query_full_name():
     Authenticated users should be able to list users and filter by full name.
     Only results with a Trigram similarity greater than 0.2 with the query should be returned.
     """
-    user = factories.UserFactory(email="user@example.com")
+    user = factories.UserFactory(email="user@example.com", full_name="Example User")
 
     client = APIClient()
     client.force_login(user)
@@ -168,7 +168,7 @@ def test_api_users_list_query_accented_full_name():
     Authenticated users should be able to list users and filter by full name with accents.
     Only results with a Trigram similarity greater than 0.2 with the query should be returned.
     """
-    user = factories.UserFactory(email="user@example.com")
+    user = factories.UserFactory(email="user@example.com", full_name="Example User")
 
     client = APIClient()
     client.force_login(user)
@@ -416,7 +416,7 @@ def test_api_users_list_query_long_queries():
 
 def test_api_users_list_query_inactive():
     """Inactive users should not be listed."""
-    user = factories.UserFactory(email="user@example.com")
+    user = factories.UserFactory(email="user@example.com", full_name="Example User")
     client = APIClient()
     client.force_login(user)
 

src/backend/core/tests/test_api_utils_conditional_refresh_oidc_token.py

@@ -0,0 +1,32 @@
+"""module testing the conditional_refresh_oidc_token utils."""
+
+from unittest import mock
+
+from core.api import utils
+
+
+def test_refresh_oidc_access_token_storing_refresh_token_disabled(settings):
+    """The method_decorator must not be called when OIDC_STORE_REFRESH_TOKEN is False."""
+
+    settings.OIDC_STORE_REFRESH_TOKEN = False
+
+    callback = mock.MagicMock()
+
+    with mock.patch.object(utils, "method_decorator") as mock_method_decorator:
+        result = utils.conditional_refresh_oidc_token(callback)
+
+    mock_method_decorator.assert_not_called()
+    assert result == callback
+
+
+def test_refresh_oidc_access_token_storing_refresh_token_enabled(settings):
+    """The method_decorator must not be called when OIDC_STORE_REFRESH_TOKEN is False."""
+
+    settings.OIDC_STORE_REFRESH_TOKEN = True
+
+    callback = mock.MagicMock()
+
+    with mock.patch.object(utils, "method_decorator") as mock_method_decorator:
+        utils.conditional_refresh_oidc_token(callback)
+
+    mock_method_decorator.assert_called_with(utils.refresh_oidc_access_token)

src/backend/core/tests/test_models_users.py

@@ -216,7 +216,13 @@ def test_models_users_duplicate_onboarding_sandbox_document_creates_sandbox():
     When USER_ONBOARDING_SANDBOX_DOCUMENT is set with a valid template document,
     a new sandbox document should be created for the user with OWNER access.
     """
+    documents_before = factories.DocumentFactory.create_batch(20)
     template_document = factories.DocumentFactory(title="Getting started with Docs")
+    documents_after = factories.DocumentFactory.create_batch(20)
+
+    all_documents = documents_before + [template_document] + documents_after
+
+    paths = {document.pk: document.path for document in all_documents}
 
     with override_settings(USER_ONBOARDING_SANDBOX_DOCUMENT=str(template_document.id)):
         user = factories.UserFactory()
@@ -233,6 +239,10 @@ def test_models_users_duplicate_onboarding_sandbox_document_creates_sandbox():
     access = models.DocumentAccess.objects.get(user=user, document=sandbox_doc)
     assert access.role == models.RoleChoices.OWNER
 
+    for document in all_documents:
+        document.refresh_from_db()
+        assert document.path == paths[document.id]
+
 
 def test_models_users_duplicate_onboarding_sandbox_document_with_invalid_template_id():
     """

src/backend/core/tests/test_services_find_document_indexer.py

@@ -12,6 +12,7 @@ from django.db import transaction
 import pytest
 
 from core import factories, models
+from core.enums import SearchType
 from core.services.search_indexers import FindDocumentIndexer
 
 pytestmark = pytest.mark.django_db
@@ -473,8 +474,14 @@ def test_find_document_indexer_search(mock_search_query):
     nb_results = 10
     path = "/some/path/"
     visited = ["doc-123"]
+    search_type = SearchType.HYBRID
     results = FindDocumentIndexer().search(
-        q=q, token=token, nb_results=nb_results, path=path, visited=visited
+        q=q,
+        token=token,
+        nb_results=nb_results,
+        path=path,
+        visited=visited,
+        search_type=search_type,
     )
 
     mock_search_query.assert_called_once()
@@ -487,6 +494,7 @@ def test_find_document_indexer_search(mock_search_query):
         "order_by": "updated_at",
         "order_direction": "desc",
         "path": path,
+        "search_type": search_type,
     }
 
     assert len(results) == 2

src/backend/core/tests/test_services_search_indexers.py

@@ -494,7 +494,7 @@ def test_get_visited_document_ids_of():
     factories.UserDocumentAccessFactory(user=user, document=doc2)
 
     # The second document have an access for the user
-    assert get_visited_document_ids_of(queryset, user) == [str(doc1.pk)]
+    assert get_visited_document_ids_of(queryset, user) == (str(doc1.pk),)
 
 
 @pytest.mark.usefixtures("indexer_settings")
@@ -528,7 +528,7 @@ def test_get_visited_document_ids_of_deleted():
     doc_deleted.soft_delete()
 
     # Only the first document is not deleted
-    assert get_visited_document_ids_of(queryset, user) == [str(doc.pk)]
+    assert get_visited_document_ids_of(queryset, user) == (str(doc.pk),)
 
 
 @responses.activate
@@ -548,7 +548,7 @@ def test_services_search_indexers_search_errors(indexer_settings):
     )
 
     with pytest.raises(HTTPError):
-        FindDocumentIndexer().search("alpha", token="mytoken")
+        FindDocumentIndexer().search(q="alpha", token="mytoken")
 
 
 @patch("requests.post")
@@ -572,7 +572,7 @@ def test_services_search_indexers_search(mock_post, indexer_settings):
 
     visited = get_visited_document_ids_of(models.Document.objects.all(), user)
 
-    indexer.search("alpha", visited=visited, token="mytoken")
+    indexer.search(q="alpha", visited=visited, token="mytoken")
 
     args, kwargs = mock_post.call_args
 
@@ -613,7 +613,7 @@ def test_services_search_indexers_search_nb_results(mock_post, indexer_settings)
 
     visited = get_visited_document_ids_of(models.Document.objects.all(), user)
 
-    indexer.search("alpha", visited=visited, token="mytoken")
+    indexer.search(q="alpha", visited=visited, token="mytoken")
 
     args, kwargs = mock_post.call_args
 
@@ -621,7 +621,7 @@ def test_services_search_indexers_search_nb_results(mock_post, indexer_settings)
     assert kwargs.get("json")["nb_results"] == 25
 
     # The argument overrides the setting value
-    indexer.search("alpha", visited=visited, token="mytoken", nb_results=109)
+    indexer.search(q="alpha", visited=visited, token="mytoken", nb_results=109)
 
     args, kwargs = mock_post.call_args
 

src/backend/core/tests/utils/urls.py

@@ -0,0 +1,20 @@
+"""Utils for testing URLs."""
+
+import importlib
+
+from django.urls import clear_url_caches
+
+
+def reload_urls():
+    """
+    Reload the URLs. Since the URLs are loaded based on a
+    settings value, we need to reload them to make the
+    URL settings based condition effective.
+    """
+    import core.urls  # pylint:disable=import-outside-toplevel # noqa: PLC0415
+
+    import impress.urls  # pylint:disable=import-outside-toplevel # noqa: PLC0415
+
+    importlib.reload(core.urls)
+    importlib.reload(impress.urls)
+    clear_url_caches()

src/backend/core/urls.py

@@ -7,6 +7,7 @@ from lasuite.oidc_login.urls import urlpatterns as oidc_urls
 from rest_framework.routers import DefaultRouter
 
 from core.api import viewsets
+from core.external_api import viewsets as external_api_viewsets
 
 # - Main endpoints
 router = DefaultRouter()
@@ -43,6 +44,19 @@ thread_related_router.register(
     basename="comments",
 )
 
+# - Resource server routes
+external_api_router = DefaultRouter()
+external_api_router.register(
+    "documents",
+    external_api_viewsets.ResourceServerDocumentViewSet,
+    basename="resource_server_documents",
+)
+external_api_router.register(
+    "users",
+    external_api_viewsets.ResourceServerUserViewSet,
+    basename="resource_server_users",
+)
+
 
 urlpatterns = [
     path(
@@ -68,3 +82,38 @@ urlpatterns = [
     ),
     path(f"api/{settings.API_VERSION}/config/", viewsets.ConfigView.as_view()),
 ]
+
+if settings.OIDC_RESOURCE_SERVER_ENABLED:
+    # - Routes nested under a document in external API
+    external_api_document_related_router = DefaultRouter()
+
+    document_access_config = settings.EXTERNAL_API.get("document_access", {})
+    if document_access_config.get("enabled", False):
+        external_api_document_related_router.register(
+            "accesses",
+            external_api_viewsets.ResourceServerDocumentAccessViewSet,
+            basename="resource_server_document_accesses",
+        )
+
+    document_invitation_config = settings.EXTERNAL_API.get("document_invitation", {})
+    if document_invitation_config.get("enabled", False):
+        external_api_document_related_router.register(
+            "invitations",
+            external_api_viewsets.ResourceServerInvitationViewSet,
+            basename="resource_server_document_invitations",
+        )
+
+    urlpatterns.append(
+        path(
+            f"external_api/{settings.API_VERSION}/",
+            include(
+                [
+                    *external_api_router.urls,
+                    re_path(
+                        r"^documents/(?P<resource_id>[0-9a-z-]*)/",
+                        include(external_api_document_related_router.urls),
+                    ),
+                ]
+            ),
+        )
+    )

src/backend/impress/settings.py

@@ -331,6 +331,7 @@ class Base(Configuration):
         "django.contrib.messages.middleware.MessageMiddleware",
         "dockerflow.django.middleware.DockerflowMiddleware",
         "csp.middleware.CSPMiddleware",
+        "waffle.middleware.WaffleMiddleware",
     ]
 
     AUTHENTICATION_BACKENDS = [
@@ -352,6 +353,7 @@ class Base(Configuration):
         "parler",
         "treebeard",
         "easy_thumbnails",
+        "waffle",
         # Django
         "django.contrib.admin",
         "django.contrib.auth",
@@ -685,6 +687,109 @@ class Base(Configuration):
         environ_prefix=None,
     )
 
+    # OIDC Resource Server
+
+    OIDC_RESOURCE_SERVER_ENABLED = values.BooleanValue(
+        default=False, environ_name="OIDC_RESOURCE_SERVER_ENABLED", environ_prefix=None
+    )
+
+    OIDC_RS_BACKEND_CLASS = values.Value(
+        "lasuite.oidc_resource_server.backend.ResourceServerBackend",
+        environ_name="OIDC_RS_BACKEND_CLASS",
+        environ_prefix=None,
+    )
+
+    OIDC_OP_URL = values.Value(None, environ_name="OIDC_OP_URL", environ_prefix=None)
+
+    OIDC_VERIFY_SSL = values.BooleanValue(
+        default=True, environ_name="OIDC_VERIFY_SSL", environ_prefix=None
+    )
+
+    OIDC_TIMEOUT = values.PositiveIntegerValue(
+        3, environ_name="OIDC_TIMEOUT", environ_prefix=None
+    )
+
+    OIDC_PROXY = values.Value(None, environ_name="OIDC_PROXY", environ_prefix=None)
+
+    OIDC_OP_INTROSPECTION_ENDPOINT = values.Value(
+        None, environ_name="OIDC_OP_INTROSPECTION_ENDPOINT", environ_prefix=None
+    )
+
+    OIDC_RS_CLIENT_ID = values.Value(
+        None, environ_name="OIDC_RS_CLIENT_ID", environ_prefix=None
+    )
+
+    OIDC_RS_CLIENT_SECRET = values.Value(
+        None, environ_name="OIDC_RS_CLIENT_SECRET", environ_prefix=None
+    )
+
+    OIDC_RS_AUDIENCE_CLAIM = values.Value(
+        "client_id", environ_name="OIDC_RS_AUDIENCE_CLAIM", environ_prefix=None
+    )
+
+    OIDC_RS_ENCRYPTION_ENCODING = values.Value(
+        "A256GCM", environ_name="OIDC_RS_ENCRYPTION_ENCODING", environ_prefix=None
+    )
+
+    OIDC_RS_ENCRYPTION_ALGO = values.Value(
+        "RSA-OAEP", environ_name="OIDC_RS_ENCRYPTION_ALGO", environ_prefix=None
+    )
+
+    OIDC_RS_SIGNING_ALGO = values.Value(
+        "ES256", environ_name="OIDC_RS_SIGNING_ALGO", environ_prefix=None
+    )
+
+    OIDC_RS_SCOPES = values.ListValue(
+        ["openid"], environ_name="OIDC_RS_SCOPES", environ_prefix=None
+    )
+
+    OIDC_RS_ALLOWED_AUDIENCES = values.ListValue(
+        default=[],
+        environ_name="OIDC_RS_ALLOWED_AUDIENCES",
+        environ_prefix=None,
+    )
+
+    OIDC_RS_PRIVATE_KEY_STR = values.Value(
+        default=None,
+        environ_name="OIDC_RS_PRIVATE_KEY_STR",
+        environ_prefix=None,
+    )
+    OIDC_RS_ENCRYPTION_KEY_TYPE = values.Value(
+        default="RSA",
+        environ_name="OIDC_RS_ENCRYPTION_KEY_TYPE",
+        environ_prefix=None,
+    )
+
+    # External API Configuration
+    # Configure available routes and actions for external_api endpoints
+    EXTERNAL_API = values.DictValue(
+        default={
+            "documents": {
+                "enabled": True,
+                "actions": [
+                    "list",
+                    "retrieve",
+                    "create",
+                    "children",
+                ],
+            },
+            "document_access": {
+                "enabled": False,
+                "actions": [],
+            },
+            "document_invitation": {
+                "enabled": False,
+                "actions": [],
+            },
+            "users": {
+                "enabled": True,
+                "actions": ["get_me"],
+            },
+        },
+        environ_name="EXTERNAL_API",
+        environ_prefix=None,
+    )
+
     ALLOW_LOGOUT_GET_METHOD = values.BooleanValue(
         default=True, environ_name="ALLOW_LOGOUT_GET_METHOD", environ_prefix=None
     )

src/backend/pyproject.toml

@@ -7,7 +7,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "impress"
-version = "4.8.1"
+version = "4.8.3"
 authors = [{ "name" = "DINUM", "email" = "dev@mail.numerique.gouv.fr" }]
 classifiers = [
     "Development Status :: 5 - Production/Stable",
@@ -42,6 +42,7 @@ dependencies = [
     "django<6.0.0",
     "django-treebeard<5.0.0",
     "djangorestframework==3.16.1",
+    "django-waffle==5.0.0",
     "drf_spectacular==0.29.0",
     "dockerflow==2026.1.26",
     "easy_thumbnails==2.10.1",

src/frontend/apps/e2e/__tests__/app-impress/doc-ai.spec.ts

@@ -46,9 +46,9 @@ test.describe('Doc AI feature', () => {
 
       await page.locator('.bn-block-outer').last().fill('Anything');
       await page.getByText('Anything').selectText();
-      expect(
-        await page.locator('button[data-test="convertMarkdown"]').count(),
-      ).toBe(1);
+      await expect(
+        page.locator('button[data-test="convertMarkdown"]'),
+      ).toHaveCount(1);
       await expect(
         page.getByRole('button', { name: config.selector, exact: true }),
       ).toBeHidden();

src/frontend/apps/e2e/__tests__/app-impress/doc-comments.spec.ts

@@ -130,12 +130,13 @@ test.describe('Doc Comments', () => {
     await thread.getByRole('paragraph').first().fill('This is a comment');
     await thread.locator('[data-test="save"]').click();
     await expect(thread.getByText('This is a comment').first()).toBeHidden();
+    await expect(editor.getByText('Hello')).toHaveClass('bn-thread-mark');
 
-    // Check background color changed
     await expect(editor.getByText('Hello')).toHaveCSS(
       'background-color',
-      'rgba(237, 180, 0, 0.4)',
+      'color(srgb 0.882353 0.831373 0.717647 / 0.4)',
     );
+
     await editor.first().click();
     await editor.getByText('Hello').click();
 
@@ -184,6 +185,7 @@ test.describe('Doc Comments', () => {
     await thread.getByText('This is an edited comment').first().hover();
     await thread.locator('[data-test="resolve"]').click();
     await expect(thread).toBeHidden();
+
     await expect(editor.getByText('Hello')).toHaveCSS(
       'background-color',
       'rgba(0, 0, 0, 0)',
@@ -195,11 +197,13 @@ test.describe('Doc Comments', () => {
 
     await thread.getByRole('paragraph').first().fill('This is a new comment');
     await thread.locator('[data-test="save"]').click();
+    await expect(editor.getByText('Hello')).toHaveClass('bn-thread-mark');
 
     await expect(editor.getByText('Hello')).toHaveCSS(
       'background-color',
-      'rgba(237, 180, 0, 0.4)',
+      'color(srgb 0.882353 0.831373 0.717647 / 0.4)',
     );
+
     await editor.first().click();
     await editor.getByText('Hello').click();
 
@@ -207,6 +211,7 @@ test.describe('Doc Comments', () => {
     await thread.locator('[data-test="moreactions"]').first().click();
     await thread.getByRole('menuitem', { name: 'Delete comment' }).click();
 
+    await expect(editor.getByText('Hello')).not.toHaveClass('bn-thread-mark');
     await expect(editor.getByText('Hello')).toHaveCSS(
       'background-color',
       'rgba(0, 0, 0, 0)',
@@ -262,7 +267,7 @@ test.describe('Doc Comments', () => {
 
     await expect(otherEditor.getByText('Hello')).toHaveCSS(
       'background-color',
-      'rgba(237, 180, 0, 0.4)',
+      'color(srgb 0.882353 0.831373 0.717647 / 0.4)',
     );
 
     // We change the role of the second user to reader
@@ -297,7 +302,7 @@ test.describe('Doc Comments', () => {
 
     await expect(otherEditor.getByText('Hello')).toHaveCSS(
       'background-color',
-      'rgba(237, 180, 0, 0.4)',
+      'color(srgb 0.882353 0.831373 0.717647 / 0.4)',
     );
     await otherEditor.getByText('Hello').click();
     await expect(
@@ -343,7 +348,7 @@ test.describe('Doc Comments', () => {
 
     await expect(editor1.getByText('Document One')).toHaveCSS(
       'background-color',
-      'rgba(237, 180, 0, 0.4)',
+      'color(srgb 0.882353 0.831373 0.717647 / 0.4)',
     );
 
     await editor1.getByText('Document One').click();

src/frontend/apps/e2e/__tests__/app-impress/doc-editor.spec.ts

@@ -147,20 +147,18 @@ test.describe('Doc Editor', () => {
     const wsClosePromise = webSocket.waitForEvent('close');
 
     await selectVisibility.click();
-    await page.getByRole('menuitem', { name: 'Connected' }).click();
+    await page.getByRole('menuitemradio', { name: 'Connected' }).click();
 
     // Assert that the doc reconnects to the ws
     const wsClose = await wsClosePromise;
     expect(wsClose.isClosed()).toBeTruthy();
 
     // Check the ws is connected again
-    webSocketPromise = page.waitForEvent('websocket', (webSocket) => {
+    webSocket = await page.waitForEvent('websocket', (webSocket) => {
       return webSocket
         .url()
         .includes('ws://localhost:4444/collaboration/ws/?room=');
     });
-
-    webSocket = await webSocketPromise;
     framesentPromise = webSocket.waitForEvent('framesent');
     framesent = await framesentPromise;
     expect(framesent.payload).not.toBeNull();
@@ -577,12 +575,10 @@ test.describe('Doc Editor', () => {
 
     await page.reload();
 
-    responseCanEditPromise = page.waitForResponse(
+    responseCanEdit = await page.waitForResponse(
       (response) =>
         response.url().includes(`/can-edit/`) && response.status() === 200,
     );
-
-    responseCanEdit = await responseCanEditPromise;
     expect(responseCanEdit.ok()).toBeTruthy();
 
     jsonCanEdit = (await responseCanEdit.json()) as { can_edit: boolean };
@@ -608,7 +604,7 @@ test.describe('Doc Editor', () => {
     await page.getByRole('button', { name: 'Share' }).click();
 
     await page.getByTestId('doc-access-mode').click();
-    await page.getByRole('menuitem', { name: 'Reading' }).click();
+    await page.getByRole('menuitemradio', { name: 'Reading' }).click();
 
     // Close the modal
     await page.getByRole('button', { name: 'close' }).first().click();

src/frontend/apps/e2e/__tests__/app-impress/doc-grid-move.spec.ts

@@ -341,7 +341,9 @@ test.describe('Doc grid move', () => {
       `doc-share-access-request-row-${emailRequest}`,
     );
     await container.getByTestId('doc-role-dropdown').click();
-    await otherPage.getByRole('menuitem', { name: 'Administrator' }).click();
+    await otherPage
+      .getByRole('menuitemradio', { name: 'Administrator' })
+      .click();
     await container.getByRole('button', { name: 'Approve' }).click();
 
     await expect(otherPage.getByText('Access Requests')).toBeHidden();

src/frontend/apps/e2e/__tests__/app-impress/doc-header.spec.ts

@@ -78,11 +78,7 @@ test.describe('Doc Header', () => {
 
     await page.getByTestId('doc-visibility').click();
 
-    await page
-      .getByRole('menuitem', {
-        name: 'Public',
-      })
-      .click();
+    await page.getByRole('menuitemradio', { name: 'Public' }).click();
 
     await page.getByRole('button', { name: 'close' }).first().click();
 
@@ -241,7 +237,7 @@ test.describe('Doc Header', () => {
         hasText: randomDoc,
       });
 
-    expect(await row.count()).toBe(0);
+    await expect(row).toHaveCount(0);
   });
 
   test('it checks the options available if administrator', async ({ page }) => {
@@ -280,7 +276,7 @@ test.describe('Doc Header', () => {
     ).toBeDisabled();
 
     // Click somewhere else to close the options
-    await page.click('body', { position: { x: 0, y: 0 } });
+    await page.locator('body').click({ position: { x: 0, y: 0 } });
 
     await page.getByRole('button', { name: 'Share' }).click();
 
@@ -300,7 +296,7 @@ test.describe('Doc Header', () => {
 
     await invitationRole.click();
 
-    await page.getByRole('menuitem', { name: 'Remove access' }).click();
+    await page.getByRole('menuitemradio', { name: 'Remove access' }).click();
     await expect(invitationCard).toBeHidden();
 
     const memberCard = shareModal.getByLabel('List members card');
@@ -313,7 +309,7 @@ test.describe('Doc Header', () => {
 
     await roles.click();
     await expect(
-      page.getByRole('menuitem', { name: 'Remove access' }),
+      page.getByRole('menuitemradio', { name: 'Remove access' }),
     ).toBeEnabled();
   });
 
@@ -359,7 +355,7 @@ test.describe('Doc Header', () => {
     ).toBeDisabled();
 
     // Click somewhere else to close the options
-    await page.click('body', { position: { x: 0, y: 0 } });
+    await page.locator('body').click({ position: { x: 0, y: 0 } });
 
     await page.getByRole('button', { name: 'Share' }).click();
 
@@ -431,7 +427,7 @@ test.describe('Doc Header', () => {
     ).toBeDisabled();
 
     // Click somewhere else to close the options
-    await page.click('body', { position: { x: 0, y: 0 } });
+    await page.locator('body').click({ position: { x: 0, y: 0 } });
 
     await page.getByRole('button', { name: 'Share' }).click();
 
@@ -487,7 +483,9 @@ test.describe('Doc Header', () => {
     // Copy content to clipboard
     await page.getByLabel('Open the document options').click();
     await page.getByRole('menuitem', { name: 'Copy as Markdown' }).click();
-    await expect(page.getByText('Copied to clipboard')).toBeVisible();
+    await expect(
+      page.getByText('Copied as Markdown to clipboard'),
+    ).toBeVisible();
 
     // Test that clipboard is in Markdown format
     const handle = await page.evaluateHandle(() =>

src/frontend/apps/e2e/__tests__/app-impress/doc-import.spec.ts

@@ -177,5 +177,5 @@ const dragAndDropFiles = async (
     return dt;
   }, filesData);
 
-  await page.dispatchEvent(selector, 'drop', { dataTransfer });
+  await page.locator(selector).dispatchEvent('drop', { dataTransfer });
 };

src/frontend/apps/e2e/__tests__/app-impress/doc-inherited-share.spec.ts

@@ -53,7 +53,7 @@ test.describe('Inherited share accesses', () => {
     await expect(docVisibilityCard.getByText('Reading')).toBeVisible();
 
     await docVisibilityCard.getByText('Reading').click();
-    await page.getByRole('menuitem', { name: 'Editing' }).click();
+    await page.getByRole('menuitemradio', { name: 'Editing' }).click();
 
     await expect(docVisibilityCard.getByText('Reading')).toBeHidden();
     await expect(docVisibilityCard.getByText('Editing')).toBeVisible();
@@ -61,11 +61,11 @@ test.describe('Inherited share accesses', () => {
     // Verify inherited link
     await docVisibilityCard.getByText('Connected').click();
     await expect(
-      page.getByRole('menuitem', { name: 'Private' }),
+      page.getByRole('menuitemradio', { name: 'Private' }),
     ).toBeDisabled();
 
     // Update child link
-    await page.getByRole('menuitem', { name: 'Public' }).click();
+    await page.getByRole('menuitemradio', { name: 'Public' }).click();
 
     await expect(docVisibilityCard.getByText('Connected')).toBeHidden();
     await expect(

src/frontend/apps/e2e/__tests__/app-impress/doc-member-create.spec.ts

@@ -16,6 +16,41 @@ test.describe('Document create member', () => {
     await page.goto('/');
   });
 
+  test('it checks search hints', async ({ page, browserName }) => {
+    await createDoc(page, 'select-multi-users', browserName, 1);
+
+    await page.getByRole('button', { name: 'Share' }).click();
+
+    const shareModal = page.getByLabel('Share the document');
+    await expect(shareModal.getByText('Document owner')).toBeVisible();
+
+    const inputSearch = page.getByTestId('quick-search-input');
+    await inputSearch.fill('u');
+    await expect(shareModal.getByText('Document owner')).toBeHidden();
+    await expect(
+      shareModal.getByText('Type at least 3 characters to display user names'),
+    ).toBeVisible();
+    await inputSearch.fill('user');
+    await expect(
+      shareModal.getByText('Type at least 3 characters to display user names'),
+    ).toBeHidden();
+    await expect(shareModal.getByText('Choose a user')).toBeVisible();
+    await inputSearch.fill('anything');
+    await expect(shareModal.getByText('Choose a user')).toBeHidden();
+    await expect(
+      shareModal.getByText(
+        'No results. Type a full email address to invite someone.',
+      ),
+    ).toBeVisible();
+    await inputSearch.fill('anything@test.com');
+    await expect(
+      shareModal.getByText(
+        'No results. Type a full email address to invite someone.',
+      ),
+    ).toBeHidden();
+    await expect(shareModal.getByText('Choose the email')).toBeVisible();
+  });
+
   test('it selects 2 users and 1 invitation', async ({ page, browserName }) => {
     const inputFill = 'user.test';
     const responsePromise = page.waitForResponse(
@@ -75,15 +110,21 @@ test.describe('Document create member', () => {
 
     // Check roles are displayed
     await list.getByTestId('doc-role-dropdown').click();
-    await expect(page.getByRole('menuitem', { name: 'Reader' })).toBeVisible();
-    await expect(page.getByRole('menuitem', { name: 'Editor' })).toBeVisible();
-    await expect(page.getByRole('menuitem', { name: 'Owner' })).toBeVisible();
     await expect(
-      page.getByRole('menuitem', { name: 'Administrator' }),
+      page.getByRole('menuitemradio', { name: 'Reader' }),
+    ).toBeVisible();
+    await expect(
+      page.getByRole('menuitemradio', { name: 'Editor' }),
+    ).toBeVisible();
+    await expect(
+      page.getByRole('menuitemradio', { name: 'Owner' }),
+    ).toBeVisible();
+    await expect(
+      page.getByRole('menuitemradio', { name: 'Administrator' }),
     ).toBeVisible();
 
     // Validate
-    await page.getByRole('menuitem', { name: 'Administrator' }).click();
+    await page.getByRole('menuitemradio', { name: 'Administrator' }).click();
     await page.getByTestId('doc-share-invite-button').click();
 
     // Check invitation added
@@ -129,7 +170,7 @@ test.describe('Document create member', () => {
     // Choose a role
     const container = page.getByTestId('doc-share-add-member-list');
     await container.getByTestId('doc-role-dropdown').click();
-    await page.getByRole('menuitem', { name: 'Owner' }).click();
+    await page.getByRole('menuitemradio', { name: 'Owner' }).click();
 
     const responsePromiseCreateInvitation = page.waitForResponse(
       (response) =>
@@ -147,7 +188,7 @@ test.describe('Document create member', () => {
 
     // Choose a role
     await container.getByTestId('doc-role-dropdown').click();
-    await page.getByRole('menuitem', { name: 'Owner' }).click();
+    await page.getByRole('menuitemradio', { name: 'Owner' }).click();
 
     const responsePromiseCreateInvitationFail = page.waitForResponse(
       (response) =>
@@ -184,7 +225,7 @@ test.describe('Document create member', () => {
     // Choose a role
     const container = page.getByTestId('doc-share-add-member-list');
     await container.getByTestId('doc-role-dropdown').click();
-    await page.getByRole('menuitem', { name: 'Administrator' }).click();
+    await page.getByRole('menuitemradio', { name: 'Administrator' }).click();
 
     const responsePromiseCreateInvitation = page.waitForResponse(
       (response) =>
@@ -211,13 +252,13 @@ test.describe('Document create member', () => {
     );
 
     await userInvitation.getByTestId('doc-role-dropdown').click();
-    await page.getByRole('menuitem', { name: 'Reader' }).click();
+    await page.getByRole('menuitemradio', { name: 'Reader' }).click();
 
     const responsePatchInvitation = await responsePromisePatchInvitation;
     expect(responsePatchInvitation.ok()).toBeTruthy();
 
     await userInvitation.getByTestId('doc-role-dropdown').click();
-    await page.getByRole('menuitem', { name: 'Remove access' }).click();
+    await page.getByRole('menuitemradio', { name: 'Remove access' }).click();
 
     await expect(userInvitation).toBeHidden();
   });
@@ -269,7 +310,7 @@ test.describe('Document create member', () => {
       `doc-share-access-request-row-${emailRequest}`,
     );
     await container.getByTestId('doc-role-dropdown').click();
-    await page.getByRole('menuitem', { name: 'Administrator' }).click();
+    await page.getByRole('menuitemradio', { name: 'Administrator' }).click();
     await container.getByRole('button', { name: 'Approve' }).click();
 
     await expect(page.getByText('Access Requests')).toBeHidden();

src/frontend/apps/e2e/__tests__/app-impress/doc-member-list.spec.ts

@@ -161,7 +161,7 @@ test.describe('Document list members', () => {
     );
     await expect(soloOwner).toBeVisible();
     await expect(
-      page.getByRole('menuitem', { name: 'Administrator' }),
+      page.getByRole('menuitemradio', { name: 'Administrator' }),
     ).toBeDisabled();
 
     await list.click({
@@ -185,18 +185,20 @@ test.describe('Document list members', () => {
     });
 
     await currentUserRole.click();
-    await page.getByRole('menuitem', { name: 'Administrator' }).click();
+    await page.getByRole('menuitemradio', { name: 'Administrator' }).click();
     await list.click();
     await expect(currentUserRole).toBeVisible();
 
     await newUserRoles.click();
-    await expect(page.getByRole('menuitem', { name: 'Owner' })).toBeDisabled();
+    await expect(
+      page.getByRole('menuitemradio', { name: 'Owner' }),
+    ).toBeDisabled();
     await list.click({
       force: true, // Force click to close the dropdown
     });
 
     await currentUserRole.click();
-    await page.getByRole('menuitem', { name: 'Reader' }).click();
+    await page.getByRole('menuitemradio', { name: 'Reader' }).click();
     await list.click({
       force: true, // Force click to close the dropdown
     });
@@ -236,11 +238,11 @@ test.describe('Document list members', () => {
     await expect(userReader).toBeVisible();
 
     await userReaderRole.click();
-    await page.getByRole('menuitem', { name: 'Remove access' }).click();
+    await page.getByRole('menuitemradio', { name: 'Remove access' }).click();
     await expect(userReader).toBeHidden();
 
     await mySelfRole.click();
-    await page.getByRole('menuitem', { name: 'Remove access' }).click();
+    await page.getByRole('menuitemradio', { name: 'Remove access' }).click();
     await expect(
       page.getByText('Insufficient access rights to view the document.'),
     ).toBeVisible();

src/frontend/apps/e2e/__tests__/app-impress/doc-search.spec.ts

@@ -29,7 +29,7 @@ test.describe('Document search', () => {
     await page.getByTestId('search-docs-button').click();
 
     await expect(
-      page.getByRole('img', { name: 'No active search' }),
+      page.getByLabel('Search modal').locator('img[alt=""]'),
     ).toBeVisible();
 
     await expect(
@@ -107,7 +107,7 @@ test.describe('Document search', () => {
 
     await searchButton.click();
     await expect(
-      page.getByRole('combobox', { name: 'Quick search input' }),
+      page.getByRole('combobox', { name: 'Search documents' }),
     ).toBeVisible();
     await expect(filters).toBeHidden();
 
@@ -120,7 +120,7 @@ test.describe('Document search', () => {
 
     await searchButton.click();
     await expect(
-      page.getByRole('combobox', { name: 'Quick search input' }),
+      page.getByRole('combobox', { name: 'Search documents' }),
     ).toBeVisible();
     await expect(filters).toBeHidden();
 
@@ -137,12 +137,12 @@ test.describe('Document search', () => {
     await filters.click();
     await filters.getByRole('button', { name: 'Current doc' }).click();
     await expect(
-      page.getByRole('menuitem', { name: 'All docs' }),
+      page.getByRole('menuitemcheckbox', { name: 'All docs' }),
     ).toBeVisible();
     await expect(
-      page.getByRole('menuitem', { name: 'Current doc' }),
+      page.getByRole('menuitemcheckbox', { name: 'Current doc' }),
     ).toBeVisible();
-    await page.getByRole('menuitem', { name: 'All docs' }).click();
+    await page.getByRole('menuitemcheckbox', { name: 'All docs' }).click();
 
     await expect(page.getByRole('button', { name: 'Reset' })).toBeVisible();
   });
@@ -168,9 +168,9 @@ test.describe('Document search', () => {
     const searchButton = page.getByTestId('search-docs-button');
 
     await searchButton.click();
-    await page.getByRole('combobox', { name: 'Quick search input' }).click();
+    await page.getByRole('combobox', { name: 'Search documents' }).click();
     await page
-      .getByRole('combobox', { name: 'Quick search input' })
+      .getByRole('combobox', { name: 'Search documents' })
       .fill('sub page search');
 
     // Expect to find the first and second docs in the results list
@@ -192,7 +192,7 @@ test.describe('Document search', () => {
     );
     await searchButton.click();
     await page
-      .getByRole('combobox', { name: 'Quick search input' })
+      .getByRole('combobox', { name: 'Search documents' })
       .fill('second');
 
     // Now there is a sub page - expect to have the focus on the current doc

src/frontend/apps/e2e/__tests__/app-impress/doc-table-content.spec.ts

@@ -19,7 +19,9 @@ test.describe('Doc Table Content', () => {
 
     await page.locator('.ProseMirror').click();
 
-    await expect(page.getByRole('button', { name: 'Summary' })).toBeHidden();
+    await expect(
+      page.getByRole('button', { name: 'Show the table of contents' }),
+    ).toBeHidden();
 
     await page.keyboard.type('# Level 1\n## Level 2\n### Level 3');
 

src/frontend/apps/e2e/__tests__/app-impress/doc-tree.spec.ts

@@ -42,15 +42,12 @@ test.describe('Doc Tree', () => {
     await expect(secondSubPageItem).toBeVisible();
 
     // Check the position of the sub pages
-    const allSubPageItems = await docTree
-      .getByTestId(/^doc-sub-page-item/)
-      .all();
-
-    expect(allSubPageItems.length).toBe(2);
+    const allSubPageItems = docTree.getByTestId(/^doc-sub-page-item/);
+    await expect(allSubPageItems).toHaveCount(2);
 
     // Check that elements are in the correct order
-    await expect(allSubPageItems[0].getByText('first move')).toBeVisible();
-    await expect(allSubPageItems[1].getByText('second move')).toBeVisible();
+    await expect(allSubPageItems.nth(0).getByText('first move')).toBeVisible();
+    await expect(allSubPageItems.nth(1).getByText('second move')).toBeVisible();
 
     // Will move the first sub page to the second position
     const firstSubPageBoundingBox = await firstSubPageItem.boundingBox();
@@ -90,17 +87,15 @@ test.describe('Doc Tree', () => {
     await expect(secondSubPageItem).toBeVisible();
 
     // Check that elements are in the correct order
-    const allSubPageItemsAfterReload = await docTree
-      .getByTestId(/^doc-sub-page-item/)
-      .all();
-
-    expect(allSubPageItemsAfterReload.length).toBe(2);
+    const allSubPageItemsAfterReload =
+      docTree.getByTestId(/^doc-sub-page-item/);
+    await expect(allSubPageItemsAfterReload).toHaveCount(2);
 
     await expect(
-      allSubPageItemsAfterReload[0].getByText('second move'),
+      allSubPageItemsAfterReload.nth(0).getByText('second move'),
     ).toBeVisible();
     await expect(
-      allSubPageItemsAfterReload[1].getByText('first move'),
+      allSubPageItemsAfterReload.nth(1).getByText('first move'),
     ).toBeVisible();
   });
 
@@ -162,7 +157,7 @@ test.describe('Doc Tree', () => {
     );
     const currentUserRole = currentUser.getByTestId('doc-role-dropdown');
     await currentUserRole.click();
-    await page.getByRole('menuitem', { name: 'Administrator' }).click();
+    await page.getByRole('menuitemradio', { name: 'Administrator' }).click();
     await list.click();
 
     await page.getByRole('button', { name: 'Ok' }).click();
@@ -297,7 +292,7 @@ test.describe('Doc Tree', () => {
 
     await page.keyboard.press('Tab');
 
-    await expect(page.getByLabel('Open onboarding menu')).toBeFocused();
+    await expect(page.getByLabel('Open help menu')).toBeFocused();
 
     await page.keyboard.press('Tab');
 
@@ -307,7 +302,7 @@ test.describe('Doc Tree', () => {
 
     await page.keyboard.press('Shift+Tab');
 
-    await expect(page.getByLabel('Open onboarding menu')).toBeFocused();
+    await expect(page.getByLabel('Open help menu')).toBeFocused();
 
     await page.keyboard.press('Shift+Tab');
 
@@ -390,11 +385,7 @@ test.describe('Doc Tree: Inheritance', () => {
     const selectVisibility = page.getByTestId('doc-visibility');
     await selectVisibility.click();
 
-    await page
-      .getByRole('menuitem', {
-        name: 'Public',
-      })
-      .click();
+    await page.getByRole('menuitemradio', { name: 'Public' }).click();
 
     await expect(
       page.getByText('The document visibility has been updated.'),

src/frontend/apps/e2e/__tests__/app-impress/doc-version.spec.ts

@@ -23,8 +23,8 @@ test.describe('Doc Version', () => {
     await page.getByRole('menuitem', { name: 'Version history' }).click();
     await expect(page.getByText('History', { exact: true })).toBeVisible();
 
-    const modal = page.getByLabel('version history modal');
-    const panel = modal.getByLabel('version list');
+    const modal = page.getByRole('dialog', { name: 'Version history' });
+    const panel = modal.getByLabel('Version list');
     await expect(panel).toBeVisible();
     await expect(modal.getByText('No versions')).toBeVisible();
 
@@ -79,9 +79,9 @@ test.describe('Doc Version', () => {
     await expect(panel).toBeVisible();
     await expect(page.getByText('History', { exact: true })).toBeVisible();
     await expect(page.getByRole('status')).toBeHidden();
-    const items = await panel.locator('.version-item').all();
-    expect(items.length).toBe(2);
-    await items[1].click();
+    const items = panel.locator('.version-item');
+    await expect(items).toHaveCount(2);
+    await items.nth(1).click();
 
     await expect(modal.getByText('Hello World')).toBeVisible();
     await expect(modal.getByText('It will create a version')).toBeHidden();
@@ -89,7 +89,7 @@ test.describe('Doc Version', () => {
       modal.locator('div[data-content-type="callout"]').first(),
     ).toBeHidden();
 
-    await items[0].click();
+    await items.nth(0).click();
 
     await expect(modal.getByText('Hello World')).toBeVisible();
     await expect(modal.getByText('It will create a version')).toBeVisible();
@@ -100,7 +100,7 @@ test.describe('Doc Version', () => {
       modal.getByText('It will create a second version'),
     ).toBeHidden();
 
-    await items[1].click();
+    await items.nth(1).click();
 
     await expect(modal.getByText('Hello World')).toBeVisible();
     await expect(modal.getByText('It will create a version')).toBeHidden();
@@ -155,21 +155,26 @@ test.describe('Doc Version', () => {
     await page.getByLabel('Open the document options').click();
     await page.getByRole('menuitem', { name: 'Version history' }).click();
 
-    const modal = page.getByLabel('version history modal');
-    const panel = modal.getByLabel('version list');
+    const modal = page.getByRole('dialog', { name: 'Version history' });
+    const panel = modal.getByLabel('Version list');
     await expect(panel).toBeVisible();
 
     await expect(page.getByText('History', { exact: true })).toBeVisible();
-    await panel.getByRole('button', { name: 'version item' }).click();
+    await panel.locator('.version-item').first().click();
 
     await expect(modal.getByText('World')).toBeHidden();
 
-    await page.getByRole('button', { name: 'Restore' }).click();
-    await expect(page.getByText('Your current document will')).toBeVisible();
-    await page.getByText('If a member is editing, his').click();
+    await page.getByRole('button', { name: 'Restore', exact: true }).click();
+    await expect(
+      page.getByText(
+        "The current document will be replaced, but you'll still find it in the version history.",
+      ),
+    ).toBeVisible();
 
     await page.getByLabel('Restore', { exact: true }).click();
 
+    await page.waitForTimeout(500);
+
     await expect(page.getByText('Hello')).toBeVisible();
     await expect(page.getByText('World')).toBeHidden();
   });

src/frontend/apps/e2e/__tests__/app-impress/doc-visibility.spec.ts

@@ -47,20 +47,20 @@ test.describe('Doc Visibility', () => {
     await expect(selectVisibility.getByText('Private')).toBeVisible();
 
     await expect(
-      page.getByRole('menuitem', { name: 'Read only' }),
+      page.getByRole('menuitemradio', { name: 'Read only' }),
     ).toBeHidden();
     await expect(
-      page.getByRole('menuitem', { name: 'Can read and edit' }),
+      page.getByRole('menuitemradio', { name: 'Can read and edit' }),
     ).toBeHidden();
 
     await selectVisibility.click();
-    await page.getByRole('menuitem', { name: 'Connected' }).click();
+    await page.getByRole('menuitemradio', { name: 'Connected' }).click();
 
     await expect(page.getByTestId('doc-access-mode')).toBeVisible();
 
     await selectVisibility.click();
 
-    await page.getByRole('menuitem', { name: 'Public' }).click();
+    await page.getByRole('menuitemradio', { name: 'Public' }).click();
 
     await expect(page.getByTestId('doc-access-mode')).toBeVisible();
   });
@@ -205,11 +205,7 @@ test.describe('Doc Visibility: Public', () => {
     const selectVisibility = page.getByTestId('doc-visibility');
     await selectVisibility.click();
 
-    await page
-      .getByRole('menuitem', {
-        name: 'Public',
-      })
-      .click();
+    await page.getByRole('menuitemradio', { name: 'Public' }).click();
 
     await expect(
       page.getByText('The document visibility has been updated.'),
@@ -217,11 +213,7 @@ test.describe('Doc Visibility: Public', () => {
 
     await expect(page.getByTestId('doc-access-mode')).toBeVisible();
     await page.getByTestId('doc-access-mode').click();
-    await page
-      .getByRole('menuitem', {
-        name: 'Reading',
-      })
-      .click();
+    await page.getByRole('menuitemradio', { name: 'Reading' }).click();
 
     await expect(
       page.getByText('The document visibility has been updated.').first(),
@@ -307,18 +299,14 @@ test.describe('Doc Visibility: Public', () => {
     const selectVisibility = page.getByTestId('doc-visibility');
     await selectVisibility.click();
 
-    await page
-      .getByRole('menuitem', {
-        name: 'Public',
-      })
-      .click();
+    await page.getByRole('menuitemradio', { name: 'Public' }).click();
 
     await expect(
       page.getByText('The document visibility has been updated.'),
     ).toBeVisible();
 
     await page.getByTestId('doc-access-mode').click();
-    await page.getByRole('menuitem', { name: 'Editing' }).click();
+    await page.getByRole('menuitemradio', { name: 'Editing' }).click();
 
     await expect(
       page.getByText('The document visibility has been updated.').first(),
@@ -402,11 +390,7 @@ test.describe('Doc Visibility: Authenticated', () => {
     await page.getByRole('button', { name: 'Share' }).click();
     const selectVisibility = page.getByTestId('doc-visibility');
     await selectVisibility.click();
-    await page
-      .getByRole('menuitem', {
-        name: 'Connected',
-      })
-      .click();
+    await page.getByRole('menuitemradio', { name: 'Connected' }).click();
 
     await expect(
       page.getByText('The document visibility has been updated.'),
@@ -454,11 +438,7 @@ test.describe('Doc Visibility: Authenticated', () => {
     await page.getByRole('button', { name: 'Share' }).click();
     const selectVisibility = page.getByTestId('doc-visibility');
     await selectVisibility.click();
-    await page
-      .getByRole('menuitem', {
-        name: 'Connected',
-      })
-      .click();
+    await page.getByRole('menuitemradio', { name: 'Connected' }).click();
 
     await expect(
       page.getByText('The document visibility has been updated.'),
@@ -556,11 +536,7 @@ test.describe('Doc Visibility: Authenticated', () => {
     await page.getByRole('button', { name: 'Share' }).click();
     const selectVisibility = page.getByTestId('doc-visibility');
     await selectVisibility.click();
-    await page
-      .getByRole('menuitem', {
-        name: 'Connected',
-      })
-      .click();
+    await page.getByRole('menuitemradio', { name: 'Connected' }).click();
 
     await expect(
       page.getByText('The document visibility has been updated.'),
@@ -568,7 +544,7 @@ test.describe('Doc Visibility: Authenticated', () => {
 
     const urlDoc = page.url();
     await page.getByTestId('doc-access-mode').click();
-    await page.getByRole('menuitem', { name: 'Editing' }).click();
+    await page.getByRole('menuitemradio', { name: 'Editing' }).click();
 
     await expect(
       page.getByText('The document visibility has been updated.').first(),

src/frontend/apps/e2e/__tests__/app-impress/footer.spec.ts

@@ -47,7 +47,7 @@ test.describe('Footer', () => {
     // Check the translation
     const header = page.locator('header').first();
     await header.getByRole('button').getByText('English').click();
-    await page.getByRole('menuitem', { name: 'Français' }).click();
+    await page.getByRole('menuitemradio', { name: 'Français' }).click();
 
     await expect(
       page.locator('footer').getByText('Mentions légales'),
@@ -131,7 +131,7 @@ test.describe('Footer', () => {
     // Check the translation
     const header = page.locator('header').first();
     await header.getByRole('button').getByText('English').click();
-    await page.getByRole('menuitem', { name: 'Français' }).click();
+    await page.getByRole('menuitemradio', { name: 'Français' }).click();
 
     await expect(
       page

src/frontend/apps/e2e/__tests__/app-impress/header.spec.ts

@@ -191,25 +191,27 @@ test.describe('Header: Override configuration', () => {
 });
 
 test.describe('Header: Skip to Content', () => {
-  test('it displays skip link on first TAB and focuses main content on click', async ({
+  test('it displays skip link on first TAB and focuses page heading on click', async ({
     page,
   }) => {
     await page.goto('/');
 
-    // Wait for skip button to be mounted (client-side only component)
-    const skipButton = page.getByRole('button', { name: 'Go to content' });
-    await skipButton.waitFor({ state: 'attached' });
+    // Wait for skip link to be mounted (client-side only component)
+    const skipLink = page.getByRole('link', { name: 'Go to content' });
+    await skipLink.waitFor({ state: 'attached' });
 
-    // First TAB shows the skip button
+    // First TAB shows the skip link
     await page.keyboard.press('Tab');
 
-    // The skip button should be visible and focused
-    await expect(skipButton).toBeFocused();
-    await expect(skipButton).toBeVisible();
-
-    // Clicking moves focus to the main content
-    await skipButton.click();
-    const mainContent = page.locator('main#mainContent');
-    await expect(mainContent).toBeFocused();
+    // The skip link should be visible and focused
+    await expect(skipLink).toBeFocused();
+    await expect(skipLink).toBeVisible();
+    // Clicking moves focus to the page heading
+    await skipLink.click();
+    const pageHeading = page.getByRole('heading', {
+      name: 'All docs',
+      level: 2,
+    });
+    await expect(pageHeading).toBeFocused();
   });
 });

src/frontend/apps/e2e/__tests__/app-impress/help.spec.ts

@@ -26,7 +26,7 @@ test.describe('Help feature', () => {
       await expect(page.getByRole('button', { name: 'New doc' })).toBeVisible();
 
       await expect(
-        page.getByRole('button', { name: 'Open onboarding menu' }),
+        page.getByRole('button', { name: 'Open help menu' }),
       ).toBeHidden();
     });
 
@@ -42,7 +42,7 @@ test.describe('Help feature', () => {
         },
       });
 
-      await page.getByRole('button', { name: 'Open onboarding menu' }).click();
+      await page.getByRole('button', { name: 'Open help menu' }).click();
 
       await page.getByRole('menuitem', { name: 'Onboarding' }).click();
 
@@ -86,7 +86,7 @@ test.describe('Help feature', () => {
     });
 
     test('closes modal with Skip button', async ({ page }) => {
-      await page.getByRole('button', { name: 'Open onboarding menu' }).click();
+      await page.getByRole('button', { name: 'Open help menu' }).click();
       await page.getByRole('menuitem', { name: 'Onboarding' }).click();
 
       const modal = page.getByTestId('onboarding-modal');
@@ -106,9 +106,7 @@ test.describe('Help feature', () => {
       // switch to french
       await waitForLanguageSwitch(page, TestLanguage.French);
 
-      await page
-        .getByRole('button', { name: "Ouvrir le menu d'embarquement" })
-        .click();
+      await page.getByRole('button', { name: "Ouvrir le menu d'aide" }).click();
 
       await page.getByRole('menuitem', { name: 'Premiers pas' }).click();
 

src/frontend/apps/e2e/__tests__/app-impress/language.spec.ts

@@ -75,7 +75,7 @@ test.describe('Language', () => {
 
     await expect(page.locator('[role="menu"]')).toBeVisible();
 
-    const menuItems = page.getByRole('menuitem');
+    const menuItems = page.locator('[role="menuitemradio"]');
     await expect(menuItems.first()).toBeVisible();
 
     await menuItems.first().click();

src/frontend/apps/e2e/__tests__/app-impress/left-panel.spec.ts

@@ -1,6 +1,7 @@
 import { expect, test } from '@playwright/test';
 
 import { createDoc, goToGridDoc, verifyDocName } from './utils-common';
+import { createRootSubPage } from './utils-sub-pages';
 
 test.describe('Left panel desktop', () => {
   test.beforeEach(async ({ page }) => {
@@ -18,7 +19,7 @@ test.describe('Left panel desktop', () => {
     await expect(page.getByTestId('home-button')).toBeVisible();
   });
 
-  test('focuses main content after switching the docs filter', async ({
+  test('focuses page heading after switching the docs filter', async ({
     page,
   }) => {
     await page.goto('/');
@@ -28,8 +29,11 @@ test.describe('Left panel desktop', () => {
     await page.keyboard.press('Enter');
     await expect(page).toHaveURL(/target=my_docs/);
 
-    const mainContent = page.locator('main#mainContent');
-    await expect(mainContent).toBeFocused();
+    const pageHeading = page.getByRole('heading', {
+      name: 'My docs',
+      level: 2,
+    });
+    await expect(pageHeading).toBeFocused();
   });
 
   test('checks resize handle is present and functional on document page', async ({
@@ -118,6 +122,47 @@ test.describe('Left panel mobile', () => {
     await expect(logoutButton).toBeInViewport();
   });
 
+  test('checks panel closes when clicking on a subdoc', async ({
+    page,
+    browserName,
+  }) => {
+    const [docTitle] = await createDoc(
+      page,
+      'mobile-doc-test',
+      browserName,
+      1,
+      true,
+    );
+
+    const { name: docChild } = await createRootSubPage(
+      page,
+      browserName,
+      'mobile-doc-test-child',
+      true,
+    );
+
+    const { name: docChild2 } = await createRootSubPage(
+      page,
+      browserName,
+      'mobile-doc-test-child-2',
+      true,
+    );
+
+    const header = page.locator('header').first();
+    await header.getByLabel('Open the header menu').click();
+
+    await expect(page.getByTestId('left-panel-mobile')).toBeInViewport();
+
+    const docTree = page.getByTestId('doc-tree');
+    await expect(docTree.getByText(docTitle)).toBeVisible();
+    await expect(docTree.getByText(docChild)).toBeVisible();
+    await expect(docTree.getByText(docChild2)).toBeVisible();
+
+    await docTree.getByText(docChild).click();
+    await verifyDocName(page, docChild);
+    await expect(page.getByTestId('left-panel-mobile')).not.toBeInViewport();
+  });
+
   test('checks resize handle is not present on mobile', async ({ page }) => {
     await page.goto('/');
 

src/frontend/apps/e2e/__tests__/app-impress/utils-common.ts

@@ -382,7 +382,7 @@ export async function waitForLanguageSwitch(
 
   await languagePicker.click();
 
-  await page.getByRole('menuitem', { name: lang.label }).click();
+  await page.getByRole('menuitemradio', { name: lang.label }).click();
 }
 
 export const clickInEditorMenu = async (page: Page, textButton: string) => {

src/frontend/apps/e2e/__tests__/app-impress/utils-share.ts

@@ -39,7 +39,7 @@ export const addNewMember = async (
 
   // Choose a role
   await page.getByTestId('doc-role-dropdown').click();
-  await page.getByRole('menuitem', { name: role }).click();
+  await page.getByRole('menuitemradio', { name: role }).click();
   await page.getByTestId('doc-share-invite-button').click();
 
   return users[index].email;
@@ -51,7 +51,7 @@ export const updateShareLink = async (
   linkRole?: LinkRole | null,
 ) => {
   await page.getByTestId('doc-visibility').click();
-  await page.getByRole('menuitem', { name: linkReach }).click();
+  await page.getByRole('menuitemradio', { name: linkReach }).click();
 
   const visibilityUpdatedText = page
     .getByText('The document visibility has been updated')
@@ -61,7 +61,7 @@ export const updateShareLink = async (
 
   if (linkRole) {
     await page.getByTestId('doc-access-mode').click();
-    await page.getByRole('menuitem', { name: linkRole }).click();
+    await page.getByRole('menuitemradio', { name: linkRole }).click();
     await expect(visibilityUpdatedText).toBeVisible();
   }
 };
@@ -76,7 +76,7 @@ export const updateRoleUser = async (
   const currentUser = list.getByTestId(`doc-share-member-row-${email}`);
   const currentUserRole = currentUser.getByTestId('doc-role-dropdown');
   await currentUserRole.click();
-  await page.getByRole('menuitem', { name: role }).click();
+  await page.getByRole('menuitemradio', { name: role }).click();
   await list.click();
 };
 

src/frontend/apps/e2e/package.json

@@ -1,6 +1,6 @@
 {
   "name": "app-e2e",
-  "version": "4.8.1",
+  "version": "4.8.3",
   "repository": "https://github.com/suitenumerique/docs",
   "author": "DINUM",
   "license": "MIT",

src/frontend/apps/impress/package.json

@@ -1,6 +1,6 @@
 {
   "name": "app-impress",
-  "version": "4.8.1",
+  "version": "4.8.3",
   "repository": "https://github.com/suitenumerique/docs",
   "author": "DINUM",
   "license": "MIT",
@@ -23,7 +23,7 @@
   },
   "dependencies": {
     "@ag-media/react-pdf-table": "2.0.3",
-    "@ai-sdk/openai": "3.0.19",
+    "@ai-sdk/openai": "3.0.45",
     "@blocknote/code-block": "0.47.1",
     "@blocknote/core": "0.47.1",
     "@blocknote/mantine": "0.47.1",
@@ -38,20 +38,20 @@
     "@emoji-mart/data": "1.2.1",
     "@emoji-mart/react": "1.1.1",
     "@fontsource-variable/inter": "5.2.8",
-    "@fontsource-variable/material-symbols-outlined": "5.2.35",
+    "@fontsource-variable/material-symbols-outlined": "5.2.38",
     "@fontsource/material-icons": "5.2.7",
     "@gouvfr-lasuite/cunningham-react": "4.2.0",
     "@gouvfr-lasuite/integration": "1.0.3",
-    "@gouvfr-lasuite/ui-kit": "0.19.6",
+    "@gouvfr-lasuite/ui-kit": "0.19.10",
     "@hocuspocus/provider": "3.4.4",
-    "@mantine/core": "8.3.14",
-    "@mantine/hooks": "8.3.14",
+    "@mantine/core": "8.3.17",
+    "@mantine/hooks": "8.3.17",
     "@react-aria/live-announcer": "3.4.4",
     "@react-pdf/renderer": "4.3.1",
-    "@sentry/nextjs": "10.38.0",
+    "@sentry/nextjs": "10.43.0",
     "@tanstack/react-query": "5.90.21",
     "@tiptap/extensions": "*",
-    "ai": "6.0.49",
+    "ai": "6.0.128",
     "canvg": "4.0.3",
     "clsx": "2.1.1",
     "cmdk": "1.1.1",
@@ -59,28 +59,28 @@
     "emoji-datasource-apple": "16.0.0",
     "emoji-mart": "5.6.0",
     "emoji-regex": "10.6.0",
-    "i18next": "25.8.12",
+    "i18next": "25.8.18",
     "i18next-browser-languagedetector": "8.2.1",
     "idb": "8.0.3",
     "lodash": "4.17.23",
     "luxon": "3.7.2",
-    "next": "16.1.6",
-    "posthog-js": "1.347.2",
+    "next": "16.1.7",
+    "posthog-js": "1.360.2",
     "react": "*",
-    "react-aria-components": "1.15.1",
+    "react-aria-components": "1.16.0",
     "react-dom": "*",
     "react-dropzone": "15.0.0",
-    "react-i18next": "16.5.4",
-    "react-intersection-observer": "10.0.2",
+    "react-i18next": "16.5.8",
+    "react-intersection-observer": "10.0.3",
     "react-resizable-panels": "3.0.6",
     "react-select": "5.10.2",
-    "styled-components": "6.3.9",
+    "styled-components": "6.3.11",
     "use-debounce": "10.1.0",
     "uuid": "13.0.0",
     "y-protocols": "1.0.7",
     "yjs": "*",
-    "zod": "3.25.28",
-    "zustand": "5.0.11"
+    "zod": "4.3.6",
+    "zustand": "5.0.12"
   },
   "devDependencies": {
     "@svgr/webpack": "8.1.0",
@@ -89,26 +89,25 @@
     "@testing-library/jest-dom": "6.9.1",
     "@testing-library/react": "16.3.2",
     "@testing-library/user-event": "14.6.1",
-    "@types/lodash": "4.17.23",
+    "@types/lodash": "4.17.24",
     "@types/luxon": "3.7.1",
     "@types/node": "*",
     "@types/react": "*",
     "@types/react-dom": "*",
-    "@vitejs/plugin-react": "5.1.4",
+    "@vitejs/plugin-react": "6.0.1",
     "cross-env": "10.1.0",
     "dotenv": "17.3.1",
     "eslint-plugin-docs": "*",
     "fetch-mock": "9.11.0",
-    "jsdom": "28.1.0",
+    "jsdom": "29.0.0",
     "node-fetch": "2.7.0",
     "prettier": "3.8.1",
     "stylelint": "16.26.1",
     "stylelint-config-standard": "39.0.1",
     "stylelint-prettier": "5.0.3",
     "typescript": "*",
-    "vite-tsconfig-paths": "6.1.1",
-    "vitest": "4.0.18",
-    "webpack": "5.105.2",
+    "vitest": "4.1.0",
+    "webpack": "5.105.4",
     "workbox-webpack-plugin": "7.1.0"
   },
   "packageManager": "yarn@1.22.22"

src/frontend/apps/impress/src/assets/icons/ui-kit/markdown_copy.svg

@@ -0,0 +1,9 @@
+<svg
+  xmlns="http://www.w3.org/2000/svg"
+  viewBox="0 -960 960 960"
+  fill="currentColor"
+>
+  <path
+    d="M360-240q-33 0-56.5-23.5T280-320v-480q0-33 23.5-56.5T360-880h360q33 0 56.5 23.5T800-800v480q0 33-23.5 56.5T720-240H360Zm0-80h360v-480H360v480ZM200-80q-33 0-56.5-23.5T120-160v-560h80v560h440v80H200Zm210-360h60v-180h40v120h60v-120h40v180h60v-200q0-17-11.5-28.5T630-680H450q-17 0-28.5 11.5T410-640v200Zm-50 120v-480 480Z"
+  />
+</svg>

src/frontend/apps/impress/src/components/BoxButton.tsx

@@ -1,17 +1,17 @@
-import { forwardRef } from 'react';
+import { Ref, forwardRef } from 'react';
 import { css } from 'styled-components';
 
 import { Box, BoxType } from './Box';
 
-export type BoxButtonType = BoxType & {
+export type BoxButtonType = Omit<BoxType, 'ref'> & {
   disabled?: boolean;
+  ref?: Ref<HTMLButtonElement>;
 };
 
-/**
-
 /**
  * Styleless button that extends the Box component.
  * Good to wrap around SVGs or other elements that need to be clickable.
+ * Uses aria-disabled instead of native disabled to preserve keyboard focusability.
  * @param props - @see BoxType props
  * @param ref
  * @see Box
@@ -22,8 +22,8 @@ export type BoxButtonType = BoxType & {
  *  </BoxButton>
  * ```
  */
-const BoxButton = forwardRef<HTMLDivElement, BoxButtonType>(
-  ({ $css, ...props }, ref) => {
+const BoxButton = forwardRef<HTMLButtonElement, BoxButtonType>(
+  ({ $css, disabled, ...props }, ref) => {
     const theme = props.$theme || 'gray';
     const variation = props.$variation || 'primary';
 
@@ -31,16 +31,18 @@ const BoxButton = forwardRef<HTMLDivElement, BoxButtonType>(
       <Box
         ref={ref}
         as="button"
+        type="button"
         $background="none"
         $margin="none"
         $padding="none"
         $hasTransition
+        aria-disabled={disabled || undefined}
         $css={css`
-          cursor: ${props.disabled ? 'not-allowed' : 'pointer'};
+          cursor: ${disabled ? 'not-allowed' : 'pointer'};
           border: none;
           outline: none;
           font-family: inherit;
-          color: ${props.disabled &&
+          color: ${disabled &&
           `var(--c--contextuals--content--semantic--disabled--primary)`};
           &:focus-visible {
             transition: none;
@@ -53,11 +55,11 @@ const BoxButton = forwardRef<HTMLDivElement, BoxButtonType>(
         `}
         {...props}
         className={`--docs--box-button ${props.className || ''}`}
-        onClick={(event: React.MouseEvent<HTMLDivElement>) => {
-          if (props.disabled) {
+        onClick={(event: React.MouseEvent<HTMLButtonElement>) => {
+          if (disabled) {
             return;
           }
-          props.onClick?.(event);
+          props.onClick?.(event as unknown as React.MouseEvent<HTMLDivElement>);
         }}
       />
     );

src/frontend/apps/impress/src/components/DropButton.tsx

@@ -93,6 +93,8 @@ export const DropButton = ({
           onOpenChangeHandler(true);
         }}
         aria-label={label}
+        aria-haspopup="true"
+        aria-expanded={isLocalOpen}
         data-testid={testId}
         $css={css`
           font-family: ${font};

src/frontend/apps/impress/src/components/SkipToContent.tsx

@@ -1,63 +1,33 @@
 import { Button } from '@gouvfr-lasuite/cunningham-react';
-import { useRouter } from 'next/router';
-import { useEffect, useState } from 'react';
+import { useState } from 'react';
 import { useTranslation } from 'react-i18next';
-import { css } from 'styled-components';
 
 import { Box } from '@/components';
 import { useCunninghamTheme } from '@/cunningham';
 import { MAIN_LAYOUT_ID } from '@/layouts/conf';
+import { focusMainContentStart } from '@/layouts/utils';
 
 export const SkipToContent = () => {
   const { t } = useTranslation();
-  const router = useRouter();
   const { spacingsTokens } = useCunninghamTheme();
   const [isVisible, setIsVisible] = useState(false);
 
-  // Reset focus after route change so first TAB goes to skip link
-  useEffect(() => {
-    const handleRouteChange = () => {
-      (document.activeElement as HTMLElement)?.blur();
-
-      document.body.setAttribute('tabindex', '-1');
-      document.body.focus({ preventScroll: true });
-
-      setTimeout(() => {
-        document.body.removeAttribute('tabindex');
-      }, 100);
-    };
-
-    router.events.on('routeChangeComplete', handleRouteChange);
-    return () => {
-      router.events.off('routeChangeComplete', handleRouteChange);
-    };
-  }, [router.events]);
-
   const handleClick = (e: React.MouseEvent) => {
     e.preventDefault();
-    const mainContent = document.getElementById(MAIN_LAYOUT_ID);
-    if (mainContent) {
-      mainContent.focus();
-      mainContent.scrollIntoView({ behavior: 'smooth', block: 'start' });
+    const focusTarget = focusMainContentStart();
+
+    if (focusTarget instanceof HTMLElement) {
+      focusTarget.scrollIntoView({ behavior: 'smooth', block: 'start' });
     }
   };
 
   return (
-    <Box
-      $css={css`
-        .c__button--brand--primary.--docs--skip-to-content:focus-visible {
-          box-shadow:
-            0 0 0 1px var(--c--globals--colors--white-000),
-            0 0 0 4px var(--c--contextuals--border--semantic--brand--primary);
-          border-radius: var(--c--globals--spacings--st);
-        }
-      `}
-    >
+    <Box>
       <Button
-        onClick={handleClick}
-        type="button"
+        href={`#${MAIN_LAYOUT_ID}`}
         color="brand"
         className="--docs--skip-to-content"
+        onClick={handleClick}
         onFocus={() => setIsVisible(true)}
         onBlur={() => setIsVisible(false)}
         style={{
@@ -65,7 +35,6 @@ export const SkipToContent = () => {
           pointerEvents: isVisible ? 'auto' : 'none',
           position: 'fixed',
           top: spacingsTokens['2xs'],
-          // padding header + logo(32px) + gap(3xs≈4px) + text "Docs"(≈70px) + 12px
           left: `calc(${spacingsTokens['base']} + 32px + ${spacingsTokens['3xs']} + 70px + 12px)`,
           zIndex: 9999,
           whiteSpace: 'nowrap',

src/frontend/apps/impress/src/components/dropdown-menu/DropdownMenu.tsx

@@ -26,6 +26,7 @@ import { useDropdownKeyboardNav } from './hook/useDropdownKeyboardNav';
 export type DropdownMenuOption = {
   icon?: ReactNode;
   label: string;
+  lang?: string;
   testId?: string;
   value?: string;
   callback?: () => void | Promise<unknown>;
@@ -69,7 +70,10 @@ export const DropdownMenu = ({
   const [isOpen, setIsOpen] = useState(opened ?? false);
   const [focusedIndex, setFocusedIndex] = useState(-1);
   const blockButtonRef = useRef<HTMLDivElement>(null);
-  const menuItemRefs = useRef<(HTMLDivElement | null)[]>([]);
+  const menuItemRefs = useRef<(HTMLButtonElement | null)[]>([]);
+  const isSingleSelectable = options.some(
+    (option) => option.isSelected !== undefined,
+  );
 
   const onOpenChange = useCallback(
     (isOpen: boolean) => {
@@ -172,14 +176,25 @@ export const DropdownMenu = ({
           }
           const isDisabled = option.disabled !== undefined && option.disabled;
           const isFocused = index === focusedIndex;
+          const isSelected =
+            option.isSelected === true ||
+            (selectedValues?.includes(option.value ?? '') ?? false);
+          const itemRole =
+            selectedValues !== undefined
+              ? 'menuitemcheckbox'
+              : isSingleSelectable
+                ? 'menuitemradio'
+                : 'menuitem';
+          const optionKey = option.value ?? option.testId ?? `option-${index}`;
 
           return (
-            <Fragment key={option.label}>
+            <Fragment key={optionKey}>
               <BoxButton
                 ref={(el) => {
                   menuItemRefs.current[index] = el;
                 }}
-                role="menuitem"
+                role={itemRole}
+                aria-checked={itemRole === 'menuitem' ? undefined : isSelected}
                 data-testid={option.testId}
                 $direction="row"
                 disabled={isDisabled}
@@ -190,7 +205,6 @@ export const DropdownMenu = ({
                   triggerOption(option);
                 }}
                 onKeyDown={keyboardAction(() => triggerOption(option))}
-                key={option.label}
                 $align="center"
                 $justify="space-between"
                 $background="var(--c--contextuals--background--surface--primary)"
@@ -261,16 +275,16 @@ export const DropdownMenu = ({
                     <Box
                       $theme="neutral"
                       $variation={isDisabled ? 'tertiary' : 'primary'}
+                      aria-hidden="true"
                     >
                       {option.icon}
                     </Box>
                   )}
                   <Text $variation={isDisabled ? 'tertiary' : 'primary'}>
-                    {option.label}
+                    <span lang={option.lang}>{option.label}</span>
                   </Text>
                 </Box>
-                {(option.isSelected ||
-                  selectedValues?.includes(option.value ?? '')) && (
+                {isSelected && (
                   <Icon
                     iconName="check"
                     $size="20px"

src/frontend/apps/impress/src/components/dropdown-menu/__tests__/DropdownMenu.spec.tsx

@@ -0,0 +1,119 @@
+import { render, screen, waitFor, within } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
+import React from 'react';
+import { describe, expect, test, vi } from 'vitest';
+
+import { AppWrapper } from '@/tests/utils';
+
+import { DropdownMenu, DropdownMenuOption } from '../DropdownMenu';
+
+const mockAddLastFocus = vi.fn();
+vi.mock('@/stores', () => ({
+  useFocusStore: (selector: any) =>
+    selector({ addLastFocus: mockAddLastFocus }),
+  useResponsiveStore: () => ({ isDesktop: true }),
+}));
+
+const baseOptions: DropdownMenuOption[] = [
+  { label: 'English', callback: vi.fn() },
+  { label: 'Français', callback: vi.fn() },
+  { label: 'Deutsch', callback: vi.fn() },
+];
+
+const selectableOptions: DropdownMenuOption[] = [
+  { label: 'English', isSelected: false, callback: vi.fn() },
+  { label: 'Français', isSelected: true, callback: vi.fn() },
+  { label: 'Deutsch', isSelected: false, callback: vi.fn() },
+];
+
+describe('<DropdownMenu />', () => {
+  test('renders menuitem role when options have no selection', async () => {
+    render(
+      <DropdownMenu options={baseOptions} label="Options" opened>
+        Open menu
+      </DropdownMenu>,
+      { wrapper: AppWrapper },
+    );
+
+    const items = screen.getAllByRole('menuitem');
+    expect(items).toHaveLength(3);
+    items.forEach((item) => {
+      expect(item).not.toHaveAttribute('aria-checked');
+    });
+  });
+
+  test('renders menuitemradio role with aria-checked when options have isSelected', async () => {
+    render(
+      <DropdownMenu options={selectableOptions} label="Select language" opened>
+        Français
+      </DropdownMenu>,
+      { wrapper: AppWrapper },
+    );
+
+    const radios = screen.getAllByRole('menuitemradio');
+    expect(radios).toHaveLength(3);
+
+    expect(radios[0]).toHaveAttribute('aria-checked', 'false');
+    expect(radios[1]).toHaveAttribute('aria-checked', 'true');
+    expect(radios[2]).toHaveAttribute('aria-checked', 'false');
+  });
+
+  test('renders menuitemcheckbox role with aria-checked when selectedValues is provided', async () => {
+    const optionsWithValues: DropdownMenuOption[] = [
+      { label: 'English', value: 'en', callback: vi.fn() },
+      { label: 'Français', value: 'fr', callback: vi.fn() },
+      { label: 'Deutsch', value: 'de', callback: vi.fn() },
+    ];
+
+    render(
+      <DropdownMenu
+        options={optionsWithValues}
+        selectedValues={['fr']}
+        label="Select language"
+        opened
+      >
+        Français
+      </DropdownMenu>,
+      { wrapper: AppWrapper },
+    );
+
+    const checkboxes = screen.getAllByRole('menuitemcheckbox');
+    expect(checkboxes).toHaveLength(3);
+
+    expect(checkboxes[0]).toHaveAttribute('aria-checked', 'false');
+    expect(checkboxes[1]).toHaveAttribute('aria-checked', 'true');
+    expect(checkboxes[2]).toHaveAttribute('aria-checked', 'false');
+  });
+
+  test('trigger button has aria-haspopup and aria-expanded', async () => {
+    render(
+      <DropdownMenu options={baseOptions} label="Select language">
+        Français
+      </DropdownMenu>,
+      { wrapper: AppWrapper },
+    );
+
+    const trigger = screen.getByRole('button', { name: 'Select language' });
+    expect(trigger).toHaveAttribute('aria-haspopup', 'true');
+    expect(trigger).toHaveAttribute('aria-expanded', 'false');
+
+    await userEvent.click(trigger);
+    await waitFor(() => {
+      expect(trigger).toHaveAttribute('aria-expanded', 'true');
+    });
+  });
+
+  test('displays check icon for selected item', async () => {
+    render(
+      <DropdownMenu options={selectableOptions} label="Select language" opened>
+        Français
+      </DropdownMenu>,
+      { wrapper: AppWrapper },
+    );
+
+    const menu = screen.getByRole('menu');
+    const checkedItem = within(menu).getAllByRole('menuitemradio')[1];
+    expect(checkedItem).toHaveAttribute('aria-checked', 'true');
+    expect(within(checkedItem).getByText('Français')).toBeInTheDocument();
+  });
+});

src/frontend/apps/impress/src/components/dropdown-menu/hook/useDropdownKeyboardNav.ts

@@ -6,7 +6,7 @@ type UseDropdownKeyboardNavProps = {
   isOpen: boolean;
   focusedIndex: number;
   options: DropdownMenuOption[];
-  menuItemRefs: RefObject<(HTMLDivElement | null)[]>;
+  menuItemRefs: RefObject<(HTMLButtonElement | null)[]>;
   setFocusedIndex: (index: number) => void;
   onOpenChange: (isOpen: boolean) => void;
 };

src/frontend/apps/impress/src/components/modal/AlertModal.tsx

@@ -56,7 +56,7 @@ export const AlertModal = ({
       isOpen={isOpen}
       size={ModalSize.MEDIUM}
       onClose={onClose}
-      aria-describedby="alert-modal-title"
+      aria-label={title}
       title={
         <Text
           $size="h6"

src/frontend/apps/impress/src/components/quick-search/QuickSearch.tsx

@@ -32,6 +32,7 @@ export type QuickSearchProps = {
   label?: string;
   placeholder?: string;
   groupKey?: string;
+  beforeList?: ReactNode;
 };
 
 export const QuickSearch = ({
@@ -41,6 +42,7 @@ export const QuickSearch = ({
   showInput = true,
   label,
   placeholder,
+  beforeList,
   children,
 }: PropsWithChildren<QuickSearchProps>) => {
   const ref = useRef<HTMLDivElement | null>(null);
@@ -76,6 +78,7 @@ export const QuickSearch = ({
               {inputContent}
             </QuickSearchInput>
           )}
+          {beforeList}
           <Command.List id={listId} aria-label={label} role="listbox">
             <Box>{children}</Box>
           </Command.List>

src/frontend/apps/impress/src/components/quick-search/QuickSearchInput.tsx

@@ -1,9 +1,10 @@
 import { Command } from 'cmdk';
-import { PropsWithChildren } from 'react';
+import { PropsWithChildren, useEffect, useRef } from 'react';
 import { useTranslation } from 'react-i18next';
 
 import { HorizontalSeparator } from '@/components';
 import { useCunninghamTheme } from '@/cunningham';
+import { useFocusStore } from '@/stores';
 
 import { Box } from '../Box';
 import { Icon } from '../Icon';
@@ -14,7 +15,6 @@ type QuickSearchInputProps = {
   placeholder?: string;
   withSeparator?: boolean;
   listId?: string;
-  isExpanded?: boolean;
 };
 export const QuickSearchInput = ({
   inputValue,
@@ -26,6 +26,12 @@ export const QuickSearchInput = ({
 }: PropsWithChildren<QuickSearchInputProps>) => {
   const { t } = useTranslation();
   const { spacingsTokens } = useCunninghamTheme();
+  const inputRef = useRef<HTMLInputElement>(null);
+  const addLastFocus = useFocusStore((state) => state.addLastFocus);
+
+  useEffect(() => {
+    addLastFocus(inputRef.current);
+  }, [addLastFocus]);
 
   if (children) {
     return (
@@ -42,11 +48,12 @@ export const QuickSearchInput = ({
         $direction="row"
         $align="center"
         className="quick-search-input"
-        $gap={spacingsTokens['2xs']}
+        $gap={spacingsTokens['xxs']}
         $padding={{ horizontal: 'base', vertical: 'xxs' }}
       >
         <Icon iconName="search" $variation="secondary" aria-hidden="true" />
         <Command.Input
+          ref={inputRef}
           autoFocus={true}
           aria-label={t('Quick search input')}
           aria-controls={listId}
@@ -55,6 +62,7 @@ export const QuickSearchInput = ({
           placeholder={placeholder ?? t('Search')}
           onValueChange={onFilter}
           maxLength={254}
+          minLength={6}
           data-testid="quick-search-input"
         />
       </Box>

src/frontend/apps/impress/src/components/quick-search/QuickSearchStyle.tsx

@@ -18,14 +18,15 @@ export const QuickSearchStyle = createGlobalStyle`
     [cmdk-input] {
       border: none;
       width: 100%;
-      font-size: 17px;
+      font-size: 16px;
       background: white;
       outline: none;
       color: var(--c--contextuals--content--semantic--neutral--primary);
       border-radius: var(--c--globals--spacings--0);
+      font-family: var(--c--globals--font--families--base);
 
       &::placeholder {
-        color: var(--c--globals--colors--gray-500);
+        color: var(--c--contextuals--content--semantic--neutral--tertiary);
       }
     }
 

src/frontend/apps/impress/src/features/docs/doc-editor/components/BlockNoteToolBar/ModalConfirmDownloadUnsafe.tsx

@@ -19,7 +19,7 @@ export const ModalConfirmDownloadUnsafe = ({
       isOpen
       closeOnClickOutside
       onClose={() => onClose()}
-      aria-describedby="modal-confirm-download-unsafe-title"
+      aria-label={t('Warning')}
       rightActions={
         <>
           <Button
@@ -48,7 +48,7 @@ export const ModalConfirmDownloadUnsafe = ({
       size={ModalSize.SMALL}
       title={
         <Text
-          as="h1"
+          as="h2"
           id="modal-confirm-download-unsafe-title"
           $gap="0.7rem"
           $size="h6"
@@ -61,10 +61,7 @@ export const ModalConfirmDownloadUnsafe = ({
         </Text>
       }
     >
-      <Box
-        aria-label={t('Modal confirmation to download the attachment')}
-        className="--docs--modal-confirm-download-unsafe"
-      >
+      <Box className="--docs--modal-confirm-download-unsafe">
         <Box>
           <Box $direction="column" $gap="0.35rem" $margin={{ top: 'sm' }}>
             <Text $variation="secondary">

src/frontend/apps/impress/src/features/docs/doc-editor/components/DocEditor.tsx

@@ -2,7 +2,7 @@ import clsx from 'clsx';
 import { useEffect, useState } from 'react';
 
 import { Box, Loading } from '@/components';
-import { DocHeader, FloatingBar } from '@/docs/doc-header/';
+import { DocHeader } from '@/docs/doc-header/';
 import {
   Doc,
   LinkReach,
@@ -35,7 +35,6 @@ export const DocEditorContainer = ({
 
   return (
     <>
-      {isDesktop && <FloatingBar />}
       <Box
         $maxWidth="868px"
         $width="100%"

src/frontend/apps/impress/src/features/docs/doc-editor/components/comments/styles.tsx

@@ -8,12 +8,37 @@ export const cssComments = (
   & .--docs--main-editor .ProseMirror {
     // Comments marks in the editor
     .bn-editor {
-      .bn-thread-mark:not([data-orphan='true']),
-      .bn-thread-mark-selected:not([data-orphan='true']) {
-        background: ${canSeeComment ? '#EDB40066' : 'transparent'};
-        color: var(--c--globals--colors--gray-700);
+      // Resets blocknote comments styles
+      .bn-thread-mark,
+      .bn-thread-mark-selected {
+        background-color: transparent;
       }
 
+      ${canSeeComment &&
+      css`
+        .bn-thread-mark:not([data-orphan='true']) {
+          background-color: color-mix(
+            in srgb,
+            var(--c--contextuals--background--palette--yellow--tertiary) 40%,
+            transparent
+          );
+          border-bottom: 2px solid
+            var(--c--contextuals--background--palette--yellow--secondary);
+
+          mix-blend-mode: multiply;
+
+          transition:
+            background-color var(--c--globals--transitions--duration),
+            border-bottom-color var(--c--globals--transitions--duration);
+
+          &:has(.bn-thread-mark-selected) {
+            background-color: var(
+              --c--contextuals--background--palette--yellow--tertiary
+            );
+          }
+        }
+      `}
+
       [data-show-selection] {
         color: HighlightText;
       }

src/frontend/apps/impress/src/features/docs/doc-editor/components/custom-blocks/AccessibleImageBlock.tsx

@@ -57,30 +57,22 @@ export const accessibleImageRender =
       imgSelector?.removeAttribute('aria-hidden');
       imgSelector?.setAttribute('tabindex', '0');
 
-      const figureElement = document.createElement('figure');
+      const originalCaption = dom.querySelector('.bn-file-caption');
 
-      // Copy all attributes from the original div
-      figureElement.className = dom.className;
-      const styleAttr = dom.getAttribute('style');
-      if (styleAttr) {
-        figureElement.setAttribute('style', styleAttr);
-      }
-      figureElement.style.setProperty('margin', '0');
+      if (imgSelector?.parentNode && originalCaption) {
+        const figureElement = document.createElement('figure');
+        figureElement.style.setProperty('margin', '0');
 
-      Array.from(dom.children).forEach((child) => {
-        figureElement.appendChild(child.cloneNode(true));
-      });
+        // Wrap only the img inside figure, preserving the rest of the dom tree
+        imgSelector.parentNode.insertBefore(figureElement, imgSelector);
+        figureElement.appendChild(imgSelector);
 
-      // Replace the <p> caption with <figcaption>
-      const figcaptionElement = document.createElement('figcaption');
-      const originalCaption = figureElement.querySelector('.bn-file-caption');
-      if (originalCaption) {
+        // Replace the <p> caption with <figcaption> inside the figure
+        const figcaptionElement = document.createElement('figcaption');
         figcaptionElement.className = originalCaption.className;
         figcaptionElement.textContent = originalCaption.textContent;
-        originalCaption.parentNode?.replaceChild(
-          figcaptionElement,
-          originalCaption,
-        );
+        figureElement.appendChild(figcaptionElement);
+        originalCaption.parentNode?.removeChild(originalCaption);
 
         // Add explicit role and aria-label for better screen reader support
         figureElement.setAttribute('role', 'img');
@@ -90,10 +82,9 @@ export const accessibleImageRender =
         );
       }
 
-      // Return the figure element as the new dom
       return {
         ...imageRenderComputed,
-        dom: figureElement,
+        dom,
       };
     };
 

src/frontend/apps/impress/src/features/docs/doc-editor/hook/useSaveDoc.tsx

@@ -3,7 +3,7 @@ import { useCallback, useEffect, useState } from 'react';
 import * as Y from 'yjs';
 
 import { useUpdateDoc } from '@/docs/doc-management/';
-import { KEY_LIST_DOC_VERSIONS } from '@/docs/doc-versioning';
+import { KEY_LIST_DOC_VERSIONS } from '@/docs/doc-versioning/api/useDocVersions';
 import { toBase64 } from '@/utils/string';
 import { isFirefox } from '@/utils/userAgent';
 

src/frontend/apps/impress/src/features/docs/doc-editor/hook/useShortcuts.tsx

@@ -1,11 +1,83 @@
-import { useEffect } from 'react';
+import { announce } from '@react-aria/live-announcer';
+import { useCallback, useEffect } from 'react';
+import { useTranslation } from 'react-i18next';
 
 import { DocsBlockNoteEditor } from '../types';
 
+const getFormattingShortcutLabel = (
+  event: KeyboardEvent,
+  t: (key: string) => string,
+): string | null => {
+  const isMod = event.ctrlKey || event.metaKey;
+  if (!isMod) {
+    return null;
+  }
+
+  if (event.altKey) {
+    switch (event.code) {
+      case 'Digit1':
+        return t('Heading 1 applied');
+      case 'Digit2':
+        return t('Heading 2 applied');
+      case 'Digit3':
+        return t('Heading 3 applied');
+      default:
+        return null;
+    }
+  }
+
+  if (event.shiftKey) {
+    switch (event.code) {
+      case 'Digit0':
+        return t('Paragraph applied');
+      case 'Digit6':
+        return t('Toggle list applied');
+      case 'Digit7':
+        return t('Numbered list applied');
+      case 'Digit8':
+        return t('Bulleted list applied');
+      case 'Digit9':
+        return t('Checklist applied');
+      case 'KeyC':
+        return t('Code block applied');
+      default:
+        return null;
+    }
+  }
+
+  return null;
+};
+
 export const useShortcuts = (
   editor: DocsBlockNoteEditor,
   el: HTMLDivElement | null,
 ) => {
+  const { t } = useTranslation();
+
+  const handleFormattingShortcut = useCallback(
+    (event: KeyboardEvent) => {
+      if (!editor?.isFocused()) {
+        return;
+      }
+
+      const label = getFormattingShortcutLabel(event, t);
+      if (label) {
+        setTimeout(() => {
+          announce(label, 'assertive');
+        }, 150);
+      }
+    },
+    [editor, t],
+  );
+
+  useEffect(() => {
+    el?.addEventListener('keydown', handleFormattingShortcut, true);
+
+    return () => {
+      el?.removeEventListener('keydown', handleFormattingShortcut, true);
+    };
+  }, [el, handleFormattingShortcut]);
+
   useEffect(() => {
     // Check if editor and its view are mounted
     if (!editor || !el) {

src/frontend/apps/impress/src/features/docs/doc-export/__tests__/ExportMIT.test.tsx

@@ -1,4 +1,9 @@
 import { afterAll, afterEach, describe, expect, it, vi } from 'vitest';
+
+vi.mock('@/docs/doc-export/components/ModalExport', () => ({
+  ModalExport: vi.fn(),
+}));
+
 const originalEnv = process.env.NEXT_PUBLIC_PUBLISH_AS_MIT;
 
 describe('useModuleExport', () => {
@@ -16,12 +21,12 @@ describe('useModuleExport', () => {
     const Export = await import('@/features/docs/doc-export/');
 
     expect(Export.default).toBeUndefined();
-  }, 15000);
+  });
 
   it('should load modules when NEXT_PUBLIC_PUBLISH_AS_MIT is false', async () => {
     process.env.NEXT_PUBLIC_PUBLISH_AS_MIT = 'false';
     const Export = await import('@/features/docs/doc-export/');
 
     expect(Export.default).toHaveProperty('ModalExport');
-  }, 15000);
+  });
 });

src/frontend/apps/impress/src/features/docs/doc-export/components/ModalExport.tsx

@@ -60,6 +60,23 @@ export const ModalExport = ({ onClose, doc }: ModalExportProps) => {
   const { untitledDocument } = useTrans();
   const mediaUrl = useMediaUrl();
 
+  const formatOptions = [
+    { label: t('PDF'), value: DocDownloadFormat.PDF },
+    { label: t('Docx'), value: DocDownloadFormat.DOCX },
+    { label: t('ODT'), value: DocDownloadFormat.ODT },
+    { label: t('HTML'), value: DocDownloadFormat.HTML },
+    { label: t('Print'), value: DocDownloadFormat.PRINT },
+  ];
+
+  const formatLabels = Object.fromEntries(
+    formatOptions.map((opt) => [opt.value, opt.label]),
+  );
+
+  const downloadButtonAriaLabel =
+    format === DocDownloadFormat.PRINT
+      ? t('Print')
+      : t('Download {{format}}', { format: formatLabels[format] });
+
   async function onSubmit() {
     if (!editor) {
       toast(t('The export failed'), VariantType.ERROR);
@@ -196,6 +213,7 @@ export const ModalExport = ({ onClose, doc }: ModalExportProps) => {
       closeOnClickOutside
       onClose={() => onClose()}
       hideCloseButton
+      aria-label={t('Export')}
       aria-describedby="modal-export-title"
       rightActions={
         <>
@@ -210,9 +228,7 @@ export const ModalExport = ({ onClose, doc }: ModalExportProps) => {
           </Button>
           <Button
             data-testid="doc-export-download-button"
-            aria-label={
-              format === DocDownloadFormat.PRINT ? t('Print') : t('Download')
-            }
+            aria-label={downloadButtonAriaLabel}
             variant="primary"
             fullWidth
             onClick={() => void onSubmit()}
@@ -247,7 +263,6 @@ export const ModalExport = ({ onClose, doc }: ModalExportProps) => {
     >
       <Box
         $margin={{ bottom: 'xl' }}
-        aria-label={t('Content modal to export the document')}
         $gap="1rem"
         className="--docs--modal-export-content"
       >
@@ -260,13 +275,7 @@ export const ModalExport = ({ onClose, doc }: ModalExportProps) => {
           clearable={false}
           fullWidth
           label={t('Format')}
-          options={[
-            { label: t('PDF'), value: DocDownloadFormat.PDF },
-            { label: t('Docx'), value: DocDownloadFormat.DOCX },
-            { label: t('ODT'), value: DocDownloadFormat.ODT },
-            { label: t('HTML'), value: DocDownloadFormat.HTML },
-            { label: t('Print'), value: DocDownloadFormat.PRINT },
-          ]}
+          options={formatOptions}
           value={format}
           onChange={(options) =>
             setFormat(options.target.value as DocDownloadFormat)

src/frontend/apps/impress/src/features/docs/doc-header/__tests__/DocToolBoxLicence.spec.tsx

@@ -1,6 +1,4 @@
 import { render, screen } from '@testing-library/react';
-import userEvent from '@testing-library/user-event';
-import React from 'react';
 import { afterAll, beforeEach, describe, expect, vi } from 'vitest';
 
 import { AppWrapper } from '@/tests/utils';
@@ -40,17 +38,11 @@ describe('DocToolBox - Licence', () => {
     render(<DocToolBox doc={doc as any} />, {
       wrapper: AppWrapper,
     });
-    const optionsButton = await screen.findByLabelText('Export the document');
-    await userEvent.click(optionsButton);
 
-    // Wait for the export modal to be visible, then assert on its content text.
-    await screen.findByTestId('modal-export-title');
     expect(
-      screen.getByText(
-        'Export your document to print or download in .docx, .odt, .pdf or .html(zip) format.',
-      ),
+      await screen.findByLabelText('Export the document'),
     ).toBeInTheDocument();
-  }, 10000);
+  }, 15000);
 
   test('The export button is not rendered when MIT version is activated', async () => {
     process.env.NEXT_PUBLIC_PUBLISH_AS_MIT = 'true';
@@ -68,5 +60,5 @@ describe('DocToolBox - Licence', () => {
     expect(
       screen.queryByLabelText('Export the document'),
     ).not.toBeInTheDocument();
-  });
+  }, 15000);
 });

src/frontend/apps/impress/src/features/docs/doc-header/components/AlertNetwork.tsx

@@ -73,6 +73,7 @@ export const AlertNetworkModal = ({ onClose }: AlertNetworkModalProps) => {
       isOpen
       closeOnClickOutside
       onClose={() => onClose()}
+      aria-label={t("Why you can't edit the document?")}
       rightActions={
         <>
           <Button
@@ -92,11 +93,7 @@ export const AlertNetworkModal = ({ onClose }: AlertNetworkModalProps) => {
         </Text>
       }
     >
-      <Box
-        aria-label={t('Content modal to explain why the user cannot edit')}
-        className="--docs--modal-alert-network"
-        $margin={{ top: 'md' }}
-      >
+      <Box className="--docs--modal-alert-network" $margin={{ top: 'md' }}>
         <Text $size="sm" $variation="secondary">
           {t(
             'Others are editing this document. Unfortunately your network blocks WebSockets, the technology enabling real-time co-editing.',

src/frontend/apps/impress/src/features/docs/doc-header/components/BoutonShare.tsx

@@ -55,7 +55,9 @@ export const BoutonShare = ({
         `}
       >
         <Button
-          aria-label={t('Share button')}
+          aria-label={t('Share button, shared with {{count}} users', {
+            count: doc.nb_accesses_direct,
+          })}
           variant="secondary"
           icon={
             <Icon

src/frontend/apps/impress/src/features/docs/doc-header/components/DocToolBox.tsx

@@ -1,9 +1,8 @@
 import { Button, useModal } from '@gouvfr-lasuite/cunningham-react';
 import { useTreeContext } from '@gouvfr-lasuite/ui-kit';
-import { useQueryClient } from '@tanstack/react-query';
 import dynamic from 'next/dynamic';
 import { useRouter } from 'next/router';
-import { useEffect, useState } from 'react';
+import { useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { css } from 'styled-components';
 
@@ -17,6 +16,7 @@ import GroupSVG from '@/assets/icons/ui-kit/group.svg';
 import HistorySVG from '@/assets/icons/ui-kit/history.svg';
 import KeepSVG from '@/assets/icons/ui-kit/keep.svg';
 import KeepOffSVG from '@/assets/icons/ui-kit/keep_off.svg';
+import MarkdownCopySVG from '@/assets/icons/ui-kit/markdown_copy.svg';
 import {
   Box,
   DropdownMenu,
@@ -38,7 +38,6 @@ import {
   useDocUtils,
   useDuplicateDoc,
 } from '@/docs/doc-management';
-import { KEY_LIST_DOC_VERSIONS } from '@/docs/doc-versioning';
 import { useFocusStore, useResponsiveStore } from '@/stores';
 
 import { useCopyCurrentEditorToClipboard } from '../hooks/useCopyCurrentEditorToClipboard';
@@ -87,7 +86,6 @@ interface DocToolBoxProps {
 export const DocToolBox = ({ doc }: DocToolBoxProps) => {
   const { t } = useTranslation();
   const treeContext = useTreeContext<Doc>();
-  const queryClient = useQueryClient();
   const router = useRouter();
   const { isChild, isTopRoot } = useDocUtils(doc);
 
@@ -113,16 +111,6 @@ export const DocToolBox = ({ doc }: DocToolBoxProps) => {
     listInvalidQueries: [KEY_LIST_DOC, KEY_DOC, KEY_LIST_FAVORITE_DOC],
   });
 
-  useEffect(() => {
-    if (selectHistoryModal.isOpen) {
-      return;
-    }
-
-    void queryClient.resetQueries({
-      queryKey: [KEY_LIST_DOC_VERSIONS],
-    });
-  }, [selectHistoryModal.isOpen, queryClient]);
-
   // Emoji Management
   const { emoji } = getEmojiAndTitle(doc.title ?? '');
   const { updateDocEmoji } = useDocTitleUpdate();
@@ -193,7 +181,7 @@ export const DocToolBox = ({ doc }: DocToolBoxProps) => {
     },
     {
       label: t('Copy as {{format}}', { format: 'Markdown' }),
-      icon: <ContentCopySVG width={24} height={24} />,
+      icon: <MarkdownCopySVG width={24} height={24} />,
       callback: () => {
         void copyCurrentEditorToClipboard('markdown');
       },

src/frontend/apps/impress/src/features/docs/doc-header/hooks/useCopyCurrentEditorToClipboard.tsx

@@ -4,7 +4,7 @@ import {
 } from '@gouvfr-lasuite/cunningham-react';
 import { useTranslation } from 'react-i18next';
 
-import { useEditorStore } from '../../doc-editor';
+import { useEditorStore } from '@/docs/doc-editor/stores/useEditorStore';
 
 export const useCopyCurrentEditorToClipboard = () => {
   const { editor } = useEditorStore();
@@ -13,20 +13,31 @@ export const useCopyCurrentEditorToClipboard = () => {
 
   return async (asFormat: 'html' | 'markdown') => {
     if (!editor) {
-      toast(t('Editor unavailable'), VariantType.ERROR, { duration: 3000 });
+      const message = t('Editor unavailable');
+      toast(message, VariantType.ERROR, { duration: 3000 });
       return;
     }
 
     try {
       const editorContentFormatted =
         asFormat === 'html'
-          ? await editor.blocksToHTMLLossy()
-          : await editor.blocksToMarkdownLossy();
+          ? editor.blocksToHTMLLossy()
+          : editor.blocksToMarkdownLossy();
       await navigator.clipboard.writeText(editorContentFormatted);
-      toast(t('Copied to clipboard'), VariantType.SUCCESS, { duration: 3000 });
+      const successMessage =
+        asFormat === 'markdown'
+          ? t('Copied as Markdown to clipboard')
+          : t('Copied to clipboard');
+
+      toast(successMessage, VariantType.SUCCESS, { duration: 3000 });
     } catch (error) {
       console.error(error);
-      toast(t('Failed to copy to clipboard'), VariantType.ERROR, {
+      const errorMessage =
+        asFormat === 'markdown'
+          ? t('Failed to copy as Markdown to clipboard')
+          : t('Failed to copy to clipboard');
+
+      toast(errorMessage, VariantType.ERROR, {
         duration: 3000,
       });
     }

src/frontend/apps/impress/src/features/docs/doc-management/api/useCreateFavoriteDoc.tsx

@@ -1,4 +1,6 @@
+import { announce } from '@react-aria/live-announcer';
 import { useMutation, useQueryClient } from '@tanstack/react-query';
+import { useTranslation } from 'react-i18next';
 
 import { APIError, errorCauses, fetchAPI } from '@/api';
 
@@ -29,6 +31,8 @@ export function useCreateFavoriteDoc({
   listInvalidQueries,
 }: CreateFavoriteDocProps) {
   const queryClient = useQueryClient();
+  const { t } = useTranslation();
+
   return useMutation<void, APIError, CreateFavoriteDocParams>({
     mutationFn: createFavoriteDoc,
     onSuccess: () => {
@@ -37,7 +41,15 @@ export function useCreateFavoriteDoc({
           queryKey: [queryKey],
         });
       });
+
+      const message = t('Document pinned successfully!');
+      announce(message, 'polite');
+
       onSuccess?.();
     },
+    onError: () => {
+      const message = t('Failed to pin the document.');
+      announce(message, 'assertive');
+    },
   });
 }

src/frontend/apps/impress/src/features/docs/doc-management/api/useDeleteFavoriteDoc.tsx

@@ -1,4 +1,6 @@
+import { announce } from '@react-aria/live-announcer';
 import { useMutation, useQueryClient } from '@tanstack/react-query';
+import { useTranslation } from 'react-i18next';
 
 import { APIError, errorCauses, fetchAPI } from '@/api';
 
@@ -29,6 +31,8 @@ export function useDeleteFavoriteDoc({
   listInvalidQueries,
 }: DeleteFavoriteDocProps) {
   const queryClient = useQueryClient();
+  const { t } = useTranslation();
+
   return useMutation<void, APIError, DeleteFavoriteDocParams>({
     mutationFn: deleteFavoriteDoc,
     onSuccess: () => {
@@ -37,7 +41,15 @@ export function useDeleteFavoriteDoc({
           queryKey: [queryKey],
         });
       });
+
+      const message = t('Document unpinned successfully!');
+      announce(message, 'polite');
+
       onSuccess?.();
     },
+    onError: () => {
+      const message = t('Failed to unpin the document.');
+      announce(message, 'assertive');
+    },
   });
 }

src/frontend/apps/impress/src/features/docs/doc-management/api/useDuplicateDoc.tsx

@@ -88,14 +88,16 @@ export function useDuplicateDoc(options?: DuplicateDocOptions) {
         queryKey: [KEY_LIST_DOC],
       });
 
-      toast(t('Document duplicated successfully!'), VariantType.SUCCESS, {
+      const message = t('Document duplicated successfully!');
+      toast(message, VariantType.SUCCESS, {
         duration: 3000,
       });
 
       void options?.onSuccess?.(data, variables, onMutateResult, context);
     },
     onError: (error, variables, onMutateResult, context) => {
-      toast(t('Failed to duplicate the document...'), VariantType.ERROR, {
+      const message = t('Failed to duplicate the document...');
+      toast(message, VariantType.ERROR, {
         duration: 3000,
       });
 

src/frontend/apps/impress/src/features/docs/doc-management/api/useUpdateDoc.tsx

@@ -44,7 +44,7 @@ export function useUpdateDoc(queryConfig?: UseUpdateDoc) {
     ...queryConfig,
     onSuccess: (data, variables, onMutateResult, context) => {
       queryConfig?.listInvalidQueries?.forEach((queryKey) => {
-        void queryClient.invalidateQueries({
+        void queryClient.resetQueries({
           queryKey: [queryKey],
         });
       });

src/frontend/apps/impress/src/features/docs/doc-management/components/DocIcon.tsx

@@ -44,7 +44,7 @@ export const DocIcon = ({
   const { t } = useTranslation();
   const { addLastFocus, restoreFocus } = useFocusStore();
 
-  const iconRef = useRef<HTMLDivElement>(null);
+  const iconRef = useRef<HTMLButtonElement>(null);
 
   const [openEmojiPicker, setOpenEmojiPicker] = useState<boolean>(false);
   const [pickerPosition, setPickerPosition] = useState<{

src/frontend/apps/impress/src/features/docs/doc-management/components/ModalRemoveDoc.tsx

@@ -90,7 +90,7 @@ export const ModalRemoveDoc = ({
       closeOnClickOutside
       hideCloseButton
       onClose={handleClose}
-      aria-describedby="modal-remove-doc-title"
+      aria-label={t('Delete a doc')}
       rightActions={
         <>
           <Button

src/frontend/apps/impress/src/features/docs/doc-management/hooks/__tests__/useDocTitleUpdate.test.tsx

@@ -14,6 +14,11 @@ vi.mock('@/stores', () => ({
   }),
 }));
 
+vi.mock('@gouvfr-lasuite/ui-kit', async () => ({
+  ...(await vi.importActual('@gouvfr-lasuite/ui-kit')),
+  useTreeContext: () => null,
+}));
+
 describe('useDocTitleUpdate', () => {
   beforeEach(() => {
     vi.clearAllMocks();

src/frontend/apps/impress/src/features/docs/doc-management/stores/useProviderStore.tsx

@@ -30,6 +30,8 @@ const defaultValues = {
 
 type ExtendedCloseEvent = CloseEvent & { wasClean: boolean };
 
+let reconnectTimeout: ReturnType<typeof setTimeout> | undefined;
+
 export const useProviderStore = create<UseCollaborationStore>((set, get) => ({
   ...defaultValues,
   createProvider: (wsUrl, storeId, initialDoc) => {
@@ -48,7 +50,20 @@ export const useProviderStore = create<UseCollaborationStore>((set, get) => ({
       onDisconnect(data) {
         // Attempt to reconnect if the disconnection was clean (initiated by the client or server)
         if ((data.event as ExtendedCloseEvent).wasClean) {
-          void provider.connect();
+          if (data.event.reason === 'No cookies' && data.event.code === 4001) {
+            console.error(
+              'Disconnection due to missing cookies. Not attempting to reconnect.',
+            );
+            void provider.disconnect();
+            set({
+              isReady: true,
+              isConnected: false,
+            });
+            return;
+          }
+
+          clearTimeout(reconnectTimeout);
+          reconnectTimeout = setTimeout(() => void provider.connect(), 1000);
         }
       },
       onAuthenticationFailed() {
@@ -107,6 +122,7 @@ export const useProviderStore = create<UseCollaborationStore>((set, get) => ({
     return provider;
   },
   destroyProvider: () => {
+    clearTimeout(reconnectTimeout);
     const provider = get().provider;
     if (provider) {
       provider.destroy();

src/frontend/apps/impress/src/features/docs/doc-search/components/DocSearchContent.tsx

@@ -1,3 +1,4 @@
+import { announce } from '@react-aria/live-announcer';
 import { t } from 'i18next';
 import { useEffect, useState } from 'react';
 import { InView } from 'react-intersection-observer';
@@ -73,10 +74,12 @@ export const DocSearchContent = ({
       docs = docs.filter(filterResults);
     }
 
+    const elements = search || isSearchNotMandatory ? docs : [];
+
     setDocsData({
       groupName: docs.length > 0 ? groupName : '',
       groupKey: 'docs',
-      elements: search || isSearchNotMandatory ? docs : [],
+      elements,
       emptyString: t('No document found'),
       endActions: hasNextPage
         ? [
@@ -90,6 +93,13 @@ export const DocSearchContent = ({
           ]
         : [],
     });
+
+    if (search) {
+      announce(
+        t('{{count}} result(s) available', { count: elements.length }),
+        'polite',
+      );
+    }
   }, [
     search,
     data?.pages,

src/frontend/apps/impress/src/features/docs/doc-search/components/DocSearchFilters.tsx

@@ -58,7 +58,13 @@ export const DocSearchFilters = ({
         />
       </Box>
       {hasFilters && (
-        <Button color="brand" variant="tertiary" size="small" onClick={onReset}>
+        <Button
+          color="brand"
+          variant="tertiary"
+          size="small"
+          onClick={onReset}
+          aria-label={t('Reset search filters')}
+        >
           {t('Reset')}
         </Button>
       )}

src/frontend/apps/impress/src/features/docs/doc-search/components/DocSearchModal.tsx

@@ -14,7 +14,7 @@ import {
   DocSearchFiltersValues,
   DocSearchTarget,
 } from '@/docs/doc-search';
-import { useResponsiveStore } from '@/stores';
+import { useFocusStore, useResponsiveStore } from '@/stores';
 
 import EmptySearchIcon from '../assets/illustration-docs-empty.png';
 
@@ -36,6 +36,7 @@ const DocSearchModalGlobal = ({
 }: DocSearchModalGlobalProps) => {
   const { t } = useTranslation();
   const [loading, setLoading] = useState(false);
+  const restoreFocus = useFocusStore((state) => state.restoreFocus);
   const router = useRouter();
   const [search, setSearch] = useState('');
   const [filters, setFilters] = useState<DocSearchFiltersValues>(
@@ -51,6 +52,7 @@ const DocSearchModalGlobal = ({
 
   const handleResetFilters = () => {
     setFilters({});
+    restoreFocus();
   };
 
   return (
@@ -86,21 +88,26 @@ const DocSearchModalGlobal = ({
           />
         </Box>
         <QuickSearch
+          label={t('Search documents')}
           placeholder={t('Type the name of a document')}
           loading={loading}
           onFilter={handleInputSearch}
+          beforeList={
+            showFilters ? (
+              <Box $padding={{ horizontal: '10px' }}>
+                <DocSearchFilters
+                  values={filters}
+                  onValuesChange={setFilters}
+                  onReset={handleResetFilters}
+                />
+              </Box>
+            ) : undefined
+          }
         >
           <Box
             $padding={{ horizontal: '10px', vertical: 'base' }}
             $height={isDesktop ? '500px' : 'calc(100vh - 68px - 1rem)'}
           >
-            {showFilters && (
-              <DocSearchFilters
-                values={filters}
-                onValuesChange={setFilters}
-                onReset={handleResetFilters}
-              />
-            )}
             {search.length === 0 && (
               <Box
                 $direction="column"
@@ -108,11 +115,7 @@ const DocSearchModalGlobal = ({
                 $align="center"
                 $justify="center"
               >
-                <Image
-                  width={320}
-                  src={EmptySearchIcon}
-                  alt={t('No active search')}
-                />
+                <Image width={320} src={EmptySearchIcon} alt="" />
               </Box>
             )}
             {search && (

src/frontend/apps/impress/src/features/docs/doc-share/components/DocShareAddMemberList.tsx

@@ -124,7 +124,8 @@ export const DocShareAddMemberList = ({
       $scope="surface"
       $theme="tertiary"
       $variation=""
-      $border="1px solid var(--c--contextuals--border--semantic--contextual--primary)"
+      $border="1px solid var(--c--contextuals--border--surface--primary)"
+      $margin={{ bottom: 'sm' }}
     >
       <Box
         $direction="row"

src/frontend/apps/impress/src/features/docs/doc-share/components/DocShareModal.tsx

@@ -289,7 +289,7 @@ export const DocShareModal = ({ doc, onClose, isRootDoc = true }: Props) => {
                     />
                   )}
                   {showMemberSection && isRootDoc && (
-                    <Box $padding={{ horizontal: 'base' }}>
+                    <Box $padding={{ horizontal: 'base', top: 'base' }}>
                       <QuickSearchGroupAccessRequest doc={doc} />
                       <QuickSearchGroupInvitation doc={doc} />
                       <QuickSearchGroupMember doc={doc} />
@@ -301,6 +301,7 @@ export const DocShareModal = ({ doc, onClose, isRootDoc = true }: Props) => {
                       searchUsersRawData={searchUsersQuery.data}
                       onSelect={onSelect}
                       userQuery={userQuery}
+                      minLength={API_USERS_SEARCH_QUERY_MIN_LENGTH}
                     />
                   )}
                 </QuickSearch>
@@ -321,14 +322,35 @@ interface QuickSearchInviteInputSectionProps {
   onSelect: (usr: User) => void;
   searchUsersRawData: User[] | undefined;
   userQuery: string;
+  minLength: number;
 }
 
 const QuickSearchInviteInputSection = ({
   onSelect,
   searchUsersRawData,
   userQuery,
+  minLength,
 }: QuickSearchInviteInputSectionProps) => {
   const { t } = useTranslation();
+  const hint = useMemo(() => {
+    if (userQuery.length < minLength) {
+      return t('Type at least {{minLength}} characters to display user names', {
+        minLength,
+      });
+    }
+    if (isValidEmail(userQuery)) {
+      return t('Choose the email');
+    }
+    if (!searchUsersRawData?.length) {
+      return t('No results. Type a full email address to invite someone.');
+    }
+
+    return t('Choose a user');
+  }, [minLength, searchUsersRawData?.length, t, userQuery]);
+
+  useEffect(() => {
+    announce(hint, 'polite');
+  }, [hint]);
 
   const searchUserData: QuickSearchData<User> = useMemo(() => {
     const users = searchUsersRawData || [];
@@ -347,7 +369,7 @@ const QuickSearchInviteInputSection = ({
     );
 
     return {
-      groupName: t('Search user result'),
+      groupName: hint,
       elements: users,
       endActions:
         isEmail && !hasEmailInUsers
@@ -359,12 +381,12 @@ const QuickSearchInviteInputSection = ({
             ]
           : undefined,
     };
-  }, [onSelect, searchUsersRawData, t, userQuery]);
+  }, [searchUsersRawData, userQuery, hint, onSelect]);
 
   return (
     <Box
       aria-label={t('List search user result card')}
-      $padding={{ horizontal: 'base', bottom: '3xs' }}
+      $padding={{ horizontal: 'base', bottom: '3xs', top: 'base' }}
     >
       <QuickSearchGroup
         group={searchUserData}