Compare commits
17 Commits
271261539
...
50be0b6b57
| Author | SHA1 | Date | |
|---|---|---|---|
| 50be0b6b57 | |||
| 5dfe614d15 | |||
| ec408df2a1 | |||
| f78382c019 | |||
| 9be0ec75ec | |||
| be7b899837 | |||
| d045dd0b07 | |||
| 138069590b | |||
| 8125b766c7 | |||
| d53e2917aa | |||
| d7847652db | |||
| 24ac54d606 | |||
| 62f392ad37 | |||
| e42ae8585d | |||
| 06e0797722 | |||
| 914f478178 | |||
| fb65d646f2 |
@@ -1 +1 @@
|
|||||||
271261539
|
2602261523
|
||||||
|
|||||||
53
Dockerfile
Normal file
53
Dockerfile
Normal file
@@ -0,0 +1,53 @@
|
|||||||
|
FROM node:20-slim AS frontend-builder
|
||||||
|
|
||||||
|
WORKDIR /frontend
|
||||||
|
|
||||||
|
ENV NODE_ENV=production \
|
||||||
|
BACKEND_INTERNAL_URL=http://127.0.0.1:8000 \
|
||||||
|
NEXT_PUBLIC_API_BASE=/api
|
||||||
|
|
||||||
|
COPY frontend/package.json ./
|
||||||
|
RUN npm install
|
||||||
|
|
||||||
|
COPY frontend/app ./app
|
||||||
|
COPY frontend/public ./public
|
||||||
|
COPY frontend/next-env.d.ts ./next-env.d.ts
|
||||||
|
COPY frontend/next.config.js ./next.config.js
|
||||||
|
COPY frontend/tsconfig.json ./tsconfig.json
|
||||||
|
|
||||||
|
RUN npm run build
|
||||||
|
|
||||||
|
FROM python:3.12-slim
|
||||||
|
|
||||||
|
WORKDIR /app
|
||||||
|
|
||||||
|
ENV PYTHONDONTWRITEBYTECODE=1 \
|
||||||
|
PYTHONUNBUFFERED=1 \
|
||||||
|
NODE_ENV=production
|
||||||
|
|
||||||
|
RUN apt-get update \
|
||||||
|
&& apt-get install -y --no-install-recommends curl gnupg supervisor \
|
||||||
|
&& curl -fsSL https://deb.nodesource.com/setup_20.x | bash - \
|
||||||
|
&& apt-get install -y --no-install-recommends nodejs \
|
||||||
|
&& apt-get clean \
|
||||||
|
&& rm -rf /var/lib/apt/lists/*
|
||||||
|
|
||||||
|
COPY backend/requirements.txt .
|
||||||
|
RUN pip install --no-cache-dir -r requirements.txt
|
||||||
|
|
||||||
|
COPY backend/app ./app
|
||||||
|
COPY data/branding /app/data/branding
|
||||||
|
|
||||||
|
COPY --from=frontend-builder /frontend/.next /app/frontend/.next
|
||||||
|
COPY --from=frontend-builder /frontend/public /app/frontend/public
|
||||||
|
COPY --from=frontend-builder /frontend/node_modules /app/frontend/node_modules
|
||||||
|
COPY --from=frontend-builder /frontend/package.json /app/frontend/package.json
|
||||||
|
COPY --from=frontend-builder /frontend/next.config.js /app/frontend/next.config.js
|
||||||
|
COPY --from=frontend-builder /frontend/next-env.d.ts /app/frontend/next-env.d.ts
|
||||||
|
COPY --from=frontend-builder /frontend/tsconfig.json /app/frontend/tsconfig.json
|
||||||
|
|
||||||
|
COPY docker/supervisord.conf /etc/supervisor/conf.d/magent.conf
|
||||||
|
|
||||||
|
EXPOSE 3000 8000
|
||||||
|
|
||||||
|
CMD ["/usr/bin/supervisord", "-c", "/etc/supervisor/conf.d/magent.conf"]
|
||||||
@@ -2,11 +2,8 @@ FROM python:3.12-slim
|
|||||||
|
|
||||||
WORKDIR /app
|
WORKDIR /app
|
||||||
|
|
||||||
ARG BUILD_NUMBER=dev
|
|
||||||
|
|
||||||
ENV PYTHONDONTWRITEBYTECODE=1 \
|
ENV PYTHONDONTWRITEBYTECODE=1 \
|
||||||
PYTHONUNBUFFERED=1 \
|
PYTHONUNBUFFERED=1
|
||||||
SITE_BUILD_NUMBER=${BUILD_NUMBER}
|
|
||||||
|
|
||||||
COPY backend/requirements.txt .
|
COPY backend/requirements.txt .
|
||||||
RUN pip install --no-cache-dir -r requirements.txt
|
RUN pip install --no-cache-dir -r requirements.txt
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
from typing import Dict, Any
|
from datetime import datetime, timezone
|
||||||
|
from typing import Dict, Any, Optional
|
||||||
|
|
||||||
from fastapi import Depends, HTTPException, status, Request
|
from fastapi import Depends, HTTPException, status, Request
|
||||||
from fastapi.security import OAuth2PasswordBearer
|
from fastapi.security import OAuth2PasswordBearer
|
||||||
@@ -8,6 +9,21 @@ from .security import safe_decode_token, TokenError
|
|||||||
|
|
||||||
oauth2_scheme = OAuth2PasswordBearer(tokenUrl="/auth/login")
|
oauth2_scheme = OAuth2PasswordBearer(tokenUrl="/auth/login")
|
||||||
|
|
||||||
|
|
||||||
|
def _is_expired(expires_at: str | None) -> bool:
|
||||||
|
if not isinstance(expires_at, str) or not expires_at.strip():
|
||||||
|
return False
|
||||||
|
candidate = expires_at.strip()
|
||||||
|
if candidate.endswith("Z"):
|
||||||
|
candidate = candidate[:-1] + "+00:00"
|
||||||
|
try:
|
||||||
|
parsed = datetime.fromisoformat(candidate)
|
||||||
|
except ValueError:
|
||||||
|
return False
|
||||||
|
if parsed.tzinfo is None:
|
||||||
|
parsed = parsed.replace(tzinfo=timezone.utc)
|
||||||
|
return parsed <= datetime.now(timezone.utc)
|
||||||
|
|
||||||
def _extract_client_ip(request: Request) -> str:
|
def _extract_client_ip(request: Request) -> str:
|
||||||
forwarded = request.headers.get("x-forwarded-for")
|
forwarded = request.headers.get("x-forwarded-for")
|
||||||
if forwarded:
|
if forwarded:
|
||||||
@@ -22,7 +38,7 @@ def _extract_client_ip(request: Request) -> str:
|
|||||||
return "unknown"
|
return "unknown"
|
||||||
|
|
||||||
|
|
||||||
def get_current_user(token: str = Depends(oauth2_scheme), request: Request = None) -> Dict[str, Any]:
|
def _load_current_user_from_token(token: str, request: Optional[Request] = None) -> Dict[str, Any]:
|
||||||
try:
|
try:
|
||||||
payload = safe_decode_token(token)
|
payload = safe_decode_token(token)
|
||||||
except TokenError as exc:
|
except TokenError as exc:
|
||||||
@@ -37,6 +53,8 @@ def get_current_user(token: str = Depends(oauth2_scheme), request: Request = Non
|
|||||||
raise HTTPException(status_code=status.HTTP_401_UNAUTHORIZED, detail="User not found")
|
raise HTTPException(status_code=status.HTTP_401_UNAUTHORIZED, detail="User not found")
|
||||||
if user.get("is_blocked"):
|
if user.get("is_blocked"):
|
||||||
raise HTTPException(status_code=status.HTTP_403_FORBIDDEN, detail="User is blocked")
|
raise HTTPException(status_code=status.HTTP_403_FORBIDDEN, detail="User is blocked")
|
||||||
|
if _is_expired(user.get("expires_at")):
|
||||||
|
raise HTTPException(status_code=status.HTTP_403_FORBIDDEN, detail="User access has expired")
|
||||||
|
|
||||||
if request is not None:
|
if request is not None:
|
||||||
ip = _extract_client_ip(request)
|
ip = _extract_client_ip(request)
|
||||||
@@ -47,10 +65,40 @@ def get_current_user(token: str = Depends(oauth2_scheme), request: Request = Non
|
|||||||
"username": user["username"],
|
"username": user["username"],
|
||||||
"role": user["role"],
|
"role": user["role"],
|
||||||
"auth_provider": user.get("auth_provider", "local"),
|
"auth_provider": user.get("auth_provider", "local"),
|
||||||
|
"jellyseerr_user_id": user.get("jellyseerr_user_id"),
|
||||||
|
"auto_search_enabled": bool(user.get("auto_search_enabled", True)),
|
||||||
|
"profile_id": user.get("profile_id"),
|
||||||
|
"expires_at": user.get("expires_at"),
|
||||||
|
"is_expired": bool(user.get("is_expired", False)),
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
def get_current_user(token: str = Depends(oauth2_scheme), request: Request = None) -> Dict[str, Any]:
|
||||||
|
return _load_current_user_from_token(token, request)
|
||||||
|
|
||||||
|
|
||||||
|
def get_current_user_event_stream(request: Request) -> Dict[str, Any]:
|
||||||
|
"""EventSource cannot send Authorization headers, so allow a query token here only."""
|
||||||
|
token = None
|
||||||
|
auth_header = request.headers.get("authorization", "")
|
||||||
|
if auth_header.lower().startswith("bearer "):
|
||||||
|
token = auth_header.split(" ", 1)[1].strip()
|
||||||
|
if not token:
|
||||||
|
token = request.query_params.get("access_token")
|
||||||
|
if not token:
|
||||||
|
raise HTTPException(status_code=status.HTTP_401_UNAUTHORIZED, detail="Missing token")
|
||||||
|
return _load_current_user_from_token(token, None)
|
||||||
|
|
||||||
|
|
||||||
def require_admin(user: Dict[str, Any] = Depends(get_current_user)) -> Dict[str, Any]:
|
def require_admin(user: Dict[str, Any] = Depends(get_current_user)) -> Dict[str, Any]:
|
||||||
if user.get("role") != "admin":
|
if user.get("role") != "admin":
|
||||||
raise HTTPException(status_code=status.HTTP_403_FORBIDDEN, detail="Admin access required")
|
raise HTTPException(status_code=status.HTTP_403_FORBIDDEN, detail="Admin access required")
|
||||||
return user
|
return user
|
||||||
|
|
||||||
|
|
||||||
|
def require_admin_event_stream(
|
||||||
|
user: Dict[str, Any] = Depends(get_current_user_event_stream),
|
||||||
|
) -> Dict[str, Any]:
|
||||||
|
if user.get("role") != "admin":
|
||||||
|
raise HTTPException(status_code=status.HTTP_403_FORBIDDEN, detail="Admin access required")
|
||||||
|
return user
|
||||||
|
|||||||
2
backend/app/build_info.py
Normal file
2
backend/app/build_info.py
Normal file
@@ -0,0 +1,2 @@
|
|||||||
|
BUILD_NUMBER = "2602261523"
|
||||||
|
CHANGELOG = '2026-01-22\\n- Initial commit\\n- Ignore build artifacts\\n- Update README\\n- Update README with Docker-first guide\\n\\n2026-01-23\\n- Fix cache titles via Jellyseerr media lookup\\n- Split search actions and improve download options\\n- Fallback manual grab to qBittorrent\\n- Hide header actions when signed out\\n- Add feedback form and webhook\\n- Fix cache titles and move feedback link\\n- Show available status on landing when in Jellyfin\\n- Add default branding assets when missing\\n- Use bundled branding assets\\n- Remove password fields from users page\\n- Add Docker Hub compose override\\n- Fix backend Dockerfile paths for root context\\n- Copy public assets into frontend image\\n- Use backend branding assets for logo and favicon\\n\\n2026-01-24\\n- Route grabs through Sonarr/Radarr only\\n- Document fix buttons in how-it-works\\n- Clarify how-it-works steps and fixes\\n- Map Prowlarr releases to Arr indexers for manual grab\\n- Improve request handling and qBittorrent categories\\n\\n2026-01-25\\n- Add site banner, build number, and changelog\\n- Automate build number tagging and sync\\n- Improve mobile header layout\\n- Move account actions into avatar menu\\n- Add user stats and activity tracking\\n- Add Jellyfin login cache and admin-only stats\\n- Tidy request sync controls\\n- Seed branding logo from bundled assets\\n- Serve bundled branding assets by default\\n- Harden request cache titles and cache-only reads\\n- Build 2501262041\\n\\n2026-01-26\\n- Fix cache title hydration\\n- Fix sync progress bar animation\\n\\n2026-01-27\\n- Add cache control artwork stats\\n- Improve cache stats performance (build 271261145)\\n- Fix backend cache stats import (build 271261149)\\n- Clarify request sync settings (build 271261159)\\n- Bump build number to 271261202\\n- Fix request titles in snapshots (build 271261219)\\n- Fix snapshot title fallback (build 271261228)\\n- Add cache load spinner (build 271261238)\\n- Bump build number (process 2) 271261322\\n- Add service test buttons (build 271261335)\\n- Fallback to TMDB when artwork cache fails (build 271261524)\\n- Hydrate missing artwork from Jellyseerr (build 271261539)\\n\\n2026-01-29\\n- release: 2901262036\\n- release: 2901262044\\n- release: 2901262102\\n- Hardcode build number in backend\\n- Bake build number and changelog\\n- Update full changelog\\n- Tidy full changelog\\n- Build 2901262240: cache users\n\n2026-01-30\n- Merge backend and frontend into one container'
|
||||||
@@ -30,3 +30,14 @@ class ApiClient:
|
|||||||
response = await client.post(url, headers=self.headers(), json=payload)
|
response = await client.post(url, headers=self.headers(), json=payload)
|
||||||
response.raise_for_status()
|
response.raise_for_status()
|
||||||
return response.json()
|
return response.json()
|
||||||
|
|
||||||
|
async def put(self, path: str, payload: Optional[Dict[str, Any]] = None) -> Optional[Any]:
|
||||||
|
if not self.base_url:
|
||||||
|
return None
|
||||||
|
url = f"{self.base_url}{path}"
|
||||||
|
async with httpx.AsyncClient(timeout=10.0) as client:
|
||||||
|
response = await client.put(url, headers=self.headers(), json=payload)
|
||||||
|
response.raise_for_status()
|
||||||
|
if not response.content:
|
||||||
|
return None
|
||||||
|
return response.json()
|
||||||
|
|||||||
@@ -35,3 +35,12 @@ class JellyseerrClient(ApiClient):
|
|||||||
"page": page,
|
"page": page,
|
||||||
},
|
},
|
||||||
)
|
)
|
||||||
|
|
||||||
|
async def get_users(self, take: int = 50, skip: int = 0) -> Optional[Dict[str, Any]]:
|
||||||
|
return await self.get(
|
||||||
|
"/api/v1/user",
|
||||||
|
params={
|
||||||
|
"take": take,
|
||||||
|
"skip": skip,
|
||||||
|
},
|
||||||
|
)
|
||||||
|
|||||||
@@ -9,6 +9,9 @@ class RadarrClient(ApiClient):
|
|||||||
async def get_movie_by_tmdb_id(self, tmdb_id: int) -> Optional[Dict[str, Any]]:
|
async def get_movie_by_tmdb_id(self, tmdb_id: int) -> Optional[Dict[str, Any]]:
|
||||||
return await self.get("/api/v3/movie", params={"tmdbId": tmdb_id})
|
return await self.get("/api/v3/movie", params={"tmdbId": tmdb_id})
|
||||||
|
|
||||||
|
async def get_movie(self, movie_id: int) -> Optional[Dict[str, Any]]:
|
||||||
|
return await self.get(f"/api/v3/movie/{movie_id}")
|
||||||
|
|
||||||
async def get_movies(self) -> Optional[Dict[str, Any]]:
|
async def get_movies(self) -> Optional[Dict[str, Any]]:
|
||||||
return await self.get("/api/v3/movie")
|
return await self.get("/api/v3/movie")
|
||||||
|
|
||||||
@@ -44,6 +47,9 @@ class RadarrClient(ApiClient):
|
|||||||
}
|
}
|
||||||
return await self.post("/api/v3/movie", payload=payload)
|
return await self.post("/api/v3/movie", payload=payload)
|
||||||
|
|
||||||
|
async def update_movie(self, payload: Dict[str, Any]) -> Optional[Dict[str, Any]]:
|
||||||
|
return await self.put("/api/v3/movie", payload=payload)
|
||||||
|
|
||||||
async def grab_release(self, guid: str, indexer_id: int) -> Optional[Dict[str, Any]]:
|
async def grab_release(self, guid: str, indexer_id: int) -> Optional[Dict[str, Any]]:
|
||||||
return await self.post("/api/v3/release", payload={"guid": guid, "indexerId": indexer_id})
|
return await self.post("/api/v3/release", payload={"guid": guid, "indexerId": indexer_id})
|
||||||
|
|
||||||
|
|||||||
@@ -9,6 +9,9 @@ class SonarrClient(ApiClient):
|
|||||||
async def get_series_by_tvdb_id(self, tvdb_id: int) -> Optional[Dict[str, Any]]:
|
async def get_series_by_tvdb_id(self, tvdb_id: int) -> Optional[Dict[str, Any]]:
|
||||||
return await self.get("/api/v3/series", params={"tvdbId": tvdb_id})
|
return await self.get("/api/v3/series", params={"tvdbId": tvdb_id})
|
||||||
|
|
||||||
|
async def get_series(self, series_id: int) -> Optional[Dict[str, Any]]:
|
||||||
|
return await self.get(f"/api/v3/series/{series_id}")
|
||||||
|
|
||||||
async def get_root_folders(self) -> Optional[Dict[str, Any]]:
|
async def get_root_folders(self) -> Optional[Dict[str, Any]]:
|
||||||
return await self.get("/api/v3/rootfolder")
|
return await self.get("/api/v3/rootfolder")
|
||||||
|
|
||||||
@@ -51,6 +54,9 @@ class SonarrClient(ApiClient):
|
|||||||
payload["title"] = title
|
payload["title"] = title
|
||||||
return await self.post("/api/v3/series", payload=payload)
|
return await self.post("/api/v3/series", payload=payload)
|
||||||
|
|
||||||
|
async def update_series(self, payload: Dict[str, Any]) -> Optional[Dict[str, Any]]:
|
||||||
|
return await self.put("/api/v3/series", payload=payload)
|
||||||
|
|
||||||
async def grab_release(self, guid: str, indexer_id: int) -> Optional[Dict[str, Any]]:
|
async def grab_release(self, guid: str, indexer_id: int) -> Optional[Dict[str, Any]]:
|
||||||
return await self.post("/api/v3/release", payload={"guid": guid, "indexerId": indexer_id})
|
return await self.post("/api/v3/release", payload={"guid": guid, "indexerId": indexer_id})
|
||||||
|
|
||||||
|
|||||||
@@ -2,6 +2,7 @@ from typing import Optional
|
|||||||
from pydantic import AliasChoices, Field
|
from pydantic import AliasChoices, Field
|
||||||
from pydantic_settings import BaseSettings, SettingsConfigDict
|
from pydantic_settings import BaseSettings, SettingsConfigDict
|
||||||
|
|
||||||
|
from .build_info import BUILD_NUMBER, CHANGELOG
|
||||||
|
|
||||||
class Settings(BaseSettings):
|
class Settings(BaseSettings):
|
||||||
model_config = SettingsConfigDict(env_prefix="")
|
model_config = SettingsConfigDict(env_prefix="")
|
||||||
@@ -38,9 +39,7 @@ class Settings(BaseSettings):
|
|||||||
artwork_cache_mode: str = Field(
|
artwork_cache_mode: str = Field(
|
||||||
default="remote", validation_alias=AliasChoices("ARTWORK_CACHE_MODE")
|
default="remote", validation_alias=AliasChoices("ARTWORK_CACHE_MODE")
|
||||||
)
|
)
|
||||||
site_build_number: Optional[str] = Field(
|
site_build_number: Optional[str] = Field(default=BUILD_NUMBER)
|
||||||
default=None, validation_alias=AliasChoices("SITE_BUILD_NUMBER")
|
|
||||||
)
|
|
||||||
site_banner_enabled: bool = Field(
|
site_banner_enabled: bool = Field(
|
||||||
default=False, validation_alias=AliasChoices("SITE_BANNER_ENABLED")
|
default=False, validation_alias=AliasChoices("SITE_BANNER_ENABLED")
|
||||||
)
|
)
|
||||||
@@ -50,9 +49,7 @@ class Settings(BaseSettings):
|
|||||||
site_banner_tone: str = Field(
|
site_banner_tone: str = Field(
|
||||||
default="info", validation_alias=AliasChoices("SITE_BANNER_TONE")
|
default="info", validation_alias=AliasChoices("SITE_BANNER_TONE")
|
||||||
)
|
)
|
||||||
site_changelog: Optional[str] = Field(
|
site_changelog: Optional[str] = Field(default=CHANGELOG)
|
||||||
default=None, validation_alias=AliasChoices("SITE_CHANGELOG")
|
|
||||||
)
|
|
||||||
|
|
||||||
jellyseerr_base_url: Optional[str] = Field(
|
jellyseerr_base_url: Optional[str] = Field(
|
||||||
default=None, validation_alias=AliasChoices("JELLYSEERR_URL", "JELLYSEERR_BASE_URL")
|
default=None, validation_alias=AliasChoices("JELLYSEERR_URL", "JELLYSEERR_BASE_URL")
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
@@ -4,7 +4,7 @@ from fastapi import FastAPI
|
|||||||
from fastapi.middleware.cors import CORSMiddleware
|
from fastapi.middleware.cors import CORSMiddleware
|
||||||
|
|
||||||
from .config import settings
|
from .config import settings
|
||||||
from .db import init_db, set_setting
|
from .db import init_db
|
||||||
from .routers.requests import (
|
from .routers.requests import (
|
||||||
router as requests_router,
|
router as requests_router,
|
||||||
startup_warmup_requests_cache,
|
startup_warmup_requests_cache,
|
||||||
@@ -13,12 +13,13 @@ from .routers.requests import (
|
|||||||
run_daily_db_cleanup,
|
run_daily_db_cleanup,
|
||||||
)
|
)
|
||||||
from .routers.auth import router as auth_router
|
from .routers.auth import router as auth_router
|
||||||
from .routers.admin import router as admin_router
|
from .routers.admin import router as admin_router, events_router as admin_events_router
|
||||||
from .routers.images import router as images_router
|
from .routers.images import router as images_router
|
||||||
from .routers.branding import router as branding_router
|
from .routers.branding import router as branding_router
|
||||||
from .routers.status import router as status_router
|
from .routers.status import router as status_router
|
||||||
from .routers.feedback import router as feedback_router
|
from .routers.feedback import router as feedback_router
|
||||||
from .routers.site import router as site_router
|
from .routers.site import router as site_router
|
||||||
|
from .routers.events import router as events_router
|
||||||
from .services.jellyfin_sync import run_daily_jellyfin_sync
|
from .services.jellyfin_sync import run_daily_jellyfin_sync
|
||||||
from .logging_config import configure_logging
|
from .logging_config import configure_logging
|
||||||
from .runtime import get_runtime_settings
|
from .runtime import get_runtime_settings
|
||||||
@@ -41,8 +42,6 @@ async def health() -> dict:
|
|||||||
@app.on_event("startup")
|
@app.on_event("startup")
|
||||||
async def startup() -> None:
|
async def startup() -> None:
|
||||||
init_db()
|
init_db()
|
||||||
if settings.site_build_number and settings.site_build_number.strip():
|
|
||||||
set_setting("site_build_number", settings.site_build_number.strip())
|
|
||||||
runtime = get_runtime_settings()
|
runtime = get_runtime_settings()
|
||||||
configure_logging(runtime.log_level, runtime.log_file)
|
configure_logging(runtime.log_level, runtime.log_file)
|
||||||
asyncio.create_task(run_daily_jellyfin_sync())
|
asyncio.create_task(run_daily_jellyfin_sync())
|
||||||
@@ -55,8 +54,10 @@ async def startup() -> None:
|
|||||||
app.include_router(requests_router)
|
app.include_router(requests_router)
|
||||||
app.include_router(auth_router)
|
app.include_router(auth_router)
|
||||||
app.include_router(admin_router)
|
app.include_router(admin_router)
|
||||||
|
app.include_router(admin_events_router)
|
||||||
app.include_router(images_router)
|
app.include_router(images_router)
|
||||||
app.include_router(branding_router)
|
app.include_router(branding_router)
|
||||||
app.include_router(status_router)
|
app.include_router(status_router)
|
||||||
app.include_router(feedback_router)
|
app.include_router(feedback_router)
|
||||||
app.include_router(site_router)
|
app.include_router(site_router)
|
||||||
|
app.include_router(events_router)
|
||||||
|
|||||||
@@ -1,29 +1,60 @@
|
|||||||
from typing import Any, Dict, List
|
from typing import Any, Dict, List, Optional
|
||||||
|
from datetime import datetime, timedelta, timezone
|
||||||
|
import asyncio
|
||||||
|
import ipaddress
|
||||||
|
import json
|
||||||
import os
|
import os
|
||||||
|
import secrets
|
||||||
|
import sqlite3
|
||||||
|
import string
|
||||||
|
from urllib.parse import urlparse, urlunparse
|
||||||
|
|
||||||
from fastapi import APIRouter, HTTPException, Depends, UploadFile, File
|
from fastapi import APIRouter, HTTPException, Depends, UploadFile, File, Request
|
||||||
|
from fastapi.responses import StreamingResponse
|
||||||
|
|
||||||
from ..auth import require_admin
|
from ..auth import require_admin, get_current_user, require_admin_event_stream
|
||||||
from ..config import settings as env_settings
|
from ..config import settings as env_settings
|
||||||
from ..db import (
|
from ..db import (
|
||||||
delete_setting,
|
delete_setting,
|
||||||
get_all_users,
|
get_all_users,
|
||||||
|
get_cached_requests,
|
||||||
|
get_cached_requests_count,
|
||||||
get_request_cache_overview,
|
get_request_cache_overview,
|
||||||
get_request_cache_missing_titles,
|
get_request_cache_missing_titles,
|
||||||
get_request_cache_stats,
|
get_request_cache_stats,
|
||||||
get_settings_overrides,
|
get_settings_overrides,
|
||||||
|
get_user_by_id,
|
||||||
get_user_by_username,
|
get_user_by_username,
|
||||||
|
get_user_request_stats,
|
||||||
|
create_user_if_missing,
|
||||||
|
set_user_jellyseerr_id,
|
||||||
set_setting,
|
set_setting,
|
||||||
set_user_blocked,
|
set_user_blocked,
|
||||||
|
set_user_auto_search_enabled,
|
||||||
|
set_auto_search_enabled_for_non_admin_users,
|
||||||
|
set_user_profile_id,
|
||||||
|
set_user_expires_at,
|
||||||
set_user_password,
|
set_user_password,
|
||||||
set_user_role,
|
set_user_role,
|
||||||
run_integrity_check,
|
run_integrity_check,
|
||||||
vacuum_db,
|
vacuum_db,
|
||||||
clear_requests_cache,
|
clear_requests_cache,
|
||||||
clear_history,
|
clear_history,
|
||||||
|
clear_user_objects_nuclear,
|
||||||
cleanup_history,
|
cleanup_history,
|
||||||
update_request_cache_title,
|
update_request_cache_title,
|
||||||
repair_request_cache_titles,
|
repair_request_cache_titles,
|
||||||
|
delete_non_admin_users,
|
||||||
|
list_user_profiles,
|
||||||
|
get_user_profile,
|
||||||
|
create_user_profile,
|
||||||
|
update_user_profile,
|
||||||
|
delete_user_profile,
|
||||||
|
list_signup_invites,
|
||||||
|
get_signup_invite_by_id,
|
||||||
|
create_signup_invite,
|
||||||
|
update_signup_invite,
|
||||||
|
delete_signup_invite,
|
||||||
)
|
)
|
||||||
from ..runtime import get_runtime_settings
|
from ..runtime import get_runtime_settings
|
||||||
from ..clients.sonarr import SonarrClient
|
from ..clients.sonarr import SonarrClient
|
||||||
@@ -31,12 +62,22 @@ from ..clients.radarr import RadarrClient
|
|||||||
from ..clients.jellyfin import JellyfinClient
|
from ..clients.jellyfin import JellyfinClient
|
||||||
from ..clients.jellyseerr import JellyseerrClient
|
from ..clients.jellyseerr import JellyseerrClient
|
||||||
from ..services.jellyfin_sync import sync_jellyfin_users
|
from ..services.jellyfin_sync import sync_jellyfin_users
|
||||||
|
from ..services.user_cache import (
|
||||||
|
build_jellyseerr_candidate_map,
|
||||||
|
get_cached_jellyfin_users,
|
||||||
|
get_cached_jellyseerr_users,
|
||||||
|
match_jellyseerr_user_id,
|
||||||
|
save_jellyfin_users_cache,
|
||||||
|
save_jellyseerr_users_cache,
|
||||||
|
clear_user_import_caches,
|
||||||
|
)
|
||||||
import logging
|
import logging
|
||||||
from ..logging_config import configure_logging
|
from ..logging_config import configure_logging
|
||||||
from ..routers import requests as requests_router
|
from ..routers import requests as requests_router
|
||||||
from ..routers.branding import save_branding_image
|
from ..routers.branding import save_branding_image
|
||||||
|
|
||||||
router = APIRouter(prefix="/admin", tags=["admin"], dependencies=[Depends(require_admin)])
|
router = APIRouter(prefix="/admin", tags=["admin"], dependencies=[Depends(require_admin)])
|
||||||
|
events_router = APIRouter(prefix="/admin/events", tags=["admin"])
|
||||||
logger = logging.getLogger(__name__)
|
logger = logging.getLogger(__name__)
|
||||||
|
|
||||||
SENSITIVE_KEYS = {
|
SENSITIVE_KEYS = {
|
||||||
@@ -48,6 +89,16 @@ SENSITIVE_KEYS = {
|
|||||||
"qbittorrent_password",
|
"qbittorrent_password",
|
||||||
}
|
}
|
||||||
|
|
||||||
|
URL_SETTING_KEYS = {
|
||||||
|
"jellyseerr_base_url",
|
||||||
|
"jellyfin_base_url",
|
||||||
|
"jellyfin_public_url",
|
||||||
|
"sonarr_base_url",
|
||||||
|
"radarr_base_url",
|
||||||
|
"prowlarr_base_url",
|
||||||
|
"qbittorrent_base_url",
|
||||||
|
}
|
||||||
|
|
||||||
SETTING_KEYS: List[str] = [
|
SETTING_KEYS: List[str] = [
|
||||||
"jellyseerr_base_url",
|
"jellyseerr_base_url",
|
||||||
"jellyseerr_api_key",
|
"jellyseerr_api_key",
|
||||||
@@ -80,13 +131,90 @@ SETTING_KEYS: List[str] = [
|
|||||||
"requests_cleanup_time",
|
"requests_cleanup_time",
|
||||||
"requests_cleanup_days",
|
"requests_cleanup_days",
|
||||||
"requests_data_source",
|
"requests_data_source",
|
||||||
"site_build_number",
|
|
||||||
"site_banner_enabled",
|
"site_banner_enabled",
|
||||||
"site_banner_message",
|
"site_banner_message",
|
||||||
"site_banner_tone",
|
"site_banner_tone",
|
||||||
"site_changelog",
|
|
||||||
]
|
]
|
||||||
|
|
||||||
|
|
||||||
|
def _admin_live_state_snapshot() -> Dict[str, Any]:
|
||||||
|
return {
|
||||||
|
"type": "admin_live_state",
|
||||||
|
"requestsSync": requests_router.get_requests_sync_state(),
|
||||||
|
"artworkPrefetch": requests_router.get_artwork_prefetch_state(),
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
def _sse_encode(data: Dict[str, Any]) -> str:
|
||||||
|
payload = json.dumps(data, ensure_ascii=True, separators=(",", ":"), default=str)
|
||||||
|
return f"data: {payload}\n\n"
|
||||||
|
|
||||||
|
|
||||||
|
def _read_log_tail_lines(lines: int) -> List[str]:
|
||||||
|
runtime = get_runtime_settings()
|
||||||
|
log_file = runtime.log_file
|
||||||
|
if not log_file:
|
||||||
|
raise HTTPException(status_code=400, detail="Log file not configured")
|
||||||
|
if not os.path.isabs(log_file):
|
||||||
|
log_file = os.path.join(os.getcwd(), log_file)
|
||||||
|
if not os.path.exists(log_file):
|
||||||
|
raise HTTPException(status_code=404, detail="Log file not found")
|
||||||
|
lines = max(1, min(lines, 1000))
|
||||||
|
from collections import deque
|
||||||
|
|
||||||
|
with open(log_file, "r", encoding="utf-8", errors="replace") as handle:
|
||||||
|
tail = deque(handle, maxlen=lines)
|
||||||
|
return list(tail)
|
||||||
|
|
||||||
|
def _normalize_username(value: str) -> str:
|
||||||
|
normalized = value.strip().lower()
|
||||||
|
if "@" in normalized:
|
||||||
|
normalized = normalized.split("@", 1)[0]
|
||||||
|
return normalized
|
||||||
|
|
||||||
|
|
||||||
|
def _is_ip_host(host: str) -> bool:
|
||||||
|
try:
|
||||||
|
ipaddress.ip_address(host)
|
||||||
|
return True
|
||||||
|
except ValueError:
|
||||||
|
return False
|
||||||
|
|
||||||
|
|
||||||
|
def _normalize_service_url(value: str) -> str:
|
||||||
|
raw = value.strip()
|
||||||
|
if not raw:
|
||||||
|
raise ValueError("URL cannot be empty.")
|
||||||
|
|
||||||
|
candidate = raw
|
||||||
|
if "://" not in candidate:
|
||||||
|
authority = candidate.split("/", 1)[0].strip()
|
||||||
|
if authority.startswith("["):
|
||||||
|
closing = authority.find("]")
|
||||||
|
host = authority[1:closing] if closing > 0 else authority.strip("[]")
|
||||||
|
else:
|
||||||
|
host = authority.split(":", 1)[0]
|
||||||
|
host = host.strip().lower()
|
||||||
|
default_scheme = "http" if host in {"localhost"} or _is_ip_host(host) or "." not in host else "https"
|
||||||
|
candidate = f"{default_scheme}://{candidate}"
|
||||||
|
|
||||||
|
parsed = urlparse(candidate)
|
||||||
|
if parsed.scheme not in {"http", "https"}:
|
||||||
|
raise ValueError("URL must use http:// or https://.")
|
||||||
|
if not parsed.netloc:
|
||||||
|
raise ValueError("URL must include a host.")
|
||||||
|
if parsed.query or parsed.fragment:
|
||||||
|
raise ValueError("URL must not include query params or fragments.")
|
||||||
|
if not parsed.hostname:
|
||||||
|
raise ValueError("URL must include a valid host.")
|
||||||
|
|
||||||
|
normalized_path = parsed.path.rstrip("/")
|
||||||
|
normalized = parsed._replace(path=normalized_path, params="", query="", fragment="")
|
||||||
|
result = urlunparse(normalized).rstrip("/")
|
||||||
|
if not result:
|
||||||
|
raise ValueError("URL is invalid.")
|
||||||
|
return result
|
||||||
|
|
||||||
def _normalize_root_folders(folders: Any) -> List[Dict[str, Any]]:
|
def _normalize_root_folders(folders: Any) -> List[Dict[str, Any]]:
|
||||||
if not isinstance(folders, list):
|
if not isinstance(folders, list):
|
||||||
return []
|
return []
|
||||||
@@ -149,6 +277,105 @@ def _normalize_quality_profiles(profiles: Any) -> List[Dict[str, Any]]:
|
|||||||
return results
|
return results
|
||||||
|
|
||||||
|
|
||||||
|
def _normalize_optional_text(value: Any) -> Optional[str]:
|
||||||
|
if value is None:
|
||||||
|
return None
|
||||||
|
if not isinstance(value, str):
|
||||||
|
value = str(value)
|
||||||
|
trimmed = value.strip()
|
||||||
|
return trimmed if trimmed else None
|
||||||
|
|
||||||
|
|
||||||
|
def _parse_optional_positive_int(value: Any, field_name: str) -> Optional[int]:
|
||||||
|
if value is None or value == "":
|
||||||
|
return None
|
||||||
|
try:
|
||||||
|
parsed = int(value)
|
||||||
|
except (TypeError, ValueError) as exc:
|
||||||
|
raise HTTPException(status_code=400, detail=f"{field_name} must be a number") from exc
|
||||||
|
if parsed <= 0:
|
||||||
|
raise HTTPException(status_code=400, detail=f"{field_name} must be greater than 0")
|
||||||
|
return parsed
|
||||||
|
|
||||||
|
|
||||||
|
def _parse_optional_profile_id(value: Any) -> Optional[int]:
|
||||||
|
if value is None or value == "":
|
||||||
|
return None
|
||||||
|
try:
|
||||||
|
parsed = int(value)
|
||||||
|
except (TypeError, ValueError) as exc:
|
||||||
|
raise HTTPException(status_code=400, detail="profile_id must be a number") from exc
|
||||||
|
if parsed <= 0:
|
||||||
|
raise HTTPException(status_code=400, detail="profile_id must be greater than 0")
|
||||||
|
profile = get_user_profile(parsed)
|
||||||
|
if not profile:
|
||||||
|
raise HTTPException(status_code=404, detail="Profile not found")
|
||||||
|
return parsed
|
||||||
|
|
||||||
|
|
||||||
|
def _parse_optional_expires_at(value: Any) -> Optional[str]:
|
||||||
|
if value is None or value == "":
|
||||||
|
return None
|
||||||
|
if not isinstance(value, str):
|
||||||
|
raise HTTPException(status_code=400, detail="expires_at must be an ISO datetime string")
|
||||||
|
candidate = value.strip()
|
||||||
|
if not candidate:
|
||||||
|
return None
|
||||||
|
try:
|
||||||
|
parsed = datetime.fromisoformat(candidate.replace("Z", "+00:00"))
|
||||||
|
except ValueError as exc:
|
||||||
|
raise HTTPException(status_code=400, detail="expires_at must be a valid ISO datetime") from exc
|
||||||
|
if parsed.tzinfo is None:
|
||||||
|
parsed = parsed.replace(tzinfo=timezone.utc)
|
||||||
|
return parsed.isoformat()
|
||||||
|
|
||||||
|
|
||||||
|
def _normalize_invite_code(value: Optional[str]) -> str:
|
||||||
|
raw = (value or "").strip().upper()
|
||||||
|
filtered = "".join(ch for ch in raw if ch.isalnum())
|
||||||
|
if len(filtered) < 6:
|
||||||
|
raise HTTPException(status_code=400, detail="Invite code must be at least 6 letters/numbers.")
|
||||||
|
return filtered
|
||||||
|
|
||||||
|
|
||||||
|
def _generate_invite_code(length: int = 12) -> str:
|
||||||
|
alphabet = string.ascii_uppercase + string.digits
|
||||||
|
return "".join(secrets.choice(alphabet) for _ in range(length))
|
||||||
|
|
||||||
|
|
||||||
|
def _normalize_role_or_none(value: Any) -> Optional[str]:
|
||||||
|
if value is None:
|
||||||
|
return None
|
||||||
|
if not isinstance(value, str):
|
||||||
|
value = str(value)
|
||||||
|
role = value.strip().lower()
|
||||||
|
if not role:
|
||||||
|
return None
|
||||||
|
if role not in {"user", "admin"}:
|
||||||
|
raise HTTPException(status_code=400, detail="role must be 'user' or 'admin'")
|
||||||
|
return role
|
||||||
|
|
||||||
|
|
||||||
|
def _calculate_profile_expiry(profile: Dict[str, Any]) -> Optional[str]:
|
||||||
|
expires_days = profile.get("account_expires_days")
|
||||||
|
if isinstance(expires_days, int) and expires_days > 0:
|
||||||
|
return (datetime.now(timezone.utc) + timedelta(days=expires_days)).isoformat()
|
||||||
|
return None
|
||||||
|
|
||||||
|
|
||||||
|
def _apply_profile_defaults_to_user(username: str, profile: Dict[str, Any]) -> Dict[str, Any]:
|
||||||
|
set_user_profile_id(username, int(profile["id"]))
|
||||||
|
role = profile.get("role") or "user"
|
||||||
|
if role in {"user", "admin"}:
|
||||||
|
set_user_role(username, role)
|
||||||
|
set_user_auto_search_enabled(username, bool(profile.get("auto_search_enabled", True)))
|
||||||
|
set_user_expires_at(username, _calculate_profile_expiry(profile))
|
||||||
|
refreshed = get_user_by_username(username)
|
||||||
|
if not refreshed:
|
||||||
|
raise HTTPException(status_code=404, detail="User not found")
|
||||||
|
return refreshed
|
||||||
|
|
||||||
|
|
||||||
@router.get("/settings")
|
@router.get("/settings")
|
||||||
async def list_settings() -> Dict[str, Any]:
|
async def list_settings() -> Dict[str, Any]:
|
||||||
overrides = get_settings_overrides()
|
overrides = get_settings_overrides()
|
||||||
@@ -183,7 +410,14 @@ async def update_settings(payload: Dict[str, Any]) -> Dict[str, Any]:
|
|||||||
delete_setting(key)
|
delete_setting(key)
|
||||||
updates += 1
|
updates += 1
|
||||||
continue
|
continue
|
||||||
set_setting(key, str(value))
|
value_to_store = str(value).strip() if isinstance(value, str) else str(value)
|
||||||
|
if key in URL_SETTING_KEYS and value_to_store:
|
||||||
|
try:
|
||||||
|
value_to_store = _normalize_service_url(value_to_store)
|
||||||
|
except ValueError as exc:
|
||||||
|
friendly_key = key.replace("_", " ")
|
||||||
|
raise HTTPException(status_code=400, detail=f"{friendly_key}: {exc}") from exc
|
||||||
|
set_setting(key, value_to_store)
|
||||||
updates += 1
|
updates += 1
|
||||||
if key in {"log_level", "log_file"}:
|
if key in {"log_level", "log_file"}:
|
||||||
touched_logging = True
|
touched_logging = True
|
||||||
@@ -223,6 +457,9 @@ async def radarr_options() -> Dict[str, Any]:
|
|||||||
|
|
||||||
@router.get("/jellyfin/users")
|
@router.get("/jellyfin/users")
|
||||||
async def jellyfin_users() -> Dict[str, Any]:
|
async def jellyfin_users() -> Dict[str, Any]:
|
||||||
|
cached = get_cached_jellyfin_users()
|
||||||
|
if cached is not None:
|
||||||
|
return {"users": cached}
|
||||||
runtime = get_runtime_settings()
|
runtime = get_runtime_settings()
|
||||||
client = JellyfinClient(runtime.jellyfin_base_url, runtime.jellyfin_api_key)
|
client = JellyfinClient(runtime.jellyfin_base_url, runtime.jellyfin_api_key)
|
||||||
if not client.configured():
|
if not client.configured():
|
||||||
@@ -230,18 +467,7 @@ async def jellyfin_users() -> Dict[str, Any]:
|
|||||||
users = await client.get_users()
|
users = await client.get_users()
|
||||||
if not isinstance(users, list):
|
if not isinstance(users, list):
|
||||||
return {"users": []}
|
return {"users": []}
|
||||||
results = []
|
results = save_jellyfin_users_cache(users)
|
||||||
for user in users:
|
|
||||||
if not isinstance(user, dict):
|
|
||||||
continue
|
|
||||||
results.append(
|
|
||||||
{
|
|
||||||
"id": user.get("Id"),
|
|
||||||
"name": user.get("Name"),
|
|
||||||
"hasPassword": user.get("HasPassword"),
|
|
||||||
"lastLoginDate": user.get("LastLoginDate"),
|
|
||||||
}
|
|
||||||
)
|
|
||||||
return {"users": results}
|
return {"users": results}
|
||||||
|
|
||||||
|
|
||||||
@@ -250,6 +476,106 @@ async def jellyfin_users_sync() -> Dict[str, Any]:
|
|||||||
imported = await sync_jellyfin_users()
|
imported = await sync_jellyfin_users()
|
||||||
return {"status": "ok", "imported": imported}
|
return {"status": "ok", "imported": imported}
|
||||||
|
|
||||||
|
async def _fetch_all_jellyseerr_users(
|
||||||
|
client: JellyseerrClient, use_cache: bool = True
|
||||||
|
) -> List[Dict[str, Any]]:
|
||||||
|
if use_cache:
|
||||||
|
cached = get_cached_jellyseerr_users()
|
||||||
|
if cached is not None:
|
||||||
|
return cached
|
||||||
|
users: List[Dict[str, Any]] = []
|
||||||
|
take = 100
|
||||||
|
skip = 0
|
||||||
|
while True:
|
||||||
|
payload = await client.get_users(take=take, skip=skip)
|
||||||
|
if not payload:
|
||||||
|
break
|
||||||
|
if isinstance(payload, list):
|
||||||
|
batch = payload
|
||||||
|
elif isinstance(payload, dict):
|
||||||
|
batch = payload.get("results") or payload.get("users") or payload.get("data") or payload.get("items")
|
||||||
|
else:
|
||||||
|
batch = None
|
||||||
|
if not isinstance(batch, list) or not batch:
|
||||||
|
break
|
||||||
|
users.extend([user for user in batch if isinstance(user, dict)])
|
||||||
|
if len(batch) < take:
|
||||||
|
break
|
||||||
|
skip += take
|
||||||
|
if users:
|
||||||
|
return save_jellyseerr_users_cache(users)
|
||||||
|
return users
|
||||||
|
|
||||||
|
@router.post("/jellyseerr/users/sync")
|
||||||
|
async def jellyseerr_users_sync() -> Dict[str, Any]:
|
||||||
|
runtime = get_runtime_settings()
|
||||||
|
client = JellyseerrClient(runtime.jellyseerr_base_url, runtime.jellyseerr_api_key)
|
||||||
|
if not client.configured():
|
||||||
|
raise HTTPException(status_code=400, detail="Jellyseerr not configured")
|
||||||
|
jellyseerr_users = await _fetch_all_jellyseerr_users(client, use_cache=False)
|
||||||
|
if not jellyseerr_users:
|
||||||
|
return {"status": "ok", "matched": 0, "skipped": 0, "total": 0}
|
||||||
|
|
||||||
|
candidate_to_id = build_jellyseerr_candidate_map(jellyseerr_users)
|
||||||
|
|
||||||
|
updated = 0
|
||||||
|
skipped = 0
|
||||||
|
users = get_all_users()
|
||||||
|
for user in users:
|
||||||
|
if user.get("jellyseerr_user_id") is not None:
|
||||||
|
skipped += 1
|
||||||
|
continue
|
||||||
|
username = user.get("username") or ""
|
||||||
|
matched_id = match_jellyseerr_user_id(username, candidate_to_id)
|
||||||
|
if matched_id is not None:
|
||||||
|
set_user_jellyseerr_id(username, matched_id)
|
||||||
|
updated += 1
|
||||||
|
else:
|
||||||
|
skipped += 1
|
||||||
|
|
||||||
|
return {"status": "ok", "matched": updated, "skipped": skipped, "total": len(users)}
|
||||||
|
|
||||||
|
def _pick_jellyseerr_username(user: Dict[str, Any]) -> Optional[str]:
|
||||||
|
for key in ("email", "username", "displayName", "name"):
|
||||||
|
value = user.get(key)
|
||||||
|
if isinstance(value, str) and value.strip():
|
||||||
|
return value.strip()
|
||||||
|
return None
|
||||||
|
|
||||||
|
|
||||||
|
@router.post("/jellyseerr/users/resync")
|
||||||
|
async def jellyseerr_users_resync() -> Dict[str, Any]:
|
||||||
|
runtime = get_runtime_settings()
|
||||||
|
client = JellyseerrClient(runtime.jellyseerr_base_url, runtime.jellyseerr_api_key)
|
||||||
|
if not client.configured():
|
||||||
|
raise HTTPException(status_code=400, detail="Jellyseerr not configured")
|
||||||
|
jellyseerr_users = await _fetch_all_jellyseerr_users(client, use_cache=False)
|
||||||
|
if not jellyseerr_users:
|
||||||
|
return {"status": "ok", "imported": 0, "cleared": 0}
|
||||||
|
|
||||||
|
cleared = delete_non_admin_users()
|
||||||
|
imported = 0
|
||||||
|
for user in jellyseerr_users:
|
||||||
|
user_id = user.get("id") or user.get("userId") or user.get("Id")
|
||||||
|
try:
|
||||||
|
user_id = int(user_id)
|
||||||
|
except (TypeError, ValueError):
|
||||||
|
continue
|
||||||
|
username = _pick_jellyseerr_username(user)
|
||||||
|
if not username:
|
||||||
|
continue
|
||||||
|
created = create_user_if_missing(
|
||||||
|
username,
|
||||||
|
"jellyseerr-user",
|
||||||
|
role="user",
|
||||||
|
auth_provider="jellyseerr",
|
||||||
|
jellyseerr_user_id=user_id,
|
||||||
|
)
|
||||||
|
if created:
|
||||||
|
imported += 1
|
||||||
|
else:
|
||||||
|
set_user_jellyseerr_id(username, user_id)
|
||||||
|
return {"status": "ok", "imported": imported, "cleared": cleared}
|
||||||
|
|
||||||
@router.post("/requests/sync")
|
@router.post("/requests/sync")
|
||||||
async def requests_sync() -> Dict[str, Any]:
|
async def requests_sync() -> Dict[str, Any]:
|
||||||
@@ -318,22 +644,65 @@ async def requests_sync_status() -> Dict[str, Any]:
|
|||||||
return {"status": "ok", "sync": requests_router.get_requests_sync_state()}
|
return {"status": "ok", "sync": requests_router.get_requests_sync_state()}
|
||||||
|
|
||||||
|
|
||||||
|
@events_router.get("/stream")
|
||||||
|
async def admin_events_stream(
|
||||||
|
request: Request,
|
||||||
|
include_logs: bool = False,
|
||||||
|
log_lines: int = 200,
|
||||||
|
_: Dict[str, Any] = Depends(require_admin_event_stream),
|
||||||
|
) -> StreamingResponse:
|
||||||
|
async def event_generator():
|
||||||
|
# Advise client reconnect timing once per stream.
|
||||||
|
yield "retry: 2000\n\n"
|
||||||
|
last_snapshot: Optional[str] = None
|
||||||
|
heartbeat_counter = 0
|
||||||
|
log_refresh_counter = 5 if include_logs else 0
|
||||||
|
latest_logs_payload: Optional[Dict[str, Any]] = None
|
||||||
|
while True:
|
||||||
|
if await request.is_disconnected():
|
||||||
|
break
|
||||||
|
snapshot_payload = _admin_live_state_snapshot()
|
||||||
|
if include_logs:
|
||||||
|
log_refresh_counter += 1
|
||||||
|
if log_refresh_counter >= 5:
|
||||||
|
log_refresh_counter = 0
|
||||||
|
try:
|
||||||
|
latest_logs_payload = {
|
||||||
|
"lines": _read_log_tail_lines(log_lines),
|
||||||
|
"count": max(1, min(int(log_lines or 200), 1000)),
|
||||||
|
}
|
||||||
|
except HTTPException as exc:
|
||||||
|
latest_logs_payload = {
|
||||||
|
"error": str(exc.detail) if exc.detail else "Could not read logs",
|
||||||
|
}
|
||||||
|
except Exception as exc:
|
||||||
|
latest_logs_payload = {"error": str(exc)}
|
||||||
|
snapshot_payload["logs"] = latest_logs_payload
|
||||||
|
|
||||||
|
snapshot = _sse_encode(snapshot_payload)
|
||||||
|
if snapshot != last_snapshot:
|
||||||
|
last_snapshot = snapshot
|
||||||
|
yield snapshot
|
||||||
|
heartbeat_counter = 0
|
||||||
|
else:
|
||||||
|
heartbeat_counter += 1
|
||||||
|
# Keep the stream alive through proxies even when state is unchanged.
|
||||||
|
if heartbeat_counter >= 15:
|
||||||
|
yield ": ping\n\n"
|
||||||
|
heartbeat_counter = 0
|
||||||
|
await asyncio.sleep(1.0)
|
||||||
|
|
||||||
|
headers = {
|
||||||
|
"Cache-Control": "no-cache",
|
||||||
|
"Connection": "keep-alive",
|
||||||
|
"X-Accel-Buffering": "no",
|
||||||
|
}
|
||||||
|
return StreamingResponse(event_generator(), media_type="text/event-stream", headers=headers)
|
||||||
|
|
||||||
|
|
||||||
@router.get("/logs")
|
@router.get("/logs")
|
||||||
async def read_logs(lines: int = 200) -> Dict[str, Any]:
|
async def read_logs(lines: int = 200) -> Dict[str, Any]:
|
||||||
runtime = get_runtime_settings()
|
return {"lines": _read_log_tail_lines(lines)}
|
||||||
log_file = runtime.log_file
|
|
||||||
if not log_file:
|
|
||||||
raise HTTPException(status_code=400, detail="Log file not configured")
|
|
||||||
if not os.path.isabs(log_file):
|
|
||||||
log_file = os.path.join(os.getcwd(), log_file)
|
|
||||||
if not os.path.exists(log_file):
|
|
||||||
raise HTTPException(status_code=404, detail="Log file not found")
|
|
||||||
lines = max(1, min(lines, 1000))
|
|
||||||
from collections import deque
|
|
||||||
|
|
||||||
with open(log_file, "r", encoding="utf-8", errors="replace") as handle:
|
|
||||||
tail = deque(handle, maxlen=lines)
|
|
||||||
return {"lines": list(tail)}
|
|
||||||
|
|
||||||
|
|
||||||
@router.get("/requests/cache")
|
@router.get("/requests/cache")
|
||||||
@@ -348,6 +717,40 @@ async def requests_cache(limit: int = 50) -> Dict[str, Any]:
|
|||||||
return {"rows": rows}
|
return {"rows": rows}
|
||||||
|
|
||||||
|
|
||||||
|
@router.get("/requests/all")
|
||||||
|
async def requests_all(
|
||||||
|
take: int = 50,
|
||||||
|
skip: int = 0,
|
||||||
|
days: Optional[int] = None,
|
||||||
|
user: Dict[str, str] = Depends(get_current_user),
|
||||||
|
) -> Dict[str, Any]:
|
||||||
|
if user.get("role") != "admin":
|
||||||
|
raise HTTPException(status_code=403, detail="Forbidden")
|
||||||
|
take = max(1, min(int(take or 50), 200))
|
||||||
|
skip = max(0, int(skip or 0))
|
||||||
|
since_iso = None
|
||||||
|
if days is not None and int(days) > 0:
|
||||||
|
since_iso = (datetime.now(timezone.utc) - timedelta(days=int(days))).isoformat()
|
||||||
|
rows = get_cached_requests(limit=take, offset=skip, since_iso=since_iso)
|
||||||
|
total = get_cached_requests_count(since_iso=since_iso)
|
||||||
|
results = []
|
||||||
|
for row in rows:
|
||||||
|
status = row.get("status")
|
||||||
|
results.append(
|
||||||
|
{
|
||||||
|
"id": row.get("request_id"),
|
||||||
|
"title": row.get("title"),
|
||||||
|
"year": row.get("year"),
|
||||||
|
"type": row.get("media_type"),
|
||||||
|
"status": status,
|
||||||
|
"statusLabel": requests_router._status_label(status),
|
||||||
|
"requestedBy": row.get("requested_by"),
|
||||||
|
"createdAt": row.get("created_at"),
|
||||||
|
}
|
||||||
|
)
|
||||||
|
return {"results": results, "total": total, "take": take, "skip": skip}
|
||||||
|
|
||||||
|
|
||||||
@router.post("/branding/logo")
|
@router.post("/branding/logo")
|
||||||
async def upload_branding_logo(file: UploadFile = File(...)) -> Dict[str, Any]:
|
async def upload_branding_logo(file: UploadFile = File(...)) -> Dict[str, Any]:
|
||||||
return await save_branding_image(file)
|
return await save_branding_image(file)
|
||||||
@@ -365,9 +768,23 @@ async def repair_database() -> Dict[str, Any]:
|
|||||||
async def flush_database() -> Dict[str, Any]:
|
async def flush_database() -> Dict[str, Any]:
|
||||||
cleared = clear_requests_cache()
|
cleared = clear_requests_cache()
|
||||||
history = clear_history()
|
history = clear_history()
|
||||||
|
user_objects = clear_user_objects_nuclear()
|
||||||
|
user_caches = clear_user_import_caches()
|
||||||
delete_setting("requests_sync_last_at")
|
delete_setting("requests_sync_last_at")
|
||||||
logger.warning("Database flush executed: requests_cache=%s history=%s", cleared, history)
|
logger.warning(
|
||||||
return {"status": "ok", "requestsCleared": cleared, "historyCleared": history}
|
"Database flush executed: requests_cache=%s history=%s user_objects=%s user_caches=%s",
|
||||||
|
cleared,
|
||||||
|
history,
|
||||||
|
user_objects,
|
||||||
|
user_caches,
|
||||||
|
)
|
||||||
|
return {
|
||||||
|
"status": "ok",
|
||||||
|
"requestsCleared": cleared,
|
||||||
|
"historyCleared": history,
|
||||||
|
"userObjectsCleared": user_objects,
|
||||||
|
"userCachesCleared": user_caches,
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
@router.post("/maintenance/cleanup")
|
@router.post("/maintenance/cleanup")
|
||||||
@@ -400,6 +817,36 @@ async def list_users() -> Dict[str, Any]:
|
|||||||
users = get_all_users()
|
users = get_all_users()
|
||||||
return {"users": users}
|
return {"users": users}
|
||||||
|
|
||||||
|
@router.get("/users/summary")
|
||||||
|
async def list_users_summary() -> Dict[str, Any]:
|
||||||
|
users = get_all_users()
|
||||||
|
results: list[Dict[str, Any]] = []
|
||||||
|
for user in users:
|
||||||
|
username = user.get("username") or ""
|
||||||
|
username_norm = _normalize_username(username) if username else ""
|
||||||
|
stats = get_user_request_stats(username_norm, user.get("jellyseerr_user_id"))
|
||||||
|
results.append({**user, "stats": stats})
|
||||||
|
return {"users": results}
|
||||||
|
|
||||||
|
@router.get("/users/{username}")
|
||||||
|
async def get_user_summary(username: str) -> Dict[str, Any]:
|
||||||
|
user = get_user_by_username(username)
|
||||||
|
if not user:
|
||||||
|
raise HTTPException(status_code=404, detail="User not found")
|
||||||
|
username_norm = _normalize_username(user.get("username") or "")
|
||||||
|
stats = get_user_request_stats(username_norm, user.get("jellyseerr_user_id"))
|
||||||
|
return {"user": user, "stats": stats}
|
||||||
|
|
||||||
|
|
||||||
|
@router.get("/users/id/{user_id}")
|
||||||
|
async def get_user_summary_by_id(user_id: int) -> Dict[str, Any]:
|
||||||
|
user = get_user_by_id(user_id)
|
||||||
|
if not user:
|
||||||
|
raise HTTPException(status_code=404, detail="User not found")
|
||||||
|
username_norm = _normalize_username(user.get("username") or "")
|
||||||
|
stats = get_user_request_stats(username_norm, user.get("jellyseerr_user_id"))
|
||||||
|
return {"user": user, "stats": stats}
|
||||||
|
|
||||||
|
|
||||||
@router.post("/users/{username}/block")
|
@router.post("/users/{username}/block")
|
||||||
async def block_user(username: str) -> Dict[str, Any]:
|
async def block_user(username: str) -> Dict[str, Any]:
|
||||||
@@ -422,6 +869,145 @@ async def update_user_role(username: str, payload: Dict[str, Any]) -> Dict[str,
|
|||||||
return {"status": "ok", "username": username, "role": role}
|
return {"status": "ok", "username": username, "role": role}
|
||||||
|
|
||||||
|
|
||||||
|
@router.post("/users/{username}/auto-search")
|
||||||
|
async def update_user_auto_search(username: str, payload: Dict[str, Any]) -> Dict[str, Any]:
|
||||||
|
enabled = payload.get("enabled") if isinstance(payload, dict) else None
|
||||||
|
if not isinstance(enabled, bool):
|
||||||
|
raise HTTPException(status_code=400, detail="enabled must be true or false")
|
||||||
|
user = get_user_by_username(username)
|
||||||
|
if not user:
|
||||||
|
raise HTTPException(status_code=404, detail="User not found")
|
||||||
|
set_user_auto_search_enabled(username, enabled)
|
||||||
|
return {"status": "ok", "username": username, "auto_search_enabled": enabled}
|
||||||
|
|
||||||
|
|
||||||
|
@router.post("/users/{username}/profile")
|
||||||
|
async def update_user_profile_assignment(username: str, payload: Dict[str, Any]) -> Dict[str, Any]:
|
||||||
|
user = get_user_by_username(username)
|
||||||
|
if not user:
|
||||||
|
raise HTTPException(status_code=404, detail="User not found")
|
||||||
|
if not isinstance(payload, dict):
|
||||||
|
raise HTTPException(status_code=400, detail="Invalid payload")
|
||||||
|
profile_id = payload.get("profile_id")
|
||||||
|
if profile_id in (None, ""):
|
||||||
|
set_user_profile_id(username, None)
|
||||||
|
refreshed = get_user_by_username(username)
|
||||||
|
return {"status": "ok", "user": refreshed}
|
||||||
|
try:
|
||||||
|
parsed_profile_id = int(profile_id)
|
||||||
|
except (TypeError, ValueError) as exc:
|
||||||
|
raise HTTPException(status_code=400, detail="profile_id must be a number") from exc
|
||||||
|
profile = get_user_profile(parsed_profile_id)
|
||||||
|
if not profile:
|
||||||
|
raise HTTPException(status_code=404, detail="Profile not found")
|
||||||
|
if not profile.get("is_active", True):
|
||||||
|
raise HTTPException(status_code=400, detail="Profile is disabled")
|
||||||
|
refreshed = _apply_profile_defaults_to_user(username, profile)
|
||||||
|
return {"status": "ok", "user": refreshed, "applied_profile_id": parsed_profile_id}
|
||||||
|
|
||||||
|
|
||||||
|
@router.post("/users/{username}/expiry")
|
||||||
|
async def update_user_expiry(username: str, payload: Dict[str, Any]) -> Dict[str, Any]:
|
||||||
|
user = get_user_by_username(username)
|
||||||
|
if not user:
|
||||||
|
raise HTTPException(status_code=404, detail="User not found")
|
||||||
|
if not isinstance(payload, dict):
|
||||||
|
raise HTTPException(status_code=400, detail="Invalid payload")
|
||||||
|
clear = payload.get("clear")
|
||||||
|
if clear is True:
|
||||||
|
set_user_expires_at(username, None)
|
||||||
|
refreshed = get_user_by_username(username)
|
||||||
|
return {"status": "ok", "user": refreshed}
|
||||||
|
if "days" in payload and payload.get("days") not in (None, ""):
|
||||||
|
days = _parse_optional_positive_int(payload.get("days"), "days")
|
||||||
|
expires_at = None
|
||||||
|
if days is not None:
|
||||||
|
expires_at = (datetime.now(timezone.utc) + timedelta(days=days)).isoformat()
|
||||||
|
set_user_expires_at(username, expires_at)
|
||||||
|
refreshed = get_user_by_username(username)
|
||||||
|
return {"status": "ok", "user": refreshed}
|
||||||
|
expires_at = _parse_optional_expires_at(payload.get("expires_at"))
|
||||||
|
set_user_expires_at(username, expires_at)
|
||||||
|
refreshed = get_user_by_username(username)
|
||||||
|
return {"status": "ok", "user": refreshed}
|
||||||
|
|
||||||
|
|
||||||
|
@router.post("/users/auto-search/bulk")
|
||||||
|
async def update_users_auto_search_bulk(payload: Dict[str, Any]) -> Dict[str, Any]:
|
||||||
|
enabled = payload.get("enabled") if isinstance(payload, dict) else None
|
||||||
|
if not isinstance(enabled, bool):
|
||||||
|
raise HTTPException(status_code=400, detail="enabled must be true or false")
|
||||||
|
updated = set_auto_search_enabled_for_non_admin_users(enabled)
|
||||||
|
return {
|
||||||
|
"status": "ok",
|
||||||
|
"enabled": enabled,
|
||||||
|
"updated": updated,
|
||||||
|
"scope": "non-admin-users",
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@router.post("/users/profile/bulk")
|
||||||
|
async def update_users_profile_bulk(payload: Dict[str, Any]) -> Dict[str, Any]:
|
||||||
|
if not isinstance(payload, dict):
|
||||||
|
raise HTTPException(status_code=400, detail="Invalid payload")
|
||||||
|
scope = str(payload.get("scope") or "non-admin-users").strip().lower()
|
||||||
|
if scope not in {"non-admin-users", "all-users"}:
|
||||||
|
raise HTTPException(status_code=400, detail="Invalid scope")
|
||||||
|
profile_id_value = payload.get("profile_id")
|
||||||
|
if profile_id_value in (None, ""):
|
||||||
|
users = get_all_users()
|
||||||
|
updated = 0
|
||||||
|
for user in users:
|
||||||
|
if scope == "non-admin-users" and user.get("role") == "admin":
|
||||||
|
continue
|
||||||
|
set_user_profile_id(user["username"], None)
|
||||||
|
updated += 1
|
||||||
|
return {"status": "ok", "updated": updated, "scope": scope, "profile_id": None}
|
||||||
|
try:
|
||||||
|
profile_id = int(profile_id_value)
|
||||||
|
except (TypeError, ValueError) as exc:
|
||||||
|
raise HTTPException(status_code=400, detail="profile_id must be a number") from exc
|
||||||
|
profile = get_user_profile(profile_id)
|
||||||
|
if not profile:
|
||||||
|
raise HTTPException(status_code=404, detail="Profile not found")
|
||||||
|
if not profile.get("is_active", True):
|
||||||
|
raise HTTPException(status_code=400, detail="Profile is disabled")
|
||||||
|
users = get_all_users()
|
||||||
|
updated = 0
|
||||||
|
for user in users:
|
||||||
|
if scope == "non-admin-users" and user.get("role") == "admin":
|
||||||
|
continue
|
||||||
|
_apply_profile_defaults_to_user(user["username"], profile)
|
||||||
|
updated += 1
|
||||||
|
return {"status": "ok", "updated": updated, "scope": scope, "profile_id": profile_id}
|
||||||
|
|
||||||
|
|
||||||
|
@router.post("/users/expiry/bulk")
|
||||||
|
async def update_users_expiry_bulk(payload: Dict[str, Any]) -> Dict[str, Any]:
|
||||||
|
if not isinstance(payload, dict):
|
||||||
|
raise HTTPException(status_code=400, detail="Invalid payload")
|
||||||
|
scope = str(payload.get("scope") or "non-admin-users").strip().lower()
|
||||||
|
if scope not in {"non-admin-users", "all-users"}:
|
||||||
|
raise HTTPException(status_code=400, detail="Invalid scope")
|
||||||
|
clear = payload.get("clear")
|
||||||
|
expires_at: Optional[str] = None
|
||||||
|
if clear is True:
|
||||||
|
expires_at = None
|
||||||
|
elif "days" in payload and payload.get("days") not in (None, ""):
|
||||||
|
days = _parse_optional_positive_int(payload.get("days"), "days")
|
||||||
|
expires_at = (datetime.now(timezone.utc) + timedelta(days=int(days or 0))).isoformat() if days else None
|
||||||
|
else:
|
||||||
|
expires_at = _parse_optional_expires_at(payload.get("expires_at"))
|
||||||
|
users = get_all_users()
|
||||||
|
updated = 0
|
||||||
|
for user in users:
|
||||||
|
if scope == "non-admin-users" and user.get("role") == "admin":
|
||||||
|
continue
|
||||||
|
set_user_expires_at(user["username"], expires_at)
|
||||||
|
updated += 1
|
||||||
|
return {"status": "ok", "updated": updated, "scope": scope, "expires_at": expires_at}
|
||||||
|
|
||||||
|
|
||||||
@router.post("/users/{username}/password")
|
@router.post("/users/{username}/password")
|
||||||
async def update_user_password(username: str, payload: Dict[str, Any]) -> Dict[str, Any]:
|
async def update_user_password(username: str, payload: Dict[str, Any]) -> Dict[str, Any]:
|
||||||
new_password = payload.get("password") if isinstance(payload, dict) else None
|
new_password = payload.get("password") if isinstance(payload, dict) else None
|
||||||
@@ -436,3 +1022,211 @@ async def update_user_password(username: str, payload: Dict[str, Any]) -> Dict[s
|
|||||||
)
|
)
|
||||||
set_user_password(username, new_password.strip())
|
set_user_password(username, new_password.strip())
|
||||||
return {"status": "ok", "username": username}
|
return {"status": "ok", "username": username}
|
||||||
|
|
||||||
|
|
||||||
|
@router.get("/profiles")
|
||||||
|
async def get_profiles() -> Dict[str, Any]:
|
||||||
|
profiles = list_user_profiles()
|
||||||
|
users = get_all_users()
|
||||||
|
invites = list_signup_invites()
|
||||||
|
user_counts: Dict[int, int] = {}
|
||||||
|
invite_counts: Dict[int, int] = {}
|
||||||
|
for user in users:
|
||||||
|
profile_id = user.get("profile_id")
|
||||||
|
if isinstance(profile_id, int):
|
||||||
|
user_counts[profile_id] = user_counts.get(profile_id, 0) + 1
|
||||||
|
for invite in invites:
|
||||||
|
profile_id = invite.get("profile_id")
|
||||||
|
if isinstance(profile_id, int):
|
||||||
|
invite_counts[profile_id] = invite_counts.get(profile_id, 0) + 1
|
||||||
|
enriched = []
|
||||||
|
for profile in profiles:
|
||||||
|
pid = int(profile["id"])
|
||||||
|
enriched.append(
|
||||||
|
{
|
||||||
|
**profile,
|
||||||
|
"assigned_users": user_counts.get(pid, 0),
|
||||||
|
"assigned_invites": invite_counts.get(pid, 0),
|
||||||
|
}
|
||||||
|
)
|
||||||
|
return {"profiles": enriched}
|
||||||
|
|
||||||
|
|
||||||
|
@router.post("/profiles")
|
||||||
|
async def create_profile(payload: Dict[str, Any]) -> Dict[str, Any]:
|
||||||
|
if not isinstance(payload, dict):
|
||||||
|
raise HTTPException(status_code=400, detail="Invalid payload")
|
||||||
|
name = _normalize_optional_text(payload.get("name"))
|
||||||
|
if not name:
|
||||||
|
raise HTTPException(status_code=400, detail="Profile name is required")
|
||||||
|
role = _normalize_role_or_none(payload.get("role")) or "user"
|
||||||
|
auto_search_enabled = payload.get("auto_search_enabled")
|
||||||
|
if auto_search_enabled is None:
|
||||||
|
auto_search_enabled = True
|
||||||
|
if not isinstance(auto_search_enabled, bool):
|
||||||
|
raise HTTPException(status_code=400, detail="auto_search_enabled must be true or false")
|
||||||
|
is_active = payload.get("is_active")
|
||||||
|
if is_active is None:
|
||||||
|
is_active = True
|
||||||
|
if not isinstance(is_active, bool):
|
||||||
|
raise HTTPException(status_code=400, detail="is_active must be true or false")
|
||||||
|
account_expires_days = _parse_optional_positive_int(
|
||||||
|
payload.get("account_expires_days"), "account_expires_days"
|
||||||
|
)
|
||||||
|
try:
|
||||||
|
profile = create_user_profile(
|
||||||
|
name=name,
|
||||||
|
description=_normalize_optional_text(payload.get("description")),
|
||||||
|
role=role,
|
||||||
|
auto_search_enabled=auto_search_enabled,
|
||||||
|
account_expires_days=account_expires_days,
|
||||||
|
is_active=is_active,
|
||||||
|
)
|
||||||
|
except sqlite3.IntegrityError as exc:
|
||||||
|
raise HTTPException(status_code=409, detail="A profile with that name already exists") from exc
|
||||||
|
return {"status": "ok", "profile": profile}
|
||||||
|
|
||||||
|
|
||||||
|
@router.put("/profiles/{profile_id}")
|
||||||
|
async def edit_profile(profile_id: int, payload: Dict[str, Any]) -> Dict[str, Any]:
|
||||||
|
if not isinstance(payload, dict):
|
||||||
|
raise HTTPException(status_code=400, detail="Invalid payload")
|
||||||
|
existing = get_user_profile(profile_id)
|
||||||
|
if not existing:
|
||||||
|
raise HTTPException(status_code=404, detail="Profile not found")
|
||||||
|
name = _normalize_optional_text(payload.get("name"))
|
||||||
|
if not name:
|
||||||
|
raise HTTPException(status_code=400, detail="Profile name is required")
|
||||||
|
role = _normalize_role_or_none(payload.get("role")) or "user"
|
||||||
|
auto_search_enabled = payload.get("auto_search_enabled")
|
||||||
|
if not isinstance(auto_search_enabled, bool):
|
||||||
|
raise HTTPException(status_code=400, detail="auto_search_enabled must be true or false")
|
||||||
|
is_active = payload.get("is_active")
|
||||||
|
if not isinstance(is_active, bool):
|
||||||
|
raise HTTPException(status_code=400, detail="is_active must be true or false")
|
||||||
|
account_expires_days = _parse_optional_positive_int(
|
||||||
|
payload.get("account_expires_days"), "account_expires_days"
|
||||||
|
)
|
||||||
|
try:
|
||||||
|
profile = update_user_profile(
|
||||||
|
profile_id,
|
||||||
|
name=name,
|
||||||
|
description=_normalize_optional_text(payload.get("description")),
|
||||||
|
role=role,
|
||||||
|
auto_search_enabled=auto_search_enabled,
|
||||||
|
account_expires_days=account_expires_days,
|
||||||
|
is_active=is_active,
|
||||||
|
)
|
||||||
|
except sqlite3.IntegrityError as exc:
|
||||||
|
raise HTTPException(status_code=409, detail="A profile with that name already exists") from exc
|
||||||
|
if not profile:
|
||||||
|
raise HTTPException(status_code=404, detail="Profile not found")
|
||||||
|
return {"status": "ok", "profile": profile}
|
||||||
|
|
||||||
|
|
||||||
|
@router.delete("/profiles/{profile_id}")
|
||||||
|
async def remove_profile(profile_id: int) -> Dict[str, Any]:
|
||||||
|
try:
|
||||||
|
deleted = delete_user_profile(profile_id)
|
||||||
|
except ValueError as exc:
|
||||||
|
raise HTTPException(status_code=400, detail=str(exc)) from exc
|
||||||
|
if not deleted:
|
||||||
|
raise HTTPException(status_code=404, detail="Profile not found")
|
||||||
|
return {"status": "ok", "deleted": True, "profile_id": profile_id}
|
||||||
|
|
||||||
|
|
||||||
|
@router.get("/invites")
|
||||||
|
async def get_invites() -> Dict[str, Any]:
|
||||||
|
invites = list_signup_invites()
|
||||||
|
profiles = {profile["id"]: profile for profile in list_user_profiles()}
|
||||||
|
results = []
|
||||||
|
for invite in invites:
|
||||||
|
profile = profiles.get(invite.get("profile_id"))
|
||||||
|
results.append(
|
||||||
|
{
|
||||||
|
**invite,
|
||||||
|
"profile": (
|
||||||
|
{
|
||||||
|
"id": profile.get("id"),
|
||||||
|
"name": profile.get("name"),
|
||||||
|
}
|
||||||
|
if profile
|
||||||
|
else None
|
||||||
|
),
|
||||||
|
}
|
||||||
|
)
|
||||||
|
return {"invites": results}
|
||||||
|
|
||||||
|
|
||||||
|
@router.post("/invites")
|
||||||
|
async def create_invite(payload: Dict[str, Any], current_user: Dict[str, Any] = Depends(get_current_user)) -> Dict[str, Any]:
|
||||||
|
if not isinstance(payload, dict):
|
||||||
|
raise HTTPException(status_code=400, detail="Invalid payload")
|
||||||
|
raw_code = _normalize_optional_text(payload.get("code"))
|
||||||
|
code = _normalize_invite_code(raw_code) if raw_code else _generate_invite_code()
|
||||||
|
profile_id = _parse_optional_profile_id(payload.get("profile_id"))
|
||||||
|
enabled = payload.get("enabled")
|
||||||
|
if enabled is None:
|
||||||
|
enabled = True
|
||||||
|
if not isinstance(enabled, bool):
|
||||||
|
raise HTTPException(status_code=400, detail="enabled must be true or false")
|
||||||
|
role = _normalize_role_or_none(payload.get("role"))
|
||||||
|
max_uses = _parse_optional_positive_int(payload.get("max_uses"), "max_uses")
|
||||||
|
expires_at = _parse_optional_expires_at(payload.get("expires_at"))
|
||||||
|
try:
|
||||||
|
invite = create_signup_invite(
|
||||||
|
code=code,
|
||||||
|
label=_normalize_optional_text(payload.get("label")),
|
||||||
|
description=_normalize_optional_text(payload.get("description")),
|
||||||
|
profile_id=profile_id,
|
||||||
|
role=role,
|
||||||
|
max_uses=max_uses,
|
||||||
|
enabled=enabled,
|
||||||
|
expires_at=expires_at,
|
||||||
|
created_by=current_user.get("username"),
|
||||||
|
)
|
||||||
|
except sqlite3.IntegrityError as exc:
|
||||||
|
raise HTTPException(status_code=409, detail="An invite with that code already exists") from exc
|
||||||
|
return {"status": "ok", "invite": invite}
|
||||||
|
|
||||||
|
|
||||||
|
@router.put("/invites/{invite_id}")
|
||||||
|
async def edit_invite(invite_id: int, payload: Dict[str, Any]) -> Dict[str, Any]:
|
||||||
|
if not isinstance(payload, dict):
|
||||||
|
raise HTTPException(status_code=400, detail="Invalid payload")
|
||||||
|
existing = get_signup_invite_by_id(invite_id)
|
||||||
|
if not existing:
|
||||||
|
raise HTTPException(status_code=404, detail="Invite not found")
|
||||||
|
code = _normalize_invite_code(_normalize_optional_text(payload.get("code")) or existing["code"])
|
||||||
|
profile_id = _parse_optional_profile_id(payload.get("profile_id"))
|
||||||
|
enabled = payload.get("enabled")
|
||||||
|
if not isinstance(enabled, bool):
|
||||||
|
raise HTTPException(status_code=400, detail="enabled must be true or false")
|
||||||
|
role = _normalize_role_or_none(payload.get("role"))
|
||||||
|
max_uses = _parse_optional_positive_int(payload.get("max_uses"), "max_uses")
|
||||||
|
expires_at = _parse_optional_expires_at(payload.get("expires_at"))
|
||||||
|
try:
|
||||||
|
invite = update_signup_invite(
|
||||||
|
invite_id,
|
||||||
|
code=code,
|
||||||
|
label=_normalize_optional_text(payload.get("label")),
|
||||||
|
description=_normalize_optional_text(payload.get("description")),
|
||||||
|
profile_id=profile_id,
|
||||||
|
role=role,
|
||||||
|
max_uses=max_uses,
|
||||||
|
enabled=enabled,
|
||||||
|
expires_at=expires_at,
|
||||||
|
)
|
||||||
|
except sqlite3.IntegrityError as exc:
|
||||||
|
raise HTTPException(status_code=409, detail="An invite with that code already exists") from exc
|
||||||
|
if not invite:
|
||||||
|
raise HTTPException(status_code=404, detail="Invite not found")
|
||||||
|
return {"status": "ok", "invite": invite}
|
||||||
|
|
||||||
|
|
||||||
|
@router.delete("/invites/{invite_id}")
|
||||||
|
async def remove_invite(invite_id: int) -> Dict[str, Any]:
|
||||||
|
deleted = delete_signup_invite(invite_id)
|
||||||
|
if not deleted:
|
||||||
|
raise HTTPException(status_code=404, detail="Invite not found")
|
||||||
|
return {"status": "ok", "deleted": True, "invite_id": invite_id}
|
||||||
|
|||||||
@@ -5,11 +5,16 @@ from fastapi.security import OAuth2PasswordRequestForm
|
|||||||
|
|
||||||
from ..db import (
|
from ..db import (
|
||||||
verify_user_password,
|
verify_user_password,
|
||||||
|
create_user,
|
||||||
create_user_if_missing,
|
create_user_if_missing,
|
||||||
set_last_login,
|
set_last_login,
|
||||||
get_user_by_username,
|
get_user_by_username,
|
||||||
set_user_password,
|
set_user_password,
|
||||||
set_jellyfin_auth_cache,
|
set_jellyfin_auth_cache,
|
||||||
|
set_user_jellyseerr_id,
|
||||||
|
get_signup_invite_by_code,
|
||||||
|
increment_signup_invite_use,
|
||||||
|
get_user_profile,
|
||||||
get_user_activity,
|
get_user_activity,
|
||||||
get_user_activity_summary,
|
get_user_activity_summary,
|
||||||
get_user_request_stats,
|
get_user_request_stats,
|
||||||
@@ -21,12 +26,21 @@ from ..clients.jellyfin import JellyfinClient
|
|||||||
from ..clients.jellyseerr import JellyseerrClient
|
from ..clients.jellyseerr import JellyseerrClient
|
||||||
from ..security import create_access_token, verify_password
|
from ..security import create_access_token, verify_password
|
||||||
from ..auth import get_current_user
|
from ..auth import get_current_user
|
||||||
|
from ..services.user_cache import (
|
||||||
|
build_jellyseerr_candidate_map,
|
||||||
|
get_cached_jellyseerr_users,
|
||||||
|
match_jellyseerr_user_id,
|
||||||
|
save_jellyfin_users_cache,
|
||||||
|
)
|
||||||
|
|
||||||
router = APIRouter(prefix="/auth", tags=["auth"])
|
router = APIRouter(prefix="/auth", tags=["auth"])
|
||||||
|
|
||||||
|
|
||||||
def _normalize_username(value: str) -> str:
|
def _normalize_username(value: str) -> str:
|
||||||
return value.strip().lower()
|
normalized = value.strip().lower()
|
||||||
|
if "@" in normalized:
|
||||||
|
normalized = normalized.split("@", 1)[0]
|
||||||
|
return normalized
|
||||||
|
|
||||||
|
|
||||||
def _is_recent_jellyfin_auth(last_auth_at: str) -> bool:
|
def _is_recent_jellyfin_auth(last_auth_at: str) -> bool:
|
||||||
@@ -53,14 +67,77 @@ def _has_valid_jellyfin_cache(user: dict, password: str) -> bool:
|
|||||||
return False
|
return False
|
||||||
return _is_recent_jellyfin_auth(last_auth_at)
|
return _is_recent_jellyfin_auth(last_auth_at)
|
||||||
|
|
||||||
|
def _extract_jellyseerr_user_id(response: dict) -> int | None:
|
||||||
|
if not isinstance(response, dict):
|
||||||
|
return None
|
||||||
|
candidate = response
|
||||||
|
if isinstance(response.get("user"), dict):
|
||||||
|
candidate = response.get("user")
|
||||||
|
for key in ("id", "userId", "Id"):
|
||||||
|
value = candidate.get(key) if isinstance(candidate, dict) else None
|
||||||
|
if value is None:
|
||||||
|
continue
|
||||||
|
try:
|
||||||
|
return int(value)
|
||||||
|
except (TypeError, ValueError):
|
||||||
|
continue
|
||||||
|
return None
|
||||||
|
|
||||||
|
|
||||||
|
def _is_user_expired(user: dict | None) -> bool:
|
||||||
|
if not user:
|
||||||
|
return False
|
||||||
|
expires_at = user.get("expires_at")
|
||||||
|
if not expires_at:
|
||||||
|
return False
|
||||||
|
try:
|
||||||
|
parsed = datetime.fromisoformat(str(expires_at).replace("Z", "+00:00"))
|
||||||
|
except ValueError:
|
||||||
|
return False
|
||||||
|
if parsed.tzinfo is None:
|
||||||
|
parsed = parsed.replace(tzinfo=timezone.utc)
|
||||||
|
return parsed <= datetime.now(timezone.utc)
|
||||||
|
|
||||||
|
|
||||||
|
def _assert_user_can_login(user: dict | None) -> None:
|
||||||
|
if not user:
|
||||||
|
return
|
||||||
|
if user.get("is_blocked"):
|
||||||
|
raise HTTPException(status_code=status.HTTP_403_FORBIDDEN, detail="User is blocked")
|
||||||
|
if _is_user_expired(user):
|
||||||
|
raise HTTPException(status_code=status.HTTP_403_FORBIDDEN, detail="User access has expired")
|
||||||
|
|
||||||
|
|
||||||
|
def _public_invite_payload(invite: dict, profile: dict | None = None) -> dict:
|
||||||
|
return {
|
||||||
|
"code": invite.get("code"),
|
||||||
|
"label": invite.get("label"),
|
||||||
|
"description": invite.get("description"),
|
||||||
|
"enabled": bool(invite.get("enabled")),
|
||||||
|
"expires_at": invite.get("expires_at"),
|
||||||
|
"max_uses": invite.get("max_uses"),
|
||||||
|
"use_count": invite.get("use_count", 0),
|
||||||
|
"remaining_uses": invite.get("remaining_uses"),
|
||||||
|
"is_expired": bool(invite.get("is_expired")),
|
||||||
|
"is_usable": bool(invite.get("is_usable")),
|
||||||
|
"profile": (
|
||||||
|
{
|
||||||
|
"id": profile.get("id"),
|
||||||
|
"name": profile.get("name"),
|
||||||
|
"description": profile.get("description"),
|
||||||
|
}
|
||||||
|
if profile
|
||||||
|
else None
|
||||||
|
),
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
@router.post("/login")
|
@router.post("/login")
|
||||||
async def login(form_data: OAuth2PasswordRequestForm = Depends()) -> dict:
|
async def login(form_data: OAuth2PasswordRequestForm = Depends()) -> dict:
|
||||||
user = verify_user_password(form_data.username, form_data.password)
|
user = verify_user_password(form_data.username, form_data.password)
|
||||||
if not user:
|
if not user:
|
||||||
raise HTTPException(status_code=status.HTTP_401_UNAUTHORIZED, detail="Invalid credentials")
|
raise HTTPException(status_code=status.HTTP_401_UNAUTHORIZED, detail="Invalid credentials")
|
||||||
if user.get("is_blocked"):
|
_assert_user_can_login(user)
|
||||||
raise HTTPException(status_code=status.HTTP_403_FORBIDDEN, detail="User is blocked")
|
|
||||||
token = create_access_token(user["username"], user["role"])
|
token = create_access_token(user["username"], user["role"])
|
||||||
set_last_login(user["username"])
|
set_last_login(user["username"])
|
||||||
return {
|
return {
|
||||||
@@ -76,11 +153,12 @@ async def jellyfin_login(form_data: OAuth2PasswordRequestForm = Depends()) -> di
|
|||||||
client = JellyfinClient(runtime.jellyfin_base_url, runtime.jellyfin_api_key)
|
client = JellyfinClient(runtime.jellyfin_base_url, runtime.jellyfin_api_key)
|
||||||
if not client.configured():
|
if not client.configured():
|
||||||
raise HTTPException(status_code=status.HTTP_400_BAD_REQUEST, detail="Jellyfin not configured")
|
raise HTTPException(status_code=status.HTTP_400_BAD_REQUEST, detail="Jellyfin not configured")
|
||||||
|
jellyseerr_users = get_cached_jellyseerr_users()
|
||||||
|
candidate_map = build_jellyseerr_candidate_map(jellyseerr_users or [])
|
||||||
username = form_data.username
|
username = form_data.username
|
||||||
password = form_data.password
|
password = form_data.password
|
||||||
user = get_user_by_username(username)
|
user = get_user_by_username(username)
|
||||||
if user and user.get("is_blocked"):
|
_assert_user_can_login(user)
|
||||||
raise HTTPException(status_code=status.HTTP_403_FORBIDDEN, detail="User is blocked")
|
|
||||||
if user and _has_valid_jellyfin_cache(user, password):
|
if user and _has_valid_jellyfin_cache(user, password):
|
||||||
token = create_access_token(username, "user")
|
token = create_access_token(username, "user")
|
||||||
set_last_login(username)
|
set_last_login(username)
|
||||||
@@ -93,20 +171,24 @@ async def jellyfin_login(form_data: OAuth2PasswordRequestForm = Depends()) -> di
|
|||||||
raise HTTPException(status_code=status.HTTP_401_UNAUTHORIZED, detail="Invalid Jellyfin credentials")
|
raise HTTPException(status_code=status.HTTP_401_UNAUTHORIZED, detail="Invalid Jellyfin credentials")
|
||||||
create_user_if_missing(username, "jellyfin-user", role="user", auth_provider="jellyfin")
|
create_user_if_missing(username, "jellyfin-user", role="user", auth_provider="jellyfin")
|
||||||
user = get_user_by_username(username)
|
user = get_user_by_username(username)
|
||||||
if user and user.get("is_blocked"):
|
_assert_user_can_login(user)
|
||||||
raise HTTPException(status_code=status.HTTP_403_FORBIDDEN, detail="User is blocked")
|
|
||||||
try:
|
try:
|
||||||
users = await client.get_users()
|
users = await client.get_users()
|
||||||
if isinstance(users, list):
|
if isinstance(users, list):
|
||||||
for user in users:
|
save_jellyfin_users_cache(users)
|
||||||
if not isinstance(user, dict):
|
for jellyfin_user in users:
|
||||||
|
if not isinstance(jellyfin_user, dict):
|
||||||
continue
|
continue
|
||||||
name = user.get("Name")
|
name = jellyfin_user.get("Name")
|
||||||
if isinstance(name, str) and name:
|
if isinstance(name, str) and name:
|
||||||
create_user_if_missing(name, "jellyfin-user", role="user", auth_provider="jellyfin")
|
create_user_if_missing(name, "jellyfin-user", role="user", auth_provider="jellyfin")
|
||||||
except Exception:
|
except Exception:
|
||||||
pass
|
pass
|
||||||
set_jellyfin_auth_cache(username, password)
|
set_jellyfin_auth_cache(username, password)
|
||||||
|
if user and user.get("jellyseerr_user_id") is None and candidate_map:
|
||||||
|
matched_id = match_jellyseerr_user_id(username, candidate_map)
|
||||||
|
if matched_id is not None:
|
||||||
|
set_user_jellyseerr_id(username, matched_id)
|
||||||
token = create_access_token(username, "user")
|
token = create_access_token(username, "user")
|
||||||
set_last_login(username)
|
set_last_login(username)
|
||||||
return {"access_token": token, "token_type": "bearer", "user": {"username": username, "role": "user"}}
|
return {"access_token": token, "token_type": "bearer", "user": {"username": username, "role": "user"}}
|
||||||
@@ -125,10 +207,18 @@ async def jellyseerr_login(form_data: OAuth2PasswordRequestForm = Depends()) ->
|
|||||||
raise HTTPException(status_code=status.HTTP_502_BAD_GATEWAY, detail=str(exc)) from exc
|
raise HTTPException(status_code=status.HTTP_502_BAD_GATEWAY, detail=str(exc)) from exc
|
||||||
if not isinstance(response, dict):
|
if not isinstance(response, dict):
|
||||||
raise HTTPException(status_code=status.HTTP_401_UNAUTHORIZED, detail="Invalid Jellyseerr credentials")
|
raise HTTPException(status_code=status.HTTP_401_UNAUTHORIZED, detail="Invalid Jellyseerr credentials")
|
||||||
create_user_if_missing(form_data.username, "jellyseerr-user", role="user", auth_provider="jellyseerr")
|
jellyseerr_user_id = _extract_jellyseerr_user_id(response)
|
||||||
|
create_user_if_missing(
|
||||||
|
form_data.username,
|
||||||
|
"jellyseerr-user",
|
||||||
|
role="user",
|
||||||
|
auth_provider="jellyseerr",
|
||||||
|
jellyseerr_user_id=jellyseerr_user_id,
|
||||||
|
)
|
||||||
user = get_user_by_username(form_data.username)
|
user = get_user_by_username(form_data.username)
|
||||||
if user and user.get("is_blocked"):
|
_assert_user_can_login(user)
|
||||||
raise HTTPException(status_code=status.HTTP_403_FORBIDDEN, detail="User is blocked")
|
if jellyseerr_user_id is not None:
|
||||||
|
set_user_jellyseerr_id(form_data.username, jellyseerr_user_id)
|
||||||
token = create_access_token(form_data.username, "user")
|
token = create_access_token(form_data.username, "user")
|
||||||
set_last_login(form_data.username)
|
set_last_login(form_data.username)
|
||||||
return {"access_token": token, "token_type": "bearer", "user": {"username": form_data.username, "role": "user"}}
|
return {"access_token": token, "token_type": "bearer", "user": {"username": form_data.username, "role": "user"}}
|
||||||
@@ -139,11 +229,112 @@ async def me(current_user: dict = Depends(get_current_user)) -> dict:
|
|||||||
return current_user
|
return current_user
|
||||||
|
|
||||||
|
|
||||||
|
@router.get("/invites/{code}")
|
||||||
|
async def invite_details(code: str) -> dict:
|
||||||
|
invite = get_signup_invite_by_code(code.strip())
|
||||||
|
if not invite:
|
||||||
|
raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="Invite not found")
|
||||||
|
profile = None
|
||||||
|
profile_id = invite.get("profile_id")
|
||||||
|
if profile_id is not None:
|
||||||
|
profile = get_user_profile(int(profile_id))
|
||||||
|
if profile and not profile.get("is_active", True):
|
||||||
|
invite = {**invite, "is_usable": False}
|
||||||
|
return {"invite": _public_invite_payload(invite, profile)}
|
||||||
|
|
||||||
|
|
||||||
|
@router.post("/signup")
|
||||||
|
async def signup(payload: dict) -> dict:
|
||||||
|
if not isinstance(payload, dict):
|
||||||
|
raise HTTPException(status_code=status.HTTP_400_BAD_REQUEST, detail="Invalid payload")
|
||||||
|
invite_code = str(payload.get("invite_code") or "").strip()
|
||||||
|
username = str(payload.get("username") or "").strip()
|
||||||
|
password = str(payload.get("password") or "")
|
||||||
|
if not invite_code:
|
||||||
|
raise HTTPException(status_code=status.HTTP_400_BAD_REQUEST, detail="Invite code is required")
|
||||||
|
if not username:
|
||||||
|
raise HTTPException(status_code=status.HTTP_400_BAD_REQUEST, detail="Username is required")
|
||||||
|
if len(password.strip()) < 8:
|
||||||
|
raise HTTPException(
|
||||||
|
status_code=status.HTTP_400_BAD_REQUEST,
|
||||||
|
detail="Password must be at least 8 characters.",
|
||||||
|
)
|
||||||
|
if get_user_by_username(username):
|
||||||
|
raise HTTPException(status_code=status.HTTP_409_CONFLICT, detail="User already exists")
|
||||||
|
|
||||||
|
invite = get_signup_invite_by_code(invite_code)
|
||||||
|
if not invite:
|
||||||
|
raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="Invite not found")
|
||||||
|
if not invite.get("enabled"):
|
||||||
|
raise HTTPException(status_code=status.HTTP_403_FORBIDDEN, detail="Invite is disabled")
|
||||||
|
if invite.get("is_expired"):
|
||||||
|
raise HTTPException(status_code=status.HTTP_403_FORBIDDEN, detail="Invite has expired")
|
||||||
|
remaining_uses = invite.get("remaining_uses")
|
||||||
|
if remaining_uses is not None and int(remaining_uses) <= 0:
|
||||||
|
raise HTTPException(status_code=status.HTTP_403_FORBIDDEN, detail="Invite has no remaining uses")
|
||||||
|
|
||||||
|
profile = None
|
||||||
|
profile_id = invite.get("profile_id")
|
||||||
|
if profile_id is not None:
|
||||||
|
profile = get_user_profile(int(profile_id))
|
||||||
|
if not profile:
|
||||||
|
raise HTTPException(status_code=status.HTTP_400_BAD_REQUEST, detail="Invite profile not found")
|
||||||
|
if not profile.get("is_active", True):
|
||||||
|
raise HTTPException(status_code=status.HTTP_403_FORBIDDEN, detail="Invite profile is disabled")
|
||||||
|
|
||||||
|
invite_role = invite.get("role")
|
||||||
|
profile_role = profile.get("role") if profile else None
|
||||||
|
role = invite_role if invite_role in {"user", "admin"} else profile_role
|
||||||
|
if role not in {"user", "admin"}:
|
||||||
|
role = "user"
|
||||||
|
|
||||||
|
auto_search_enabled = (
|
||||||
|
bool(profile.get("auto_search_enabled", True))
|
||||||
|
if profile is not None
|
||||||
|
else True
|
||||||
|
)
|
||||||
|
|
||||||
|
expires_at = None
|
||||||
|
account_expires_days = profile.get("account_expires_days") if profile else None
|
||||||
|
if isinstance(account_expires_days, int) and account_expires_days > 0:
|
||||||
|
expires_at = (datetime.now(timezone.utc) + timedelta(days=account_expires_days)).isoformat()
|
||||||
|
|
||||||
|
try:
|
||||||
|
create_user(
|
||||||
|
username,
|
||||||
|
password.strip(),
|
||||||
|
role=role,
|
||||||
|
auth_provider="local",
|
||||||
|
auto_search_enabled=auto_search_enabled,
|
||||||
|
profile_id=int(profile_id) if profile_id is not None else None,
|
||||||
|
expires_at=expires_at,
|
||||||
|
invited_by_code=invite.get("code"),
|
||||||
|
)
|
||||||
|
except Exception as exc:
|
||||||
|
raise HTTPException(status_code=status.HTTP_400_BAD_REQUEST, detail=str(exc)) from exc
|
||||||
|
|
||||||
|
increment_signup_invite_use(int(invite["id"]))
|
||||||
|
created_user = get_user_by_username(username)
|
||||||
|
_assert_user_can_login(created_user)
|
||||||
|
token = create_access_token(username, role)
|
||||||
|
set_last_login(username)
|
||||||
|
return {
|
||||||
|
"access_token": token,
|
||||||
|
"token_type": "bearer",
|
||||||
|
"user": {
|
||||||
|
"username": username,
|
||||||
|
"role": role,
|
||||||
|
"profile_id": created_user.get("profile_id") if created_user else None,
|
||||||
|
"expires_at": created_user.get("expires_at") if created_user else None,
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
@router.get("/profile")
|
@router.get("/profile")
|
||||||
async def profile(current_user: dict = Depends(get_current_user)) -> dict:
|
async def profile(current_user: dict = Depends(get_current_user)) -> dict:
|
||||||
username = current_user.get("username") or ""
|
username = current_user.get("username") or ""
|
||||||
username_norm = _normalize_username(username) if username else ""
|
username_norm = _normalize_username(username) if username else ""
|
||||||
stats = get_user_request_stats(username_norm)
|
stats = get_user_request_stats(username_norm, current_user.get("jellyseerr_user_id"))
|
||||||
global_total = get_global_request_total()
|
global_total = get_global_request_total()
|
||||||
share = (stats.get("total", 0) / global_total) if global_total else 0
|
share = (stats.get("total", 0) / global_total) if global_total else 0
|
||||||
activity_summary = get_user_activity_summary(username) if username else {}
|
activity_summary = get_user_activity_summary(username) if username else {}
|
||||||
|
|||||||
112
backend/app/routers/events.py
Normal file
112
backend/app/routers/events.py
Normal file
@@ -0,0 +1,112 @@
|
|||||||
|
from __future__ import annotations
|
||||||
|
|
||||||
|
import asyncio
|
||||||
|
import json
|
||||||
|
import time
|
||||||
|
from datetime import datetime, timezone
|
||||||
|
from typing import Any, Dict, Optional
|
||||||
|
|
||||||
|
from fastapi import APIRouter, Depends, Request
|
||||||
|
from fastapi.responses import StreamingResponse
|
||||||
|
|
||||||
|
from ..auth import get_current_user_event_stream
|
||||||
|
from . import requests as requests_router
|
||||||
|
from .status import services_status
|
||||||
|
|
||||||
|
router = APIRouter(prefix="/events", tags=["events"])
|
||||||
|
|
||||||
|
|
||||||
|
def _sse_json(payload: Dict[str, Any]) -> str:
|
||||||
|
return f"data: {json.dumps(payload, ensure_ascii=True, separators=(',', ':'), default=str)}\n\n"
|
||||||
|
|
||||||
|
|
||||||
|
@router.get("/stream")
|
||||||
|
async def events_stream(
|
||||||
|
request: Request,
|
||||||
|
recent_days: int = 90,
|
||||||
|
user: Dict[str, Any] = Depends(get_current_user_event_stream),
|
||||||
|
) -> StreamingResponse:
|
||||||
|
recent_days = max(0, min(int(recent_days or 90), 3650))
|
||||||
|
recent_take = 50 if user.get("role") == "admin" else 6
|
||||||
|
|
||||||
|
async def event_generator():
|
||||||
|
yield "retry: 2000\n\n"
|
||||||
|
last_recent_signature: Optional[str] = None
|
||||||
|
last_services_signature: Optional[str] = None
|
||||||
|
next_recent_at = 0.0
|
||||||
|
next_services_at = 0.0
|
||||||
|
heartbeat_counter = 0
|
||||||
|
|
||||||
|
while True:
|
||||||
|
if await request.is_disconnected():
|
||||||
|
break
|
||||||
|
|
||||||
|
now = time.monotonic()
|
||||||
|
sent_any = False
|
||||||
|
|
||||||
|
if now >= next_recent_at:
|
||||||
|
next_recent_at = now + 15.0
|
||||||
|
try:
|
||||||
|
recent_payload = await requests_router.recent_requests(
|
||||||
|
take=recent_take,
|
||||||
|
skip=0,
|
||||||
|
days=recent_days,
|
||||||
|
user=user,
|
||||||
|
)
|
||||||
|
results = recent_payload.get("results") if isinstance(recent_payload, dict) else []
|
||||||
|
payload = {
|
||||||
|
"type": "home_recent",
|
||||||
|
"ts": datetime.now(timezone.utc).isoformat(),
|
||||||
|
"days": recent_days,
|
||||||
|
"results": results if isinstance(results, list) else [],
|
||||||
|
}
|
||||||
|
except Exception as exc:
|
||||||
|
payload = {
|
||||||
|
"type": "home_recent",
|
||||||
|
"ts": datetime.now(timezone.utc).isoformat(),
|
||||||
|
"days": recent_days,
|
||||||
|
"error": str(exc),
|
||||||
|
}
|
||||||
|
signature = json.dumps(payload, ensure_ascii=True, separators=(",", ":"), default=str)
|
||||||
|
if signature != last_recent_signature:
|
||||||
|
last_recent_signature = signature
|
||||||
|
yield _sse_json(payload)
|
||||||
|
sent_any = True
|
||||||
|
|
||||||
|
if now >= next_services_at:
|
||||||
|
next_services_at = now + 30.0
|
||||||
|
try:
|
||||||
|
status_payload = await services_status()
|
||||||
|
payload = {
|
||||||
|
"type": "home_services",
|
||||||
|
"ts": datetime.now(timezone.utc).isoformat(),
|
||||||
|
"status": status_payload,
|
||||||
|
}
|
||||||
|
except Exception as exc:
|
||||||
|
payload = {
|
||||||
|
"type": "home_services",
|
||||||
|
"ts": datetime.now(timezone.utc).isoformat(),
|
||||||
|
"error": str(exc),
|
||||||
|
}
|
||||||
|
signature = json.dumps(payload, ensure_ascii=True, separators=(",", ":"), default=str)
|
||||||
|
if signature != last_services_signature:
|
||||||
|
last_services_signature = signature
|
||||||
|
yield _sse_json(payload)
|
||||||
|
sent_any = True
|
||||||
|
|
||||||
|
if sent_any:
|
||||||
|
heartbeat_counter = 0
|
||||||
|
else:
|
||||||
|
heartbeat_counter += 1
|
||||||
|
if heartbeat_counter >= 15:
|
||||||
|
yield ": ping\n\n"
|
||||||
|
heartbeat_counter = 0
|
||||||
|
|
||||||
|
await asyncio.sleep(1.0)
|
||||||
|
|
||||||
|
headers = {
|
||||||
|
"Cache-Control": "no-cache",
|
||||||
|
"Connection": "keep-alive",
|
||||||
|
"X-Accel-Buffering": "no",
|
||||||
|
}
|
||||||
|
return StreamingResponse(event_generator(), media_type="text/event-stream", headers=headers)
|
||||||
@@ -113,9 +113,34 @@ def _normalize_username(value: Any) -> Optional[str]:
|
|||||||
if not isinstance(value, str):
|
if not isinstance(value, str):
|
||||||
return None
|
return None
|
||||||
normalized = value.strip().lower()
|
normalized = value.strip().lower()
|
||||||
|
if not normalized:
|
||||||
|
return None
|
||||||
|
if "@" in normalized:
|
||||||
|
normalized = normalized.split("@", 1)[0]
|
||||||
return normalized if normalized else None
|
return normalized if normalized else None
|
||||||
|
|
||||||
|
|
||||||
|
def _user_can_use_search_auto(user: Dict[str, Any]) -> bool:
|
||||||
|
if user.get("role") == "admin":
|
||||||
|
return True
|
||||||
|
return bool(user.get("auto_search_enabled", True))
|
||||||
|
|
||||||
|
|
||||||
|
def _filter_snapshot_actions_for_user(snapshot: Snapshot, user: Dict[str, Any]) -> Snapshot:
|
||||||
|
if _user_can_use_search_auto(user):
|
||||||
|
return snapshot
|
||||||
|
snapshot.actions = [action for action in snapshot.actions if action.id != "search_auto"]
|
||||||
|
return snapshot
|
||||||
|
|
||||||
|
|
||||||
|
def _quality_profile_id(value: Any) -> Optional[int]:
|
||||||
|
if isinstance(value, int):
|
||||||
|
return value
|
||||||
|
if isinstance(value, str) and value.strip().isdigit():
|
||||||
|
return int(value.strip())
|
||||||
|
return None
|
||||||
|
|
||||||
|
|
||||||
def _request_matches_user(request_data: Any, username: str) -> bool:
|
def _request_matches_user(request_data: Any, username: str) -> bool:
|
||||||
requested_by = None
|
requested_by = None
|
||||||
if isinstance(request_data, dict):
|
if isinstance(request_data, dict):
|
||||||
@@ -164,6 +189,21 @@ def _normalize_requested_by(request_data: Any) -> Optional[str]:
|
|||||||
normalized = normalized.split("@", 1)[0]
|
normalized = normalized.split("@", 1)[0]
|
||||||
return normalized
|
return normalized
|
||||||
|
|
||||||
|
def _extract_requested_by_id(request_data: Any) -> Optional[int]:
|
||||||
|
if not isinstance(request_data, dict):
|
||||||
|
return None
|
||||||
|
requested_by = request_data.get("requestedBy") or request_data.get("requestedByUser")
|
||||||
|
if isinstance(requested_by, dict):
|
||||||
|
for key in ("id", "userId", "Id"):
|
||||||
|
value = requested_by.get(key)
|
||||||
|
if value is None:
|
||||||
|
continue
|
||||||
|
try:
|
||||||
|
return int(value)
|
||||||
|
except (TypeError, ValueError):
|
||||||
|
continue
|
||||||
|
return None
|
||||||
|
|
||||||
|
|
||||||
def _format_upstream_error(service: str, exc: httpx.HTTPStatusError) -> str:
|
def _format_upstream_error(service: str, exc: httpx.HTTPStatusError) -> str:
|
||||||
response = exc.response
|
response = exc.response
|
||||||
@@ -206,6 +246,7 @@ def _parse_request_payload(item: Dict[str, Any]) -> Dict[str, Any]:
|
|||||||
updated_at = item.get("updatedAt") or created_at
|
updated_at = item.get("updatedAt") or created_at
|
||||||
requested_by = _request_display_name(item)
|
requested_by = _request_display_name(item)
|
||||||
requested_by_norm = _normalize_requested_by(item)
|
requested_by_norm = _normalize_requested_by(item)
|
||||||
|
requested_by_id = _extract_requested_by_id(item)
|
||||||
return {
|
return {
|
||||||
"request_id": item.get("id"),
|
"request_id": item.get("id"),
|
||||||
"media_id": media_id,
|
"media_id": media_id,
|
||||||
@@ -216,6 +257,7 @@ def _parse_request_payload(item: Dict[str, Any]) -> Dict[str, Any]:
|
|||||||
"year": year,
|
"year": year,
|
||||||
"requested_by": requested_by,
|
"requested_by": requested_by,
|
||||||
"requested_by_norm": requested_by_norm,
|
"requested_by_norm": requested_by_norm,
|
||||||
|
"requested_by_id": requested_by_id,
|
||||||
"created_at": created_at,
|
"created_at": created_at,
|
||||||
"updated_at": updated_at,
|
"updated_at": updated_at,
|
||||||
}
|
}
|
||||||
@@ -577,6 +619,7 @@ async def _sync_all_requests(client: JellyseerrClient) -> int:
|
|||||||
year=payload.get("year"),
|
year=payload.get("year"),
|
||||||
requested_by=payload.get("requested_by"),
|
requested_by=payload.get("requested_by"),
|
||||||
requested_by_norm=payload.get("requested_by_norm"),
|
requested_by_norm=payload.get("requested_by_norm"),
|
||||||
|
requested_by_id=payload.get("requested_by_id"),
|
||||||
created_at=payload.get("created_at"),
|
created_at=payload.get("created_at"),
|
||||||
updated_at=payload.get("updated_at"),
|
updated_at=payload.get("updated_at"),
|
||||||
payload_json=payload_json,
|
payload_json=payload_json,
|
||||||
@@ -714,6 +757,7 @@ async def _sync_delta_requests(client: JellyseerrClient) -> int:
|
|||||||
year=payload.get("year"),
|
year=payload.get("year"),
|
||||||
requested_by=payload.get("requested_by"),
|
requested_by=payload.get("requested_by"),
|
||||||
requested_by_norm=payload.get("requested_by_norm"),
|
requested_by_norm=payload.get("requested_by_norm"),
|
||||||
|
requested_by_id=payload.get("requested_by_id"),
|
||||||
created_at=payload.get("created_at"),
|
created_at=payload.get("created_at"),
|
||||||
updated_at=payload.get("updated_at"),
|
updated_at=payload.get("updated_at"),
|
||||||
payload_json=payload_json,
|
payload_json=payload_json,
|
||||||
@@ -843,6 +887,7 @@ async def _prefetch_artwork_cache(
|
|||||||
year=parsed.get("year"),
|
year=parsed.get("year"),
|
||||||
requested_by=parsed.get("requested_by"),
|
requested_by=parsed.get("requested_by"),
|
||||||
requested_by_norm=parsed.get("requested_by_norm"),
|
requested_by_norm=parsed.get("requested_by_norm"),
|
||||||
|
requested_by_id=parsed.get("requested_by_id"),
|
||||||
created_at=parsed.get("created_at"),
|
created_at=parsed.get("created_at"),
|
||||||
updated_at=parsed.get("updated_at"),
|
updated_at=parsed.get("updated_at"),
|
||||||
payload_json=json.dumps(payload, ensure_ascii=True),
|
payload_json=json.dumps(payload, ensure_ascii=True),
|
||||||
@@ -985,18 +1030,38 @@ def _recent_cache_stale() -> bool:
|
|||||||
return (datetime.now(timezone.utc) - parsed).total_seconds() > RECENT_CACHE_TTL_SECONDS
|
return (datetime.now(timezone.utc) - parsed).total_seconds() > RECENT_CACHE_TTL_SECONDS
|
||||||
|
|
||||||
|
|
||||||
|
def _parse_iso_datetime(value: Optional[str]) -> Optional[datetime]:
|
||||||
|
if not value:
|
||||||
|
return None
|
||||||
|
try:
|
||||||
|
parsed = datetime.fromisoformat(value.replace("Z", "+00:00"))
|
||||||
|
except ValueError:
|
||||||
|
return None
|
||||||
|
if parsed.tzinfo is None:
|
||||||
|
return parsed.replace(tzinfo=timezone.utc)
|
||||||
|
return parsed
|
||||||
|
|
||||||
|
|
||||||
def _get_recent_from_cache(
|
def _get_recent_from_cache(
|
||||||
requested_by_norm: Optional[str],
|
requested_by_norm: Optional[str],
|
||||||
|
requested_by_id: Optional[int],
|
||||||
limit: int,
|
limit: int,
|
||||||
offset: int,
|
offset: int,
|
||||||
since_iso: Optional[str],
|
since_iso: Optional[str],
|
||||||
) -> List[Dict[str, Any]]:
|
) -> List[Dict[str, Any]]:
|
||||||
items = _recent_cache.get("items") or []
|
items = _recent_cache.get("items") or []
|
||||||
results = []
|
results = []
|
||||||
|
since_dt = _parse_iso_datetime(since_iso)
|
||||||
for item in items:
|
for item in items:
|
||||||
if requested_by_norm and item.get("requested_by_norm") != requested_by_norm:
|
if requested_by_id is not None:
|
||||||
|
if item.get("requested_by_id") != requested_by_id:
|
||||||
continue
|
continue
|
||||||
if since_iso and item.get("created_at") and item["created_at"] < since_iso:
|
elif requested_by_norm and item.get("requested_by_norm") != requested_by_norm:
|
||||||
|
continue
|
||||||
|
if since_dt:
|
||||||
|
candidate = item.get("created_at") or item.get("updated_at")
|
||||||
|
item_dt = _parse_iso_datetime(candidate)
|
||||||
|
if not item_dt or item_dt < since_dt:
|
||||||
continue
|
continue
|
||||||
results.append(item)
|
results.append(item)
|
||||||
return results[offset : offset + limit]
|
return results[offset : offset + limit]
|
||||||
@@ -1432,7 +1497,8 @@ async def get_snapshot(request_id: str, user: Dict[str, str] = Depends(get_curre
|
|||||||
client = JellyseerrClient(runtime.jellyseerr_base_url, runtime.jellyseerr_api_key)
|
client = JellyseerrClient(runtime.jellyseerr_base_url, runtime.jellyseerr_api_key)
|
||||||
if client.configured():
|
if client.configured():
|
||||||
await _ensure_request_access(client, int(request_id), user)
|
await _ensure_request_access(client, int(request_id), user)
|
||||||
return await build_snapshot(request_id)
|
snapshot = await build_snapshot(request_id)
|
||||||
|
return _filter_snapshot_actions_for_user(snapshot, user)
|
||||||
|
|
||||||
|
|
||||||
@router.get("/recent")
|
@router.get("/recent")
|
||||||
@@ -1455,13 +1521,15 @@ async def recent_requests(
|
|||||||
raise HTTPException(status_code=502, detail=str(exc)) from exc
|
raise HTTPException(status_code=502, detail=str(exc)) from exc
|
||||||
|
|
||||||
username_norm = _normalize_username(user.get("username", ""))
|
username_norm = _normalize_username(user.get("username", ""))
|
||||||
|
requested_by_id = user.get("jellyseerr_user_id")
|
||||||
requested_by = None if user.get("role") == "admin" else username_norm
|
requested_by = None if user.get("role") == "admin" else username_norm
|
||||||
|
requested_by_id = None if user.get("role") == "admin" else requested_by_id
|
||||||
since_iso = None
|
since_iso = None
|
||||||
if days > 0:
|
if days > 0:
|
||||||
since_iso = (datetime.now(timezone.utc) - timedelta(days=days)).isoformat()
|
since_iso = (datetime.now(timezone.utc) - timedelta(days=days)).isoformat()
|
||||||
if _recent_cache_stale():
|
if _recent_cache_stale():
|
||||||
_refresh_recent_cache_from_db()
|
_refresh_recent_cache_from_db()
|
||||||
rows = _get_recent_from_cache(requested_by, take, skip, since_iso)
|
rows = _get_recent_from_cache(requested_by, requested_by_id, take, skip, since_iso)
|
||||||
cache_mode = (runtime.artwork_cache_mode or "remote").lower()
|
cache_mode = (runtime.artwork_cache_mode or "remote").lower()
|
||||||
allow_title_hydrate = False
|
allow_title_hydrate = False
|
||||||
allow_artwork_hydrate = client.configured()
|
allow_artwork_hydrate = client.configured()
|
||||||
@@ -1537,6 +1605,7 @@ async def recent_requests(
|
|||||||
year=year or payload.get("year"),
|
year=year or payload.get("year"),
|
||||||
requested_by=payload.get("requested_by"),
|
requested_by=payload.get("requested_by"),
|
||||||
requested_by_norm=payload.get("requested_by_norm"),
|
requested_by_norm=payload.get("requested_by_norm"),
|
||||||
|
requested_by_id=payload.get("requested_by_id"),
|
||||||
created_at=payload.get("created_at"),
|
created_at=payload.get("created_at"),
|
||||||
updated_at=payload.get("updated_at"),
|
updated_at=payload.get("updated_at"),
|
||||||
payload_json=json.dumps(details, ensure_ascii=True),
|
payload_json=json.dumps(details, ensure_ascii=True),
|
||||||
@@ -1584,6 +1653,7 @@ async def recent_requests(
|
|||||||
year=payload.get("year"),
|
year=payload.get("year"),
|
||||||
requested_by=payload.get("requested_by"),
|
requested_by=payload.get("requested_by"),
|
||||||
requested_by_norm=payload.get("requested_by_norm"),
|
requested_by_norm=payload.get("requested_by_norm"),
|
||||||
|
requested_by_id=payload.get("requested_by_id"),
|
||||||
created_at=payload.get("created_at"),
|
created_at=payload.get("created_at"),
|
||||||
updated_at=payload.get("updated_at"),
|
updated_at=payload.get("updated_at"),
|
||||||
payload_json=json.dumps(details, ensure_ascii=True),
|
payload_json=json.dumps(details, ensure_ascii=True),
|
||||||
@@ -1602,6 +1672,7 @@ async def recent_requests(
|
|||||||
"status": status,
|
"status": status,
|
||||||
"statusLabel": status_label,
|
"statusLabel": status_label,
|
||||||
"mediaId": row.get("media_id"),
|
"mediaId": row.get("media_id"),
|
||||||
|
"createdAt": row.get("created_at") or row.get("updated_at"),
|
||||||
"artwork": {
|
"artwork": {
|
||||||
"poster_url": _artwork_url(poster_path, "w185", cache_mode),
|
"poster_url": _artwork_url(poster_path, "w185", cache_mode),
|
||||||
"backdrop_url": _artwork_url(backdrop_path, "w780", cache_mode),
|
"backdrop_url": _artwork_url(backdrop_path, "w780", cache_mode),
|
||||||
@@ -1656,8 +1727,14 @@ async def search_requests(
|
|||||||
status_label = _status_label(status)
|
status_label = _status_label(status)
|
||||||
elif isinstance(media_info_id, int):
|
elif isinstance(media_info_id, int):
|
||||||
username_norm = _normalize_username(user.get("username", ""))
|
username_norm = _normalize_username(user.get("username", ""))
|
||||||
|
requested_by_id = user.get("jellyseerr_user_id")
|
||||||
requested_by = None if user.get("role") == "admin" else username_norm
|
requested_by = None if user.get("role") == "admin" else username_norm
|
||||||
cached = get_cached_request_by_media_id(media_info_id, requested_by_norm=requested_by)
|
requested_by_id = None if user.get("role") == "admin" else requested_by_id
|
||||||
|
cached = get_cached_request_by_media_id(
|
||||||
|
media_info_id,
|
||||||
|
requested_by_norm=requested_by,
|
||||||
|
requested_by_id=requested_by_id,
|
||||||
|
)
|
||||||
if cached:
|
if cached:
|
||||||
request_id = cached.get("request_id")
|
request_id = cached.get("request_id")
|
||||||
status = cached.get("status")
|
status = cached.get("status")
|
||||||
@@ -1692,7 +1769,7 @@ async def ai_triage(request_id: str, user: Dict[str, str] = Depends(get_current_
|
|||||||
client = JellyseerrClient(runtime.jellyseerr_base_url, runtime.jellyseerr_api_key)
|
client = JellyseerrClient(runtime.jellyseerr_base_url, runtime.jellyseerr_api_key)
|
||||||
if client.configured():
|
if client.configured():
|
||||||
await _ensure_request_access(client, int(request_id), user)
|
await _ensure_request_access(client, int(request_id), user)
|
||||||
snapshot = await build_snapshot(request_id)
|
snapshot = _filter_snapshot_actions_for_user(await build_snapshot(request_id), user)
|
||||||
return triage_snapshot(snapshot)
|
return triage_snapshot(snapshot)
|
||||||
|
|
||||||
|
|
||||||
@@ -1729,6 +1806,8 @@ async def action_search(request_id: str, user: Dict[str, str] = Depends(get_curr
|
|||||||
|
|
||||||
@router.post("/{request_id}/actions/search_auto")
|
@router.post("/{request_id}/actions/search_auto")
|
||||||
async def action_search_auto(request_id: str, user: Dict[str, str] = Depends(get_current_user)) -> dict:
|
async def action_search_auto(request_id: str, user: Dict[str, str] = Depends(get_current_user)) -> dict:
|
||||||
|
if not _user_can_use_search_auto(user):
|
||||||
|
raise HTTPException(status_code=403, detail="Auto search and download is disabled for this user")
|
||||||
runtime = get_runtime_settings()
|
runtime = get_runtime_settings()
|
||||||
client = JellyseerrClient(runtime.jellyseerr_base_url, runtime.jellyseerr_api_key)
|
client = JellyseerrClient(runtime.jellyseerr_base_url, runtime.jellyseerr_api_key)
|
||||||
if client.configured():
|
if client.configured():
|
||||||
@@ -1742,10 +1821,23 @@ async def action_search_auto(request_id: str, user: Dict[str, str] = Depends(get
|
|||||||
client = SonarrClient(runtime.sonarr_base_url, runtime.sonarr_api_key)
|
client = SonarrClient(runtime.sonarr_base_url, runtime.sonarr_api_key)
|
||||||
if not client.configured():
|
if not client.configured():
|
||||||
raise HTTPException(status_code=400, detail="Sonarr not configured")
|
raise HTTPException(status_code=400, detail="Sonarr not configured")
|
||||||
|
target_profile_id = _quality_profile_id(runtime.sonarr_quality_profile_id)
|
||||||
|
current_profile_id = _quality_profile_id(arr_item.get("qualityProfileId"))
|
||||||
|
profile_message = None
|
||||||
|
series_id = _quality_profile_id(arr_item.get("id"))
|
||||||
|
if target_profile_id and series_id and current_profile_id != target_profile_id:
|
||||||
|
series = await client.get_series(series_id)
|
||||||
|
if not isinstance(series, dict):
|
||||||
|
raise HTTPException(status_code=502, detail="Could not load Sonarr series before search")
|
||||||
|
series["qualityProfileId"] = target_profile_id
|
||||||
|
await client.update_series(series)
|
||||||
|
profile_message = f"Sonarr quality profile updated to {target_profile_id} before search."
|
||||||
episodes = await client.get_episodes(int(arr_item["id"]))
|
episodes = await client.get_episodes(int(arr_item["id"]))
|
||||||
missing_by_season = _missing_episode_ids_by_season(episodes)
|
missing_by_season = _missing_episode_ids_by_season(episodes)
|
||||||
if not missing_by_season:
|
if not missing_by_season:
|
||||||
message = "No missing monitored episodes found."
|
message = "No missing monitored episodes found."
|
||||||
|
if profile_message:
|
||||||
|
message = f"{profile_message} {message}"
|
||||||
await asyncio.to_thread(
|
await asyncio.to_thread(
|
||||||
save_action, request_id, "search_auto", "Search and auto-download", "ok", message
|
save_action, request_id, "search_auto", "Search and auto-download", "ok", message
|
||||||
)
|
)
|
||||||
@@ -1759,6 +1851,8 @@ async def action_search_auto(request_id: str, user: Dict[str, str] = Depends(get
|
|||||||
{"season": season_number, "episodeCount": len(episode_ids), "response": response}
|
{"season": season_number, "episodeCount": len(episode_ids), "response": response}
|
||||||
)
|
)
|
||||||
message = "Search sent to Sonarr."
|
message = "Search sent to Sonarr."
|
||||||
|
if profile_message:
|
||||||
|
message = f"{profile_message} {message}"
|
||||||
await asyncio.to_thread(
|
await asyncio.to_thread(
|
||||||
save_action, request_id, "search_auto", "Search and auto-download", "ok", message
|
save_action, request_id, "search_auto", "Search and auto-download", "ok", message
|
||||||
)
|
)
|
||||||
@@ -1767,8 +1861,21 @@ async def action_search_auto(request_id: str, user: Dict[str, str] = Depends(get
|
|||||||
client = RadarrClient(runtime.radarr_base_url, runtime.radarr_api_key)
|
client = RadarrClient(runtime.radarr_base_url, runtime.radarr_api_key)
|
||||||
if not client.configured():
|
if not client.configured():
|
||||||
raise HTTPException(status_code=400, detail="Radarr not configured")
|
raise HTTPException(status_code=400, detail="Radarr not configured")
|
||||||
|
target_profile_id = _quality_profile_id(runtime.radarr_quality_profile_id)
|
||||||
|
current_profile_id = _quality_profile_id(arr_item.get("qualityProfileId"))
|
||||||
|
profile_message = None
|
||||||
|
movie_id = _quality_profile_id(arr_item.get("id"))
|
||||||
|
if target_profile_id and movie_id and current_profile_id != target_profile_id:
|
||||||
|
movie = await client.get_movie(movie_id)
|
||||||
|
if not isinstance(movie, dict):
|
||||||
|
raise HTTPException(status_code=502, detail="Could not load Radarr movie before search")
|
||||||
|
movie["qualityProfileId"] = target_profile_id
|
||||||
|
await client.update_movie(movie)
|
||||||
|
profile_message = f"Radarr quality profile updated to {target_profile_id} before search."
|
||||||
response = await client.search(int(arr_item["id"]))
|
response = await client.search(int(arr_item["id"]))
|
||||||
message = "Search sent to Radarr."
|
message = "Search sent to Radarr."
|
||||||
|
if profile_message:
|
||||||
|
message = f"{profile_message} {message}"
|
||||||
await asyncio.to_thread(
|
await asyncio.to_thread(
|
||||||
save_action, request_id, "search_auto", "Search and auto-download", "ok", message
|
save_action, request_id, "search_auto", "Search and auto-download", "ok", message
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -14,6 +14,7 @@ _BOOL_FIELDS = {
|
|||||||
"jellyfin_sync_to_arr",
|
"jellyfin_sync_to_arr",
|
||||||
"site_banner_enabled",
|
"site_banner_enabled",
|
||||||
}
|
}
|
||||||
|
_SKIP_OVERRIDE_FIELDS = {"site_build_number", "site_changelog"}
|
||||||
|
|
||||||
|
|
||||||
def get_runtime_settings():
|
def get_runtime_settings():
|
||||||
@@ -22,6 +23,8 @@ def get_runtime_settings():
|
|||||||
for key, value in overrides.items():
|
for key, value in overrides.items():
|
||||||
if value is None:
|
if value is None:
|
||||||
continue
|
continue
|
||||||
|
if key in _SKIP_OVERRIDE_FIELDS:
|
||||||
|
continue
|
||||||
if key in _INT_FIELDS:
|
if key in _INT_FIELDS:
|
||||||
try:
|
try:
|
||||||
update[key] = int(value)
|
update[key] = int(value)
|
||||||
|
|||||||
@@ -3,8 +3,14 @@ import logging
|
|||||||
from fastapi import HTTPException
|
from fastapi import HTTPException
|
||||||
|
|
||||||
from ..clients.jellyfin import JellyfinClient
|
from ..clients.jellyfin import JellyfinClient
|
||||||
from ..db import create_user_if_missing
|
from ..db import create_user_if_missing, set_user_jellyseerr_id
|
||||||
from ..runtime import get_runtime_settings
|
from ..runtime import get_runtime_settings
|
||||||
|
from .user_cache import (
|
||||||
|
build_jellyseerr_candidate_map,
|
||||||
|
get_cached_jellyseerr_users,
|
||||||
|
match_jellyseerr_user_id,
|
||||||
|
save_jellyfin_users_cache,
|
||||||
|
)
|
||||||
|
|
||||||
logger = logging.getLogger(__name__)
|
logger = logging.getLogger(__name__)
|
||||||
|
|
||||||
@@ -17,6 +23,9 @@ async def sync_jellyfin_users() -> int:
|
|||||||
users = await client.get_users()
|
users = await client.get_users()
|
||||||
if not isinstance(users, list):
|
if not isinstance(users, list):
|
||||||
return 0
|
return 0
|
||||||
|
save_jellyfin_users_cache(users)
|
||||||
|
jellyseerr_users = get_cached_jellyseerr_users()
|
||||||
|
candidate_map = build_jellyseerr_candidate_map(jellyseerr_users or [])
|
||||||
imported = 0
|
imported = 0
|
||||||
for user in users:
|
for user in users:
|
||||||
if not isinstance(user, dict):
|
if not isinstance(user, dict):
|
||||||
@@ -24,8 +33,18 @@ async def sync_jellyfin_users() -> int:
|
|||||||
name = user.get("Name")
|
name = user.get("Name")
|
||||||
if not name:
|
if not name:
|
||||||
continue
|
continue
|
||||||
if create_user_if_missing(name, "jellyfin-user", role="user", auth_provider="jellyfin"):
|
matched_id = match_jellyseerr_user_id(name, candidate_map) if candidate_map else None
|
||||||
|
created = create_user_if_missing(
|
||||||
|
name,
|
||||||
|
"jellyfin-user",
|
||||||
|
role="user",
|
||||||
|
auth_provider="jellyfin",
|
||||||
|
jellyseerr_user_id=matched_id,
|
||||||
|
)
|
||||||
|
if created:
|
||||||
imported += 1
|
imported += 1
|
||||||
|
elif matched_id is not None:
|
||||||
|
set_user_jellyseerr_id(name, matched_id)
|
||||||
return imported
|
return imported
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
158
backend/app/services/user_cache.py
Normal file
158
backend/app/services/user_cache.py
Normal file
@@ -0,0 +1,158 @@
|
|||||||
|
import json
|
||||||
|
import logging
|
||||||
|
from datetime import datetime, timezone, timedelta
|
||||||
|
from typing import Any, Dict, List, Optional
|
||||||
|
|
||||||
|
from ..db import get_setting, set_setting, delete_setting
|
||||||
|
|
||||||
|
logger = logging.getLogger(__name__)
|
||||||
|
|
||||||
|
JELLYSEERR_CACHE_KEY = "jellyseerr_users_cache"
|
||||||
|
JELLYSEERR_CACHE_AT_KEY = "jellyseerr_users_cached_at"
|
||||||
|
JELLYFIN_CACHE_KEY = "jellyfin_users_cache"
|
||||||
|
JELLYFIN_CACHE_AT_KEY = "jellyfin_users_cached_at"
|
||||||
|
|
||||||
|
|
||||||
|
def _now_iso() -> str:
|
||||||
|
return datetime.now(timezone.utc).isoformat()
|
||||||
|
|
||||||
|
|
||||||
|
def _parse_iso(value: Optional[str]) -> Optional[datetime]:
|
||||||
|
if not value:
|
||||||
|
return None
|
||||||
|
try:
|
||||||
|
parsed = datetime.fromisoformat(value)
|
||||||
|
except ValueError:
|
||||||
|
return None
|
||||||
|
if parsed.tzinfo is None:
|
||||||
|
parsed = parsed.replace(tzinfo=timezone.utc)
|
||||||
|
return parsed
|
||||||
|
|
||||||
|
|
||||||
|
def _cache_is_fresh(cached_at: Optional[str], max_age_minutes: int) -> bool:
|
||||||
|
parsed = _parse_iso(cached_at)
|
||||||
|
if not parsed:
|
||||||
|
return False
|
||||||
|
age = datetime.now(timezone.utc) - parsed
|
||||||
|
return age <= timedelta(minutes=max_age_minutes)
|
||||||
|
|
||||||
|
|
||||||
|
def _load_cached_users(
|
||||||
|
cache_key: str, cache_at_key: str, max_age_minutes: int
|
||||||
|
) -> Optional[List[Dict[str, Any]]]:
|
||||||
|
cached_at = get_setting(cache_at_key)
|
||||||
|
if not _cache_is_fresh(cached_at, max_age_minutes):
|
||||||
|
return None
|
||||||
|
raw = get_setting(cache_key)
|
||||||
|
if not raw:
|
||||||
|
return None
|
||||||
|
try:
|
||||||
|
data = json.loads(raw)
|
||||||
|
except (TypeError, json.JSONDecodeError):
|
||||||
|
return None
|
||||||
|
if isinstance(data, list):
|
||||||
|
return [item for item in data if isinstance(item, dict)]
|
||||||
|
return None
|
||||||
|
|
||||||
|
|
||||||
|
def _save_cached_users(cache_key: str, cache_at_key: str, users: List[Dict[str, Any]]) -> None:
|
||||||
|
payload = json.dumps(users, ensure_ascii=True)
|
||||||
|
set_setting(cache_key, payload)
|
||||||
|
set_setting(cache_at_key, _now_iso())
|
||||||
|
|
||||||
|
|
||||||
|
def _normalized_handles(value: Any) -> List[str]:
|
||||||
|
if not isinstance(value, str):
|
||||||
|
return []
|
||||||
|
normalized = value.strip().lower()
|
||||||
|
if not normalized:
|
||||||
|
return []
|
||||||
|
handles = [normalized]
|
||||||
|
if "@" in normalized:
|
||||||
|
handles.append(normalized.split("@", 1)[0])
|
||||||
|
return list(dict.fromkeys(handles))
|
||||||
|
|
||||||
|
|
||||||
|
def build_jellyseerr_candidate_map(users: List[Dict[str, Any]]) -> Dict[str, int]:
|
||||||
|
candidate_to_id: Dict[str, int] = {}
|
||||||
|
for user in users:
|
||||||
|
if not isinstance(user, dict):
|
||||||
|
continue
|
||||||
|
user_id = user.get("id") or user.get("userId") or user.get("Id")
|
||||||
|
try:
|
||||||
|
user_id = int(user_id)
|
||||||
|
except (TypeError, ValueError):
|
||||||
|
continue
|
||||||
|
for key in ("username", "email", "displayName", "name"):
|
||||||
|
for handle in _normalized_handles(user.get(key)):
|
||||||
|
candidate_to_id.setdefault(handle, user_id)
|
||||||
|
return candidate_to_id
|
||||||
|
|
||||||
|
|
||||||
|
def match_jellyseerr_user_id(
|
||||||
|
username: str, candidate_map: Dict[str, int]
|
||||||
|
) -> Optional[int]:
|
||||||
|
for handle in _normalized_handles(username):
|
||||||
|
matched = candidate_map.get(handle)
|
||||||
|
if matched is not None:
|
||||||
|
return matched
|
||||||
|
return None
|
||||||
|
|
||||||
|
|
||||||
|
def save_jellyseerr_users_cache(users: List[Dict[str, Any]]) -> List[Dict[str, Any]]:
|
||||||
|
normalized: List[Dict[str, Any]] = []
|
||||||
|
for user in users:
|
||||||
|
if not isinstance(user, dict):
|
||||||
|
continue
|
||||||
|
normalized.append(
|
||||||
|
{
|
||||||
|
"id": user.get("id") or user.get("userId") or user.get("Id"),
|
||||||
|
"email": user.get("email"),
|
||||||
|
"username": user.get("username"),
|
||||||
|
"displayName": user.get("displayName"),
|
||||||
|
"name": user.get("name"),
|
||||||
|
}
|
||||||
|
)
|
||||||
|
_save_cached_users(JELLYSEERR_CACHE_KEY, JELLYSEERR_CACHE_AT_KEY, normalized)
|
||||||
|
logger.debug("Cached Jellyseerr users: %s", len(normalized))
|
||||||
|
return normalized
|
||||||
|
|
||||||
|
|
||||||
|
def get_cached_jellyseerr_users(max_age_minutes: int = 1440) -> Optional[List[Dict[str, Any]]]:
|
||||||
|
return _load_cached_users(JELLYSEERR_CACHE_KEY, JELLYSEERR_CACHE_AT_KEY, max_age_minutes)
|
||||||
|
|
||||||
|
|
||||||
|
def save_jellyfin_users_cache(users: List[Dict[str, Any]]) -> List[Dict[str, Any]]:
|
||||||
|
normalized: List[Dict[str, Any]] = []
|
||||||
|
for user in users:
|
||||||
|
if not isinstance(user, dict):
|
||||||
|
continue
|
||||||
|
normalized.append(
|
||||||
|
{
|
||||||
|
"id": user.get("Id"),
|
||||||
|
"name": user.get("Name"),
|
||||||
|
"hasPassword": user.get("HasPassword"),
|
||||||
|
"lastLoginDate": user.get("LastLoginDate"),
|
||||||
|
}
|
||||||
|
)
|
||||||
|
_save_cached_users(JELLYFIN_CACHE_KEY, JELLYFIN_CACHE_AT_KEY, normalized)
|
||||||
|
logger.debug("Cached Jellyfin users: %s", len(normalized))
|
||||||
|
return normalized
|
||||||
|
|
||||||
|
|
||||||
|
def get_cached_jellyfin_users(max_age_minutes: int = 1440) -> Optional[List[Dict[str, Any]]]:
|
||||||
|
return _load_cached_users(JELLYFIN_CACHE_KEY, JELLYFIN_CACHE_AT_KEY, max_age_minutes)
|
||||||
|
|
||||||
|
|
||||||
|
def clear_user_import_caches() -> Dict[str, int]:
|
||||||
|
cleared = 0
|
||||||
|
for key in (
|
||||||
|
JELLYSEERR_CACHE_KEY,
|
||||||
|
JELLYSEERR_CACHE_AT_KEY,
|
||||||
|
JELLYFIN_CACHE_KEY,
|
||||||
|
JELLYFIN_CACHE_AT_KEY,
|
||||||
|
):
|
||||||
|
delete_setting(key)
|
||||||
|
cleared += 1
|
||||||
|
logger.debug("Cleared user import cache keys: %s", cleared)
|
||||||
|
return {"settingsKeysCleared": cleared}
|
||||||
@@ -1,19 +1,10 @@
|
|||||||
services:
|
services:
|
||||||
backend:
|
magent:
|
||||||
image: rephl3xnz/magent-backend:latest
|
image: rephl3xnz/magent:latest
|
||||||
env_file:
|
env_file:
|
||||||
- ./.env
|
- ./.env
|
||||||
ports:
|
ports:
|
||||||
|
- "3000:3000"
|
||||||
- "8000:8000"
|
- "8000:8000"
|
||||||
volumes:
|
volumes:
|
||||||
- ./data:/app/data
|
- ./data:/app/data
|
||||||
|
|
||||||
frontend:
|
|
||||||
image: rephl3xnz/magent-frontend:latest
|
|
||||||
environment:
|
|
||||||
- NEXT_PUBLIC_API_BASE=/api
|
|
||||||
- BACKEND_INTERNAL_URL=http://backend:8000
|
|
||||||
ports:
|
|
||||||
- "3000:3000"
|
|
||||||
depends_on:
|
|
||||||
- backend
|
|
||||||
|
|||||||
@@ -1,25 +1,12 @@
|
|||||||
services:
|
services:
|
||||||
backend:
|
magent:
|
||||||
build:
|
build:
|
||||||
context: .
|
context: .
|
||||||
dockerfile: backend/Dockerfile
|
dockerfile: Dockerfile
|
||||||
args:
|
|
||||||
BUILD_NUMBER: ${BUILD_NUMBER}
|
|
||||||
env_file:
|
env_file:
|
||||||
- ./.env
|
- ./.env
|
||||||
ports:
|
ports:
|
||||||
|
- "3000:3000"
|
||||||
- "8000:8000"
|
- "8000:8000"
|
||||||
volumes:
|
volumes:
|
||||||
- ./data:/app/data
|
- ./data:/app/data
|
||||||
|
|
||||||
frontend:
|
|
||||||
build:
|
|
||||||
context: ./frontend
|
|
||||||
dockerfile: Dockerfile
|
|
||||||
environment:
|
|
||||||
- NEXT_PUBLIC_API_BASE=/api
|
|
||||||
- BACKEND_INTERNAL_URL=http://backend:8000
|
|
||||||
ports:
|
|
||||||
- "3000:3000"
|
|
||||||
depends_on:
|
|
||||||
- backend
|
|
||||||
|
|||||||
28
docker/supervisord.conf
Normal file
28
docker/supervisord.conf
Normal file
@@ -0,0 +1,28 @@
|
|||||||
|
[supervisord]
|
||||||
|
nodaemon=true
|
||||||
|
logfile=/dev/null
|
||||||
|
logfile_maxbytes=0
|
||||||
|
pidfile=/tmp/supervisord.pid
|
||||||
|
|
||||||
|
[program:backend]
|
||||||
|
directory=/app
|
||||||
|
command=uvicorn app.main:app --host 0.0.0.0 --port 8000
|
||||||
|
autostart=true
|
||||||
|
autorestart=true
|
||||||
|
stdout_logfile=/dev/stdout
|
||||||
|
stdout_logfile_maxbytes=0
|
||||||
|
stderr_logfile=/dev/stderr
|
||||||
|
stderr_logfile_maxbytes=0
|
||||||
|
priority=10
|
||||||
|
|
||||||
|
[program:frontend]
|
||||||
|
directory=/app/frontend
|
||||||
|
command=/usr/bin/npm start -- --hostname 0.0.0.0 --port 3000
|
||||||
|
environment=NEXT_PUBLIC_API_BASE="/api",BACKEND_INTERNAL_URL="http://127.0.0.1:8000",NODE_ENV="production"
|
||||||
|
autostart=true
|
||||||
|
autorestart=true
|
||||||
|
stdout_logfile=/dev/stdout
|
||||||
|
stdout_logfile_maxbytes=0
|
||||||
|
stderr_logfile=/dev/stderr
|
||||||
|
stderr_logfile_maxbytes=0
|
||||||
|
priority=20
|
||||||
@@ -1,6 +1,6 @@
|
|||||||
'use client'
|
'use client'
|
||||||
|
|
||||||
import { useCallback, useEffect, useMemo, useState } from 'react'
|
import { useCallback, useEffect, useMemo, useRef, useState } from 'react'
|
||||||
import { useRouter } from 'next/navigation'
|
import { useRouter } from 'next/navigation'
|
||||||
import { authFetch, clearToken, getApiBase, getToken } from '../lib/auth'
|
import { authFetch, clearToken, getApiBase, getToken } from '../lib/auth'
|
||||||
import AdminShell from '../ui/AdminShell'
|
import AdminShell from '../ui/AdminShell'
|
||||||
@@ -34,6 +34,15 @@ const SECTION_LABELS: Record<string, string> = {
|
|||||||
|
|
||||||
const BOOL_SETTINGS = new Set(['jellyfin_sync_to_arr', 'site_banner_enabled'])
|
const BOOL_SETTINGS = new Set(['jellyfin_sync_to_arr', 'site_banner_enabled'])
|
||||||
const TEXTAREA_SETTINGS = new Set(['site_banner_message', 'site_changelog'])
|
const TEXTAREA_SETTINGS = new Set(['site_banner_message', 'site_changelog'])
|
||||||
|
const URL_SETTINGS = new Set([
|
||||||
|
'jellyseerr_base_url',
|
||||||
|
'jellyfin_base_url',
|
||||||
|
'jellyfin_public_url',
|
||||||
|
'sonarr_base_url',
|
||||||
|
'radarr_base_url',
|
||||||
|
'prowlarr_base_url',
|
||||||
|
'qbittorrent_base_url',
|
||||||
|
])
|
||||||
const BANNER_TONES = ['info', 'warning', 'error', 'maintenance']
|
const BANNER_TONES = ['info', 'warning', 'error', 'maintenance']
|
||||||
|
|
||||||
const SECTION_DESCRIPTIONS: Record<string, string> = {
|
const SECTION_DESCRIPTIONS: Record<string, string> = {
|
||||||
@@ -132,6 +141,9 @@ export default function SettingsPage({ section }: SettingsPageProps) {
|
|||||||
const [artworkSummaryStatus, setArtworkSummaryStatus] = useState<string | null>(null)
|
const [artworkSummaryStatus, setArtworkSummaryStatus] = useState<string | null>(null)
|
||||||
const [maintenanceStatus, setMaintenanceStatus] = useState<string | null>(null)
|
const [maintenanceStatus, setMaintenanceStatus] = useState<string | null>(null)
|
||||||
const [maintenanceBusy, setMaintenanceBusy] = useState(false)
|
const [maintenanceBusy, setMaintenanceBusy] = useState(false)
|
||||||
|
const [liveStreamConnected, setLiveStreamConnected] = useState(false)
|
||||||
|
const requestsSyncRef = useRef<any | null>(null)
|
||||||
|
const artworkPrefetchRef = useRef<any | null>(null)
|
||||||
|
|
||||||
const loadSettings = useCallback(async () => {
|
const loadSettings = useCallback(async () => {
|
||||||
const baseUrl = getApiBase()
|
const baseUrl = getApiBase()
|
||||||
@@ -329,27 +341,40 @@ export default function SettingsPage({ section }: SettingsPageProps) {
|
|||||||
return false
|
return false
|
||||||
}
|
}
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
requestsSyncRef.current = requestsSync
|
||||||
|
}, [requestsSync])
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
artworkPrefetchRef.current = artworkPrefetch
|
||||||
|
}, [artworkPrefetch])
|
||||||
|
|
||||||
const settingDescriptions: Record<string, string> = {
|
const settingDescriptions: Record<string, string> = {
|
||||||
jellyseerr_base_url: 'Base URL for your Jellyseerr server.',
|
jellyseerr_base_url:
|
||||||
|
'Base URL for your Jellyseerr server (FQDN or IP). Scheme is optional.',
|
||||||
jellyseerr_api_key: 'API key used to read requests and status.',
|
jellyseerr_api_key: 'API key used to read requests and status.',
|
||||||
jellyfin_base_url: 'Local Jellyfin server URL for logins and lookups.',
|
jellyfin_base_url:
|
||||||
|
'Jellyfin server URL for logins and lookups (FQDN or IP). Scheme is optional.',
|
||||||
jellyfin_api_key: 'Admin API key for syncing users and availability.',
|
jellyfin_api_key: 'Admin API key for syncing users and availability.',
|
||||||
jellyfin_public_url: 'Public Jellyfin URL used for the “Open in Jellyfin” button.',
|
jellyfin_public_url:
|
||||||
|
'Public Jellyfin URL for the “Open in Jellyfin” button (FQDN or IP).',
|
||||||
jellyfin_sync_to_arr: 'Auto-add items to Sonarr/Radarr when they already exist in Jellyfin.',
|
jellyfin_sync_to_arr: 'Auto-add items to Sonarr/Radarr when they already exist in Jellyfin.',
|
||||||
artwork_cache_mode: 'Choose whether posters are cached locally or loaded from the web.',
|
artwork_cache_mode: 'Choose whether posters are cached locally or loaded from the web.',
|
||||||
sonarr_base_url: 'Sonarr server URL for TV tracking.',
|
sonarr_base_url: 'Sonarr server URL for TV tracking (FQDN or IP). Scheme is optional.',
|
||||||
sonarr_api_key: 'API key for Sonarr.',
|
sonarr_api_key: 'API key for Sonarr.',
|
||||||
sonarr_quality_profile_id: 'Quality profile used when adding TV shows.',
|
sonarr_quality_profile_id: 'Quality profile used when adding TV shows.',
|
||||||
sonarr_root_folder: 'Root folder where Sonarr stores TV shows.',
|
sonarr_root_folder: 'Root folder where Sonarr stores TV shows.',
|
||||||
sonarr_qbittorrent_category: 'qBittorrent category for manual Sonarr downloads.',
|
sonarr_qbittorrent_category: 'qBittorrent category for manual Sonarr downloads.',
|
||||||
radarr_base_url: 'Radarr server URL for movies.',
|
radarr_base_url: 'Radarr server URL for movies (FQDN or IP). Scheme is optional.',
|
||||||
radarr_api_key: 'API key for Radarr.',
|
radarr_api_key: 'API key for Radarr.',
|
||||||
radarr_quality_profile_id: 'Quality profile used when adding movies.',
|
radarr_quality_profile_id: 'Quality profile used when adding movies.',
|
||||||
radarr_root_folder: 'Root folder where Radarr stores movies.',
|
radarr_root_folder: 'Root folder where Radarr stores movies.',
|
||||||
radarr_qbittorrent_category: 'qBittorrent category for manual Radarr downloads.',
|
radarr_qbittorrent_category: 'qBittorrent category for manual Radarr downloads.',
|
||||||
prowlarr_base_url: 'Prowlarr server URL for indexer searches.',
|
prowlarr_base_url:
|
||||||
|
'Prowlarr server URL for indexer searches (FQDN or IP). Scheme is optional.',
|
||||||
prowlarr_api_key: 'API key for Prowlarr.',
|
prowlarr_api_key: 'API key for Prowlarr.',
|
||||||
qbittorrent_base_url: 'qBittorrent server URL for download status.',
|
qbittorrent_base_url:
|
||||||
|
'qBittorrent server URL for download status (FQDN or IP). Scheme is optional.',
|
||||||
qbittorrent_username: 'qBittorrent login username.',
|
qbittorrent_username: 'qBittorrent login username.',
|
||||||
qbittorrent_password: 'qBittorrent login password.',
|
qbittorrent_password: 'qBittorrent login password.',
|
||||||
requests_sync_ttl_minutes: 'How long saved requests stay fresh before a refresh is needed.',
|
requests_sync_ttl_minutes: 'How long saved requests stay fresh before a refresh is needed.',
|
||||||
@@ -371,6 +396,16 @@ export default function SettingsPage({ section }: SettingsPageProps) {
|
|||||||
site_changelog: 'One update per line for the public changelog.',
|
site_changelog: 'One update per line for the public changelog.',
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const settingPlaceholders: Record<string, string> = {
|
||||||
|
jellyseerr_base_url: 'https://requests.example.com or 10.30.1.81:5055',
|
||||||
|
jellyfin_base_url: 'https://jelly.example.com or 10.40.0.80:8096',
|
||||||
|
jellyfin_public_url: 'https://jelly.example.com',
|
||||||
|
sonarr_base_url: 'https://sonarr.example.com or 10.30.1.81:8989',
|
||||||
|
radarr_base_url: 'https://radarr.example.com or 10.30.1.81:7878',
|
||||||
|
prowlarr_base_url: 'https://prowlarr.example.com or 10.30.1.81:9696',
|
||||||
|
qbittorrent_base_url: 'https://qb.example.com or 10.30.1.81:8080',
|
||||||
|
}
|
||||||
|
|
||||||
const buildSelectOptions = (
|
const buildSelectOptions = (
|
||||||
currentValue: string,
|
currentValue: string,
|
||||||
options: { id: number; label: string; path?: string }[],
|
options: { id: number; label: string; path?: string }[],
|
||||||
@@ -552,7 +587,100 @@ export default function SettingsPage({ section }: SettingsPageProps) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
if (!artworkPrefetch || artworkPrefetch.status !== 'running') {
|
const shouldSubscribe = showRequestsExtras || showArtworkExtras || showLogs
|
||||||
|
if (!shouldSubscribe) {
|
||||||
|
setLiveStreamConnected(false)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
const token = getToken()
|
||||||
|
if (!token) {
|
||||||
|
setLiveStreamConnected(false)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
const baseUrl = getApiBase()
|
||||||
|
const params = new URLSearchParams()
|
||||||
|
params.set('access_token', token)
|
||||||
|
if (showLogs) {
|
||||||
|
params.set('include_logs', '1')
|
||||||
|
params.set('log_lines', String(logsCount))
|
||||||
|
}
|
||||||
|
const streamUrl = `${baseUrl}/admin/events/stream?${params.toString()}`
|
||||||
|
let closed = false
|
||||||
|
const source = new EventSource(streamUrl)
|
||||||
|
|
||||||
|
source.onopen = () => {
|
||||||
|
if (closed) return
|
||||||
|
setLiveStreamConnected(true)
|
||||||
|
}
|
||||||
|
|
||||||
|
source.onmessage = (event) => {
|
||||||
|
if (closed) return
|
||||||
|
setLiveStreamConnected(true)
|
||||||
|
try {
|
||||||
|
const payload = JSON.parse(event.data)
|
||||||
|
if (!payload || payload.type !== 'admin_live_state') {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
const rawSync =
|
||||||
|
payload.requestsSync && typeof payload.requestsSync === 'object'
|
||||||
|
? payload.requestsSync
|
||||||
|
: null
|
||||||
|
const nextSync = rawSync?.status === 'idle' ? null : rawSync
|
||||||
|
const prevSync = requestsSyncRef.current
|
||||||
|
requestsSyncRef.current = nextSync
|
||||||
|
setRequestsSync(nextSync)
|
||||||
|
if (prevSync?.status === 'running' && nextSync?.status && nextSync.status !== 'running') {
|
||||||
|
setRequestsSyncStatus(nextSync.message || 'Sync complete.')
|
||||||
|
}
|
||||||
|
|
||||||
|
const rawArtwork =
|
||||||
|
payload.artworkPrefetch && typeof payload.artworkPrefetch === 'object'
|
||||||
|
? payload.artworkPrefetch
|
||||||
|
: null
|
||||||
|
const nextArtwork = rawArtwork?.status === 'idle' ? null : rawArtwork
|
||||||
|
const prevArtwork = artworkPrefetchRef.current
|
||||||
|
artworkPrefetchRef.current = nextArtwork
|
||||||
|
setArtworkPrefetch(nextArtwork)
|
||||||
|
if (
|
||||||
|
prevArtwork?.status === 'running' &&
|
||||||
|
nextArtwork?.status &&
|
||||||
|
nextArtwork.status !== 'running'
|
||||||
|
) {
|
||||||
|
setArtworkPrefetchStatus(nextArtwork.message || 'Artwork caching complete.')
|
||||||
|
if (showArtworkExtras) {
|
||||||
|
void loadArtworkSummary()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (payload.logs && typeof payload.logs === 'object') {
|
||||||
|
if (Array.isArray(payload.logs.lines)) {
|
||||||
|
setLogsLines(payload.logs.lines)
|
||||||
|
setLogsStatus(null)
|
||||||
|
} else if (typeof payload.logs.error === 'string' && payload.logs.error.trim()) {
|
||||||
|
setLogsStatus(payload.logs.error)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} catch (err) {
|
||||||
|
console.error(err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
source.onerror = () => {
|
||||||
|
if (closed) return
|
||||||
|
setLiveStreamConnected(false)
|
||||||
|
}
|
||||||
|
|
||||||
|
return () => {
|
||||||
|
closed = true
|
||||||
|
setLiveStreamConnected(false)
|
||||||
|
source.close()
|
||||||
|
}
|
||||||
|
}, [loadArtworkSummary, logsCount, showArtworkExtras, showLogs, showRequestsExtras])
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
if (liveStreamConnected || !artworkPrefetch || artworkPrefetch.status !== 'running') {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
let active = true
|
let active = true
|
||||||
@@ -578,7 +706,7 @@ export default function SettingsPage({ section }: SettingsPageProps) {
|
|||||||
active = false
|
active = false
|
||||||
clearInterval(timer)
|
clearInterval(timer)
|
||||||
}
|
}
|
||||||
}, [artworkPrefetch, loadArtworkSummary])
|
}, [artworkPrefetch, liveStreamConnected, loadArtworkSummary])
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
if (!artworkPrefetch || artworkPrefetch.status === 'running') {
|
if (!artworkPrefetch || artworkPrefetch.status === 'running') {
|
||||||
@@ -591,7 +719,7 @@ export default function SettingsPage({ section }: SettingsPageProps) {
|
|||||||
}, [artworkPrefetch])
|
}, [artworkPrefetch])
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
if (!requestsSync || requestsSync.status !== 'running') {
|
if (liveStreamConnected || !requestsSync || requestsSync.status !== 'running') {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
let active = true
|
let active = true
|
||||||
@@ -616,7 +744,7 @@ export default function SettingsPage({ section }: SettingsPageProps) {
|
|||||||
active = false
|
active = false
|
||||||
clearInterval(timer)
|
clearInterval(timer)
|
||||||
}
|
}
|
||||||
}, [requestsSync])
|
}, [liveStreamConnected, requestsSync])
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
if (!requestsSync || requestsSync.status === 'running') {
|
if (!requestsSync || requestsSync.status === 'running') {
|
||||||
@@ -659,12 +787,15 @@ export default function SettingsPage({ section }: SettingsPageProps) {
|
|||||||
if (!showLogs) {
|
if (!showLogs) {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
if (liveStreamConnected) {
|
||||||
|
return
|
||||||
|
}
|
||||||
void loadLogs()
|
void loadLogs()
|
||||||
const timer = setInterval(() => {
|
const timer = setInterval(() => {
|
||||||
void loadLogs()
|
void loadLogs()
|
||||||
}, 5000)
|
}, 5000)
|
||||||
return () => clearInterval(timer)
|
return () => clearInterval(timer)
|
||||||
}, [loadLogs, showLogs])
|
}, [liveStreamConnected, loadLogs, showLogs])
|
||||||
|
|
||||||
const loadCache = async () => {
|
const loadCache = async () => {
|
||||||
setCacheStatus(null)
|
setCacheStatus(null)
|
||||||
@@ -739,7 +870,7 @@ export default function SettingsPage({ section }: SettingsPageProps) {
|
|||||||
setMaintenanceBusy(true)
|
setMaintenanceBusy(true)
|
||||||
if (typeof window !== 'undefined') {
|
if (typeof window !== 'undefined') {
|
||||||
const ok = window.confirm(
|
const ok = window.confirm(
|
||||||
'This will clear cached requests and history, then re-sync from Jellyseerr. Continue?'
|
'This will perform a nuclear reset: clear cached requests/history, wipe non-admin users, invites, and profiles, then re-sync users and requests from Jellyseerr. Continue?'
|
||||||
)
|
)
|
||||||
if (!ok) {
|
if (!ok) {
|
||||||
setMaintenanceBusy(false)
|
setMaintenanceBusy(false)
|
||||||
@@ -748,7 +879,7 @@ export default function SettingsPage({ section }: SettingsPageProps) {
|
|||||||
}
|
}
|
||||||
try {
|
try {
|
||||||
const baseUrl = getApiBase()
|
const baseUrl = getApiBase()
|
||||||
setMaintenanceStatus('Flushing database...')
|
setMaintenanceStatus('Running nuclear flush...')
|
||||||
const flushResponse = await authFetch(`${baseUrl}/admin/maintenance/flush`, {
|
const flushResponse = await authFetch(`${baseUrl}/admin/maintenance/flush`, {
|
||||||
method: 'POST',
|
method: 'POST',
|
||||||
})
|
})
|
||||||
@@ -756,12 +887,25 @@ export default function SettingsPage({ section }: SettingsPageProps) {
|
|||||||
const text = await flushResponse.text()
|
const text = await flushResponse.text()
|
||||||
throw new Error(text || 'Flush failed')
|
throw new Error(text || 'Flush failed')
|
||||||
}
|
}
|
||||||
setMaintenanceStatus('Database flushed. Starting re-sync...')
|
const flushData = await flushResponse.json()
|
||||||
|
const usersCleared = Number(flushData?.userObjectsCleared?.users ?? 0)
|
||||||
|
setMaintenanceStatus(`Nuclear flush complete. Cleared ${usersCleared} non-admin users. Re-syncing users...`)
|
||||||
|
const usersResyncResponse = await authFetch(`${baseUrl}/admin/jellyseerr/users/resync`, {
|
||||||
|
method: 'POST',
|
||||||
|
})
|
||||||
|
if (!usersResyncResponse.ok) {
|
||||||
|
const text = await usersResyncResponse.text()
|
||||||
|
throw new Error(text || 'User resync failed')
|
||||||
|
}
|
||||||
|
const usersResyncData = await usersResyncResponse.json()
|
||||||
|
setMaintenanceStatus(
|
||||||
|
`Users re-synced (${usersResyncData?.imported ?? 0} imported). Starting request re-sync...`
|
||||||
|
)
|
||||||
await syncRequests()
|
await syncRequests()
|
||||||
setMaintenanceStatus('Database flushed. Re-sync running now.')
|
setMaintenanceStatus('Nuclear flush complete. User and request re-sync running now.')
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
console.error(err)
|
console.error(err)
|
||||||
setMaintenanceStatus('Flush + resync failed.')
|
setMaintenanceStatus('Nuclear flush + resync failed.')
|
||||||
} finally {
|
} finally {
|
||||||
setMaintenanceBusy(false)
|
setMaintenanceBusy(false)
|
||||||
}
|
}
|
||||||
@@ -982,6 +1126,10 @@ export default function SettingsPage({ section }: SettingsPageProps) {
|
|||||||
const isRadarrProfile = setting.key === 'radarr_quality_profile_id'
|
const isRadarrProfile = setting.key === 'radarr_quality_profile_id'
|
||||||
const isRadarrRoot = setting.key === 'radarr_root_folder'
|
const isRadarrRoot = setting.key === 'radarr_root_folder'
|
||||||
const isBoolSetting = BOOL_SETTINGS.has(setting.key)
|
const isBoolSetting = BOOL_SETTINGS.has(setting.key)
|
||||||
|
const isUrlSetting = URL_SETTINGS.has(setting.key)
|
||||||
|
const inputPlaceholder = setting.sensitive && setting.isSet
|
||||||
|
? 'Configured (enter to replace)'
|
||||||
|
: settingPlaceholders[setting.key] ?? ''
|
||||||
if (isBoolSetting) {
|
if (isBoolSetting) {
|
||||||
return (
|
return (
|
||||||
<label key={setting.key} data-helper={helperText || undefined}>
|
<label key={setting.key} data-helper={helperText || undefined}>
|
||||||
@@ -1312,9 +1460,8 @@ export default function SettingsPage({ section }: SettingsPageProps) {
|
|||||||
<input
|
<input
|
||||||
name={setting.key}
|
name={setting.key}
|
||||||
type={setting.sensitive ? 'password' : 'text'}
|
type={setting.sensitive ? 'password' : 'text'}
|
||||||
placeholder={
|
placeholder={inputPlaceholder}
|
||||||
setting.sensitive && setting.isSet ? 'Configured (enter to replace)' : ''
|
autoComplete={isUrlSetting ? 'url' : undefined}
|
||||||
}
|
|
||||||
value={value}
|
value={value}
|
||||||
onChange={(event) =>
|
onChange={(event) =>
|
||||||
setFormValues((current) => ({
|
setFormValues((current) => ({
|
||||||
@@ -1425,7 +1572,7 @@ export default function SettingsPage({ section }: SettingsPageProps) {
|
|||||||
<h2>Maintenance</h2>
|
<h2>Maintenance</h2>
|
||||||
</div>
|
</div>
|
||||||
<div className="status-banner">
|
<div className="status-banner">
|
||||||
Emergency tools. Use with care: flush will clear saved requests and history.
|
Emergency tools. Use with care: flush + resync now performs a nuclear wipe of non-admin users, invite links, profiles, cached requests, and history before re-syncing Jellyseerr users/requests.
|
||||||
</div>
|
</div>
|
||||||
{maintenanceStatus && <div className="status-banner">{maintenanceStatus}</div>}
|
{maintenanceStatus && <div className="status-banner">{maintenanceStatus}</div>}
|
||||||
<div className="maintenance-grid">
|
<div className="maintenance-grid">
|
||||||
@@ -1444,7 +1591,7 @@ export default function SettingsPage({ section }: SettingsPageProps) {
|
|||||||
onClick={runFlushAndResync}
|
onClick={runFlushAndResync}
|
||||||
disabled={maintenanceBusy}
|
disabled={maintenanceBusy}
|
||||||
>
|
>
|
||||||
Flush database + resync
|
Nuclear flush + resync
|
||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
</section>
|
</section>
|
||||||
|
|||||||
1044
frontend/app/admin/invites/page.tsx
Normal file
1044
frontend/app/admin/invites/page.tsx
Normal file
File diff suppressed because it is too large
Load Diff
6
frontend/app/admin/profiles/page.tsx
Normal file
6
frontend/app/admin/profiles/page.tsx
Normal file
@@ -0,0 +1,6 @@
|
|||||||
|
import { redirect } from 'next/navigation'
|
||||||
|
|
||||||
|
export default function AdminProfilesRedirectPage() {
|
||||||
|
redirect('/admin/invites')
|
||||||
|
}
|
||||||
|
|
||||||
172
frontend/app/admin/requests-all/page.tsx
Normal file
172
frontend/app/admin/requests-all/page.tsx
Normal file
@@ -0,0 +1,172 @@
|
|||||||
|
'use client'
|
||||||
|
|
||||||
|
import { useEffect, useMemo, useState } from 'react'
|
||||||
|
import { useRouter } from 'next/navigation'
|
||||||
|
import { authFetch, clearToken, getApiBase, getToken } from '../../lib/auth'
|
||||||
|
import AdminShell from '../../ui/AdminShell'
|
||||||
|
|
||||||
|
type RequestRow = {
|
||||||
|
id: number
|
||||||
|
title?: string | null
|
||||||
|
year?: number | null
|
||||||
|
type?: string | null
|
||||||
|
statusLabel?: string | null
|
||||||
|
requestedBy?: string | null
|
||||||
|
createdAt?: string | null
|
||||||
|
}
|
||||||
|
|
||||||
|
const formatDateTime = (value?: string | null) => {
|
||||||
|
if (!value) return 'Unknown'
|
||||||
|
const date = new Date(value)
|
||||||
|
if (Number.isNaN(date.valueOf())) return value
|
||||||
|
return date.toLocaleString()
|
||||||
|
}
|
||||||
|
|
||||||
|
export default function AdminRequestsAllPage() {
|
||||||
|
const router = useRouter()
|
||||||
|
const [rows, setRows] = useState<RequestRow[]>([])
|
||||||
|
const [total, setTotal] = useState(0)
|
||||||
|
const [loading, setLoading] = useState(false)
|
||||||
|
const [error, setError] = useState<string | null>(null)
|
||||||
|
const [pageSize, setPageSize] = useState(50)
|
||||||
|
const [page, setPage] = useState(1)
|
||||||
|
|
||||||
|
const pageCount = useMemo(() => {
|
||||||
|
if (!total || pageSize <= 0) return 1
|
||||||
|
return Math.max(1, Math.ceil(total / pageSize))
|
||||||
|
}, [total, pageSize])
|
||||||
|
|
||||||
|
const load = async () => {
|
||||||
|
if (!getToken()) {
|
||||||
|
router.push('/login')
|
||||||
|
return
|
||||||
|
}
|
||||||
|
setLoading(true)
|
||||||
|
setError(null)
|
||||||
|
try {
|
||||||
|
const baseUrl = getApiBase()
|
||||||
|
const skip = (page - 1) * pageSize
|
||||||
|
const response = await authFetch(
|
||||||
|
`${baseUrl}/admin/requests/all?take=${pageSize}&skip=${skip}`
|
||||||
|
)
|
||||||
|
if (!response.ok) {
|
||||||
|
if (response.status === 401) {
|
||||||
|
clearToken()
|
||||||
|
router.push('/login')
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if (response.status === 403) {
|
||||||
|
router.push('/')
|
||||||
|
return
|
||||||
|
}
|
||||||
|
throw new Error(`Load failed: ${response.status}`)
|
||||||
|
}
|
||||||
|
const data = await response.json()
|
||||||
|
setRows(Array.isArray(data?.results) ? data.results : [])
|
||||||
|
setTotal(Number(data?.total ?? 0))
|
||||||
|
} catch (err) {
|
||||||
|
console.error(err)
|
||||||
|
setError('Unable to load requests.')
|
||||||
|
} finally {
|
||||||
|
setLoading(false)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
void load()
|
||||||
|
}, [page, pageSize])
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
if (page > pageCount) {
|
||||||
|
setPage(pageCount)
|
||||||
|
}
|
||||||
|
}, [pageCount, page])
|
||||||
|
|
||||||
|
return (
|
||||||
|
<AdminShell
|
||||||
|
title="All requests"
|
||||||
|
subtitle="Paginated view of every cached request."
|
||||||
|
actions={
|
||||||
|
<button type="button" onClick={() => router.push('/admin')}>
|
||||||
|
Back to settings
|
||||||
|
</button>
|
||||||
|
}
|
||||||
|
>
|
||||||
|
<section className="admin-section">
|
||||||
|
<div className="admin-toolbar">
|
||||||
|
<div className="admin-toolbar-info">
|
||||||
|
<span>{total.toLocaleString()} total</span>
|
||||||
|
</div>
|
||||||
|
<div className="admin-toolbar-actions">
|
||||||
|
<label className="admin-select">
|
||||||
|
<span>Per page</span>
|
||||||
|
<select value={pageSize} onChange={(e) => setPageSize(Number(e.target.value))}>
|
||||||
|
<option value={25}>25</option>
|
||||||
|
<option value={50}>50</option>
|
||||||
|
<option value={100}>100</option>
|
||||||
|
<option value={200}>200</option>
|
||||||
|
</select>
|
||||||
|
</label>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
{loading ? (
|
||||||
|
<div className="status-banner">Loading requests…</div>
|
||||||
|
) : error ? (
|
||||||
|
<div className="error-banner">{error}</div>
|
||||||
|
) : rows.length === 0 ? (
|
||||||
|
<div className="status-banner">No requests found.</div>
|
||||||
|
) : (
|
||||||
|
<div className="admin-table">
|
||||||
|
<div className="admin-table-head">
|
||||||
|
<span>Request</span>
|
||||||
|
<span>Status</span>
|
||||||
|
<span>Requested by</span>
|
||||||
|
<span>Created</span>
|
||||||
|
</div>
|
||||||
|
{rows.map((row) => (
|
||||||
|
<button
|
||||||
|
key={row.id}
|
||||||
|
type="button"
|
||||||
|
className="admin-table-row"
|
||||||
|
onClick={() => router.push(`/requests/${row.id}`)}
|
||||||
|
>
|
||||||
|
<span>
|
||||||
|
{row.title || `Request #${row.id}`}
|
||||||
|
{row.year ? ` (${row.year})` : ''}
|
||||||
|
</span>
|
||||||
|
<span>{row.statusLabel || 'Unknown'}</span>
|
||||||
|
<span>{row.requestedBy || 'Unknown'}</span>
|
||||||
|
<span>{formatDateTime(row.createdAt)}</span>
|
||||||
|
</button>
|
||||||
|
))}
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
<div className="admin-pagination">
|
||||||
|
<button type="button" onClick={() => setPage(1)} disabled={page <= 1}>
|
||||||
|
First
|
||||||
|
</button>
|
||||||
|
<button type="button" onClick={() => setPage(page - 1)} disabled={page <= 1}>
|
||||||
|
Previous
|
||||||
|
</button>
|
||||||
|
<span>
|
||||||
|
Page {page} of {pageCount}
|
||||||
|
</span>
|
||||||
|
<button
|
||||||
|
type="button"
|
||||||
|
onClick={() => setPage(page + 1)}
|
||||||
|
disabled={page >= pageCount}
|
||||||
|
>
|
||||||
|
Next
|
||||||
|
</button>
|
||||||
|
<button
|
||||||
|
type="button"
|
||||||
|
onClick={() => setPage(pageCount)}
|
||||||
|
disabled={page >= pageCount}
|
||||||
|
>
|
||||||
|
Last
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
</section>
|
||||||
|
</AdminShell>
|
||||||
|
)
|
||||||
|
}
|
||||||
File diff suppressed because it is too large
Load Diff
@@ -85,6 +85,9 @@ export default function LoginPage() {
|
|||||||
>
|
>
|
||||||
Sign in with Magent account
|
Sign in with Magent account
|
||||||
</button>
|
</button>
|
||||||
|
<a className="ghost-button" href="/signup">
|
||||||
|
Have an invite? Create a Magent account
|
||||||
|
</a>
|
||||||
</form>
|
</form>
|
||||||
</main>
|
</main>
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -4,6 +4,24 @@ import { useRouter } from 'next/navigation'
|
|||||||
import { useEffect, useState } from 'react'
|
import { useEffect, useState } from 'react'
|
||||||
import { authFetch, getApiBase, getToken, clearToken } from './lib/auth'
|
import { authFetch, getApiBase, getToken, clearToken } from './lib/auth'
|
||||||
|
|
||||||
|
const normalizeRecentResults = (items: any[]) =>
|
||||||
|
items
|
||||||
|
.filter((item: any) => item?.id)
|
||||||
|
.map((item: any) => {
|
||||||
|
const id = item.id
|
||||||
|
const rawTitle = item.title
|
||||||
|
const placeholder =
|
||||||
|
typeof rawTitle === 'string' && rawTitle.trim().toLowerCase() === `request ${id}`
|
||||||
|
return {
|
||||||
|
id,
|
||||||
|
title: !rawTitle || placeholder ? `Request #${id}` : rawTitle,
|
||||||
|
year: item.year,
|
||||||
|
statusLabel: item.statusLabel,
|
||||||
|
artwork: item.artwork,
|
||||||
|
createdAt: item.createdAt ?? null,
|
||||||
|
}
|
||||||
|
})
|
||||||
|
|
||||||
export default function HomePage() {
|
export default function HomePage() {
|
||||||
const router = useRouter()
|
const router = useRouter()
|
||||||
const [query, setQuery] = useState('')
|
const [query, setQuery] = useState('')
|
||||||
@@ -14,6 +32,7 @@ export default function HomePage() {
|
|||||||
year?: number
|
year?: number
|
||||||
statusLabel?: string
|
statusLabel?: string
|
||||||
artwork?: { poster_url?: string }
|
artwork?: { poster_url?: string }
|
||||||
|
createdAt?: string | null
|
||||||
}[]
|
}[]
|
||||||
>([])
|
>([])
|
||||||
const [recentError, setRecentError] = useState<string | null>(null)
|
const [recentError, setRecentError] = useState<string | null>(null)
|
||||||
@@ -32,6 +51,7 @@ export default function HomePage() {
|
|||||||
const [servicesError, setServicesError] = useState<string | null>(null)
|
const [servicesError, setServicesError] = useState<string | null>(null)
|
||||||
const [serviceTesting, setServiceTesting] = useState<Record<string, boolean>>({})
|
const [serviceTesting, setServiceTesting] = useState<Record<string, boolean>>({})
|
||||||
const [serviceTestResults, setServiceTestResults] = useState<Record<string, string | null>>({})
|
const [serviceTestResults, setServiceTestResults] = useState<Record<string, string | null>>({})
|
||||||
|
const [liveStreamConnected, setLiveStreamConnected] = useState(false)
|
||||||
|
|
||||||
const submit = (event: React.FormEvent) => {
|
const submit = (event: React.FormEvent) => {
|
||||||
event.preventDefault()
|
event.preventDefault()
|
||||||
@@ -136,24 +156,7 @@ export default function HomePage() {
|
|||||||
}
|
}
|
||||||
const data = await response.json()
|
const data = await response.json()
|
||||||
if (Array.isArray(data?.results)) {
|
if (Array.isArray(data?.results)) {
|
||||||
setRecent(
|
setRecent(normalizeRecentResults(data.results))
|
||||||
data.results
|
|
||||||
.filter((item: any) => item?.id)
|
|
||||||
.map((item: any) => {
|
|
||||||
const id = item.id
|
|
||||||
const rawTitle = item.title
|
|
||||||
const placeholder =
|
|
||||||
typeof rawTitle === 'string' &&
|
|
||||||
rawTitle.trim().toLowerCase() === `request ${id}`
|
|
||||||
return {
|
|
||||||
id,
|
|
||||||
title: !rawTitle || placeholder ? `Request #${id}` : rawTitle,
|
|
||||||
year: item.year,
|
|
||||||
statusLabel: item.statusLabel,
|
|
||||||
artwork: item.artwork,
|
|
||||||
}
|
|
||||||
})
|
|
||||||
)
|
|
||||||
}
|
}
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.error(error)
|
console.error(error)
|
||||||
@@ -194,10 +197,79 @@ export default function HomePage() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
load()
|
void load()
|
||||||
|
if (liveStreamConnected) {
|
||||||
|
return
|
||||||
|
}
|
||||||
const timer = setInterval(load, 30000)
|
const timer = setInterval(load, 30000)
|
||||||
return () => clearInterval(timer)
|
return () => clearInterval(timer)
|
||||||
}, [authReady, router])
|
}, [authReady, liveStreamConnected, router])
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
if (!authReady) {
|
||||||
|
setLiveStreamConnected(false)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
const token = getToken()
|
||||||
|
if (!token) {
|
||||||
|
setLiveStreamConnected(false)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
const baseUrl = getApiBase()
|
||||||
|
const streamUrl = `${baseUrl}/events/stream?access_token=${encodeURIComponent(token)}&recent_days=${encodeURIComponent(String(recentDays))}`
|
||||||
|
let closed = false
|
||||||
|
const source = new EventSource(streamUrl)
|
||||||
|
|
||||||
|
source.onopen = () => {
|
||||||
|
if (closed) return
|
||||||
|
setLiveStreamConnected(true)
|
||||||
|
}
|
||||||
|
|
||||||
|
source.onmessage = (event) => {
|
||||||
|
if (closed) return
|
||||||
|
setLiveStreamConnected(true)
|
||||||
|
try {
|
||||||
|
const payload = JSON.parse(event.data)
|
||||||
|
if (!payload || typeof payload !== 'object') {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if (payload.type === 'home_recent') {
|
||||||
|
if (Array.isArray(payload.results)) {
|
||||||
|
setRecent(normalizeRecentResults(payload.results))
|
||||||
|
setRecentError(null)
|
||||||
|
setRecentLoading(false)
|
||||||
|
} else if (typeof payload.error === 'string' && payload.error.trim()) {
|
||||||
|
setRecentError('Recent requests are not available right now.')
|
||||||
|
setRecentLoading(false)
|
||||||
|
}
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if (payload.type === 'home_services') {
|
||||||
|
if (payload.status && typeof payload.status === 'object') {
|
||||||
|
setServicesStatus(payload.status)
|
||||||
|
setServicesError(null)
|
||||||
|
setServicesLoading(false)
|
||||||
|
} else if (typeof payload.error === 'string' && payload.error.trim()) {
|
||||||
|
setServicesError('Service status is not available right now.')
|
||||||
|
setServicesLoading(false)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} catch (error) {
|
||||||
|
console.error(error)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
source.onerror = () => {
|
||||||
|
if (closed) return
|
||||||
|
setLiveStreamConnected(false)
|
||||||
|
}
|
||||||
|
|
||||||
|
return () => {
|
||||||
|
closed = true
|
||||||
|
setLiveStreamConnected(false)
|
||||||
|
source.close()
|
||||||
|
}
|
||||||
|
}, [authReady, recentDays])
|
||||||
|
|
||||||
const runSearch = async (term: string) => {
|
const runSearch = async (term: string) => {
|
||||||
try {
|
try {
|
||||||
@@ -236,6 +308,13 @@ export default function HomePage() {
|
|||||||
return url.startsWith('http') ? url : `${getApiBase()}${url}`
|
return url.startsWith('http') ? url : `${getApiBase()}${url}`
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const formatRequestTime = (value?: string | null) => {
|
||||||
|
if (!value) return null
|
||||||
|
const date = new Date(value)
|
||||||
|
if (Number.isNaN(date.valueOf())) return value
|
||||||
|
return date.toLocaleString()
|
||||||
|
}
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<main className="card">
|
<main className="card">
|
||||||
<div className="layout-grid">
|
<div className="layout-grid">
|
||||||
@@ -312,11 +391,12 @@ export default function HomePage() {
|
|||||||
<h2>{role === 'admin' ? 'All requests' : 'My recent requests'}</h2>
|
<h2>{role === 'admin' ? 'All requests' : 'My recent requests'}</h2>
|
||||||
{authReady && (
|
{authReady && (
|
||||||
<label className="recent-filter">
|
<label className="recent-filter">
|
||||||
<span>Show last</span>
|
<span>Show</span>
|
||||||
<select
|
<select
|
||||||
value={recentDays}
|
value={recentDays}
|
||||||
onChange={(event) => setRecentDays(Number(event.target.value))}
|
onChange={(event) => setRecentDays(Number(event.target.value))}
|
||||||
>
|
>
|
||||||
|
<option value={0}>All</option>
|
||||||
<option value={30}>30 days</option>
|
<option value={30}>30 days</option>
|
||||||
<option value={60}>60 days</option>
|
<option value={60}>60 days</option>
|
||||||
<option value={90}>90 days</option>
|
<option value={90}>90 days</option>
|
||||||
@@ -363,6 +443,7 @@ export default function HomePage() {
|
|||||||
<span className="recent-meta">
|
<span className="recent-meta">
|
||||||
{item.statusLabel ? item.statusLabel : 'Status not available yet'} · Request{' '}
|
{item.statusLabel ? item.statusLabel : 'Status not available yet'} · Request{' '}
|
||||||
{item.id}
|
{item.id}
|
||||||
|
{item.createdAt ? ` · ${formatRequestTime(item.createdAt)}` : ''}
|
||||||
</span>
|
</span>
|
||||||
</span>
|
</span>
|
||||||
</button>
|
</button>
|
||||||
|
|||||||
223
frontend/app/signup/page.tsx
Normal file
223
frontend/app/signup/page.tsx
Normal file
@@ -0,0 +1,223 @@
|
|||||||
|
'use client'
|
||||||
|
|
||||||
|
import { Suspense, useEffect, useMemo, useState } from 'react'
|
||||||
|
import { useRouter, useSearchParams } from 'next/navigation'
|
||||||
|
import BrandingLogo from '../ui/BrandingLogo'
|
||||||
|
import { clearToken, getApiBase, setToken } from '../lib/auth'
|
||||||
|
|
||||||
|
type InviteInfo = {
|
||||||
|
code: string
|
||||||
|
label?: string | null
|
||||||
|
description?: string | null
|
||||||
|
enabled: boolean
|
||||||
|
is_expired?: boolean
|
||||||
|
is_usable?: boolean
|
||||||
|
expires_at?: string | null
|
||||||
|
max_uses?: number | null
|
||||||
|
use_count?: number | null
|
||||||
|
remaining_uses?: number | null
|
||||||
|
profile?: {
|
||||||
|
id: number
|
||||||
|
name: string
|
||||||
|
description?: string | null
|
||||||
|
} | null
|
||||||
|
}
|
||||||
|
|
||||||
|
const formatDate = (value?: string | null) => {
|
||||||
|
if (!value) return 'Never'
|
||||||
|
const date = new Date(value)
|
||||||
|
if (Number.isNaN(date.valueOf())) return value
|
||||||
|
return date.toLocaleString()
|
||||||
|
}
|
||||||
|
|
||||||
|
function SignupPageContent() {
|
||||||
|
const router = useRouter()
|
||||||
|
const searchParams = useSearchParams()
|
||||||
|
const [inviteCode, setInviteCode] = useState(searchParams.get('code') ?? '')
|
||||||
|
const [invite, setInvite] = useState<InviteInfo | null>(null)
|
||||||
|
const [inviteLoading, setInviteLoading] = useState(false)
|
||||||
|
const [loading, setLoading] = useState(false)
|
||||||
|
const [username, setUsername] = useState('')
|
||||||
|
const [password, setPassword] = useState('')
|
||||||
|
const [confirmPassword, setConfirmPassword] = useState('')
|
||||||
|
const [error, setError] = useState<string | null>(null)
|
||||||
|
const [status, setStatus] = useState<string | null>(null)
|
||||||
|
|
||||||
|
const canSubmit = useMemo(() => {
|
||||||
|
return Boolean(invite?.is_usable && username.trim() && password && !loading)
|
||||||
|
}, [invite, username, password, loading])
|
||||||
|
|
||||||
|
const lookupInvite = async (code: string) => {
|
||||||
|
const trimmed = code.trim()
|
||||||
|
if (!trimmed) {
|
||||||
|
setInvite(null)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
setInviteLoading(true)
|
||||||
|
setError(null)
|
||||||
|
setStatus(null)
|
||||||
|
try {
|
||||||
|
const baseUrl = getApiBase()
|
||||||
|
const response = await fetch(`${baseUrl}/auth/invites/${encodeURIComponent(trimmed)}`)
|
||||||
|
if (!response.ok) {
|
||||||
|
const text = await response.text()
|
||||||
|
throw new Error(text || 'Invite not found')
|
||||||
|
}
|
||||||
|
const data = await response.json()
|
||||||
|
setInvite(data?.invite ?? null)
|
||||||
|
setStatus('Invite loaded.')
|
||||||
|
} catch (err) {
|
||||||
|
console.error(err)
|
||||||
|
setInvite(null)
|
||||||
|
setError('Invite code not found or unavailable.')
|
||||||
|
} finally {
|
||||||
|
setInviteLoading(false)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
const initialCode = searchParams.get('code') ?? ''
|
||||||
|
if (initialCode) {
|
||||||
|
setInviteCode(initialCode)
|
||||||
|
void lookupInvite(initialCode)
|
||||||
|
}
|
||||||
|
}, [searchParams])
|
||||||
|
|
||||||
|
const submit = async (event: React.FormEvent) => {
|
||||||
|
event.preventDefault()
|
||||||
|
if (password !== confirmPassword) {
|
||||||
|
setError('Passwords do not match.')
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if (!inviteCode.trim()) {
|
||||||
|
setError('Invite code is required.')
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if (!invite?.is_usable) {
|
||||||
|
setError('Invite is not usable. Refresh invite details or ask an admin for a new code.')
|
||||||
|
return
|
||||||
|
}
|
||||||
|
setLoading(true)
|
||||||
|
setError(null)
|
||||||
|
setStatus(null)
|
||||||
|
try {
|
||||||
|
clearToken()
|
||||||
|
const baseUrl = getApiBase()
|
||||||
|
const response = await fetch(`${baseUrl}/auth/signup`, {
|
||||||
|
method: 'POST',
|
||||||
|
headers: { 'Content-Type': 'application/json' },
|
||||||
|
body: JSON.stringify({
|
||||||
|
invite_code: inviteCode,
|
||||||
|
username: username.trim(),
|
||||||
|
password,
|
||||||
|
}),
|
||||||
|
})
|
||||||
|
if (!response.ok) {
|
||||||
|
const text = await response.text()
|
||||||
|
throw new Error(text || 'Sign-up failed')
|
||||||
|
}
|
||||||
|
const data = await response.json()
|
||||||
|
if (data?.access_token) {
|
||||||
|
setToken(data.access_token)
|
||||||
|
window.location.href = '/'
|
||||||
|
return
|
||||||
|
}
|
||||||
|
throw new Error('Sign-up did not return a token')
|
||||||
|
} catch (err) {
|
||||||
|
console.error(err)
|
||||||
|
setError(err instanceof Error ? err.message : 'Unable to create account.')
|
||||||
|
} finally {
|
||||||
|
setLoading(false)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return (
|
||||||
|
<main className="card auth-card">
|
||||||
|
<BrandingLogo className="brand-logo brand-logo--login" />
|
||||||
|
<h1>Create account</h1>
|
||||||
|
<p className="lede">Use an invite code from your admin to create a Magent account.</p>
|
||||||
|
<form onSubmit={submit} className="auth-form">
|
||||||
|
<label>
|
||||||
|
Invite code
|
||||||
|
<div className="invite-lookup-row">
|
||||||
|
<input
|
||||||
|
value={inviteCode}
|
||||||
|
onChange={(e) => setInviteCode(e.target.value)}
|
||||||
|
placeholder="Paste your invite code"
|
||||||
|
autoCapitalize="characters"
|
||||||
|
/>
|
||||||
|
<button
|
||||||
|
type="button"
|
||||||
|
className="ghost-button"
|
||||||
|
disabled={inviteLoading}
|
||||||
|
onClick={() => void lookupInvite(inviteCode)}
|
||||||
|
>
|
||||||
|
{inviteLoading ? 'Checking…' : 'Check invite'}
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
</label>
|
||||||
|
{invite && (
|
||||||
|
<div className={`invite-summary ${invite.is_usable ? '' : 'is-disabled'}`}>
|
||||||
|
<div className="invite-summary-row">
|
||||||
|
<strong>{invite.label || invite.code}</strong>
|
||||||
|
<span className={`small-pill ${invite.is_usable ? '' : 'is-muted'}`}>
|
||||||
|
{invite.is_usable ? 'Usable' : 'Unavailable'}
|
||||||
|
</span>
|
||||||
|
</div>
|
||||||
|
{invite.description && <p>{invite.description}</p>}
|
||||||
|
<div className="admin-meta-row">
|
||||||
|
<span>Code: {invite.code}</span>
|
||||||
|
<span>Expires: {formatDate(invite.expires_at)}</span>
|
||||||
|
<span>Remaining uses: {invite.remaining_uses ?? 'Unlimited'}</span>
|
||||||
|
<span>Profile: {invite.profile?.name || 'None'}</span>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
<label>
|
||||||
|
Username
|
||||||
|
<input
|
||||||
|
value={username}
|
||||||
|
onChange={(e) => setUsername(e.target.value)}
|
||||||
|
autoComplete="username"
|
||||||
|
/>
|
||||||
|
</label>
|
||||||
|
<label>
|
||||||
|
Password
|
||||||
|
<input
|
||||||
|
type="password"
|
||||||
|
value={password}
|
||||||
|
onChange={(e) => setPassword(e.target.value)}
|
||||||
|
autoComplete="new-password"
|
||||||
|
/>
|
||||||
|
</label>
|
||||||
|
<label>
|
||||||
|
Confirm password
|
||||||
|
<input
|
||||||
|
type="password"
|
||||||
|
value={confirmPassword}
|
||||||
|
onChange={(e) => setConfirmPassword(e.target.value)}
|
||||||
|
autoComplete="new-password"
|
||||||
|
/>
|
||||||
|
</label>
|
||||||
|
{error && <div className="error-banner">{error}</div>}
|
||||||
|
{status && <div className="status-banner">{status}</div>}
|
||||||
|
<div className="auth-actions">
|
||||||
|
<button type="submit" disabled={!canSubmit}>
|
||||||
|
{loading ? 'Creating account…' : 'Create account'}
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
<button type="button" className="ghost-button" disabled={loading} onClick={() => router.push('/login')}>
|
||||||
|
Back to sign in
|
||||||
|
</button>
|
||||||
|
</form>
|
||||||
|
</main>
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
export default function SignupPage() {
|
||||||
|
return (
|
||||||
|
<Suspense fallback={<main className="card auth-card">Loading sign-up…</main>}>
|
||||||
|
<SignupPageContent />
|
||||||
|
</Suspense>
|
||||||
|
)
|
||||||
|
}
|
||||||
@@ -18,6 +18,7 @@ const NAV_GROUPS = [
|
|||||||
title: 'Requests',
|
title: 'Requests',
|
||||||
items: [
|
items: [
|
||||||
{ href: '/admin/requests', label: 'Request sync' },
|
{ href: '/admin/requests', label: 'Request sync' },
|
||||||
|
{ href: '/admin/requests-all', label: 'All requests' },
|
||||||
{ href: '/admin/cache', label: 'Cache Control' },
|
{ href: '/admin/cache', label: 'Cache Control' },
|
||||||
],
|
],
|
||||||
},
|
},
|
||||||
@@ -26,6 +27,7 @@ const NAV_GROUPS = [
|
|||||||
items: [
|
items: [
|
||||||
{ href: '/admin/site', label: 'Site' },
|
{ href: '/admin/site', label: 'Site' },
|
||||||
{ href: '/users', label: 'Users' },
|
{ href: '/users', label: 'Users' },
|
||||||
|
{ href: '/admin/invites', label: 'Invite management' },
|
||||||
{ href: '/admin/logs', label: 'Activity log' },
|
{ href: '/admin/logs', label: 'Activity log' },
|
||||||
{ href: '/admin/maintenance', label: 'Maintenance' },
|
{ href: '/admin/maintenance', label: 'Maintenance' },
|
||||||
],
|
],
|
||||||
|
|||||||
554
frontend/app/users/[id]/page.tsx
Normal file
554
frontend/app/users/[id]/page.tsx
Normal file
@@ -0,0 +1,554 @@
|
|||||||
|
'use client'
|
||||||
|
|
||||||
|
import { useEffect, useState } from 'react'
|
||||||
|
import { useParams, useRouter } from 'next/navigation'
|
||||||
|
import { authFetch, clearToken, getApiBase, getToken } from '../../lib/auth'
|
||||||
|
import AdminShell from '../../ui/AdminShell'
|
||||||
|
|
||||||
|
type UserStats = {
|
||||||
|
total: number
|
||||||
|
ready: number
|
||||||
|
pending: number
|
||||||
|
approved: number
|
||||||
|
working: number
|
||||||
|
partial: number
|
||||||
|
declined: number
|
||||||
|
in_progress: number
|
||||||
|
last_request_at?: string | null
|
||||||
|
}
|
||||||
|
|
||||||
|
type AdminUser = {
|
||||||
|
id?: number
|
||||||
|
username: string
|
||||||
|
role: string
|
||||||
|
auth_provider?: string | null
|
||||||
|
last_login_at?: string | null
|
||||||
|
is_blocked?: boolean
|
||||||
|
auto_search_enabled?: boolean
|
||||||
|
jellyseerr_user_id?: number | null
|
||||||
|
profile_id?: number | null
|
||||||
|
expires_at?: string | null
|
||||||
|
is_expired?: boolean
|
||||||
|
}
|
||||||
|
|
||||||
|
type UserProfileOption = {
|
||||||
|
id: number
|
||||||
|
name: string
|
||||||
|
is_active?: boolean
|
||||||
|
}
|
||||||
|
|
||||||
|
const formatDateTime = (value?: string | null) => {
|
||||||
|
if (!value) return 'Never'
|
||||||
|
const date = new Date(value)
|
||||||
|
if (Number.isNaN(date.valueOf())) return value
|
||||||
|
return date.toLocaleString()
|
||||||
|
}
|
||||||
|
|
||||||
|
const toLocalDateTimeInput = (value?: string | null) => {
|
||||||
|
if (!value) return ''
|
||||||
|
const date = new Date(value)
|
||||||
|
if (Number.isNaN(date.valueOf())) return ''
|
||||||
|
const offsetMs = date.getTimezoneOffset() * 60_000
|
||||||
|
const local = new Date(date.getTime() - offsetMs)
|
||||||
|
return local.toISOString().slice(0, 16)
|
||||||
|
}
|
||||||
|
|
||||||
|
const fromLocalDateTimeInput = (value: string) => {
|
||||||
|
if (!value.trim()) return null
|
||||||
|
const date = new Date(value)
|
||||||
|
if (Number.isNaN(date.valueOf())) return null
|
||||||
|
return date.toISOString()
|
||||||
|
}
|
||||||
|
|
||||||
|
const normalizeStats = (stats: any): UserStats => ({
|
||||||
|
total: Number(stats?.total ?? 0),
|
||||||
|
ready: Number(stats?.ready ?? 0),
|
||||||
|
pending: Number(stats?.pending ?? 0),
|
||||||
|
approved: Number(stats?.approved ?? 0),
|
||||||
|
working: Number(stats?.working ?? 0),
|
||||||
|
partial: Number(stats?.partial ?? 0),
|
||||||
|
declined: Number(stats?.declined ?? 0),
|
||||||
|
in_progress: Number(stats?.in_progress ?? 0),
|
||||||
|
last_request_at: stats?.last_request_at ?? null,
|
||||||
|
})
|
||||||
|
|
||||||
|
export default function UserDetailPage() {
|
||||||
|
const params = useParams()
|
||||||
|
const router = useRouter()
|
||||||
|
const idParam = Array.isArray(params?.id) ? params.id[0] : params?.id
|
||||||
|
const [user, setUser] = useState<AdminUser | null>(null)
|
||||||
|
const [stats, setStats] = useState<UserStats | null>(null)
|
||||||
|
const [error, setError] = useState<string | null>(null)
|
||||||
|
const [loading, setLoading] = useState(true)
|
||||||
|
const [profiles, setProfiles] = useState<UserProfileOption[]>([])
|
||||||
|
const [profileSelection, setProfileSelection] = useState('')
|
||||||
|
const [expiryInput, setExpiryInput] = useState('')
|
||||||
|
const [savingProfile, setSavingProfile] = useState(false)
|
||||||
|
const [savingExpiry, setSavingExpiry] = useState(false)
|
||||||
|
const [actionStatus, setActionStatus] = useState<string | null>(null)
|
||||||
|
|
||||||
|
const loadProfiles = async () => {
|
||||||
|
try {
|
||||||
|
const baseUrl = getApiBase()
|
||||||
|
const response = await authFetch(`${baseUrl}/admin/profiles`)
|
||||||
|
if (!response.ok) {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
const data = await response.json()
|
||||||
|
if (!Array.isArray(data?.profiles)) {
|
||||||
|
setProfiles([])
|
||||||
|
return
|
||||||
|
}
|
||||||
|
setProfiles(
|
||||||
|
data.profiles.map((profile: any) => ({
|
||||||
|
id: Number(profile.id ?? 0),
|
||||||
|
name: String(profile.name ?? 'Unnamed profile'),
|
||||||
|
is_active: Boolean(profile.is_active ?? true),
|
||||||
|
}))
|
||||||
|
)
|
||||||
|
} catch (err) {
|
||||||
|
console.error(err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
const loadUser = async () => {
|
||||||
|
if (!idParam) return
|
||||||
|
try {
|
||||||
|
const baseUrl = getApiBase()
|
||||||
|
const response = await authFetch(
|
||||||
|
`${baseUrl}/admin/users/id/${encodeURIComponent(idParam)}`
|
||||||
|
)
|
||||||
|
if (!response.ok) {
|
||||||
|
if (response.status === 401) {
|
||||||
|
clearToken()
|
||||||
|
router.push('/login')
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if (response.status === 403) {
|
||||||
|
router.push('/')
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if (response.status === 404) {
|
||||||
|
setError('User not found.')
|
||||||
|
return
|
||||||
|
}
|
||||||
|
throw new Error('Could not load user.')
|
||||||
|
}
|
||||||
|
const data = await response.json()
|
||||||
|
const nextUser = data?.user ?? null
|
||||||
|
setUser(nextUser)
|
||||||
|
setStats(normalizeStats(data?.stats))
|
||||||
|
setProfileSelection(
|
||||||
|
nextUser?.profile_id == null || Number.isNaN(Number(nextUser?.profile_id))
|
||||||
|
? ''
|
||||||
|
: String(nextUser.profile_id)
|
||||||
|
)
|
||||||
|
setExpiryInput(toLocalDateTimeInput(nextUser?.expires_at))
|
||||||
|
setError(null)
|
||||||
|
} catch (err) {
|
||||||
|
console.error(err)
|
||||||
|
setError('Could not load user.')
|
||||||
|
} finally {
|
||||||
|
setLoading(false)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
const toggleUserBlock = async (blocked: boolean) => {
|
||||||
|
if (!user) return
|
||||||
|
try {
|
||||||
|
setActionStatus(null)
|
||||||
|
const baseUrl = getApiBase()
|
||||||
|
const response = await authFetch(
|
||||||
|
`${baseUrl}/admin/users/${encodeURIComponent(user.username)}/${blocked ? 'block' : 'unblock'}`,
|
||||||
|
{ method: 'POST' }
|
||||||
|
)
|
||||||
|
if (!response.ok) {
|
||||||
|
throw new Error('Update failed')
|
||||||
|
}
|
||||||
|
await loadUser()
|
||||||
|
setActionStatus(blocked ? 'User blocked.' : 'User unblocked.')
|
||||||
|
} catch (err) {
|
||||||
|
console.error(err)
|
||||||
|
setError('Could not update user access.')
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
const updateUserRole = async (role: string) => {
|
||||||
|
if (!user) return
|
||||||
|
try {
|
||||||
|
setActionStatus(null)
|
||||||
|
const baseUrl = getApiBase()
|
||||||
|
const response = await authFetch(
|
||||||
|
`${baseUrl}/admin/users/${encodeURIComponent(user.username)}/role`,
|
||||||
|
{
|
||||||
|
method: 'POST',
|
||||||
|
headers: { 'Content-Type': 'application/json' },
|
||||||
|
body: JSON.stringify({ role }),
|
||||||
|
}
|
||||||
|
)
|
||||||
|
if (!response.ok) {
|
||||||
|
throw new Error('Update failed')
|
||||||
|
}
|
||||||
|
await loadUser()
|
||||||
|
setActionStatus(`Role updated to ${role}.`)
|
||||||
|
} catch (err) {
|
||||||
|
console.error(err)
|
||||||
|
setError('Could not update user role.')
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
const updateAutoSearchEnabled = async (enabled: boolean) => {
|
||||||
|
if (!user) return
|
||||||
|
try {
|
||||||
|
setActionStatus(null)
|
||||||
|
const baseUrl = getApiBase()
|
||||||
|
const response = await authFetch(
|
||||||
|
`${baseUrl}/admin/users/${encodeURIComponent(user.username)}/auto-search`,
|
||||||
|
{
|
||||||
|
method: 'POST',
|
||||||
|
headers: { 'Content-Type': 'application/json' },
|
||||||
|
body: JSON.stringify({ enabled }),
|
||||||
|
}
|
||||||
|
)
|
||||||
|
if (!response.ok) {
|
||||||
|
throw new Error('Update failed')
|
||||||
|
}
|
||||||
|
await loadUser()
|
||||||
|
setActionStatus(`Auto search/download ${enabled ? 'enabled' : 'disabled'}.`)
|
||||||
|
} catch (err) {
|
||||||
|
console.error(err)
|
||||||
|
setError('Could not update auto search access.')
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
const applyProfileToUser = async (profileOverride?: string | null) => {
|
||||||
|
if (!user) return
|
||||||
|
const profileValue = profileOverride ?? profileSelection
|
||||||
|
setSavingProfile(true)
|
||||||
|
setError(null)
|
||||||
|
setActionStatus(null)
|
||||||
|
try {
|
||||||
|
const baseUrl = getApiBase()
|
||||||
|
const response = await authFetch(
|
||||||
|
`${baseUrl}/admin/users/${encodeURIComponent(user.username)}/profile`,
|
||||||
|
{
|
||||||
|
method: 'POST',
|
||||||
|
headers: { 'Content-Type': 'application/json' },
|
||||||
|
body: JSON.stringify({ profile_id: profileValue || null }),
|
||||||
|
}
|
||||||
|
)
|
||||||
|
if (!response.ok) {
|
||||||
|
const text = await response.text()
|
||||||
|
throw new Error(text || 'Profile update failed')
|
||||||
|
}
|
||||||
|
await loadUser()
|
||||||
|
setActionStatus(profileValue ? 'Profile applied to user.' : 'Profile assignment cleared.')
|
||||||
|
} catch (err) {
|
||||||
|
console.error(err)
|
||||||
|
setError('Could not update user profile.')
|
||||||
|
} finally {
|
||||||
|
setSavingProfile(false)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
const saveUserExpiry = async () => {
|
||||||
|
if (!user) return
|
||||||
|
const expiresAt = fromLocalDateTimeInput(expiryInput)
|
||||||
|
if (expiryInput.trim() && !expiresAt) {
|
||||||
|
setError('Invalid expiry date/time.')
|
||||||
|
return
|
||||||
|
}
|
||||||
|
setSavingExpiry(true)
|
||||||
|
setError(null)
|
||||||
|
setActionStatus(null)
|
||||||
|
try {
|
||||||
|
const baseUrl = getApiBase()
|
||||||
|
const response = await authFetch(
|
||||||
|
`${baseUrl}/admin/users/${encodeURIComponent(user.username)}/expiry`,
|
||||||
|
{
|
||||||
|
method: 'POST',
|
||||||
|
headers: { 'Content-Type': 'application/json' },
|
||||||
|
body: JSON.stringify({ expires_at: expiresAt }),
|
||||||
|
}
|
||||||
|
)
|
||||||
|
if (!response.ok) {
|
||||||
|
const text = await response.text()
|
||||||
|
throw new Error(text || 'Expiry update failed')
|
||||||
|
}
|
||||||
|
await loadUser()
|
||||||
|
setActionStatus(expiresAt ? 'User expiry updated.' : 'User expiry cleared.')
|
||||||
|
} catch (err) {
|
||||||
|
console.error(err)
|
||||||
|
setError('Could not update user expiry.')
|
||||||
|
} finally {
|
||||||
|
setSavingExpiry(false)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
const clearUserExpiry = async () => {
|
||||||
|
if (!user) return
|
||||||
|
setSavingExpiry(true)
|
||||||
|
setError(null)
|
||||||
|
setActionStatus(null)
|
||||||
|
try {
|
||||||
|
const baseUrl = getApiBase()
|
||||||
|
const response = await authFetch(
|
||||||
|
`${baseUrl}/admin/users/${encodeURIComponent(user.username)}/expiry`,
|
||||||
|
{
|
||||||
|
method: 'POST',
|
||||||
|
headers: { 'Content-Type': 'application/json' },
|
||||||
|
body: JSON.stringify({ clear: true }),
|
||||||
|
}
|
||||||
|
)
|
||||||
|
if (!response.ok) {
|
||||||
|
const text = await response.text()
|
||||||
|
throw new Error(text || 'Expiry clear failed')
|
||||||
|
}
|
||||||
|
setExpiryInput('')
|
||||||
|
await loadUser()
|
||||||
|
setActionStatus('User expiry cleared.')
|
||||||
|
} catch (err) {
|
||||||
|
console.error(err)
|
||||||
|
setError('Could not clear user expiry.')
|
||||||
|
} finally {
|
||||||
|
setSavingExpiry(false)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
if (!getToken()) {
|
||||||
|
router.push('/login')
|
||||||
|
return
|
||||||
|
}
|
||||||
|
void loadUser()
|
||||||
|
void loadProfiles()
|
||||||
|
}, [router, idParam])
|
||||||
|
|
||||||
|
if (loading) {
|
||||||
|
return <main className="card">Loading user...</main>
|
||||||
|
}
|
||||||
|
|
||||||
|
return (
|
||||||
|
<AdminShell
|
||||||
|
title={user?.username || 'User'}
|
||||||
|
subtitle="User overview and request stats."
|
||||||
|
actions={
|
||||||
|
<button type="button" onClick={() => router.push('/users')}>
|
||||||
|
Back to users
|
||||||
|
</button>
|
||||||
|
}
|
||||||
|
>
|
||||||
|
<section className="admin-section">
|
||||||
|
{error && <div className="error-banner">{error}</div>}
|
||||||
|
{actionStatus && <div className="status-banner">{actionStatus}</div>}
|
||||||
|
{!user ? (
|
||||||
|
<div className="status-banner">No user data found.</div>
|
||||||
|
) : (
|
||||||
|
<div className="user-detail-page-grid">
|
||||||
|
<div className="user-detail-main-column">
|
||||||
|
<div className="admin-panel user-detail-panel">
|
||||||
|
<div className="user-detail-panel-header">
|
||||||
|
<div className="user-detail-title-row">
|
||||||
|
<strong className="user-detail-name">{user.username}</strong>
|
||||||
|
<span className={`user-grid-pill ${user.is_blocked ? 'is-blocked' : ''}`}>
|
||||||
|
{user.is_blocked ? 'Blocked' : 'Active'}
|
||||||
|
</span>
|
||||||
|
<span className={`user-grid-pill ${user.is_expired ? 'is-blocked' : ''}`}>
|
||||||
|
{user.is_expired ? 'Expired' : user.expires_at ? 'Expiry set' : 'No expiry'}
|
||||||
|
</span>
|
||||||
|
</div>
|
||||||
|
<p className="lede">
|
||||||
|
User identity, access state, and request history for this account.
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
<div className="user-detail-meta-grid">
|
||||||
|
<div className="user-detail-meta-item">
|
||||||
|
<span className="label">Jellyseerr ID</span>
|
||||||
|
<strong>{user.jellyseerr_user_id ?? user.id ?? 'Unknown'}</strong>
|
||||||
|
</div>
|
||||||
|
<div className="user-detail-meta-item">
|
||||||
|
<span className="label">Role</span>
|
||||||
|
<strong>{user.role}</strong>
|
||||||
|
</div>
|
||||||
|
<div className="user-detail-meta-item">
|
||||||
|
<span className="label">Login type</span>
|
||||||
|
<strong>{user.auth_provider || 'local'}</strong>
|
||||||
|
</div>
|
||||||
|
<div className="user-detail-meta-item">
|
||||||
|
<span className="label">Assigned profile</span>
|
||||||
|
<strong>{user.profile_id ?? 'None'}</strong>
|
||||||
|
</div>
|
||||||
|
<div className="user-detail-meta-item">
|
||||||
|
<span className="label">Last login</span>
|
||||||
|
<strong>{formatDateTime(user.last_login_at)}</strong>
|
||||||
|
</div>
|
||||||
|
<div className="user-detail-meta-item">
|
||||||
|
<span className="label">Account expiry</span>
|
||||||
|
<strong>{user.expires_at ? formatDateTime(user.expires_at) : 'Never'}</strong>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div className="admin-panel user-detail-panel">
|
||||||
|
<div className="user-detail-panel-header">
|
||||||
|
<h2>Request statistics</h2>
|
||||||
|
<p className="lede">Snapshot of request states and recent activity for this user.</p>
|
||||||
|
</div>
|
||||||
|
<div className="user-detail-grid">
|
||||||
|
<div className="user-detail-stat">
|
||||||
|
<span className="label">Total</span>
|
||||||
|
<span className="value">{stats?.total ?? 0}</span>
|
||||||
|
</div>
|
||||||
|
<div className="user-detail-stat">
|
||||||
|
<span className="label">Ready</span>
|
||||||
|
<span className="value">{stats?.ready ?? 0}</span>
|
||||||
|
</div>
|
||||||
|
<div className="user-detail-stat">
|
||||||
|
<span className="label">Pending</span>
|
||||||
|
<span className="value">{stats?.pending ?? 0}</span>
|
||||||
|
</div>
|
||||||
|
<div className="user-detail-stat">
|
||||||
|
<span className="label">Approved</span>
|
||||||
|
<span className="value">{stats?.approved ?? 0}</span>
|
||||||
|
</div>
|
||||||
|
<div className="user-detail-stat">
|
||||||
|
<span className="label">Working</span>
|
||||||
|
<span className="value">{stats?.working ?? 0}</span>
|
||||||
|
</div>
|
||||||
|
<div className="user-detail-stat">
|
||||||
|
<span className="label">Partial</span>
|
||||||
|
<span className="value">{stats?.partial ?? 0}</span>
|
||||||
|
</div>
|
||||||
|
<div className="user-detail-stat">
|
||||||
|
<span className="label">Declined</span>
|
||||||
|
<span className="value">{stats?.declined ?? 0}</span>
|
||||||
|
</div>
|
||||||
|
<div className="user-detail-stat">
|
||||||
|
<span className="label">In progress</span>
|
||||||
|
<span className="value">{stats?.in_progress ?? 0}</span>
|
||||||
|
</div>
|
||||||
|
<div className="user-detail-stat user-detail-stat--wide">
|
||||||
|
<span className="label">Last request</span>
|
||||||
|
<span className="value">{formatDateTime(stats?.last_request_at)}</span>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div className="user-detail-side-column">
|
||||||
|
<div className="admin-panel user-detail-panel">
|
||||||
|
<div className="user-detail-panel-header">
|
||||||
|
<h2>Access controls</h2>
|
||||||
|
<p className="lede">Role, login access, and auto-download behavior.</p>
|
||||||
|
</div>
|
||||||
|
<div className="user-detail-control-stack">
|
||||||
|
<label className="toggle">
|
||||||
|
<input
|
||||||
|
type="checkbox"
|
||||||
|
checked={user.role === 'admin'}
|
||||||
|
onChange={(event) => updateUserRole(event.target.checked ? 'admin' : 'user')}
|
||||||
|
/>
|
||||||
|
<span>Make admin</span>
|
||||||
|
</label>
|
||||||
|
<label className="toggle">
|
||||||
|
<input
|
||||||
|
type="checkbox"
|
||||||
|
checked={Boolean(user.auto_search_enabled ?? true)}
|
||||||
|
disabled={user.role === 'admin'}
|
||||||
|
onChange={(event) => updateAutoSearchEnabled(event.target.checked)}
|
||||||
|
/>
|
||||||
|
<span>Allow auto search/download</span>
|
||||||
|
</label>
|
||||||
|
<button
|
||||||
|
type="button"
|
||||||
|
className="ghost-button"
|
||||||
|
onClick={() => toggleUserBlock(!user.is_blocked)}
|
||||||
|
>
|
||||||
|
{user.is_blocked ? 'Allow access' : 'Block access'}
|
||||||
|
</button>
|
||||||
|
{user.role === 'admin' && (
|
||||||
|
<div className="user-detail-helper">
|
||||||
|
Admins always have auto search/download access.
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div className="admin-panel user-detail-panel">
|
||||||
|
<div className="user-detail-panel-header">
|
||||||
|
<h2>Profile defaults</h2>
|
||||||
|
<p className="lede">Assign or clear an invite profile for this user.</p>
|
||||||
|
</div>
|
||||||
|
<div className="user-detail-actions user-detail-actions--stacked">
|
||||||
|
<label className="admin-select">
|
||||||
|
<span>Assigned profile</span>
|
||||||
|
<select
|
||||||
|
value={profileSelection}
|
||||||
|
onChange={(event) => setProfileSelection(event.target.value)}
|
||||||
|
disabled={savingProfile}
|
||||||
|
>
|
||||||
|
<option value="">None</option>
|
||||||
|
{profiles.map((profile) => (
|
||||||
|
<option key={profile.id} value={profile.id}>
|
||||||
|
{profile.name}
|
||||||
|
{profile.is_active === false ? ' (disabled)' : ''}
|
||||||
|
</option>
|
||||||
|
))}
|
||||||
|
</select>
|
||||||
|
</label>
|
||||||
|
<div className="admin-inline-actions">
|
||||||
|
<button type="button" onClick={() => void applyProfileToUser()} disabled={savingProfile}>
|
||||||
|
{savingProfile ? 'Applying...' : 'Apply profile defaults'}
|
||||||
|
</button>
|
||||||
|
<button
|
||||||
|
type="button"
|
||||||
|
className="ghost-button"
|
||||||
|
onClick={() => {
|
||||||
|
setProfileSelection('')
|
||||||
|
void applyProfileToUser('')
|
||||||
|
}}
|
||||||
|
disabled={savingProfile}
|
||||||
|
>
|
||||||
|
Clear profile
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div className="admin-panel user-detail-panel">
|
||||||
|
<div className="user-detail-panel-header">
|
||||||
|
<h2>Account expiry</h2>
|
||||||
|
<p className="lede">Set a specific expiry date/time for this user account.</p>
|
||||||
|
</div>
|
||||||
|
<div className="user-detail-actions user-detail-actions--stacked">
|
||||||
|
<label>
|
||||||
|
<span className="user-bulk-label">Account expiry</span>
|
||||||
|
<input
|
||||||
|
type="datetime-local"
|
||||||
|
value={expiryInput}
|
||||||
|
onChange={(event) => setExpiryInput(event.target.value)}
|
||||||
|
disabled={savingExpiry}
|
||||||
|
/>
|
||||||
|
</label>
|
||||||
|
<div className="admin-inline-actions">
|
||||||
|
<button type="button" onClick={saveUserExpiry} disabled={savingExpiry}>
|
||||||
|
{savingExpiry ? 'Saving...' : 'Save expiry'}
|
||||||
|
</button>
|
||||||
|
<button
|
||||||
|
type="button"
|
||||||
|
className="ghost-button"
|
||||||
|
onClick={clearUserExpiry}
|
||||||
|
disabled={savingExpiry}
|
||||||
|
>
|
||||||
|
Clear expiry
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
</section>
|
||||||
|
</AdminShell>
|
||||||
|
)
|
||||||
|
}
|
||||||
@@ -2,15 +2,34 @@
|
|||||||
|
|
||||||
import { useEffect, useState } from 'react'
|
import { useEffect, useState } from 'react'
|
||||||
import { useRouter } from 'next/navigation'
|
import { useRouter } from 'next/navigation'
|
||||||
|
import Link from 'next/link'
|
||||||
import { authFetch, clearToken, getApiBase, getToken } from '../lib/auth'
|
import { authFetch, clearToken, getApiBase, getToken } from '../lib/auth'
|
||||||
import AdminShell from '../ui/AdminShell'
|
import AdminShell from '../ui/AdminShell'
|
||||||
|
|
||||||
type AdminUser = {
|
type AdminUser = {
|
||||||
|
id: number
|
||||||
username: string
|
username: string
|
||||||
role: string
|
role: string
|
||||||
authProvider?: string | null
|
authProvider?: string | null
|
||||||
lastLoginAt?: string | null
|
lastLoginAt?: string | null
|
||||||
isBlocked?: boolean
|
isBlocked?: boolean
|
||||||
|
autoSearchEnabled?: boolean
|
||||||
|
profileId?: number | null
|
||||||
|
expiresAt?: string | null
|
||||||
|
isExpired?: boolean
|
||||||
|
stats?: UserStats
|
||||||
|
}
|
||||||
|
|
||||||
|
type UserStats = {
|
||||||
|
total: number
|
||||||
|
ready: number
|
||||||
|
pending: number
|
||||||
|
approved: number
|
||||||
|
working: number
|
||||||
|
partial: number
|
||||||
|
declined: number
|
||||||
|
in_progress: number
|
||||||
|
last_request_at?: string | null
|
||||||
}
|
}
|
||||||
|
|
||||||
const formatLastLogin = (value?: string | null) => {
|
const formatLastLogin = (value?: string | null) => {
|
||||||
@@ -20,18 +39,59 @@ const formatLastLogin = (value?: string | null) => {
|
|||||||
return date.toLocaleString()
|
return date.toLocaleString()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const formatLastRequest = (value?: string | null) => {
|
||||||
|
if (!value) return '—'
|
||||||
|
const date = new Date(value)
|
||||||
|
if (Number.isNaN(date.valueOf())) return value
|
||||||
|
return date.toLocaleString()
|
||||||
|
}
|
||||||
|
|
||||||
|
const formatExpiry = (value?: string | null) => {
|
||||||
|
if (!value) return 'Never'
|
||||||
|
const date = new Date(value)
|
||||||
|
if (Number.isNaN(date.valueOf())) return value
|
||||||
|
return date.toLocaleString()
|
||||||
|
}
|
||||||
|
|
||||||
|
const emptyStats: UserStats = {
|
||||||
|
total: 0,
|
||||||
|
ready: 0,
|
||||||
|
pending: 0,
|
||||||
|
approved: 0,
|
||||||
|
working: 0,
|
||||||
|
partial: 0,
|
||||||
|
declined: 0,
|
||||||
|
in_progress: 0,
|
||||||
|
last_request_at: null,
|
||||||
|
}
|
||||||
|
|
||||||
|
const normalizeStats = (stats: any): UserStats => ({
|
||||||
|
total: Number(stats?.total ?? 0),
|
||||||
|
ready: Number(stats?.ready ?? 0),
|
||||||
|
pending: Number(stats?.pending ?? 0),
|
||||||
|
approved: Number(stats?.approved ?? 0),
|
||||||
|
working: Number(stats?.working ?? 0),
|
||||||
|
partial: Number(stats?.partial ?? 0),
|
||||||
|
declined: Number(stats?.declined ?? 0),
|
||||||
|
in_progress: Number(stats?.in_progress ?? 0),
|
||||||
|
last_request_at: stats?.last_request_at ?? null,
|
||||||
|
})
|
||||||
|
|
||||||
export default function UsersPage() {
|
export default function UsersPage() {
|
||||||
const router = useRouter()
|
const router = useRouter()
|
||||||
const [users, setUsers] = useState<AdminUser[]>([])
|
const [users, setUsers] = useState<AdminUser[]>([])
|
||||||
const [error, setError] = useState<string | null>(null)
|
const [error, setError] = useState<string | null>(null)
|
||||||
const [loading, setLoading] = useState(true)
|
const [loading, setLoading] = useState(true)
|
||||||
const [jellyfinSyncStatus, setJellyfinSyncStatus] = useState<string | null>(null)
|
const [query, setQuery] = useState('')
|
||||||
const [jellyfinSyncBusy, setJellyfinSyncBusy] = useState(false)
|
const [jellyseerrSyncStatus, setJellyseerrSyncStatus] = useState<string | null>(null)
|
||||||
|
const [jellyseerrSyncBusy, setJellyseerrSyncBusy] = useState(false)
|
||||||
|
const [jellyseerrResyncBusy, setJellyseerrResyncBusy] = useState(false)
|
||||||
|
const [bulkAutoSearchBusy, setBulkAutoSearchBusy] = useState(false)
|
||||||
|
|
||||||
const loadUsers = async () => {
|
const loadUsers = async () => {
|
||||||
try {
|
try {
|
||||||
const baseUrl = getApiBase()
|
const baseUrl = getApiBase()
|
||||||
const response = await authFetch(`${baseUrl}/admin/users`)
|
const response = await authFetch(`${baseUrl}/admin/users/summary`)
|
||||||
if (!response.ok) {
|
if (!response.ok) {
|
||||||
if (response.status === 401) {
|
if (response.status === 401) {
|
||||||
clearToken()
|
clearToken()
|
||||||
@@ -53,6 +113,15 @@ export default function UsersPage() {
|
|||||||
authProvider: user.auth_provider ?? 'local',
|
authProvider: user.auth_provider ?? 'local',
|
||||||
lastLoginAt: user.last_login_at ?? null,
|
lastLoginAt: user.last_login_at ?? null,
|
||||||
isBlocked: Boolean(user.is_blocked),
|
isBlocked: Boolean(user.is_blocked),
|
||||||
|
autoSearchEnabled: Boolean(user.auto_search_enabled ?? true),
|
||||||
|
profileId:
|
||||||
|
user.profile_id == null || Number.isNaN(Number(user.profile_id))
|
||||||
|
? null
|
||||||
|
: Number(user.profile_id),
|
||||||
|
expiresAt: user.expires_at ?? null,
|
||||||
|
isExpired: Boolean(user.is_expired),
|
||||||
|
id: Number(user.id ?? 0),
|
||||||
|
stats: normalizeStats(user.stats ?? emptyStats),
|
||||||
}))
|
}))
|
||||||
)
|
)
|
||||||
} else {
|
} else {
|
||||||
@@ -67,50 +136,12 @@ export default function UsersPage() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
const toggleUserBlock = async (username: string, blocked: boolean) => {
|
const syncJellyseerrUsers = async () => {
|
||||||
|
setJellyseerrSyncStatus(null)
|
||||||
|
setJellyseerrSyncBusy(true)
|
||||||
try {
|
try {
|
||||||
const baseUrl = getApiBase()
|
const baseUrl = getApiBase()
|
||||||
const response = await authFetch(
|
const response = await authFetch(`${baseUrl}/admin/jellyseerr/users/sync`, {
|
||||||
`${baseUrl}/admin/users/${encodeURIComponent(username)}/${blocked ? 'block' : 'unblock'}`,
|
|
||||||
{ method: 'POST' }
|
|
||||||
)
|
|
||||||
if (!response.ok) {
|
|
||||||
throw new Error('Update failed')
|
|
||||||
}
|
|
||||||
await loadUsers()
|
|
||||||
} catch (err) {
|
|
||||||
console.error(err)
|
|
||||||
setError('Could not update user access.')
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
const updateUserRole = async (username: string, role: string) => {
|
|
||||||
try {
|
|
||||||
const baseUrl = getApiBase()
|
|
||||||
const response = await authFetch(
|
|
||||||
`${baseUrl}/admin/users/${encodeURIComponent(username)}/role`,
|
|
||||||
{
|
|
||||||
method: 'POST',
|
|
||||||
headers: { 'Content-Type': 'application/json' },
|
|
||||||
body: JSON.stringify({ role }),
|
|
||||||
}
|
|
||||||
)
|
|
||||||
if (!response.ok) {
|
|
||||||
throw new Error('Update failed')
|
|
||||||
}
|
|
||||||
await loadUsers()
|
|
||||||
} catch (err) {
|
|
||||||
console.error(err)
|
|
||||||
setError('Could not update user role.')
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
const syncJellyfinUsers = async () => {
|
|
||||||
setJellyfinSyncStatus(null)
|
|
||||||
setJellyfinSyncBusy(true)
|
|
||||||
try {
|
|
||||||
const baseUrl = getApiBase()
|
|
||||||
const response = await authFetch(`${baseUrl}/admin/jellyfin/users/sync`, {
|
|
||||||
method: 'POST',
|
method: 'POST',
|
||||||
})
|
})
|
||||||
if (!response.ok) {
|
if (!response.ok) {
|
||||||
@@ -118,13 +149,71 @@ export default function UsersPage() {
|
|||||||
throw new Error(text || 'Sync failed')
|
throw new Error(text || 'Sync failed')
|
||||||
}
|
}
|
||||||
const data = await response.json()
|
const data = await response.json()
|
||||||
setJellyfinSyncStatus(`Synced ${data?.imported ?? 0} Jellyfin users.`)
|
setJellyseerrSyncStatus(
|
||||||
|
`Matched ${data?.matched ?? 0} users. Skipped ${data?.skipped ?? 0}.`
|
||||||
|
)
|
||||||
await loadUsers()
|
await loadUsers()
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
console.error(err)
|
console.error(err)
|
||||||
setJellyfinSyncStatus('Could not sync Jellyfin users.')
|
setJellyseerrSyncStatus('Could not sync Jellyseerr users.')
|
||||||
} finally {
|
} finally {
|
||||||
setJellyfinSyncBusy(false)
|
setJellyseerrSyncBusy(false)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
const resyncJellyseerrUsers = async () => {
|
||||||
|
const confirmed = window.confirm(
|
||||||
|
'This will remove all non-admin users and re-import from Jellyseerr. Continue?'
|
||||||
|
)
|
||||||
|
if (!confirmed) return
|
||||||
|
setJellyseerrSyncStatus(null)
|
||||||
|
setJellyseerrResyncBusy(true)
|
||||||
|
try {
|
||||||
|
const baseUrl = getApiBase()
|
||||||
|
const response = await authFetch(`${baseUrl}/admin/jellyseerr/users/resync`, {
|
||||||
|
method: 'POST',
|
||||||
|
})
|
||||||
|
if (!response.ok) {
|
||||||
|
const text = await response.text()
|
||||||
|
throw new Error(text || 'Resync failed')
|
||||||
|
}
|
||||||
|
const data = await response.json()
|
||||||
|
setJellyseerrSyncStatus(
|
||||||
|
`Re-imported ${data?.imported ?? 0} users. Cleared ${data?.cleared ?? 0}.`
|
||||||
|
)
|
||||||
|
await loadUsers()
|
||||||
|
} catch (err) {
|
||||||
|
console.error(err)
|
||||||
|
setJellyseerrSyncStatus('Could not resync Jellyseerr users.')
|
||||||
|
} finally {
|
||||||
|
setJellyseerrResyncBusy(false)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
const bulkUpdateAutoSearch = async (enabled: boolean) => {
|
||||||
|
setBulkAutoSearchBusy(true)
|
||||||
|
setJellyseerrSyncStatus(null)
|
||||||
|
try {
|
||||||
|
const baseUrl = getApiBase()
|
||||||
|
const response = await authFetch(`${baseUrl}/admin/users/auto-search/bulk`, {
|
||||||
|
method: 'POST',
|
||||||
|
headers: { 'Content-Type': 'application/json' },
|
||||||
|
body: JSON.stringify({ enabled }),
|
||||||
|
})
|
||||||
|
if (!response.ok) {
|
||||||
|
const text = await response.text()
|
||||||
|
throw new Error(text || 'Bulk update failed')
|
||||||
|
}
|
||||||
|
const data = await response.json()
|
||||||
|
setJellyseerrSyncStatus(
|
||||||
|
`${enabled ? 'Enabled' : 'Disabled'} auto search/download for ${data?.updated ?? 0} non-admin users.`
|
||||||
|
)
|
||||||
|
await loadUsers()
|
||||||
|
} catch (err) {
|
||||||
|
console.error(err)
|
||||||
|
setError('Could not update auto search/download for all users.')
|
||||||
|
} finally {
|
||||||
|
setBulkAutoSearchBusy(false)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -140,58 +229,198 @@ export default function UsersPage() {
|
|||||||
return <main className="card">Loading users...</main>
|
return <main className="card">Loading users...</main>
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const nonAdminUsers = users.filter((user) => user.role !== 'admin')
|
||||||
|
const autoSearchEnabledCount = nonAdminUsers.filter((user) => user.autoSearchEnabled !== false).length
|
||||||
|
const blockedCount = users.filter((user) => user.isBlocked).length
|
||||||
|
const expiredCount = users.filter((user) => user.isExpired).length
|
||||||
|
const adminCount = users.filter((user) => user.role === 'admin').length
|
||||||
|
const normalizedQuery = query.trim().toLowerCase()
|
||||||
|
const filteredUsers = normalizedQuery
|
||||||
|
? users.filter((user) => {
|
||||||
|
const fields = [
|
||||||
|
user.username,
|
||||||
|
user.role,
|
||||||
|
user.authProvider || '',
|
||||||
|
user.profileId != null ? String(user.profileId) : '',
|
||||||
|
]
|
||||||
|
return fields.some((field) => field.toLowerCase().includes(normalizedQuery))
|
||||||
|
})
|
||||||
|
: users
|
||||||
|
const filteredCountLabel =
|
||||||
|
filteredUsers.length === users.length
|
||||||
|
? `${users.length} users`
|
||||||
|
: `${filteredUsers.length} of ${users.length} users`
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<AdminShell
|
<AdminShell
|
||||||
title="Users"
|
title="Users"
|
||||||
subtitle="Manage who can use Magent."
|
subtitle="Directory, access status, and request activity."
|
||||||
actions={
|
actions={
|
||||||
<>
|
<div className="admin-inline-actions">
|
||||||
|
<button type="button" className="ghost-button" onClick={() => router.push('/admin/invites')}>
|
||||||
|
Invite management
|
||||||
|
</button>
|
||||||
<button type="button" onClick={loadUsers}>
|
<button type="button" onClick={loadUsers}>
|
||||||
Reload list
|
Reload list
|
||||||
</button>
|
</button>
|
||||||
<button type="button" onClick={syncJellyfinUsers} disabled={jellyfinSyncBusy}>
|
<button type="button" onClick={syncJellyseerrUsers} disabled={jellyseerrSyncBusy}>
|
||||||
{jellyfinSyncBusy ? 'Syncing Jellyfin users...' : 'Sync Jellyfin users'}
|
{jellyseerrSyncBusy ? 'Syncing Jellyseerr users...' : 'Sync Jellyseerr users'}
|
||||||
</button>
|
</button>
|
||||||
</>
|
<button type="button" onClick={resyncJellyseerrUsers} disabled={jellyseerrResyncBusy}>
|
||||||
|
{jellyseerrResyncBusy ? 'Resyncing Jellyseerr users...' : 'Resync Jellyseerr users'}
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
}
|
}
|
||||||
>
|
>
|
||||||
<section className="admin-section">
|
<section className="admin-section">
|
||||||
{error && <div className="error-banner">{error}</div>}
|
{error && <div className="error-banner">{error}</div>}
|
||||||
{jellyfinSyncStatus && <div className="status-banner">{jellyfinSyncStatus}</div>}
|
{jellyseerrSyncStatus && <div className="status-banner">{jellyseerrSyncStatus}</div>}
|
||||||
{users.length === 0 ? (
|
<div className="admin-summary-grid user-summary-grid">
|
||||||
<div className="status-banner">No users found yet.</div>
|
<div className="admin-summary-tile">
|
||||||
) : (
|
<span className="label">Total users</span>
|
||||||
<div className="admin-grid">
|
<strong>{users.length}</strong>
|
||||||
{users.map((user) => (
|
<small>{adminCount} admin</small>
|
||||||
<div key={user.username} className="summary-card user-card">
|
</div>
|
||||||
|
<div className="admin-summary-tile">
|
||||||
|
<span className="label">Auto search</span>
|
||||||
|
<strong>{autoSearchEnabledCount}</strong>
|
||||||
|
<small>of {nonAdminUsers.length} non-admin users</small>
|
||||||
|
</div>
|
||||||
|
<div className="admin-summary-tile">
|
||||||
|
<span className="label">Blocked</span>
|
||||||
|
<strong>{blockedCount}</strong>
|
||||||
|
<small>{blockedCount ? 'Needs review' : 'No blocked users'}</small>
|
||||||
|
</div>
|
||||||
|
<div className="admin-summary-tile">
|
||||||
|
<span className="label">Expired</span>
|
||||||
|
<strong>{expiredCount}</strong>
|
||||||
|
<small>{expiredCount ? 'Access expired' : 'No expiries'}</small>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div className="user-directory-control-grid">
|
||||||
|
<div className="admin-panel user-directory-search-panel">
|
||||||
|
<div className="user-directory-panel-header">
|
||||||
<div>
|
<div>
|
||||||
<strong>{user.username}</strong>
|
<h2>Directory search</h2>
|
||||||
<div className="user-meta">
|
<p className="lede">
|
||||||
<span className="meta">Role: {user.role}</span>
|
Filter by username, role, login provider, or assigned profile.
|
||||||
<span className="meta">Login type: {user.authProvider || 'local'}</span>
|
</p>
|
||||||
<span className="meta">Last login: {formatLastLogin(user.lastLoginAt)}</span>
|
|
||||||
</div>
|
</div>
|
||||||
|
<span className="small-pill">{filteredCountLabel}</span>
|
||||||
</div>
|
</div>
|
||||||
<div className="user-actions">
|
<div className="user-directory-toolbar">
|
||||||
<label className="toggle">
|
<div className="user-directory-search">
|
||||||
|
<label>
|
||||||
|
<span className="user-bulk-label">Search users</span>
|
||||||
<input
|
<input
|
||||||
type="checkbox"
|
value={query}
|
||||||
checked={user.role === 'admin'}
|
onChange={(event) => setQuery(event.target.value)}
|
||||||
onChange={(event) =>
|
placeholder="Search username, login type, role, profile…"
|
||||||
updateUserRole(user.username, event.target.checked ? 'admin' : 'user')
|
|
||||||
}
|
|
||||||
/>
|
/>
|
||||||
<span>Make admin</span>
|
|
||||||
</label>
|
</label>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div className="admin-panel user-directory-bulk-panel">
|
||||||
|
<div className="user-directory-panel-header">
|
||||||
|
<div>
|
||||||
|
<h2>Bulk controls</h2>
|
||||||
|
<p className="lede">
|
||||||
|
Auto search/download can be enabled or disabled for all non-admin users.
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div className="user-bulk-toolbar">
|
||||||
|
<div className="user-bulk-summary">
|
||||||
|
<strong>Auto search/download</strong>
|
||||||
|
<span>
|
||||||
|
{autoSearchEnabledCount} of {nonAdminUsers.length} non-admin users enabled
|
||||||
|
</span>
|
||||||
|
</div>
|
||||||
|
<div className="user-bulk-actions">
|
||||||
|
<button
|
||||||
|
type="button"
|
||||||
|
onClick={() => bulkUpdateAutoSearch(true)}
|
||||||
|
disabled={bulkAutoSearchBusy}
|
||||||
|
>
|
||||||
|
{bulkAutoSearchBusy ? 'Working...' : 'Enable for all users'}
|
||||||
|
</button>
|
||||||
<button
|
<button
|
||||||
type="button"
|
type="button"
|
||||||
className="ghost-button"
|
className="ghost-button"
|
||||||
onClick={() => toggleUserBlock(user.username, !user.isBlocked)}
|
onClick={() => bulkUpdateAutoSearch(false)}
|
||||||
|
disabled={bulkAutoSearchBusy}
|
||||||
>
|
>
|
||||||
{user.isBlocked ? 'Allow access' : 'Block access'}
|
{bulkAutoSearchBusy ? 'Working...' : 'Disable for all users'}
|
||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
{filteredUsers.length === 0 ? (
|
||||||
|
<div className="status-banner">No users found yet.</div>
|
||||||
|
) : (
|
||||||
|
<div className="user-directory-list">
|
||||||
|
<div className="user-directory-header">
|
||||||
|
<span>User</span>
|
||||||
|
<span>Access</span>
|
||||||
|
<span>Requests</span>
|
||||||
|
<span>Activity</span>
|
||||||
|
</div>
|
||||||
|
{filteredUsers.map((user) => (
|
||||||
|
<Link
|
||||||
|
key={user.username}
|
||||||
|
className="user-directory-row"
|
||||||
|
href={`/users/${user.id}`}
|
||||||
|
>
|
||||||
|
<div className="user-directory-cell user-directory-cell--identity">
|
||||||
|
<div className="user-directory-title-row">
|
||||||
|
<strong>{user.username}</strong>
|
||||||
|
<span className="user-grid-meta">{user.role}</span>
|
||||||
|
</div>
|
||||||
|
<div className="user-directory-subtext">
|
||||||
|
Login: {user.authProvider || 'local'} • Profile: {user.profileId ?? 'None'}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div className="user-directory-cell">
|
||||||
|
<div className="user-directory-pill-row">
|
||||||
|
<span className={`user-grid-pill ${user.isBlocked ? 'is-blocked' : ''}`}>
|
||||||
|
{user.isBlocked ? 'Blocked' : 'Active'}
|
||||||
|
</span>
|
||||||
|
<span
|
||||||
|
className={`user-grid-pill ${user.autoSearchEnabled === false ? 'is-disabled' : ''}`}
|
||||||
|
>
|
||||||
|
Auto {user.autoSearchEnabled === false ? 'Off' : 'On'}
|
||||||
|
</span>
|
||||||
|
<span className={`user-grid-pill ${user.isExpired ? 'is-blocked' : ''}`}>
|
||||||
|
{user.expiresAt ? (user.isExpired ? 'Expired' : 'Expiry set') : 'No expiry'}
|
||||||
|
</span>
|
||||||
|
</div>
|
||||||
|
<div className="user-directory-subtext">
|
||||||
|
{user.expiresAt ? `Expires: ${formatExpiry(user.expiresAt)}` : 'No account expiry'}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div className="user-directory-cell">
|
||||||
|
<div className="user-directory-stats-inline">
|
||||||
|
<span><strong>{user.stats?.total ?? 0}</strong> total</span>
|
||||||
|
<span><strong>{user.stats?.ready ?? 0}</strong> ready</span>
|
||||||
|
<span><strong>{user.stats?.pending ?? 0}</strong> pending</span>
|
||||||
|
<span><strong>{user.stats?.in_progress ?? 0}</strong> in progress</span>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div className="user-directory-cell">
|
||||||
|
<div className="user-directory-subtext">
|
||||||
|
Last login: {formatLastLogin(user.lastLoginAt)}
|
||||||
|
</div>
|
||||||
|
<div className="user-directory-subtext">
|
||||||
|
Last request: {formatLastRequest(user.stats?.last_request_at)}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div className="user-directory-row-chevron" aria-hidden="true">
|
||||||
|
Open
|
||||||
|
</div>
|
||||||
|
</Link>
|
||||||
))}
|
))}
|
||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"name": "magent-frontend",
|
"name": "magent-frontend",
|
||||||
"private": true,
|
"private": true,
|
||||||
"version": "0.1.0",
|
"version": "0202261541",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"dev": "next dev",
|
"dev": "next dev",
|
||||||
"build": "next build",
|
"build": "next build",
|
||||||
|
|||||||
Reference in New Issue
Block a user