wip

.github/workflows/meet.yml

@@ -122,6 +122,9 @@ jobs:
       DB_PASSWORD: pass
       DB_PORT: 5432
       STORAGES_STATICFILES_BACKEND: django.contrib.staticfiles.storage.StaticFilesStorage
+      AWS_S3_ENDPOINT_URL: http://localhost:9000
+      AWS_S3_ACCESS_KEY_ID: meet
+      AWS_S3_SECRET_ACCESS_KEY: password
       LIVEKIT_API_SECRET: secret
       LIVEKIT_API_KEY: devkey
 

Dockerfile

@@ -1,7 +1,7 @@
 # Django Meet
 
 # ---- base image to inherit from ----
-FROM python:3.12.6-alpine3.20 AS base
+FROM python:3.12.6-alpine3.20 as base
 
 # Upgrade pip to its latest release to speed up dependencies installation
 RUN python -m pip install --upgrade pip setuptools
@@ -11,7 +11,7 @@ RUN apk update && \
   apk upgrade
 
 # ---- Back-end builder image ----
-FROM base AS back-builder
+FROM base as back-builder
 
 WORKDIR /builder
 
@@ -23,7 +23,7 @@ RUN mkdir /install && \
 
 
 # ---- mails ----
-FROM node:20 AS mail-builder
+FROM node:20 as mail-builder
 
 COPY ./src/mail /mail/app
 
@@ -34,7 +34,7 @@ RUN yarn install --frozen-lockfile && \
 
 
 # ---- static link collector ----
-FROM base AS link-collector
+FROM base as link-collector
 ARG MEET_STATIC_ROOT=/data/static
 
 RUN apk add \
@@ -58,7 +58,7 @@ RUN DJANGO_CONFIGURATION=Build DJANGO_JWT_PRIVATE_SIGNING_KEY=Dummy \
 RUN rdfind -makesymlinks true -followsymlinks true -makeresultsfile false ${MEET_STATIC_ROOT}
 
 # ---- Core application image ----
-FROM base AS core
+FROM base as core
 
 ENV PYTHONUNBUFFERED=1
 
@@ -93,7 +93,7 @@ WORKDIR /app
 ENTRYPOINT [ "/usr/local/bin/entrypoint" ]
 
 # ---- Development image ----
-FROM core AS backend-development
+FROM core as backend-development
 
 # Switch back to the root user to install development dependencies
 USER root:root
@@ -119,7 +119,7 @@ ENV DB_HOST=postgresql \
 CMD ["python", "manage.py", "runserver", "0.0.0.0:8000"]
 
 # ---- Production image ----
-FROM core AS backend-production
+FROM core as backend-production
 
 ARG MEET_STATIC_ROOT=/data/static
 

Makefile

@@ -302,7 +302,6 @@ build-k8s-cluster: ## build the kubernetes cluster using kind
 .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
 

bin/_config.sh

@@ -5,7 +5,7 @@ set -eo pipefail
 REPO_DIR="$(cd "$( dirname "${BASH_SOURCE[0]}" )/.." && pwd)"
 UNSET_USER=0
 
-COMPOSE_FILE="${REPO_DIR}/compose.yml"
+COMPOSE_FILE="${REPO_DIR}/docker-compose.yml"
 COMPOSE_PROJECT="meet"
 
 

bin/start-kind.sh

@@ -97,41 +97,6 @@ data:
     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

docker-compose.yml

@@ -1,3 +1,4 @@
+version: '3.8'
 
 services:
   postgresql:
@@ -15,6 +16,30 @@ 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'
+    entrypoint: ""
+    command: minio server --console-address :9001 /data
+    volumes:
+      - ./data/media:/data
+
+  createbuckets:
+    image: minio/mc
+    depends_on:
+      - minio
+    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: .
@@ -39,6 +64,7 @@ services:
         - mailcatcher
         - redis
         - nginx
+        - createbuckets
         - livekit
   
   celery-dev:
@@ -72,6 +98,7 @@ services:
     depends_on:
       - postgresql
       - redis
+      - createbuckets
       - livekit
 
   celery:

env.d/development/common.dist

@@ -18,6 +18,9 @@ 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

src/backend/.pylintrc

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

src/backend/core/admin.py

@@ -77,18 +77,3 @@ class RoomAdmin(admin.ModelAdmin):
     """Room admin interface declaration."""
 
     inlines = (ResourceAccessInline,)
-
-
-class RecordingAccessInline(admin.TabularInline):
-    """Inline admin class for recording accesses."""
-
-    model = models.RecordingAccess
-    extra = 0
-
-
-@admin.register(models.Recording)
-class RecordingAdmin(admin.ModelAdmin):
-    """Recording admin interface declaration."""
-
-    inlines = (RecordingAccessInline,)
-    list_display = ("id", "status", "room", "created_at", "worker_id")

src/backend/core/analytics.py

@@ -0,0 +1,58 @@
+"""
+Meet analytics class.
+"""
+
+import uuid
+
+from django.conf import settings
+
+from june import analytics as jAnalytics
+
+
+class Analytics:
+    """Analytics integration
+
+    This class wraps the June analytics code to avoid coupling our code directly
+    with this third-party library. By doing so, we create a generic interface
+    for analytics that can be easily modified or replaced in the future.
+    """
+
+    def __init__(self):
+        key = getattr(settings, "ANALYTICS_KEY", None)
+
+        if key is not None:
+            jAnalytics.write_key = key
+
+        self._enabled = key is not None
+
+    def _is_anonymous_user(self, user):
+        """Check if the user is anonymous."""
+        return user is None or user.is_anonymous
+
+    def identify(self, user, **kwargs):
+        """Identify a user"""
+
+        if self._is_anonymous_user(user) or not self._enabled:
+            return
+
+        traits = kwargs.pop("traits", {})
+        traits.update({"email": user.email_anonymized})
+
+        jAnalytics.identify(user_id=user.sub, traits=traits, **kwargs)
+
+    def track(self, user, **kwargs):
+        """Track an event"""
+
+        if not self._enabled:
+            return
+
+        event_data = {}
+        if self._is_anonymous_user(user):
+            event_data["anonymous_id"] = str(uuid.uuid4())
+        else:
+            event_data["user_id"] = user.sub
+
+        jAnalytics.track(**event_data, **kwargs)
+
+
+analytics = Analytics()

src/backend/core/api/__init__.py

@@ -37,10 +37,6 @@ def get_frontend_configuration(request):
     """Returns the frontend configuration dict as configured in settings."""
     frontend_configuration = {
         "LANGUAGE_CODE": settings.LANGUAGE_CODE,
-        "recording": {
-            "is_enabled": settings.RECORDING_ENABLE,
-            "available_modes": settings.RECORDING_WORKER_CLASSES.keys(),
-        },
     }
     frontend_configuration.update(settings.FRONTEND_CONFIGURATION)
     return Response(frontend_configuration)

src/backend/core/api/permissions.py

@@ -1,7 +1,5 @@
 """Permission handlers for the Meet core app."""
 
-from django.conf import settings
-
 from rest_framework import permissions
 
 from ..models import RoleChoices
@@ -41,37 +39,41 @@ class IsSelf(IsAuthenticated):
         return obj == request.user
 
 
-class RoomPermissions(permissions.BasePermission):
-    """
-    Permissions applying to the room API endpoint.
-    """
+# class RoomPermissions(permissions.BasePermission):
+#     """
+#     Permissions applying to the room API endpoint.
+#     """
 
-    def has_permission(self, request, view):
-        """Only allow authenticated users for unsafe methods."""
-        if request.method in permissions.SAFE_METHODS:
-            return True
+#     def has_permission(self, request, view):
+#         """Only allow authenticated users for unsafe methods."""
+#         if request.method in permissions.SAFE_METHODS:
+#             return True
 
-        return request.user.is_authenticated
+#         return request.user.is_authenticated
 
-    def has_object_permission(self, request, view, obj):
-        """Object permissions are only given to administrators of the room."""
+#     def has_object_permission(self, request, view, obj):
+#         """Object permissions are only given to administrators of the room."""
 
-        if request.method in permissions.SAFE_METHODS:
-            return True
+#         if request.method in permissions.SAFE_METHODS:
+#             return True
 
-        user = request.user
+#         user = request.user
 
-        if request.method == "DELETE":
-            return obj.is_owner(user)
+#         if request.method == "DELETE":
+#             return obj.is_owner(user)
 
-        return obj.is_administrator(user)
+#         return obj.is_administrator(user)
 
 
-class ResourceAccessPermission(IsAuthenticated):
+class ResourceAccessPermission(permissions.BasePermission):
     """
     Permissions for a room that can only be updated by room administrators.
     """
 
+    def has_permission(self, request, view):
+        """Only allow authenticated users."""
+        return request.user.is_authenticated
+
     def has_object_permission(self, request, view, obj):
         """
         Check that the logged-in user is administrator of the linked room.
@@ -80,42 +82,15 @@ class ResourceAccessPermission(IsAuthenticated):
         if request.method == "DELETE" and obj.role == RoleChoices.OWNER:
             return obj.user == user
 
-        return obj.resource.is_administrator(user)
+        return RoleChoices.is_administrator(obj.resource.get_roles(user))
 
 
-class HasAbilityPermission(IsAuthenticated):
+class AccessPermission(permissions.BasePermission):
     """Permission class for access objects."""
 
+    def has_permission(self, request, view):
+        return request.user.is_authenticated or view.action != "create"
+
     def has_object_permission(self, request, view, obj):
         """Check permission for a given object."""
         return obj.get_abilities(request.user).get(view.action, False)
-
-
-class HasPrivilegesOnRoom(IsAuthenticated):
-    """Check if user has privileges on a given room."""
-
-    message = "You must have privileges to start a recording."
-
-    def has_object_permission(self, request, view, obj):
-        """Determine if user has privileges on room."""
-        return obj.is_owner(request.user) or obj.is_administrator(request.user)
-
-
-class IsRecordingEnabled(permissions.BasePermission):
-    """Check if the recording feature is enabled."""
-
-    message = "Access denied, recording is disabled."
-
-    def has_permission(self, request, view):
-        """Determine if access is allowed based on settings."""
-        return settings.RECORDING_ENABLE
-
-
-class IsStorageEventEnabled(permissions.BasePermission):
-    """Check if the storage event feature is enabled."""
-
-    message = "Access denied, storage event is disabled."
-
-    def has_permission(self, request, view):
-        """Determine if access is allowed based on settings."""
-        return settings.RECORDING_STORAGE_EVENT_ENABLE

src/backend/core/api/serializers.py

@@ -115,10 +115,10 @@ class RoomSerializer(serializers.ModelSerializer):
         if not request:
             return output
 
-        role = instance.get_role(request.user)
-        is_admin = models.RoleChoices.check_administrator_role(role)
+        roles = instance.get_roles(request.user)
+        is_administrator = models.RoleChoices.is_administrator(roles)
 
-        if role is not None:
+        if roles:
             access_serializer = NestedResourceAccessSerializer(
                 instance.accesses.select_related("resource", "user").all(),
                 context=self.context,
@@ -126,11 +126,12 @@ class RoomSerializer(serializers.ModelSerializer):
             )
             output["accesses"] = access_serializer.data
 
-        if not is_admin:
+        if not is_administrator:
             del output["configuration"]
 
-        if role is not None or instance.is_public:
-            slug = f"{instance.id!s}"
+        if roles or instance.is_public:
+            slug = f"{instance.id!s}".replace("-", "")
+
             username = request.query_params.get("username", None)
 
             output["livekit"] = {
@@ -141,7 +142,7 @@ class RoomSerializer(serializers.ModelSerializer):
                 ),
             }
 
-        output["is_administrable"] = is_admin
+        output["is_administrable"] = is_administrator
 
         return output
 
@@ -153,27 +154,5 @@ class RecordingSerializer(serializers.ModelSerializer):
 
     class Meta:
         model = models.Recording
-        fields = ["id", "room", "created_at", "updated_at", "status"]
+        fields = ["id", "room", "created_at", "updated_at", "stopped_at", "status"]
         read_only_fields = fields
-
-
-class StartRecordingSerializer(serializers.Serializer):
-    """Validate start recording requests."""
-
-    mode = serializers.ChoiceField(
-        choices=models.RecordingModeChoices.choices,
-        required=True,
-        error_messages={
-            "required": "Recording mode is required.",
-            "invalid_choice": "Invalid recording mode. Choose between "
-            "screen_recording or transcript.",
-        },
-    )
-
-    def create(self, validated_data):
-        """Not implemented as this is a validation-only serializer."""
-        raise NotImplementedError("StartRecordingSerializer is validation-only")
-
-    def update(self, instance, validated_data):
-        """Not implemented as this is a validation-only serializer."""
-        raise NotImplementedError("StartRecordingSerializer is validation-only")

src/backend/core/api/utils.py

@@ -0,0 +1,33 @@
+"""Util to generate S3 authorization headers for object storage access control"""
+
+from django.core.files.storage import default_storage
+
+import botocore
+
+
+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 documents' content
+    - 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

src/backend/core/api/viewsets.py

@@ -1,54 +1,41 @@
 """API endpoints"""
 
+import re
 import uuid
-from logging import getLogger
+from urllib.parse import urlparse
 
 from django.conf import settings
 from django.db.models import Q
 from django.http import Http404
 from django.shortcuts import get_object_or_404
+from django.utils import timezone
 from django.utils.text import slugify
 
 from rest_framework import (
     decorators,
+    exceptions,
     mixins,
     pagination,
+    status,
     viewsets,
 )
-from rest_framework import (
-    exceptions as drf_exceptions,
-)
 from rest_framework import (
     response as drf_response,
 )
-from rest_framework import (
-    status as drf_status,
-)
 
 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.parsers import get_parser
-from core.recording.worker.exceptions import (
-    RecordingStartError,
-    RecordingStopError,
-)
-from core.recording.worker.factories import (
-    get_worker_service,
-)
-from core.recording.worker.mediator import (
-    WorkerServiceMediator,
-)
 
+from ..analytics import analytics
 from . import permissions, serializers
 
 # pylint: disable=too-many-ancestors
 
-logger = getLogger(__name__)
+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}"
+)
+RECORDING_URL_PATTERN = re.compile(
+    f"{settings.MEDIA_URL:s}recordings/({UUID_REGEX:s})/file.mp4/$"
+)
 
 
 class NestedGenericViewSet(viewsets.GenericViewSet):
@@ -187,7 +174,7 @@ class RoomViewSet(
     API endpoints to access and perform actions on rooms.
     """
 
-    permission_classes = [permissions.RoomPermissions]
+    permission_classes = [permissions.AccessPermission]
     queryset = models.Room.objects.all()
     serializer_class = serializers.RoomSerializer
 
@@ -214,6 +201,7 @@ class RoomViewSet(
         except Http404:
             if not settings.ALLOW_UNREGISTERED_ROOMS:
                 raise
+
             slug = slugify(self.kwargs["pk"])
             username = request.query_params.get("username", None)
             data = {
@@ -227,6 +215,11 @@ class RoomViewSet(
                 },
             }
         else:
+            analytics.track(
+                user=self.request.user,
+                event="Get Room",
+                properties={"slug": instance.slug},
+            )
             data = self.get_serializer(instance).data
 
         return drf_response.Response(data)
@@ -259,87 +252,23 @@ class RoomViewSet(
             role=models.RoleChoices.OWNER,
         )
 
-    @decorators.action(
-        detail=True,
-        methods=["post"],
-        url_path="start-recording",
-        permission_classes=[
-            permissions.HasPrivilegesOnRoom,
-            permissions.IsRecordingEnabled,
-        ],
-    )
-    def start_room_recording(self, request, pk=None):  # pylint: disable=unused-argument
-        """Start recording a room."""
-
-        serializer = serializers.StartRecordingSerializer(data=request.data)
-
-        if not serializer.is_valid():
-            return drf_response.Response(
-                {"detail": "Invalid request."}, status=drf_status.HTTP_400_BAD_REQUEST
-            )
-
-        mode = serializer.validated_data["mode"]
-        room = self.get_object()
-
-        # May raise exception if an active or initiated recording already exist for the room
-        recording = models.Recording.objects.create(room=room, mode=mode)
-
-        models.RecordingAccess.objects.create(
-            user=self.request.user, role=models.RoleChoices.OWNER, recording=recording
+        analytics.track(
+            user=self.request.user,
+            event="Create Room",
+            properties={
+                "slug": room.slug,
+            },
         )
 
-        worker_service = get_worker_service(mode=recording.mode)
-        worker_manager = WorkerServiceMediator(worker_service=worker_service)
-
-        try:
-            worker_manager.start(recording)
-        except RecordingStartError:
-            return drf_response.Response(
-                {"error": f"Recording failed to start for room {room.slug}"},
-                status=drf_status.HTTP_500_INTERNAL_SERVER_ERROR,
-            )
-
-        return drf_response.Response(
-            {"message": f"Recording successfully started for room {room.slug}"},
-            status=drf_status.HTTP_201_CREATED,
-        )
-
-    @decorators.action(
-        detail=True,
-        methods=["post"],
-        url_path="stop-recording",
-        permission_classes=[
-            permissions.HasPrivilegesOnRoom,
-            permissions.IsRecordingEnabled,
-        ],
-    )
-    def stop_room_recording(self, request, pk=None):  # pylint: disable=unused-argument
-        """Stop room recording."""
-
+    @decorators.action(detail=True, methods=["post"], url_path="start-recording")
+    def start_recording(self, request, *args, **kwargs):
+        """This view is used to start a recording for a room."""
+        # Check permission first
         room = self.get_object()
-
-        try:
-            recording = models.Recording.objects.get(
-                room=room, status=models.RecordingStatusChoices.ACTIVE
-            )
-        except models.Recording.DoesNotExist as e:
-            raise drf_exceptions.NotFound(
-                "No active recording found for this room."
-            ) from e
-
-        worker_service = get_worker_service(mode=recording.mode)
-        worker_manager = WorkerServiceMediator(worker_service=worker_service)
-
-        try:
-            worker_manager.stop(recording)
-        except RecordingStopError:
-            return drf_response.Response(
-                {"error": f"Recording failed to stop for room {room.slug}"},
-                status=drf_status.HTTP_500_INTERNAL_SERVER_ERROR,
-            )
+        recording = room.start_recording()
 
         return drf_response.Response(
-            {"message": f"Recording stopped for room {room.slug}."}
+            {"recording": recording.id}, status=status.HTTP_201_CREATED
         )
 
 
@@ -398,59 +327,84 @@ class RecordingViewSet(
     """
 
     pagination_class = Pagination
-    permission_classes = [permissions.HasAbilityPermission]
+    permission_classes = [permissions.AccessPermission]
     queryset = models.Recording.objects.all()
     serializer_class = serializers.RecordingSerializer
 
-    def get_queryset(self):
-        """Restrict recordings to the user's ones."""
+    def list(self, request, *args, **kwargs):
+        """Restrict resources returned by the list endpoint to a user's room."""
+        queryset = self.filter_queryset(self.get_queryset())
         user = self.request.user
-        return (
-            super()
-            .get_queryset()
-            .filter(Q(accesses__user=user) | Q(accesses__team__in=user.get_teams()))
-        )
+        if user.is_authenticated:
+            queryset = queryset.filter(room__accesses__user=user)
+        else:
+            queryset = queryset.none()
 
-    @decorators.action(
-        detail=False,
-        methods=["post"],
-        url_path="storage-hook",
-        authentication_classes=[StorageEventAuthentication],
-        permission_classes=[permissions.IsStorageEventEnabled],
-    )
-    def on_storage_event_received(self, request, pk=None):  # pylint: disable=unused-argument
-        """Handle incoming storage hook events for recordings."""
+        page = self.paginate_queryset(queryset)
+        if page is not None:
+            serializer = self.get_serializer(page, many=True)
+            return self.get_paginated_response(serializer.data)
 
-        parser = get_parser()
+        serializer = self.get_serializer(queryset, many=True)
+        return drf_response.Response(serializer.data)
 
-        try:
-            recording_id = parser.get_recording_id(request.data)
+    @decorators.action(detail=True, methods=["post"], url_path="stop")
+    def stop(self, request, *args, **kwargs):
+        """
+        This view is used to stop a recording. It can be called anonymously as the
+        recording ID will not have been communicated anywhere at the time of recording.
+        """
+        recording = self.get_object()
 
-        except ParsingEventDataError as e:
-            raise drf_exceptions.PermissionDenied(f"Invalid request data: {e}") from e
+        if recording.stopped_at is not None:
+            raise exceptions.PermissionDenied()
 
-        except InvalidBucketError as e:
-            raise drf_exceptions.PermissionDenied("Invalid bucket specified") from e
-
-        except InvalidFileTypeError as e:
-            return drf_response.Response(
-                {"message": f"Ignore this file type, {e}"},
-            )
-
-        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 not recording.is_savable():
-            raise drf_exceptions.PermissionDenied(
-                f"Recording with ID {recording_id} cannot be saved because it is either,"
-                " in an error state or has already been saved."
-            )
-
-        recording.status = models.RecordingStatusChoices.SAVED
+        recording.stopped_at = timezone.now()
         recording.save()
 
-        return drf_response.Response(
-            {"message": "Event processed."},
-        )
+        # TODO: Generate summary and send to note taking app
+
+        serializer = self.get_serializer(recording)
+        return drf_response.Response(serializer.data, status=status.HTTP_200_OK)
+
+    @decorators.action(detail=False, methods=["get"], url_path="retrieve-auth")
+    def retrieve_auth(self, request, *args, **kwargs):
+        """
+        This view is used by an Nginx subrequest to control access to a recording file.
+
+        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.
+
+        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.
+        """
+        if not request.user.is_authenticated:
+            raise exceptions.AuthenticationFailed()
+
+        original_url = urlparse(request.META.get("HTTP_X_ORIGINAL_URL"))
+        match = RECORDING_URL_PATTERN.search(original_url.path)
+
+        try:
+            (pk,) = match.groups()
+        except AttributeError as excpt:
+            raise exceptions.PermissionDenied() from excpt
+
+        # Check permission
+        if not models.Recording.objects.filter(
+            pk=pk, room__accesses__user=request.user
+        ).exists():
+            raise exceptions.PermissionDenied()
+
+        # Generate authorization headers and return an authorization to proceed with the request
+        key = models.Recording(pk=pk).key
+        request = utils.generate_s3_authorization_headers(key)
+        return drf_response.Response("authorized", headers=request.headers, status=200)

src/backend/core/authentication/backends.py

@@ -1,6 +1,5 @@
 """Authentication Backends for the Meet core app."""
 
-from django.conf import settings
 from django.core.exceptions import SuspiciousOperation
 from django.utils.translation import gettext_lazy as _
 
@@ -11,6 +10,8 @@ from mozilla_django_oidc.auth import (
 
 from core.models import User
 
+from ..analytics import analytics
+
 
 class OIDCAuthenticationBackend(MozillaOIDCAuthenticationBackend):
     """Custom OpenID Connect (OIDC) Authentication Backend.
@@ -67,40 +68,36 @@ class OIDCAuthenticationBackend(MozillaOIDCAuthenticationBackend):
         user_info = self.get_userinfo(access_token, id_token, payload)
         sub = user_info.get("sub")
 
-        if not sub:
+        if sub is None:
             raise SuspiciousOperation(
                 _("User info contained no recognizable user identification")
             )
 
-        email = user_info.get("email")
-        user = self.get_existing_user(sub, email)
-
-        if not user and self.get_settings("OIDC_CREATE_USER", True):
-            user = User.objects.create(
-                sub=sub,
-                email=email,
-                password="!",  # noqa: S106
-            )
-        elif not user:
-            return None
-
-        if not user.is_active:
-            raise SuspiciousOperation(_("User account is disabled"))
+        try:
+            user = User.objects.get(sub=sub)
+        except User.DoesNotExist:
+            if self.get_settings("OIDC_CREATE_USER", True):
+                user = self.create_user(user_info)
+            else:
+                user = None
 
+        analytics.identify(user=user)
         return user
 
-    def get_existing_user(self, sub, email):
-        """Fetch existing user by sub or email."""
-        try:
-            return User.objects.get(sub=sub)
-        except User.DoesNotExist:
-            if email and settings.OIDC_FALLBACK_TO_EMAIL_FOR_IDENTIFICATION:
-                try:
-                    return User.objects.get(email__iexact=email)
-                except User.DoesNotExist:
-                    pass
-                except User.MultipleObjectsReturned as e:
-                    raise SuspiciousOperation(
-                        _("Multiple user accounts share a common email.")
-                    ) from e
-        return None
+    def create_user(self, claims):
+        """Return a newly created User instance."""
+
+        sub = claims.get("sub")
+
+        if sub is None:
+            raise SuspiciousOperation(
+                _("Claims contained no recognizable user identification")
+            )
+
+        user = User.objects.create(
+            sub=sub,
+            email=claims.get("email"),
+            password="!",  # noqa: S106
+        )
+
+        return user

src/backend/core/authentication/views.py

@@ -22,6 +22,8 @@ from mozilla_django_oidc.views import (
     OIDCLogoutView as MozillaOIDCOIDCLogoutView,
 )
 
+from ..analytics import analytics
+
 
 class OIDCLogoutView(MozillaOIDCOIDCLogoutView):
     """Custom logout view for handling OpenID Connect (OIDC) logout flow.
@@ -98,6 +100,10 @@ class OIDCLogoutView(MozillaOIDCOIDCLogoutView):
 
         logout_url = self.redirect_url
 
+        analytics.track(
+            user=request.user,
+            event="Signed Out",
+        )
         if request.user.is_authenticated:
             logout_url = self.construct_oidc_logout_url(request)
 

src/backend/core/factories.py

@@ -32,7 +32,6 @@ class ResourceFactory(factory.django.DjangoModelFactory):
 
     class Meta:
         model = models.Resource
-        skip_postgeneration_save = True
 
     is_public = factory.Faker("boolean", chance_of_getting_true=50)
 
@@ -46,8 +45,6 @@ class ResourceFactory(factory.django.DjangoModelFactory):
                 else:
                     UserResourceAccessFactory(resource=self, user=item[0], role=item[1])
 
-        self.save()
-
 
 class UserResourceAccessFactory(factory.django.DjangoModelFactory):
     """Create fake resource user accesses for testing."""
@@ -71,49 +68,9 @@ class RoomFactory(ResourceFactory):
 
 
 class RecordingFactory(factory.django.DjangoModelFactory):
-    """Create fake recording for testing."""
+    """Create fake recordings for testing."""
 
     class Meta:
         model = models.Recording
-        skip_postgeneration_save = True
 
     room = factory.SubFactory(RoomFactory)
-    status = models.RecordingStatusChoices.INITIATED
-    mode = models.RecordingModeChoices.SCREEN_RECORDING
-    worker_id = None
-
-    @factory.post_generation
-    def users(self, create, extracted, **kwargs):
-        """Add users to recording from a given list of users with or without roles."""
-        if create and extracted:
-            for item in extracted:
-                if isinstance(item, models.User):
-                    UserRecordingAccessFactory(recording=self, user=item)
-                else:
-                    UserRecordingAccessFactory(
-                        recording=self, user=item[0], role=item[1]
-                    )
-
-            self.save()
-
-
-class UserRecordingAccessFactory(factory.django.DjangoModelFactory):
-    """Create fake recording user accesses for testing."""
-
-    class Meta:
-        model = models.RecordingAccess
-
-    recording = factory.SubFactory(RecordingFactory)
-    user = factory.SubFactory(UserFactory)
-    role = factory.fuzzy.FuzzyChoice(models.RoleChoices.values)
-
-
-class TeamRecordingAccessFactory(factory.django.DjangoModelFactory):
-    """Create fake recording team accesses for testing."""
-
-    class Meta:
-        model = models.RecordingAccess
-
-    recording = factory.SubFactory(RecordingFactory)
-    team = factory.Sequence(lambda n: f"team{n}")
-    role = factory.fuzzy.FuzzyChoice(models.RoleChoices.values)

src/backend/core/migrations/0005_alter_user_language_recording.py

@@ -0,0 +1,37 @@
+# Generated by Django 5.1.1 on 2024-10-12 11:52
+
+import django.db.models.deletion
+import uuid
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('core', '0004_alter_user_language'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='user',
+            name='language',
+            field=models.CharField(choices="(('en-us', 'English'), ('fr-fr', 'French'))", default='en-us', help_text='The language in which the user wants to see the interface.', max_length=10, verbose_name='language'),
+        ),
+        migrations.CreateModel(
+            name='Recording',
+            fields=[
+                ('id', models.UUIDField(default=uuid.uuid4, editable=False, help_text='primary key for the record as UUID', primary_key=True, serialize=False, verbose_name='id')),
+                ('created_at', models.DateTimeField(auto_now_add=True, help_text='date and time at which a record was created', verbose_name='created on')),
+                ('updated_at', models.DateTimeField(auto_now=True, help_text='date and time at which a record was last updated', verbose_name='updated on')),
+                ('stopped_at', models.DateTimeField(blank=True, null=True, verbose_name='End Time')),
+                ('status', models.CharField(choices=[('recording', 'Recording'), ('done', 'Done')], default='recording')),
+                ('room', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='meetings', to='core.room', verbose_name='Room')),
+            ],
+            options={
+                'verbose_name': 'Recording',
+                'verbose_name_plural': 'Recordings',
+                'db_table': 'meet_recording',
+                'ordering': ('created_at',),
+            },
+        ),
+    ]

src/backend/core/migrations/0005_recording_recordingaccess_and_more.py

@@ -1,67 +0,0 @@
-# Generated by Django 5.1.1 on 2024-11-06 14:31
-
-import django.db.models.deletion
-import uuid
-from django.conf import settings
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('core', '0004_alter_user_language'),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='Recording',
-            fields=[
-                ('id', models.UUIDField(default=uuid.uuid4, editable=False, help_text='primary key for the record as UUID', primary_key=True, serialize=False, verbose_name='id')),
-                ('created_at', models.DateTimeField(auto_now_add=True, help_text='date and time at which a record was created', verbose_name='created on')),
-                ('updated_at', models.DateTimeField(auto_now=True, help_text='date and time at which a record was last updated', verbose_name='updated on')),
-                ('status', 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')], default='initiated', max_length=20)),
-                ('worker_id', models.CharField(blank=True, help_text='Enter an identifier for the worker recording.This ID is retained even when the worker stops, allowing for easy tracking.', max_length=255, null=True, verbose_name='Worker ID')),
-                ('room', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='recordings', to='core.room', verbose_name='Room')),
-            ],
-            options={
-                'verbose_name': 'Recording',
-                'verbose_name_plural': 'Recordings',
-                'db_table': 'meet_recording',
-                'ordering': ('-created_at',),
-            },
-        ),
-        migrations.CreateModel(
-            name='RecordingAccess',
-            fields=[
-                ('id', models.UUIDField(default=uuid.uuid4, editable=False, help_text='primary key for the record as UUID', primary_key=True, serialize=False, verbose_name='id')),
-                ('created_at', models.DateTimeField(auto_now_add=True, help_text='date and time at which a record was created', verbose_name='created on')),
-                ('updated_at', models.DateTimeField(auto_now=True, help_text='date and time at which a record was last updated', verbose_name='updated on')),
-                ('team', models.CharField(blank=True, max_length=100)),
-                ('role', models.CharField(choices=[('member', 'Member'), ('administrator', 'Administrator'), ('owner', 'Owner')], default='member', max_length=20)),
-                ('recording', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='accesses', to='core.recording')),
-                ('user', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
-            ],
-            options={
-                'verbose_name': 'Recording/user relation',
-                'verbose_name_plural': 'Recording/user relations',
-                'db_table': 'meet_recording_access',
-                'ordering': ('-created_at',),
-            },
-        ),
-        migrations.AddConstraint(
-            model_name='recording',
-            constraint=models.UniqueConstraint(condition=models.Q(('status__in', ['active', 'initiated'])), fields=('room',), name='unique_initiated_or_active_recording_per_room'),
-        ),
-        migrations.AddConstraint(
-            model_name='recordingaccess',
-            constraint=models.UniqueConstraint(condition=models.Q(('user__isnull', False)), fields=('user', 'recording'), name='unique_recording_user', violation_error_message='This user is already in this recording.'),
-        ),
-        migrations.AddConstraint(
-            model_name='recordingaccess',
-            constraint=models.UniqueConstraint(condition=models.Q(('team__gt', '')), fields=('team', 'recording'), name='unique_recording_team', violation_error_message='This team is already in this recording.'),
-        ),
-        migrations.AddConstraint(
-            model_name='recordingaccess',
-            constraint=models.CheckConstraint(condition=models.Q(models.Q(('team', ''), ('user__isnull', False)), models.Q(('team__gt', ''), ('user__isnull', True)), _connector='OR'), name='check_recording_access_either_user_or_team', violation_error_message='Either user or team must be set, not both.'),
-        ),
-    ]

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

