Hi there
", - "text_body": "Hi there", - }, - ) - finally: - app.dependency_overrides.pop(get_mail_queue, None) - - assert response.status_code == 202 - data = response.json() - assert data["status"] == "queued" - assert data["request_id"] == "mail-123456" - assert data["recipient_count"] == 2 - assert data["attachment_count"] == 0 - mail_queue.enqueue.assert_called_once() - kwargs = mail_queue.enqueue.call_args.kwargs - assert kwargs["recipients"] == ["alex@example.com", "sam@example.com"] - assert kwargs["subject"] == "Hello team" - assert kwargs["settings"] is settings - - # --- Files --- diff --git a/backend/tests/test_authentik_client.py b/backend/tests/test_authentik_client.py new file mode 100644 index 0000000..b318de0 --- /dev/null +++ b/backend/tests/test_authentik_client.py @@ -0,0 +1,183 @@ +"""Tests for AuthentikClient and the directory endpoint.""" + +from __future__ import annotations + +from pathlib import Path +from unittest.mock import MagicMock, patch + +import pytest +from cryptography.fernet import Fernet +from fastapi.testclient import TestClient + +from media_library_viewer_api.clients.authentik import AuthentikClient +from media_library_viewer_api.dependencies import get_settings_store +from media_library_viewer_api.main import app +from media_library_viewer_api.services.secrets import reset_encryption_key_cache +from media_library_viewer_api.services.settings_store import SettingsStore + +TEST_KEY = Fernet.generate_key().decode() + + +@pytest.fixture(autouse=True) +def _encryption_key(monkeypatch: pytest.MonkeyPatch) -> None: + """Provide a stable MANAGE_ENCRYPTION_KEY for every test.""" + monkeypatch.setenv("MANAGE_ENCRYPTION_KEY", TEST_KEY) + reset_encryption_key_cache() + yield + reset_encryption_key_cache() + + +@pytest.fixture() +def store(tmp_path: Path) -> SettingsStore: + s = SettingsStore(tmp_path / "settings.sqlite") + s.ensure_defaults() + app.dependency_overrides[get_settings_store] = lambda: s + yield s + app.dependency_overrides.clear() + + +# --------------------------------------------------------------------------- +# Client unit tests +# --------------------------------------------------------------------------- + + +class TestAuthentikClient: + def test_base_url_normalizes_trailing_slash(self) -> None: + c = AuthentikClient(base_url="https://auth.example.com/", api_token="t") + assert c.base_url == "https://auth.example.com" + + def test_base_url_strips_api_v3_suffix(self) -> None: + c = AuthentikClient(base_url="https://auth.example.com/api/v3", api_token="t") + assert c.base_url == "https://auth.example.com" + + def test_bearer_header_is_set(self) -> None: + c = AuthentikClient(base_url="https://auth.example.com", api_token="tok") + assert c.session.headers["Authorization"] == "Bearer tok" + + def test_empty_base_url_raises(self) -> None: + with pytest.raises(ValueError): + AuthentikClient(base_url="", api_token="t") + + def test_empty_api_token_raises(self) -> None: + with pytest.raises(ValueError): + AuthentikClient(base_url="https://auth.example.com", api_token="") + + @patch.object(AuthentikClient, "get") + def test_users_normalizes_pagination(self, mock_get: MagicMock) -> None: + mock_get.return_value = { + "pagination": {"count": 42, "next": 2, "previous": 0, "current": 1}, + "results": [ + {"pk": 1, "username": "alice", "email": "alice@example.com"}, + {"pk": 2, "username": "bob", "email": "bob@example.com"}, + ], + } + client = AuthentikClient(base_url="https://auth.example.com", api_token="t") + result = client.users(search="ali", page=1, page_size=2) + assert result["total"] == 42 + assert result["page"] == 1 + assert result["page_size"] == 2 + assert len(result["items"]) == 2 + assert result["items"][0]["username"] == "alice" + + @patch.object(AuthentikClient, "get") + def test_users_handles_empty_results(self, mock_get: MagicMock) -> None: + mock_get.return_value = {"pagination": {"count": 0}, "results": []} + client = AuthentikClient(base_url="https://auth.example.com", api_token="t") + result = client.users() + assert result["items"] == [] + assert result["total"] == 0 + + @patch.object(AuthentikClient, "get") + def test_users_handles_non_dict_payload(self, mock_get: MagicMock) -> None: + mock_get.return_value = [] + client = AuthentikClient(base_url="https://auth.example.com", api_token="t") + result = client.users() + assert result["items"] == [] + assert result["total"] == 0 + + @patch("media_library_viewer_api.clients.authentik.requests.Session") + def test_get_sends_correct_url_and_params(self, mock_session_cls: MagicMock) -> None: + mock_session = MagicMock() + mock_session_cls.return_value = mock_session + mock_response = MagicMock() + mock_response.json.return_value = {"results": []} + mock_response.raise_for_status.return_value = None + mock_session.get.return_value = mock_response + + c = AuthentikClient(base_url="https://auth.example.com", api_token="t") + c.get("/core/users/", search="x", page=2) + + call_args = mock_session.get.call_args + assert call_args.kwargs["params"] == {"search": "x", "page": 2} + assert call_args.args[0] == "https://auth.example.com/api/v3/core/users/" + + +# --------------------------------------------------------------------------- +# Endpoint integration tests +# --------------------------------------------------------------------------- + + +class TestAuthentikUsersEndpoint: + def test_not_configured_returns_empty_with_error(self, store: SettingsStore) -> None: + client = TestClient(app) + response = client.get("/api/services/authentik/nonexistent/users") + assert response.status_code == 200 + data = response.json() + assert data["items"] == [] + assert data["total"] == 0 + assert "error" in data + + @patch("media_library_viewer_api.routers.authentik_users.AuthentikClient") + def test_success_returns_users(self, mock_client_cls: MagicMock, store: SettingsStore) -> None: + mock_client = MagicMock() + mock_client.users.return_value = { + "items": [{"pk": 1, "username": "alice"}], + "total": 1, + "page": 1, + "page_size": 50, + } + mock_client_cls.return_value = mock_client + + created = store.upsert_service( + { + "service_type": "authentik", + "name": "Main", + "config": {"base_url": "https://auth.example.com"}, + "enabled": True, + }, + secret_values={"api_token": "secret-token"}, + ) + service_id = created["id"] + + client = TestClient(app) + response = client.get(f"/api/services/authentik/{service_id}/users?search=ali") + assert response.status_code == 200 + data = response.json() + assert len(data["items"]) == 1 + assert data["items"][0]["username"] == "alice" + assert data["total"] == 1 + assert "error" not in data + + @patch("media_library_viewer_api.routers.authentik_users.AuthentikClient") + def test_unreachable_returns_error(self, mock_client_cls: MagicMock, store: SettingsStore) -> None: + mock_client = MagicMock() + mock_client.users.side_effect = ConnectionError("refused") + mock_client_cls.return_value = mock_client + + created = store.upsert_service( + { + "service_type": "authentik", + "name": "Main", + "config": {"base_url": "https://auth.example.com"}, + "enabled": True, + }, + secret_values={"api_token": "secret-token"}, + ) + service_id = created["id"] + + client = TestClient(app) + response = client.get(f"/api/services/authentik/{service_id}/users") + assert response.status_code == 200 + data = response.json() + assert data["items"] == [] + assert "error" in data diff --git a/backend/tests/test_dashboards.py b/backend/tests/test_dashboards.py new file mode 100644 index 0000000..8d30e7e --- /dev/null +++ b/backend/tests/test_dashboards.py @@ -0,0 +1,97 @@ +"""Tests for named-dashboards CRUD + slug uniqueness.""" + +from __future__ import annotations + +from pathlib import Path + +from fastapi.testclient import TestClient + +from media_library_viewer_api.dependencies import get_settings_store +from media_library_viewer_api.main import app +from media_library_viewer_api.services.settings_store import SettingsStore + + +def _client(tmp_path: Path) -> TestClient: + store = SettingsStore(tmp_path / "settings.sqlite") + app.dependency_overrides[get_settings_store] = lambda: store + client = TestClient(app) + client.store = store # type: ignore[attr-defined] + return client + + +def test_create_and_list_dashboards(tmp_path: Path): + client = _client(tmp_path) + try: + resp = client.post( + "/api/dashboards", + json={"label": "Storage Overview", "payload": {"widgets": []}}, + ) + assert resp.status_code == 200 + created = resp.json() + assert created["label"] == "Storage Overview" + assert created["slug"] == "storage-overview" + assert created["payload"] == {"widgets": []} + + listed = client.get("/api/dashboards").json() + assert len(listed) == 1 + assert listed[0]["id"] == created["id"] + finally: + app.dependency_overrides.clear() + + +def test_update_dashboard(tmp_path: Path): + client = _client(tmp_path) + try: + created = client.post("/api/dashboards", json={"label": "First"}).json() + updated = client.put( + f"/api/dashboards/{created['id']}", + json={"label": "Renamed", "payload": {"widgets": ["w1"]}}, + ).json() + assert updated["label"] == "Renamed" + assert updated["payload"] == {"widgets": ["w1"]} + assert updated["slug"] == "renamed" + finally: + app.dependency_overrides.clear() + + +def test_delete_dashboard(tmp_path: Path): + client = _client(tmp_path) + try: + created = client.post("/api/dashboards", json={"label": "Temp"}).json() + resp = client.delete(f"/api/dashboards/{created['id']}") + assert resp.status_code == 200 + assert client.get("/api/dashboards").json() == [] + finally: + app.dependency_overrides.clear() + + +def test_slug_collision_appends_suffix(tmp_path: Path): + client = _client(tmp_path) + try: + first = client.post("/api/dashboards", json={"label": "Overview"}).json() + second = client.post("/api/dashboards", json={"label": "Overview"}).json() + assert first["slug"] == "overview" + assert second["slug"] == "overview-2" + finally: + app.dependency_overrides.clear() + + +def test_explicit_slug_respected(tmp_path: Path): + client = _client(tmp_path) + try: + created = client.post( + "/api/dashboards", + json={"label": "My Dashboard", "slug": "custom-slug"}, + ).json() + assert created["slug"] == "custom-slug" + finally: + app.dependency_overrides.clear() + + +def test_update_nonexistent_returns_404(tmp_path: Path): + client = _client(tmp_path) + try: + resp = client.put("/api/dashboards/nope", json={"label": "X"}) + assert resp.status_code == 404 + finally: + app.dependency_overrides.clear() diff --git a/backend/tests/test_services.py b/backend/tests/test_services.py index b041762..cfbe6ce 100644 --- a/backend/tests/test_services.py +++ b/backend/tests/test_services.py @@ -57,24 +57,55 @@ def client(tmp_path): # --------------------------------------------------------------------------- -def test_registry_contains_seven_service_types(): +def test_registry_contains_eight_service_types(): assert set(SERVICE_DEFINITIONS) == { "grafana", "prometheus", "alertmanager", "jellyfin", - "jellyseerr", "nextcloud", "ssh_tasks", + "backups", + "authentik", } +def test_jellyseerr_absorbed_into_jellyfin(): + """Jellyseerr is no longer its own service type (absorbed into Jellyfin).""" + assert "jellyseerr" not in SERVICE_DEFINITIONS + jellyfin_config = get_service_definition("jellyfin").config_schema["properties"] + assert "jellyseerr_url" in jellyfin_config + assert "jellyseerr_api_key" in jellyfin_config + + +def test_backups_service_definition(): + definition = get_service_definition("backups") + assert definition is not None + assert definition.secret_fields == [] + assert {wk.kind for wk in definition.widget_kinds} == {"summary"} + schema = definition.config_schema + assert "ingestion_label" in schema["properties"] + + +def test_authentik_service_definition(): + definition = get_service_definition("authentik") + assert definition is not None + assert {sf.key for sf in definition.secret_fields} == {"api_token"} + assert definition.secret_fields[0].required is True + assert definition.widget_kinds == [] + schema = definition.config_schema + assert "base_url" in schema["properties"] + assert "timeout_seconds" in schema["properties"] + + def test_definitions_declare_widget_kinds(): assert {wk.kind for wk in get_service_definition("grafana").widget_kinds} == {"link"} assert {wk.kind for wk in get_service_definition("prometheus").widget_kinds} == {"metric"} assert {wk.kind for wk in get_service_definition("alertmanager").widget_kinds} == {"active_alerts"} assert {wk.kind for wk in get_service_definition("jellyfin").widget_kinds} == {"activity"} assert get_service_definition("nextcloud").widget_kinds == [] + assert get_service_definition("authentik").widget_kinds == [] + assert {wk.kind for wk in get_service_definition("backups").widget_kinds} == {"summary"} assert {wk.kind for wk in get_service_definition("ssh_tasks").widget_kinds} == {"task_output"} @@ -139,9 +170,10 @@ def test_list_service_types(client): types = {item["service_type"] for item in response.json()} assert types == { "alertmanager", + "authentik", + "backups", "grafana", "jellyfin", - "jellyseerr", "nextcloud", "prometheus", "ssh_tasks", @@ -265,7 +297,7 @@ def test_service_base_url_requires_http_schema(bad_url): @pytest.mark.parametrize( - "service_type", ["grafana", "prometheus", "alertmanager", "jellyfin", "jellyseerr", "nextcloud"] + "service_type", ["grafana", "prometheus", "alertmanager", "jellyfin", "authentik", "nextcloud"] ) def test_service_base_url_accepts_absolute_urls(service_type): model = get_service_definition(service_type).config_model @@ -390,3 +422,99 @@ def test_record_and_list_service_task_runs(client): assert len(runs) == 1 assert runs[0]["status"] == "success" assert runs[0]["stdout_tail"] == "ok" + + +# --------------------------------------------------------------------------- +# Jellyseerr → Jellyfin migration (Slice 1.4 / 1.5) +# --------------------------------------------------------------------------- + + +def test_jellyseerr_migrates_into_single_jellyfin(tmp_path): + """A standalone jellyseerr service merges into the only jellyfin instance.""" + store = SettingsStore(tmp_path / "settings.sqlite") + store.ensure_defaults() + + jellyfin = store.upsert_service( + { + "service_type": "jellyfin", + "name": "Main Jellyfin", + "config": {"base_url": "https://jellyfin.example.com"}, + "enabled": True, + }, + secret_values={"api_key": "jf-key"}, + ) + store.upsert_service( + { + "service_type": "jellyseerr", + "name": "Main Jellyseerr", + "config": {"base_url": "https://jellyseerr.example.com"}, + "enabled": True, + }, + secret_values={"api_key": "js-key"}, + ) + + # Run migration via ensure_defaults (idempotent entry point). + store.ensure_defaults() + + # Jellyseerr row is gone. + assert store.list_services("jellyseerr") == [] + + # Jellyfin config gained the absorbed fields. + migrated = store.get_service(jellyfin["id"]) + assert migrated["config"]["jellyseerr_url"] == "https://jellyseerr.example.com" + assert migrated["config"]["jellyseerr_api_key"] == "js-key" + + +def test_jellyseerr_dropped_when_no_jellyfin(tmp_path): + """An unpaired jellyseerr (no jellyfin) is dropped with a warning, no crash.""" + store = SettingsStore(tmp_path / "settings.sqlite") + store.ensure_defaults() + + store.upsert_service( + { + "service_type": "jellyseerr", + "name": "Orphan Jellyseerr", + "config": {"base_url": "https://jellyseerr.example.com"}, + "enabled": True, + }, + secret_values={"api_key": "js-key"}, + ) + + store.ensure_defaults() + + assert store.list_services("jellyseerr") == [] + assert store.list_services("jellyfin") == [] + + +def test_jellyseerr_migration_is_idempotent(tmp_path): + """Running ensure_defaults twice does nothing the second time.""" + store = SettingsStore(tmp_path / "settings.sqlite") + store.ensure_defaults() + + store.upsert_service( + { + "service_type": "jellyfin", + "name": "JF", + "config": {"base_url": "https://jellyfin.example.com"}, + "enabled": True, + }, + secret_values={"api_key": "k"}, + ) + store.upsert_service( + { + "service_type": "jellyseerr", + "name": "JS", + "config": {"base_url": "https://jellyseerr.example.com"}, + "enabled": True, + }, + secret_values={"api_key": "k"}, + ) + + store.ensure_defaults() + first_jellyfin = store.list_services("jellyfin")[0] + first_url = first_jellyfin["config"]["jellyseerr_url"] + + store.ensure_defaults() # second run + second_jellyfin = store.list_services("jellyfin")[0] + assert second_jellyfin["config"]["jellyseerr_url"] == first_url + assert store.list_services("jellyseerr") == [] diff --git a/frontend/src/App.tsx b/frontend/src/App.tsx index b4ef87c..b030a99 100644 --- a/frontend/src/App.tsx +++ b/frontend/src/App.tsx @@ -5,7 +5,6 @@ import { NavLink, useLocation, Outlet, - Navigate, } from "react-router-dom"; import { QueryClient, @@ -13,22 +12,22 @@ import { useQuery, } from "@tanstack/react-query"; import { useEffect, useMemo, useState } from "react"; +import type { LucideIcon } from "lucide-react"; import { AuthProvider, useAuth } from "react-oidc-context"; import { Dashboard } from "./pages/Dashboard"; -import { Applications } from "./pages/Applications"; +import { NamedDashboardPage } from "./pages/NamedDashboardPage"; import { Settings } from "./pages/Settings"; -import { UsersPage } from "./pages/Users"; -import { FileBrowser } from "./pages/FileBrowser"; -import { Actions } from "./pages/Actions"; -import BackupsPage from "./components/BackupsPage"; -import { ObservabilityPage } from "./components/ObservabilityPage"; import { ServicePage } from "./pages/ServicePage"; +import { ServiceTypePage } from "./pages/ServiceTypePage"; import { ServicesPage } from "./pages/ServicesPage"; import { getOidcConfig, isOidcConfigured, setAccessToken } from "./auth"; import { fetchAppVersion } from "./api/client"; import { FRONTEND_VERSION_LABEL } from "./version"; import { usePersistentState } from "./hooks/usePersistentState"; import { useIsMobile } from "./hooks/useIsMobile"; +import { useServiceInstances } from "./hooks/useServices"; +import { useDashboards } from "./hooks/useDashboards"; +import { configuredNavEntries } from "./integrations/navEntries"; import { Button } from "@/components/ui/button"; import { Tooltip, @@ -45,12 +44,6 @@ import { } from "@/components/ui/sheet"; import { LayoutDashboard, - Activity, - DatabaseBackup, - Monitor, - Users, - Zap, - FolderOpen, Settings as SettingsIcon, Menu, Sun, @@ -59,6 +52,7 @@ import { ChevronLeft, ChevronRight, Boxes, + LayoutTemplate, } from "lucide-react"; const queryClient = new QueryClient({ @@ -66,9 +60,6 @@ const queryClient = new QueryClient({ queries: { retry: 1, refetchOnWindowFocus: false, - // Pause interval-based refetches (widgets ~30s, queue status 5s, - // media build progress 1s) when the tab is hidden. Saves battery on - // mobile (D8 follow-up). Build progress polls resume on return. refetchIntervalInBackground: false, }, }, @@ -92,18 +83,40 @@ function useDarkMode() { return [darkMode, () => setDarkMode((prev) => !prev)] as const; } -// Navigation items for sidebar -const navItems = [ - { path: "/", label: "Dashboard", icon: LayoutDashboard }, - { path: "/observability", label: "Observability", icon: Activity }, - { path: "/media", label: "Media", icon: Monitor }, - { path: "/files", label: "Files", icon: FolderOpen }, - { path: "/backups", label: "Backups", icon: DatabaseBackup }, - { path: "/users", label: "Users", icon: Users }, - { path: "/actions", label: "Actions", icon: Zap }, - { path: "/services", label: "Services", icon: Boxes }, - { path: "/settings", label: "Settings", icon: SettingsIcon }, -]; +// Navigation items are data-driven (spec R1). Built from configured services + dashboards. +interface NavItem { + path: string; + label: string; + icon: LucideIcon; +} + +function useNavItems() { + const { data: services = [] } = useServiceInstances(); + const { data: dashboards = [] } = useDashboards(); + + return useMemoThis page doesn't exist.
+ +{detail}
-- Unified view of metrics, logs, and alerts from Prometheus, Loki, and - Alertmanager. Deep dashboards live in Grafana. -
-- Browse application-specific tools from a compact tabbed workspace. -
-+ No services configured yet. Add a Jellyfin, SSH target, Authentik, + or observability service to populate the navigation and + dashboards. +
+ ++ Add these to the dashboard from the dashboard's edit dialog. +
++ No widget kinds for this service type. +
+ ); + + const configBody = ( +- Add these to the dashboard from the dashboard's edit dialog. -
-{binding.description}
No connection config.
- ) : ( -No secret fields.
- ) : ( -No connection config.
+ ) : ( +