feat(read-docs): decrypt them

Signed-off-by: Raito Bezarius <masterancpp@gmail.com>

.github/workflows/crowdin_download.yml

@@ -1,76 +0,0 @@
-name: Download translations from Crowdin
-
-on:
-  workflow_dispatch:
-  push:
-    branches:
-      - 'release/**'
-
-jobs:
-  install-front:
-    uses: ./.github/workflows/front-dependencies-installation.yml
-    with:
-      node_version: '20.x'
-
-  synchronize-with-crowdin:
-    runs-on: ubuntu-latest
-    permissions:
-      contents: write
-      pull-requests: write
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-      - name: Create empty source files
-        run: |
-          touch src/backend/locale/django.pot
-          mkdir -p src/frontend/packages/i18n/locales/impress/
-          touch src/frontend/packages/i18n/locales/impress/translations-crowdin.json
-      # crowdin workflow
-      - name: crowdin action
-        uses: crowdin/github-action@v2
-        with:
-          config: crowdin/config.yml
-          upload_sources: false
-          upload_translations: false
-          download_translations: true
-          create_pull_request: false
-          push_translations: false
-          push_sources: false
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          # A numeric ID, found at https://crowdin.com/project/<projectName>/tools/api
-          CROWDIN_PROJECT_ID: ${{ secrets.CROWDIN_PROJECT_ID }}
-
-          # Visit https://crowdin.com/settings#api-key to create this token
-          CROWDIN_PERSONAL_TOKEN: ${{ secrets.CROWDIN_PERSONAL_TOKEN }}
-
-          CROWDIN_BASE_PATH: "../src/"
-      # frontend i18n
-      - name: Restore the frontend cache
-        uses: actions/cache@v4
-        with:
-          path: "src/frontend/**/node_modules"
-          key: front-node_modules-${{ hashFiles('src/frontend/**/yarn.lock') }}
-          fail-on-cache-miss: true
-      - name: generate translations files
-        working-directory: src/frontend
-        run: yarn i18n:deploy
-      # Create a new PR
-      - name: Create a new Pull Request with new translated strings
-        uses: peter-evans/create-pull-request@v7
-        with:
-          commit-message: |
-            🌐(i18n) update translated strings
-
-            Update translated files with new translations
-          title: 🌐(i18n) update translated strings
-          body: |
-            ## Purpose
-
-            update translated strings
-
-            ## Proposal
-
-            - [x]  update translated strings
-          branch: i18n/update-translations
-          labels: i18n

.github/workflows/crowdin_upload.yml

@@ -1,67 +0,0 @@
-name: Update crowdin sources
-
-on:
-  workflow_dispatch:
-  push:
-    branches: 
-      - main
-
-jobs:
-  install-front:
-    uses: ./.github/workflows/front-dependencies-installation.yml
-    with:
-      node_version: '20.x'
-
-  synchronize-with-crowdin:
-    needs: install-front
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-      # Backend i18n
-      - name: Install Python
-        uses: actions/setup-python@v3
-        with:
-          python-version: "3.12.6"
-      - name: Upgrade pip and setuptools
-        run: pip install --upgrade pip setuptools
-      - name: Install development dependencies
-        run: pip install --user .
-        working-directory: src/backend
-      - name: Install gettext
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y gettext pandoc
-      - name: generate pot files
-        working-directory: src/backend
-        run: |
-          DJANGO_CONFIGURATION=Build python manage.py makemessages -a --keep-pot
-      # frontend i18n
-      - name: Restore the frontend cache
-        uses: actions/cache@v4
-        with:
-          path: "src/frontend/**/node_modules"
-          key: front-node_modules-${{ hashFiles('src/frontend/**/yarn.lock') }}
-          fail-on-cache-miss: true
-      - name: generate source translation file
-        working-directory: src/frontend
-        run: yarn i18n:extract
-      # crowdin workflow
-      - name: crowdin action
-        uses: crowdin/github-action@v2
-        with:
-          config: crowdin/config.yml
-          upload_sources: true
-          upload_translations: false
-          download_translations: false
-          create_pull_request: false
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          # A numeric ID, found at https://crowdin.com/project/<projectName>/tools/api
-          CROWDIN_PROJECT_ID: ${{ secrets.CROWDIN_PROJECT_ID }}
-
-          # Visit https://crowdin.com/settings#api-key to create this token
-          CROWDIN_PERSONAL_TOKEN: ${{ secrets.CROWDIN_PERSONAL_TOKEN }}
-
-          CROWDIN_BASE_PATH: "../src/"

.github/workflows/deploy.yml

@@ -0,0 +1,52 @@
+name: Deploy
+
+on:
+  push:
+    tags:
+      - 'preprod'
+      - 'production'
+
+
+jobs:
+  notify-argocd:
+    runs-on: ubuntu-latest
+    steps:
+      -
+        uses: actions/create-github-app-token@v1
+        id: app-token
+        with:
+          app-id: ${{ secrets.APP_ID }}
+          private-key: ${{ secrets.PRIVATE_KEY }}
+          owner: ${{ github.repository_owner }}
+          repositories: "impress,secrets"
+      -
+        name: Checkout repository
+        uses: actions/checkout@v2
+        with:
+          submodules: recursive
+          token: ${{ steps.app-token.outputs.token }}
+      -
+        name: Load sops secrets
+        uses: rouja/actions-sops@main
+        with:
+          secret-file: secrets/numerique-gouv/impress/secrets.enc.env
+          age-key: ${{ secrets.SOPS_PRIVATE }}
+      -
+        name: Call argocd github webhook
+        run: |
+          data='{"ref": "'$GITHUB_REF'","repository": {"html_url":"'$GITHUB_SERVER_URL'/'$GITHUB_REPOSITORY'"}}'
+          sig=$(echo -n ${data} | openssl dgst -sha1 -hmac ''${ARGOCD_WEBHOOK_SECRET}'' | awk '{print "X-Hub-Signature: sha1="$2}')
+          curl -X POST -H 'X-GitHub-Event:push' -H "Content-Type: application/json" -H "${sig}" --data "${data}" $ARGOCD_WEBHOOK_URL
+          sig=$(echo -n ${data} | openssl dgst -sha1 -hmac ''${ARGOCD_PRODUCTION_WEBHOOK_SECRET}'' | awk '{print "X-Hub-Signature: sha1="$2}')
+          curl -X POST -H 'X-GitHub-Event:push' -H "Content-Type: application/json" -H "${sig}" --data "${data}" $ARGOCD_PRODUCTION_WEBHOOK_URL
+
+  start-test-on-preprod:
+    needs:
+      - notify-argocd
+    runs-on: ubuntu-latest
+    if: startsWith(github.event.ref, 'refs/tags/preprod')
+    steps:
+      -
+        name: Debug
+        run: |
+          echo "Start test when preprod is ready"

.github/workflows/docker-hub.yml

@@ -1,5 +1,4 @@
 name: Docker Hub Workflow
-run-name: Docker Hub Workflow
 
 on:
   workflow_dispatch:
@@ -19,9 +18,26 @@ jobs:
   build-and-push-backend:
     runs-on: ubuntu-latest
     steps:
+      -
+        uses: actions/create-github-app-token@v1
+        id: app-token
+        with:
+          app-id: ${{ secrets.APP_ID }}
+          private-key: ${{ secrets.PRIVATE_KEY }}
+          owner: ${{ github.repository_owner }}
+          repositories: "impress,secrets"
       -
         name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v2
+        with:
+          submodules: recursive
+          token: ${{ steps.app-token.outputs.token }}
+      -
+        name: Load sops secrets
+        uses: rouja/actions-sops@main
+        with:
+          secret-file: secrets/numerique-gouv/impress/secrets.enc.env
+          age-key: ${{ secrets.SOPS_PRIVATE }}
       -
         name: Docker meta
         id: meta
@@ -31,17 +47,10 @@ jobs:
       -
         name: Login to DockerHub
         if: github.event_name != 'pull_request'
-        run: echo "${{ secrets.DOCKER_HUB_PASSWORD }}" | docker login -u "${{ secrets.DOCKER_HUB_USER }}" --password-stdin
-      -
-        name: Run trivy scan
-        uses: numerique-gouv/action-trivy-cache@main
-        with:
-          docker-build-args: '--target backend-production -f Dockerfile'
-          docker-image-name: 'docker.io/lasuite/impress-backend:${{ github.sha }}'
-        continue-on-error: true
+        run: echo "$DOCKER_HUB_PASSWORD" | docker login -u "$DOCKER_HUB_USER" --password-stdin
       -
         name: Build and push
-        uses: docker/build-push-action@v6
+        uses: docker/build-push-action@v5
         with:
           context: .
           target: backend-production
@@ -53,9 +62,26 @@ jobs:
   build-and-push-frontend:
     runs-on: ubuntu-latest
     steps:
+      -
+        uses: actions/create-github-app-token@v1
+        id: app-token
+        with:
+          app-id: ${{ secrets.APP_ID }}
+          private-key: ${{ secrets.PRIVATE_KEY }}
+          owner: ${{ github.repository_owner }}
+          repositories: "impress,secrets"
       -
         name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v2
+        with:
+          submodules: recursive
+          token: ${{ steps.app-token.outputs.token }}
+      -
+        name: Load sops secrets
+        uses: rouja/actions-sops@main
+        with:
+          secret-file: secrets/numerique-gouv/impress/secrets.enc.env
+          age-key: ${{ secrets.SOPS_PRIVATE }}
       -
         name: Docker meta
         id: meta
@@ -65,17 +91,10 @@ jobs:
       -
         name: Login to DockerHub
         if: github.event_name != 'pull_request'
-        run: echo "${{ secrets.DOCKER_HUB_PASSWORD }}" | docker login -u "${{ secrets.DOCKER_HUB_USER }}" --password-stdin
-      -
-        name: Run trivy scan
-        uses: numerique-gouv/action-trivy-cache@main
-        with:
-          docker-build-args: '-f src/frontend/Dockerfile --target frontend-production'
-          docker-image-name: 'docker.io/lasuite/impress-frontend:${{ github.sha }}'
-        continue-on-error: true
+        run: echo "$DOCKER_HUB_PASSWORD" | docker login -u "$DOCKER_HUB_USER" --password-stdin
       -
         name: Build and push
-        uses: docker/build-push-action@v6
+        uses: docker/build-push-action@v5
         with:
           context: .
           file: ./src/frontend/Dockerfile
@@ -88,9 +107,26 @@ jobs:
   build-and-push-y-provider:
     runs-on: ubuntu-latest
     steps:
+      -
+        uses: actions/create-github-app-token@v1
+        id: app-token
+        with:
+          app-id: ${{ secrets.APP_ID }}
+          private-key: ${{ secrets.PRIVATE_KEY }}
+          owner: ${{ github.repository_owner }}
+          repositories: "impress,secrets"
       -
         name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v2
+        with:
+          submodules: recursive
+          token: ${{ steps.app-token.outputs.token }}
+      -
+        name: Load sops secrets
+        uses: rouja/actions-sops@main
+        with:
+          secret-file: secrets/numerique-gouv/impress/secrets.enc.env
+          age-key: ${{ secrets.SOPS_PRIVATE }}
       -
         name: Docker meta
         id: meta
@@ -100,20 +136,13 @@ jobs:
       -
         name: Login to DockerHub
         if: github.event_name != 'pull_request'
-        run: echo "${{ secrets.DOCKER_HUB_PASSWORD }}" | docker login -u "${{ secrets.DOCKER_HUB_USER }}" --password-stdin
-      -
-        name: Run trivy scan
-        uses: numerique-gouv/action-trivy-cache@main
-        with:
-          docker-build-args: '-f src/frontend/servers/y-provider/Dockerfile --target y-provider'
-          docker-image-name: 'docker.io/lasuite/impress-frontend:${{ github.sha }}'
-        continue-on-error: true
+        run: echo "$DOCKER_HUB_PASSWORD" | docker login -u "$DOCKER_HUB_USER" --password-stdin
       -
         name: Build and push
-        uses: docker/build-push-action@v6
+        uses: docker/build-push-action@v5
         with:
           context: .
-          file: ./src/frontend/servers/y-provider/Dockerfile
+          file: ./src/frontend/Dockerfile
           target: y-provider
           build-args: DOCKER_USER=${{ env.DOCKER_USER }}:-1000
           push: ${{ github.event_name != 'pull_request' }}
@@ -128,12 +157,29 @@ jobs:
     if: |
       github.event_name != 'pull_request'
     steps:
+      -
+        uses: actions/create-github-app-token@v1
+        id: app-token
+        with:
+          app-id: ${{ secrets.APP_ID }}
+          private-key: ${{ secrets.PRIVATE_KEY }}
+          owner: ${{ github.repository_owner }}
+          repositories: "impress,secrets"
       -
         name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v2
+        with:
+          submodules: recursive
+          token: ${{ steps.app-token.outputs.token }}
+      -
+        name: Load sops secrets
+        uses: rouja/actions-sops@main
+        with:
+          secret-file: secrets/numerique-gouv/impress/secrets.enc.env
+          age-key: ${{ secrets.SOPS_PRIVATE }}
       -
         name: Call argocd github webhook
         run: |
           data='{"ref": "'$GITHUB_REF'","repository": {"html_url":"'$GITHUB_SERVER_URL'/'$GITHUB_REPOSITORY'"}}'
-          sig=$(echo -n ${data} | openssl dgst -sha1 -hmac ''${{ secrets.ARGOCD_PREPROD_WEBHOOK_SECRET}}'' | awk '{print "X-Hub-Signature: sha1="$2}')
-          curl -X POST -H 'X-GitHub-Event:push' -H "Content-Type: application/json" -H "${sig}" --data "${data}" ${{ vars.ARGOCD_PREPROD_WEBHOOK_URL }}
+          sig=$(echo -n ${data} | openssl dgst -sha1 -hmac ''${ARGOCD_WEBHOOK_SECRET}'' | awk '{print "X-Hub-Signature: sha1="$2}')
+          curl -X POST -H 'X-GitHub-Event:push' -H "Content-Type: application/json" -H "${sig}" --data "${data}" $ARGOCD_WEBHOOK_URL

.github/workflows/front-dependencies-installation.yml

@@ -1,36 +0,0 @@
-name: Install frontend installation reusable workflow
-
-on:
-  workflow_call:
-    inputs:
-      node_version:
-        required: false
-        default: '20.x'
-        type: string
-
-jobs:
-  front-dependencies-installation:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-      - name: Restore the frontend cache
-        uses: actions/cache@v4
-        id: front-node_modules
-        with:
-          path: "src/frontend/**/node_modules"
-          key: front-node_modules-${{ hashFiles('src/frontend/**/yarn.lock') }}
-      - name: Setup Node.js
-        if: steps.front-node_modules.outputs.cache-hit != 'true'
-        uses: actions/setup-node@v4
-        with:
-          node-version: ${{ inputs.node_version }}
-      - name: Install dependencies
-        if: steps.front-node_modules.outputs.cache-hit != 'true'
-        run: cd src/frontend/ && yarn install --frozen-lockfile
-      - name: Cache install frontend
-        if: steps.front-node_modules.outputs.cache-hit != 'true'
-        uses: actions/cache@v4
-        with:
-          path: "src/frontend/**/node_modules"
-          key: front-node_modules-${{ hashFiles('src/frontend/**/yarn.lock') }}

.github/workflows/helmfile-linter.yaml

@@ -1,30 +0,0 @@
-name: Helmfile lint
-run-name: Helmfile lint
-
-on:
-  push:
-  pull_request:
-    branches:
-      - 'main'
-
-jobs:
-  helmfile-lint:
-    runs-on: ubuntu-latest
-    container:
-      image: ghcr.io/helmfile/helmfile:latest
-    steps:
-    -
-      name: Checkout repository
-      uses: actions/checkout@v4
-    -
-      name: Helmfile lint
-      shell: bash
-      run: |
-        set -e
-        HELMFILE=src/helm/helmfile.yaml
-        environments=$(awk '/environments:/ {flag=1; next} flag && NF {print} !NF {flag=0}' "$HELMFILE" | grep -E '^[[:space:]]{2}[a-zA-Z]+' | sed 's/^[[:space:]]*//;s/:.*//')
-        for env in $environments; do
-          echo "################### $env lint ###################"
-          helmfile -e $env -f $HELMFILE lint || exit 1
-          echo -e "\n"
-        done

.github/workflows/impress-frontend.yml

@@ -9,15 +9,9 @@ on:
       - "*"
 
 jobs:
-
   install-front:
-    uses: ./.github/workflows/front-dependencies-installation.yml
-    with:
-      node_version: '20.x'
-
-  test-front:
-    needs: install-front
     runs-on: ubuntu-latest
+
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
@@ -25,17 +19,65 @@ jobs:
       - name: Setup Node.js
         uses: actions/setup-node@v4
         with:
-          node-version: "20.x"
+          node-version: "18.x"
 
       - name: Restore the frontend cache
+        uses: actions/cache@v4
+        id: front-node_modules
+        with:
+          path: "src/frontend/**/node_modules"
+          key: front-node_modules-${{ hashFiles('src/frontend/**/yarn.lock') }}
+
+      - name: Install dependencies
+        if: steps.front-node_modules.outputs.cache-hit != 'true'
+        run: cd src/frontend/ && yarn install --frozen-lockfile
+
+      - name: Cache install frontend
+        if: steps.front-node_modules.outputs.cache-hit != 'true'
         uses: actions/cache@v4
         with:
           path: "src/frontend/**/node_modules"
           key: front-node_modules-${{ hashFiles('src/frontend/**/yarn.lock') }}
-          fail-on-cache-miss: true
+
+  build-front:
+    runs-on: ubuntu-latest
+    needs: install-front
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Restore the frontend cache
+        uses: actions/cache@v4
+        id: front-node_modules
+        with:
+          path: "src/frontend/**/node_modules"
+          key: front-node_modules-${{ hashFiles('src/frontend/**/yarn.lock') }}
+
+      - name: Build CI App
+        run: cd src/frontend/ && yarn ci:build
+
+      - name: Cache build frontend
+        uses: actions/cache@v4
+        with:
+          path: src/frontend/apps/impress/out/
+          key: build-front-${{ github.run_id }}
+
+  test-front:
+    runs-on: ubuntu-latest
+    needs: install-front
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Restore the frontend cache
+        uses: actions/cache@v4
+        id: front-node_modules
+        with:
+          path: "src/frontend/**/node_modules"
+          key: front-node_modules-${{ hashFiles('src/frontend/**/yarn.lock') }}
 
       - name: Test App
-        run: cd src/frontend/ && yarn test
+        run: cd src/frontend/ && yarn app:test
 
   lint-front:
     runs-on: ubuntu-latest
@@ -44,75 +86,88 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v4
 
-      - name: Setup Node.js
-        uses: actions/setup-node@v4
-        with:
-          node-version: "20.x"
       - name: Restore the frontend cache
         uses: actions/cache@v4
+        id: front-node_modules
         with:
           path: "src/frontend/**/node_modules"
           key: front-node_modules-${{ hashFiles('src/frontend/**/yarn.lock') }}
-          fail-on-cache-miss: true
 
       - name: Check linting
         run: cd src/frontend/ && yarn lint
 
   test-e2e-chromium:
     runs-on: ubuntu-latest
-    needs: install-front
+    needs: build-front
     timeout-minutes: 20
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
 
-      - name: Setup Node.js
-        uses: actions/setup-node@v4
+      - name: Set services env variables
+        run: |
+          make data/media
+          make create-env-files
+          cat env.d/development/common.e2e.dist >> env.d/development/common
+
+      - name: Restore the mail templates
+        uses: actions/cache@v4
+        id: mail-templates
         with:
-          node-version: "20.x"
+          path: "src/backend/core/templates/mail"
+          key: mail-templates-${{ hashFiles('src/mail/mjml') }}
 
       - name: Restore the frontend cache
         uses: actions/cache@v4
+        id: front-node_modules
         with:
           path: "src/frontend/**/node_modules"
           key: front-node_modules-${{ hashFiles('src/frontend/**/yarn.lock') }}
-          fail-on-cache-miss: true
 
-      - name: Set e2e env variables
-        run: cat env.d/development/common.e2e.dist >> env.d/development/common.dist
+      - name: Restore the build cache
+        uses: actions/cache@v4
+        id: cache-build
+        with:
+          path: src/frontend/apps/impress/out/
+          key: build-front-${{ github.run_id }}
 
-      - name: Install Playwright Browsers
-        run: cd src/frontend/apps/e2e && yarn install --frozen-lockfile && yarn install-playwright chromium
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Build the Docker images
+        uses: docker/bake-action@v4
+        with:
+          targets: |
+            app-dev
+            y-provider
+          load: true
+          set: |
+            *.cache-from=type=gha,scope=cached-stage
+            *.cache-to=type=gha,scope=cached-stage,mode=max
 
       - name: Start Docker services
-        run: make bootstrap FLUSH_ARGS='--no-input' cache=
-
-      # Tool to wait for a service to be ready
-      - name: Install Dockerize
         run: |
-          curl -sSL https://github.com/jwilder/dockerize/releases/download/v0.8.0/dockerize-linux-amd64-v0.8.0.tar.gz | sudo tar -C /usr/local/bin -xzv
+          make run
 
-      - name: Wait for services to be ready
+      - name: Start Nginx for the frontend
         run: |
-          printf "Minio check...\n"
-          dockerize -wait tcp://localhost:9000 -timeout 20s
-          printf "Keyclock check...\n"
-          dockerize -wait tcp://localhost:8080 -timeout 20s
-          printf "Server collaboration check...\n"
-          dockerize -wait tcp://localhost:4444 -timeout 20s
-          printf "Ngnix check...\n"
-          dockerize -wait tcp://localhost:8083 -timeout 20s
-          printf "DRF check...\n"
-          dockerize -wait tcp://localhost:8071 -timeout 20s
-          printf "Postgres Keyclock check...\n"
-          dockerize -wait tcp://localhost:5433 -timeout 20s
-          printf "Postgres back check...\n"
-          dockerize -wait tcp://localhost:15432 -timeout 20s
+          docker compose up --force-recreate -d nginx-front
+
+      - name: Apply DRF migrations
+        run: |
+          make migrate
+
+      - name: Add dummy data
+        run: |
+          make demo FLUSH_ARGS='--no-input'
+
+      - name: Install Playwright Browsers
+        run: cd src/frontend/apps/e2e && yarn install-playwright chromium
 
       - name: Run e2e tests
         run: cd src/frontend/ && yarn e2e:test --project='chromium'
 
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v3
         if: always()
         with:
           name: playwright-chromium-report
@@ -121,28 +176,76 @@ jobs:
 
   test-e2e-other-browser:
     runs-on: ubuntu-latest
-    needs: test-e2e-chromium
+    needs: build-front
     timeout-minutes: 20
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
 
-      - name: Install frontend dependencies
-        uses: ./.github/workflows/front-dependencies-installation.yml
+      - name: Set services env variables
+        run: |
+          make data/media
+          make create-env-files
+          cat env.d/development/common.e2e.dist >> env.d/development/common
 
-      - name: Set e2e env variables
-        run: cat env.d/development/common.e2e.dist >> env.d/development/common.dist
+      - name: Restore the mail templates
+        uses: actions/cache@v4
+        id: mail-templates
+        with:
+          path: "src/backend/core/templates/mail"
+          key: mail-templates-${{ hashFiles('src/mail/mjml') }}
 
-      - name: Install Playwright Browsers
-        run: cd src/frontend/apps/e2e && yarn install --frozen-lockfile && yarn install-playwright firefox webkit chromium
+      - name: Restore the frontend cache
+        uses: actions/cache@v4
+        id: front-node_modules
+        with:
+          path: "src/frontend/**/node_modules"
+          key: front-node_modules-${{ hashFiles('src/frontend/**/yarn.lock') }}
+
+      - name: Restore the build cache
+        uses: actions/cache@v4
+        id: cache-build
+        with:
+          path: src/frontend/apps/impress/out/
+          key: build-front-${{ github.run_id }}
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Build the Docker images
+        uses: docker/bake-action@v4
+        with:
+          targets: |
+            app-dev
+            y-provider
+          load: true
+          set: |
+            *.cache-from=type=gha,scope=cached-stage
+            *.cache-to=type=gha,scope=cached-stage,mode=max
 
       - name: Start Docker services
-        run: make bootstrap FLUSH_ARGS='--no-input' cache=
+        run: |
+          make run
+
+      - name: Start Nginx for the frontend
+        run: |
+          docker compose up --force-recreate -d nginx-front
+
+      - name: Apply DRF migrations
+        run: |
+          make migrate
+
+      - name: Add dummy data
+        run: |
+          make demo FLUSH_ARGS='--no-input'
+
+      - name: Install Playwright Browsers
+        run: cd src/frontend/apps/e2e && yarn install-playwright firefox webkit chromium
 
       - name: Run e2e tests
         run: cd src/frontend/ && yarn e2e:test --project=firefox --project=webkit
 
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v3
         if: always()
         with:
           name: playwright-other-report

.github/workflows/impress.yml

@@ -9,52 +9,52 @@ on:
       - "*"
 
 jobs:
-  lint-git:
-    runs-on: ubuntu-latest
-    if: github.event_name == 'pull_request' # Makes sense only for pull requests
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v2
-        with:
-          fetch-depth: 0
-      - name: show
-        run: git log
-      - name: Enforce absence of print statements in code
-        run: |
-          ! git diff origin/${{ github.event.pull_request.base.ref }}..HEAD -- . ':(exclude)**/impress.yml' | grep "print("
-      - name: Check absence of fixup commits
-        run: |
-          ! git log | grep 'fixup!'
-      - name: Install gitlint
-        run: pip install --user requests gitlint
-      - name: Lint commit messages added to main
-        run: ~/.local/bin/gitlint --commits origin/${{ github.event.pull_request.base.ref }}..HEAD
+  # lint-git:
+  #   runs-on: ubuntu-latest
+  #   if: github.event_name == 'pull_request' # Makes sense only for pull requests
+  #   steps:
+  #     - name: Checkout repository
+  #       uses: actions/checkout@v2
+  #       with:
+  #         fetch-depth: 0
+  #     - name: show
+  #       run: git log
+  #     - name: Enforce absence of print statements in code
+  #       run: |
+  #         ! git diff origin/${{ github.event.pull_request.base.ref }}..HEAD -- . ':(exclude)**/impress.yml' | grep "print("
+  #     - name: Check absence of fixup commits
+  #       run: |
+  #         ! git log | grep 'fixup!'
+  #     - name: Install gitlint
+  #       run: pip install --user requests gitlint
+  #     - name: Lint commit messages added to main
+  #       run: ~/.local/bin/gitlint --commits origin/${{ github.event.pull_request.base.ref }}..HEAD
 
-  check-changelog:
-    runs-on: ubuntu-latest
-    if: |
-      contains(github.event.pull_request.labels.*.name, 'noChangeLog') == false &&
-      github.event_name == 'pull_request'
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v3
-        with:
-          fetch-depth: 50
-      - name: Check that the CHANGELOG has been modified in the current branch
-        run: git diff --name-only ${{ github.event.pull_request.base.sha }} ${{ github.event.after }} | grep 'CHANGELOG.md'
+  # check-changelog:
+  #   runs-on: ubuntu-latest
+  #   if: |
+  #     contains(github.event.pull_request.labels.*.name, 'noChangeLog') == false &&
+  #     github.event_name == 'pull_request'
+  #   steps:
+  #     - name: Checkout repository
+  #       uses: actions/checkout@v3
+  #       with:
+  #         fetch-depth: 50
+  #     - name: Check that the CHANGELOG has been modified in the current branch
+  #       run: git diff --name-only ${{ github.event.pull_request.base.sha }} ${{ github.event.after }} | grep 'CHANGELOG.md'
 
-  lint-changelog:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v2
-      - name: Check CHANGELOG max line length
-        run: |
-          max_line_length=$(cat CHANGELOG.md | grep -Ev "^\[.*\]: https://github.com" | wc -L)
-          if [ $max_line_length -ge 80 ]; then
-            echo "ERROR: CHANGELOG has lines longer than 80 characters."
-            exit 1
-          fi
+  # lint-changelog:
+  #   runs-on: ubuntu-latest
+  #   steps:
+  #     - name: Checkout repository
+  #       uses: actions/checkout@v2
+  #     - name: Check CHANGELOG max line length
+  #       run: |
+  #         max_line_length=$(cat CHANGELOG.md | grep -Ev "^\[.*\]: https://github.com" | wc -L)
+  #         if [ $max_line_length -ge 80 ]; then
+  #           echo "ERROR: CHANGELOG has lines longer than 80 characters."
+  #           exit 1
+  #         fi
 
   build-mails:
     runs-on: ubuntu-latest
@@ -96,124 +96,112 @@ jobs:
           path: "src/backend/core/templates/mail"
           key: mail-templates-${{ hashFiles('src/mail/mjml') }}
 
-  lint-back:
-    runs-on: ubuntu-latest
-    defaults:
-      run:
-        working-directory: src/backend
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v2
-      - name: Install Python
-        uses: actions/setup-python@v3
-        with:
-          python-version: "3.12.6"
-      - name: Upgrade pip and setuptools
-        run: pip install --upgrade pip setuptools
-      - name: Install development dependencies
-        run: pip install --user .[dev]
-      - name: Check code formatting with ruff
-        run: ~/.local/bin/ruff format . --diff
-      - name: Lint code with ruff
-        run: ~/.local/bin/ruff check .
-      - name: Lint code with pylint
-        run: ~/.local/bin/pylint .
+  # lint-back:
+  #   runs-on: ubuntu-latest
+  #   defaults:
+  #     run:
+  #       working-directory: src/backend
+  #   steps:
+  #     - name: Checkout repository
+  #       uses: actions/checkout@v2
+  #     - name: Install Python
+  #       uses: actions/setup-python@v3
+  #       with:
+  #         python-version: "3.10"
+  #     - name: Install development dependencies
+  #       run: pip install --user .[dev]
+  #     - name: Check code formatting with ruff
+  #       run: ~/.local/bin/ruff format . --diff
+  #     - name: Lint code with ruff
+  #       run: ~/.local/bin/ruff check .
+  #     - name: Lint code with pylint
+  #       run: ~/.local/bin/pylint .
 
-  test-back:
-    runs-on: ubuntu-latest
-    needs: build-mails
+  # test-back:
+  #   runs-on: ubuntu-latest
+  #   needs: build-mails
 
-    defaults:
-      run:
-        working-directory: src/backend
+  #   defaults:
+  #     run:
+  #       working-directory: src/backend
 
-    services:
-      postgres:
-        image: postgres:16
-        env:
-          POSTGRES_DB: impress
-          POSTGRES_USER: dinum
-          POSTGRES_PASSWORD: pass
-        ports:
-          - 5432:5432
-        # needed because the postgres container does not provide a healthcheck
-        options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5
+  #   services:
+  #     postgres:
+  #       image: postgres:16
+  #       env:
+  #         POSTGRES_DB: impress
+  #         POSTGRES_USER: dinum
+  #         POSTGRES_PASSWORD: pass
+  #       ports:
+  #         - 5432:5432
+  #       # needed because the postgres container does not provide a healthcheck
+  #       options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5
 
-    env:
-      DJANGO_CONFIGURATION: Test
-      DJANGO_SETTINGS_MODULE: impress.settings
-      DJANGO_SECRET_KEY: ThisIsAnExampleKeyForTestPurposeOnly
-      OIDC_OP_JWKS_ENDPOINT: /endpoint-for-test-purpose-only
-      DB_HOST: localhost
-      DB_NAME: impress
-      DB_USER: dinum
-      DB_PASSWORD: pass
-      DB_PORT: 5432
-      STORAGES_STATICFILES_BACKEND: django.contrib.staticfiles.storage.StaticFilesStorage
-      AWS_S3_ENDPOINT_URL: http://localhost:9000
-      AWS_S3_ACCESS_KEY_ID: impress
-      AWS_S3_SECRET_ACCESS_KEY: password
+  #   env:
+  #     DJANGO_CONFIGURATION: Test
+  #     DJANGO_SETTINGS_MODULE: impress.settings
+  #     DJANGO_SECRET_KEY: ThisIsAnExampleKeyForTestPurposeOnly
+  #     OIDC_OP_JWKS_ENDPOINT: /endpoint-for-test-purpose-only
+  #     DB_HOST: localhost
+  #     DB_NAME: impress
+  #     DB_USER: dinum
+  #     DB_PASSWORD: pass
+  #     DB_PORT: 5432
+  #     STORAGES_STATICFILES_BACKEND: django.contrib.staticfiles.storage.StaticFilesStorage
+  #     AWS_S3_ENDPOINT_URL: http://localhost:9000
+  #     AWS_S3_ACCESS_KEY_ID: impress
+  #     AWS_S3_SECRET_ACCESS_KEY: password
 
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
+  #   steps:
+  #     - name: Checkout repository
+  #       uses: actions/checkout@v4
 
-      - name: Create writable /data
-        run: |
-          sudo mkdir -p /data/media && \
-          sudo mkdir -p /data/static
+  #     - name: Create writable /data
+  #       run: |
+  #         sudo mkdir -p /data/media && \
+  #         sudo mkdir -p /data/static
 
-      - name: Restore the mail templates
-        uses: actions/cache@v4
-        id: mail-templates
-        with:
-          path: "src/backend/core/templates/mail"
-          key: mail-templates-${{ hashFiles('src/mail/mjml') }}
+  #     - name: Restore the mail templates
+  #       uses: actions/cache@v4
+  #       id: mail-templates
+  #       with:
+  #         path: "src/backend/core/templates/mail"
+  #         key: mail-templates-${{ hashFiles('src/mail/mjml') }}
 
-      - name: Start MinIO
-        run: |
-          docker pull minio/minio
-          docker run -d --name minio \
-            -p 9000:9000 \
-            -e "MINIO_ACCESS_KEY=impress" \
-            -e "MINIO_SECRET_KEY=password" \
-            -v /data/media:/data \
-            minio/minio server --console-address :9001 /data
+  #     - name: Start Minio
+  #       run: |
+  #         docker pull minio/minio
+  #         docker run -d --name minio \
+  #           -p 9000:9000 \
+  #           -e "MINIO_ACCESS_KEY=impress" \
+  #           -e "MINIO_SECRET_KEY=password" \
+  #           -v /data/media:/data \
+  #           minio/minio server --console-address :9001 /data
 
-      # Tool to wait for a service to be ready
-      - name: Install Dockerize
-        run: |
-          curl -sSL https://github.com/jwilder/dockerize/releases/download/v0.8.0/dockerize-linux-amd64-v0.8.0.tar.gz | sudo tar -C /usr/local/bin -xzv
+  #     - name: Configure MinIO
+  #       run: |
+  #         MINIO=$(docker ps | grep minio/minio | sed -E 's/.*\s+([a-zA-Z0-9_-]+)$/\1/')
+  #         docker exec ${MINIO} sh -c \
+  #           "mc alias set impress http://localhost:9000 impress password && \
+  #           mc alias ls && \
+  #           mc mb impress/impress-media-storage && \
+  #           mc version enable impress/impress-media-storage"
 
-      - name: Wait for MinIO to be ready
-        run: |
-          dockerize -wait tcp://localhost:9000 -timeout 10s
+  #     - name: Install Python
+  #       uses: actions/setup-python@v3
+  #       with:
+  #         python-version: "3.10"
 
-      - name: Configure MinIO
-        run: |
-          MINIO=$(docker ps | grep minio/minio | sed -E 's/.*\s+([a-zA-Z0-9_-]+)$/\1/')
-          docker exec ${MINIO} sh -c \
-            "mc alias set impress http://localhost:9000 impress password && \
-            mc alias ls && \
-            mc mb impress/impress-media-storage && \
-            mc version enable impress/impress-media-storage"
+  #     - name: Install development dependencies
+  #       run: pip install --user .[dev]
 
-      - name: Install Python
-        uses: actions/setup-python@v3
-        with:
-          python-version: "3.12.6"
+  #     - name: Install gettext (required to compile messages)
+  #       run: |
+  #         sudo apt-get update
+  #         sudo apt-get install -y gettext pandoc
 
-      - name: Install development dependencies
-        run: pip install --user .[dev]
+  #     - name: Generate a MO file from strings extracted from the project
+  #       run: python manage.py compilemessages
 
-      - name: Install gettext (required to compile messages) and MIME support
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y gettext pandoc shared-mime-info
-          sudo wget https://svn.apache.org/repos/asf/httpd/httpd/trunk/docs/conf/mime.types -O /etc/mime.types
-
-      - name: Generate a MO file from strings extracted from the project
-        run: python manage.py compilemessages
-
-      - name: Run tests
-        run: ~/.local/bin/pytest -n 2
+  #     - name: Run tests
+  #       run: ~/.local/bin/pytest -n 2

.github/workflows/release-helm-chart.yaml

@@ -1,34 +0,0 @@
-name: Release Chart
-run-name: Release Chart
-
-on:
-  push:
-    paths:
-      - src/helm/impress/**
-
-jobs:
-  release:
-    # depending on default permission settings for your org (contents being read-only or read-write for workloads), you will have to add permissions
-    # see: https://docs.github.com/en/actions/security-guides/automatic-token-authentication#modifying-the-permissions-for-the-github_token
-    permissions:
-      contents: write
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-
-      - name: Cleanup
-        run: rm -rf ./src/helm/extra
-
-      - name: Install Helm
-        uses: azure/setup-helm@v4
-        env:
-          GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
-
-      - name: Publish Helm charts
-        uses: numerique-gouv/helm-gh-pages@add-overwrite-option
-        with:
-          charts_dir: ./src/helm
-          token: ${{ secrets.GITHUB_TOKEN }}

.gitignore

@@ -30,7 +30,6 @@ MANIFEST
 .next/
 
 # Translations	# Translations
-*.mo
 *.pot
 
 # Environments
@@ -41,7 +40,6 @@ ENV/
 env.bak/
 venv.bak/
 env.d/development/*
-env.d/production/*
 !env.d/development/*.dist
 env.d/terraform
 

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "secrets"]
+	path = secrets
+	url = ../secrets

CHANGELOG.md

@@ -11,242 +11,19 @@ and this project adheres to
 
 ## Added
 
-- github actions to managed Crowdin workflow
-- 📈Integrate Posthog #540
-- 🏷️(backend) add content-type to uploaded files #552
-
-## Changed
-
-- 💄(frontend) add abilities on doc row #581
-
-
-## [2.0.1] - 2025-01-17
-
-## Fixed
-
--🐛(frontend) share modal is shown when you don't have the abilities #557
--🐛(frontend) title copy break app #564
-
-## [2.0.0] - 2025-01-13
-
-## Added
-
-- 🔧(backend) add option to configure list of essential OIDC claims #525 & #531
-- 🔧(helm) add option to disable default tls setting by @dominikkaminski #519
-- 💄(frontend) Add left panel #420
-- 💄(frontend) add filtering to left panel #475
-- ✨(frontend) new share modal ui #489
-- ✨(frontend) add favorite feature #515
-
-## Changed
-
-- 🏗️(yjs-server) organize yjs server #528
-- ♻️(frontend) better separation collaboration process #528
-- 💄(frontend) updating the header and leftpanel for responsive #421
-- 💄(frontend) update DocsGrid component #431
-- 💄(frontend) update DocsGridOptions component #432
-- 💄(frontend) update DocHeader ui #448
-- 💄(frontend) update doc versioning ui #463
-- 💄(frontend) update doc summary ui #473
-- 📝(doc) update readme.md to match V2 changes #558
-
-## Fixed
-
-- 🐛(backend) fix create document via s2s if sub unknown but email found #543
-- 🐛(frontend) hide search and create doc button if not authenticated #555
-- 🐛(backend) race condition creation issue #556
-
-## [1.10.0] - 2024-12-17
-
-## Added
-
-- ✨(backend) add server-to-server API endpoint to create documents #467
-- ✨(email) white brand email #412
-- ✨(y-provider) create a markdown converter endpoint #488
-
-## Changed
-
-- ⚡️(docker) improve y-provider image #422
-
-## Fixed
-
-- ⚡️(e2e) reduce flakiness on e2e tests #511
-
-
-## Fixed
-- 🐛(frontend) update doc editor height #481
-- 💄(frontend) add doc search #485
-
-
-## [1.9.0] - 2024-12-11
-
-## Added
-
-- ✨(backend) annotate number of accesses on documents in list view #429
-- ✨(backend) allow users to mark/unmark documents as favorite #429
-
-## Changed
-
-- 🔒️(collaboration) increase collaboration access security #472
-- 🔨(frontend) encapsulated title to its own component #474
-- ⚡️(backend) optimize number of queries on document list view #429
-- ♻️(frontend) stop to use provider with version #480
-- 🚚(collaboration) change the websocket key name #480
-
-## Fixed
-
-- 🐛(frontend) fix initial content with collaboration #484
-- 🐛(frontend) Fix hidden menu on Firefox #468
-- 🐛(backend) fix sanitize problem IA #490
-
-
-## [1.8.2] - 2024-11-28
-
-## Changed
-
-- ♻️(SW) change strategy html caching #460
-
-
-## [1.8.1] - 2024-11-27
-
-## Fixed
-
-- 🐛(frontend) link not clickable and flickering firefox #457
-
-
-## [1.8.0] - 2024-11-25
-
-## Added
-
-- 🌐(backend) add German translation #259
-- 🌐(frontend) add German translation #255
-- ✨(frontend) add a broadcast store #387
-- ✨(backend) whitelist pod's IP address #443
-- ✨(backend) config endpoint #425
-- ✨(frontend) config endpoint #424
-- ✨(frontend) add sentry #424
-- ✨(frontend) add crisp chatbot #450
-
-## Changed
-
-- 🚸(backend) improve users similarity search and sort results #391
-- ♻️(frontend) simplify stores #402
-- ✨(frontend) update $css Box props type to add styled components RuleSet #423
-- ✅(CI) trivy continue on error #453
-
-## Fixed
-
-- 🔧(backend) fix logging for docker and make it configurable by envar #427
-- 🦺(backend) add comma to sub regex #408
-- 🐛(editor) collaborative user tag hidden when read only #385
-- 🐛(frontend) users have view access when revoked #387
-- 🐛(frontend) fix placeholder editable when double clicks #454
-
-
-## [1.7.0] - 2024-10-24
-
-## Added
-
-- 📝Contributing.md #352
-- 🌐(frontend) add localization to editor #368
-- ✨Public and restricted doc editable #357
-- ✨(frontend) Add full name if available #380
-- ✨(backend) Add view accesses ability #376
-
-## Changed
-
-- ♻️(frontend) list accesses if user has abilities #376
-- ♻️(frontend) avoid documents indexing in search engine #372
-- 👔(backend) doc restricted by default #388
-
-## Fixed
-
-- 🐛(backend) require right to manage document accesses to see invitations #369
-- 🐛(i18n) same frontend and backend language using shared cookies #365
-- 🐛(frontend) add default toolbar buttons #355
-- 🐛(frontend) throttle error correctly display #378
-
-## Removed
-
-- 🔥(helm) remove infra related codes #366
-
-
-## [1.6.0] - 2024-10-17
-
-## Added
-
-- ✨AI to doc editor #250
-- ✨(backend) allow uploading more types of attachments #309
-- ✨(frontend) add buttons to copy document to clipboard as HTML/Markdown #318
-
-## Changed
-
-- ♻️(frontend) more multi theme friendly #325
-- ♻️ Bootstrap frontend #257
-- ♻️ Add username in email #314
-
-## Fixed
-
-- 🛂(backend) do not duplicate user when disabled
-- 🐛(frontend) invalidate queries after removing user #336
-- 🐛(backend) Fix dysfunctional permissions on document create #329
-- 🐛(backend) fix nginx docker container #340
-- 🐛(frontend) fix copy paste firefox #353
-
-
-## [1.5.1] - 2024-10-10
-
-## Fixed
-
-- 🐛(db) fix users duplicate #316
-
-## [1.5.0] - 2024-10-09
-
-## Added
-
-- ✨(backend) add name fields to the user synchronized with OIDC #301
-- ✨(ci) add security scan #291
-- ♻️(frontend) Add versions #277
-- ✨(frontend) one-click document creation #275
-- ✨(frontend) edit title inline #275
-- 📱(frontend) mobile responsive #304
-- 🌐(frontend) Update translation #308
-
-## Changed
-
-- 💄(frontend) error alert closeable on editor #284
-- ♻️(backend) Change email content #283
-- 🛂(frontend) viewers and editors can access share modal #302
-- ♻️(frontend) remove footer on doc editor #313
-
-## Fixed
-
-- 🛂(frontend) match email if no existing user matches the sub
-- 🐛(backend) gitlab oicd userinfo endpoint #232
-- 🛂(frontend) redirect to the OIDC when private doc and unauthentified #292
-- ♻️(backend) getting list of document versions available for a user #258
-- 🔧(backend) fix configuration to avoid different ssl warning #297
-- 🐛(frontend) fix editor break line not working #302
-
-
-## [1.4.0] - 2024-09-17
-
-## Added
-
 - ✨Add link public/authenticated/restricted access with read/editor roles #234
 - ✨(frontend) add copy link button #235
 - 🛂(frontend) access public docs without being logged #235
 
 ## Changed
 
-- ♻️(backend) Allow null titles on documents for easier creation #234
+- ♻️ Allow null titles on documents for easier creation #234
 - 🛂(backend) stop to list public doc to everyone #234
 - 🚚(frontend) change visibility in share modal #235
-- ⚡️(frontend) Improve summary #244
 
 ## Fixed
 
-- 🐛(backend) Fix forcing ID when creating a document via API endpoint #234
+- 🐛 Fix forcing ID when creating a document via API endpoint #234
 - 🐛 Rebuild frontend dev container from makefile #248
 
 
@@ -372,19 +149,7 @@ and this project adheres to
 - 🚀 Impress, project to manage your documents easily and collaboratively.
 
 
-[unreleased]: https://github.com/numerique-gouv/impress/compare/v2.0.1...main
-[v2.0.1]: https://github.com/numerique-gouv/impress/releases/v2.0.1
-[v2.0.0]: https://github.com/numerique-gouv/impress/releases/v2.0.0
-[v1.10.0]: https://github.com/numerique-gouv/impress/releases/v1.10.0
-[v1.9.0]: https://github.com/numerique-gouv/impress/releases/v1.9.0
-[v1.8.2]: https://github.com/numerique-gouv/impress/releases/v1.8.2
-[v1.8.1]: https://github.com/numerique-gouv/impress/releases/v1.8.1
-[v1.8.0]: https://github.com/numerique-gouv/impress/releases/v1.8.0
-[v1.7.0]: https://github.com/numerique-gouv/impress/releases/v1.7.0
-[v1.6.0]: https://github.com/numerique-gouv/impress/releases/v1.6.0
-[1.5.1]: https://github.com/numerique-gouv/impress/releases/v1.5.1
-[1.5.0]: https://github.com/numerique-gouv/impress/releases/v1.5.0
-[1.4.0]: https://github.com/numerique-gouv/impress/releases/v1.4.0
+[unreleased]: https://github.com/numerique-gouv/impress/compare/v1.3.0...main
 [1.3.0]: https://github.com/numerique-gouv/impress/releases/v1.3.0
 [1.2.1]: https://github.com/numerique-gouv/impress/releases/v1.2.1
 [1.2.0]: https://github.com/numerique-gouv/impress/releases/v1.2.0

CONTRIBUTING.md

@@ -1,79 +0,0 @@
-# Contributing to the Project
-
-Thank you for taking the time to contribute! Please follow these guidelines to ensure a smooth and productive workflow. 🚀🚀🚀
-
-To get started with the project, please refer to the [README.md](https://github.com/numerique-gouv/impress/blob/main/README.md) for detailed instructions.
-
-## Creating an Issue
-
-When creating an issue, please provide the following details:
-
-1.  **Title**: A concise and descriptive title for the issue.
-2.  **Description**: A detailed explanation of the issue, including relevant context or screenshots if applicable.
-3.  **Steps to Reproduce**: If the issue is a bug, include the steps needed to reproduce the problem.
-4.  **Expected vs. Actual Behavior**: Describe what you expected to happen and what actually happened.
-5.  **Labels**: Add appropriate labels to categorize the issue (e.g., bug, feature request, documentation).
-
-## Selecting an issue
-
-We use a [GitHub Project](https://github.com/orgs/numerique-gouv/projects/13) in order to prioritize our workload. 
-
-Please check in priority the issues that are in the **todo** column and have a higher priority (P0 -> P2). 
-
-## Commit Message Format
-
-All commit messages must adhere to the following format:
-
-`<gitmoji>(type) title description`
-
-*   <**gitmoji**>: Use a gitmoji to represent the purpose of the commit. For example, ✨ for adding a new feature or 🔥 for removing something, see the list here: <https://gitmoji.dev/>.
-*   **(type)**: Describe the type of change. Common types include `backend`, `frontend`, `CI`, `docker` etc...
-*   **title**: A short, descriptive title for the change, starting with a lowercase character.
-*   **description**: Include additional details about what was changed and why.
-
-### Example Commit Message
-
-```
-✨(frontend) add user authentication logic 
-
-Implemented login and signup features, and integrated OAuth2 for social login.
-```
-
-## Changelog Update
-
-Please add a line to the changelog describing your development. The changelog entry should include a brief summary of the changes, this helps in tracking changes effectively and keeping everyone informed. We usually include the title of the pull request, followed by the pull request ID to finish the log entry. The changelog line should be less than 80 characters in total.
-
-### Example Changelog Message
-```
-## [Unreleased]
-
-## Added
-
-- ✨(frontend) add AI to the project #321
-```
-
-## Pull Requests
-
-It is nice to add information about the purpose of the pull request to help reviewers understand the context and intent of the changes. If you can, add some pictures or a small video to show the changes.
-
-### Don't forget to: 
-- check your commits
-- check the linting: `make lint && make frontend-lint`
-- check the tests: `make test`
-- add a changelog entry
-
-Once all the required tests have passed, you can request a review from the project maintainers.
-
-## Code Style
-
-Please maintain consistency in code style. Run any linting tools available to make sure the code is clean and follows the project's conventions.
-
-## Tests
-
-Make sure that all new features or fixes have corresponding tests. Run the test suite before pushing your changes to ensure that nothing is broken.
-
-## Asking for Help
-
-If you need any help while contributing, feel free to open a discussion or ask for guidance in the issue tracker. We are more than happy to assist!
-
-Thank you for your contributions! 👍

Dockerfile

@@ -1,17 +1,18 @@
 # Django impress
 
 # ---- base image to inherit from ----
-FROM python:3.12.6-alpine3.20 AS base
+FROM python:3.10-slim-bullseye as base
 
 # Upgrade pip to its latest release to speed up dependencies installation
-RUN python -m pip install --upgrade pip setuptools
+RUN python -m pip install --upgrade pip
 
 # Upgrade system packages to install security updates
-RUN apk update && \
-  apk upgrade
+RUN apt-get update && \
+  apt-get -y upgrade && \
+  rm -rf /var/lib/apt/lists/*
 
 # ---- Back-end builder image ----
-FROM base AS back-builder
+FROM base as back-builder
 
 WORKDIR /builder
 
@@ -23,7 +24,7 @@ RUN mkdir /install && \
 
 
 # ---- mails ----
-FROM node:20 AS mail-builder
+FROM node:20 as mail-builder
 
 COPY ./src/mail /mail/app
 
@@ -34,13 +35,15 @@ RUN yarn install --frozen-lockfile && \
 
 
 # ---- static link collector ----
-FROM base AS link-collector
+FROM base as link-collector
 ARG IMPRESS_STATIC_ROOT=/data/static
 
-# Install pango & rdfind
-RUN apk add \
-  pango \
-  rdfind
+# Install libpangocairo & rdfind
+RUN apt-get update && \
+    apt-get install -y \
+      libpangocairo-1.0-0 \
+      rdfind && \
+    rm -rf /var/lib/apt/lists/*
 
 # Copy installed python dependencies
 COPY --from=back-builder /install /usr/local
@@ -51,7 +54,7 @@ COPY ./src/backend /app/
 WORKDIR /app
 
 # collectstatic
-RUN DJANGO_CONFIGURATION=Build \
+RUN DJANGO_CONFIGURATION=Build DJANGO_JWT_PRIVATE_SIGNING_KEY=Dummy \
     python manage.py collectstatic --noinput
 
 # Replace duplicated file by a symlink to decrease the overall size of the
@@ -59,24 +62,23 @@ RUN DJANGO_CONFIGURATION=Build \
 RUN rdfind -makesymlinks true -followsymlinks true -makeresultsfile false ${IMPRESS_STATIC_ROOT}
 
 # ---- Core application image ----
-FROM base AS core
+FROM base as core
 
 ENV PYTHONUNBUFFERED=1
 
 # Install required system libs
-RUN apk add \
-  cairo \
-  file \
-  font-noto \
-  font-noto-emoji \
-  gettext \
-  gdk-pixbuf \
-  libffi-dev \
-  pandoc \
-  pango \
-  shared-mime-info
-
-RUN wget https://svn.apache.org/repos/asf/httpd/httpd/trunk/docs/conf/mime.types -O /etc/mime.types
+RUN apt-get update && \
+    apt-get install -y \
+      gettext \
+      libcairo2 \
+      libffi-dev \
+      libgdk-pixbuf2.0-0 \
+      libpango-1.0-0 \
+      libpangocairo-1.0-0 \
+      pandoc \
+      fonts-noto-color-emoji \
+      shared-mime-info && \
+  rm -rf /var/lib/apt/lists/*
 
 # Copy entrypoint
 COPY ./docker/files/usr/local/bin/entrypoint /usr/local/bin/entrypoint
@@ -94,24 +96,21 @@ COPY ./src/backend /app/
 
 WORKDIR /app
 
-# Generate compiled translation messages
-RUN DJANGO_CONFIGURATION=Build \
-    python manage.py compilemessages
-
-
 # We wrap commands run in this container by the following entrypoint that
 # creates a user on-the-fly with the container user ID (see USER) and root group
 # ID.
 ENTRYPOINT [ "/usr/local/bin/entrypoint" ]
 
 # ---- Development image ----
-FROM core AS backend-development
+FROM core as backend-development
 
 # Switch back to the root user to install development dependencies
 USER root:root
 
 # Install psql
-RUN apk add postgresql-client
+RUN apt-get update && \
+    apt-get install -y postgresql-client && \
+    rm -rf /var/lib/apt/lists/*
 
 # Uninstall impress and re-install it in editable mode along with development
 # dependencies
@@ -131,7 +130,7 @@ ENV DB_HOST=postgresql \
 CMD ["python", "manage.py", "runserver", "0.0.0.0:8000"]
 
 # ---- Production image ----
-FROM core AS backend-production
+FROM core as backend-production
 
 ARG IMPRESS_STATIC_ROOT=/data/static
 

Makefile

@@ -38,13 +38,13 @@ DB_PORT            = 5432
 DOCKER_UID          = $(shell id -u)
 DOCKER_GID          = $(shell id -g)
 DOCKER_USER         = $(DOCKER_UID):$(DOCKER_GID)
-COMPOSE             = DOCKER_USER=$(DOCKER_USER) ./bin/compose
-COMPOSE_PRODUCTION  = DOCKER_USER=$(DOCKER_USER) COMPOSE_FILE=compose.production.yaml ./bin/compose
+COMPOSE             = DOCKER_USER=$(DOCKER_USER) docker compose
 COMPOSE_EXEC        = $(COMPOSE) exec
 COMPOSE_EXEC_APP    = $(COMPOSE_EXEC) app-dev
 COMPOSE_RUN         = $(COMPOSE) run --rm
 COMPOSE_RUN_APP     = $(COMPOSE_RUN) app-dev
 COMPOSE_RUN_CROWDIN = $(COMPOSE_RUN) crowdin crowdin
+WAIT_DB             = @$(COMPOSE_RUN) dockerize -wait tcp://$(DB_HOST):$(DB_PORT) -timeout 60s
 
 # -- Backend
 MANAGE              = $(COMPOSE_RUN_APP) python manage.py
@@ -65,19 +65,6 @@ data/media:
 data/static:
 	@mkdir -p data/static
 
-# -- production volumes
-data/production/media:
-	@mkdir -p data/production/media
-
-data/production/certs:
-	@mkdir -p data/production/certs
-
-data/production/databases/backend:
-	@mkdir -p data/production/databases/backend
-
-data/production/databases/keycloak:
-	@mkdir -p data/production/databases/keycloak
-
 # -- Project
 
 create-env-files: ## Copy the dist env files to env files
@@ -94,7 +81,7 @@ bootstrap: \
 	data/static \
 	create-env-files \
 	build \
-	run-with-frontend \
+	run-frontend-dev \
 	migrate \
 	demo \
 	back-i18n-compile \
@@ -102,50 +89,12 @@ bootstrap: \
 	mails-build
 .PHONY: bootstrap
 
-bootstrap-production: ## Prepare project to run in production mode using docker compose
-bootstrap-production: \
-	env.d/production \
-	data/production/media \
-	data/production/certs \
-	data/production/databases/backend \
-	data/production/databases/keycloak
-bootstrap-production:
-	@echo 'Environment files created in env.d/production'
-	@echo 'Edit them to set good value for your production environment'
-.PHONY: bootstrap-production
-
-run-production: ## Run compose project in production mode
-	@$(COMPOSE_PRODUCTION) up -d ingress
-.PHONY: run-production
-
-stop-production: ## Stop compose project in production mode
-	@$(COMPOSE_PRODUCTION) stop
-.PHONY: stop-production
-
-
 # -- Docker/compose
-build: cache ?= --no-cache
-build: ## build the project containers
-	@$(MAKE) build-backend cache=$(cache)
-	@$(MAKE) build-yjs-provider cache=$(cache)
-	@$(MAKE) build-frontend cache=$(cache)
+build: ## build the app-dev container
+	@$(COMPOSE) build app-dev --no-cache
+	@$(COMPOSE) build frontend-dev --no-cache
 .PHONY: build
 
-build-backend: cache ?=
-build-backend: ## build the app-dev container
-	@$(COMPOSE) build app-dev $(cache)
-.PHONY: build-backend
-
-build-yjs-provider: cache ?=
-build-yjs-provider: ## build the y-provider container
-	@$(COMPOSE) build y-provider $(cache)
-.PHONY: build-yjs-provider
-
-build-frontend: cache ?=
-build-frontend: ## build the frontend container
-	@$(COMPOSE) build frontend-dev $(cache)
-.PHONY: build-frontend
-
 down: ## stop and remove containers, networks, images, and volumes
 	@$(COMPOSE) down
 .PHONY: down
@@ -157,14 +106,10 @@ logs: ## display app-dev logs (follow mode)
 run: ## start the wsgi (production) and development server
 	@$(COMPOSE) up --force-recreate -d celery-dev
 	@$(COMPOSE) up --force-recreate -d y-provider
-	@$(COMPOSE) up --force-recreate -d nginx
+	@echo "Wait for postgresql to be up..."
+	@$(WAIT_DB)
 .PHONY: run
 
-run-with-frontend: ## Start all the containers needed (backend to frontend)
-	@$(MAKE) run
-	@$(COMPOSE) up --force-recreate -d frontend-dev
-.PHONY: run-with-frontend
-
 status: ## an alias for "docker compose ps"
 	@$(COMPOSE) ps
 .PHONY: status
@@ -220,12 +165,14 @@ test-back-parallel: ## run all back-end tests in parallel
 makemigrations:  ## run django makemigrations for the impress project.
 	@echo "$(BOLD)Running makemigrations$(RESET)"
 	@$(COMPOSE) up -d postgresql
+	@$(WAIT_DB)
 	@$(MANAGE) makemigrations
 .PHONY: makemigrations
 
 migrate:  ## run django migrations for the impress project.
 	@echo "$(BOLD)Running migrations$(RESET)"
 	@$(COMPOSE) up -d postgresql
+	@$(WAIT_DB)
 	@$(MANAGE) migrate
 .PHONY: migrate
 
@@ -259,8 +206,6 @@ resetdb: ## flush database and create a superuser "admin"
 	@${MAKE} superuser
 .PHONY: resetdb
 
-# -- Environment variable files
-
 env.d/development/common:
 	cp -n env.d/development/common.dist env.d/development/common
 
@@ -270,9 +215,6 @@ env.d/development/postgresql:
 env.d/development/kc_postgresql:
 	cp -n env.d/development/kc_postgresql.dist env.d/development/kc_postgresql
 
-env.d/production:
-	cp -rnf env.d/production.dist env.d/production
-
 # -- Internationalization
 
 env.d/development/crowdin:
@@ -344,19 +286,10 @@ help:
 	@grep -E '^[a-zA-Z0-9_-]+:.*?## .*$$' $(firstword $(MAKEFILE_LIST)) | sort | awk 'BEGIN {FS = ":.*?## "}; {printf "$(GREEN)%-30s$(RESET) %s\n", $$1, $$2}'
 .PHONY: help
 
-# Front
-frontend-install: ## install the frontend locally
-	cd $(PATH_FRONT_IMPRESS) && yarn
-.PHONY: frontend-install
-
-frontend-lint: ## run the frontend linter
-	cd $(PATH_FRONT) && yarn lint
-.PHONY: frontend-lint
-
-run-frontend-development: ## Run the frontend in development mode
-	@$(COMPOSE) stop frontend-dev
-	cd $(PATH_FRONT_IMPRESS) && yarn dev
-.PHONY: run-frontend-development
+# Front 
+run-frontend-dev: ## Install and run the frontend dev  
+	@$(COMPOSE) up --force-recreate -d frontend-dev
+.PHONY: run-frontend-dev
 
 frontend-i18n-extract: ## Extract the frontend translation inside a json to be used for crowdin
 	cd $(PATH_FRONT) && yarn i18n:extract
@@ -381,7 +314,7 @@ start-tilt: ## start the kubernetes cluster using kind
 	tilt up -f ./bin/Tiltfile
 .PHONY: build-k8s-cluster
 
-bump-packages-version: VERSION_TYPE ?= minor
+VERSION_TYPE ?= minor
 bump-packages-version: ## bump the version of the project - VERSION_TYPE can be "major", "minor", "patch"
 	cd ./src/mail && yarn version --no-git-tag-version --$(VERSION_TYPE)
 	cd ./src/frontend/ && yarn version --no-git-tag-version --$(VERSION_TYPE)

README.md

@@ -1,171 +1,86 @@
-<p align="center">
-  <a href="https://github.com/suitenumerique/docs">
-    <img alt="Docs" src="/docs/assets/logo-docs.png" width="300" />
-  </a>
-</p>
+# Impress
 
-<p align="center">
-Welcome to Docs! The open source document editor where your notes can become knowledge through live collaboration
-</p>
+Impress prints your markdown to pdf from predefined templates with user and role based access rights.
 
-<p align="center">
-  <a href="https://matrix.to/#/#docs-official:matrix.org">
-    Chat on Matrix
-  </a> - <a href="/docs/">
-    Documentation
-  </a> - <a href="#getting-started">
-    Getting started
-  </a>
-</p>
+Impress is built on top of [Django Rest
+Framework](https://www.django-rest-framework.org/) and [Next.js](https://nextjs.org/).
 
-<img src="/docs/assets/docs_live_collaboration_light.gif" width="100%" align="center"/>
+## Getting started
 
-## Why use Docs ❓
-Docs is a collaborative text editor designed to address common challenges in knowledge building and sharing.
+### Prerequisite
 
-### Write
-*   😌 Simple collaborative editing without the formatting complexity of markdown
-*   🔌 Offline? No problem, keep writing, your edits will get synced when back online
-*   💅 Create clean documents with limited but beautiful formatting options and focus on content
-*   🧱 Built for productivity (markdown support, many block types, slash commands, markdown support, keyboard shortcuts) (page in french sorry 😅).
-*   ✨ Save time thanks to our AI actions (generate, sum up, correct, translate)
+Make sure you have a recent version of Docker and [Docker
+Compose](https://docs.docker.com/compose/install) installed on your laptop:
 
-### Collaborate
-*   🤝 Collaborate in realtime with your team mates
-*   🔒 Granular access control to keep your information secure and shared with the right people
-*   📑 Professional document exports in multiple formats (.odt, .doc, .pdf) with customizable templates
-*   📚 Built-in wiki functionality to transform your team's collaborative work into organized knowledge `ETA 02/2025`
-
-### Self-host
-*   🚀 Easy to install, scalable and secure alternative to Notion, Outline or Confluence
-
-## Getting started 🔧
-### Test it
-Test Docs on your browser by logging in on this [environment](https://impress-preprod.beta.numerique.gouv.fr/docs/0aa856e9-da41-4d59-b73d-a61cb2c1245f/)
-```
-email: test.docs@yopmail.com
-password: I'd<3ToTestDocs
-```
-### Run it locally
-**Prerequisite**
-Make sure you have a recent version of Docker and [Docker Compose](https://docs.docker.com/compose/install) installed on your laptop:
-
-```shellscript
+```bash
 $ docker -v
-  Docker version 27.4.1, build b9d17ea
+  Docker version 20.10.2, build 2291f61
 
-$ docker compose version
-  Docker Compose version v2.32.1
+$ docker compose -v
+  docker compose version 1.27.4, build 40524192
 ```
 
-> ⚠️ You may need to run the following commands with sudo but this can be avoided by assigning your user to the `docker` group.
+> ⚠️ You may need to run the following commands with `sudo` but this can be
+> avoided by assigning your user to the `docker` group.
+
+### Project bootstrap
 
-**Project bootstrap**
 The easiest way to start working on the project is to use GNU Make:
 
-```shellscript
+```bash
 $ make bootstrap FLUSH_ARGS='--no-input'
 ```
 
-This command builds the `app` container, installs dependencies, performs database migrations and compile translations. It's a good idea to use this
+Then you can access to the project in development mode by going to http://localhost:3000.
+You will be prompted to log in, the default credentials are:
+```bash
+username: impress
+password: impress
+```
+---
 
-command each time you are pulling code from the project repository to avoid dependency-releated or migration-releated issues.
+This command builds the `app` container, installs dependencies, performs
+database migrations and compile translations. It's a good idea to use this
+command each time you are pulling code from the project repository to avoid
+dependency-releated or migration-releated issues.
 
 Your Docker services should now be up and running 🎉
 
-You can access to the project by going to <http://localhost:3000>.
+Note that if you need to run them afterwards, you can use the eponym Make rule:
 
-You will be prompted to log in, the default credentials are:
-
-```shellscript
-username: impress
-
-password: impress
+```bash
+$ make run-frontend-dev
 ```
 
-📝 Note that if you need to run them afterwards, you can use the eponym Make rule:
+### Adding content
 
-```shellscript
-$ make run-with-frontend
-```
-
-⚠️ For the frontend developper, it is often better to run the frontend in development mode locally.
-
-To do so, install the frontend dependencies with the following command:
-
-```shellscript
-$ make frontend-install
-```
-
-And run the frontend locally in development mode with the following command:
-
-```shellscript
-$ make run-frontend-development
-```
-
-To start all the services, except the frontend container, you can use the following command:
-
-```shellscript
-$ make run
-```
-
-**Adding content**
 You can create a basic demo site by running:
 
-```shellscript
-$ make demo
-```
+    $ make demo
 
 Finally, you can check all available Make rules using:
 
-```shellscript
+```bash
 $ make help
 ```
 
-**Django admin**
-You can access the Django admin site at
+### Django admin
 
-<http://localhost:8071/admin>.
+You can access the Django admin site at
+[http://localhost:8071/admin](http://localhost:8071/admin).
 
 You first need to create a superuser account:
 
-```shellscript
+```bash
 $ make superuser
 ```
 
-## Feedback 🙋‍♂️🙋‍♀️
-We'd love to hear your thoughts and hear about your experiments, so come and say hi on [Matrix](https://matrix.to/#/#docs-official:matrix.org).
+## Contributing
 
-## Roadmap
-Want to know where the project is headed? [🗺️ Checkout our roadmap](https://github.com/orgs/numerique-gouv/projects/13/views/11)
+This project is intended to be community-driven, so please, do not hesitate to
+get in touch if you have any question related to our implementation or design
+decisions.
 
-## Licence 📝
-This work is released under the MIT License (see [LICENSE](https://github.com/suitenumerique/docs/blob/main/LICENSE)).
+## License
 
-While Docs is public driven initiative our licence choice is an invitation for private sector actors to use, sell and contribute to the project. 
-
-## Contributing 🙌
-This project is intended to be community-driven, so please, do not hesitate to get in touch if you have any question related to our implementation or design decisions.
-
-If you intend to make pull requests see CONTRIBUTING for guidelines.
-
-Directory structure:
-
-```markdown
-docs
-├── bin - executable scripts or binaries that are used for various tasks, such as setup scripts, utility scripts, or custom commands.
-├── crowdin - for crowdin translations, a tool or service that helps manage translations for the project.
-├── docker - Dockerfiles and related configuration files used to build Docker images for the project. These images can be used for development, testing, or production environments.
-├── docs - documentation for the project, including user guides, API documentation, and other helpful resources.
-├── env.d/development - environment-specific configuration files for the development environment. These files might include environment variables, configuration settings, or other setup files needed for development.
-├── gitlint - configuration files for `gitlint`, a tool that enforces commit message guidelines to ensure consistency and quality in commit messages.
-├── playground - experimental or temporary code, where developers can test new features or ideas without affecting the main codebase.
-└── src - main source code directory, containing the core application code, libraries, and modules of the project.
-```
-
-## Credits ❤️
-### Stack
-Impress is built on top of [Django Rest Framework](https://www.django-rest-framework.org/), [Next.js](https://nextjs.org/), [MinIO](https://min.io/) and [BlocNote.js](https://www.blocknotejs.org/)
-
-### States ❤️ open source
-Docs is the result of a joint effort lead by the French 🇫🇷🥖 ([DINUM](https://www.numerique.gouv.fr/dinum/)) and German 🇩🇪🥨 government ([ZenDiS](https://zendis.de/)). We are always looking for new public partners feel free to reach out if you are interested in using or contributing to docs.
+This work is released under the MIT License (see [LICENSE](./LICENSE)).

bin/Tiltfile

@@ -20,7 +20,7 @@ docker_build(
 docker_build(
     'localhost:5001/impress-y-provider:latest',
     context='..',
-    dockerfile='../src/frontend/servers/y-provider/Dockerfile',
+    dockerfile='../src/frontend/Dockerfile',
     only=['./src/frontend/', './docker/', './.dockerignore'],
     target = 'y-provider',
     live_update=[

bin/_config.sh

@@ -6,9 +6,9 @@ REPO_DIR="$(cd "$( dirname "${BASH_SOURCE[0]}" )/.." && pwd)"
 UNSET_USER=0
 
 TERRAFORM_DIRECTORY="./env.d/terraform"
-if [ -z ${COMPOSE_FILE+x} ]; then
-    COMPOSE_FILE="${REPO_DIR}/compose.yaml"
-fi
+COMPOSE_FILE="${REPO_DIR}/docker-compose.yml"
+COMPOSE_PROJECT="impress"
+
 
 # _set_user: set (or unset) default user id used to run docker commands
 #
@@ -40,8 +40,9 @@ function _set_user() {
 # ARGS   : docker compose command arguments
 function _docker_compose() {
 
-    echo "🐳(compose) project, file: '${COMPOSE_FILE}'"
+    echo "🐳(compose) project: '${COMPOSE_PROJECT}' file: '${COMPOSE_FILE}'"
     docker compose \
+        -p "${COMPOSE_PROJECT}" \
         -f "${COMPOSE_FILE}" \
         --project-directory "${REPO_DIR}" \
         "$@"

bin/start-kind.sh

@@ -1,2 +1,103 @@
 #!/bin/sh
-curl https://raw.githubusercontent.com/numerique-gouv/tools/refs/heads/main/kind/create_cluster.sh | bash -s -- impress
+set -o errexit
+
+CURRENT_DIR=$(pwd)
+
+echo "0. Create ca"
+# 0. Create ca
+mkcert -install
+cd /tmp
+mkcert "127.0.0.1.nip.io" "*.127.0.0.1.nip.io"
+cd $CURRENT_DIR
+
+echo "1. Create registry container unless it already exists"
+# 1. Create registry container unless it already exists
+reg_name='kind-registry'
+reg_port='5001'
+if [ "$(docker inspect -f '{{.State.Running}}' "${reg_name}" 2>/dev/null || true)" != 'true' ]; then
+	docker run \
+		-d --restart=unless-stopped -p "127.0.0.1:${reg_port}:5000" --network bridge --name "${reg_name}" \
+		registry:2
+fi
+
+echo "2. Create kind cluster with containerd registry config dir enabled"
+# 2. Create kind cluster with containerd registry config dir enabled
+# TODO: kind will eventually enable this by default and this patch will
+# be unnecessary.
+#
+# See:
+# https://github.com/kubernetes-sigs/kind/issues/2875
+# https://github.com/containerd/containerd/blob/main/docs/cri/config.md#registry-configuration
+# See: https://github.com/containerd/containerd/blob/main/docs/hosts.md
+cat <<EOF | kind create cluster --config=-
+kind: Cluster
+apiVersion: kind.x-k8s.io/v1alpha4
+containerdConfigPatches:
+- |-
+  [plugins."io.containerd.grpc.v1.cri".registry]
+    config_path = "/etc/containerd/certs.d"
+nodes:
+- role: control-plane
+  image: kindest/node:v1.27.3
+  kubeadmConfigPatches:
+  - |
+    kind: InitConfiguration
+    nodeRegistration:
+      kubeletExtraArgs:
+        node-labels: "ingress-ready=true"
+  extraPortMappings:
+  - containerPort: 80
+    hostPort: 80
+    protocol: TCP
+  - containerPort: 443
+    hostPort: 443
+    protocol: TCP
+- role: worker
+  image: kindest/node:v1.27.3
+- role: worker
+  image: kindest/node:v1.27.3
+EOF
+
+echo "3. Add the registry config to the nodes"
+# 3. Add the registry config to the nodes
+#
+# This is necessary because localhost resolves to loopback addresses that are
+# network-namespace local.
+# In other words: localhost in the container is not localhost on the host.
+#
+# We want a consistent name that works from both ends, so we tell containerd to
+# alias localhost:${reg_port} to the registry container when pulling images
+REGISTRY_DIR="/etc/containerd/certs.d/localhost:${reg_port}"
+for node in $(kind get nodes); do
+	docker exec "${node}" mkdir -p "${REGISTRY_DIR}"
+	cat <<EOF | docker exec -i "${node}" cp /dev/stdin "${REGISTRY_DIR}/hosts.toml"
+[host."http://${reg_name}:5000"]
+EOF
+done
+
+echo "4. Connect the registry to the cluster network if not already connected"
+# 4. Connect the registry to the cluster network if not already connected
+# This allows kind to bootstrap the network but ensures they're on the same network
+if [ "$(docker inspect -f='{{json .NetworkSettings.Networks.kind}}' "${reg_name}")" = 'null' ]; then
+	docker network connect "kind" "${reg_name}"
+fi
+
+echo "5. Document the local registry"
+# 5. Document the local registry
+# https://github.com/kubernetes/enhancements/tree/master/keps/sig-cluster-lifecycle/generic/1755-communicating-a-local-registry
+cat <<EOF | kubectl apply -f -
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: local-registry-hosting
+  namespace: kube-public
+data:
+  localRegistryHosting.v1: |
+    host: "localhost:${reg_port}"
+    help: "https://kind.sigs.k8s.io/docs/user/local-registry/"
+EOF
+
+echo "6. Install ingress-nginx"
+kubectl apply -f https://raw.githubusercontent.com/kubernetes/ingress-nginx/main/deploy/static/provider/kind/deploy.yaml
+kubectl -n ingress-nginx create secret tls mkcert --key /tmp/127.0.0.1.nip.io+1-key.pem --cert /tmp/127.0.0.1.nip.io+1.pem
+kubectl -n ingress-nginx patch deployments.apps ingress-nginx-controller --type 'json' -p '[{"op": "add", "path": "/spec/template/spec/containers/0/args/-", "value":"--default-ssl-certificate=ingress-nginx/mkcert"}]'

bin/update_app_cacert.sh

@@ -1,17 +0,0 @@
-#!/bin/sh
-set -o errexit
-
-#  The script is pretty simple. It downloads the latest  cacert.pem  file from the  certifi  package and appends the root certificate from  mkcert  to it. Then it copies the updated  cacert.pem  file to the container. 
-#  The script is executed with the following command: 
-#  $ bin/update_app_cacert.sh docs-production-backend-1
-
-CONTAINER_NAME=${1:-"docs-production-backend-1"}
-
-echo "updating cacert.pem for certifi package in ${CONTAINER_NAME}"
-
-
-curl --create-dirs https://raw.githubusercontent.com/certifi/python-certifi/refs/heads/master/certifi/cacert.pem -o /tmp/certifi/cacert.pem
-cat "$(mkcert -CAROOT)/rootCA.pem" >> /tmp/certifi/cacert.pem
-docker cp /tmp/certifi/cacert.pem ${CONTAINER_NAME}:/usr/local/lib/python3.12/site-packages/certifi/cacert.pem
-
-echo "end patching cacert.pem in ${CONTAINER_NAME}"

compose.production.yaml

@@ -1,167 +0,0 @@
-name: docs-production
-
-services:
-  postgresql:
-    image: postgres:16
-    healthcheck:
-      test: ["CMD", "pg_isready", "-q", "-U", "docs", "-d", "docs"]
-      interval: 1s
-      timeout: 2s
-      retries: 300
-    env_file:
-      - env.d/production/postgresql
-    environment:
-      - PGDATA=/var/lib/postgresql/data/pgdata
-    volumes:
-      - ./data/production/databases/backend:/var/lib/postgresql/data/pgdata
-
-  redis:
-    image: redis:5
-
-  backend-migration:
-    image: lasuite/impress-backend:latest
-    user: ${DOCKER_USER:-1000}
-    command: ["python", "manage.py", "migrate", "--noinput"]
-    environment:
-      - DJANGO_CONFIGURATION=Production
-    env_file:
-      - env.d/production/backend
-      - env.d/production/postgresql
-      - env.d/production/yprovider
-    depends_on:
-      postgresql:
-        condition: service_healthy
-        restart: true
-      redis:
-        condition: service_started
-      minio:
-        condition: service_started
-
-  backend:
-    image: lasuite/impress-backend:latest
-    user: ${DOCKER_USER:-1000}
-    restart: always
-    environment:
-      - DJANGO_CONFIGURATION=Production
-    env_file:
-      - env.d/production/backend
-      - env.d/production/postgresql
-      - env.d/production/yprovider
-    healthcheck:
-      test: ["CMD", "python", "manage.py", "check"]
-      interval: 15s
-      timeout: 30s
-      retries: 20
-      start_period: 10s
-    depends_on:
-      postgresql:
-        condition: service_healthy
-        restart: true
-      backend-migration:
-        condition: service_completed_successfully
-      redis:
-        condition: service_started
-      minio:
-        condition: service_started
-      minio-bootstrap:
-        condition: service_completed_successfully
-
-  celery:
-    user: ${DOCKER_USER:-1000}
-    image: lasuite/impress-backend:latest
-    command: ["celery", "-A", "impress.celery_app", "worker", "-l", "INFO"]
-    environment:
-      - DJANGO_CONFIGURATION=Production
-    env_file:
-      - env.d/production/backend
-      - env.d/production/postgresql
-      - env.d/production/yprovider
-    depends_on:
-      - backend
-
-  frontend:
-    image: lasuite/impress-frontend:latest
-    user: ${DOCKER_USER:-1000}
-
-  y-provider:
-    image: lasuite/impress-y-provider:latest
-    user: ${DOCKER_USER:-1000}
-    env_file:
-      - env.d/production/yprovider
-
-  kc_postgresql:
-    image: postgres:16
-    healthcheck:
-      test: ["CMD", "pg_isready", "-q", "-U", "keycloak", "-d", "keycloak"]
-      interval: 1s
-      timeout: 2s
-      retries: 300    
-    env_file:
-      - env.d/production/kc_postgresql
-    environment:
-      - PGDATA=/var/lib/postgresql/data/pgdata
-    volumes:
-      - ./data/production/databases/keycloak:/var/lib/postgresql/data/pgdata
-
-  keycloak:
-    image: quay.io/keycloak/keycloak:26.1.0
-    command: ["start"]
-    env_file:
-      - env.d/production/keycloak
-      - env.d/production/kc_postgresql
-    ports:
-      - "8443:8443"
-    volumes:
-      - ${DOCS_PROD_KEYCLOAK_CERT_FOLDER:-./data/production/certs}:/etc/ssl/certs:ro
-    depends_on:
-      kc_postgresql:
-        condition: service_healthy
-        restart: true
-
-  minio-bootstrap:
-    image: minio/mc
-    env_file:
-      - env.d/production/minio
-    depends_on:
-      minio:
-        condition: service_healthy
-        restart: true
-    entrypoint: >
-      sh -c "
-      /usr/bin/mc alias set docs http://minio:9000 $${MINIO_ROOT_USER} $${MINIO_ROOT_PASSWORD} && \
-      /usr/bin/mc mb --ignore-existing docs/docs-media-storage && \
-      /usr/bin/mc version enable docs/docs-media-storage && \
-      exit 0;"
-
-  minio:
-    user: ${DOCKER_USER:-1000}
-    image: minio/minio
-    env_file:
-      - env.d/production/minio
-    healthcheck:
-      test: ["CMD", "mc", "ready", "local"]
-      interval: 1s
-      timeout: 20s
-      retries: 300
-    entrypoint: ""
-    command: minio server /data
-    volumes:
-      - ./data/production/media:/data
-
-  ingress:
-    image: nginx:1.27
-    ports:
-      - "${DOCS_PROD_NGING_PORT:-443}:8083"
-    volumes:
-      - ./docker/files/production/etc/nginx/conf.d:/etc/nginx/conf.d:ro
-      - ${DOCS_PROD_NGINX_CERT_FOLDER:-./data/production/certs}:/etc/nginx/ssl:ro
-    depends_on:
-      frontend:
-        condition: service_started
-      y-provider:
-        condition: service_started
-      keycloak:
-        condition: service_started
-      backend:
-        condition: service_healthy
-        restart: true

crowdin/config.yml

@@ -1,7 +1,7 @@
 #
 # Your crowdin's credentials
 #
-api_token_env: CROWDIN_PERSONAL_TOKEN
+api_token_env: CROWDIN_API_TOKEN
 project_id_env: CROWDIN_PROJECT_ID
 base_path_env: CROWDIN_BASE_PATH
 
@@ -15,11 +15,11 @@ preserve_hierarchy: true
 # Files configuration
 #
 files: [
-  {
-    source : "/backend/locale/django.pot",
-    dest: "/backend-impress.pot",
-    translation : "/backend/locale/%locale_with_underscore%/LC_MESSAGES/django.po"
-  },
+ {
+  source : "/backend/locale/django.pot",
+  dest: "/backend-impress.pot",
+  translation : "/backend/locale/%locale_with_underscore%/LC_MESSAGES/django.po"
+ },
   {
     source: "/frontend/packages/i18n/locales/impress/translations-crowdin.json",
     dest: "/frontend-impress.json",

docker-compose.yml

@@ -1,13 +1,6 @@
-name: docs
-
 services:
   postgresql:
     image: postgres:16
-    healthcheck:
-      test: ["CMD-SHELL", "pg_isready"]
-      interval: 1s
-      timeout: 2s
-      retries: 300
     env_file:
       - env.d/development/postgresql
     ports:
@@ -30,11 +23,6 @@ services:
     ports:
       - '9000:9000'
       - '9001:9001'
-    healthcheck:
-      test: ["CMD", "mc", "ready", "local"]
-      interval: 1s
-      timeout: 20s
-      retries: 300
     entrypoint: ""
     command: minio server --console-address :9001 /data
     volumes:
@@ -43,9 +31,7 @@ services:
   createbuckets:
     image: minio/mc
     depends_on:
-      minio:
-        condition: service_healthy
-        restart: true
+      - minio
     entrypoint: >
       sh -c "
       /usr/bin/mc alias set impress http://minio:9000 impress password && \
@@ -73,15 +59,11 @@ services:
       - ./src/backend:/app
       - ./data/static:/data/static
     depends_on:
-        postgresql:
-            condition: service_healthy
-            restart: true
-        mailcatcher:
-          condition: service_started
-        redis:
-          condition: service_started
-        createbuckets:
-          condition: service_started
+        - postgresql
+        - mailcatcher
+        - redis
+        - createbuckets
+        - nginx
   
   celery-dev:
     user: ${DOCKER_USER:-1000}
@@ -112,13 +94,9 @@ services:
       - env.d/development/common
       - env.d/development/postgresql
     depends_on:
-      postgresql:
-        condition: service_healthy
-        restart: true
-      redis:
-        condition: service_started
-      minio:
-        condition: service_started
+      - postgresql
+      - redis
+      - minio
 
   celery:
     user: ${DOCKER_USER:-1000}
@@ -140,23 +118,17 @@ services:
       - ./docker/files/etc/nginx/conf.d:/etc/nginx/conf.d:ro
     depends_on:
       - keycloak
-      - app-dev
-      - y-provider
 
-  frontend-dev:
-    user: "${DOCKER_USER:-1000}"
-    build: 
-      context: .
-      dockerfile: ./src/frontend/Dockerfile
-      target: frontend-production
-      args:
-        API_ORIGIN: "http://localhost:8071"
-        Y_PROVIDER_URL: "ws://localhost:4444"
-        MEDIA_URL: "http://localhost:8083"
-        SW_DEACTIVATED: "true"
-    image: impress:frontend-development
+  nginx-front:
+    image: nginx:1.25
     ports:
       - "3000:3000"
+    volumes:
+      - ./src/frontend/apps/impress/conf/default.conf:/etc/nginx/conf.d/default.conf
+      - ./src/frontend/apps/impress/out:/usr/share/nginx/html
+
+  dockerize:
+    image: jwilder/dockerize
 
   crowdin:
     image: crowdin/cli:3.16.0
@@ -171,7 +143,7 @@ services:
     image: node:18
     user: "${DOCKER_USER:-1000}"
     environment:
-      HOME: /tmp 
+      HOME: /tmp
     volumes:
       - ".:/app"
 
@@ -179,21 +151,33 @@ services:
     user: ${DOCKER_USER:-1000}
     build: 
       context: .
-      dockerfile: ./src/frontend/servers/y-provider/Dockerfile
+      dockerfile: ./src/frontend/Dockerfile
       target: y-provider
     restart: unless-stopped
-    env_file:
-      - env.d/development/common
     ports:
       - "4444:4444"
+    volumes:
+      - ./src/frontend/servers/y-provider:/home/frontend/servers/y-provider
+      - /home/frontend/servers/y-provider/node_modules/
+      - /home/frontend/servers/y-provider/dist/
+
+  frontend-dev:
+    user: "${DOCKER_USER:-1000}"
+    build: 
+      context: .
+      dockerfile: ./src/frontend/Dockerfile
+      target: impress-dev
+    ports:
+      - "3000:3000"
+    volumes:
+      - ./src/frontend/apps/impress:/home/frontend/apps/impress
+      - /home/frontend/node_modules/
+    depends_on:
+      - y-provider
+      - celery-dev
 
   kc_postgresql:
     image: postgres:14.3
-    healthcheck:
-      test: ["CMD-SHELL", "pg_isready"]
-      interval: 1s
-      timeout: 2s
-      retries: 300    
     ports:
       - "5433:5432"
     env_file:
@@ -225,6 +209,4 @@ services:
     ports:
       - "8080:8080"
     depends_on:
-      kc_postgresql:
-        condition: service_healthy
-        restart: true
+      - kc_postgresql

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

@@ -4,58 +4,9 @@ server {
     server_name localhost;
     charset utf-8;
 
-    # Proxy auth for collaboration server
-    location /collaboration/ws/ {
-        # Collaboration Auth request configuration
-        auth_request /collaboration-auth;
-        auth_request_set $authHeader $upstream_http_authorization;
-        auth_request_set $canEdit $upstream_http_x_can_edit;
-        auth_request_set $userId $upstream_http_x_user_id;
-
-        # Pass specific headers from the auth response
-        proxy_set_header Authorization $authHeader;
-        proxy_set_header X-Can-Edit $canEdit;
-        proxy_set_header X-User-Id $userId;
-
-        # Ensure WebSocket upgrade
-        proxy_http_version 1.1;
-        proxy_set_header Upgrade $http_upgrade;
-        proxy_set_header Connection "Upgrade";
-
-        # Collaboration server
-        proxy_pass http://y-provider:4444;
-
-        # Set appropriate timeout for WebSocket
-        proxy_read_timeout 86400;
-        proxy_send_timeout 86400;
-
-        # Preserve original host and additional headers
-        proxy_set_header Host $host;
-    }
-
-    location /collaboration-auth {
-        proxy_pass http://app-dev:8000/api/v1.0/documents/collaboration-auth/;
-        proxy_set_header Host $host;
-        proxy_set_header X-Real-IP $remote_addr;
-        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-        proxy_set_header X-Original-URL $request_uri;
-        
-        # Prevent the body from being passed
-        proxy_pass_request_body off;
-        proxy_set_header Content-Length "";
-        proxy_set_header X-Original-Method $request_method;
-    }
-
-    location  /collaboration/api/ {
-        # Collaboration server
-        proxy_pass http://y-provider:4444;
-        proxy_set_header Host $host;
-    }
-
-    # Proxy auth for media
     location /media/ {
         # Auth request configuration
-        auth_request /media-auth;
+        auth_request /auth;
         auth_request_set $authHeader $upstream_http_authorization;
         auth_request_set $authDate $upstream_http_x_amz_date;
         auth_request_set $authContentSha256 $upstream_http_x_amz_content_sha256;
@@ -70,8 +21,8 @@ server {
         proxy_set_header Host minio:9000;
     }
 
-    location /media-auth {
-        proxy_pass http://app-dev:8000/api/v1.0/documents/media-auth/;
+    location /auth {
+        proxy_pass http://app-dev:8000/api/v1.0/documents/retrieve-auth/;
         proxy_set_header Host $host;
         proxy_set_header X-Real-IP $remote_addr;
         proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;

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

@@ -1,132 +0,0 @@
-upstream docs_backend {
-    server backend:8000 fail_timeout=0;
-}
-
-upstream docs_frontend {
-    server frontend:8080 fail_timeout=0;
-}
-
-server {
-    listen 8083 ssl;
-    server_name localhost;
-
-    # Disables server version feedback on pages and in headers
-    server_tokens off;
-
-    ssl_certificate /etc/nginx/ssl/fullchain.pem;
-    ssl_certificate_key /etc/nginx/ssl/privkey.pem;
-
-    location @proxy_to_docs_backend {
-        proxy_set_header X-Forwarded-Proto https;
-        proxy_set_header Host $http_host;
-        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-
-        proxy_redirect off;
-        proxy_pass http://docs_backend;
-    }
-
-    location @proxy_to_docs_frontend {
-        proxy_set_header X-Forwarded-Proto https;
-        proxy_set_header Host $http_host;
-        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-
-        proxy_redirect off;
-        proxy_pass http://docs_frontend;
-    }
-
-    location / {
-        try_files $uri @proxy_to_docs_frontend;
-    }
-
-    location /api {
-        try_files $uri @proxy_to_docs_backend;
-    }
-
-    location /admin {
-        try_files $uri @proxy_to_docs_backend;
-    }
-
-    # Proxy auth for collaboration server
-    location /collaboration/ws/ {
-        # Collaboration Auth request configuration
-        auth_request /collaboration-auth;
-        proxy_set_header X-Forwarded-Proto https;
-        auth_request_set $authHeader $upstream_http_authorization;
-        auth_request_set $canEdit $upstream_http_x_can_edit;
-        auth_request_set $userId $upstream_http_x_user_id;
-
-        # Pass specific headers from the auth response
-        proxy_set_header Authorization $authHeader;
-        proxy_set_header X-Can-Edit $canEdit;
-        proxy_set_header X-User-Id $userId;
-
-        # Ensure WebSocket upgrade
-        proxy_http_version 1.1;
-        proxy_set_header Upgrade $http_upgrade;
-        proxy_set_header Connection "Upgrade";
-
-        # Collaboration server
-        proxy_pass http://y-provider:4444;
-
-        # Set appropriate timeout for WebSocket
-        proxy_read_timeout 86400;
-        proxy_send_timeout 86400;
-
-        # Preserve original host and additional headers
-        proxy_set_header X-Forwarded-Proto https;
-        proxy_set_header Origin $http_origin;
-        proxy_set_header Host $host;
-    }
-
-    location /collaboration-auth {
-        proxy_pass http://docs_backend/api/v1.0/documents/collaboration-auth/;
-        proxy_set_header X-Forwarded-Proto https;
-        proxy_set_header Host $host;
-        proxy_set_header X-Real-IP $remote_addr;
-        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-        proxy_set_header X-Original-URL $request_uri;
-        
-        # Prevent the body from being passed
-        proxy_pass_request_body off;
-        proxy_set_header Content-Length "";
-        proxy_set_header X-Original-Method $request_method;
-    }
-
-    location  /collaboration/api/ {
-        # Collaboration server
-        proxy_pass http://y-provider:4444;
-        proxy_set_header Host $host;
-    }
-
-    # Proxy auth for media
-    location /media/ {
-        # Auth request configuration
-        auth_request /media-auth;
-        auth_request_set $authHeader $upstream_http_authorization;
-        auth_request_set $authDate $upstream_http_x_amz_date;
-        auth_request_set $authContentSha256 $upstream_http_x_amz_content_sha256;
-
-        # Pass specific headers from the auth response
-        proxy_set_header Authorization $authHeader;
-        proxy_set_header X-Amz-Date $authDate;
-        proxy_set_header X-Amz-Content-SHA256 $authContentSha256;
-
-        # Get resource from Minio
-        proxy_pass http://minio:9000/docs-media-storage/;
-        proxy_set_header Host minio:9000;
-    }
-
-    location /media-auth {
-        proxy_pass http://docs_backend/api/v1.0/documents/media-auth/;
-        proxy_set_header X-Forwarded-Proto https;
-        proxy_set_header Host $host;
-        proxy_set_header X-Real-IP $remote_addr;
-        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-        proxy_set_header X-Original-URL $request_uri;
-        
-        # Prevent the body from being passed
-        proxy_pass_request_body off;
-        proxy_set_header Content-Length "";
-        proxy_set_header X-Original-Method $request_method;
-    }
-}

docs/examples/impress.values.yaml

@@ -1,163 +0,0 @@
-image:
-  repository: lasuite/impress-backend
-  pullPolicy: Always
-  tag: "latest"
-
-backend:
-  replicas: 1
-  envVars:
-    COLLABORATION_API_URL: https://impress.127.0.0.1.nip.io/collaboration/api/
-    COLLABORATION_SERVER_SECRET: my-secret
-    DJANGO_CSRF_TRUSTED_ORIGINS: https://impress.127.0.0.1.nip.io
-    DJANGO_CONFIGURATION: Feature
-    DJANGO_ALLOWED_HOSTS: impress.127.0.0.1.nip.io
-    DJANGO_SERVER_TO_SERVER_API_TOKENS: secret-api-key
-    DJANGO_SECRET_KEY: AgoodOrAbadKey
-    DJANGO_SETTINGS_MODULE: impress.settings
-    DJANGO_SUPERUSER_PASSWORD: admin
-    DJANGO_EMAIL_BRAND_NAME: "La Suite Numérique"
-    DJANGO_EMAIL_HOST: "mailcatcher"
-    DJANGO_EMAIL_LOGO_IMG: https://impress.127.0.0.1.nip.io/assets/logo-suite-numerique.png
-    DJANGO_EMAIL_PORT: 1025
-    DJANGO_EMAIL_USE_SSL: False
-    LOGGING_LEVEL_HANDLERS_CONSOLE: ERROR
-    LOGGING_LEVEL_LOGGERS_ROOT: INFO
-    LOGGING_LEVEL_LOGGERS_APP: INFO
-    OIDC_OP_JWKS_ENDPOINT: https://keycloak.127.0.0.1.nip.io/realms/impress/protocol/openid-connect/certs
-    OIDC_OP_AUTHORIZATION_ENDPOINT: https://keycloak.127.0.0.1.nip.io/realms/impress/protocol/openid-connect/auth
-    OIDC_OP_TOKEN_ENDPOINT: https://keycloak.127.0.0.1.nip.io/realms/impress/protocol/openid-connect/token
-    OIDC_OP_USER_ENDPOINT: https://keycloak.127.0.0.1.nip.io/realms/impress/protocol/openid-connect/userinfo
-    OIDC_OP_LOGOUT_ENDPOINT: https://keycloak.127.0.0.1.nip.io/realms/impress/protocol/openid-connect/session/end
-    OIDC_RP_CLIENT_ID: impress
-    OIDC_RP_CLIENT_SECRET: ThisIsAnExampleKeyForDevPurposeOnly
-    OIDC_RP_SIGN_ALGO: RS256
-    OIDC_RP_SCOPES: "openid email"
-    OIDC_VERIFY_SSL: False
-    USER_OIDC_FIELD_TO_SHORTNAME: "given_name"
-    USER_OIDC_FIELDS_TO_FULLNAME: "given_name,usual_name"
-    OIDC_REDIRECT_ALLOWED_HOSTS: https://impress.127.0.0.1.nip.io
-    OIDC_AUTH_REQUEST_EXTRA_PARAMS: "{'acr_values': 'eidas1'}"
-    LOGIN_REDIRECT_URL: https://impress.127.0.0.1.nip.io
-    LOGIN_REDIRECT_URL_FAILURE: https://impress.127.0.0.1.nip.io
-    LOGOUT_REDIRECT_URL: https://impress.127.0.0.1.nip.io
-    POSTHOG_KEY: "{'id': 'posthog_key', 'host': 'https://product.impress.127.0.0.1.nip.io'}"
-    DB_HOST: postgresql
-    DB_NAME: impress
-    DB_USER: dinum
-    DB_PASSWORD: pass
-    DB_PORT: 5432
-    POSTGRES_DB: impress
-    POSTGRES_USER: dinum
-    POSTGRES_PASSWORD: pass
-    REDIS_URL: redis://default:pass@redis-master:6379/1
-    AWS_S3_ENDPOINT_URL: http://minio.impress.svc.cluster.local:9000
-    AWS_S3_ACCESS_KEY_ID: root
-    AWS_S3_SECRET_ACCESS_KEY: password
-    AWS_STORAGE_BUCKET_NAME: impress-media-storage
-    STORAGES_STATICFILES_BACKEND: django.contrib.staticfiles.storage.StaticFilesStorage
-    Y_PROVIDER_API_BASE_URL: http://impress-y-provider:443/api/
-    Y_PROVIDER_API_KEY: my-secret
-
-  migrate:
-    command:
-      - "/bin/sh"
-      - "-c"
-      - |
-        python manage.py migrate --no-input &&
-        python manage.py create_demo --force
-    restartPolicy: Never
-
-  command:
-    - "gunicorn"
-    - "-c"
-    - "/usr/local/etc/gunicorn/impress.py"
-    - "impress.wsgi:application"
-    - "--reload"
-
-  createsuperuser:
-    command:
-      - "/bin/sh"
-      - "-c"
-      - |
-        python manage.py createsuperuser --email admin@example.com --password admin
-    restartPolicy: Never
-
-  # Exra volume to manage our local custom CA and avoid to set ssl_verify: false
-  extraVolumeMounts:
-    - name: certs
-      mountPath: /usr/local/lib/python3.12/site-packages/certifi/cacert.pem
-      subPath: cacert.pem
-
-  # Exra volume to manage our local custom CA and avoid to set ssl_verify: false
-  extraVolumes:
-    - name: certs
-      configMap:
-        name: certifi
-        items:
-        - key: cacert.pem
-          path: cacert.pem
-frontend:
-  envVars:
-    PORT: 8080
-    NEXT_PUBLIC_API_ORIGIN: https://impress.127.0.0.1.nip.io
-
-  replicas: 1
-
-  image:
-    repository: lasuite/impress-frontend
-    pullPolicy: Always
-    tag: "latest"
-
-yProvider:
-  replicas: 1
-
-  image:
-    repository: lasuite/impress-y-provider
-    pullPolicy: Always
-    tag: "latest"
-
-  envVars:
-    COLLABORATION_LOGGING: true
-    COLLABORATION_SERVER_ORIGIN: https://impress.127.0.0.1.nip.io
-    COLLABORATION_SERVER_SECRET: my-secret
-    Y_PROVIDER_API_KEY: my-secret
-
-posthog:
-  ingress:
-    enabled: false
-  ingressAssets:
-    enabled: false
-
-ingress:
-  enabled: true
-  host: impress.127.0.0.1.nip.io
-
-ingressCollaborationWS:
-  enabled: true
-  host: impress.127.0.0.1.nip.io
-  
-  annotations:
-    nginx.ingress.kubernetes.io/auth-url: https://impress.127.0.0.1.nip.io/api/v1.0/documents/collaboration-auth/
-
-ingressCollaborationApi:
-  enabled: true
-  host: impress.127.0.0.1.nip.io
-
-ingressAdmin:
-  enabled: true
-  host: impress.127.0.0.1.nip.io
-
-ingressMedia:
-  enabled: true
-  host: impress.127.0.0.1.nip.io
-
-  annotations:
-    nginx.ingress.kubernetes.io/auth-url: https://impress.127.0.0.1.nip.io/api/v1.0/documents/media-auth/
-    nginx.ingress.kubernetes.io/auth-response-headers: "Authorization, X-Amz-Date, X-Amz-Content-SHA256"
-    nginx.ingress.kubernetes.io/upstream-vhost: minio.impress.svc.cluster.local:9000
-    nginx.ingress.kubernetes.io/rewrite-target: /impress-media-storage/$1
-
-serviceMedia:
-  host: minio.impress.svc.cluster.local
-  port: 9000
-

docs/examples/minio.values.yaml

@@ -1,8 +0,0 @@
-auth:
-  rootUser: root
-  rootPassword: password
-provisioning:
-  enabled: true
-  buckets:
-    - name: impress-media-storage
-      versioning: true

docs/examples/postgresql.values.yaml

@@ -1,7 +0,0 @@
-auth:
-  username: dinum
-  password: pass
-  database: impress
-tls:
-  enabled: true
-  autoGenerated: true

docs/examples/redis.values.yaml

@@ -1,4 +0,0 @@
-auth:
-  password: pass
-architecture: standalone
-

docs/installation/compose.md

@@ -1,66 +0,0 @@
-# Installation with docker compose
-
-We provide a configuration for running Docs in production using docker compose. This configuration is experimental, the official way to deploy Docs in production is to use [k8s](docs/installation/k8s.md)
-
-## Requirements
-
-- A modern version of Docker and its Compose plugin.
-- SSL certificates for Docs domain and Keycloak.
-- Two domain name. One for the Docs application and an other one for Keycloak. Both can be a subdomain of a common domain. (example: docs.domain.tld and keycloak.domain.tld)
-
-## Installation
-
-- Clone this repository: `git clone https://github.com/suitenumerique/docs.git`
-- Then in the clone directory you can run the following command: `make bootsrap-production`
-
-## Configure your ssl certificates
-
-You have to provide the ssl certificates. The easiest way is to use [certbot](https://certbot.eff.org/), generate the certificates with it (both for Docs and Keycloak) and then mount them in ingress and keycloak containers. Two environment variables can be used for that: 
-- `DOCS_PROD_NGINX_CERT_FOLDER` path to the folder containing the certificates for Docs. This folder will be mounted in `/etc/nginx/ssl` in the container. You have to adapt the certificates name in the file `docker/files/production/etc/nginx/conf.d/default.conf` accordingly with the certificates name you have (see `ssl_certificate` and `ssl_certificate_key` directives).
-- `DOCS_PROD_KEYCLOAK_CERT_FOLDER` path to the folder containing the certificates for Keycloak. This folder will be mounted in `/etc/ssl/certs` in the container. You have to adapt the certificates name in the configuration file in `env.d/production/keycloak` to add the correct path for environment variables `KC_HTTPS_CERTIFICATE_FILE` and `KC_HTTPS_CERTIFICATE_KEY_FILE`.
-
-### Configuration
-
-All the configuration files are in the directory `env.d/production`. You have to edit all the files to complete them. For the OIDC information you will have them once Keycloak will be running and you have configured your own realm on it.
-
-#### env.d/production/minio
-
-All the settings related to Minio. You have to set a username and a password to manage the minio cluster. You will need them later in the `env.d/production/backend` file.
-
-#### env.d/production/postgresql
-
-All the settings related to the Postgresql database used by the Django application.
-
-#### env.d/production/yprovider
-
-All the settings related to the collaboration server. All the secret and api key must be generated.
-
-#### env.d/production/kc_postgresql
-
-All the settings related to the Postgresql database used by keycloak.
-
-#### env.d/production/keycloak
-
-All the settings related to the Keycloak application.
-
-#### env.d/production/backend
-
-All the settings related to the Django application. Only the settings you don't have for now are all the one related to OIDC. You will have them once the compose started and you can access to Keycloak.
-
-## Run the compose configuration
-
-The compose configuration can be run with the following command: `make run-production`. The first start can be a little bit long, lots of things are created. Once started you can check that everything is running with the following command: `COMPOSE_FILE=compose.production.yaml ./bin/compose ps`
-
-## Configure keycloak
-
-You have to create a new realm in your Keycloak and once created you have to create a new OIDC client in it. You will use this client to configure the OIDC part in `env.d/production/backend`. This is the last missing part to complete the Django application configuration.
-Once the client information set in `env.d/production/backend` you have to start the containers again by running the commande `make run-production`. The command will recreate the containers with the good configuration.
-
-### Helpers
-
-there is a helper script to control the `docker compose` command. You can export the variable `COMPOSE_FILE` with the compose filename (`export COMPOSE_FILE=compose.production.yaml`). After you can run `./bin/compose` to run the docker compose command line.
-
-Makefile commands available:
-- `make bootstrap-production`: create the configuration files in `env.d/production`, create the directories : `data/production`. Both directories must be backup, if you loose them you loose all the data related to the application.
-- `make run-production`: up the ingress containers. Will start all the containers needed in cascade.
-- `make stop-production`: stop all the containers.

docs/installation/k8s.md

@@ -1,231 +0,0 @@
-# Installation on a k8s cluster
-
-This document is a step-by-step guide that describes how to install Docs on a k8s cluster without AI features. It's a teaching document to learn how it's work. It needs to be adapt for production environment.
-
-
-## Prerequisites
-
-- k8s cluster with an nginx-ingress controller
-- an OIDC provider (if you don't have one, we will provide an example)
-- a PostgreSQL server (if you don't have one, we will provide an example)
-- a Memcached server (if you don't have one, we will provide an example)
-- a S3 bucket (if you don't have one, we will provide an example)
-
-### Test cluster
-
-If you do not have a test cluster, you can install everything on a local kind cluster. In this case, the simplest way is to use our script **bin/start-kind.sh**.
-
-To be able to use the script, you will need to install:
-
-- Docker (https://docs.docker.com/desktop/)
-- Kind (https://kind.sigs.k8s.io/docs/user/quick-start/#installation)
-- Mkcert (https://github.com/FiloSottile/mkcert#installation)
-- Helm (https://helm.sh/docs/intro/quickstart/#install-helm)
-
-```
-./bin/start-kind.sh 
-  % Total    % Received % Xferd  Average Speed   Time    Time     Time  Current
-                                 Dload  Upload   Total   Spent    Left  Speed
-100  4700  100  4700    0     0  92867      0 --:--:-- --:--:-- --:--:-- 94000
-0. Create ca
-The local CA is already installed in the system trust store! 👍
-The local CA is already installed in the Firefox and/or Chrome/Chromium trust store! 👍
-
-
-Created a new certificate valid for the following names 📜
- - "127.0.0.1.nip.io"
- - "*.127.0.0.1.nip.io"
-
-Reminder: X.509 wildcards only go one level deep, so this won't match a.b.127.0.0.1.nip.io ℹ️
-
-The certificate is at "./127.0.0.1.nip.io+1.pem" and the key at "./127.0.0.1.nip.io+1-key.pem" ✅
-
-It will expire on 24 March 2027 🗓
-
-1. Create registry container unless it already exists
-2. Create kind cluster with containerd registry config dir enabled
-Creating cluster "suite" ...
- ✓ Ensuring node image (kindest/node:v1.27.3) 🖼
- ✓ Preparing nodes 📦  
- ✓ Writing configuration 📜 
- ✓ Starting control-plane 🕹️ 
- ✓ Installing CNI 🔌 
- ✓ Installing StorageClass 💾 
-Set kubectl context to "kind-suite"
-You can now use your cluster with:
-
-kubectl cluster-info --context kind-suite
-
-Thanks for using kind! 😊
-3. Add the registry config to the nodes
-4. Connect the registry to the cluster network if not already connected
-5. Document the local registry
-configmap/local-registry-hosting created
-Warning: resource configmaps/coredns is missing the kubectl.kubernetes.io/last-applied-configuration annotation which is required by kubectl apply. kubectl apply should only be used on resources created declaratively by either kubectl create --save-config or kubectl apply. The missing annotation will be patched automatically.
-configmap/coredns configured
-deployment.apps/coredns restarted
-6. Install ingress-nginx
-namespace/ingress-nginx created
-serviceaccount/ingress-nginx created
-serviceaccount/ingress-nginx-admission created
-role.rbac.authorization.k8s.io/ingress-nginx created
-role.rbac.authorization.k8s.io/ingress-nginx-admission created
-clusterrole.rbac.authorization.k8s.io/ingress-nginx created
-clusterrole.rbac.authorization.k8s.io/ingress-nginx-admission created
-rolebinding.rbac.authorization.k8s.io/ingress-nginx created
-rolebinding.rbac.authorization.k8s.io/ingress-nginx-admission created
-clusterrolebinding.rbac.authorization.k8s.io/ingress-nginx created
-clusterrolebinding.rbac.authorization.k8s.io/ingress-nginx-admission created
-configmap/ingress-nginx-controller created
-service/ingress-nginx-controller created
-service/ingress-nginx-controller-admission created
-deployment.apps/ingress-nginx-controller created
-job.batch/ingress-nginx-admission-create created
-job.batch/ingress-nginx-admission-patch created
-ingressclass.networking.k8s.io/nginx created
-validatingwebhookconfiguration.admissionregistration.k8s.io/ingress-nginx-admission created
-secret/mkcert created
-deployment.apps/ingress-nginx-controller patched
-7. Setup namespace
-namespace/impress created
-Context "kind-suite" modified.
-secret/mkcert created
-$ kubectl -n ingress-nginx get po
-NAME                                        READY   STATUS      RESTARTS   AGE
-ingress-nginx-admission-create-t55ph        0/1     Completed   0          2m56s
-ingress-nginx-admission-patch-94dvt         0/1     Completed   1          2m56s
-ingress-nginx-controller-57c548c4cd-2rx47   1/1     Running     0          2m56s
-```
-When your k8s cluster is ready (the ingress nginx controller is up), you can start the deployment. This cluster is special because it uses the *.127.0.0.1.nip.io domain and mkcert certificates to have full HTTPS support and easy domain name management.
-
-Please remember that *.127.0.0.1.nip.io will always resolve to 127.0.0.1, except in the k8s cluster where we configure CoreDNS to answer with the ingress-nginx service IP.
-
-## Preparation
-
-### What will you use to authenticate your users ?
-
-Docs uses OIDC, so if you already have an OIDC provider, obtain the necessary information to use it. In the next step, we will see how to configure Django (and thus Docs) to use it. If you do not have a provider, we will show you how to deploy a local Keycloak instance (this is not a production deployment, just a demo).
-
-```
-$ kubectl create namespace impress
-$ kubectl config set-context --current --namespace=impress
-$ helm install keycloak oci://registry-1.docker.io/bitnamicharts/keycloak -f examples/keycloak.values.yaml
-$ #wait until
-$ kubectl get po
-NAME                    READY   STATUS    RESTARTS   AGE
-keycloak-0              1/1     Running   0          6m48s
-keycloak-postgresql-0   1/1     Running   0          6m48s
-```
-
-From here the important informations you will need are :
-
-```
-OIDC_OP_JWKS_ENDPOINT: https://keycloak.127.0.0.1.nip.io/realms/impress/protocol/openid-connect/certs
-OIDC_OP_AUTHORIZATION_ENDPOINT: https://keycloak.127.0.0.1.nip.io/realms/impress/protocol/openid-connect/auth
-OIDC_OP_TOKEN_ENDPOINT: https://keycloak.127.0.0.1.nip.io/realms/impress/protocol/openid-connect/token
-OIDC_OP_USER_ENDPOINT: https://keycloak.127.0.0.1.nip.io/realms/impress/protocol/openid-connect/userinfo
-OIDC_OP_LOGOUT_ENDPOINT: https://keycloak.127.0.0.1.nip.io/realms/impress/protocol/openid-connect/session/end
-OIDC_RP_CLIENT_ID: impress
-OIDC_RP_CLIENT_SECRET: ThisIsAnExampleKeyForDevPurposeOnly
-OIDC_RP_SIGN_ALGO: RS256
-OIDC_RP_SCOPES: "openid email"
-```
-
-You can find these values in **examples/keycloak.values.yaml**
-
-### Find redis server connexion values
-
-Impress need a redis so we will start by deploying a redis :
-
-```
-$ helm install redis oci://registry-1.docker.io/bitnamicharts/redis -f examples/redis.values.yaml
-$ kubectl get po
-NAME                    READY   STATUS    RESTARTS   AGE
-keycloak-0              1/1     Running   0          26m
-keycloak-postgresql-0   1/1     Running   0          26m
-redis-master-0          1/1     Running   0          35s
-```
-
-### Find postgresql connexion values
-
-Impress uses a postgresql db as backend so if you have a provider, obtain the necessary information to use it. If you do not have, you can install a postgresql testing environment as follow:
-
-```
-$ helm install postgresql oci://registry-1.docker.io/bitnamicharts/postgresql -f examples/postgresql.values.yaml
-$ kubectl get po
-NAME                    READY   STATUS    RESTARTS   AGE
-keycloak-0              1/1     Running   0          28m
-keycloak-postgresql-0   1/1     Running   0          28m
-postgresql-0            1/1     Running   0          14m
-redis-master-0          1/1     Running   0          42s
-```
-
-From here important informations you will need are :
-
-```
-DB_HOST: postgres-postgresql
-DB_NAME: impress
-DB_USER: dinum
-DB_PASSWORD: pass
-DB_PORT: 5432
-POSTGRES_DB: impress
-POSTGRES_USER: dinum
-POSTGRES_PASSWORD: pass
-```
-
-### Find s3 bucket connexion values
-
-Impress uses a s3 bucket to store documents so if you have a provider obtain the necessary information to use it. If you do not have, you can install a local minio testing environment as follow:
-
-```
-$ helm install minio oci://registry-1.docker.io/bitnamicharts/minio -f examples/minio.values.yaml
-$ kubectl get po
-NAME                       READY   STATUS      RESTARTS   AGE
-keycloak-0                 1/1     Running     0          38m
-keycloak-postgresql-0      1/1     Running     0          38m
-minio-84f5c66895-bbhsk     1/1     Running     0          42s
-minio-provisioning-2b5sq   0/1     Completed   0          42s
-postgresql-0               1/1     Running     0          24m
-redis-master-0             1/1     Running     0          10m
-```
-
-## Deployment
-
-Now you are ready to deploy Impress without AI. AI requiered more dependancies (openai API). To deploy impress you need to provide all previous informations to the helm chart.
-
-```
-$ helm repo add impress https://suitenumerique.github.io/docs/
-$ helm repo update
-$ helm install impress impress/docs -f examples/impress.values.yaml
-$ kubectl get po
-NAME                                         READY   STATUS      RESTARTS   AGE
-impress-docs-backend-96558758d-xtkbp         0/1     Running     0          79s
-impress-docs-backend-createsuperuser-r7ltc   0/1     Completed   0          79s
-impress-docs-backend-migrate-c949s           0/1     Completed   0          79s
-impress-docs-frontend-6749f644f7-p5s42       1/1     Running     0          79s
-impress-docs-y-provider-6947fd8f54-78f2l     1/1     Running     0          79s
-keycloak-0                                   1/1     Running     0          48m
-keycloak-postgresql-0                        1/1     Running     0          48m
-minio-84f5c66895-bbhsk                       1/1     Running     0          10m
-minio-provisioning-2b5sq                     0/1     Completed   0          10m
-postgresql-0                                 1/1     Running     0          34m
-redis-master-0                               1/1     Running     0          20m
-```
-
-## Test your deployment
-
-In order to test your deployment you have to login to your instance. If you use exclusively our examples you can do :
-
-```
-$ kubectl get ingress
-NAME                             CLASS    HOSTS                       ADDRESS     PORTS     AGE
-impress-docs                     <none>   impress.127.0.0.1.nip.io    localhost   80, 443   114s
-impress-docs-admin               <none>   impress.127.0.0.1.nip.io    localhost   80, 443   114s
-impress-docs-collaboration-api   <none>   impress.127.0.0.1.nip.io    localhost   80, 443   114s
-impress-docs-media               <none>   impress.127.0.0.1.nip.io    localhost   80, 443   114s
-impress-docs-ws                  <none>   impress.127.0.0.1.nip.io    localhost   80, 443   114s
-keycloak                         <none>   keycloak.127.0.0.1.nip.io   localhost   80        49m
-```
-
-You can use impress on https://impress.127.0.0.1.nip.io. The provisionning user in keycloak is impress/impress.
-

env.d/development/common.dist

@@ -4,21 +4,13 @@ DJANGO_SECRET_KEY=ThisIsAnExampleKeyForDevPurposeOnly
 DJANGO_SETTINGS_MODULE=impress.settings
 DJANGO_SUPERUSER_PASSWORD=admin
 
-# Logging
-# Set to DEBUG level for dev only
-LOGGING_LEVEL_HANDLERS_CONSOLE=INFO
-LOGGING_LEVEL_LOGGERS_ROOT=INFO
-LOGGING_LEVEL_LOGGERS_APP=INFO
-
 # Python
 PYTHONPATH=/app
 
 # impress settings
 
 # Mail
-DJANGO_EMAIL_BRAND_NAME="La Suite Numérique"
 DJANGO_EMAIL_HOST="mailcatcher"
-DJANGO_EMAIL_LOGO_IMG="http://localhost:3000/assets/logo-suite-numerique.png"
 DJANGO_EMAIL_PORT=1025
 
 # Backend url
@@ -29,7 +21,6 @@ STORAGES_STATICFILES_BACKEND=django.contrib.staticfiles.storage.StaticFilesStora
 AWS_S3_ENDPOINT_URL=http://minio:9000
 AWS_S3_ACCESS_KEY_ID=impress
 AWS_S3_SECRET_ACCESS_KEY=password
-MEDIA_BASE_URL=http://localhost:8083
 
 # OIDC
 OIDC_OP_JWKS_ENDPOINT=http://nginx:8083/realms/impress/protocol/openid-connect/certs
@@ -48,17 +39,3 @@ LOGOUT_REDIRECT_URL=http://localhost:3000
 
 OIDC_REDIRECT_ALLOWED_HOSTS=["http://localhost:8083", "http://localhost:3000"]
 OIDC_AUTH_REQUEST_EXTRA_PARAMS={"acr_values": "eidas1"}
-
-# AI
-AI_BASE_URL=https://openaiendpoint.com
-AI_API_KEY=password
-AI_MODEL=llama
-
-# Collaboration
-COLLABORATION_API_URL=http://nginx:8083/collaboration/api/
-COLLABORATION_SERVER_ORIGIN=http://localhost:3000
-COLLABORATION_SERVER_SECRET=my-secret
-COLLABORATION_WS_URL=ws://localhost:8083/collaboration/ws/
-
-# Frontend
-FRONTEND_THEME=dsfr

env.d/development/common.e2e.dist

@@ -1,6 +1,3 @@
 # For the CI job test-e2e
 SUSTAINED_THROTTLE_RATES="200/hour"
 BURST_THROTTLE_RATES="200/minute"
-DJANGO_SERVER_TO_SERVER_API_TOKENS=test-e2e
-Y_PROVIDER_API_KEY=yprovider-api-key
-Y_PROVIDER_API_BASE_URL=http://y-provider:4444/api/

env.d/development/crowdin.dist

@@ -1,3 +1,3 @@
-CROWDIN_PERSONAL_TOKEN=Your-Personal-Token
+CROWDIN_API_TOKEN=Your-Api-Token
 CROWDIN_PROJECT_ID=Your-Project-Id
 CROWDIN_BASE_PATH=/app/src

env.d/production.dist/backend

@@ -1,58 +0,0 @@
-## Django
-DJANGO_ALLOWED_HOSTS=impress.127.0.0.1.nip.io,keycloack.127.0.0.1.nip.io
-DJANGO_SECRET_KEY=ThisIsAnExampleKeyForDevPurposeOnly
-DJANGO_SETTINGS_MODULE=impress.settings
-DJANGO_SUPERUSER_PASSWORD=ThisIsAnExamplePassword
-
-# Logging
-# Set to DEBUG level for dev only
-LOGGING_LEVEL_HANDLERS_CONSOLE=ERROR
-LOGGING_LEVEL_LOGGERS_ROOT=INFO
-LOGGING_LEVEL_LOGGERS_APP=INFO
-
-# Python
-PYTHONPATH=/app
-
-# impress settings
-
-# Mail
-DJANGO_EMAIL_BRAND_NAME="La Suite Numérique"
-DJANGO_EMAIL_HOST="mailcatcher"
-DJANGO_EMAIL_LOGO_IMG="https://impress.127.0.0.1.nip.io/assets/logo-suite-numerique.png"
-DJANGO_EMAIL_PORT=1025
-
-# Media
-STORAGES_STATICFILES_BACKEND=django.contrib.staticfiles.storage.StaticFilesStorage
-AWS_S3_ENDPOINT_URL=http://minio:9000
-AWS_S3_ACCESS_KEY_ID=<minio root user>
-AWS_S3_SECRET_ACCESS_KEY=<minio root password>
-AWS_STORAGE_BUCKET_NAME=docs-media-storage
-MEDIA_BASE_URL=impress.127.0.0.1.nip.io
-
-# OIDC
-USER_OIDC_FIELD_TO_SHORTNAME="given_name"
-USER_OIDC_FIELDS_TO_FULLNAME="given_name,usual_name"
-OIDC_OP_JWKS_ENDPOINT=https://impress.127.0.0.1.nip.io/realms/impress/protocol/openid-connect/certs
-OIDC_OP_AUTHORIZATION_ENDPOINT=https://impress.127.0.0.1.nip.io/realms/impress/protocol/openid-connect/auth
-OIDC_OP_TOKEN_ENDPOINT=https://impress.127.0.0.1.nip.io/realms/impress/protocol/openid-connect/token
-OIDC_OP_USER_ENDPOINT=https://impress.127.0.0.1.nip.io/realms/impress/protocol/openid-connect/userinfo
-OIDC_OP_LOGOUT_ENDPOINT=https://impress.127.0.0.1.nip.io/realms/impress/protocol/openid-connect/logout
-OIDC_RP_CLIENT_ID=impress
-OIDC_RP_CLIENT_SECRETThisIsAnExampleKeyForDevPurposeOnly
-OIDC_RP_SIGN_ALGO=RS256
-OIDC_RP_SCOPES="openid email"
-
-LOGIN_REDIRECT_URL=https://impress.127.0.0.1.nip.io
-LOGIN_REDIRECT_URL_FAILURE=https://impress.127.0.0.1.nip.io
-LOGOUT_REDIRECT_URL=https://impress.127.0.0.1.nip.io
-
-OIDC_REDIRECT_ALLOWED_HOSTS=["https://impress.127.0.0.1.nip.io"]
-OIDC_AUTH_REQUEST_EXTRA_PARAMS={"acr_values": "eidas1"}
-
-# AI
-AI_BASE_URL=https://openaiendpoint.com
-AI_API_KEY=password
-AI_MODEL=llama
-
-# Frontend
-FRONTEND_THEME=dsfr

env.d/production.dist/kc_postgresql

@@ -1,9 +0,0 @@
-# Postgresql db container configuration
-POSTGRES_DB=keycloak
-POSTGRES_USER=keycloak
-POSTGRES_PASSWORD=<Set postgresql password>
-
-# Keycloak database configuration
-KC_DB_URL_DATABASE=keycloak
-KC_DB_USERNAME=keycloak
-KC_DB_PASSWORD=<Same password as above>

env.d/production.dist/keycloak

@@ -1,9 +0,0 @@
-KC_BOOTSTRAP_ADMIN_USERNAME=<Change this admin user>
-KC_BOOTSTRAP_ADMIN_PASSWORD=<Change this admin password>
-KC_DB=postgres
-KC_DB_URL_HOST=kc_postgresql
-KC_DB_SCHEMA=public
-PROXY_ADDRESS_FORWARDING='true'
-KC_HOSTNAME=http://localhost:8083
-KC_HTTPS_CERTIFICATE_FILE=/etc/ssl/certs/docs.crt
-KC_HTTPS_CERTIFICATE_KEY_FILE=/etc/ssl/private/docs.key

env.d/production.dist/minio

@@ -1,2 +0,0 @@
-MINIO_ROOT_USER=<Set minio root username>
-MINIO_ROOT_PASSWORD=<Set minio root password>

env.d/production.dist/postgresql

@@ -1,11 +0,0 @@
-# Postgresql db container configuration
-POSTGRES_DB=docs
-POSTGRES_USER=docs
-POSTGRES_PASSWORD=<Set postgresql password>
-
-# App database configuration
-DB_HOST=postgresql
-DB_NAME=docs
-DB_USER=docs
-DB_PASSWORD=<Same password as above>
-DB_PORT=5432

env.d/production.dist/yprovider

@@ -1,5 +0,0 @@
-COLLABORATION_LOGGING=true
-Y_PROVIDER_API_KEY=<Set y provider api key>
-COLLABORATION_API_URL=https://impress.127.0.0.1.nip.io/collaboration/api/
-COLLABORATION_SERVER_ORIGIN=https://impress.127.0.0.1.nip.io
-COLLABORATION_SERVER_SECRET=<Set collaboration secret>

renovate.json

@@ -13,13 +13,7 @@
       "enabled": false,
       "groupName": "ignored js dependencies",
       "matchManagers": ["npm"],
-      "matchPackageNames": [
-        "fetch-mock",
-        "node",
-        "node-fetch",
-        "eslint",
-        "workbox-webpack-plugin"
-      ]
+      "matchPackageNames": ["fetch-mock", "node", "node-fetch", "eslint"]
     }
   ]
 }

src/backend/.pylintrc

@@ -447,10 +447,10 @@ max-bool-expr=5
 max-branches=12
 
 # Maximum number of locals for function / method body
-max-locals=20
+max-locals=15
 
 # Maximum number of parents for a class (see R0901).
-max-parents=10
+max-parents=7
 
 # Maximum number of public methods for a class (see R0904).
 max-public-methods=20

src/backend/core/admin.py

@@ -29,19 +29,7 @@ class UserAdmin(auth_admin.UserAdmin):
                 )
             },
         ),
-        (
-            _("Personal info"),
-            {
-                "fields": (
-                    "sub",
-                    "email",
-                    "full_name",
-                    "short_name",
-                    "language",
-                    "timezone",
-                )
-            },
-        ),
+        (_("Personal info"), {"fields": ("sub", "email", "language", "timezone")}),
         (
             _("Permissions"),
             {
@@ -70,7 +58,6 @@ class UserAdmin(auth_admin.UserAdmin):
     list_display = (
         "id",
         "sub",
-        "full_name",
         "admin_email",
         "email",
         "is_active",
@@ -81,24 +68,9 @@ class UserAdmin(auth_admin.UserAdmin):
         "updated_at",
     )
     list_filter = ("is_staff", "is_superuser", "is_device", "is_active")
-    ordering = (
-        "is_active",
-        "-is_superuser",
-        "-is_staff",
-        "-is_device",
-        "-updated_at",
-        "full_name",
-    )
-    readonly_fields = (
-        "id",
-        "sub",
-        "email",
-        "full_name",
-        "short_name",
-        "created_at",
-        "updated_at",
-    )
-    search_fields = ("id", "sub", "admin_email", "email", "full_name")
+    ordering = ("is_active", "-is_superuser", "-is_staff", "-is_device", "-updated_at")
+    readonly_fields = ("id", "sub", "email", "created_at", "updated_at")
+    search_fields = ("id", "sub", "admin_email", "email")
 
 
 @admin.register(models.Template)

src/backend/core/api/filters.py

@@ -1,69 +0,0 @@
-"""API filters for Impress' core application."""
-
-from django.utils.translation import gettext_lazy as _
-
-import django_filters
-
-from core import models
-
-
-class DocumentFilter(django_filters.FilterSet):
-    """
-    Custom filter for filtering documents.
-    """
-
-    is_creator_me = django_filters.BooleanFilter(
-        method="filter_is_creator_me", label=_("Creator is me")
-    )
-    is_favorite = django_filters.BooleanFilter(
-        method="filter_is_favorite", label=_("Favorite")
-    )
-    title = django_filters.CharFilter(
-        field_name="title", lookup_expr="icontains", label=_("Title")
-    )
-
-    class Meta:
-        model = models.Document
-        fields = ["is_creator_me", "is_favorite", "link_reach", "title"]
-
-    # pylint: disable=unused-argument
-    def filter_is_creator_me(self, queryset, name, value):
-        """
-        Filter documents based on the `creator` being the current user.
-
-        Example:
-            - /api/v1.0/documents/?is_creator_me=true
-                → Filters documents created by the logged-in user
-            - /api/v1.0/documents/?is_creator_me=false
-                → Filters documents created by other users
-        """
-        user = self.request.user
-
-        if not user.is_authenticated:
-            return queryset
-
-        if value:
-            return queryset.filter(creator=user)
-
-        return queryset.exclude(creator=user)
-
-    # pylint: disable=unused-argument
-    def filter_is_favorite(self, queryset, name, value):
-        """
-        Filter documents based on whether they are marked as favorite by the current user.
-
-        Example:
-            - /api/v1.0/documents/?is_favorite=true
-                → Filters documents marked as favorite by the logged-in user
-            - /api/v1.0/documents/?is_favorite=false
-                → Filters documents not marked as favorite by the logged-in user
-        """
-        user = self.request.user
-
-        if not user.is_authenticated:
-            return queryset
-
-        if value:
-            return queryset.filter(favorited_by_users__user=user)
-
-        return queryset.exclude(favorited_by_users__user=user)

src/backend/core/api/permissions.py

@@ -1,12 +1,9 @@
 """Permission handlers for the impress core app."""
 
 from django.core import exceptions
-from django.db.models import Q
 
 from rest_framework import permissions
 
-from core.models import DocumentAccess, RoleChoices
-
 ACTION_FOR_METHOD_TO_PERMISSION = {
     "versions_detail": {"DELETE": "versions_destroy", "GET": "versions_retrieve"}
 }
@@ -62,38 +59,6 @@ class IsOwnedOrPublic(IsAuthenticated):
             return False
 
 
-class CanCreateInvitationPermission(permissions.BasePermission):
-    """
-    Custom permission class to handle permission checks for managing invitations.
-    """
-
-    def has_permission(self, request, view):
-        user = request.user
-
-        # Ensure the user is authenticated
-        if not (bool(request.auth) or request.user.is_authenticated):
-            return False
-
-        # Apply permission checks only for creation (POST requests)
-        if view.action != "create":
-            return True
-
-        # Check if resource_id is passed in the context
-        try:
-            document_id = view.kwargs["resource_id"]
-        except KeyError as exc:
-            raise exceptions.ValidationError(
-                "You must set a document ID in kwargs to manage document invitations."
-            ) from exc
-
-        # Check if the user has access to manage invitations (Owner/Admin roles)
-        return DocumentAccess.objects.filter(
-            Q(user=user) | Q(team__in=user.teams),
-            document=document_id,
-            role__in=[RoleChoices.OWNER, RoleChoices.ADMIN],
-        ).exists()
-
-
 class AccessPermission(permissions.BasePermission):
     """Permission class for access objects."""
 

src/backend/core/api/serializers.py

@@ -4,18 +4,11 @@ import mimetypes
 
 from django.conf import settings
 from django.db.models import Q
-from django.utils.functional import lazy
 from django.utils.translation import gettext_lazy as _
 
-import magic
 from rest_framework import exceptions, serializers
 
-from core import enums, models
-from core.services.ai_services import AI_ACTIONS
-from core.services.converter_services import (
-    ConversionError,
-    YdocConverter,
-)
+from core import models
 
 
 class UserSerializer(serializers.ModelSerializer):
@@ -23,8 +16,8 @@ class UserSerializer(serializers.ModelSerializer):
 
     class Meta:
         model = models.User
-        fields = ["id", "email", "full_name", "short_name"]
-        read_only_fields = ["id", "email", "full_name", "short_name"]
+        fields = ["id", "sub", "email"]
+        read_only_fields = ["id", "sub", "email"]
 
 
 class BaseAccessSerializer(serializers.ModelSerializer):
@@ -76,7 +69,6 @@ class BaseAccessSerializer(serializers.ModelSerializer):
             if not self.Meta.model.objects.filter(  # pylint: disable=no-member
                 Q(user=user) | Q(team__in=user.teams),
                 role__in=[models.RoleChoices.OWNER, models.RoleChoices.ADMIN],
-                **{self.Meta.resource_field_name: resource_id},  # pylint: disable=no-member
             ).exists():
                 raise exceptions.PermissionDenied(
                     "You are not allowed to manage accesses for this resource."
@@ -142,69 +134,33 @@ class BaseResourceSerializer(serializers.ModelSerializer):
         return {}
 
 
-class ListDocumentSerializer(BaseResourceSerializer):
-    """Serialize documents with limited fields for display in lists."""
-
-    is_favorite = serializers.BooleanField(read_only=True)
-    nb_accesses = serializers.IntegerField(read_only=True)
-
-    class Meta:
-        model = models.Document
-        fields = [
-            "id",
-            "abilities",
-            "content",
-            "created_at",
-            "creator",
-            "is_favorite",
-            "link_role",
-            "link_reach",
-            "nb_accesses",
-            "title",
-            "updated_at",
-        ]
-        read_only_fields = [
-            "id",
-            "abilities",
-            "created_at",
-            "creator",
-            "is_favorite",
-            "link_role",
-            "link_reach",
-            "nb_accesses",
-            "updated_at",
-        ]
-
-
-class DocumentSerializer(ListDocumentSerializer):
-    """Serialize documents with all fields for display in detail views."""
+class DocumentSerializer(BaseResourceSerializer):
+    """Serialize documents."""
 
     content = serializers.CharField(required=False)
+    accesses = DocumentAccessSerializer(many=True, read_only=True)
 
     class Meta:
         model = models.Document
         fields = [
             "id",
-            "abilities",
             "content",
-            "created_at",
-            "creator",
-            "is_favorite",
+            "title",
+            "accesses",
+            "abilities",
+            "is_e2ee",
             "link_role",
             "link_reach",
-            "nb_accesses",
-            "title",
+            "created_at",
             "updated_at",
         ]
         read_only_fields = [
             "id",
+            "accesses",
             "abilities",
-            "created_at",
-            "creator",
-            "is_favorite",
             "link_role",
             "link_reach",
-            "nb_accesses",
+            "created_at",
             "updated_at",
         ]
 
@@ -232,104 +188,6 @@ class DocumentSerializer(ListDocumentSerializer):
         return value
 
 
-class ServerCreateDocumentSerializer(serializers.Serializer):
-    """
-    Serializer for creating a document from a server-to-server request.
-
-    Expects 'content' as a markdown string, which is converted to our internal format
-    via a Node.js microservice. The conversion is handled automatically, so third parties
-    only need to provide markdown.
-
-    Both "sub" and "email" are required because the external app calling doesn't know
-    if the user will pre-exist in Docs database. If the user pre-exist, we will ignore the
-    submitted "email" field and use the email address set on the user account in our database
-    """
-
-    # Document
-    title = serializers.CharField(required=True)
-    content = serializers.CharField(required=True)
-    # User
-    sub = serializers.CharField(
-        required=True, validators=[models.User.sub_validator], max_length=255
-    )
-    email = serializers.EmailField(required=True)
-    language = serializers.ChoiceField(
-        required=False, choices=lazy(lambda: settings.LANGUAGES, tuple)()
-    )
-    # Invitation
-    message = serializers.CharField(required=False)
-    subject = serializers.CharField(required=False)
-
-    def create(self, validated_data):
-        """Create the document and associate it with the user or send an invitation."""
-        language = validated_data.get("language", settings.LANGUAGE_CODE)
-
-        # Get the user on its sub (unique identifier). Default on email if allowed in settings
-        email = validated_data["email"]
-
-        try:
-            user = models.User.objects.get_user_by_sub_or_email(
-                validated_data["sub"], email
-            )
-        except models.DuplicateEmailError as err:
-            raise serializers.ValidationError({"email": [err.message]}) from err
-
-        if user:
-            email = user.email
-            language = user.language or language
-
-        try:
-            document_content = YdocConverter().convert_markdown(
-                validated_data["content"]
-            )
-        except ConversionError as err:
-            raise serializers.ValidationError(
-                {"content": ["Could not convert content"]}
-            ) from err
-
-        document = models.Document.objects.create(
-            title=validated_data["title"],
-            content=document_content,
-            creator=user,
-        )
-
-        if user:
-            # Associate the document with the pre-existing user
-            models.DocumentAccess.objects.create(
-                document=document,
-                role=models.RoleChoices.OWNER,
-                user=user,
-            )
-        else:
-            # The user doesn't exist in our database: we need to invite him/her
-            models.Invitation.objects.create(
-                document=document,
-                email=email,
-                role=models.RoleChoices.OWNER,
-            )
-
-        self._send_email_notification(document, validated_data, email, language)
-        return document
-
-    def _send_email_notification(self, document, validated_data, email, language):
-        """Notify the user about the newly created document."""
-        subject = validated_data.get("subject") or _(
-            "A new document was created on your behalf!"
-        )
-        context = {
-            "message": validated_data.get("message")
-            or _("You have been granted ownership of a new document:"),
-            "title": subject,
-        }
-        document.send_email(subject, [email], context, language)
-
-    def update(self, instance, validated_data):
-        """
-        This serializer does not support updates.
-        """
-        raise NotImplementedError("Update is not supported for this serializer.")
-
-
 class LinkDocumentSerializer(BaseResourceSerializer):
     """
     Serialize link configuration for documents.
@@ -361,44 +219,16 @@ class FileUploadSerializer(serializers.Serializer):
                 f"File size exceeds the maximum limit of {max_size:d} MB."
             )
 
-        extension = file.name.rpartition(".")[-1] if "." in file.name else None
-
-        # Read the first few bytes to determine the MIME type accurately
-        mime = magic.Magic(mime=True)
-        magic_mime_type = mime.from_buffer(file.read(1024))
-        file.seek(0)  # Reset file pointer to the beginning after reading
-
-        self.context["is_unsafe"] = (
-            magic_mime_type in settings.DOCUMENT_UNSAFE_MIME_TYPES
-        )
-
-        extension_mime_type, _ = mimetypes.guess_type(file.name)
-
-        # Try guessing a coherent extension from the mimetype
-        if extension_mime_type != magic_mime_type:
-            self.context["is_unsafe"] = True
-
-        guessed_ext = mimetypes.guess_extension(magic_mime_type)
-        # Missing extensions or extensions longer than 5 characters (it's as long as an extension
-        # can be) are replaced by the extension we eventually guessed from mimetype.
-        if (extension is None or len(extension) > 5) and guessed_ext:
-            extension = guessed_ext[1:]
-
-        if extension is None:
-            raise serializers.ValidationError("Could not determine file extension.")
-
-        self.context["expected_extension"] = extension
-        self.context["content_type"] = magic_mime_type
+        # Validate file type
+        mime_type, _ = mimetypes.guess_type(file.name)
+        if mime_type not in settings.DOCUMENT_IMAGE_ALLOWED_MIME_TYPES:
+            mime_types = ", ".join(settings.DOCUMENT_IMAGE_ALLOWED_MIME_TYPES)
+            raise serializers.ValidationError(
+                f"File type '{mime_type:s}' is not allowed. Allowed types are: {mime_types:s}"
+            )
 
         return file
 
-    def validate(self, attrs):
-        """Override validate to add the computed extension to validated_data."""
-        attrs["expected_extension"] = self.context["expected_extension"]
-        attrs["is_unsafe"] = self.context["is_unsafe"]
-        attrs["content_type"] = self.context["content_type"]
-        return attrs
-
 
 class TemplateSerializer(BaseResourceSerializer):
     """Serialize templates."""
@@ -470,72 +300,54 @@ class InvitationSerializer(serializers.ModelSerializer):
         return {}
 
     def validate(self, attrs):
-        """Validate invitation data."""
+        """Validate and restrict invitation to new user based on email."""
+
         request = self.context.get("request")
         user = getattr(request, "user", None)
+        role = attrs.get("role")
 
-        attrs["document_id"] = self.context["resource_id"]
+        try:
+            document_id = self.context["resource_id"]
+        except KeyError as exc:
+            raise exceptions.ValidationError(
+                "You must set a document ID in kwargs to create a new document invitation."
+            ) from exc
 
-        # Only set the issuer if the instance is being created
-        if self.instance is None:
-            attrs["issuer"] = user
+        if not user and user.is_authenticated:
+            raise exceptions.PermissionDenied(
+                "Anonymous users are not allowed to create invitations."
+            )
 
-        return attrs
+        if not models.DocumentAccess.objects.filter(
+            Q(user=user) | Q(team__in=user.teams),
+            document=document_id,
+            role__in=[models.RoleChoices.OWNER, models.RoleChoices.ADMIN],
+        ).exists():
+            raise exceptions.PermissionDenied(
+                "You are not allowed to manage invitations for this document."
+            )
 
-    def validate_role(self, role):
-        """Custom validation for the role field."""
-        request = self.context.get("request")
-        user = getattr(request, "user", None)
-        document_id = self.context["resource_id"]
-
-        # If the role is OWNER, check if the user has OWNER access
-        if role == models.RoleChoices.OWNER:
-            if not models.DocumentAccess.objects.filter(
+        if (
+            role == models.RoleChoices.OWNER
+            and not models.DocumentAccess.objects.filter(
                 Q(user=user) | Q(team__in=user.teams),
                 document=document_id,
                 role=models.RoleChoices.OWNER,
-            ).exists():
-                raise serializers.ValidationError(
-                    "Only owners of a document can invite other users as owners."
-                )
+            ).exists()
+        ):
+            raise exceptions.PermissionDenied(
+                "Only owners of a document can invite other users as owners."
+            )
 
-        return role
+        attrs["document_id"] = document_id
+        attrs["issuer"] = user
+        return attrs
 
 
-class VersionFilterSerializer(serializers.Serializer):
-    """Validate version filters applied to the list endpoint."""
+class DocumentVersionSerializer(serializers.Serializer):
+    """Serialize Versions."""
 
-    version_id = serializers.CharField(required=False, allow_blank=True)
-    page_size = serializers.IntegerField(
-        required=False, min_value=1, max_value=50, default=20
-    )
-
-
-class AITransformSerializer(serializers.Serializer):
-    """Serializer for AI transform requests."""
-
-    action = serializers.ChoiceField(choices=AI_ACTIONS, required=True)
-    text = serializers.CharField(required=True)
-
-    def validate_text(self, value):
-        """Ensure the text field is not empty."""
-
-        if len(value.strip()) == 0:
-            raise serializers.ValidationError("Text field cannot be empty.")
-        return value
-
-
-class AITranslateSerializer(serializers.Serializer):
-    """Serializer for AI translate requests."""
-
-    language = serializers.ChoiceField(
-        choices=tuple(enums.ALL_LANGUAGES.items()), required=True
-    )
-    text = serializers.CharField(required=True)
-
-    def validate_text(self, value):
-        """Ensure the text field is not empty."""
-
-        if len(value.strip()) == 0:
-            raise serializers.ValidationError("Text field cannot be empty.")
-        return value
+    etag = serializers.CharField()
+    is_latest = serializers.BooleanField()
+    last_modified = serializers.DateTimeField()
+    version_id = serializers.CharField()

src/backend/core/api/utils.py

@@ -1,14 +1,8 @@
 """Util to generate S3 authorization headers for object storage access control"""
 
-import time
-from abc import ABC, abstractmethod
-
-from django.conf import settings
-from django.core.cache import cache
 from django.core.files.storage import default_storage
 
 import botocore
-from rest_framework.throttling import BaseThrottle
 
 
 def generate_s3_authorization_headers(key):
@@ -37,93 +31,3 @@ def generate_s3_authorization_headers(key):
     auth.add_auth(request)
 
     return request
-
-
-class AIBaseRateThrottle(BaseThrottle, ABC):
-    """Base throttle class for AI-related rate limiting with backoff."""
-
-    def __init__(self, rates):
-        """Initialize instance attributes with configurable rates."""
-        super().__init__()
-        self.rates = rates
-        self.cache_key = None
-        self.recent_requests_minute = 0
-        self.recent_requests_hour = 0
-        self.recent_requests_day = 0
-
-    @abstractmethod
-    def get_cache_key(self, request, view):
-        """Abstract method to generate cache key for throttling."""
-
-    def allow_request(self, request, view):
-        """Check if the request is allowed based on rate limits."""
-        self.cache_key = self.get_cache_key(request, view)
-        if not self.cache_key:
-            return True  # Allow if no cache key is generated
-
-        now = time.time()
-        history = cache.get(self.cache_key, [])
-        # Keep requests within the last 24 hours
-        history = [req for req in history if req > now - 86400]
-
-        # Calculate recent requests
-        self.recent_requests_minute = len([req for req in history if req > now - 60])
-        self.recent_requests_hour = len([req for req in history if req > now - 3600])
-        self.recent_requests_day = len(history)
-
-        # Check rate limits
-        if self.recent_requests_minute >= self.rates["minute"]:
-            return False
-        if self.recent_requests_hour >= self.rates["hour"]:
-            return False
-        if self.recent_requests_day >= self.rates["day"]:
-            return False
-
-        # Log the request
-        history.append(now)
-        cache.set(self.cache_key, history, timeout=86400)
-        return True
-
-    def wait(self):
-        """Implement a backoff strategy by increasing wait time based on limits hit."""
-        if self.recent_requests_day >= self.rates["day"]:
-            return 86400
-        if self.recent_requests_hour >= self.rates["hour"]:
-            return 3600
-        if self.recent_requests_minute >= self.rates["minute"]:
-            return 60
-        return None
-
-
-class AIDocumentRateThrottle(AIBaseRateThrottle):
-    """Throttle for limiting AI requests per document with backoff."""
-
-    def __init__(self, *args, **kwargs):
-        super().__init__(settings.AI_DOCUMENT_RATE_THROTTLE_RATES)
-
-    def get_cache_key(self, request, view):
-        """Include document ID in the cache key."""
-        document_id = view.kwargs["pk"]
-        return f"document_{document_id}_throttle_ai"
-
-
-class AIUserRateThrottle(AIBaseRateThrottle):
-    """Throttle that limits requests per user or IP with backoff and rate limits."""
-
-    def __init__(self, *args, **kwargs):
-        super().__init__(settings.AI_USER_RATE_THROTTLE_RATES)
-
-    def get_cache_key(self, request, view=None):
-        """Generate a cache key based on the user ID or IP for anonymous users."""
-        if request.user.is_authenticated:
-            return f"user_{request.user.id!s}_throttle_ai"
-        return f"anonymous_{self.get_ident(request)}_throttle_ai"
-
-    def get_ident(self, request):
-        """Return the request IP address."""
-        x_forwarded_for = request.META.get("HTTP_X_FORWARDED_FOR")
-        return (
-            x_forwarded_for.split(",")[0]
-            if x_forwarded_for
-            else request.META.get("REMOTE_ADDR")
-        )

src/backend/core/authentication/__init__.py

@@ -1,52 +0,0 @@
-"""Custom authentication classes for the Impress core app"""
-
-from django.conf import settings
-
-from rest_framework.authentication import BaseAuthentication
-from rest_framework.exceptions import AuthenticationFailed
-
-
-class ServerToServerAuthentication(BaseAuthentication):
-    """
-    Custom authentication class for server-to-server requests.
-    Validates the presence and correctness of the Authorization header.
-    """
-
-    AUTH_HEADER = "Authorization"
-    TOKEN_TYPE = "Bearer"  # noqa S105
-
-    def authenticate(self, request):
-        """
-        Authenticate the server-to-server request by validating the Authorization header.
-
-        This method checks if the Authorization header is present in the request, ensures it
-        contains a valid token with the correct format, and verifies the token against the
-        list of allowed server-to-server tokens. If the header is missing, improperly formatted,
-        or contains an invalid token, an AuthenticationFailed exception is raised.
-
-        Returns:
-            None: If authentication is successful
-                  (no user is authenticated for server-to-server requests).
-
-        Raises:
-            AuthenticationFailed: If the Authorization header is missing, malformed,
-            or contains an invalid token.
-        """
-        auth_header = request.headers.get(self.AUTH_HEADER)
-        if not auth_header:
-            raise AuthenticationFailed("Authorization header is missing.")
-
-        # Validate token format and existence
-        auth_parts = auth_header.split(" ")
-        if len(auth_parts) != 2 or auth_parts[0] != self.TOKEN_TYPE:
-            raise AuthenticationFailed("Invalid authorization header.")
-
-        token = auth_parts[1]
-        if token not in settings.SERVER_TO_SERVER_API_TOKENS:
-            raise AuthenticationFailed("Invalid server-to-server token.")
-
-        # Authentication is successful, but no user is authenticated
-
-    def authenticate_header(self, request):
-        """Return the WWW-Authenticate header value."""
-        return f"{self.TOKEN_TYPE} realm='Create document server to server'"

src/backend/core/authentication/backends.py

@@ -1,8 +1,5 @@
 """Authentication Backends for the Impress core app."""
 
-import logging
-
-from django.conf import settings
 from django.core.exceptions import SuspiciousOperation
 from django.utils.translation import gettext_lazy as _
 
@@ -11,9 +8,7 @@ from mozilla_django_oidc.auth import (
     OIDCAuthenticationBackend as MozillaOIDCAuthenticationBackend,
 )
 
-from core.models import DuplicateEmailError, User
-
-logger = logging.getLogger(__name__)
+from core.models import User
 
 
 class OIDCAuthenticationBackend(MozillaOIDCAuthenticationBackend):
@@ -50,81 +45,56 @@ class OIDCAuthenticationBackend(MozillaOIDCAuthenticationBackend):
             proxies=self.get_settings("OIDC_PROXY", None),
         )
         user_response.raise_for_status()
-
-        try:
-            userinfo = user_response.json()
-        except ValueError:
-            try:
-                userinfo = self.verify_token(user_response.text)
-            except Exception as e:
-                raise SuspiciousOperation(
-                    _("Invalid response format or token verification failed")
-                ) from e
-
+        userinfo = self.verify_token(user_response.text)
         return userinfo
 
-    def verify_claims(self, claims):
-        """
-        Verify the presence of essential claims and the "sub" (which is mandatory as defined
-        by the OIDC specification) to decide if authentication should be allowed.
-        """
-        essential_claims = settings.USER_OIDC_ESSENTIAL_CLAIMS
-        missing_claims = [claim for claim in essential_claims if claim not in claims]
-
-        if missing_claims:
-            logger.error("Missing essential claims: %s", missing_claims)
-            return False
-
-        return True
-
     def get_or_create_user(self, access_token, id_token, payload):
-        """Return a User based on userinfo. Create a new user if no match is found."""
+        """Return a User based on userinfo. Get or create a new user if no user matches the Sub.
+
+        Parameters:
+        - access_token (str): The access token.
+        - id_token (str): The ID token.
+        - payload (dict): The user payload.
+
+        Returns:
+        - User: An existing or newly created User instance.
+
+        Raises:
+        - Exception: Raised when user creation is not allowed and no existing user is found.
+        """
 
         user_info = self.get_userinfo(access_token, id_token, payload)
+        sub = user_info.get("sub")
 
-        if not self.verify_claims(user_info):
-            raise SuspiciousOperation("Claims verification failed.")
-
-        sub = user_info["sub"]
-        email = user_info.get("email")
-
-        # Get user's full name from OIDC fields defined in settings
-        full_name = self.compute_full_name(user_info)
-        short_name = user_info.get(settings.USER_OIDC_FIELD_TO_SHORTNAME)
-
-        claims = {
-            "email": email,
-            "full_name": full_name,
-            "short_name": short_name,
-        }
+        if sub is None:
+            raise SuspiciousOperation(
+                _("User info contained no recognizable user identification")
+            )
 
         try:
-            user = User.objects.get_user_by_sub_or_email(sub, email)
-        except DuplicateEmailError as err:
-            raise SuspiciousOperation(err.message) from err
-
-        if user:
-            if not user.is_active:
-                raise SuspiciousOperation(_("User account is disabled"))
-            self.update_user_if_needed(user, claims)
-        elif self.get_settings("OIDC_CREATE_USER", True):
-            user = User.objects.create(sub=sub, password="!", **claims)  # noqa: S106
+            user = User.objects.get(sub=sub)
+        except User.DoesNotExist:
+            if self.get_settings("OIDC_CREATE_USER", True):
+                user = self.create_user(user_info)
+            else:
+                user = None
 
         return user
 
-    def compute_full_name(self, user_info):
-        """Compute user's full name based on OIDC fields in settings."""
-        name_fields = settings.USER_OIDC_FIELDS_TO_FULLNAME
-        full_name = " ".join(
-            user_info[field] for field in name_fields if user_info.get(field)
-        )
-        return full_name or None
+    def create_user(self, claims):
+        """Return a newly created User instance."""
 
-    def update_user_if_needed(self, user, claims):
-        """Update user claims if they have changed."""
-        has_changed = any(
-            value and value != getattr(user, key) for key, value in claims.items()
+        sub = claims.get("sub")
+
+        if sub is None:
+            raise SuspiciousOperation(
+                _("Claims contained no recognizable user identification")
+            )
+
+        user = User.objects.create(
+            sub=sub,
+            email=claims.get("email"),
+            password="!",  # noqa: S106
         )
-        if has_changed:
-            updated_claims = {key: value for key, value in claims.items() if value}
-            self.UserModel.objects.filter(id=user.id).update(**updated_claims)
+
+        return user

src/backend/core/enums.py

@@ -2,11 +2,15 @@
 Core application enums declaration
 """
 
-from django.conf import global_settings
+from django.conf import global_settings, settings
 from django.utils.translation import gettext_lazy as _
 
-# In Django's code base, `LANGUAGES` is set by default with all supported languages.
-# We can use it for the choice of languages which should not be limited to the few languages
-# active in the app.
+# Django sets `LANGUAGES` by default with all supported languages. We can use it for
+# the choice of languages which should not be limited to the few languages active in
+# the app.
 # pylint: disable=no-member
-ALL_LANGUAGES = {language: _(name) for language, name in global_settings.LANGUAGES}
+ALL_LANGUAGES = getattr(
+    settings,
+    "ALL_LANGUAGES",
+    [(language, _(name)) for language, name in global_settings.LANGUAGES],
+)

src/backend/core/factories.py

@@ -22,29 +22,9 @@ class UserFactory(factory.django.DjangoModelFactory):
 
     sub = factory.Sequence(lambda n: f"user{n!s}")
     email = factory.Faker("email")
-    full_name = factory.Faker("name")
-    short_name = factory.Faker("first_name")
     language = factory.fuzzy.FuzzyChoice([lang[0] for lang in settings.LANGUAGES])
     password = make_password("password")
 
-    @factory.post_generation
-    def with_owned_document(self, create, extracted, **kwargs):
-        """
-        Create a document for which the user is owner to check
-        that there is no interference
-        """
-        if create and (extracted is True):
-            UserDocumentAccessFactory(user=self, role="owner")
-
-    @factory.post_generation
-    def with_owned_template(self, create, extracted, **kwargs):
-        """
-        Create a template for which the user is owner to check
-        that there is no interference
-        """
-        if create and (extracted is True):
-            UserTemplateAccessFactory(user=self, role="owner")
-
 
 class DocumentFactory(factory.django.DjangoModelFactory):
     """A factory to create documents"""
@@ -56,7 +36,6 @@ class DocumentFactory(factory.django.DjangoModelFactory):
 
     title = factory.Sequence(lambda n: f"document{n}")
     content = factory.Sequence(lambda n: f"content{n}")
-    creator = factory.SubFactory(UserFactory)
     link_reach = factory.fuzzy.FuzzyChoice(
         [a[0] for a in models.LinkReachChoices.choices]
     )
@@ -81,13 +60,6 @@ class DocumentFactory(factory.django.DjangoModelFactory):
             for item in extracted:
                 models.LinkTrace.objects.create(document=self, user=item)
 
-    @factory.post_generation
-    def favorited_by(self, create, extracted, **kwargs):
-        """Mark document as favorited by a list of users."""
-        if create and extracted:
-            for item in extracted:
-                models.DocumentFavorite.objects.create(document=self, user=item)
-
 
 class UserDocumentAccessFactory(factory.django.DjangoModelFactory):
     """Create fake document user accesses for testing."""

src/backend/core/management/commands/update_files_content_type_metadata.py

@@ -1,95 +0,0 @@
-"""Management command updating the metadata for all the files in the MinIO bucket."""
-
-from django.core.files.storage import default_storage
-from django.core.management.base import BaseCommand
-
-import magic
-
-from core.models import Document
-
-# pylint: disable=too-many-locals, broad-exception-caught
-
-
-class Command(BaseCommand):
-    """Update the metadata for all the files in the MinIO bucket."""
-
-    help = __doc__
-
-    def handle(self, *args, **options):
-        """Execute management command."""
-        s3_client = default_storage.connection.meta.client
-        bucket_name = default_storage.bucket_name
-
-        mime_detector = magic.Magic(mime=True)
-
-        documents = Document.objects.all()
-        self.stdout.write(
-            f"[INFO] Found {documents.count()} documents. Starting ContentType fix..."
-        )
-
-        for doc in documents:
-            doc_id_str = str(doc.id)
-            prefix = f"{doc_id_str}/attachments/"
-            self.stdout.write(
-                f"[INFO] Processing attachments under prefix '{prefix}' ..."
-            )
-
-            continuation_token = None
-            total_updated = 0
-
-            while True:
-                list_kwargs = {"Bucket": bucket_name, "Prefix": prefix}
-                if continuation_token:
-                    list_kwargs["ContinuationToken"] = continuation_token
-
-                response = s3_client.list_objects_v2(**list_kwargs)
-
-                # If no objects found under this prefix, break out of the loop
-                if "Contents" not in response:
-                    break
-
-                for obj in response["Contents"]:
-                    key = obj["Key"]
-
-                    # Skip if it's a folder
-                    if key.endswith("/"):
-                        continue
-
-                    try:
-                        # Get existing metadata
-                        head_resp = s3_client.head_object(Bucket=bucket_name, Key=key)
-
-                        # Read first ~1KB for MIME detection
-                        partial_obj = s3_client.get_object(
-                            Bucket=bucket_name, Key=key, Range="bytes=0-1023"
-                        )
-                        partial_data = partial_obj["Body"].read()
-
-                        # Detect MIME type
-                        magic_mime_type = mime_detector.from_buffer(partial_data)
-
-                        # Update ContentType
-                        s3_client.copy_object(
-                            Bucket=bucket_name,
-                            CopySource={"Bucket": bucket_name, "Key": key},
-                            Key=key,
-                            ContentType=magic_mime_type,
-                            Metadata=head_resp.get("Metadata", {}),
-                            MetadataDirective="REPLACE",
-                        )
-                        total_updated += 1
-
-                    except Exception as exc:  # noqa
-                        self.stderr.write(
-                            f"[ERROR] Could not update ContentType for {key}: {exc}"
-                        )
-
-                if response.get("IsTruncated"):
-                    continuation_token = response.get("NextContinuationToken")
-                else:
-                    break
-
-            if total_updated > 0:
-                self.stdout.write(
-                    f"[INFO] -> Updated {total_updated} objects for Document {doc_id_str}."
-                )

src/backend/core/migrations/0006_add_user_full_name_and_short_name.py

@@ -1,28 +0,0 @@
-# Generated by Django 5.1.1 on 2024-09-29 03:47
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('core', '0005_remove_document_is_public_alter_document_link_reach_and_more'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='user',
-            name='full_name',
-            field=models.CharField(blank=True, max_length=100, null=True, verbose_name='full name'),
-        ),
-        migrations.AddField(
-            model_name='user',
-            name='short_name',
-            field=models.CharField(blank=True, max_length=20, null=True, verbose_name='short name'),
-        ),
-        migrations.AlterField(
-            model_name='user',
-            name='language',
-            field=models.CharField(choices="(('en-us', 'English'), ('fr-fr', 'French'))", default='en-us', help_text='The language in which the user wants to see the interface.', max_length=10, verbose_name='language'),
-        ),
-    ]

src/backend/core/migrations/0006_remove_document_is_public_document_is_e2ee_and_more.py

@@ -0,0 +1,18 @@
+# Generated by Django 5.1 on 2024-09-12 13:53
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('core', '0005_remove_document_is_public_alter_document_link_reach_and_more'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='document',
+            name='is_e2ee',
+            field=models.BooleanField(default=False),
+        ),
+    ]

src/backend/core/migrations/0007_fix_users_duplicate.py

@@ -1,128 +0,0 @@
-# Generated by Django 5.1.1 on 2024-10-10 11:45
-
-from django.db import migrations
-
-procedure = """
-DO $$
-DECLARE
-    user_email TEXT;
-BEGIN
-    -- Step 1: Create a temporary table (without the unique constraint)
-    -- impress_document_access
-    DROP TABLE IF EXISTS impress_document_access_tmp;
-    CREATE TEMP TABLE impress_document_access_tmp AS
-    SELECT * FROM impress_document_access;
-    
-    -- impress_link_trace
-    DROP TABLE IF EXISTS impress_link_trace_tmp;
-    CREATE TEMP TABLE impress_link_trace_tmp AS
-    SELECT * FROM impress_link_trace;
-
-    -- Step 2: Loop through each email that appears more than once
-    FOR user_email IN
-      SELECT email
-      FROM impress_user
-      GROUP BY email
-      HAVING COUNT(email) > 1
-    LOOP
-      -- Step 3: Update user_id in the temporary table based on email
-      -- For impress_document_access
-      UPDATE impress_document_access_tmp
-      SET user_id = (
-        SELECT id
-        FROM impress_user
-        WHERE email = user_email
-        LIMIT 1
-      )
-      WHERE user_id IN (
-        SELECT id
-        FROM impress_user
-        WHERE email = user_email
-      );
-
-      -- For impress_link_trace
-      UPDATE impress_link_trace_tmp
-      SET user_id = (
-        SELECT id
-        FROM impress_user
-        WHERE email = user_email
-        LIMIT 1
-      )
-      WHERE user_id IN (
-        SELECT id
-        FROM impress_user
-        WHERE email = user_email
-      );
-      
-      -- update impress_invitation
-      UPDATE impress_invitation
-      SET issuer_id = (
-        SELECT id
-        FROM impress_user
-        WHERE email = user_email
-        LIMIT 1
-      )
-      WHERE issuer_id IN (
-        SELECT id
-        FROM impress_user
-        WHERE email = user_email
-      );
-      
-      DELETE FROM impress_user
-      WHERE id IN (
-        SELECT id
-        FROM impress_user
-        WHERE email = user_email
-      )
-      AND id != (
-        SELECT id
-        FROM impress_user
-        WHERE email = user_email
-        LIMIT 1
-      );
-
-      RAISE NOTICE 'Processed updates for email: %', user_email;
-    END LOOP;
-		
-    -- Step 4: Remove duplicate rows from the temporary table, keeping only one row per (document_id, user_id)
-    -- For impress_document_access
-    DELETE FROM impress_document_access_tmp a
-    USING impress_document_access_tmp b
-    WHERE a.ctid < b.ctid  -- Keep one row
-    AND a.document_id = b.document_id
-    AND a.user_id = b.user_id;
-
-    -- Step 5: Replace the original table with the cleaned-up temporary table
-    TRUNCATE TABLE impress_document_access;
-
-    -- Insert cleaned-up data back into the original table
-    INSERT INTO impress_document_access
-    SELECT * FROM impress_document_access_tmp;
-    
-    -- For impress_link_trace
-    DELETE FROM impress_link_trace_tmp a
-    USING impress_link_trace_tmp b
-    WHERE a.ctid < b.ctid  -- Keep one row
-    AND a.document_id = b.document_id
-    AND a.user_id = b.user_id;
-
-    -- Step 5: Replace the original table with the cleaned-up temporary table
-    TRUNCATE TABLE impress_link_trace;
-
-    -- Insert cleaned-up data back into the original table
-    INSERT INTO impress_link_trace
-    SELECT * FROM impress_link_trace_tmp;
-		
-    RAISE NOTICE 'Update and deduplication process completed.';
-END $$;
-"""
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('core', '0006_add_user_full_name_and_short_name'),
-    ]
-
-    operations = [
-        migrations.RunSQL(procedure),
-    ]

src/backend/core/migrations/0008_alter_document_link_reach.py

@@ -1,18 +0,0 @@
-# Generated by Django 5.1.2 on 2024-10-25 11:41
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('core', '0007_fix_users_duplicate'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='document',
-            name='link_reach',
-            field=models.CharField(choices=[('restricted', 'Restricted'), ('authenticated', 'Authenticated'), ('public', 'Public')], default='restricted', max_length=20),
-        ),
-    ]

src/backend/core/migrations/0009_add_document_favorite.py

@@ -1,37 +0,0 @@
-# Generated by Django 5.1.2 on 2024-11-08 07:59
-
-import django.db.models.deletion
-import uuid
-from django.conf import settings
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('core', '0008_alter_document_link_reach'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='user',
-            name='language',
-            field=models.CharField(choices="(('en-us', 'English'), ('fr-fr', 'French'), ('de-de', 'German'))", default='en-us', help_text='The language in which the user wants to see the interface.', max_length=10, verbose_name='language'),
-        ),
-        migrations.CreateModel(
-            name='DocumentFavorite',
-            fields=[
-                ('id', models.UUIDField(default=uuid.uuid4, editable=False, help_text='primary key for the record as UUID', primary_key=True, serialize=False, verbose_name='id')),
-                ('created_at', models.DateTimeField(auto_now_add=True, help_text='date and time at which a record was created', verbose_name='created on')),
-                ('updated_at', models.DateTimeField(auto_now=True, help_text='date and time at which a record was last updated', verbose_name='updated on')),
-                ('document', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='favorited_by_users', to='core.document')),
-                ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='favorite_documents', to=settings.AUTH_USER_MODEL)),
-            ],
-            options={
-                'verbose_name': 'Document favorite',
-                'verbose_name_plural': 'Document favorites',
-                'db_table': 'impress_document_favorite',
-                'constraints': [models.UniqueConstraint(fields=('user', 'document'), name='unique_document_favorite_user', violation_error_message='This document is already targeted by a favorite relation instance for the same user.')],
-            },
-        ),
-    ]

src/backend/core/migrations/0010_add_field_creator_to_document.py

@@ -1,31 +0,0 @@
-# Generated by Django 5.1.2 on 2024-11-09 11:36
-
-import django.core.validators
-import django.db.models.deletion
-from django.conf import settings
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('core', '0009_add_document_favorite'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='document',
-            name='creator',
-            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.RESTRICT, related_name='documents_created', to=settings.AUTH_USER_MODEL),
-        ),
-        migrations.AlterField(
-            model_name='user',
-            name='language',
-            field=models.CharField(choices="(('en-us', 'English'), ('fr-fr', 'French'), ('de-de', 'German'))", default='en-us', help_text='The language in which the user wants to see the interface.', max_length=10, verbose_name='language'),
-        ),
-        migrations.AlterField(
-            model_name='user',
-            name='sub',
-            field=models.CharField(blank=True, help_text='Required. 255 characters or fewer. Letters, numbers, and @/./+/-/_/: characters only.', max_length=255, null=True, unique=True, validators=[django.core.validators.RegexValidator(message='Enter a valid sub. This value may contain only letters, numbers, and @/./+/-/_/: characters.', regex='^[\\w.@+-:]+\\Z')], verbose_name='sub'),
-        ),
-    ]

src/backend/core/migrations/0011_populate_creator_field_and_make_it_required.py

@@ -1,52 +0,0 @@
-# Generated by Django 5.1.2 on 2024-11-09 11:48
-
-import django.db.models.deletion
-from django.conf import settings
-from django.db import migrations
-from django.db.models import F, ForeignKey, Subquery, OuterRef, Q
-
-
-def set_creator_from_document_access(apps, schema_editor):
-    """
-    Populate the `creator` field for existing Document records.
-
-    This function assigns the `creator` field using the existing
-    DocumentAccess entries. We can be sure that all documents have at
-    least one user with "owner" role. If the document has several roles,
-    it should take the entry with the oldest date of creation.
-
-    The update is performed using efficient bulk queries with Django's
-    Subquery and OuterRef to minimize database hits and ensure performance.
-
-    Note: After running this migration, we quickly modify the schema to make
-    the `creator` field required.
-    """
-    Document = apps.get_model("core", "Document")
-    DocumentAccess = apps.get_model("core", "DocumentAccess")
-
-    # Update `creator` using the "owner" role
-    owner_subquery = DocumentAccess.objects.filter(
-        document=OuterRef('pk'),
-        user__isnull=False,
-        role='owner',
-    ).order_by('created_at').values('user_id')[:1]
-
-    Document.objects.filter(
-        creator__isnull=True
-    ).update(creator=Subquery(owner_subquery))
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('core', '0010_add_field_creator_to_document'),
-    ]
-
-    operations = [
-        migrations.RunPython(set_creator_from_document_access, reverse_code=migrations.RunPython.noop),
-        migrations.AlterField(
-            model_name='document',
-            name='creator',
-            field=ForeignKey(on_delete=django.db.models.deletion.RESTRICT, related_name='documents_created', to=settings.AUTH_USER_MODEL),
-        ),
-    ]

src/backend/core/migrations/0012_make_document_creator_and_invitation_issuer_optional.py

@@ -1,30 +0,0 @@
-# Generated by Django 5.1.2 on 2024-11-30 22:23
-
-import django.db.models.deletion
-from django.conf import settings
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('core', '0011_populate_creator_field_and_make_it_required'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='document',
-            name='creator',
-            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.RESTRICT, related_name='documents_created', to=settings.AUTH_USER_MODEL),
-        ),
-        migrations.AlterField(
-            model_name='invitation',
-            name='issuer',
-            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='invitations', to=settings.AUTH_USER_MODEL),
-        ),
-        migrations.AlterField(
-            model_name='user',
-            name='language',
-            field=models.CharField(choices="(('en-us', 'English'), ('fr-fr', 'French'), ('de-de', 'German'))", default='en-us', help_text='The language in which the user wants to see the interface.', max_length=10, verbose_name='language'),
-        ),
-    ]

src/backend/core/models.py

@@ -1,10 +1,8 @@
 """
 Declare and configure the models for the impress core application
 """
-# pylint: disable=too-many-lines
 
 import hashlib
-import smtplib
 import tempfile
 import textwrap
 import uuid
@@ -15,19 +13,15 @@ from logging import getLogger
 from django.conf import settings
 from django.contrib.auth import models as auth_models
 from django.contrib.auth.base_user import AbstractBaseUser
-from django.contrib.sites.models import Site
 from django.core import exceptions, mail, validators
 from django.core.files.base import ContentFile
 from django.core.files.storage import default_storage
-from django.core.mail import send_mail
 from django.db import models
 from django.http import FileResponse
 from django.template.base import Template as DjangoTemplate
 from django.template.context import Context
-from django.template.loader import render_to_string
 from django.utils import html, timezone
 from django.utils.functional import cached_property, lazy
-from django.utils.translation import get_language, override
 from django.utils.translation import gettext_lazy as _
 
 import frontmatter
@@ -73,9 +67,6 @@ class RoleChoices(models.TextChoices):
     OWNER = "owner", _("Owner")
 
 
-PRIVILEGED_ROLES = [RoleChoices.ADMIN, RoleChoices.OWNER]
-
-
 class LinkReachChoices(models.TextChoices):
     """Defines types of access for links"""
 
@@ -90,16 +81,6 @@ class LinkReachChoices(models.TextChoices):
     PUBLIC = "public", _("Public")  # Even anonymous users can access the document
 
 
-class DuplicateEmailError(Exception):
-    """Raised when an email is already associated with a pre-existing user."""
-
-    def __init__(self, message=None, email=None):
-        """Set message and email to describe the exception."""
-        self.message = message
-        self.email = email
-        super().__init__(self.message)
-
-
 class BaseModel(models.Model):
     """
     Serves as an abstract base model for other models, ensuring that records are validated
@@ -137,50 +118,21 @@ class BaseModel(models.Model):
         super().save(*args, **kwargs)
 
 
-class UserManager(auth_models.UserManager):
-    """Custom manager for User model with additional methods."""
-
-    def get_user_by_sub_or_email(self, sub, email):
-        """Fetch existing user by sub or email."""
-        try:
-            return self.get(sub=sub)
-        except self.model.DoesNotExist as err:
-            if not email:
-                return None
-
-            if settings.OIDC_FALLBACK_TO_EMAIL_FOR_IDENTIFICATION:
-                try:
-                    return self.get(email=email)
-                except self.model.DoesNotExist:
-                    pass
-            elif (
-                self.filter(email=email).exists()
-                and not settings.OIDC_ALLOW_DUPLICATE_EMAILS
-            ):
-                raise DuplicateEmailError(
-                    _(
-                        "We couldn't find a user with this sub but the email is already "
-                        "associated with a registered user."
-                    )
-                ) from err
-        return None
-
-
 class User(AbstractBaseUser, BaseModel, auth_models.PermissionsMixin):
     """User model to work with OIDC only authentication."""
 
     sub_validator = validators.RegexValidator(
-        regex=r"^[\w.@+-:]+\Z",
+        regex=r"^[\w.@+-]+\Z",
         message=_(
             "Enter a valid sub. This value may contain only letters, "
-            "numbers, and @/./+/-/_/: characters."
+            "numbers, and @/./+/-/_ characters."
         ),
     )
 
     sub = models.CharField(
         _("sub"),
         help_text=_(
-            "Required. 255 characters or fewer. Letters, numbers, and @/./+/-/_/: characters only."
+            "Required. 255 characters or fewer. Letters, numbers, and @/./+/-/_ characters only."
         ),
         max_length=255,
         unique=True,
@@ -188,10 +140,6 @@ class User(AbstractBaseUser, BaseModel, auth_models.PermissionsMixin):
         blank=True,
         null=True,
     )
-
-    full_name = models.CharField(_("full name"), max_length=100, null=True, blank=True)
-    short_name = models.CharField(_("short name"), max_length=20, null=True, blank=True)
-
     email = models.EmailField(_("identity email address"), blank=True, null=True)
 
     # Unlike the "email" field which stores the email coming from the OIDC token, this field
@@ -232,7 +180,7 @@ class User(AbstractBaseUser, BaseModel, auth_models.PermissionsMixin):
         ),
     )
 
-    objects = UserManager()
+    objects = auth_models.UserManager()
 
     USERNAME_FIELD = "admin_email"
     REQUIRED_FIELDS = []
@@ -279,13 +227,6 @@ class User(AbstractBaseUser, BaseModel, auth_models.PermissionsMixin):
                 for invitation in valid_invitations
             ]
         )
-
-        # Set creator of documents if not yet set (e.g. documents created via server-to-server API)
-        document_ids = [invitation.document_id for invitation in valid_invitations]
-        Document.objects.filter(id__in=document_ids, creator__isnull=True).update(
-            creator=self
-        )
-
         valid_invitations.delete()
 
     def email_user(self, subject, message, from_email=None, **kwargs):
@@ -383,18 +324,12 @@ class Document(BaseModel):
     link_reach = models.CharField(
         max_length=20,
         choices=LinkReachChoices.choices,
-        default=LinkReachChoices.RESTRICTED,
+        default=LinkReachChoices.AUTHENTICATED,
     )
     link_role = models.CharField(
         max_length=20, choices=LinkRoleChoices.choices, default=LinkRoleChoices.READER
     )
-    creator = models.ForeignKey(
-        User,
-        on_delete=models.RESTRICT,
-        related_name="documents_created",
-        blank=True,
-        null=True,
-    )
+    is_e2ee = models.BooleanField(default=False)
 
     _content = None
 
@@ -477,62 +412,73 @@ class Document(BaseModel):
             Bucket=default_storage.bucket_name, Key=self.file_key, VersionId=version_id
         )
 
-    def get_versions_slice(self, from_version_id="", min_datetime=None, page_size=None):
+    def get_versions_slice(
+        self, from_version_id="", from_datetime=None, page_size=None
+    ):
         """Get document versions from object storage with pagination and starting conditions"""
         # /!\ Trick here /!\
         # The "KeyMarker" and "VersionIdMarker" fields must either be both set or both not set.
         # The error we get otherwise is not helpful at all.
-        markers = {}
+        token = {}
         if from_version_id:
-            markers.update(
+            token.update(
                 {"KeyMarker": self.file_key, "VersionIdMarker": from_version_id}
             )
 
-        real_page_size = (
-            min(page_size, settings.DOCUMENT_VERSIONS_PAGE_SIZE)
-            if page_size
-            else settings.DOCUMENT_VERSIONS_PAGE_SIZE
-        )
+        if from_datetime:
+            response = default_storage.connection.meta.client.list_object_versions(
+                Bucket=default_storage.bucket_name,
+                Prefix=self.file_key,
+                MaxKeys=settings.DOCUMENT_VERSIONS_PAGE_SIZE,
+                **token,
+            )
+
+            # Find the first version after the given datetime
+            version = None
+            for version in response.get("Versions", []):
+                if version["LastModified"] >= from_datetime:
+                    token = {
+                        "KeyMarker": self.file_key,
+                        "VersionIdMarker": version["VersionId"],
+                    }
+                    break
+            else:
+                if version is None or version["LastModified"] < from_datetime:
+                    if response["NextVersionIdMarker"]:
+                        return self.get_versions_slice(
+                            from_version_id=response["NextVersionIdMarker"],
+                            page_size=settings.DOCUMENT_VERSIONS_PAGE_SIZE,
+                            from_datetime=from_datetime,
+                        )
+                    return {
+                        "next_version_id_marker": "",
+                        "is_truncated": False,
+                        "versions": [],
+                    }
 
         response = default_storage.connection.meta.client.list_object_versions(
             Bucket=default_storage.bucket_name,
             Prefix=self.file_key,
-            # compensate the latest version that we exclude below and get one more to
-            # know if there are more pages
-            MaxKeys=real_page_size + 2,
-            **markers,
+            MaxKeys=min(page_size, settings.DOCUMENT_VERSIONS_PAGE_SIZE)
+            if page_size
+            else settings.DOCUMENT_VERSIONS_PAGE_SIZE,
+            **token,
         )
-
-        min_last_modified = min_datetime or self.created_at
-        versions = [
-            {
-                key_snake: version[key_camel]
-                for key_snake, key_camel in [
-                    ("etag", "ETag"),
-                    ("is_latest", "IsLatest"),
-                    ("last_modified", "LastModified"),
-                    ("version_id", "VersionId"),
-                ]
-            }
-            for version in response.get("Versions", [])
-            if version["LastModified"] >= min_last_modified
-            and version["IsLatest"] is False
-        ]
-        results = versions[:real_page_size]
-
-        count = len(results)
-        if count == len(versions):
-            is_truncated = False
-            next_version_id_marker = ""
-        else:
-            is_truncated = True
-            next_version_id_marker = versions[count - 1]["version_id"]
-
         return {
-            "next_version_id_marker": next_version_id_marker,
-            "is_truncated": is_truncated,
-            "versions": results,
-            "count": count,
+            "next_version_id_marker": response["NextVersionIdMarker"],
+            "is_truncated": response["IsTruncated"],
+            "versions": [
+                {
+                    key_snake: version[key_camel]
+                    for key_camel, key_snake in [
+                        ("ETag", "etag"),
+                        ("IsLatest", "is_latest"),
+                        ("LastModified", "last_modified"),
+                        ("VersionId", "version_id"),
+                    ]
+                }
+                for version in response.get("Versions", [])
+            ],
         }
 
     def delete_version(self, version_id):
@@ -550,8 +496,7 @@ class Document(BaseModel):
         # Compute version roles before adding link roles because we don't
         # want anonymous users to access versions (we wouldn't know from
         # which date to allow them anyway)
-        # Anonymous users should also not see document accesses
-        has_role = bool(roles)
+        can_get_versions = bool(roles)
 
         # Add role provided by the document link
         if self.link_reach == LinkReachChoices.PUBLIC or (
@@ -562,87 +507,22 @@ class Document(BaseModel):
         is_owner_or_admin = bool(
             roles.intersection({RoleChoices.OWNER, RoleChoices.ADMIN})
         )
+        is_editor = bool(RoleChoices.EDITOR in roles)
         can_get = bool(roles)
-        can_update = is_owner_or_admin or RoleChoices.EDITOR in roles
 
         return {
-            "accesses_manage": is_owner_or_admin,
-            "accesses_view": has_role,
-            "ai_transform": can_update,
-            "ai_translate": can_update,
-            "attachment_upload": can_update,
-            "collaboration_auth": can_get,
+            "attachment_upload": is_owner_or_admin or is_editor,
             "destroy": RoleChoices.OWNER in roles,
-            "favorite": can_get and user.is_authenticated,
             "link_configuration": is_owner_or_admin,
-            "invite_owner": RoleChoices.OWNER in roles,
-            "partial_update": can_update,
+            "manage_accesses": is_owner_or_admin,
+            "partial_update": is_owner_or_admin or is_editor,
             "retrieve": can_get,
-            "media_auth": can_get,
-            "update": can_update,
+            "update": is_owner_or_admin or is_editor,
             "versions_destroy": is_owner_or_admin,
-            "versions_list": has_role,
-            "versions_retrieve": has_role,
+            "versions_list": can_get_versions,
+            "versions_retrieve": can_get_versions,
         }
 
-    def send_email(self, subject, emails, context=None, language=None):
-        """Generate and send email from a template."""
-        context = context or {}
-        domain = Site.objects.get_current().domain
-        language = language or get_language()
-        context.update(
-            {
-                "brandname": settings.EMAIL_BRAND_NAME,
-                "document": self,
-                "domain": domain,
-                "link": f"{domain}/docs/{self.id}/",
-                "logo_img": settings.EMAIL_LOGO_IMG,
-            }
-        )
-
-        with override(language):
-            msg_html = render_to_string("mail/html/invitation.html", context)
-            msg_plain = render_to_string("mail/text/invitation.txt", context)
-            subject = str(subject)  # Force translation
-
-            try:
-                send_mail(
-                    subject.capitalize(),
-                    msg_plain,
-                    settings.EMAIL_FROM,
-                    emails,
-                    html_message=msg_html,
-                    fail_silently=False,
-                )
-            except smtplib.SMTPException as exception:
-                logger.error("invitation to %s was not sent: %s", emails, exception)
-
-    def send_invitation_email(self, email, role, sender, language=None):
-        """Method allowing a user to send an email invitation to another user for a document."""
-        language = language or get_language()
-        role = RoleChoices(role).label
-        sender_name = sender.full_name or sender.email
-        sender_name_email = (
-            f"{sender.full_name:s} ({sender.email})"
-            if sender.full_name
-            else sender.email
-        )
-
-        with override(language):
-            context = {
-                "title": _("{name} shared a document with you!").format(
-                    name=sender_name
-                ),
-                "message": _(
-                    '{name} invited you with the role "{role}" on the following document:'
-                ).format(name=sender_name_email, role=role.lower()),
-            }
-            subject = _("{name} shared a document with you: {title}").format(
-                name=sender_name, title=self.title
-            )
-
-        self.send_email(subject, [email], context, language)
-
 
 class LinkTrace(BaseModel):
     """
@@ -676,37 +556,6 @@ class LinkTrace(BaseModel):
         return f"{self.user!s} trace on document {self.document!s}"
 
 
-class DocumentFavorite(BaseModel):
-    """Relation model to store a user's favorite documents."""
-
-    document = models.ForeignKey(
-        Document,
-        on_delete=models.CASCADE,
-        related_name="favorited_by_users",
-    )
-    user = models.ForeignKey(
-        User, on_delete=models.CASCADE, related_name="favorite_documents"
-    )
-
-    class Meta:
-        db_table = "impress_document_favorite"
-        verbose_name = _("Document favorite")
-        verbose_name_plural = _("Document favorites")
-        constraints = [
-            models.UniqueConstraint(
-                fields=["user", "document"],
-                name="unique_document_favorite_user",
-                violation_error_message=_(
-                    "This document is already targeted by a favorite relation instance "
-                    "for the same user."
-                ),
-            ),
-        ]
-
-    def __str__(self):
-        return f"{self.user!s} favorite on document {self.document!s}"
-
-
 class DocumentAccess(BaseAccess):
     """Relation model to give access to a document for a user or a team with a role."""
 
@@ -782,15 +631,15 @@ class Template(BaseModel):
         is_owner_or_admin = bool(
             set(roles).intersection({RoleChoices.OWNER, RoleChoices.ADMIN})
         )
+        is_editor = bool(RoleChoices.EDITOR in roles)
         can_get = self.is_public or bool(roles)
-        can_update = is_owner_or_admin or RoleChoices.EDITOR in roles
 
         return {
             "destroy": RoleChoices.OWNER in roles,
             "generate_document": can_get,
-            "accesses_manage": is_owner_or_admin,
-            "update": can_update,
-            "partial_update": can_update,
+            "manage_accesses": is_owner_or_admin,
+            "update": is_owner_or_admin or is_editor,
+            "partial_update": is_owner_or_admin or is_editor,
             "retrieve": can_get,
         }
 
@@ -957,8 +806,6 @@ class Invitation(BaseModel):
         User,
         on_delete=models.CASCADE,
         related_name="invitations",
-        blank=True,
-        null=True,
     )
 
     class Meta:
@@ -979,10 +826,7 @@ class Invitation(BaseModel):
         super().clean()
 
         # Check if an identity already exists for the provided email
-        if (
-            User.objects.filter(email=self.email).exists()
-            and not settings.OIDC_ALLOW_DUPLICATE_EMAILS
-        ):
+        if User.objects.filter(email=self.email).exists():
             raise exceptions.ValidationError(
                 {"email": _("This email is already associated to a registered user.")}
             )
@@ -998,6 +842,8 @@ class Invitation(BaseModel):
 
     def get_abilities(self, user):
         """Compute and return abilities for a given user."""
+        can_delete = False
+        can_update = False
         roles = []
 
         if user.is_authenticated:
@@ -1012,13 +858,17 @@ class Invitation(BaseModel):
                 except (self._meta.model.DoesNotExist, IndexError):
                     roles = []
 
-        is_admin_or_owner = bool(
-            set(roles).intersection({RoleChoices.OWNER, RoleChoices.ADMIN})
-        )
+            can_delete = bool(
+                set(roles).intersection({RoleChoices.OWNER, RoleChoices.ADMIN})
+            )
+
+            can_update = bool(
+                set(roles).intersection({RoleChoices.OWNER, RoleChoices.ADMIN})
+            )
 
         return {
-            "destroy": is_admin_or_owner,
-            "update": is_admin_or_owner,
-            "partial_update": is_admin_or_owner,
-            "retrieve": is_admin_or_owner,
+            "destroy": can_delete,
+            "update": can_update,
+            "partial_update": can_update,
+            "retrieve": bool(roles),
         }

src/backend/core/services/ai_services.py

@@ -1,98 +0,0 @@
-"""AI services."""
-
-import json
-import re
-
-from django.conf import settings
-from django.core.exceptions import ImproperlyConfigured
-
-from openai import OpenAI
-
-from core import enums
-
-AI_ACTIONS = {
-    "prompt": (
-        "Answer the prompt in markdown format. Return JSON: "
-        '{"answer": "Your markdown answer"}. '
-        "Do not provide any other information."
-    ),
-    "correct": (
-        "Correct grammar and spelling of the markdown text, "
-        "preserving language and markdown formatting. "
-        'Return JSON: {"answer": "your corrected markdown text"}. '
-        "Do not provide any other information."
-    ),
-    "rephrase": (
-        "Rephrase the given markdown text, "
-        "preserving language and markdown formatting. "
-        'Return JSON: {"answer": "your rephrased markdown text"}. '
-        "Do not provide any other information."
-    ),
-    "summarize": (
-        "Summarize the markdown text, preserving language and markdown formatting. "
-        'Return JSON: {"answer": "your markdown summary"}. '
-        "Do not provide any other information."
-    ),
-}
-
-AI_TRANSLATE = (
-    "Translate the markdown text to {language:s}, preserving markdown formatting. "
-    'Return JSON: {{"answer": "your translated markdown text in {language:s}"}}. '
-    "Do not provide any other information."
-)
-
-
-class AIService:
-    """Service class for AI-related operations."""
-
-    def __init__(self):
-        """Ensure that the AI configuration is set properly."""
-        if (
-            settings.AI_BASE_URL is None
-            or settings.AI_API_KEY is None
-            or settings.AI_MODEL is None
-        ):
-            raise ImproperlyConfigured("AI configuration not set")
-        self.client = OpenAI(base_url=settings.AI_BASE_URL, api_key=settings.AI_API_KEY)
-
-    def call_ai_api(self, system_content, text):
-        """Helper method to call the OpenAI API and process the response."""
-        response = self.client.chat.completions.create(
-            model=settings.AI_MODEL,
-            response_format={"type": "json_object"},
-            messages=[
-                {"role": "system", "content": system_content},
-                {"role": "user", "content": json.dumps({"markdown_input": text})},
-            ],
-        )
-
-        content = response.choices[0].message.content
-
-        try:
-            sanitized_content = re.sub(r'\s*"answer"\s*:\s*', '"answer": ', content)
-            sanitized_content = re.sub(r"\s*\}", "}", sanitized_content)
-            sanitized_content = re.sub(r"(?<!\\)\n", "\\\\n", sanitized_content)
-            sanitized_content = re.sub(r"(?<!\\)\t", "\\\\t", sanitized_content)
-
-            json_response = json.loads(sanitized_content)
-        except (json.JSONDecodeError, IndexError):
-            try:
-                json_response = json.loads(content)
-            except json.JSONDecodeError as err:
-                raise RuntimeError("AI response is not valid JSON", content) from err
-
-        if "answer" not in json_response:
-            raise RuntimeError("AI response does not contain an answer")
-
-        return json_response
-
-    def transform(self, text, action):
-        """Transform text based on specified action."""
-        system_content = AI_ACTIONS[action]
-        return self.call_ai_api(system_content, text)
-
-    def translate(self, text, language):
-        """Translate text to a specified language."""
-        language_display = enums.ALL_LANGUAGES.get(language, language)
-        system_content = AI_TRANSLATE.format(language=language_display)
-        return self.call_ai_api(system_content, text)

src/backend/core/services/collaboration_services.py

@@ -1,43 +0,0 @@
-"""Collaboration services."""
-
-from django.conf import settings
-from django.core.exceptions import ImproperlyConfigured
-
-import requests
-
-
-class CollaborationService:
-    """Service class for Collaboration related operations."""
-
-    def __init__(self):
-        """Ensure that the collaboration configuration is set properly."""
-        if settings.COLLABORATION_API_URL is None:
-            raise ImproperlyConfigured("Collaboration configuration not set")
-
-    def reset_connections(self, room, user_id=None):
-        """
-        Reset connections of a room in the collaboration server.
-        Reseting a connection means that the user will be disconnected and will
-        have to reconnect to the collaboration server, with updated rights.
-        """
-        endpoint = "reset-connections"
-
-        # room is necessary as a parameter, it is easier to stick to the
-        # same pod thanks to a parameter
-        endpoint_url = f"{settings.COLLABORATION_API_URL}{endpoint}/?room={room}"
-
-        # Note: Collaboration microservice accepts only raw token, which is not recommended
-        headers = {"Authorization": settings.COLLABORATION_SERVER_SECRET}
-        if user_id:
-            headers["X-User-Id"] = user_id
-
-        try:
-            response = requests.post(endpoint_url, headers=headers, timeout=10)
-        except requests.RequestException as e:
-            raise requests.HTTPError("Failed to notify WebSocket server.") from e
-
-        if response.status_code != 200:
-            raise requests.HTTPError(
-                f"Failed to notify WebSocket server. Status code: {response.status_code}, "
-                f"Response: {response.text}"
-            )

src/backend/core/services/converter_services.py

@@ -1,78 +0,0 @@
-"""Converter services."""
-
-from django.conf import settings
-
-import requests
-
-
-class ConversionError(Exception):
-    """Base exception for conversion-related errors."""
-
-
-class ValidationError(ConversionError):
-    """Raised when the input validation fails."""
-
-
-class ServiceUnavailableError(ConversionError):
-    """Raised when the conversion service is unavailable."""
-
-
-class InvalidResponseError(ConversionError):
-    """Raised when the conversion service returns an invalid response."""
-
-
-class MissingContentError(ConversionError):
-    """Raised when the response is missing required content."""
-
-
-class YdocConverter:
-    """Service class for conversion-related operations."""
-
-    @property
-    def auth_header(self):
-        """Build microservice authentication header."""
-        # Note: Yprovider microservice accepts only raw token, which is not recommended
-        return settings.Y_PROVIDER_API_KEY
-
-    def convert_markdown(self, text):
-        """Convert a Markdown text into our internal format using an external microservice."""
-
-        if not text:
-            raise ValidationError("Input text cannot be empty")
-
-        try:
-            response = requests.post(
-                f"{settings.Y_PROVIDER_API_BASE_URL}{settings.CONVERSION_API_ENDPOINT}/",
-                json={
-                    "content": text,
-                },
-                headers={
-                    "Authorization": self.auth_header,
-                    "Content-Type": "application/json",
-                },
-                timeout=settings.CONVERSION_API_TIMEOUT,
-                verify=settings.CONVERSION_API_SECURE,
-            )
-            response.raise_for_status()
-            conversion_response = response.json()
-
-        except requests.RequestException as err:
-            raise ServiceUnavailableError(
-                "Failed to connect to conversion service",
-            ) from err
-
-        except ValueError as err:
-            raise InvalidResponseError(
-                "Could not parse conversion service response"
-            ) from err
-
-        try:
-            document_content = conversion_response[
-                settings.CONVERSION_API_CONTENT_FIELD
-            ]
-        except KeyError as err:
-            raise MissingContentError(
-                f"Response missing required field: {settings.CONVERSION_API_CONTENT_FIELD}"
-            ) from err
-
-        return document_content

src/backend/core/tests/authentication/test_backends.py

@@ -1,15 +1,8 @@
 """Unit tests for the Authentication Backends."""
 
-import random
-import re
-from logging import Logger
-from unittest import mock
-
 from django.core.exceptions import SuspiciousOperation
-from django.test.utils import override_settings
 
 import pytest
-import responses
 
 from core import models
 from core.authentication.backends import OIDCAuthenticationBackend
@@ -41,233 +34,6 @@ def test_authentication_getter_existing_user_no_email(
     assert user == db_user
 
 
-def test_authentication_getter_existing_user_via_email(
-    django_assert_num_queries, monkeypatch
-):
-    """
-    If an existing user doesn't match the sub but matches the email,
-    the user should be returned.
-    """
-
-    klass = OIDCAuthenticationBackend()
-    db_user = UserFactory()
-
-    def get_userinfo_mocked(*args):
-        return {"sub": "123", "email": db_user.email}
-
-    monkeypatch.setattr(OIDCAuthenticationBackend, "get_userinfo", get_userinfo_mocked)
-
-    with django_assert_num_queries(2):
-        user = klass.get_or_create_user(
-            access_token="test-token", id_token=None, payload=None
-        )
-
-    assert user == db_user
-
-
-def test_authentication_getter_email_none(monkeypatch):
-    """
-    If no user is found with the sub and no email is provided, a new user should be created.
-    """
-
-    klass = OIDCAuthenticationBackend()
-    db_user = UserFactory(email=None)
-
-    def get_userinfo_mocked(*args):
-        user_info = {"sub": "123"}
-        if random.choice([True, False]):
-            user_info["email"] = None
-        return user_info
-
-    monkeypatch.setattr(OIDCAuthenticationBackend, "get_userinfo", get_userinfo_mocked)
-
-    user = klass.get_or_create_user(
-        access_token="test-token", id_token=None, payload=None
-    )
-
-    # Since the sub and email didn't match, it should create a new user
-    assert models.User.objects.count() == 2
-    assert user != db_user
-    assert user.sub == "123"
-
-
-def test_authentication_getter_existing_user_no_fallback_to_email_allow_duplicate(
-    settings, monkeypatch
-):
-    """
-    When the "OIDC_FALLBACK_TO_EMAIL_FOR_IDENTIFICATION" setting is set to False,
-    the system should not match users by email, even if the email matches.
-    """
-
-    klass = OIDCAuthenticationBackend()
-    db_user = UserFactory()
-
-    # Set the setting to False
-    settings.OIDC_FALLBACK_TO_EMAIL_FOR_IDENTIFICATION = False
-    settings.OIDC_ALLOW_DUPLICATE_EMAILS = True
-
-    def get_userinfo_mocked(*args):
-        return {"sub": "123", "email": db_user.email}
-
-    monkeypatch.setattr(OIDCAuthenticationBackend, "get_userinfo", get_userinfo_mocked)
-
-    user = klass.get_or_create_user(
-        access_token="test-token", id_token=None, payload=None
-    )
-
-    # Since the sub doesn't match, it should create a new user
-    assert models.User.objects.count() == 2
-    assert user != db_user
-    assert user.sub == "123"
-
-
-def test_authentication_getter_existing_user_no_fallback_to_email_no_duplicate(
-    settings, monkeypatch
-):
-    """
-    When the "OIDC_FALLBACK_TO_EMAIL_FOR_IDENTIFICATION" setting is set to False,
-    the system should not match users by email, even if the email matches.
-    """
-
-    klass = OIDCAuthenticationBackend()
-    db_user = UserFactory()
-
-    # Set the setting to False
-    settings.OIDC_FALLBACK_TO_EMAIL_FOR_IDENTIFICATION = False
-    settings.OIDC_ALLOW_DUPLICATE_EMAILS = False
-
-    def get_userinfo_mocked(*args):
-        return {"sub": "123", "email": db_user.email}
-
-    monkeypatch.setattr(OIDCAuthenticationBackend, "get_userinfo", get_userinfo_mocked)
-
-    with pytest.raises(
-        SuspiciousOperation,
-        match=(
-            "We couldn't find a user with this sub but the email is already associated "
-            "with a registered user."
-        ),
-    ):
-        klass.get_or_create_user(access_token="test-token", id_token=None, payload=None)
-
-    # Since the sub doesn't match, it should not create a new user
-    assert models.User.objects.count() == 1
-
-
-def test_authentication_getter_existing_user_with_email(
-    django_assert_num_queries, monkeypatch
-):
-    """
-    When the user's info contains an email and targets an existing user,
-    """
-    klass = OIDCAuthenticationBackend()
-    user = UserFactory(full_name="John Doe", short_name="John")
-
-    def get_userinfo_mocked(*args):
-        return {
-            "sub": user.sub,
-            "email": user.email,
-            "first_name": "John",
-            "last_name": "Doe",
-        }
-
-    monkeypatch.setattr(OIDCAuthenticationBackend, "get_userinfo", get_userinfo_mocked)
-
-    # Only 1 query because email and names have not changed
-    with django_assert_num_queries(1):
-        authenticated_user = klass.get_or_create_user(
-            access_token="test-token", id_token=None, payload=None
-        )
-
-    assert user == authenticated_user
-
-
-@pytest.mark.parametrize(
-    "first_name, last_name, email",
-    [
-        ("Jack", "Doe", "john.doe@example.com"),
-        ("John", "Duy", "john.doe@example.com"),
-        ("John", "Doe", "jack.duy@example.com"),
-        ("Jack", "Duy", "jack.duy@example.com"),
-    ],
-)
-def test_authentication_getter_existing_user_change_fields_sub(
-    first_name, last_name, email, django_assert_num_queries, monkeypatch
-):
-    """
-    It should update the email or name fields on the user when they change
-    and the user was identified by its "sub".
-    """
-    klass = OIDCAuthenticationBackend()
-    user = UserFactory(
-        full_name="John Doe", short_name="John", email="john.doe@example.com"
-    )
-
-    def get_userinfo_mocked(*args):
-        return {
-            "sub": user.sub,
-            "email": email,
-            "first_name": first_name,
-            "last_name": last_name,
-        }
-
-    monkeypatch.setattr(OIDCAuthenticationBackend, "get_userinfo", get_userinfo_mocked)
-
-    # One and only one additional update query when a field has changed
-    with django_assert_num_queries(2):
-        authenticated_user = klass.get_or_create_user(
-            access_token="test-token", id_token=None, payload=None
-        )
-
-    assert user == authenticated_user
-    user.refresh_from_db()
-    assert user.email == email
-    assert user.full_name == f"{first_name:s} {last_name:s}"
-    assert user.short_name == first_name
-
-
-@pytest.mark.parametrize(
-    "first_name, last_name, email",
-    [
-        ("Jack", "Doe", "john.doe@example.com"),
-        ("John", "Duy", "john.doe@example.com"),
-    ],
-)
-def test_authentication_getter_existing_user_change_fields_email(
-    first_name, last_name, email, django_assert_num_queries, monkeypatch
-):
-    """
-    It should update the name fields on the user when they change
-    and the user was identified by its "email" as fallback.
-    """
-    klass = OIDCAuthenticationBackend()
-    user = UserFactory(
-        full_name="John Doe", short_name="John", email="john.doe@example.com"
-    )
-
-    def get_userinfo_mocked(*args):
-        return {
-            "sub": "123",
-            "email": user.email,
-            "first_name": first_name,
-            "last_name": last_name,
-        }
-
-    monkeypatch.setattr(OIDCAuthenticationBackend, "get_userinfo", get_userinfo_mocked)
-
-    # One and only one additional update query when a field has changed
-    with django_assert_num_queries(3):
-        authenticated_user = klass.get_or_create_user(
-            access_token="test-token", id_token=None, payload=None
-        )
-
-    assert user == authenticated_user
-    user.refresh_from_db()
-    assert user.email == email
-    assert user.full_name == f"{first_name:s} {last_name:s}"
-    assert user.short_name == first_name
-
-
 def test_authentication_getter_new_user_no_email(monkeypatch):
     """
     If no user matches the user's info sub, a user should be created.
@@ -286,8 +52,6 @@ def test_authentication_getter_new_user_no_email(monkeypatch):
 
     assert user.sub == "123"
     assert user.email is None
-    assert user.full_name is None
-    assert user.short_name is None
     assert user.password == "!"
     assert models.User.objects.count() == 1
 
@@ -313,148 +77,12 @@ def test_authentication_getter_new_user_with_email(monkeypatch):
 
     assert user.sub == "123"
     assert user.email == email
-    assert user.full_name == "John Doe"
-    assert user.short_name == "John"
     assert user.password == "!"
     assert models.User.objects.count() == 1
 
 
-@override_settings(OIDC_OP_USER_ENDPOINT="http://oidc.endpoint.test/userinfo")
-@responses.activate
-def test_authentication_get_userinfo_json_response():
-    """Test get_userinfo method with a JSON response."""
-
-    responses.add(
-        responses.GET,
-        re.compile(r".*/userinfo"),
-        json={
-            "first_name": "John",
-            "last_name": "Doe",
-            "email": "john.doe@example.com",
-        },
-        status=200,
-    )
-
-    oidc_backend = OIDCAuthenticationBackend()
-    result = oidc_backend.get_userinfo("fake_access_token", None, None)
-
-    assert result["first_name"] == "John"
-    assert result["last_name"] == "Doe"
-    assert result["email"] == "john.doe@example.com"
-
-
-@override_settings(OIDC_OP_USER_ENDPOINT="http://oidc.endpoint.test/userinfo")
-@responses.activate
-def test_authentication_get_userinfo_token_response(monkeypatch):
-    """Test get_userinfo method with a token response."""
-
-    responses.add(
-        responses.GET, re.compile(r".*/userinfo"), body="fake.jwt.token", status=200
-    )
-
-    def mock_verify_token(self, token):  # pylint: disable=unused-argument
-        return {
-            "first_name": "Jane",
-            "last_name": "Doe",
-            "email": "jane.doe@example.com",
-        }
-
-    monkeypatch.setattr(OIDCAuthenticationBackend, "verify_token", mock_verify_token)
-
-    oidc_backend = OIDCAuthenticationBackend()
-    result = oidc_backend.get_userinfo("fake_access_token", None, None)
-
-    assert result["first_name"] == "Jane"
-    assert result["last_name"] == "Doe"
-    assert result["email"] == "jane.doe@example.com"
-
-
-@override_settings(OIDC_OP_USER_ENDPOINT="http://oidc.endpoint.test/userinfo")
-@responses.activate
-def test_authentication_get_userinfo_invalid_response():
-    """
-    Test get_userinfo method with an invalid JWT response that
-    causes verify_token to raise an error.
-    """
-
-    responses.add(
-        responses.GET, re.compile(r".*/userinfo"), body="fake.jwt.token", status=200
-    )
-
-    oidc_backend = OIDCAuthenticationBackend()
-
-    with pytest.raises(
-        SuspiciousOperation,
-        match="Invalid response format or token verification failed",
-    ):
-        oidc_backend.get_userinfo("fake_access_token", None, None)
-
-
-def test_authentication_getter_existing_disabled_user_via_sub(
-    django_assert_num_queries, monkeypatch
-):
-    """
-    If an existing user matches the sub but is disabled,
-    an error should be raised and a user should not be created.
-    """
-
-    klass = OIDCAuthenticationBackend()
-    db_user = UserFactory(is_active=False)
-
-    def get_userinfo_mocked(*args):
-        return {
-            "sub": db_user.sub,
-            "email": db_user.email,
-            "first_name": "John",
-            "last_name": "Doe",
-        }
-
-    monkeypatch.setattr(OIDCAuthenticationBackend, "get_userinfo", get_userinfo_mocked)
-
-    with (
-        django_assert_num_queries(1),
-        pytest.raises(SuspiciousOperation, match="User account is disabled"),
-    ):
-        klass.get_or_create_user(access_token="test-token", id_token=None, payload=None)
-
-    assert models.User.objects.count() == 1
-
-
-def test_authentication_getter_existing_disabled_user_via_email(
-    django_assert_num_queries, monkeypatch
-):
-    """
-    If an existing user does not match the sub but matches the email and is disabled,
-    an error should be raised and a user should not be created.
-    """
-
-    klass = OIDCAuthenticationBackend()
-    db_user = UserFactory(is_active=False)
-
-    def get_userinfo_mocked(*args):
-        return {
-            "sub": "random",
-            "email": db_user.email,
-            "first_name": "John",
-            "last_name": "Doe",
-        }
-
-    monkeypatch.setattr(OIDCAuthenticationBackend, "get_userinfo", get_userinfo_mocked)
-
-    with (
-        django_assert_num_queries(2),
-        pytest.raises(SuspiciousOperation, match="User account is disabled"),
-    ):
-        klass.get_or_create_user(access_token="test-token", id_token=None, payload=None)
-
-    assert models.User.objects.count() == 1
-
-
-# Essential claims
-
-
-def test_authentication_verify_claims_default(django_assert_num_queries, monkeypatch):
-    """The sub claim should be mandatory by default."""
+def test_models_oidc_user_getter_invalid_token(django_assert_num_queries, monkeypatch):
+    """The user's info doesn't contain a sub."""
     klass = OIDCAuthenticationBackend()
 
     def get_userinfo_mocked(*args):
@@ -464,86 +92,13 @@ def test_authentication_verify_claims_default(django_assert_num_queries, monkeyp
 
     monkeypatch.setattr(OIDCAuthenticationBackend, "get_userinfo", get_userinfo_mocked)
 
-    with (
-        django_assert_num_queries(0),
-        pytest.raises(
-            KeyError,
-            match="sub",
-        ),
-    ):
-        klass.get_or_create_user(access_token="test-token", id_token=None, payload=None)
-
-    assert models.User.objects.exists() is False
-
-
-@pytest.mark.parametrize(
-    "essential_claims, missing_claims",
-    [
-        (["email", "sub"], ["email"]),
-        (["Email", "sub"], ["Email"]),  # Case sensitivity
-    ],
-)
-@override_settings(OIDC_OP_USER_ENDPOINT="http://oidc.endpoint.test/userinfo")
-@mock.patch.object(Logger, "error")
-def test_authentication_verify_claims_essential_missing(
-    mock_logger,
-    essential_claims,
-    missing_claims,
-    django_assert_num_queries,
-    monkeypatch,
-):
-    """Ensure SuspiciousOperation is raised if essential claims are missing."""
-
-    klass = OIDCAuthenticationBackend()
-
-    def get_userinfo_mocked(*args):
-        return {
-            "sub": "123",
-            "last_name": "Doe",
-        }
-
-    monkeypatch.setattr(OIDCAuthenticationBackend, "get_userinfo", get_userinfo_mocked)
-
     with (
         django_assert_num_queries(0),
         pytest.raises(
             SuspiciousOperation,
-            match="Claims verification failed",
+            match="User info contained no recognizable user identification",
         ),
-        override_settings(USER_OIDC_ESSENTIAL_CLAIMS=essential_claims),
     ):
         klass.get_or_create_user(access_token="test-token", id_token=None, payload=None)
 
     assert models.User.objects.exists() is False
-    mock_logger.assert_called_once_with("Missing essential claims: %s", missing_claims)
-
-
-@override_settings(
-    OIDC_OP_USER_ENDPOINT="http://oidc.endpoint.test/userinfo",
-    USER_OIDC_ESSENTIAL_CLAIMS=["email", "last_name"],
-)
-def test_authentication_verify_claims_success(django_assert_num_queries, monkeypatch):
-    """Ensure user is authenticated when all essential claims are present."""
-
-    klass = OIDCAuthenticationBackend()
-
-    def get_userinfo_mocked(*args):
-        return {
-            "email": "john.doe@example.com",
-            "last_name": "Doe",
-            "sub": "123",
-        }
-
-    monkeypatch.setattr(OIDCAuthenticationBackend, "get_userinfo", get_userinfo_mocked)
-
-    with django_assert_num_queries(6):
-        user = klass.get_or_create_user(
-            access_token="test-token", id_token=None, payload=None
-        )
-
-    assert models.User.objects.filter(id=user.id).exists()
-
-    assert user.sub == "123"
-    assert user.full_name == "Doe"
-    assert user.short_name is None
-    assert user.email == "john.doe@example.com"

src/backend/core/tests/commands/test_update_files_content_type_metadata.py

@@ -1,50 +0,0 @@
-"""
-Unit test for `update_files_content_type_metadata` command.
-"""
-
-import uuid
-
-from django.core.files.storage import default_storage
-from django.core.management import call_command
-
-import pytest
-
-from core import factories
-
-
-@pytest.mark.django_db
-def test_update_files_content_type_metadata():
-    """
-    Test that the command `update_files_content_type_metadata`
-    fixes the ContentType of attachment in the storage.
-    """
-    s3_client = default_storage.connection.meta.client
-    bucket_name = default_storage.bucket_name
-
-    # Create files with a wrong ContentType
-    keys = []
-    for _ in range(10):
-        doc_id = uuid.uuid4()
-        factories.DocumentFactory(id=doc_id)
-        key = f"{doc_id}/attachments/testfile.png"
-        keys.append(key)
-        fake_png = b"\x89PNG\r\n\x1a\n\x00\x00\x00\rIHDR..."
-        s3_client.put_object(
-            Bucket=bucket_name,
-            Key=key,
-            Body=fake_png,
-            ContentType="text/plain",
-            Metadata={"owner": "None"},
-        )
-
-    # Call the command that fixes the ContentType
-    call_command("update_files_content_type_metadata")
-
-    for key in keys:
-        head_resp = s3_client.head_object(Bucket=bucket_name, Key=key)
-        assert (
-            head_resp["ContentType"] == "image/png"
-        ), f"ContentType not fixed, got {head_resp['ContentType']!r}"
-
-        # Check that original metadata was preserved
-        assert head_resp["Metadata"].get("owner") == "None"

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

@@ -11,9 +11,6 @@ from rest_framework.test import APIClient
 from core import factories, models
 from core.api import serializers
 from core.tests.conftest import TEAM, USER, VIA
-from core.tests.test_services_collaboration_services import (  # pylint: disable=unused-import
-    mock_reset_connections,
-)
 
 pytestmark = pytest.mark.django_db
 
@@ -152,7 +149,7 @@ def test_api_document_accesses_retrieve_authenticated_unrelated():
     Authenticated users should not be allowed to retrieve a document access for
     a document to which they are not related.
     """
-    user = factories.UserFactory(with_owned_document=True)
+    user = factories.UserFactory()
 
     client = APIClient()
     client.force_login(user)
@@ -249,7 +246,7 @@ def test_api_document_accesses_update_authenticated_unrelated():
     Authenticated users should not be allowed to update a document access for a document to which
     they are not related.
     """
-    user = factories.UserFactory(with_owned_document=True)
+    user = factories.UserFactory()
 
     client = APIClient()
     client.force_login(user)
@@ -282,7 +279,7 @@ def test_api_document_accesses_update_authenticated_reader_or_editor(
     via, role, mock_user_teams
 ):
     """Readers or editors of a document should not be allowed to update its accesses."""
-    user = factories.UserFactory(with_owned_document=True)
+    user = factories.UserFactory()
 
     client = APIClient()
     client.force_login(user)
@@ -319,16 +316,12 @@ def test_api_document_accesses_update_authenticated_reader_or_editor(
 
 
 @pytest.mark.parametrize("via", VIA)
-def test_api_document_accesses_update_administrator_except_owner(
-    via,
-    mock_user_teams,
-    mock_reset_connections,  # pylint: disable=redefined-outer-name
-):
+def test_api_document_accesses_update_administrator_except_owner(via, mock_user_teams):
     """
     A user who is a direct administrator in a document should be allowed to update a user
     access for this document, as long as they don't try to set the role to owner.
     """
-    user = factories.UserFactory(with_owned_document=True)
+    user = factories.UserFactory()
 
     client = APIClient()
     client.force_login(user)
@@ -358,21 +351,18 @@ def test_api_document_accesses_update_administrator_except_owner(
 
     for field, value in new_values.items():
         new_data = {**old_values, field: value}
-        if new_data["role"] == old_values["role"]:
-            response = client.put(
-                f"/api/v1.0/documents/{document.id!s}/accesses/{access.id!s}/",
-                data=new_data,
-                format="json",
-            )
+        response = client.put(
+            f"/api/v1.0/documents/{document.id!s}/accesses/{access.id!s}/",
+            data=new_data,
+            format="json",
+        )
+
+        if (
+            new_data["role"] == old_values["role"]
+        ):  # we are not really updating the role
             assert response.status_code == 403
         else:
-            with mock_reset_connections(document.id, str(access.user_id)):
-                response = client.put(
-                    f"/api/v1.0/documents/{document.id!s}/accesses/{access.id!s}/",
-                    data=new_data,
-                    format="json",
-                )
-                assert response.status_code == 200
+            assert response.status_code == 200
 
         access.refresh_from_db()
         updated_values = serializers.DocumentAccessSerializer(instance=access).data
@@ -388,7 +378,7 @@ def test_api_document_accesses_update_administrator_from_owner(via, mock_user_te
     A user who is an administrator in a document, should not be allowed to update
     the user access of an "owner" for this document.
     """
-    user = factories.UserFactory(with_owned_document=True)
+    user = factories.UserFactory()
 
     client = APIClient()
     client.force_login(user)
@@ -430,16 +420,12 @@ def test_api_document_accesses_update_administrator_from_owner(via, mock_user_te
 
 
 @pytest.mark.parametrize("via", VIA)
-def test_api_document_accesses_update_administrator_to_owner(
-    via,
-    mock_user_teams,
-    mock_reset_connections,  # pylint: disable=redefined-outer-name
-):
+def test_api_document_accesses_update_administrator_to_owner(via, mock_user_teams):
     """
     A user who is an administrator in a document, should not be allowed to update
     the user access of another user to grant document ownership.
     """
-    user = factories.UserFactory(with_owned_document=True)
+    user = factories.UserFactory()
 
     client = APIClient()
     client.force_login(user)
@@ -471,23 +457,16 @@ def test_api_document_accesses_update_administrator_to_owner(
 
     for field, value in new_values.items():
         new_data = {**old_values, field: value}
+        response = client.put(
+            f"/api/v1.0/documents/{document.id!s}/accesses/{access.id!s}/",
+            data=new_data,
+            format="json",
+        )
         # We are not allowed or not really updating the role
         if field == "role" or new_data["role"] == old_values["role"]:
-            response = client.put(
-                f"/api/v1.0/documents/{document.id!s}/accesses/{access.id!s}/",
-                data=new_data,
-                format="json",
-            )
-
             assert response.status_code == 403
         else:
-            with mock_reset_connections(document.id, str(access.user_id)):
-                response = client.put(
-                    f"/api/v1.0/documents/{document.id!s}/accesses/{access.id!s}/",
-                    data=new_data,
-                    format="json",
-                )
-                assert response.status_code == 200
+            assert response.status_code == 200
 
         access.refresh_from_db()
         updated_values = serializers.DocumentAccessSerializer(instance=access).data
@@ -495,16 +474,12 @@ def test_api_document_accesses_update_administrator_to_owner(
 
 
 @pytest.mark.parametrize("via", VIA)
-def test_api_document_accesses_update_owner(
-    via,
-    mock_user_teams,
-    mock_reset_connections,  # pylint: disable=redefined-outer-name
-):
+def test_api_document_accesses_update_owner(via, mock_user_teams):
     """
     A user who is an owner in a document should be allowed to update
     a user access for this document whatever the role.
     """
-    user = factories.UserFactory(with_owned_document=True)
+    user = factories.UserFactory()
 
     client = APIClient()
     client.force_login(user)
@@ -532,24 +507,18 @@ def test_api_document_accesses_update_owner(
 
     for field, value in new_values.items():
         new_data = {**old_values, field: value}
+        response = client.put(
+            f"/api/v1.0/documents/{document.id!s}/accesses/{access.id!s}/",
+            data=new_data,
+            format="json",
+        )
+
         if (
             new_data["role"] == old_values["role"]
         ):  # we are not really updating the role
-            response = client.put(
-                f"/api/v1.0/documents/{document.id!s}/accesses/{access.id!s}/",
-                data=new_data,
-                format="json",
-            )
             assert response.status_code == 403
         else:
-            with mock_reset_connections(document.id, str(access.user_id)):
-                response = client.put(
-                    f"/api/v1.0/documents/{document.id!s}/accesses/{access.id!s}/",
-                    data=new_data,
-                    format="json",
-                )
-
-                assert response.status_code == 200
+            assert response.status_code == 200
 
         access.refresh_from_db()
         updated_values = serializers.DocumentAccessSerializer(instance=access).data
@@ -561,16 +530,12 @@ def test_api_document_accesses_update_owner(
 
 
 @pytest.mark.parametrize("via", VIA)
-def test_api_document_accesses_update_owner_self(
-    via,
-    mock_user_teams,
-    mock_reset_connections,  # pylint: disable=redefined-outer-name
-):
+def test_api_document_accesses_update_owner_self(via, mock_user_teams):
     """
     A user who is owner of a document should be allowed to update
     their own user access provided there are other owners in the document.
     """
-    user = factories.UserFactory(with_owned_document=True)
+    user = factories.UserFactory()
 
     client = APIClient()
     client.force_login(user)
@@ -603,23 +568,21 @@ def test_api_document_accesses_update_owner_self(
     # Add another owner and it should now work
     factories.UserDocumentAccessFactory(document=document, role="owner")
 
-    user_id = str(access.user_id) if via == USER else None
-    with mock_reset_connections(document.id, user_id):
-        response = client.put(
-            f"/api/v1.0/documents/{document.id!s}/accesses/{access.id!s}/",
-            data={
-                **old_values,
-                "role": new_role,
-                "user_id": old_values.get("user", {}).get("id")
-                if old_values.get("user") is not None
-                else None,
-            },
-            format="json",
-        )
+    response = client.put(
+        f"/api/v1.0/documents/{document.id!s}/accesses/{access.id!s}/",
+        data={
+            **old_values,
+            "role": new_role,
+            "user_id": old_values.get("user", {}).get("id")
+            if old_values.get("user") is not None
+            else None,
+        },
+        format="json",
+    )
 
-        assert response.status_code == 200
-        access.refresh_from_db()
-        assert access.role == new_role
+    assert response.status_code == 200
+    access.refresh_from_db()
+    assert access.role == new_role
 
 
 # Delete
@@ -642,7 +605,7 @@ def test_api_document_accesses_delete_authenticated():
     Authenticated users should not be allowed to delete a document access for a
     document to which they are not related.
     """
-    user = factories.UserFactory(with_owned_document=True)
+    user = factories.UserFactory()
 
     client = APIClient()
     client.force_login(user)
@@ -654,7 +617,7 @@ def test_api_document_accesses_delete_authenticated():
     )
 
     assert response.status_code == 403
-    assert models.DocumentAccess.objects.count() == 2
+    assert models.DocumentAccess.objects.count() == 1
 
 
 @pytest.mark.parametrize("role", ["reader", "editor"])
@@ -664,7 +627,7 @@ def test_api_document_accesses_delete_reader_or_editor(via, role, mock_user_team
     Authenticated users should not be allowed to delete a document access for a
     document in which they are a simple reader or editor.
     """
-    user = factories.UserFactory(with_owned_document=True)
+    user = factories.UserFactory()
 
     client = APIClient()
     client.force_login(user)
@@ -680,7 +643,7 @@ def test_api_document_accesses_delete_reader_or_editor(via, role, mock_user_team
 
     access = factories.UserDocumentAccessFactory(document=document)
 
-    assert models.DocumentAccess.objects.count() == 3
+    assert models.DocumentAccess.objects.count() == 2
     assert models.DocumentAccess.objects.filter(user=access.user).exists()
 
     response = client.delete(
@@ -688,14 +651,12 @@ def test_api_document_accesses_delete_reader_or_editor(via, role, mock_user_team
     )
 
     assert response.status_code == 403
-    assert models.DocumentAccess.objects.count() == 3
+    assert models.DocumentAccess.objects.count() == 2
 
 
 @pytest.mark.parametrize("via", VIA)
 def test_api_document_accesses_delete_administrators_except_owners(
-    via,
-    mock_user_teams,
-    mock_reset_connections,  # pylint: disable=redefined-outer-name
+    via, mock_user_teams
 ):
     """
     Users who are administrators in a document should be allowed to delete an access
@@ -724,13 +685,12 @@ def test_api_document_accesses_delete_administrators_except_owners(
     assert models.DocumentAccess.objects.count() == 2
     assert models.DocumentAccess.objects.filter(user=access.user).exists()
 
-    with mock_reset_connections(document.id, str(access.user_id)):
-        response = client.delete(
-            f"/api/v1.0/documents/{document.id!s}/accesses/{access.id!s}/",
-        )
+    response = client.delete(
+        f"/api/v1.0/documents/{document.id!s}/accesses/{access.id!s}/",
+    )
 
-        assert response.status_code == 204
-        assert models.DocumentAccess.objects.count() == 1
+    assert response.status_code == 204
+    assert models.DocumentAccess.objects.count() == 1
 
 
 @pytest.mark.parametrize("via", VIA)
@@ -739,7 +699,7 @@ def test_api_document_accesses_delete_administrator_on_owners(via, mock_user_tea
     Users who are administrators in a document should not be allowed to delete an ownership
     access from the document.
     """
-    user = factories.UserFactory(with_owned_document=True)
+    user = factories.UserFactory()
 
     client = APIClient()
     client.force_login(user)
@@ -757,7 +717,7 @@ def test_api_document_accesses_delete_administrator_on_owners(via, mock_user_tea
 
     access = factories.UserDocumentAccessFactory(document=document, role="owner")
 
-    assert models.DocumentAccess.objects.count() == 3
+    assert models.DocumentAccess.objects.count() == 2
     assert models.DocumentAccess.objects.filter(user=access.user).exists()
 
     response = client.delete(
@@ -765,15 +725,11 @@ def test_api_document_accesses_delete_administrator_on_owners(via, mock_user_tea
     )
 
     assert response.status_code == 403
-    assert models.DocumentAccess.objects.count() == 3
+    assert models.DocumentAccess.objects.count() == 2
 
 
 @pytest.mark.parametrize("via", VIA)
-def test_api_document_accesses_delete_owners(
-    via,
-    mock_user_teams,
-    mock_reset_connections,  # pylint: disable=redefined-outer-name
-):
+def test_api_document_accesses_delete_owners(via, mock_user_teams):
     """
     Users should be able to delete the document access of another user
     for a document of which they are owner.
@@ -797,13 +753,12 @@ def test_api_document_accesses_delete_owners(
     assert models.DocumentAccess.objects.count() == 2
     assert models.DocumentAccess.objects.filter(user=access.user).exists()
 
-    with mock_reset_connections(document.id, str(access.user_id)):
-        response = client.delete(
-            f"/api/v1.0/documents/{document.id!s}/accesses/{access.id!s}/",
-        )
+    response = client.delete(
+        f"/api/v1.0/documents/{document.id!s}/accesses/{access.id!s}/",
+    )
 
-        assert response.status_code == 204
-        assert models.DocumentAccess.objects.count() == 1
+    assert response.status_code == 204
+    assert models.DocumentAccess.objects.count() == 1
 
 
 @pytest.mark.parametrize("via", VIA)
@@ -811,7 +766,7 @@ def test_api_document_accesses_delete_owners_last_owner(via, mock_user_teams):
     """
     It should not be possible to delete the last owner access from a document
     """
-    user = factories.UserFactory(with_owned_document=True)
+    user = factories.UserFactory()
 
     client = APIClient()
     client.force_login(user)
@@ -828,10 +783,10 @@ def test_api_document_accesses_delete_owners_last_owner(via, mock_user_teams):
             document=document, team="lasuite", role="owner"
         )
 
-    assert models.DocumentAccess.objects.count() == 2
+    assert models.DocumentAccess.objects.count() == 1
     response = client.delete(
         f"/api/v1.0/documents/{document.id!s}/accesses/{access.id!s}/",
     )
 
     assert response.status_code == 403
-    assert models.DocumentAccess.objects.count() == 2
+    assert models.DocumentAccess.objects.count() == 1

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

@@ -18,13 +18,13 @@ pytestmark = pytest.mark.django_db
 
 def test_api_document_accesses_create_anonymous():
     """Anonymous users should not be allowed to create document accesses."""
+    user = factories.UserFactory()
     document = factories.DocumentFactory()
 
-    other_user = factories.UserFactory()
     response = APIClient().post(
         f"/api/v1.0/documents/{document.id!s}/accesses/",
         {
-            "user_id": str(other_user.id),
+            "user": str(user.id),
             "document": str(document.id),
             "role": random.choice(models.RoleChoices.choices)[0],
         },
@@ -43,7 +43,7 @@ def test_api_document_accesses_create_authenticated_unrelated():
     Authenticated users should not be allowed to create document accesses for a document to
     which they are not related.
     """
-    user = factories.UserFactory(with_owned_document=True)
+    user = factories.UserFactory()
 
     client = APIClient()
     client.force_login(user)
@@ -54,7 +54,7 @@ def test_api_document_accesses_create_authenticated_unrelated():
     response = client.post(
         f"/api/v1.0/documents/{document.id!s}/accesses/",
         {
-            "user_id": str(other_user.id),
+            "user": str(other_user.id),
         },
         format="json",
     )
@@ -69,7 +69,7 @@ def test_api_document_accesses_create_authenticated_reader_or_editor(
     via, role, mock_user_teams
 ):
     """Readers or editors of a document should not be allowed to create document accesses."""
-    user = factories.UserFactory(with_owned_document=True)
+    user = factories.UserFactory()
 
     client = APIClient()
     client.force_login(user)
@@ -89,7 +89,7 @@ def test_api_document_accesses_create_authenticated_reader_or_editor(
         response = client.post(
             f"/api/v1.0/documents/{document.id!s}/accesses/",
             {
-                "user_id": str(other_user.id),
+                "user": str(other_user.id),
                 "role": new_role,
             },
             format="json",
@@ -107,7 +107,7 @@ def test_api_document_accesses_create_authenticated_administrator(via, mock_user
     except for the "owner" role.
     An email should be sent to the accesses to notify them of the adding.
     """
-    user = factories.UserFactory(with_owned_document=True)
+    user = factories.UserFactory()
 
     client = APIClient()
     client.force_login(user)
@@ -129,7 +129,7 @@ def test_api_document_accesses_create_authenticated_administrator(via, mock_user
     response = client.post(
         f"/api/v1.0/documents/{document.id!s}/accesses/",
         {
-            "user_id": str(other_user.id),
+            "user": str(other_user.id),
             "role": "owner",
         },
         format="json",
@@ -171,11 +171,7 @@ def test_api_document_accesses_create_authenticated_administrator(via, mock_user
     email = mail.outbox[0]
     assert email.to == [other_user["email"]]
     email_content = " ".join(email.body.split())
-    assert f"{user.full_name} shared a document with you!" in email_content
-    assert (
-        f"{user.full_name} ({user.email}) invited you with the role "{role}" "
-        f"on the following document: {document.title}"
-    ) in email_content
+    assert "Invitation to join Docs!" in email_content
     assert "docs/" + str(document.id) + "/" in email_content
 
 
@@ -229,9 +225,5 @@ def test_api_document_accesses_create_authenticated_owner(via, mock_user_teams):
     email = mail.outbox[0]
     assert email.to == [other_user["email"]]
     email_content = " ".join(email.body.split())
-    assert f"{user.full_name} shared a document with you!" in email_content
-    assert (
-        f"{user.full_name} ({user.email}) invited you with the role "{role}" "
-        f"on the following document: {document.title}"
-    ) in email_content
+    assert "Invitation to join Docs!" in email_content
     assert "docs/" + str(document.id) + "/" in email_content

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

@@ -39,7 +39,7 @@ def test_api_document_versions_list_authenticated_unrelated(reach):
     Authenticated users should not be allowed to list document versions for a document
     to which they are not related.
     """
-    user = factories.UserFactory(with_owned_document=True)
+    user = factories.UserFactory()
 
     client = APIClient()
     client.force_login(user)
@@ -60,7 +60,7 @@ def test_api_document_versions_list_authenticated_unrelated(reach):
 
 
 @pytest.mark.parametrize("via", VIA)
-def test_api_document_versions_list_authenticated_related_success(via, mock_user_teams):
+def test_api_document_versions_list_authenticated_related(via, mock_user_teams):
     """
     Authenticated users should be able to list document versions for a document
     to which they are directly related, whatever their role in the document.
@@ -95,12 +95,12 @@ def test_api_document_versions_list_authenticated_related_success(via, mock_user
 
     assert response.status_code == 200
     content = response.json()
+    assert len(content["results"]) == 0
     assert content["count"] == 0
 
     # Add a new version to the document
-    for i in range(3):
-        document.content = f"new content {i:d}"
-        document.save()
+    document.content = "new content"
+    document.save()
 
     response = client.get(
         f"/api/v1.0/documents/{document.id!s}/versions/",
@@ -108,100 +108,8 @@ def test_api_document_versions_list_authenticated_related_success(via, mock_user
 
     assert response.status_code == 200
     content = response.json()
-    # The current version is not listed
-    assert content["count"] == 2
-
-
-@pytest.mark.parametrize("via", VIA)
-def test_api_document_versions_list_authenticated_related_pagination(
-    via, mock_user_teams
-):
-    """
-    The list of versions should be paginated and exclude versions that were created prior to the
-    user gaining access to the document.
-    """
-    user = factories.UserFactory()
-
-    client = APIClient()
-    client.force_login(user)
-
-    document = factories.DocumentFactory()
-    for i in range(3):
-        document.content = f"before {i:d}"
-        document.save()
-
-    if via == USER:
-        models.DocumentAccess.objects.create(
-            document=document,
-            user=user,
-            role=random.choice(models.RoleChoices.choices)[0],
-        )
-    elif via == TEAM:
-        mock_user_teams.return_value = ["lasuite", "unknown"]
-        models.DocumentAccess.objects.create(
-            document=document,
-            team="lasuite",
-            role=random.choice(models.RoleChoices.choices)[0],
-        )
-
-    for i in range(4):
-        document.content = f"after {i:d}"
-        document.save()
-
-    response = client.get(
-        f"/api/v1.0/documents/{document.id!s}/versions/",
-    )
-
-    content = response.json()
-    assert content["is_truncated"] is False
-    # The current version is not listed
-    assert content["count"] == 3
-    assert content["next_version_id_marker"] == ""
-    all_version_ids = [version["version_id"] for version in content["versions"]]
-
-    # - set page size
-    response = client.get(
-        f"/api/v1.0/documents/{document.id!s}/versions/?page_size=2",
-    )
-
-    content = response.json()
-    assert content["count"] == 2
-    assert content["is_truncated"] is True
-    marker = content["next_version_id_marker"]
-    assert marker == all_version_ids[1]
-    assert [
-        version["version_id"] for version in content["versions"]
-    ] == all_version_ids[:2]
-
-    # - get page 2
-    response = client.get(
-        f"/api/v1.0/documents/{document.id!s}/versions/?page_size=2&version_id={marker:s}",
-    )
-
-    content = response.json()
+    assert len(content["results"]) == 1
     assert content["count"] == 1
-    assert content["is_truncated"] is False
-    assert content["next_version_id_marker"] == ""
-    assert content["versions"][0]["version_id"] == all_version_ids[2]
-
-
-def test_api_document_versions_list_exceeds_max_page_size():
-    """Page size should not exceed the limit set on the serializer"""
-    user = factories.UserFactory()
-
-    client = APIClient()
-    client.force_login(user)
-
-    document = factories.DocumentFactory(users=[user])
-    document.content = "version 2"
-    document.save()
-
-    response = client.get(f"/api/v1.0/documents/{document.id!s}/versions/?page_size=51")
-
-    assert response.status_code == 400
-    assert response.json() == {
-        "page_size": ["Ensure this value is less than or equal to 50."]
-    }
 
 
 @pytest.mark.parametrize("reach", models.LinkReachChoices.values)
@@ -211,9 +119,6 @@ def test_api_document_versions_retrieve_anonymous(reach):
     restricted or authenticated link reach.
     """
     document = factories.DocumentFactory(link_reach=reach)
-    document.content = "new content"
-    document.save()
-
     version_id = document.get_versions_slice()["versions"][0]["version_id"]
 
     url = f"/api/v1.0/documents/{document.id!s}/versions/{version_id:s}/"
@@ -231,15 +136,12 @@ def test_api_document_versions_retrieve_authenticated_unrelated(reach):
     Authenticated users should not be allowed to retrieve specific versions for a
     document to which they are not related.
     """
-    user = factories.UserFactory(with_owned_document=True)
+    user = factories.UserFactory()
 
     client = APIClient()
     client.force_login(user)
 
     document = factories.DocumentFactory(link_reach=reach)
-    document.content = "new content"
-    document.save()
-
     version_id = document.get_versions_slice()["versions"][0]["version_id"]
 
     response = client.get(
@@ -255,7 +157,7 @@ def test_api_document_versions_retrieve_authenticated_unrelated(reach):
 def test_api_document_versions_retrieve_authenticated_related(via, mock_user_teams):
     """
     A user who is related to a document should be allowed to retrieve the
-    associated document versions.
+    associated document user accesses.
     """
     user = factories.UserFactory()
 
@@ -263,10 +165,6 @@ def test_api_document_versions_retrieve_authenticated_related(via, mock_user_tea
     client.force_login(user)
 
     document = factories.DocumentFactory()
-    document.content = "new content"
-    document.save()
-
-    assert len(document.get_versions_slice()["versions"]) == 1
     version_id = document.get_versions_slice()["versions"][0]["version_id"]
 
     if via == USER:
@@ -275,8 +173,6 @@ def test_api_document_versions_retrieve_authenticated_related(via, mock_user_tea
         mock_user_teams.return_value = ["lasuite", "unknown"]
         factories.TeamDocumentAccessFactory(document=document, team="lasuite")
 
-    time.sleep(1)  # minio stores datetimes with the precision of a second
-
     # Versions created before the document was shared should not be seen by the user
     response = client.get(
         f"/api/v1.0/documents/{document.id!s}/versions/{version_id:s}/",
@@ -284,26 +180,11 @@ def test_api_document_versions_retrieve_authenticated_related(via, mock_user_tea
 
     assert response.status_code == 404
 
-    # Create a new version should not make it available to the user because
-    # only the current version is available to the user but it is excluded
-    # from the list
-    document.content = "new content 1"
+    # Create a new version should make it available to the user
+    time.sleep(1)  # minio stores datetimes with the precision of a second
+    document.content = "new content"
     document.save()
 
-    assert len(document.get_versions_slice()["versions"]) == 2
-    version_id = document.get_versions_slice()["versions"][0]["version_id"]
-
-    response = client.get(
-        f"/api/v1.0/documents/{document.id!s}/versions/{version_id:s}/",
-    )
-
-    assert response.status_code == 404
-
-    # Adding one more version should make the previous version available to the user
-    document.content = "new content 2"
-    document.save()
-
-    assert len(document.get_versions_slice()["versions"]) == 3
     version_id = document.get_versions_slice()["versions"][0]["version_id"]
 
     response = client.get(
@@ -311,7 +192,7 @@ def test_api_document_versions_retrieve_authenticated_related(via, mock_user_tea
     )
 
     assert response.status_code == 200
-    assert response.json()["content"] == "new content 1"
+    assert response.json()["content"] == "new content"
 
 
 def test_api_document_versions_create_anonymous():
@@ -379,15 +260,10 @@ def test_api_document_versions_create_authenticated_related(via, mock_user_teams
 def test_api_document_versions_update_anonymous():
     """Anonymous users should not be allowed to update a document version."""
     access = factories.UserDocumentAccessFactory()
-    document = access.document
-    document.content = "new content"
-    document.save()
-
-    assert len(document.get_versions_slice()["versions"]) == 1
-    version_id = document.get_versions_slice()["versions"][0]["version_id"]
+    version_id = access.document.get_versions_slice()["versions"][0]["version_id"]
 
     response = APIClient().put(
-        f"/api/v1.0/documents/{document.id!s}/versions/{version_id:s}/",
+        f"/api/v1.0/documents/{access.document_id!s}/versions/{version_id:s}/",
         {"foo": "bar"},
         format="json",
     )
@@ -405,12 +281,7 @@ def test_api_document_versions_update_authenticated_unrelated():
     client.force_login(user)
 
     access = factories.UserDocumentAccessFactory()
-    document = access.document
-    document.content = "new content"
-    document.save()
-
-    assert len(document.get_versions_slice()["versions"]) == 1
-    version_id = document.get_versions_slice()["versions"][0]["version_id"]
+    version_id = access.document.get_versions_slice()["versions"][0]["version_id"]
 
     response = client.put(
         f"/api/v1.0/documents/{access.document_id!s}/versions/{version_id:s}/",
@@ -432,6 +303,7 @@ def test_api_document_versions_update_authenticated_related(via, mock_user_teams
     client.force_login(user)
 
     document = factories.DocumentFactory()
+    version_id = document.get_versions_slice()["versions"][0]["version_id"]
 
     if via == USER:
         factories.UserDocumentAccessFactory(document=document, user=user)
@@ -439,14 +311,6 @@ def test_api_document_versions_update_authenticated_related(via, mock_user_teams
         mock_user_teams.return_value = ["lasuite", "unknown"]
         factories.TeamDocumentAccessFactory(document=document, team="lasuite")
 
-    time.sleep(1)  # minio stores datetimes with the precision of a second
-
-    document.content = "new content"
-    document.save()
-
-    assert len(document.get_versions_slice()["versions"]) == 1
-    version_id = document.get_versions_slice()["versions"][0]["version_id"]
-
     response = client.put(
         f"/api/v1.0/documents/{document.id!s}/versions/{version_id!s}/",
         {"foo": "bar"},
@@ -475,15 +339,12 @@ def test_api_document_versions_delete_authenticated(reach):
     Authenticated users should not be allowed to delete a document version for a
     public document to which they are not related.
     """
-    user = factories.UserFactory(with_owned_document=True)
+    user = factories.UserFactory()
 
     client = APIClient()
     client.force_login(user)
 
     document = factories.DocumentFactory(link_reach=reach)
-    document.content = "new content"
-    document.save()
-
     version_id = document.get_versions_slice()["versions"][0]["version_id"]
 
     response = client.delete(
@@ -500,7 +361,7 @@ def test_api_document_versions_delete_reader_or_editor(via, role, mock_user_team
     Authenticated users should not be allowed to delete a document version for a
     document in which they are a simple reader or editor.
     """
-    user = factories.UserFactory(with_owned_document=True)
+    user = factories.UserFactory()
 
     client = APIClient()
     client.force_login(user)
@@ -520,7 +381,13 @@ def test_api_document_versions_delete_reader_or_editor(via, role, mock_user_team
     document.save()
 
     versions = document.get_versions_slice()["versions"]
-    assert len(versions) == 1
+    assert len(versions) == 2
+
+    version_id = versions[1]["version_id"]
+    response = client.delete(
+        f"/api/v1.0/documents/{document.id!s}/versions/{version_id:s}/",
+    )
+    assert response.status_code == 403
 
     version_id = versions[0]["version_id"]
     response = client.delete(
@@ -529,7 +396,7 @@ def test_api_document_versions_delete_reader_or_editor(via, role, mock_user_team
     assert response.status_code == 403
 
     versions = document.get_versions_slice()["versions"]
-    assert len(versions) == 1
+    assert len(versions) == 2
 
 
 @pytest.mark.parametrize("via", VIA)
@@ -554,25 +421,19 @@ def test_api_document_versions_delete_administrator_or_owner(via, mock_user_team
 
     # Create a new version should make it available to the user
     time.sleep(1)  # minio stores datetimes with the precision of a second
-    document.content = "new content 1"
+    document.content = "new content"
     document.save()
 
     versions = document.get_versions_slice()["versions"]
-    assert len(versions) == 1
+    assert len(versions) == 2
 
-    version_id = versions[0]["version_id"]
+    version_id = versions[1]["version_id"]
     response = client.delete(
         f"/api/v1.0/documents/{document.id!s}/versions/{version_id:s}/",
     )
     # 404 because the version was created before the user was given access to the document
     assert response.status_code == 404
 
-    document.content = "new content 2"
-    document.save()
-
-    versions = document.get_versions_slice()["versions"]
-    assert len(versions) == 2
-
     version_id = versions[0]["version_id"]
     response = client.delete(
         f"/api/v1.0/documents/{document.id!s}/versions/{version_id:s}/",

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

@@ -1,346 +0,0 @@
-"""
-Test AI transform API endpoint for users in impress's core app.
-"""
-
-from unittest.mock import MagicMock, patch
-
-from django.core.cache import cache
-from django.test import override_settings
-
-import pytest
-from rest_framework.test import APIClient
-
-from core import factories
-from core.tests.conftest import TEAM, USER, VIA
-
-pytestmark = pytest.mark.django_db
-
-
-@pytest.fixture(autouse=True)
-def clear_cache():
-    """Fixture to clear the cache before each test."""
-    cache.clear()
-
-
-@pytest.fixture
-def ai_settings():
-    """Fixture to set AI settings."""
-    with override_settings(
-        AI_BASE_URL="http://example.com", AI_API_KEY="test-key", AI_MODEL="llama"
-    ):
-        yield
-
-
-@pytest.mark.parametrize(
-    "reach, role",
-    [
-        ("restricted", "reader"),
-        ("restricted", "editor"),
-        ("authenticated", "reader"),
-        ("authenticated", "editor"),
-        ("public", "reader"),
-    ],
-)
-def test_api_documents_ai_transform_anonymous_forbidden(reach, role):
-    """
-    Anonymous users should not be able to request AI transform if the link reach
-    and role don't allow it.
-    """
-    document = factories.DocumentFactory(link_reach=reach, link_role=role)
-
-    url = f"/api/v1.0/documents/{document.id!s}/ai-transform/"
-    response = APIClient().post(url, {"text": "hello", "action": "prompt"})
-
-    assert response.status_code == 401
-    assert response.json() == {
-        "detail": "Authentication credentials were not provided."
-    }
-
-
-@pytest.mark.usefixtures("ai_settings")
-@patch("openai.resources.chat.completions.Completions.create")
-def test_api_documents_ai_transform_anonymous_success(mock_create):
-    """
-    Anonymous users should be able to request AI transform to a document
-    if the link reach and role permit it.
-    """
-    document = factories.DocumentFactory(link_reach="public", link_role="editor")
-
-    answer = '{"answer": "Salut"}'
-    mock_create.return_value = MagicMock(
-        choices=[MagicMock(message=MagicMock(content=answer))]
-    )
-
-    url = f"/api/v1.0/documents/{document.id!s}/ai-transform/"
-    response = APIClient().post(url, {"text": "Hello", "action": "summarize"})
-
-    assert response.status_code == 200
-    assert response.json() == {"answer": "Salut"}
-    mock_create.assert_called_once_with(
-        model="llama",
-        response_format={"type": "json_object"},
-        messages=[
-            {
-                "role": "system",
-                "content": (
-                    "Summarize the markdown text, preserving language and markdown formatting. "
-                    'Return JSON: {"answer": "your markdown summary"}. Do not provide any other '
-                    "information."
-                ),
-            },
-            {"role": "user", "content": '{"markdown_input": "Hello"}'},
-        ],
-    )
-
-
-@pytest.mark.parametrize(
-    "reach, role",
-    [
-        ("restricted", "reader"),
-        ("restricted", "editor"),
-        ("authenticated", "reader"),
-        ("public", "reader"),
-    ],
-)
-def test_api_documents_ai_transform_authenticated_forbidden(reach, role):
-    """
-    Users who are not related to a document can't request AI transform if the
-    link reach and role don't allow it.
-    """
-    user = factories.UserFactory()
-
-    client = APIClient()
-    client.force_login(user)
-
-    document = factories.DocumentFactory(link_reach=reach, link_role=role)
-
-    url = f"/api/v1.0/documents/{document.id!s}/ai-transform/"
-    response = client.post(url, {"text": "Hello", "action": "prompt"})
-
-    assert response.status_code == 403
-    assert response.json() == {
-        "detail": "You do not have permission to perform this action."
-    }
-
-
-@pytest.mark.parametrize(
-    "reach, role",
-    [
-        ("authenticated", "editor"),
-        ("public", "editor"),
-    ],
-)
-@pytest.mark.usefixtures("ai_settings")
-@patch("openai.resources.chat.completions.Completions.create")
-def test_api_documents_ai_transform_authenticated_success(mock_create, reach, role):
-    """
-    Autenticated who are not related to a document should be able to request AI transform
-    if the link reach and role permit it.
-    """
-    user = factories.UserFactory()
-
-    client = APIClient()
-    client.force_login(user)
-
-    document = factories.DocumentFactory(link_reach=reach, link_role=role)
-
-    answer = '{"answer": "Salut"}'
-    mock_create.return_value = MagicMock(
-        choices=[MagicMock(message=MagicMock(content=answer))]
-    )
-
-    url = f"/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"}
-    mock_create.assert_called_once_with(
-        model="llama",
-        response_format={"type": "json_object"},
-        messages=[
-            {
-                "role": "system",
-                "content": (
-                    'Answer the prompt in markdown format. Return JSON: {"answer": '
-                    '"Your markdown answer"}. Do not provide any other information.'
-                ),
-            },
-            {"role": "user", "content": '{"markdown_input": "Hello"}'},
-        ],
-    )
-
-
-@pytest.mark.parametrize("via", VIA)
-def test_api_documents_ai_transform_reader(via, mock_user_teams):
-    """
-    Users who are simple readers on a document should not be allowed to request AI transform.
-    """
-    user = factories.UserFactory()
-
-    client = APIClient()
-    client.force_login(user)
-
-    document = factories.DocumentFactory(link_role="reader")
-    if via == USER:
-        factories.UserDocumentAccessFactory(document=document, user=user, role="reader")
-    elif via == TEAM:
-        mock_user_teams.return_value = ["lasuite", "unknown"]
-        factories.TeamDocumentAccessFactory(
-            document=document, team="lasuite", role="reader"
-        )
-
-    url = f"/api/v1.0/documents/{document.id!s}/ai-transform/"
-    response = client.post(url, {"text": "Hello", "action": "prompt"})
-
-    assert response.status_code == 403
-    assert response.json() == {
-        "detail": "You do not have permission to perform this action."
-    }
-
-
-@pytest.mark.parametrize("role", ["editor", "administrator", "owner"])
-@pytest.mark.parametrize("via", VIA)
-@pytest.mark.usefixtures("ai_settings")
-@patch("openai.resources.chat.completions.Completions.create")
-def test_api_documents_ai_transform_success(mock_create, via, role, mock_user_teams):
-    """
-    Editors, administrators and owners of a document should be able to request AI transform.
-    """
-    user = factories.UserFactory()
-
-    client = APIClient()
-    client.force_login(user)
-
-    document = factories.DocumentFactory()
-    if via == USER:
-        factories.UserDocumentAccessFactory(document=document, user=user, role=role)
-    elif via == TEAM:
-        mock_user_teams.return_value = ["lasuite", "unknown"]
-        factories.TeamDocumentAccessFactory(
-            document=document, team="lasuite", role=role
-        )
-
-    answer = '{"answer": "Salut"}'
-    mock_create.return_value = MagicMock(
-        choices=[MagicMock(message=MagicMock(content=answer))]
-    )
-
-    url = f"/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"}
-    mock_create.assert_called_once_with(
-        model="llama",
-        response_format={"type": "json_object"},
-        messages=[
-            {
-                "role": "system",
-                "content": (
-                    'Answer the prompt in markdown format. Return JSON: {"answer": '
-                    '"Your markdown answer"}. Do not provide any other information.'
-                ),
-            },
-            {"role": "user", "content": '{"markdown_input": "Hello"}'},
-        ],
-    )
-
-
-def test_api_documents_ai_transform_empty_text():
-    """The text should not be empty when requesting AI transform."""
-    user = factories.UserFactory()
-
-    client = APIClient()
-    client.force_login(user)
-
-    document = factories.DocumentFactory(link_reach="public", link_role="editor")
-
-    url = f"/api/v1.0/documents/{document.id!s}/ai-transform/"
-    response = client.post(url, {"text": " ", "action": "prompt"})
-
-    assert response.status_code == 400
-    assert response.json() == {"text": ["This field may not be blank."]}
-
-
-def test_api_documents_ai_transform_invalid_action():
-    """The action should valid when requesting AI transform."""
-    user = factories.UserFactory()
-
-    client = APIClient()
-    client.force_login(user)
-
-    document = factories.DocumentFactory(link_reach="public", link_role="editor")
-
-    url = f"/api/v1.0/documents/{document.id!s}/ai-transform/"
-    response = client.post(url, {"text": "Hello", "action": "invalid"})
-
-    assert response.status_code == 400
-    assert response.json() == {"action": ['"invalid" is not a valid choice.']}
-
-
-@override_settings(AI_DOCUMENT_RATE_THROTTLE_RATES={"minute": 3, "hour": 6, "day": 10})
-@pytest.mark.usefixtures("ai_settings")
-@patch("openai.resources.chat.completions.Completions.create")
-def test_api_documents_ai_transform_throttling_document(mock_create):
-    """
-    Throttling per document should be triggered on the AI transform endpoint.
-    For full throttle class test see: `test_api_utils_ai_document_rate_throttles`
-    """
-    client = APIClient()
-    document = factories.DocumentFactory(link_reach="public", link_role="editor")
-
-    answer = '{"answer": "Salut"}'
-    mock_create.return_value = MagicMock(
-        choices=[MagicMock(message=MagicMock(content=answer))]
-    )
-
-    url = f"/api/v1.0/documents/{document.id!s}/ai-transform/"
-    for _ in range(3):
-        user = factories.UserFactory()
-        client.force_login(user)
-        response = client.post(url, {"text": "Hello", "action": "summarize"})
-        assert response.status_code == 200
-        assert response.json() == {"answer": "Salut"}
-
-    user = factories.UserFactory()
-    client.force_login(user)
-    response = client.post(url, {"text": "Hello", "action": "summarize"})
-
-    assert response.status_code == 429
-    assert response.json() == {
-        "detail": "Request was throttled. Expected available in 60 seconds."
-    }
-
-
-@override_settings(AI_USER_RATE_THROTTLE_RATES={"minute": 3, "hour": 6, "day": 10})
-@pytest.mark.usefixtures("ai_settings")
-@patch("openai.resources.chat.completions.Completions.create")
-def test_api_documents_ai_transform_throttling_user(mock_create):
-    """
-    Throttling per user should be triggered on the AI transform endpoint.
-    For full throttle class test see: `test_api_utils_ai_user_rate_throttles`
-    """
-    user = factories.UserFactory()
-    client = APIClient()
-    client.force_login(user)
-
-    answer = '{"answer": "Salut"}'
-    mock_create.return_value = MagicMock(
-        choices=[MagicMock(message=MagicMock(content=answer))]
-    )
-
-    for _ in range(3):
-        document = factories.DocumentFactory(link_reach="public", link_role="editor")
-        url = f"/api/v1.0/documents/{document.id!s}/ai-transform/"
-        response = client.post(url, {"text": "Hello", "action": "summarize"})
-        assert response.status_code == 200
-        assert response.json() == {"answer": "Salut"}
-
-    document = factories.DocumentFactory(link_reach="public", link_role="editor")
-    url = f"/api/v1.0/documents/{document.id!s}/ai-transform/"
-    response = client.post(url, {"text": "Hello", "action": "summarize"})
-
-    assert response.status_code == 429
-    assert response.json() == {
-        "detail": "Request was throttled. Expected available in 60 seconds."
-    }

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

@@ -1,370 +0,0 @@
-"""
-Test AI translate API endpoint for users in impress's core app.
-"""
-
-from unittest.mock import MagicMock, patch
-
-from django.core.cache import cache
-from django.test import override_settings
-
-import pytest
-from rest_framework.test import APIClient
-
-from core import factories
-from core.tests.conftest import TEAM, USER, VIA
-
-pytestmark = pytest.mark.django_db
-
-
-@pytest.fixture(autouse=True)
-def clear_cache():
-    """Fixture to clear the cache before each test."""
-    cache.clear()
-
-
-@pytest.fixture
-def ai_settings():
-    """Fixture to set AI settings."""
-    with override_settings(
-        AI_BASE_URL="http://example.com", AI_API_KEY="test-key", AI_MODEL="llama"
-    ):
-        yield
-
-
-def test_api_documents_ai_translate_viewset_options_metadata():
-    """The documents endpoint should give us the list of available languages."""
-    user = factories.UserFactory()
-
-    client = APIClient()
-    client.force_login(user)
-
-    factories.DocumentFactory(link_reach="public", link_role="editor")
-
-    response = APIClient().options("/api/v1.0/documents/")
-
-    assert response.status_code == 200
-    metadata = response.json()
-    assert metadata["name"] == "Document List"
-    assert metadata["actions"]["POST"]["language"]["choices"][0] == {
-        "value": "af",
-        "display_name": "Afrikaans",
-    }
-
-
-@pytest.mark.parametrize(
-    "reach, role",
-    [
-        ("restricted", "reader"),
-        ("restricted", "editor"),
-        ("authenticated", "reader"),
-        ("authenticated", "editor"),
-        ("public", "reader"),
-    ],
-)
-def test_api_documents_ai_translate_anonymous_forbidden(reach, role):
-    """
-    Anonymous users should not be able to request AI translate if the link reach
-    and role don't allow it.
-    """
-    document = factories.DocumentFactory(link_reach=reach, link_role=role)
-
-    url = f"/api/v1.0/documents/{document.id!s}/ai-translate/"
-    response = APIClient().post(url, {"text": "hello", "language": "es"})
-
-    assert response.status_code == 401
-    assert response.json() == {
-        "detail": "Authentication credentials were not provided."
-    }
-
-
-@pytest.mark.usefixtures("ai_settings")
-@patch("openai.resources.chat.completions.Completions.create")
-def test_api_documents_ai_translate_anonymous_success(mock_create):
-    """
-    Anonymous users should be able to request AI translate to a document
-    if the link reach and role permit it.
-    """
-    document = factories.DocumentFactory(link_reach="public", link_role="editor")
-
-    answer = '{"answer": "Salut"}'
-    mock_create.return_value = MagicMock(
-        choices=[MagicMock(message=MagicMock(content=answer))]
-    )
-
-    url = f"/api/v1.0/documents/{document.id!s}/ai-translate/"
-    response = APIClient().post(url, {"text": "Hello", "language": "es"})
-
-    assert response.status_code == 200
-    assert response.json() == {"answer": "Salut"}
-    mock_create.assert_called_once_with(
-        model="llama",
-        response_format={"type": "json_object"},
-        messages=[
-            {
-                "role": "system",
-                "content": (
-                    "Translate the markdown text to Spanish, preserving markdown formatting. "
-                    'Return JSON: {"answer": "your translated markdown text in Spanish"}. '
-                    "Do not provide any other information."
-                ),
-            },
-            {"role": "user", "content": '{"markdown_input": "Hello"}'},
-        ],
-    )
-
-
-@pytest.mark.parametrize(
-    "reach, role",
-    [
-        ("restricted", "reader"),
-        ("restricted", "editor"),
-        ("authenticated", "reader"),
-        ("public", "reader"),
-    ],
-)
-def test_api_documents_ai_translate_authenticated_forbidden(reach, role):
-    """
-    Users who are not related to a document can't request AI translate if the
-    link reach and role don't allow it.
-    """
-    user = factories.UserFactory()
-
-    client = APIClient()
-    client.force_login(user)
-
-    document = factories.DocumentFactory(link_reach=reach, link_role=role)
-
-    url = f"/api/v1.0/documents/{document.id!s}/ai-translate/"
-    response = client.post(url, {"text": "Hello", "language": "es"})
-
-    assert response.status_code == 403
-    assert response.json() == {
-        "detail": "You do not have permission to perform this action."
-    }
-
-
-@pytest.mark.parametrize(
-    "reach, role",
-    [
-        ("authenticated", "editor"),
-        ("public", "editor"),
-    ],
-)
-@pytest.mark.usefixtures("ai_settings")
-@patch("openai.resources.chat.completions.Completions.create")
-def test_api_documents_ai_translate_authenticated_success(mock_create, reach, role):
-    """
-    Autenticated who are not related to a document should be able to request AI translate
-    if the link reach and role permit it.
-    """
-    user = factories.UserFactory()
-
-    client = APIClient()
-    client.force_login(user)
-
-    document = factories.DocumentFactory(link_reach=reach, link_role=role)
-
-    answer = '{"answer": "Salut"}'
-    mock_create.return_value = MagicMock(
-        choices=[MagicMock(message=MagicMock(content=answer))]
-    )
-
-    url = f"/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",
-        response_format={"type": "json_object"},
-        messages=[
-            {
-                "role": "system",
-                "content": (
-                    "Translate the markdown text to Colombian Spanish, "
-                    "preserving markdown formatting. Return JSON: "
-                    '{"answer": "your translated markdown text in Colombian Spanish"}. '
-                    "Do not provide any other information."
-                ),
-            },
-            {"role": "user", "content": '{"markdown_input": "Hello"}'},
-        ],
-    )
-
-
-@pytest.mark.parametrize("via", VIA)
-def test_api_documents_ai_translate_reader(via, mock_user_teams):
-    """
-    Users who are simple readers on a document should not be allowed to request AI translate.
-    """
-    user = factories.UserFactory()
-
-    client = APIClient()
-    client.force_login(user)
-
-    document = factories.DocumentFactory(link_role="reader")
-    if via == USER:
-        factories.UserDocumentAccessFactory(document=document, user=user, role="reader")
-    elif via == TEAM:
-        mock_user_teams.return_value = ["lasuite", "unknown"]
-        factories.TeamDocumentAccessFactory(
-            document=document, team="lasuite", role="reader"
-        )
-
-    url = f"/api/v1.0/documents/{document.id!s}/ai-translate/"
-    response = client.post(url, {"text": "Hello", "language": "es"})
-
-    assert response.status_code == 403
-    assert response.json() == {
-        "detail": "You do not have permission to perform this action."
-    }
-
-
-@pytest.mark.parametrize("role", ["editor", "administrator", "owner"])
-@pytest.mark.parametrize("via", VIA)
-@pytest.mark.usefixtures("ai_settings")
-@patch("openai.resources.chat.completions.Completions.create")
-def test_api_documents_ai_translate_success(mock_create, via, role, mock_user_teams):
-    """
-    Editors, administrators and owners of a document should be able to request AI translate.
-    """
-    user = factories.UserFactory()
-
-    client = APIClient()
-    client.force_login(user)
-
-    document = factories.DocumentFactory()
-    if via == USER:
-        factories.UserDocumentAccessFactory(document=document, user=user, role=role)
-    elif via == TEAM:
-        mock_user_teams.return_value = ["lasuite", "unknown"]
-        factories.TeamDocumentAccessFactory(
-            document=document, team="lasuite", role=role
-        )
-
-    answer = '{"answer": "Salut"}'
-    mock_create.return_value = MagicMock(
-        choices=[MagicMock(message=MagicMock(content=answer))]
-    )
-
-    url = f"/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",
-        response_format={"type": "json_object"},
-        messages=[
-            {
-                "role": "system",
-                "content": (
-                    "Translate the markdown text to Colombian Spanish, "
-                    "preserving markdown formatting. Return JSON: "
-                    '{"answer": "your translated markdown text in Colombian Spanish"}. '
-                    "Do not provide any other information."
-                ),
-            },
-            {"role": "user", "content": '{"markdown_input": "Hello"}'},
-        ],
-    )
-
-
-def test_api_documents_ai_translate_empty_text():
-    """The text should not be empty when requesting AI translate."""
-    user = factories.UserFactory()
-
-    client = APIClient()
-    client.force_login(user)
-
-    document = factories.DocumentFactory(link_reach="public", link_role="editor")
-
-    url = f"/api/v1.0/documents/{document.id!s}/ai-translate/"
-    response = client.post(url, {"text": " ", "language": "es"})
-
-    assert response.status_code == 400
-    assert response.json() == {"text": ["This field may not be blank."]}
-
-
-def test_api_documents_ai_translate_invalid_action():
-    """The action should valid when requesting AI translate."""
-    user = factories.UserFactory()
-
-    client = APIClient()
-    client.force_login(user)
-
-    document = factories.DocumentFactory(link_reach="public", link_role="editor")
-
-    url = f"/api/v1.0/documents/{document.id!s}/ai-translate/"
-    response = client.post(url, {"text": "Hello", "language": "invalid"})
-
-    assert response.status_code == 400
-    assert response.json() == {"language": ['"invalid" is not a valid choice.']}
-
-
-@override_settings(AI_DOCUMENT_RATE_THROTTLE_RATES={"minute": 3, "hour": 6, "day": 10})
-@pytest.mark.usefixtures("ai_settings")
-@patch("openai.resources.chat.completions.Completions.create")
-def test_api_documents_ai_translate_throttling_document(mock_create):
-    """
-    Throttling per document should be triggered on the AI translate endpoint.
-    For full throttle class test see: `test_api_utils_ai_document_rate_throttles`
-    """
-    client = APIClient()
-    document = factories.DocumentFactory(link_reach="public", link_role="editor")
-
-    answer = '{"answer": "Salut"}'
-    mock_create.return_value = MagicMock(
-        choices=[MagicMock(message=MagicMock(content=answer))]
-    )
-
-    url = f"/api/v1.0/documents/{document.id!s}/ai-translate/"
-    for _ in range(3):
-        user = factories.UserFactory()
-        client.force_login(user)
-        response = client.post(url, {"text": "Hello", "language": "es"})
-        assert response.status_code == 200
-        assert response.json() == {"answer": "Salut"}
-
-    user = factories.UserFactory()
-    client.force_login(user)
-    response = client.post(url, {"text": "Hello", "language": "es"})
-
-    assert response.status_code == 429
-    assert response.json() == {
-        "detail": "Request was throttled. Expected available in 60 seconds."
-    }
-
-
-@override_settings(AI_USER_RATE_THROTTLE_RATES={"minute": 3, "hour": 6, "day": 10})
-@pytest.mark.usefixtures("ai_settings")
-@patch("openai.resources.chat.completions.Completions.create")
-def test_api_documents_ai_translate_throttling_user(mock_create):
-    """
-    Throttling per user should be triggered on the AI translate endpoint.
-    For full throttle class test see: `test_api_utils_ai_user_rate_throttles`
-    """
-    user = factories.UserFactory()
-    client = APIClient()
-    client.force_login(user)
-
-    answer = '{"answer": "Salut"}'
-    mock_create.return_value = MagicMock(
-        choices=[MagicMock(message=MagicMock(content=answer))]
-    )
-
-    for _ in range(3):
-        document = factories.DocumentFactory(link_reach="public", link_role="editor")
-        url = f"/api/v1.0/documents/{document.id!s}/ai-translate/"
-        response = client.post(url, {"text": "Hello", "language": "es"})
-        assert response.status_code == 200
-        assert response.json() == {"answer": "Salut"}
-
-    document = factories.DocumentFactory(link_reach="public", link_role="editor")
-    url = f"/api/v1.0/documents/{document.id!s}/ai-translate/"
-    response = client.post(url, {"text": "Hello", "language": "es"})
-
-    assert response.status_code == 429
-    assert response.json() == {
-        "detail": "Request was throttled. Expected available in 60 seconds."
-    }

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

@@ -5,7 +5,7 @@ Test file uploads API endpoint for users in impress's core app.
 import re
 import uuid
 
-from django.core.files.storage import default_storage
+from django.core.files.base import ContentFile
 from django.core.files.uploadedfile import SimpleUploadedFile
 
 import pytest
@@ -16,12 +16,6 @@ from core.tests.conftest import TEAM, USER, VIA
 
 pytestmark = pytest.mark.django_db
 
-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"
-)
-
 
 @pytest.mark.parametrize(
     "reach, role",
@@ -39,7 +33,7 @@ def test_api_documents_attachment_upload_anonymous_forbidden(reach, role):
     and role don't allow it.
     """
     document = factories.DocumentFactory(link_reach=reach, link_role=role)
-    file = SimpleUploadedFile(name="test.png", content=PIXEL, content_type="image/png")
+    file = SimpleUploadedFile("test_file.jpg", b"Dummy content")
 
     url = f"/api/v1.0/documents/{document.id!s}/attachment-upload/"
     response = APIClient().post(url, {"file": file}, format="multipart")
@@ -56,30 +50,20 @@ def test_api_documents_attachment_upload_anonymous_success():
     if the link reach and role permit it.
     """
     document = factories.DocumentFactory(link_reach="public", link_role="editor")
-    file = SimpleUploadedFile(name="test.png", content=PIXEL, content_type="image/png")
+    file = SimpleUploadedFile("test_file.jpg", b"Dummy content")
 
     url = f"/api/v1.0/documents/{document.id!s}/attachment-upload/"
     response = APIClient().post(url, {"file": file}, format="multipart")
 
     assert response.status_code == 201
 
-    pattern = re.compile(rf"^/media/{document.id!s}/attachments/(.*)\.png")
-    file_path = response.json()["file"]
-    match = pattern.search(file_path)
+    pattern = re.compile(rf"^/media/{document.id!s}/attachments/(.*)\.jpg")
+    match = pattern.search(response.json()["file"])
     file_id = match.group(1)
 
     # Validate that file_id is a valid UUID
     uuid.UUID(file_id)
 
-    # Now, check the metadata of the uploaded file
-    key = file_path.replace("/media", "")
-    file_head = default_storage.connection.meta.client.head_object(
-        Bucket=default_storage.bucket_name, Key=key
-    )
-
-    assert file_head["Metadata"] == {"owner": "None"}
-    assert file_head["ContentType"] == "image/png"
-
 
 @pytest.mark.parametrize(
     "reach, role",
@@ -95,13 +79,13 @@ def test_api_documents_attachment_upload_authenticated_forbidden(reach, role):
     Users who are not related to a document can't upload attachments if the
     link reach and role don't allow it.
     """
-    user = factories.UserFactory(with_owned_document=True)
+    user = factories.UserFactory()
 
     client = APIClient()
     client.force_login(user)
 
     document = factories.DocumentFactory(link_reach=reach, link_role=role)
-    file = SimpleUploadedFile(name="test.png", content=PIXEL, content_type="image/png")
+    file = SimpleUploadedFile("test_file.jpg", b"Dummy content")
 
     url = f"/api/v1.0/documents/{document.id!s}/attachment-upload/"
     response = client.post(url, {"file": file}, format="multipart")
@@ -130,14 +114,14 @@ def test_api_documents_attachment_upload_authenticated_success(reach, role):
     client.force_login(user)
 
     document = factories.DocumentFactory(link_reach=reach, link_role=role)
-    file = SimpleUploadedFile(name="test.png", content=PIXEL, content_type="image/png")
+    file = SimpleUploadedFile("test_file.jpg", b"Dummy content")
 
     url = f"/api/v1.0/documents/{document.id!s}/attachment-upload/"
     response = client.post(url, {"file": file}, format="multipart")
 
     assert response.status_code == 201
 
-    pattern = re.compile(rf"^/media/{document.id!s}/attachments/(.*)\.png")
+    pattern = re.compile(rf"^/media/{document.id!s}/attachments/(.*)\.jpg")
     match = pattern.search(response.json()["file"])
     file_id = match.group(1)
 
@@ -150,7 +134,7 @@ def test_api_documents_attachment_upload_reader(via, mock_user_teams):
     """
     Users who are simple readers on a document should not be allowed to upload an attachment.
     """
-    user = factories.UserFactory(with_owned_document=True)
+    user = factories.UserFactory()
 
     client = APIClient()
     client.force_login(user)
@@ -164,7 +148,7 @@ def test_api_documents_attachment_upload_reader(via, mock_user_teams):
             document=document, team="lasuite", role="reader"
         )
 
-    file = SimpleUploadedFile(name="test.png", content=PIXEL, content_type="image/png")
+    file = SimpleUploadedFile("test_file.jpg", b"Dummy content")
 
     url = f"/api/v1.0/documents/{document.id!s}/attachment-upload/"
     response = client.post(url, {"file": file}, format="multipart")
@@ -195,29 +179,20 @@ def test_api_documents_attachment_upload_success(via, role, mock_user_teams):
             document=document, team="lasuite", role=role
         )
 
-    file = SimpleUploadedFile(name="test.png", content=PIXEL, content_type="image/png")
+    file = SimpleUploadedFile("test_file.jpg", b"Dummy content")
 
     url = f"/api/v1.0/documents/{document.id!s}/attachment-upload/"
     response = client.post(url, {"file": file}, format="multipart")
 
     assert response.status_code == 201
 
-    file_path = response.json()["file"]
-    pattern = re.compile(rf"^/media/{document.id!s}/attachments/(.*)\.png")
-    match = pattern.search(file_path)
+    pattern = re.compile(rf"^/media/{document.id!s}/attachments/(.*)\.jpg")
+    match = pattern.search(response.json()["file"])
     file_id = match.group(1)
 
     # Validate that file_id is a valid UUID
     uuid.UUID(file_id)
 
-    # Now, check the metadata of the uploaded file
-    key = file_path.replace("/media", "")
-    file_head = default_storage.connection.meta.client.head_object(
-        Bucket=default_storage.bucket_name, Key=key
-    )
-    assert file_head["Metadata"] == {"owner": str(user.id)}
-    assert file_head["ContentType"] == "image/png"
-
 
 def test_api_documents_attachment_upload_invalid(client):
     """Attempt to upload without a file should return an explicit error."""
@@ -247,9 +222,8 @@ def test_api_documents_attachment_upload_size_limit_exceeded(settings):
     url = f"/api/v1.0/documents/{document.id!s}/attachment-upload/"
 
     # Create a temporary file larger than the allowed size
-    file = SimpleUploadedFile(
-        name="test.txt", content=b"a" * (1048576 + 1), content_type="text/plain"
-    )
+    content = b"a" * (1048576 + 1)
+    file = ContentFile(content, name="test.jpg")
 
     response = client.post(url, {"file": file}, format="multipart")
 
@@ -257,23 +231,10 @@ def test_api_documents_attachment_upload_size_limit_exceeded(settings):
     assert response.json() == {"file": ["File size exceeds the maximum limit of 1 MB."]}
 
 
-@pytest.mark.parametrize(
-    "name,content,extension,content_type",
-    [
-        ("test.exe", b"text", "exe", "text/plain"),
-        ("test", b"text", "txt", "text/plain"),
-        ("test.aaaaaa", b"test", "txt", "text/plain"),
-        ("test.txt", PIXEL, "txt", "image/png"),
-        ("test.py", b"#!/usr/bin/python", "py", "text/plain"),
-    ],
-)
-def test_api_documents_attachment_upload_fix_extension(
-    name, content, extension, content_type
-):
-    """
-    A file with no extension or a wrong extension is accepted and the extension
-    is corrected in storage.
-    """
+def test_api_documents_attachment_upload_type_not_allowed(settings):
+    """The uploaded file should be of a whitelisted type."""
+    settings.DOCUMENT_IMAGE_ALLOWED_MIME_TYPES = ["image/jpeg", "image/png"]
+
     user = factories.UserFactory()
     client = APIClient()
     client.force_login(user)
@@ -281,72 +242,14 @@ def test_api_documents_attachment_upload_fix_extension(
     document = factories.DocumentFactory(users=[(user, "owner")])
     url = f"/api/v1.0/documents/{document.id!s}/attachment-upload/"
 
-    file = SimpleUploadedFile(name=name, content=content)
-    response = client.post(url, {"file": file}, format="multipart")
+    # Create a temporary file with a not allowed type (e.g., text file)
+    file = ContentFile(b"a" * 1048576, name="test.txt")
 
-    assert response.status_code == 201
-
-    file_path = response.json()["file"]
-    pattern = re.compile(rf"^/media/{document.id!s}/attachments/(.*)\.{extension:s}")
-    match = pattern.search(file_path)
-    file_id = match.group(1)
-
-    # Validate that file_id is a valid UUID
-    uuid.UUID(file_id)
-
-    # Now, check the metadata of the uploaded file
-    key = file_path.replace("/media", "")
-    file_head = default_storage.connection.meta.client.head_object(
-        Bucket=default_storage.bucket_name, Key=key
-    )
-    assert file_head["Metadata"] == {"owner": str(user.id), "is_unsafe": "true"}
-    assert file_head["ContentType"] == content_type
-
-
-def test_api_documents_attachment_upload_empty_file():
-    """An empty file should be rejected."""
-    user = factories.UserFactory()
-    client = APIClient()
-    client.force_login(user)
-
-    document = factories.DocumentFactory(users=[(user, "owner")])
-    url = f"/api/v1.0/documents/{document.id!s}/attachment-upload/"
-
-    file = SimpleUploadedFile(name="test.png", content=b"")
     response = client.post(url, {"file": file}, format="multipart")
 
     assert response.status_code == 400
-    assert response.json() == {"file": ["The submitted file is empty."]}
-
-
-def test_api_documents_attachment_upload_unsafe():
-    """A file with an unsafe mime type should be tagged as such."""
-    user = factories.UserFactory()
-    client = APIClient()
-    client.force_login(user)
-
-    document = factories.DocumentFactory(users=[(user, "owner")])
-    url = f"/api/v1.0/documents/{document.id!s}/attachment-upload/"
-
-    file = SimpleUploadedFile(
-        name="script.exe", content=b"\x4d\x5a\x90\x00\x03\x00\x00\x00"
-    )
-    response = client.post(url, {"file": file}, format="multipart")
-
-    assert response.status_code == 201
-
-    file_path = response.json()["file"]
-    pattern = re.compile(rf"^/media/{document.id!s}/attachments/(.*)\.exe")
-    match = pattern.search(file_path)
-    file_id = match.group(1)
-
-    # Validate that file_id is a valid UUID
-    uuid.UUID(file_id)
-
-    # Now, check the metadata of the uploaded file
-    key = file_path.replace("/media", "")
-    file_head = default_storage.connection.meta.client.head_object(
-        Bucket=default_storage.bucket_name, Key=key
-    )
-    assert file_head["Metadata"] == {"owner": str(user.id), "is_unsafe": "true"}
-    assert file_head["ContentType"] == "application/octet-stream"
+    assert response.json() == {
+        "file": [
+            "File type 'text/plain' is not allowed. Allowed types are: image/jpeg, image/png"
+        ]
+    }

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

@@ -47,7 +47,6 @@ def test_api_documents_create_authenticated_success():
     assert response.status_code == 201
     document = Document.objects.get()
     assert document.title == "my document"
-    assert document.link_reach == "restricted"
     assert document.accesses.filter(role="owner", user=user).exists()
 
 

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

@@ -1,575 +0,0 @@
-"""
-Tests for Documents API endpoint in impress's core app: create
-"""
-
-# pylint: disable=W0621
-
-from unittest.mock import patch
-
-from django.core import mail
-from django.test import override_settings
-
-import pytest
-from rest_framework.test import APIClient
-
-from core import factories
-from core.api.serializers import ServerCreateDocumentSerializer
-from core.models import Document, Invitation, User
-from core.services.converter_services import ConversionError, YdocConverter
-
-pytestmark = pytest.mark.django_db
-
-
-@pytest.fixture
-def mock_convert_md():
-    """Mock YdocConverter.convert_markdown to return a converted content."""
-    with patch.object(
-        YdocConverter,
-        "convert_markdown",
-        return_value="Converted document content",
-    ) as mock:
-        yield mock
-
-
-def test_api_documents_create_for_owner_missing_token():
-    """Requests with no token should not be allowed to create documents for owner."""
-    data = {
-        "title": "My Document",
-        "content": "Document content",
-        "sub": "123",
-        "email": "john.doe@example.com",
-    }
-
-    response = APIClient().post(
-        "/api/v1.0/documents/create-for-owner/", data, format="json"
-    )
-
-    assert response.status_code == 401
-    assert not Document.objects.exists()
-
-
-@override_settings(SERVER_TO_SERVER_API_TOKENS=["DummyToken"])
-def test_api_documents_create_for_owner_invalid_token():
-    """Requests with an invalid token should not be allowed to create documents for owner."""
-    data = {
-        "title": "My Document",
-        "content": "Document content",
-        "sub": "123",
-        "email": "john.doe@example.com",
-        "language": "fr",
-    }
-
-    response = APIClient().post(
-        "/api/v1.0/documents/create-for-owner/",
-        data,
-        format="json",
-        HTTP_AUTHORIZATION="Bearer InvalidToken",
-    )
-
-    assert response.status_code == 401
-    assert not Document.objects.exists()
-
-
-def test_api_documents_create_for_owner_authenticated_forbidden():
-    """
-    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(
-        "/api/v1.0/documents/create-for-owner/",
-        data,
-        format="json",
-    )
-
-    assert response.status_code == 401
-    assert not Document.objects.exists()
-
-
-@override_settings(SERVER_TO_SERVER_API_TOKENS=["DummyToken"])
-def test_api_documents_create_for_owner_missing_sub():
-    """Requests with no sub should not be allowed to create documents for owner."""
-    data = {
-        "title": "My Document",
-        "content": "Document content",
-        "email": "john.doe@example.com",
-    }
-
-    response = APIClient().post(
-        "/api/v1.0/documents/create-for-owner/",
-        data,
-        format="json",
-        HTTP_AUTHORIZATION="Bearer DummyToken",
-    )
-
-    assert response.status_code == 400
-    assert not Document.objects.exists()
-
-    assert response.json() == {"sub": ["This field is required."]}
-
-
-@override_settings(SERVER_TO_SERVER_API_TOKENS=["DummyToken"])
-def test_api_documents_create_for_owner_missing_email():
-    """Requests with no email should not be allowed to create documents for owner."""
-    data = {
-        "title": "My Document",
-        "content": "Document content",
-        "sub": "123",
-    }
-
-    response = APIClient().post(
-        "/api/v1.0/documents/create-for-owner/",
-        data,
-        format="json",
-        HTTP_AUTHORIZATION="Bearer DummyToken",
-    )
-
-    assert response.status_code == 400
-    assert not Document.objects.exists()
-
-    assert response.json() == {"email": ["This field is required."]}
-
-
-@override_settings(SERVER_TO_SERVER_API_TOKENS=["DummyToken"])
-def test_api_documents_create_for_owner_invalid_sub():
-    """Requests with an invalid sub should not be allowed to create documents for owner."""
-    data = {
-        "title": "My Document",
-        "content": "Document content",
-        "sub": "123!!",
-        "email": "john.doe@example.com",
-    }
-
-    response = APIClient().post(
-        "/api/v1.0/documents/create-for-owner/",
-        data,
-        format="json",
-        HTTP_AUTHORIZATION="Bearer DummyToken",
-    )
-
-    assert response.status_code == 400
-    assert not Document.objects.exists()
-
-    assert response.json() == {
-        "sub": [
-            "Enter a valid sub. This value may contain only letters, "
-            "numbers, and @/./+/-/_/: characters."
-        ]
-    }
-
-
-@override_settings(SERVER_TO_SERVER_API_TOKENS=["DummyToken"])
-def test_api_documents_create_for_owner_existing(mock_convert_md):
-    """
-    It should be possible to create a document on behalf of a pre-existing user
-    by passing their sub and email.
-    """
-    user = factories.UserFactory(language="en-us")
-
-    data = {
-        "title": "My Document",
-        "content": "Document content",
-        "sub": str(user.sub),
-        "email": "irrelevant@example.com",  # Should be ignored since the user already exists
-    }
-
-    response = APIClient().post(
-        "/api/v1.0/documents/create-for-owner/",
-        data,
-        format="json",
-        HTTP_AUTHORIZATION="Bearer DummyToken",
-    )
-
-    assert response.status_code == 201
-
-    mock_convert_md.assert_called_once_with("Document content")
-
-    document = Document.objects.get()
-    assert response.json() == {"id": str(document.id)}
-
-    assert document.title == "My Document"
-    assert document.content == "Converted document content"
-    assert document.creator == user
-    assert document.accesses.filter(user=user, role="owner").exists()
-
-    assert Invitation.objects.exists() is False
-
-    assert len(mail.outbox) == 1
-    email = mail.outbox[0]
-    assert email.to == [user.email]
-    assert email.subject == "A new document was created on your behalf!"
-    email_content = " ".join(email.body.split())
-    assert "A new document was created on your behalf!" in email_content
-    assert (
-        "You have been granted ownership of a new document: My Document"
-    ) in email_content
-
-
-@override_settings(SERVER_TO_SERVER_API_TOKENS=["DummyToken"])
-def test_api_documents_create_for_owner_new_user(mock_convert_md):
-    """
-    It should be possible to create a document on behalf of new users by
-    passing their unknown sub and email address.
-    """
-    data = {
-        "title": "My Document",
-        "content": "Document content",
-        "sub": "123",
-        "email": "john.doe@example.com",  # Should be used to create a new user
-    }
-
-    response = APIClient().post(
-        "/api/v1.0/documents/create-for-owner/",
-        data,
-        format="json",
-        HTTP_AUTHORIZATION="Bearer DummyToken",
-    )
-
-    assert response.status_code == 201
-
-    mock_convert_md.assert_called_once_with("Document content")
-
-    document = Document.objects.get()
-    assert response.json() == {"id": str(document.id)}
-
-    assert document.title == "My Document"
-    assert document.content == "Converted document content"
-    assert document.creator is None
-    assert document.accesses.exists() is False
-
-    invitation = Invitation.objects.get()
-    assert invitation.email == "john.doe@example.com"
-    assert invitation.role == "owner"
-
-    assert len(mail.outbox) == 1
-    email = mail.outbox[0]
-    assert email.to == ["john.doe@example.com"]
-    assert email.subject == "A new document was created on your behalf!"
-    email_content = " ".join(email.body.split())
-    assert "A new document was created on your behalf!" in email_content
-    assert (
-        "You have been granted ownership of a new document: My Document"
-    ) in email_content
-
-    # The creator field on the document should be set when the user is created
-    user = User.objects.create(email="john.doe@example.com", password="!")
-    document.refresh_from_db()
-    assert document.creator == user
-
-
-@override_settings(
-    SERVER_TO_SERVER_API_TOKENS=["DummyToken"],
-    OIDC_FALLBACK_TO_EMAIL_FOR_IDENTIFICATION=True,
-)
-def test_api_documents_create_for_owner_existing_user_email_no_sub_with_fallback(
-    mock_convert_md,
-):
-    """
-    It should be possible to create a document on behalf of a pre-existing user for
-    who the sub was not found if the settings allow it. This edge case should not
-    happen in a healthy OIDC federation but can be usefull if an OIDC provider modifies
-    users sub on each login for example...
-    """
-    user = factories.UserFactory(language="en-us")
-
-    data = {
-        "title": "My Document",
-        "content": "Document content",
-        "sub": "123",
-        "email": user.email,
-    }
-
-    response = APIClient().post(
-        "/api/v1.0/documents/create-for-owner/",
-        data,
-        format="json",
-        HTTP_AUTHORIZATION="Bearer DummyToken",
-    )
-
-    assert response.status_code == 201
-
-    mock_convert_md.assert_called_once_with("Document content")
-
-    document = Document.objects.get()
-    assert response.json() == {"id": str(document.id)}
-
-    assert document.title == "My Document"
-    assert document.content == "Converted document content"
-    assert document.creator == user
-    assert document.accesses.filter(user=user, role="owner").exists()
-
-    assert Invitation.objects.exists() is False
-
-    assert len(mail.outbox) == 1
-    email = mail.outbox[0]
-    assert email.to == [user.email]
-    assert email.subject == "A new document was created on your behalf!"
-    email_content = " ".join(email.body.split())
-    assert "A new document was created on your behalf!" in email_content
-    assert (
-        "You have been granted ownership of a new document: My Document"
-    ) in email_content
-
-
-@override_settings(
-    SERVER_TO_SERVER_API_TOKENS=["DummyToken"],
-    OIDC_FALLBACK_TO_EMAIL_FOR_IDENTIFICATION=False,
-    OIDC_ALLOW_DUPLICATE_EMAILS=False,
-)
-def test_api_documents_create_for_owner_existing_user_email_no_sub_no_fallback(
-    mock_convert_md,
-):
-    """
-    When a user does not match an existing sub and fallback to matching on email is
-    not allowed in settings, it should raise an error if the email is already used by
-    a registered user and duplicate emails are not allowed.
-    """
-    user = factories.UserFactory()
-
-    data = {
-        "title": "My Document",
-        "content": "Document content",
-        "sub": "123",
-        "email": user.email,
-    }
-
-    response = APIClient().post(
-        "/api/v1.0/documents/create-for-owner/",
-        data,
-        format="json",
-        HTTP_AUTHORIZATION="Bearer DummyToken",
-    )
-    assert response.status_code == 400
-    assert response.json() == {
-        "email": [
-            (
-                "We couldn't find a user with this sub but the email is already "
-                "associated with a registered user."
-            )
-        ]
-    }
-    assert mock_convert_md.called is False
-    assert Document.objects.exists() is False
-    assert Invitation.objects.exists() is False
-    assert len(mail.outbox) == 0
-
-
-@override_settings(
-    SERVER_TO_SERVER_API_TOKENS=["DummyToken"],
-    OIDC_FALLBACK_TO_EMAIL_FOR_IDENTIFICATION=False,
-    OIDC_ALLOW_DUPLICATE_EMAILS=True,
-)
-def test_api_documents_create_for_owner_new_user_no_sub_no_fallback_allow_duplicate(
-    mock_convert_md,
-):
-    """
-    When a user does not match an existing sub and fallback to matching on email is
-    not allowed in settings, it should be possible to create a new user with the same
-    email as an existing user if the settings allow it (identification is still done
-    via the sub in this case).
-    """
-    user = factories.UserFactory()
-
-    data = {
-        "title": "My Document",
-        "content": "Document content",
-        "sub": "123",
-        "email": user.email,
-    }
-
-    response = APIClient().post(
-        "/api/v1.0/documents/create-for-owner/",
-        data,
-        format="json",
-        HTTP_AUTHORIZATION="Bearer DummyToken",
-    )
-    assert response.status_code == 201
-    mock_convert_md.assert_called_once_with("Document content")
-
-    document = Document.objects.get()
-    assert response.json() == {"id": str(document.id)}
-
-    assert document.title == "My Document"
-    assert document.content == "Converted document content"
-    assert document.creator is None
-    assert document.accesses.exists() is False
-
-    invitation = Invitation.objects.get()
-    assert invitation.email == user.email
-    assert invitation.role == "owner"
-
-    assert len(mail.outbox) == 1
-    email = mail.outbox[0]
-    assert email.to == [user.email]
-    assert email.subject == "A new document was created on your behalf!"
-    email_content = " ".join(email.body.split())
-    assert "A new document was created on your behalf!" in email_content
-    assert (
-        "You have been granted ownership of a new document: My Document"
-    ) in email_content
-
-    # The creator field on the document should be set when the user is created
-    user = User.objects.create(email=user.email, password="!")
-    document.refresh_from_db()
-    assert document.creator == user
-
-
-@patch.object(ServerCreateDocumentSerializer, "_send_email_notification")
-@override_settings(SERVER_TO_SERVER_API_TOKENS=["DummyToken"], LANGUAGE_CODE="de-de")
-def test_api_documents_create_for_owner_with_default_language(
-    mock_send, mock_convert_md
-):
-    """The default language from settings should apply by default."""
-    data = {
-        "title": "My Document",
-        "content": "Document content",
-        "sub": "123",
-        "email": "john.doe@example.com",
-    }
-
-    response = APIClient().post(
-        "/api/v1.0/documents/create-for-owner/",
-        data,
-        format="json",
-        HTTP_AUTHORIZATION="Bearer DummyToken",
-    )
-    assert response.status_code == 201
-
-    mock_convert_md.assert_called_once_with("Document content")
-    assert mock_send.call_args[0][3] == "de-de"
-
-
-@override_settings(SERVER_TO_SERVER_API_TOKENS=["DummyToken"])
-def test_api_documents_create_for_owner_with_custom_language(mock_convert_md):
-    """
-    Test creating a document with a specific language.
-    Useful if the remote server knows the user's language.
-    """
-    data = {
-        "title": "My Document",
-        "content": "Document content",
-        "sub": "123",
-        "email": "john.doe@example.com",
-        "language": "fr-fr",
-    }
-
-    response = APIClient().post(
-        "/api/v1.0/documents/create-for-owner/",
-        data,
-        format="json",
-        HTTP_AUTHORIZATION="Bearer DummyToken",
-    )
-
-    assert response.status_code == 201
-
-    mock_convert_md.assert_called_once_with("Document content")
-
-    assert len(mail.outbox) == 1
-    email = mail.outbox[0]
-    assert email.to == ["john.doe@example.com"]
-    assert email.subject == "Un nouveau document a été créé pour vous !"
-    email_content = " ".join(email.body.split())
-    assert "Un nouveau document a été créé pour vous !" in email_content
-    assert (
-        "Vous avez été déclaré propriétaire d'un nouveau document : My Document"
-    ) in email_content
-
-
-@override_settings(SERVER_TO_SERVER_API_TOKENS=["DummyToken"])
-def test_api_documents_create_for_owner_with_custom_subject_and_message(
-    mock_convert_md,
-):
-    """It should be possible to customize the subject and message of the invitation email."""
-    data = {
-        "title": "My Document",
-        "content": "Document content",
-        "sub": "123",
-        "email": "john.doe@example.com",
-        "message": "mon message spécial",
-        "subject": "mon sujet spécial !",
-    }
-
-    response = APIClient().post(
-        "/api/v1.0/documents/create-for-owner/",
-        data,
-        format="json",
-        HTTP_AUTHORIZATION="Bearer DummyToken",
-    )
-
-    assert response.status_code == 201
-
-    mock_convert_md.assert_called_once_with("Document content")
-
-    assert len(mail.outbox) == 1
-    email = mail.outbox[0]
-    assert email.to == ["john.doe@example.com"]
-    assert email.subject == "Mon sujet spécial !"
-    email_content = " ".join(email.body.split())
-    assert "Mon sujet spécial !" in email_content
-    assert "Mon message spécial" in email_content
-
-
-@override_settings(SERVER_TO_SERVER_API_TOKENS=["DummyToken"])
-def test_api_documents_create_for_owner_with_converter_exception(
-    mock_convert_md,
-):
-    """In case of converter error, a 400 error should be raised."""
-
-    mock_convert_md.side_effect = ConversionError("Conversion failed")
-
-    data = {
-        "title": "My Document",
-        "content": "Document content",
-        "sub": "123",
-        "email": "john.doe@example.com",
-        "message": "mon message spécial",
-        "subject": "mon sujet spécial !",
-    }
-
-    response = APIClient().post(
-        "/api/v1.0/documents/create-for-owner/",
-        data,
-        format="json",
-        HTTP_AUTHORIZATION="Bearer DummyToken",
-    )
-    mock_convert_md.assert_called_once_with("Document content")
-
-    assert response.status_code == 400
-    assert response.json() == {"content": ["Could not convert content"]}
-
-
-@override_settings(SERVER_TO_SERVER_API_TOKENS=["DummyToken"])
-def test_api_documents_create_for_owner_with_empty_content():
-    """The content should not be empty or a 400 error should be raised."""
-
-    data = {
-        "title": "My Document",
-        "content": "  ",
-        "sub": "123",
-        "email": "john.doe@example.com",
-    }
-
-    response = APIClient().post(
-        "/api/v1.0/documents/create-for-owner/",
-        data,
-        format="json",
-        HTTP_AUTHORIZATION="Bearer DummyToken",
-    )
-
-    assert response.status_code == 400
-    assert response.json() == {
-        "content": [
-            "This field may not be blank.",
-        ],
-    }

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

@@ -30,7 +30,7 @@ def test_api_documents_delete_authenticated_unrelated(reach, role):
     Authenticated users should not be allowed to delete a document to which
     they are not related.
     """
-    user = factories.UserFactory(with_owned_document=True)
+    user = factories.UserFactory()
 
     client = APIClient()
     client.force_login(user)
@@ -42,7 +42,7 @@ def test_api_documents_delete_authenticated_unrelated(reach, role):
     )
 
     assert response.status_code == 403
-    assert models.Document.objects.count() == 2
+    assert models.Document.objects.count() == 1
 
 
 @pytest.mark.parametrize("role", ["reader", "editor", "administrator"])
@@ -52,7 +52,7 @@ def test_api_documents_delete_authenticated_not_owner(via, role, mock_user_teams
     Authenticated users should not be allowed to delete a document for which they are
     only a reader, editor or administrator.
     """
-    user = factories.UserFactory(with_owned_document=True)
+    user = factories.UserFactory()
 
     client = APIClient()
     client.force_login(user)
@@ -74,7 +74,7 @@ def test_api_documents_delete_authenticated_not_owner(via, role, mock_user_teams
     assert response.json() == {
         "detail": "You do not have permission to perform this action."
     }
-    assert models.Document.objects.count() == 2
+    assert models.Document.objects.count() == 1
 
 
 @pytest.mark.parametrize("via", VIA)

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

@@ -1,308 +0,0 @@
-"""Test favorite document API endpoint for users in impress's core app."""
-
-import pytest
-from rest_framework.test import APIClient
-
-from core import factories, models
-
-pytestmark = pytest.mark.django_db
-
-
-@pytest.mark.parametrize(
-    "reach",
-    [
-        "restricted",
-        "authenticated",
-        "public",
-    ],
-)
-@pytest.mark.parametrize("method", ["post", "delete"])
-def test_api_document_favorite_anonymous_user(method, reach):
-    """Anonymous users should not be able to mark/unmark documents as favorites."""
-    document = factories.DocumentFactory(link_reach=reach)
-
-    response = getattr(APIClient(), method)(
-        f"/api/v1.0/documents/{document.id!s}/favorite/"
-    )
-
-    assert response.status_code == 401
-    assert response.json() == {
-        "detail": "Authentication credentials were not provided."
-    }
-
-    # Verify in database
-    assert models.DocumentFavorite.objects.exists() is False
-
-
-@pytest.mark.parametrize(
-    "reach, has_role",
-    [
-        ["restricted", True],
-        ["authenticated", False],
-        ["authenticated", True],
-        ["public", False],
-        ["public", True],
-    ],
-)
-def test_api_document_favorite_authenticated_post_allowed(reach, has_role):
-    """Authenticated users should be able to mark a document as favorite using POST."""
-    user = factories.UserFactory()
-    document = factories.DocumentFactory(link_reach=reach)
-    client = APIClient()
-    client.force_login(user)
-
-    if has_role:
-        models.DocumentAccess.objects.create(document=document, user=user)
-
-    # Mark as favorite
-    response = client.post(f"/api/v1.0/documents/{document.id!s}/favorite/")
-
-    assert response.status_code == 201
-    assert response.json() == {"detail": "Document marked as favorite"}
-
-    # Verify in database
-    assert models.DocumentFavorite.objects.filter(document=document, user=user).exists()
-
-    # Verify document format
-    response = client.get(f"/api/v1.0/documents/{document.id!s}/")
-    assert response.json()["is_favorite"] is True
-
-
-def test_api_document_favorite_authenticated_post_forbidden():
-    """Authenticated users should be able to mark a document as favorite using POST."""
-    user = factories.UserFactory()
-    document = factories.DocumentFactory(link_reach="restricted")
-    client = APIClient()
-    client.force_login(user)
-
-    # Try marking as favorite
-    response = client.post(f"/api/v1.0/documents/{document.id!s}/favorite/")
-
-    assert response.status_code == 403
-    assert response.json() == {
-        "detail": "You do not have permission to perform this action."
-    }
-
-    # Verify in database
-    assert (
-        models.DocumentFavorite.objects.filter(document=document, user=user).exists()
-        is False
-    )
-
-
-@pytest.mark.parametrize(
-    "reach, has_role",
-    [
-        ["restricted", True],
-        ["authenticated", False],
-        ["authenticated", True],
-        ["public", False],
-        ["public", True],
-    ],
-)
-def test_api_document_favorite_authenticated_post_already_favorited_allowed(
-    reach, has_role
-):
-    """POST should not create duplicate favorites if already marked."""
-    user = factories.UserFactory()
-    document = factories.DocumentFactory(link_reach=reach, favorited_by=[user])
-    client = APIClient()
-    client.force_login(user)
-
-    if has_role:
-        models.DocumentAccess.objects.create(document=document, user=user)
-
-    # Try to mark as favorite again
-    response = client.post(f"/api/v1.0/documents/{document.id!s}/favorite/")
-
-    assert response.status_code == 200
-    assert response.json() == {"detail": "Document already marked as favorite"}
-
-    # Verify in database
-    assert models.DocumentFavorite.objects.filter(document=document, user=user).exists()
-
-    # Verify document format
-    response = client.get(f"/api/v1.0/documents/{document.id!s}/")
-    assert response.json()["is_favorite"] is True
-
-
-def test_api_document_favorite_authenticated_post_already_favorited_forbidden():
-    """POST should not create duplicate favorites if already marked."""
-    user = factories.UserFactory()
-    document = factories.DocumentFactory(link_reach="restricted", favorited_by=[user])
-    client = APIClient()
-    client.force_login(user)
-
-    # Try to mark as favorite again
-    response = client.post(f"/api/v1.0/documents/{document.id!s}/favorite/")
-
-    assert response.status_code == 403
-    assert response.json() == {
-        "detail": "You do not have permission to perform this action."
-    }
-
-    # Verify in database
-    assert models.DocumentFavorite.objects.filter(document=document, user=user).exists()
-
-
-@pytest.mark.parametrize(
-    "reach, has_role",
-    [
-        ["restricted", True],
-        ["authenticated", False],
-        ["authenticated", True],
-        ["public", False],
-        ["public", True],
-    ],
-)
-def test_api_document_favorite_authenticated_delete_allowed(reach, has_role):
-    """Authenticated users should be able to unmark a document as favorite using DELETE."""
-    user = factories.UserFactory()
-    document = factories.DocumentFactory(link_reach=reach, favorited_by=[user])
-    client = APIClient()
-    client.force_login(user)
-
-    if has_role:
-        models.DocumentAccess.objects.create(document=document, user=user)
-
-    # Unmark as favorite
-    response = client.delete(f"/api/v1.0/documents/{document.id!s}/favorite/")
-    assert response.status_code == 204
-
-    # Verify in database
-    assert (
-        models.DocumentFavorite.objects.filter(document=document, user=user).exists()
-        is False
-    )
-
-    # Verify document format
-    response = client.get(f"/api/v1.0/documents/{document.id!s}/")
-    assert response.json()["is_favorite"] is False
-
-
-def test_api_document_favorite_authenticated_delete_forbidden():
-    """Authenticated users should be able to unmark a document as favorite using DELETE."""
-    user = factories.UserFactory()
-    document = factories.DocumentFactory(link_reach="restricted", favorited_by=[user])
-    client = APIClient()
-    client.force_login(user)
-
-    # Unmark as favorite
-    response = client.delete(f"/api/v1.0/documents/{document.id!s}/favorite/")
-
-    assert response.status_code == 403
-    assert response.json() == {
-        "detail": "You do not have permission to perform this action."
-    }
-
-    # Verify in database
-    assert (
-        models.DocumentFavorite.objects.filter(document=document, user=user).exists()
-        is True
-    )
-
-
-@pytest.mark.parametrize(
-    "reach, has_role",
-    [
-        ["restricted", True],
-        ["authenticated", False],
-        ["authenticated", True],
-        ["public", False],
-        ["public", True],
-    ],
-)
-def test_api_document_favorite_authenticated_delete_not_favorited_allowed(
-    reach, has_role
-):
-    """DELETE should be idempotent if the document is not marked as favorite."""
-    user = factories.UserFactory()
-    document = factories.DocumentFactory(link_reach=reach)
-    client = APIClient()
-    client.force_login(user)
-
-    if has_role:
-        models.DocumentAccess.objects.create(document=document, user=user)
-
-    # Try to unmark as favorite when no favorite entry exists
-    response = client.delete(f"/api/v1.0/documents/{document.id!s}/favorite/")
-
-    assert response.status_code == 200
-    assert response.json() == {"detail": "Document was already not marked as favorite"}
-
-    # Verify in database
-    assert (
-        models.DocumentFavorite.objects.filter(document=document, user=user).exists()
-        is False
-    )
-
-    # Verify document format
-    response = client.get(f"/api/v1.0/documents/{document.id!s}/")
-    assert response.json()["is_favorite"] is False
-
-
-def test_api_document_favorite_authenticated_delete_not_favorited_forbidden():
-    """DELETE should be idempotent if the document is not marked as favorite."""
-    user = factories.UserFactory()
-    document = factories.DocumentFactory(link_reach="restricted")
-    client = APIClient()
-    client.force_login(user)
-
-    # Try to unmark as favorite when no favorite entry exists
-    response = client.delete(f"/api/v1.0/documents/{document.id!s}/favorite/")
-
-    assert response.status_code == 403
-    assert response.json() == {
-        "detail": "You do not have permission to perform this action."
-    }
-
-    # Verify in database
-    assert (
-        models.DocumentFavorite.objects.filter(document=document, user=user).exists()
-        is False
-    )
-
-
-@pytest.mark.parametrize(
-    "reach, has_role",
-    [
-        ["restricted", True],
-        ["authenticated", False],
-        ["authenticated", True],
-        ["public", False],
-        ["public", True],
-    ],
-)
-def test_api_document_favorite_authenticated_post_unmark_then_mark_again_allowed(
-    reach, has_role
-):
-    """A user should be able to mark, unmark, and mark a document again as favorite."""
-    user = factories.UserFactory()
-    document = factories.DocumentFactory(link_reach=reach)
-    client = APIClient()
-    client.force_login(user)
-
-    if has_role:
-        models.DocumentAccess.objects.create(document=document, user=user)
-
-    url = f"/api/v1.0/documents/{document.id!s}/favorite/"
-
-    # Mark as favorite
-    response = client.post(url)
-    assert response.status_code == 201
-
-    # Unmark as favorite
-    response = client.delete(url)
-    assert response.status_code == 204
-
-    # Mark as favorite again
-    response = client.post(url)
-    assert response.status_code == 201
-    assert response.json() == {"detail": "Document marked as favorite"}
-
-    # Verify in database
-    assert models.DocumentFavorite.objects.filter(document=document, user=user).exists()
-
-    # Verify document format
-    response = client.get(f"/api/v1.0/documents/{document.id!s}/")
-    assert response.json()["is_favorite"] is True

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

@@ -6,9 +6,6 @@ from rest_framework.test import APIClient
 from core import factories, models
 from core.api import serializers
 from core.tests.conftest import TEAM, USER, VIA
-from core.tests.test_services_collaboration_services import (  # pylint: disable=unused-import
-    mock_reset_connections,
-)
 
 pytestmark = pytest.mark.django_db
 
@@ -45,7 +42,7 @@ def test_api_documents_link_configuration_update_authenticated_unrelated(reach,
     Authenticated users should not be allowed to update the link configuration for
     a document to which they are not related.
     """
-    user = factories.UserFactory(with_owned_document=True)
+    user = factories.UserFactory()
 
     client = APIClient()
     client.force_login(user)
@@ -81,7 +78,7 @@ def test_api_documents_link_configuration_update_authenticated_related_forbidden
     Users who are readers or editors of a document should not be allowed to update
     the link configuration.
     """
-    user = factories.UserFactory(with_owned_document=True)
+    user = factories.UserFactory()
 
     client = APIClient()
     client.force_login(user)
@@ -119,10 +116,7 @@ def test_api_documents_link_configuration_update_authenticated_related_forbidden
 @pytest.mark.parametrize("role", ["administrator", "owner"])
 @pytest.mark.parametrize("via", VIA)
 def test_api_documents_link_configuration_update_authenticated_related_success(
-    via,
-    role,
-    mock_user_teams,
-    mock_reset_connections,  # pylint: disable=redefined-outer-name
+    via, role, mock_user_teams
 ):
     """
     A user who is administrator or owner of a document should be allowed to update
@@ -145,16 +139,14 @@ def test_api_documents_link_configuration_update_authenticated_related_success(
     new_document_values = serializers.LinkDocumentSerializer(
         instance=factories.DocumentFactory()
     ).data
+    response = client.put(
+        f"/api/v1.0/documents/{document.id!s}/link-configuration/",
+        new_document_values,
+        format="json",
+    )
+    assert response.status_code == 200
 
-    with mock_reset_connections(document.id):
-        response = client.put(
-            f"/api/v1.0/documents/{document.id!s}/link-configuration/",
-            new_document_values,
-            format="json",
-        )
-        assert response.status_code == 200
-
-        document = models.Document.objects.get(pk=document.pk)
-        document_values = serializers.LinkDocumentSerializer(instance=document).data
-        for key, value in document_values.items():
-            assert value == new_document_values[key]
+    document = models.Document.objects.get(pk=document.pk)
+    document_values = serializers.LinkDocumentSerializer(instance=document).data
+    for key, value in document_values.items():
+        assert value == new_document_values[key]

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

@@ -3,9 +3,7 @@ Tests for Documents API endpoint in impress's core app: list
 """
 
 import operator
-import random
 from unittest import mock
-from urllib.parse import urlencode
 
 import pytest
 from faker import Faker
@@ -34,47 +32,7 @@ def test_api_documents_list_anonymous(reach, role):
     assert len(results) == 0
 
 
-def test_api_documents_list_format():
-    """Validate the format of documents as returned by the list view."""
-    user = factories.UserFactory()
-
-    client = APIClient()
-    client.force_login(user)
-
-    other_users = factories.UserFactory.create_batch(3)
-    document = factories.DocumentFactory(
-        users=[user, *factories.UserFactory.create_batch(2)],
-        favorited_by=[user, *other_users],
-        link_traces=other_users,
-    )
-
-    response = client.get("/api/v1.0/documents/")
-
-    assert response.status_code == 200
-    content = response.json()
-    results = content.pop("results")
-    assert content == {
-        "count": 1,
-        "next": None,
-        "previous": None,
-    }
-    assert len(results) == 1
-    assert results[0] == {
-        "id": str(document.id),
-        "abilities": document.get_abilities(user),
-        "content": document.content,
-        "created_at": document.created_at.isoformat().replace("+00:00", "Z"),
-        "creator": str(document.creator.id),
-        "is_favorite": True,
-        "link_reach": document.link_reach,
-        "link_role": document.link_role,
-        "nb_accesses": 3,
-        "title": document.title,
-        "updated_at": document.updated_at.isoformat().replace("+00:00", "Z"),
-    }
-
-
-def test_api_documents_list_authenticated_direct(django_assert_num_queries):
+def test_api_documents_list_authenticated_direct():
     """
     Authenticated users should be able to list documents they are a direct
     owner/administrator/member of or documents that have a link reach other
@@ -97,8 +55,9 @@ def test_api_documents_list_authenticated_direct(django_assert_num_queries):
 
     expected_ids = {str(document.id) for document in documents}
 
-    with django_assert_num_queries(3):
-        response = client.get("/api/v1.0/documents/")
+    response = client.get(
+        "/api/v1.0/documents/",
+    )
 
     assert response.status_code == 200
     results = response.json()["results"]
@@ -107,9 +66,7 @@ def test_api_documents_list_authenticated_direct(django_assert_num_queries):
     assert expected_ids == results_id
 
 
-def test_api_documents_list_authenticated_via_team(
-    django_assert_num_queries, mock_user_teams
-):
+def test_api_documents_list_authenticated_via_team(mock_user_teams):
     """
     Authenticated users should be able to list documents they are a
     owner/administrator/member of via a team.
@@ -132,8 +89,7 @@ def test_api_documents_list_authenticated_via_team(
 
     expected_ids = {str(document.id) for document in documents_team1 + documents_team2}
 
-    with django_assert_num_queries(3):
-        response = client.get("/api/v1.0/documents/")
+    response = client.get("/api/v1.0/documents/")
 
     assert response.status_code == 200
     results = response.json()["results"]
@@ -142,9 +98,7 @@ def test_api_documents_list_authenticated_via_team(
     assert expected_ids == results_id
 
 
-def test_api_documents_list_authenticated_link_reach_restricted(
-    django_assert_num_queries,
-):
+def test_api_documents_list_authenticated_link_reach_restricted():
     """
     An authenticated user who has link traces to a document that is restricted should not
     see it on the list view
@@ -161,10 +115,9 @@ def test_api_documents_list_authenticated_link_reach_restricted(
     other_document = factories.DocumentFactory(link_reach="public")
     models.LinkTrace.objects.create(document=other_document, user=user)
 
-    with django_assert_num_queries(3):
-        response = client.get(
-            "/api/v1.0/documents/",
-        )
+    response = client.get(
+        "/api/v1.0/documents/",
+    )
 
     assert response.status_code == 200
     results = response.json()["results"]
@@ -174,9 +127,7 @@ def test_api_documents_list_authenticated_link_reach_restricted(
     assert results[0]["id"] == str(other_document.id)
 
 
-def test_api_documents_list_authenticated_link_reach_public_or_authenticated(
-    django_assert_num_queries,
-):
+def test_api_documents_list_authenticated_link_reach_public_or_authenticated():
     """
     An authenticated user who has link traces to a document with public or authenticated
     link reach should see it on the list view.
@@ -193,10 +144,9 @@ def test_api_documents_list_authenticated_link_reach_public_or_authenticated(
     ]
     expected_ids = {str(document.id) for document in documents}
 
-    with django_assert_num_queries(3):
-        response = client.get(
-            "/api/v1.0/documents/",
-        )
+    response = client.get(
+        "/api/v1.0/documents/",
+    )
 
     assert response.status_code == 200
     results = response.json()["results"]
@@ -274,143 +224,6 @@ def test_api_documents_list_authenticated_distinct():
     assert content["results"][0]["id"] == str(document.id)
 
 
-def test_api_documents_list_favorites_no_extra_queries(django_assert_num_queries):
-    """
-    Ensure that marking documents as favorite does not generate additional queries
-    when fetching the document list.
-    """
-    user = factories.UserFactory()
-    client = APIClient()
-    client.force_login(user)
-
-    special_documents = factories.DocumentFactory.create_batch(3, users=[user])
-    factories.DocumentFactory.create_batch(2, users=[user])
-
-    url = "/api/v1.0/documents/"
-    with django_assert_num_queries(3):
-        response = client.get(url)
-
-    assert response.status_code == 200
-    results = response.json()["results"]
-    assert len(results) == 5
-
-    assert all(result["is_favorite"] is False for result in results)
-
-    # Mark documents as favorite and check results again
-    for document in special_documents:
-        models.DocumentFavorite.objects.create(document=document, user=user)
-
-    with django_assert_num_queries(3):
-        response = client.get(url)
-
-    assert response.status_code == 200
-    results = response.json()["results"]
-    assert len(results) == 5
-
-    # Check if the "is_favorite" annotation is correctly set for the favorited documents
-    favorited_ids = {str(doc.id) for doc in special_documents}
-    for result in results:
-        if result["id"] in favorited_ids:
-            assert result["is_favorite"] is True
-        else:
-            assert result["is_favorite"] is False
-
-
-def test_api_documents_list_filter_and_access_rights():
-    """Filtering on querystring parameters should respect access rights."""
-    user = factories.UserFactory()
-    client = APIClient()
-    client.force_login(user)
-
-    other_user = factories.UserFactory()
-
-    def random_favorited_by():
-        return random.choice([[], [user], [other_user]])
-
-    # Documents that should be listed to this user
-    listed_documents = [
-        factories.DocumentFactory(
-            link_reach="public",
-            link_traces=[user],
-            favorited_by=random_favorited_by(),
-            creator=random.choice([user, other_user]),
-        ),
-        factories.DocumentFactory(
-            link_reach="authenticated",
-            link_traces=[user],
-            favorited_by=random_favorited_by(),
-            creator=random.choice([user, other_user]),
-        ),
-        factories.DocumentFactory(
-            link_reach="restricted",
-            users=[user],
-            favorited_by=random_favorited_by(),
-            creator=random.choice([user, other_user]),
-        ),
-    ]
-    listed_ids = [str(doc.id) for doc in listed_documents]
-    word_list = [word for doc in listed_documents for word in doc.title.split(" ")]
-
-    # Documents that should not be listed to this user
-    factories.DocumentFactory(
-        link_reach="public",
-        favorited_by=random_favorited_by(),
-        creator=random.choice([user, other_user]),
-    )
-    factories.DocumentFactory(
-        link_reach="authenticated",
-        favorited_by=random_favorited_by(),
-        creator=random.choice([user, other_user]),
-    )
-    factories.DocumentFactory(
-        link_reach="restricted",
-        favorited_by=random_favorited_by(),
-        creator=random.choice([user, other_user]),
-    )
-    factories.DocumentFactory(
-        link_reach="restricted",
-        link_traces=[user],
-        favorited_by=random_favorited_by(),
-        creator=random.choice([user, other_user]),
-    )
-
-    filters = {
-        "link_reach": random.choice([None, *models.LinkReachChoices.values]),
-        "title": random.choice([None, *word_list]),
-        "favorite": random.choice([None, True, False]),
-        "creator": random.choice([None, user, other_user]),
-        "ordering": random.choice(
-            [
-                None,
-                "created_at",
-                "-created_at",
-                "is_favorite",
-                "-is_favorite",
-                "nb_accesses",
-                "-nb_accesses",
-                "title",
-                "-title",
-                "updated_at",
-                "-updated_at",
-            ]
-        ),
-    }
-    query_params = {key: value for key, value in filters.items() if value is not None}
-    querystring = urlencode(query_params)
-
-    response = client.get(f"/api/v1.0/documents/?{querystring:s}")
-
-    assert response.status_code == 200
-    results = response.json()["results"]
-
-    # Ensure all documents in results respect expected access rights
-    for result in results:
-        assert result["id"] in listed_ids
-
-
-# Filters: ordering
-
-
 def test_api_documents_list_ordering_default():
     """Documents should be ordered by descending "updated_at" by default"""
     user = factories.UserFactory()
@@ -441,14 +254,10 @@ def test_api_documents_list_ordering_by_fields():
     for parameter in [
         "created_at",
         "-created_at",
-        "is_favorite",
-        "-is_favorite",
-        "nb_accesses",
-        "-nb_accesses",
-        "title",
-        "-title",
         "updated_at",
         "-updated_at",
+        "title",
+        "-title",
     ]:
         is_descending = parameter.startswith("-")
         field = parameter.lstrip("-")
@@ -463,212 +272,3 @@ def test_api_documents_list_ordering_by_fields():
         compare = operator.ge if is_descending else operator.le
         for i in range(4):
             assert compare(results[i][field], results[i + 1][field])
-
-
-# Filters: is_creator_me
-
-
-def test_api_documents_list_filter_is_creator_me_true():
-    """
-    Authenticated users should be able to filter documents they created.
-    """
-    user = factories.UserFactory()
-    client = APIClient()
-    client.force_login(user)
-
-    factories.DocumentFactory.create_batch(3, users=[user], creator=user)
-    factories.DocumentFactory.create_batch(2, users=[user])
-
-    response = client.get("/api/v1.0/documents/?is_creator_me=true")
-
-    assert response.status_code == 200
-    results = response.json()["results"]
-    assert len(results) == 3
-
-    # Ensure all results are created by the current user
-    for result in results:
-        assert result["creator"] == str(user.id)
-
-
-def test_api_documents_list_filter_is_creator_me_false():
-    """
-    Authenticated users should be able to filter documents created by others.
-    """
-    user = factories.UserFactory()
-    client = APIClient()
-    client.force_login(user)
-
-    factories.DocumentFactory.create_batch(3, users=[user], creator=user)
-    factories.DocumentFactory.create_batch(2, users=[user])
-
-    response = client.get("/api/v1.0/documents/?is_creator_me=false")
-
-    assert response.status_code == 200
-    results = response.json()["results"]
-    assert len(results) == 2
-
-    # Ensure all results are created by other users
-    for result in results:
-        assert result["creator"] != str(user.id)
-
-
-def test_api_documents_list_filter_is_creator_me_invalid():
-    """Filtering with an invalid `is_creator_me` value should do nothing."""
-    user = factories.UserFactory()
-    client = APIClient()
-    client.force_login(user)
-
-    factories.DocumentFactory.create_batch(3, users=[user], creator=user)
-    factories.DocumentFactory.create_batch(2, users=[user])
-
-    response = client.get("/api/v1.0/documents/?is_creator_me=invalid")
-
-    assert response.status_code == 200
-    results = response.json()["results"]
-    assert len(results) == 5
-
-
-# Filters: is_favorite
-
-
-def test_api_documents_list_filter_is_favorite_true():
-    """
-    Authenticated users should be able to filter documents they marked as favorite.
-    """
-    user = factories.UserFactory()
-    client = APIClient()
-    client.force_login(user)
-
-    factories.DocumentFactory.create_batch(3, users=[user], favorited_by=[user])
-    factories.DocumentFactory.create_batch(2, users=[user])
-
-    response = client.get("/api/v1.0/documents/?is_favorite=true")
-
-    assert response.status_code == 200
-    results = response.json()["results"]
-    assert len(results) == 3
-
-    # Ensure all results are marked as favorite by the current user
-    for result in results:
-        assert result["is_favorite"] is True
-
-
-def test_api_documents_list_filter_is_favorite_false():
-    """
-    Authenticated users should be able to filter documents they didn't mark as favorite.
-    """
-    user = factories.UserFactory()
-    client = APIClient()
-    client.force_login(user)
-
-    factories.DocumentFactory.create_batch(3, users=[user], favorited_by=[user])
-    factories.DocumentFactory.create_batch(2, users=[user])
-
-    response = client.get("/api/v1.0/documents/?is_favorite=false")
-
-    assert response.status_code == 200
-    results = response.json()["results"]
-    assert len(results) == 2
-
-    # Ensure all results are not marked as favorite by the current user
-    for result in results:
-        assert result["is_favorite"] is False
-
-
-def test_api_documents_list_filter_is_favorite_invalid():
-    """Filtering with an invalid `is_favorite` value should do nothing."""
-    user = factories.UserFactory()
-    client = APIClient()
-    client.force_login(user)
-
-    factories.DocumentFactory.create_batch(3, users=[user], favorited_by=[user])
-    factories.DocumentFactory.create_batch(2, users=[user])
-
-    response = client.get("/api/v1.0/documents/?is_favorite=invalid")
-
-    assert response.status_code == 200
-    results = response.json()["results"]
-    assert len(results) == 5
-
-
-# Filters: link_reach
-
-
-@pytest.mark.parametrize("reach", models.LinkReachChoices.values)
-def test_api_documents_list_filter_link_reach(reach):
-    """Authenticated users should be able to filter documents by link reach."""
-    user = factories.UserFactory()
-    client = APIClient()
-    client.force_login(user)
-
-    factories.DocumentFactory.create_batch(5, users=[user])
-
-    response = client.get(f"/api/v1.0/documents/?link_reach={reach:s}")
-
-    assert response.status_code == 200
-    results = response.json()["results"]
-
-    # Ensure all results have the chosen link reach
-    for result in results:
-        assert result["link_reach"] == reach
-
-
-def test_api_documents_list_filter_link_reach_invalid():
-    """Filtering with an invalid `link_reach` value should raise an error."""
-    user = factories.UserFactory()
-    client = APIClient()
-    client.force_login(user)
-
-    factories.DocumentFactory.create_batch(3, users=[user])
-
-    response = client.get("/api/v1.0/documents/?link_reach=invalid")
-
-    assert response.status_code == 400
-    assert response.json() == {
-        "link_reach": [
-            "Select a valid choice. invalid is not one of the available choices."
-        ]
-    }
-
-
-# Filters: title
-
-
-@pytest.mark.parametrize(
-    "query,nb_results",
-    [
-        ("Project Alpha", 1),  # Exact match
-        ("project", 2),  # Partial match (case-insensitive)
-        ("Guide", 1),  # Word match within a title
-        ("Special", 0),  # No match (nonexistent keyword)
-        ("2024", 2),  # Match by numeric keyword
-        ("", 5),  # Empty string
-    ],
-)
-def test_api_documents_list_filter_title(query, nb_results):
-    """Authenticated users should be able to search documents by their title."""
-    user = factories.UserFactory()
-    client = APIClient()
-    client.force_login(user)
-
-    # Create documents with predefined titles
-    titles = [
-        "Project Alpha Documentation",
-        "Project Beta Overview",
-        "User Guide",
-        "Financial Report 2024",
-        "Annual Review 2024",
-    ]
-    for title in titles:
-        factories.DocumentFactory(title=title, users=[user])
-
-    # Perform the search query
-    response = client.get(f"/api/v1.0/documents/?title={query:s}")
-
-    assert response.status_code == 200
-    results = response.json()["results"]
-    assert len(results) == nb_results
-
-    # Ensure all results contain the query in their title
-    for result in results:
-        assert query.lower().strip() in result["title"].lower()

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

@@ -21,18 +21,10 @@ def test_api_documents_retrieve_anonymous_public():
     assert response.json() == {
         "id": str(document.id),
         "abilities": {
-            "accesses_manage": False,
-            "accesses_view": False,
-            "ai_transform": document.link_role == "editor",
-            "ai_translate": document.link_role == "editor",
             "attachment_upload": document.link_role == "editor",
-            "collaboration_auth": True,
             "destroy": False,
-            # Anonymous user can't favorite a document even with read access
-            "favorite": False,
-            "invite_owner": False,
             "link_configuration": False,
-            "media_auth": True,
+            "manage_accesses": False,
             "partial_update": document.link_role == "editor",
             "retrieve": True,
             "update": document.link_role == "editor",
@@ -40,14 +32,13 @@ def test_api_documents_retrieve_anonymous_public():
             "versions_list": False,
             "versions_retrieve": False,
         },
-        "content": document.content,
-        "created_at": document.created_at.isoformat().replace("+00:00", "Z"),
-        "creator": str(document.creator.id),
-        "is_favorite": False,
+        "accesses": [],
+        "is_e2ee": False,
         "link_reach": "public",
         "link_role": document.link_role,
-        "nb_accesses": 0,
         "title": document.title,
+        "content": document.content,
+        "created_at": document.created_at.isoformat().replace("+00:00", "Z"),
         "updated_at": document.updated_at.isoformat().replace("+00:00", "Z"),
     }
 
@@ -85,17 +76,10 @@ def test_api_documents_retrieve_authenticated_unrelated_public_or_authenticated(
     assert response.json() == {
         "id": str(document.id),
         "abilities": {
-            "accesses_manage": False,
-            "accesses_view": False,
-            "ai_transform": document.link_role == "editor",
-            "ai_translate": document.link_role == "editor",
             "attachment_upload": document.link_role == "editor",
-            "collaboration_auth": True,
-            "destroy": False,
-            "favorite": True,
-            "invite_owner": False,
-            "media_auth": True,
             "link_configuration": False,
+            "destroy": False,
+            "manage_accesses": False,
             "partial_update": document.link_role == "editor",
             "retrieve": True,
             "update": document.link_role == "editor",
@@ -103,14 +87,13 @@ def test_api_documents_retrieve_authenticated_unrelated_public_or_authenticated(
             "versions_list": False,
             "versions_retrieve": False,
         },
-        "content": document.content,
-        "created_at": document.created_at.isoformat().replace("+00:00", "Z"),
-        "creator": str(document.creator.id),
-        "is_favorite": False,
+        "accesses": [],
+        "is_e2ee": False,
         "link_reach": reach,
         "link_role": document.link_role,
-        "nb_accesses": 0,
         "title": document.title,
+        "content": document.content,
+        "created_at": document.created_at.isoformat().replace("+00:00", "Z"),
         "updated_at": document.updated_at.isoformat().replace("+00:00", "Z"),
     }
     assert (
@@ -152,7 +135,7 @@ def test_api_documents_retrieve_authenticated_unrelated_restricted():
     Authenticated users should not be allowed to retrieve a document that is restricted and
     to which they are not related.
     """
-    user = factories.UserFactory(with_owned_document=True)
+    user = factories.UserFactory()
 
     client = APIClient()
     client.force_login(user)
@@ -179,26 +162,44 @@ def test_api_documents_retrieve_authenticated_related_direct():
     client.force_login(user)
 
     document = factories.DocumentFactory()
-    factories.UserDocumentAccessFactory(document=document, user=user)
+    access1 = factories.UserDocumentAccessFactory(document=document, user=user)
     access2 = factories.UserDocumentAccessFactory(document=document)
-    serializers.UserSerializer(instance=user)
-    serializers.UserSerializer(instance=access2.user)
+    access1_user = serializers.UserSerializer(instance=user).data
+    access2_user = serializers.UserSerializer(instance=access2.user).data
 
     response = client.get(
         f"/api/v1.0/documents/{document.id!s}/",
     )
     assert response.status_code == 200
+    content = response.json()
+    assert sorted(content.pop("accesses"), key=lambda x: x["id"]) == sorted(
+        [
+            {
+                "id": str(access1.id),
+                "user": access1_user,
+                "team": "",
+                "role": access1.role,
+                "abilities": access1.get_abilities(user),
+            },
+            {
+                "id": str(access2.id),
+                "user": access2_user,
+                "team": "",
+                "role": access2.role,
+                "abilities": access2.get_abilities(user),
+            },
+        ],
+        key=lambda x: x["id"],
+    )
     assert response.json() == {
         "id": str(document.id),
-        "abilities": document.get_abilities(user),
+        "title": document.title,
         "content": document.content,
-        "creator": str(document.creator.id),
-        "created_at": document.created_at.isoformat().replace("+00:00", "Z"),
-        "is_favorite": False,
+        "abilities": document.get_abilities(user),
+        "is_e2ee": False,
         "link_reach": document.link_reach,
         "link_role": document.link_role,
-        "nb_accesses": 2,
-        "title": document.title,
+        "created_at": document.created_at.isoformat().replace("+00:00", "Z"),
         "updated_at": document.updated_at.isoformat().replace("+00:00", "Z"),
     }
 
@@ -210,7 +211,7 @@ def test_api_documents_retrieve_authenticated_related_team_none(mock_user_teams)
     """
     mock_user_teams.return_value = []
 
-    user = factories.UserFactory(with_owned_document=True)
+    user = factories.UserFactory()
 
     client = APIClient()
     client.force_login(user)
@@ -251,7 +252,7 @@ def test_api_documents_retrieve_authenticated_related_team_members(
 ):
     """
     Authenticated users should be allowed to retrieve a document to which they
-    are related via a team whatever the role.
+    are related via a team whatever the role and see all its accesses.
     """
     mock_user_teams.return_value = teams
 
@@ -262,34 +263,82 @@ def test_api_documents_retrieve_authenticated_related_team_members(
 
     document = factories.DocumentFactory(link_reach="restricted")
 
-    factories.TeamDocumentAccessFactory(
+    access_reader = factories.TeamDocumentAccessFactory(
         document=document, team="readers", role="reader"
     )
-    factories.TeamDocumentAccessFactory(
+    access_editor = factories.TeamDocumentAccessFactory(
         document=document, team="editors", role="editor"
     )
-    factories.TeamDocumentAccessFactory(
+    access_administrator = factories.TeamDocumentAccessFactory(
         document=document, team="administrators", role="administrator"
     )
-    factories.TeamDocumentAccessFactory(document=document, team="owners", role="owner")
-    factories.TeamDocumentAccessFactory(document=document)
+    access_owner = factories.TeamDocumentAccessFactory(
+        document=document, team="owners", role="owner"
+    )
+    other_access = factories.TeamDocumentAccessFactory(document=document)
     factories.TeamDocumentAccessFactory()
 
     response = client.get(f"/api/v1.0/documents/{document.id!s}/")
 
     # pylint: disable=R0801
     assert response.status_code == 200
+    content = response.json()
+    expected_abilities = {
+        "destroy": False,
+        "retrieve": True,
+        "set_role_to": [],
+        "update": False,
+        "partial_update": False,
+    }
+    assert sorted(content.pop("accesses"), key=lambda x: x["id"]) == sorted(
+        [
+            {
+                "id": str(access_reader.id),
+                "user": None,
+                "team": "readers",
+                "role": access_reader.role,
+                "abilities": expected_abilities,
+            },
+            {
+                "id": str(access_editor.id),
+                "user": None,
+                "team": "editors",
+                "role": access_editor.role,
+                "abilities": expected_abilities,
+            },
+            {
+                "id": str(access_administrator.id),
+                "user": None,
+                "team": "administrators",
+                "role": access_administrator.role,
+                "abilities": expected_abilities,
+            },
+            {
+                "id": str(access_owner.id),
+                "user": None,
+                "team": "owners",
+                "role": access_owner.role,
+                "abilities": expected_abilities,
+            },
+            {
+                "id": str(other_access.id),
+                "user": None,
+                "team": other_access.team,
+                "role": other_access.role,
+                "abilities": expected_abilities,
+            },
+        ],
+        key=lambda x: x["id"],
+    )
     assert response.json() == {
         "id": str(document.id),
-        "abilities": document.get_abilities(user),
+        "title": document.title,
         "content": document.content,
-        "created_at": document.created_at.isoformat().replace("+00:00", "Z"),
-        "creator": str(document.creator.id),
-        "is_favorite": False,
+        "abilities": document.get_abilities(user),
+        "is_e2ee": False,
         "link_reach": "restricted",
         "link_role": document.link_role,
-        "nb_accesses": 5,
-        "title": document.title,
+        "created_at": document.created_at.isoformat().replace("+00:00", "Z"),
         "updated_at": document.updated_at.isoformat().replace("+00:00", "Z"),
     }
 
@@ -307,7 +356,7 @@ def test_api_documents_retrieve_authenticated_related_team_administrators(
 ):
     """
     Authenticated users should be allowed to retrieve a document to which they
-    are related via a team whatever the role.
+    are related via a team whatever the role and see all its accesses.
     """
     mock_user_teams.return_value = teams
 
@@ -318,34 +367,99 @@ def test_api_documents_retrieve_authenticated_related_team_administrators(
 
     document = factories.DocumentFactory(link_reach="restricted")
 
-    factories.TeamDocumentAccessFactory(
+    access_reader = factories.TeamDocumentAccessFactory(
         document=document, team="readers", role="reader"
     )
-    factories.TeamDocumentAccessFactory(
+    access_editor = factories.TeamDocumentAccessFactory(
         document=document, team="editors", role="editor"
     )
-    factories.TeamDocumentAccessFactory(
+    access_administrator = factories.TeamDocumentAccessFactory(
         document=document, team="administrators", role="administrator"
     )
-    factories.TeamDocumentAccessFactory(document=document, team="owners", role="owner")
-    factories.TeamDocumentAccessFactory(document=document)
+    access_owner = factories.TeamDocumentAccessFactory(
+        document=document, team="owners", role="owner"
+    )
+    other_access = factories.TeamDocumentAccessFactory(document=document)
     factories.TeamDocumentAccessFactory()
 
     response = client.get(f"/api/v1.0/documents/{document.id!s}/")
 
     # pylint: disable=R0801
     assert response.status_code == 200
+    content = response.json()
+    assert sorted(content.pop("accesses"), key=lambda x: x["id"]) == sorted(
+        [
+            {
+                "id": str(access_reader.id),
+                "user": None,
+                "team": "readers",
+                "role": "reader",
+                "abilities": {
+                    "destroy": True,
+                    "retrieve": True,
+                    "set_role_to": ["administrator", "editor"],
+                    "update": True,
+                    "partial_update": True,
+                },
+            },
+            {
+                "id": str(access_editor.id),
+                "user": None,
+                "team": "editors",
+                "role": "editor",
+                "abilities": {
+                    "destroy": True,
+                    "retrieve": True,
+                    "set_role_to": ["administrator", "reader"],
+                    "update": True,
+                    "partial_update": True,
+                },
+            },
+            {
+                "id": str(access_administrator.id),
+                "user": None,
+                "team": "administrators",
+                "role": "administrator",
+                "abilities": {
+                    "destroy": True,
+                    "retrieve": True,
+                    "set_role_to": ["editor", "reader"],
+                    "update": True,
+                    "partial_update": True,
+                },
+            },
+            {
+                "id": str(access_owner.id),
+                "user": None,
+                "team": "owners",
+                "role": "owner",
+                "abilities": {
+                    "destroy": False,
+                    "retrieve": True,
+                    "set_role_to": [],
+                    "update": False,
+                    "partial_update": False,
+                },
+            },
+            {
+                "id": str(other_access.id),
+                "user": None,
+                "team": other_access.team,
+                "role": other_access.role,
+                "abilities": other_access.get_abilities(user),
+            },
+        ],
+        key=lambda x: x["id"],
+    )
     assert response.json() == {
         "id": str(document.id),
-        "abilities": document.get_abilities(user),
+        "title": document.title,
         "content": document.content,
-        "created_at": document.created_at.isoformat().replace("+00:00", "Z"),
-        "creator": str(document.creator.id),
-        "is_favorite": False,
+        "abilities": document.get_abilities(user),
+        "is_e2ee": False,
         "link_reach": "restricted",
         "link_role": document.link_role,
-        "nb_accesses": 5,
-        "title": document.title,
+        "created_at": document.created_at.isoformat().replace("+00:00", "Z"),
         "updated_at": document.updated_at.isoformat().replace("+00:00", "Z"),
     }
 
@@ -364,7 +478,7 @@ def test_api_documents_retrieve_authenticated_related_team_owners(
 ):
     """
     Authenticated users should be allowed to retrieve a restricted document to which
-    they are related via a team whatever the role.
+    they are related via a team whatever the role and see all its accesses.
     """
     mock_user_teams.return_value = teams
 
@@ -375,33 +489,101 @@ def test_api_documents_retrieve_authenticated_related_team_owners(
 
     document = factories.DocumentFactory(link_reach="restricted")
 
-    factories.TeamDocumentAccessFactory(
+    access_reader = factories.TeamDocumentAccessFactory(
         document=document, team="readers", role="reader"
     )
-    factories.TeamDocumentAccessFactory(
+    access_editor = factories.TeamDocumentAccessFactory(
         document=document, team="editors", role="editor"
     )
-    factories.TeamDocumentAccessFactory(
+    access_administrator = factories.TeamDocumentAccessFactory(
         document=document, team="administrators", role="administrator"
     )
-    factories.TeamDocumentAccessFactory(document=document, team="owners", role="owner")
-    factories.TeamDocumentAccessFactory(document=document)
+    access_owner = factories.TeamDocumentAccessFactory(
+        document=document, team="owners", role="owner"
+    )
+    other_access = factories.TeamDocumentAccessFactory(document=document)
     factories.TeamDocumentAccessFactory()
 
     response = client.get(f"/api/v1.0/documents/{document.id!s}/")
 
     # pylint: disable=R0801
     assert response.status_code == 200
+    content = response.json()
+    assert sorted(content.pop("accesses"), key=lambda x: x["id"]) == sorted(
+        [
+            {
+                "id": str(access_reader.id),
+                "user": None,
+                "team": "readers",
+                "role": "reader",
+                "abilities": {
+                    "destroy": True,
+                    "retrieve": True,
+                    "set_role_to": ["owner", "administrator", "editor"],
+                    "update": True,
+                    "partial_update": True,
+                },
+            },
+            {
+                "id": str(access_editor.id),
+                "user": None,
+                "team": "editors",
+                "role": "editor",
+                "abilities": {
+                    "destroy": True,
+                    "retrieve": True,
+                    "set_role_to": ["owner", "administrator", "reader"],
+                    "update": True,
+                    "partial_update": True,
+                },
+            },
+            {
+                "id": str(access_administrator.id),
+                "user": None,
+                "team": "administrators",
+                "role": "administrator",
+                "abilities": {
+                    "destroy": True,
+                    "retrieve": True,
+                    "set_role_to": ["owner", "editor", "reader"],
+                    "update": True,
+                    "partial_update": True,
+                },
+            },
+            {
+                "id": str(access_owner.id),
+                "user": None,
+                "team": "owners",
+                "role": "owner",
+                "abilities": {
+                    # editable only if there is another owner role than the user's team...
+                    "destroy": other_access.role == "owner",
+                    "retrieve": True,
+                    "set_role_to": ["administrator", "editor", "reader"]
+                    if other_access.role == "owner"
+                    else [],
+                    "update": other_access.role == "owner",
+                    "partial_update": other_access.role == "owner",
+                },
+            },
+            {
+                "id": str(other_access.id),
+                "user": None,
+                "team": other_access.team,
+                "role": other_access.role,
+                "abilities": other_access.get_abilities(user),
+            },
+        ],
+        key=lambda x: x["id"],
+    )
     assert response.json() == {
         "id": str(document.id),
-        "abilities": document.get_abilities(user),
+        "title": document.title,
         "content": document.content,
-        "created_at": document.created_at.isoformat().replace("+00:00", "Z"),
-        "creator": str(document.creator.id),
-        "is_favorite": False,
+        "abilities": document.get_abilities(user),
+        "is_e2ee": False,
         "link_reach": "restricted",
         "link_role": document.link_role,
-        "nb_accesses": 5,
-        "title": document.title,
+        "created_at": document.created_at.isoformat().replace("+00:00", "Z"),
         "updated_at": document.updated_at.isoformat().replace("+00:00", "Z"),
     }

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

@@ -20,7 +20,7 @@ from core.tests.conftest import TEAM, USER, VIA
 pytestmark = pytest.mark.django_db
 
 
-def test_api_documents_media_auth_anonymous_public():
+def test_api_documents_retrieve_auth_anonymous_public():
     """Anonymous users should be able to retrieve attachments linked to a public document"""
     document = factories.DocumentFactory(link_reach="public")
 
@@ -36,7 +36,7 @@ def test_api_documents_media_auth_anonymous_public():
 
     original_url = f"http://localhost/media/{key:s}"
     response = APIClient().get(
-        "/api/v1.0/documents/media-auth/", HTTP_X_ORIGINAL_URL=original_url
+        "/api/v1.0/documents/retrieve-auth/", HTTP_X_ORIGINAL_URL=original_url
     )
 
     assert response.status_code == 200
@@ -65,7 +65,7 @@ def test_api_documents_media_auth_anonymous_public():
 
 
 @pytest.mark.parametrize("reach", ["authenticated", "restricted"])
-def test_api_documents_media_auth_anonymous_authenticated_or_restricted(reach):
+def test_api_documents_retrieve_auth_anonymous_authenticated_or_restricted(reach):
     """
     Anonymous users should not be allowed to retrieve attachments linked to a document
     with link reach set to authenticated or restricted.
@@ -76,7 +76,7 @@ def test_api_documents_media_auth_anonymous_authenticated_or_restricted(reach):
     media_url = f"http://localhost/media/{document.pk!s}/attachments/{filename:s}"
 
     response = APIClient().get(
-        "/api/v1.0/documents/media-auth/", HTTP_X_ORIGINAL_URL=media_url
+        "/api/v1.0/documents/retrieve-auth/", HTTP_X_ORIGINAL_URL=media_url
     )
 
     assert response.status_code == 403
@@ -84,7 +84,7 @@ def test_api_documents_media_auth_anonymous_authenticated_or_restricted(reach):
 
 
 @pytest.mark.parametrize("reach", ["public", "authenticated"])
-def test_api_documents_media_auth_authenticated_public_or_authenticated(reach):
+def test_api_documents_retrieve_auth_authenticated_public_or_authenticated(reach):
     """
     Authenticated users who are not related to a document should be able to retrieve
     attachments related to a document with public or authenticated link reach.
@@ -107,7 +107,7 @@ def test_api_documents_media_auth_authenticated_public_or_authenticated(reach):
 
     original_url = f"http://localhost/media/{key:s}"
     response = client.get(
-        "/api/v1.0/documents/media-auth/", HTTP_X_ORIGINAL_URL=original_url
+        "/api/v1.0/documents/retrieve-auth/", HTTP_X_ORIGINAL_URL=original_url
     )
 
     assert response.status_code == 200
@@ -135,14 +135,14 @@ def test_api_documents_media_auth_authenticated_public_or_authenticated(reach):
     assert response.content.decode("utf-8") == "my prose"
 
 
-def test_api_documents_media_auth_authenticated_restricted():
+def test_api_documents_retrieve_auth_authenticated_restricted():
     """
     Authenticated users who are not related to a document should not be allowed to
     retrieve attachments linked to a document that is restricted.
     """
     document = factories.DocumentFactory(link_reach="restricted")
 
-    user = factories.UserFactory(with_owned_document=True)
+    user = factories.UserFactory()
     client = APIClient()
     client.force_login(user)
 
@@ -150,7 +150,7 @@ def test_api_documents_media_auth_authenticated_restricted():
     media_url = f"http://localhost/media/{document.pk!s}/attachments/{filename:s}"
 
     response = client.get(
-        "/api/v1.0/documents/media-auth/", HTTP_X_ORIGINAL_URL=media_url
+        "/api/v1.0/documents/retrieve-auth/", HTTP_X_ORIGINAL_URL=media_url
     )
 
     assert response.status_code == 403
@@ -158,7 +158,7 @@ def test_api_documents_media_auth_authenticated_restricted():
 
 
 @pytest.mark.parametrize("via", VIA)
-def test_api_documents_media_auth_related(via, mock_user_teams):
+def test_api_documents_retrieve_auth_related(via, mock_user_teams):
     """
     Users who have a specific access to a document, whatever the role, should be able to
     retrieve related attachments.
@@ -186,7 +186,7 @@ def test_api_documents_media_auth_related(via, mock_user_teams):
 
     original_url = f"http://localhost/media/{key:s}"
     response = client.get(
-        "/api/v1.0/documents/media-auth/", HTTP_X_ORIGINAL_URL=original_url
+        "/api/v1.0/documents/retrieve-auth/", HTTP_X_ORIGINAL_URL=original_url
     )
 
     assert response.status_code == 200

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

@@ -66,14 +66,14 @@ def test_api_documents_update_authenticated_unrelated_forbidden(reach, role):
     Authenticated users should not be allowed to update a document to which
     they are not related if the link configuration does not allow it.
     """
-    user = factories.UserFactory(with_owned_document=True)
+    user = factories.UserFactory()
 
     client = APIClient()
     client.force_login(user)
 
     document = factories.DocumentFactory(link_reach=reach, link_role=role)
-
     old_document_values = serializers.DocumentSerializer(instance=document).data
+
     new_document_values = serializers.DocumentSerializer(
         instance=factories.DocumentFactory()
     ).data
@@ -111,14 +111,14 @@ def test_api_documents_update_anonymous_or_authenticated_unrelated(
     client = APIClient()
 
     if is_authenticated:
-        user = factories.UserFactory(with_owned_document=True)
+        user = factories.UserFactory()
         client.force_login(user)
     else:
         user = AnonymousUser()
 
     document = factories.DocumentFactory(link_reach=reach, link_role=role)
-
     old_document_values = serializers.DocumentSerializer(instance=document).data
+
     new_document_values = serializers.DocumentSerializer(
         instance=factories.DocumentFactory()
     ).data
@@ -132,14 +132,7 @@ def test_api_documents_update_anonymous_or_authenticated_unrelated(
     document = models.Document.objects.get(pk=document.pk)
     document_values = serializers.DocumentSerializer(instance=document).data
     for key, value in document_values.items():
-        if key in [
-            "id",
-            "accesses",
-            "created_at",
-            "creator",
-            "link_reach",
-            "link_role",
-        ]:
+        if key in ["id", "accesses", "created_at", "link_reach", "link_role"]:
             assert value == old_document_values[key]
         elif key == "updated_at":
             assert value > old_document_values[key]
@@ -153,7 +146,7 @@ def test_api_documents_update_authenticated_reader(via, mock_user_teams):
     Users who are reader of a document but not administrators should
     not be allowed to update it.
     """
-    user = factories.UserFactory(with_owned_document=True)
+    user = factories.UserFactory()
 
     client = APIClient()
     client.force_login(user)
@@ -194,7 +187,7 @@ def test_api_documents_update_authenticated_editor_administrator_or_owner(
     via, role, mock_user_teams
 ):
     """A user who is editor, administrator or owner of a document should be allowed to update it."""
-    user = factories.UserFactory(with_owned_document=True)
+    user = factories.UserFactory()
 
     client = APIClient()
     client.force_login(user)
@@ -223,14 +216,7 @@ def test_api_documents_update_authenticated_editor_administrator_or_owner(
     document = models.Document.objects.get(pk=document.pk)
     document_values = serializers.DocumentSerializer(instance=document).data
     for key, value in document_values.items():
-        if key in [
-            "id",
-            "created_at",
-            "creator",
-            "link_reach",
-            "link_role",
-            "nb_accesses",
-        ]:
+        if key in ["id", "accesses", "created_at", "link_reach", "link_role"]:
             assert value == old_document_values[key]
         elif key == "updated_at":
             assert value > old_document_values[key]
@@ -241,7 +227,7 @@ def test_api_documents_update_authenticated_editor_administrator_or_owner(
 @pytest.mark.parametrize("via", VIA)
 def test_api_documents_update_authenticated_owners(via, mock_user_teams):
     """Administrators of a document should be allowed to update it."""
-    user = factories.UserFactory(with_owned_document=True)
+    user = factories.UserFactory()
 
     client = APIClient()
     client.force_login(user)
@@ -269,14 +255,7 @@ def test_api_documents_update_authenticated_owners(via, mock_user_teams):
     document = models.Document.objects.get(pk=document.pk)
     document_values = serializers.DocumentSerializer(instance=document).data
     for key, value in document_values.items():
-        if key in [
-            "id",
-            "created_at",
-            "creator",
-            "link_reach",
-            "link_role",
-            "nb_accesses",
-        ]:
+        if key in ["id", "accesses", "created_at", "link_reach", "link_role"]:
             assert value == old_document_values[key]
         elif key == "updated_at":
             assert value > old_document_values[key]
@@ -290,7 +269,7 @@ def test_api_documents_update_administrator_or_owner_of_another(via, mock_user_t
     Being administrator or owner of a document should not grant authorization to update
     another document.
     """
-    user = factories.UserFactory(with_owned_document=True)
+    user = factories.UserFactory()
 
     client = APIClient()
     client.force_login(user)

src/backend/core/tests/templates/test_api_template_accesses_create.py

@@ -1,206 +0,0 @@
-"""
-Test template accesses create API endpoint for users in impress's core app.
-"""
-
-import random
-
-import pytest
-from rest_framework.test import APIClient
-
-from core import factories, models
-from core.tests.conftest import TEAM, USER, VIA
-
-pytestmark = pytest.mark.django_db
-
-
-def test_api_template_accesses_create_anonymous():
-    """Anonymous users should not be allowed to create template accesses."""
-    template = factories.TemplateFactory()
-
-    other_user = factories.UserFactory()
-    response = APIClient().post(
-        f"/api/v1.0/templates/{template.id!s}/accesses/",
-        {
-            "user": str(other_user.id),
-            "template": str(template.id),
-            "role": random.choice(models.RoleChoices.choices)[0],
-        },
-        format="json",
-    )
-
-    assert response.status_code == 401
-    assert response.json() == {
-        "detail": "Authentication credentials were not provided."
-    }
-    assert models.TemplateAccess.objects.exists() is False
-
-
-def test_api_template_accesses_create_authenticated_unrelated():
-    """
-    Authenticated users should not be allowed to create template accesses for a template to
-    which they are not related.
-    """
-    user = factories.UserFactory(with_owned_template=True)
-
-    client = APIClient()
-    client.force_login(user)
-
-    other_user = factories.UserFactory()
-    template = factories.TemplateFactory()
-
-    response = client.post(
-        f"/api/v1.0/templates/{template.id!s}/accesses/",
-        {
-            "user": str(other_user.id),
-        },
-        format="json",
-    )
-
-    assert response.status_code == 403
-    assert not models.TemplateAccess.objects.filter(user=other_user).exists()
-
-
-@pytest.mark.parametrize("role", ["reader", "editor"])
-@pytest.mark.parametrize("via", VIA)
-def test_api_template_accesses_create_authenticated_editor_or_reader(
-    via, role, mock_user_teams
-):
-    """Editors or readers of a template should not be allowed to create template accesses."""
-    user = factories.UserFactory(with_owned_template=True)
-
-    client = APIClient()
-    client.force_login(user)
-
-    template = factories.TemplateFactory()
-    if via == USER:
-        factories.UserTemplateAccessFactory(template=template, user=user, role=role)
-    elif via == TEAM:
-        mock_user_teams.return_value = ["lasuite", "unknown"]
-        factories.TeamTemplateAccessFactory(
-            template=template, team="lasuite", role=role
-        )
-
-    other_user = factories.UserFactory()
-
-    for new_role in [role[0] for role in models.RoleChoices.choices]:
-        response = client.post(
-            f"/api/v1.0/templates/{template.id!s}/accesses/",
-            {
-                "user": str(other_user.id),
-                "role": new_role,
-            },
-            format="json",
-        )
-
-        assert response.status_code == 403
-
-    assert not models.TemplateAccess.objects.filter(user=other_user).exists()
-
-
-@pytest.mark.parametrize("via", VIA)
-def test_api_template_accesses_create_authenticated_administrator(via, mock_user_teams):
-    """
-    Administrators of a template should be able to create template accesses
-    except for the "owner" role.
-    """
-    user = factories.UserFactory(with_owned_template=True)
-
-    client = APIClient()
-    client.force_login(user)
-
-    template = factories.TemplateFactory()
-    if via == USER:
-        factories.UserTemplateAccessFactory(
-            template=template, user=user, role="administrator"
-        )
-    elif via == TEAM:
-        mock_user_teams.return_value = ["lasuite", "unknown"]
-        factories.TeamTemplateAccessFactory(
-            template=template, team="lasuite", role="administrator"
-        )
-
-    other_user = factories.UserFactory()
-
-    # It should not be allowed to create an owner access
-    response = client.post(
-        f"/api/v1.0/templates/{template.id!s}/accesses/",
-        {
-            "user": str(other_user.id),
-            "role": "owner",
-        },
-        format="json",
-    )
-
-    assert response.status_code == 403
-    assert response.json() == {
-        "detail": "Only owners of a resource can assign other users as owners."
-    }
-
-    # It should be allowed to create a lower access
-    role = random.choice(
-        [role[0] for role in models.RoleChoices.choices if role[0] != "owner"]
-    )
-
-    response = client.post(
-        f"/api/v1.0/templates/{template.id!s}/accesses/",
-        {
-            "user": str(other_user.id),
-            "role": role,
-        },
-        format="json",
-    )
-
-    assert response.status_code == 201
-    assert models.TemplateAccess.objects.filter(user=other_user).count() == 1
-    new_template_access = models.TemplateAccess.objects.filter(user=other_user).get()
-    assert response.json() == {
-        "abilities": new_template_access.get_abilities(user),
-        "id": str(new_template_access.id),
-        "team": "",
-        "role": role,
-        "user": str(other_user.id),
-    }
-
-
-@pytest.mark.parametrize("via", VIA)
-def test_api_template_accesses_create_authenticated_owner(via, mock_user_teams):
-    """
-    Owners of a template should be able to create template accesses whatever the role.
-    """
-    user = factories.UserFactory(with_owned_template=True)
-
-    client = APIClient()
-    client.force_login(user)
-
-    template = factories.TemplateFactory()
-    if via == USER:
-        factories.UserTemplateAccessFactory(template=template, user=user, role="owner")
-    elif via == TEAM:
-        mock_user_teams.return_value = ["lasuite", "unknown"]
-        factories.TeamTemplateAccessFactory(
-            template=template, team="lasuite", role="owner"
-        )
-
-    other_user = factories.UserFactory()
-
-    role = random.choice([role[0] for role in models.RoleChoices.choices])
-
-    response = client.post(
-        f"/api/v1.0/templates/{template.id!s}/accesses/",
-        {
-            "user": str(other_user.id),
-            "role": role,
-        },
-        format="json",
-    )
-
-    assert response.status_code == 201
-    assert models.TemplateAccess.objects.filter(user=other_user).count() == 1
-    new_template_access = models.TemplateAccess.objects.filter(user=other_user).get()
-    assert response.json() == {
-        "id": str(new_template_access.id),
-        "user": str(other_user.id),
-        "team": "",
-        "role": role,
-        "abilities": new_template_access.get_abilities(user),
-    }

src/backend/core/tests/templates/test_api_templates_retrieve.py

@@ -22,7 +22,7 @@ def test_api_templates_retrieve_anonymous_public():
         "abilities": {
             "destroy": False,
             "generate_document": True,
-            "accesses_manage": False,
+            "manage_accesses": False,
             "partial_update": False,
             "retrieve": True,
             "update": False,
@@ -68,7 +68,7 @@ def test_api_templates_retrieve_authenticated_unrelated_public():
         "abilities": {
             "destroy": False,
             "generate_document": True,
-            "accesses_manage": False,
+            "manage_accesses": False,
             "partial_update": False,
             "retrieve": True,
             "update": False,

src/backend/core/tests/test_api_config.py

@@ -1,47 +0,0 @@
-"""
-Test config API endpoints in the Impress core app.
-"""
-
-from django.test import override_settings
-
-import pytest
-from rest_framework.status import (
-    HTTP_200_OK,
-)
-from rest_framework.test import APIClient
-
-from core import factories
-
-pytestmark = pytest.mark.django_db
-
-
-@override_settings(
-    COLLABORATION_WS_URL="http://testcollab/",
-    CRISP_WEBSITE_ID="123",
-    FRONTEND_THEME="test-theme",
-    MEDIA_BASE_URL="http://testserver/",
-    POSTHOG_KEY={"id": "132456", "host": "https://eu.i.posthog-test.com"},
-    SENTRY_DSN="https://sentry.test/123",
-)
-@pytest.mark.parametrize("is_authenticated", [False, True])
-def test_api_config(is_authenticated):
-    """Anonymous users should be allowed to get the configuration."""
-    client = APIClient()
-
-    if is_authenticated:
-        user = factories.UserFactory()
-        client.force_login(user)
-
-    response = client.get("/api/v1.0/config/")
-    assert response.status_code == HTTP_200_OK
-    assert response.json() == {
-        "COLLABORATION_WS_URL": "http://testcollab/",
-        "CRISP_WEBSITE_ID": "123",
-        "ENVIRONMENT": "test",
-        "FRONTEND_THEME": "test-theme",
-        "LANGUAGES": [["en-us", "English"], ["fr-fr", "French"], ["de-de", "German"]],
-        "LANGUAGE_CODE": "en-us",
-        "MEDIA_BASE_URL": "http://testserver/",
-        "POSTHOG_KEY": {"id": "132456", "host": "https://eu.i.posthog-test.com"},
-        "SENTRY_DSN": "https://sentry.test/123",
-    }

src/backend/core/tests/test_api_template_accesses.py

@@ -32,7 +32,7 @@ def test_api_template_accesses_list_authenticated_unrelated():
     Authenticated users should not be allowed to list template accesses for a template
     to which they are not related.
     """
-    user = factories.UserFactory(with_owned_template=True)
+    user = factories.UserFactory()
 
     client = APIClient()
     client.force_login(user)
@@ -62,7 +62,7 @@ def test_api_template_accesses_list_authenticated_related(via, mock_user_teams):
     Authenticated users should be able to list template accesses for a template
     to which they are directly related, whatever their role in the template.
     """
-    user = factories.UserFactory(with_owned_template=True)
+    user = factories.UserFactory()
 
     client = APIClient()
     client.force_login(user)
@@ -146,7 +146,7 @@ def test_api_template_accesses_retrieve_authenticated_unrelated():
     Authenticated users should not be allowed to retrieve a template access for
     a template to which they are not related.
     """
-    user = factories.UserFactory(with_owned_template=True)
+    user = factories.UserFactory()
 
     client = APIClient()
     client.force_login(user)
@@ -183,7 +183,7 @@ def test_api_template_accesses_retrieve_authenticated_related(via, mock_user_tea
     A user who is related to a template should be allowed to retrieve the
     associated template user accesses.
     """
-    user = factories.UserFactory(with_owned_template=True)
+    user = factories.UserFactory()
 
     client = APIClient()
     client.force_login(user)
@@ -211,6 +211,199 @@ def test_api_template_accesses_retrieve_authenticated_related(via, mock_user_tea
     }
 
 
+def test_api_template_accesses_create_anonymous():
+    """Anonymous users should not be allowed to create template accesses."""
+    user = factories.UserFactory()
+    template = factories.TemplateFactory()
+
+    response = APIClient().post(
+        f"/api/v1.0/templates/{template.id!s}/accesses/",
+        {
+            "user": str(user.id),
+            "template": str(template.id),
+            "role": random.choice(models.RoleChoices.choices)[0],
+        },
+        format="json",
+    )
+
+    assert response.status_code == 401
+    assert response.json() == {
+        "detail": "Authentication credentials were not provided."
+    }
+    assert models.TemplateAccess.objects.exists() is False
+
+
+def test_api_template_accesses_create_authenticated_unrelated():
+    """
+    Authenticated users should not be allowed to create template accesses for a template to
+    which they are not related.
+    """
+    user = factories.UserFactory()
+
+    client = APIClient()
+    client.force_login(user)
+
+    other_user = factories.UserFactory()
+    template = factories.TemplateFactory()
+
+    response = client.post(
+        f"/api/v1.0/templates/{template.id!s}/accesses/",
+        {
+            "user": str(other_user.id),
+        },
+        format="json",
+    )
+
+    assert response.status_code == 403
+    assert not models.TemplateAccess.objects.filter(user=other_user).exists()
+
+
+@pytest.mark.parametrize("role", ["reader", "editor"])
+@pytest.mark.parametrize("via", VIA)
+def test_api_template_accesses_create_authenticated_editor_or_reader(
+    via, role, mock_user_teams
+):
+    """Editors or readers of a template should not be allowed to create template accesses."""
+    user = factories.UserFactory()
+
+    client = APIClient()
+    client.force_login(user)
+
+    template = factories.TemplateFactory()
+    if via == USER:
+        factories.UserTemplateAccessFactory(template=template, user=user, role=role)
+    elif via == TEAM:
+        mock_user_teams.return_value = ["lasuite", "unknown"]
+        factories.TeamTemplateAccessFactory(
+            template=template, team="lasuite", role=role
+        )
+
+    other_user = factories.UserFactory()
+
+    for new_role in [role[0] for role in models.RoleChoices.choices]:
+        response = client.post(
+            f"/api/v1.0/templates/{template.id!s}/accesses/",
+            {
+                "user": str(other_user.id),
+                "role": new_role,
+            },
+            format="json",
+        )
+
+        assert response.status_code == 403
+
+    assert not models.TemplateAccess.objects.filter(user=other_user).exists()
+
+
+@pytest.mark.parametrize("via", VIA)
+def test_api_template_accesses_create_authenticated_administrator(via, mock_user_teams):
+    """
+    Administrators of a template should be able to create template accesses
+    except for the "owner" role.
+    """
+    user = factories.UserFactory()
+
+    client = APIClient()
+    client.force_login(user)
+
+    template = factories.TemplateFactory()
+    if via == USER:
+        factories.UserTemplateAccessFactory(
+            template=template, user=user, role="administrator"
+        )
+    elif via == TEAM:
+        mock_user_teams.return_value = ["lasuite", "unknown"]
+        factories.TeamTemplateAccessFactory(
+            template=template, team="lasuite", role="administrator"
+        )
+
+    other_user = factories.UserFactory()
+
+    # It should not be allowed to create an owner access
+    response = client.post(
+        f"/api/v1.0/templates/{template.id!s}/accesses/",
+        {
+            "user": str(other_user.id),
+            "role": "owner",
+        },
+        format="json",
+    )
+
+    assert response.status_code == 403
+    assert response.json() == {
+        "detail": "Only owners of a resource can assign other users as owners."
+    }
+
+    # It should be allowed to create a lower access
+    role = random.choice(
+        [role[0] for role in models.RoleChoices.choices if role[0] != "owner"]
+    )
+
+    response = client.post(
+        f"/api/v1.0/templates/{template.id!s}/accesses/",
+        {
+            "user": str(other_user.id),
+            "role": role,
+        },
+        format="json",
+    )
+
+    assert response.status_code == 201
+    assert models.TemplateAccess.objects.filter(user=other_user).count() == 1
+    new_template_access = models.TemplateAccess.objects.filter(user=other_user).get()
+    assert response.json() == {
+        "abilities": new_template_access.get_abilities(user),
+        "id": str(new_template_access.id),
+        "team": "",
+        "role": role,
+        "user": str(other_user.id),
+    }
+
+
+@pytest.mark.parametrize("via", VIA)
+def test_api_template_accesses_create_authenticated_owner(via, mock_user_teams):
+    """
+    Owners of a template should be able to create template accesses whatever the role.
+    """
+    user = factories.UserFactory()
+
+    client = APIClient()
+    client.force_login(user)
+
+    template = factories.TemplateFactory()
+    if via == USER:
+        factories.UserTemplateAccessFactory(template=template, user=user, role="owner")
+    elif via == TEAM:
+        mock_user_teams.return_value = ["lasuite", "unknown"]
+        factories.TeamTemplateAccessFactory(
+            template=template, team="lasuite", role="owner"
+        )
+
+    other_user = factories.UserFactory()
+
+    role = random.choice([role[0] for role in models.RoleChoices.choices])
+
+    response = client.post(
+        f"/api/v1.0/templates/{template.id!s}/accesses/",
+        {
+            "user": str(other_user.id),
+            "role": role,
+        },
+        format="json",
+    )
+
+    assert response.status_code == 201
+    assert models.TemplateAccess.objects.filter(user=other_user).count() == 1
+    new_template_access = models.TemplateAccess.objects.filter(user=other_user).get()
+    assert response.json() == {
+        "id": str(new_template_access.id),
+        "user": str(other_user.id),
+        "team": "",
+        "role": role,
+        "abilities": new_template_access.get_abilities(user),
+    }
+
+
 def test_api_template_accesses_update_anonymous():
     """Anonymous users should not be allowed to update a template access."""
     access = factories.UserTemplateAccessFactory()
@@ -241,14 +434,14 @@ def test_api_template_accesses_update_authenticated_unrelated():
     Authenticated users should not be allowed to update a template access for a template to which
     they are not related.
     """
-    user = factories.UserFactory(with_owned_template=True)
+    user = factories.UserFactory()
 
     client = APIClient()
     client.force_login(user)
 
     access = factories.UserTemplateAccessFactory()
-
     old_values = serializers.TemplateAccessSerializer(instance=access).data
+
     new_values = {
         "id": uuid4(),
         "user": factories.UserFactory().id,
@@ -274,7 +467,7 @@ def test_api_template_accesses_update_authenticated_editor_or_reader(
     via, role, mock_user_teams
 ):
     """Editors or readers of a template should not be allowed to update its accesses."""
-    user = factories.UserFactory(with_owned_template=True)
+    user = factories.UserFactory()
 
     client = APIClient()
     client.force_login(user)
@@ -316,7 +509,7 @@ def test_api_template_accesses_update_administrator_except_owner(via, mock_user_
     A user who is a direct administrator in a template should be allowed to update a user
     access for this template, as long as they don't try to set the role to owner.
     """
-    user = factories.UserFactory(with_owned_template=True)
+    user = factories.UserFactory()
 
     client = APIClient()
     client.force_login(user)
@@ -336,8 +529,8 @@ def test_api_template_accesses_update_administrator_except_owner(via, mock_user_
         template=template,
         role=random.choice(["administrator", "editor", "reader"]),
     )
-
     old_values = serializers.TemplateAccessSerializer(instance=access).data
+
     new_values = {
         "id": uuid4(),
         "user_id": factories.UserFactory().id,
@@ -373,7 +566,7 @@ def test_api_template_accesses_update_administrator_from_owner(via, mock_user_te
     A user who is an administrator in a template, should not be allowed to update
     the user access of an "owner" for this template.
     """
-    user = factories.UserFactory(with_owned_template=True)
+    user = factories.UserFactory()
 
     client = APIClient()
     client.force_login(user)
@@ -393,8 +586,8 @@ def test_api_template_accesses_update_administrator_from_owner(via, mock_user_te
     access = factories.UserTemplateAccessFactory(
         template=template, user=other_user, role="owner"
     )
-
     old_values = serializers.TemplateAccessSerializer(instance=access).data
+
     new_values = {
         "id": uuid4(),
         "user_id": factories.UserFactory().id,
@@ -420,7 +613,7 @@ def test_api_template_accesses_update_administrator_to_owner(via, mock_user_team
     A user who is an administrator in a template, should not be allowed to update
     the user access of another user to grant template ownership.
     """
-    user = factories.UserFactory(with_owned_template=True)
+    user = factories.UserFactory()
 
     client = APIClient()
     client.force_login(user)
@@ -442,8 +635,8 @@ def test_api_template_accesses_update_administrator_to_owner(via, mock_user_team
         user=other_user,
         role=random.choice(["administrator", "editor", "reader"]),
     )
-
     old_values = serializers.TemplateAccessSerializer(instance=access).data
+
     new_values = {
         "id": uuid4(),
         "user_id": factories.UserFactory().id,
@@ -474,7 +667,7 @@ def test_api_template_accesses_update_owner(via, mock_user_teams):
     A user who is an owner in a template should be allowed to update
     a user access for this template whatever the role.
     """
-    user = factories.UserFactory(with_owned_template=True)
+    user = factories.UserFactory()
 
     client = APIClient()
     client.force_login(user)
@@ -492,8 +685,8 @@ def test_api_template_accesses_update_owner(via, mock_user_teams):
     access = factories.UserTemplateAccessFactory(
         template=template,
     )
-
     old_values = serializers.TemplateAccessSerializer(instance=access).data
+
     new_values = {
         "id": uuid4(),
         "user_id": factories.UserFactory().id,
@@ -530,21 +723,22 @@ def test_api_template_accesses_update_owner_self(via, mock_user_teams):
     A user who is owner of a template should be allowed to update
     their own user access provided there are other owners in the template.
     """
-    user = factories.UserFactory(with_owned_template=True)
+    user = factories.UserFactory()
 
     client = APIClient()
     client.force_login(user)
 
     template = factories.TemplateFactory()
-    if via == TEAM:
+    access = None
+    if via == USER:
+        access = factories.UserTemplateAccessFactory(
+            template=template, user=user, role="owner"
+        )
+    elif via == TEAM:
         mock_user_teams.return_value = ["lasuite", "unknown"]
         access = factories.TeamTemplateAccessFactory(
             template=template, team="lasuite", role="owner"
         )
-    else:
-        access = factories.UserTemplateAccessFactory(
-            template=template, user=user, role="owner"
-        )
 
     old_values = serializers.TemplateAccessSerializer(instance=access).data
     new_role = random.choice(["administrator", "editor", "reader"])
@@ -593,7 +787,7 @@ def test_api_template_accesses_delete_authenticated():
     Authenticated users should not be allowed to delete a template access for a
     template to which they are not related.
     """
-    user = factories.UserFactory(with_owned_template=True)
+    user = factories.UserFactory()
 
     client = APIClient()
     client.force_login(user)
@@ -605,7 +799,7 @@ def test_api_template_accesses_delete_authenticated():
     )
 
     assert response.status_code == 403
-    assert models.TemplateAccess.objects.count() == 2
+    assert models.TemplateAccess.objects.count() == 1
 
 
 @pytest.mark.parametrize("role", ["reader", "editor"])
@@ -615,7 +809,7 @@ def test_api_template_accesses_delete_editor_or_reader(via, role, mock_user_team
     Authenticated users should not be allowed to delete a template access for a
     template in which they are a simple editor or reader.
     """
-    user = factories.UserFactory(with_owned_template=True)
+    user = factories.UserFactory()
 
     client = APIClient()
     client.force_login(user)
@@ -631,7 +825,7 @@ def test_api_template_accesses_delete_editor_or_reader(via, role, mock_user_team
 
     access = factories.UserTemplateAccessFactory(template=template)
 
-    assert models.TemplateAccess.objects.count() == 3
+    assert models.TemplateAccess.objects.count() == 2
     assert models.TemplateAccess.objects.filter(user=access.user).exists()
 
     response = client.delete(
@@ -639,7 +833,7 @@ def test_api_template_accesses_delete_editor_or_reader(via, role, mock_user_team
     )
 
     assert response.status_code == 403
-    assert models.TemplateAccess.objects.count() == 3
+    assert models.TemplateAccess.objects.count() == 2
 
 
 @pytest.mark.parametrize("via", VIA)
@@ -687,7 +881,7 @@ def test_api_template_accesses_delete_administrator_on_owners(via, mock_user_tea
     Users who are administrators in a template should not be allowed to delete an ownership
     access from the template.
     """
-    user = factories.UserFactory(with_owned_template=True)
+    user = factories.UserFactory()
 
     client = APIClient()
     client.force_login(user)
@@ -705,7 +899,7 @@ def test_api_template_accesses_delete_administrator_on_owners(via, mock_user_tea
 
     access = factories.UserTemplateAccessFactory(template=template, role="owner")
 
-    assert models.TemplateAccess.objects.count() == 3
+    assert models.TemplateAccess.objects.count() == 2
     assert models.TemplateAccess.objects.filter(user=access.user).exists()
 
     response = client.delete(
@@ -713,7 +907,7 @@ def test_api_template_accesses_delete_administrator_on_owners(via, mock_user_tea
     )
 
     assert response.status_code == 403
-    assert models.TemplateAccess.objects.count() == 3
+    assert models.TemplateAccess.objects.count() == 2
 
 
 @pytest.mark.parametrize("via", VIA)
@@ -754,7 +948,7 @@ def test_api_template_accesses_delete_owners_last_owner(via, mock_user_teams):
     """
     It should not be possible to delete the last owner access from a template
     """
-    user = factories.UserFactory(with_owned_template=True)
+    user = factories.UserFactory()
 
     client = APIClient()
     client.force_login(user)
@@ -771,10 +965,10 @@ def test_api_template_accesses_delete_owners_last_owner(via, mock_user_teams):
             template=template, team="lasuite", role="owner"
         )
 
-    assert models.TemplateAccess.objects.count() == 2
+    assert models.TemplateAccess.objects.count() == 1
     response = client.delete(
         f"/api/v1.0/templates/{template.id!s}/accesses/{access.id!s}/",
     )
 
     assert response.status_code == 403
-    assert models.TemplateAccess.objects.count() == 2
+    assert models.TemplateAccess.objects.count() == 1

src/backend/core/tests/test_api_users.py

@@ -69,48 +69,6 @@ def test_api_users_list_query_email():
     assert user_ids == [str(nicole.id), str(frank.id)]
 
 
-def test_api_users_list_query_email_matching():
-    """While filtering by email, results should be filtered and sorted by similarity"""
-    user = factories.UserFactory()
-
-    client = APIClient()
-    client.force_login(user)
-
-    alice = factories.UserFactory(email="alice.johnson@example.gouv.fr")
-    factories.UserFactory(email="jane.smith@example.gouv.fr")
-    michael_wilson = factories.UserFactory(email="michael.wilson@example.gouv.fr")
-    factories.UserFactory(email="david.jones@example.gouv.fr")
-    michael_brown = factories.UserFactory(email="michael.brown@example.gouv.fr")
-    factories.UserFactory(email="sophia.taylor@example.gouv.fr")
-
-    response = client.get(
-        "/api/v1.0/users/?q=michael.johnson@example.gouv.f",
-    )
-    assert response.status_code == 200
-    user_ids = [user["id"] for user in response.json()["results"]]
-    assert user_ids == [str(michael_wilson.id)]
-
-    response = client.get("/api/v1.0/users/?q=michael.johnson@example.gouv.fr")
-
-    assert response.status_code == 200
-    user_ids = [user["id"] for user in response.json()["results"]]
-    assert user_ids == [str(michael_wilson.id), str(alice.id), str(michael_brown.id)]
-
-    response = client.get(
-        "/api/v1.0/users/?q=ajohnson@example.gouv.f",
-    )
-    assert response.status_code == 200
-    user_ids = [user["id"] for user in response.json()["results"]]
-    assert user_ids == [str(alice.id)]
-
-    response = client.get(
-        "/api/v1.0/users/?q=michael.wilson@example.gouv.f",
-    )
-    assert response.status_code == 200
-    user_ids = [user["id"] for user in response.json()["results"]]
-    assert user_ids == [str(michael_wilson.id)]
-
-
 def test_api_users_list_query_email_exclude_doc_user():
     """
     Authenticated users should be able to list users
@@ -162,8 +120,6 @@ def test_api_users_retrieve_me_authenticated():
     assert response.json() == {
         "id": str(user.id),
         "email": user.email,
-        "full_name": user.full_name,
-        "short_name": user.short_name,
     }
 
 

src/backend/core/tests/test_api_utils_ai_document_rate_throttles.py

@@ -1,127 +0,0 @@
-"""
-Test throttling on documents for the AI endpoint.
-"""
-
-from unittest.mock import patch
-
-from django.core.cache import cache
-from django.test import override_settings
-
-import pytest
-from rest_framework.response import Response
-from rest_framework.test import APIRequestFactory
-from rest_framework.views import APIView
-
-from core.api.utils import AIDocumentRateThrottle
-
-
-class DocumentAPIView(APIView):
-    """A simple view to test the throttle"""
-
-    throttle_classes = [AIDocumentRateThrottle]
-
-    def get(self, request, *args, **kwargs):
-        """Minimal get method for testing purposes."""
-        return Response({"message": "Success"})
-
-
-@pytest.fixture(autouse=True)
-def clear_cache():
-    """Fixture to clear the cache before each test."""
-    cache.clear()
-
-
-@override_settings(AI_DOCUMENT_RATE_THROTTLE_RATES={"minute": 3, "hour": 6, "day": 10})
-@patch("time.time")
-def test_api_utils_ai_document_rate_throttle_minute_limit(mock_time):
-    """Test that minute limit is enforced."""
-    api_rf = APIRequestFactory()
-    mock_time.return_value = 1000000
-
-    # Simulate requests to the document API
-    for _i in range(3):  # 3 first requests should be allowed
-        request = api_rf.get("/documents/1/")
-        response = DocumentAPIView.as_view()(request, pk=1)
-        assert response.status_code == 200
-
-    # Simulate passage of time
-    mock_time.return_value += 59
-
-    # 4th request should be throttled
-    request = api_rf.get("/documents/1/")
-    response = DocumentAPIView.as_view()(request, pk=1)
-    assert response.status_code == 429
-
-    # After the 60s backoff wait time has passed, we can make a request again
-    mock_time.return_value += 1
-
-    request = api_rf.get("/documents/1/")
-    response = DocumentAPIView.as_view()(request, pk=1)
-    assert response.status_code == 200
-
-
-@override_settings(
-    AI_DOCUMENT_RATE_THROTTLE_RATES={"minute": 100000, "hour": 6, "day": 10}
-)
-@patch("time.time")
-def test_ai_document_rate_throttle_hour_limit(mock_time):
-    """Test that the hour limit is enforced without hitting the minute limit."""
-    api_rf = APIRequestFactory()
-    mock_time.return_value = 1000000
-
-    # Make requests to the document API, one per 21 seconds to avoid hitting the minute limit
-    for _i in range(6):
-        request = api_rf.get("/documents/1/")
-        response = DocumentAPIView.as_view()(request, pk=1)
-        assert response.status_code == 200
-
-        # Simulate passage of time
-        mock_time.return_value += 21
-
-    # Simulate passage of time
-    mock_time.return_value += 3600 - 6 * 21 - 1
-
-    # 7th request should be throttled
-    request = api_rf.get("/documents/1/")
-    response = DocumentAPIView.as_view()(request, pk=1)
-    assert response.status_code == 429
-
-    # After the 1h backoff wait time has passed, we can make a request again
-    mock_time.return_value += 1
-
-    request = api_rf.get("/documents/1/")
-    response = DocumentAPIView.as_view()(request, pk=1)
-    assert response.status_code == 200
-
-
-@override_settings(AI_DOCUMENT_RATE_THROTTLE_RATES={"minute": 3, "hour": 6, "day": 10})
-@patch("time.time")
-def test_api_utils_ai_document_rate_throttle_day_limit(mock_time):
-    """Test that day limit is enforced."""
-    api_rf = APIRequestFactory()
-    mock_time.return_value = 1000000
-
-    # Make requests to the document API, one per 10 minutes to avoid hitting
-    # the minute and hour limits
-    for _i in range(10):  # 10 requests should be allowed
-        request = api_rf.get("/documents/1/")
-        response = DocumentAPIView.as_view()(request, pk=1)
-        assert response.status_code == 200
-
-        # Simulate passage of time
-        mock_time.return_value += 60 * 10
-
-    # Simulate passage of time
-    mock_time.return_value += 24 * 3600 - 10 * 60 * 10 - 1
-
-    # 11th request should be throttled
-    request = api_rf.get("/documents/1/")
-    response = DocumentAPIView.as_view()(request, pk=1)
-    assert response.status_code == 429
-
-    # After the 24h backoff wait time has passed we can make a request again
-    mock_time.return_value += 1
-
-    request = api_rf.get("/documents/1/")
-    response = DocumentAPIView.as_view()(request, pk=1)
-    assert response.status_code == 200

src/backend/core/tests/test_api_utils_ai_user_rate_throttles.py

@@ -1,146 +0,0 @@
-"""
-Test throttling on users for the AI endpoint.
-"""
-
-from unittest.mock import patch
-from uuid import uuid4
-
-from django.core.cache import cache
-from django.test import override_settings
-
-import pytest
-from rest_framework.response import Response
-from rest_framework.test import APIRequestFactory
-from rest_framework.views import APIView
-
-from core.api.utils import AIUserRateThrottle
-from core.factories import UserFactory
-
-pytestmark = pytest.mark.django_db
-
-
-class DocumentAPIView(APIView):
-    """A simple view to test the throttle"""
-
-    throttle_classes = [AIUserRateThrottle]
-
-    def get(self, request, *args, **kwargs):
-        """Minimal get method for testing purposes."""
-        return Response({"message": "Success"})
-
-
-@pytest.fixture(autouse=True)
-def clear_cache():
-    """Fixture to clear the cache before each test."""
-    cache.clear()
-
-
-@override_settings(AI_USER_RATE_THROTTLE_RATES={"minute": 3, "hour": 6, "day": 10})
-@patch("time.time")
-def test_api_utils_ai_user_rate_throttle_minute_limit(mock_time):
-    """Test that minute limit is enforced."""
-    user = UserFactory()
-    api_rf = APIRequestFactory()
-    mock_time.return_value = 1000000
-
-    # Simulate requests to the document API
-    for _i in range(3):  # 3 first requests should be allowed
-        document_id = str(uuid4())
-        request = api_rf.get(f"/documents/{document_id:s}/")
-        request.user = user
-        response = DocumentAPIView.as_view()(request, pk=document_id)
-        assert response.status_code == 200
-
-    # Simulate passage of time
-    mock_time.return_value += 59
-
-    # 4th request should be throttled
-    document_id = str(uuid4())
-    request = api_rf.get(f"/documents/{document_id:s}/")
-    request.user = user
-    response = DocumentAPIView.as_view()(request, pk=document_id)
-    assert response.status_code == 429
-
-    # After the 60s backoff wait time has passed, we can make a request again
-    mock_time.return_value += 1
-
-    document_id = str(uuid4())
-    request = api_rf.get(f"/documents/{document_id:s}/")
-    request.user = user
-    response = DocumentAPIView.as_view()(request, pk=document_id)
-    assert response.status_code == 200
-
-
-@override_settings(AI_USER_RATE_THROTTLE_RATES={"minute": 100000, "hour": 6, "day": 10})
-@patch("time.time")
-def test_ai_user_rate_throttle_hour_limit(mock_time):
-    """Test that the hour limit is enforced without hitting the minute limit."""
-    user = UserFactory()
-    api_rf = APIRequestFactory()
-    mock_time.return_value = 1000000
-
-    # Make requests to the document API, one per 21 seconds to avoid hitting the minute limit
-    for _i in range(6):
-        document_id = str(uuid4())
-        request = api_rf.get(f"/documents/{document_id:s}/")
-        request.user = user
-        response = DocumentAPIView.as_view()(request, pk=document_id)
-        assert response.status_code == 200
-
-        # Simulate passage of time
-        mock_time.return_value += 21
-
-    # Simulate passage of time
-    mock_time.return_value += 3600 - 6 * 21 - 1
-
-    # 7th request should be throttled
-    request = api_rf.get(f"/documents/{document_id:s}/")
-    request.user = user
-    response = DocumentAPIView.as_view()(request, pk=document_id)
-    assert response.status_code == 429
-
-    # After the 1h backoff wait time has passed, we can make a request again
-    mock_time.return_value += 1
-
-    request = api_rf.get(f"/documents/{document_id:s}/")
-    request.user = user
-    response = DocumentAPIView.as_view()(request, pk=document_id)
-    assert response.status_code == 200
-
-
-@override_settings(AI_USER_RATE_THROTTLE_RATES={"minute": 3, "hour": 6, "day": 10})
-@patch("time.time")
-def test_api_utils_ai_user_rate_throttle_day_limit(mock_time):
-    """Test that day limit is enforced."""
-    user = UserFactory()
-    api_rf = APIRequestFactory()
-    mock_time.return_value = 1000000
-
-    # Make requests to the document API, one per 10 minutes to avoid hitting
-    # the minute and hour limits
-    for _i in range(10):  # 10 requests should be allowed
-        document_id = str(uuid4())
-        request = api_rf.get(f"/documents/{document_id:s}/")
-        request.user = user
-        response = DocumentAPIView.as_view()(request, pk=document_id)
-        assert response.status_code == 200
-
-        # Simulate passage of time
-        mock_time.return_value += 60 * 10
-
-    # Simulate passage of time
-    mock_time.return_value += 24 * 3600 - 10 * 60 * 10 - 1
-
-    # 11th request should be throttled
-    request = api_rf.get(f"/documents/{document_id:s}/")
-    request.user = user
-    response = DocumentAPIView.as_view()(request, pk=document_id)
-    assert response.status_code == 429
-
-    # After the 24h backoff wait time has passed we can make a request again
-    mock_time.return_value += 1
-
-    request = api_rf.get(f"/documents/{document_id:s}/")
-    request.user = user
-    response = DocumentAPIView.as_view()(request, pk=document_id)
-    assert response.status_code == 200

src/backend/core/tests/test_models_documents.py

@@ -2,15 +2,9 @@
 Unit tests for the Document model
 """
 
-import smtplib
-from logging import Logger
-from unittest import mock
-
 from django.contrib.auth.models import AnonymousUser
-from django.core import mail
 from django.core.exceptions import ValidationError
 from django.core.files.storage import default_storage
-from django.utils import timezone
 
 import pytest
 
@@ -32,22 +26,15 @@ def test_models_documents_id_unique():
         factories.DocumentFactory(id=document.id)
 
 
-def test_models_documents_creator_required():
-    """No field should be required on the Document model."""
-    models.Document.objects.create()
-
-
 def test_models_documents_title_null():
     """The "title" field can be null."""
-    document = models.Document.objects.create(
-        title=None, creator=factories.UserFactory()
-    )
+    document = models.Document.objects.create(title=None)
     assert document.title is None
 
 
 def test_models_documents_title_empty():
     """The "title" field can be empty."""
-    document = models.Document.objects.create(title="", creator=factories.UserFactory())
+    document = models.Document.objects.create(title="")
     assert document.title == ""
 
 
@@ -90,17 +77,10 @@ def test_models_documents_get_abilities_forbidden(is_authenticated, reach, role)
     user = factories.UserFactory() if is_authenticated else AnonymousUser()
     abilities = document.get_abilities(user)
     assert abilities == {
-        "accesses_manage": False,
-        "accesses_view": False,
-        "ai_transform": False,
-        "ai_translate": False,
         "attachment_upload": False,
-        "collaboration_auth": False,
-        "destroy": False,
-        "favorite": False,
-        "invite_owner": False,
-        "media_auth": False,
         "link_configuration": False,
+        "destroy": False,
+        "manage_accesses": False,
         "partial_update": False,
         "retrieve": False,
         "update": False,
@@ -127,17 +107,10 @@ def test_models_documents_get_abilities_reader(is_authenticated, reach):
     user = factories.UserFactory() if is_authenticated else AnonymousUser()
     abilities = document.get_abilities(user)
     assert abilities == {
-        "accesses_manage": False,
-        "accesses_view": False,
-        "ai_transform": False,
-        "ai_translate": False,
         "attachment_upload": False,
-        "collaboration_auth": True,
         "destroy": False,
-        "favorite": is_authenticated,
-        "invite_owner": False,
         "link_configuration": False,
-        "media_auth": True,
+        "manage_accesses": False,
         "partial_update": False,
         "retrieve": True,
         "update": False,
@@ -164,17 +137,10 @@ def test_models_documents_get_abilities_editor(is_authenticated, reach):
     user = factories.UserFactory() if is_authenticated else AnonymousUser()
     abilities = document.get_abilities(user)
     assert abilities == {
-        "accesses_manage": False,
-        "accesses_view": False,
-        "ai_transform": True,
-        "ai_translate": True,
         "attachment_upload": True,
-        "collaboration_auth": True,
         "destroy": False,
-        "favorite": is_authenticated,
-        "invite_owner": False,
         "link_configuration": False,
-        "media_auth": True,
+        "manage_accesses": False,
         "partial_update": True,
         "retrieve": True,
         "update": True,
@@ -190,17 +156,10 @@ def test_models_documents_get_abilities_owner():
     access = factories.UserDocumentAccessFactory(role="owner", user=user)
     abilities = access.document.get_abilities(access.user)
     assert abilities == {
-        "accesses_manage": True,
-        "accesses_view": True,
-        "ai_transform": True,
-        "ai_translate": True,
         "attachment_upload": True,
-        "collaboration_auth": True,
         "destroy": True,
-        "favorite": True,
-        "invite_owner": True,
         "link_configuration": True,
-        "media_auth": True,
+        "manage_accesses": True,
         "partial_update": True,
         "retrieve": True,
         "update": True,
@@ -215,17 +174,10 @@ def test_models_documents_get_abilities_administrator():
     access = factories.UserDocumentAccessFactory(role="administrator")
     abilities = access.document.get_abilities(access.user)
     assert abilities == {
-        "accesses_manage": True,
-        "accesses_view": True,
-        "ai_transform": True,
-        "ai_translate": True,
         "attachment_upload": True,
-        "collaboration_auth": True,
         "destroy": False,
-        "favorite": True,
-        "invite_owner": False,
         "link_configuration": True,
-        "media_auth": True,
+        "manage_accesses": True,
         "partial_update": True,
         "retrieve": True,
         "update": True,
@@ -243,17 +195,10 @@ def test_models_documents_get_abilities_editor_user(django_assert_num_queries):
         abilities = access.document.get_abilities(access.user)
 
     assert abilities == {
-        "accesses_manage": False,
-        "accesses_view": True,
-        "ai_transform": True,
-        "ai_translate": True,
         "attachment_upload": True,
-        "collaboration_auth": True,
         "destroy": False,
-        "favorite": True,
-        "invite_owner": False,
         "link_configuration": False,
-        "media_auth": True,
+        "manage_accesses": False,
         "partial_update": True,
         "retrieve": True,
         "update": True,
@@ -273,17 +218,10 @@ def test_models_documents_get_abilities_reader_user(django_assert_num_queries):
         abilities = access.document.get_abilities(access.user)
 
     assert abilities == {
-        "accesses_manage": False,
-        "accesses_view": True,
-        "ai_transform": False,
-        "ai_translate": False,
         "attachment_upload": False,
-        "collaboration_auth": True,
         "destroy": False,
-        "favorite": True,
-        "invite_owner": False,
         "link_configuration": False,
-        "media_auth": True,
+        "manage_accesses": False,
         "partial_update": False,
         "retrieve": True,
         "update": False,
@@ -304,17 +242,10 @@ def test_models_documents_get_abilities_preset_role(django_assert_num_queries):
         abilities = access.document.get_abilities(access.user)
 
     assert abilities == {
-        "accesses_manage": False,
-        "accesses_view": True,
-        "ai_transform": False,
-        "ai_translate": False,
         "attachment_upload": False,
-        "collaboration_auth": True,
         "destroy": False,
-        "favorite": True,
-        "invite_owner": False,
         "link_configuration": False,
-        "media_auth": True,
+        "manage_accesses": False,
         "partial_update": False,
         "retrieve": True,
         "update": False,
@@ -324,7 +255,7 @@ def test_models_documents_get_abilities_preset_role(django_assert_num_queries):
     }
 
 
-def test_models_documents_get_versions_slice_pagination(settings):
+def test_models_documents_get_versions_slice(settings):
     """
     The "get_versions_slice" method should allow navigating all versions of
     the document with pagination.
@@ -337,7 +268,7 @@ def test_models_documents_get_versions_slice_pagination(settings):
         document.content = f"bar{i:d}"
         document.save()
 
-    # Add a document version not related to the first document
+    # Add a version not related to the first document
     factories.DocumentFactory()
 
     # - Get default max versions
@@ -355,7 +286,7 @@ def test_models_documents_get_versions_slice_pagination(settings):
         from_version_id=response["next_version_id_marker"]
     )
     assert response["is_truncated"] is False
-    assert len(response["versions"]) == 2
+    assert len(response["versions"]) == 3
     assert response["next_version_id_marker"] == ""
 
     # - Get custom max versions
@@ -365,30 +296,6 @@ def test_models_documents_get_versions_slice_pagination(settings):
     assert response["next_version_id_marker"] != ""
 
 
-def test_models_documents_get_versions_slice_min_datetime():
-    """
-    The "get_versions_slice" method should filter out versions anterior to
-    the from_datetime passed in argument and the current version.
-    """
-    document = factories.DocumentFactory()
-    from_dt = []
-    for i in range(6):
-        from_dt.append(timezone.now())
-        document.content = f"bar{i:d}"
-        document.save()
-
-    response = document.get_versions_slice(min_datetime=from_dt[2])
-
-    assert len(response["versions"]) == 3
-    for version in response["versions"]:
-        assert version["last_modified"] > from_dt[2]
-
-    response = document.get_versions_slice(min_datetime=from_dt[4])
-
-    assert len(response["versions"]) == 1
-    assert response["versions"][0]["last_modified"] > from_dt[4]
-
-
 def test_models_documents_version_duplicate():
     """A new version should be created in object storage only if the content has changed."""
     document = factories.DocumentFactory()
@@ -415,105 +322,3 @@ def test_models_documents_version_duplicate():
         Bucket=default_storage.bucket_name, Prefix=file_key
     )
     assert len(response["Versions"]) == 2
-
-
-def test_models_documents__email_invitation__success():
-    """
-    The email invitation is sent successfully.
-    """
-    document = factories.DocumentFactory()
-
-    # pylint: disable-next=no-member
-    assert len(mail.outbox) == 0
-
-    sender = factories.UserFactory(full_name="Test Sender", email="sender@example.com")
-    document.send_invitation_email(
-        "guest@example.com", models.RoleChoices.EDITOR, sender, "en"
-    )
-
-    # pylint: disable-next=no-member
-    assert len(mail.outbox) == 1
-
-    # pylint: disable-next=no-member
-    email = mail.outbox[0]
-
-    assert email.to == ["guest@example.com"]
-    email_content = " ".join(email.body.split())
-
-    assert (
-        f"Test Sender (sender@example.com) invited you with the role "editor" "
-        f"on the following document: {document.title}" in email_content
-    )
-    assert f"docs/{document.id}/" in email_content
-
-
-def test_models_documents__email_invitation__success_fr():
-    """
-    The email invitation is sent successfully in french.
-    """
-    document = factories.DocumentFactory()
-
-    # pylint: disable-next=no-member
-    assert len(mail.outbox) == 0
-
-    sender = factories.UserFactory(
-        full_name="Test Sender2", email="sender2@example.com"
-    )
-    document.send_invitation_email(
-        "guest2@example.com",
-        models.RoleChoices.OWNER,
-        sender,
-        "fr-fr",
-    )
-
-    # pylint: disable-next=no-member
-    assert len(mail.outbox) == 1
-
-    # pylint: disable-next=no-member
-    email = mail.outbox[0]
-
-    assert email.to == ["guest2@example.com"]
-    email_content = " ".join(email.body.split())
-
-    assert (
-        f"Test Sender2 (sender2@example.com) vous a invité avec le rôle "propriétaire" "
-        f"sur le document suivant: {document.title}" in email_content
-    )
-    assert f"docs/{document.id}/" in email_content
-
-
-@mock.patch(
-    "core.models.send_mail",
-    side_effect=smtplib.SMTPException("Error SMTPException"),
-)
-@mock.patch.object(Logger, "error")
-def test_models_documents__email_invitation__failed(mock_logger, _mock_send_mail):
-    """Check mail behavior when an SMTP error occurs when sent an email invitation."""
-    document = factories.DocumentFactory()
-
-    # pylint: disable-next=no-member
-    assert len(mail.outbox) == 0
-
-    sender = factories.UserFactory()
-    document.send_invitation_email(
-        "guest3@example.com",
-        models.RoleChoices.ADMIN,
-        sender,
-        "en",
-    )
-
-    # No email has been sent
-    # pylint: disable-next=no-member
-    assert len(mail.outbox) == 0
-
-    # Logger should be called
-    mock_logger.assert_called_once()
-
-    (
-        _,
-        emails,
-        exception,
-    ) = mock_logger.call_args.args
-
-    assert emails == ["guest3@example.com"]
-    assert isinstance(exception, smtplib.SMTPException)

src/backend/core/tests/test_models_invitations.py

@@ -2,12 +2,10 @@
 Unit tests for the Invitation model
 """
 
-from datetime import timedelta
-from unittest import mock
+import time
 
 from django.contrib.auth.models import AnonymousUser
 from django.core import exceptions
-from django.utils import timezone
 
 import pytest
 from faker import Faker
@@ -62,7 +60,7 @@ def test_models_invitations_role_among_choices():
         factories.InvitationFactory(role="boss")
 
 
-def test_models_invitations_is_expired():
+def test_models_invitations__is_expired(settings):
     """
     The 'is_expired' property should return False until validity duration
     is exceeded and True afterwards.
@@ -70,16 +68,13 @@ def test_models_invitations_is_expired():
     expired_invitation = factories.InvitationFactory()
     assert expired_invitation.is_expired is False
 
-    not_late = timezone.now() + timedelta(seconds=604799)
-    with mock.patch("django.utils.timezone.now", return_value=not_late):
-        assert expired_invitation.is_expired is False
+    settings.INVITATION_VALIDITY_DURATION = 1
+    time.sleep(1)
 
-    too_late = timezone.now() + timedelta(seconds=604800)  # 7 days
-    with mock.patch("django.utils.timezone.now", return_value=too_late):
-        assert expired_invitation.is_expired is True
+    assert expired_invitation.is_expired is True
 
 
-def test_models_invitationd_new_userd_convert_invitations_to_accesses():
+def test_models_invitation__new_user__convert_invitations_to_accesses():
     """
     Upon creating a new user, invitations linked to the email
     should be converted to accesses and then deleted.
@@ -114,7 +109,7 @@ def test_models_invitationd_new_userd_convert_invitations_to_accesses():
     ).exists()  # the other invitation remains
 
 
-def test_models_invitationd_new_user_filter_expired_invitations():
+def test_models_invitation__new_user__filter_expired_invitations():
     """
     Upon creating a new identity, valid invitations should be converted into accesses
     and expired invitations should remain unchanged.
@@ -144,8 +139,8 @@ def test_models_invitationd_new_user_filter_expired_invitations():
     ).exists()
 
 
-@pytest.mark.parametrize("num_invitations, num_queries", [(0, 3), (1, 7), (20, 7)])
-def test_models_invitationd_new_userd_user_creation_constant_num_queries(
+@pytest.mark.parametrize("num_invitations, num_queries", [(0, 3), (1, 6), (20, 6)])
+def test_models_invitation__new_user__user_creation_constant_num_queries(
     django_assert_num_queries, num_invitations, num_queries
 ):
     """
@@ -240,7 +235,7 @@ def test_models_document_invitations_get_abilities_reader(via, mock_user_teams):
 
     assert abilities == {
         "destroy": False,
-        "retrieve": False,
+        "retrieve": True,
         "partial_update": False,
         "update": False,
     }
@@ -265,7 +260,7 @@ def test_models_document_invitations_get_abilities_editor(via, mock_user_teams):
 
     assert abilities == {
         "destroy": False,
-        "retrieve": False,
+        "retrieve": True,
         "partial_update": False,
         "update": False,
     }

src/backend/core/tests/test_models_templates.py

@@ -3,7 +3,6 @@ Unit tests for the Template model
 """
 
 import os
-import time
 from unittest import mock
 
 from django.contrib.auth.models import AnonymousUser
@@ -62,7 +61,7 @@ def test_models_templates_get_abilities_anonymous_public():
         "destroy": False,
         "retrieve": True,
         "update": False,
-        "accesses_manage": False,
+        "manage_accesses": False,
         "partial_update": False,
         "generate_document": True,
     }
@@ -76,7 +75,7 @@ def test_models_templates_get_abilities_anonymous_not_public():
         "destroy": False,
         "retrieve": False,
         "update": False,
-        "accesses_manage": False,
+        "manage_accesses": False,
         "partial_update": False,
         "generate_document": False,
     }
@@ -90,7 +89,7 @@ def test_models_templates_get_abilities_authenticated_public():
         "destroy": False,
         "retrieve": True,
         "update": False,
-        "accesses_manage": False,
+        "manage_accesses": False,
         "partial_update": False,
         "generate_document": True,
     }
@@ -104,7 +103,7 @@ def test_models_templates_get_abilities_authenticated_not_public():
         "destroy": False,
         "retrieve": False,
         "update": False,
-        "accesses_manage": False,
+        "manage_accesses": False,
         "partial_update": False,
         "generate_document": False,
     }
@@ -119,7 +118,7 @@ def test_models_templates_get_abilities_owner():
         "destroy": True,
         "retrieve": True,
         "update": True,
-        "accesses_manage": True,
+        "manage_accesses": True,
         "partial_update": True,
         "generate_document": True,
     }
@@ -133,7 +132,7 @@ def test_models_templates_get_abilities_administrator():
         "destroy": False,
         "retrieve": True,
         "update": True,
-        "accesses_manage": True,
+        "manage_accesses": True,
         "partial_update": True,
         "generate_document": True,
     }
@@ -150,7 +149,7 @@ def test_models_templates_get_abilities_editor_user(django_assert_num_queries):
         "destroy": False,
         "retrieve": True,
         "update": True,
-        "accesses_manage": False,
+        "manage_accesses": False,
         "partial_update": True,
         "generate_document": True,
     }
@@ -167,7 +166,7 @@ def test_models_templates_get_abilities_reader_user(django_assert_num_queries):
         "destroy": False,
         "retrieve": True,
         "update": False,
-        "accesses_manage": False,
+        "manage_accesses": False,
         "partial_update": False,
         "generate_document": True,
     }
@@ -185,7 +184,7 @@ def test_models_templates_get_abilities_preset_role(django_assert_num_queries):
         "destroy": False,
         "retrieve": True,
         "update": False,
-        "accesses_manage": False,
+        "manage_accesses": False,
         "partial_update": False,
         "generate_document": True,
     }
@@ -204,7 +203,7 @@ def test_models_templates__generate_word():
     "pypandoc.convert_text",
     side_effect=RuntimeError("Conversion failed"),
 )
-def test_models_templates__generate_word__raise_error(_mock_pypandoc):
+def test_models_templates__generate_word__raise_error(_mock_send_mail):
     """
     Generate word document and assert no tmp files are left in /tmp folder
     even when the conversion fails.
@@ -215,5 +214,4 @@ def test_models_templates__generate_word__raise_error(_mock_pypandoc):
         template.generate_word("<p>Test body</p>", {})
     except RuntimeError as e:
         assert str(e) == "Conversion failed"
-        time.sleep(0.5)
         assert len([f for f in os.listdir("/tmp") if f.startswith("docx_")]) == 0