@@ -1,89 +0,0 @@
-
-from django.db import migrations
-from django.db.models import Count
-from core.models import RoleChoices
-
-def merge_duplicate_user_accounts(apps, schema_editor):
-    """Merge user accounts that share the same email address.
-
-    Historical Context:
-    Previously, ProConnect authentication could return users with the same email
-    but different sub, leading to duplicate user accounts. While the application
-    now prevents this scenario, this migration is needed to clean up existing
-    duplicate accounts to ensure users can continue to connect without being blocked
-    by unique email constraints.
-
-    Performance of this migration is poor, this implementation prioritizes readability
-    and maintainability. Consider refactoring this code to avoid individual db queries
-    on each iteration.
-    """
-
-    User = apps.get_model('core', 'User')
-    ResourceAccess = apps.get_model('core', 'ResourceAccess')
-
-    emails_with_duplicates = (
-        User.objects.values('email')
-        .annotate(count=Count('id'))
-        .filter(count__gt=1)
-        .values_list('email', flat=True)
-    )
-
-    for email in emails_with_duplicates:
-        # Keep the oldest user
-        primary_user = User.objects.filter(email=email).order_by('created_at').first()
-        duplicate_user_accounts = User.objects.filter(email=email).exclude(id=primary_user.id)
-
-        # Get IDs of duplicate accounts to be merged
-        duplicate_account_ids = list(duplicate_user_accounts.values_list('id', flat=True))
-        resource_accesses_to_transfer = ResourceAccess.objects.filter(user_id__in=duplicate_account_ids)
-
-        # Transfer resource access permissions to primary user
-        # This process handles role hierarchy where:
-        # OWNER > ADMIN > MEMBER
-        for resource_access in resource_accesses_to_transfer:
-
-            # Determine if primary user already has access to this resource
-            existing_primary_access = ResourceAccess.objects.filter(
-                user_id=primary_user.id,
-                resource_id=resource_access.resource.id
-            ).first()
-
-            if existing_primary_access:
-                # Skip if primary user is already OWNER as it's the highest privilege level
-                # No need to modify or downgrade owner access
-                if existing_primary_access.role == RoleChoices.OWNER:
-                    continue
-
-                # Skip if primary user already has the exact same role
-                # No need to update when roles match
-                elif existing_primary_access.role == resource_access.role:
-                    continue
-
-                # Skip if new role is MEMBER since user already has base access
-                # All existing access includes at least MEMBER privileges
-                elif resource_access.role == RoleChoices.MEMBER:
-                    continue
-
-                # Update the role only if it represents a higher privilege level
-                # Preserves existing access record while updating the role
-                existing_primary_access.role = resource_access.role
-                existing_primary_access.save()
-            else:
-                # Transfer access to primary user
-                resource_access.user_id = primary_user.id
-                resource_access.save()
-
-        # Delete duplicate accounts - CASCADE will automatically remove any untransferred
-        # ResourceAccess records and other related data for these users
-        duplicate_user_accounts.delete()
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('core', '0005_recording_recordingaccess_and_more'),
-    ]
-
-    operations = [
-        migrations.RunPython(merge_duplicate_user_accounts, reverse_code=migrations.RunPython.noop),
-    ]

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

@@ -1,18 +0,0 @@
-# Generated by Django 5.1.1 on 2024-11-12 10:59
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('core', '0006_merge_duplicate_users'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='recording',
-            name='mode',
-            field=models.CharField(choices=[('screen_recording', 'SCREEN_RECORDING'), ('transcript', 'TRANSCRIPT')], default='screen_recording', help_text='Defines the mode of recording being called.', max_length=20, verbose_name='Recording mode'),
-        ),
-    ]

src/backend/core/models.py

@@ -4,7 +4,6 @@ Declare and configure the models for the Meet core application
 
 import uuid
 from logging import getLogger
-from typing import List
 
 from django.conf import settings
 from django.contrib.auth import models as auth_models
@@ -29,54 +28,16 @@ class RoleChoices(models.TextChoices):
     OWNER = "owner", _("Owner")
 
     @classmethod
-    def check_administrator_role(cls, role):
+    def is_administrator(cls, roles):
         """Check if a role is administrator."""
-        return role in [cls.ADMIN, cls.OWNER]
-
-    @classmethod
-    def check_owner_role(cls, role):
-        """Check if a role is owner."""
-        return role == cls.OWNER
+        return bool(set(roles).intersection({RoleChoices.OWNER, RoleChoices.ADMIN}))
 
 
 class RecordingStatusChoices(models.TextChoices):
-    """Enumeration of possible states for a recording operation."""
+    """Recording status choices."""
 
-    INITIATED = "initiated", _("Initiated")
-    ACTIVE = "active", _("Active")
-    STOPPED = "stopped", _("Stopped")
-    SAVED = "saved", _("Saved")
-    ABORTED = "aborted", _("Aborted")
-    FAILED_TO_START = "failed_to_start", _("Failed to Start")
-    FAILED_TO_STOP = "failed_to_stop", _("Failed to Stop")
-
-    @classmethod
-    def is_final(cls, status):
-        """Determine if the recording status represents a final state.
-
-        A final status indicates the recording flow has completed, either
-        successfully or unsuccessfully.
-        """
-
-        return status in {
-            cls.STOPPED,
-            cls.SAVED,
-            cls.ABORTED,
-            cls.FAILED_TO_START,
-            cls.FAILED_TO_STOP,
-        }
-
-    @classmethod
-    def is_unsuccessful(cls, status):
-        """Determine if the recording status represents an unsuccessful state."""
-        return status in {cls.ABORTED, cls.FAILED_TO_START, cls.FAILED_TO_STOP}
-
-
-class RecordingModeChoices(models.TextChoices):
-    """Recording mode choices."""
-
-    SCREEN_RECORDING = "screen_recording", _("SCREEN_RECORDING")
-    TRANSCRIPT = "transcript", _("TRANSCRIPT")
+    RECORDING = "recording", _("Recording")
+    DONE = "done", _("Done")
 
 
 class BaseModel(models.Model):
@@ -212,38 +173,10 @@ class User(AbstractBaseUser, BaseModel, auth_models.PermissionsMixin):
         return f"***@{self.email.split('@')[1]}"
 
 
-def get_resource_roles(resource: models.Model, user: User) -> List[str]:
-    """
-    Get all roles assigned to a user for a specific resource, including team-based roles.
-
-    Args:
-        resource: The resource to check permissions for
-        user: The user to get roles for
-
-    Returns:
-        List of role strings assigned to the user
-    """
-    if not user.is_authenticated:
-        return []
-
-    # Use pre-annotated roles if available from viewset optimization
-    if hasattr(resource, "user_roles"):
-        return resource.user_roles or []
-
-    try:
-        return list(
-            resource.accesses.filter_user(user)
-            .values_list("role", flat=True)
-            .distinct()
-        )
-    except (IndexError, models.ObjectDoesNotExist):
-        return []
-
-
 class Resource(BaseModel):
     """Model to define access control"""
 
-    is_public = models.BooleanField(default=settings.RESOURCE_DEFAULT_IS_PUBLIC)
+    is_public = models.BooleanField(default=settings.DEFAULT_ROOM_IS_PUBLIC)
     users = models.ManyToManyField(
         User,
         through="ResourceAccess",
@@ -262,34 +195,44 @@ class Resource(BaseModel):
         except AttributeError:
             return f"Resource {self.id!s}"
 
-    def get_role(self, user):
-        """
-        Determine the role of a given user in this resource.
-        """
-        if not user or not user.is_authenticated:
-            return None
-
-        role = None
-        for access in self.accesses.filter(user=user):
-            if access.role == RoleChoices.OWNER:
-                return RoleChoices.OWNER
-            if access.role == RoleChoices.ADMIN:
-                role = RoleChoices.ADMIN
-            if access.role == RoleChoices.MEMBER and role != RoleChoices.ADMIN:
-                role = RoleChoices.MEMBER
-        return role
-
     def is_administrator(self, user):
         """
         Check if a user is administrator of the resource.
-
         Users carrying the "owner" role are considered as administrators a fortiori.
         """
-        return RoleChoices.check_administrator_role(self.get_role(user))
+        return RoleChoices.is_administrator(self.get_roles(user))
 
     def is_owner(self, user):
         """Check if a user is owner of the resource."""
-        return RoleChoices.check_owner_role(self.get_role(user))
+        return RoleChoices.OWNER in self.get_roles(user)
+
+    def get_roles(self, user):
+        """Compute the roles a user has in a room."""
+        if not user or not user.is_authenticated:
+            return self.accesses.none()
+
+        try:
+            roles = self.user_roles or []
+        except AttributeError:
+            try:
+                roles = self.accesses.filter(user=user).values_list("role", flat=True)
+            except (models.ObjectDoesNotExist, IndexError):
+                roles = self.accesses.none()
+        return roles
+
+    def get_abilities(self, user):
+        """Compute and return abilities for a given user on the room."""
+        roles = self.get_roles(user)
+        is_owner_or_admin = RoleChoices.is_administrator(roles)
+
+        return {
+            "start_recording": is_owner_or_admin,
+            "destroy": RoleChoices.OWNER in roles,
+            "manage_accesses": is_owner_or_admin,
+            "partial_update": is_owner_or_admin,
+            "retrieve": True,
+            "update": is_owner_or_admin,
+        }
 
 
 class ResourceAccess(BaseModel):
@@ -395,212 +338,46 @@ class Room(Resource):
             raise ValidationError({"name": f'Room name "{self.name:s}" is reserved.'})
         super().clean_fields(exclude=exclude)
 
-
-class BaseAccessManager(models.Manager):
-    """Base manager for handling resource access control."""
-
-    def filter_user(self, user):
-        """Filter accesses for a given user, including both direct and team-based access."""
-        return self.filter(models.Q(user=user) | models.Q(team__in=user.get_teams()))
-
-
-class BaseAccess(BaseModel):
-    """Base model for accesses to handle resources."""
-
-    user = models.ForeignKey(
-        User,
-        on_delete=models.CASCADE,
-        null=True,
-        blank=True,
-    )
-    team = models.CharField(max_length=100, blank=True)
-    role = models.CharField(
-        max_length=20, choices=RoleChoices.choices, default=RoleChoices.MEMBER
-    )
-
-    objects = BaseAccessManager()
-
-    class Meta:
-        abstract = True
-
-    def _get_abilities(self, resource, user):
-        """
-        Compute and return abilities for a given user taking into account
-        the current state of the object.
-        """
-
-        roles = get_resource_roles(resource, user)
-
-        is_owner = RoleChoices.OWNER in roles
-        has_privileges = is_owner or RoleChoices.ADMIN in roles
-
-        # Default values for unprivileged users
-        set_role_to = set()
-        can_delete = False
-
-        # Special handling when modifying an owner's access
-        if self.role == RoleChoices.OWNER:
-            # Prevent orphaning the resource
-            can_delete = (
-                is_owner
-                and resource.accesses.filter(role=RoleChoices.OWNER).count() > 1
-            )
-            if can_delete:
-                set_role_to = {RoleChoices.ADMIN, RoleChoices.OWNER, RoleChoices.MEMBER}
-        elif has_privileges:
-            can_delete = True
-            set_role_to = {RoleChoices.ADMIN, RoleChoices.MEMBER}
-            if is_owner:
-                set_role_to.add(RoleChoices.OWNER)
-
-        # Remove the current role as we don't want to propose it as an option
-        set_role_to.discard(self.role)
-
-        return {
-            "destroy": can_delete,
-            "update": bool(set_role_to),
-            "partial_update": bool(set_role_to),
-            "retrieve": bool(roles),
-            "set_role_to": sorted(r.value for r in set_role_to),
-        }
+    def start_recording(self):
+        """Create a new related recording object to which Livekit will be able to save a file."""
+        return Recording.objects.create(room=self)
 
 
 class Recording(BaseModel):
-    """Model for recordings that take place in a room"""
+    """Model for recording meetings that take place in a room"""
 
     room = models.ForeignKey(
-        Room,
-        on_delete=models.CASCADE,
-        related_name="recordings",
-        verbose_name=_("Room"),
+        Room, on_delete=models.CASCADE, related_name="meetings", verbose_name=_("Room")
     )
+    stopped_at = models.DateTimeField(verbose_name=_("End Time"), null=True, blank=True)
     status = models.CharField(
-        max_length=20,
-        choices=RecordingStatusChoices.choices,
-        default=RecordingStatusChoices.INITIATED,
-    )
-    worker_id = models.CharField(
-        max_length=255,
-        null=True,
-        blank=True,
-        verbose_name=_("Worker ID"),
-        help_text=_(
-            "Enter an identifier for the worker recording."
-            "This ID is retained even when the worker stops, allowing for easy tracking."
-        ),
-    )
-    mode = models.CharField(
-        max_length=20,
-        choices=RecordingModeChoices.choices,
-        default=RecordingModeChoices.SCREEN_RECORDING,
-        verbose_name=_("Recording mode"),
-        help_text=_("Defines the mode of recording being called."),
+        choices=RecordingStatusChoices, default=RecordingStatusChoices.RECORDING
     )
 
     class Meta:
         db_table = "meet_recording"
-        ordering = ("-created_at",)
+        ordering = ("created_at",)
         verbose_name = _("Recording")
         verbose_name_plural = _("Recordings")
-        constraints = [
-            models.UniqueConstraint(
-                fields=["room"],
-                condition=models.Q(
-                    status__in=[
-                        RecordingStatusChoices.ACTIVE,
-                        RecordingStatusChoices.INITIATED,
-                    ]
-                ),
-                name="unique_initiated_or_active_recording_per_room",
-            )
-        ]
 
     def __str__(self):
-        return f"Recording {self.id} ({self.status})"
+        return _(
+            f"Recording in {self.room.name:s} on {self.created_at:%B %d, %Y at %I:%M %p}"
+        )
+
+    @property
+    def key(self):
+        """Return the path where the recording file will be stored in object storage."""
+        return f"recordings/{self.pk!s}/file.mp4/"
 
     def get_abilities(self, user):
         """Compute and return abilities for a given user on the recording."""
-
-        roles = set(get_resource_roles(self, user))
-
-        is_owner_or_admin = bool(
-            roles.intersection({RoleChoices.OWNER, RoleChoices.ADMIN})
-        )
-
-        is_final_status = RecordingStatusChoices.is_final(self.status)
+        roles = self.room.get_roles(user)
 
         return {
-            "destroy": is_owner_or_admin and is_final_status,
+            "destroy": RoleChoices.OWNER in roles,
             "partial_update": False,
-            "retrieve": is_owner_or_admin,
-            "stop": is_owner_or_admin and not is_final_status,
+            "retrieve": False,
+            "stop": True,
             "update": False,
         }
-
-    def is_savable(self) -> bool:
-        """Determine if the recording can be saved based on its current status."""
-
-        return self.status in {
-            RecordingStatusChoices.ACTIVE,
-            RecordingStatusChoices.STOPPED,
-        }
-
-
-class RecordingAccess(BaseAccess):
-    """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,
-        on_delete=models.CASCADE,
-        related_name="accesses",
-    )
-
-    class Meta:
-        db_table = "meet_recording_access"
-        ordering = ("-created_at",)
-        verbose_name = _("Recording/user relation")
-        verbose_name_plural = _("Recording/user relations")
-        constraints = [
-            models.UniqueConstraint(
-                fields=["user", "recording"],
-                condition=models.Q(user__isnull=False),  # Exclude null users
-                name="unique_recording_user",
-                violation_error_message=_("This user is already in this recording."),
-            ),
-            models.UniqueConstraint(
-                fields=["team", "recording"],
-                condition=models.Q(team__gt=""),  # Exclude empty string teams
-                name="unique_recording_team",
-                violation_error_message=_("This team is already in this recording."),
-            ),
-            models.CheckConstraint(
-                condition=models.Q(user__isnull=False, team="")
-                | models.Q(user__isnull=True, team__gt=""),
-                name="check_recording_access_either_user_or_team",
-                violation_error_message=_("Either user or team must be set, not both."),
-            ),
-        ]
-
-    def __str__(self):
-        return f"{self.user!s} is {self.role:s} in {self.recording!s}"
-
-    def get_abilities(self, user):
-        """
-        Compute and return abilities for a given user on the recording access.
-        """
-        return self._get_abilities(self.recording, user)

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

@@ -1 +0,0 @@
-"""Meet event parser classes, authentication and exceptions."""

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

@@ -1,96 +0,0 @@
-"""Authentication class for storage event token validation."""
-
-import logging
-import secrets
-
-from django.conf import settings
-from django.utils.translation import gettext_lazy as _
-
-from rest_framework.authentication import BaseAuthentication
-from rest_framework.exceptions import AuthenticationFailed
-
-logger = logging.getLogger(__name__)
-
-
-class MachineUser:
-    """Represent a non-interactive system user for automated storage operations."""
-
-    def __init__(self) -> None:
-        self.pk = None
-        self.username = "storage_event_user"
-        self.is_active = True
-
-    @property
-    def is_authenticated(self):
-        """Indicate if this machine user is authenticated."""
-        return True
-
-    @property
-    def is_anonymous(self) -> bool:
-        """Indicate if this is an anonymous user."""
-        return False
-
-    def get_username(self) -> str:
-        """Return the machine user identifier."""
-        return self.username
-
-
-class StorageEventAuthentication(BaseAuthentication):
-    """Authenticate requests using a Bearer token for storage event integration.
-    This class validates Bearer tokens for storage events that don't map to database users.
-    It's designed for S3-compatible storage integrations and similar use cases.
-    Events are submitted when a webhook is configured on some bucket's events.
-    """
-
-    AUTH_HEADER = "Authorization"
-    TOKEN_TYPE = "Bearer"  # noqa S105
-
-    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
-
-        required_token = settings.RECORDING_STORAGE_EVENT_TOKEN
-        if not required_token:
-            if settings.RECORDING_ENABLE_STORAGE_EVENT_AUTH:
-                raise AuthenticationFailed(
-                    _("Authentication is enabled but token is not configured.")
-                )
-
-            return MachineUser(), None
-
-        auth_header = request.headers.get(self.AUTH_HEADER)
-
-        if not auth_header:
-            logger.warning(
-                "Authentication failed: Missing Authorization header (ip: %s)",
-                request.META.get("REMOTE_ADDR"),
-            )
-            raise AuthenticationFailed(_("Authorization header is required"))
-
-        auth_parts = auth_header.split(" ")
-        if len(auth_parts) != 2 or auth_parts[0] != self.TOKEN_TYPE:
-            logger.warning(
-                "Authentication failed: Invalid authorization header (ip: %s)",
-                request.META.get("REMOTE_ADDR"),
-            )
-            raise AuthenticationFailed(_("Invalid authorization header."))
-
-        token = auth_parts[1]
-
-        # Use constant-time comparison to prevent timing attacks
-        if not secrets.compare_digest(token.encode(), required_token.encode()):
-            logger.warning(
-                "Authentication failed: Invalid token (ip: %s)",
-                request.META.get("REMOTE_ADDR"),
-            )
-            raise AuthenticationFailed(_("Invalid token"))
-
-        return MachineUser(), token
-
-    def authenticate_header(self, request):
-        """Return the WWW-Authenticate header value."""
-        return f"{self.TOKEN_TYPE} realm='Storage event API'"

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

@@ -1,17 +0,0 @@
-"""Storage parsers specific exceptions."""
-
-
-class ParsingEventDataError(Exception):
-    """Raised when the request data is malformed, incomplete, or missing."""
-
-
-class InvalidBucketError(Exception):
-    """Raised when the bucket name in the request does not match the expected one."""
-
-
-class InvalidFileTypeError(Exception):
-    """Raised when the file type in the request is not supported."""
-
-
-class InvalidFilepathError(Exception):
-    """Raised when the filepath in the request is invalid."""

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

@@ -1,147 +0,0 @@
-"""Meet storage event parser classes."""
-
-import logging
-import re
-from dataclasses import dataclass
-from functools import lru_cache
-from typing import Any, Dict, Optional, Protocol
-
-from django.conf import settings
-from django.utils.module_loading import import_string
-
-from .exceptions import (
-    InvalidBucketError,
-    InvalidFilepathError,
-    InvalidFileTypeError,
-    ParsingEventDataError,
-)
-
-logger = logging.getLogger(__name__)
-
-
-@dataclass
-class StorageEvent:
-    """Represents a storage event with relevant metadata.
-    Attributes:
-        filepath: Identifier for the affected recording
-        filetype: Type of storage event
-        bucket_name: When the event occurred
-        metadata: Additional event data
-    """
-
-    filepath: str
-    filetype: str
-    bucket_name: str
-    metadata: Optional[Dict[str, Any]]
-
-    def __post_init__(self):
-        if self.filepath is None:
-            raise TypeError("filepath cannot be None")
-        if self.filetype is None:
-            raise TypeError("filetype cannot be None")
-        if self.bucket_name is None:
-            raise TypeError("bucket_name cannot be None")
-
-
-class EventParser(Protocol):
-    """Interface for parsing storage events."""
-
-    def __init__(self, bucket_name, allowed_filetypes=None):
-        """Initialize parser with bucket name and optional allowed filetypes."""
-
-    def parse(self, data: Dict) -> StorageEvent:
-        """Extract storage event data from raw dictionary input."""
-
-    def validate(self, data: StorageEvent) -> None:
-        """Verify storage event data meets all requirements."""
-
-    def get_recording_id(self, data: Dict) -> str:
-        """Extract recording ID from event dictionary."""
-
-
-@lru_cache(maxsize=1)
-def get_parser() -> EventParser:
-    """Return cached instance of configured event parser.
-    Uses function memoization instead of a factory class since the only
-    varying parameter is the parser class from settings. A factory class
-    would add unnecessary complexity when a cached function provides the
-    same singleton behavior with simpler code.
-    """
-
-    event_parser_cls = import_string(settings.RECORDING_EVENT_PARSER_CLASS)
-    return event_parser_cls(bucket_name=settings.AWS_STORAGE_BUCKET_NAME)
-
-
-class MinioParser:
-    """Handle parsing and validation of Minio storage events."""
-
-    def __init__(self, bucket_name: str, allowed_filetypes=None):
-        """Initialize parser with target bucket name and accepted filetypes."""
-
-        if not bucket_name:
-            raise ValueError("Bucket name cannot be None or empty")
-
-        self._bucket_name = bucket_name
-        self._allowed_filetypes = allowed_filetypes or {"audio/ogg", "video/mp4"}
-
-        # pylint: disable=line-too-long
-        self._filepath_regex = re.compile(
-            r"(?P<url_encoded_folder_path>(?:[^%]+%2F)*)?(?P<recording_id>[0-9a-fA-F\-]{36})\.(?P<extension>[a-zA-Z0-9]+)"
-        )
-
-    @staticmethod
-    def parse(data):
-        """Convert raw Minio event dictionary to StorageEvent object."""
-
-        if not data:
-            raise ParsingEventDataError("Received empty data.")
-
-        try:
-            record = data["Records"][0]
-            s3 = record["s3"]
-            bucket_name = s3["bucket"]["name"]
-            file_object = s3["object"]
-            filepath = file_object["key"]
-            filetype = file_object["contentType"]
-        except (KeyError, IndexError) as e:
-            raise ParsingEventDataError(f"Missing or malformed key: {e}.") from e
-        try:
-            return StorageEvent(
-                filepath=filepath,
-                filetype=filetype,
-                bucket_name=bucket_name,
-                metadata=None,
-            )
-        except TypeError as e:
-            raise ParsingEventDataError(f"Missing essential data fields: {e}") from e
-
-    def validate(self, event_data: StorageEvent) -> str:
-        """Verify StorageEvent matches bucket, filetype and filepath requirements."""
-
-        if event_data.bucket_name != self._bucket_name:
-            raise InvalidBucketError(
-                f"Invalid bucket: expected {self._bucket_name}, got {event_data.bucket_name}"
-            )
-
-        if not event_data.filetype in self._allowed_filetypes:
-            raise InvalidFileTypeError(
-                f"Invalid file type, expected {self._allowed_filetypes},"
-                f"got '{event_data.filetype}'"
-            )
-
-        match = self._filepath_regex.match(event_data.filepath)
-        if not match:
-            raise InvalidFilepathError(
-                f"Invalid filepath structure: {event_data.filepath}"
-            )
-
-        recording_id = match.group("recording_id")
-        return recording_id
-
-    def get_recording_id(self, data):
-        """Extract recording ID from Minio event through parsing and validation."""
-
-        event_data = self.parse(data)
-        recording_id = self.validate(event_data)
-
-        return recording_id

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

@@ -1 +0,0 @@
-"""Meet worker services classes and exceptions."""

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

@@ -1,21 +0,0 @@
-"""Recording and worker services specific exceptions."""
-
-
-class WorkerRequestError(Exception):
-    """Raised when there is an issue with the worker request"""
-
-
-class WorkerConnectionError(Exception):
-    """Raised when there is an issue connecting to the worker."""
-
-
-class WorkerResponseError(Exception):
-    """Raised when the worker's response is not as expected."""
-
-
-class RecordingStartError(Exception):
-    """Raised when there is an error starting the recording."""
-
-
-class RecordingStopError(Exception):
-    """Raised when there is an error stopping the recording."""

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

@@ -1,75 +0,0 @@
-"""Factory, configurations and Protocol to create worker services"""
-
-import logging
-from dataclasses import dataclass
-from functools import lru_cache
-from typing import Any, ClassVar, Dict, Optional, Protocol, Type
-
-from django.conf import settings
-from django.utils.module_loading import import_string
-
-logger = logging.getLogger(__name__)
-
-
-@dataclass(frozen=True)
-class WorkerServiceConfig:
-    """Declare Worker Service common configurations"""
-
-    output_folder: str
-    server_configurations: Dict[str, Any]
-    verify_ssl: Optional[bool]
-    bucket_args: Optional[dict]
-
-    @classmethod
-    @lru_cache
-    def from_settings(cls) -> "WorkerServiceConfig":
-        """Load configuration from Django settings with caching for efficiency."""
-
-        logger.debug("Loading WorkerServiceConfig from settings.")
-        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,
-                "secret": settings.AWS_S3_SECRET_ACCESS_KEY,
-                "region": settings.AWS_S3_REGION_NAME,
-                "bucket": settings.AWS_STORAGE_BUCKET_NAME,
-                "force_path_style": True,
-            },
-        )
-
-
-class WorkerService(Protocol):
-    """Define the interface for interacting with a worker service."""
-
-    hrid: ClassVar[str]
-
-    def __init__(self, config: WorkerServiceConfig):
-        """Initialize the service with the given configuration."""
-
-    def start(self, room_id: str, recording_id: str) -> str:
-        """Start a recording for a specified room."""
-
-    def stop(self, worker_id: str) -> str:
-        """Stop recording for a specified worker."""
-
-
-def get_worker_service(mode: str) -> WorkerService:
-    """Instantiate a worker service by its mode."""
-
-    worker_registry: Dict[str, str] = settings.RECORDING_WORKER_CLASSES
-
-    try:
-        worker_class_path = worker_registry[mode]
-    except KeyError as e:
-        raise ValueError(
-            f"Recording mode '{mode}' not found in RECORDING_WORKER_CLASSES. "
-            f"Available modes: {list(worker_registry.keys())}"
-        ) from e
-
-    worker_class: Type[WorkerService] = import_string(worker_class_path)
-
-    config = WorkerServiceConfig.from_settings()
-    return worker_class(config=config)

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

