feat(2-Schritt2): Login-Link + persistentes is_admin-Flag pro Nutzer
- Nutzerverwaltung zeigt beim Anlegen/„Link erneuern" jetzt den vollen
Ein-Klick-Link (location.origin/?k=<token>) statt nur des Tokens.
- Neuer Admin-Schalter pro Nutzer (DB-Spalte users.is_admin + Migration).
is_admin_user() honoriert das Flag ODER ADMIN_USERS (SSO). Dadurch zeigt
/me den Admin-Button anhand des Flags — Grundlage für den nginx-Cutover.
- admin.py: PUT /admin/users/{id}/admin; list_users liefert is_admin.
Migration live verifiziert (Spalte vorhanden, bestehende Admins via
ADMIN_USERS weiterhin korrekt). app.js v=45. 219 passed.
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
parent
47daf918ae
commit
bd55807a1c
8 changed files with 94 additions and 9 deletions
|
|
@ -17,7 +17,7 @@ from app.auth import is_admin_user, require_admin, require_admin_or_user
|
|||
from app.config import settings
|
||||
from app.dependencies import get_store
|
||||
from app.runtime_config import RUNTIME_SETTABLE, invalidate_cache, runtime_settings
|
||||
from app.schemas import AdminUserPrefsUpdate, MemoryCreate, MemoryOut, UserCreate, UserCreated, UserUpdate
|
||||
from app.schemas import AdminUserPrefsUpdate, MemoryCreate, MemoryOut, UserCreate, UserCreated, UserUpdate, UserAdminUpdate
|
||||
|
||||
router = APIRouter()
|
||||
|
||||
|
|
@ -94,6 +94,15 @@ async def reset_token(user_id: str):
|
|||
return UserCreated(user_id=user.id, display_name=user.display_name, token=token)
|
||||
|
||||
|
||||
@router.put("/admin/users/{user_id}/admin", dependencies=[Depends(require_admin)])
|
||||
async def set_user_admin(user_id: str, payload: UserAdminUpdate):
|
||||
"""Schaltet Admin-Rechte (persistentes DB-Flag) für einen Nutzer ein/aus."""
|
||||
user = get_store().set_user_admin(user_id, payload.is_admin)
|
||||
if user is None:
|
||||
raise HTTPException(status_code=404, detail=f"Nutzer {user_id!r} nicht gefunden.")
|
||||
return {"user_id": user.id, "is_admin": user.is_admin}
|
||||
|
||||
|
||||
@router.put("/admin/users/{user_id}/prefs", dependencies=[Depends(require_admin)])
|
||||
async def update_user_prefs(user_id: str, payload: AdminUserPrefsUpdate):
|
||||
"""Setzt Nutzer-Einstellungen (z. B. erlaubte Sprachen). Merge mit bestehenden Prefs."""
|
||||
|
|
@ -135,6 +144,7 @@ async def list_users():
|
|||
"external_id": u.external_id,
|
||||
"created_at": u.created_at,
|
||||
"allowed_languages": (u.prefs or {}).get("allowed_languages", ""),
|
||||
"is_admin": is_admin_user(u),
|
||||
}
|
||||
for u in get_store().list_users()
|
||||
]
|
||||
|
|
|
|||
|
|
@ -64,7 +64,11 @@ def _username_from_cookie(headers, cfg: Settings) -> str | None:
|
|||
|
||||
def is_admin_user(user: User | None, cfg: Settings = settings) -> bool:
|
||||
"""True, wenn der Nutzer (per SSO-Identitaet) in ADMIN_USERS steht."""
|
||||
if user is None or not user.external_id:
|
||||
if user is None:
|
||||
return False
|
||||
if getattr(user, "is_admin", False):
|
||||
return True # persistentes DB-Flag (vom Admin gesetzt)
|
||||
if not user.external_id:
|
||||
return False
|
||||
return user.external_id in _csv_set(cfg.admin_users)
|
||||
|
||||
|
|
|
|||
|
|
@ -113,3 +113,8 @@ class EmergencyRequest(BaseModel):
|
|||
class AdminUserPrefsUpdate(BaseModel):
|
||||
"""Admin setzt Nutzer-Einstellungen (z. B. erlaubte Sprachen, CSV: "de,en")."""
|
||||
allowed_languages: str | None = None
|
||||
|
||||
|
||||
class UserAdminUpdate(BaseModel):
|
||||
"""Admin schaltet Admin-Rechte für einen Nutzer ein/aus."""
|
||||
is_admin: bool
|
||||
|
|
|
|||
17
app/store.py
17
app/store.py
|
|
@ -69,6 +69,8 @@ class Store(ABC):
|
|||
@abstractmethod
|
||||
def set_user_prefs(self, user_id: str, prefs: dict) -> User: ...
|
||||
|
||||
def set_user_admin(self, user_id: str, is_admin: bool) -> User | None: ...
|
||||
|
||||
@abstractmethod
|
||||
def ensure_anonymous_user(self) -> User: ...
|
||||
|
||||
|
|
@ -185,7 +187,8 @@ class SQLiteStore(Store):
|
|||
token_hash TEXT NOT NULL UNIQUE,
|
||||
prefs_json TEXT NOT NULL DEFAULT '{}',
|
||||
created_at TEXT NOT NULL,
|
||||
external_id TEXT
|
||||
external_id TEXT,
|
||||
is_admin INTEGER NOT NULL DEFAULT 0
|
||||
);
|
||||
CREATE TABLE IF NOT EXISTS sessions (
|
||||
id TEXT PRIMARY KEY,
|
||||
|
|
@ -236,6 +239,8 @@ class SQLiteStore(Store):
|
|||
cols = {row["name"] for row in conn.execute("PRAGMA table_info(users)")}
|
||||
if "external_id" not in cols:
|
||||
conn.execute("ALTER TABLE users ADD COLUMN external_id TEXT")
|
||||
if "is_admin" not in cols:
|
||||
conn.execute("ALTER TABLE users ADD COLUMN is_admin INTEGER NOT NULL DEFAULT 0")
|
||||
# NULLs gelten in SQLite als verschieden -> Alt-Nutzer ohne external_id ok.
|
||||
conn.execute(
|
||||
"CREATE UNIQUE INDEX IF NOT EXISTS idx_users_external"
|
||||
|
|
@ -251,6 +256,7 @@ class SQLiteStore(Store):
|
|||
prefs=json.loads(row["prefs_json"] or "{}"),
|
||||
created_at=row["created_at"],
|
||||
external_id=row["external_id"] if "external_id" in keys else None,
|
||||
is_admin=bool(row["is_admin"]) if "is_admin" in keys else False,
|
||||
)
|
||||
|
||||
def create_user(self, display_name: str) -> tuple[User, str]:
|
||||
|
|
@ -505,6 +511,15 @@ class SQLiteStore(Store):
|
|||
row = conn.execute("SELECT * FROM users WHERE id = ?", (user_id,)).fetchone()
|
||||
return self._row_to_user(row) if row else None
|
||||
|
||||
def set_user_admin(self, user_id: str, is_admin: bool) -> User | None:
|
||||
with self._connect() as conn:
|
||||
conn.execute(
|
||||
"UPDATE users SET is_admin = ? WHERE id = ?",
|
||||
(1 if is_admin else 0, user_id),
|
||||
)
|
||||
row = conn.execute("SELECT * FROM users WHERE id = ?", (user_id,)).fetchone()
|
||||
return self._row_to_user(row) if row else None
|
||||
|
||||
# ----- Notfall-Protokoll ------------------------------------------------
|
||||
def log_emergency(self, user_id: str, category: str, snippet: str) -> None:
|
||||
with self._connect() as conn:
|
||||
|
|
|
|||
|
|
@ -320,6 +320,12 @@ let currentUserId = null;
|
|||
const sessionKey = (uid) => "va-session-" + uid;
|
||||
|
||||
// Sprachen (Code -> Kurzlabel) für Filter + Admin-Auswahl.
|
||||
function loginLink(token) { return location.origin + "/?k=" + token; }
|
||||
async function copyText(text, btn) {
|
||||
try { await navigator.clipboard.writeText(text); if (btn) { const t = btn.textContent; btn.textContent = "✓ kopiert"; setTimeout(() => (btn.textContent = t), 1500); } }
|
||||
catch (e) { /* Clipboard evtl. blockiert -> select-all bleibt als Fallback */ }
|
||||
}
|
||||
|
||||
const ALL_LANGS = [["de","DE"],["en","EN"],["fr","FR"],["es","ES"],["it","IT"],
|
||||
["pt","PT"],["pl","PL"],["ar","AR"],["ru","RU"],["zh","ZH"]];
|
||||
|
||||
|
|
@ -1013,7 +1019,7 @@ $("#create-user-form").addEventListener("submit", async (e) => {
|
|||
if (!name) return;
|
||||
const data = await adminFetch("/api/admin/users", "POST", { display_name: name });
|
||||
if (data?.token) {
|
||||
$("#new-token-value").textContent = data.token;
|
||||
$("#new-token-value").textContent = loginLink(data.token);
|
||||
$("#new-token-box").classList.remove("hidden");
|
||||
nameEl.value = "";
|
||||
loadAdminUsers();
|
||||
|
|
@ -1039,14 +1045,15 @@ function buildUserCard(u) {
|
|||
</div>
|
||||
<div class="flex flex-wrap gap-1.5">
|
||||
<button class="btn-rename text-xs rounded-lg border border-slate-300 dark:border-slate-600 px-2.5 py-1.5 hover:bg-slate-100 dark:hover:bg-slate-700 transition-colors">Umbenennen</button>
|
||||
<button class="btn-token text-xs rounded-lg border border-amber-300 dark:border-amber-700 text-amber-700 dark:text-amber-300 px-2.5 py-1.5 hover:bg-amber-50 dark:hover:bg-amber-900/20 transition-colors">Token-Reset</button>
|
||||
<button class="btn-admin text-xs rounded-lg border px-2.5 py-1.5 transition-colors"></button>
|
||||
<button class="btn-token text-xs rounded-lg border border-amber-300 dark:border-amber-700 text-amber-700 dark:text-amber-300 px-2.5 py-1.5 hover:bg-amber-50 dark:hover:bg-amber-900/20 transition-colors">Link erneuern</button>
|
||||
<button class="btn-delete text-xs rounded-lg border border-red-300 dark:border-red-800 text-red-600 dark:text-red-400 px-2.5 py-1.5 hover:bg-red-50 dark:hover:bg-red-900/20 transition-colors">Löschen</button>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Token-Anzeige nach Reset -->
|
||||
<div class="token-box hidden mt-3 rounded-lg bg-amber-50 dark:bg-amber-900/30 border border-amber-200 dark:border-amber-700 p-3">
|
||||
<p class="text-xs text-amber-700 dark:text-amber-300 font-medium mb-1">Neuer Token (einmalig — jetzt kopieren!):</p>
|
||||
<p class="text-xs text-amber-700 dark:text-amber-300 font-medium mb-1">Neuer Login-Link (einmalig — jetzt kopieren!):</p>
|
||||
<code class="token-val text-xs font-mono break-all text-amber-900 dark:text-amber-100 select-all"></code>
|
||||
</div>
|
||||
|
||||
|
|
@ -1104,6 +1111,27 @@ function buildUserCard(u) {
|
|||
}
|
||||
renderLangChips();
|
||||
|
||||
// Admin-Rechte (persistentes Flag) ein-/ausschalten
|
||||
let isAdmin = !!u.is_admin;
|
||||
const adminBtn = card.querySelector(".btn-admin");
|
||||
function renderAdminBtn() {
|
||||
adminBtn.textContent = isAdmin ? "★ Admin" : "Admin?";
|
||||
adminBtn.classList.toggle("bg-blue-600", isAdmin);
|
||||
adminBtn.classList.toggle("text-white", isAdmin);
|
||||
adminBtn.classList.toggle("border-blue-600", isAdmin);
|
||||
adminBtn.classList.toggle("border-slate-300", !isAdmin);
|
||||
adminBtn.classList.toggle("dark:border-slate-600", !isAdmin);
|
||||
adminBtn.classList.toggle("text-slate-600", !isAdmin);
|
||||
adminBtn.classList.toggle("dark:text-slate-300", !isAdmin);
|
||||
}
|
||||
renderAdminBtn();
|
||||
adminBtn.addEventListener("click", async () => {
|
||||
const next = !isAdmin;
|
||||
if (next && !confirm(`„${u.display_name}" Admin-Rechte geben?`)) return;
|
||||
const res = await adminFetch(`/api/admin/users/${uid}/admin`, "PUT", { is_admin: next });
|
||||
if (res) { isAdmin = !!res.is_admin; renderAdminBtn(); }
|
||||
});
|
||||
|
||||
// Umbenennen
|
||||
card.querySelector(".btn-rename").addEventListener("click", () =>
|
||||
card.querySelector(".rename-box").classList.toggle("hidden")
|
||||
|
|
@ -1127,7 +1155,7 @@ function buildUserCard(u) {
|
|||
if (!confirm(`Token für „${u.display_name}" zurücksetzen?\nDer alte Token wird sofort ungültig.`)) return;
|
||||
const data = await adminFetch(`/api/admin/users/${uid}/token`, "POST");
|
||||
if (data?.token) {
|
||||
card.querySelector(".token-val").textContent = data.token;
|
||||
card.querySelector(".token-val").textContent = loginLink(data.token);
|
||||
card.querySelector(".token-box").classList.remove("hidden");
|
||||
}
|
||||
});
|
||||
|
|
|
|||
|
|
@ -81,7 +81,7 @@
|
|||
class="rounded-lg bg-blue-600 hover:bg-blue-700 text-white text-sm px-4 py-2 font-medium transition-colors">Anlegen</button>
|
||||
</form>
|
||||
<div id="new-token-box" class="hidden mt-3 rounded-lg bg-emerald-50 dark:bg-emerald-900/30 border border-emerald-200 dark:border-emerald-800 p-3">
|
||||
<p class="text-xs text-emerald-700 dark:text-emerald-400 mb-1 font-medium">Token (nur einmal sichtbar — jetzt kopieren!):</p>
|
||||
<p class="text-xs text-emerald-700 dark:text-emerald-400 mb-1 font-medium">Login-Link (nur einmal sichtbar — jetzt kopieren & an den Nutzer geben!):</p>
|
||||
<code id="new-token-value" class="text-xs font-mono break-all text-emerald-800 dark:text-emerald-200 select-all"></code>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -356,6 +356,6 @@
|
|||
<div id="status" class="w-full max-w-3xl mx-auto mt-1 min-h-[1rem] text-xs text-slate-500 dark:text-slate-400"></div>
|
||||
</footer>
|
||||
|
||||
<script src="/app.js?v=44"></script>
|
||||
<script src="/app.js?v=45"></script>
|
||||
</body>
|
||||
</html>
|
||||
|
|
|
|||
|
|
@ -203,3 +203,15 @@ def test_admin_sets_user_allowed_languages():
|
|||
users = client.get("/api/admin/users", headers=ADM_HDR).json()
|
||||
entry = next(u for u in users if u["user_id"] == uid)
|
||||
assert entry["allowed_languages"] == "de,en"
|
||||
|
||||
|
||||
def test_admin_can_flag_user_as_admin():
|
||||
created = client.post("/api/admin/users", headers=ADM_HDR,
|
||||
json={"display_name": "Caregiver"}).json()
|
||||
uid = created["user_id"]
|
||||
users = client.get("/api/admin/users", headers=ADM_HDR).json()
|
||||
assert next(u for u in users if u["user_id"] == uid)["is_admin"] is False
|
||||
r = client.put(f"/api/admin/users/{uid}/admin", headers=ADM_HDR, json={"is_admin": True})
|
||||
assert r.status_code == 200 and r.json()["is_admin"] is True
|
||||
users = client.get("/api/admin/users", headers=ADM_HDR).json()
|
||||
assert next(u for u in users if u["user_id"] == uid)["is_admin"] is True
|
||||
|
|
|
|||
|
|
@ -46,3 +46,14 @@ def test_invalid_capability_link_does_not_set_cookie(monkeypatch):
|
|||
# ungültiges Token -> kein Cookie, kein 303-Redirect auf bereinigte URL
|
||||
assert "va_token=" not in r.headers.get("set-cookie", "")
|
||||
client.cookies.clear()
|
||||
|
||||
|
||||
def test_db_admin_flag_grants_admin_via_me(monkeypatch):
|
||||
monkeypatch.setattr(settings, "auth_enabled", True)
|
||||
store = deps.get_store()
|
||||
user, token = store.create_user("Caregiver")
|
||||
store.set_user_admin(user.id, True)
|
||||
client.cookies.set("va_token", token)
|
||||
me = client.get("/api/me").json()
|
||||
assert me["is_admin"] is True
|
||||
client.cookies.clear()
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue