💬(frontend) rename Agent Connect mentions

Feedback from C Chausse. Outdated copy writting.

.github/workflows/deploy.yml

@@ -11,17 +11,34 @@ 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: "meet,secrets"
       -
         name: Checkout repository
         uses: actions/checkout@v4
+        with:
+          submodules: recursive
+          token: ${{ steps.app-token.outputs.token }}
+      -
+        name: Load sops secrets
+        uses: rouja/actions-sops@main
+        with:
+          secret-file: secrets/numerique-gouv/meet/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_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_WEBHOOK_URL }}
-          sig=$(echo -n ${data} | openssl dgst -sha1 -hmac ''${{ secrets.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}" ${{ secrets.ARGOCD_PRODUCTION_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
+          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:

.github/workflows/docker-hub.yml

@@ -19,9 +19,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: "meet,secrets"
       -
         name: Checkout repository
         uses: actions/checkout@v4
+        with:
+          submodules: recursive
+          token: ${{ steps.app-token.outputs.token }}
+      -
+        name: Load sops secrets
+        uses: rouja/actions-sops@main
+        with:
+          secret-file: secrets/numerique-gouv/meet/secrets.enc.env
+          age-key: ${{ secrets.SOPS_PRIVATE }}
       -
         name: Docker meta
         id: meta
@@ -31,7 +48,7 @@ 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
+        run: echo "$DOCKER_HUB_PASSWORD" | docker login -u "$DOCKER_HUB_USER" --password-stdin
       -
         name: Run trivy scan
         uses: numerique-gouv/action-trivy-cache@main
@@ -52,9 +69,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: "meet,secrets"
       -
         name: Checkout repository
         uses: actions/checkout@v4
+        with:
+          submodules: recursive
+          token: ${{ steps.app-token.outputs.token }}
+      -
+        name: Load sops secrets
+        uses: rouja/actions-sops@main
+        with:
+          secret-file: secrets/numerique-gouv/meet/secrets.enc.env
+          age-key: ${{ secrets.SOPS_PRIVATE }}
       -
         name: Docker meta
         id: meta
@@ -64,7 +98,7 @@ 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
+        run: echo "$DOCKER_HUB_PASSWORD" | docker login -u "$DOCKER_HUB_USER" --password-stdin
       -
         name: Run trivy scan
         uses: numerique-gouv/action-trivy-cache@main
@@ -83,45 +117,37 @@ jobs:
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
 
-  build-and-push-summary:
-    runs-on: ubuntu-latest
-    steps:
-      -
-        name: Checkout repository
-        uses: actions/checkout@v4
-      -
-        name: Docker meta
-        id: meta
-        uses: docker/metadata-action@v5
-        with:
-          images: lasuite/meet-summary
-      -
-        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: Build and push
-        uses: docker/build-push-action@v6
-        with:
-          context: ./src/summary
-          file: ./src/summary/Dockerfile
-          target: production
-          build-args: DOCKER_USER=${{ env.DOCKER_USER }}:-1000
-          push: ${{ github.event_name != 'pull_request' }}
-          tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}
-
   notify-argocd:
     needs:
       - build-and-push-frontend
       - build-and-push-backend
-      - build-and-push-summary
     runs-on: ubuntu-latest
-    if: github.event_name != 'pull_request'
+    if: |
+      github.event_name != 'pull_request'
     steps:
-      - uses: numerique-gouv/action-argocd-webhook-notification@main
-        id: notify
+      -
+        uses: actions/create-github-app-token@v1
+        id: app-token
         with:
-          deployment_repo_path: "${{ secrets.DEPLOYMENT_REPO_URL }}"
-          argocd_webhook_secret: "${{ secrets.ARGOCD_PREPROD_WEBHOOK_SECRET }}"
-          argocd_url: "${{ vars.ARGOCD_PREPROD_WEBHOOK_URL }}"
+          app-id: ${{ secrets.APP_ID }}
+          private-key: ${{ secrets.PRIVATE_KEY }}
+          owner: ${{ github.repository_owner }}
+          repositories: "meet,secrets"
+      -
+        name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          submodules: recursive
+          token: ${{ steps.app-token.outputs.token }}
+      -
+        name: Load sops secrets
+        uses: rouja/actions-sops@main
+        with:
+          secret-file: secrets/numerique-gouv/meet/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

.github/workflows/helmfile-linter.yml

@@ -0,0 +1,22 @@
+name: Helmfile lint
+run-name: Helmfile lint
+
+on:
+  pull_request:
+    branches:
+      - 'main'
+
+jobs:
+  helmfile-lint:
+    runs-on: ubuntu-latest
+    container:
+      image: ghcr.io/helmfile/helmfile:latest
+    steps:
+      -
+        uses: numerique-gouv/action-helmfile-lint@main
+        with:
+          app-id: ${{ secrets.APP_ID }}
+          age-key: ${{ secrets.SOPS_PRIVATE }}
+          private-key: ${{ secrets.PRIVATE_KEY }}
+          helmfile-src: "src/helm"
+          repositories: "meet,secrets"

.github/workflows/meet.yml

@@ -81,7 +81,7 @@ jobs:
       - name: Install Python
         uses: actions/setup-python@v5
         with:
-          python-version: "3.12"
+          python-version: "3.10"
       - name: Install development dependencies
         run: pip install --user .[dev]
       - name: Check code formatting with ruff
@@ -110,16 +110,6 @@ jobs:
           - 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
-      redis:
-        image: redis:5
-        ports:
-          - 6379:6379
-        # Set health checks to wait until redis has started
-        options: >-
-          --health-cmd "redis-cli ping"
-          --health-interval 10s
-          --health-timeout 5s
-          --health-retries 5
 
     env:
       DJANGO_CONFIGURATION: Test
@@ -131,13 +121,9 @@ jobs:
       DB_USER: dinum
       DB_PASSWORD: pass
       DB_PORT: 5432
-      REDIS_URL: redis://localhost:6379/1
       STORAGES_STATICFILES_BACKEND: django.contrib.staticfiles.storage.StaticFilesStorage
       LIVEKIT_API_SECRET: secret
       LIVEKIT_API_KEY: devkey
-      AWS_S3_ENDPOINT_URL: http://localhost:9000
-      AWS_S3_ACCESS_KEY_ID: meet
-      AWS_S3_SECRET_ACCESS_KEY: password
 
     steps:
       - name: Checkout repository
@@ -155,37 +141,10 @@ jobs:
           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=meet" \
-            -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: Wait for MinIO to be ready
-        run: |
-          dockerize -wait tcp://localhost:9000 -timeout 10s
-
-      - 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 meet http://localhost:9000 meet password && \
-            mc alias ls && \
-            mc mb meet/meet-media-storage"
-
       - name: Install Python
         uses: actions/setup-python@v5
         with:
-          python-version: "3.12"
+          python-version: "3.10"
 
       - name: Install development dependencies
         run: pip install --user .[dev]
@@ -216,36 +175,69 @@ jobs:
       - name: Check format
         run: cd src/frontend/ && npm run check
 
-  lint-sdk:
+  i18n-crowdin:
     runs-on: ubuntu-latest
-    defaults:
-      run:
-        working-directory: src/sdk/library
     steps:
-      - name: Checkout repository
+      -
+        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: "infrastructure,secrets"
+      -
+        name: Checkout repository
         uses: actions/checkout@v4
+        with:
+          submodules: recursive
+          token: ${{ steps.app-token.outputs.token }}
+      -
+        name: Load sops secrets
+        uses: rouja/actions-sops@main
+        with:
+          secret-file: secrets/numerique-gouv/meet/secrets.enc.env
+          age-key: ${{ secrets.SOPS_PRIVATE }}
+
+      - name: Install gettext (required to make messages)
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y gettext
+
+      - name: Install Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: "3.10"
+
+      - name: Install development dependencies
+        working-directory: src/backend
+        run: pip install --user .[dev]
+
+      - name: Generate the translation base file
+        run: ~/.local/bin/django-admin makemessages --keep-pot --all
+
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: "18.x"
+          cache: "npm"
+          cache-dependency-path: src/frontend/package-lock.json
 
       - name: Install dependencies
-        run: npm ci
+        run: cd src/frontend/ && npm ci
 
-      - name: Check linting
-        run: npm run lint
+      - name: Extract the frontend translation
+        run: make frontend-i18n-extract
 
-      - name: Check format
-        run: npm run check
-
-  build-sdk:
-    runs-on: ubuntu-latest
-    needs: lint-sdk
-    defaults:
-      run:
-        working-directory: src/sdk/library
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-
-      - name: Install dependencies
-        run: npm ci
-
-      - name: Build SDK
-        run: npm run build
+      - name: Upload files to Crowdin
+        uses: crowdin/github-action@v2
+        with:
+          config: crowdin/config.yml
+          upload_sources: true
+          upload_translations: true
+          download_translations: false
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          CROWDIN_PROJECT_ID: ${{ secrets.CROWDIN_PROJECT_ID }}
+          CROWDIN_BASE_PATH: ${{ github.workspace }}
+          CROWDIN_PERSONAL_TOKEN: ${{ secrets.CROWDIN_PERSONAL_TOKEN }}

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

@@ -1,33 +0,0 @@
-name: Release Chart
-run-name: Release Chart
-
-on:
-  push:
-    paths:
-      - src/helm/meet/**
-
-jobs:
-  release:
-    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
-          linting: on
-          token: ${{ secrets.GITHUB_TOKEN }}

.gitignore

@@ -79,6 +79,3 @@ db.sqlite3
 
 # Egress output
 docker/livekit/out
-
-# LiveKit CA configuration
-docker/livekit/rootCA.pem

.gitmodules

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

CHANGELOG.md

@@ -1,4 +1,3 @@
-
 # Changelog
 
 All notable changes to this project will be documented in this file.

CODE_OF_CONDUCT.md

@@ -1,76 +0,0 @@
-# Contributor Covenant Code of Conduct
-
-## Our Pledge
-
-In the interest of fostering an open and welcoming environment, we as
-contributors and maintainers pledge to making participation in our project and
-our community a harassment-free experience for everyone, regardless of age, body
-size, disability, ethnicity, sex characteristics, gender identity and expression,
-level of experience, education, socio-economic status, nationality, personal
-appearance, race, religion, or sexual identity and orientation.
-
-## Our Standards
-
-Examples of behavior that contributes to creating a positive environment
-include:
-
-* Using welcoming and inclusive language
-* Being respectful of differing viewpoints and experiences
-* Gracefully accepting constructive criticism
-* Focusing on what is best for the community
-* Showing empathy towards other community members
-
-Examples of unacceptable behavior by participants include:
-
-* The use of sexualized language or imagery and unwelcome sexual attention or
-  advances
-* Trolling, insulting/derogatory comments, and personal or political attacks
-* Public or private harassment
-* Publishing others' private information, such as a physical or electronic
-  address, without explicit permission
-* Other conduct which could reasonably be considered inappropriate in a
-  professional setting
-
-## Our Responsibilities
-
-Project maintainers are responsible for clarifying the standards of acceptable
-behavior and are expected to take appropriate and fair corrective action in
-response to any instances of unacceptable behavior.
-
-Project maintainers have the right and responsibility to remove, edit, or
-reject comments, commits, code, wiki edits, issues, and other contributions
-that are not aligned to this Code of Conduct, or to ban temporarily or
-permanently any contributor for other behaviors that they deem inappropriate,
-threatening, offensive, or harmful.
-
-## Scope
-
-This Code of Conduct applies both within project spaces and in public spaces
-when an individual is representing the project or its community. Examples of
-representing a project or community include using an official project e-mail
-address, posting via an official social media account, or acting as an appointed
-representative at an online or offline event. Representation of a project may be
-further defined and clarified by project maintainers.
-
-## Enforcement
-
-Instances of abusive, harassing, or otherwise unacceptable behavior may be
-reported by contacting the project team at visio@numerique.gouv.fr. All
-complaints will be reviewed and investigated and will result in a response that
-is deemed necessary and appropriate to the circumstances. The project team is
-obligated to maintain confidentiality with regard to the reporter of an incident.
-Further details of specific enforcement policies may be posted separately.
-
-Project maintainers who do not follow or enforce the Code of Conduct in good
-faith may face temporary or permanent repercussions as determined by other
-members of the project's leadership.
-
-## Attribution
-
-This Code of Conduct is adapted from the [PostHog Code of Conduct](https://github.com/PostHog/posthog/blob/master/CODE_OF_CONDUCT.md), inspired from Contributor Covenant version 1.4,
-available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html
-
-[homepage]: https://www.contributor-covenant.org
-
-For answers to common questions about this code of conduct, see
-https://www.contributor-covenant.org/faq

CONTRIBUTING.md

@@ -1,77 +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/suitenumerique/meet/blob/main/README.md) for detailed instructions.
-
-Please also check out our [dev handbook](https://suitenumerique.gitbook.io/handbook) to learn our best practices.
-
-
-## 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).
-
-
-## 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! 👍

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2024-2025 DINUM/Etalab
+Copyright (c) 2023 Direction Interministérielle du Numérique - Gouvernement Français
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

LICENSE.md

@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2024-2025 DINUM/Etalab
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.

LICENSES/LICENSE.Etalab-2.0.md

@@ -1,79 +0,0 @@
-# LICENCE OUVERTE 2.0/OPEN LICENCE 2.0
-
-## Réutilisation de l’« Information » sous  cette licence
-
-Le « Concédant » concède au « Réutilisateur » un droit non exclusif et gratuit de libre  « Réutilisation » de l’« Information » objet de la présente licence, à des fins commerciales ou non, dans le monde entier et pour une durée illimitée, dans les conditions exprimées ci-dessous.
-
-**Le « Réutilisateur » est libre de réutiliser l’« Information » :**
-
--   de la communiquer, la reproduire, la copier ;
--   de l’adapter, la modifier, l’extraire et la transformer, notamment pour créer des « Informations dérivées » ;
--   de la diffuser, la redistribuer, la publier et la transmettre, de l’exploiter à titre commercial, par exemple en la combinant avec d’autres informations, ou en l’incluant dans votre propre produit ou application.
-
-**Sous réserve de :**
-
--   mentionner la paternité de l’«Information» : sa source (a minima le nom du  « Concédant ») et la date de la dernière mise à jour de l’« Information » réutilisée.
-
-Le « Réutilisateur » peut notamment s’ acquitter de cette condition en indiquant l’adresse (URL) renvoyant vers « l’Information » et assurant une mention effective de sa paternité.
-
-**Par exemple :**
-
-Dans le cas d’une réutilisation de la base SIRENE de l’INSEE, mentionner l’URL du « Concédant » : www.insee.fr + la date de dernière mise à jour de l’Information réutilisée.
-
-Cette mention de paternité ne doit ni conférer un caractère officiel à la « Réutilisation » de l’« Information », ni suggérer une quelconque reconnaissance ou caution par le « Concédant », ou par toute autre entité publique, du « Réutilisateur » ou de sa « Réutilisation ».
-
-## Données à caractère personnel
-
-L’« Information » mise à disposition peut contenir des « Données à caractère personnel » pouvant faire l’objet d’une « Réutilisation ». Alors, le « Concédant » informe le « Réutilisateur » (par tous moyens) de leur présence, l’ « Information » peut être librement réutilisée, sans faire obstacle aux libertés accordées par la présente licence, à condition de respecter le cadre légal relatif à la protection des données à caractère personnel.
-
-## Droits de propriété intellectuelle
-
-Il est garanti au « Réutilisateur » que l’ « Information » ne contient pas de « Droits de propriété intellectuelle »  appartenant à des tiers qui pourraient faire obstacle aux libertés qui lui sont accordées par la présente licence.
-
-Les éventuels « Droits de propriété intellectuelle » détenus par le « Concédant » sur l’ « Information » ne font pas obstacle aux libertés qui sont accordées par la présente licence. Lorsque le « Concédant » détient des « Droits de propriété intellectuelle » » sur l’ « Information », il les cède au « Réutilisateur » de façon non exclusive, à titre gracieux, pour le monde entier, pour toute la durée des « Droits de propriété intellectuelle », et le « Réutilisateur »  peut en faire tout usage conformément aux libertés et aux conditions définies par la présente licence.
-
-## Responsabilité
-
-L’ «Information» est mise à disposition telle que produite ou reçue, sans autre garantie expresse ou tacite qui n’est pas prévue par la présente licence. L’absence de défauts ou d’erreurs éventuellement contenues dans l’ «Information», comme la fourniture continue de l’ « Information » n’est pas garantie par le «Concédant». Il ne peut être tenu pour responsable de toute perte, préjudice ou dommage de quelque sorte causé à des tiers du fait de la « Réutilisation ».
-
-Le « Réutilisateur » est seul responsable de la « Réutilisation » de l’« Information ».
-
-La « Réutilisation » ne doit pas induire en erreur des tiers quant au contenu de l’« Information », sa source et sa date de mise à jour.
-
-## Droit applicable
-
-La présente licence est régie par le droit français.
-
-### Compatibilité de la présente licence
-
-Elle a été conçue pour être compatible avec toute licence libre qui exige _a minima_ la mention de paternité. Elle est notamment compatible avec la version antérieure de la présente licence ainsi qu’avec les licences « Open Government Licence » (OGL) du Royaume-Uni, « Creative Commons Attribution » (CC-BY) de Creative Commons et « Open Data Commons Attribution » (ODC-BY) de l’Open Knowledge Foundation.
-
-## Définitions
-
-Sont considérés, au sens de la présente licence comme :
-
--   Le « **Concédant** » : toute personne concédant un droit de « Réutilisation » sur l’« Information » dans les libertés et les conditions prévues par la présente licence.
--   L’« **Information** » :
-    -   toute information publique figurant dans des documents communiqués ou publiés par une administration mentionnée au premier alinéa de l’article L.300-2 du CRPA ;
-    -   toute information mise à disposition par toute personne selon les termes et conditions de la présente licence.
--   La « **Réutilisation** » : l’utilisation de l’« Information » à d’autres fins que celles pour lesquelles elle a été produite ou reçue.
--   Le « **Réutilisateur** » : toute personne qui réutilise les « Informations »  conformément aux conditions de la présente licence.
--   Des « **Données à caractère personnel** » : toute information se rapportant à une personne physique identifiée ou identifiable, pouvant être identifiée directement ou indirectement. Leur « Réutilisation » est subordonnée au respect du cadre juridique en vigueur.
--   Une « **Information dérivée** » : toute nouvelle donnée ou information créées directement à partir de l’« Information » ou à partir d’une combinaison  de l’ « Information » et d’autres données ou informations non  soumises à cette licence.
--   Les « **Droits de propriété intellectuelle** » : tous droits identifiés comme tels par le Code de la propriété intellectuelle (droit d’auteur, droits voisins au droit d’auteur, droit sui generis des producteurs de bases de données).
-
-## À propos de cette licence
-
-La présente licence a vocation à être utilisée par les administrations pour la réutilisation de leurs informations publiques. Elle peut également être utilisée par toute personne souhaitant mettre à disposition de l’« Information » dans les conditions définies par la présente licence
-
-La France est dotée d’un cadre juridique global visant à une diffusion spontanée par les administrations de leurs informations publiques afin d’en permettre la plus large réutilisation.
-
-Le droit de la « Réutilisation » de l’« Information » des administrations est régi par le code des relations entre le public et l’administration (CRPA) et, le cas échéant, le code du patrimoine (livre II relatif aux archives).
-
-Cette licence facilite la réutilisation libre et gratuite des informations publiques et figure parmi les licences qui peuvent être utilisées par l’administration en vertu du décret pris en application de l’article L.323-2 du CRPA.
-
-Etalab est la mission chargée, sous l’autorité du Premier ministre, d’ouvrir le plus grand nombre de données publiques des administrations de l’État et de ses établissements publics. Elle a réalisé la Licence Ouverte pour faciliter la réutilisation libre et gratuite de ces informations publiques, telles que définies par l’article L321-1 du CRPA.
-
-Cette licence est une version 2.0 de la Licence Ouverte.
-
-Etalab se réserve la faculté de proposer de nouvelles versions de la Licence Ouverte. Cependant, les « Réutilisateurs » pourront continuer à réutiliser les informations disponibles sous cette licence s’ils le souhaitent.

Makefile

@@ -88,20 +88,10 @@ bootstrap: \
 .PHONY: bootstrap
 
 # -- Docker/compose
-build: ## build the project containers
-	@$(MAKE) build-backend
-	@$(MAKE) build-frontend
+build: ## build the app-dev container
+	@$(COMPOSE) build app-dev --no-cache
 .PHONY: build
 
-build-backend: ## build the app-dev container
-	@$(COMPOSE) build app-dev
-.PHONY: build-backend
-
-
-build-frontend: ## build the frontend container
-	@$(COMPOSE) build frontend
-.PHONY: build-frontend
-
 down: ## stop and remove containers, networks, images, and volumes
 	@$(COMPOSE) down
 .PHONY: down
@@ -110,16 +100,10 @@ logs: ## display app-dev logs (follow mode)
 	@$(COMPOSE) logs -f app-dev
 .PHONY: logs
 
-run-backend: ## start only the backend application and all needed services
+run: ## start the wsgi (production) and development server
 	@$(COMPOSE) up --force-recreate -d celery-dev
 	@echo "Wait for postgresql to be up..."
 	@$(WAIT_DB)
-.PHONY: run-backend
-
-run:
-run: ## start the wsgi (production) and development server
-	@$(MAKE) run-backend
-	@$(COMPOSE) up --force-recreate -d frontend
 .PHONY: run
 
 status: ## an alias for "docker compose ps"
@@ -130,25 +114,6 @@ stop: ## stop the development server using Docker
 	@$(COMPOSE) stop
 .PHONY: stop
 
-# -- Front
-
-frontend-development-install: ## install the frontend locally
-	cd $(PATH_FRONT) && npm i
-.PHONY: frontend-development-install
-
-frontend-lint: ## run the frontend linter
-	cd $(PATH_FRONT) && npm run lint
-.PHONY: frontend-lint
-
-frontend-format: ## run the frontend format
-	cd $(PATH_FRONT) && npm run format
-.PHONY: frontend-format
-
-run-frontend-development: ## run the frontend in development mode
-	@$(COMPOSE) stop frontend
-	cd $(PATH_FRONT) && npm run dev
-.PHONY: run-frontend-development
-
 # -- Backend
 
 demo: ## flush db then create a demo for load testing purpose
@@ -336,14 +301,8 @@ build-k8s-cluster: ## build the kubernetes cluster using kind
 	./bin/start-kind.sh
 .PHONY: build-k8s-cluster
 
-install-external-secrets: ## install the kubernetes secrets from Vaultwarden
-	./bin/install-external-secrets.sh
-.PHONY: build-k8s-cluster
-
 start-tilt: ## start the kubernetes cluster using kind
+	kubectl config set-context --current --namespace=meet
 	tilt up -f ./bin/Tiltfile
 .PHONY: build-k8s-cluster
 
-start-tilt-keycloak: ## start the kubernetes cluster using kind, without Pro Connect for authentication, use keycloak
-	DEV_ENV=dev-keycloak tilt up -f ./bin/Tiltfile
-.PHONY: build-k8s-cluster

README.md

@@ -1,119 +1,155 @@
-<p align="center">
-  <img alt="meet logo" src="./docs/assets/banner-meet-fr.png" maxWidth="100%">
-</p>
+# Meet
+
+Meet is a simple video and phone conferencing tool, powered by [LiveKit](https://livekit.io/).
+
+Meet is built on top of [Django Rest
+Framework](https://www.django-rest-framework.org/) and [Vite.js](https://vitejs.dev/).
+
+## Getting started
+
+### Prerequisite
+
+#### Docker
+
+Make sure you have a recent version of Docker and [Docker
+Compose](https://docs.docker.com/compose/install) installed on your laptop:
+
+```bash
+$ docker -v
+  Docker version 20.10.2, build 2291f61
+
+$ 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.
+
+#### LiveKit CLI
+
+Install LiveKit CLI, which provides utilities for interacting with the LiveKit ecosystem (including the server, egress, and more), please follow the instructions available in the [official repository](https://github.com/livekit/livekit-cli).
+
+### Project bootstrap
+
+The easiest way to start working on the project is to use GNU Make:
+
+```bash
+$ make bootstrap FLUSH_ARGS='--no-input'
+```
+
+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: meet
+password: meet
+```
+---
+
+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-related or migration-related issues.
+
+Your Docker services should now be up and running 🎉
+
+[FIXME] Explain how to run the frontend project.
+
+### Configure LiveKit CLI
+
+For the optimal DX, create a default project named `meet` to use with `livekit-cli` commands:
+```bash
+$ livekit-cli project add
+URL: http://localhost:7880
+API Key: devkey
+API Secret: secret
+Give it a name for later reference: meet
+? Make this project default?? [y/N] y
+```
+
+Thus, you won't need to pass the project API Key and API Secret for each command.
 
 
-<p align="center">
-  <a href="https://github.com/suitenumerique/meet/stargazers/">
-    <img src="https://img.shields.io/github/stars/suitenumerique/meet" alt="">
-  </a>
-  <a href='http://makeapullrequest.com'><img alt='PRs Welcome' src='https://img.shields.io/badge/PRs-welcome-brightgreen.svg?style=shields'/></a>
-  <img alt="GitHub commit activity" src="https://img.shields.io/github/commit-activity/m/suitenumerique/meet"/>
-  <img alt="GitHub closed issues" src="https://img.shields.io/github/issues-closed/suitenumerique/meet"/>
-  <a href="https://github.com/suitenumerique/meet/blob/main/LICENSE">
-    <img alt="GitHub closed issues" src="https://img.shields.io/github/license/suitenumerique/meet"/>
-  </a>    
-</p>
+### Adding content
 
-<p align="center">
-  <a href="https://livekit.io/">LiveKit</a> - <a href="https://matrix.to/#/#meet-official:matrix.org">Chat with us</a> - <a href="https://github.com/orgs/suitenumerique/projects/3/views/2">Roadmap</a> - <a href="https://github.com/suitenumerique/meet/blob/main/CHANGELOG.md">Changelog</a> - <a href="https://github.com/suitenumerique/meet/issues/new?assignees=&labels=bug&template=Bug_report.md">Bug reports</a> 
-</p>
+You can create a basic demo site by running:
 
-<p align="center">
-  <a href="https://visio.numerique.gouv.fr/">
-    <img src="https://github.com/user-attachments/assets/09c1faa1-de88-4848-af3a-6fbe793999bf" alt="La Suite Meet Demonstration">
-  </a>
-</p>
+```bash
+$ make demo
+```
 
-## La Suite Meet: Simple Video Conferencing
+Finally, you can check all available Make rules using:
 
-Powered by [LiveKit](https://livekit.io/), La Suite Meet offers Zoom-level performance with high-quality video and audio. No installation required—simply join calls directly from your browser. Check out LiveKit's impressive optimizations in their [blog post](https://blog.livekit.io/livekit-one-dot-zero/).
-### Features
-- Optimized for stability in large meetings (+100 p.)
-- Support for multiple screen sharing streams
-- Non-persistent, secure chat
-- End-to-end encryption (coming soon)
-- Meeting recording (coming soon)
-- Meeting transcription (currently in beta)
-- Telephony integration (in development)
-- Secure participation with robust authentication and access control
-- LiveKit Advances features including :
-  - speaker detection 
-  - simulcast 
-  - end-to-end optimizations 
-  - selective subscription
-  - SVC codecs (VP9, AV1)
+```bash
+$ make help
+```
+
+### Django 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:
+
+```bash
+$ make superuser
+```
+
+### Run application on local Kubernetes
+
+The application is deployed across staging, preprod, and production environments using Kubernetes (K8s).
+Reproducing environment conditions locally is crucial for developing new features or debugging issues.
+
+This is facilitated by [Tilt](https://tilt.dev/) ("Kubernetes for Prod, Tilt for Dev").  Tilt enables smart rebuilds and live updates for services running locally in Kubernetes.  We defined our services in a Tiltfile located at `bin/Tiltfile`.
 
 
-La Suite Meet is fully self-hostable and released under the MIT License, ensuring complete control and flexibility. It's simple to [get started](https://visio.numerique.gouv.fr/) or [request a demo](mailto:visio@numerique.gouv.fr). 
+#### Getting Started
 
-We’re continuously adding new features to enhance your experience, with the latest updates coming soon!
+Make sure you have installed:
+- kubectl
+- helm
+- helmfile
+- tilt
 
+To build and start the Kubernetes cluster using Kind:
+```shell
+$ make build-k8s-cluster 
+```
 
-## Table of Contents
+Once the Kubernetes cluster is ready, start the application stack locally:
+```shell
+$ make start-tilt
+```
+These commands set up and run your application environment using Tilt for local Kubernetes development.
 
-- [Get started](#get-started)
-- [Docs](#docs)
-- [Contributing](#contributing)
-- [Philosophy](#philosophy)
-- [Open source](#open-source)
+You can monitor Tilt's at `http://localhost:10350/`. After Tilt actions finish, you can access the app at `https://meet.127.0.0.1.nip.io/`.
 
+#### Debugging frontend
 
-## Get started
+Tilt deploys the `meet-dev` for the frontend by default, to benefit from Vite.js hot reloading while developing. 
+To troubleshoot production issues, please modify the Tiltfile, switch frontend's target to `frontend-production`:
 
-### La Suite Meet Cloud (Recommended)
-Sign up for La Suite Meet Cloud, designed for french public servants. Hosted on SecNumCloud-compliant providers and accessible via government SSO, [ProConnect](https://www.proconnect.gouv.fr/). The easiest way to try our product. Reach out if your entity isn't connected yet to our sso.
+```yaml
+...
 
-### Open-source deployment (Advanced)
-
-Deploy La Suite Meet on your own infrastructure using [our self-hosting guide](https://github.com/suitenumerique/meet/blob/main/docs/installation.md). Our open-source deployment is optimized for Kubernetes, and we're working on supporting additional deployment options. Keycloak integration and any SSO are supported. We offer customer support for open-source setups—just reach out for assistance.  
-
-## Docs
-
-We're currently working on both technical and user documentation for La Suite Meet. In the meantime, many of the essential aspects are already well covered by the [LiveKit documentation](https://docs.livekit.io/home/) and their [self-hosting guide](https://docs.livekit.io/home/self-hosting/deployment/). Stay tuned for more updates!
+docker_build(
+    'localhost:5001/meet-frontend:latest',
+    context='..',
+    dockerfile='../src/frontend/Dockerfile',
+    only=['./src/frontend', './docker', './.dockerignore'],
+    target='frontend-production',  # Update this line when needed
+    live_update=[
+        sync('../src/frontend', '/home/frontend'),
+    ]
+)
+...
+```
 
 ## Contributing
 
-We <3 contributions of any kind, big and small:
-
-- Vote on features or get early access to beta functionality in our [roadmap](https://github.com/orgs/suitenumerique/projects/3/views/2)
-- Open a PR (see our instructions on [developing La Suite Meet locally](https://github.com/suitenumerique/meet/blob/main/docs/developping_locally.md))
-- Submit a [feature request](https://github.com/suitenumerique/meet/issues/new?assignees=&labels=enhancement&template=Feature_request.md) or [bug report](https://github.com/suitenumerique/meet/issues/new?assignees=&labels=bug&template=Bug_report.md)
-
-
-## Philosophy
-
-We’re relentlessly focused on building the best open-source video conferencing product—La Suite Meet. Growth comes from creating something people truly need, not just from chasing metrics.
-
-Our users come first. We’re committed to making La Suite Meet as accessible and easy to use as proprietary solutions, ensuring it meets the highest standards.
-
-Most of the heavy engineering is handled by the incredible LiveKit team, allowing us to focus on delivering a top-tier product. We follow extreme programming practices, favoring pair programming and quick, iterative releases. Challenge our tech and architecture—simplicity is always our top priority.
-
-
-## Open-source
-
-Gov 🇫🇷 supports open source! This project is available under [MIT license](https://github.com/suitenumerique/meet/blob/0cc2a7b7b4f4821e2c4d9d790efa739622bb6601/LICENSE).
-
-All features we develop will always remain open-source, and we are committed to contributing back to the LiveKit community whenever feasible.
-To learn more, don't hesitate to [reach out](mailto:visio@numerique.gouv.fr).
-
-### Help us!
-
-Come help us make La Suite Meet even better. We're growing fast and [would love some help](mailto:visio@numerique.gouv.fr).
-
-
-## Contributors 🧞
-
-<a href="https://github.com/suitenumerique/meet/graphs/contributors">
-  <img src="https://contrib.rocks/image?repo=suitenumerique/meet" />
-</a>
-
-## Credits 
-
-We're using the awesome [LiveKit](https://livekit.io/) implementation. We're also thankful to the teams behind [Django Rest Framework](https://www.django-rest-framework.org/), [Vite.js](https://vite.dev/), and [React Aria](https://github.com/adobe/react-spectrum) — Thanks for your amazing work!
+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.
 
 ## License
 
-Code in this repository is published under the MIT license by DINUM (Direction interministériel du numérique).
-Documentation (in the docs/) directory is released under the [Etalab-2.0 license](https://spdx.org/licenses/etalab-2.0.html).
-
+This work is released under the MIT License (see [LICENSE](./LICENSE)).

SECURITY.md

@@ -1,23 +0,0 @@
-# Security Policy
-
-## Reporting a Vulnerability
-
-Security is very important to us.
-
-If you have any issue regarding security, please disclose the information responsibly submiting [this form](https://vdp.numerique.gouv.fr/p/Send-a-report?lang=en) and not by creating an issue on the repository. You can also email us at visio@numerique.gouv.fr
-
-We appreciate your effort to make Visio more secure.
-
-## Vulnerability disclosure policy
-
-Working with security issues in an open source project can be challenging, as we are required to disclose potential problems that could be exploited by attackers. With this in mind, our security fix policy is as follows:
-
-1. The Maintainers team will handle the fix as usual (Pull Request,
-   release).
-2. In the release notes, we will include the identification numbers from the
-   GitHub Advisory Database (GHSA) and, if applicable, the Common Vulnerabilities
-   and Exposures (CVE) identifier for the vulnerability.
-3. Once this grace period has passed, we will publish the vulnerability.
-
-By adhering to this security policy, we aim to address security concerns
-effectively and responsibly in our open source software project.

bin/Tiltfile

@@ -2,9 +2,6 @@ load('ext://uibutton', 'cmd_button', 'bool_input', 'location')
 load('ext://namespace', 'namespace_create', 'namespace_inject')
 namespace_create('meet')
 
-def clean_old_images(image_name):
-    local('docker images -q %s | tail -n +2 | xargs -r docker rmi' % image_name)
-
 docker_build(
     'localhost:5001/meet-backend:latest',
     context='..',
@@ -19,7 +16,6 @@ docker_build(
         )
     ]
 )
-clean_old_images('localhost:5001/meet-backend')
 
 docker_build(
     'localhost:5001/meet-frontend:latest',
@@ -31,38 +27,8 @@ docker_build(
         sync('../src/frontend', '/home/frontend'),
     ]
 )
-clean_old_images('localhost:5001/meet-frontend')
 
-docker_build(
-    'localhost:5001/meet-summary:latest',
-    context='../src/summary',
-    dockerfile='../src/summary/Dockerfile',
-    only=['.', '../../docker', '../../.dockerignore'],
-    target = 'production',
-    live_update=[
-        sync('../src/summary', '/home/summary'),
-    ]
-)
-clean_old_images('localhost:5001/meet-summary')
-
-# Copy the mkcert root CA certificate to our Docker build context
-# This is necessary because we need to inject the certificate into our LiveKit container
-local_resource(
-    'copy-root-ca',
-    cmd='cp -f "$(mkcert -CAROOT)/rootCA.pem" ../docker/livekit/rootCA.pem',
-    deps=[],  # No dependencies needed
-)
-# Build a custom LiveKit Docker image that includes our root CA certificate
-# This allows LiveKit to trust our local development certificates
-docker_build(
-    'localhost:5001/meet-livekit:latest',
-    context='../docker/livekit',
-    dockerfile='./../docker/livekit/Dockerfile',
-    only=['.'],
-)
-clean_old_images('localhost:5001/meet-livekit')
-
-k8s_yaml(local('cd ../src/helm && helmfile -n meet -e ${DEV_ENV:-dev} template .'))
+k8s_yaml(local('cd ../src/helm && helmfile -n meet -e dev template .'))
 
 migration = '''
 set -eu

bin/install-external-secrets.sh

@@ -1,90 +0,0 @@
-#!/usr/bin/env bash
-set -o errexit
-
-CURRENT_DIR=$(pwd)
-NAMESPACE=${1:-meet}
-SECRET_NAME=${2:-bitwarden-cli-meet}
-TEMP_SECRET_FILE=$(mktemp)
-
-
-cleanup() {
-    rm -f "${TEMP_SECRET_FILE}"
-}
-trap cleanup EXIT
-
-
-# Check if kubectl is available
-check_prerequisites() {
-    if ! command -v kubectl &> /dev/null; then
-        echo "Error: kubectl is not installed or not in PATH"
-        exit 1
-    fi
-}
-
-# Check if secret already exists
-check_secret_exists() {
-    kubectl -n "${NAMESPACE}" get secrets "${SECRET_NAME}" &> /dev/null
-}
-
-
-# Collect user input securely
-get_user_input() {
-    echo "Please provide the following information:"
-    read -p "Enter your Vaultwarden email login: " LOGIN
-    read -s -p "Enter your Vaultwarden password: " PASSWORD
-    echo
-    read -p "Enter your Vaultwarden server url: " URL
-}
-
-# Create and apply the secret
-create_secret() {
-    cat > "${TEMP_SECRET_FILE}" << EOF
-apiVersion: v1
-kind: Secret
-metadata:
-  name: ${SECRET_NAME}
-  namespace: ${NAMESPACE}
-type: Opaque
-stringData:
-  BW_HOST: ${URL}
-  BW_PASSWORD: ${PASSWORD}
-  BW_USERNAME: ${LOGIN}
-EOF
-
-    kubectl -n "${NAMESPACE}" apply -f "${TEMP_SECRET_FILE}"
-}
-
-# Install external-secrets using Helm
-install_external_secrets() {
-    if ! kubectl get ns external-secrets &>/dev/null; then
-        echo "Installing external-secrets…"
-        helm repo add external-secrets https://charts.external-secrets.io
-        helm upgrade --install external-secrets \
-            external-secrets/external-secrets \
-            -n external-secrets \
-            --create-namespace \
-            --set installCRDs=true
-    else
-        echo "External secrets already deployed"
-    fi
-}
-
-main() {
-    check_prerequisites
-
-    if check_secret_exists; then
-        echo "Secret '${SECRET_NAME}' already present in namespace '${NAMESPACE}'"
-        exit 0
-    fi
-
-    echo -e ${TEMP_SECRET_FILE}
-
-    get_user_input
-    echo -e "\nCreating Vaultwarden secret…"
-    create_secret
-    install_external_secrets
-
-    echo "Secret installation completed successfully"
-}
-
-main "$@"

bin/install-hooks.sh

@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/bash
 
 mkdir -p "$(dirname -- "${BASH_SOURCE[0]}")/../.git/hooks/"
 PRE_COMMIT_FILE="$(dirname -- "${BASH_SOURCE[0]}")/../.git/hooks/pre-commit"

bin/start-kind.sh

@@ -1,3 +1,138 @@
-#!/usr/bin/env bash
+#!/bin/sh
+set -o errexit
 
-curl https://raw.githubusercontent.com/numerique-gouv/tools/refs/heads/main/kind/create_cluster.sh | bash -s -- meet
+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=always -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
+
+cat <<EOF | kubectl apply -f -
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: coredns
+  namespace: kube-system
+data:
+  Corefile: |
+    .:53 {
+        errors
+        health {
+          lameduck 5s
+        }
+        ready
+        kubernetes cluster.local in-addr.arpa ip6.arpa {
+          pods insecure
+          fallthrough in-addr.arpa ip6.arpa
+          ttl 30
+        }
+        prometheus :9153
+        forward . /etc/resolv.conf {
+          max_concurrent 1000
+        }
+        rewrite stop {
+          name regex (.*).127.0.0.1.nip.io ingress-nginx-controller.ingress-nginx.svc.cluster.local answer auto
+        }
+        cache 30
+        loop
+        reload
+        loadbalance
+    }
+EOF
+
+kubectl -n kube-system rollout restart deployments/coredns
+
+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-git-submodule.sh

@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/bash
 
 git submodule update --init --recursive
 git submodule foreach 'git fetch origin; git checkout $(git rev-parse --abbrev-ref HEAD); git reset --hard origin/$(git rev-parse --abbrev-ref HEAD); git submodule update --recursive; git clean -dfx'

bin/update-keys.sh

@@ -1,3 +1,3 @@
-#!/usr/bin/env bash
+#!/bin/bash
 
 find . -name "*.enc.*" -exec sops updatekeys -y {} \;

bin/validate-helm-configuration.sh

@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/bash
 
 set -e
 

compose.yml

@@ -15,37 +15,6 @@ services:
     ports:
       - "1081:1080"
 
-  minio:
-    user: ${DOCKER_USER:-1000}
-    image: minio/minio
-    environment:
-      - MINIO_ROOT_USER=meet
-      - MINIO_ROOT_PASSWORD=password
-    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:
-      - ./data/media:/data
-
-  createbuckets:
-    image: minio/mc
-    depends_on:
-      minio:
-        condition: service_healthy
-        restart: true
-    entrypoint: >
-      sh -c "
-      /usr/bin/mc alias set meet http://minio:9000 meet password && \
-      /usr/bin/mc mb meet/meet-media-storage && \
-      exit 0;"
-
   app-dev:
     build:
       context: .
@@ -71,9 +40,6 @@ services:
         - redis
         - nginx
         - livekit
-        - createbuckets
-    extra_hosts:
-      - "127.0.0.1.nip.io:host-gateway"
   
   celery-dev:
     user: ${DOCKER_USER:-1000}
@@ -107,7 +73,6 @@ services:
       - postgresql
       - redis
       - livekit
-      - minio
 
   celery:
     user: ${DOCKER_USER:-1000}
@@ -130,21 +95,8 @@ services:
     depends_on:
       - keycloak
 
-  frontend:
-    user: "${DOCKER_USER:-1000}"
-    build:
-      context: .
-      dockerfile: ./src/frontend/Dockerfile
-      target: frontend-production
-      args:
-        VITE_API_BASE_URL: "http://localhost:8071"
-    image: meet:frontend-development
-    ports:
-      - "3000:8080"
-
   dockerize:
     image: jwilder/dockerize
-    platform: linux/x86_64
 
   crowdin:
     image: crowdin/cli:4.0.0

docker/livekit/Dockerfile

@@ -1,6 +0,0 @@
-FROM livekit/livekit-server:v1.8.0
-
-# We inject the nip.io certificate manually because the livekit chart doesn't support volume mounting
-COPY rootCA.pem /etc/ssl/certs/
-
-ENTRYPOINT ["/livekit-server"]

docs/developping_locally.md

@@ -1,145 +0,0 @@
-# Getting Started
-
-Before setting up, let's review Visio's architecture.
-
-Visio consists of four main components that run simultaneously:
-
-- React frontend, built with Vite.js
-- Django server
-- LiveKit server
-- FastAPI server (optional, required for AI beta features)
-
-These components rely on a few key services:
-
-- PostgreSQL for storing data (users, rooms, recordings)
-- Redis for caching and inter-service communication
-- MinIO for storing files (room recordings)
-- Celery workers for meeting transcript (optional, required for AI beta features)
-
-We provide two stack options for getting Visio up and running for development:
-
-- Docker Compose stack (recommended for most users)
-- Kubernetes stack powered by Tilt (Advanced)
-
-We recommend starting with the **Docker Compose** option for simplicity. However, if you're comfortable with running Kubernetes locally, the advanced option mirrors the production environment and provides most of the tools required for development (e.g., hot reloading).
-
-These instructions are for macOS or Ubuntu. For other distros, adjust as needed.
-
-If any steps are outdated, please let us know!
-
----
-
-We also provide **GNU make utilities**. To view all available Make rules, run:
-```shellscript
-$ make help
-```
-
----
-
-## Need Help?
-If you need any assistance or have questions while getting started, feel free to reach out to @lebaudantoine anytime! Antoine is available to help you onboard and guide you through the process. Chat with him @antoine.lebaud:matrix.org, or from the [support hotline](https://go.crisp.chat/chat/embed/?website_id=58ea6697-8eba-4492-bc59-ad6562585041).
-
----
-
-## Option 1: Developing with Docker
-
-### Prerequisites
-
-1. Ensure you have a recent version of **Docker** and **Docker Compose** installed:
-```shellscript
-$ docker -v
-Docker version 20.10.2, build 2291f61
-
-$ docker compose version
-Docker Compose version v2.32.4
-```
-
-2. Install **LiveKit CLI** by following the instructions available in the [official repository](https://github.com/livekit/livekit-cli). After installation, verify that it's working:
-```shellscript
-$ lk --version
-lk version 2.3.1
-```
-
----
-
-### Project Bootstrap
-
-1. Bootstrap the project using the **Make** command. This will build the `app` container, install dependencies, run database migrations, and compile translations:
-```shellscript
-$ make bootstrap FLUSH_ARGS='--no-input'
-```
-
-2. Access the project:
-- The frontend is available at [http://localhost:3000](http://localhost:3000) with the default credentials:
-    - username: meet
-    - password: meet
-- The Django backend is available at [http://localhost:8071](http://localhost:8071)
-
----
-
-## Developing
-
-- To **stop** the application:
-```shellscript
-$ make stop
-```
-
-- To **restart** the application:
-```shellscript
-$ make run
-```
-
-- For **frontend development**, start all backend services without the frontend container:
-```shellscript
-$ make run-backend
-```
-
-Then:
-```shellscript
-$ make frontend-development-install
-$ make run-frontend-development
-```
-
-Which is equivalent to these direct npm commands:
-```shellscript
-$ cd src/frontend
-$ npm i
-$ npm run dev
-```
-
----
-
-## Adding Content
-
-You can bootstrap demo data with a single command:
-```shellscript
-$ make demo
-```
-
----
-
-## Option 2: Developing with Kubernetes
-
-Visio is deployed across staging, preprod, and production environments using **Kubernetes (K8s)**. Reproducing the environment locally is crucial for developing new features or debugging.
-
-This is facilitated by [Tilt](https://tilt.dev/), which provides Kubernetes-like development for local environments, enabling smart rebuilds and live updates.
-
-### Getting Started
-
-Make sure you have the following installed:
-- kubectl
-- helm
-- helmfile
-- tilt
-
-To build and start the Kubernetes cluster using **Kind**:
-```shellscript
-$ make build-k8s-cluster 
-```
-
-Once the Kubernetes cluster is ready, start the application stack locally:
-```shellscript
-$ make start-tilt-keycloak
-```
-
-Monitor Tilt’s progress at [http://localhost:10350/](http://localhost:10350/). After Tilt actions finish, you can access the app at [https://visio.127.0.0.1.nip.io/](https://visio.127.0.0.1.nip.io/).

docs/examples/livekit.values.yaml

@@ -1,40 +0,0 @@
-replicaCount: 1
-terminationGracePeriodSeconds: 18000
-
-livekit:
-  keys:
-      devkey: secret
-  log_level: debug
-  rtc:
-    use_external_ip: false
-    port_range_start: 50000
-    port_range_end: 60000
-    tcp_port: 7881
-  redis:
-    address: redis-master:6379
-    password: pass
-  turn:
-    enabled: true
-    udp_port: 443
-    domain: livekit.127.0.0.1.nip.io
-    loadBalancerAnnotations: {}
-
-
-loadBalancer:
-  type: nginx
-  annotations:
-    nginx.ingress.kubernetes.io/rewrite-target: /
-    nginx.ingress.kubernetes.io/ssl-redirect: "true"
-  tls:
-    - hosts:
-        - livekit.127.0.0.1.nip.io
-      secretName: livekit-dinum-cert
-
-autoscaling:
-  enabled: false
-  minReplicas: 1
-  maxReplicas: 5
-  targetCPUUtilizationPercentage: 60
-
-nodeSelector: {}
-resources: {}

docs/examples/meet.values.yaml

@@ -1,120 +0,0 @@
-image:
-  repository: lasuite/meet-backend
-  pullPolicy: Always
-  tag: "latest"
-
-backend:
-  replicas: 1
-  envVars:
-    DJANGO_CSRF_TRUSTED_ORIGINS: https://meet.127.0.0.1.nip.io,http://meet.127.0.0.1.nip.io
-    DJANGO_CONFIGURATION: Production
-    DJANGO_ALLOWED_HOSTS: meet.127.0.0.1.nip.io
-    DJANGO_SECRET_KEY: ThisCouldBeAReallyGoodOrPerhapsABadKeyToUseSometimes
-    DJANGO_SETTINGS_MODULE: meet.settings
-    DJANGO_SILENCED_SYSTEM_CHECKS: security.W004, security.W008
-    DJANGO_SUPERUSER_PASSWORD: admin
-    DJANGO_EMAIL_HOST: "mailcatcher"
-    DJANGO_EMAIL_PORT: 1025
-    DJANGO_EMAIL_USE_SSL: False
-    OIDC_OP_JWKS_ENDPOINT: https://keycloak.127.0.0.1.nip.io/realms/meet/protocol/openid-connect/certs
-    OIDC_OP_AUTHORIZATION_ENDPOINT: https://keycloak.127.0.0.1.nip.io/realms/meet/protocol/openid-connect/auth
-    OIDC_OP_TOKEN_ENDPOINT: https://keycloak.127.0.0.1.nip.io/realms/meet/protocol/openid-connect/token
-    OIDC_OP_USER_ENDPOINT: https://keycloak.127.0.0.1.nip.io/realms/meet/protocol/openid-connect/userinfo
-    OIDC_OP_LOGOUT_ENDPOINT: https://keycloak.127.0.0.1.nip.io/realms/meet/protocol/openid-connect/session/end
-    OIDC_RP_CLIENT_ID: meet
-    OIDC_RP_CLIENT_SECRET: ThisIsAnExampleKeyForDevPurposeOnly
-    OIDC_RP_SIGN_ALGO: RS256
-    OIDC_RP_SCOPES: "openid email"
-    OIDC_REDIRECT_ALLOWED_HOSTS: https://meet.127.0.0.1.nip.io
-    OIDC_AUTH_REQUEST_EXTRA_PARAMS: "{'acr_values': 'eidas1'}"
-    LOGIN_REDIRECT_URL: https://meet.127.0.0.1.nip.io
-    LOGIN_REDIRECT_URL_FAILURE: https://meet.127.0.0.1.nip.io
-    LOGOUT_REDIRECT_URL: https://meet.127.0.0.1.nip.io
-    DB_HOST: postgresql
-    DB_NAME: meet
-    DB_USER: dinum
-    DB_PASSWORD: pass
-    DB_PORT: 5432
-    POSTGRES_DB: meet
-    POSTGRES_USER: dinum
-    POSTGRES_PASSWORD: pass
-    REDIS_URL: redis://default:pass@redis-master:6379/1
-    STORAGES_STATICFILES_BACKEND: django.contrib.staticfiles.storage.StaticFilesStorage
-    LIVEKIT_API_SECRET: secret
-    LIVEKIT_API_KEY: devkey
-    LIVEKIT_API_URL: https://livekit.127.0.0.1.nip.io/
-    ALLOW_UNREGISTERED_ROOMS: False
-    FRONTEND_SILENCE_LIVEKIT_DEBUG: False
-
-
-  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/meet.py"
-    - "meet.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:
-    VITE_PORT: 8080
-    VITE_HOST: 0.0.0.0
-    VITE_API_BASE_URL: https://meet.127.0.0.1.nip.io/
-
-  replicas: 1
-
-  image:
-    repository: lasuite/meet-frontend
-    pullPolicy: Always
-    tag: "latest"
-
-ingress:
-  enabled: true
-  host: meet.127.0.0.1.nip.io
-
-ingressAdmin:
-  enabled: true
-  host: meet.127.0.0.1.nip.io
-
-posthog:
-  ingress:
-    enabled: false
-  ingressAssets:
-    enabled: false
-
-summary:
-  replicas: 0
-
-celery:
-  replicas: 0

docs/examples/postgresql.values.yaml

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

docs/examples/redis.values.yaml

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

docs/installation.md

@@ -1,360 +0,0 @@
-# Installation on a k8s cluster
-
-This document is a step-by-step guide that describes how to install Visio on a k8s cluster without AI features.
-
-## Prerequisites for a kubernetes setup
-
-- k8s cluster with an nginx-ingress controller
-- an OIDC provider (if you don't have one, we will provide an example)
-- a LiveKit server (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)
-
-### Test cluster
-
-If you do not have a kubernetes test cluster, you can install everything on a local kind cluster. In this case, the simplest way is to use our script located in this repo under **bin/start-kind.sh**.
-
-IMPORTANT: The kind method will only deploy meet as a local instance(127.0.0.1) that can only be accessed from the device where it has been deployed. 
-
-To be able to use the script, you will need to install the following components:
-
-- 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)
-- kubectl (https://kubernetes.io/docs/tasks/tools/)
-
-In order to initiate the local kind installation via **start-kind.sh** do the following:
-1) Make sure administrator/root user context is able to execute mkcert, docker, kind etc. commands or the script might fail
-2) Download the script to the device where the above components are installed
-3) Make the script executable
-4) Run the script with proper permissions (administrator/sudo etc.)
-
-The output of the script will resemble the below example:
-
-```
-$ ./bin/start-kind.sh
-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 23 March 2027 🗓
-
-1. Create registry container unless it already exists
-2. Create kind cluster with containerd registry config dir enabled
-Creating cluster "visio" ...
- ✓ Ensuring node image (kindest/node:v1.27.3) 🖼
- ✓ Preparing nodes 📦
- ✓ Writing configuration 📜
- ✓ Starting control-plane 🕹️
- ✓ Installing CNI 🔌
- ✓ Installing StorageClass 💾
-Set kubectl context to "kind-visio"
-You can now use your cluster with:
-
-kubectl cluster-info --context kind-visio
-
-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/meet created
-Context "kind-visio" modified.
-secret/mkcert created
-$ kind get clusters
-visio
-$ kubectl -n ingress-nginx get po
-NAME                                        READY   STATUS      RESTARTS   AGE
-ingress-nginx-admission-create-jgnc9        0/1     Completed   0          2m44s
-ingress-nginx-admission-patch-wrt47         0/1     Completed   0          2m44s
-ingress-nginx-controller-57c548c4cd-9xwt6   1/1     Running     0          2m44s
-```
-
-When your k8s cluster is ready, 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 of components
-
-### What will you use to authenticate your users ?
-
-Visio 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 Visio) 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).
-
-If you haven't run the script **bin/start-kind.sh**, you'll need to manually create the namespace by running the following command:
-
-```
-$ kubectl create namespace meet
-```
-
-If you have already run the script, you can skip this step and proceed to the next instruction. NOTE: Before you proceed, and is using the kind method, make sure you download this repo examples/ directory and its contents to the location where you will be executing the helm command. Helm will look for "examples/<name>values.yaml" from based on the path it is being executed.
-
-```
-$ kubectl config set-context --current --namespace=meet
-$ 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 information you will need are :
-
-```
-OIDC_OP_JWKS_ENDPOINT: https://keycloak.127.0.0.1.nip.io/realms/meet/protocol/openid-connect/certs
-OIDC_OP_AUTHORIZATION_ENDPOINT: https://keycloak.127.0.0.1.nip.io/realms/meet/protocol/openid-connect/auth
-OIDC_OP_TOKEN_ENDPOINT: https://keycloak.127.0.0.1.nip.io/realms/meet/protocol/openid-connect/token
-OIDC_OP_USER_ENDPOINT: https://keycloak.127.0.0.1.nip.io/realms/meet/protocol/openid-connect/userinfo
-OIDC_OP_LOGOUT_ENDPOINT: https://keycloak.127.0.0.1.nip.io/realms/meet/protocol/openid-connect/session/end
-OIDC_RP_CLIENT_ID: meet
-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 livekit server connexion values
-
-Visio use livekit for streaming part so if you have a livekit provider, obtain the necessary information to use it. If you do not have a provider, you can install a livekit testing environment as follows:
-
-Livekit need a redis (and meet too) 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
-```
-
-When the redis is ready we can deploy livekit-server.
-
-```
-$ helm repo add livekit https://helm.livekit.io
-$ helm repo update
-$ helm install livekit livekit/livekit-server -f examples/livekit.values.yaml
-$ kubectl get po
-NAME                                      READY   STATUS    RESTARTS   AGE
-keycloak-0                                1/1     Running   0          30m
-keycloak-postgresql-0                     1/1     Running   0          30m
-livekit-livekit-server-5c5fb87f7f-ct6x5   1/1     Running   0          7s
-redis-master-0                            1/1     Running   0          4m30s
-$ curl https://livekit.127.0.0.1.nip.io
-OK
-```
-
-From here important information you will need are :
-
-```
-LIVEKIT_API_SECRET: secret
-LIVEKIT_API_KEY: devkey
-LIVEKIT_API_URL: https://livekit.127.0.0.1.nip.io/
-REDIS_URL: redis://default:pass@redis-master:6379/1
-CELERY_BROKER_URL: redis://default:pass@redis-master:6379/1
-CELERY_RESULT_BACKEND: redis://default:pass@redis-master:6379/1
-```
-
-### Find postgresql connexion values
-
-Visio 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 follows:
-
-```
-$ 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          45m
-keycloak-postgresql-0                     1/1     Running   0          45m
-livekit-livekit-server-5c5fb87f7f-ct6x5   1/1     Running   0          15m
-postgresql-0                              1/1     Running   0          50s
-redis-master-0                            1/1     Running   0          19
-```
-
-From here important information you will need are :
-
-```
-DB_HOST: postgres-postgresql
-DB_NAME: meet
-DB_USER: dinum
-DB_PASSWORD: pass
-DB_PORT: 5432
-POSTGRES_DB: meet
-POSTGRES_USER: dinum
-POSTGRES_PASSWORD: pass
-```
-
-## Deployment
-
-Now you are ready to deploy Visio without AI. AI required more dependencies (Openai-compliant API, LiveKit Egress, Cold storage and a docs deployment to push resumes). To deploy meet you need to provide all previous information to the helm chart.
-
-```
-$ helm repo add meet https://suitenumerique.github.io/meet/
-$ helm repo update
-$ helm install meet meet/meet -f examples/meet.values.yaml
-```
-
-## Test your deployment
-
-In order to test your deployment you have to log in to your instance. If you use exclusively our examples you can do:
-
-```
-$ kubectl get ingress
-NAME                     CLASS    HOSTS                       ADDRESS     PORTS     AGE
-keycloak                 <none>   keycloak.127.0.0.1.nip.io   localhost   80        58m
-livekit-livekit-server   <none>   livekit.127.0.0.1.nip.io    localhost   80, 443   106m
-meet                     <none>   meet.127.0.0.1.nip.io       localhost   80, 443   52m
-meet-admin               <none>   meet.127.0.0.1.nip.io       localhost   80, 443   52m
-```
-
-You can use Visio on https://meet.127.0.0.1.nip.io from the local device. The provisioning user in keycloak is meet/meet.
-
-## All options
-
-These are the environmental options available on meet backend.
-
-| Option                                          | Description                              | default                                                                                                                                                       |
-| ----------------------------------------------- | ---------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| DATA_DIR                                        | Data directory location                  | /data                                                                                                                                                         |
-| DJANGO_ALLOWED_HOSTS                            | Hosts that are allowed                   | []                                                                                                                                                            |
-| DJANGO_SECRET_KEY                               | Secret key used for Django security      |                                                                                                                                                               |
-| DJANGO_SILENCED_SYSTEM_CHECKS                   | Silence Django system checks             | []                                                                                                                                                            |
-| DJANGO_ALLOW_UNSECURE_USER_LISTING              | Allow unsecure user listing              | false                                                                                                                                                         |
-| DB_ENGINE                                       | Database engine used                     | django.db.backends.postgresql_psycopg2                                                                                                                        |
-| DB_NAME                                         | Name of the database                     | meet                                                                                                                                                          |
-| DB_USER                                         | User used to connect to database         | dinum                                                                                                                                                         |
-| DB_PASSWORD                                     | Password used to connect to the database | pass                                                                                                                                                          |
-| DB_HOST                                         | Hostname of the database                 | localhost                                                                                                                                                     |
-| DB_PORT                                         | Port to connect to database              | 5432                                                                                                                                                          |
-| STORAGES_STATICFILES_BACKEND                    | Static file serving engine               | whitenoise.storage.CompressedManifestStaticFilesStorage                                                                                                       |
-| AWS_S3_ENDPOINT_URL                             | S3 host endpoint                         |                                                                                                                                                               |
-| AWS_S3_ACCESS_KEY_ID                            | S3 access key                            |                                                                                                                                                               |
-| AWS_S3_SECRET_ACCESS_KEY                        | S3 secret key                            |                                                                                                                                                               |
-| AWS_S3_REGION_NAME                              | S3 region                                |                                                                                                                                                               |
-| AWS_STORAGE_BUCKET_NAME                         | S3 bucket name                           | meet-media-storage                                                                                                                                            |
-| DJANGO_LANGUAGE_CODE                            | Default language                         | en-us                                                                                                                                                         |
-| REDIS_URL                                       | Redis endpoint                           | redis://redis:6379/1                                                                                                                                          |
-| SESSION_COOKIE_AGE                              | Session cookie expiration in seconds     | 43200 (12 hours)                                                                                                                                             |
-| REQUEST_ENTRY_THROTTLE_RATES                    | Entry request throttle rates             | 150/minute                                                                                                                                                    |
-| CREATION_CALLBACK_THROTTLE_RATES                | Creation callback throttle rates         | 600/minute                                                                                                                                                    |
-| SPECTACULAR_SETTINGS_ENABLE_DJANGO_DEPLOY_CHECK | Enable Django deploy check               | false                                                                                                                                                         |
-| CSRF_TRUSTED_ORIGINS                            | CSRF trusted origins list                | []                                                                                                                                                            |
-| FRONTEND_ANALYTICS                              | Analytics information                    | {}                                                                                                                                                            |
-| FRONTEND_SUPPORT                                | Crisp frontend support configuration     | {}                                                                                                                                                            |
-| FRONTEND_SILENCE_LIVEKIT_DEBUG                  | Silence LiveKit debug logs               | false                                                                                                                                                         |
-| FRONTEND_IS_SILENT_LOGIN_ENABLED                | Enable silent login feature             | true                                                                                                                                                          |
-| FRONTEND_FEEDBACK                               | Frontend feedback configuration          | {}                                                                                                                                                            |
-| DJANGO_EMAIL_BACKEND                            | Email backend library                    | django.core.mail.backends.smtp.EmailBackend                                                                                                                   |
-| DJANGO_EMAIL_HOST                               | Host of the email server                 |                                                                                                                                                               |
-| DJANGO_EMAIL_HOST_USER                          | User to connect to the email server      |                                                                                                                                                               |
-| DJANGO_EMAIL_HOST_PASSWORD                      | Password to connect to the email server  |                                                                                                                                                               |
-| DJANGO_EMAIL_PORT                               | Port to connect to the email server      |                                                                                                                                                               |
-| DJANGO_EMAIL_USE_TLS                            | Enable TLS on email connection           | false                                                                                                                                                         |
-| DJANGO_EMAIL_USE_SSL                            | Enable SSL on email connection           | false                                                                                                                                                         |
-| DJANGO_EMAIL_FROM                               | Email from account                       | from@example.com                                                                                                                                              |
-| EMAIL_BRAND_NAME                                | Email branding name                      |                                                                                                                                                               |
-| EMAIL_SUPPORT_EMAIL                             | Support email address                    |                                                                                                                                                               |
-| EMAIL_LOGO_IMG                                  | Email logo image                         |                                                                                                                                                               |
-| EMAIL_DOMAIN                                    | Email domain                             |                                                                                                                                                               |
-| EMAIL_APP_BASE_URL                              | Email app base URL                       |                                                                                                                                                               |
-| DJANGO_CORS_ALLOW_ALL_ORIGINS                   | Allow all CORS origins                   | true                                                                                                                                                          |
-| DJANGO_CORS_ALLOWED_ORIGINS                     | Origins to allow (string list)           | []                                                                                                                                                            |
-| DJANGO_CORS_ALLOWED_ORIGIN_REGEXES              | Origins to allow (regex patterns)        | []                                                                                                                                                            |
-| SENTRY_DSN                                      | Sentry server DSN                        |                                                                                                                                                               |
-| DJANGO_CELERY_BROKER_URL                        | Celery broker host                       | redis://redis:6379/0                                                                                                                                          |
-| DJANGO_CELERY_BROKER_TRANSPORT_OPTIONS          | Celery broker options                    | {}                                                                                                                                                            |
-| OIDC_CREATE_USER                                | Create OIDC user if not exists           | true                                                                                                                                                          |
-| OIDC_VERIFY_SSL                                 | Verify SSL for OIDC                      | true                                                                                                                                                          |
-| OIDC_FALLBACK_TO_EMAIL_FOR_IDENTIFICATION       | Fallback to email for identification     | false                                                                                                                                                         |
-| OIDC_RP_SIGN_ALGO                               | Token verification algorithm used by OIDC | RS256                                                                                                                                                         |
-| OIDC_RP_CLIENT_ID                               | OIDC client ID                           | meet                                                                                                                                                          |
-| OIDC_RP_CLIENT_SECRET                           | OIDC client secret                       |                                                                                                                                                               |
-| OIDC_OP_JWKS_ENDPOINT                           | OIDC endpoint for JWKS                   |                                                                                                                                                               |
-| OIDC_OP_AUTHORIZATION_ENDPOINT                  | OIDC endpoint for authorization          |                                                                                                                                                               |
-| OIDC_OP_TOKEN_ENDPOINT                          | OIDC endpoint for token                  |                                                                                                                                                               |
-| OIDC_OP_USER_ENDPOINT                           | OIDC endpoint for user                   |                                                                                                                                                               |
-| OIDC_OP_USER_ENDPOINT_FORMAT                    | OIDC endpoint format (AUTO, JWT, JSON)   | AUTO                                                                                                                                                          |
-| OIDC_OP_LOGOUT_ENDPOINT                         | OIDC endpoint for logout                 |                                                                                                                                                               |
-| OIDC_AUTH_REQUEST_EXTRA_PARAMS                  | Extra parameters for OIDC request        | {}                                                                                                                                                            |
-| OIDC_RP_SCOPES                                  | OIDC scopes                              | openid email                                                                                                                                                  |
-| OIDC_USE_NONCE                                  | Use nonce for OIDC                       | true                                                                                                                                                          |
-| OIDC_REDIRECT_REQUIRE_HTTPS                     | Require HTTPS for OIDC                   | false                                                                                                                                                         |
-| OIDC_REDIRECT_ALLOWED_HOSTS                     | Allowed redirect hosts for OIDC          | []                                                                                                                                                            |
-| OIDC_STORE_ID_TOKEN                             | Store OIDC ID token                      | true                                                                                                                                                          |
-| OIDC_REDIRECT_FIELD_NAME                        | Redirect field for OIDC                  | returnTo                                                                                                                                                      |
-| OIDC_USERINFO_FULLNAME_FIELDS                   | Full name claim from OIDC token          | ["given_name", "usual_name"]                                                                                                                                  |
-| OIDC_USERINFO_SHORTNAME_FIELD                   | Short name claim from OIDC token         | given_name                                                                                                                                                    |
-| OIDC_USERINFO_ESSENTIAL_CLAIMS                  | Required claims from OIDC token          | []                                                                                                                                                            |
-| LOGIN_REDIRECT_URL                              | Login redirect URL                       |                                                                                                                                                               |
-| LOGIN_REDIRECT_URL_FAILURE                      | Login redirect URL for failure           |                                                                                                                                                               |
-| LOGOUT_REDIRECT_URL                             | URL to redirect to on logout             |                                                                                                                                                               |
-| ALLOW_LOGOUT_GET_METHOD                         | Allow logout through GET method          | true                                                                                                                                                          |
-| LIVEKIT_API_KEY                                 | LiveKit API key                          |                                                                                                                                                               |
-| LIVEKIT_API_SECRET                              | LiveKit API secret                       |                                                                                                                                                               |
-| LIVEKIT_API_URL                                 | LiveKit API URL                          |                                                                                                                                                               |
-| LIVEKIT_VERIFY_SSL                              | Verify SSL for LiveKit connections       | true                                                                                                                                                          |
-| RESOURCE_DEFAULT_ACCESS_LEVEL                   | Default resource access level for rooms  | public                                                                                                                                                        |
-| ALLOW_UNREGISTERED_ROOMS                        | Allow usage of unregistered rooms        | true                                                                                                                                                          |
-| RECORDING_ENABLE                                | Record meeting option                    | false                                                                                                                                                         |
-| RECORDING_OUTPUT_FOLDER                         | Folder to store meetings                 | recordings                                                                                                                                                    |
-| RECORDING_WORKER_CLASSES                        | Worker classes for recording             | {"screen_recording": "core.recording.worker.services.VideoCompositeEgressService","transcript": "core.recording.worker.services.AudioCompositeEgressService"} |
-| RECORDING_EVENT_PARSER_CLASS                    | Storage event engine for recording       | core.recording.event.parsers.MinioParser                                                                                                                      |
-| RECORDING_ENABLE_STORAGE_EVENT_AUTH             | Enable storage event authorization       | true                                                                                                                                                          |
-| RECORDING_STORAGE_EVENT_ENABLE                  | Enable recording storage events          | false                                                                                                                                                         |
-| RECORDING_STORAGE_EVENT_TOKEN                   | Recording storage event token            |                                                                                                                                                               |
-| RECORDING_EXPIRATION_DAYS                       | Recording expiration in days             |                                                                                                                                                               |
-| SCREEN_RECORDING_BASE_URL                       | Screen recording base URL                |                                                                                                                                                               |
-| SUMMARY_SERVICE_ENDPOINT                        | Summary service endpoint                 |                                                                                                                                                               |
-| SUMMARY_SERVICE_API_TOKEN                       | API token for summary service            |                                                                                                                                                               |
-| SIGNUP_NEW_USER_TO_MARKETING_EMAIL              | Signup users to marketing emails         | false                                                                                                                                                         |
-| MARKETING_SERVICE_CLASS                         | Marketing service class                  | core.services.marketing.BrevoMarketingService                                                                                                                 |
-| BREVO_API_KEY                                   | Brevo API key for marketing emails       |                                                                                                                                                               |
-| BREVO_API_CONTACT_LIST_IDS                      | Brevo API contact list IDs               | []                                                                                                                                                            |
-| DJANGO_BREVO_API_CONTACT_ATTRIBUTES             | Brevo contact attributes                 | {"VISIO_USER": true}                                                                                                                                          |
-| BREVO_API_TIMEOUT                               | Brevo timeout in seconds                 | 1                                                                                                                                                             |
-| LOBBY_KEY_PREFIX                                | Lobby key prefix                         | room_lobby                                                                                                                                                    |
-| LOBBY_WAITING_TIMEOUT                           | Lobby waiting timeout in seconds         | 3                                                                                                                                                             |
-| LOBBY_DENIED_TIMEOUT                            | Lobby deny timeout in seconds            | 5                                                                                                                                                             |
-| LOBBY_ACCEPTED_TIMEOUT                          | Lobby accept timeout in seconds          | 21600 (6 hours)                                                                                                                                              |
-| LOBBY_NOTIFICATION_TYPE                         | Lobby notification types                 | participantWaiting                                                                                                                                            |
-| LOBBY_COOKIE_NAME                               | Lobby cookie name                        | lobbyParticipantId                                                                                                                                            |
-| ROOM_CREATION_CALLBACK_CACHE_TIMEOUT            | Room creation callback cache timeout     | 600 (10 minutes)                                                                                                                                             |
-| ROOM_TELEPHONY_ENABLED                          | Enable SIP telephony feature             | false                                                                                                                                                         |
-| ROOM_TELEPHONY_PIN_LENGTH                       | Telephony PIN length                     | 10                                                                                                                                                            |
-| ROOM_TELEPHONY_PIN_MAX_RETRIES                  | Telephony PIN maximum retries            | 5                                                                                                                                                             |

env.d/development/common.dist

@@ -12,20 +12,12 @@ PYTHONPATH=/app
 # Mail
 DJANGO_EMAIL_HOST="mailcatcher"
 DJANGO_EMAIL_PORT=1025
-DJANGO_EMAIL_BRAND_NAME=La Suite Numérique
-DJANGO_EMAIL_SUPPORT_EMAIL=test@yopmail.com
-DJANGO_EMAIL_LOGO_IMG=http://localhost:3000/assets/logo-suite-numerique.png
-DJANGO_EMAIL_DOMAIN=localhost:3000
-DJANGO_EMAIL_APP_BASE_URL=http://localhost:3000
 
 # Backend url
 MEET_BASE_URL="http://localhost:8072"
 
 # Media
 STORAGES_STATICFILES_BACKEND=django.contrib.staticfiles.storage.StaticFilesStorage
-AWS_S3_ENDPOINT_URL=http://minio:9000
-AWS_S3_ACCESS_KEY_ID=meet
-AWS_S3_SECRET_ACCESS_KEY=password
 
 # OIDC
 OIDC_OP_JWKS_ENDPOINT=http://nginx:8083/realms/meet/protocol/openid-connect/certs
@@ -48,12 +40,5 @@ OIDC_AUTH_REQUEST_EXTRA_PARAMS={"acr_values": "eidas1"}
 # Livekit Token settings
 LIVEKIT_API_SECRET=secret
 LIVEKIT_API_KEY=devkey
-LIVEKIT_API_URL=http://127.0.0.1.nip.io:7880
-LIVEKIT_VERIFY_SSL=False
+LIVEKIT_API_URL=http://localhost:7880
 ALLOW_UNREGISTERED_ROOMS=False
-
-# Recording
-SCREEN_RECORDING_BASE_URL=http://localhost:3000/recordings
-
-# Telephony
-ROOM_TELEPHONY_ENABLED=True

renovate.json

@@ -14,7 +14,7 @@
       "groupName": "ignored js dependencies",
       "matchManagers": ["npm"],
       "matchPackageNames": [
-        "eslint", "react", "react-dom", "@types/react-dom", "@types/react", "react-i18next"
+        "eslint"
       ]
     }
   ]

src/backend/core/admin.py

@@ -99,7 +99,6 @@ class ResourceAccessInline(admin.TabularInline):
 
     model = models.ResourceAccess
     extra = 0
-    autocomplete_fields = ["user"]
 
 
 @admin.register(models.Room)
@@ -107,10 +106,6 @@ class RoomAdmin(admin.ModelAdmin):
     """Room admin interface declaration."""
 
     inlines = (ResourceAccessInline,)
-    search_fields = ["name", "slug", "=id"]
-    list_display = ["name", "slug", "access_level", "created_at"]
-    list_filter = ["access_level", "created_at"]
-    readonly_fields = ["id", "created_at", "updated_at"]
 
 
 class RecordingAccessInline(admin.TabularInline):
@@ -125,28 +120,4 @@ class RecordingAdmin(admin.ModelAdmin):
     """Recording admin interface declaration."""
 
     inlines = (RecordingAccessInline,)
-    search_fields = ["status", "=id", "worker_id", "room__slug", "=room__id"]
-    list_display = ("id", "status", "room", "get_owner", "created_at", "worker_id")
-    list_filter = ["status", "room", "created_at"]
-    readonly_fields = ["id", "created_at", "updated_at"]
-
-    def get_queryset(self, request):
-        """Optimize queries by prefetching related access and user data to avoid N+1 queries."""
-        return super().get_queryset(request).prefetch_related("accesses__user")
-
-    def get_owner(self, obj):
-        """Return the owner of the recording for display in the admin list."""
-
-        owners = [
-            access
-            for access in obj.accesses.all()
-            if access.role == models.RoleChoices.OWNER
-        ]
-
-        if not owners:
-            return _("No owner")
-
-        if len(owners) > 1:
-            return _("Multiple owners")
-
-        return str(owners[0].user)
+    list_display = ("id", "status", "room", "created_at", "worker_id")

src/backend/core/api/__init__.py

@@ -40,9 +40,7 @@ def get_frontend_configuration(request):
         "recording": {
             "is_enabled": settings.RECORDING_ENABLE,
             "available_modes": settings.RECORDING_WORKER_CLASSES.keys(),
-            "expiration_days": settings.RECORDING_EXPIRATION_DAYS,
         },
-        "custom_css": "/custom.css",
     }
     frontend_configuration.update(settings.FRONTEND_CONFIGURATION)
     return Response(frontend_configuration)

src/backend/core/api/permissions.py

@@ -94,7 +94,7 @@ class HasAbilityPermission(IsAuthenticated):
 class HasPrivilegesOnRoom(IsAuthenticated):
     """Check if user has privileges on a given room."""
 
-    message = "You must have privileges on room to perform this action."
+    message = "You must have privileges to start a recording."
 
     def has_object_permission(self, request, view, obj):
         """Determine if user has privileges on room."""

src/backend/core/api/serializers.py

@@ -1,10 +1,10 @@
 """Client serializers for the Meet core app."""
 
+from django.conf import settings
 from django.utils.translation import gettext_lazy as _
 
 from rest_framework import serializers
 from rest_framework.exceptions import PermissionDenied
-from timezone_field.rest_framework import TimeZoneSerializerField
 
 from core import models, utils
 
@@ -12,11 +12,9 @@ from core import models, utils
 class UserSerializer(serializers.ModelSerializer):
     """Serialize users."""
 
-    timezone = TimeZoneSerializerField()
-
     class Meta:
         model = models.User
-        fields = ["id", "email", "full_name", "short_name", "timezone", "language"]
+        fields = ["id", "email", "full_name", "short_name"]
         read_only_fields = ["id", "email", "full_name", "short_name"]
 
 
@@ -37,7 +35,7 @@ class ResourceAccessSerializerMixin:
             # Update
             self.instance
             and (
-                data.get("role") == models.RoleChoices.OWNER
+                data["role"] == models.RoleChoices.OWNER
                 and not self.instance.resource.is_owner(user)
                 or self.instance.role == models.RoleChoices.OWNER
                 and not self.instance.user == user
@@ -94,7 +92,7 @@ class ListRoomSerializer(serializers.ModelSerializer):
 
     class Meta:
         model = models.Room
-        fields = ["id", "name", "slug", "access_level"]
+        fields = ["id", "name", "slug", "is_public"]
         read_only_fields = ["id", "slug"]
 
 
@@ -103,7 +101,7 @@ class RoomSerializer(serializers.ModelSerializer):
 
     class Meta:
         model = models.Room
-        fields = ["id", "name", "slug", "configuration", "access_level"]
+        fields = ["id", "name", "slug", "configuration", "is_public"]
         read_only_fields = ["id", "slug"]
 
     def to_representation(self, instance):
@@ -120,7 +118,7 @@ class RoomSerializer(serializers.ModelSerializer):
         role = instance.get_role(request.user)
         is_admin = models.RoleChoices.check_administrator_role(role)
 
-        if is_admin:
+        if role is not None:
             access_serializer = NestedResourceAccessSerializer(
                 instance.accesses.select_related("resource", "user").all(),
                 context=self.context,
@@ -131,21 +129,17 @@ class RoomSerializer(serializers.ModelSerializer):
         if not is_admin:
             del output["configuration"]
 
-        should_access_room = (
-            (
-                instance.access_level == models.RoomAccessLevel.TRUSTED
-                and request.user.is_authenticated
-            )
-            or role is not None
-            or instance.is_public
-        )
-
-        if should_access_room:
-            room_id = f"{instance.id!s}"
+        if role is not None or instance.is_public:
+            slug = f"{instance.id!s}"
             username = request.query_params.get("username", None)
-            output["livekit"] = utils.generate_livekit_config(
-                room_id=room_id, user=request.user, username=username
-            )
+
+            output["livekit"] = {
+                "url": settings.LIVEKIT_CONFIGURATION["url"],
+                "room": slug,
+                "token": utils.generate_token(
+                    room=slug, user=request.user, username=username
+                ),
+            }
 
         output["is_administrable"] = is_admin
 
@@ -159,17 +153,7 @@ class RecordingSerializer(serializers.ModelSerializer):
 
     class Meta:
         model = models.Recording
-        fields = [
-            "id",
-            "room",
-            "created_at",
-            "updated_at",
-            "status",
-            "mode",
-            "key",
-            "is_expired",
-            "expired_at",
-        ]
+        fields = ["id", "room", "created_at", "updated_at", "status"]
         read_only_fields = fields
 
 
@@ -193,60 +177,3 @@ class StartRecordingSerializer(serializers.Serializer):
     def update(self, instance, validated_data):
         """Not implemented as this is a validation-only serializer."""
         raise NotImplementedError("StartRecordingSerializer is validation-only")
-
-
-class RequestEntrySerializer(serializers.Serializer):
-    """Validate request entry data."""
-
-    username = serializers.CharField(required=True)
-
-    def create(self, validated_data):
-        """Not implemented as this is a validation-only serializer."""
-        raise NotImplementedError("RequestEntrySerializer is validation-only")
-
-    def update(self, instance, validated_data):
-        """Not implemented as this is a validation-only serializer."""
-        raise NotImplementedError("RequestEntrySerializer is validation-only")
-
-
-class ParticipantEntrySerializer(serializers.Serializer):
-    """Validate participant entry decision data."""
-
-    participant_id = serializers.CharField(required=True)
-    allow_entry = serializers.BooleanField(required=True)
-
-    def create(self, validated_data):
-        """Not implemented as this is a validation-only serializer."""
-        raise NotImplementedError("ParticipantEntrySerializer is validation-only")
-
-    def update(self, instance, validated_data):
-        """Not implemented as this is a validation-only serializer."""
-        raise NotImplementedError("ParticipantEntrySerializer is validation-only")
-
-
-class CreationCallbackSerializer(serializers.Serializer):
-    """Validate room creation callback data."""
-
-    callback_id = serializers.CharField(required=True)
-
-    def create(self, validated_data):
-        """Not implemented as this is a validation-only serializer."""
-        raise NotImplementedError("CreationCallbackSerializer is validation-only")
-
-    def update(self, instance, validated_data):
-        """Not implemented as this is a validation-only serializer."""
-        raise NotImplementedError("CreationCallbackSerializer is validation-only")
-
-
-class RoomInviteSerializer(serializers.Serializer):
-    """Validate room invite creation data."""
-
-    emails = serializers.ListField(child=serializers.EmailField(), allow_empty=False)
-
-    def create(self, validated_data):
-        """Not implemented as this is a validation-only serializer."""
-        raise NotImplementedError("RoomInviteSerializer is validation-only")
-
-    def update(self, instance, validated_data):
-        """Not implemented as this is a validation-only serializer."""
-        raise NotImplementedError("RoomInviteSerializer is validation-only")

src/backend/core/api/viewsets.py

@@ -2,7 +2,6 @@
 
 import uuid
 from logging import getLogger
-from urllib.parse import urlparse
 
 from django.conf import settings
 from django.db.models import Q
@@ -10,7 +9,12 @@ from django.http import Http404
 from django.shortcuts import get_object_or_404
 from django.utils.text import slugify
 
-from rest_framework import decorators, mixins, pagination, throttling, viewsets
+from rest_framework import (
+    decorators,
+    mixins,
+    pagination,
+    viewsets,
+)
 from rest_framework import (
     exceptions as drf_exceptions,
 )
@@ -21,15 +25,13 @@ from rest_framework import (
     status as drf_status,
 )
 
-from core import enums, models, utils
-from core.recording.enums import FileExtension
+from core import models, utils
 from core.recording.event.authentication import StorageEventAuthentication
 from core.recording.event.exceptions import (
     InvalidBucketError,
     InvalidFileTypeError,
     ParsingEventDataError,
 )
-from core.recording.event.notification import notification_service
 from core.recording.event.parsers import get_parser
 from core.recording.worker.exceptions import (
     RecordingStartError,
@@ -41,16 +43,6 @@ from core.recording.worker.factories import (
 from core.recording.worker.mediator import (
     WorkerServiceMediator,
 )
-from core.services.invitation import InvitationService
-from core.services.livekit_events import (
-    LiveKitEventsService,
-    LiveKitWebhookError,
-)
-from core.services.lobby import (
-    LobbyParticipantNotFound,
-    LobbyService,
-)
-from core.services.room_creation import RoomCreation
 
 from . import permissions, serializers
 
@@ -158,8 +150,9 @@ class UserViewSet(
         queryset = self.queryset
 
         if self.action == "list":
-            if not settings.ALLOW_UNSECURE_USER_LISTING:
-                return models.User.objects.none()
+            # Exclude all users already in the given document
+            if document_id := self.request.GET.get("document_id", ""):
+                queryset = queryset.exclude(documentaccess__document_id=document_id)
 
             # Filter users by email similarity
             if query := self.request.GET.get("q", ""):
@@ -184,18 +177,6 @@ class UserViewSet(
         )
 
 
-class RequestEntryAnonRateThrottle(throttling.AnonRateThrottle):
-    """Throttle Anonymous user requesting room entry"""
-
-    scope = "request_entry"
-
-
-class CreationCallbackAnonRateThrottle(throttling.AnonRateThrottle):
-    """Throttle Anonymous user requesting room generation callback"""
-
-    scope = "creation_callback"
-
-
 class RoomViewSet(
     mixins.CreateModelMixin,
     mixins.DestroyModelMixin,
@@ -278,9 +259,6 @@ class RoomViewSet(
             role=models.RoleChoices.OWNER,
         )
 
-        if callback_id := self.request.data.get("callback_id"):
-            RoomCreation().persist_callback_state(callback_id, room)
-
     @decorators.action(
         detail=True,
         methods=["post"],
@@ -364,179 +342,41 @@ class RoomViewSet(
             {"message": f"Recording stopped for room {room.slug}."}
         )
 
-    @decorators.action(
-        detail=True,
-        methods=["post"],
-        url_path="request-entry",
-        permission_classes=[],
-        throttle_classes=[RequestEntryAnonRateThrottle],
-    )
-    def request_entry(self, request, pk=None):  # pylint: disable=unused-argument
-        """Request entry to a room"""
 
-        serializer = serializers.RequestEntrySerializer(data=request.data)
-        serializer.is_valid(raise_exception=True)
+class ResourceAccessListModelMixin:
+    """List mixin for resource access API."""
 
-        room = self.get_object()
-        lobby_service = LobbyService()
+    def get_permissions(self):
+        """User only needs to be authenticated to list rooms access"""
+        if self.action == "list":
+            permission_classes = [permissions.IsAuthenticated]
+        else:
+            return super().get_permissions()
 
-        participant, livekit = lobby_service.request_entry(
-            room=room,
-            request=request,
-            **serializer.validated_data,
-        )
-        response = drf_response.Response({**participant.to_dict(), "livekit": livekit})
-        lobby_service.prepare_response(response, participant.id)
+        return [permission() for permission in permission_classes]
 
-        return response
-
-    @decorators.action(
-        detail=True,
-        methods=["post"],
-        url_path="enter",
-        permission_classes=[
-            permissions.HasPrivilegesOnRoom,
-        ],
-    )
-    def allow_participant_to_enter(self, request, pk=None):  # pylint: disable=unused-argument
-        """Accept or deny a participant's entry request."""
-
-        serializer = serializers.ParticipantEntrySerializer(data=request.data)
-        serializer.is_valid(raise_exception=True)
-
-        room = self.get_object()
-
-        if room.is_public:
-            return drf_response.Response(
-                {"message": "Room has no lobby system."},
-                status=drf_status.HTTP_404_NOT_FOUND,
-            )
-
-        lobby_service = LobbyService()
-
-        try:
-            lobby_service.handle_participant_entry(
-                room_id=room.id,
-                **serializer.validated_data,
-            )
-            return drf_response.Response({"message": "Participant was updated."})
-
-        except LobbyParticipantNotFound:
-            return drf_response.Response(
-                {"message": "Participant not found."},
-                status=drf_status.HTTP_404_NOT_FOUND,
-            )
-
-    @decorators.action(
-        detail=True,
-        methods=["GET"],
-        url_path="waiting-participants",
-        permission_classes=[
-            permissions.HasPrivilegesOnRoom,
-        ],
-    )
-    def list_waiting_participants(self, request, pk=None):  # pylint: disable=unused-argument
-        """List waiting participants."""
-        room = self.get_object()
-
-        if room.is_public:
-            return drf_response.Response({"participants": []})
-
-        lobby_service = LobbyService()
-
-        participants = lobby_service.list_waiting_participants(room.id)
-        return drf_response.Response({"participants": participants})
-
-    @decorators.action(
-        detail=False,
-        methods=["post"],
-        url_path="webhooks-livekit",
-        permission_classes=[],
-    )
-    def webhooks_livekit(self, request):
-        """Process webhooks from LiveKit."""
-
-        livekit_events_service = LiveKitEventsService()
-
-        try:
-            livekit_events_service.receive(request)
-            return drf_response.Response(
-                {"status": "success"}, status=drf_status.HTTP_200_OK
-            )
-        except LiveKitWebhookError as e:
-            status_code = getattr(e, "status_code", drf_status.HTTP_400_BAD_REQUEST)
-
-            if status_code == drf_status.HTTP_500_INTERNAL_SERVER_ERROR:
-                raise e
-
-            return drf_response.Response(
-                {"status": "error", "message": str(e)}, status=status_code
-            )
-
-    @decorators.action(
-        detail=False,
-        methods=["post"],
-        url_path="creation-callback",
-        permission_classes=[],
-        throttle_classes=[CreationCallbackAnonRateThrottle],
-    )
-    def creation_callback(self, request):
-        """Retrieve cached room data via an unauthenticated request with a unique ID.
-
-        Designed for interoperability across iframes, popups, and other contexts,
-        even on the same domain, bypassing browser security restrictions on direct communication.
-        """
-
-        serializer = serializers.CreationCallbackSerializer(data=request.data)
-        serializer.is_valid(raise_exception=True)
-
-        room = RoomCreation().get_callback_state(
-            callback_id=serializer.validated_data.get("callback_id")
-        )
-
-        return drf_response.Response(
-            {"status": "success", "room": room}, status=drf_status.HTTP_200_OK
-        )
-
-    @decorators.action(
-        detail=True,
-        methods=["post"],
-        url_path="invite",
-        permission_classes=[
-            permissions.HasPrivilegesOnRoom,
-        ],
-    )
-    def invite(self, request, pk=None):  # pylint: disable=unused-argument
-        """Send email invitations to join a room.
-
-        This API endpoint allows a user with appropriate privileges to send email invitations
-        to one or more recipients, inviting them to join the specified room.
-        """
-
-        room = self.get_object()
-
-        serializer = serializers.RoomInviteSerializer(data=request.data)
-        serializer.is_valid(raise_exception=True)
-
-        emails = serializer.validated_data.get("emails")
-        emails = list(set(emails))
-
-        InvitationService().invite_to_room(
-            room=room, sender=request.user, emails=emails
-        )
-
-        return drf_response.Response(
-            {"status": "success", "message": "invitations sent"},
-            status=drf_status.HTTP_200_OK,
-        )
+    def get_queryset(self):
+        """Return the queryset according to the action."""
+        queryset = super().get_queryset()
+        if self.action == "list":
+            user = self.request.user
+            queryset = queryset.filter(
+                Q(resource__accesses__user=user),
+                resource__accesses__role__in=[
+                    models.RoleChoices.ADMIN,
+                    models.RoleChoices.OWNER,
+                ],
+            ).distinct()
+        return queryset
 
 
 class ResourceAccessViewSet(
+    ResourceAccessListModelMixin,
     mixins.CreateModelMixin,
     mixins.DestroyModelMixin,
+    mixins.ListModelMixin,
     mixins.RetrieveModelMixin,
     mixins.UpdateModelMixin,
-    mixins.ListModelMixin,
     viewsets.GenericViewSet,
 ):
     """
@@ -547,30 +387,10 @@ class ResourceAccessViewSet(
     queryset = models.ResourceAccess.objects.all()
     serializer_class = serializers.ResourceAccessSerializer
 
-    def get_queryset(self):
-        """Return the queryset according to the action."""
-
-        queryset = super().get_queryset()
-
-        # Restrict access to resources the user either has explicit
-        # permissions for or administrative privileges over.
-        if self.action == "list":
-            user = self.request.user
-            queryset = queryset.filter(
-                Q(resource__accesses__user=user),
-                resource__accesses__role__in=[
-                    models.RoleChoices.ADMIN,
-                    models.RoleChoices.OWNER,
-                ],
-            ).distinct()
-
-        return queryset
-
 
 class RecordingViewSet(
     mixins.DestroyModelMixin,
     mixins.ListModelMixin,
-    mixins.RetrieveModelMixin,
     viewsets.GenericViewSet,
 ):
     """
@@ -628,101 +448,9 @@ class RecordingViewSet(
                 " in an error state or has already been saved."
             )
 
-        # Attempt to notify external services about the recording
-        # This is a non-blocking operation - failures are logged but don't interrupt the flow
-        notification_succeeded = notification_service.notify_external_services(
-            recording
-        )
-
-        recording.status = (
-            models.RecordingStatusChoices.NOTIFICATION_SUCCEEDED
-            if notification_succeeded
-            else models.RecordingStatusChoices.SAVED
-        )
+        recording.status = models.RecordingStatusChoices.SAVED
         recording.save()
 
         return drf_response.Response(
             {"message": "Event processed."},
         )
-
-    def _auth_get_original_url(self, request):
-        """
-        Extracts and parses the original URL from the "HTTP_X_ORIGINAL_URL" header.
-        Raises PermissionDenied if the header is missing.
-        The original url is passed by nginx in the "HTTP_X_ORIGINAL_URL" header.
-        See corresponding ingress configuration in Helm chart and read about the
-        nginx.ingress.kubernetes.io/auth-url annotation to understand how the Nginx ingress
-        is configured to do this.
-        Based on the original url and the logged-in user, we must decide if we authorize Nginx
-        to let this request go through (by returning a 200 code) or if we block it (by returning
-        a 403 error). Note that we return 403 errors without any further details for security
-        reasons.
-        """
-        # Extract the original URL from the request header
-        original_url = request.META.get("HTTP_X_ORIGINAL_URL")
-        if not original_url:
-            logger.debug("Missing HTTP_X_ORIGINAL_URL header in subrequest")
-            raise drf_exceptions.PermissionDenied()
-
-        logger.debug("Original url: '%s'", original_url)
-        return urlparse(original_url)
-
-    def _auth_get_url_params(self, pattern, fragment):
-        """
-        Extracts URL parameters from the given fragment using the specified regex pattern.
-        Raises PermissionDenied if parameters cannot be extracted.
-        """
-
-        match = pattern.search(fragment)
-
-        try:
-            return match.groupdict()
-        except (ValueError, AttributeError) as exc:
-            logger.debug("Failed to extract parameters from subrequest URL: %s", exc)
-            raise drf_exceptions.PermissionDenied() from exc
-
-    @decorators.action(detail=False, methods=["get"], url_path="media-auth")
-    def media_auth(self, request, *args, **kwargs):
-        """
-        This view is used by an Nginx subrequest to control access to a recording's
-        media file.
-        When we let the request go through, we compute authorization headers that will be added to
-        the request going through thanks to the nginx.ingress.kubernetes.io/auth-response-headers
-        annotation. The request will then be proxied to the object storage backend who will
-        respond with the file after checking the signature included in headers.
-        """
-
-        parsed_url = self._auth_get_original_url(request)
-
-        url_params = self._auth_get_url_params(
-            enums.RECORDING_STORAGE_URL_PATTERN, parsed_url.path
-        )
-
-        user = request.user
-        recording_id = url_params["recording_id"]
-
-        extension = url_params["extension"]
-        if extension not in [item.value for item in FileExtension]:
-            raise drf_exceptions.ValidationError({"detail": "Unsupported extension."})
-
-        try:
-            recording = models.Recording.objects.get(id=recording_id)
-        except models.Recording.DoesNotExist as e:
-            raise drf_exceptions.NotFound("No recording found for this event.") from e
-
-        if extension != recording.extension:
-            raise drf_exceptions.NotFound("No recording found with this extension.")
-
-        abilities = recording.get_abilities(user)
-
-        if not abilities["retrieve"]:
-            logger.debug("User '%s' lacks permission for attachment", user.id)
-            raise drf_exceptions.PermissionDenied()
-
-        if not recording.is_saved:
-            logger.debug("Recording '%s' has not been saved", recording)
-            raise drf_exceptions.PermissionDenied()
-
-        request = utils.generate_s3_authorization_headers(recording.key)
-
-        return drf_response.Response("authorized", headers=request.headers, status=200)

src/backend/core/authentication/backends.py

@@ -1,85 +1,100 @@
 """Authentication Backends for the Meet core app."""
 
-import contextlib
-
 from django.conf import settings
-from django.core.exceptions import ImproperlyConfigured, SuspiciousOperation
+from django.core.exceptions import SuspiciousOperation
 from django.utils.translation import gettext_lazy as _
 
-from lasuite.oidc_login.backends import (
-    OIDCAuthenticationBackend as LaSuiteOIDCAuthenticationBackend,
+import requests
+from mozilla_django_oidc.auth import (
+    OIDCAuthenticationBackend as MozillaOIDCAuthenticationBackend,
 )
 
 from core.models import User
-from core.services.marketing import (
-    ContactCreationError,
-    ContactData,
-    get_marketing_service,
-)
 
 
-class OIDCAuthenticationBackend(LaSuiteOIDCAuthenticationBackend):
+class OIDCAuthenticationBackend(MozillaOIDCAuthenticationBackend):
     """Custom OpenID Connect (OIDC) Authentication Backend.
 
     This class overrides the default OIDC Authentication Backend to accommodate differences
     in the User and Identity models, and handles signed and/or encrypted UserInfo response.
     """
 
-    def get_extra_claims(self, user_info):
-        """
-        Return extra claims from user_info.
+    def get_userinfo(self, access_token, id_token, payload):
+        """Return user details dictionary.
 
-        Args:
-          user_info (dict): The user information dictionary.
+        Parameters:
+        - access_token (str): The access token.
+        - id_token (str): The id token (unused).
+        - payload (dict): The token payload (unused).
+
+        Note: The id_token and payload parameters are unused in this implementation,
+        but were kept to preserve base method signature.
+
+        Note: It handles signed and/or encrypted UserInfo Response. It is required by
+        Agent Connect, which follows the OIDC standard. It forces us to override the
+        base method, which deal with 'application/json' response.
 
         Returns:
-          dict: A dictionary of extra claims.
-
+        - dict: User details dictionary obtained from the OpenID Connect user endpoint.
         """
-        return {
-            # Get user's full name from OIDC fields defined in settings
+
+        user_response = requests.get(
+            self.OIDC_OP_USER_ENDPOINT,
+            headers={"Authorization": f"Bearer {access_token}"},
+            verify=self.get_settings("OIDC_VERIFY_SSL", True),
+            timeout=self.get_settings("OIDC_TIMEOUT", None),
+            proxies=self.get_settings("OIDC_PROXY", None),
+        )
+        user_response.raise_for_status()
+        userinfo = self.verify_token(user_response.text)
+        return userinfo
+
+    def get_or_create_user(self, access_token, id_token, payload):
+        """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 sub:
+            raise SuspiciousOperation(
+                _("User info contained no recognizable user identification")
+            )
+
+        email = user_info.get("email")
+        user = self.get_existing_user(sub, email)
+
+        claims = {
+            "email": email,
             "full_name": self.compute_full_name(user_info),
             "short_name": user_info.get(settings.OIDC_USERINFO_SHORTNAME_FIELD),
         }
-
-    def post_get_or_create_user(self, user, claims, is_new_user):
-        """
-        Post-processing after user creation or retrieval.
-
-        Args:
-          user (User): The user instance.
-          claims (dict): The claims dictionary.
-          is_new_user (bool): Indicates if the user was newly created.
-
-        Returns:
-        - None
-
-        """
-        email = claims["email"]
-        if is_new_user and email and settings.SIGNUP_NEW_USER_TO_MARKETING_EMAIL:
-            self.signup_to_marketing_email(email)
-
-    @staticmethod
-    def signup_to_marketing_email(email):
-        """Pragmatic approach to newsletter signup during authentication flow.
-
-        Details:
-        1. Uses a very short timeout (1s) to prevent blocking the auth process
-        2. Silently fails if the marketing service is down/slow to prioritize user experience
-        3. Trade-off: May miss some signups but ensures auth flow remains fast
-
-        Note: For a more robust solution, consider using Async task processing (Celery/Django-Q)
-        """
-        with contextlib.suppress(
-            ContactCreationError, ImproperlyConfigured, ImportError
-        ):
-            marketing_service = get_marketing_service()
-            contact_data = ContactData(
-                email=email, attributes={"VISIO_SOURCE": ["SIGNIN"]}
-            )
-            marketing_service.create_contact(
-                contact_data, timeout=settings.BREVO_API_TIMEOUT
+        if not user and self.get_settings("OIDC_CREATE_USER", True):
+            user = User.objects.create(
+                sub=sub,
+                password="!",  # noqa: S106
+                **claims,
             )
+        elif not user:
+            return None
+
+        if not user.is_active:
+            raise SuspiciousOperation(_("User account is disabled"))
+
+        self.update_user_if_needed(user, claims)
+
+        return user
 
     def get_existing_user(self, sub, email):
         """Fetch existing user by sub or email."""
@@ -93,6 +108,35 @@ class OIDCAuthenticationBackend(LaSuiteOIDCAuthenticationBackend):
                     pass
                 except User.MultipleObjectsReturned as e:
                     raise SuspiciousOperation(
-                        "Multiple user accounts share a common email."
+                        _("Multiple user accounts share a common email.")
                     ) from e
         return None
+
+    @staticmethod
+    def compute_full_name(user_info):
+        """Compute user's full name based on OIDC fields in settings."""
+        full_name = " ".join(
+            filter(
+                None,
+                (
+                    user_info.get(field)
+                    for field in settings.OIDC_USERINFO_FULLNAME_FIELDS
+                ),
+            )
+        )
+        return full_name or None
+
+    @staticmethod
+    def update_user_if_needed(user, claims):
+        """Update user claims if they have changed."""
+        user_fields = vars(user.__class__)  # Get available model fields
+        updated_claims = {
+            key: value
+            for key, value in claims.items()
+            if value and key in user_fields and value != getattr(user, key)
+        }
+
+        if not updated_claims:
+            return
+
+        User.objects.filter(sub=user.sub).update(**updated_claims)

src/backend/core/authentication/urls.py

@@ -0,0 +1,18 @@
+"""Authentication URLs for the People core app."""
+
+from django.urls import path
+
+from mozilla_django_oidc.urls import urlpatterns as mozzila_oidc_urls
+
+from .views import OIDCLogoutCallbackView, OIDCLogoutView
+
+urlpatterns = [
+    # Override the default 'logout/' path from Mozilla Django OIDC with our custom view.
+    path("logout/", OIDCLogoutView.as_view(), name="oidc_logout_custom"),
+    path(
+        "logout-callback/",
+        OIDCLogoutCallbackView.as_view(),
+        name="oidc_logout_callback",
+    ),
+    *mozzila_oidc_urls,
+]

src/backend/core/authentication/views.py

@@ -0,0 +1,181 @@
+"""Authentication Views for the People core app."""
+
+import copy
+from urllib.parse import urlencode
+
+from django.contrib import auth
+from django.core.exceptions import SuspiciousOperation
+from django.http import HttpResponseRedirect
+from django.urls import reverse
+from django.utils import crypto
+
+from mozilla_django_oidc.utils import (
+    absolutify,
+)
+from mozilla_django_oidc.views import (
+    OIDCAuthenticationCallbackView as MozillaOIDCAuthenticationCallbackView,
+)
+from mozilla_django_oidc.views import (
+    OIDCAuthenticationRequestView as MozillaOIDCAuthenticationRequestView,
+)
+from mozilla_django_oidc.views import (
+    OIDCLogoutView as MozillaOIDCOIDCLogoutView,
+)
+
+
+class OIDCLogoutView(MozillaOIDCOIDCLogoutView):
+    """Custom logout view for handling OpenID Connect (OIDC) logout flow.
+
+    Adds support for handling logout callbacks from the identity provider (OP)
+    by initiating the logout flow if the user has an active session.
+
+    The Django session is retained during the logout process to persist the 'state' OIDC parameter.
+    This parameter is crucial for maintaining the integrity of the logout flow between this call
+    and the subsequent callback.
+    """
+
+    @staticmethod
+    def persist_state(request, state):
+        """Persist the given 'state' parameter in the session's 'oidc_states' dictionary
+
+        This method is used to store the OIDC state parameter in the session, according to the
+        structure expected by Mozilla Django OIDC's 'add_state_and_verifier_and_nonce_to_session'
+        utility function.
+        """
+
+        if "oidc_states" not in request.session or not isinstance(
+            request.session["oidc_states"], dict
+        ):
+            request.session["oidc_states"] = {}
+
+        request.session["oidc_states"][state] = {}
+        request.session.save()
+
+    def construct_oidc_logout_url(self, request):
+        """Create the redirect URL for interfacing with the OIDC provider.
+
+        Retrieves the necessary parameters from the session and constructs the URL
+        required to initiate logout with the OpenID Connect provider.
+
+        If no ID token is found in the session, the logout flow will not be initiated,
+        and the method will return the default redirect URL.
+
+        The 'state' parameter is generated randomly and persisted in the session to ensure
+        its integrity during the subsequent callback.
+        """
+
+        oidc_logout_endpoint = self.get_settings("OIDC_OP_LOGOUT_ENDPOINT")
+
+        if not oidc_logout_endpoint:
+            return self.redirect_url
+
+        reverse_url = reverse("oidc_logout_callback")
+        id_token = request.session.get("oidc_id_token", None)
+
+        if not id_token:
+            return self.redirect_url
+
+        query = {
+            "id_token_hint": id_token,
+            "state": crypto.get_random_string(self.get_settings("OIDC_STATE_SIZE", 32)),
+            "post_logout_redirect_uri": absolutify(request, reverse_url),
+        }
+
+        self.persist_state(request, query["state"])
+
+        return f"{oidc_logout_endpoint}?{urlencode(query)}"
+
+    def post(self, request):
+        """Handle user logout.
+
+        If the user is not authenticated, redirects to the default logout URL.
+        Otherwise, constructs the OIDC logout URL and redirects the user to start
+        the logout process.
+
+        If the user is redirected to the default logout URL, ensure her Django session
+        is terminated.
+        """
+
+        logout_url = self.redirect_url
+
+        if request.user.is_authenticated:
+            logout_url = self.construct_oidc_logout_url(request)
+
+        # If the user is not redirected to the OIDC provider, ensure logout
+        if logout_url == self.redirect_url:
+            auth.logout(request)
+
+        return HttpResponseRedirect(logout_url)
+
+
+class OIDCLogoutCallbackView(MozillaOIDCOIDCLogoutView):
+    """Custom view for handling the logout callback from the OpenID Connect (OIDC) provider.
+
+    Handles the callback after logout from the identity provider (OP).
+    Verifies the state parameter and performs necessary logout actions.
+
+    The Django session is maintained during the logout process to ensure the integrity
+    of the logout flow initiated in the previous step.
+    """
+
+    http_method_names = ["get"]
+
+    def get(self, request):
+        """Handle the logout callback.
+
+        If the user is not authenticated, redirects to the default logout URL.
+        Otherwise, verifies the state parameter and performs necessary logout actions.
+        """
+
+        if not request.user.is_authenticated:
+            return HttpResponseRedirect(self.redirect_url)
+
+        state = request.GET.get("state")
+
+        if state not in request.session.get("oidc_states", {}):
+            msg = "OIDC callback state not found in session `oidc_states`!"
+            raise SuspiciousOperation(msg)
+
+        del request.session["oidc_states"][state]
+        request.session.save()
+
+        auth.logout(request)
+
+        return HttpResponseRedirect(self.redirect_url)
+
+
+class OIDCAuthenticationCallbackView(MozillaOIDCAuthenticationCallbackView):
+    """Custom callback view for handling the silent loging flow."""
+
+    @property
+    def failure_url(self):
+        """Override the failure URL property to handle silent login flow
+
+        A silent login failure (e.g., no active user session) should not be
+        considered as an authentication failure.
+        """
+        if self.request.session.get("silent", None):
+            del self.request.session["silent"]
+            self.request.session.save()
+            return self.success_url
+        return super().failure_url
+
+
+class OIDCAuthenticationRequestView(MozillaOIDCAuthenticationRequestView):
+    """Custom authentication view for handling the silent loging flow."""
+
+    def get_extra_params(self, request):
+        """Handle 'prompt' extra parameter for the silent login flow
+
+        This extra parameter is necessary to distinguish between a standard
+        authentication flow and the silent login flow.
+        """
+        extra_params = self.get_settings("OIDC_AUTH_REQUEST_EXTRA_PARAMS", None)
+        if extra_params is None:
+            extra_params = {}
+        if request.GET.get("silent") == "true":
+            extra_params = copy.deepcopy(extra_params)
+            extra_params.update({"prompt": "none"})
+            request.session["silent"] = True
+            request.session.save()
+        return extra_params

src/backend/core/enums.py

@@ -2,21 +2,9 @@
 Core application enums declaration
 """
 
-import re
-
 from django.conf import global_settings, settings
 from django.utils.translation import gettext_lazy as _
 
-UUID_REGEX = (
-    r"[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}"
-)
-FILE_EXT_REGEX = r"[a-zA-Z0-9]{1,10}"
-
-# pylint: disable=line-too-long
-RECORDING_STORAGE_URL_PATTERN = re.compile(
-    f"/media/{settings.RECORDING_OUTPUT_FOLDER}/(?P<recording_id>{UUID_REGEX:s}).(?P<extension>{FILE_EXT_REGEX:s})"
-)
-
 # 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.

src/backend/core/factories.py

@@ -36,6 +36,8 @@ class ResourceFactory(factory.django.DjangoModelFactory):
         model = models.Resource
         skip_postgeneration_save = True
 
+    is_public = factory.Faker("boolean", chance_of_getting_true=50)
+
     @factory.post_generation
     def users(self, create, extracted, **kwargs):
         """Add users to resource from a given list of users."""
@@ -68,7 +70,6 @@ class RoomFactory(ResourceFactory):
 
     name = factory.Faker("catch_phrase")
     slug = factory.LazyAttribute(lambda o: slugify(o.name))
-    access_level = factory.fuzzy.FuzzyChoice(models.RoomAccessLevel)
 
 
 class RecordingFactory(factory.django.DjangoModelFactory):

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

@@ -1,18 +0,0 @@
-# Generated by Django 5.1.3 on 2024-12-02 13:23
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('core', '0008_user_full_name_user_short_name'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='recording',
-            name='status',
-            field=models.CharField(choices=[('initiated', 'Initiated'), ('active', 'Active'), ('stopped', 'Stopped'), ('saved', 'Saved'), ('aborted', 'Aborted'), ('failed_to_start', 'Failed to Start'), ('failed_to_stop', 'Failed to Stop'), ('notification_succeeded', 'Notification succeeded')], default='initiated', max_length=50),
-        ),
-    ]

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

@@ -1,21 +0,0 @@
-# Generated by Django 5.1.4 on 2025-01-13 12:25
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('core', '0009_alter_recording_status'),
-    ]
-
-    operations = [
-        migrations.AlterModelOptions(
-            name='resourceaccess',
-            options={'ordering': ('-created_at',), 'verbose_name': 'Resource access', 'verbose_name_plural': 'Resource accesses'},
-        ),
-        migrations.AlterModelOptions(
-            name='user',
-            options={'ordering': ('-created_at',), 'verbose_name': 'user', 'verbose_name_plural': 'users'},
-        ),
-    ]

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

@@ -1,22 +0,0 @@
-# Generated by Django 5.1.5 on 2025-02-16 11:42
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('core', '0010_alter_resourceaccess_options_alter_user_options'),
-    ]
-
-    operations = [
-        migrations.RemoveField(
-            model_name='resource',
-            name='is_public',
-        ),
-        migrations.AddField(
-            model_name='room',
-            name='access_level',
-            field=models.CharField(choices=[('public', 'Public Access'), ('restricted', 'Restricted Access')], default='public', max_length=50),
-        ),
-    ]

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

@@ -1,18 +0,0 @@
-# Generated by Django 5.1.6 on 2025-03-04 09:51
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('core', '0011_remove_resource_is_public_room_access_level'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='room',
-            name='access_level',
-            field=models.CharField(choices=[('public', 'Public Access'), ('trusted', 'Trusted Access'), ('restricted', 'Restricted Access')], default='public', max_length=50),
-        )
-    ]

src/backend/core/migrations/0013_alter_user_language.py

@@ -1,18 +0,0 @@
-# Generated by Django 5.1.8 on 2025-04-22 14:52
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('core', '0012_alter_room_access_level'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='user',
-            name='language',
-            field=models.CharField(choices="(('en-us', 'English'), ('fr-fr', 'French'), ('nl-nl', 'Dutch'))", 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/0014_room_pin_code.py

@@ -1,45 +0,0 @@
-# Generated by Django 5.1.9 on 2025-05-13 08:22
-
-import secrets
-from django.db import migrations, models
-
-
-def generate_pin_for_rooms(apps, schema_editor):
-    """Generate unique 10-digit PIN codes for existing rooms.
-    The PIN code is required for SIP telephony features.
-    """
-    Room = apps.get_model('core', 'Room')
-    rooms_without_pin_code = Room.objects.filter(pin_code__isnull=True)
-    existing_pins = set(Room.objects.values_list('pin_code', flat=True))
-
-    length = 10
-
-    def generate_pin_code():
-        while True:
-            pin_code = str(secrets.randbelow(10 ** length)).zfill(length)
-            if not pin_code in existing_pins:
-                return pin_code
-
-    for room in rooms_without_pin_code:
-        room.pin_code = generate_pin_code()
-        room.save()
-
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('core', '0013_alter_user_language'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='room',
-            name='pin_code',
-            field=models.CharField(blank=True, help_text='Unique n-digit code that identifies this room in telephony mode.', max_length=None, null=True, unique=True, verbose_name='Room PIN code'),
-        ),
-        migrations.RunPython(
-            generate_pin_for_rooms,
-            reverse_code=migrations.RunPython.noop
-        ),
-    ]

src/backend/core/models.py

@@ -2,11 +2,9 @@
 Declare and configure the models for the Meet core application
 """
 
-import secrets
 import uuid
-from datetime import datetime, timedelta
 from logging import getLogger
-from typing import List, Optional
+from typing import List
 
 from django.conf import settings
 from django.contrib.auth import models as auth_models
@@ -14,14 +12,12 @@ from django.contrib.auth.base_user import AbstractBaseUser
 from django.core import mail, validators
 from django.core.exceptions import PermissionDenied, ValidationError
 from django.db import models
-from django.utils import timezone
+from django.utils.functional import lazy
 from django.utils.text import capfirst, slugify
 from django.utils.translation import gettext_lazy as _
 
 from timezone_field import TimeZoneField
 
-from .recording.enums import FileExtension
-
 logger = getLogger(__name__)
 
 
@@ -53,7 +49,6 @@ class RecordingStatusChoices(models.TextChoices):
     ABORTED = "aborted", _("Aborted")
     FAILED_TO_START = "failed_to_start", _("Failed to Start")
     FAILED_TO_STOP = "failed_to_stop", _("Failed to Stop")
-    NOTIFICATION_SUCCEEDED = "notification_succeeded", _("Notification succeeded")
 
     @classmethod
     def is_final(cls, status):
@@ -84,14 +79,6 @@ class RecordingModeChoices(models.TextChoices):
     TRANSCRIPT = "transcript", _("TRANSCRIPT")
 
 
-class RoomAccessLevel(models.TextChoices):
-    """Room access level choices."""
-
-    PUBLIC = "public", _("Public Access")
-    TRUSTED = "trusted", _("Trusted Access")
-    RESTRICTED = "restricted", _("Restricted Access")
-
-
 class BaseModel(models.Model):
     """
     Serves as an abstract base model for other models, ensuring that records are validated
@@ -164,7 +151,7 @@ class User(AbstractBaseUser, BaseModel, auth_models.PermissionsMixin):
     )
     language = models.CharField(
         max_length=10,
-        choices=settings.LANGUAGES,
+        choices=lazy(lambda: settings.LANGUAGES, tuple)(),
         default=settings.LANGUAGE_CODE,
         verbose_name=_("language"),
         help_text=_("The language in which the user wants to see the interface."),
@@ -201,7 +188,6 @@ class User(AbstractBaseUser, BaseModel, auth_models.PermissionsMixin):
 
     class Meta:
         db_table = "meet_user"
-        ordering = ("-created_at",)
         verbose_name = _("user")
         verbose_name_plural = _("users")
 
@@ -253,6 +239,7 @@ def get_resource_roles(resource: models.Model, user: User) -> List[str]:
 class Resource(BaseModel):
     """Model to define access control"""
 
+    is_public = models.BooleanField(default=settings.RESOURCE_DEFAULT_IS_PUBLIC)
     users = models.ManyToManyField(
         User,
         through="ResourceAccess",
@@ -316,7 +303,6 @@ class ResourceAccess(BaseModel):
 
     class Meta:
         db_table = "meet_resource_access"
-        ordering = ("-created_at",)
         verbose_name = _("Resource access")
         verbose_name_plural = _("Resource accesses")
         constraints = [
@@ -372,25 +358,13 @@ class Room(Resource):
         primary_key=True,
     )
     slug = models.SlugField(max_length=100, blank=True, null=True, unique=True)
-    access_level = models.CharField(
-        max_length=50,
-        choices=RoomAccessLevel.choices,
-        default=settings.RESOURCE_DEFAULT_ACCESS_LEVEL,
-    )
+
     configuration = models.JSONField(
         blank=True,
         default=dict,
         verbose_name=_("Visio room configuration"),
         help_text=_("Values for Visio parameters to configure the room."),
     )
-    pin_code = models.CharField(
-        max_length=None,
-        unique=True,
-        blank=True,
-        null=True,
-        verbose_name=_("Room PIN code"),
-        help_text=_("Unique n-digit code that identifies this room in telephony mode."),
-    )
 
     class Meta:
         db_table = "meet_room"
@@ -401,14 +375,6 @@ class Room(Resource):
     def __str__(self):
         return capfirst(self.name)
 
-    def save(self, *args, **kwargs):
-        """Generate a unique n-digit pin code for new rooms."""
-        if settings.ROOM_TELEPHONY_ENABLED and not self.pk and not self.pin_code:
-            self.pin_code = self.generate_unique_pin_code(
-                length=settings.ROOM_TELEPHONY_PIN_LENGTH
-            )
-        super().save(*args, **kwargs)
-
     def clean_fields(self, exclude=None):
         """
         Automatically generate the slug from the name and make sure it does not look like a UUID.
@@ -423,39 +389,8 @@ class Room(Resource):
             pass
         else:
             raise ValidationError({"name": f'Room name "{self.name:s}" is reserved.'})
-
         super().clean_fields(exclude=exclude)
 
-    @property
-    def is_public(self):
-        """Check if a room is public"""
-        return self.access_level == RoomAccessLevel.PUBLIC
-
-    @staticmethod
-    def generate_unique_pin_code(length):
-        """Generate a unique n-digit PIN code"""
-
-        if length < 4:
-            raise ValueError(
-                "PIN code length must be at least 4 digits for minimal security"
-            )
-
-        max_value = 10**length
-
-        for _ in range(settings.ROOM_TELEPHONY_PIN_MAX_RETRIES):
-            pin_code = str(secrets.randbelow(max_value)).zfill(length)
-            if not Room.objects.filter(pin_code=pin_code).exists():
-                return pin_code
-
-        # Log a warning as a temporary measure until backend observability is implemented.
-        logger.warning(
-            "Failed to generate unique PIN code of length %s after %s attempts",
-            length,
-            settings.ROOM_TELEPHONY_PIN_MAX_RETRIES,
-        )
-
-        return None
-
 
 class BaseAccessManager(models.Manager):
     """Base manager for handling resource access control."""
@@ -527,23 +462,7 @@ class BaseAccess(BaseModel):
 
 
 class Recording(BaseModel):
-    """Model for recordings that take place in a room.
-
-     Recording Status Flow:
-    1. INITIATED: Initial state when recording is requested
-    2. ACTIVE: Recording is currently in progress
-    3. STOPPED: Recording has been stopped by user/system
-    4. SAVED: Recording has been successfully processed and stored
-    4. NOTIFICATION_SUCCEEDED: External service has been notified of this recording
-
-    Error States:
-    - FAILED_TO_START: Worker failed to initialize recording
-    - FAILED_TO_STOP: Worker failed during stop operation
-    - ABORTED: Recording was terminated before completion
-
-    Warning: Worker failures may lead to database inconsistency between the actual
-    recording state and its status in the database.
-    """
+    """Model for recordings that take place in a room"""
 
     room = models.ForeignKey(
         Room,
@@ -552,7 +471,7 @@ class Recording(BaseModel):
         verbose_name=_("Room"),
     )
     status = models.CharField(
-        max_length=50,
+        max_length=20,
         choices=RecordingStatusChoices.choices,
         default=RecordingStatusChoices.INITIATED,
     )
@@ -622,60 +541,24 @@ class Recording(BaseModel):
             RecordingStatusChoices.STOPPED,
         }
 
-    @property
-    def is_saved(self) -> bool:
-        """Check if the recording is in a saved state."""
-        return self.status in {
-            RecordingStatusChoices.NOTIFICATION_SUCCEEDED,
-            RecordingStatusChoices.SAVED,
-        }
-
-    @property
-    def extension(self):
-        """Get recording extension based on its mode."""
-        extensions = {
-            RecordingModeChoices.TRANSCRIPT: FileExtension.OGG.value,
-            RecordingModeChoices.SCREEN_RECORDING: FileExtension.MP4.value,
-        }
-        return extensions.get(self.mode, FileExtension.MP4.value)
-
-    @property
-    def key(self):
-        """Generate the file key based on recording mode."""
-
-        return f"{settings.RECORDING_OUTPUT_FOLDER}/{self.id}.{self.extension}"
-
-    @property
-    def expired_at(self) -> Optional[datetime]:
-        """
-        Calculate the expiration date based on created_at and RECORDING_EXPIRATION_DAYS.
-        Returns None if no expiration is configured.
-
-        Note: This is a naive and imperfect implementation since recordings are actually
-        saved to the bucket after created_at timestamp is set. The actual expiration
-        will be determined by the bucket lifecycle policy which operates on the object's
-        timestamp in the storage system, not this value.
-        """
-
-        if not settings.RECORDING_EXPIRATION_DAYS:
-            return None
-
-        return self.created_at + timedelta(days=settings.RECORDING_EXPIRATION_DAYS)
-
-    @property
-    def is_expired(self) -> bool:
-        """
-        Determine if the recording has expired by comparing expired_at with current UTC time.
-        Returns False if no expiration is configured or if expiration date is in the future.
-        """
-        if not self.expired_at:
-            return False
-
-        return self.expired_at < timezone.now()
-
 
 class RecordingAccess(BaseAccess):
-    """Relation model to give access to a recording for a user or a team with a role."""
+    """Relation model to give access to a recording for a user or a team with a role.
+
+    Recording Status Flow:
+    1. INITIATED: Initial state when recording is requested
+    2. ACTIVE: Recording is currently in progress
+    3. STOPPED: Recording has been stopped by user/system
+    4. SAVED: Recording has been successfully processed and stored
+
+    Error States:
+    - FAILED_TO_START: Worker failed to initialize recording
+    - FAILED_TO_STOP: Worker failed during stop operation
+    - ABORTED: Recording was terminated before completion
+
+    Warning: Worker failures may lead to database inconsistency between the actual
+    recording state and its status in the database.
+    """
 
     recording = models.ForeignKey(
         Recording,

src/backend/core/recording/enums.py

@@ -1,10 +0,0 @@
-"""Enums related to recordings."""
-
-from enum import Enum
-
-
-class FileExtension(Enum):
-    """Enum for file extensions used in recordings."""
-
-    OGG = "ogg"
-    MP4 = "mp4"

src/backend/core/recording/event/authentication.py

@@ -47,6 +47,8 @@ class StorageEventAuthentication(BaseAuthentication):
 
     def authenticate(self, request):
         """Validate the Bearer token from the Authorization header."""
+        if not settings.RECORDING_ENABLE_STORAGE_EVENT_AUTH:
+            return MachineUser(), None
 
         if not settings.RECORDING_ENABLE_STORAGE_EVENT_AUTH:
             return MachineUser(), None
@@ -55,7 +57,7 @@ class StorageEventAuthentication(BaseAuthentication):
         if not required_token:
             if settings.RECORDING_ENABLE_STORAGE_EVENT_AUTH:
                 raise AuthenticationFailed(
-                    "Authentication is enabled but token is not configured."
+                    _("Authentication is enabled but token is not configured.")
                 )
 
             return MachineUser(), None
@@ -67,7 +69,7 @@ class StorageEventAuthentication(BaseAuthentication):
                 "Authentication failed: Missing Authorization header (ip: %s)",
                 request.META.get("REMOTE_ADDR"),
             )
-            raise AuthenticationFailed("Authorization header is required")
+            raise AuthenticationFailed(_("Authorization header is required"))
 
         auth_parts = auth_header.split(" ")
         if len(auth_parts) != 2 or auth_parts[0] != self.TOKEN_TYPE:
@@ -75,7 +77,7 @@ class StorageEventAuthentication(BaseAuthentication):
                 "Authentication failed: Invalid authorization header (ip: %s)",
                 request.META.get("REMOTE_ADDR"),
             )
-            raise AuthenticationFailed("Invalid authorization header.")
+            raise AuthenticationFailed(_("Invalid authorization header."))
 
         token = auth_parts[1]
 
@@ -85,7 +87,7 @@ class StorageEventAuthentication(BaseAuthentication):
                 "Authentication failed: Invalid token (ip: %s)",
                 request.META.get("REMOTE_ADDR"),
             )
-            raise AuthenticationFailed("Invalid token")
+            raise AuthenticationFailed(_("Invalid token"))
 
         return MachineUser(), token
 

src/backend/core/recording/event/notification.py

@@ -1,166 +0,0 @@
-"""Service to notify external services when a new recording is ready."""
-
-import logging
-import smtplib
-
-from django.conf import settings
-from django.core.mail import send_mail
-from django.template.loader import render_to_string
-from django.utils.translation import get_language, override
-from django.utils.translation import gettext_lazy as _
-
-import requests
-
-from core import models
-
-logger = logging.getLogger(__name__)
-
-
-class NotificationService:
-    """Service for processing recordings and notifying external services."""
-
-    def notify_external_services(self, recording):
-        """Process a recording based on its mode."""
-
-        if recording.mode == models.RecordingModeChoices.TRANSCRIPT:
-            return self._notify_summary_service(recording)
-
-        if recording.mode == models.RecordingModeChoices.SCREEN_RECORDING:
-            return self._notify_user_by_email(recording)
-
-        logger.error(
-            "Unknown recording mode %s for recording %s",
-            recording.mode,
-            recording.id,
-        )
-        return False
-
-    @staticmethod
-    def _notify_user_by_email(recording) -> bool:
-        """
-        Send an email notification to recording owners when their recording is ready.
-
-        The email includes a direct link that redirects owners to a dedicated download
-        page in the frontend where they can access their specific recording.
-        """
-
-        owner_accesses = (
-            models.RecordingAccess.objects.select_related("user")
-            .filter(
-                role=models.RoleChoices.OWNER,
-                recording_id=recording.id,
-            )
-            .order_by("created_at")
-        )
-
-        if not owner_accesses:
-            logger.error("No owner found for recording %s", recording.id)
-            return False
-
-        context = {
-            "brandname": settings.EMAIL_BRAND_NAME,
-            "support_email": settings.EMAIL_SUPPORT_EMAIL,
-            "logo_img": settings.EMAIL_LOGO_IMG,
-            "domain": settings.EMAIL_DOMAIN,
-            "room_name": recording.room.name,
-            "recording_expiration_days": settings.RECORDING_EXPIRATION_DAYS,
-            "link": f"{settings.SCREEN_RECORDING_BASE_URL}/{recording.id}",
-        }
-
-        has_failures = False
-
-        # We process emails individually rather than in batch because:
-        # 1. Each email requires personalization (timezone, language)
-        # 2. The number of recipients per recording is typically small (not thousands)
-        for access in owner_accesses:
-            user = access.user
-            language = user.language or get_language()
-            with override(language):
-                personalized_context = {
-                    "recording_date": recording.created_at.astimezone(
-                        user.timezone
-                    ).strftime("%Y-%m-%d"),
-                    "recording_time": recording.created_at.astimezone(
-                        user.timezone
-                    ).strftime("%H:%M"),
-                    **context,
-                }
-                msg_html = render_to_string(
-                    "mail/html/screen_recording.html", personalized_context
-                )
-                msg_plain = render_to_string(
-                    "mail/text/screen_recording.txt", personalized_context
-                )
-                subject = str(_("Your recording is ready"))  # Force translation
-
-                try:
-                    send_mail(
-                        subject.capitalize(),
-                        msg_plain,
-                        settings.EMAIL_FROM,
-                        [user.email],
-                        html_message=msg_html,
-                        fail_silently=False,
-                    )
-                except smtplib.SMTPException as exception:
-                    logger.error("notification could not be sent: %s", exception)
-                    has_failures = True
-
-        return not has_failures
-
-    @staticmethod
-    def _notify_summary_service(recording):
-        """Notify summary service about a new recording."""
-
-        if (
-            not settings.SUMMARY_SERVICE_ENDPOINT
-            or not settings.SUMMARY_SERVICE_API_TOKEN
-        ):
-            logger.error("Summary service not configured")
-            return False
-
-        owner_access = (
-            models.RecordingAccess.objects.select_related("user")
-            .filter(
-                role=models.RoleChoices.OWNER,
-                recording_id=recording.id,
-            )
-            .first()
-        )
-
-        if not owner_access:
-            logger.error("No owner found for recording %s", recording.id)
-            return False
-
-        payload = {
-            "filename": recording.key,
-            "email": owner_access.user.email,
-            "sub": owner_access.user.sub,
-        }
-
-        headers = {
-            "Content-Type": "application/json",
-            "Authorization": f"Bearer {settings.SUMMARY_SERVICE_API_TOKEN}",
-        }
-
-        try:
-            response = requests.post(
-                settings.SUMMARY_SERVICE_ENDPOINT,
-                json=payload,
-                headers=headers,
-                timeout=30,
-            )
-            response.raise_for_status()
-        except requests.HTTPError as exc:
-            logger.exception(
-                "Summary service HTTP error for recording %s. URL: %s. Exception: %s",
-                recording.id,
-                settings.SUMMARY_SERVICE_ENDPOINT,
-                exc,
-            )
-            return False
-
-        return True
-
-
-notification_service = NotificationService()

src/backend/core/recording/worker/factories.py

@@ -17,6 +17,7 @@ class WorkerServiceConfig:
 
     output_folder: str
     server_configurations: Dict[str, Any]
+    verify_ssl: Optional[bool]
     bucket_args: Optional[dict]
 
     @classmethod
@@ -28,6 +29,7 @@ class WorkerServiceConfig:
         return cls(
             output_folder=settings.RECORDING_OUTPUT_FOLDER,
             server_configurations=settings.LIVEKIT_CONFIGURATION,
+            verify_ssl=settings.RECORDING_VERIFY_SSL,
             bucket_args={
                 "endpoint": settings.AWS_S3_ENDPOINT_URL,
                 "access_key": settings.AWS_S3_ACCESS_KEY_ID,

src/backend/core/recording/worker/services.py

@@ -2,11 +2,11 @@
 
 # pylint: disable=no-member
 
+import aiohttp
 from asgiref.sync import async_to_sync
 from livekit import api as livekit_api
+from livekit.api.egress_service import EgressService
 
-from ... import utils
-from ..enums import FileExtension
 from .exceptions import WorkerConnectionError, WorkerResponseError
 from .factories import WorkerServiceConfig
 
@@ -28,26 +28,21 @@ class BaseEgressService:
     async def _handle_request(self, request, method_name: str):
         """Handle making a request to the LiveKit API and returns the response."""
 
-        lkapi = utils.create_livekit_client(self._config.server_configurations)
+        # Use HTTP connector for local development with Tilt,
+        # where cluster communications are unsecure
+        connector = aiohttp.TCPConnector(ssl=self._config.verify_ssl)
 
-        # ruff: noqa: SLF001
-        # pylint: disable=protected-access
-        method = getattr(lkapi._egress, method_name)
+        async with aiohttp.ClientSession(connector=connector) as session:
+            client = EgressService(session, **self._config.server_configurations)
+            method = getattr(client, method_name)
+            try:
+                response = await method(request)
+            except livekit_api.TwirpError as e:
+                raise WorkerConnectionError(
+                    f"LiveKit client connection error, {e.message}."
+                ) from e
 
-        try:
-            response = await method(request)
             return response
-        except livekit_api.TwirpError as e:
-            raise WorkerConnectionError(
-                f"LiveKit client connection error, {e.message}."
-            ) from e
-        except Exception as e:
-            raise WorkerConnectionError(
-                f"Unexpected error during LiveKit client connection: {str(e)}"
-            ) from e
-
-        finally:
-            await lkapi.aclose()
 
     def stop(self, worker_id: str) -> str:
         """Stop an ongoing egress worker.
@@ -94,9 +89,7 @@ class VideoCompositeEgressService(BaseEgressService):
 
         # Save room's recording as a mp4 video file.
         file_type = livekit_api.EncodedFileType.MP4
-        filepath = self._get_filepath(
-            filename=recording_id, extension=FileExtension.MP4.value
-        )
+        filepath = self._get_filepath(filename=recording_id, extension="mp4")
 
         file_output = livekit_api.EncodedFileOutput(
             file_type=file_type,
@@ -105,7 +98,8 @@ class VideoCompositeEgressService(BaseEgressService):
         )
 
         request = livekit_api.RoomCompositeEgressRequest(
-            room_name=room_name, file_outputs=[file_output], layout="speaker-light"
+            room_name=room_name,
+            file_outputs=[file_output],
         )
 
         response = self._handle_request(request, "start_room_composite_egress")
@@ -126,9 +120,7 @@ class AudioCompositeEgressService(BaseEgressService):
 
         # Save room's recording as an ogg audio file.
         file_type = livekit_api.EncodedFileType.OGG
-        filepath = self._get_filepath(
-            filename=recording_id, extension=FileExtension.OGG.value
-        )
+        filepath = self._get_filepath(filename=recording_id, extension="ogg")
 
         file_output = livekit_api.EncodedFileOutput(
             file_type=file_type,

src/backend/core/services/invitation.py

@@ -1,59 +0,0 @@
-"""Invitation Service."""
-
-import smtplib
-from logging import getLogger
-
-from django.conf import settings
-from django.core.mail import send_mail
-from django.template.loader import render_to_string
-from django.utils.translation import get_language, override
-from django.utils.translation import gettext_lazy as _
-
-logger = getLogger(__name__)
-
-
-class InvitationError(Exception):
-    """Exception raised when invitation emails cannot be sent."""
-
-    status_code = 500
-
-
-class InvitationService:
-    """Service for invitations to users."""
-
-    @staticmethod
-    def invite_to_room(room, sender, emails):
-        """Send invitation emails to join a room."""
-
-        language = get_language()
-
-        context = {
-            "brandname": settings.EMAIL_BRAND_NAME,
-            "logo_img": settings.EMAIL_LOGO_IMG,
-            "domain": settings.EMAIL_DOMAIN,
-            "room_url": f"{settings.EMAIL_APP_BASE_URL}/{room.slug}",
-            "room_link": f"{settings.EMAIL_DOMAIN}/{room.slug}",
-            "sender_email": sender.email,
-        }
-
-        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(
-                _(
-                    f"Video call in progress: {sender.email} is waiting for you to connect"
-                )
-            )  # Force translation
-
-            try:
-                send_mail(
-                    subject,
-                    msg_plain,
-                    settings.EMAIL_FROM,
-                    emails,
-                    html_message=msg_html,
-                    fail_silently=False,
-                )
-            except smtplib.SMTPException as e:
-                logger.error("invitation to %s was not sent: %s", emails, e)
-                raise InvitationError("Could not send invitation") from e

src/backend/core/services/livekit_events.py

@@ -1,117 +0,0 @@
-"""LiveKit Events Service"""
-
-import uuid
-from enum import Enum
-
-from django.conf import settings
-
-from livekit import api
-
-from .lobby import LobbyService
-
-
-class LiveKitWebhookError(Exception):
-    """Base exception for LiveKit webhook processing errors."""
-
-    status_code = 500
-
-
-class AuthenticationError(LiveKitWebhookError):
-    """Authentication failed."""
-
-    status_code = 401
-
-
-class InvalidPayloadError(LiveKitWebhookError):
-    """Invalid webhook payload."""
-
-    status_code = 400
-
-
-class UnsupportedEventTypeError(LiveKitWebhookError):
-    """Unsupported event type."""
-
-    status_code = 422
-
-
-class ActionFailedError(LiveKitWebhookError):
-    """Webhook action fails to process or complete."""
-
-    status_code = 500
-
-
-class LiveKitWebhookEventType(Enum):
-    """LiveKit webhook event types."""
-
-    # Room events
-    ROOM_STARTED = "room_started"
-    ROOM_FINISHED = "room_finished"
-
-    # Participant events
-    PARTICIPANT_JOINED = "participant_joined"
-    PARTICIPANT_LEFT = "participant_left"
-
-    # Track events
-    TRACK_PUBLISHED = "track_published"
-    TRACK_UNPUBLISHED = "track_unpublished"
-
-    # Egress events
-    EGRESS_STARTED = "egress_started"
-    EGRESS_UPDATED = "egress_updated"
-    EGRESS_ENDED = "egress_ended"
-
-    # Ingress events
-    INGRESS_STARTED = "ingress_started"
-    INGRESS_ENDED = "ingress_ended"
-
-
-class LiveKitEventsService:
-    """Service for processing and handling LiveKit webhook events and notifications."""
-
-    def __init__(self):
-        """Initialize with required services."""
-
-        token_verifier = api.TokenVerifier(
-            settings.LIVEKIT_CONFIGURATION["api_key"],
-            settings.LIVEKIT_CONFIGURATION["api_secret"],
-        )
-        self.webhook_receiver = api.WebhookReceiver(token_verifier)
-        self.lobby_service = LobbyService()
-
-    def receive(self, request):
-        """Process webhook and route to appropriate handler."""
-
-        auth_token = request.headers.get("Authorization")
-        if not auth_token:
-            raise AuthenticationError("Authorization header missing")
-
-        try:
-            data = self.webhook_receiver.receive(
-                request.body.decode("utf-8"), auth_token
-            )
-        except Exception as e:
-            raise InvalidPayloadError("Invalid webhook payload") from e
-
-        try:
-            webhook_type = LiveKitWebhookEventType(data.event)
-        except ValueError as e:
-            raise UnsupportedEventTypeError(
-                f"Unknown webhook type: {data.event}"
-            ) from e
-
-        handler_name = f"_handle_{webhook_type.value}"
-        handler = getattr(self, handler_name, None)
-
-        if not handler or not callable(handler):
-            return
-
-        # pylint: disable=not-callable
-        handler(data)
-
-    def _handle_room_finished(self, data):
-        """Handle 'room_finished' event."""
-        try:
-            room_id = uuid.UUID(data.room.name)
-            self.lobby_service.clear_room_cache(room_id)
-        except Exception as e:
-            raise ActionFailedError("Failed to process room finished event") from e

src/backend/core/services/lobby.py

@@ -1,384 +0,0 @@
-"""Lobby Service"""
-
-import json
-import logging
-import uuid
-from dataclasses import dataclass
-from enum import Enum
-from typing import Dict, List, Optional, Tuple
-from uuid import UUID
-
-from django.conf import settings
-from django.core.cache import cache
-
-from asgiref.sync import async_to_sync
-from livekit.api import (  # pylint: disable=E0611
-    ListRoomsRequest,
-    SendDataRequest,
-    TwirpError,
-)
-
-from core import models, utils
-
-logger = logging.getLogger(__name__)
-
-
-class LobbyParticipantStatus(Enum):
-    """Possible states of a participant in the lobby system.
-    Values are lowercase strings for consistent serialization and API responses.
-    """
-
-    UNKNOWN = "unknown"
-    WAITING = "waiting"
-    ACCEPTED = "accepted"
-    DENIED = "denied"
-
-
-class LobbyError(Exception):
-    """Base exception for lobby-related errors."""
-
-
-class LobbyParticipantParsingError(LobbyError):
-    """Raised when participant data parsing fails."""
-
-
-class LobbyParticipantNotFound(LobbyError):
-    """Raised when participant is not found."""
-
-
-class LobbyNotificationError(LobbyError):
-    """Raised when LiveKit notification fails."""
-
-
-@dataclass
-class LobbyParticipant:
-    """Participant in a lobby system."""
-
-    status: LobbyParticipantStatus
-    username: str
-    color: str
-    id: str
-
-    def to_dict(self) -> Dict[str, str]:
-        """Serialize the participant object to a dict representation."""
-        return {
-            "status": self.status.value,
-            "username": self.username,
-            "id": self.id,
-            "color": self.color,
-        }
-
-    @classmethod
-    def from_dict(cls, data: dict) -> "LobbyParticipant":
-        """Create a LobbyParticipant instance from a dictionary."""
-        try:
-            status = LobbyParticipantStatus(
-                data.get("status", LobbyParticipantStatus.UNKNOWN.value)
-            )
-            return cls(
-                status=status,
-                username=data["username"],
-                id=data["id"],
-                color=data["color"],
-            )
-        except (KeyError, ValueError) as e:
-            logger.exception("Error creating Participant from dict:")
-            raise LobbyParticipantParsingError("Invalid participant data") from e
-
-
-class LobbyService:
-    """Service for managing participant access through a lobby system.
-
-    Handles participant entry requests, status management, and notifications
-    using cache for state management and LiveKit for real-time updates.
-    """
-
-    @staticmethod
-    def _get_cache_key(room_id: UUID, participant_id: str) -> str:
-        """Generate cache key for participant(s) data."""
-        return f"{settings.LOBBY_KEY_PREFIX}_{room_id!s}_{participant_id}"
-
-    @staticmethod
-    def _get_or_create_participant_id(request) -> str:
-        """Extract unique participant identifier from the request."""
-        return request.COOKIES.get(settings.LOBBY_COOKIE_NAME, uuid.uuid4().hex)
-
-    @staticmethod
-    def prepare_response(response, participant_id):
-        """Set participant cookie if needed."""
-        if not response.cookies.get(settings.LOBBY_COOKIE_NAME):
-            response.set_cookie(
-                key=settings.LOBBY_COOKIE_NAME,
-                value=participant_id,
-                httponly=True,
-                secure=True,
-                samesite="Lax",
-            )
-
-    @staticmethod
-    def can_bypass_lobby(room, user) -> bool:
-        """Determines if a user can bypass the waiting lobby and join a room directly.
-
-        A user can bypass the lobby if:
-        1. The room is public (open to everyone)
-        2. The room has TRUSTED access level and the user is authenticated
-
-        Note: Room access levels can change while participants are waiting in the lobby.
-        This function only checks the current state and should be called each time
-        a participant requests entry to ensure consistent access control, even for
-        participants who have already begun waiting.
-        """
-        return room.is_public or (
-            room.access_level == models.RoomAccessLevel.TRUSTED
-            and user.is_authenticated
-        )
-
-    def request_entry(
-        self,
-        room,
-        request,
-        username: str,
-    ) -> Tuple[LobbyParticipant, Optional[Dict]]:
-        """Request entry to a room for a participant.
-
-        This usual status transitions is:
-        UNKNOWN -> WAITING -> (ACCEPTED | DENIED)
-
-        Flow:
-        1. Check current status
-        2. If waiting, refresh timeout to maintain position
-        3. If unknown, add to waiting list
-        4. If accepted, generate LiveKit config
-        5. If denied, do nothing.
-        """
-
-        participant_id = self._get_or_create_participant_id(request)
-        participant = self._get_participant(room.id, participant_id)
-
-        if self.can_bypass_lobby(room=room, user=request.user):
-            if participant is None:
-                participant = LobbyParticipant(
-                    status=LobbyParticipantStatus.ACCEPTED,
-                    username=username,
-                    id=participant_id,
-                    color=utils.generate_color(participant_id),
-                )
-            else:
-                participant.status = LobbyParticipantStatus.ACCEPTED
-
-            livekit_config = utils.generate_livekit_config(
-                room_id=str(room.id),
-                user=request.user,
-                username=username,
-                color=participant.color,
-            )
-            return participant, livekit_config
-
-        livekit_config = None
-
-        if participant is None:
-            participant = self.enter(room.id, participant_id, username)
-
-        elif participant.status == LobbyParticipantStatus.WAITING:
-            self.refresh_waiting_status(room.id, participant_id)
-
-        elif participant.status == LobbyParticipantStatus.ACCEPTED:
-            # wrongly named, contains access token to join a room
-            livekit_config = utils.generate_livekit_config(
-                room_id=str(room.id),
-                user=request.user,
-                username=username,
-                color=participant.color,
-            )
-
-        return participant, livekit_config
-
-    def refresh_waiting_status(self, room_id: UUID, participant_id: str):
-        """Refresh timeout for waiting participant.
-
-        Extends the waiting period for a participant to maintain their position
-        in the lobby queue. Automatic removal if the participant is not
-        actively checking their status.
-        """
-        cache.touch(
-            self._get_cache_key(room_id, participant_id), settings.LOBBY_WAITING_TIMEOUT
-        )
-
-    def enter(
-        self, room_id: UUID, participant_id: str, username: str
-    ) -> LobbyParticipant:
-        """Add participant to waiting lobby.
-
-        Create a new participant entry in waiting status and notify room
-        participants of the new entry request.
-
-        Raises:
-            LobbyNotificationError: If room notification fails
-        """
-
-        color = utils.generate_color(participant_id)
-
-        participant = LobbyParticipant(
-            status=LobbyParticipantStatus.WAITING,
-            username=username,
-            id=participant_id,
-            color=color,
-        )
-
-        try:
-            self.notify_participants(room_id=room_id)
-        except LobbyNotificationError:
-            # If room not created yet, there is no participants to notify
-            pass
-
-        cache_key = self._get_cache_key(room_id, participant_id)
-        cache.set(
-            cache_key,
-            participant.to_dict(),
-            timeout=settings.LOBBY_WAITING_TIMEOUT,
-        )
-
-        return participant
-
-    def _get_participant(
-        self, room_id: UUID, participant_id: str
-    ) -> Optional[LobbyParticipant]:
-        """Check participant's current status in the lobby."""
-
-        cache_key = self._get_cache_key(room_id, participant_id)
-        data = cache.get(cache_key)
-
-        if not data:
-            return None
-
-        try:
-            return LobbyParticipant.from_dict(data)
-        except LobbyParticipantParsingError:
-            logger.error("Corrupted participant data found and removed: %s", cache_key)
-            cache.delete(cache_key)
-            return None
-
-    def list_waiting_participants(self, room_id: UUID) -> List[dict]:
-        """List all waiting participants for a room."""
-
-        pattern = self._get_cache_key(room_id, "*")
-        keys = cache.keys(pattern)
-
-        if not keys:
-            return []
-
-        data = cache.get_many(keys)
-
-        waiting_participants = []
-        for cache_key, raw_participant in data.items():
-            try:
-                participant = LobbyParticipant.from_dict(raw_participant)
-            except LobbyParticipantParsingError:
-                cache.delete(cache_key)
-                continue
-            if participant.status == LobbyParticipantStatus.WAITING:
-                waiting_participants.append(participant.to_dict())
-
-        return waiting_participants
-
-    def handle_participant_entry(
-        self,
-        room_id: UUID,
-        participant_id: str,
-        allow_entry: bool,
-    ) -> None:
-        """Handle decision on participant entry.
-
-        Updates participant status based on allow_entry:
-        - If accepted: ACCEPTED status with extended timeout matching LiveKit token
-        - If denied: DENIED status with short timeout allowing status check and retry
-        """
-        if allow_entry:
-            decision = {
-                "status": LobbyParticipantStatus.ACCEPTED,
-                "timeout": settings.LOBBY_ACCEPTED_TIMEOUT,
-            }
-        else:
-            decision = {
-                "status": LobbyParticipantStatus.DENIED,
-                "timeout": settings.LOBBY_DENIED_TIMEOUT,
-            }
-
-        self._update_participant_status(room_id, participant_id, **decision)
-
-    def _update_participant_status(
-        self,
-        room_id: UUID,
-        participant_id: str,
-        status: LobbyParticipantStatus,
-        timeout: int,
-    ) -> None:
-        """Update participant status with appropriate timeout."""
-
-        cache_key = self._get_cache_key(room_id, participant_id)
-
-        data = cache.get(cache_key)
-        if not data:
-            logger.error("Participant %s not found", participant_id)
-            raise LobbyParticipantNotFound("Participant not found")
-
-        try:
-            participant = LobbyParticipant.from_dict(data)
-        except LobbyParticipantParsingError:
-            logger.exception(
-                "Removed corrupted data for participant %s:", participant_id
-            )
-            cache.delete(cache_key)
-            raise
-
-        participant.status = status
-        cache.set(cache_key, participant.to_dict(), timeout=timeout)
-
-    @async_to_sync
-    async def notify_participants(self, room_id: UUID):
-        """Notify room participants about a new waiting participant using LiveKit.
-
-        Raises:
-            LobbyNotificationError: If notification fails to send
-        """
-
-        notification_data = {
-            "type": settings.LOBBY_NOTIFICATION_TYPE,
-        }
-
-        lkapi = utils.create_livekit_client()
-
-        try:
-            room_response = await lkapi.room.list_rooms(
-                ListRoomsRequest(
-                    names=[str(room_id)],
-                )
-            )
-
-            # Check if the room exists
-            if not room_response.rooms:
-                return
-
-            await lkapi.room.send_data(
-                SendDataRequest(
-                    room=str(room_id),
-                    data=json.dumps(notification_data).encode("utf-8"),
-                    kind="RELIABLE",
-                )
-            )
-        except TwirpError as e:
-            logger.exception("Failed to notify room participants")
-            raise LobbyNotificationError("Failed to notify room participants") from e
-        finally:
-            await lkapi.aclose()
-
-    def clear_room_cache(self, room_id: UUID) -> None:
-        """Clear all participant entries from the cache for a specific room."""
-
-        pattern = self._get_cache_key(room_id, "*")
-        keys = cache.keys(pattern)
-
-        if not keys:
-            return
-
-        cache.delete_many(keys)

src/backend/core/services/marketing.py

@@ -1,138 +0,0 @@
-"""Marketing service in charge of pushing data for marketing automation."""
-
-import logging
-from dataclasses import dataclass
-from functools import lru_cache
-from typing import Dict, List, Optional, Protocol
-
-from django.conf import settings
-from django.core.exceptions import ImproperlyConfigured
-from django.utils.module_loading import import_string
-
-import brevo_python
-import urllib3
-
-logger = logging.getLogger(__name__)
-
-
-class ContactCreationError(Exception):
-    """Raised when the contact creation fails."""
-
-
-@dataclass
-class ContactData:
-    """Contact data for marketing service integration."""
-
-    email: str
-    attributes: Optional[Dict[str, str]] = None
-    list_ids: Optional[List[int]] = None
-    update_enabled: bool = True
-
-
-class MarketingServiceProtocol(Protocol):
-    """Interface for marketing automation service integrations."""
-
-    def create_contact(
-        self, contact_data: ContactData, timeout: Optional[int] = None
-    ) -> dict:
-        """Create or update a contact.
-
-        Args:
-            contact_data: Contact information and attributes
-            timeout: API request timeout in seconds
-
-        Returns:
-            dict: Service response
-
-        Raises:
-            ContactCreationError: If contact creation fails
-        """
-
-
-class BrevoMarketingService:
-    """Brevo marketing automation integration.
-
-    Handles:
-    - Contact management and segmentation
-    - Marketing campaigns and automation
-    - Email communications
-
-    Configuration via Django settings:
-    - BREVO_API_KEY: API authentication
-    - BREVO_API_CONTACT_LIST_IDS: Default contact lists
-    - BREVO_API_CONTACT_ATTRIBUTES: Default contact attributes
-    """
-
-    def __init__(self):
-        """Initialize Brevo (ex-sendinblue) marketing service."""
-
-        if not settings.BREVO_API_KEY:
-            raise ImproperlyConfigured("Brevo API key is required")
-
-        configuration = brevo_python.Configuration()
-        configuration.api_key["api-key"] = settings.BREVO_API_KEY
-
-        self._api_client = brevo_python.ApiClient(configuration)
-
-    def create_contact(self, contact_data: ContactData, timeout=None) -> dict:
-        """Create or update a Brevo contact.
-
-        Args:
-            contact_data: Contact information and attributes
-            timeout: API request timeout in seconds
-
-        Returns:
-            dict: Brevo API response
-
-        Raises:
-            ContactCreationError: If contact creation fails
-            ImproperlyConfigured: If required settings are missing
-
-        Note:
-            Contact attributes must be pre-configured in Brevo.
-            Changes to attributes can impact existing workflows.
-        """
-
-        if not settings.BREVO_API_CONTACT_LIST_IDS:
-            raise ImproperlyConfigured(
-                "Default Brevo List IDs must be configured in settings."
-            )
-
-        contact_api = brevo_python.ContactsApi(self._api_client)
-
-        attributes = {
-            **settings.BREVO_API_CONTACT_ATTRIBUTES,
-            **(contact_data.attributes or {}),
-        }
-
-        list_ids = (contact_data.list_ids or []) + settings.BREVO_API_CONTACT_LIST_IDS
-
-        contact = brevo_python.CreateContact(
-            email=contact_data.email,
-            attributes=attributes,
-            list_ids=list_ids,
-            update_enabled=contact_data.update_enabled,
-        )
-
-        api_configurations = {}
-
-        if timeout is not None:
-            api_configurations["_request_timeout"] = timeout
-
-        try:
-            response = contact_api.create_contact(contact, **api_configurations)
-        except (
-            brevo_python.rest.ApiException,
-            urllib3.exceptions.ReadTimeoutError,
-        ) as err:
-            logger.warning("Failed to create contact in Brevo", exc_info=True)
-            raise ContactCreationError("Failed to create contact in Brevo") from err
-
-        return response
-
-
-@lru_cache(maxsize=1)
-def get_marketing_service() -> MarketingServiceProtocol:
-    """Return cached instance of configured marketing service."""
-    marketing_service_cls = import_string(settings.MARKETING_SERVICE_CLASS)
-    return marketing_service_cls()

src/backend/core/services/room_creation.py

@@ -1,37 +0,0 @@
-"""Room creation service."""
-
-from django.conf import settings
-from django.core.cache import cache
-
-
-class RoomCreation:
-    """Room creation related methods"""
-
-    @staticmethod
-    def _get_cache_key(callback_id):
-        """Generate a standardized cache key for room creation callbacks."""
-        return f"room-creation-callback_{callback_id}"
-
-    def persist_callback_state(self, callback_id: str, room) -> None:
-        """Store room data in cache using the callback ID as an identifier."""
-        data = {
-            "slug": room.slug,
-        }
-        cache.set(
-            self._get_cache_key(callback_id),
-            data,
-            timeout=settings.ROOM_CREATION_CALLBACK_CACHE_TIMEOUT,
-        )
-
-    def get_callback_state(self, callback_id: str) -> dict:
-        """Retrieve and clear cached room data for the given callback ID."""
-
-        cache_key = self._get_cache_key(callback_id)
-        data = cache.get(cache_key)
-
-        if not data:
-            return {}
-
-        cache.delete(cache_key)
-
-        return data

src/backend/core/templates/core/generate_document.html

@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <title>Generate Document</title>
+</head>
+<body>
+    <h2>Generate Document</h2>
+    <form method="post" enctype="multipart/form-data">
+        {% csrf_token %}
+        {{ form.as_p }}
+        <button type="submit">Generate PDF</button>
+    </form>
+</body>
+</html>

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

@@ -1,15 +1,12 @@
 """Unit tests for the Authentication Backends."""
 
-from unittest import mock
-
-from django.core.exceptions import ImproperlyConfigured, SuspiciousOperation
+from django.core.exceptions import SuspiciousOperation
 
 import pytest
 
 from core import models
 from core.authentication.backends import OIDCAuthenticationBackend
 from core.factories import UserFactory
-from core.services import marketing
 
 pytestmark = pytest.mark.django_db
 
@@ -58,7 +55,7 @@ def test_authentication_getter_new_user_no_email(monkeypatch):
 
     assert user.sub == "123"
     assert user.email is None
-    assert user.has_usable_password() is False
+    assert user.password == "!"
     assert models.User.objects.count() == 1
 
 
@@ -84,7 +81,7 @@ def test_authentication_getter_new_user_with_email(monkeypatch):
     assert user.email == email
     assert user.full_name is None
     assert user.short_name is None
-    assert user.has_usable_password() is False
+    assert user.password == "!"
     assert models.User.objects.count() == 1
 
 
@@ -110,7 +107,7 @@ def test_authentication_getter_new_user_with_names(monkeypatch, email):
     assert user.email == email
     assert user.full_name == "John Doe"
     assert user.short_name == "John"
-    assert user.has_usable_password() is False
+    assert user.password == "!"
     assert models.User.objects.count() == 1
 
 
@@ -129,7 +126,7 @@ def test_models_oidc_user_getter_invalid_token(django_assert_num_queries, monkey
         django_assert_num_queries(0),
         pytest.raises(
             SuspiciousOperation,
-            match="Claims verification failed",
+            match="User info contained no recognizable user identification",
         ),
     ):
         klass.get_or_create_user(access_token="test-token", id_token=None, payload=None)
@@ -415,139 +412,3 @@ def test_update_user_when_no_update_needed(django_assert_num_queries, claims):
     user.refresh_from_db()
 
     assert user.email == "john.doe@example.com"
-
-
-@mock.patch.object(OIDCAuthenticationBackend, "signup_to_marketing_email")
-def test_marketing_signup_new_user_enabled(mock_signup, monkeypatch, settings):
-    """Test marketing signup for new user with settings enabled."""
-    settings.SIGNUP_NEW_USER_TO_MARKETING_EMAIL = True
-
-    klass = OIDCAuthenticationBackend()
-    email = "test@example.com"
-
-    def get_userinfo_mocked(*args):
-        return {"sub": "123", "email": email}
-
-    monkeypatch.setattr(OIDCAuthenticationBackend, "get_userinfo", get_userinfo_mocked)
-
-    user = klass.get_or_create_user("test-token", None, None)
-
-    assert user.email == email
-    mock_signup.assert_called_once_with(email)
-
-
-@mock.patch.object(OIDCAuthenticationBackend, "signup_to_marketing_email")
-def test_marketing_signup_new_user_disabled(mock_signup, monkeypatch, settings):
-    """Test no marketing signup for new user with settings disabled."""
-    settings.SIGNUP_NEW_USER_TO_MARKETING_EMAIL = False
-
-    klass = OIDCAuthenticationBackend()
-    email = "test@example.com"
-
-    def get_userinfo_mocked(*args):
-        return {"sub": "123", "email": email}
-
-    monkeypatch.setattr(OIDCAuthenticationBackend, "get_userinfo", get_userinfo_mocked)
-
-    user = klass.get_or_create_user("test-token", None, None)
-
-    assert user.email == email
-    mock_signup.assert_not_called()
-
-
-@mock.patch.object(OIDCAuthenticationBackend, "signup_to_marketing_email")
-def test_marketing_signup_new_user_default_disabled(mock_signup, monkeypatch):
-    """Test no marketing signup for new user with settings by default disabled."""
-
-    klass = OIDCAuthenticationBackend()
-    email = "test@example.com"
-
-    def get_userinfo_mocked(*args):
-        return {"sub": "123", "email": email}
-
-    monkeypatch.setattr(OIDCAuthenticationBackend, "get_userinfo", get_userinfo_mocked)
-
-    user = klass.get_or_create_user("test-token", None, None)
-
-    assert user.email == email
-    mock_signup.assert_not_called()
-
-
-@pytest.mark.parametrize(
-    "is_signup_enabled",
-    [True, False],
-)
-@mock.patch.object(OIDCAuthenticationBackend, "signup_to_marketing_email")
-def test_marketing_signup_existing_user(
-    mock_signup, monkeypatch, settings, is_signup_enabled
-):
-    """Test no marketing signup for existing user regardless of settings."""
-
-    settings.SIGNUP_NEW_USER_TO_MARKETING_EMAIL = is_signup_enabled
-
-    klass = OIDCAuthenticationBackend()
-    db_user = UserFactory(email="test@example.com")
-
-    def get_userinfo_mocked(*args):
-        return {"sub": db_user.sub, "email": db_user.email}
-
-    monkeypatch.setattr(OIDCAuthenticationBackend, "get_userinfo", get_userinfo_mocked)
-
-    user = klass.get_or_create_user("test-token", None, None)
-    assert user == db_user
-    mock_signup.assert_not_called()
-
-
-@mock.patch("core.authentication.backends.get_marketing_service")
-def test_signup_to_marketing_email_success(mock_marketing):
-    """Test successful marketing signup."""
-
-    email = "test@example.com"
-
-    # Call the method
-    OIDCAuthenticationBackend.signup_to_marketing_email(email)
-
-    # Verify service interaction
-    mock_service = mock_marketing.return_value
-    mock_service.create_contact.assert_called_once()
-
-
-@pytest.mark.parametrize(
-    "error",
-    [
-        ImportError,
-        ImproperlyConfigured,
-    ],
-)
-@mock.patch("core.authentication.backends.get_marketing_service")
-def test_marketing_signup_handles_service_initialization_errors(
-    mock_marketing, error, settings
-):
-    """Tests errors that occur when trying to get/initialize the marketing service."""
-    settings.SIGNUP_NEW_USER_TO_MARKETING_EMAIL = True
-
-    mock_marketing.side_effect = error
-
-    # Should not raise any exception
-    OIDCAuthenticationBackend.signup_to_marketing_email("test@example.com")
-
-
-@pytest.mark.parametrize(
-    "error",
-    [
-        marketing.ContactCreationError,
-        ImproperlyConfigured,
-        ImportError,
-    ],
-)
-@mock.patch("core.authentication.backends.get_marketing_service")
-def test_marketing_signup_handles_contact_creation_errors(
-    mock_marketing, error, settings
-):
-    """Tests errors that occur during the contact creation process."""
-
-    settings.SIGNUP_NEW_USER_TO_MARKETING_EMAIL = True
-    mock_marketing.return_value.create_contact.side_effect = error
-
-    # Should not raise any exception
-    OIDCAuthenticationBackend.signup_to_marketing_email("test@example.com")

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

@@ -0,0 +1,10 @@
+"""Unit tests for the Authentication URLs."""
+
+from core.authentication.urls import urlpatterns
+
+
+def test_urls_override_default_mozilla_django_oidc():
+    """Custom URL patterns should override default ones from Mozilla Django OIDC."""
+
+    url_names = [u.name for u in urlpatterns]
+    assert url_names.index("oidc_logout_custom") < url_names.index("oidc_logout")

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

@@ -0,0 +1,359 @@
+"""Unit tests for the Authentication Views."""
+
+from unittest import mock
+from urllib.parse import parse_qs, urlparse
+
+from django.contrib.auth.models import AnonymousUser
+from django.contrib.sessions.middleware import SessionMiddleware
+from django.core.exceptions import SuspiciousOperation
+from django.test import RequestFactory
+from django.test.utils import override_settings
+from django.urls import reverse
+from django.utils import crypto
+
+import pytest
+from rest_framework.test import APIClient
+
+from core import factories
+from core.authentication.views import (
+    MozillaOIDCAuthenticationCallbackView,
+    OIDCAuthenticationCallbackView,
+    OIDCAuthenticationRequestView,
+    OIDCLogoutCallbackView,
+    OIDCLogoutView,
+)
+
+pytestmark = pytest.mark.django_db
+
+
+@override_settings(LOGOUT_REDIRECT_URL="/example-logout")
+def test_view_logout_anonymous():
+    """Anonymous users calling the logout url,
+    should be redirected to the specified LOGOUT_REDIRECT_URL."""
+
+    url = reverse("oidc_logout_custom")
+    response = APIClient().get(url)
+
+    assert response.status_code == 302
+    assert response.url == "/example-logout"
+
+
+@mock.patch.object(
+    OIDCLogoutView, "construct_oidc_logout_url", return_value="/example-logout"
+)
+def test_view_logout(mocked_oidc_logout_url):
+    """Authenticated users should be redirected to OIDC provider for logout."""
+
+    user = factories.UserFactory()
+
+    client = APIClient()
+    client.force_login(user)
+
+    url = reverse("oidc_logout_custom")
+    response = client.get(url)
+
+    mocked_oidc_logout_url.assert_called_once()
+
+    assert response.status_code == 302
+    assert response.url == "/example-logout"
+
+
+@override_settings(LOGOUT_REDIRECT_URL="/default-redirect-logout")
+@mock.patch.object(
+    OIDCLogoutView, "construct_oidc_logout_url", return_value="/default-redirect-logout"
+)
+def test_view_logout_no_oidc_provider(mocked_oidc_logout_url):
+    """Authenticated users should be logged out when no OIDC provider is available."""
+
+    user = factories.UserFactory()
+
+    client = APIClient()
+    client.force_login(user)
+
+    url = reverse("oidc_logout_custom")
+
+    with mock.patch("mozilla_django_oidc.views.auth.logout") as mock_logout:
+        response = client.get(url)
+        mocked_oidc_logout_url.assert_called_once()
+        mock_logout.assert_called_once()
+
+    assert response.status_code == 302
+    assert response.url == "/default-redirect-logout"
+
+
+@override_settings(LOGOUT_REDIRECT_URL="/example-logout")
+def test_view_logout_callback_anonymous():
+    """Anonymous users calling the logout callback url,
+    should be redirected to the specified LOGOUT_REDIRECT_URL."""
+
+    url = reverse("oidc_logout_callback")
+    response = APIClient().get(url)
+
+    assert response.status_code == 302
+    assert response.url == "/example-logout"
+
+
+@pytest.mark.parametrize(
+    "initial_oidc_states",
+    [{}, {"other_state": "foo"}],
+)
+def test_view_logout_persist_state(initial_oidc_states):
+    """State value should be persisted in session's data."""
+
+    user = factories.UserFactory()
+
+    request = RequestFactory().request()
+    request.user = user
+
+    middleware = SessionMiddleware(get_response=lambda x: x)
+    middleware.process_request(request)
+
+    if initial_oidc_states:
+        request.session["oidc_states"] = initial_oidc_states
+        request.session.save()
+
+    mocked_state = "mock_state"
+
+    OIDCLogoutView().persist_state(request, mocked_state)
+
+    assert "oidc_states" in request.session
+    assert request.session["oidc_states"] == {
+        "mock_state": {},
+        **initial_oidc_states,
+    }
+
+
+@override_settings(OIDC_OP_LOGOUT_ENDPOINT="/example-logout")
+@mock.patch.object(OIDCLogoutView, "persist_state")
+@mock.patch.object(crypto, "get_random_string", return_value="mocked_state")
+def test_view_logout_construct_oidc_logout_url(
+    mocked_get_random_string, mocked_persist_state
+):
+    """Should construct the logout URL to initiate the logout flow with the OIDC provider."""
+
+    user = factories.UserFactory()
+
+    request = RequestFactory().request()
+    request.user = user
+
+    middleware = SessionMiddleware(get_response=lambda x: x)
+    middleware.process_request(request)
+
+    request.session["oidc_id_token"] = "mocked_oidc_id_token"
+    request.session.save()
+
+    redirect_url = OIDCLogoutView().construct_oidc_logout_url(request)
+
+    mocked_persist_state.assert_called_once()
+    mocked_get_random_string.assert_called_once()
+
+    params = parse_qs(urlparse(redirect_url).query)
+
+    assert params["id_token_hint"][0] == "mocked_oidc_id_token"
+    assert params["state"][0] == "mocked_state"
+
+    url = reverse("oidc_logout_callback")
+    assert url in params["post_logout_redirect_uri"][0]
+
+
+@override_settings(LOGOUT_REDIRECT_URL="/")
+def test_view_logout_construct_oidc_logout_url_none_id_token():
+    """If no ID token is available in the session,
+    the user should be redirected to the final URL."""
+
+    user = factories.UserFactory()
+
+    request = RequestFactory().request()
+    request.user = user
+
+    middleware = SessionMiddleware(get_response=lambda x: x)
+    middleware.process_request(request)
+
+    redirect_url = OIDCLogoutView().construct_oidc_logout_url(request)
+
+    assert redirect_url == "/"
+
+
+@pytest.mark.parametrize(
+    "initial_state",
+    [None, {"other_state": "foo"}],
+)
+def test_view_logout_callback_wrong_state(initial_state):
+    """Should raise an error if OIDC state doesn't match session data."""
+
+    user = factories.UserFactory()
+
+    request = RequestFactory().request()
+    request.user = user
+
+    middleware = SessionMiddleware(get_response=lambda x: x)
+    middleware.process_request(request)
+
+    if initial_state:
+        request.session["oidc_states"] = initial_state
+        request.session.save()
+
+    callback_view = OIDCLogoutCallbackView.as_view()
+
+    with pytest.raises(SuspiciousOperation) as excinfo:
+        callback_view(request)
+
+    assert (
+        str(excinfo.value) == "OIDC callback state not found in session `oidc_states`!"
+    )
+
+
+@override_settings(LOGOUT_REDIRECT_URL="/example-logout")
+def test_view_logout_callback():
+    """If state matches, callback should clear OIDC state and redirects."""
+
+    user = factories.UserFactory()
+
+    request = RequestFactory().get("/logout-callback/", data={"state": "mocked_state"})
+    request.user = user
+
+    middleware = SessionMiddleware(get_response=lambda x: x)
+    middleware.process_request(request)
+
+    mocked_state = "mocked_state"
+
+    request.session["oidc_states"] = {mocked_state: {}}
+    request.session.save()
+
+    callback_view = OIDCLogoutCallbackView.as_view()
+
+    with mock.patch("mozilla_django_oidc.views.auth.logout") as mock_logout:
+
+        def clear_user(request):
+            # Assert state is cleared prior to logout
+            assert request.session["oidc_states"] == {}
+            request.user = AnonymousUser()
+
+        mock_logout.side_effect = clear_user
+        response = callback_view(request)
+        mock_logout.assert_called_once()
+
+    assert response.status_code == 302
+    assert response.url == "/example-logout"
+
+
+@pytest.mark.parametrize("mocked_extra_params_setting", [{"foo": 123}, {}, None])
+def test_view_authentication_default(settings, mocked_extra_params_setting):
+    """By default, authentication request should not trigger silent login."""
+
+    settings.OIDC_AUTH_REQUEST_EXTRA_PARAMS = mocked_extra_params_setting
+
+    user = factories.UserFactory()
+
+    request = RequestFactory().request()
+    request.user = user
+    request.GET = {}
+
+    view = OIDCAuthenticationRequestView()
+    extra_params = view.get_extra_params(request)
+
+    assert extra_params == (mocked_extra_params_setting or {})
+
+
+@pytest.mark.parametrize("mocked_extra_params_setting", [{"foo": 123}, {}, None])
+def test_view_authentication_silent_false(settings, mocked_extra_params_setting):
+    """Ensure setting 'silent' parameter to a random value doesn't trigger the silent login flow."""
+
+    settings.OIDC_AUTH_REQUEST_EXTRA_PARAMS = mocked_extra_params_setting
+
+    user = factories.UserFactory()
+
+    request = RequestFactory().request()
+    request.user = user
+    request.GET = {"silent": "foo"}
+
+    middleware = SessionMiddleware(get_response=lambda x: x)
+    middleware.process_request(request)
+
+    view = OIDCAuthenticationRequestView()
+    extra_params = view.get_extra_params(request)
+
+    assert extra_params == (mocked_extra_params_setting or {})
+    assert not request.session.get("silent")
+
+
+@pytest.mark.parametrize("mocked_extra_params_setting", [{"foo": 123}, {}, None])
+def test_view_authentication_silent_true(settings, mocked_extra_params_setting):
+    """If 'silent' parameter is set to True, the silent login should be triggered."""
+    settings.OIDC_AUTH_REQUEST_EXTRA_PARAMS = mocked_extra_params_setting
+
+    user = factories.UserFactory()
+
+    request = RequestFactory().request()
+    request.user = user
+    request.GET = {"silent": "true"}
+
+    middleware = SessionMiddleware(get_response=lambda x: x)
+    middleware.process_request(request)
+
+    view = OIDCAuthenticationRequestView()
+    extra_params = view.get_extra_params(request)
+    expected_params = {"prompt": "none"}
+
+    assert (
+        extra_params == {**mocked_extra_params_setting, **expected_params}
+        if mocked_extra_params_setting
+        else expected_params
+    )
+    assert request.session.get("silent") is True
+
+
+@mock.patch.object(
+    MozillaOIDCAuthenticationCallbackView,
+    "failure_url",
+    new_callable=mock.PropertyMock,
+    return_value="foo",
+)
+def test_view_callback_failure_url(mocked_failure_url):
+    """Test default behavior of the 'failure_url' property"""
+
+    user = factories.UserFactory()
+
+    request = RequestFactory().request()
+    request.user = user
+
+    middleware = SessionMiddleware(get_response=lambda x: x)
+    middleware.process_request(request)
+
+    view = OIDCAuthenticationCallbackView()
+    view.request = request
+
+    returned_url = view.failure_url
+
+    mocked_failure_url.assert_called_once()
+    assert returned_url == "foo"
+
+
+@mock.patch.object(
+    OIDCAuthenticationCallbackView,
+    "success_url",
+    new_callable=mock.PropertyMock,
+    return_value="foo",
+)
+def test_view_callback_failure_url_silent_login(mocked_success_url):
+    """If a silent login was initiated and failed, it should not be treated as a failure."""
+
+    user = factories.UserFactory()
+
+    request = RequestFactory().request()
+    request.user = user
+
+    middleware = SessionMiddleware(get_response=lambda x: x)
+    middleware.process_request(request)
+
+    request.session["silent"] = True
+    request.session.save()
+
+    view = OIDCAuthenticationCallbackView()
+    view.request = request
+
+    returned_url = view.failure_url
+
+    mocked_success_url.assert_called_once()
+    assert returned_url == "foo"
+    assert not request.session.get("silent")

src/backend/core/tests/recording/event/test_notification.py

@@ -1,224 +0,0 @@
-"""
-Test event notification.
-"""
-
-# pylint: disable=E1128,W0621,W0613,W0212
-
-import datetime
-import smtplib
-from unittest import mock
-
-from django.contrib.sites.models import Site
-
-import pytest
-
-from core import factories, models
-from core.recording.event.notification import NotificationService, notification_service
-
-pytestmark = pytest.mark.django_db
-
-
-@pytest.fixture
-def mocked_current_site():
-    """Mocks the Site.objects.get_current()to return a controlled predefined domain."""
-
-    site_mock = mock.Mock()
-    site_mock.domain = "test-domain.com"
-
-    with mock.patch.object(
-        Site.objects, "get_current", return_value=site_mock
-    ) as patched:
-        yield patched
-
-
-@mock.patch.object(NotificationService, "_notify_summary_service", return_value=True)
-def test_notify_external_services_transcript_mode(mock_notify_summary):
-    """Test notification routing for transcript mode recordings."""
-
-    service = NotificationService()
-
-    recording = factories.RecordingFactory(mode=models.RecordingModeChoices.TRANSCRIPT)
-    result = service.notify_external_services(recording)
-
-    assert result is True
-    mock_notify_summary.assert_called_once_with(recording)
-
-
-@mock.patch.object(NotificationService, "_notify_user_by_email", return_value=True)
-def test_notify_external_services_screen_recording_mode(mock_notify_email):
-    """Test notification routing for screen recording mode."""
-
-    service = NotificationService()
-
-    recording = factories.RecordingFactory(
-        mode=models.RecordingModeChoices.SCREEN_RECORDING
-    )
-
-    result = service.notify_external_services(recording)
-
-    assert result is True
-    mock_notify_email.assert_called_once_with(recording)
-
-
-def test_notify_external_services_unknown_mode(caplog):
-    """Test notification for unknown recording mode."""
-    recording = factories.RecordingFactory()
-
-    # Bypass validation
-    recording.mode = "unknown"
-
-    service = NotificationService()
-
-    result = service.notify_external_services(recording)
-
-    assert result is False
-    assert f"Unknown recording mode unknown for recording {recording.id}" in caplog.text
-
-
-# pylint: disable=too-many-locals
-def test_notify_user_by_email_success(mocked_current_site, settings):
-    """Test successful email notification to recording owners."""
-    settings.EMAIL_BRAND_NAME = "ACME"
-    settings.EMAIL_SUPPORT_EMAIL = "support@acme.com"
-    settings.EMAIL_LOGO_IMG = "https://acme.com/logo"
-    settings.SCREEN_RECORDING_BASE_URL = "https://acme.com/recordings"
-    settings.EMAIL_FROM = "notifications@acme.com"
-
-    recording = factories.RecordingFactory(room__name="Conference Room A")
-
-    # Fix recording test to avoid flaky tests
-    recording.created_at = datetime.datetime(2023, 5, 15, 14, 30, 0)
-
-    french_user = factories.UserFactory(
-        email="franc@test.com", language="fr-fr", timezone="Europe/Paris"
-    )
-    dutch_user = factories.UserFactory(
-        email="berry@test.com", language="nl-nl", timezone="Europe/Amsterdam"
-    )
-    english_user = factories.UserFactory(
-        email="john@test.com", language="en-us", timezone="America/Phoenix"
-    )
-
-    factories.UserRecordingAccessFactory(
-        recording=recording, role=models.RoleChoices.OWNER, user=french_user
-    )
-    factories.UserRecordingAccessFactory(
-        recording=recording, role=models.RoleChoices.OWNER, user=dutch_user
-    )
-    factories.UserRecordingAccessFactory(
-        recording=recording, role=models.RoleChoices.OWNER, user=english_user
-    )
-
-    # Create non-owner users to verify they don't receive emails
-    factories.UserRecordingAccessFactory(
-        recording=recording, role=models.RoleChoices.MEMBER
-    )
-    factories.UserRecordingAccessFactory(
-        recording=recording, role=models.RoleChoices.ADMIN
-    )
-
-    notification_service = NotificationService()
-
-    with mock.patch("core.recording.event.notification.send_mail") as mock_send_mail:
-        result = notification_service._notify_user_by_email(recording)
-
-        assert result is True
-        assert mock_send_mail.call_count == 3
-
-        call_args_list = mock_send_mail.call_args_list
-
-        base_content = [
-            "ACME",  # Brand name
-            "support@acme.com",  # Support email
-            "https://acme.com/logo",  # Logo URL
-            f"https://acme.com/recordings/{recording.id}",  # Recording link
-            "Conference Room A",  # Room name
-        ]
-
-        # First call verification
-        subject1, body1, sender1, recipients1 = call_args_list[0][0]
-        assert subject1 == "Votre enregistrement est prêt"
-
-        # Verify email contains expected content
-        personalized_content1 = [
-            *base_content,
-            "2023-05-15",  # Formatted date
-            "16:30",  # Formatted time
-            "Votre enregistrement est prêt !",  # Intro
-        ]
-        for content in personalized_content1:
-            assert content in body1
-
-        assert recipients1 == ["franc@test.com"]
-        assert sender1 == "notifications@acme.com"
-
-        # Second call verification
-        subject2, body2, sender2, recipients2 = call_args_list[1][0]
-        assert subject2 == "Je opname is klaar"
-
-        # Verify second email content (if needed)
-        personalized_content2 = [
-            *base_content,
-            "2023-05-15",  # Formatted date
-            "16:30",  # Formatted time
-            "Je opname is klaar!",  # Intro
-        ]
-        for content in personalized_content2:
-            assert content in body2
-
-        assert recipients2 == ["berry@test.com"]
-        assert sender2 == "notifications@acme.com"
-
-        # Third call verification
-        subject3, body3, sender3, recipients3 = call_args_list[2][0]
-        assert subject3 == "Your recording is ready"
-
-        # Verify second email content (if needed)
-        personalized_content3 = [
-            *base_content,
-            "Conference Room A",  # Room name
-            "2023-05-15",  # Formatted date
-            "07:30",  # Formatted time
-            "Your recording is ready!",  # Intro
-        ]
-        for content in personalized_content3:
-            assert content in body3
-
-        assert recipients3 == ["john@test.com"]
-        assert sender3 == "notifications@acme.com"
-
-
-def test_notify_user_by_email_no_owners(mocked_current_site, caplog):
-    """Test email notification when no owners are found."""
-
-    # Recording with no access
-    recording = factories.RecordingFactory()
-
-    result = notification_service._notify_user_by_email(recording)
-
-    assert result is False
-    assert f"No owner found for recording {recording.id}" in caplog.text
-
-
-def test_notify_user_by_email_smtp_exception(mocked_current_site, caplog):
-    """Test email notification when an exception occurs."""
-
-    recording = factories.RecordingFactory(room__name="Conference Room A")
-    factories.UserRecordingAccessFactory(
-        recording=recording, role=models.RoleChoices.OWNER
-    )
-    factories.UserRecordingAccessFactory(
-        recording=recording, role=models.RoleChoices.OWNER
-    )
-
-    notification_service = NotificationService()
-
-    with mock.patch(
-        "core.recording.event.notification.send_mail",
-        side_effect=smtplib.SMTPException("SMTP Error"),
-    ) as mock_send_mail:
-        result = notification_service._notify_user_by_email(recording)
-
-        assert result is False
-        assert mock_send_mail.call_count == 2
-        assert "notification could not be sent:" in caplog.text

src/backend/core/tests/recording/test_api_recordings_list.py

@@ -22,37 +22,15 @@ def test_api_recordings_list_anonymous():
     assert response.status_code == 401
 
 
-def test_api_recordings_list_authenticated_no_recording():
-    """
-    Authenticated users listing recordings should only
-    see recordings to which they have access.
-    """
-    user = factories.UserFactory()
-    client = APIClient()
-    client.force_login(user)
-
-    other_user = factories.UserFactory()
-    factories.UserRecordingAccessFactory(user=other_user)
-
-    response = client.get(
-        "/api/v1.0/recordings/",
-    )
-
-    assert response.status_code == 200
-    results = response.json()["results"]
-    assert results == []
-
-
 @pytest.mark.parametrize(
     "role",
     ["administrator", "member", "owner"],
 )
-def test_api_recordings_list_authenticated_direct(role, settings):
+def test_api_recordings_list_authenticated_direct(role):
     """
     Authenticated users listing recordings, should only see the recordings
     to which they are related.
     """
-    settings.RECORDING_EXPIRATIONS_DAYS = None
     user = factories.UserFactory()
     client = APIClient()
     client.force_login(user)
@@ -79,19 +57,15 @@ def test_api_recordings_list_authenticated_direct(role, settings):
     assert expected_ids == result_ids
     assert results[0] == {
         "id": str(recording.id),
-        "key": recording.key,
         "created_at": recording.created_at.isoformat().replace("+00:00", "Z"),
-        "mode": recording.mode,
         "room": {
-            "access_level": str(room.access_level),
             "id": str(room.id),
+            "is_public": room.is_public,
             "name": room.name,
             "slug": room.slug,
         },
         "status": "initiated",
         "updated_at": recording.updated_at.isoformat().replace("+00:00", "Z"),
-        "expired_at": None,
-        "is_expired": False,
     }
 
 

src/backend/core/tests/recording/test_api_recordings_media_auth.py

@@ -1,284 +0,0 @@
-"""
-Test media-auth authorization API endpoint in docs core app.
-"""
-
-from io import BytesIO
-from urllib.parse import urlparse
-from uuid import uuid4
-
-from django.conf import settings
-from django.core.files.storage import default_storage
-from django.utils import timezone
-
-import pytest
-import requests
-from rest_framework.test import APIClient
-
-from core import models
-from core.factories import RecordingFactory, UserFactory, UserRecordingAccessFactory
-
-pytestmark = pytest.mark.django_db
-
-
-def test_api_recordings_media_auth_unauthenticated():
-    """
-    Test that unauthenticated requests to download media are rejected
-    """
-    original_url = f"http://localhost/media/recordings/{uuid4()!s}.mp4"
-
-    response = APIClient().get(
-        "/api/v1.0/recordings/media-auth/", HTTP_X_ORIGINAL_URL=original_url
-    )
-
-    assert response.status_code == 401
-
-
-def test_api_recordings_media_auth_wrong_path():
-    """
-    Test that media URLs with incorrect path structures are rejected
-    """
-    user = UserFactory()
-
-    client = APIClient()
-    client.force_login(user)
-
-    original_url = f"http://localhost/media/wrong-path/{uuid4()!s}.mp4"
-
-    response = client.get(
-        "/api/v1.0/recordings/media-auth/", HTTP_X_ORIGINAL_URL=original_url
-    )
-
-    assert response.status_code == 403
-
-
-def test_api_recordings_media_auth_unknown_recording():
-    """
-    Test that requests for non-existent recordings are properly handled
-    """
-    user = UserFactory()
-
-    client = APIClient()
-    client.force_login(user)
-
-    original_url = f"http://localhost/media/recordings/{uuid4()!s}.mp4"
-
-    response = client.get(
-        "/api/v1.0/recordings/media-auth/", HTTP_X_ORIGINAL_URL=original_url
-    )
-
-    assert response.status_code == 404
-
-
-def test_api_recordings_media_auth_no_abilities():
-    """
-    Test that users without any access permissions cannot download recordings
-    """
-    user = UserFactory()
-
-    client = APIClient()
-    client.force_login(user)
-
-    recording = RecordingFactory(status=models.RecordingStatusChoices.SAVED)
-    original_url = f"http://localhost/media/recordings/{recording.id!s}.mp4"
-
-    response = client.get(
-        "/api/v1.0/recordings/media-auth/", HTTP_X_ORIGINAL_URL=original_url
-    )
-
-    assert response.status_code == 403
-
-
-def test_api_recordings_media_auth_wrong_abilities():
-    """
-    Test that users with insufficient role permissions cannot download recordings
-    """
-    user = UserFactory()
-
-    client = APIClient()
-    client.force_login(user)
-
-    recording = RecordingFactory(status=models.RecordingStatusChoices.SAVED)
-
-    UserRecordingAccessFactory(user=user, recording=recording, role="member")
-
-    original_url = f"http://localhost/media/recordings/{recording.id!s}.mp4"
-
-    response = client.get(
-        "/api/v1.0/recordings/media-auth/", HTTP_X_ORIGINAL_URL=original_url
-    )
-
-    assert response.status_code == 403
-
-
-@pytest.mark.parametrize("wrong_status", ["initiated", "active", "failed_to_stop"])
-def test_api_recordings_media_auth_unsaved(wrong_status):
-    """
-    Test that recordings that aren't in 'saved' status cannot be downloaded
-    """
-    user = UserFactory()
-
-    client = APIClient()
-    client.force_login(user)
-
-    recording = RecordingFactory(status=wrong_status)
-    UserRecordingAccessFactory(user=user, recording=recording, role="owner")
-
-    original_url = f"http://localhost/media/recordings/{recording.id!s}.mp4"
-
-    response = client.get(
-        "/api/v1.0/recordings/media-auth/", HTTP_X_ORIGINAL_URL=original_url
-    )
-
-    assert response.status_code == 403
-
-
-def test_api_recordings_media_auth_mismatched_extension():
-    """
-    Test that requests with mismatched file extensions are rejected
-    """
-    user = UserFactory()
-
-    client = APIClient()
-    client.force_login(user)
-
-    recording = RecordingFactory(
-        status=models.RecordingStatusChoices.SAVED,
-        mode=models.RecordingModeChoices.TRANSCRIPT,
-    )
-    UserRecordingAccessFactory(user=user, recording=recording, role="owner")
-
-    original_url = f"http://localhost/media/recordings/{recording.id!s}.mp4"
-
-    response = client.get(
-        "/api/v1.0/recordings/media-auth/", HTTP_X_ORIGINAL_URL=original_url
-    )
-
-    assert response.status_code == 404
-    assert response.json() == {"detail": "No recording found with this extension."}
-
-
-@pytest.mark.parametrize(
-    "wrong_extension", ["jpg", "txt", "mp3"], ids=["image", "text", "audio"]
-)
-def test_api_recordings_media_auth_wrong_extension(wrong_extension):
-    """
-    Trying to download a recording with an unsupported extension should return
-    a validation error (400) with details about allowed extensions.
-    """
-    user = UserFactory()
-    client = APIClient()
-    client.force_login(user)
-
-    recording = RecordingFactory(status=models.RecordingStatusChoices.SAVED)
-    UserRecordingAccessFactory(user=user, recording=recording, role="owner")
-
-    original_url = (
-        f"http://localhost/media/recordings/{recording.id!s}.{wrong_extension}"
-    )
-
-    response = client.get(
-        "/api/v1.0/recordings/media-auth/", HTTP_X_ORIGINAL_URL=original_url
-    )
-
-    assert response.status_code == 400
-    assert response.json() == {"detail": "Unsupported extension."}
-
-
-@pytest.mark.parametrize("mode", ["screen_recording", "transcript"])
-def test_api_recordings_media_auth_success_owner(mode):
-    """
-    Test downloading a recording when logged in and authorized.
-    Verifies S3 authentication headers and successful file retrieval.
-    """
-    user = UserFactory()
-    client = APIClient()
-    client.force_login(user)
-
-    recording = RecordingFactory(status=models.RecordingStatusChoices.SAVED, mode=mode)
-    UserRecordingAccessFactory(user=user, recording=recording, role="owner")
-
-    default_storage.connection.meta.client.put_object(
-        Bucket=default_storage.bucket_name,
-        Key=recording.key,
-        Body=BytesIO(b"my prose"),
-        ContentType="text/plain",
-    )
-
-    original_url = f"http://localhost/media/{recording.key:s}"
-    response = client.get(
-        "/api/v1.0/recordings/media-auth/", HTTP_X_ORIGINAL_URL=original_url
-    )
-
-    assert response.status_code == 200
-
-    authorization = response["Authorization"]
-    assert "AWS4-HMAC-SHA256 Credential=" in authorization
-    assert (
-        "SignedHeaders=host;x-amz-content-sha256;x-amz-date, Signature="
-        in authorization
-    )
-    assert response["X-Amz-Date"] == timezone.now().strftime("%Y%m%dT%H%M%SZ")
-
-    s3_url = urlparse(settings.AWS_S3_ENDPOINT_URL)
-    file_url = f"{settings.AWS_S3_ENDPOINT_URL:s}/meet-media-storage/{recording.key:s}"
-    response = requests.get(
-        file_url,
-        headers={
-            "authorization": authorization,
-            "x-amz-date": response["x-amz-date"],
-            "x-amz-content-sha256": response["x-amz-content-sha256"],
-            "Host": f"{s3_url.hostname:s}:{s3_url.port:d}",
-        },
-        timeout=1,
-    )
-    assert response.content.decode("utf-8") == "my prose"
-
-
-@pytest.mark.parametrize("mode", ["screen_recording", "transcript"])
-def test_api_recordings_media_auth_success_administrator(mode):
-    """
-    Test downloading a recording when logged in and authorized.
-    Verifies S3 authentication headers and successful file retrieval.
-    """
-    user = UserFactory()
-    client = APIClient()
-    client.force_login(user)
-
-    recording = RecordingFactory(status=models.RecordingStatusChoices.SAVED, mode=mode)
-    UserRecordingAccessFactory(user=user, recording=recording, role="administrator")
-
-    default_storage.connection.meta.client.put_object(
-        Bucket=default_storage.bucket_name,
-        Key=recording.key,
-        Body=BytesIO(b"my prose"),
-        ContentType="text/plain",
-    )
-
-    original_url = f"http://localhost/media/{recording.key:s}"
-    response = client.get(
-        "/api/v1.0/recordings/media-auth/", HTTP_X_ORIGINAL_URL=original_url
-    )
-
-    assert response.status_code == 200
-
-    authorization = response["Authorization"]
-    assert "AWS4-HMAC-SHA256 Credential=" in authorization
-    assert (
-        "SignedHeaders=host;x-amz-content-sha256;x-amz-date, Signature="
-        in authorization
-    )
-    assert response["X-Amz-Date"] == timezone.now().strftime("%Y%m%dT%H%M%SZ")
-
-    s3_url = urlparse(settings.AWS_S3_ENDPOINT_URL)
-    file_url = f"{settings.AWS_S3_ENDPOINT_URL:s}/meet-media-storage/{recording.key:s}"
-    response = requests.get(
-        file_url,
-        headers={
-            "authorization": authorization,
-            "x-amz-date": response["x-amz-date"],
-            "x-amz-content-sha256": response["x-amz-content-sha256"],
-            "Host": f"{s3_url.hostname:s}:{s3_url.port:d}",
-        },
-        timeout=1,
-    )
-    assert response.content.decode("utf-8") == "my prose"

src/backend/core/tests/recording/test_api_recordings_retrieve.py

@@ -1,243 +0,0 @@
-"""
-Test recordings API endpoints in the Meet core app: retrieve.
-"""
-
-import random
-
-import pytest
-from freezegun import freeze_time
-from rest_framework.test import APIClient
-
-from ...factories import RecordingFactory, UserFactory, UserRecordingAccessFactory
-from ...models import RecordingStatusChoices
-
-pytestmark = pytest.mark.django_db
-
-
-def test_api_recording_retrieve_anonymous():
-    """Anonymous users should not be able to retrieve recordings."""
-    recording = RecordingFactory()
-    client = APIClient()
-    response = client.get(f"/api/v1.0/recordings/{recording.id!s}/")
-
-    assert response.status_code == 401
-    assert response.json() == {
-        "detail": "Authentication credentials were not provided."
-    }
-
-
-def test_api_recording_retrieve_authenticated():
-    """Authenticated users without access receive 404 when requesting recordings.
-
-    The API returns 404 instead of 403 to avoid revealing the existence of
-    resources the user doesn't have permission to access.
-    """
-    user = UserFactory()
-
-    client = APIClient()
-    client.force_login(user)
-
-    other_user = UserFactory()
-    recording = UserRecordingAccessFactory(user=other_user).recording
-
-    response = client.get(f"/api/v1.0/recordings/{recording.id!s}/")
-    assert response.status_code == 404
-    assert response.json() == {"detail": "No Recording matches the given query."}
-
-
-def test_api_recording_retrieve_members():
-    """
-    A user who is a member of a recording should not be able to retrieve it.
-    """
-    user = UserFactory()
-    recording = RecordingFactory()
-
-    UserRecordingAccessFactory(recording=recording, user=user, role="member")
-
-    client = APIClient()
-    client.force_login(user)
-
-    response = client.get(f"/api/v1.0/recordings/{recording.id!s}/")
-    assert response.status_code == 403
-    assert response.json() == {
-        "detail": "You do not have permission to perform this action."
-    }
-
-
-def test_api_recording_retrieve_administrators(settings):
-    """A user who is an administrator of a recording should be able to retrieve it."""
-    settings.RECORDING_EXPIRATION_DAYS = None
-
-    user = UserFactory()
-    recording = RecordingFactory()
-
-    UserRecordingAccessFactory(recording=recording, user=user, role="administrator")
-
-    client = APIClient()
-    client.force_login(user)
-
-    response = client.get(f"/api/v1.0/recordings/{recording.id!s}/")
-
-    assert response.status_code == 200
-    content = response.json()
-    room = recording.room
-
-    assert content == {
-        "id": str(recording.id),
-        "key": recording.key,
-        "room": {
-            "access_level": str(room.access_level),
-            "id": str(room.id),
-            "name": room.name,
-            "slug": room.slug,
-        },
-        "created_at": recording.created_at.isoformat().replace("+00:00", "Z"),
-        "updated_at": recording.updated_at.isoformat().replace("+00:00", "Z"),
-        "status": str(recording.status),
-        "mode": str(recording.mode),
-        "expired_at": None,
-        "is_expired": False,
-    }
-
-
-def test_api_recording_retrieve_owners(settings):
-    """A user who is an owner of a recording should be able to retrieve it."""
-    settings.RECORDING_EXPIRATION_DAYS = None
-    user = UserFactory()
-    recording = RecordingFactory()
-
-    UserRecordingAccessFactory(recording=recording, user=user, role="owner")
-
-    client = APIClient()
-    client.force_login(user)
-
-    response = client.get(f"/api/v1.0/recordings/{recording.id!s}/")
-
-    assert response.status_code == 200
-    content = response.json()
-    room = recording.room
-
-    assert content == {
-        "id": str(recording.id),
-        "key": recording.key,
-        "room": {
-            "access_level": str(room.access_level),
-            "id": str(room.id),
-            "name": room.name,
-            "slug": room.slug,
-        },
-        "created_at": recording.created_at.isoformat().replace("+00:00", "Z"),
-        "updated_at": recording.updated_at.isoformat().replace("+00:00", "Z"),
-        "status": str(recording.status),
-        "mode": str(recording.mode),
-        "expired_at": None,
-        "is_expired": False,
-    }
-
-
-@freeze_time("2023-01-15 12:00:00")
-def test_api_recording_retrieve_compute_expiration_date_correctly(settings):
-    """Test that the API returns the correct expiration date for a non-expired recording."""
-    settings.RECORDING_EXPIRATION_DAYS = 1
-
-    user = UserFactory()
-    recording = RecordingFactory()
-
-    UserRecordingAccessFactory(
-        recording=recording, user=user, role=random.choice(["administrator", "owner"])
-    )
-
-    client = APIClient()
-    client.force_login(user)
-
-    response = client.get(f"/api/v1.0/recordings/{recording.id!s}/")
-
-    assert response.status_code == 200
-    content = response.json()
-    room = recording.room
-
-    assert content == {
-        "id": str(recording.id),
-        "key": recording.key,
-        "room": {
-            "access_level": str(room.access_level),
-            "id": str(room.id),
-            "name": room.name,
-            "slug": room.slug,
-        },
-        "created_at": "2023-01-15T12:00:00Z",
-        "updated_at": "2023-01-15T12:00:00Z",
-        "status": str(recording.status),
-        "mode": str(recording.mode),
-        "expired_at": "2023-01-16T12:00:00Z",
-        "is_expired": False,  # Ensure the recording is still valid and hasn't expired
-    }
-
-
-def test_api_recording_retrieve_expired(settings):
-    """Test that the API returns the correct expiration date and flag for an expired recording."""
-    settings.RECORDING_EXPIRATION_DAYS = 2
-
-    user = UserFactory()
-
-    with freeze_time("2023-01-15 12:00:00"):
-        recording = RecordingFactory()
-
-    UserRecordingAccessFactory(
-        recording=recording, user=user, role=random.choice(["administrator", "owner"])
-    )
-
-    client = APIClient()
-    client.force_login(user)
-
-    response = client.get(f"/api/v1.0/recordings/{recording.id!s}/")
-
-    assert response.status_code == 200
-    content = response.json()
-    room = recording.room
-
-    assert content == {
-        "id": str(recording.id),
-        "key": recording.key,
-        "room": {
-            "access_level": str(room.access_level),
-            "id": str(room.id),
-            "name": room.name,
-            "slug": room.slug,
-        },
-        "created_at": "2023-01-15T12:00:00Z",
-        "updated_at": "2023-01-15T12:00:00Z",
-        "status": str(recording.status),
-        "mode": str(recording.mode),
-        "expired_at": "2023-01-17T12:00:00Z",
-        "is_expired": True,  # Ensure the recording has expired
-    }
-
-
-@pytest.mark.parametrize(
-    "status",
-    [
-        RecordingStatusChoices.INITIATED,
-        RecordingStatusChoices.ACTIVE,
-        RecordingStatusChoices.SAVED,
-        RecordingStatusChoices.FAILED_TO_START,
-        RecordingStatusChoices.FAILED_TO_STOP,
-        RecordingStatusChoices.ABORTED,
-    ],
-)
-def test_api_recording_retrieve_any_status(status):
-    """Test that recordings with any status can be retrieved."""
-    user = UserFactory()
-    recording = RecordingFactory(status=status)
-
-    UserRecordingAccessFactory(recording=recording, user=user, role="owner")
-
-    client = APIClient()
-    client.force_login(user)
-
-    response = client.get(f"/api/v1.0/recordings/{recording.id!s}/")
-
-    assert response.status_code == 200
-    content = response.json()
-    assert content["id"] == str(recording.id)
-    assert content["status"] == status

src/backend/core/tests/recording/worker/test_factories.py

@@ -32,6 +32,7 @@ def test_settings():
     mocked_settings = {
         "RECORDING_OUTPUT_FOLDER": "/test/output",
         "LIVEKIT_CONFIGURATION": {"server": "test.example.com"},
+        "RECORDING_VERIFY_SSL": True,
         "AWS_S3_ENDPOINT_URL": "https://s3.test.com",
         "AWS_S3_ACCESS_KEY_ID": "test_key",
         "AWS_S3_SECRET_ACCESS_KEY": "test_secret",
@@ -55,6 +56,7 @@ def test_config_initialization(default_config):
     """Test that WorkerServiceConfig is properly initialized from settings"""
     assert default_config.output_folder == "/test/output"
     assert default_config.server_configurations == {"server": "test.example.com"}
+    assert default_config.verify_ssl is True
     assert default_config.bucket_args == {
         "endpoint": "https://s3.test.com",
         "access_key": "test_key",
@@ -74,6 +76,7 @@ def test_config_immutability(default_config):
 @override_settings(
     RECORDING_OUTPUT_FOLDER="/test/output",
     LIVEKIT_CONFIGURATION={"server": "test.example.com"},
+    RECORDING_VERIFY_SSL=True,
     AWS_S3_ENDPOINT_URL="https://s3.test.com",
     AWS_S3_ACCESS_KEY_ID="test_key",
     AWS_S3_SECRET_ACCESS_KEY="test_secret",

src/backend/core/tests/recording/worker/test_services.py

@@ -6,9 +6,10 @@ Test worker service classes.
 
 from unittest.mock import AsyncMock, Mock, patch
 
+import aiohttp
 import pytest
 
-from core.recording.worker.exceptions import WorkerResponseError
+from core.recording.worker.exceptions import WorkerConnectionError, WorkerResponseError
 from core.recording.worker.factories import WorkerServiceConfig
 from core.recording.worker.services import (
     AudioCompositeEgressService,
@@ -24,10 +25,11 @@ def config():
     return WorkerServiceConfig(
         output_folder="/test/output",
         server_configurations={
-            "url": "test.livekit.io",
+            "host": "test.livekit.io",
             "api_key": "test_key",
             "api_secret": "test_secret",
         },
+        verify_ssl=True,
         bucket_args={
             "endpoint": "https://s3.test.com",
             "access_key": "test_key",
@@ -125,6 +127,58 @@ def test_base_egress_filepath_construction(service, filename, extension, expecte
     assert result.endswith(f"{filename}.{extension}")
 
 
+def test_base_egress_handle_request_success(
+    config, service, mock_client_session, mock_egress_service, mock_tcp_connector
+):
+    """Test successful request handling"""
+    # Setup mock response
+    mock_response = Mock()
+    mock_method = AsyncMock(return_value=mock_response)
+    mock_egress_instance = Mock()
+    mock_egress_instance.test_method = mock_method
+    mock_egress_service.return_value = mock_egress_instance
+
+    # Create test request
+    test_request = Mock()
+
+    response = service._handle_request(test_request, "test_method")
+
+    mock_client_session.assert_called_once_with(
+        connector=mock_tcp_connector.return_value
+    )
+
+    # Verify EgressService initialization
+    mock_egress_service.assert_called_once_with(
+        mock_client_session.return_value.__aenter__.return_value,
+        **service._config.server_configurations,
+    )
+
+    # Verify method call and response
+    mock_method.assert_called_once_with(test_request)
+    assert response == mock_response
+
+
+def test_base_egress_handle_request_connection_error(service, mock_egress_service):
+    """Test handling of connection errors"""
+    # Setup mock error
+    mock_method = AsyncMock(
+        side_effect=livekit_api.TwirpError(msg="Connection failed", code=500)
+    )
+    mock_egress_instance = Mock()
+    mock_egress_instance.test_method = mock_method
+    mock_egress_service.return_value = mock_egress_instance
+
+    # Create test request
+    test_request = Mock()
+
+    # Verify error handling
+    with pytest.raises(WorkerConnectionError) as exc:
+        service._handle_request(test_request, "test_method")
+
+    assert "LiveKit client connection error" in str(exc.value)
+    assert "Connection failed" in str(exc.value)
+
+
 @pytest.mark.parametrize(
     "response_status,expected_result",
     [
@@ -170,6 +224,43 @@ def test_base_egress_start_not_implemented(service):
     assert "Subclass must implement this method" in str(exc.value)
 
 
+@pytest.mark.parametrize("verify_ssl", [True, False])
+def test_base_egress_ssl_verification_config(verify_ssl):
+    """Test SSL verification configuration"""
+    config = WorkerServiceConfig(
+        output_folder="/test/output",
+        server_configurations={
+            "host": "test.livekit.io",
+            "api_key": "test_key",
+            "api_secret": "test_secret",
+        },
+        verify_ssl=verify_ssl,
+        bucket_args={
+            "endpoint": "https://s3.test.com",
+            "access_key": "test_key",
+            "secret": "test_secret",
+            "region": "test-region",
+            "bucket": "test-bucket",
+            "force_path_style": True,
+        },
+    )
+
+    service = BaseEgressService(config)
+
+    # Mock ClientSession to capture connector configuration
+    with patch("aiohttp.ClientSession") as mock_session:
+        mock_session.return_value.__aenter__ = AsyncMock()
+        mock_session.return_value.__aexit__ = AsyncMock()
+
+        # Trigger request to verify connector configuration
+        service._handle_request(Mock(), "test_method")
+
+        # Verify SSL configuration
+        connector = mock_session.call_args[1]["connector"]
+        assert isinstance(connector, aiohttp.TCPConnector)
+        assert connector._ssl == verify_ssl
+
+
 def test_video_composite_egress_hrid(video_service):
     """Test HRID is correct"""
     assert video_service.hrid == "video-recording-composite-livekit-egress"

src/backend/core/tests/rooms/test_api_rooms_create.py

@@ -2,9 +2,6 @@
 Test rooms API endpoints in the Meet core app: create.
 """
 
-# pylint: disable=W0621,W0613
-from django.core.cache import cache
-
 import pytest
 from rest_framework.test import APIClient
 
@@ -14,15 +11,6 @@ from ...models import Room
 pytestmark = pytest.mark.django_db
 
 
-@pytest.fixture
-def reset_cache():
-    """Provide cache cleanup after each test to maintain test isolation."""
-    yield
-    keys = cache.keys("room-creation-callback_*")
-    if keys:
-        cache.delete(*keys)
-
-
 def test_api_rooms_create_anonymous():
     """Anonymous users should not be allowed to create rooms."""
     client = APIClient()
@@ -38,7 +26,7 @@ def test_api_rooms_create_anonymous():
     assert Room.objects.exists() is False
 
 
-def test_api_rooms_create_authenticated(reset_cache):
+def test_api_rooms_create_authenticated():
     """
     Authenticated users should be able to create rooms and should automatically be declared
     as owner of the newly created room.
@@ -61,33 +49,6 @@ def test_api_rooms_create_authenticated(reset_cache):
     assert room.slug == "my-room"
     assert room.accesses.filter(role="owner", user=user).exists() is True
 
-    rooms_data = cache.keys("room-creation-callback_*")
-    assert not rooms_data
-
-
-def test_api_rooms_create_generation_cache(reset_cache):
-    """
-    Authenticated users creating a room with a callback ID should have room data stored in cache.
-    """
-    user = UserFactory()
-
-    client = APIClient()
-    client.force_login(user)
-
-    response = client.post(
-        "/api/v1.0/rooms/",
-        {"name": "my room", "callback_id": "1234"},
-    )
-
-    assert response.status_code == 201
-    room = Room.objects.get()
-    assert room.name == "my room"
-    assert room.slug == "my-room"
-    assert room.accesses.filter(role="owner", user=user).exists() is True
-
-    room_data = cache.get("room-creation-callback_1234")
-    assert room_data.get("slug") == "my-room"
-
 
 def test_api_rooms_create_authenticated_existing_slug():
     """

src/backend/core/tests/rooms/test_api_rooms_creation_callback.py

@@ -1,98 +0,0 @@
-"""
-Test rooms API endpoints in the Meet core app: creation callback functionality.
-"""
-
-# pylint: disable=W0621,W0613
-from django.core.cache import cache
-
-import pytest
-from rest_framework.test import APIClient
-
-from ...factories import UserFactory
-
-pytestmark = pytest.mark.django_db
-
-
-# Tests for creation_callback endpoint
-
-
-@pytest.fixture
-def reset_cache():
-    """Provide cache cleanup after each test to maintain test isolation."""
-    yield
-    keys = cache.keys("room-creation-callback_*")
-    if keys:
-        cache.delete(*keys)
-
-
-def test_api_rooms_create_anonymous(reset_cache):
-    """Anonymous user can retrieve room data once using a valid callback ID."""
-    client = APIClient()
-    cache.set("room-creation-callback_123", {"slug": "my room"})
-    response = client.post(
-        "/api/v1.0/rooms/creation-callback/",
-        {
-            "callback_id": "123",
-        },
-    )
-
-    assert response.status_code == 200
-    assert response.json() == {"status": "success", "room": {"slug": "my room"}}
-
-    # Data should be cleared after retrieval
-    response = client.post(
-        "/api/v1.0/rooms/creation-callback/",
-        {
-            "callback_id": "123",
-        },
-    )
-
-    assert response.status_code == 200
-    assert response.json() == {"status": "success", "room": {}}
-
-
-def test_api_rooms_create_empty_cache():
-    """Valid callback ID return empty room data when nothing is stored in the cache."""
-    client = APIClient()
-
-    response = client.post(
-        "/api/v1.0/rooms/creation-callback/",
-        {
-            "callback_id": "123",
-        },
-    )
-
-    assert response.status_code == 200
-    assert response.json() == {"status": "success", "room": {}}
-
-
-def test_api_rooms_create_missing_callback_id():
-    """Requests without a callback ID properly fail with a 400 status code."""
-    client = APIClient()
-
-    response = client.post(
-        "/api/v1.0/rooms/creation-callback/",
-        {},
-    )
-
-    assert response.status_code == 400
-
-
-def test_api_rooms_create_authenticated(reset_cache):
-    """Authenticated users can also successfully retrieve room data using a valid callback ID"""
-    user = UserFactory()
-
-    client = APIClient()
-    client.force_login(user)
-
-    cache.set("room-creation-callback_123", {"slug": "my room"})
-
-    response = client.post(
-        "/api/v1.0/rooms/creation-callback/",
-        {
-            "callback_id": "123",
-        },
-    )
-
-    assert response.status_code == 200
-    assert response.json() == {"status": "success", "room": {"slug": "my room"}}

src/backend/core/tests/rooms/test_api_rooms_invite.py

@@ -1,295 +0,0 @@
-"""
-Test rooms API endpoints in the Meet core app: invite.
-"""
-
-# pylint: disable=W0621,W0613
-
-import json
-import random
-from unittest import mock
-
-import pytest
-from rest_framework.test import APIClient
-
-from ...factories import RoomFactory, UserFactory
-from ...services.invitation import InvitationError, InvitationService
-
-pytestmark = pytest.mark.django_db
-
-
-def test_api_rooms_invite_anonymous():
-    """Test anonymous users should not be allowed to invite people to rooms."""
-
-    client = APIClient()
-    room = RoomFactory()
-
-    data = {"emails": ["toto@yopmail.com"]}
-    response = client.post(
-        f"/api/v1.0/rooms/{room.id}/invite/",
-        json.dumps(data),
-        content_type="application/json",
-    )
-
-    assert response.status_code == 401
-
-
-def test_api_rooms_invite_no_access():
-    """Test non-privileged users should not be allowed to invite people to rooms."""
-
-    client = APIClient()
-    room = RoomFactory()
-
-    user = UserFactory()
-    client.force_login(user)
-
-    data = {"emails": ["toto@yopmail.com"]}
-    response = client.post(
-        f"/api/v1.0/rooms/{room.id}/invite/",
-        json.dumps(data),
-        content_type="application/json",
-    )
-
-    assert response.status_code == 403
-    assert response.json() == {
-        "detail": "You must have privileges on room to perform this action.",
-    }
-
-
-def test_api_rooms_invite_member():
-    """Test member users should not be allowed to invite people to rooms."""
-
-    client = APIClient()
-    room = RoomFactory()
-
-    user = UserFactory()
-    client.force_login(user)
-
-    room.accesses.create(user=user, role="member")
-
-    data = {"emails": ["toto@yopmail.com"]}
-    response = client.post(
-        f"/api/v1.0/rooms/{room.id}/invite/",
-        json.dumps(data),
-        content_type="application/json",
-    )
-
-    assert response.status_code == 403
-    assert response.json() == {
-        "detail": "You must have privileges on room to perform this action.",
-    }
-
-
-def test_api_rooms_invite_missing_emails():
-    """Test missing email list should return validation error."""
-
-    client = APIClient()
-    room = RoomFactory()
-    user = UserFactory()
-
-    room.accesses.create(user=user, role=random.choice(["administrator", "owner"]))
-
-    client.force_login(user)
-
-    data = {"foo": []}
-    response = client.post(
-        f"/api/v1.0/rooms/{room.id}/invite/",
-        json.dumps(data),
-        content_type="application/json",
-    )
-
-    assert response.status_code == 400
-    assert response.json() == {
-        "emails": [
-            "This field is required.",
-        ]
-    }
-
-
-def test_api_rooms_invite_empty_emails():
-    """Test empty email list should return validation error."""
-
-    client = APIClient()
-    room = RoomFactory()
-    user = UserFactory()
-
-    room.accesses.create(user=user, role=random.choice(["administrator", "owner"]))
-
-    client.force_login(user)
-
-    data = {"emails": []}
-    response = client.post(
-        f"/api/v1.0/rooms/{room.id}/invite/",
-        json.dumps(data),
-        content_type="application/json",
-    )
-
-    assert response.status_code == 400
-    assert response.json() == {
-        "emails": [
-            "This list may not be empty.",
-        ]
-    }
-
-
-def test_api_rooms_invite_invalid_emails():
-    """Test invalid email addresses should return validation errors."""
-
-    client = APIClient()
-    room = RoomFactory()
-    user = UserFactory()
-
-    room.accesses.create(user=user, role=random.choice(["administrator", "owner"]))
-
-    client.force_login(user)
-
-    data = {"emails": ["abdc", "efg"]}
-
-    response = client.post(
-        f"/api/v1.0/rooms/{room.id}/invite/",
-        json.dumps(data),
-        content_type="application/json",
-    )
-
-    assert response.status_code == 400
-    assert response.json() == {
-        "emails": {
-            "0": ["Enter a valid email address."],
-            "1": ["Enter a valid email address."],
-        }
-    }
-
-
-def test_api_rooms_invite_partially_invalid_emails():
-    """Test partially invalid email addresses should return validation errors."""
-
-    client = APIClient()
-    room = RoomFactory()
-    user = UserFactory()
-
-    room.accesses.create(user=user, role=random.choice(["administrator", "owner"]))
-
-    client.force_login(user)
-
-    data = {"emails": ["fabrice@yopmail.com", "efg"]}
-
-    response = client.post(
-        f"/api/v1.0/rooms/{room.id}/invite/",
-        json.dumps(data),
-        content_type="application/json",
-    )
-
-    assert response.status_code == 400
-    assert response.json() == {
-        "emails": {
-            "1": ["Enter a valid email address."],
-        }
-    }
-
-
-@mock.patch.object(InvitationService, "invite_to_room")
-def test_api_rooms_invite_duplicates(mock_invite_to_room):
-    """Test duplicate emails should be deduplicated before processing."""
-
-    client = APIClient()
-    room = RoomFactory()
-    user = UserFactory()
-
-    room.accesses.create(user=user, role=random.choice(["administrator", "owner"]))
-
-    client.force_login(user)
-
-    data = {"emails": ["toto@yopmail.com", "toto@yopmail.com", "Toto@yopmail.com"]}
-
-    response = client.post(
-        f"/api/v1.0/rooms/{room.id}/invite/",
-        json.dumps(data),
-        content_type="application/json",
-    )
-
-    assert response.status_code == 200
-    mock_invite_to_room.assert_called_once()
-
-    _, kwargs = mock_invite_to_room.call_args
-
-    assert kwargs["room"] == room
-    assert kwargs["sender"] == user
-    assert sorted(kwargs["emails"]) == sorted(["Toto@yopmail.com", "toto@yopmail.com"])
-
-
-@mock.patch.object(InvitationService, "invite_to_room", side_effect=InvitationError())
-def test_api_rooms_invite_error(mock_invite_to_room):
-    """Test invitation service error should return appropriate error response."""
-
-    client = APIClient()
-    room = RoomFactory()
-    user = UserFactory()
-
-    room.accesses.create(user=user, role=random.choice(["administrator", "owner"]))
-
-    client.force_login(user)
-
-    data = {"emails": ["toto@yopmail.com", "toto@yopmail.com"]}
-
-    with pytest.raises(InvitationError) as excinfo:
-        client.post(
-            f"/api/v1.0/rooms/{room.id}/invite/",
-            json.dumps(data),
-            content_type="application/json",
-        )
-
-        mock_invite_to_room.assert_called_once()
-        assert "Could not send invitation" in str(excinfo.value)
-
-
-@mock.patch("core.services.invitation.send_mail")
-def test_api_rooms_invite_success(mock_send_mail, settings):
-    """Test privileged users should successfully send invitation emails."""
-
-    settings.EMAIL_BRAND_NAME = "ACME"
-    settings.EMAIL_LOGO_IMG = "https://acme.com/logo"
-    settings.EMAIL_APP_BASE_URL = "https://acme.com"
-    settings.EMAIL_FROM = "notifications@acme.com"
-    settings.EMAIL_DOMAIN = "acme.com"
-
-    client = APIClient()
-    room = RoomFactory()
-    user = UserFactory()
-
-    room.accesses.create(user=user, role=random.choice(["administrator", "owner"]))
-
-    client.force_login(user)
-
-    data = {"emails": ["fabien@yopmail.com", "gerald@yopmail.com"]}
-
-    response = client.post(
-        f"/api/v1.0/rooms/{room.id}/invite/",
-        json.dumps(data),
-        content_type="application/json",
-    )
-
-    assert response.status_code == 200
-    assert response.json() == {"status": "success", "message": "invitations sent"}
-
-    mock_send_mail.assert_called_once()
-
-    subject, body, sender, recipients = mock_send_mail.call_args[0]
-
-    assert (
-        subject == f"Video call in progress: {user.email} is waiting for you to connect"
-    )
-
-    # Verify email contains expected content
-    required_content = [
-        "ACME",  # Brand name
-        "https://acme.com/logo",  # Logo URL
-        f"https://acme.com/{room.slug}",  # Room url
-        f"acme.com/{room.slug}",  # Room link
-    ]
-
-    for content in required_content:
-        assert content in body
-
-    assert sender == "notifications@acme.com"
-
-    # Verify all owners received the email (order-independent comparison)
-    assert sorted(recipients) == sorted(["fabien@yopmail.com", "gerald@yopmail.com"])

src/backend/core/tests/rooms/test_api_rooms_list.py

@@ -9,16 +9,14 @@ from rest_framework.pagination import PageNumberPagination
 from rest_framework.test import APIClient
 
 from ...factories import RoomFactory, UserFactory
-from ...models import RoomAccessLevel
 
 pytestmark = pytest.mark.django_db
 
 
 def test_api_rooms_list_anonymous():
     """Anonymous users should not be able to list rooms."""
-    RoomFactory(access_level=RoomAccessLevel.PUBLIC)
-    RoomFactory(access_level=RoomAccessLevel.TRUSTED)
-    RoomFactory(access_level=RoomAccessLevel.RESTRICTED)
+    RoomFactory(is_public=False)
+    RoomFactory(is_public=True)
 
     client = APIClient()
 
@@ -40,13 +38,10 @@ def test_api_rooms_list_authenticated():
 
     other_user = UserFactory()
 
-    RoomFactory(access_level=RoomAccessLevel.PUBLIC)
-    RoomFactory(access_level=RoomAccessLevel.TRUSTED)
-    RoomFactory(access_level=RoomAccessLevel.RESTRICTED)
-    room_user_accesses = RoomFactory(
-        access_level=RoomAccessLevel.RESTRICTED, users=[user]
-    )
-    RoomFactory(access_level=RoomAccessLevel.RESTRICTED, users=[other_user])
+    RoomFactory(is_public=False)
+    RoomFactory(is_public=True)
+    room_user_accesses = RoomFactory(is_public=False, users=[user])
+    RoomFactory(is_public=False, users=[other_user])
 
     response = client.get(
         "/api/v1.0/rooms/",
@@ -110,7 +105,7 @@ def test_api_rooms_list_authenticated_distinct():
     client = APIClient()
     client.force_login(user)
 
-    room = RoomFactory(access_level=RoomAccessLevel.PUBLIC, users=[user, other_user])
+    room = RoomFactory(is_public=True, users=[user, other_user])
 
     response = client.get(
         "/api/v1.0/rooms/",

src/backend/core/tests/rooms/test_api_rooms_lobby.py

@@ -1,624 +0,0 @@
-"""
-Test rooms API endpoints in the Meet core app: lobby functionality.
-"""
-
-# pylint: disable=W0621,W0613,W0212
-import uuid
-from unittest import mock
-
-from django.core.cache import cache
-
-import pytest
-from rest_framework.test import APIClient
-
-from ... import utils
-from ...factories import RoomFactory, UserFactory
-from ...models import RoomAccessLevel
-from ...services.lobby import (
-    LobbyService,
-)
-
-pytestmark = pytest.mark.django_db
-
-
-# Tests for request_entry endpoint
-
-
-def test_request_entry_anonymous(settings):
-    """Anonymous users should be allowed to request entry to a room."""
-    room = RoomFactory(access_level=RoomAccessLevel.RESTRICTED)
-    client = APIClient()
-
-    settings.LOBBY_COOKIE_NAME = "mocked-cookie"
-    settings.LOBBY_KEY_PREFIX = "mocked-cache-prefix"
-
-    # Lobby cache should be empty before the request
-    lobby_keys = cache.keys(f"mocked-cache-prefix_{room.id}_*")
-    assert not lobby_keys
-
-    with (
-        mock.patch.object(LobbyService, "notify_participants", return_value=None),
-        mock.patch.object(utils, "generate_color", return_value="mocked-color"),
-    ):
-        response = client.post(
-            f"/api/v1.0/rooms/{room.id}/request-entry/",
-            {"username": "test_user"},
-        )
-
-    assert response.status_code == 200
-
-    # Verify the lobby cookie was properly set
-    cookie = response.cookies.get("mocked-cookie")
-    assert cookie is not None
-
-    participant_id = cookie.value
-
-    # Verify response content matches expected structure and values
-    assert response.json() == {
-        "id": participant_id,
-        "username": "test_user",
-        "status": "waiting",
-        "color": "mocked-color",
-        "livekit": None,
-    }
-
-    # Verify a participant was stored in cache
-    lobby_keys = cache.keys(f"mocked-cache-prefix_{room.id}_*")
-    assert len(lobby_keys) == 1
-
-    # Verify participant data was correctly stored in cache
-    participant_data = cache.get(f"mocked-cache-prefix_{room.id!s}_{participant_id}")
-    assert participant_data.get("username") == "test_user"
-
-
-def test_request_entry_authenticated_user(settings):
-    """Authenticated users should be allowed to request entry."""
-    room = RoomFactory(access_level=RoomAccessLevel.RESTRICTED)
-    user = UserFactory()
-    client = APIClient()
-    client.force_login(user)
-
-    settings.LOBBY_COOKIE_NAME = "mocked-cookie"
-    settings.LOBBY_KEY_PREFIX = "mocked-cache-prefix"
-
-    # Lobby cache should be empty before the request
-    lobby_keys = cache.keys(f"mocked-cache-prefix_{room.id}_*")
-    assert not lobby_keys
-
-    with (
-        mock.patch.object(LobbyService, "notify_participants", return_value=None),
-        mock.patch.object(utils, "generate_color", return_value="mocked-color"),
-    ):
-        response = client.post(
-            f"/api/v1.0/rooms/{room.id}/request-entry/",
-            {"username": "test_user"},
-        )
-
-    assert response.status_code == 200
-
-    # Verify the lobby cookie was properly set
-    cookie = response.cookies.get("mocked-cookie")
-    assert cookie is not None
-
-    participant_id = cookie.value
-
-    # Verify response content matches expected structure and values
-    assert response.json() == {
-        "id": participant_id,
-        "username": "test_user",
-        "status": "waiting",
-        "color": "mocked-color",
-        "livekit": None,
-    }
-
-    # Verify a participant was stored in cache
-    lobby_keys = cache.keys(f"mocked-cache-prefix_{room.id}_*")
-    assert len(lobby_keys) == 1
-
-    # Verify participant data was correctly stored in cache
-    participant_data = cache.get(f"mocked-cache-prefix_{room.id!s}_{participant_id}")
-    assert participant_data.get("username") == "test_user"
-
-
-def test_request_entry_with_existing_participants(settings):
-    """Anonymous users should be allowed to request entry to a room with existing participants."""
-    # Create a restricted access room
-    room = RoomFactory(access_level=RoomAccessLevel.RESTRICTED)
-    client = APIClient()
-
-    # Configure test settings for cookies and cache
-    settings.LOBBY_COOKIE_NAME = "mocked-cookie"
-    settings.LOBBY_KEY_PREFIX = "mocked-cache-prefix"
-
-    # Add two participants already waiting in the lobby
-    cache.set(
-        f"mocked-cache-prefix_{room.id}_participant1",
-        {
-            "id": "participant1",
-            "username": "user1",
-            "status": "waiting",
-            "color": "#123456",
-        },
-    )
-    cache.set(
-        f"mocked-cache-prefix_{room.id}_participant2",
-        {
-            "id": "participant2",
-            "username": "user2",
-            "status": "accepted",
-            "color": "#654321",
-        },
-    )
-
-    # Verify two participants are in the lobby before the request
-    lobby_keys = cache.keys(f"mocked-cache-prefix_{room.id}_*")
-    assert len(lobby_keys) == 2
-
-    # Mock external service calls to isolate the test
-    with (
-        mock.patch.object(LobbyService, "notify_participants", return_value=None),
-        mock.patch.object(utils, "generate_color", return_value="mocked-color"),
-    ):
-        # Make request as a new anonymous user
-        response = client.post(
-            f"/api/v1.0/rooms/{room.id}/request-entry/",
-            {"username": "test_user"},
-        )
-
-    # Verify successful response
-    assert response.status_code == 200
-
-    # Verify the lobby cookie was properly set for the new participant
-    cookie = response.cookies.get("mocked-cookie")
-    assert cookie is not None
-
-    participant_id = cookie.value
-
-    # Verify response content matches expected structure and values
-    assert response.json() == {
-        "id": participant_id,
-        "username": "test_user",
-        "status": "waiting",
-        "color": "mocked-color",
-        "livekit": None,
-    }
-
-    # Verify now three participants are in the lobby cache
-    lobby_keys = cache.keys(f"mocked-cache-prefix_{room.id}_*")
-    assert len(lobby_keys) == 3
-
-    # Verify the new participant data was correctly stored in cache
-    participant_data = cache.get(f"mocked-cache-prefix_{room.id!s}_{participant_id}")
-    assert participant_data.get("username") == "test_user"
-
-
-def test_request_entry_public_room(settings):
-    """Entry requests to public rooms should return ACCEPTED status with LiveKit config."""
-    room = RoomFactory(access_level=RoomAccessLevel.PUBLIC)
-    client = APIClient()
-
-    settings.LOBBY_COOKIE_NAME = "mocked-cookie"
-    settings.LOBBY_KEY_PREFIX = "mocked-cache-prefix"
-
-    # Lobby cache should be empty before the request
-    lobby_keys = cache.keys(f"mocked-cache-prefix_{room.id}_*")
-    assert not lobby_keys
-
-    with (
-        mock.patch.object(LobbyService, "notify_participants", return_value=None),
-        mock.patch.object(
-            LobbyService, "_get_or_create_participant_id", return_value="123"
-        ),
-        mock.patch.object(
-            utils, "generate_livekit_config", return_value={"token": "test-token"}
-        ),
-        mock.patch.object(utils, "generate_color", return_value="mocked-color"),
-    ):
-        response = client.post(
-            f"/api/v1.0/rooms/{room.id}/request-entry/",
-            {"username": "test_user"},
-        )
-
-    assert response.status_code == 200
-
-    # Verify the lobby cookie was set
-    cookie = response.cookies.get("mocked-cookie")
-    assert cookie is not None
-    assert cookie.value == "123"
-
-    # Verify response content matches expected structure and values
-    assert response.json() == {
-        "id": "123",
-        "username": "test_user",
-        "status": "accepted",
-        "color": "mocked-color",
-        "livekit": {"token": "test-token"},
-    }
-
-    # Verify lobby cache is still empty after the request
-    lobby_keys = cache.keys(f"mocked-cache-prefix_{room.id}_*")
-    assert not lobby_keys
-
-
-def test_request_entry_authenticated_user_public_room(settings):
-    """While authenticated, entry request to public rooms should get accepted."""
-    room = RoomFactory(access_level=RoomAccessLevel.PUBLIC)
-    user = UserFactory()
-    client = APIClient()
-    client.force_login(user)
-
-    settings.LOBBY_COOKIE_NAME = "mocked-cookie"
-    settings.LOBBY_KEY_PREFIX = "mocked-cache-prefix"
-
-    # Lobby cache should be empty before the request
-    lobby_keys = cache.keys(f"mocked-cache-prefix_{room.id}_*")
-    assert not lobby_keys
-
-    with (
-        mock.patch.object(LobbyService, "notify_participants", return_value=None),
-        mock.patch.object(
-            LobbyService, "_get_or_create_participant_id", return_value="123"
-        ),
-        mock.patch.object(
-            utils, "generate_livekit_config", return_value={"token": "test-token"}
-        ),
-        mock.patch.object(utils, "generate_color", return_value="mocked-color"),
-    ):
-        response = client.post(
-            f"/api/v1.0/rooms/{room.id}/request-entry/",
-            {"username": "test_user"},
-        )
-
-    assert response.status_code == 200
-
-    # Verify the lobby cookie was set
-    cookie = response.cookies.get("mocked-cookie")
-    assert cookie is not None
-    assert cookie.value == "123"
-
-    # Verify response content matches expected structure and values
-    assert response.json() == {
-        "id": "123",
-        "username": "test_user",
-        "status": "accepted",
-        "color": "mocked-color",
-        "livekit": {"token": "test-token"},
-    }
-
-    # Verify lobby cache is still empty after the request
-    lobby_keys = cache.keys(f"mocked-cache-prefix_{room.id}_*")
-    assert not lobby_keys
-
-
-def test_request_entry_waiting_participant_public_room(settings):
-    """While waiting, entry request to public rooms should get accepted."""
-    room = RoomFactory(access_level=RoomAccessLevel.PUBLIC)
-    client = APIClient()
-
-    settings.LOBBY_COOKIE_NAME = "mocked-cookie"
-    settings.LOBBY_KEY_PREFIX = "mocked-cache-prefix"
-
-    # Add a waiting participant to the room's lobby cache
-    cache.set(
-        f"mocked-cache-prefix_{room.id}_participant1",
-        {
-            "id": "participant1",
-            "username": "user1",
-            "status": "waiting",
-            "color": "#123456",
-        },
-    )
-
-    # Simulate a browser with existing participant cookie
-    client.cookies.load({"mocked-cookie": "participant1"})
-
-    with (
-        mock.patch.object(LobbyService, "notify_participants", return_value=None),
-        mock.patch.object(
-            utils, "generate_livekit_config", return_value={"token": "test-token"}
-        ),
-    ):
-        response = client.post(
-            f"/api/v1.0/rooms/{room.id}/request-entry/",
-            {"username": "user1"},
-        )
-
-    assert response.status_code == 200
-
-    # Verify the lobby cookie was set
-    cookie = response.cookies.get("mocked-cookie")
-    assert cookie is not None
-    assert cookie.value == "participant1"
-
-    # Verify response content matches expected structure and values
-    assert response.json() == {
-        "id": "participant1",
-        "username": "user1",
-        "status": "accepted",
-        "color": "#123456",
-        "livekit": {"token": "test-token"},
-    }
-
-    # Verify participant remains in the lobby cache after acceptance
-    lobby_keys = cache.keys(f"mocked-cache-prefix_{room.id}_*")
-    assert len(lobby_keys) == 1
-
-
-def test_request_entry_invalid_data():
-    """Should return 400 for invalid request data."""
-    room = RoomFactory()
-    client = APIClient()
-
-    response = client.post(
-        f"/api/v1.0/rooms/{room.id}/request-entry/",
-        {},  # Missing required username field
-    )
-
-    assert response.status_code == 400
-
-
-def test_request_entry_room_not_found():
-    """Should return 404 for non-existent room."""
-    client = APIClient()
-
-    response = client.post(
-        f"/api/v1.0/rooms/{uuid.uuid4()!s}/request-entry/",
-        {"username": "anonymous"},
-    )
-
-    assert response.status_code == 404
-
-
-# Tests for allow_participant_to_enter endpoint
-
-
-def test_allow_participant_to_enter_anonymous():
-    """Anonymous users should not be allowed to manage entry requests."""
-    room = RoomFactory()
-    client = APIClient()
-
-    response = client.post(
-        f"/api/v1.0/rooms/{room.id}/enter/",
-        {"participant_id": "test-id", "allow_entry": True},
-    )
-
-    assert response.status_code == 401
-
-
-def test_allow_participant_to_enter_non_owner():
-    """Non-privileged users should not be allowed to manage entry requests."""
-    room = RoomFactory()
-    user = UserFactory()
-    client = APIClient()
-    client.force_login(user)
-
-    response = client.post(
-        f"/api/v1.0/rooms/{room.id}/enter/",
-        {"participant_id": "test-id", "allow_entry": True},
-    )
-
-    assert response.status_code == 403
-
-
-def test_allow_participant_to_enter_public_room():
-    """Should return 404 for public rooms that don't use the lobby system."""
-    room = RoomFactory(access_level=RoomAccessLevel.PUBLIC)
-    user = UserFactory()
-    # Make user the room owner
-    room.accesses.create(user=user, role="owner")
-
-    client = APIClient()
-    client.force_login(user)
-
-    response = client.post(
-        f"/api/v1.0/rooms/{room.id}/enter/",
-        {"participant_id": "test-id", "allow_entry": True},
-    )
-
-    assert response.status_code == 404
-    assert response.json() == {"message": "Room has no lobby system."}
-
-
-@pytest.mark.parametrize(
-    "allow_entry, updated_status", [(True, "accepted"), (False, "denied")]
-)
-def test_allow_participant_to_enter_success(settings, allow_entry, updated_status):
-    """Should successfully update participant status when everything is correct."""
-    room = RoomFactory(access_level=RoomAccessLevel.RESTRICTED)
-    user = UserFactory()
-    # Make user the room owner
-    room.accesses.create(user=user, role="owner")
-
-    client = APIClient()
-    client.force_login(user)
-
-    settings.LOBBY_KEY_PREFIX = "mocked-cache-prefix"
-
-    cache.set(
-        f"mocked-cache-prefix_{room.id!s}_participant1",
-        {
-            "id": "test-id",
-            "status": "waiting",
-            "username": "foo",
-            "color": "123",
-        },
-    )
-
-    response = client.post(
-        f"/api/v1.0/rooms/{room.id}/enter/",
-        {"participant_id": "participant1", "allow_entry": allow_entry},
-    )
-
-    assert response.status_code == 200
-    assert response.json() == {"message": "Participant was updated."}
-
-    participant_data = cache.get(f"mocked-cache-prefix_{room.id!s}_participant1")
-    assert participant_data.get("status") == updated_status
-
-
-def test_allow_participant_to_enter_participant_not_found(settings):
-    """Should handle case when participant is not found."""
-    room = RoomFactory(access_level=RoomAccessLevel.RESTRICTED)
-    user = UserFactory()
-    # Make user the room owner
-    room.accesses.create(user=user, role="owner")
-
-    client = APIClient()
-    client.force_login(user)
-
-    settings.LOBBY_KEY_PREFIX = "mocked-cache-prefix"
-
-    participant_data = cache.get(f"mocked-cache-prefix_{room.id!s}_test-id")
-    assert participant_data is None
-
-    response = client.post(
-        f"/api/v1.0/rooms/{room.id}/enter/",
-        {"participant_id": "test-id", "allow_entry": True},
-    )
-
-    assert response.status_code == 404
-    assert response.json() == {"message": "Participant not found."}
-
-
-def test_allow_participant_to_enter_invalid_data():
-    """Should return 400 for invalid request data."""
-    room = RoomFactory()
-    user = UserFactory()
-    # Make user the room owner
-    room.accesses.create(user=user, role="owner")
-
-    client = APIClient()
-    client.force_login(user)
-
-    response = client.post(
-        f"/api/v1.0/rooms/{room.id}/enter/",
-        {},  # Missing required fields
-    )
-
-    assert response.status_code == 400
-
-
-# Tests for list_waiting_participants endpoint
-
-
-def test_list_waiting_participants_anonymous():
-    """Anonymous users should not be allowed to list waiting participants."""
-    room = RoomFactory()
-    client = APIClient()
-
-    response = client.get(f"/api/v1.0/rooms/{room.id}/waiting-participants/")
-
-    assert response.status_code == 401
-
-
-def test_list_waiting_participants_non_owner():
-    """Non-privileged users should not be allowed to list waiting participants."""
-    room = RoomFactory()
-    user = UserFactory()
-    client = APIClient()
-    client.force_login(user)
-
-    response = client.get(f"/api/v1.0/rooms/{room.id}/waiting-participants/")
-
-    assert response.status_code == 403
-
-
-def test_list_waiting_participants_public_room():
-    """Should return empty list for public rooms."""
-    room = RoomFactory(access_level=RoomAccessLevel.PUBLIC)
-    user = UserFactory()
-    # Make user the room owner
-    room.accesses.create(user=user, role="owner")
-
-    client = APIClient()
-    client.force_login(user)
-
-    # Lobby cache should be empty before the request
-    lobby_keys = cache.keys(f"mocked-cache-prefix_{room.id}_*")
-    assert not lobby_keys
-
-    with mock.patch(
-        "core.api.viewsets.LobbyService", autospec=True
-    ) as mocked_lobby_service:
-        response = client.get(f"/api/v1.0/rooms/{room.id}/waiting-participants/")
-
-    # Verify lobby service was not instantiated
-    mocked_lobby_service.assert_not_called()
-
-    assert response.status_code == 200
-    assert response.json() == {"participants": []}
-
-
-def test_list_waiting_participants_success(settings):
-    """Should successfully return list of waiting participants."""
-    room = RoomFactory(access_level=RoomAccessLevel.RESTRICTED)
-    user = UserFactory()
-    # Make user the room owner
-    room.accesses.create(user=user, role="owner")
-
-    client = APIClient()
-    client.force_login(user)
-
-    settings.LOBBY_KEY_PREFIX = "mocked-cache-prefix"
-
-    # Add participants in the lobby
-    cache.set(
-        f"mocked-cache-prefix_{room.id}_participant1",
-        {
-            "id": "participant1",
-            "username": "user1",
-            "status": "waiting",
-            "color": "#123456",
-        },
-    )
-    cache.set(
-        f"mocked-cache-prefix_{room.id}_participant2",
-        {
-            "id": "participant2",
-            "username": "user2",
-            "status": "waiting",
-            "color": "#654321",
-        },
-    )
-
-    response = client.get(f"/api/v1.0/rooms/{room.id}/waiting-participants/")
-
-    assert response.status_code == 200
-
-    participants = response.json().get("participants")
-    assert sorted(participants, key=lambda p: p["id"]) == [
-        {
-            "id": "participant1",
-            "username": "user1",
-            "status": "waiting",
-            "color": "#123456",
-        },
-        {
-            "id": "participant2",
-            "username": "user2",
-            "status": "waiting",
-            "color": "#654321",
-        },
-    ]
-
-
-def test_list_waiting_participants_empty(settings):
-    """Should handle case when there are no waiting participants."""
-    room = RoomFactory(access_level=RoomAccessLevel.RESTRICTED)
-    user = UserFactory()
-    # Make user the room owner
-    room.accesses.create(user=user, role="owner")
-
-    client = APIClient()
-    client.force_login(user)
-
-    settings.LOBBY_KEY_PREFIX = "mocked-cache-prefix"
-
-    # Lobby cache should be empty before the request
-    lobby_keys = cache.keys(f"mocked-cache-prefix_{room.id}_*")
-    assert not lobby_keys
-
-    response = client.get(f"/api/v1.0/rooms/{room.id}/waiting-participants/")
-
-    assert response.status_code == 200
-    assert response.json() == {"participants": []}

src/backend/core/tests/rooms/test_api_rooms_retrieve.py

@@ -12,7 +12,6 @@ import pytest
 from rest_framework.test import APIClient
 
 from ...factories import RoomFactory, UserFactory, UserResourceAccessFactory
-from ...models import RoomAccessLevel
 
 pytestmark = pytest.mark.django_db
 
@@ -22,34 +21,15 @@ def test_api_rooms_retrieve_anonymous_private_pk():
     Anonymous users should be allowed to retrieve a private room but should not be
     given any token.
     """
-    room = RoomFactory(access_level=RoomAccessLevel.RESTRICTED)
+    room = RoomFactory(is_public=False)
     client = APIClient()
     response = client.get(f"/api/v1.0/rooms/{room.id!s}/")
 
     assert response.status_code == 200
     assert response.json() == {
-        "access_level": "restricted",
-        "id": str(room.id),
-        "is_administrable": False,
-        "name": room.name,
-        "slug": room.slug,
-    }
-
-
-def test_api_rooms_retrieve_anonymous_trusted_pk():
-    """
-    Anonymous users should be allowed to retrieve a room that has a trusted access_level,
-    but should not be given any token.
-    """
-    room = RoomFactory(access_level=RoomAccessLevel.TRUSTED)
-    client = APIClient()
-    response = client.get(f"/api/v1.0/rooms/{room.id!s}/")
-
-    assert response.status_code == 200
-    assert response.json() == {
-        "access_level": "trusted",
         "id": str(room.id),
         "is_administrable": False,
+        "is_public": False,
         "name": room.name,
         "slug": room.slug,
     }
@@ -57,7 +37,7 @@ def test_api_rooms_retrieve_anonymous_trusted_pk():
 
 def test_api_rooms_retrieve_anonymous_private_pk_no_dashes():
     """It should be possible to get a room by its id stripped of its dashes."""
-    room = RoomFactory(access_level=RoomAccessLevel.RESTRICTED)
+    room = RoomFactory(is_public=False)
     id_no_dashes = str(room.id)
 
     client = APIClient()
@@ -65,9 +45,9 @@ def test_api_rooms_retrieve_anonymous_private_pk_no_dashes():
 
     assert response.status_code == 200
     assert response.json() == {
-        "access_level": "restricted",
         "id": str(room.id),
         "is_administrable": False,
+        "is_public": False,
         "name": room.name,
         "slug": room.slug,
     }
@@ -75,15 +55,15 @@ def test_api_rooms_retrieve_anonymous_private_pk_no_dashes():
 
 def test_api_rooms_retrieve_anonymous_private_slug():
     """It should be possible to get a room by its slug."""
-    room = RoomFactory(access_level=RoomAccessLevel.RESTRICTED)
+    room = RoomFactory(is_public=False)
     client = APIClient()
     response = client.get(f"/api/v1.0/rooms/{room.slug!s}/")
 
     assert response.status_code == 200
     assert response.json() == {
-        "access_level": "restricted",
         "id": str(room.id),
         "is_administrable": False,
+        "is_public": False,
         "name": room.name,
         "slug": room.slug,
     }
@@ -91,15 +71,15 @@ def test_api_rooms_retrieve_anonymous_private_slug():
 
 def test_api_rooms_retrieve_anonymous_private_slug_not_normalized():
     """Getting a room by a slug that is not normalized should work."""
-    room = RoomFactory(name="Réunion", access_level=RoomAccessLevel.RESTRICTED)
+    room = RoomFactory(name="Réunion", is_public=False)
     client = APIClient()
     response = client.get("/api/v1.0/rooms/Réunion/")
 
     assert response.status_code == 200
     assert response.json() == {
-        "access_level": "restricted",
         "id": str(room.id),
         "is_administrable": False,
+        "is_public": False,
         "name": room.name,
         "slug": room.slug,
     }
@@ -191,18 +171,18 @@ def test_api_rooms_retrieve_anonymous_unregistered_not_allowed():
 )
 def test_api_rooms_retrieve_anonymous_public(mock_token):
     """
-    Anonymous users should be able to retrieve a room with a token provided, if the room is public.
+    Anonymous users should be able to retrieve a room with a token provided it is public.
     """
-    room = RoomFactory(access_level=RoomAccessLevel.PUBLIC)
+    room = RoomFactory(is_public=True)
     client = APIClient()
     response = client.get(f"/api/v1.0/rooms/{room.id!s}/")
 
     assert response.status_code == 200
     expected_name = f"{room.id!s}"
     assert response.json() == {
-        "access_level": str(room.access_level),
         "id": str(room.id),
         "is_administrable": False,
+        "is_public": True,
         "livekit": {
             "url": "test_url_value",
             "room": expected_name,
@@ -229,7 +209,7 @@ def test_api_rooms_retrieve_authenticated_public(mock_token):
     which they are not related, provided the room is public.
     They should not see related users.
     """
-    room = RoomFactory(access_level=RoomAccessLevel.PUBLIC)
+    room = RoomFactory(is_public=True)
 
     user = UserFactory()
     client = APIClient()
@@ -242,9 +222,9 @@ def test_api_rooms_retrieve_authenticated_public(mock_token):
 
     expected_name = f"{room.id!s}"
     assert response.json() == {
-        "access_level": str(room.access_level),
         "id": str(room.id),
         "is_administrable": False,
+        "is_public": True,
         "livekit": {
             "url": "test_url_value",
             "room": expected_name,
@@ -254,53 +234,7 @@ def test_api_rooms_retrieve_authenticated_public(mock_token):
         "slug": room.slug,
     }
 
-    mock_token.assert_called_once_with(
-        room=expected_name, user=user, username=None, color=None
-    )
-
-
-@mock.patch("core.utils.generate_token", return_value="foo")
-@override_settings(
-    LIVEKIT_CONFIGURATION={
-        "api_key": "key",
-        "api_secret": "secret",
-        "url": "test_url_value",
-    }
-)
-def test_api_rooms_retrieve_authenticated_trusted(mock_token):
-    """
-    Authenticated users should be allowed to retrieve a room and get a token for a room to
-    which they are not related, provided the room has a trusted access_level.
-    They should not see related users.
-    """
-    room = RoomFactory(access_level=RoomAccessLevel.TRUSTED)
-
-    user = UserFactory()
-    client = APIClient()
-    client.force_login(user)
-
-    response = client.get(
-        f"/api/v1.0/rooms/{room.id!s}/",
-    )
-    assert response.status_code == 200
-
-    expected_name = f"{room.id!s}"
-    assert response.json() == {
-        "access_level": str(room.access_level),
-        "id": str(room.id),
-        "is_administrable": False,
-        "livekit": {
-            "url": "test_url_value",
-            "room": expected_name,
-            "token": "foo",
-        },
-        "name": room.name,
-        "slug": room.slug,
-    }
-
-    mock_token.assert_called_once_with(
-        room=expected_name, user=user, username=None, color=None
-    )
+    mock_token.assert_called_once_with(room=expected_name, user=user, username=None)
 
 
 def test_api_rooms_retrieve_authenticated():
@@ -308,7 +242,7 @@ def test_api_rooms_retrieve_authenticated():
     Authenticated users should be allowed to retrieve a private room to which they
     are not related but should not be given any token.
     """
-    room = RoomFactory(access_level=RoomAccessLevel.RESTRICTED)
+    room = RoomFactory(is_public=False)
 
     user = UserFactory()
     client = APIClient()
@@ -320,9 +254,9 @@ def test_api_rooms_retrieve_authenticated():
     assert response.status_code == 200
 
     assert response.json() == {
-        "access_level": "restricted",
         "id": str(room.id),
         "is_administrable": False,
+        "is_public": False,
         "name": room.name,
         "slug": room.slug,
     }
@@ -336,22 +270,23 @@ def test_api_rooms_retrieve_authenticated():
         "url": "test_url_value",
     }
 )
-def test_api_rooms_retrieve_members(mock_token, django_assert_num_queries, settings):
+def test_api_rooms_retrieve_members(mock_token, django_assert_num_queries):
     """
-    Users who are members of a room should not be allowed to see related users.
+    Users who are members of a room should be allowed to see related users.
     """
-    settings.TIME_ZONE = "UTC"
     user = UserFactory()
     other_user = UserFactory()
 
     room = RoomFactory()
-    UserResourceAccessFactory(resource=room, user=user, role="member")
-    UserResourceAccessFactory(resource=room, user=other_user, role="member")
+    user_access = UserResourceAccessFactory(resource=room, user=user, role="member")
+    other_user_access = UserResourceAccessFactory(
+        resource=room, user=other_user, role="member"
+    )
 
     client = APIClient()
     client.force_login(user)
 
-    with django_assert_num_queries(3):
+    with django_assert_num_queries(4):
         response = client.get(
             f"/api/v1.0/rooms/{room.id!s}/",
         )
@@ -359,13 +294,39 @@ def test_api_rooms_retrieve_members(mock_token, django_assert_num_queries, setti
     assert response.status_code == 200
     content_dict = response.json()
 
-    assert "accesses" not in content_dict
+    assert sorted(content_dict.pop("accesses"), key=lambda x: x["id"]) == sorted(
+        [
+            {
+                "id": str(user_access.id),
+                "user": {
+                    "id": str(user_access.user.id),
+                    "email": user_access.user.email,
+                    "full_name": user_access.user.full_name,
+                    "short_name": user_access.user.short_name,
+                },
+                "resource": str(room.id),
+                "role": user_access.role,
+            },
+            {
+                "id": str(other_user_access.id),
+                "user": {
+                    "id": str(other_user_access.user.id),
+                    "email": other_user_access.user.email,
+                    "full_name": other_user_access.user.full_name,
+                    "short_name": other_user_access.user.short_name,
+                },
+                "resource": str(room.id),
+                "role": other_user_access.role,
+            },
+        ],
+        key=lambda x: x["id"],
+    )
 
     expected_name = str(room.id)
     assert content_dict == {
-        "access_level": str(room.access_level),
         "id": str(room.id),
         "is_administrable": False,
+        "is_public": room.is_public,
         "livekit": {
             "url": "test_url_value",
             "room": expected_name,
@@ -375,9 +336,7 @@ def test_api_rooms_retrieve_members(mock_token, django_assert_num_queries, setti
         "slug": room.slug,
     }
 
-    mock_token.assert_called_once_with(
-        room=expected_name, user=user, username=None, color=None
-    )
+    mock_token.assert_called_once_with(room=expected_name, user=user, username=None)
 
 
 @mock.patch("core.utils.generate_token", return_value="foo")
@@ -388,14 +347,11 @@ def test_api_rooms_retrieve_members(mock_token, django_assert_num_queries, setti
         "url": "test_url_value",
     }
 )
-def test_api_rooms_retrieve_administrators(
-    mock_token, django_assert_num_queries, settings
-):
+def test_api_rooms_retrieve_administrators(mock_token, django_assert_num_queries):
     """
     A user who is an administrator or owner of a room should be allowed
     to see related users.
     """
-    settings.TIME_ZONE = "UTC"
     user = UserFactory()
     other_user = UserFactory()
     room = RoomFactory()
@@ -424,8 +380,6 @@ def test_api_rooms_retrieve_administrators(
                     "email": other_user_access.user.email,
                     "full_name": other_user_access.user.full_name,
                     "short_name": other_user_access.user.short_name,
-                    "timezone": "UTC",
-                    "language": other_user_access.user.language,
                 },
                 "resource": str(room.id),
                 "role": other_user_access.role,
@@ -437,8 +391,6 @@ def test_api_rooms_retrieve_administrators(
                     "email": user_access.user.email,
                     "full_name": user_access.user.full_name,
                     "short_name": user_access.user.short_name,
-                    "timezone": "UTC",
-                    "language": user_access.user.language,
                 },
                 "resource": str(room.id),
                 "role": user_access.role,
@@ -448,9 +400,9 @@ def test_api_rooms_retrieve_administrators(
     )
     expected_name = str(room.id)
     assert content_dict == {
-        "access_level": str(room.access_level),
         "id": str(room.id),
         "is_administrable": True,
+        "is_public": room.is_public,
         "configuration": {},
         "livekit": {
             "url": "test_url_value",
@@ -461,6 +413,4 @@ def test_api_rooms_retrieve_administrators(
         "slug": room.slug,
     }
 
-    mock_token.assert_called_once_with(
-        room=expected_name, user=user, username=None, color=None
-    )
+    mock_token.assert_called_once_with(room=expected_name, user=user, username=None)

src/backend/core/tests/rooms/test_api_rooms_update.py

@@ -8,7 +8,6 @@ import pytest
 from rest_framework.test import APIClient
 
 from ...factories import RoomFactory, UserFactory
-from ...models import RoomAccessLevel
 
 pytestmark = pytest.mark.django_db
 
@@ -55,18 +54,17 @@ def test_api_rooms_update_members():
     not be allowed to update it.
     """
     user = UserFactory()
-    room = RoomFactory(
-        access_level=RoomAccessLevel.PUBLIC, name="Old name", users=[(user, "member")]
-    )
+    room = RoomFactory(name="Old name", users=[(user, "member")])
     client = APIClient()
     client.force_login(user)
 
+    new_is_public = not room.is_public
     response = client.put(
         f"/api/v1.0/rooms/{room.id!s}/",
         {
             "name": "New name",
             "slug": "should-be-ignored",
-            "access_level": RoomAccessLevel.RESTRICTED,
+            "is_public": new_is_public,
             "configuration": {"the_key": "the_value"},
         },
         format="json",
@@ -75,26 +73,24 @@ def test_api_rooms_update_members():
     room.refresh_from_db()
     assert room.name == "Old name"
     assert room.slug == "old-name"
-    assert room.access_level != RoomAccessLevel.RESTRICTED
+    assert room.is_public != new_is_public
     assert room.configuration == {}
 
 
 def test_api_rooms_update_administrators():
     """Administrators or owners of a room should be allowed to update it."""
     user = UserFactory()
-    room = RoomFactory(
-        access_level=RoomAccessLevel.RESTRICTED,
-        users=[(user, random.choice(["administrator", "owner"]))],
-    )
+    room = RoomFactory(users=[(user, random.choice(["administrator", "owner"]))])
     client = APIClient()
     client.force_login(user)
 
+    new_is_public = not room.is_public
     response = client.put(
         f"/api/v1.0/rooms/{room.id!s}/",
         {
             "name": "New name",
             "slug": "should-be-ignored",
-            "access_level": RoomAccessLevel.PUBLIC,
+            "is_public": new_is_public,
             "configuration": {"the_key": "the_value"},
         },
         format="json",
@@ -103,7 +99,7 @@ def test_api_rooms_update_administrators():
     room.refresh_from_db()
     assert room.name == "New name"
     assert room.slug == "new-name"
-    assert room.access_level == RoomAccessLevel.PUBLIC
+    assert room.is_public == new_is_public
     assert room.configuration == {"the_key": "the_value"}
 
 

src/backend/core/tests/rooms/test_api_rooms_webhook.py

@@ -1,191 +0,0 @@
-"""
-Test LiveKit webhook endpoint on the rooms API.
-"""
-
-# ruff: noqa: PLR0913
-# pylint: disable=R0913,W0621,R0917,W0613
-import base64
-import hashlib
-import json
-from unittest import mock
-
-import pytest
-from livekit import api
-
-from ...services.livekit_events import ActionFailedError, LiveKitEventsService
-
-
-@pytest.fixture
-def webhook_event_data():
-    """Sample webhook event data for testing."""
-    return {
-        "event": "room_finished",
-        "room": {
-            "sid": "RM_hycBMAjmt6Ub",
-            "name": "00000000-0000-0000-0000-000000000000",
-            "emptyTimeout": 300,
-            "creationTime": "1692627281",
-            "turnPassword": "2Pvdj+/WV1xV4EkB8klJ9xkXDWY=",
-            "enabledCodecs": [
-                {"mime": "audio/opus"},
-                {"mime": "video/H264"},
-                {"mime": "video/VP8"},
-            ],
-        },
-        "id": "EV_eugWmGhovZmm",
-        "createdAt": "1692985556",
-    }
-
-
-@pytest.fixture
-def serialized_event_data(webhook_event_data):
-    """Serialize event data to JSON."""
-    return json.dumps(webhook_event_data)
-
-
-@pytest.fixture
-def mock_livekit_config(settings):
-    """Mock LiveKit configuration."""
-    settings.LIVEKIT_CONFIGURATION = {
-        "api_key": "test_api_key",
-        "api_secret": "test_api_secret",
-        "url": "https://test-livekit.example.com/",
-    }
-    return settings.LIVEKIT_CONFIGURATION
-
-
-@pytest.fixture
-def auth_token(serialized_event_data, mock_livekit_config):
-    """Generate authentication token for webhook request."""
-    hash64 = base64.b64encode(
-        hashlib.sha256(serialized_event_data.encode()).digest()
-    ).decode()
-    token = api.AccessToken(
-        mock_livekit_config["api_key"], mock_livekit_config["api_secret"]
-    )
-    token.claims.sha256 = hash64
-    return token.to_jwt()
-
-
-def test_missing_auth_header(client, serialized_event_data, mock_livekit_config):
-    """Should return 401 when auth header is missing."""
-    response = client.post(
-        "/api/v1.0/rooms/webhooks-livekit/",
-        data=serialized_event_data,
-        content_type="application/json",
-    )
-
-    assert response.status_code == 401
-    assert response.json() == {
-        "status": "error",
-        "message": "Authorization header missing",
-    }
-
-
-def test_invalid_payload(client, auth_token, mock_livekit_config):
-    """Should return 400 for invalid payload."""
-    response = client.post(
-        "/api/v1.0/rooms/webhooks-livekit/",
-        data=json.dumps({"invalid": "payload"}),
-        content_type="application/json",
-        HTTP_AUTHORIZATION=auth_token,
-    )
-
-    assert response.status_code == 400
-    assert response.json() == {"status": "error", "message": "Invalid webhook payload"}
-
-
-def test_unknown_event_type(client, mock_livekit_config):
-    """Should return 422 for unknown event type."""
-    event_data = json.dumps({"event": "unknown_event_type"})
-
-    # Generate auth token for this specific payload
-    hash64 = base64.b64encode(hashlib.sha256(event_data.encode()).digest()).decode()
-    token = api.AccessToken(
-        mock_livekit_config["api_key"], mock_livekit_config["api_secret"]
-    )
-    token.claims.sha256 = hash64
-    auth_token = token.to_jwt()
-
-    response = client.post(
-        "/api/v1.0/rooms/webhooks-livekit/",
-        data=event_data,
-        content_type="application/json",
-        HTTP_AUTHORIZATION=auth_token,
-    )
-
-    assert response.status_code == 422
-    assert response.json() == {
-        "status": "error",
-        "message": "Unknown webhook type: unknown_event_type",
-    }
-
-
-@mock.patch.object(LiveKitEventsService, "_handle_room_finished")
-def test_handled_event_type(
-    mock_handler,
-    client,
-    serialized_event_data,
-    auth_token,
-    mock_livekit_config,
-):
-    """Should process valid webhook successfully."""
-    response = client.post(
-        "/api/v1.0/rooms/webhooks-livekit/",
-        data=serialized_event_data,
-        content_type="application/json",
-        HTTP_AUTHORIZATION=auth_token,
-    )
-
-    mock_handler.assert_called_once()
-    assert response.status_code == 200
-    assert response.json() == {"status": "success"}
-
-
-def test_unhandled_event_type(client, mock_livekit_config):
-    """Should return 200 for event types that have no handler."""
-    event_data = json.dumps({"event": "room_started"})
-
-    hash64 = base64.b64encode(hashlib.sha256(event_data.encode()).digest()).decode()
-    token = api.AccessToken(
-        mock_livekit_config["api_key"], mock_livekit_config["api_secret"]
-    )
-    token.claims.sha256 = hash64
-    auth_token = token.to_jwt()
-
-    response = client.post(
-        "/api/v1.0/rooms/webhooks-livekit/",
-        data=event_data,
-        content_type="application/json",
-        HTTP_AUTHORIZATION=auth_token,
-    )
-
-    assert response.status_code == 200
-    assert response.json() == {"status": "success"}
-
-
-def test_action_error(client, mock_livekit_config):
-    """Should raise exceptions when errors occur during LiveKit webhook processing."""
-    event_data = json.dumps(
-        {
-            "event": "room_finished",
-            "room": {"sid": "RM_hycBMAjmt6Ub", "name": "invalid-uuid"},
-        }
-    )
-    hash64 = base64.b64encode(hashlib.sha256(event_data.encode()).digest()).decode()
-    token = api.AccessToken(
-        mock_livekit_config["api_key"], mock_livekit_config["api_secret"]
-    )
-    token.claims.sha256 = hash64
-    auth_token = token.to_jwt()
-
-    with pytest.raises(
-        ActionFailedError,
-        match="Failed to process room finished event",
-    ):
-        client.post(
-            "/api/v1.0/rooms/webhooks-livekit/",
-            data=event_data,
-            content_type="application/json",
-            HTTP_AUTHORIZATION=auth_token,
-        )

src/backend/core/tests/services/test_livekit_events.py

@@ -1,132 +0,0 @@
-"""
-Test LiveKitEvents service.
-"""
-# pylint: disable=W0621,W0613, W0212
-
-import uuid
-from unittest import mock
-
-import pytest
-
-from core.services.livekit_events import (
-    ActionFailedError,
-    AuthenticationError,
-    InvalidPayloadError,
-    LiveKitEventsService,
-    UnsupportedEventTypeError,
-    api,
-)
-from core.services.lobby import LobbyService
-
-pytestmark = pytest.mark.django_db
-
-
-@pytest.fixture
-def mock_livekit_config(settings):
-    """Mock LiveKit configuration."""
-    settings.LIVEKIT_CONFIGURATION = {
-        "api_key": "test_api_key",
-        "api_secret": "test_api_secret",
-        "url": "https://test-livekit.example.com/",
-    }
-    return settings.LIVEKIT_CONFIGURATION
-
-
-@pytest.fixture
-def service(mock_livekit_config):
-    """Initialize LiveKitEventsService."""
-    return LiveKitEventsService()
-
-
-@mock.patch("livekit.api.TokenVerifier")
-@mock.patch("livekit.api.WebhookReceiver")
-def test_initialization(
-    mock_webhook_receiver, mock_token_verifier, mock_livekit_config
-):
-    """Should correctly initialize the service with required dependencies."""
-
-    api_key = mock_livekit_config["api_key"]
-    api_secret = mock_livekit_config["api_secret"]
-
-    service = LiveKitEventsService()
-
-    mock_token_verifier.assert_called_once_with(api_key, api_secret)
-    mock_webhook_receiver.assert_called_once_with(mock_token_verifier.return_value)
-    assert isinstance(service.lobby_service, LobbyService)
-
-
-@mock.patch.object(LobbyService, "clear_room_cache")
-def test_handle_room_finished(mock_clear_cache, service):
-    """Should clear lobby cache when room is finished."""
-
-    mock_room_name = uuid.uuid4()
-
-    mock_data = mock.MagicMock()
-    mock_data.room.name = str(mock_room_name)
-
-    service._handle_room_finished(mock_data)
-
-    mock_clear_cache.assert_called_once_with(mock_room_name)
-
-
-@mock.patch.object(
-    LobbyService, "clear_room_cache", side_effect=Exception("Test error")
-)
-def test_handle_room_finished_error(mock_clear_cache, service):
-    """Should raise ActionFailedError when processing fails."""
-    mock_data = mock.MagicMock()
-    mock_data.room.name = "00000000-0000-0000-0000-000000000000"
-    with pytest.raises(
-        ActionFailedError, match="Failed to process room finished event"
-    ):
-        service._handle_room_finished(mock_data)
-
-
-def test_handle_room_finished_invalid_room_name(service):
-    """Should raise ActionFailedError when processing fails."""
-    mock_data = mock.MagicMock()
-    mock_data.room.name = "invalid"
-    with pytest.raises(
-        ActionFailedError, match="Failed to process room finished event"
-    ):
-        service._handle_room_finished(mock_data)
-
-
-@mock.patch.object(
-    api.WebhookReceiver, "receive", side_effect=Exception("Invalid payload")
-)
-def test_receive_invalid_payload(mock_receive, service):
-    """Should raise InvalidPayloadError for invalid payloads."""
-    mock_request = mock.MagicMock()
-    mock_request.headers = {"Authorization": "test_token"}
-    mock_request.body = b"{}"
-
-    with pytest.raises(InvalidPayloadError, match="Invalid webhook payload"):
-        service.receive(mock_request)
-
-
-def test_receive_missing_auth(service):
-    """Should raise AuthenticationError when auth header is missing."""
-    mock_request = mock.MagicMock()
-    mock_request.headers = {}
-
-    with pytest.raises(AuthenticationError, match="Authorization header missing"):
-        service.receive(mock_request)
-
-
-@mock.patch.object(api.WebhookReceiver, "receive")
-def test_receive_unsupported_event(mock_receive, service):
-    """Should raise LiveKitWebhookError for unsupported events."""
-    mock_request = mock.MagicMock()
-    mock_request.headers = {"Authorization": "test_token"}
-    mock_request.body = b"{}"
-
-    # Mock returned data with unsupported event type
-    mock_data = mock.MagicMock()
-    mock_data.event = "unsupported_event"
-    mock_receive.return_value = mock_data
-
-    with pytest.raises(
-        UnsupportedEventTypeError, match="Unknown webhook type: unsupported_event"
-    ):
-        service.receive(mock_request)

src/backend/core/tests/services/test_lobby.py

@@ -1,943 +0,0 @@
-"""
-Test lobby service.
-"""
-
-# pylint: disable=W0621,W0613, W0212, R0913
-# ruff: noqa: PLR0913
-
-import json
-import uuid
-from unittest import mock
-
-from django.conf import settings
-from django.core.cache import cache
-from django.http import HttpResponse
-
-import pytest
-from livekit.api import TwirpError
-
-from core.factories import RoomFactory
-from core.models import RoomAccessLevel
-from core.services.lobby import (
-    LobbyNotificationError,
-    LobbyParticipant,
-    LobbyParticipantNotFound,
-    LobbyParticipantParsingError,
-    LobbyParticipantStatus,
-    LobbyService,
-)
-
-pytestmark = pytest.mark.django_db
-
-
-@pytest.fixture
-def lobby_service():
-    """Return a LobbyService instance."""
-    return LobbyService()
-
-
-@pytest.fixture
-def participant_id():
-    """Return a string ID for test participant."""
-    return "test-participant-id"
-
-
-@pytest.fixture
-def username():
-    """Return a username for test participant."""
-    return "test-username"
-
-
-@pytest.fixture
-def participant_dict():
-    """Return a valid participant dictionary."""
-    return {
-        "status": "waiting",
-        "username": "test-username",
-        "id": "test-participant-id",
-        "color": "#123456",
-    }
-
-
-@pytest.fixture
-def participant_data():
-    """Return a valid LobbyParticipant instance."""
-    return LobbyParticipant(
-        status=LobbyParticipantStatus.WAITING,
-        username="test-username",
-        id="test-participant-id",
-        color="#123456",
-    )
-
-
-def test_lobby_participant_to_dict(participant_data):
-    """Test LobbyParticipant serialization to dict."""
-    result = participant_data.to_dict()
-
-    assert result["status"] == "waiting"
-    assert result["username"] == "test-username"
-    assert result["id"] == "test-participant-id"
-    assert result["color"] == "#123456"
-
-
-def test_lobby_participant_from_dict_success(participant_dict):
-    """Test successful LobbyParticipant creation from dict."""
-    participant = LobbyParticipant.from_dict(participant_dict)
-
-    assert participant.status == LobbyParticipantStatus.WAITING
-    assert participant.username == "test-username"
-    assert participant.id == "test-participant-id"
-    assert participant.color == "#123456"
-
-
-def test_lobby_participant_from_dict_default_status():
-    """Test LobbyParticipant creation with missing status defaults to UNKNOWN."""
-    data_without_status = {
-        "username": "test-username",
-        "id": "test-participant-id",
-        "color": "#123456",
-    }
-
-    participant = LobbyParticipant.from_dict(data_without_status)
-
-    assert participant.status == LobbyParticipantStatus.UNKNOWN
-    assert participant.username == "test-username"
-    assert participant.id == "test-participant-id"
-    assert participant.color == "#123456"
-
-
-def test_lobby_participant_from_dict_missing_fields():
-    """Test LobbyParticipant creation with missing fields."""
-    invalid_data = {"username": "test-username"}
-
-    with pytest.raises(LobbyParticipantParsingError, match="Invalid participant data"):
-        LobbyParticipant.from_dict(invalid_data)
-
-
-def test_lobby_participant_from_dict_invalid_status():
-    """Test LobbyParticipant creation with invalid status."""
-    invalid_data = {
-        "status": "invalid_status",
-        "username": "test-username",
-        "id": "test-participant-id",
-        "color": "#123456",
-    }
-
-    with pytest.raises(LobbyParticipantParsingError, match="Invalid participant data"):
-        LobbyParticipant.from_dict(invalid_data)
-
-
-def test_get_cache_key(lobby_service, participant_id):
-    """Test cache key generation."""
-    room = RoomFactory(access_level=RoomAccessLevel.RESTRICTED)
-    cache_key = lobby_service._get_cache_key(room.id, participant_id)
-
-    expected_key = f"{settings.LOBBY_KEY_PREFIX}_{room.id!s}_{participant_id}"
-    assert cache_key == expected_key
-
-
-def test_get_or_create_participant_id_from_cookie(lobby_service):
-    """Test extracting participant ID from cookie."""
-    request = mock.Mock()
-    request.COOKIES = {settings.LOBBY_COOKIE_NAME: "existing-id"}
-
-    participant_id = lobby_service._get_or_create_participant_id(request)
-
-    assert participant_id == "existing-id"
-
-
-@mock.patch("uuid.uuid4")
-def test_get_or_create_participant_id_new(mock_uuid4, lobby_service):
-    """Test creating new participant ID when cookie is missing."""
-    mock_uuid4.return_value = mock.Mock(hex="generated-id")
-    request = mock.Mock()
-    request.COOKIES = {}
-
-    participant_id = lobby_service._get_or_create_participant_id(request)
-
-    assert participant_id == "generated-id"
-    mock_uuid4.assert_called_once()
-
-
-def test_prepare_response_existing_cookie(lobby_service, participant_id):
-    """Test response preparation with existing cookie."""
-    response = HttpResponse()
-    response.cookies[settings.LOBBY_COOKIE_NAME] = "existing-cookie"
-
-    lobby_service.prepare_response(response, participant_id)
-
-    # Verify cookie wasn't set again
-    cookie = response.cookies.get(settings.LOBBY_COOKIE_NAME)
-    assert cookie.value == "existing-cookie"
-    assert cookie.value != participant_id
-
-
-def test_prepare_response_new_cookie(lobby_service, participant_id):
-    """Test response preparation with new cookie."""
-    response = HttpResponse()
-
-    lobby_service.prepare_response(response, participant_id)
-
-    # Verify cookie was set
-    cookie = response.cookies.get(settings.LOBBY_COOKIE_NAME)
-    assert cookie is not None
-    assert cookie.value == participant_id
-    assert cookie["httponly"] is True
-    assert cookie["secure"] is True
-    assert cookie["samesite"] == "Lax"
-
-    # It's a session cookies (no max_age specified):
-    assert not cookie["max-age"]
-
-
-def test_can_bypass_lobby_public_room(lobby_service):
-    """Should return True for public rooms regardless of user auth."""
-    room = RoomFactory(access_level=RoomAccessLevel.PUBLIC)
-
-    # Anonymous user
-    user = mock.Mock()
-    user.is_authenticated = False
-    assert lobby_service.can_bypass_lobby(room, user) is True
-
-    # Authenticated user
-    user.is_authenticated = True
-    assert lobby_service.can_bypass_lobby(room, user) is True
-
-
-def test_can_bypass_lobby_trusted_room_authenticated(lobby_service):
-    """Should return True for trusted rooms with authenticated users."""
-    room = RoomFactory(access_level=RoomAccessLevel.TRUSTED)
-
-    # Authenticated user
-    user = mock.Mock()
-    user.is_authenticated = True
-    assert lobby_service.can_bypass_lobby(room, user) is True
-
-
-def test_can_bypass_lobby_trusted_room_anonymous(lobby_service):
-    """Should return False for trusted rooms with anonymous users."""
-    room = RoomFactory(access_level=RoomAccessLevel.TRUSTED)
-
-    # Anonymous user
-    user = mock.Mock()
-    user.is_authenticated = False
-    assert lobby_service.can_bypass_lobby(room, user) is False
-
-
-def test_can_bypass_lobby_private_room(lobby_service):
-    """Should return False for private rooms regardless of user auth."""
-    room = RoomFactory(access_level=RoomAccessLevel.RESTRICTED)
-
-    # Anonymous user
-    user = mock.Mock()
-    user.is_authenticated = False
-    assert lobby_service.can_bypass_lobby(room, user) is False
-
-    # Authenticated user
-    user.is_authenticated = True
-    assert lobby_service.can_bypass_lobby(room, user) is False
-
-
-@mock.patch("core.utils.generate_livekit_config")
-def test_request_entry_public_room(
-    mock_generate_config, lobby_service, participant_id, username
-):
-    """Test requesting entry to a public room."""
-    request = mock.Mock()
-    request.user = mock.Mock()
-
-    room = RoomFactory(access_level=RoomAccessLevel.PUBLIC)
-
-    mocked_participant = LobbyParticipant(
-        status=LobbyParticipantStatus.UNKNOWN,
-        username=username,
-        id=participant_id,
-        color="#123456",
-    )
-
-    lobby_service._get_or_create_participant_id = mock.Mock(return_value=participant_id)
-    lobby_service._get_participant = mock.Mock(return_value=mocked_participant)
-    mock_generate_config.return_value = {"token": "test-token"}
-
-    participant, livekit_config = lobby_service.request_entry(room, request, username)
-
-    assert participant.status == LobbyParticipantStatus.ACCEPTED
-    assert livekit_config == {"token": "test-token"}
-    mock_generate_config.assert_called_once_with(
-        room_id=str(room.id),
-        user=request.user,
-        username=username,
-        color=participant.color,
-    )
-
-    lobby_service._get_participant.assert_called_once_with(room.id, participant_id)
-
-
-@mock.patch("core.utils.generate_livekit_config")
-def test_request_entry_trusted_room(
-    mock_generate_config, lobby_service, participant_id, username
-):
-    """Test requesting entry to a trusted room when the user is authenticated."""
-    request = mock.Mock()
-    request.user = mock.Mock()
-    request.user.is_authenticated = True
-
-    room = RoomFactory(access_level=RoomAccessLevel.TRUSTED)
-
-    mocked_participant = LobbyParticipant(
-        status=LobbyParticipantStatus.UNKNOWN,
-        username=username,
-        id=participant_id,
-        color="#123456",
-    )
-
-    lobby_service._get_or_create_participant_id = mock.Mock(return_value=participant_id)
-    lobby_service._get_participant = mock.Mock(return_value=mocked_participant)
-    mock_generate_config.return_value = {"token": "test-token"}
-
-    participant, livekit_config = lobby_service.request_entry(room, request, username)
-
-    assert participant.status == LobbyParticipantStatus.ACCEPTED
-    assert livekit_config == {"token": "test-token"}
-    mock_generate_config.assert_called_once_with(
-        room_id=str(room.id),
-        user=request.user,
-        username=username,
-        color=participant.color,
-    )
-
-    lobby_service._get_participant.assert_called_once_with(room.id, participant_id)
-
-
-@mock.patch("core.services.lobby.LobbyService.enter")
-def test_request_entry_new_participant(
-    mock_enter, lobby_service, participant_id, username
-):
-    """Test requesting entry for a new participant."""
-    request = mock.Mock()
-    request.COOKIES = {settings.LOBBY_COOKIE_NAME: participant_id}
-
-    room = RoomFactory(access_level=RoomAccessLevel.RESTRICTED)
-
-    lobby_service._get_or_create_participant_id = mock.Mock(return_value=participant_id)
-    lobby_service._get_participant = mock.Mock(return_value=None)
-
-    participant_data = LobbyParticipant(
-        status=LobbyParticipantStatus.WAITING,
-        username=username,
-        id=participant_id,
-        color="#123456",
-    )
-    mock_enter.return_value = participant_data
-
-    participant, livekit_config = lobby_service.request_entry(room, request, username)
-
-    assert participant == participant_data
-    assert livekit_config is None
-    mock_enter.assert_called_once_with(room.id, participant_id, username)
-    lobby_service._get_participant.assert_called_once_with(room.id, participant_id)
-
-
-@mock.patch("core.services.lobby.LobbyService.refresh_waiting_status")
-def test_request_entry_waiting_participant(
-    mock_refresh, lobby_service, participant_id, username
-):
-    """Test requesting entry for a waiting participant."""
-    request = mock.Mock()
-    request.COOKIES = {settings.LOBBY_COOKIE_NAME: participant_id}
-
-    room = RoomFactory(access_level=RoomAccessLevel.RESTRICTED)
-
-    mocked_participant = LobbyParticipant(
-        status=LobbyParticipantStatus.WAITING,
-        username=username,
-        id=participant_id,
-        color="#123456",
-    )
-    lobby_service._get_or_create_participant_id = mock.Mock(return_value=participant_id)
-    lobby_service._get_participant = mock.Mock(return_value=mocked_participant)
-
-    participant, livekit_config = lobby_service.request_entry(room, request, username)
-
-    assert participant.status == LobbyParticipantStatus.WAITING
-    assert livekit_config is None
-    mock_refresh.assert_called_once_with(room.id, participant_id)
-    lobby_service._get_participant.assert_called_once_with(room.id, participant_id)
-
-
-@mock.patch("core.utils.generate_livekit_config")
-def test_request_entry_accepted_participant(
-    mock_generate_config, lobby_service, participant_id, username
-):
-    """Test requesting entry for an accepted participant."""
-    request = mock.Mock()
-    request.user = mock.Mock()
-    request.COOKIES = {settings.LOBBY_COOKIE_NAME: participant_id}
-
-    room = RoomFactory(access_level=RoomAccessLevel.RESTRICTED)
-
-    mocked_participant = LobbyParticipant(
-        status=LobbyParticipantStatus.ACCEPTED,
-        username=username,
-        id=participant_id,
-        color="#123456",
-    )
-    lobby_service._get_or_create_participant_id = mock.Mock(return_value=participant_id)
-    lobby_service._get_participant = mock.Mock(return_value=mocked_participant)
-
-    mock_generate_config.return_value = {"token": "test-token"}
-
-    participant, livekit_config = lobby_service.request_entry(room, request, username)
-
-    assert participant.status == LobbyParticipantStatus.ACCEPTED
-    assert livekit_config == {"token": "test-token"}
-    mock_generate_config.assert_called_once_with(
-        room_id=str(room.id),
-        user=request.user,
-        username=username,
-        color="#123456",
-    )
-    lobby_service._get_participant.assert_called_once_with(room.id, participant_id)
-
-
-@mock.patch("core.services.lobby.cache")
-def test_refresh_waiting_status(mock_cache, lobby_service, participant_id):
-    """Test refreshing waiting status for a participant."""
-    lobby_service._get_cache_key = mock.Mock(return_value="mocked_cache_key")
-    room = RoomFactory(access_level=RoomAccessLevel.RESTRICTED)
-    lobby_service.refresh_waiting_status(room.id, participant_id)
-    mock_cache.touch.assert_called_once_with(
-        "mocked_cache_key", settings.LOBBY_WAITING_TIMEOUT
-    )
-
-
-# pylint: disable=R0917
-@mock.patch("core.services.lobby.cache")
-@mock.patch("core.utils.generate_color")
-@mock.patch("core.services.lobby.LobbyService.notify_participants")
-def test_enter_success(
-    mock_notify,
-    mock_generate_color,
-    mock_cache,
-    lobby_service,
-    participant_id,
-    username,
-):
-    """Test successful participant entry."""
-    mock_generate_color.return_value = "#123456"
-    lobby_service._get_cache_key = mock.Mock(return_value="mocked_cache_key")
-
-    room = RoomFactory(access_level=RoomAccessLevel.RESTRICTED)
-    participant = lobby_service.enter(room.id, participant_id, username)
-
-    mock_generate_color.assert_called_once_with(participant_id)
-    assert participant.status == LobbyParticipantStatus.WAITING
-    assert participant.username == username
-    assert participant.id == participant_id
-    assert participant.color == "#123456"
-
-    lobby_service._get_cache_key.assert_called_once_with(room.id, participant_id)
-
-    mock_cache.set.assert_called_once_with(
-        "mocked_cache_key",
-        participant.to_dict(),
-        timeout=settings.LOBBY_WAITING_TIMEOUT,
-    )
-    mock_notify.assert_called_once_with(room_id=room.id)
-
-
-# pylint: disable=R0917
-@mock.patch("core.services.lobby.cache")
-@mock.patch("core.utils.generate_color")
-@mock.patch("core.services.lobby.LobbyService.notify_participants")
-def test_enter_with_notification_error(
-    mock_notify,
-    mock_generate_color,
-    mock_cache,
-    lobby_service,
-    participant_id,
-    username,
-):
-    """Test participant entry with notification error."""
-    mock_generate_color.return_value = "#123456"
-    mock_notify.side_effect = LobbyNotificationError("Error notifying")
-    lobby_service._get_cache_key = mock.Mock(return_value="mocked_cache_key")
-
-    room = RoomFactory(access_level=RoomAccessLevel.RESTRICTED)
-    participant = lobby_service.enter(room.id, participant_id, username)
-
-    mock_generate_color.assert_called_once_with(participant_id)
-    assert participant.status == LobbyParticipantStatus.WAITING
-    assert participant.username == username
-
-    lobby_service._get_cache_key.assert_called_once_with(room.id, participant_id)
-
-    mock_cache.set.assert_called_once_with(
-        "mocked_cache_key",
-        participant.to_dict(),
-        timeout=settings.LOBBY_WAITING_TIMEOUT,
-    )
-
-
-@mock.patch("core.services.lobby.cache")
-def test_get_participant_not_found(mock_cache, lobby_service, participant_id):
-    """Test getting a participant that doesn't exist."""
-    mock_cache.get.return_value = None
-    lobby_service._get_cache_key = mock.Mock(return_value="mocked_cache_key")
-
-    room = RoomFactory(access_level=RoomAccessLevel.RESTRICTED)
-    result = lobby_service._get_participant(room.id, participant_id)
-
-    assert result is None
-
-    lobby_service._get_cache_key.assert_called_once_with(room.id, participant_id)
-    mock_cache.get.assert_called_once_with("mocked_cache_key")
-
-
-@mock.patch("core.services.lobby.cache")
-@mock.patch("core.services.lobby.LobbyParticipant.from_dict")
-def test_get_participant_parsing_error(
-    mock_from_dict, mock_cache, lobby_service, participant_id
-):
-    """Test handling corrupted participant data."""
-    mock_cache.get.return_value = {"some": "data"}
-    lobby_service._get_cache_key = mock.Mock(return_value="mocked_cache_key")
-    mock_from_dict.side_effect = LobbyParticipantParsingError("Invalid data")
-
-    room = RoomFactory(access_level=RoomAccessLevel.RESTRICTED)
-    result = lobby_service._get_participant(room.id, participant_id)
-
-    assert result is None
-    lobby_service._get_cache_key.assert_called_once_with(room.id, participant_id)
-    mock_cache.delete.assert_called_once_with("mocked_cache_key")
-
-
-@mock.patch("core.services.lobby.cache")
-def test_list_waiting_participants_empty(mock_cache, lobby_service):
-    """Test listing waiting participants when none exist."""
-    mock_cache.keys.return_value = []
-
-    room = RoomFactory(access_level=RoomAccessLevel.RESTRICTED)
-    result = lobby_service.list_waiting_participants(room.id)
-
-    assert result == []
-    pattern = f"{settings.LOBBY_KEY_PREFIX}_{room.id!s}_*"
-    mock_cache.keys.assert_called_once_with(pattern)
-    mock_cache.get_many.assert_not_called()
-
-
-@mock.patch("core.services.lobby.cache")
-def test_list_waiting_participants(mock_cache, lobby_service, participant_dict):
-    """Test listing waiting participants with valid data."""
-    room = RoomFactory(access_level=RoomAccessLevel.RESTRICTED)
-    cache_key = f"{settings.LOBBY_KEY_PREFIX}_{room.id!s}_participant1"
-    mock_cache.keys.return_value = [cache_key]
-    mock_cache.get_many.return_value = {cache_key: participant_dict}
-
-    result = lobby_service.list_waiting_participants(room.id)
-
-    assert len(result) == 1
-    assert result[0]["status"] == "waiting"
-    assert result[0]["username"] == "test-username"
-    pattern = f"{settings.LOBBY_KEY_PREFIX}_{room.id!s}_*"
-    mock_cache.keys.assert_called_once_with(pattern)
-    mock_cache.get_many.assert_called_once_with([cache_key])
-
-
-@mock.patch("core.services.lobby.cache")
-def test_list_waiting_participants_multiple(mock_cache, lobby_service):
-    """Test listing multiple waiting participants with valid data."""
-    room = RoomFactory(access_level=RoomAccessLevel.RESTRICTED)
-    cache_key1 = f"{settings.LOBBY_KEY_PREFIX}_{room.id!s}_participant1"
-    cache_key2 = f"{settings.LOBBY_KEY_PREFIX}_{room.id!s}_participant2"
-
-    participant1 = {
-        "status": "waiting",
-        "username": "user1",
-        "id": "participant1",
-        "color": "#123456",
-    }
-
-    participant2 = {
-        "status": "waiting",
-        "username": "user2",
-        "id": "participant2",
-        "color": "#654321",
-    }
-
-    mock_cache.keys.return_value = [cache_key1, cache_key2]
-    mock_cache.get_many.return_value = {
-        cache_key1: participant1,
-        cache_key2: participant2,
-    }
-
-    result = lobby_service.list_waiting_participants(room.id)
-
-    assert len(result) == 2
-
-    # Verify both participants are in the result
-    assert any(p["id"] == "participant1" and p["username"] == "user1" for p in result)
-    assert any(p["id"] == "participant2" and p["username"] == "user2" for p in result)
-
-    # Verify all participants have waiting status
-    assert all(p["status"] == "waiting" for p in result)
-
-    pattern = f"{settings.LOBBY_KEY_PREFIX}_{room.id!s}_*"
-    mock_cache.keys.assert_called_once_with(pattern)
-    mock_cache.get_many.assert_called_once_with([cache_key1, cache_key2])
-
-
-@mock.patch("core.services.lobby.cache")
-def test_list_waiting_participants_corrupted_data(mock_cache, lobby_service):
-    """Test listing waiting participants with corrupted data."""
-    room = RoomFactory(access_level=RoomAccessLevel.RESTRICTED)
-    cache_key = f"{settings.LOBBY_KEY_PREFIX}_{room.id!s}_participant1"
-    mock_cache.keys.return_value = [cache_key]
-    mock_cache.get_many.return_value = {cache_key: {"invalid": "data"}}
-
-    result = lobby_service.list_waiting_participants(room.id)
-
-    assert result == []
-    mock_cache.delete.assert_called_once_with(cache_key)
-
-
-@mock.patch("core.services.lobby.cache")
-def test_list_waiting_participants_partially_corrupted(mock_cache, lobby_service):
-    """Test listing waiting participants with one valid and one corrupted entry."""
-    room = RoomFactory(access_level=RoomAccessLevel.RESTRICTED)
-    cache_key1 = f"{settings.LOBBY_KEY_PREFIX}_{room.id!s}_participant1"
-    cache_key2 = f"{settings.LOBBY_KEY_PREFIX}_{room.id!s}_participant2"
-
-    valid_participant = {
-        "status": "waiting",
-        "username": "user2",
-        "id": "participant2",
-        "color": "#654321",
-    }
-
-    corrupted_participant = {"invalid": "data"}
-
-    mock_cache.keys.return_value = [cache_key1, cache_key2]
-    mock_cache.get_many.return_value = {
-        cache_key1: corrupted_participant,
-        cache_key2: valid_participant,
-    }
-
-    result = lobby_service.list_waiting_participants(room.id)
-
-    # Check that only the valid participant is returned
-    assert len(result) == 1
-    assert result[0]["id"] == "participant2"
-    assert result[0]["status"] == "waiting"
-    assert result[0]["username"] == "user2"
-
-    # Verify corrupted entry was deleted
-    mock_cache.delete.assert_called_once_with(cache_key1)
-
-    # Verify both cache keys were queried
-    pattern = f"{settings.LOBBY_KEY_PREFIX}_{room.id!s}_*"
-    mock_cache.keys.assert_called_once_with(pattern)
-    mock_cache.get_many.assert_called_once_with([cache_key1, cache_key2])
-
-
-@mock.patch("core.services.lobby.cache")
-def test_list_waiting_participants_non_waiting(mock_cache, lobby_service):
-    """Test listing only waiting participants (not accepted/denied)."""
-    room = RoomFactory(access_level=RoomAccessLevel.RESTRICTED)
-    cache_key1 = f"{settings.LOBBY_KEY_PREFIX}_{room.id!s}_participant1"
-    cache_key2 = f"{settings.LOBBY_KEY_PREFIX}_{room.id!s}_participant2"
-
-    participant1 = {
-        "status": "waiting",
-        "username": "user1",
-        "id": "participant1",
-        "color": "#123456",
-    }
-    participant2 = {
-        "status": "accepted",
-        "username": "user2",
-        "id": "participant2",
-        "color": "#654321",
-    }
-
-    mock_cache.keys.return_value = [cache_key1, cache_key2]
-    mock_cache.get_many.return_value = {
-        cache_key1: participant1,
-        cache_key2: participant2,
-    }
-
-    result = lobby_service.list_waiting_participants(room.id)
-
-    assert len(result) == 1
-    assert result[0]["id"] == "participant1"
-    assert result[0]["status"] == "waiting"
-
-
-@mock.patch("core.services.lobby.LobbyService._update_participant_status")
-def test_handle_participant_entry_allow(mock_update, lobby_service, participant_id):
-    """Test handling allowed participant entry."""
-    room = RoomFactory(access_level=RoomAccessLevel.RESTRICTED)
-    lobby_service.handle_participant_entry(room.id, participant_id, allow_entry=True)
-
-    mock_update.assert_called_once_with(
-        room.id,
-        participant_id,
-        status=LobbyParticipantStatus.ACCEPTED,
-        timeout=settings.LOBBY_ACCEPTED_TIMEOUT,
-    )
-
-
-@mock.patch("core.services.lobby.LobbyService._update_participant_status")
-def test_handle_participant_entry_deny(mock_update, lobby_service, participant_id):
-    """Test handling denied participant entry."""
-    room = RoomFactory(access_level=RoomAccessLevel.RESTRICTED)
-    lobby_service.handle_participant_entry(room.id, participant_id, allow_entry=False)
-
-    mock_update.assert_called_once_with(
-        room.id,
-        participant_id,
-        status=LobbyParticipantStatus.DENIED,
-        timeout=settings.LOBBY_DENIED_TIMEOUT,
-    )
-
-
-@mock.patch("core.services.lobby.cache")
-def test_update_participant_status_not_found(mock_cache, lobby_service, participant_id):
-    """Test updating status for non-existent participant."""
-    room = RoomFactory(access_level=RoomAccessLevel.RESTRICTED)
-    mock_cache.get.return_value = None
-    lobby_service._get_cache_key = mock.Mock(return_value="mocked_cache_key")
-
-    with pytest.raises(LobbyParticipantNotFound, match="Participant not found"):
-        lobby_service._update_participant_status(
-            room.id,
-            participant_id,
-            status=LobbyParticipantStatus.ACCEPTED,
-            timeout=60,
-        )
-
-    lobby_service._get_cache_key.assert_called_once_with(room.id, participant_id)
-    mock_cache.get.assert_called_once_with("mocked_cache_key")
-
-
-@mock.patch("core.services.lobby.cache")
-@mock.patch("core.services.lobby.LobbyParticipant.from_dict")
-def test_update_participant_status_corrupted_data(
-    mock_from_dict, mock_cache, lobby_service, participant_id
-):
-    """Test updating status with corrupted participant data."""
-    room = RoomFactory(access_level=RoomAccessLevel.RESTRICTED)
-    mock_cache.get.return_value = {"some": "data"}
-    mock_from_dict.side_effect = LobbyParticipantParsingError("Invalid data")
-    lobby_service._get_cache_key = mock.Mock(return_value="mocked_cache_key")
-
-    with pytest.raises(LobbyParticipantParsingError):
-        lobby_service._update_participant_status(
-            room.id,
-            participant_id,
-            status=LobbyParticipantStatus.ACCEPTED,
-            timeout=60,
-        )
-
-    mock_cache.delete.assert_called_once_with("mocked_cache_key")
-    lobby_service._get_cache_key.assert_called_once_with(room.id, participant_id)
-
-
-@mock.patch("core.services.lobby.cache")
-def test_update_participant_status_success(mock_cache, lobby_service, participant_id):
-    """Test successful participant status update."""
-    room = RoomFactory(access_level=RoomAccessLevel.RESTRICTED)
-    participant_dict = {
-        "status": "waiting",
-        "username": "test-username",
-        "id": participant_id,
-        "color": "#123456",
-    }
-
-    mock_cache.get.return_value = participant_dict
-    lobby_service._get_cache_key = mock.Mock(return_value="mocked_cache_key")
-
-    lobby_service._update_participant_status(
-        room.id,
-        participant_id,
-        status=LobbyParticipantStatus.ACCEPTED,
-        timeout=60,
-    )
-
-    expected_data = {
-        "status": "accepted",
-        "username": "test-username",
-        "id": participant_id,
-        "color": "#123456",
-    }
-    mock_cache.set.assert_called_once_with(
-        "mocked_cache_key", expected_data, timeout=60
-    )
-    lobby_service._get_cache_key.assert_called_once_with(room.id, participant_id)
-
-
-@mock.patch("core.utils.create_livekit_client")
-def test_notify_participants_success_no_room(mock_create_livekit_client, lobby_service):
-    """Test the notify_participants method when the LiveKit room doesn't exist yet."""
-
-    room = RoomFactory(access_level=RoomAccessLevel.RESTRICTED)
-
-    # Set up the mock LiveKitAPI and its behavior
-    mock_api_instance = mock.Mock()
-    mock_api_instance.room = mock.Mock()
-    mock_api_instance.room.send_data = mock.AsyncMock()
-
-    # Create a proper response object with an empty rooms list
-    class MockResponse:
-        """LiveKit API response mock with empty rooms list."""
-
-        rooms = []
-
-    mock_api_instance.room.list_rooms = mock.AsyncMock(return_value=MockResponse())
-    mock_api_instance.aclose = mock.AsyncMock()
-    mock_create_livekit_client.return_value = mock_api_instance
-
-    # Act
-    lobby_service.notify_participants(room.id)
-
-    # Verify that the service checked for existing rooms
-    mock_api_instance.room.list_rooms.assert_called_once()
-
-    # Verify the send_data method was not called since no room exists
-    mock_api_instance.room.send_data.assert_not_called()
-
-    # Verify the connection was properly closed
-    mock_api_instance.aclose.assert_called_once()
-
-
-@mock.patch("core.utils.create_livekit_client")
-def test_notify_participants_success(mock_create_livekit_client, lobby_service):
-    """Test successful participant notification."""
-    room = RoomFactory(access_level=RoomAccessLevel.RESTRICTED)
-    # Set up the mock LiveKitAPI and its behavior
-    mock_api_instance = mock.Mock()
-    mock_api_instance.room = mock.Mock()
-    mock_api_instance.room.send_data = mock.AsyncMock()
-
-    class MockResponse:
-        """LiveKit API response mock with non-empty rooms list."""
-
-        rooms = ["room-1"]
-
-    mock_api_instance.room.list_rooms = mock.AsyncMock(return_value=MockResponse())
-
-    mock_api_instance.aclose = mock.AsyncMock()
-    mock_create_livekit_client.return_value = mock_api_instance
-
-    # Call the function
-    lobby_service.notify_participants(room.id)
-
-    # Verify that the service checked for existing rooms
-    mock_api_instance.room.list_rooms.assert_called_once()
-
-    # Verify the send_data method was called
-    mock_api_instance.room.send_data.assert_called_once()
-    send_data_request = mock_api_instance.room.send_data.call_args[0][0]
-    assert send_data_request.room == str(room.id)
-    assert (
-        json.loads(send_data_request.data.decode("utf-8"))["type"]
-        == settings.LOBBY_NOTIFICATION_TYPE
-    )
-    assert send_data_request.kind == 0  # RELIABLE mode in Livekit protocol
-
-    # Verify aclose was called
-    mock_api_instance.aclose.assert_called_once()
-
-
-@mock.patch("core.utils.create_livekit_client")
-def test_notify_participants_error(mock_create_livekit_client, lobby_service):
-    """Test participant notification with API error."""
-    room = RoomFactory(access_level=RoomAccessLevel.RESTRICTED)
-    # Set up the mock LiveKitAPI and its behavior
-    mock_api_instance = mock.Mock()
-    mock_api_instance.room = mock.Mock()
-    mock_api_instance.room.send_data = mock.AsyncMock(
-        side_effect=TwirpError(msg="test error", code=123, status=123)
-    )
-
-    class MockResponse:
-        """LiveKit API response mock with non-empty rooms list."""
-
-        rooms = ["room-1"]
-
-    mock_api_instance.room.list_rooms = mock.AsyncMock(return_value=MockResponse())
-
-    mock_api_instance.aclose = mock.AsyncMock()
-    mock_create_livekit_client.return_value = mock_api_instance
-
-    # Call the function and expect an exception
-    with pytest.raises(
-        LobbyNotificationError, match="Failed to notify room participants"
-    ):
-        lobby_service.notify_participants(room.id)
-
-    # Verify that the service checked for existing rooms
-    mock_api_instance.room.list_rooms.assert_called_once()
-
-    # Verify send_data was called
-    mock_api_instance.room.send_data.assert_called_once()
-
-    # Verify aclose was still called after the exception
-    mock_api_instance.aclose.assert_called_once()
-
-
-def test_clear_room_cache(settings, lobby_service):
-    """Test clearing room cache actually removes entries from cache."""
-
-    settings.LOBBY_KEY_PREFIX = "test-lobby"
-    settings.LOBBY_WAITING_TIMEOUT = 10000
-    settings.LOBBY_ACCEPTED_TIMEOUT = 10000
-    settings.LOBBY_DENIED_TIMEOUT = 10000
-
-    room_id = uuid.uuid4()
-
-    cache.set(
-        f"test-lobby_{room_id!s}_participant1",
-        LobbyParticipant(
-            status=LobbyParticipantStatus.WAITING,
-            username="participant1",
-            id="participant1",
-            color="#123456",
-        ),
-        timeout=settings.LOBBY_WAITING_TIMEOUT,
-    )
-    cache.set(
-        f"test-lobby_{room_id!s}_participant2",
-        LobbyParticipant(
-            status=LobbyParticipantStatus.ACCEPTED,
-            username="participant2",
-            id="participant2",
-            color="#123456",
-        ),
-        timeout=settings.LOBBY_ACCEPTED_TIMEOUT,
-    )
-    cache.set(
-        f"test-lobby_{room_id!s}_participant3",
-        LobbyParticipant(
-            status=LobbyParticipantStatus.DENIED,
-            username="participant3",
-            id="participant3",
-            color="#123456",
-        ),
-        timeout=settings.LOBBY_DENIED_TIMEOUT,
-    )
-
-    lobby_service.clear_room_cache(room_id)
-
-    assert cache.keys(f"test-lobby_{room_id!s}_*") == []
-
-
-def test_clear_room_empty(settings, lobby_service):
-    """Test clearing room cache when it's already empty."""
-
-    settings.LOBBY_KEY_PREFIX = "test-lobby"
-    room_id = uuid.uuid4()
-
-    assert cache.keys(f"test-lobby_{room_id!s}_*") == []
-    lobby_service.clear_room_cache(room_id)
-    assert cache.keys(f"test-lobby_{room_id!s}_*") == []

src/backend/core/tests/services/test_marketing.py

@@ -1,212 +0,0 @@
-"""
-Test marketing services.
-"""
-
-# pylint: disable=W0621,W0613
-
-from unittest import mock
-
-from django.conf import settings
-from django.core.exceptions import ImproperlyConfigured
-
-import brevo_python
-import pytest
-import urllib3
-
-from core.services.marketing import (
-    BrevoMarketingService,
-    ContactCreationError,
-    ContactData,
-    get_marketing_service,
-)
-
-
-def test_init_missing_api_key(settings):
-    """Test initialization with missing API key."""
-    settings.BREVO_API_KEY = None
-    with pytest.raises(ImproperlyConfigured, match="Brevo API key is required"):
-        BrevoMarketingService()
-
-
-def test_create_contact_missing_list_ids(settings):
-    """Test contact creation with missing list IDs."""
-
-    settings.BREVO_API_KEY = "test-api-key"
-    settings.BREVO_API_CONTACT_LIST_IDS = None
-    settings.BREVO_API_CONTACT_ATTRIBUTES = {"source": "test"}
-
-    valid_contact_data = ContactData(
-        email="test@example.com",
-        attributes={"first_name": "Test"},
-        list_ids=[1, 2],
-        update_enabled=True,
-    )
-
-    brevo_service = BrevoMarketingService()
-
-    with pytest.raises(
-        ImproperlyConfigured, match="Default Brevo List IDs must be configured"
-    ):
-        brevo_service.create_contact(valid_contact_data)
-
-
-@mock.patch("brevo_python.ContactsApi")
-def test_create_contact_success(mock_contact_api):
-    """Test successful contact creation."""
-
-    mock_api = mock_contact_api.return_value
-
-    settings.BREVO_API_KEY = "test-api-key"
-    settings.BREVO_API_CONTACT_LIST_IDS = [1, 2, 3, 4]
-    settings.BREVO_API_CONTACT_ATTRIBUTES = {"source": "test"}
-
-    valid_contact_data = ContactData(
-        email="test@example.com",
-        attributes={"first_name": "Test"},
-        list_ids=[1, 2],
-        update_enabled=True,
-    )
-
-    brevo_service = BrevoMarketingService()
-
-    mock_api.create_contact.return_value = {"id": "test-id"}
-    response = brevo_service.create_contact(valid_contact_data)
-
-    assert response == {"id": "test-id"}
-
-    mock_api.create_contact.assert_called_once()
-    contact_arg = mock_api.create_contact.call_args[0][0]
-    assert contact_arg.email == "test@example.com"
-    assert contact_arg.attributes == {
-        **settings.BREVO_API_CONTACT_ATTRIBUTES,
-        **valid_contact_data.attributes,
-    }
-    assert set(contact_arg.list_ids) == {1, 2, 3, 4}
-    assert contact_arg.update_enabled is True
-
-
-@mock.patch("brevo_python.ContactsApi")
-def test_create_contact_with_timeout(mock_contact_api):
-    """Test contact creation with timeout."""
-
-    mock_api = mock_contact_api.return_value
-
-    settings.BREVO_API_KEY = "test-api-key"
-    settings.BREVO_API_CONTACT_LIST_IDS = [1, 2, 3, 4]
-    settings.BREVO_API_CONTACT_ATTRIBUTES = {"source": "test"}
-
-    valid_contact_data = ContactData(
-        email="test@example.com",
-        attributes={"first_name": "Test"},
-        list_ids=[1, 2],
-        update_enabled=True,
-    )
-
-    brevo_service = BrevoMarketingService()
-    brevo_service.create_contact(valid_contact_data, timeout=30)
-
-    mock_api.create_contact.assert_called_once()
-    assert mock_api.create_contact.call_args[1]["_request_timeout"] == 30
-
-
-@mock.patch("brevo_python.ContactsApi")
-def test_create_contact_api_error(mock_contact_api):
-    """Test contact creation API error handling."""
-
-    mock_api = mock_contact_api.return_value
-
-    settings.BREVO_API_KEY = "test-api-key"
-    settings.BREVO_API_CONTACT_LIST_IDS = [1, 2, 3, 4]
-    settings.BREVO_API_CONTACT_ATTRIBUTES = {"source": "test"}
-
-    valid_contact_data = ContactData(
-        email="test@example.com",
-        attributes={"first_name": "Test"},
-        list_ids=[1, 2],
-        update_enabled=True,
-    )
-
-    brevo_service = BrevoMarketingService()
-
-    mock_api.create_contact.side_effect = brevo_python.rest.ApiException()
-
-    with pytest.raises(ContactCreationError, match="Failed to create contact in Brevo"):
-        brevo_service.create_contact(valid_contact_data)
-
-
-@mock.patch("brevo_python.ContactsApi")
-def test_create_contact_timeout_error(mock_contact_api):
-    """Test contact creation timeout error handling."""
-
-    mock_api = mock_contact_api.return_value
-    settings.BREVO_API_KEY = "test-api-key"
-    settings.BREVO_API_CONTACT_LIST_IDS = [1, 2, 3, 4]
-    settings.BREVO_API_CONTACT_ATTRIBUTES = {"source": "test"}
-
-    valid_contact_data = ContactData(
-        email="test@example.com",
-        attributes={"first_name": "Test"},
-        list_ids=[1, 2],
-        update_enabled=True,
-    )
-
-    brevo_service = BrevoMarketingService()
-
-    mock_api.create_contact.side_effect = urllib3.exceptions.ReadTimeoutError(
-        pool=mock.Mock(),
-        url="https://api.brevo.com/v3/endpoint",
-        message="HTTPSConnectionPool(host='api.brevo.com', port=443): Read timed out.",
-    )
-
-    with pytest.raises(ContactCreationError, match="Failed to create contact in Brevo"):
-        brevo_service.create_contact(valid_contact_data)
-
-
-@pytest.fixture
-def clear_marketing_cache():
-    """Clear marketing service cache between tests."""
-    get_marketing_service.cache_clear()
-    yield
-    get_marketing_service.cache_clear()
-
-
-def test_get_marketing_service_caching(clear_marketing_cache):
-    """Test marketing service caching behavior."""
-    settings.BREVO_API_KEY = "test-api-key"
-    settings.MARKETING_SERVICE_CLASS = "core.services.marketing.BrevoMarketingService"
-
-    service1 = get_marketing_service()
-    service2 = get_marketing_service()
-
-    assert service1 is service2
-    assert isinstance(service1, BrevoMarketingService)
-
-
-def test_get_marketing_service_invalid_class(clear_marketing_cache):
-    """Test handling of invalid service class."""
-    settings.MARKETING_SERVICE_CLASS = "invalid.service.path"
-
-    with pytest.raises(ImportError):
-        get_marketing_service()
-
-
-@mock.patch("core.services.marketing.import_string")
-def test_service_instantiation_called_once(mock_import_string, clear_marketing_cache):
-    """Test service class is instantiated only once."""
-
-    settings.BREVO_API_KEY = "test-api-key"
-    settings.MARKETING_SERVICE_CLASS = "core.services.marketing.BrevoMarketingService"
-    get_marketing_service.cache_clear()
-
-    mock_service_cls = mock.Mock()
-    mock_service_instance = mock.Mock()
-    mock_service_cls.return_value = mock_service_instance
-    mock_import_string.return_value = mock_service_cls
-
-    service1 = get_marketing_service()
-    service2 = get_marketing_service()
-
-    mock_import_string.assert_called_once_with(settings.MARKETING_SERVICE_CLASS)
-    mock_service_cls.assert_called_once()
-    assert service1 is service2
-    assert service1 is mock_service_instance

src/backend/core/tests/test_api_resource_accesses.py

@@ -16,7 +16,7 @@ from ..factories import (
     UserFactory,
     UserResourceAccessFactory,
 )
-from ..models import ResourceAccess, RoleChoices, RoomAccessLevel
+from ..models import ResourceAccess, RoleChoices
 
 pytestmark = pytest.mark.django_db
 
@@ -44,13 +44,13 @@ def test_api_room_user_accesses_list_authenticated_not_related():
     client = APIClient()
     client.force_login(user)
 
-    public_room = RoomFactory(access_level=RoomAccessLevel.PUBLIC)
+    public_room = RoomFactory(is_public=True)
     UserResourceAccessFactory(resource=public_room)
     UserResourceAccessFactory(resource=public_room, role="member")
     UserResourceAccessFactory(resource=public_room, role="administrator")
     UserResourceAccessFactory(resource=public_room, role="owner")
 
-    private_room = RoomFactory(access_level=RoomAccessLevel.RESTRICTED)
+    private_room = RoomFactory(is_public=False)
     UserResourceAccessFactory(resource=private_room)
     UserResourceAccessFactory(resource=private_room, role="member")
     UserResourceAccessFactory(resource=private_room, role="administrator")
@@ -73,17 +73,13 @@ def test_api_room_user_accesses_list_authenticated_member():
     client = APIClient()
     client.force_login(user)
 
-    public_room = RoomFactory(
-        access_level=RoomAccessLevel.PUBLIC, users=[(user, "member")]
-    )
+    public_room = RoomFactory(is_public=True, users=[(user, "member")])
     UserResourceAccessFactory(resource=public_room)
     UserResourceAccessFactory(resource=public_room, role="member")
     UserResourceAccessFactory(resource=public_room, role="administrator")
     UserResourceAccessFactory(resource=public_room, role="owner")
 
-    private_room = RoomFactory(
-        access_level=RoomAccessLevel.RESTRICTED, users=[(user, "member")]
-    )
+    private_room = RoomFactory(is_public=False, users=[(user, "member")])
     UserResourceAccessFactory(resource=private_room)
     UserResourceAccessFactory(resource=private_room, role="member")
     UserResourceAccessFactory(resource=private_room, role="administrator")
@@ -106,7 +102,7 @@ def test_api_room_user_accesses_list_authenticated_administrator():
     client = APIClient()
     client.force_login(user)
 
-    public_room = RoomFactory(access_level=RoomAccessLevel.PUBLIC)
+    public_room = RoomFactory(is_public=True)
     public_room_accesses = (
         # Access for the logged-in user
         UserResourceAccessFactory(
@@ -119,7 +115,7 @@ def test_api_room_user_accesses_list_authenticated_administrator():
         UserResourceAccessFactory(resource=public_room, role="owner"),
     )
 
-    private_room = RoomFactory(access_level=RoomAccessLevel.RESTRICTED)
+    private_room = RoomFactory(is_public=False)
     private_room_accesses = (
         # Access for the logged-in user
         UserResourceAccessFactory(
@@ -152,7 +148,7 @@ def test_api_room_user_accesses_list_authenticated_owner():
     client = APIClient()
     client.force_login(user)
 
-    public_room = RoomFactory(access_level=RoomAccessLevel.PUBLIC)
+    public_room = RoomFactory(is_public=True)
     public_room_accesses = (
         # Access for the logged-in user
         UserResourceAccessFactory(resource=public_room, user=user, role="owner"),
@@ -162,7 +158,7 @@ def test_api_room_user_accesses_list_authenticated_owner():
         UserResourceAccessFactory(resource=public_room, role="administrator"),
         UserResourceAccessFactory(resource=public_room, role="owner"),
     )
-    private_room = RoomFactory(access_level=RoomAccessLevel.RESTRICTED)
+    private_room = RoomFactory(is_public=False)
     private_room_accesses = (
         # Access for the logged-in user
         UserResourceAccessFactory(resource=private_room, user=user, role="owner"),
@@ -256,8 +252,8 @@ def test_api_room_user_accesses_retrieve_authenticated_not_related():
     client = APIClient()
     client.force_login(user)
 
-    for access_level in [RoomAccessLevel.PUBLIC, RoomAccessLevel.RESTRICTED]:
-        room = RoomFactory(access_level=access_level)
+    for is_public in [True, False]:
+        room = RoomFactory(is_public=is_public)
         assert len(RoleChoices.choices) == 3
 
         for role, _name in RoleChoices.choices:
@@ -281,9 +277,9 @@ def test_api_room_user_accesses_retrieve_authenticated_member():
     client = APIClient()
     client.force_login(user)
 
-    for access_level in [RoomAccessLevel.PUBLIC, RoomAccessLevel.RESTRICTED]:
+    for is_public in [True, False]:
         room = RoomFactory(
-            access_level=access_level,
+            is_public=is_public,
             users=[(user, "member")],
         )
         assert len(RoleChoices.choices) == 3
@@ -309,8 +305,8 @@ def test_api_room_user_accesses_retrieve_authenticated_administrator():
     client = APIClient()
     client.force_login(user)
 
-    for access_level in [RoomAccessLevel.PUBLIC, RoomAccessLevel.RESTRICTED]:
-        room = RoomFactory(access_level=access_level, users=[(user, "administrator")])
+    for is_public in [True, False]:
+        room = RoomFactory(is_public=is_public, users=[(user, "administrator")])
         assert len(RoleChoices.choices) == 3
 
         for role, _name in RoleChoices.choices:
@@ -338,8 +334,8 @@ def test_api_room_user_accesses_retrieve_authenticated_owner():
     client = APIClient()
     client.force_login(user)
 
-    for access_level in [RoomAccessLevel.PUBLIC, RoomAccessLevel.RESTRICTED]:
-        room = RoomFactory(access_level=access_level, users=[(user, "owner")])
+    for is_public in [True, False]:
+        room = RoomFactory(is_public=is_public, users=[(user, "owner")])
         assert len(RoleChoices.choices) == 3
 
         for role, _name in RoleChoices.choices:

src/backend/core/tests/test_api_users.py

@@ -22,32 +22,10 @@ def test_api_users_list_anonymous():
     }
 
 
-def test_api_users_list_authenticated_secure(settings):
+def test_api_users_list_authenticated():
     """
-    Authenticated users should not be able to list any user
-    when ALLOW_UNSECURE_USER_LISTING is False.
+    Authenticated users should be able to list users.
     """
-    settings.ALLOW_UNSECURE_USER_LISTING = False
-    user = factories.UserFactory()
-
-    client = APIClient()
-    client.force_login(user)
-
-    factories.UserFactory.create_batch(2)
-    response = client.get(
-        "/api/v1.0/users/",
-    )
-    assert response.status_code == 200
-    content = response.json()
-    assert len(content["results"]) == 0
-
-
-def test_api_users_list_authenticated_unsecure(settings):
-    """
-    Authenticated users should be able to list all users
-    when ALLOW_UNSECURE_USER_LISTING is True.
-    """
-    settings.ALLOW_UNSECURE_USER_LISTING = True
     user = factories.UserFactory()
 
     client = APIClient()
@@ -62,12 +40,11 @@ def test_api_users_list_authenticated_unsecure(settings):
     assert len(content["results"]) == 3
 
 
-def test_api_users_list_query_email(settings):
+def test_api_users_list_query_email():
     """
     Authenticated users should be able to list users
     and filter by email.
     """
-    settings.ALLOW_UNSECURE_USER_LISTING = True
     user = factories.UserFactory()
 
     client = APIClient()
@@ -89,7 +66,7 @@ def test_api_users_list_query_email(settings):
 
     assert response.status_code == 200
     user_ids = [user["id"] for user in response.json()["results"]]
-    assert user_ids == [str(frank.id), str(nicole.id)]
+    assert user_ids == [str(nicole.id), str(frank.id)]
 
 
 def test_api_users_retrieve_me_anonymous():
@@ -103,10 +80,8 @@ def test_api_users_retrieve_me_anonymous():
     }
 
 
-def test_api_users_retrieve_me_authenticated(settings):
+def test_api_users_retrieve_me_authenticated():
     """Authenticated users should be able to retrieve their own user via the "/users/me" path."""
-
-    settings.TIME_ZONE = "UTC"
     user = factories.UserFactory()
 
     client = APIClient()
@@ -123,8 +98,6 @@ def test_api_users_retrieve_me_authenticated(settings):
         "email": user.email,
         "full_name": user.full_name,
         "short_name": user.short_name,
-        "language": user.language,
-        "timezone": "UTC",
     }
 
 

src/backend/core/tests/test_models_recording.py

@@ -12,8 +12,7 @@ from core.factories import (
     UserFactory,
     UserRecordingAccessFactory,
 )
-from core.models import Recording, RecordingModeChoices, RecordingStatusChoices
-from core.recording.enums import FileExtension
+from core.models import Recording, RecordingStatusChoices
 
 pytestmark = pytest.mark.django_db
 
@@ -217,74 +216,3 @@ def test_models_recording_worker_id_very_long():
     too_long_id = "w" * 256
     with pytest.raises(ValidationError):
         RecordingFactory(worker_id=too_long_id)
-
-
-# Test key property method
-
-
-def test_models_recording_key_for_transcript(settings):
-    """Test key property returns correct path for transcript mode."""
-
-    settings.RECORDING_OUTPUT_FOLDER = "/custom/path"
-
-    recording = RecordingFactory(mode=RecordingModeChoices.TRANSCRIPT)
-    expected_path = f"/custom/path/{recording.id}.{FileExtension.OGG.value}"
-    assert recording.key == expected_path
-
-
-def test_models_recording_key_for_screen_recording(settings):
-    """Test key property returns correct path for screen recording mode."""
-    settings.RECORDING_OUTPUT_FOLDER = "/custom/path"
-
-    recording = RecordingFactory(mode=RecordingModeChoices.SCREEN_RECORDING)
-    expected_path = f"/custom/path/{recording.id}.{FileExtension.MP4.value}"
-    assert recording.key == expected_path
-
-
-def test_models_recording_key_for_unknown_mode(settings):
-    """Test key property uses default extension for unknown mode."""
-
-    settings.RECORDING_OUTPUT_FOLDER = "/custom/path"
-    recording = RecordingFactory()
-    # Directly set an invalid mode (bypassing validation)
-    recording.mode = "unknown_mode"
-    expected_path = f"/custom/path/{recording.id}.{FileExtension.MP4.value}"
-    assert recording.key == expected_path
-
-
-# Test is_saved method
-
-
-def test_models_recording_is_saved_true():
-    """Test is_saved property returns True for SAVED and NOTIFICATION_SUCCEEDED status."""
-    recording = RecordingFactory(status=RecordingStatusChoices.SAVED)
-    assert recording.is_saved is True
-
-    recording = RecordingFactory(status=RecordingStatusChoices.NOTIFICATION_SUCCEEDED)
-    assert recording.is_saved is True
-
-
-def test_models_recording_is_saved_false_active():
-    """Test is_saved property returns False for ACTIVE status."""
-    recording = RecordingFactory(status=RecordingStatusChoices.ACTIVE)
-    assert recording.is_saved is False
-
-
-def test_models_recording_is_saved_false_initiated():
-    """Test is_saved property returns False for INITIATED status."""
-    recording = RecordingFactory(status=RecordingStatusChoices.INITIATED)
-    assert recording.is_saved is False
-
-
-@pytest.mark.parametrize(
-    "status",
-    [
-        RecordingStatusChoices.FAILED_TO_STOP,
-        RecordingStatusChoices.FAILED_TO_START,
-        RecordingStatusChoices.ABORTED,
-    ],
-)
-def test_models_recording_is_saved_false_error_states(status):
-    """Test is_saved property returns False for error statuses."""
-    recording = RecordingFactory(status=status)
-    assert recording.is_saved is False

src/backend/core/tests/test_models_rooms.py

@@ -2,19 +2,13 @@
 Unit tests for the Room model
 """
 
-# pylint: disable=W0613
-
-import secrets
-from logging import Logger
-from unittest import mock
-
 from django.contrib.auth.models import AnonymousUser
 from django.core.exceptions import ValidationError
 
 import pytest
 
 from core.factories import RoomFactory, UserFactory
-from core.models import Room, RoomAccessLevel
+from core.models import Room
 
 pytestmark = pytest.mark.django_db
 
@@ -86,10 +80,10 @@ def test_models_rooms_users():
     assert list(room.users.all()) == [user]
 
 
-def test_models_rooms_access_level_default():
+def test_models_rooms_is_public_default():
     """A room should be public by default."""
     room = Room.objects.create(name="room")
-    assert room.access_level == RoomAccessLevel.PUBLIC
+    assert room.is_public is True
 
 
 # Access rights methods
@@ -170,180 +164,3 @@ def test_models_rooms_access_rights_owner_direct(django_assert_num_queries):
         assert room.is_administrator(user) is True
     with django_assert_num_queries(1):
         assert room.is_owner(user) is True
-
-
-def test_models_rooms_is_public_property():
-    """Test the is_public property returns correctly based on access_level."""
-    # Test public room
-    public_room = RoomFactory(access_level=RoomAccessLevel.PUBLIC)
-    assert public_room.is_public is True
-
-    # Test non-public room
-    private_room = RoomFactory(access_level=RoomAccessLevel.RESTRICTED)
-    assert private_room.is_public is False
-
-
-@mock.patch.object(Room, "generate_unique_pin_code")
-def test_telephony_disabled_skips_pin_generation(
-    mock_generate_unique_pin_code, settings
-):
-    """Telephony disabled should not generate pin codes."""
-
-    settings.ROOM_TELEPHONY_ENABLED = False
-
-    room = RoomFactory()
-
-    mock_generate_unique_pin_code.assert_not_called()
-    assert room.pin_code is None
-
-
-def test_default_and_custom_pin_length(settings):
-    """Pin codes should be created with correct configured length."""
-
-    settings.ROOM_TELEPHONY_ENABLED = True
-
-    room = RoomFactory()
-
-    # Assert default value is 10 for collision reasons
-    assert len(room.pin_code) == 10
-
-    settings.ROOM_TELEPHONY_PIN_LENGTH = 5
-
-    room = RoomFactory()
-
-    # Assert custom size
-    assert len(room.pin_code) == 5
-
-
-def test_room_updates_preserve_pin_code(settings):
-    """Room updates should preserve existing pin code."""
-
-    settings.ROOM_TELEPHONY_ENABLED = True
-
-    room = RoomFactory()
-
-    # Store the original pin code to compare after updates
-    previous_pin_code = room.pin_code
-
-    # If this method is called, it would indicate the pin is being regenerated unnecessarily
-    with mock.patch.object(
-        Room, "generate_unique_pin_code"
-    ) as mock_generate_unique_pin_code:
-        # Explicitly call save to persist the changes to the room
-        room.slug = "aaa-aaaa-aaa"
-        room.save()
-        assert room.pin_code == previous_pin_code
-        mock_generate_unique_pin_code.assert_not_called()
-
-
-@pytest.mark.parametrize("is_telephony_enabled", [True, False])
-def test_manual_pin_code_updates(is_telephony_enabled, settings):
-    """Manual pin code changes should persist regardless of telephony setting."""
-
-    settings.ROOM_TELEPHONY_ENABLED = is_telephony_enabled
-    settings.ROOM_TELEPHONY_PIN_LENGTH = 5
-
-    room = RoomFactory()
-    assert room.pin_code != "12345"
-
-    room.pin_code = "12345"
-    room.save()
-
-    assert room.pin_code == "12345"
-
-    # No data validation when manual updates are made
-    room.pin_code = "123"
-    room.save()
-
-    assert room.pin_code == "123"
-
-
-def test_pin_code_uniqueness(settings):
-    """Duplicate pin codes should raise validation error."""
-
-    settings.ROOM_TELEPHONY_ENABLED = True
-    settings.ROOM_TELEPHONY_PIN_LENGTH = 5
-
-    RoomFactory(pin_code="12345")
-
-    with pytest.raises(ValidationError) as excinfo:
-        RoomFactory(pin_code="12345")
-
-    assert "Room with this Room PIN code already exists." in str(excinfo.value)
-
-
-@pytest.mark.parametrize("invalid_length", [0, 1, 2, 3])
-def test_pin_code_minimum_length(invalid_length, settings):
-    """Pin codes should enforce minimum length for security."""
-
-    settings.ROOM_TELEPHONY_ENABLED = True
-    settings.ROOM_TELEPHONY_PIN_LENGTH = 4
-
-    # Assert no exception is raised with a valid length
-    RoomFactory()
-
-    settings.ROOM_TELEPHONY_PIN_LENGTH = invalid_length
-
-    with pytest.raises(ValueError) as excinfo:
-        RoomFactory()
-
-    assert "PIN code length must be at least 4 digits for minimal security" in str(
-        excinfo.value
-    )
-
-
-@mock.patch.object(Logger, "warning")
-@mock.patch.object(secrets, "randbelow", return_value=12345)
-def test_pin_generation_max_retries(mock_randbelow, mock_logger, settings):
-    """Pin generation should give up after max retries."""
-
-    settings.ROOM_TELEPHONY_ENABLED = True
-    settings.ROOM_TELEPHONY_PIN_LENGTH = 5
-
-    RoomFactory(pin_code="12345")
-
-    # Assert default max retries is low, 5
-    room1 = RoomFactory()
-    assert mock_randbelow.call_count == 5
-    assert room1.pin_code is None
-
-    mock_logger.assert_called_once_with(
-        "Failed to generate unique PIN code of length %s after %s attempts", 5, 5
-    )
-
-    mock_logger.reset_mock()
-    mock_randbelow.reset_mock()
-    settings.ROOM_TELEPHONY_PIN_MAX_RETRIES = 3
-
-    room2 = RoomFactory()
-    assert mock_randbelow.call_count == 3
-    assert room2.pin_code is None
-
-    mock_logger.assert_called_once_with(
-        "Failed to generate unique PIN code of length %s after %s attempts", 5, 3
-    )
-
-
-@mock.patch.object(secrets, "randbelow", return_value=12345)
-def test_pin_code_zero_padding(mock_randbelow, settings):
-    """Pin codes should be zero-padded to meet required length."""
-
-    settings.ROOM_TELEPHONY_ENABLED = True
-    settings.ROOM_TELEPHONY_PIN_LENGTH = 10
-
-    room = RoomFactory()
-    assert room.pin_code == "0000012345"
-
-
-@mock.patch.object(secrets, "randbelow", return_value=12345)
-def test_pin_generation_upper_bound(mock_randbelow, settings):
-    """Random number generator should use correct upper bound based on pin length."""
-
-    settings.ROOM_TELEPHONY_ENABLED = False
-
-    room = RoomFactory()
-
-    room.generate_unique_pin_code(length=5)
-
-    # Assert called with the right exclusive upper bound, 10^5
-    mock_randbelow.assert_called_with(100000)

src/backend/core/tests/test_utils.py

@@ -1,62 +0,0 @@
-"""
-Test utils functions
-"""
-
-from unittest import mock
-
-from core.utils import create_livekit_client
-
-
-@mock.patch("asyncio.get_running_loop")
-@mock.patch("core.utils.LiveKitAPI")
-def test_create_livekit_client_ssl_enabled(
-    mock_livekit_api, mock_get_running_loop, settings
-):
-    """Test LiveKitAPI client creation with SSL verification enabled."""
-    mock_get_running_loop.return_value = mock.MagicMock()
-    settings.LIVEKIT_VERIFY_SSL = True
-
-    create_livekit_client()
-
-    mock_livekit_api.assert_called_once_with(
-        **settings.LIVEKIT_CONFIGURATION, session=None
-    )
-
-
-@mock.patch("core.utils.aiohttp.ClientSession")
-@mock.patch("asyncio.get_running_loop")
-@mock.patch("core.utils.LiveKitAPI")
-def test_create_livekit_client_ssl_disabled(
-    mock_livekit_api, mock_get_running_loop, mock_client_session, settings
-):
-    """Test LiveKitAPI client creation with SSL verification disabled."""
-    mock_get_running_loop.return_value = mock.MagicMock()
-    mock_session_instance = mock.MagicMock()
-    mock_client_session.return_value = mock_session_instance
-    settings.LIVEKIT_VERIFY_SSL = False
-
-    create_livekit_client()
-
-    mock_livekit_api.assert_called_once_with(
-        **settings.LIVEKIT_CONFIGURATION, session=mock_session_instance
-    )
-
-
-@mock.patch("asyncio.get_running_loop")
-@mock.patch("core.utils.LiveKitAPI")
-def test_create_livekit_client_custom_configuration(
-    mock_livekit_api, mock_get_running_loop, settings
-):
-    """Test LiveKitAPI client creation with custom configuration."""
-    settings.LIVEKIT_VERIFY_SSL = True
-
-    mock_get_running_loop.return_value = mock.MagicMock()
-    custom_configuration = {
-        "api_key": "mock_key",
-        "api_secret": "mock_secret",
-        "url": "http://mock-url.com",
-    }
-
-    create_livekit_client(custom_configuration)
-
-    mock_livekit_api.assert_called_once_with(**custom_configuration, session=None)

src/backend/core/urls.py

@@ -3,10 +3,10 @@
 from django.conf import settings
 from django.urls import include, path
 
-from lasuite.oidc_login.urls import urlpatterns as oidc_urls
 from rest_framework.routers import DefaultRouter
 
 from core.api import get_frontend_configuration, viewsets
+from core.authentication.urls import urlpatterns as oidc_urls
 
 # - Main endpoints
 router = DefaultRouter()

src/backend/core/utils.py

@@ -11,11 +11,8 @@ from typing import Optional
 from uuid import uuid4
 
 from django.conf import settings
-from django.core.files.storage import default_storage
 
-import aiohttp
-import botocore
-from livekit.api import AccessToken, LiveKitAPI, VideoGrants
+from livekit.api import AccessToken, VideoGrants
 
 
 def generate_color(identity: str) -> str:
@@ -40,9 +37,7 @@ def generate_color(identity: str) -> str:
     return f"hsl({hue}, {saturation}%, {lightness}%)"
 
 
-def generate_token(
-    room: str, user, username: Optional[str] = None, color: Optional[str] = None
-) -> str:
+def generate_token(room: str, user, username: Optional[str] = None) -> str:
     """Generate a LiveKit access token for a user in a specific room.
 
     Args:
@@ -50,8 +45,6 @@ def generate_token(
         user (User): The user which request the access token.
         username (Optional[str]): The username to be displayed in the room.
                          If none, a default value will be used.
-        color (Optional[str]): The color to be displayed in the room.
-                         If none, a value will be generated
 
     Returns:
         str: The LiveKit JWT access token.
@@ -76,9 +69,6 @@ def generate_token(
         identity = str(user.sub)
         default_username = str(user)
 
-    if color is None:
-        color = generate_color(identity)
-
     token = (
         AccessToken(
             api_key=settings.LIVEKIT_CONFIGURATION["api_key"],
@@ -87,74 +77,7 @@ def generate_token(
         .with_grants(video_grants)
         .with_identity(identity)
         .with_name(username or default_username)
-        .with_metadata(json.dumps({"color": color}))
+        .with_metadata(json.dumps({"color": generate_color(identity)}))
     )
 
     return token.to_jwt()
-
-
-def generate_livekit_config(
-    room_id: str, user, username: str, color: Optional[str] = None
-) -> dict:
-    """Generate LiveKit configuration for room access.
-
-    Args:
-        room_id: Room identifier
-        user: User instance requesting access
-        username: Display name in room
-
-    Returns:
-        dict: LiveKit configuration with URL, room and access token
-    """
-    return {
-        "url": settings.LIVEKIT_CONFIGURATION["url"],
-        "room": room_id,
-        "token": generate_token(
-            room=room_id, user=user, username=username, color=color
-        ),
-    }
-
-
-def generate_s3_authorization_headers(key):
-    """
-    Generate authorization headers for an s3 object.
-    These headers can be used as an alternative to signed urls with many benefits:
-    - the urls of our files never expire and can be stored in our recording' metadata
-    - we don't leak authorized urls that could be shared (file access can only be done
-      with cookies)
-    - access control is truly realtime
-    - the object storage service does not need to be exposed on internet
-    """
-
-    url = default_storage.unsigned_connection.meta.client.generate_presigned_url(
-        "get_object",
-        ExpiresIn=0,
-        Params={"Bucket": default_storage.bucket_name, "Key": key},
-    )
-
-    request = botocore.awsrequest.AWSRequest(method="get", url=url)
-
-    s3_client = default_storage.connection.meta.client
-    # pylint: disable=protected-access
-    credentials = s3_client._request_signer._credentials  # noqa: SLF001
-    frozen_credentials = credentials.get_frozen_credentials()
-    region = s3_client.meta.region_name
-    auth = botocore.auth.S3SigV4Auth(frozen_credentials, "s3", region)
-    auth.add_auth(request)
-
-    return request
-
-
-def create_livekit_client(custom_configuration=None):
-    """Create and return a configured LiveKit API client."""
-
-    custom_session = None
-
-    if not settings.LIVEKIT_VERIFY_SSL:
-        connector = aiohttp.TCPConnector(ssl=False)
-        custom_session = aiohttp.ClientSession(connector=connector)
-
-    # Use default configuration if none provided
-    configuration = custom_configuration or settings.LIVEKIT_CONFIGURATION
-
-    return LiveKitAPI(session=custom_session, **configuration)

src/backend/locale/de_DE/LC_MESSAGES/django.po

@@ -1,446 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-05-26 10:50+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: core/admin.py:26
-msgid "Personal info"
-msgstr "Persönliche Informationen"
-
-#: core/admin.py:39
-msgid "Permissions"
-msgstr "Berechtigungen"
-
-#: core/admin.py:51
-msgid "Important dates"
-msgstr "Wichtige Daten"
-
-#: core/admin.py:143
-msgid "No owner"
-msgstr "Kein Eigentümer"
-
-#: core/admin.py:146
-msgid "Multiple owners"
-msgstr "Mehrere Eigentümer"
-
-#: core/api/serializers.py:63
-msgid "You must be administrator or owner of a room to add accesses to it."
-msgstr ""
-"Sie müssen Administrator oder Eigentümer eines Raums sein, um Zugriffe "
-"hinzuzufügen."
-
-#: core/models.py:31
-msgid "Member"
-msgstr "Mitglied"
-
-#: core/models.py:32
-msgid "Administrator"
-msgstr "Administrator"
-
-#: core/models.py:33
-msgid "Owner"
-msgstr "Eigentümer"
-
-#: core/models.py:49
-msgid "Initiated"
-msgstr "Gestartet"
-
-#: core/models.py:50
-msgid "Active"
-msgstr "Aktiv"
-
-#: core/models.py:51
-msgid "Stopped"
-msgstr "Beendet"
-
-#: core/models.py:52
-msgid "Saved"
-msgstr "Gespeichert"
-
-#: core/models.py:53
-msgid "Aborted"
-msgstr "Abgebrochen"
-
-#: core/models.py:54
-msgid "Failed to Start"
-msgstr "Start fehlgeschlagen"
-
-#: core/models.py:55
-msgid "Failed to Stop"
-msgstr "Stopp fehlgeschlagen"
-
-#: core/models.py:56
-msgid "Notification succeeded"
-msgstr "Benachrichtigung erfolgreich"
-
-#: core/models.py:83
-msgid "SCREEN_RECORDING"
-msgstr "BILDSCHIRMAUFZEICHNUNG"
-
-#: core/models.py:84
-msgid "TRANSCRIPT"
-msgstr "TRANSKRIPT"
-
-#: core/models.py:90
-msgid "Public Access"
-msgstr "Öffentlicher Zugriff"
-
-#: core/models.py:91
-msgid "Trusted Access"
-msgstr "Vertrauenswürdiger Zugriff"
-
-#: core/models.py:92
-msgid "Restricted Access"
-msgstr "Eingeschränkter Zugriff"
-
-#: core/models.py:104
-msgid "id"
-msgstr "ID"
-
-#: core/models.py:105
-msgid "primary key for the record as UUID"
-msgstr "Primärschlüssel des Eintrags als UUID"
-
-#: core/models.py:111
-msgid "created on"
-msgstr "erstellt am"
-
-#: core/models.py:112
-msgid "date and time at which a record was created"
-msgstr "Datum und Uhrzeit der Erstellung eines Eintrags"
-
-#: core/models.py:117
-msgid "updated on"
-msgstr "aktualisiert am"
-
-#: core/models.py:118
-msgid "date and time at which a record was last updated"
-msgstr "Datum und Uhrzeit der letzten Aktualisierung eines Eintrags"
-
-#: core/models.py:138
-msgid ""
-"Enter a valid sub. This value may contain only letters, numbers, and @/./+/-/"
-"_ characters."
-msgstr ""
-"Geben Sie einen gültigen Sub ein. Dieser Wert darf nur Buchstaben, Zahlen "
-"und die Zeichen @/./+/-/_ enthalten."
-
-#: core/models.py:144
-msgid "sub"
-msgstr "Sub"
-
-#: core/models.py:146
-msgid ""
-"Required. 255 characters or fewer. Letters, numbers, and @/./+/-/_ "
-"characters only."
-msgstr ""
-"Erforderlich. Maximal 255 Zeichen. Nur Buchstaben, Zahlen und @/./+/-/_ sind "
-"erlaubt."
-
-#: core/models.py:154
-msgid "identity email address"
-msgstr "Identitäts-E-Mail-Adresse"
-
-#: core/models.py:159
-msgid "admin email address"
-msgstr "Administrator-E-Mail-Adresse"
-
-#: core/models.py:161
-msgid "full name"
-msgstr "Vollständiger Name"
-
-#: core/models.py:163
-msgid "short name"
-msgstr "Kurzname"
-
-#: core/models.py:169
-msgid "language"
-msgstr "Sprache"
-
-#: core/models.py:170
-msgid "The language in which the user wants to see the interface."
-msgstr "Die Sprache, in der der Benutzer die Oberfläche sehen möchte."
-
-#: core/models.py:176
-msgid "The timezone in which the user wants to see times."
-msgstr "Die Zeitzone, in der der Benutzer die Zeiten sehen möchte."
-
-#: core/models.py:179
-msgid "device"
-msgstr "Gerät"
-
-#: core/models.py:181
-msgid "Whether the user is a device or a real user."
-msgstr "Ob es sich um ein Gerät oder einen echten Benutzer handelt."
-
-#: core/models.py:184
-msgid "staff status"
-msgstr "Mitarbeiterstatus"
-
-#: core/models.py:186
-msgid "Whether the user can log into this admin site."
-msgstr "Ob der Benutzer sich bei dieser Admin-Seite anmelden kann."
-
-#: core/models.py:189
-msgid "active"
-msgstr "aktiv"
-
-#: core/models.py:192
-msgid ""
-"Whether this user should be treated as active. Unselect this instead of "
-"deleting accounts."
-msgstr ""
-"Ob dieser Benutzer als aktiv behandelt werden soll. Deaktivieren Sie dies "
-"anstelle des Löschens des Kontos."
-
-#: core/models.py:205
-msgid "user"
-msgstr "Benutzer"
-
-#: core/models.py:206
-msgid "users"
-msgstr "Benutzer"
-
-#: core/models.py:265
-msgid "Resource"
-msgstr "Ressource"
-
-#: core/models.py:266
-msgid "Resources"
-msgstr "Ressourcen"
-
-#: core/models.py:320
-msgid "Resource access"
-msgstr "Ressourcenzugriff"
-
-#: core/models.py:321
-msgid "Resource accesses"
-msgstr "Ressourcenzugriffe"
-
-#: core/models.py:327
-msgid "Resource access with this User and Resource already exists."
-msgstr ""
-"Ein Ressourcenzugriff mit diesem Benutzer und dieser Ressource existiert "
-"bereits."
-
-#: core/models.py:383
-msgid "Visio room configuration"
-msgstr "Visio-Raumkonfiguration"
-
-#: core/models.py:384
-msgid "Values for Visio parameters to configure the room."
-msgstr "Werte für Visio-Parameter zur Konfiguration des Raums."
-
-#: core/models.py:391
-msgid "Room PIN code"
-msgstr "PIN-Code für den Raum"
-
-#: core/models.py:392
-msgid "Unique n-digit code that identifies this room in telephony mode."
-msgstr "Eindeutiger n-stelliger Code, der diesen Raum im Telephonmodus identifiziert."
-
-#: core/models.py:398 core/models.py:552
-msgid "Room"
-msgstr "Raum"
-
-#: core/models.py:399
-msgid "Rooms"
-msgstr "Räume"
-
-#: core/models.py:563
-msgid "Worker ID"
-msgstr "Worker-ID"
-
-#: core/models.py:565
-msgid ""
-"Enter an identifier for the worker recording.This ID is retained even when "
-"the worker stops, allowing for easy tracking."
-msgstr ""
-"Geben Sie eine ID für die Aufzeichnung des Workers ein. Diese ID bleibt "
-"erhalten, auch wenn der Worker stoppt, was ein einfaches Nachverfolgen "
-"ermöglicht."
-
-#: core/models.py:573
-msgid "Recording mode"
-msgstr "Aufzeichnungsmodus"
-
-#: core/models.py:574
-msgid "Defines the mode of recording being called."
-msgstr "Definiert den aufgerufenen Aufzeichnungsmodus."
-
-#: core/models.py:580
-msgid "Recording"
-msgstr "Aufzeichnung"
-
-#: core/models.py:581
-msgid "Recordings"
-msgstr "Aufzeichnungen"
-
-#: core/models.py:689
-msgid "Recording/user relation"
-msgstr "Beziehung Aufzeichnung/Benutzer"
-
-#: core/models.py:690
-msgid "Recording/user relations"
-msgstr "Beziehungen Aufzeichnung/Benutzer"
-
-#: core/models.py:696
-msgid "This user is already in this recording."
-msgstr "Dieser Benutzer ist bereits Teil dieser Aufzeichnung."
-
-#: core/models.py:702
-msgid "This team is already in this recording."
-msgstr "Dieses Team ist bereits Teil dieser Aufzeichnung."
-
-#: core/models.py:708
-msgid "Either user or team must be set, not both."
-msgstr "Entweder Benutzer oder Team muss festgelegt werden, nicht beides."
-
-#: core/recording/event/notification.py:94
-msgid "Your recording is ready"
-msgstr "Ihre Aufzeichnung ist bereit"
-
-#: core/services/invitation.py:44
-#, python-brace-format
-msgid "Video call in progress: {sender.email} is waiting for you to connect"
-msgstr "Videoanruf läuft: {sender.email} wartet auf Ihre Teilnahme"
-
-#: core/templates/mail/html/invitation.html:159
-#: core/templates/mail/html/screen_recording.html:159
-#: core/templates/mail/text/invitation.txt:3
-#: core/templates/mail/text/screen_recording.txt:3
-msgid "Logo email"
-msgstr "Logo-E-Mail"
-
-#: core/templates/mail/html/invitation.html:189
-#: core/templates/mail/text/invitation.txt:5
-msgid "invites you to join an ongoing video call"
-msgstr "lädt Sie zu einem laufenden Videoanruf ein"
-
-#: core/templates/mail/html/invitation.html:200
-#: core/templates/mail/text/invitation.txt:7
-msgid "JOIN THE CALL"
-msgstr "AM ANRUF TEILNEHMEN"
-
-#: core/templates/mail/html/invitation.html:227
-#: core/templates/mail/text/invitation.txt:13
-msgid ""
-"If you can't click the button, copy and paste the URL into your browser to "
-"join the call."
-msgstr ""
-"Wenn Sie den Button nicht anklicken können, kopieren Sie die URL und fügen "
-"Sie sie in Ihren Browser ein, um am Anruf teilzunehmen."
-
-#: core/templates/mail/html/invitation.html:235
-#: core/templates/mail/text/invitation.txt:15
-msgid "Tips for a better experience:"
-msgstr "Tipps für ein besseres Erlebnis:"
-
-#: core/templates/mail/html/invitation.html:237
-#: core/templates/mail/text/invitation.txt:17
-msgid "Use Chrome or Firefox for better call quality"
-msgstr "Verwenden Sie Chrome oder Firefox für eine bessere Anrufqualität"
-
-#: core/templates/mail/html/invitation.html:238
-#: core/templates/mail/text/invitation.txt:18
-msgid "Test your microphone and camera before joining"
-msgstr "Testen Sie Ihr Mikrofon und Ihre Kamera vor dem Beitritt"
-
-#: core/templates/mail/html/invitation.html:239
-#: core/templates/mail/text/invitation.txt:19
-msgid "Make sure you have a stable internet connection"
-msgstr "Stellen Sie sicher, dass Sie eine stabile Internetverbindung haben"
-
-#: core/templates/mail/html/invitation.html:248
-#: core/templates/mail/html/screen_recording.html:240
-#: core/templates/mail/text/invitation.txt:21
-#: core/templates/mail/text/screen_recording.txt:22
-#, python-format
-msgid " Thank you for using %(brandname)s. "
-msgstr " Vielen Dank für die Nutzung von %(brandname)s. "
-
-#: core/templates/mail/html/screen_recording.html:188
-#: core/templates/mail/text/screen_recording.txt:6
-msgid "Your recording is ready!"
-msgstr "Ihre Aufzeichnung ist fertig!"
-
-#: core/templates/mail/html/screen_recording.html:195
-#: core/templates/mail/text/screen_recording.txt:8
-#, python-format
-msgid ""
-" Your recording of \"%(room_name)s\" on %(recording_date)s at "
-"%(recording_time)s is now ready to download. "
-msgstr ""
-" Ihre Aufzeichnung von \"%(room_name)s\" am %(recording_date)s um "
-"%(recording_time)s steht nun zum Herunterladen bereit. "
-
-#: core/templates/mail/html/screen_recording.html:195
-#: core/templates/mail/text/screen_recording.txt:8
-#, python-format
-msgid " The recording will expire in %(days)s days. "
-msgstr " Die Aufzeichnung wird in %(days)s Tagen ablaufen. "
-
-#: core/templates/mail/html/screen_recording.html:201
-#: core/templates/mail/text/screen_recording.txt:10
-msgid "To keep this recording permanently:"
-msgstr "So speichern Sie diese Aufzeichnung dauerhaft:"
-
-#: core/templates/mail/html/screen_recording.html:203
-#: core/templates/mail/text/screen_recording.txt:12
-msgid "Click the \"Open\" button below "
-msgstr "Klicken Sie auf den Button „Öffnen“ unten "
-
-#: core/templates/mail/html/screen_recording.html:204
-#: core/templates/mail/text/screen_recording.txt:13
-msgid "Use the \"Download\" button in the interface "
-msgstr "Verwenden Sie den Button „Herunterladen“ in der Oberfläche "
-
-#: core/templates/mail/html/screen_recording.html:205
-#: core/templates/mail/text/screen_recording.txt:14
-msgid "Save the file to your preferred location"
-msgstr "Speichern Sie die Datei an einem gewünschten Ort"
-
-#: core/templates/mail/html/screen_recording.html:216
-#: core/templates/mail/text/screen_recording.txt:16
-msgid "Open"
-msgstr "Öffnen"
-
-#: core/templates/mail/html/screen_recording.html:225
-#: core/templates/mail/text/screen_recording.txt:18
-#, python-format
-msgid ""
-" If you have any questions or need assistance, please contact our support "
-"team at %(support_email)s. "
-msgstr ""
-" Wenn Sie Fragen haben oder Unterstützung benötigen, wenden Sie sich bitte "
-"an unser Support-Team unter %(support_email)s. "
-
-#: meet/settings.py:162
-msgid "English"
-msgstr "Englisch"
-
-#: meet/settings.py:163
-msgid "French"
-msgstr "Französisch"
-
-#: meet/settings.py:164
-msgid "Dutch"
-msgstr "Niederländisch"
-
-#: meet/settings.py:165
-msgid "German"
-msgstr "Deutsch"

src/backend/locale/en_US/LC_MESSAGES/django.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-05-26 10:50+0000\n"
+"POT-Creation-Date: 2024-04-03 10:31+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,425 +17,192 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: core/admin.py:26
+#: core/admin.py:31
 msgid "Personal info"
 msgstr ""
 
-#: core/admin.py:39
+#: core/admin.py:33
 msgid "Permissions"
-msgstr "Permissions"
+msgstr ""
 
-#: core/admin.py:51
+#: core/admin.py:45
 msgid "Important dates"
-msgstr "Important dates"
+msgstr ""
 
-#: core/admin.py:143
-msgid "No owner"
-msgstr "No owner"
+#: core/api/serializers.py:128
+msgid "Markdown Body"
+msgstr ""
 
-#: core/admin.py:146
-msgid "Multiple owners"
-msgstr "Multiple owners"
+#: core/authentication.py:71
+msgid "User info contained no recognizable user identification"
+msgstr ""
 
-#: core/api/serializers.py:63
-msgid "You must be administrator or owner of a room to add accesses to it."
-msgstr "You must be administrator or owner of a room to add accesses to it."
+#: core/authentication.py:91
+msgid "Claims contained no recognizable user identification"
+msgstr ""
 
-#: core/models.py:31
+#: core/models.py:27
 msgid "Member"
-msgstr "Member"
+msgstr ""
 
-#: core/models.py:32
+#: core/models.py:28
 msgid "Administrator"
-msgstr "Administrator"
+msgstr ""
 
-#: core/models.py:33
+#: core/models.py:29
 msgid "Owner"
-msgstr "Owner"
+msgstr ""
+
+#: core/models.py:41
+msgid "id"
+msgstr ""
+
+#: core/models.py:42
+msgid "primary key for the record as UUID"
+msgstr ""
+
+#: core/models.py:48
+msgid "created on"
+msgstr ""
 
 #: core/models.py:49
-msgid "Initiated"
-msgstr "Initiated"
-
-#: core/models.py:50
-msgid "Active"
-msgstr "Active"
-
-#: core/models.py:51
-msgid "Stopped"
-msgstr "Stopped"
-
-#: core/models.py:52
-msgid "Saved"
-msgstr "Saved"
-
-#: core/models.py:53
-msgid "Aborted"
-msgstr "Aborted"
+msgid "date and time at which a record was created"
+msgstr ""
 
 #: core/models.py:54
-msgid "Failed to Start"
-msgstr "Failed to Start"
+msgid "updated on"
+msgstr ""
 
 #: core/models.py:55
-msgid "Failed to Stop"
-msgstr "Failed to Stop"
+msgid "date and time at which a record was last updated"
+msgstr ""
 
-#: core/models.py:56
-msgid "Notification succeeded"
-msgstr "Notification succeeded"
+#: core/models.py:75
+msgid ""
+"Enter a valid sub. This value may contain only letters, numbers, and @/./+/-/"
+"_ characters."
+msgstr ""
+
+#: core/models.py:81
+msgid "sub"
+msgstr ""
 
 #: core/models.py:83
-msgid "SCREEN_RECORDING"
-msgstr "SCREEN_RECORDING"
-
-#: core/models.py:84
-msgid "TRANSCRIPT"
-msgstr "TRANSCRIPT"
-
-#: core/models.py:90
-msgid "Public Access"
-msgstr "Public Access"
+msgid ""
+"Required. 255 characters or fewer. Letters, numbers, and @/./+/-/_ "
+"characters only."
+msgstr ""
 
 #: core/models.py:91
-msgid "Trusted Access"
-msgstr "Trusted Access"
+msgid "identity email address"
+msgstr ""
 
-#: core/models.py:92
-msgid "Restricted Access"
-msgstr "Restricted Access"
+#: core/models.py:96
+msgid "admin email address"
+msgstr ""
+
+#: core/models.py:103
+msgid "language"
+msgstr ""
 
 #: core/models.py:104
-msgid "id"
-msgstr "id"
+msgid "The language in which the user wants to see the interface."
+msgstr ""
 
-#: core/models.py:105
-msgid "primary key for the record as UUID"
-msgstr "primary key for the record as UUID"
+#: core/models.py:110
+msgid "The timezone in which the user wants to see times."
+msgstr ""
 
-#: core/models.py:111
-msgid "created on"
-msgstr "created on"
+#: core/models.py:113
+msgid "device"
+msgstr ""
 
-#: core/models.py:112
-msgid "date and time at which a record was created"
-msgstr "date and time at which a record was created"
-
-#: core/models.py:117
-msgid "updated on"
-msgstr "updated on"
+#: core/models.py:115
+msgid "Whether the user is a device or a real user."
+msgstr ""
 
 #: core/models.py:118
-msgid "date and time at which a record was last updated"
-msgstr "date and time at which a record was last updated"
+msgid "staff status"
+msgstr ""
+
+#: core/models.py:120
+msgid "Whether the user can log into this admin site."
+msgstr ""
+
+#: core/models.py:123
+msgid "active"
+msgstr ""
+
+#: core/models.py:126
+msgid ""
+"Whether this user should be treated as active. Unselect this instead of "
+"deleting accounts."
+msgstr ""
 
 #: core/models.py:138
-msgid ""
-"Enter a valid sub. This value may contain only letters, numbers, and @/./+/-/"
-"_ characters."
+msgid "user"
 msgstr ""
-"Enter a valid sub. This value may contain only letters, numbers, and @/./+/-/"
-"_ characters."
 
-#: core/models.py:144
-msgid "sub"
-msgstr "sub"
-
-#: core/models.py:146
-msgid ""
-"Required. 255 characters or fewer. Letters, numbers, and @/./+/-/_ "
-"characters only."
+#: core/models.py:139
+msgid "users"
 msgstr ""
-"Required. 255 characters or fewer. Letters, numbers, and @/./+/-/_ "
-"characters only."
-
-#: core/models.py:154
-msgid "identity email address"
-msgstr "identity email address"
-
-#: core/models.py:159
-msgid "admin email address"
-msgstr "admin email address"
 
 #: core/models.py:161
-msgid "full name"
-msgstr "full name"
+msgid "title"
+msgstr ""
+
+#: core/models.py:162
+msgid "description"
+msgstr ""
 
 #: core/models.py:163
-msgid "short name"
-msgstr "short name"
-
-#: core/models.py:169
-msgid "language"
-msgstr "language"
-
-#: core/models.py:170
-msgid "The language in which the user wants to see the interface."
-msgstr "The language in which the user wants to see the interface."
-
-#: core/models.py:176
-msgid "The timezone in which the user wants to see times."
-msgstr "The timezone in which the user wants to see times."
-
-#: core/models.py:179
-msgid "device"
-msgstr "device"
-
-#: core/models.py:181
-msgid "Whether the user is a device or a real user."
-msgstr "Whether the user is a device or a real user."
-
-#: core/models.py:184
-msgid "staff status"
-msgstr "staff status"
-
-#: core/models.py:186
-msgid "Whether the user can log into this admin site."
-msgstr "Whether the user can log into this admin site."
-
-#: core/models.py:189
-msgid "active"
-msgstr "active"
-
-#: core/models.py:192
-msgid ""
-"Whether this user should be treated as active. Unselect this instead of "
-"deleting accounts."
+msgid "code"
 msgstr ""
-"Whether this user should be treated as active. Unselect this instead of "
-"deleting accounts."
 
-#: core/models.py:205
-msgid "user"
-msgstr "user"
-
-#: core/models.py:206
-msgid "users"
-msgstr "users"
-
-#: core/models.py:265
-msgid "Resource"
-msgstr "Resource"
-
-#: core/models.py:266
-msgid "Resources"
-msgstr "Resources"
-
-#: core/models.py:320
-msgid "Resource access"
-msgstr "Resource access"
-
-#: core/models.py:321
-msgid "Resource accesses"
-msgstr "Resource accesses"
-
-#: core/models.py:327
-msgid "Resource access with this User and Resource already exists."
-msgstr "Resource access with this User and Resource already exists."
-
-#: core/models.py:383
-msgid "Visio room configuration"
-msgstr "Visio room configuration"
-
-#: core/models.py:384
-msgid "Values for Visio parameters to configure the room."
-msgstr "Values for Visio parameters to configure the room."
-
-#: core/models.py:391
-msgid "Room PIN code"
-msgstr "Room PIN code"
-
-#: core/models.py:392
-msgid "Unique n-digit code that identifies this room in telephony mode."
-msgstr "Unique n-digit code that identifies this room in telephony mode."
-
-#: core/models.py:398 core/models.py:552
-msgid "Room"
-msgstr "Room"
-
-#: core/models.py:399
-msgid "Rooms"
-msgstr "Rooms"
-
-#: core/models.py:563
-msgid "Worker ID"
-msgstr "Worker ID"
-
-#: core/models.py:565
-msgid ""
-"Enter an identifier for the worker recording.This ID is retained even when "
-"the worker stops, allowing for easy tracking."
+#: core/models.py:164
+msgid "css"
 msgstr ""
-"Enter an identifier for the worker recording.This ID is retained even when "
-"the worker stops, allowing for easy tracking."
 
-#: core/models.py:573
-msgid "Recording mode"
-msgstr "Recording mode"
+#: core/models.py:166
+msgid "public"
+msgstr ""
 
-#: core/models.py:574
-msgid "Defines the mode of recording being called."
-msgstr "Defines the mode of recording being called."
+#: core/models.py:168
+msgid "Whether this template is public for anyone to use."
+msgstr ""
 
-#: core/models.py:580
-msgid "Recording"
-msgstr "Recording"
+#: core/models.py:174
+msgid "Template"
+msgstr ""
 
-#: core/models.py:581
-msgid "Recordings"
-msgstr "Recordings"
+#: core/models.py:175
+msgid "Templates"
+msgstr ""
 
-#: core/models.py:689
-msgid "Recording/user relation"
-msgstr "Recording/user relation"
+#: core/models.py:256
+msgid "Template/user relation"
+msgstr ""
 
-#: core/models.py:690
-msgid "Recording/user relations"
-msgstr "Recording/user relations"
+#: core/models.py:257
+msgid "Template/user relations"
+msgstr ""
 
-#: core/models.py:696
-msgid "This user is already in this recording."
-msgstr "This user is already in this recording."
+#: core/models.py:263
+msgid "This user is already in this template."
+msgstr ""
 
-#: core/models.py:702
-msgid "This team is already in this recording."
-msgstr "This team is already in this recording."
+#: core/models.py:269
+msgid "This team is already in this template."
+msgstr ""
 
-#: core/models.py:708
+#: core/models.py:275
 msgid "Either user or team must be set, not both."
-msgstr "Either user or team must be set, not both."
-
-#: core/recording/event/notification.py:94
-msgid "Your recording is ready"
-msgstr "Your recording is ready"
-
-#: core/services/invitation.py:44
-#, python-brace-format
-msgid "Video call in progress: {sender.email} is waiting for you to connect"
-msgstr "Video call in progress: {sender.email} is waiting for you to connect"
-
-#: core/templates/mail/html/invitation.html:159
-#: core/templates/mail/html/screen_recording.html:159
-#: core/templates/mail/text/invitation.txt:3
-#: core/templates/mail/text/screen_recording.txt:3
-msgid "Logo email"
-msgstr "Logo email"
-
-#: core/templates/mail/html/invitation.html:189
-#: core/templates/mail/text/invitation.txt:5
-msgid "invites you to join an ongoing video call"
-msgstr "invites you to join an ongoing video call"
-
-#: core/templates/mail/html/invitation.html:200
-#: core/templates/mail/text/invitation.txt:7
-msgid "JOIN THE CALL"
-msgstr "JOIN THE CALL"
-
-#: core/templates/mail/html/invitation.html:227
-#: core/templates/mail/text/invitation.txt:13
-msgid ""
-"If you can't click the button, copy and paste the URL into your browser to "
-"join the call."
 msgstr ""
-"If you can't click the button, copy and paste the URL into your browser to "
-"join the call."
 
-#: core/templates/mail/html/invitation.html:235
-#: core/templates/mail/text/invitation.txt:15
-msgid "Tips for a better experience:"
-msgstr "Tips for a better experience:"
-
-#: core/templates/mail/html/invitation.html:237
-#: core/templates/mail/text/invitation.txt:17
-msgid "Use Chrome or Firefox for better call quality"
-msgstr "Use Chrome or Firefox for better call quality"
-
-#: core/templates/mail/html/invitation.html:238
-#: core/templates/mail/text/invitation.txt:18
-msgid "Test your microphone and camera before joining"
-msgstr "Test your microphone and camera before joining"
-
-#: core/templates/mail/html/invitation.html:239
-#: core/templates/mail/text/invitation.txt:19
-msgid "Make sure you have a stable internet connection"
-msgstr "Make sure you have a stable internet connection"
-
-#: core/templates/mail/html/invitation.html:248
-#: core/templates/mail/html/screen_recording.html:240
-#: core/templates/mail/text/invitation.txt:21
-#: core/templates/mail/text/screen_recording.txt:22
-#, python-format
-msgid " Thank you for using %(brandname)s. "
-msgstr " Thank you for using %(brandname)s. "
-
-#: core/templates/mail/html/screen_recording.html:188
-#: core/templates/mail/text/screen_recording.txt:6
-msgid "Your recording is ready!"
-msgstr "Your recording is ready!"
-
-#: core/templates/mail/html/screen_recording.html:195
-#: core/templates/mail/text/screen_recording.txt:8
-#, python-format
-msgid ""
-" Your recording of \"%(room_name)s\" on %(recording_date)s at "
-"%(recording_time)s is now ready to download. "
-msgstr ""
-" Your recording of \"%(room_name)s\" on %(recording_date)s at "
-"%(recording_time)s is now ready to download. "
-
-#: core/templates/mail/html/screen_recording.html:195
-#: core/templates/mail/text/screen_recording.txt:8
-#, python-format
-msgid " The recording will expire in %(days)s days. "
-msgstr " The recording will expire in %(days)s days. "
-
-#: core/templates/mail/html/screen_recording.html:201
-#: core/templates/mail/text/screen_recording.txt:10
-msgid "To keep this recording permanently:"
-msgstr "To keep this recording permanently:"
-
-#: core/templates/mail/html/screen_recording.html:203
-#: core/templates/mail/text/screen_recording.txt:12
-msgid "Click the \"Open\" button below "
-msgstr "Click the \"Open\" button below "
-
-#: core/templates/mail/html/screen_recording.html:204
-#: core/templates/mail/text/screen_recording.txt:13
-msgid "Use the \"Download\" button in the interface "
-msgstr "Use the \"Download\" button in the interface "
-
-#: core/templates/mail/html/screen_recording.html:205
-#: core/templates/mail/text/screen_recording.txt:14
-msgid "Save the file to your preferred location"
-msgstr "Save the file to your preferred location"
-
-#: core/templates/mail/html/screen_recording.html:216
-#: core/templates/mail/text/screen_recording.txt:16
-msgid "Open"
-msgstr "Open"
-
-#: core/templates/mail/html/screen_recording.html:225
-#: core/templates/mail/text/screen_recording.txt:18
-#, python-format
-msgid ""
-" If you have any questions or need assistance, please contact our support "
-"team at %(support_email)s. "
-msgstr ""
-" If you have any questions or need assistance, please contact our support "
-"team at %(support_email)s. "
-
-#: meet/settings.py:162
+#: meet/settings.py:134
 msgid "English"
-msgstr "English"
+msgstr ""
 
-#: meet/settings.py:163
+#: meet/settings.py:135
 msgid "French"
-msgstr "French"
-
-#: meet/settings.py:164
-msgid "Dutch"
-msgstr "Dutch"
-
-#: meet/settings.py:165
-msgid "German"
-msgstr "German"
+msgstr ""

src/backend/locale/fr_FR/LC_MESSAGES/django.po

@@ -8,440 +8,201 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-05-26 10:50+0000\n"
+"POT-Creation-Date: 2024-04-03 10:31+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: antoine.lebaud@mail.numerique.gouv.fr\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: core/admin.py:26
+#: core/admin.py:31
 msgid "Personal info"
-msgstr "Informations personnelles"
-
-#: core/admin.py:39
-msgid "Permissions"
-msgstr "Permissions"
-
-#: core/admin.py:51
-msgid "Important dates"
-msgstr "Dates importantes"
-
-#: core/admin.py:143
-msgid "No owner"
-msgstr "Pas de propriétaire"
-
-#: core/admin.py:146
-msgid "Multiple owners"
-msgstr "Plusieurs propriétaires"
-
-#: core/api/serializers.py:63
-msgid "You must be administrator or owner of a room to add accesses to it."
 msgstr ""
-"Vous devez être administrateur ou propriétaire d'une salle pour y ajouter "
-"des accès."
 
-#: core/models.py:31
+#: core/admin.py:33
+msgid "Permissions"
+msgstr ""
+
+#: core/admin.py:45
+msgid "Important dates"
+msgstr ""
+
+#: core/api/serializers.py:128
+msgid "Markdown Body"
+msgstr ""
+
+#: core/authentication.py:71
+msgid "User info contained no recognizable user identification"
+msgstr ""
+
+#: core/authentication.py:91
+msgid "Claims contained no recognizable user identification"
+msgstr ""
+
+#: core/models.py:27
 msgid "Member"
-msgstr "Membre"
+msgstr ""
 
-#: core/models.py:32
+#: core/models.py:28
 msgid "Administrator"
-msgstr "Administrateur"
+msgstr ""
 
-#: core/models.py:33
+#: core/models.py:29
 msgid "Owner"
-msgstr "Propriétaire"
+msgstr ""
+
+#: core/models.py:41
+msgid "id"
+msgstr ""
+
+#: core/models.py:42
+msgid "primary key for the record as UUID"
+msgstr ""
+
+#: core/models.py:48
+msgid "created on"
+msgstr ""
 
 #: core/models.py:49
-msgid "Initiated"
-msgstr "Initié"
-
-#: core/models.py:50
-msgid "Active"
-msgstr "Actif"
-
-#: core/models.py:51
-msgid "Stopped"
-msgstr "Arrêté"
-
-#: core/models.py:52
-msgid "Saved"
-msgstr "Enregistré"
-
-#: core/models.py:53
-msgid "Aborted"
-msgstr "Abandonné"
+msgid "date and time at which a record was created"
+msgstr ""
 
 #: core/models.py:54
-msgid "Failed to Start"
-msgstr "Échec au démarrage"
+msgid "updated on"
+msgstr ""
 
 #: core/models.py:55
-msgid "Failed to Stop"
-msgstr "Échec à l'arrêt"
-
-#: core/models.py:56
-msgid "Notification succeeded"
-msgstr "Notification réussie"
-
-#: core/models.py:83
-msgid "SCREEN_RECORDING"
-msgstr "ENREGISTREMENT_ÉCRAN"
-
-#: core/models.py:84
-msgid "TRANSCRIPT"
-msgstr "TRANSCRIPTION"
-
-#: core/models.py:90
-msgid "Public Access"
-msgstr "Accès public"
-
-#: core/models.py:91
-msgid "Trusted Access"
-msgstr "Accès de confiance"
-
-#: core/models.py:92
-msgid "Restricted Access"
-msgstr "Accès restreint"
-
-#: core/models.py:104
-msgid "id"
-msgstr "id"
-
-#: core/models.py:105
-msgid "primary key for the record as UUID"
-msgstr "clé primaire pour l'enregistrement sous forme d'UUID"
-
-#: core/models.py:111
-msgid "created on"
-msgstr "créé le"
-
-#: core/models.py:112
-msgid "date and time at which a record was created"
-msgstr "date et heure auxquelles un enregistrement a été créé"
-
-#: core/models.py:117
-msgid "updated on"
-msgstr "mis à jour le"
-
-#: core/models.py:118
 msgid "date and time at which a record was last updated"
 msgstr ""
-"date et heure auxquelles un enregistrement a été mis à jour pour la dernière "
-"fois"
 
-#: core/models.py:138
+#: core/models.py:75
 msgid ""
 "Enter a valid sub. This value may contain only letters, numbers, and @/./+/-/"
 "_ characters."
 msgstr ""
-"Entrez un sub valide. Cette valeur ne peut contenir que des lettres, "
-"des chiffres et les caractères @/./+/-/_."
 
-#: core/models.py:144
+#: core/models.py:81
 msgid "sub"
-msgstr "sub"
+msgstr ""
 
-#: core/models.py:146
+#: core/models.py:83
 msgid ""
 "Required. 255 characters or fewer. Letters, numbers, and @/./+/-/_ "
 "characters only."
 msgstr ""
-"Obligatoire. 255 caractères ou moins. Lettres, chiffres et caractères @/./"
-"+/-/_ uniquement."
 
-#: core/models.py:154
+#: core/models.py:91
 msgid "identity email address"
-msgstr "adresse e-mail d'identité"
+msgstr ""
 
-#: core/models.py:159
+#: core/models.py:96
 msgid "admin email address"
-msgstr "adresse e-mail d'administrateur"
+msgstr ""
 
-#: core/models.py:161
-msgid "full name"
-msgstr "nom complet"
-
-#: core/models.py:163
-msgid "short name"
-msgstr "nom court"
-
-#: core/models.py:169
+#: core/models.py:103
 msgid "language"
-msgstr "langue"
+msgstr ""
 
-#: core/models.py:170
+#: core/models.py:104
 msgid "The language in which the user wants to see the interface."
-msgstr "La langue dans laquelle l'utilisateur souhaite voir l'interface."
+msgstr ""
 
-#: core/models.py:176
+#: core/models.py:110
 msgid "The timezone in which the user wants to see times."
-msgstr "Le fuseau horaire dans lequel l'utilisateur souhaite voir les heures."
+msgstr ""
 
-#: core/models.py:179
+#: core/models.py:113
 msgid "device"
-msgstr "appareil"
+msgstr ""
 
-#: core/models.py:181
+#: core/models.py:115
 msgid "Whether the user is a device or a real user."
-msgstr "Si l'utilisateur est un appareil ou un utilisateur réel."
+msgstr ""
 
-#: core/models.py:184
+#: core/models.py:118
 msgid "staff status"
-msgstr "statut du personnel"
+msgstr ""
 
-#: core/models.py:186
+#: core/models.py:120
 msgid "Whether the user can log into this admin site."
-msgstr "Si l'utilisateur peut se connecter à ce site d'administration."
+msgstr ""
 
-#: core/models.py:189
+#: core/models.py:123
 msgid "active"
-msgstr "actif"
+msgstr ""
 
-#: core/models.py:192
+#: core/models.py:126
 msgid ""
 "Whether this user should be treated as active. Unselect this instead of "
 "deleting accounts."
 msgstr ""
-"Si cet utilisateur doit être traité comme actif. Désélectionnez cette option "
-"au lieu de supprimer des comptes."
 
-#: core/models.py:205
+#: core/models.py:138
 msgid "user"
-msgstr "utilisateur"
+msgstr ""
 
-#: core/models.py:206
+#: core/models.py:139
 msgid "users"
-msgstr "utilisateurs"
-
-#: core/models.py:265
-msgid "Resource"
-msgstr "Ressource"
-
-#: core/models.py:266
-msgid "Resources"
-msgstr "Ressources"
-
-#: core/models.py:320
-msgid "Resource access"
-msgstr "Accès aux ressources"
-
-#: core/models.py:321
-msgid "Resource accesses"
-msgstr "Accès aux ressources"
-
-#: core/models.py:327
-msgid "Resource access with this User and Resource already exists."
 msgstr ""
-"L'accès à la ressource avec cet utilisateur et cette ressource existe déjà."
 
-#: core/models.py:383
-msgid "Visio room configuration"
-msgstr "Configuration de la salle de visioconférence"
-
-#: core/models.py:384
-msgid "Values for Visio parameters to configure the room."
-msgstr "Valeurs des paramètres de visioconférence pour configurer la salle."
-
-#: core/models.py:391
-msgid "Room PIN code"
-msgstr "Code PIN de la salle"
-
-#: core/models.py:392
-msgid "Unique n-digit code that identifies this room in telephony mode."
-msgstr "Code unique à n chiffres qui identifie cette salle en mode téléphonique."
-
-#: core/models.py:398 core/models.py:552
-msgid "Room"
-msgstr "Salle"
-
-#: core/models.py:399
-msgid "Rooms"
-msgstr "Salles"
-
-#: core/models.py:563
-msgid "Worker ID"
-msgstr "ID du Worker"
-
-#: core/models.py:565
-msgid ""
-"Enter an identifier for the worker recording.This ID is retained even when "
-"the worker stops, allowing for easy tracking."
+#: core/models.py:161
+msgid "title"
 msgstr ""
-"Entrez un identifiant pour l'enregistrement du Worker. Cet identifiant "
-"est conservé même lorsque le Worker s'arrête, permettant un suivi "
-"facile."
 
-#: core/models.py:573
-msgid "Recording mode"
-msgstr "Mode d'enregistrement"
+#: core/models.py:162
+msgid "description"
+msgstr ""
 
-#: core/models.py:574
-msgid "Defines the mode of recording being called."
-msgstr "Définit le mode d'enregistrement appelé."
+#: core/models.py:163
+msgid "code"
+msgstr ""
 
-#: core/models.py:580
-msgid "Recording"
-msgstr "Enregistrement"
+#: core/models.py:164
+msgid "css"
+msgstr ""
 
-#: core/models.py:581
-msgid "Recordings"
-msgstr "Enregistrements"
+#: core/models.py:166
+msgid "public"
+msgstr ""
 
-#: core/models.py:689
-msgid "Recording/user relation"
-msgstr "Relation enregistrement/utilisateur"
+#: core/models.py:168
+msgid "Whether this template is public for anyone to use."
+msgstr ""
 
-#: core/models.py:690
-msgid "Recording/user relations"
-msgstr "Relations enregistrement/utilisateur"
+#: core/models.py:174
+msgid "Template"
+msgstr ""
 
-#: core/models.py:696
-msgid "This user is already in this recording."
-msgstr "Cet utilisateur est déjà dans cet enregistrement."
+#: core/models.py:175
+msgid "Templates"
+msgstr ""
 
-#: core/models.py:702
-msgid "This team is already in this recording."
-msgstr "Cette équipe est déjà dans cet enregistrement."
+#: core/models.py:256
+msgid "Template/user relation"
+msgstr ""
 
-#: core/models.py:708
+#: core/models.py:257
+msgid "Template/user relations"
+msgstr ""
+
+#: core/models.py:263
+msgid "This user is already in this template."
+msgstr ""
+
+#: core/models.py:269
+msgid "This team is already in this template."
+msgstr ""
+
+#: core/models.py:275
 msgid "Either user or team must be set, not both."
-msgstr "Soit l'utilisateur, soit l'équipe doit être défini, pas les deux."
-
-#: core/recording/event/notification.py:94
-msgid "Your recording is ready"
-msgstr "Votre enregistrement est prêt"
-
-#: core/services/invitation.py:44
-#, python-brace-format
-msgid "Video call in progress: {sender.email} is waiting for you to connect"
-msgstr "Appel vidéo en cours : {sender.email} attend que vous vous connectiez"
-
-#: core/templates/mail/html/invitation.html:159
-#: core/templates/mail/html/screen_recording.html:159
-#: core/templates/mail/text/invitation.txt:3
-#: core/templates/mail/text/screen_recording.txt:3
-msgid "Logo email"
-msgstr "Logo email"
-
-#: core/templates/mail/html/invitation.html:189
-#: core/templates/mail/text/invitation.txt:5
-msgid "invites you to join an ongoing video call"
-msgstr "vous invite à rejoindre un appel vidéo en cours"
-
-#: core/templates/mail/html/invitation.html:200
-#: core/templates/mail/text/invitation.txt:7
-msgid "JOIN THE CALL"
-msgstr "REJOINDRE L'APPEL"
-
-#: core/templates/mail/html/invitation.html:227
-#: core/templates/mail/text/invitation.txt:13
-msgid ""
-"If you can't click the button, copy and paste the URL into your browser to "
-"join the call."
 msgstr ""
-"Si vous ne pouvez pas cliquer sur le bouton, copiez et collez l'URL dans "
-"votre navigateur pour rejoindre l'appel."
 
-#: core/templates/mail/html/invitation.html:235
-#: core/templates/mail/text/invitation.txt:15
-msgid "Tips for a better experience:"
-msgstr "Conseils pour une meilleure expérience :"
-
-#: core/templates/mail/html/invitation.html:237
-#: core/templates/mail/text/invitation.txt:17
-msgid "Use Chrome or Firefox for better call quality"
-msgstr "Utilisez Chrome ou Firefox pour une meilleure qualité d'appel"
-
-#: core/templates/mail/html/invitation.html:238
-#: core/templates/mail/text/invitation.txt:18
-msgid "Test your microphone and camera before joining"
-msgstr "Testez votre microphone et votre caméra avant de rejoindre"
-
-#: core/templates/mail/html/invitation.html:239
-#: core/templates/mail/text/invitation.txt:19
-msgid "Make sure you have a stable internet connection"
-msgstr "Assurez-vous d'avoir une connexion Internet stable"
-
-#: core/templates/mail/html/invitation.html:248
-#: core/templates/mail/html/screen_recording.html:240
-#: core/templates/mail/text/invitation.txt:21
-#: core/templates/mail/text/screen_recording.txt:22
-#, python-format
-msgid " Thank you for using %(brandname)s. "
-msgstr " Merci d'utiliser %(brandname)s. "
-
-#: core/templates/mail/html/screen_recording.html:188
-#: core/templates/mail/text/screen_recording.txt:6
-msgid "Your recording is ready!"
-msgstr "Votre enregistrement est prêt !"
-
-#: core/templates/mail/html/screen_recording.html:195
-#: core/templates/mail/text/screen_recording.txt:8
-#, python-format
-msgid ""
-" Your recording of \"%(room_name)s\" on %(recording_date)s at "
-"%(recording_time)s is now ready to download. "
-msgstr ""
-" Votre enregistrement de \"%(room_name)s\" du %(recording_date)s à "
-"%(recording_time)s est maintenant prêt à être téléchargé. "
-
-#: core/templates/mail/html/screen_recording.html:195
-#: core/templates/mail/text/screen_recording.txt:8
-#, python-format
-msgid " The recording will expire in %(days)s days. "
-msgstr " L'enregistrement expirera dans %(days)s jours. "
-
-#: core/templates/mail/html/screen_recording.html:201
-#: core/templates/mail/text/screen_recording.txt:10
-msgid "To keep this recording permanently:"
-msgstr "Pour conserver cet enregistrement de façon permanente :"
-
-#: core/templates/mail/html/screen_recording.html:203
-#: core/templates/mail/text/screen_recording.txt:12
-msgid "Click the \"Open\" button below "
-msgstr "Cliquez sur le bouton \"Ouvrir\" ci-dessous "
-
-#: core/templates/mail/html/screen_recording.html:204
-#: core/templates/mail/text/screen_recording.txt:13
-msgid "Use the \"Download\" button in the interface "
-msgstr "Utilisez le bouton \"Télécharger\" dans l'interface "
-
-#: core/templates/mail/html/screen_recording.html:205
-#: core/templates/mail/text/screen_recording.txt:14
-msgid "Save the file to your preferred location"
-msgstr "Enregistrez le fichier à l'emplacement de votre choix"
-
-#: core/templates/mail/html/screen_recording.html:216
-#: core/templates/mail/text/screen_recording.txt:16
-msgid "Open"
-msgstr "Ouvrir"
-
-#: core/templates/mail/html/screen_recording.html:225
-#: core/templates/mail/text/screen_recording.txt:18
-#, python-format
-msgid ""
-" If you have any questions or need assistance, please contact our support "
-"team at %(support_email)s. "
-msgstr ""
-" Si vous avez des questions ou besoin d'assistance, veuillez contacter notre "
-"équipe d'assistance à %(support_email)s. "
-
-#: meet/settings.py:162
+#: meet/settings.py:134
 msgid "English"
-msgstr "Anglais"
+msgstr ""
 
-#: meet/settings.py:163
+#: meet/settings.py:135
 msgid "French"
-msgstr "Français"
-
-#: meet/settings.py:164
-msgid "Dutch"
-msgstr "Néerlandais"
-
-#: meet/settings.py:165
-msgid "German"
-msgstr "Allemand"
+msgstr ""