@@ -1,98 +0,0 @@
-"""Mediator between the worker service and recording instances in the Django ORM."""
-
-import logging
-
-from core.models import Recording, RecordingStatusChoices
-
-from .exceptions import (
-    RecordingStartError,
-    RecordingStopError,
-    WorkerConnectionError,
-    WorkerRequestError,
-    WorkerResponseError,
-)
-from .factories import WorkerService
-
-logger = logging.getLogger(__name__)
-
-
-class WorkerServiceMediator:
-    """Mediate interactions between a worker service and a recording instance.
-
-    A mediator class that decouples the worker from Django ORM, handles recording updates
-    based on worker status, and transforms worker errors into user-friendly exceptions.
-    Implements Mediator pattern.
-    """
-
-    def __init__(self, worker_service: WorkerService):
-        """Initialize the WorkerServiceMediator with the provided worker service."""
-
-        self._worker_service = worker_service
-
-    def start(self, recording: Recording):
-        """Start the recording process using the worker service.
-
-        If the operation is successful, the recording's status will
-        transition from INITIATED to ACTIVE, else to FAILED_TO_START to keep track of errors.
-
-        Args:
-            recording (Recording): The recording instance to start.
-        Raises:
-            RecordingStartError: If there is an error starting the recording.
-        """
-
-        if recording.status != RecordingStatusChoices.INITIATED:
-            logger.error("Cannot start recording in %s status.", recording.status)
-            raise RecordingStartError()
-
-        room_name = str(recording.room.id)
-        try:
-            worker_id = self._worker_service.start(room_name, recording.id)
-        except (WorkerRequestError, WorkerConnectionError, WorkerResponseError) as e:
-            logger.exception(
-                "Failed to start recording for room %s: %s", recording.room.slug, e
-            )
-            recording.status = RecordingStatusChoices.FAILED_TO_START
-            raise RecordingStartError() from e
-        else:
-            recording.worker_id = worker_id
-            recording.status = RecordingStatusChoices.ACTIVE
-        finally:
-            recording.save()
-
-        logger.info(
-            "Worker started for room %s (worker ID: %s)",
-            recording.room,
-            recording.worker_id,
-        )
-
-    def stop(self, recording: Recording):
-        """Stop the recording process using the worker service.
-
-        If the operation is successful, the recording's status will transition
-        from ACTIVE to STOPPED, else to FAILED_TO_STOP to keep track of errors.
-
-        Args:
-            recording (Recording): The recording instance to stop.
-        Raises:
-            RecordingStopError: If there is an error stopping the recording.
-        """
-
-        if recording.status != RecordingStatusChoices.ACTIVE:
-            logger.error("Cannot stop recording in %s status.", recording.status)
-            raise RecordingStopError()
-
-        try:
-            response = self._worker_service.stop(worker_id=recording.worker_id)
-        except (WorkerConnectionError, WorkerResponseError) as e:
-            logger.exception(
-                "Failed to stop recording for room %s: %s", recording.room.slug, e
-            )
-            recording.status = RecordingStatusChoices.FAILED_TO_STOP
-            raise RecordingStopError() from e
-        else:
-            recording.status = RecordingStatusChoices[response]
-        finally:
-            recording.save()
-
-        logger.info("Worker stopped for room %s", recording.room)

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

@@ -1,140 +0,0 @@
-"""Worker services in charge of recording a room."""
-
-# 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 .exceptions import WorkerConnectionError, WorkerResponseError
-from .factories import WorkerServiceConfig
-
-
-class BaseEgressService:
-    """Base egress defining common methods to manage and interact with LiveKit egress processes."""
-
-    def __init__(self, config: WorkerServiceConfig):
-        self._config = config
-        self._s3 = livekit_api.S3Upload(**config.bucket_args)
-
-    def _get_filepath(self, filename: str, extension: str) -> str:
-        """Construct the file path for a given filename and extension.
-        Unsecure method, doesn't handle paths robustly and securely.
-        """
-        return f"{self._config.output_folder}/{filename}.{extension}"
-
-    @async_to_sync
-    async def _handle_request(self, request, method_name: str):
-        """Handle making a request to the LiveKit API and returns the response."""
-
-        # Use HTTP connector for local development with Tilt,
-        # where cluster communications are unsecure
-        connector = aiohttp.TCPConnector(ssl=self._config.verify_ssl)
-
-        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
-
-            return response
-
-    def stop(self, worker_id: str) -> str:
-        """Stop an ongoing egress worker.
-        The StopEgressRequest is shared among all types of egress,
-        so a single implementation in the base class should be sufficient.
-        """
-
-        request = livekit_api.StopEgressRequest(
-            egress_id=worker_id,
-        )
-
-        response = self._handle_request(request, "stop_egress")
-
-        if not response.status:
-            raise WorkerResponseError(
-                "LiveKit response is missing the recording status."
-            )
-
-        # To avoid exposing EgressStatus values and coupling with LiveKit outside of this class,
-        # the response status is mapped to simpler "ABORTED", "STOPPED" or "FAILED_TO_STOP" strings.
-        if response.status == livekit_api.EgressStatus.EGRESS_ABORTED:
-            return "ABORTED"
-
-        if response.status == livekit_api.EgressStatus.EGRESS_ENDING:
-            return "STOPPED"
-
-        return "FAILED_TO_STOP"
-
-    def start(self, room_name, recording_id):
-        """Start the egress process for a recording (not implemented in the base class).
-        Each derived class must implement this method, providing the necessary parameters for
-        its specific egress type (e.g. audio_only, streaming output).
-        """
-        raise NotImplementedError("Subclass must implement this method.")
-
-
-class VideoCompositeEgressService(BaseEgressService):
-    """Record multiple participant video and audio tracks into a single output '.mp4' file."""
-
-    hrid = "video-recording-composite-livekit-egress"
-
-    def start(self, room_name, recording_id):
-        """Start the video composite egress process for a recording."""
-
-        # Save room's recording as a mp4 video file.
-        file_type = livekit_api.EncodedFileType.MP4
-        filepath = self._get_filepath(filename=recording_id, extension="mp4")
-
-        file_output = livekit_api.EncodedFileOutput(
-            file_type=file_type,
-            filepath=filepath,
-            s3=self._s3,
-        )
-
-        request = livekit_api.RoomCompositeEgressRequest(
-            room_name=room_name,
-            file_outputs=[file_output],
-        )
-
-        response = self._handle_request(request, "start_room_composite_egress")
-
-        if not response.egress_id:
-            raise WorkerResponseError("Egress ID not found in the response.")
-
-        return response.egress_id
-
-
-class AudioCompositeEgressService(BaseEgressService):
-    """Record multiple participant audio tracks into a single output '.ogg' file."""
-
-    hrid = "audio-recording-composite-livekit-egress"
-
-    def start(self, room_name, recording_id):
-        """Start the audio composite egress process for a recording."""
-
-        # Save room's recording as an ogg audio file.
-        file_type = livekit_api.EncodedFileType.OGG
-        filepath = self._get_filepath(filename=recording_id, extension="ogg")
-
-        file_output = livekit_api.EncodedFileOutput(
-            file_type=file_type,
-            filepath=filepath,
-            s3=self._s3,
-        )
-
-        request = livekit_api.RoomCompositeEgressRequest(
-            room_name=room_name, file_outputs=[file_output], audio_only=True
-        )
-
-        response = self._handle_request(request, "start_room_composite_egress")
-
-        if not response.egress_id:
-            raise WorkerResponseError("Egress ID not found in the response.")
-
-        return response.egress_id

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

@@ -11,35 +11,32 @@ from core.factories import UserFactory
 pytestmark = pytest.mark.django_db
 
 
-def test_authentication_getter_existing_user(monkeypatch):
+def test_authentication_getter_existing_user_no_email(
+    django_assert_num_queries, monkeypatch
+):
     """
-    If an existing user matches, the user should be returned.
+    If an existing user matches the user's info sub, the user should be returned.
     """
 
     klass = OIDCAuthenticationBackend()
-    db_user = UserFactory(email="foo@mail.com")
+    db_user = UserFactory()
 
     def get_userinfo_mocked(*args):
-        return {"sub": db_user.sub, "email": "some@mail.com"}
-
-    def get_existing_user(*args):
-        return db_user
+        return {"sub": db_user.sub}
 
     monkeypatch.setattr(OIDCAuthenticationBackend, "get_userinfo", get_userinfo_mocked)
-    monkeypatch.setattr(
-        OIDCAuthenticationBackend, "get_existing_user", get_existing_user
-    )
 
-    user = klass.get_or_create_user(
-        access_token="test-token", id_token=None, payload=None
-    )
+    with django_assert_num_queries(1):
+        user = klass.get_or_create_user(
+            access_token="test-token", id_token=None, payload=None
+        )
 
     assert user == db_user
 
 
 def test_authentication_getter_new_user_no_email(monkeypatch):
     """
-    If no user matches, a user should be created.
+    If no user matches the user's info sub, a user should be created.
     User's info doesn't contain an email, created user's email should be empty.
     """
     klass = OIDCAuthenticationBackend()
@@ -61,7 +58,7 @@ def test_authentication_getter_new_user_no_email(monkeypatch):
 
 def test_authentication_getter_new_user_with_email(monkeypatch):
     """
-    If no user matches, a user should be created.
+    If no user matches the user's info sub, a user should be created.
     User's email and name should be set on the identity.
     The "email" field on the User model should not be set as it is reserved for staff users.
     """
@@ -105,183 +102,3 @@ def test_models_oidc_user_getter_invalid_token(django_assert_num_queries, monkey
         klass.get_or_create_user(access_token="test-token", id_token=None, payload=None)
 
     assert models.User.objects.exists() is False
-
-
-def test_models_oidc_user_getter_empty_sub(django_assert_num_queries, monkeypatch):
-    """The user's info contains a sub, but it's an empty string."""
-    klass = OIDCAuthenticationBackend()
-
-    def get_userinfo_mocked(*args):
-        return {"test": "123", "sub": ""}
-
-    monkeypatch.setattr(OIDCAuthenticationBackend, "get_userinfo", get_userinfo_mocked)
-
-    with (
-        django_assert_num_queries(0),
-        pytest.raises(
-            SuspiciousOperation,
-            match="User info contained no recognizable user identification",
-        ),
-    ):
-        klass.get_or_create_user(access_token="test-token", id_token=None, payload=None)
-
-    assert models.User.objects.exists() is False
-
-
-def test_authentication_get_inactive_user(monkeypatch):
-    """Test an exception is raised when attempting to authenticate inactive user."""
-
-    klass = OIDCAuthenticationBackend()
-    db_user = UserFactory(is_active=False)
-
-    def get_userinfo_mocked(*args):
-        return {"sub": db_user.sub}
-
-    monkeypatch.setattr(OIDCAuthenticationBackend, "get_userinfo", get_userinfo_mocked)
-
-    with (
-        pytest.raises(
-            SuspiciousOperation,
-            match="User account is disabled",
-        ),
-    ):
-        klass.get_or_create_user(access_token="test-token", id_token=None, payload=None)
-
-
-def test_finds_user_by_sub(django_assert_num_queries):
-    """Should return user when found by sub, and email is matching."""
-
-    klass = OIDCAuthenticationBackend()
-    db_user = UserFactory(email="foo@mail.com")
-
-    with django_assert_num_queries(1):
-        user = klass.get_existing_user(db_user.sub, db_user.email)
-
-    assert user == db_user
-
-
-def test_finds_user_when_email_fallback_disabled(django_assert_num_queries, settings):
-    """Should not return a user when not found by sub, and email fallback is disabled."""
-
-    settings.OIDC_FALLBACK_TO_EMAIL_FOR_IDENTIFICATION = False
-
-    klass = OIDCAuthenticationBackend()
-    db_user = UserFactory(email="foo@mail.com")
-
-    with django_assert_num_queries(1):
-        user = klass.get_existing_user("wrong-sub", db_user.email)
-
-    assert user is None
-
-
-def test_finds_user_when_email_is_none(django_assert_num_queries, settings):
-    """Should not return a user when not found by sub, and email is empty."""
-
-    settings.OIDC_FALLBACK_TO_EMAIL_FOR_IDENTIFICATION = True
-
-    klass = OIDCAuthenticationBackend()
-    UserFactory(email="foo@mail.com")
-
-    empty_email = ""
-
-    with django_assert_num_queries(1):
-        user = klass.get_existing_user("wrong-sub", empty_email)
-
-    assert user is None
-
-
-def test_finds_user_by_email(django_assert_num_queries, settings):
-    """Should return user when found by email, and sub is not matching."""
-
-    settings.OIDC_FALLBACK_TO_EMAIL_FOR_IDENTIFICATION = True
-
-    klass = OIDCAuthenticationBackend()
-    db_user = UserFactory(email="foo@mail.com")
-
-    with django_assert_num_queries(2):
-        user = klass.get_existing_user("wrong-sub", db_user.email)
-
-    assert user == db_user
-
-
-def test_finds_user_case_insensitive_email(django_assert_num_queries, settings):
-    """Should match email case-insensitively when falling back to email."""
-    settings.OIDC_FALLBACK_TO_EMAIL_FOR_IDENTIFICATION = True
-
-    klass = OIDCAuthenticationBackend()
-    db_user = UserFactory(email="foo@mail.com")
-
-    with django_assert_num_queries(2):
-        user = klass.get_existing_user("wrong-sub", "FOO@MAIL.COM")
-
-    assert user == db_user
-
-
-def test_finds_user_multiple_users_same_email(django_assert_num_queries, settings):
-    """Should handle multiple users with same email appropriately."""
-
-    settings.OIDC_FALLBACK_TO_EMAIL_FOR_IDENTIFICATION = True
-
-    klass = OIDCAuthenticationBackend()
-    email = "foo@mail.com"
-    UserFactory(email=email)
-    UserFactory(email=email)  # Second user with same email
-
-    with (
-        django_assert_num_queries(2),
-        pytest.raises(
-            SuspiciousOperation,
-            match="Multiple user accounts share a common email.",
-        ),
-    ):
-        klass.get_existing_user("wrong-sub", email)
-
-
-def test_finds_user_whitespace_email(django_assert_num_queries, settings):
-    """Should not match emails with whitespace."""
-
-    settings.OIDC_FALLBACK_TO_EMAIL_FOR_IDENTIFICATION = True
-    settings.OIDC_CREATE_USER = False
-
-    klass = OIDCAuthenticationBackend()
-    UserFactory(email="foo@mail.com")
-
-    with django_assert_num_queries(2):
-        user = klass.get_existing_user("wrong-sub", " foo@mail.com ")
-
-    assert user is None
-
-
-@pytest.mark.parametrize(
-    "email",
-    [
-        "john.doe@ｅxample.com",  # Fullwidth character in domain
-        "john.doe@еxample.com",  # Cyrillic 'е' in domain
-        "JOHN.DOe@exam𝔭le.com",  # Mixed Gothic '𝔭' in domain
-        "john.doe@exаmple.com",  # Cyrillic 'а' (a) in domain
-        "john.doe@ｅ𝓧𝓪𝓶𝓹𝓵𝓮.com",  # Mixed fullwidth and cursive in domain
-    ],
-)
-def test_authentication_getter_existing_user_email_tricky(email, monkeypatch, settings):
-    """Test email matching security against visually similar but non-ASCII domains.
-
-    Validates that emails with Unicode characters that visually resemble ASCII
-    (homoglyphs) are treated as distinct from their ASCII counterparts for security,
-    per RFC compliance requirements for hostnames.
-    """
-
-    settings.OIDC_FALLBACK_TO_EMAIL_FOR_IDENTIFICATION = True
-
-    klass = OIDCAuthenticationBackend()
-    db_user = UserFactory(email="john.doe@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(
-        access_token="test-token", id_token=None, payload=None
-    )
-
-    assert user != db_user

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

@@ -1,145 +0,0 @@
-"""
-Test event authentication.
-"""
-
-# pylint: disable=E1128
-
-from django.test import RequestFactory
-
-import pytest
-from rest_framework.exceptions import AuthenticationFailed
-
-from core.recording.event.authentication import (
-    MachineUser,
-    StorageEventAuthentication,
-)
-
-
-def test_successful_authentication(settings):
-    """Test successful authentication with valid token."""
-    settings.RECORDING_STORAGE_EVENT_TOKEN = "valid-test-token"
-    request = RequestFactory().get("/")
-    request.headers = {"Authorization": "Bearer valid-test-token"}
-
-    user, token = StorageEventAuthentication().authenticate(request)
-    assert token == "valid-test-token"
-    assert isinstance(user, MachineUser)
-
-
-def test_disabled_authentication_with_header(settings):
-    """Authentication should pass when no auth is configured, and header is present."""
-    settings.RECORDING_STORAGE_EVENT_TOKEN = None
-    settings.RECORDING_ENABLE_STORAGE_EVENT_AUTH = False
-
-    request = RequestFactory().get("/")
-    request.headers = {"Authorization": "Bearer some-token"}
-
-    user, token = StorageEventAuthentication().authenticate(request)
-    assert token is None
-    assert isinstance(user, MachineUser)
-
-
-def test_disabled_authentication_without_header(settings):
-    """Authentication should pass when no auth is configured, and no header is present."""
-    settings.RECORDING_STORAGE_EVENT_TOKEN = None
-    settings.RECORDING_ENABLE_STORAGE_EVENT_AUTH = False
-
-    request = RequestFactory().get("/")
-
-    user, token = StorageEventAuthentication().authenticate(request)
-    assert token is None
-    assert isinstance(user, MachineUser)
-
-
-def test_authentication_when_disabled(settings):
-    """Authentication should pass when disabled, regardless of token configuration."""
-    settings.RECORDING_STORAGE_EVENT_TOKEN = "some-token"
-    settings.RECORDING_ENABLE_STORAGE_EVENT_AUTH = False
-
-    request = RequestFactory().get("/")
-
-    user, token = StorageEventAuthentication().authenticate(request)
-    assert token is None
-    assert isinstance(user, MachineUser)
-
-
-def test_authentication_fails_when_token_not_configured(settings):
-    """Authentication should fail when authentication is enabled but no token is configured."""
-
-    # By default RECORDING_ENABLE_STORAGE_EVENT_AUTH should be True
-    settings.RECORDING_STORAGE_EVENT_TOKEN = None
-
-    request = RequestFactory().get("/")
-
-    with pytest.raises(
-        AuthenticationFailed,
-        match="Authentication is enabled but token is not configured",
-    ):
-        StorageEventAuthentication().authenticate(request)
-
-
-def test_missing_auth_header(settings):
-    """Test failure when Authorization header is missing."""
-    settings.RECORDING_STORAGE_EVENT_TOKEN = "valid-test-token"
-    request = RequestFactory().get("/")
-    request.headers = {}
-
-    with pytest.raises(AuthenticationFailed, match="Authorization header is required"):
-        StorageEventAuthentication().authenticate(request)
-
-
-def test_invalid_auth_header_format(settings):
-    """Test failure when Authorization header has invalid format."""
-    settings.RECORDING_STORAGE_EVENT_TOKEN = "valid-test-token"
-    request = RequestFactory().get("/")
-    request.headers = {"Authorization": "InvalidFormat"}
-
-    with pytest.raises(AuthenticationFailed, match="Invalid authorization header"):
-        StorageEventAuthentication().authenticate(request)
-
-
-def test_invalid_token_type(settings):
-    """Test failure when token type is not Bearer."""
-    settings.RECORDING_STORAGE_EVENT_TOKEN = "valid-test-token"
-    request = RequestFactory().get("/")
-    request.headers = {"Authorization": "Basic some-token"}
-
-    with pytest.raises(AuthenticationFailed, match="Invalid authorization header"):
-        StorageEventAuthentication().authenticate(request)
-
-
-def test_invalid_token(settings):
-    """Test failure when token is invalid."""
-    settings.RECORDING_STORAGE_EVENT_TOKEN = "valid-test-token"
-    request = RequestFactory().get("/")
-    request.headers = {"Authorization": "Bearer wrong-token"}
-
-    with pytest.raises(AuthenticationFailed, match="Invalid token"):
-        StorageEventAuthentication().authenticate(request)
-
-
-def test_malformed_auth_header(settings):
-    """Test failure when Authorization header is malformed."""
-    settings.RECORDING_STORAGE_EVENT_TOKEN = "valid-test-token"
-    request = RequestFactory().get("/")
-    request.headers = {"Authorization": "Bearer"}  # Missing token part
-
-    with pytest.raises(AuthenticationFailed, match="Invalid authorization header"):
-        StorageEventAuthentication().authenticate(request)
-
-
-def test_authenticate_header():
-    """Test the WWW-Authenticate header value."""
-    request = RequestFactory().get("/")
-    header = StorageEventAuthentication().authenticate_header(request)
-    assert header == "Bearer realm='Storage event API'"
-
-
-def test_multiple_spaces_in_auth_header(settings):
-    """Test failure when Authorization header contains multiple spaces."""
-    settings.RECORDING_STORAGE_EVENT_TOKEN = "valid-test-token"
-    request = RequestFactory().get("/")
-    request.headers = {"Authorization": "Bearer   extra-spaces-token"}
-
-    with pytest.raises(AuthenticationFailed, match="Invalid authorization header"):
-        StorageEventAuthentication().authenticate(request)

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

@@ -1,310 +0,0 @@
-"""
-Test event parsers.
-"""
-
-# pylint: disable=W0212,W0621,W0613
-
-from unittest import mock
-
-from django.conf import settings
-
-import pytest
-
-from core.recording.event.exceptions import (
-    InvalidBucketError,
-    InvalidFilepathError,
-    InvalidFileTypeError,
-    ParsingEventDataError,
-)
-from core.recording.event.parsers import (
-    MinioParser,
-    StorageEvent,
-    get_parser,
-)
-
-
-@pytest.fixture
-def valid_minio_event():
-    """Mock a valid Minio event."""
-    return {
-        "Records": [
-            {
-                "s3": {
-                    "bucket": {"name": "test-bucket"},
-                    "object": {
-                        "key": "recording%2F46d1a121-2426-484d-8fb3-09b5d886f7a8.ogg",
-                        "contentType": "audio/ogg",
-                    },
-                }
-            }
-        ]
-    }
-
-
-@pytest.fixture
-def minio_parser():
-    """Mock a Minio parser."""
-    return MinioParser(bucket_name="test-bucket")
-
-
-def test_parse_valid_event(minio_parser, valid_minio_event):
-    """Test parsing a valid Minio event."""
-    event = minio_parser.parse(valid_minio_event)
-    assert isinstance(event, StorageEvent)
-    assert event.filepath == "recording%2F46d1a121-2426-484d-8fb3-09b5d886f7a8.ogg"
-    assert event.filetype == "audio/ogg"
-    assert event.bucket_name == "test-bucket"
-    assert event.metadata is None
-
-
-def test_parse_empty_data(minio_parser):
-    """Test parsing empty event data raises error."""
-    with pytest.raises(ParsingEventDataError, match="Received empty data."):
-        minio_parser.parse({})
-
-
-def test_parse_missing_keys(minio_parser):
-    """Test parsing event with missing key."""
-
-    invalid_minio_event = {
-        "Records": [
-            {
-                "s3": {
-                    "bucket": {"name": None},
-                    # Missing 'object' key
-                }
-            }
-        ]
-    }
-
-    with pytest.raises(ParsingEventDataError, match="Missing or malformed key"):
-        minio_parser.parse(invalid_minio_event)
-
-
-def test_parse_none_key(minio_parser):
-    """Test parsing event with None field."""
-
-    invalid_minio_event = {
-        "Records": [
-            {
-                "s3": {
-                    "bucket": {"name": "test-bucket"},
-                    "object": {
-                        "key": "recording%2F46d1a121-2426-484d-8fb3-09b5d886f7a8.ogg",
-                        "contentType": None,  # 'contentType' should not be None
-                    },
-                }
-            }
-        ]
-    }
-
-    with pytest.raises(ParsingEventDataError, match="Missing essential data fields"):
-        minio_parser.parse(invalid_minio_event)
-
-
-def test_validate_invalid_bucket(minio_parser):
-    """Test validation with wrong bucket name."""
-    event = StorageEvent(
-        filepath="recording%2F46d1a121-2426-484d-8fb3-09b5d886f7a8.ogg",
-        filetype="audio/ogg",
-        bucket_name="wrong-bucket",
-        metadata=None,
-    )
-    with pytest.raises(InvalidBucketError):
-        minio_parser.validate(event)
-
-
-def test_validate_invalid_filetype(minio_parser):
-    """Test validation with unsupported file type."""
-    event = StorageEvent(
-        filepath="recording%2F46d1a121-2426-484d-8fb3-09b5d886f7a8.txt",
-        filetype="text/plain",  # Not included in the default allowed filetypes
-        bucket_name="test-bucket",
-        metadata=None,
-    )
-    with pytest.raises(InvalidFileTypeError):
-        minio_parser.validate(event)
-
-
-@pytest.mark.parametrize(
-    "invalid_filepath",
-    [
-        "invalid_filepath",
-        "recording/46d1a121-2426-484d-8fb3-09b5d886f7a8.ogg",
-        "recording%2F46d1a1212426484d8fb309b5d886f7a8.ogg",
-    ],
-)
-def test_validate_invalid_filepath(invalid_filepath, minio_parser):
-    """Test validation with malformed filepath."""
-    event = StorageEvent(
-        filepath=invalid_filepath,
-        filetype="audio/ogg",
-        bucket_name="test-bucket",
-        metadata=None,
-    )
-    with pytest.raises(InvalidFilepathError):
-        minio_parser.validate(event)
-
-
-def test_validate_valid_event(minio_parser):
-    """Test validation with valid event data."""
-    event = StorageEvent(
-        filepath="recording%2F46d1a121-2426-484d-8fb3-09b5d886f7a8.ogg",
-        filetype="audio/ogg",
-        bucket_name="test-bucket",
-        metadata=None,
-    )
-    recording_id = minio_parser.validate(event)
-    assert recording_id == "46d1a121-2426-484d-8fb3-09b5d886f7a8"
-
-
-def test_get_recording_id_success(minio_parser, valid_minio_event):
-    """Test successful extraction of recording ID."""
-    recording_id = minio_parser.get_recording_id(valid_minio_event)
-    assert recording_id == "46d1a121-2426-484d-8fb3-09b5d886f7a8"
-
-
-def test_validate_filepath_with_folder(minio_parser):
-    """Test validation of filepath with folder structure."""
-    event = StorageEvent(
-        filepath="parent_folder%2Ffolder%2F46d1a121-2426-484d-8fb3-09b5d886f7a8.ogg",
-        filetype="audio/ogg",
-        bucket_name="test-bucket",
-        metadata=None,
-    )
-    recording_id = minio_parser.validate(event)
-    assert recording_id == "46d1a121-2426-484d-8fb3-09b5d886f7a8"
-
-
-def test_parse_with_video_type(minio_parser):
-    """Test parsing event with video file type."""
-    video_event = {
-        "Records": [
-            {
-                "s3": {
-                    "bucket": {"name": "test-bucket"},
-                    "object": {
-                        "key": "46d1a121-2426-484d-8fb3-09b5d886f7a8.mp4",
-                        "contentType": "video/mp4",
-                    },
-                }
-            }
-        ]
-    }
-    event = minio_parser.parse(video_event)
-    assert event.filetype == "video/mp4"
-    assert event.filepath.endswith(".mp4")
-
-
-def test_empty_allowed_filetypes():
-    """Test MinioParser with empty allowed_filetypes."""
-    empty_types = set()
-    parser = MinioParser(bucket_name="test-bucket", allowed_filetypes=empty_types)
-    assert parser._allowed_filetypes == {"audio/ogg", "video/mp4"}
-
-
-def test_custom_allowed_filetypes():
-    """Test MinioParser with empty allowed_filetypes."""
-    custom_types = {"audio/mp3", "video/mov"}
-    parser = MinioParser(bucket_name="test-bucket", allowed_filetypes=custom_types)
-    assert parser._allowed_filetypes == {"audio/mp3", "video/mov"}
-
-
-def test_validate_custom_filetypes():
-    """Test validation of filepath with folder structure."""
-
-    parser = MinioParser(bucket_name="test-bucket", allowed_filetypes={"audio/mp3"})
-
-    event = StorageEvent(
-        filepath="parent_folder%2Ffolder%2F46d1a121-2426-484d-8fb3-09b5d886f7a8.ogg",
-        filetype="audio/mp3",
-        bucket_name="test-bucket",
-        metadata=None,
-    )
-    parser.validate(event)
-
-
-def test_constructor_none_bucket():
-    """Test MinioParser constructor with None bucket name."""
-    with pytest.raises(ValueError, match="Bucket name cannot be None or empty"):
-        MinioParser(bucket_name=None)
-
-
-def test_constructor_empty_bucket():
-    """Test MinioParser constructor with empty bucket name."""
-    with pytest.raises(ValueError, match="Bucket name cannot be None or empty"):
-        MinioParser(bucket_name="")
-
-
-@pytest.fixture
-def clear_lru_cache():
-    """Fixture to clear the LRU cache between tests."""
-    get_parser.cache_clear()
-    yield
-    get_parser.cache_clear()
-
-
-def test_returns_correct_instance(clear_lru_cache):
-    """Test if get_parser returns the correct parser instance."""
-    settings.AWS_STORAGE_BUCKET_NAME = "test-bucket"
-    parser = get_parser()
-    assert isinstance(parser, MinioParser)
-    assert parser._bucket_name == "test-bucket"
-
-
-def test_caching_behavior(clear_lru_cache):
-    """Test if the function properly caches the parser instance."""
-    settings.AWS_STORAGE_BUCKET_NAME = "test-bucket"
-    parser1 = get_parser()
-    parser2 = get_parser()
-    assert parser1 is parser2  # Check object identity
-
-
-def test_different_settings_new_instance():
-    """Test if changing settings creates a new instance."""
-    settings.AWS_STORAGE_BUCKET_NAME = "different-bucket"
-    parser = get_parser()
-    assert parser._bucket_name == "different-bucket"
-
-
-def test_import_error_handling(clear_lru_cache):
-    """Test handling of import errors for invalid parser class."""
-    settings.RECORDING_EVENT_PARSER_CLASS = "invalid.parser.path"
-    with pytest.raises(ImportError):
-        get_parser()
-
-
-@mock.patch("core.recording.event.parsers.import_string")
-def test_parser_instantiation_called_once(mock_import_string, clear_lru_cache):
-    """Test that parser class is instantiated only once due to caching."""
-    mock_parser_cls = type(
-        "MockParser",
-        (),
-        {
-            "__init__": lambda self, bucket_name: setattr(
-                self, "_bucket_name", bucket_name
-            )
-        },
-    )
-    mock_import_string.return_value = mock_parser_cls
-
-    # First call
-    parser1 = get_parser()
-    # Second call
-    parser2 = get_parser()
-
-    # Verify import_string was called only once
-    mock_import_string.assert_called_once_with(settings.RECORDING_EVENT_PARSER_CLASS)
-    assert parser1 is parser2
-
-
-def test_cache_clear_behavior(clear_lru_cache, settings):
-    """Test that cache clearing creates new instance."""
-
-    settings.RECORDING_EVENT_PARSER_CLASS = "core.recording.event.parsers.MinioParser"
-
-    parser1 = get_parser()
-    get_parser.cache_clear()
-    parser2 = get_parser()
-
-    assert parser1 is not parser2  # Should be different instances after cache clear

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

@@ -1,203 +0,0 @@
-"""
-Test recordings API endpoints in the Meet core app: save recording.
-"""
-
-# pylint: disable=W0621,W0613
-
-import uuid
-from unittest import mock
-
-import pytest
-from rest_framework.test import APIClient
-
-from ...factories import RecordingFactory
-from ...models import Recording, RecordingStatusChoices
-from ...recording.event.exceptions import (
-    InvalidBucketError,
-    InvalidFileTypeError,
-    ParsingEventDataError,
-)
-
-pytestmark = pytest.mark.django_db
-
-
-@pytest.fixture
-def recording_settings(settings):
-    """Configure recording-related and storage event Django settings."""
-    settings.RECORDING_STORAGE_EVENT_TOKEN = "testAuthToken"
-    settings.RECORDING_STORAGE_EVENT_ENABLE = True
-    return settings
-
-
-@pytest.fixture
-def mock_get_parser():
-    """Mock 'get_parser' factory function."""
-    with mock.patch("core.api.viewsets.get_parser") as mock_parser:
-        yield mock_parser
-
-
-def test_save_recording_anonymous(settings, client):
-    """Anonymous users should not be allowed to save room recordings."""
-    settings.RECORDING_STORAGE_EVENT_TOKEN = "testAuthToken"
-
-    RecordingFactory(status="active")
-
-    response = client.post(
-        "/api/v1.0/recordings/storage-hook/",
-        {"recording_data": "valid-data"},
-    )
-
-    assert response.status_code == 401
-    assert Recording.objects.count() == 1
-
-
-def test_save_recording_wrong_bearer(settings, client):
-    """Requests with incorrect bearer token should be rejected when auth is required."""
-
-    settings.RECORDING_STORAGE_EVENT_TOKEN = "testAuthToken"
-
-    response = client.post(
-        "/api/v1.0/recordings/storage-hook/",
-        {"recording_data": "valid-data"},
-        HTTP_AUTHORIZATION="Bearer wrongAuthToken",
-    )
-
-    assert response.status_code == 401
-
-
-def test_save_recording_permission_needed(settings, client):
-    """Recordings should not be saved when feature is disabled."""
-
-    settings.RECORDING_STORAGE_EVENT_TOKEN = "testAuthToken"
-    settings.RECORDING_STORAGE_EVENT_ENABLE = False
-
-    response = client.post(
-        "/api/v1.0/recordings/storage-hook/",
-        {"recording_data": "valid-data"},
-        HTTP_AUTHORIZATION="Bearer testAuthToken",
-    )
-
-    assert response.status_code == 403
-
-
-def test_save_recording_parsing_error(recording_settings, mock_get_parser, client):
-    """Test handling of parsing errors in recording event data."""
-    mock_parser = mock.Mock()
-    mock_parser.get_recording_id.side_effect = ParsingEventDataError("Error message")
-    mock_get_parser.return_value = mock_parser
-
-    response = client.post(
-        "/api/v1.0/recordings/storage-hook/",
-        {"recording_data": "valid-data"},
-        HTTP_AUTHORIZATION="Bearer testAuthToken",
-    )
-
-    assert response.status_code == 403
-    assert response.json() == {"detail": "Invalid request data: Error message"}
-
-
-def test_save_recording_bucket_error(recording_settings, mock_get_parser, client):
-    """Test handling of invalid storage bucket errors in recording event data."""
-
-    mock_parser = mock.Mock()
-    mock_parser.get_recording_id.side_effect = InvalidBucketError("Error message")
-    mock_get_parser.return_value = mock_parser
-
-    response = client.post(
-        "/api/v1.0/recordings/storage-hook/",
-        {"recording_data": "valid-data"},
-        HTTP_AUTHORIZATION="Bearer testAuthToken",
-    )
-
-    assert response.status_code == 403
-    assert response.json() == {"detail": "Invalid bucket specified"}
-
-
-def test_save_recording_filetype_error(recording_settings, mock_get_parser):
-    """Test handling of unsupported file types in recording event data."""
-
-    mock_parser = mock.Mock()
-    mock_parser.get_recording_id.side_effect = InvalidFileTypeError(
-        "unsupported '.json'"
-    )
-    mock_get_parser.return_value = mock_parser
-
-    client = APIClient()
-
-    response = client.post(
-        "/api/v1.0/recordings/storage-hook/",
-        {"recording_data": "valid-data"},
-        HTTP_AUTHORIZATION="Bearer testAuthToken",
-    )
-
-    assert response.status_code == 200
-    assert response.json() == {"message": "Ignore this file type, unsupported '.json'"}
-
-
-def test_save_recording_unknown_recording(recording_settings, mock_get_parser, client):
-    """Test handling of events for non-existent recordings."""
-
-    RecordingFactory(status="active")
-
-    mock_parser = mock.Mock()
-    mock_parser.get_recording_id.return_value = uuid.uuid4()
-    mock_get_parser.return_value = mock_parser
-
-    response = client.post(
-        "/api/v1.0/recordings/storage-hook/",
-        {"recording_data": "valid-data"},
-        HTTP_AUTHORIZATION="Bearer testAuthToken",
-    )
-
-    assert response.status_code == 404
-    assert response.json() == {"detail": "No recording found for this event."}
-
-
-@pytest.mark.parametrize(
-    "status", ["failed_to_start", "aborted", "failed_to_stop", "saved", "initiated"]
-)
-def test_save_recording_non_savable_recording(
-    recording_settings, mock_get_parser, client, status
-):
-    """Test that recordings in non-savable states cannot be saved."""
-
-    recording = RecordingFactory(status=status)
-
-    mock_parser = mock.Mock()
-    mock_parser.get_recording_id.return_value = recording.id
-    mock_get_parser.return_value = mock_parser
-
-    response = client.post(
-        "/api/v1.0/recordings/storage-hook/",
-        {"recording_data": "valid-data"},
-        HTTP_AUTHORIZATION="Bearer testAuthToken",
-    )
-
-    assert response.status_code == 403
-    assert response.json() == {
-        "detail": f"Recording with ID {recording.id} cannot be saved because it is either,"
-        " in an error state or has already been saved."
-    }
-
-
-@pytest.mark.parametrize("status", ["active", "stopped"])
-def test_save_recording_success(recording_settings, mock_get_parser, client, status):
-    """Test successful saving of recordings in valid states."""
-
-    recording = RecordingFactory(status=status)
-
-    mock_parser = mock.Mock()
-    mock_parser.get_recording_id.return_value = recording.id
-    mock_get_parser.return_value = mock_parser
-
-    response = client.post(
-        "/api/v1.0/recordings/storage-hook/",
-        {"recording_data": "valid-data"},
-        HTTP_AUTHORIZATION="Bearer testAuthToken",
-    )
-
-    assert response.status_code == 200
-    assert response.json() == {"message": "Event processed."}
-
-    recording.refresh_from_db()
-    assert recording.status == RecordingStatusChoices.SAVED

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

@@ -1,171 +0,0 @@
-"""
-Test worker service factories.
-"""
-
-# pylint: disable=W0212,W0621,W0613
-
-from dataclasses import FrozenInstanceError
-from unittest.mock import Mock
-
-from django.test import override_settings
-
-import pytest
-
-from core.recording.worker.factories import (
-    WorkerService,
-    WorkerServiceConfig,
-    get_worker_service,
-)
-
-
-@pytest.fixture(autouse=True)
-def clear_lru_cache():
-    """Clear the lru_cache before and after each test"""
-    WorkerServiceConfig.from_settings.cache_clear()
-    yield
-    WorkerServiceConfig.from_settings.cache_clear()
-
-
-@pytest.fixture
-def test_settings():
-    """Fixture to provide test Django 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",
-        "AWS_S3_REGION_NAME": "test-region",
-        "AWS_STORAGE_BUCKET_NAME": "test-bucket",
-    }
-
-    # Use override_settings to properly patch Django settings
-    with override_settings(**mocked_settings):
-        yield test_settings
-
-
-@pytest.fixture
-def default_config(test_settings):
-    """Fixture to provide a WorkerServiceConfig instance"""
-    return WorkerServiceConfig.from_settings()
-
-
-# Tests
-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",
-        "secret": "test_secret",
-        "region": "test-region",
-        "bucket": "test-bucket",
-        "force_path_style": True,
-    }
-
-
-def test_config_immutability(default_config):
-    """Test that config instances are immutable after creation"""
-    with pytest.raises(FrozenInstanceError):
-        default_config.output_folder = "new/path"
-
-
-@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",
-    AWS_S3_REGION_NAME="test-region",
-    AWS_STORAGE_BUCKET_NAME="test-bucket",
-)
-def test_config_caching():
-    """Test that from_settings method caches its result"""
-    # Clear cache before testing caching behavior
-    WorkerServiceConfig.from_settings.cache_clear()
-
-    config1 = WorkerServiceConfig.from_settings()
-    config2 = WorkerServiceConfig.from_settings()
-    assert config1 is config2
-
-
-class MockWorkerService(WorkerService):
-    """Mock worker service for testing."""
-
-    def __init__(self, config):
-        self.config = config
-
-
-@pytest.fixture
-def mock_import_string(monkeypatch):
-    """Fixture to mock import_string function."""
-    mock = Mock(return_value=MockWorkerService)
-    monkeypatch.setattr("core.recording.worker.factories.import_string", mock)
-    return mock
-
-
-def test_factory_valid_mode(mock_import_string, settings, default_config):
-    """Test getting worker service with valid mode."""
-
-    settings.RECORDING_WORKER_CLASSES = {
-        "test_mode": "path.to.MockWorkerService",
-        "another_mode": "path.to.AnotherWorkerService",
-    }
-
-    worker = get_worker_service("test_mode")
-
-    mock_import_string.assert_called_once_with("path.to.MockWorkerService")
-    assert isinstance(worker, MockWorkerService)
-    assert worker.config == default_config
-
-
-def test_factory_invalid_mode(settings, mock_import_string, default_config):
-    """Test getting worker service with invalid mode raises ValueError."""
-
-    settings.RECORDING_WORKER_CLASSES = {
-        "test_mode": "path.to.MockWorkerService",
-        "another_mode": "path.to.AnotherWorkerService",
-    }
-
-    worker = get_worker_service("test_mode")
-
-    mock_import_string.assert_called_once_with("path.to.MockWorkerService")
-    assert isinstance(worker, MockWorkerService)
-
-    with pytest.raises(ValueError) as exc_info:
-        get_worker_service("invalid_mode")
-        mock_import_string.assert_not_called()
-
-    assert "Recording mode 'invalid_mode' not found" in str(exc_info.value)
-    assert "Available modes: ['test_mode', 'another_mode']" in str(exc_info.value)
-
-
-def test_factory_import_error(mock_import_string, settings):
-    """Test handling of import errors."""
-
-    mock_import_string.side_effect = ImportError("Module not found")
-
-    settings.RECORDING_WORKER_CLASSES = {
-        "test_mode": "path.to.MockWorkerService",
-        "another_mode": "path.to.AnotherWorkerService",
-    }
-
-    with pytest.raises(ImportError) as exc_info:
-        get_worker_service("test_mode")
-
-    assert "Module not found" in str(exc_info.value)
-
-
-def test_factory_empty_registry(settings):
-    """Test behavior when worker registry is empty."""
-
-    settings.RECORDING_WORKER_CLASSES = {}
-
-    with pytest.raises(ValueError) as exc_info:
-        get_worker_service("any_mode")
-
-    assert "Available modes: []" in str(exc_info.value)

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

@@ -1,161 +0,0 @@
-"""Test WorkerServiceMediator class."""
-
-# pylint: disable=W0621,W0613
-
-from unittest.mock import Mock
-
-import pytest
-
-from core.factories import RecordingFactory
-from core.models import RecordingStatusChoices
-from core.recording.worker.exceptions import (
-    RecordingStartError,
-    RecordingStopError,
-    WorkerConnectionError,
-    WorkerRequestError,
-    WorkerResponseError,
-)
-from core.recording.worker.factories import WorkerService
-from core.recording.worker.mediator import WorkerServiceMediator
-
-pytestmark = pytest.mark.django_db
-
-
-@pytest.fixture
-def mock_worker_service():
-    """Fixture for mock worker service"""
-    return Mock(spec=WorkerService)
-
-
-@pytest.fixture
-def mediator(mock_worker_service):
-    """Fixture for WorkerServiceMediator"""
-    return WorkerServiceMediator(mock_worker_service)
-
-
-def test_start_recording_success(mediator, mock_worker_service):
-    """Test successful recording start"""
-    # Setup
-    worker_id = "test-worker-123"
-    mock_worker_service.start.return_value = worker_id
-
-    mock_recording = RecordingFactory(
-        status=RecordingStatusChoices.INITIATED, worker_id=None
-    )
-    mediator.start(mock_recording)
-
-    # Verify worker service call
-    expected_room_name = str(mock_recording.room.id)
-    mock_worker_service.start.assert_called_once_with(
-        expected_room_name, mock_recording.id
-    )
-
-    # Verify recording updates
-    mock_recording.refresh_from_db()
-    assert mock_recording.worker_id == worker_id
-    assert mock_recording.status == RecordingStatusChoices.ACTIVE
-
-
-@pytest.mark.parametrize(
-    "error_class", [WorkerRequestError, WorkerConnectionError, WorkerResponseError]
-)
-def test_mediator_start_recording_worker_errors(
-    mediator, mock_worker_service, error_class
-):
-    """Test handling of various worker errors during start"""
-    # Setup
-    mock_worker_service.start.side_effect = error_class("Test error")
-    mock_recording = RecordingFactory(
-        status=RecordingStatusChoices.INITIATED, worker_id=None
-    )
-
-    # Execute and verify
-    with pytest.raises(RecordingStartError):
-        mediator.start(mock_recording)
-
-    # Verify recording updates
-    mock_recording.refresh_from_db()
-    assert mock_recording.status == RecordingStatusChoices.FAILED_TO_START
-    assert mock_recording.worker_id is None
-
-
-@pytest.mark.parametrize(
-    "status",
-    [
-        RecordingStatusChoices.ACTIVE,
-        RecordingStatusChoices.FAILED_TO_START,
-        RecordingStatusChoices.FAILED_TO_STOP,
-        RecordingStatusChoices.STOPPED,
-        RecordingStatusChoices.SAVED,
-        RecordingStatusChoices.ABORTED,
-    ],
-)
-def test_mediator_start_recording_from_forbidden_status(
-    mediator, mock_worker_service, status
-):
-    """Test handling of various worker errors during start"""
-    # Setup
-    mock_recording = RecordingFactory(status=status)
-
-    # Execute and verify
-    with pytest.raises(RecordingStartError):
-        mediator.start(mock_recording)
-
-    # Verify recording was not updated
-    mock_recording.refresh_from_db()
-    assert mock_recording.status == status
-
-
-def test_mediator_stop_recording_success(mediator, mock_worker_service):
-    """Test successful recording stop"""
-    # Setup
-    mock_recording = RecordingFactory(
-        status=RecordingStatusChoices.ACTIVE, worker_id="test-worker-123"
-    )
-    mock_worker_service.stop.return_value = "STOPPED"
-
-    # Execute
-    mediator.stop(mock_recording)
-
-    # Verify worker service call
-    mock_worker_service.stop.assert_called_once_with(worker_id=mock_recording.worker_id)
-
-    # Verify recording updates
-    mock_recording.refresh_from_db()
-    assert mock_recording.status == RecordingStatusChoices.STOPPED
-
-
-def test_mediator_stop_recording_aborted(mediator, mock_worker_service):
-    """Test recording stop when worker returns ABORTED"""
-    # Setup
-    mock_recording = RecordingFactory(
-        status=RecordingStatusChoices.ACTIVE, worker_id="test-worker-123"
-    )
-    mock_worker_service.stop.return_value = "ABORTED"
-
-    # Execute
-    mediator.stop(mock_recording)
-
-    # Verify recording updates
-    mock_recording.refresh_from_db()
-    assert mock_recording.status == RecordingStatusChoices.ABORTED
-
-
-@pytest.mark.parametrize("error_class", [WorkerConnectionError, WorkerResponseError])
-def test_mediator_stop_recording_worker_errors(
-    mediator, mock_worker_service, error_class
-):
-    """Test handling of worker errors during stop"""
-    # Setup
-    mock_recording = RecordingFactory(
-        status=RecordingStatusChoices.ACTIVE, worker_id="test-worker-123"
-    )
-    mock_worker_service.stop.side_effect = error_class("Test error")
-
-    # Execute and verify
-    with pytest.raises(RecordingStopError):
-        mediator.stop(mock_recording)
-
-    # Verify recording updates
-    mock_recording.refresh_from_db()
-    assert mock_recording.status == RecordingStatusChoices.FAILED_TO_STOP

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

@@ -1,368 +0,0 @@
-"""
-Test worker service classes.
-"""
-
-# pylint: disable=W0212,W0621,W0613,E1101
-
-from unittest.mock import AsyncMock, Mock, patch
-
-import aiohttp
-import pytest
-
-from core.recording.worker.exceptions import WorkerConnectionError, WorkerResponseError
-from core.recording.worker.factories import WorkerServiceConfig
-from core.recording.worker.services import (
-    AudioCompositeEgressService,
-    BaseEgressService,
-    VideoCompositeEgressService,
-    livekit_api,
-)
-
-
-@pytest.fixture
-def config():
-    """Fixture to provide a WorkerServiceConfig instance"""
-    return WorkerServiceConfig(
-        output_folder="/test/output",
-        server_configurations={
-            "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",
-            "secret": "test_secret",
-            "region": "test-region",
-            "bucket": "test-bucket",
-            "force_path_style": True,
-        },
-    )
-
-
-@pytest.fixture
-def mock_s3_upload():
-    """Fixture for mocked S3Upload"""
-    with patch("core.recording.worker.services.livekit_api.S3Upload") as mock:
-        yield mock
-
-
-@pytest.fixture
-def mock_egress_service():
-    """Fixture for mocked EgressService"""
-    with patch("core.recording.worker.services.EgressService") as mock:
-        yield mock
-
-
-@pytest.fixture
-def service(config, mock_s3_upload):
-    """Fixture for BaseEgressService instance"""
-    return BaseEgressService(config)
-
-
-@pytest.fixture
-def mock_client_session():
-    """Fixture for mocked aiohttp.ClientSession"""
-    with patch("aiohttp.ClientSession") as mock:
-        mock.return_value.__aenter__ = AsyncMock()
-        mock.return_value.__aexit__ = AsyncMock()
-        yield mock
-
-
-@pytest.fixture
-def mock_tcp_connector():
-    """Fixture for TCPConnector"""
-    with patch("aiohttp.TCPConnector") as mock_connector:
-        mock_connector_instance = Mock()
-        mock_connector.return_value = mock_connector_instance
-        yield mock_connector
-
-
-@pytest.fixture
-def video_service(config):
-    """Fixture for VideoCompositeEgressService"""
-    service = VideoCompositeEgressService(config)
-    service._handle_request = Mock()  # Mock the request handler
-    return service
-
-
-@pytest.fixture
-def audio_service(config):
-    """Fixture for AudioCompositeEgressService"""
-    service = AudioCompositeEgressService(config)
-    service._handle_request = Mock()  # Mock the request handler
-    return service
-
-
-def test_base_egress_initialization(config, mock_s3_upload):
-    """Test service initialization"""
-
-    service = BaseEgressService(config)
-    assert service._config == config
-
-    mock_s3_upload.assert_called_once_with(
-        endpoint="https://s3.test.com",
-        access_key="test_key",
-        secret="test_secret",
-        region="test-region",
-        bucket="test-bucket",
-        force_path_style=True,
-    )
-
-
-@pytest.mark.parametrize(
-    "filename,extension,expected",
-    [
-        ("test", "mp4", "/test/output/test.mp4"),
-        ("recording123", "ogg", "/test/output/recording123.ogg"),
-        ("live_stream", "m3u8", "/test/output/live_stream.m3u8"),
-    ],
-)
-def test_base_egress_filepath_construction(service, filename, extension, expected):
-    """Test filepath construction with various inputs"""
-    result = service._get_filepath(filename, extension)
-    assert result == expected
-    assert result.startswith(service._config.output_folder)
-    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",
-    [
-        (livekit_api.EgressStatus.EGRESS_ABORTED, "ABORTED"),
-        (livekit_api.EgressStatus.EGRESS_COMPLETE, "FAILED_TO_STOP"),
-        (livekit_api.EgressStatus.EGRESS_ENDING, "STOPPED"),
-        (livekit_api.EgressStatus.EGRESS_FAILED, "FAILED_TO_STOP"),
-    ],
-)
-def test_base_egress_stop_with_status(service, response_status, expected_result):
-    """Test stop method with different response statuses"""
-    # Mock _handle_request
-    mock_response = Mock(status=response_status)
-    service._handle_request = Mock(return_value=mock_response)
-
-    # Execute stop
-    result = service.stop("test_worker_id")
-
-    # Verify request and response handling
-    service._handle_request.assert_called_once_with(
-        livekit_api.StopEgressRequest(egress_id="test_worker_id"), "stop_egress"
-    )
-    assert result == expected_result
-
-
-def test_base_egress_stop_missing_status(service):
-    """Test stop method when response is missing status"""
-    # Mock _handle_request with missing status
-    mock_response = Mock(status=None)
-    service._handle_request = Mock(return_value=mock_response)
-
-    # Verify error handling
-    with pytest.raises(WorkerResponseError) as exc:
-        service.stop("test_worker_id")
-
-    assert "missing the recording status" in str(exc.value)
-
-
-def test_base_egress_start_not_implemented(service):
-    """Test that start method raises NotImplementedError"""
-    with pytest.raises(NotImplementedError) as exc:
-        service.start("test_room", "test_recording")
-    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"
-
-
-def test_video_composite_egress_start_success(video_service):
-    """Test successful start of video composite egress"""
-    # Setup mock response
-    egress_id = "test-egress-123"
-    video_service._handle_request.return_value = Mock(egress_id=egress_id)
-
-    # Test parameters
-    room_name = "test-room"
-    recording_id = "rec-123"
-
-    # Call start
-    result = video_service.start(room_name, recording_id)
-
-    # Verify result
-    assert result == egress_id
-
-    # Verify request construction
-    video_service._handle_request.assert_called_once()
-    request = video_service._handle_request.call_args[0][0]
-    method = video_service._handle_request.call_args[0][1]
-
-    # Verify request properties
-    assert isinstance(request, livekit_api.RoomCompositeEgressRequest)
-    assert request.room_name == room_name
-    assert len(request.file_outputs) == 1
-
-    assert not request.audio_only  # Video service shouldn't set audio_only
-
-    # Verify file output configuration
-    file_output = request.file_outputs[0]
-    assert file_output.file_type == livekit_api.EncodedFileType.MP4
-    assert file_output.filepath == f"/test/output/{recording_id}.mp4"
-    assert file_output.s3.bucket == "test-bucket"
-
-    # Verify method name
-    assert method == "start_room_composite_egress"
-
-
-def test_video_composite_egress_start_missing_egress_id(video_service):
-    """Test handling of missing egress ID in response"""
-    # Setup mock response without egress_id
-    video_service._handle_request.return_value = Mock(egress_id=None)
-
-    with pytest.raises(WorkerResponseError) as exc_info:
-        video_service.start("test-room", "rec-123")
-
-    assert "Egress ID not found" in str(exc_info.value)
-
-
-def test_audio_composite_egress_hrid(audio_service):
-    """Test HRID is correct"""
-    assert audio_service.hrid == "audio-recording-composite-livekit-egress"
-
-
-def test_audio_composite_egress_start_success(audio_service):
-    """Test successful start of audio composite egress"""
-    # Setup mock response
-    egress_id = "test-egress-123"
-    audio_service._handle_request.return_value = Mock(egress_id=egress_id)
-
-    # Test parameters
-    room_name = "test-room"
-    recording_id = "rec-123"
-
-    # Call start
-    result = audio_service.start(room_name, recording_id)
-
-    # Verify result
-    assert result == egress_id
-
-    # Verify request construction
-    audio_service._handle_request.assert_called_once()
-    request = audio_service._handle_request.call_args[0][0]
-    method = audio_service._handle_request.call_args[0][1]
-
-    # Verify request properties
-    assert isinstance(request, livekit_api.RoomCompositeEgressRequest)
-    assert request.room_name == room_name
-    assert len(request.file_outputs) == 1
-    assert request.audio_only is True  # Audio service should set audio_only
-
-    # Verify file output configuration
-    file_output = request.file_outputs[0]
-    assert file_output.file_type == livekit_api.EncodedFileType.OGG
-    assert file_output.filepath == f"/test/output/{recording_id}.ogg"
-    assert file_output.s3.bucket == "test-bucket"
-
-    # Verify method name
-    assert method == "start_room_composite_egress"
-
-
-def test_audio_composite_egress_start_missing_egress_id(audio_service):
-    """Test handling of missing egress ID in response"""
-    # Setup mock response without egress_id
-    audio_service._handle_request.return_value = Mock(egress_id=None)
-
-    with pytest.raises(WorkerResponseError) as exc_info:
-        audio_service.start("test-room", "rec-123")
-
-    assert "Egress ID not found" in str(exc_info.value)

src/backend/core/tests/recordings/test_api_recordings_delete.py

@@ -5,7 +5,7 @@ Test recordings API endpoints in the Meet core app: delete.
 import pytest
 from rest_framework.test import APIClient
 
-from ...factories import RecordingFactory, UserFactory, UserRecordingAccessFactory
+from ...factories import RecordingFactory, UserFactory
 from ...models import Recording
 
 pytestmark = pytest.mark.django_db
@@ -26,8 +26,8 @@ def test_api_recordings_delete_anonymous():
 
 def test_api_recordings_delete_authenticated():
     """
-    Authenticated users should not be allowed to delete a recording
-    from which they are not related.
+    Authenticated users should not be allowed to delete a recording from a room to which
+    they are not related.
     """
     recording = RecordingFactory()
     user = UserFactory()
@@ -39,76 +39,64 @@ def test_api_recordings_delete_authenticated():
         f"/api/v1.0/recordings/{recording.id!s}/",
     )
 
-    assert response.status_code == 404
+    assert response.status_code == 403
     assert Recording.objects.count() == 1
 
 
 def test_api_recordings_delete_members():
     """
-    Authenticated users should not be allowed to delete a recording
-    from which they are only a member.
+    Authenticated users should not be allowed to delete a recording from a room of which
+    they are only a member.
     """
-
     user = UserFactory()
-    access = UserRecordingAccessFactory(role="member", user=user)
+    recording = RecordingFactory(
+        room__users=[(user, "member")]
+    )  # as user declared in the room but not administrator
 
     client = APIClient()
     client.force_login(user)
 
     response = client.delete(
-        f"/api/v1.0/recordings/{access.recording.id}/",
+        f"/api/v1.0/recordings/{recording.id}/",
     )
 
     assert response.status_code == 403
     assert Recording.objects.count() == 1
 
 
-@pytest.mark.parametrize(
-    "role",
-    ["owner", "administrator"],
-)
-def test_api_recordings_delete_active(role):
+def test_api_recordings_delete_administrators():
     """
-    Authenticated users cannot delete active recordings, even with deletion privileges.
+    Authenticated users should not be allowed to delete a recording from a room in which
+    they are administrator.
     """
-
     user = UserFactory()
-
-    recording = RecordingFactory(status="active")
-    access = UserRecordingAccessFactory(role=role, user=user, recording=recording)
+    recording = RecordingFactory(room__users=[(user, "administrator")])
 
     client = APIClient()
     client.force_login(user)
 
     response = client.delete(
-        f"/api/v1.0/recordings/{access.recording.id}/",
+        f"/api/v1.0/recordings/{recording.id}/",
     )
 
     assert response.status_code == 403
     assert Recording.objects.count() == 1
 
 
-@pytest.mark.parametrize(
-    "role",
-    ["owner", "administrator"],
-)
-def test_api_recordings_delete_final(role):
+def test_api_recordings_delete_owners():
     """
-    Authenticated users should not be allowed to delete an active recording
-    from which they are an admin or owner.
+    Authenticated users should be able to delete a recording from a room in which they are
+    directly owner.
     """
-
     user = UserFactory()
-
-    recording = RecordingFactory(status="saved")
-    access = UserRecordingAccessFactory(role=role, user=user, recording=recording)
+    recording = RecordingFactory(room__users=[(user, "owner")])
 
     client = APIClient()
     client.force_login(user)
 
     response = client.delete(
-        f"/api/v1.0/recordings/{access.recording.id}/",
+        f"/api/v1.0/recordings/{recording.id}/",
     )
 
     assert response.status_code == 204
-    assert Recording.objects.count() == 0
+    assert Recording.objects.exists() is False

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

@@ -2,7 +2,6 @@
 Test recordings API endpoints in the Meet core app: list.
 """
 
-import operator
 from unittest import mock
 
 import pytest
@@ -16,17 +15,21 @@ pytestmark = pytest.mark.django_db
 
 def test_api_recordings_list_anonymous():
     """Anonymous users should not be able to list recordings."""
-    factories.RecordingFactory()
+    factories.RecordingFactory(room__is_public=False)
+    factories.RecordingFactory(room__is_public=True)
+
     response = APIClient().get("/api/v1.0/recordings/")
 
-    assert response.status_code == 401
+    assert response.status_code == 200
+    assert response.json() == {
+        "count": 0,
+        "next": None,
+        "previous": None,
+        "results": [],
+    }
 
 
-@pytest.mark.parametrize(
-    "role",
-    ["administrator", "member", "owner"],
-)
-def test_api_recordings_list_authenticated_direct(role):
+def test_api_recordings_list_authenticated():
     """
     Authenticated users listing recordings, should only see the recordings
     to which they are related.
@@ -37,10 +40,11 @@ def test_api_recordings_list_authenticated_direct(role):
 
     other_user = factories.UserFactory()
 
-    access = factories.UserRecordingAccessFactory(role=role, user=user)
-    factories.UserRecordingAccessFactory(user=other_user)
+    factories.RecordingFactory(room__is_public=False)
+    factories.RecordingFactory(room__is_public=True)
+    factories.RecordingFactory(room__is_public=False, room__users=[other_user])
 
-    recording = access.recording
+    recording = factories.RecordingFactory(room__is_public=False, room__users=[user])
     room = recording.room
 
     response = client.get(
@@ -58,51 +62,18 @@ def test_api_recordings_list_authenticated_direct(role):
     assert results[0] == {
         "id": str(recording.id),
         "created_at": recording.created_at.isoformat().replace("+00:00", "Z"),
+        "stopped_at": None,
         "room": {
             "id": str(room.id),
             "is_public": room.is_public,
             "name": room.name,
             "slug": room.slug,
         },
-        "status": "initiated",
+        "status": "recording",
         "updated_at": recording.updated_at.isoformat().replace("+00:00", "Z"),
     }
 
 
-def test_api_recording_list_authenticated_via_team(mock_user_get_teams):
-    """
-    Authenticated users should be able to list recordings they are a
-    owner/administrator/member of via a team.
-    """
-    user = factories.UserFactory()
-
-    client = APIClient()
-    client.force_login(user)
-
-    mock_user_get_teams.return_value = ["team1", "team2", "unknown"]
-
-    recordings_team1 = [
-        access.recording
-        for access in factories.TeamRecordingAccessFactory.create_batch(2, team="team1")
-    ]
-    recordings_team2 = [
-        access.recording
-        for access in factories.TeamRecordingAccessFactory.create_batch(3, team="team2")
-    ]
-
-    expected_ids = {
-        str(recording.id) for recording in recordings_team1 + recordings_team2
-    }
-
-    response = client.get("/api/v1.0/recordings/")
-
-    assert response.status_code == 200
-    results = response.json()["results"]
-    assert len(results) == 5
-    results_id = {result["id"] for result in results}
-    assert expected_ids == results_id
-
-
 @mock.patch.object(PageNumberPagination, "get_page_size", return_value=2)
 def test_api_recordings_list_pagination(_mock_page_size):
     """Pagination should work as expected."""
@@ -110,10 +81,8 @@ def test_api_recordings_list_pagination(_mock_page_size):
     client = APIClient()
     client.force_login(user)
 
-    recording_ids = [
-        str(access.recording_id)
-        for access in factories.UserRecordingAccessFactory.create_batch(3, user=user)
-    ]
+    recordings = factories.RecordingFactory.create_batch(3, room__users=[user])
+    recording_ids = [str(r.id) for r in recordings]
 
     response = client.get("/api/v1.0/recordings/")
 
@@ -145,13 +114,15 @@ def test_api_recordings_list_pagination(_mock_page_size):
 
 
 def test_api_recordings_list_authenticated_distinct():
-    """A recording for a room with several related users should only be listed once."""
+    """A recording for a public room with several related users should only be listed once."""
     user = factories.UserFactory()
     other_user = factories.UserFactory()
     client = APIClient()
     client.force_login(user)
 
-    recording = factories.RecordingFactory(users=[user, other_user])
+    recording = factories.RecordingFactory(
+        room__is_public=True, room__users=[user, other_user]
+    )
 
     response = client.get("/api/v1.0/recordings/")
 
@@ -159,22 +130,3 @@ def test_api_recordings_list_authenticated_distinct():
     content = response.json()
     assert len(content["results"]) == 1
     assert content["results"][0]["id"] == str(recording.id)
-
-
-def test_api_recordings_list_ordering_default():
-    """Recordings should be ordered by descending "updated_at" by default"""
-    user = factories.UserFactory()
-    client = APIClient()
-    client.force_login(user)
-
-    factories.RecordingFactory.create_batch(5, users=[user])
-
-    response = client.get("/api/v1.0/recordings/")
-
-    assert response.status_code == 200
-    results = response.json()["results"]
-    assert len(results) == 5
-
-    # Check that results are sorted by descending "updated_at" as expected
-    for i in range(4):
-        assert operator.ge(results[i]["updated_at"], results[i + 1]["updated_at"])

src/backend/core/tests/recordings/test_api_recordings_retrieve_auth.py

@@ -0,0 +1,128 @@
+"""
+Test file downloads API endpoint for users in Meet's core app.
+"""
+
+from urllib.parse import urlparse
+
+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 factories, models
+
+pytestmark = pytest.mark.django_db
+
+
+# This is a minimal MP4 file header, which creates a 1-second empty video
+VIDEO_BYTES = (
+    b"\x00\x00\x00\x18ftypmp42\x00\x00\x00\x00mp42mp41"
+    b"\x00\x00\x00\x08free\x00\x00\x02\xeemdat"
+)
+
+
+@pytest.mark.parametrize("is_public", [True, False])
+def test_api_recordings_retrieve_auth_anonymous(is_public):
+    """Anonymous users should not be able to retrieve recordings for a room."""
+    room = factories.RoomFactory(is_public=is_public)
+    recording = room.start_recording()
+
+    default_storage.connection.meta.client.put_object(
+        Bucket=default_storage.bucket_name,
+        Key=recording.key,
+        Body=VIDEO_BYTES,
+        ContentType="video/mp4",
+    )
+
+    original_url = f"http://localhost/media/{recording.key:s}"
+    response = APIClient().get(
+        "/api/v1.0/recordings/retrieve-auth/", HTTP_X_ORIGINAL_URL=original_url
+    )
+
+    assert response.status_code == 401
+
+
+@pytest.mark.parametrize("is_public", [True, False])
+def test_api_recordings_retrieve_auth_authenticated(is_public):
+    """
+    Authenticated users who are not related to a room should not be able to
+    retrieve recordings for this room.
+    """
+    room = factories.RoomFactory(is_public=is_public)
+    recording = room.start_recording()
+
+    user = factories.UserFactory()
+    client = APIClient()
+    client.force_login(user)
+
+    default_storage.connection.meta.client.put_object(
+        Bucket=default_storage.bucket_name,
+        Key=recording.key,
+        Body=VIDEO_BYTES,
+        ContentType="video/mp4",
+    )
+
+    original_url = f"http://localhost/media/{recording.key:s}"
+    response = client.get(
+        "/api/v1.0/recordings/retrieve-auth/", HTTP_X_ORIGINAL_URL=original_url
+    )
+
+    assert response.status_code == 403
+
+
+@pytest.mark.parametrize("is_public", [True, False])
+@pytest.mark.parametrize("role", models.RoleChoices.values)
+def test_api_recordings_retrieve_auth_admin_or_owner(role, is_public):
+    """
+    Users who are administrator or owner of a room, should be able to retrieve recordings.
+    """
+    room = factories.RoomFactory(is_public=is_public)
+    recording = room.start_recording()
+
+    user = factories.UserFactory()
+    client = APIClient()
+    client.force_login(user)
+
+    factories.UserResourceAccessFactory(resource=room, user=user, role=role)
+
+    # deposit a recording in S3
+    default_storage.connection.meta.client.put_object(
+        Bucket=default_storage.bucket_name,
+        Key=recording.key,
+        Body=VIDEO_BYTES,
+        ContentType="video/mp4",
+    )
+
+    # verify getting object content from url with authorization headers
+    original_url = f"http://localhost/media/{recording.key:s}"
+    response = client.get(
+        "/api/v1.0/recordings/retrieve-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 == VIDEO_BYTES

src/backend/core/tests/recordings/test_api_recordings_stop.py

@@ -0,0 +1,56 @@
+"""
+Test recordings API endpoints in the Meet core app: stop.
+"""
+
+from datetime import datetime, timezone
+from unittest import mock
+from uuid import uuid4
+
+from django.utils import timezone as django_timezone
+
+import pytest
+from rest_framework.test import APIClient
+
+from core import factories
+
+pytestmark = pytest.mark.django_db
+
+
+def test_api_recording_stop_recording_success():
+    """Anonymous users can stop a recording just with its UUID."""
+    recording = factories.RecordingFactory()
+
+    now = datetime(2010, 1, 1, tzinfo=timezone.utc)
+    with mock.patch.object(django_timezone, "now", return_value=now):
+        response = APIClient().post(f"/api/v1.0/recordings/{recording.id!s}/stop/")
+
+    assert response.status_code == 200
+    recording.refresh_from_db()
+    assert recording.stopped_at == now
+
+
+def test_api_recording_stop_recording_unknown():
+    """Trying to stop an unknown recording should return a 404."""
+    response = APIClient().post(f"/api/v1.0/recordings/{uuid4()!s}/stop/")
+
+    assert response.status_code == 404
+
+
+def test_api_recording_stop_recording_already_stopped():
+    """
+    Trying to stop a recording that was already stopped should return a 403 and leave
+    the recording unmodified.
+    """
+    recording = factories.RecordingFactory()
+
+    response = APIClient().post(f"/api/v1.0/recordings/{recording.id!s}/stop/")
+
+    assert response.status_code == 200
+    recording.refresh_from_db()
+    stopped_at = recording.stopped_at
+
+    response = APIClient().post(f"/api/v1.0/recordings/{recording.id!s}/stop/")
+
+    assert response.status_code == 403
+    recording.refresh_from_db()
+    assert recording.stopped_at == stopped_at

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

@@ -38,7 +38,7 @@ def test_api_rooms_retrieve_anonymous_private_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(is_public=False)
-    id_no_dashes = str(room.id)
+    id_no_dashes = str(room.id).replace("-", "")
 
     client = APIClient()
     response = client.get(f"/api/v1.0/rooms/{id_no_dashes:s}/")
@@ -178,7 +178,7 @@ def test_api_rooms_retrieve_anonymous_public(mock_token):
     response = client.get(f"/api/v1.0/rooms/{room.id!s}/")
 
     assert response.status_code == 200
-    expected_name = f"{room.id!s}"
+    expected_name = f"{room.id!s}".replace("-", "")
     assert response.json() == {
         "id": str(room.id),
         "is_administrable": False,
@@ -220,7 +220,7 @@ def test_api_rooms_retrieve_authenticated_public(mock_token):
     )
     assert response.status_code == 200
 
-    expected_name = f"{room.id!s}"
+    expected_name = f"{room.id!s}".replace("-", "")
     assert response.json() == {
         "id": str(room.id),
         "is_administrable": False,
@@ -286,7 +286,7 @@ def test_api_rooms_retrieve_members(mock_token, django_assert_num_queries):
     client = APIClient()
     client.force_login(user)
 
-    with django_assert_num_queries(4):
+    with django_assert_num_queries(5):
         response = client.get(
             f"/api/v1.0/rooms/{room.id!s}/",
         )
@@ -318,7 +318,7 @@ def test_api_rooms_retrieve_members(mock_token, django_assert_num_queries):
         key=lambda x: x["id"],
     )
 
-    expected_name = str(room.id)
+    expected_name = str(room.id).replace("-", "")
     assert content_dict == {
         "id": str(room.id),
         "is_administrable": False,
@@ -360,7 +360,7 @@ def test_api_rooms_retrieve_administrators(mock_token, django_assert_num_queries
     client = APIClient()
     client.force_login(user)
 
-    with django_assert_num_queries(4):
+    with django_assert_num_queries(5):
         response = client.get(
             f"/api/v1.0/rooms/{room.id!s}/",
         )
@@ -390,7 +390,7 @@ def test_api_rooms_retrieve_administrators(mock_token, django_assert_num_queries
         ],
         key=lambda x: x["id"],
     )
-    expected_name = str(room.id)
+    expected_name = str(room.id).replace("-", "")
     assert content_dict == {
         "id": str(room.id),
         "is_administrable": True,

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

@@ -1,200 +1,88 @@
 """
-Test rooms API endpoints in the Meet core app: start recording.
+Test rooms API endpoints in the Meet core app: start-recording.
 """
 
-# pylint: disable=W0621,W0613
-
-from unittest import mock
-
 import pytest
 from rest_framework.test import APIClient
 
-from ...factories import RoomFactory, UserFactory
-from ...models import Recording
-from ...recording.worker.exceptions import RecordingStartError
+from core import factories, models
 
 pytestmark = pytest.mark.django_db
 
 
-@pytest.fixture
-def mock_worker_service():
-    """Mock worker service."""
-    return mock.Mock()
+def test_api_rooms_start_recording_anonymous():
+    """Anonymous users should not be allowed to start a recording for a room."""
+    room = factories.RoomFactory()
 
-
-@pytest.fixture
-def mock_worker_service_factory(mock_worker_service):
-    """Mock worker service factory."""
-    with mock.patch(
-        "core.api.viewsets.get_worker_service",
-        return_value=mock_worker_service,
-    ) as mock_worker_service_factory:
-        yield mock_worker_service_factory
-
-
-@pytest.fixture
-def mock_worker_manager(mock_worker_service):
-    """Mock worker service mediator."""
-    with mock.patch("core.api.viewsets.WorkerServiceMediator") as mock_mediator_class:
-        mock_mediator = mock.Mock()
-        mock_mediator_class.return_value = mock_mediator
-        yield mock_mediator
-
-
-def test_start_recording_anonymous():
-    """Anonymous users should not be allowed to start room recordings."""
-    room = RoomFactory()
-    client = APIClient()
-
-    response = client.post(
-        f"/api/v1.0/rooms/{room.id}/start-recording/",
-        {"mode": "screen_recording"},
-    )
+    response = APIClient().post(f"/api/v1.0/rooms/{room.id!s}/start-recording/")
 
     assert response.status_code == 401
-    assert Recording.objects.count() == 0
+    assert models.Recording.objects.exists() is False
 
 
-def test_start_recording_non_owner_and_non_administrator():
-    """Non-owner and Non-Administrator users should not be allowed to start room recordings."""
-    room = RoomFactory()
-    user = UserFactory()
+def test_api_rooms_start_recording_authenticated():
+    """
+    Authenticated users should not be allowed to start a recording for a room
+    to which they are not related.
+    """
+    user = factories.UserFactory()
+    room = factories.RoomFactory()
+
     client = APIClient()
     client.force_login(user)
 
-    response = client.post(
-        f"/api/v1.0/rooms/{room.id}/start-recording/",
-        {"mode": "screen_recording"},
-    )
+    response = client.post(f"/api/v1.0/rooms/{room.id!s}/start-recording/")
 
     assert response.status_code == 403
-    assert Recording.objects.count() == 0
+    assert models.Recording.objects.exists() is False
 
 
-def test_start_recording_recording_disabled(settings):
-    """Should fail if recording is disabled for the room."""
-    settings.RECORDING_ENABLE = False
-
-    room = RoomFactory()
-    user = UserFactory()
-    # Make user the room owner
-    room.accesses.create(user=user, role="owner")
+def test_api_rooms_start_recording_members():
+    """
+    Users who are members of a room but not administrators should
+    not be allowed to start a recording in this room.
+    """
+    user = factories.UserFactory()
+    room = factories.RoomFactory(users=[(user, "member")])
 
     client = APIClient()
     client.force_login(user)
 
-    response = client.post(
-        f"/api/v1.0/rooms/{room.id}/start-recording/",
-        {"mode": "screen_recording"},
-    )
+    response = client.post(f"/api/v1.0/rooms/{room.id!s}/start-recording/")
 
-    assert response.status_code == 403
-    assert response.json() == {"detail": "Access denied, recording is disabled."}
-    assert Recording.objects.count() == 0
+    assert response.status_code, 403
+    assert models.Recording.objects.exists() is False
 
 
-def test_start_recording_missing_mode(settings):
-    """Should fail if recording mode is not provided."""
-    settings.RECORDING_ENABLE = True
-
-    room = RoomFactory()
-    user = UserFactory()
-    # Make user the room owner
-    room.accesses.create(user=user, role="owner")
+@pytest.mark.parametrize("role", ["administrator", "owner"])
+def test_api_rooms_start_recording_administrators(role):
+    """Administrators or owners of a room should be allowed to start a recording in this room."""
+    user = factories.UserFactory()
+    room = factories.RoomFactory(users=[(user, role)])
 
     client = APIClient()
     client.force_login(user)
 
-    response = client.post(f"/api/v1.0/rooms/{room.id}/start-recording/", {})
-
-    assert response.status_code == 400
-    assert response.json() == {"detail": "Invalid request."}
-    assert Recording.objects.count() == 0
-
-
-def test_start_recording_worker_error(
-    mock_worker_service_factory, mock_worker_manager, settings
-):
-    """Should handle worker service errors appropriately."""
-    settings.RECORDING_ENABLE = True
-
-    room = RoomFactory()
-    user = UserFactory()
-    # Make user the room owner
-    room.accesses.create(user=user, role="owner")
-
-    # Configure mock mediator to raise error
-    mock_start = mock.Mock()
-    mock_start.side_effect = RecordingStartError("Failed to connect to worker")
-
-    mock_worker_manager.start = mock_start
-
-    client = APIClient()
-    client.force_login(user)
-
-    response = client.post(
-        f"/api/v1.0/rooms/{room.id}/start-recording/",
-        {"mode": "screen_recording"},
-    )
-
-    mock_worker_service_factory.assert_called_once_with(mode="screen_recording")
-
-    assert response.status_code == 500
-    assert response.json() == {
-        "error": f"Recording failed to start for room {room.slug}"
-    }
-
-    # Recording object should be created even if worker fails
-    assert Recording.objects.count() == 1
-    recording = Recording.objects.first()
-    assert recording.room == room
-    assert recording.mode == "screen_recording"
-
-    # Verify recording access details
-    assert recording.accesses.count() == 1
-    access = recording.accesses.first()
-    assert access.user == user
-    assert access.role == "owner"
-
-
-def test_start_recording_success(
-    mock_worker_service_factory, mock_worker_manager, settings
-):
-    """Should successfully start recording when everything is configured correctly."""
-    settings.RECORDING_ENABLE = True
-
-    room = RoomFactory()
-    user = UserFactory()
-    # Make user the room owner
-    room.accesses.create(user=user, role="owner")
-
-    mock_start = mock.Mock()
-    mock_worker_manager.start = mock_start
-
-    client = APIClient()
-    client.force_login(user)
-
-    response = client.post(
-        f"/api/v1.0/rooms/{room.id}/start-recording/",
-        {"mode": "screen_recording"},
-    )
-
-    mock_worker_service_factory.assert_called_once_with(mode="screen_recording")
+    response = client.post(f"/api/v1.0/rooms/{room.id!s}/start-recording/")
 
     assert response.status_code == 201
-    assert response.json() == {
-        "message": f"Recording successfully started for room {room.slug}"
-    }
+    assert models.Recording.objects.get().room == room
 
-    # Verify the mediator was called with the recording
-    recording = Recording.objects.first()
-    mock_start.assert_called_once_with(recording)
 
-    assert recording.room == room
-    assert recording.mode == "screen_recording"
+@pytest.mark.parametrize("role", ["administrator", "owner"])
+def test_api_rooms_start_recording_administrators_of_another(role):
+    """
+    Being administrator or owner of a room should not grant authorization
+    to update another room.
+    """
+    user = factories.UserFactory()
+    factories.RoomFactory(users=[(user, role)])
+    other_room = factories.RoomFactory()
 
-    # Verify recording access details
-    assert recording.accesses.count() == 1
-    access = recording.accesses.first()
-    assert access.user == user
-    assert access.role == "owner"
+    client = APIClient()
+    client.force_login(user)
+
+    response = client.post(f"/api/v1.0/rooms/{other_room.id!s}/start-recording/")
+
+    assert response.status_code, 403
+    assert models.Recording.objects.exists() is False

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

@@ -1,182 +0,0 @@
-"""
-Test rooms API endpoints in the Meet core app: stop recording.
-"""
-
-# pylint: disable=W0621,W0613
-
-from unittest import mock
-
-import pytest
-from rest_framework.test import APIClient
-
-from ...factories import RecordingFactory, RoomFactory, UserFactory
-from ...models import Recording, RecordingStatusChoices
-from ...recording.worker.exceptions import RecordingStopError
-
-pytestmark = pytest.mark.django_db
-
-
-@pytest.fixture
-def mock_worker_service():
-    """Mock worker service."""
-    return mock.Mock()
-
-
-@pytest.fixture
-def mock_worker_service_factory(mock_worker_service):
-    """Mock worker service factory."""
-    with mock.patch(
-        "core.api.viewsets.get_worker_service",
-        return_value=mock_worker_service,
-    ) as mock_worker_service_factory:
-        yield mock_worker_service_factory
-
-
-@pytest.fixture
-def mock_worker_manager(mock_worker_service):
-    """Mock worker service mediator."""
-    with mock.patch("core.api.viewsets.WorkerServiceMediator") as mock_mediator_class:
-        mock_mediator = mock.Mock()
-        mock_mediator_class.return_value = mock_mediator
-        yield mock_mediator
-
-
-def test_stop_recording_anonymous():
-    """Anonymous users should not be allowed to stop room recordings."""
-    room = RoomFactory()
-    RecordingFactory(room=room, status=RecordingStatusChoices.ACTIVE)
-    client = APIClient()
-
-    response = client.post(f"/api/v1.0/rooms/{room.id}/stop-recording/")
-
-    assert response.status_code == 401
-    # Verify recording status hasn't changed
-    assert Recording.objects.filter(status=RecordingStatusChoices.ACTIVE).count() == 1
-
-
-def test_stop_recording_non_owner_and_non_administrator():
-    """Non-owner and Non-Administrator users should not be allowed to stop room recordings."""
-    room = RoomFactory()
-    user = UserFactory()
-    RecordingFactory(room=room, status=RecordingStatusChoices.ACTIVE)
-    client = APIClient()
-    client.force_login(user)
-
-    response = client.post(f"/api/v1.0/rooms/{room.id}/stop-recording/")
-
-    assert response.status_code == 403
-    # Verify recording status hasn't changed
-    assert Recording.objects.filter(status=RecordingStatusChoices.ACTIVE).count() == 1
-
-
-def test_stop_recording_recording_disabled(settings):
-    """Should fail if recording is disabled for the room."""
-
-    settings.RECORDING_ENABLE = False
-
-    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}/stop-recording/")
-
-    assert response.status_code == 403
-    assert response.json() == {"detail": "Access denied, recording is disabled."}
-    # Verify no recording exists
-    assert Recording.objects.count() == 0
-
-
-def test_stop_recording_no_active_recording(settings):
-    """Should fail when there is no active recording for the room."""
-
-    settings.RECORDING_ENABLE = True
-
-    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}/stop-recording/")
-
-    assert response.status_code == 404
-    assert response.json() == {"detail": "No active recording found for this room."}
-
-
-def test_stop_recording_worker_error(
-    mock_worker_service_factory, mock_worker_manager, settings
-):
-    """Should handle worker service errors appropriately."""
-
-    settings.RECORDING_ENABLE = True
-
-    room = RoomFactory()
-    user = UserFactory()
-    recording = RecordingFactory(
-        room=room,
-        status=RecordingStatusChoices.ACTIVE,
-        mode="screen_recording",
-    )
-    # Make user the room owner
-    room.accesses.create(user=user, role="owner")
-
-    # Configure mock mediator to raise error
-    mock_stop = mock.Mock()
-    mock_stop.side_effect = RecordingStopError("Failed to connect to worker")
-    mock_worker_manager.stop = mock_stop
-
-    client = APIClient()
-    client.force_login(user)
-
-    response = client.post(f"/api/v1.0/rooms/{room.id}/stop-recording/")
-
-    mock_worker_service_factory.assert_called_once_with(mode="screen_recording")
-    mock_stop.assert_called_once_with(recording)
-
-    assert response.status_code == 500
-    assert response.json() == {
-        "error": f"Recording failed to stop for room {room.slug}"
-    }
-    # Verify recording status hasn't changed
-    assert Recording.objects.filter(status=RecordingStatusChoices.ACTIVE).count() == 1
-
-
-def test_stop_recording_success(
-    mock_worker_service_factory, mock_worker_manager, settings
-):
-    """Should successfully stop recording when everything is configured correctly."""
-
-    settings.RECORDING_ENABLE = True
-
-    room = RoomFactory()
-    user = UserFactory()
-    recording = RecordingFactory(
-        room=room,
-        status=RecordingStatusChoices.ACTIVE,
-        mode="screen_recording",
-    )
-    # Make user the room owner
-    room.accesses.create(user=user, role="owner")
-
-    mock_stop = mock.Mock()
-    mock_worker_manager.stop = mock_stop
-
-    client = APIClient()
-    client.force_login(user)
-
-    response = client.post(f"/api/v1.0/rooms/{room.id}/stop-recording/")
-
-    mock_worker_service_factory.assert_called_once_with(mode="screen_recording")
-    mock_stop.assert_called_once_with(recording)
-
-    assert response.status_code == 200
-    assert response.json() == {"message": f"Recording stopped for room {room.slug}."}
-
-    # Verify the recording still exists
-    assert Recording.objects.count() == 1

src/backend/core/tests/test_analytics.py

@@ -0,0 +1,132 @@
+"""
+Test for the Analytics class.
+"""
+
+# pylint: disable=W0212
+
+from unittest.mock import patch
+
+from django.contrib.auth.models import AnonymousUser
+from django.test.utils import override_settings
+
+import pytest
+
+from core.analytics import Analytics
+from core.factories import UserFactory
+
+pytestmark = pytest.mark.django_db
+
+
+@pytest.fixture(name="mock_june_analytics")
+def _mock_june_analytics():
+    with patch("core.analytics.jAnalytics") as mock:
+        yield mock
+
+
+@override_settings(ANALYTICS_KEY="test_key")
+def test_analytics_init_enabled(mock_june_analytics):
+    """Should enable analytics and set the write key correctly when ANALYTICS_KEY is set."""
+    analytics = Analytics()
+    assert analytics._enabled is True
+    assert mock_june_analytics.write_key == "test_key"
+
+
+@override_settings(ANALYTICS_KEY=None)
+def test_analytics_init_disabled():
+    """Should disable analytics when ANALYTICS_KEY is not set."""
+    analytics = Analytics()
+    assert analytics._enabled is False
+
+
+@override_settings(ANALYTICS_KEY="test_key")
+def test_analytics_identify_user(mock_june_analytics):
+    """Should identify a user with the correct traits when analytics is enabled."""
+    user = UserFactory(sub="12345", email="user@example.com")
+    analytics = Analytics()
+    analytics.identify(user)
+    mock_june_analytics.identify.assert_called_once_with(
+        user_id="12345", traits={"email": "***@example.com"}
+    )
+
+
+@override_settings(ANALYTICS_KEY="test_key")
+def test_analytics_identify_user_with_traits(mock_june_analytics):
+    """Should identify a user with additional traits when analytics is enabled."""
+    user = UserFactory(sub="12345", email="user@example.com")
+    analytics = Analytics()
+    analytics.identify(user, traits={"email": "user@example.com", "foo": "foo"})
+    mock_june_analytics.identify.assert_called_once_with(
+        user_id="12345", traits={"email": "***@example.com", "foo": "foo"}
+    )
+
+
+@override_settings(ANALYTICS_KEY=None)
+def test_analytics_identify_not_enabled(mock_june_analytics):
+    """Should not call identify when analytics is not enabled."""
+    user = UserFactory(sub="12345", email="user@example.com")
+    analytics = Analytics()
+    analytics.identify(user)
+    mock_june_analytics.identify.assert_not_called()
+
+
+@override_settings(ANALYTICS_KEY="test_key")
+def test_analytics_identify_no_user(mock_june_analytics):
+    """Should not call identify when the user is None."""
+    analytics = Analytics()
+    analytics.identify(None)
+    mock_june_analytics.identify.assert_not_called()
+
+
+@override_settings(ANALYTICS_KEY="test_key")
+def test_analytics_identify_anonymous_user(mock_june_analytics):
+    """Should not call identify when the user is anonymous."""
+    user = AnonymousUser()
+    analytics = Analytics()
+    analytics.identify(user)
+    mock_june_analytics.identify.assert_not_called()
+
+
+@override_settings(ANALYTICS_KEY="test_key")
+def test_analytics_track_event(mock_june_analytics):
+    """Should track an event with the correct user and event details when analytics is enabled."""
+    user = UserFactory(sub="12345")
+    analytics = Analytics()
+    analytics.track(user, event="test_event", foo="foo")
+    mock_june_analytics.track.assert_called_once_with(
+        user_id="12345", event="test_event", foo="foo"
+    )
+
+
+@override_settings(ANALYTICS_KEY=None)
+def test_analytics_track_event_not_enabled(mock_june_analytics):
+    """Should not call track when analytics is not enabled."""
+    user = UserFactory(sub="12345")
+    analytics = Analytics()
+    analytics.track(user, event="test_event", foo="foo")
+
+    mock_june_analytics.track.assert_not_called()
+
+
+@override_settings(ANALYTICS_KEY="test_key")
+@patch("uuid.uuid4", return_value="test_uuid4")
+def test_analytics_track_event_no_user(mock_uuid4, mock_june_analytics):
+    """Should track an event with a random anonymous user ID when the user is None."""
+    analytics = Analytics()
+    analytics.track(None, event="test_event", foo="foo")
+    mock_june_analytics.track.assert_called_once_with(
+        anonymous_id="test_uuid4", event="test_event", foo="foo"
+    )
+    mock_uuid4.assert_called_once()
+
+
+@override_settings(ANALYTICS_KEY="test_key")
+@patch("uuid.uuid4", return_value="test_uuid4")
+def test_analytics_track_event_anonymous_user(mock_uuid4, mock_june_analytics):
+    """Should track an event with a random anonymous user ID when the user is anonymous."""
+    user = AnonymousUser()
+    analytics = Analytics()
+    analytics.track(user, event="test_event", foo="foo")
+    mock_june_analytics.track.assert_called_once_with(
+        anonymous_id="test_uuid4", event="test_event", foo="foo"
+    )
+    mock_uuid4.assert_called_once()

src/backend/core/tests/test_models_recording.py

@@ -1,218 +0,0 @@
-"""
-Unit tests for the Recording model
-"""
-
-from django.core.exceptions import ValidationError
-
-import pytest
-
-from core.factories import (
-    RecordingFactory,
-    RoomFactory,
-    UserFactory,
-    UserRecordingAccessFactory,
-)
-from core.models import Recording, RecordingStatusChoices
-
-pytestmark = pytest.mark.django_db
-
-
-def test_models_recording_str():
-    """The str representation should be the recording ID."""
-    recording = RecordingFactory()
-    assert str(recording) == f"Recording {recording.id} (initiated)"
-
-
-def test_models_recording_ordering():
-    """Recordings should be returned ordered by created_at in descending order."""
-    RecordingFactory.create_batch(3)
-    recordings = Recording.objects.all()
-    assert recordings[0].created_at >= recordings[1].created_at
-    assert recordings[1].created_at >= recordings[2].created_at
-
-
-def test_models_recording_room_relationship():
-    """It should maintain proper relationship with room."""
-    room = RoomFactory()
-    recording = RecordingFactory(room=room)
-    assert recording.room == room
-    assert recording in room.recordings.all()
-
-
-def test_models_recording_default_status():
-    """A new recording should have INITIATED status by default."""
-    recording = RecordingFactory()
-    assert recording.status == RecordingStatusChoices.INITIATED
-
-
-def test_models_recording_unique_initiated_or_active_per_room():
-    """Only one initiated or active recording should be allowed per room."""
-    room = RoomFactory()
-    RecordingFactory(room=room, status=RecordingStatusChoices.ACTIVE)
-
-    with pytest.raises(ValidationError):
-        RecordingFactory(room=room, status=RecordingStatusChoices.ACTIVE)
-
-    with pytest.raises(ValidationError):
-        RecordingFactory(room=room, status=RecordingStatusChoices.INITIATED)
-
-
-def test_models_recording_multiple_finished_allowed():
-    """Multiple finished recordings should be allowed in the same room."""
-    room = RoomFactory()
-    RecordingFactory(room=room, status=RecordingStatusChoices.SAVED)
-    RecordingFactory(room=room, status=RecordingStatusChoices.SAVED)
-    assert room.recordings.count() == 2
-
-
-# Test get_abilities method
-
-
-@pytest.mark.parametrize(
-    "role",
-    ["owner", "administrator"],
-)
-def test_models_recording_get_abilities_privileges_active(role):
-    """Test abilities for active recording and privileged user."""
-
-    user = UserFactory()
-    access = UserRecordingAccessFactory(role=role, user=user)
-    access.recording.status = RecordingStatusChoices.ACTIVE
-    abilities = access.recording.get_abilities(user)
-
-    assert abilities == {
-        "destroy": False,  # Not final status
-        "partial_update": False,
-        "retrieve": True,  # Privileged users can always retrieve
-        "stop": True,  # Not final status, so can stop
-        "update": False,
-    }
-
-
-def test_models_recording_get_abilities_member_active():
-    """Test abilities for a user who is unprivileged."""
-
-    user = UserFactory()
-    access = UserRecordingAccessFactory(role="member", user=user)
-    access.recording.status = RecordingStatusChoices.ACTIVE
-    abilities = access.recording.get_abilities(user)
-
-    assert abilities == {
-        "destroy": False,
-        "partial_update": False,
-        "retrieve": False,
-        "stop": False,
-        "update": False,
-    }
-
-
-@pytest.mark.parametrize(
-    "role",
-    ["owner", "administrator"],
-)
-def test_models_recording_get_abilities_privileges_final(role):
-    """Test abilities for active recording and privileged user."""
-
-    user = UserFactory()
-    access = UserRecordingAccessFactory(role=role, user=user)
-    access.recording.status = RecordingStatusChoices.SAVED
-    abilities = access.recording.get_abilities(user)
-
-    assert abilities == {
-        "destroy": True,
-        "partial_update": False,
-        "retrieve": True,  # Privileged users can always retrieve
-        "stop": False,  # In final status, so can not stop
-        "update": False,
-    }
-
-
-def test_models_recording_get_abilities_member_final():
-    """Test abilities for a user who is unprivileged."""
-
-    user = UserFactory()
-    access = UserRecordingAccessFactory(role="member", user=user)
-    access.recording.status = RecordingStatusChoices.SAVED
-    abilities = access.recording.get_abilities(user)
-
-    assert abilities == {
-        "destroy": False,
-        "partial_update": False,
-        "retrieve": False,
-        "stop": False,
-        "update": False,
-    }
-
-
-# Test is_savable method
-
-
-def test_models_recording_is_savable_normal():
-    """Test is_savable for normal recording status."""
-    recording = RecordingFactory(status=RecordingStatusChoices.ACTIVE)
-    assert recording.is_savable() is True
-
-
-@pytest.mark.parametrize(
-    "status",
-    [
-        RecordingStatusChoices.FAILED_TO_STOP,
-        RecordingStatusChoices.FAILED_TO_START,
-        RecordingStatusChoices.ABORTED,
-    ],
-)
-def test_models_recording_is_savable_error(status):
-    """Test is_savable for error status."""
-    recording = RecordingFactory(status=status)
-    assert recording.is_savable() is False
-
-
-def test_models_recording_is_savable_already_saved():
-    """Test is_savable for already saved recording."""
-    recording = RecordingFactory(status=RecordingStatusChoices.SAVED)
-    assert recording.is_savable() is False
-
-
-def test_models_recording_is_savable_only_initiated():
-    """Test is_savable for only initiated recording."""
-    recording = RecordingFactory(status=RecordingStatusChoices.INITIATED)
-    assert recording.is_savable() is False
-
-
-# Test few corner cases
-
-
-def test_models_recording_worker_id_optional():
-    """Worker ID should be optional."""
-    recording = RecordingFactory(worker_id=None)
-    assert recording.worker_id is None
-
-    recording = RecordingFactory(worker_id="worker-123")
-    assert recording.worker_id == "worker-123"
-
-
-def test_models_recording_invalid_status():
-    """Test that setting an invalid status raises an error."""
-    recording = RecordingFactory()
-    recording.status = "INVALID_STATUS"
-    with pytest.raises(ValidationError):
-        recording.save()
-
-
-def test_models_recording_room_deletion():
-    """Test that deleting a room cascades to its recordings."""
-    room = RoomFactory()
-    recording = RecordingFactory(room=room)
-    room.delete()
-    assert not Recording.objects.filter(id=recording.id).exists()
-
-
-def test_models_recording_worker_id_very_long():
-    """Test worker_id with maximum length."""
-    long_id = "w" * 255
-    recording = RecordingFactory(worker_id=long_id)
-    assert recording.worker_id == long_id
-
-    too_long_id = "w" * 256
-    with pytest.raises(ValidationError):
-        RecordingFactory(worker_id=too_long_id)

src/backend/core/tests/test_models_recording_accesses.py

@@ -1,312 +0,0 @@
-"""
-Unit tests for the RecordingAccess model
-"""
-
-from django.contrib.auth.models import AnonymousUser
-from django.core.exceptions import ValidationError
-
-import pytest
-
-from core import factories
-
-pytestmark = pytest.mark.django_db
-
-
-def test_models_recording_accesses_str():
-    """
-    The str representation should include user email, recording ID and role.
-    """
-    user = factories.UserFactory(email="david.bowman@example.com")
-    access = factories.UserRecordingAccessFactory(
-        role="member",
-        user=user,
-    )
-    assert (
-        str(access)
-        == f"david.bowman@example.com is member in Recording {access.recording.id} (initiated)"
-    )
-
-
-def test_models_recording_accesses_unique_user():
-    """Recording accesses should be unique for a given couple of user and recording."""
-    access = factories.UserRecordingAccessFactory()
-
-    with pytest.raises(
-        ValidationError,
-        match="This user is already in this recording.",
-    ):
-        factories.UserRecordingAccessFactory(
-            user=access.user, recording=access.recording
-        )
-
-
-def test_models_recording_accesses_several_empty_teams():
-    """A recording can have several recording accesses with an empty team."""
-    access = factories.UserRecordingAccessFactory()
-    factories.UserRecordingAccessFactory(recording=access.recording)
-
-
-def test_models_recording_accesses_unique_team():
-    """Recording accesses should be unique for a given couple of team and recording."""
-    access = factories.TeamRecordingAccessFactory()
-
-    with pytest.raises(
-        ValidationError,
-        match="This team is already in this recording.",
-    ):
-        factories.TeamRecordingAccessFactory(
-            team=access.team, recording=access.recording
-        )
-
-
-def test_models_recording_accesses_several_null_users():
-    """A recording can have several recording accesses with a null user."""
-    access = factories.TeamRecordingAccessFactory()
-    factories.TeamRecordingAccessFactory(recording=access.recording)
-
-
-def test_models_recording_accesses_user_and_team_set():
-    """User and team can't both be set on a recording access."""
-    with pytest.raises(
-        ValidationError,
-        match="Either user or team must be set, not both.",
-    ):
-        factories.UserRecordingAccessFactory(team="my-team")
-
-
-def test_models_recording_accesses_user_and_team_empty():
-    """User and team can't both be empty on a recording access."""
-    with pytest.raises(
-        ValidationError,
-        match="Either user or team must be set, not both.",
-    ):
-        factories.UserRecordingAccessFactory(user=None)
-
-
-# get_abilities
-
-
-def test_models_recording_access_get_abilities_anonymous():
-    """Check abilities returned for an anonymous user."""
-    access = factories.UserRecordingAccessFactory()
-    abilities = access.get_abilities(AnonymousUser())
-    assert abilities == {
-        "destroy": False,
-        "retrieve": False,
-        "update": False,
-        "partial_update": False,
-        "set_role_to": [],
-    }
-
-
-def test_models_recording_access_get_abilities_authenticated():
-    """Check abilities returned for an authenticated user."""
-    access = factories.UserRecordingAccessFactory()
-    user = factories.UserFactory()
-    abilities = access.get_abilities(user)
-    assert abilities == {
-        "destroy": False,
-        "retrieve": False,
-        "update": False,
-        "partial_update": False,
-        "set_role_to": [],
-    }
-
-
-# - for owner
-
-
-def test_models_recording_access_get_abilities_for_owner_of_self_allowed():
-    """
-    Check abilities of self access for the owner of a recording when
-    there is more than one owner left.
-    """
-    access = factories.UserRecordingAccessFactory(role="owner")
-    factories.UserRecordingAccessFactory(recording=access.recording, role="owner")
-    abilities = access.get_abilities(access.user)
-    assert abilities == {
-        "destroy": True,
-        "retrieve": True,
-        "update": True,
-        "partial_update": True,
-        "set_role_to": ["administrator", "member"],
-    }
-
-
-def test_models_recording_access_get_abilities_for_owner_of_self_last():
-    """
-    Check abilities of self access for the owner of a recording when there is only one owner left.
-    """
-    access = factories.UserRecordingAccessFactory(role="owner")
-    abilities = access.get_abilities(access.user)
-    assert abilities == {
-        "destroy": False,
-        "retrieve": True,
-        "update": False,
-        "partial_update": False,
-        "set_role_to": [],
-    }
-
-
-def test_models_recording_access_get_abilities_for_owner_of_owner():
-    """Check abilities of owner access for the owner of a recording."""
-    access = factories.UserRecordingAccessFactory(role="owner")
-    factories.UserRecordingAccessFactory(recording=access.recording)  # another one
-    user = factories.UserRecordingAccessFactory(
-        recording=access.recording, role="owner"
-    ).user
-    abilities = access.get_abilities(user)
-    assert abilities == {
-        "destroy": True,
-        "retrieve": True,
-        "update": True,
-        "partial_update": True,
-        "set_role_to": ["administrator", "member"],
-    }
-
-
-def test_models_recording_access_get_abilities_for_owner_of_administrator():
-    """Check abilities of administrator access for the owner of a recording."""
-    access = factories.UserRecordingAccessFactory(role="administrator")
-    factories.UserRecordingAccessFactory(recording=access.recording)  # another one
-    user = factories.UserRecordingAccessFactory(
-        recording=access.recording, role="owner"
-    ).user
-    abilities = access.get_abilities(user)
-    assert abilities == {
-        "destroy": True,
-        "retrieve": True,
-        "update": True,
-        "partial_update": True,
-        "set_role_to": ["member", "owner"],
-    }
-
-
-def test_models_recording_access_get_abilities_for_owner_of_member():
-    """Check abilities of member access for the owner of a recording."""
-    access = factories.UserRecordingAccessFactory(role="member")
-    factories.UserRecordingAccessFactory(recording=access.recording)  # another one
-    user = factories.UserRecordingAccessFactory(
-        recording=access.recording, role="owner"
-    ).user
-    abilities = access.get_abilities(user)
-    assert abilities == {
-        "destroy": True,
-        "retrieve": True,
-        "update": True,
-        "partial_update": True,
-        "set_role_to": ["administrator", "owner"],
-    }
-
-
-# - for administrator
-
-
-def test_models_recording_access_get_abilities_for_administrator_of_owner():
-    """Check abilities of owner access for the administrator of a recording."""
-    access = factories.UserRecordingAccessFactory(role="owner")
-    factories.UserRecordingAccessFactory(recording=access.recording)  # another one
-    user = factories.UserRecordingAccessFactory(
-        recording=access.recording, role="administrator"
-    ).user
-    abilities = access.get_abilities(user)
-    assert abilities == {
-        "destroy": False,
-        "retrieve": True,
-        "update": False,
-        "partial_update": False,
-        "set_role_to": [],
-    }
-
-
-def test_models_recording_access_get_abilities_for_administrator_of_administrator():
-    """Check abilities of administrator access for the administrator of a recording."""
-    access = factories.UserRecordingAccessFactory(role="administrator")
-    factories.UserRecordingAccessFactory(recording=access.recording)  # another one
-    user = factories.UserRecordingAccessFactory(
-        recording=access.recording, role="administrator"
-    ).user
-    abilities = access.get_abilities(user)
-    assert abilities == {
-        "destroy": True,
-        "retrieve": True,
-        "update": True,
-        "partial_update": True,
-        "set_role_to": ["member"],
-    }
-
-
-def test_models_recording_access_get_abilities_for_administrator_of_member():
-    """Check abilities of member access for the administrator of a recording."""
-    access = factories.UserRecordingAccessFactory(role="member")
-    factories.UserRecordingAccessFactory(recording=access.recording)  # another one
-    user = factories.UserRecordingAccessFactory(
-        recording=access.recording, role="administrator"
-    ).user
-    abilities = access.get_abilities(user)
-    assert abilities == {
-        "destroy": True,
-        "retrieve": True,
-        "update": True,
-        "partial_update": True,
-        "set_role_to": ["administrator"],
-    }
-
-
-# - for member
-
-
-def test_models_recording_access_get_abilities_for_member_of_owner():
-    """Check abilities of owner access for the member of a recording."""
-    access = factories.UserRecordingAccessFactory(role="owner")
-    factories.UserRecordingAccessFactory(recording=access.recording)  # another one
-    user = factories.UserRecordingAccessFactory(
-        recording=access.recording, role="member"
-    ).user
-    abilities = access.get_abilities(user)
-    assert abilities == {
-        "destroy": False,
-        "retrieve": True,
-        "update": False,
-        "partial_update": False,
-        "set_role_to": [],
-    }
-
-
-def test_models_recording_access_get_abilities_for_member_of_administrator():
-    """Check abilities of administrator access for the member of a recording."""
-    access = factories.UserRecordingAccessFactory(role="administrator")
-    factories.UserRecordingAccessFactory(recording=access.recording)  # another one
-    user = factories.UserRecordingAccessFactory(
-        recording=access.recording, role="member"
-    ).user
-    abilities = access.get_abilities(user)
-    assert abilities == {
-        "destroy": False,
-        "retrieve": True,
-        "update": False,
-        "partial_update": False,
-        "set_role_to": [],
-    }
-
-
-def test_models_recording_access_get_abilities_for_member_of_member_user(
-    django_assert_num_queries,
-):
-    """Check abilities of member access for the member of a recording."""
-    access = factories.UserRecordingAccessFactory(role="member")
-    factories.UserRecordingAccessFactory(recording=access.recording)  # another one
-    user = factories.UserRecordingAccessFactory(
-        recording=access.recording, role="member"
-    ).user
-
-    with django_assert_num_queries(1):
-        abilities = access.get_abilities(user)
-
-    assert abilities == {
-        "destroy": False,
-        "retrieve": True,
-        "update": False,
-        "partial_update": False,
-        "set_role_to": [],
-    }

src/backend/core/tests/test_models_rooms.py

@@ -86,81 +86,66 @@ def test_models_rooms_is_public_default():
     assert room.is_public is True
 
 
+def test_models_recordings_key():
+    """Check the room key format."""
+    room = RoomFactory()
+    recording = room.start_recording()
+    assert recording.key == f"recordings/{recording.pk!s}/file.mp4/"
+
+
 # Access rights methods
 
 
 def test_models_rooms_access_rights_none(django_assert_num_queries):
-    """Calling access rights methods with None should return None."""
+    """The `get_roles` method should return an empty list when called with None."""
     room = RoomFactory()
 
     with django_assert_num_queries(0):
-        assert room.get_role(None) is None
-    with django_assert_num_queries(0):
-        assert room.is_administrator(None) is False
-    with django_assert_num_queries(0):
-        assert room.is_owner(None) is False
+        assert not list(room.get_roles(None))
 
 
 def test_models_rooms_access_rights_anonymous(django_assert_num_queries):
-    """Check access rights methods on the room object for an anonymous user."""
+    """The `get_roles` method should return an empty list for an anonymous user."""
     user = AnonymousUser()
     room = RoomFactory()
 
     with django_assert_num_queries(0):
-        assert room.get_role(user) is None
-    with django_assert_num_queries(0):
-        assert room.is_administrator(user) is False
-    with django_assert_num_queries(0):
-        assert room.is_owner(user) is False
+        assert not list(room.get_roles(user))
 
 
 def test_models_rooms_access_rights_authenticated(django_assert_num_queries):
-    """Check access rights methods on the room object for an unrelated user."""
+    """
+    The `get_roles` method should return an empty list for a user not related to the room.
+    """
     user = UserFactory()
     room = RoomFactory()
 
     with django_assert_num_queries(1):
-        assert room.get_role(user) is None
-    with django_assert_num_queries(1):
-        assert room.is_administrator(user) is False
-    with django_assert_num_queries(1):
-        assert room.is_owner(user) is False
+        assert not list(room.get_roles(user))
 
 
 def test_models_rooms_access_rights_member_direct(django_assert_num_queries):
-    """Check access rights methods on the room object for a direct member."""
+    """Check `get_roles` method on the room object for a direct member."""
     user = UserFactory()
     room = RoomFactory(users=[(user, "member")])
 
     with django_assert_num_queries(1):
-        assert room.get_role(user) == "member"
-    with django_assert_num_queries(1):
-        assert room.is_administrator(user) is False
-    with django_assert_num_queries(1):
-        assert room.is_owner(user) is False
+        assert list(room.get_roles(user)) == ["member"]
 
 
 def test_models_rooms_access_rights_administrator_direct(django_assert_num_queries):
-    """The is_administrator method should return True for a direct administrator."""
+    """Check `get_roles` method on the room object for a direct administrator."""
     user = UserFactory()
     room = RoomFactory(users=[(user, "administrator")])
 
     with django_assert_num_queries(1):
-        assert room.get_role(user) == "administrator"
-    with django_assert_num_queries(1):
-        assert room.is_administrator(user) is True
-    with django_assert_num_queries(1):
-        assert room.is_owner(user) is False
+        assert list(room.get_roles(user)) == ["administrator"]
 
 
 def test_models_rooms_access_rights_owner_direct(django_assert_num_queries):
-    """Check access rights methods on the room object for an owner."""
+    """Check `get_roles` method on the room object for an owner."""
     user = UserFactory()
     room = RoomFactory(users=[(user, "owner")])
 
     with django_assert_num_queries(1):
-        assert room.get_role(user) == "owner"
-    with django_assert_num_queries(1):
-        assert room.is_administrator(user) is True
-    with django_assert_num_queries(1):
-        assert room.is_owner(user) is True
+        assert list(room.get_roles(user)) == ["owner"]

src/backend/core/urls.py

@@ -11,8 +11,8 @@ from core.authentication.urls import urlpatterns as oidc_urls
 # - Main endpoints
 router = DefaultRouter()
 router.register("users", viewsets.UserViewSet, basename="users")
-router.register("rooms", viewsets.RoomViewSet, basename="rooms")
 router.register("recordings", viewsets.RecordingViewSet, basename="recordings")
+router.register("rooms", viewsets.RoomViewSet, basename="rooms")
 router.register(
     "resource-accesses", viewsets.ResourceAccessViewSet, basename="resource_accesses"
 )

src/backend/core/utils.py

@@ -11,7 +11,9 @@ from typing import Optional
 from uuid import uuid4
 
 from django.conf import settings
+from django.core.files.storage import default_storage
 
+import botocore
 from livekit.api import AccessToken, VideoGrants
 
 
@@ -81,3 +83,31 @@ def generate_token(room: str, user, username: Optional[str] = None) -> str:
     )
 
     return token.to_jwt()
+
+
+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 documents' content
+    - 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

src/backend/meet/settings.py

@@ -327,10 +327,6 @@ class Base(Configuration):
         default=True,
         environ_name="OIDC_CREATE_USER",
     )
-    OIDC_FALLBACK_TO_EMAIL_FOR_IDENTIFICATION = values.BooleanValue(
-        default=False,
-        environ_name="OIDC_FALLBACK_TO_EMAIL_FOR_IDENTIFICATION",
-    )
     OIDC_RP_SIGN_ALGO = values.Value(
         "RS256", environ_name="OIDC_RP_SIGN_ALGO", environ_prefix=None
     )
@@ -399,44 +395,14 @@ class Base(Configuration):
         ),
         "url": values.Value(environ_name="LIVEKIT_API_URL", environ_prefix=None),
     }
-    RESOURCE_DEFAULT_IS_PUBLIC = values.BooleanValue(
-        True, environ_name="RESOURCE_DEFAULT_IS_PUBLIC", environ_prefix=None
+    DEFAULT_ROOM_IS_PUBLIC = values.BooleanValue(
+        True, environ_name="DEFAULT_ROOM_IS_PUBLIC", environ_prefix=None
     )
     ALLOW_UNREGISTERED_ROOMS = values.BooleanValue(
         True, environ_name="ALLOW_UNREGISTERED_ROOMS", environ_prefix=None
     )
-
-    # Recording settings
-    RECORDING_ENABLE = values.BooleanValue(
-        False, environ_name="RECORDING_ENABLE", environ_prefix=None
-    )
-    RECORDING_OUTPUT_FOLDER = values.Value(
-        "recordings", environ_name="RECORDING_OUTPUT_FOLDER", environ_prefix=None
-    )
-    RECORDING_VERIFY_SSL = values.BooleanValue(
-        True, environ_name="RECORDING_VERIFY_SSL", environ_prefix=None
-    )
-    RECORDING_WORKER_CLASSES = values.DictValue(
-        {
-            "screen_recording": "core.recording.worker.services.VideoCompositeEgressService",
-            "transcript": "core.recording.worker.services.AudioCompositeEgressService",
-        },
-        environ_name="RECORDING_WORKER_CLASSES",
-        environ_prefix=None,
-    )
-    RECORDING_EVENT_PARSER_CLASS = values.Value(
-        "core.recording.event.parsers.MinioParser",
-        environ_name="RECORDING_EVENT_PARSER_CLASS",
-        environ_prefix=None,
-    )
-    RECORDING_ENABLE_STORAGE_EVENT_AUTH = values.BooleanValue(
-        True, environ_name="RECORDING_ENABLE_STORAGE_EVENT_AUTH", environ_prefix=None
-    )
-    RECORDING_STORAGE_EVENT_ENABLE = values.BooleanValue(
-        False, environ_name="RECORDING_STORAGE_EVENT_ENABLE", environ_prefix=None
-    )
-    RECORDING_STORAGE_EVENT_TOKEN = values.Value(
-        None, environ_name="RECORDING_STORAGE_HOOK_TOKEN", environ_prefix=None
+    ANALYTICS_KEY = values.Value(
+        None, environ_name="ANALYTICS_KEY", environ_prefix=None
     )
 
     # pylint: disable=invalid-name
@@ -558,6 +524,8 @@ class Test(Base):
 
     CELERY_TASK_ALWAYS_EAGER = values.BooleanValue(True)
 
+    ANALYTICS_KEY = None
+
     def __init__(self):
         # pylint: disable=invalid-name
         self.INSTALLED_APPS += ["drf_spectacular_sidecar"]

src/backend/meet/urls.py

@@ -1,7 +1,6 @@
 """URL configuration for the Meet project"""
 
 from django.conf import settings
-from django.conf.urls.static import static
 from django.contrib import admin
 from django.contrib.staticfiles.urls import staticfiles_urlpatterns
 from django.urls import include, path, re_path
@@ -18,11 +17,7 @@ urlpatterns = [
 ]
 
 if settings.DEBUG:
-    urlpatterns = (
-        urlpatterns
-        + staticfiles_urlpatterns()
-        + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
-    )
+    urlpatterns = urlpatterns + staticfiles_urlpatterns()
 
 
 if settings.USE_SWAGGER or settings.DEBUG:

src/backend/pyproject.toml

@@ -25,14 +25,14 @@ license = { file = "LICENSE" }
 readme = "README.md"
 requires-python = ">=3.10"
 dependencies = [
-    "boto3==1.35.19",
+    "boto3==1.35.34",
     "Brotli==1.1.0",
     "celery[redis]==5.4.0",
     "django-configurations==2.5.1",
     "django-cors-headers==4.4.0",
     "django-countries==7.6.1",
     "django-parler==2.3",
-    "redis==5.0.8",
+    "redis==5.1.1",
     "django-redis==5.4.0",
     "django-storages[s3]==1.14.4",
     "django-timezone-field>=5.1",
@@ -47,17 +47,16 @@ dependencies = [
     "june-analytics-python==2.3.0",
     "markdown==3.7",
     "nested-multipart-parser==1.5.0",
-    "psycopg[binary]==3.2.2",
+    "psycopg[binary]==3.2.3",
     "PyJWT==2.9.0",
     "python-frontmatter==1.1.0",
     "requests==2.32.3",
-    "sentry-sdk==2.14.0",
+    "sentry-sdk==2.15.0",
     "url-normalize==1.4.3",
     "WeasyPrint>=60.2",
     "whitenoise==6.7.0",
     "mozilla-django-oidc==4.0.1",
     "livekit-api==0.7.0",
-    "aiohttp==3.10.10",
 ]
 
 [project.urls]

src/frontend/Dockerfile

@@ -1,4 +1,4 @@
-FROM node:20-alpine AS frontend-deps
+FROM node:20-alpine as frontend-deps
 
 WORKDIR /home/frontend/
 
@@ -11,11 +11,11 @@ COPY .dockerignore ./.dockerignore
 COPY ./src/frontend/ .
 
 ### ---- Front-end builder image ----
-FROM frontend-deps AS meet
+FROM frontend-deps as meet
 
 WORKDIR /home/frontend
 
-FROM frontend-deps AS meet-dev
+FROM frontend-deps as meet-dev
 
 WORKDIR /home/frontend
 
@@ -25,14 +25,14 @@ CMD [ "npm", "run", "dev"]
 
 # Tilt will rebuild Meet target so, we dissociate meet and meet-builder
 # to avoid rebuilding the app at every changes.
-FROM meet AS meet-builder
+FROM meet as meet-builder
 
 WORKDIR /home/frontend
 
 RUN npm run build
 
 # ---- Front-end image ----
-FROM nginxinc/nginx-unprivileged:1.26-alpine AS frontend-production
+FROM nginxinc/nginx-unprivileged:1.26-alpine as frontend-production
 
 # Un-privileged user running the application
 ARG DOCKER_USER

src/frontend/src/api/useConfig.ts

@@ -2,12 +2,6 @@ import { fetchApi } from './fetchApi'
 import { keys } from './queryKeys'
 import { useQuery } from '@tanstack/react-query'
 
-// todo - refactor it in a proper place
-export enum RecordingMode {
-  Transcript = 'transcript',
-  ScreenRecording = 'screen_recording',
-}
-
 export interface ApiConfig {
   analytics?: {
     id: string
@@ -17,10 +11,6 @@ export interface ApiConfig {
     id: string
   }
   silence_livekit_debug_logs?: boolean
-  recording?: {
-    is_enabled?: boolean
-    available_modes?: RecordingMode[]
-  }
 }
 
 const fetchConfig = (): Promise<ApiConfig> => {

src/frontend/src/features/notifications/MainNotificationToast.tsx

@@ -34,19 +34,19 @@ export const MainNotificationToast = () => {
   }, [room, triggerNotificationSound])
 
   useEffect(() => {
-    const removeParticipantNotifications = (participant: Participant) => {
-      toastQueue.visibleToasts.forEach((toast) => {
-        if (toast.content.participant === participant) {
-          toastQueue.close(toast.key)
-        }
-      })
-    }
-    room.on(RoomEvent.ParticipantDisconnected, removeParticipantNotifications)
-    return () => {
-      room.off(
-        RoomEvent.ParticipantDisconnected,
-        removeParticipantNotifications
+    const removeJoinNotification = (participant: Participant) => {
+      const existingToast = toastQueue.visibleToasts.find(
+        (toast) =>
+          toast.content.participant === participant &&
+          toast.content.type === NotificationType.Joined
       )
+      if (existingToast) {
+        toastQueue.close(existingToast.key)
+      }
+    }
+    room.on(RoomEvent.ParticipantDisconnected, removeJoinNotification)
+    return () => {
+      room.off(RoomEvent.ParticipantConnected, removeJoinNotification)
     }
   }, [room])
 
@@ -105,7 +105,7 @@ export const MainNotificationToast = () => {
   }, [room])
 
   return (
-    <Div position="absolute" bottom={0} right={5} zIndex={1000}>
+    <Div position="absolute" bottom={20} right={5} zIndex={1000}>
       <ToastProvider />
     </Div>
   )

src/frontend/src/features/notifications/components/ToastRaised.tsx

@@ -6,7 +6,7 @@ import { HStack } from '@/styled-system/jsx'
 import { Button, Div } from '@/primitives'
 import { useTranslation } from 'react-i18next'
 import { RiCloseLine, RiHand } from '@remixicon/react'
-import { useSidePanel } from '@/features/rooms/livekit/hooks/useSidePanel'
+import { useWidgetInteraction } from '@/features/rooms/livekit/hooks/useWidgetInteraction'
 
 export function ToastRaised({ state, ...props }: ToastProps) {
   const { t } = useTranslation('notifications')
@@ -17,7 +17,7 @@ export function ToastRaised({ state, ...props }: ToastProps) {
     ref
   )
   const participant = props.toast.content.participant
-  const { isParticipantsOpen, toggleParticipants } = useSidePanel()
+  const { isParticipantsOpen, toggleParticipants } = useWidgetInteraction()
 
   return (
     <StyledToastContainer {...toastProps} ref={ref}>

src/frontend/src/features/rooms/components/Conference.tsx

@@ -1,7 +1,11 @@
 import { useEffect, useMemo, useState } from 'react'
 import { useQuery } from '@tanstack/react-query'
 import { useTranslation } from 'react-i18next'
-import { LiveKitRoom, type LocalUserChoices } from '@livekit/components-react'
+import {
+  formatChatMessageLinks,
+  LiveKitRoom,
+  type LocalUserChoices,
+} from '@livekit/components-react'
 import { Room, RoomOptions } from 'livekit-client'
 import { keys } from '@/api/queryKeys'
 import { queryClient } from '@/api/queryClient'
@@ -89,13 +93,6 @@ export const Conference = ({
     )
   }
 
-  // Some clients (like DINUM) operate in bandwidth-constrained environments
-  // These settings help ensure successful connections in poor network conditions
-  const connectOptions = {
-    maxRetries: 5, // Default: 1. Only for unreachable server scenarios
-    peerConnectionTimeout: 60, // Default: 15s. Extended for slow TURN/TLS negotiation
-  }
-
   return (
     <QueryAware status={isFetchError ? createStatus : fetchStatus}>
       <Screen header={false}>
@@ -106,9 +103,8 @@ export const Conference = ({
           connect={true}
           audio={userConfig.audioEnabled}
           video={userConfig.videoEnabled}
-          connectOptions={connectOptions}
         >
-          <VideoConference />
+          <VideoConference chatMessageFormatter={formatChatMessageLinks} />
           {showInviteDialog && (
             <InviteDialog
               isOpen={showInviteDialog}

src/frontend/src/features/rooms/components/Join.tsx

@@ -19,7 +19,7 @@ export const Join = ({
           micLabel={t('join.audioinput.label')}
           camLabel={t('join.videoinput.label')}
           joinLabel={t('join.joinLabel')}
-          userLabel={t('join.usernameLabel')}
+          userLabel={t('join.userLabel')}
         />
       </CenteredContent>
     </Screen>

src/frontend/src/features/rooms/livekit/components/Effects.tsx

@@ -94,7 +94,7 @@ export const Effects = () => {
   }
 
   return (
-    <VStack padding="0 1.5rem" overflowY="scroll">
+    <VStack padding="0 1.5rem">
       {localCameraTrack && isCameraEnabled ? (
         <video
           ref={videoRef}

src/frontend/src/features/rooms/livekit/components/SidePanel.tsx

@@ -1,3 +1,4 @@
+import { useSnapshot } from 'valtio'
 import { layoutStore } from '@/stores/layout'
 import { css } from '@/styled-system/css'
 import { Heading } from 'react-aria-components'
@@ -6,16 +7,14 @@ import { Box, Button, Div } from '@/primitives'
 import { RiCloseLine } from '@remixicon/react'
 import { useTranslation } from 'react-i18next'
 import { ParticipantsList } from './controls/Participants/ParticipantsList'
-import { useSidePanel } from '../hooks/useSidePanel'
+import { useWidgetInteraction } from '../hooks/useWidgetInteraction'
 import { ReactNode } from 'react'
 import { Effects } from './Effects'
-import { Chat } from '../prefabs/Chat'
 
 type StyledSidePanelProps = {
   title: string
   children: ReactNode
   onClose: () => void
-  isClosed: boolean
   closeButtonTooltip: string
 }
 
@@ -23,11 +22,11 @@ const StyledSidePanel = ({
   title,
   children,
   onClose,
-  isClosed,
   closeButtonTooltip,
 }: StyledSidePanelProps) => (
   <Box
     size="sm"
+    minWidth="360px"
     className={css({
       overflow: 'hidden',
       display: 'flex',
@@ -35,16 +34,7 @@ const StyledSidePanel = ({
       margin: '1.5rem 1.5rem 1.5rem 0',
       padding: 0,
       gap: 0,
-      right: 0,
-      top: 0,
-      bottom: '80px',
-      width: '360px',
-      position: 'absolute',
-      transition: '.5s cubic-bezier(.4,0,.2,1) 5ms',
     })}
-    style={{
-      transform: isClosed ? 'translateX(calc(360px + 1.5rem))' : 'none',
-    }}
   >
     <Heading
       slot="title"
@@ -53,19 +43,11 @@ const StyledSidePanel = ({
       style={{
         paddingLeft: '1.5rem',
         paddingTop: '1rem',
-        display: isClosed ? 'none' : undefined,
       }}
     >
       {title}
     </Heading>
-    <Div
-      position="absolute"
-      top="5"
-      right="5"
-      style={{
-        display: isClosed ? 'none' : undefined,
-      }}
-    >
+    <Div position="absolute" top="5" right="5">
       <Button
         invisible
         size="xs"
@@ -76,56 +58,31 @@ const StyledSidePanel = ({
         <RiCloseLine />
       </Button>
     </Div>
-    {children}
+    <Div overflowY="scroll">{children}</Div>
   </Box>
 )
 
-type PanelProps = {
-  isOpen: boolean
-  children: React.ReactNode
-}
-
-const Panel = ({ isOpen, children }: PanelProps) => (
-  <div
-    style={{
-      display: isOpen ? 'inherit' : 'none',
-      flexDirection: 'column',
-      overflow: 'hidden',
-      flexGrow: 1,
-    }}
-  >
-    {children}
-  </div>
-)
-
 export const SidePanel = () => {
-  const {
-    activePanelId,
-    isParticipantsOpen,
-    isEffectsOpen,
-    isChatOpen,
-    isSidePanelOpen,
-  } = useSidePanel()
+  const layoutSnap = useSnapshot(layoutStore)
+  const sidePanel = layoutSnap.sidePanel
+
+  const { isParticipantsOpen, isEffectsOpen } = useWidgetInteraction()
   const { t } = useTranslation('rooms', { keyPrefix: 'sidePanel' })
 
+  if (!sidePanel) {
+    return
+  }
+
   return (
     <StyledSidePanel
-      title={t(`heading.${activePanelId}`)}
-      onClose={() => (layoutStore.activePanelId = null)}
+      title={t(`heading.${sidePanel}`)}
+      onClose={() => (layoutStore.sidePanel = null)}
       closeButtonTooltip={t('closeButton', {
-        content: t(`content.${activePanelId}`),
+        content: t(`content.${sidePanel}`),
       })}
-      isClosed={!isSidePanelOpen}
     >
-      <Panel isOpen={isParticipantsOpen}>
-        <ParticipantsList />
-      </Panel>
-      <Panel isOpen={isEffectsOpen}>
-        <Effects />
-      </Panel>
-      <Panel isOpen={isChatOpen}>
-        <Chat />
-      </Panel>
+      {isParticipantsOpen && <ParticipantsList />}
+      {isEffectsOpen && <Effects />}
     </StyledSidePanel>
   )
 }

src/frontend/src/features/rooms/livekit/components/chat/Entry.tsx

@@ -1,71 +0,0 @@
-import type { ReceivedChatMessage } from '@livekit/components-core'
-import * as React from 'react'
-import { css } from '@/styled-system/css'
-import { Text } from '@/primitives'
-import { MessageFormatter } from '@livekit/components-react'
-
-export interface ChatEntryProps extends React.HTMLAttributes<HTMLLIElement> {
-  entry: ReceivedChatMessage
-  hideMetadata?: boolean
-  messageFormatter?: MessageFormatter
-}
-
-export const ChatEntry: (
-  props: ChatEntryProps & React.RefAttributes<HTMLLIElement>
-) => React.ReactNode = /* @__PURE__ */ React.forwardRef<
-  HTMLLIElement,
-  ChatEntryProps
->(function ChatEntry(
-  { entry, hideMetadata = false, messageFormatter, ...props }: ChatEntryProps,
-  ref
-) {
-  // Fixme - Livekit messageFormatter strips '\n' char
-  const formattedMessage = React.useMemo(() => {
-    return messageFormatter ? messageFormatter(entry.message) : entry.message
-  }, [entry.message, messageFormatter])
-  const time = new Date(entry.timestamp)
-  const locale = navigator ? navigator.language : 'en-US'
-
-  return (
-    <li
-      className={css({
-        display: 'flex',
-        flexDirection: 'column',
-        gap: '0.25rem',
-      })}
-      ref={ref}
-      title={time.toLocaleTimeString(locale, { timeStyle: 'full' })}
-      data-lk-message-origin={entry.from?.isLocal ? 'local' : 'remote'}
-      {...props}
-    >
-      {!hideMetadata && (
-        <span
-          className={css({
-            display: 'flex',
-            gap: '0.5rem',
-            paddingTop: '0.75rem',
-          })}
-        >
-          <Text bold={true} variant="sm">
-            {entry.from?.name ?? entry.from?.identity}
-          </Text>
-          <Text variant="sm" className={css({ color: 'gray.700' })}>
-            {time.toLocaleTimeString(locale, { timeStyle: 'short' })}
-          </Text>
-        </span>
-      )}
-      <Text
-        variant="sm"
-        margin={false}
-        className={css({
-          '& .lk-chat-link': {
-            color: 'blue',
-            textDecoration: 'underline',
-          },
-        })}
-      >
-        {formattedMessage}
-      </Text>
-    </li>
-  )
-})

src/frontend/src/features/rooms/livekit/components/chat/Input.tsx

@@ -1,120 +0,0 @@
-import { Button } from '@/primitives'
-import { HStack } from '@/styled-system/jsx'
-import { RiSendPlane2Fill } from '@remixicon/react'
-import { useState, useEffect } from 'react'
-import { TextArea } from '@/primitives/TextArea'
-import { RefObject } from 'react'
-import { useTranslation } from 'react-i18next'
-
-const MAX_ROWS = 6
-
-interface ChatInputProps {
-  inputRef: RefObject<HTMLTextAreaElement>
-  onSubmit: (text: string) => void
-  isSending: boolean
-}
-
-export const ChatInput = ({
-  inputRef,
-  onSubmit,
-  isSending,
-}: ChatInputProps) => {
-  const { t } = useTranslation('rooms', { keyPrefix: 'controls.chat.input' })
-  const [text, setText] = useState('')
-  const [rows, setRows] = useState(1)
-
-  const handleSubmit = () => {
-    onSubmit(text)
-    setText('')
-  }
-
-  const isDisabled = !text.trim() || isSending
-
-  const submitOnEnter = (e: React.KeyboardEvent<HTMLTextAreaElement>) => {
-    if (e.key !== 'Enter' || (e.key === 'Enter' && e.shiftKey)) return
-    e.preventDefault()
-    if (!isDisabled) handleSubmit()
-  }
-
-  useEffect(() => {
-    const resize = () => {
-      if (!inputRef.current) return
-
-      const textAreaLineHeight = 20 // Adjust this value based on your TextArea's line height
-      const previousRows = inputRef.current.rows
-      inputRef.current.rows = 1
-
-      const currentRows = Math.floor(
-        inputRef.current.scrollHeight / textAreaLineHeight
-      )
-
-      if (currentRows === previousRows) {
-        inputRef.current.rows = currentRows
-      }
-
-      if (currentRows >= MAX_ROWS) {
-        inputRef.current.rows = MAX_ROWS
-        inputRef.current.scrollTop = inputRef.current.scrollHeight
-      }
-
-      if (currentRows < MAX_ROWS) {
-        inputRef.current.style.overflowY = 'hidden'
-      } else {
-        inputRef.current.style.overflowY = 'auto'
-      }
-
-      setRows(currentRows < MAX_ROWS ? currentRows : MAX_ROWS)
-    }
-
-    resize()
-  }, [text, inputRef])
-
-  return (
-    <HStack
-      style={{
-        margin: '0.75rem 0 1.5rem',
-        padding: '0.5rem',
-        backgroundColor: '#f3f4f6',
-        borderRadius: 4,
-      }}
-    >
-      <TextArea
-        ref={inputRef}
-        onKeyDown={(e) => {
-          e.stopPropagation()
-          submitOnEnter(e)
-        }}
-        onKeyUp={(e) => e.stopPropagation()}
-        placeholder={t('textArea.placeholder')}
-        value={text}
-        onChange={(e) => {
-          setText(e.target.value)
-        }}
-        rows={rows || 1}
-        style={{
-          border: 'none',
-          resize: 'none',
-          height: 'auto',
-          minHeight: `34px`,
-          lineHeight: 1.25,
-          padding: '7px 10px',
-          overflowY: 'hidden',
-        }}
-        placeholderStyle={'strong'}
-        spellCheck={false}
-        maxLength={500}
-        aria-label={t('textArea.label')}
-      />
-      <Button
-        square
-        invisible
-        size="sm"
-        onPress={handleSubmit}
-        isDisabled={isDisabled}
-        aria-label={t('button.label')}
-      >
-        <RiSendPlane2Fill />
-      </Button>
-    </HStack>
-  )
-}

src/frontend/src/features/rooms/livekit/components/controls/ChatToggle.tsx

@@ -1,17 +1,13 @@
 import { useTranslation } from 'react-i18next'
 import { RiChat1Line } from '@remixicon/react'
-import { useSnapshot } from 'valtio'
-import { css } from '@/styled-system/css'
 import { ToggleButton } from '@/primitives'
-import { chatStore } from '@/stores/chat'
-import { useSidePanel } from '../../hooks/useSidePanel'
+import { css } from '@/styled-system/css'
+import { useWidgetInteraction } from '../../hooks/useWidgetInteraction'
 
 export const ChatToggle = () => {
   const { t } = useTranslation('rooms', { keyPrefix: 'controls.chat' })
 
-  const chatSnap = useSnapshot(chatStore)
-
-  const { isChatOpen, toggleChat } = useSidePanel()
+  const { isChatOpen, unreadMessages, toggleChat } = useWidgetInteraction()
   const tooltipLabel = isChatOpen ? 'open' : 'closed'
 
   return (
@@ -32,7 +28,7 @@ export const ChatToggle = () => {
       >
         <RiChat1Line />
       </ToggleButton>
-      {!!chatSnap.unreadMessages && (
+      {!!unreadMessages && (
         <div
           className={css({
             position: 'absolute',

src/frontend/src/features/rooms/livekit/components/controls/Options/OptionsMenuItems.tsx

@@ -1,7 +1,7 @@
 import { menuItemRecipe } from '@/primitives/menuItemRecipe'
 import {
   RiAccountBoxLine,
-  RiMegaphoneLine,
+  RiFeedbackLine,
   RiSettings3Line,
 } from '@remixicon/react'
 import { MenuItem, Menu as RACMenu, Section } from 'react-aria-components'
@@ -9,7 +9,7 @@ import { useTranslation } from 'react-i18next'
 import { Dispatch, SetStateAction } from 'react'
 import { DialogState } from './OptionsButton'
 import { Separator } from '@/primitives/Separator'
-import { useSidePanel } from '../../../hooks/useSidePanel'
+import { useWidgetInteraction } from '../../../hooks/useWidgetInteraction'
 
 // @todo try refactoring it to use MenuList component
 export const OptionsMenuItems = ({
@@ -18,7 +18,7 @@ export const OptionsMenuItems = ({
   onOpenDialog: Dispatch<SetStateAction<DialogState>>
 }) => {
   const { t } = useTranslation('rooms', { keyPrefix: 'options.items' })
-  const { toggleEffects } = useSidePanel()
+  const { toggleEffects } = useWidgetInteraction()
   return (
     <RACMenu
       style={{
@@ -42,7 +42,7 @@ export const OptionsMenuItems = ({
           target="_blank"
           className={menuItemRecipe({ icon: true })}
         >
-          <RiMegaphoneLine size={20} />
+          <RiFeedbackLine size={20} />
           {t('feedbacks')}
         </MenuItem>
         <MenuItem

src/frontend/src/features/rooms/livekit/components/controls/Participants/ParticipantsList.tsx

@@ -1,4 +1,5 @@
 import { css } from '@/styled-system/css'
+import { allParticipantRoomEvents } from '@livekit/components-core'
 import { useParticipants } from '@livekit/components-react'
 
 import { Div, H } from '@/primitives'
@@ -7,6 +8,7 @@ import { ParticipantListItem } from '../../controls/Participants/ParticipantList
 import { ParticipantsCollapsableList } from '../../controls/Participants/ParticipantsCollapsableList'
 import { HandRaisedListItem } from '../../controls/Participants/HandRaisedListItem'
 import { LowerAllHandsButton } from '../../controls/Participants/LowerAllHandsButton'
+import { RoomEvent } from 'livekit-client'
 
 // TODO: Optimize rendering performance, especially for longer participant lists, even though they are generally short.
 export const ParticipantsList = () => {
@@ -15,7 +17,12 @@ export const ParticipantsList = () => {
   // Preferred using the 'useParticipants' hook rather than the separate remote and local hooks,
   // because the 'useLocalParticipant' hook does not update the participant's information when their
   // metadata/name changes. The LiveKit team has marked this as a TODO item in the code.
-  const participants = useParticipants()
+  const participants = useParticipants({
+    updateOnlyOn: [
+      RoomEvent.ParticipantNameChanged,
+      ...allParticipantRoomEvents,
+    ],
+  })
 
   const sortedRemoteParticipants = participants
     .slice(1)
@@ -37,7 +44,7 @@ export const ParticipantsList = () => {
 
   // TODO - extract inline styling in a centralized styling file, and avoid magic numbers
   return (
-    <Div overflowY="scroll">
+    <>
       <H
         lvl={2}
         className={css({
@@ -71,6 +78,6 @@ export const ParticipantsList = () => {
           <ParticipantListItem participant={participant} />
         )}
       />
-    </Div>
+    </>
   )
 }

src/frontend/src/features/rooms/livekit/components/controls/Participants/ParticipantsToggle.tsx

@@ -3,7 +3,7 @@ import { RiGroupLine, RiInfinityLine } from '@remixicon/react'
 import { ToggleButton } from '@/primitives'
 import { css } from '@/styled-system/css'
 import { useParticipants } from '@livekit/components-react'
-import { useSidePanel } from '../../../hooks/useSidePanel'
+import { useWidgetInteraction } from '../../../hooks/useWidgetInteraction'
 
 export const ParticipantsToggle = () => {
   const { t } = useTranslation('rooms', { keyPrefix: 'controls.participants' })
@@ -16,7 +16,7 @@ export const ParticipantsToggle = () => {
   const participants = useParticipants()
   const numParticipants = participants?.length
 
-  const { isParticipantsOpen, toggleParticipants } = useSidePanel()
+  const { isParticipantsOpen, toggleParticipants } = useWidgetInteraction()
 
   const tooltipLabel = isParticipantsOpen ? 'open' : 'closed'
 

src/frontend/src/features/rooms/livekit/hooks/useSidePanel.ts

@@ -1,41 +0,0 @@
-import { useSnapshot } from 'valtio'
-import { layoutStore } from '@/stores/layout'
-
-export enum PanelId {
-  PARTICIPANTS = 'participants',
-  EFFECTS = 'effects',
-  CHAT = 'chat',
-}
-
-export const useSidePanel = () => {
-  const layoutSnap = useSnapshot(layoutStore)
-  const activePanelId = layoutSnap.activePanelId
-
-  const isParticipantsOpen = activePanelId == PanelId.PARTICIPANTS
-  const isEffectsOpen = activePanelId == PanelId.EFFECTS
-  const isChatOpen = activePanelId == PanelId.CHAT
-  const isSidePanelOpen = !!activePanelId
-
-  const toggleParticipants = () => {
-    layoutStore.activePanelId = isParticipantsOpen ? null : PanelId.PARTICIPANTS
-  }
-
-  const toggleChat = () => {
-    layoutStore.activePanelId = isChatOpen ? null : PanelId.CHAT
-  }
-
-  const toggleEffects = () => {
-    layoutStore.activePanelId = isEffectsOpen ? null : PanelId.EFFECTS
-  }
-
-  return {
-    activePanelId,
-    toggleParticipants,
-    toggleChat,
-    toggleEffects,
-    isChatOpen,
-    isParticipantsOpen,
-    isEffectsOpen,
-    isSidePanelOpen,
-  }
-}

src/frontend/src/features/rooms/livekit/hooks/useWidgetInteraction.ts

@@ -0,0 +1,46 @@
+import { useLayoutContext } from '@livekit/components-react'
+import { useSnapshot } from 'valtio'
+import { layoutStore } from '@/stores/layout'
+
+export const useWidgetInteraction = () => {
+  const { dispatch, state } = useLayoutContext().widget
+
+  const layoutSnap = useSnapshot(layoutStore)
+  const sidePanel = layoutSnap.sidePanel
+
+  const isParticipantsOpen = sidePanel == 'participants'
+  const isEffectsOpen = sidePanel == 'effects'
+
+  const toggleParticipants = () => {
+    if (dispatch && state?.showChat) {
+      dispatch({ msg: 'toggle_chat' })
+    }
+    layoutStore.sidePanel = isParticipantsOpen ? null : 'participants'
+  }
+
+  const toggleChat = () => {
+    if (isParticipantsOpen || isEffectsOpen) {
+      layoutStore.sidePanel = null
+    }
+    if (dispatch) {
+      dispatch({ msg: 'toggle_chat' })
+    }
+  }
+
+  const toggleEffects = () => {
+    if (dispatch && state?.showChat) {
+      dispatch({ msg: 'toggle_chat' })
+    }
+    layoutStore.sidePanel = isEffectsOpen ? null : 'effects'
+  }
+
+  return {
+    toggleParticipants,
+    toggleChat,
+    toggleEffects,
+    isChatOpen: state?.showChat,
+    unreadMessages: state?.unreadMessages,
+    isParticipantsOpen,
+    isEffectsOpen,
+  }
+}

src/frontend/src/features/rooms/livekit/prefabs/Chat.tsx

@@ -1,134 +0,0 @@
-import type { ChatMessage, ChatOptions } from '@livekit/components-core'
-import * as React from 'react'
-import {
-  formatChatMessageLinks,
-  useChat,
-  useParticipants,
-} from '@livekit/components-react'
-import { useTranslation } from 'react-i18next'
-import { useSnapshot } from 'valtio'
-import { chatStore } from '@/stores/chat'
-import { Div, Text } from '@/primitives'
-import { ChatInput } from '../components/chat/Input'
-import { ChatEntry } from '../components/chat/Entry'
-import { useSidePanel } from '../hooks/useSidePanel'
-
-export interface ChatProps
-  extends React.HTMLAttributes<HTMLDivElement>,
-    ChatOptions {}
-
-/**
- * The Chat component adds a basis chat functionality to the LiveKit room. The messages are distributed to all participants
- * in the room. Only users who are in the room at the time of dispatch will receive the message.
- */
-export function Chat({ ...props }: ChatProps) {
-  const { t } = useTranslation('rooms', { keyPrefix: 'chat' })
-
-  const inputRef = React.useRef<HTMLTextAreaElement>(null)
-  const ulRef = React.useRef<HTMLUListElement>(null)
-
-  const { send, chatMessages, isSending } = useChat()
-
-  const { isChatOpen } = useSidePanel()
-  const chatSnap = useSnapshot(chatStore)
-
-  // Use useParticipants hook to trigger a re-render when the participant list changes.
-  const participants = useParticipants()
-
-  const lastReadMsgAt = React.useRef<ChatMessage['timestamp']>(0)
-
-  async function handleSubmit(text: string) {
-    if (!send || !text) return
-    await send(text)
-    inputRef?.current?.focus()
-  }
-
-  React.useEffect(() => {
-    if (chatMessages.length > 0 && ulRef.current) {
-      ulRef.current?.scrollTo({ top: ulRef.current.scrollHeight })
-    }
-  }, [ulRef, chatMessages])
-
-  React.useEffect(() => {
-    if (chatMessages.length === 0) {
-      return
-    }
-    if (
-      isChatOpen &&
-      lastReadMsgAt.current !== chatMessages[chatMessages.length - 1]?.timestamp
-    ) {
-      lastReadMsgAt.current = chatMessages[chatMessages.length - 1]?.timestamp
-      chatStore.unreadMessages = 0
-      return
-    }
-
-    const unreadMessageCount = chatMessages.filter(
-      (msg) => !lastReadMsgAt.current || msg.timestamp > lastReadMsgAt.current
-    ).length
-
-    if (
-      unreadMessageCount > 0 &&
-      chatSnap.unreadMessages !== unreadMessageCount
-    ) {
-      chatStore.unreadMessages = unreadMessageCount
-    }
-  }, [chatMessages, chatSnap.unreadMessages, isChatOpen])
-
-  const renderedMessages = React.useMemo(() => {
-    return chatMessages.map((msg, idx, allMsg) => {
-      const hideMetadata =
-        idx >= 1 &&
-        msg.timestamp - allMsg[idx - 1].timestamp < 60_000 &&
-        allMsg[idx - 1].from === msg.from
-
-      return (
-        <ChatEntry
-          key={msg.id ?? idx}
-          hideMetadata={hideMetadata}
-          entry={msg}
-          messageFormatter={formatChatMessageLinks}
-        />
-      )
-    })
-    // This ensures that the chat message list is updated to reflect any changes in participant information.
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [chatMessages, participants])
-
-  return (
-    <Div
-      display={'flex'}
-      padding={'0 1.5rem'}
-      flexGrow={1}
-      flexDirection={'column'}
-      minHeight={0}
-      {...props}
-    >
-      <Text
-        variant="sm"
-        style={{
-          padding: '0.75rem',
-          backgroundColor: '#f3f4f6',
-          borderRadius: 4,
-          marginBottom: '0.75rem',
-        }}
-      >
-        {t('disclaimer')}
-      </Text>
-      <Div
-        flexGrow={1}
-        flexDirection={'column'}
-        minHeight={0}
-        overflowY="scroll"
-      >
-        <ul className="lk-list lk-chat-messages" ref={ulRef}>
-          {renderedMessages}
-        </ul>
-      </Div>
-      <ChatInput
-        inputRef={inputRef}
-        onSubmit={(e) => handleSubmit(e)}
-        isSending={isSending}
-      />
-    </Div>
-  )
-}

src/frontend/src/features/rooms/livekit/prefabs/ControlBar.tsx

@@ -8,6 +8,7 @@ import {
   usePersistentUserChoices,
 } from '@livekit/components-react'
 
+import { mergeProps } from '@/utils/mergeProps.ts'
 import { StartMediaButton } from '../components/controls/StartMediaButton'
 import { useMediaQuery } from '../hooks/useMediaQuery'
 import { OptionsButton } from '../components/controls/Options/OptionsButton'
@@ -17,7 +18,6 @@ import { HandToggle } from '../components/controls/HandToggle'
 import { SelectToggleDevice } from '../components/controls/SelectToggleDevice'
 import { LeaveButton } from '../components/controls/LeaveButton'
 import { ScreenShareToggle } from '../components/controls/ScreenShareToggle'
-import { css } from '@/styled-system/css'
 
 /** @public */
 export type ControlBarControls = {
@@ -63,6 +63,7 @@ export function ControlBar({
   variation,
   saveUserChoices = true,
   onDeviceError,
+  ...props
 }: ControlBarProps) {
   const [isChatOpen, setIsChatOpen] = React.useState(false)
   const layoutContext = useMaybeLayoutContext()
@@ -81,6 +82,8 @@ export function ControlBar({
 
   const browserSupportsScreenSharing = supportsScreenSharing()
 
+  const htmlProps = mergeProps({ className: 'lk-control-bar' }, props)
+
   const {
     saveAudioInputEnabled,
     saveVideoInputEnabled,
@@ -101,23 +104,7 @@ export function ControlBar({
   )
 
   return (
-    <div
-      className={css({
-        display: 'flex',
-        gap: '.5rem',
-        alignItems: 'center',
-        justifyContent: 'center',
-        padding: '.75rem',
-        borderTop: '1px solid var(--lk-border-color)',
-        maxHeight: 'var(--lk-control-bar-height)',
-        height: '80px',
-        position: 'absolute',
-        backgroundColor: '#d1d5db',
-        bottom: 0,
-        left: 0,
-        right: 0,
-      })}
-    >
+    <div {...htmlProps}>
       <SelectToggleDevice
         source={Track.Source.Microphone}
         onChange={microphoneOnChange}

src/frontend/src/features/rooms/livekit/prefabs/VideoConference.tsx

@@ -1,4 +1,9 @@
-import type { TrackReferenceOrPlaceholder } from '@livekit/components-core'
+import type {
+  MessageDecoder,
+  MessageEncoder,
+  TrackReferenceOrPlaceholder,
+  WidgetState,
+} from '@livekit/components-core'
 import {
   isEqualTrackRef,
   isTrackReference,
@@ -15,19 +20,22 @@ import {
   GridLayout,
   LayoutContextProvider,
   RoomAudioRenderer,
+  MessageFormatter,
   usePinnedTracks,
   useTracks,
   useCreateLayoutContext,
+  Chat,
 } from '@livekit/components-react'
 
 import { ControlBar } from './ControlBar'
 import { styled } from '@/styled-system/jsx'
 import { cva } from '@/styled-system/css'
-import { MainNotificationToast } from '@/features/notifications/MainNotificationToast'
+import { useSnapshot } from 'valtio'
+import { layoutStore } from '@/stores/layout'
 import { FocusLayout } from '../components/FocusLayout'
 import { ParticipantTile } from '../components/ParticipantTile'
 import { SidePanel } from '../components/SidePanel'
-import { useSidePanel } from '../hooks/useSidePanel'
+import { MainNotificationToast } from '@/features/notifications/MainNotificationToast'
 
 const LayoutWrapper = styled(
   'div',
@@ -36,7 +44,7 @@ const LayoutWrapper = styled(
       position: 'relative',
       display: 'flex',
       width: '100%',
-      height: '100%',
+      height: 'calc(100% - var(--lk-control-bar-height))',
     },
   })
 )
@@ -46,6 +54,9 @@ const LayoutWrapper = styled(
  */
 export interface VideoConferenceProps
   extends React.HTMLAttributes<HTMLDivElement> {
+  chatMessageFormatter?: MessageFormatter
+  chatMessageEncoder?: MessageEncoder
+  chatMessageDecoder?: MessageDecoder
   /** @alpha */
   SettingsComponent?: React.ComponentType
 }
@@ -68,7 +79,17 @@ export interface VideoConferenceProps
  * ```
  * @public
  */
-export function VideoConference({ ...props }: VideoConferenceProps) {
+export function VideoConference({
+  chatMessageFormatter,
+  chatMessageDecoder,
+  chatMessageEncoder,
+  ...props
+}: VideoConferenceProps) {
+  const [widgetState, setWidgetState] = React.useState<WidgetState>({
+    showChat: false,
+    unreadMessages: 0,
+    showSettings: false,
+  })
   const lastAutoFocusedScreenShareTrack =
     React.useRef<TrackReferenceOrPlaceholder | null>(null)
 
@@ -80,6 +101,11 @@ export function VideoConference({ ...props }: VideoConferenceProps) {
     { updateOnlyOn: [RoomEvent.ActiveSpeakersChanged], onlySubscribed: false }
   )
 
+  const widgetUpdate = (state: WidgetState) => {
+    log.debug('updating widget state', state)
+    setWidgetState(state)
+  }
+
   const layoutContext = useCreateLayoutContext()
 
   const screenShareTracks = tracks
@@ -146,7 +172,8 @@ export function VideoConference({ ...props }: VideoConferenceProps) {
   ])
   /* eslint-enable react-hooks/exhaustive-deps */
 
-  const { isSidePanelOpen } = useSidePanel()
+  const layoutSnap = useSnapshot(layoutStore)
+  const sidePanel = layoutSnap.sidePanel
 
   return (
     <div className="lk-video-conference" {...props}>
@@ -154,17 +181,9 @@ export function VideoConference({ ...props }: VideoConferenceProps) {
         <LayoutContextProvider
           value={layoutContext}
           // onPinChange={handleFocusStateChange}
+          onWidgetChange={widgetUpdate}
         >
-          <div
-            // todo - extract these magic values into constant
-            style={{
-              position: 'absolute',
-              inset: isSidePanelOpen
-                ? 'var(--lk-grid-gap) calc(358px + 3rem) calc(80px + var(--lk-grid-gap)) 16px'
-                : 'var(--lk-grid-gap) var(--lk-grid-gap) calc(80px + var(--lk-grid-gap))',
-              transition: 'inset .5s cubic-bezier(0.4,0,0.2,1) 5ms',
-            }}
-          >
+          <div className="lk-video-conference-inner">
             <LayoutWrapper>
               <div
                 style={{ display: 'flex', position: 'relative', width: '100%' }}
@@ -174,7 +193,7 @@ export function VideoConference({ ...props }: VideoConferenceProps) {
                     className="lk-grid-layout-wrapper"
                     style={{ height: 'auto' }}
                   >
-                    <GridLayout tracks={tracks} style={{ padding: 0 }}>
+                    <GridLayout tracks={tracks}>
                       <ParticipantTile />
                     </GridLayout>
                   </div>
@@ -183,7 +202,7 @@ export function VideoConference({ ...props }: VideoConferenceProps) {
                     className="lk-focus-layout-wrapper"
                     style={{ height: 'auto' }}
                   >
-                    <FocusLayoutContainer style={{ padding: 0 }}>
+                    <FocusLayoutContainer>
                       <CarouselLayout
                         tracks={carouselTracks}
                         style={{
@@ -196,12 +215,18 @@ export function VideoConference({ ...props }: VideoConferenceProps) {
                     </FocusLayoutContainer>
                   </div>
                 )}
+                <MainNotificationToast />
               </div>
+              <Chat
+                style={{ display: widgetState.showChat ? 'grid' : 'none' }}
+                messageFormatter={chatMessageFormatter}
+                messageEncoder={chatMessageEncoder}
+                messageDecoder={chatMessageDecoder}
+              />
+              {sidePanel && <SidePanel />}
             </LayoutWrapper>
-            <MainNotificationToast />
+            <ControlBar />
           </div>
-          <ControlBar />
-          <SidePanel />
         </LayoutContextProvider>
       )}
       <RoomAudioRenderer />

src/frontend/src/locales/de/rooms.json

@@ -22,6 +22,7 @@
     "joinMeeting": "",
     "toggleOff": "",
     "toggleOn": "",
+    "userLabel": "",
     "usernameHint": "",
     "usernameLabel": ""
   },
@@ -46,16 +47,7 @@
     "stopScreenShare": "",
     "chat": {
       "open": "",
-      "closed": "",
-      "input": {
-        "textArea": {
-          "label": "",
-          "placeholder": ""
-        },
-        "button": {
-          "label": ""
-        }
-      }
+      "closed": ""
     },
     "hand": {
       "raise": "",
@@ -96,19 +88,14 @@
   "sidePanel": {
     "heading": {
       "participants": "",
-      "effects": "",
-      "chat": ""
+      "effects": ""
     },
     "content": {
       "participants": "",
-      "effects": "",
-      "chat": ""
+      "effects": ""
     },
     "closeButton": ""
   },
-  "chat": {
-    "disclaimer": ""
-  },
   "participants": {
     "subheading": "",
     "contributors": "",

src/frontend/src/locales/en/rooms.json

@@ -22,6 +22,7 @@
     "joinMeeting": "Join meeting",
     "toggleOff": "Click to turn off",
     "toggleOn": "Click to turn on",
+    "userLabel": "",
     "usernameHint": "Shown to other participants",
     "usernameLabel": "Your name"
   },
@@ -44,16 +45,7 @@
     "camera": "Camera",
     "chat": {
       "open": "Close the chat",
-      "closed": "Open the chat",
-      "input": {
-        "textArea": {
-          "label": "Enter a message",
-          "placeholder": "Enter a message"
-        },
-        "button": {
-          "label": "Send message"
-        }
-      }
+      "closed": "Open the chat"
     },
     "hand": {
       "raise": "Raise hand",
@@ -94,19 +86,14 @@
   "sidePanel": {
     "heading": {
       "participants": "Participants",
-      "effects": "Effects",
-      "chat": "Messages in the chat"
+      "effects": "Effects"
     },
     "content": {
       "participants": "participants",
-      "effects": "effects",
-      "chat": "messages"
+      "effects": "effects"
     },
     "closeButton": "Hide {{content}}"
   },
-  "chat": {
-    "disclaimer": "The messages are visible to participants only at the time they are sent. All messages are deleted at the end of the call."
-  },
   "participants": {
     "subheading": "In room",
     "you": "You",

src/frontend/src/locales/fr/rooms.json

@@ -22,6 +22,7 @@
     "joinMeeting": "Rejoindre la réjoindre",
     "toggleOff": "Cliquez pour désactiver",
     "toggleOn": "Cliquez pour activer",
+    "userLabel": "",
     "usernameHint": "Affiché aux autres participants",
     "usernameLabel": "Votre nom"
   },
@@ -44,16 +45,7 @@
     "camera": "Camera",
     "chat": {
       "open": "Masquer le chat",
-      "closed": "Afficher le chat",
-      "input": {
-        "textArea": {
-          "label": "Ecrire un message",
-          "placeholder": "Ecrire un message"
-        },
-        "button": {
-          "label": "Envoyer un message"
-        }
-      }
+      "closed": "Afficher le chat"
     },
     "hand": {
       "raise": "Lever la main",
@@ -94,19 +86,14 @@
   "sidePanel": {
     "heading": {
       "participants": "Participants",
-      "effects": "Effets",
-      "chat": "Messages dans l'appel"
+      "effects": "Effets"
     },
     "content": {
       "participants": "les participants",
-      "effects": "les effets",
-      "chat": "les messages"
+      "effects": "les effets"
     },
     "closeButton": "Masquer {{content}}"
   },
-  "chat": {
-    "disclaimer": "Les messages sont visibles par les participants uniquement au moment de\nleur envoi. Tous les messages sont supprimés à la fin de l'appel."
-  },
   "participants": {
     "subheading": "Dans la réunion",
     "you": "Vous",

src/frontend/src/primitives/TextArea.tsx

@@ -1,27 +0,0 @@
-import { TextArea as RACTextArea } from 'react-aria-components'
-import { styled } from '@/styled-system/jsx'
-
-/**
- * Styled RAC TextArea.
- */
-export const TextArea = styled(RACTextArea, {
-  base: {
-    width: 'full',
-    paddingY: 0.25,
-    paddingX: 0.5,
-    border: '1px solid',
-    borderColor: 'control.border',
-    color: 'control.text',
-    borderRadius: 4,
-    transition: 'all 200ms',
-  },
-  variants: {
-    placeholderStyle: {
-      strong: {
-        _placeholder: {
-          color: 'black',
-        },
-      },
-    },
-  },
-})

src/frontend/src/primitives/buttonRecipe.ts

@@ -117,9 +117,6 @@ export const buttonRecipe = cva({
         '&[data-pressed]': {
           borderColor: 'currentcolor',
         },
-        '&[data-disabled]': {
-          color: 'gray.300',
-        },
       },
     },
     fullWidth: {

src/frontend/src/stores/chat.ts

@@ -1,9 +0,0 @@
-import { proxy } from 'valtio'
-
-type State = {
-  unreadMessages: number
-}
-
-export const chatStore = proxy<State>({
-  unreadMessages: 0,
-})

src/frontend/src/stores/layout.ts

@@ -1,12 +1,11 @@
 import { proxy } from 'valtio'
-import { PanelId } from '@/features/rooms/livekit/hooks/useSidePanel'
 
 type State = {
   showHeader: boolean
-  activePanelId: PanelId | null
+  sidePanel: 'participants' | 'effects' | null
 }
 
 export const layoutStore = proxy<State>({
   showHeader: false,
-  activePanelId: null,
+  sidePanel: null,
 })

src/helm/env.d/dev/values.egress.yaml.gotmpl

@@ -1,43 +0,0 @@
-replicaCount: 1
-terminationGracePeriodSeconds: 18000
-
-egress:
-  log_level: debug
-  ws_url: ws://livekit-livekit-server:80
-  insecure: true
-  enable_chrome_sandbox: true
-  {{- with .Values.livekit.keys }}
-  {{- range $key, $value := . }}
-  api_key: {{ $key }}
-  api_secret: {{ $value }}
-  {{- end }}
-  {{- end }}
-  redis:
-    address: redis-master:6379
-    password: pass
-  s3:
-    access_key: meet
-    secret: password
-    region: local
-    bucket: meet-media-storage
-    endpoint: http://minio:9000
-    force_path_style: true
-
-loadBalancer:
-  type: nginx
-  annotations:
-    nginx.ingress.kubernetes.io/rewrite-target: /
-    nginx.ingress.kubernetes.io/ssl-redirect: "true"
-    cert-manager.io/cluster-issuer: "letsencrypt-prod"
-  tls:
-    - hosts:
-        - livekit-egress.127.0.0.1.nip.io
-      secretName: livekit-egress-dinum-cert
-
-autoscaling:
-  enabled: false
-  minReplicas: 1
-  maxReplicas: 5
-
-nodeSelector: {}
-resources: {}

src/helm/env.d/dev/values.livekit.yaml.gotmpl

@@ -4,20 +4,13 @@ terminationGracePeriodSeconds: 18000
 livekit:
   log_level: debug
   rtc:
-    use_external_ip: false
+    use_external_ip: true
     port_range_start: 50000
     port_range_end: 60000
     tcp_port: 7881
   redis:
-    address: redis-master:6379
-    password: pass
+    address:
   keys:
-  turn:
-    enabled: true
-    udp_port: 443
-    domain: livekit.127.0.0.1.nip.io
-    loadBalancerAnnotations: {}
-
 
 loadBalancer:
   type: nginx

src/helm/env.d/dev/values.meet.yaml.gotmpl

@@ -40,6 +40,10 @@ backend:
     POSTGRES_PASSWORD: pass
     REDIS_URL: redis://default:pass@redis-master:6379/1
     STORAGES_STATICFILES_BACKEND: django.contrib.staticfiles.storage.StaticFilesStorage
+    AWS_S3_ENDPOINT_URL: http://minio.meet.svc.cluster.local:9000
+    AWS_S3_ACCESS_KEY_ID: meet
+    AWS_S3_SECRET_ACCESS_KEY: password
+    AWS_STORAGE_BUCKET_NAME: meet-media-storage
     {{- with .Values.livekit.keys }}
     {{- range $key, $value := . }}
     LIVEKIT_API_SECRET: {{ $value }}
@@ -47,13 +51,10 @@ backend:
     {{- end }}
     {{- end }}
     LIVEKIT_API_URL: https://livekit.127.0.0.1.nip.io/
+    ANALYTICS_KEY: xwhoIMCZ8PBRjQ2t
     ALLOW_UNREGISTERED_ROOMS: False
     FRONTEND_SILENCE_LIVEKIT_DEBUG: False
     FRONTEND_SUPPORT: "{'id': '58ea6697-8eba-4492-bc59-ad6562585041'}"
-    AWS_S3_ENDPOINT_URL: http://minio.meet.svc.cluster.local:9000
-    AWS_S3_ACCESS_KEY_ID: meet
-    AWS_S3_SECRET_ACCESS_KEY: password
-    AWS_STORAGE_BUCKET_NAME: meet-media-storage
 
 
   migrate:
@@ -101,10 +102,23 @@ ingressAdmin:
   enabled: true
   host: meet.127.0.0.1.nip.io
 
+ingressMedia:
+  enabled: true
+  host: meet.127.0.0.1.nip.io
+
+  annotations:
+    nginx.ingress.kubernetes.io/auth-url: https://meet.127.0.0.1.nip.io/api/v1.0/recordings/retrieve-auth/
+    nginx.ingress.kubernetes.io/auth-response-headers: "Authorization, X-Amz-Date, X-Amz-Content-SHA256"
+    nginx.ingress.kubernetes.io/upstream-vhost: minio.meet.svc.cluster.local:9000
+    nginx.ingress.kubernetes.io/rewrite-target: /meet-media-storage/$1
+
+serviceMedia:
+  host: minio.meet.svc.cluster.local
+  port: 9000
+
 posthog:
   ingress:
     enabled: false
 
   ingressAssets:
-    enabled: false
-
+    enabled: false

src/helm/env.d/production/values.meet.yaml.gotmpl

@@ -85,19 +85,6 @@ backend:
         name: redis.redis.libre.sh
         key: url
     STORAGES_STATICFILES_BACKEND: django.contrib.staticfiles.storage.StaticFilesStorage
-    LIVEKIT_API_SECRET:
-      secretKeyRef:
-        name: backend
-        key: LIVEKIT_API_SECRET
-    LIVEKIT_API_KEY:
-      secretKeyRef:
-        name: backend
-        key: LIVEKIT_API_KEY
-    LIVEKIT_API_URL: https://livekit-preprod.beta.numerique.gouv.fr
-    ALLOW_UNREGISTERED_ROOMS: False
-    FRONTEND_SILENCE_LIVEKIT_DEBUG: False
-    FRONTEND_ANALYTICS: "{'id': 'phc_RPYko028Oqtj0c9exLIWwrlrjLxSdxT0ntW0Lam4iom', 'host': 'https://product.visio.numerique.gouv.fr'}"
-    FRONTEND_SUPPORT: "{'id': '58ea6697-8eba-4492-bc59-ad6562585041'}"
     AWS_S3_ENDPOINT_URL:
       secretKeyRef:
         name: meet-media-storage.bucket.libre.sh
@@ -115,6 +102,20 @@ backend:
         name: meet-media-storage.bucket.libre.sh
         key: bucket
     AWS_S3_REGION_NAME: local
+    LIVEKIT_API_SECRET:
+      secretKeyRef:
+        name: backend
+        key: LIVEKIT_API_SECRET
+    LIVEKIT_API_KEY:
+      secretKeyRef:
+        name: backend
+        key: LIVEKIT_API_KEY
+    LIVEKIT_API_URL: https://livekit-preprod.beta.numerique.gouv.fr
+    ANALYTICS_KEY: mwuxTKi8o2xzWH54
+    ALLOW_UNREGISTERED_ROOMS: False
+    FRONTEND_SILENCE_LIVEKIT_DEBUG: False
+    FRONTEND_ANALYTICS: "{'id': 'phc_RPYko028Oqtj0c9exLIWwrlrjLxSdxT0ntW0Lam4iom', 'host': 'https://product.visio.numerique.gouv.fr'}"
+    FRONTEND_SUPPORT: "{'id': '58ea6697-8eba-4492-bc59-ad6562585041'}"
 
   createsuperuser:
     command:
@@ -146,6 +147,24 @@ ingressAdmin:
     nginx.ingress.kubernetes.io/auth-signin: https://oauth2-proxy.beta.numerique.gouv.fr/oauth2/start
     nginx.ingress.kubernetes.io/auth-url: https://oauth2-proxy.beta.numerique.gouv.fr/oauth2/auth
 
+ingressMedia:
+  enabled: true
+  host: visio.numerique.gouv.fr
+
+  annotations:
+    cert-manager.io/cluster-issuer: letsencrypt-prod
+    nginx.ingress.kubernetes.io/auth-response-headers: "Authorization, X-Amz-Date, X-Amz-Content-SHA256"
+    nginx.ingress.kubernetes.io/auth-url: https://visio.numerique.gouv.fr/api/v1.0/recordings/retrieve-auth/
+    nginx.ingress.kubernetes.io/backend-protocol: "HTTPS"
+    nginx.ingress.kubernetes.io/force-ssl-redirect: "true"
+    nginx.ingress.kubernetes.io/rewrite-target: /impress-production-media-storage/$1
+    nginx.ingress.kubernetes.io/ssl-redirect: "true"
+    nginx.ingress.kubernetes.io/upstream-vhost: s3.hedy-lamarr.indiehosters.net
+
+serviceMedia:
+  host: s3.hedy-lamarr.indiehosters.net
+  port: 443
+
 posthog:
   ingress:
     enabled: true

src/helm/env.d/staging/values.meet.yaml.gotmpl

@@ -84,18 +84,6 @@ backend:
         name: redis.redis.libre.sh
         key: url
     STORAGES_STATICFILES_BACKEND: django.contrib.staticfiles.storage.StaticFilesStorage
-    LIVEKIT_API_SECRET:
-      secretKeyRef:
-        name: backend
-        key: LIVEKIT_API_SECRET
-    LIVEKIT_API_KEY:
-      secretKeyRef:
-        name: backend
-        key: LIVEKIT_API_KEY
-    LIVEKIT_API_URL: https://livekit-staging.beta.numerique.gouv.fr
-    ALLOW_UNREGISTERED_ROOMS: False
-    FRONTEND_ANALYTICS: "{'id': 'phc_RPYko028Oqtj0c9exLIWwrlrjLxSdxT0ntW0Lam4iom', 'host': 'https://product.visio-staging.beta.numerique.gouv.fr'}"
-    FRONTEND_SUPPORT: "{'id': '58ea6697-8eba-4492-bc59-ad6562585041'}"
     AWS_S3_ENDPOINT_URL:
       secretKeyRef:
         name: meet-media-storage.bucket.libre.sh
@@ -113,6 +101,19 @@ backend:
         name: meet-media-storage.bucket.libre.sh
         key: bucket
     AWS_S3_REGION_NAME: local
+    LIVEKIT_API_SECRET:
+      secretKeyRef:
+        name: backend
+        key: LIVEKIT_API_SECRET
+    LIVEKIT_API_KEY:
+      secretKeyRef:
+        name: backend
+        key: LIVEKIT_API_KEY
+    LIVEKIT_API_URL: https://livekit-staging.beta.numerique.gouv.fr
+    ANALYTICS_KEY: Roi1k6IAc2DEqHB0
+    ALLOW_UNREGISTERED_ROOMS: False
+    FRONTEND_ANALYTICS: "{'id': 'phc_RPYko028Oqtj0c9exLIWwrlrjLxSdxT0ntW0Lam4iom', 'host': 'https://product.visio-staging.beta.numerique.gouv.fr'}"
+    FRONTEND_SUPPORT: "{'id': '58ea6697-8eba-4492-bc59-ad6562585041'}"
 
   createsuperuser:
     command:
@@ -156,6 +157,24 @@ ingressAdmin:
         hosts:
           - {{ .Values.newDomain }}
 
+ingressMedia:
+  enabled: true
+  host: meet-staging.beta.numerique.gouv.fr
+
+  annotations:
+    cert-manager.io/cluster-issuer: letsencrypt-prod
+    nginx.ingress.kubernetes.io/auth-response-headers: "Authorization, X-Amz-Date, X-Amz-Content-SHA256"
+    nginx.ingress.kubernetes.io/auth-url: https://meet-staging.beta.numerique.gouv.fr/api/v1.0/recordings/retrieve-auth/
+    nginx.ingress.kubernetes.io/backend-protocol: "HTTPS"
+    nginx.ingress.kubernetes.io/force-ssl-redirect: "true"
+    nginx.ingress.kubernetes.io/rewrite-target: /meet-staging-media-storage/$1
+    nginx.ingress.kubernetes.io/ssl-redirect: "true"
+    nginx.ingress.kubernetes.io/upstream-vhost: s3.margaret-hamilton.indiehosters.net
+
+serviceMedia:
+  host: s3.margaret-hamilton.indiehosters.net
+  port: 443
+
 posthog:
   ingress:
     enabled: true

src/helm/extra/templates/s3.yaml

@@ -1,8 +0,0 @@
-apiVersion: core.libre.sh/v1alpha1
-kind: Bucket
-metadata:
-  name: impress-media-storage
-  namespace: {{ .Release.Namespace | quote }}
-spec:
-  provider: data
-  versioned: true

src/helm/helmfile.yaml

@@ -50,7 +50,7 @@ releases:
     namespace: {{ .Namespace }}
     chart: bitnami/minio
     version: 12.10.10
-    values:
+    values: 
       - auth:
           rootUser: meet
           rootPassword: password
@@ -58,14 +58,6 @@ releases:
           enabled: true
           buckets:
             - name: meet-media-storage
-              versioning: true
-      - ingress:
-          enabled: true
-          hostname: minio-console.127.0.0.1.nip.io
-          servicePort: 9001
-          annotations:
-            nginx.ingress.kubernetes.io/proxy-body-size: "0"
-            kubernetes.io/ingress.class: nginx
 
   - name: redis
     installed: {{ eq .Environment.Name "dev" | toYaml }}
@@ -107,12 +99,3 @@ releases:
       - env.d/{{ .Environment.Name }}/values.livekit.yaml.gotmpl
     secrets:
       - env.d/{{ .Environment.Name }}/secrets.enc.yaml
-
-  - name: livekit-egress
-    installed: {{ eq .Environment.Name "dev" | toYaml }}
-    namespace: {{ .Namespace }}
-    chart: livekit/egress
-    values:
-      - env.d/{{ .Environment.Name }}/values.egress.yaml.gotmpl
-    secrets:
-      - env.d/{{ .Environment.Name }}/secrets.enc.yaml

src/helm/meet/templates/ingress_media.yaml

@@ -0,0 +1,83 @@
+{{- if .Values.ingressMedia.enabled -}}
+{{- $fullName := include "meet.fullname" . -}}
+{{- if and .Values.ingressMedia.className (not (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion)) }}
+  {{- if not (hasKey .Values.ingressMedia.annotations "kubernetes.io/ingress.class") }}
+  {{- $_ := set .Values.ingressMedia.annotations "kubernetes.io/ingress.class" .Values.ingressMedia.className}}
+  {{- end }}
+{{- end }}
+{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}}
+apiVersion: networking.k8s.io/v1
+{{- else if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}}
+apiVersion: networking.k8s.io/v1beta1
+{{- else -}}
+apiVersion: extensions/v1beta1
+{{- end }}
+kind: Ingress
+metadata:
+  name: {{ $fullName }}-media
+  namespace: {{ .Release.Namespace | quote }}
+  labels:
+    {{- include "meet.labels" . | nindent 4 }}
+  {{- with .Values.ingressMedia.annotations }}
+  annotations:
+  {{- toYaml . | nindent 4 }}
+  {{- end }}
+spec:
+  {{- if and .Values.ingressMedia.className (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion) }}
+  ingressClassName: {{ .Values.ingressMedia.className }}
+  {{- end }}
+  {{- if .Values.ingressMedia.tls.enabled }}
+  tls:
+    {{- if .Values.ingressMedia.host }}
+    - secretName: {{ $fullName }}-tls
+      hosts:
+        - {{ .Values.ingressMedia.host | quote }}
+    {{- end }}
+    {{- range .Values.ingressMedia.tls.additional }}
+    - hosts:
+        {{- range .hosts }}
+        - {{ . | quote }}
+        {{- end }}
+      secretName: {{ .secretName }}
+    {{- end }}
+  {{- end }}
+  rules:
+    {{- if .Values.ingressMedia.host }}
+    - host: {{ .Values.ingressMedia.host | quote }}
+      http:
+        paths:
+          - path: {{ .Values.ingressMedia.path | quote }}
+            {{- if semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion }}
+            pathType: Prefix
+            {{- end }}
+            backend:
+              {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }}
+              service:
+                name: {{ $fullName }}-media
+                port:
+                  number: {{ .Values.serviceMedia.port }}
+              {{- else }}
+              serviceName: {{ $fullName }}-media
+              servicePort: {{ .Values.serviceMedia.port }}
+            {{- end }}
+    {{- end }}
+    {{- range .Values.ingressMedia.hosts }}
+    - host: {{ . | quote }}
+      http:
+        paths:
+          - path: {{ $.Values.ingressMedia.path | quote }}
+            {{- if semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion }}
+            pathType: Prefix
+            {{- end }}
+            backend:
+              {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }}
+              service:
+                name: {{ $fullName }}-media
+                port:
+                  number: {{ .Values.serviceMedia.port }}
+              {{- else }}
+              serviceName: {{ $fullName }}-media
+              servicePort: {{ .Values.serviceMedia.port }}
+            {{- end }}
+    {{- end }}
+{{- end }}

src/helm/meet/templates/media_svc.yaml

@@ -0,0 +1,14 @@
+{{- $fullName := include "meet.fullname" . -}}
+{{- $component := "media" -}}
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ $fullName }}-media
+  namespace: {{ .Release.Namespace | quote }}
+  labels:
+    {{- include "meet.common.labels" (list . $component) | nindent 4 }}
+  annotations:
+    {{- toYaml $.Values.serviceMedia.annotations | nindent 4 }}
+spec:
+  type: ExternalName
+  externalName: {{ $.Values.serviceMedia.host }}

src/helm/meet/values.yaml

@@ -69,6 +69,36 @@ ingressAdmin:
     enabled: true
     additional: []
 
+## @param ingressMedia.enabled whether to enable the Ingress or not
+## @param ingressMedia.className IngressClass to use for the Ingress
+## @param ingressMedia.host Host for the Ingress
+## @param ingressMedia.path Path to use for the Ingress
+ingressMedia:
+  enabled: false
+  className: null
+  host: meet.example.com
+  path: /media/(.*)
+  ## @param ingressMedia.hosts Additional host to configure for the Ingress
+  hosts: [ ]
+  #  - chart-example.local
+  ## @param ingressMedia.tls.enabled Wether to enable TLS for the Ingress
+  ## @skip ingressMedia.tls.additional
+  ## @extra ingressMedia.tls.additional[].secretName Secret name for additional TLS config
+  ## @extra ingressMedia.tls.additional[].hosts[] Hosts for additional TLS config
+  tls:
+    enabled: true
+    additional: []
+
+  annotations:
+    nginx.ingress.kubernetes.io/auth-url: https://impress.example.com/api/v1.0/documents/retrieve-auth/
+    nginx.ingress.kubernetes.io/auth-response-headers: "Authorization, X-Amz-Date, X-Amz-Content-SHA256"
+    nginx.ingress.kubernetes.io/upstream-vhost: minio.impress.svc.cluster.local:9000
+
+serviceMedia:
+  host: minio.impress.svc.cluster.local
+  port: 9000
+  annotations: {}
+
 
 ## @section backend