Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
db868d1174 | ||
|
|
32ef93ae8e | ||
|
|
73cbda65a1 | ||
|
|
3b5fbd1bcd | ||
|
|
f561ac29ba | ||
|
|
de8914f9cc |
@@ -48,3 +48,15 @@ ADMIN_EMAIL=
|
|||||||
# Free-Keys enden auf ":fx"). Ohne Key bleibt "Automatisch übersetzen"
|
# Free-Keys enden auf ":fx"). Ohne Key bleibt "Automatisch übersetzen"
|
||||||
# inaktiv; Englisch/Polnisch lassen sich weiterhin manuell eintragen.
|
# inaktiv; Englisch/Polnisch lassen sich weiterhin manuell eintragen.
|
||||||
DEEPL_API_KEY=
|
DEEPL_API_KEY=
|
||||||
|
|
||||||
|
# Optional: SSO-Login per OpenID Connect (z. B. gegen ein selbst
|
||||||
|
# gehostetes Authentik). Ohne diese drei Werte bleibt der SSO-Button auf
|
||||||
|
# der Anmeldeseite ausgeblendet, Passwort/Passkey funktionieren
|
||||||
|
# unverändert. SSO-Login funktioniert NUR für bereits unter "Benutzer"
|
||||||
|
# angelegte E-Mail-Adressen – es werden keine neuen Konten angelegt und
|
||||||
|
# die Rolle (Admin/Kantinenmitarbeiter) bleibt ausschließlich dort
|
||||||
|
# steuerbar. Beim Identity Provider als Redirect-URI eintragen:
|
||||||
|
# <APP_URL>/api/auth/oidc/callback
|
||||||
|
OIDC_ISSUER=
|
||||||
|
OIDC_CLIENT_ID=
|
||||||
|
OIDC_CLIENT_SECRET=
|
||||||
|
|||||||
@@ -4,6 +4,49 @@ Alle nennenswerten Änderungen an diesem Projekt werden hier dokumentiert.
|
|||||||
Format angelehnt an [Keep a Changelog](https://keepachangelog.com/de/1.1.0/),
|
Format angelehnt an [Keep a Changelog](https://keepachangelog.com/de/1.1.0/),
|
||||||
Versionierung nach [Semantic Versioning](https://semver.org/lang/de/).
|
Versionierung nach [Semantic Versioning](https://semver.org/lang/de/).
|
||||||
|
|
||||||
|
## [1.9.0] – 2026-07-20
|
||||||
|
|
||||||
|
### Hinzugefügt
|
||||||
|
- SSO-Login per OpenID Connect (z. B. gegen ein selbst gehostetes
|
||||||
|
Authentik), zusätzlich zu Passwort und Passkey. Konfiguration über
|
||||||
|
drei optionale Env-Vars (`OIDC_ISSUER`, `OIDC_CLIENT_ID`,
|
||||||
|
`OIDC_CLIENT_SECRET`) – ohne sie bleibt der SSO-Button auf der
|
||||||
|
Anmeldeseite ausgeblendet. Authorization-Code-Flow mit PKCE, ID-Token-
|
||||||
|
Signaturprüfung gegen das JWKS des Providers (neue Abhängigkeit
|
||||||
|
`jose`), State/Nonce serverseitig kurzlebig und einmalig verwendbar
|
||||||
|
(neue Tabelle `oidc_states`, Migration `0003_oidc_state.sql`).
|
||||||
|
SSO-Login funktioniert ausschließlich für bereits unter „Benutzer“
|
||||||
|
angelegte E-Mail-Adressen – es werden nie neue Konten angelegt, und
|
||||||
|
die Rolle (Admin/Kantinenmitarbeiter) bleibt ausschließlich über die
|
||||||
|
bestehende Benutzerverwaltung steuerbar, nie aus SSO-Claims
|
||||||
|
übernommen. In DEPLOYMENT.md unter „SSO/OpenID Connect“ dokumentiert.
|
||||||
|
|
||||||
|
## [1.8.1] – 2026-07-20
|
||||||
|
|
||||||
|
### Hinzugefügt
|
||||||
|
- `update.sh`: Update-Skript für Linux-Deployments – stoppt den Docker-
|
||||||
|
Stack, sichert lokale Änderungen an `docker-compose.yml` per
|
||||||
|
`git stash` (falls vorhanden), führt `git pull` aus, spielt die
|
||||||
|
Änderungen zurück und startet den Stack neu im Build-Modus. Bricht
|
||||||
|
bei einem `git pull`- oder Stash-Konflikt kontrolliert ab, statt mit
|
||||||
|
einem halb aktualisierten Stand weiterzumachen. In DEPLOYMENT.md unter
|
||||||
|
„Updates einspielen“ dokumentiert.
|
||||||
|
|
||||||
|
## [1.8.0] – 2026-07-19
|
||||||
|
|
||||||
|
### Hinzugefügt
|
||||||
|
- Umschaltbarer Hinweismodus für Allergene/Zusatzstoffe: Auf der Seite
|
||||||
|
„Allergene & Zusatzstoffe“ kann zwischen der bisherigen detaillierten
|
||||||
|
Auswahl je Gericht und einem einfachen, in Deutsch/Englisch/Polnisch
|
||||||
|
editierbaren Hinweistext (z. B. „Bei Fragen zu Allergenen und
|
||||||
|
Zusatzstoffen wenden Sie sich bitte an das Kantinen-Team.“)
|
||||||
|
umgeschaltet werden. Im Hinweismodus entfällt auf der öffentlichen
|
||||||
|
Speisekarte die Legende und die Kürzel an den Gerichten, und in der
|
||||||
|
Gerichte-Verwaltung wird die Allergen-/Zusatzstoff-Auswahl beim
|
||||||
|
Bearbeiten ausgeblendet (bereits zugeordnete Daten bleiben in der
|
||||||
|
Datenbank erhalten). Umschalten und Hinweistext bearbeiten dürfen
|
||||||
|
sowohl Kantinenpersonal als auch Admins.
|
||||||
|
|
||||||
## [1.7.0] – 2026-07-19
|
## [1.7.0] – 2026-07-19
|
||||||
|
|
||||||
### Hinzugefügt
|
### Hinzugefügt
|
||||||
|
|||||||
@@ -149,6 +149,32 @@ docker compose --env-file .env.local up -d
|
|||||||
werden im Kantinen-Bereich gepflegt.
|
werden im Kantinen-Bereich gepflegt.
|
||||||
- Logo/Favicon/Farben unter „Design“ (nur Admin) anpassen.
|
- Logo/Favicon/Farben unter „Design“ (nur Admin) anpassen.
|
||||||
|
|
||||||
|
## SSO/OpenID Connect (optional)
|
||||||
|
|
||||||
|
Zusätzlich zu Passwort und Passkey kann ein SSO-Login gegen einen
|
||||||
|
beliebigen OpenID-Connect-Provider aktiviert werden (z. B. ein selbst
|
||||||
|
gehostetes [Authentik](https://goauthentik.io/)). Dazu in `.env.local`
|
||||||
|
setzen:
|
||||||
|
|
||||||
|
```bash
|
||||||
|
OIDC_ISSUER=https://authentik.example.de/application/o/canteen-menu/
|
||||||
|
OIDC_CLIENT_ID=<client-id-aus-authentik>
|
||||||
|
OIDC_CLIENT_SECRET=<client-secret-aus-authentik>
|
||||||
|
```
|
||||||
|
|
||||||
|
Beim Identity Provider als Redirect-URI hinterlegen:
|
||||||
|
`<APP_URL>/api/auth/oidc/callback` (also z. B.
|
||||||
|
`https://menu.example.de/api/auth/oidc/callback`).
|
||||||
|
|
||||||
|
**Wichtig:** SSO-Login funktioniert ausschließlich für E-Mail-Adressen,
|
||||||
|
die bereits unter „Benutzer“ angelegt sind – es werden nie neue Konten
|
||||||
|
angelegt, und die Rolle (Admin/Kantinenmitarbeiter) bleibt ausschließlich
|
||||||
|
dort steuerbar. Ein Mitarbeiter muss also zuerst ganz normal als
|
||||||
|
Benutzer angelegt werden, bevor er sich per SSO anmelden kann.
|
||||||
|
|
||||||
|
Ohne die drei Variablen bleibt der SSO-Button auf der Anmeldeseite
|
||||||
|
einfach ausgeblendet, Passwort/Passkey funktionieren unverändert.
|
||||||
|
|
||||||
## Fehlerbehebung
|
## Fehlerbehebung
|
||||||
|
|
||||||
### `password authentication failed for user "postgres"` in den App-Logs
|
### `password authentication failed for user "postgres"` in den App-Logs
|
||||||
@@ -225,6 +251,15 @@ Neue Datenbank-Migrationen (`db/migrations/*.sql`) werden beim Start
|
|||||||
automatisch und idempotent angewendet, bestehende Daten bleiben
|
automatisch und idempotent angewendet, bestehende Daten bleiben
|
||||||
erhalten.
|
erhalten.
|
||||||
|
|
||||||
|
Alternativ übernimmt `./update.sh` den kompletten Ablauf: Stack stoppen,
|
||||||
|
lokale Änderungen an `docker-compose.yml` per `git stash` sichern (falls
|
||||||
|
vorhanden), `git pull`, Änderungen zurückspielen, Stack neu bauen und
|
||||||
|
starten:
|
||||||
|
|
||||||
|
```bash
|
||||||
|
./update.sh
|
||||||
|
```
|
||||||
|
|
||||||
## Backup
|
## Backup
|
||||||
|
|
||||||
Zwei Docker-Volumes enthalten alle persistenten Daten:
|
Zwei Docker-Volumes enthalten alle persistenten Daten:
|
||||||
|
|||||||
@@ -0,0 +1,60 @@
|
|||||||
|
import { NextResponse } from "next/server";
|
||||||
|
import { queryOne } from "@/lib/db";
|
||||||
|
import { createSession } from "@/lib/auth/session";
|
||||||
|
import { isConfigured } from "@/lib/auth/oidc-config";
|
||||||
|
import { consumeState } from "@/lib/auth/oidc-state";
|
||||||
|
import { discover, exchangeCode, resolveEmail, verifyIdToken } from "@/lib/auth/oidc-client";
|
||||||
|
import type { Role } from "@/lib/types";
|
||||||
|
|
||||||
|
function errorRedirect(request: Request, code: string): NextResponse {
|
||||||
|
return NextResponse.redirect(new URL(`/login?error=${code}`, request.url));
|
||||||
|
}
|
||||||
|
|
||||||
|
// GET statt POST: der Identity Provider leitet den Browser per
|
||||||
|
// Redirect hierher (Cross-Origin-Navigation) – die übliche
|
||||||
|
// isSameOrigin()-CSRF-Prüfung greift hier nicht und wird bewusst nicht
|
||||||
|
// verwendet. Die Absicherung ist der einmalig verwendbare state-
|
||||||
|
// Parameter (Standard-OIDC-Mechanismus, siehe lib/auth/oidc-state.ts).
|
||||||
|
export async function GET(request: Request) {
|
||||||
|
if (!isConfigured()) {
|
||||||
|
return errorRedirect(request, "oidc_failed");
|
||||||
|
}
|
||||||
|
|
||||||
|
const url = new URL(request.url);
|
||||||
|
const code = url.searchParams.get("code");
|
||||||
|
const state = url.searchParams.get("state");
|
||||||
|
const idpError = url.searchParams.get("error");
|
||||||
|
if (idpError || !code || !state) {
|
||||||
|
return errorRedirect(request, "oidc_failed");
|
||||||
|
}
|
||||||
|
|
||||||
|
const stored = await consumeState(state);
|
||||||
|
if (!stored) {
|
||||||
|
return errorRedirect(request, "oidc_invalid_state");
|
||||||
|
}
|
||||||
|
|
||||||
|
try {
|
||||||
|
const discovery = await discover();
|
||||||
|
const { idToken, accessToken } = await exchangeCode(discovery, code, stored.codeVerifier);
|
||||||
|
const payload = await verifyIdToken(discovery, idToken, stored.nonce);
|
||||||
|
const email = await resolveEmail(discovery, payload, accessToken);
|
||||||
|
if (!email) {
|
||||||
|
return errorRedirect(request, "oidc_failed");
|
||||||
|
}
|
||||||
|
|
||||||
|
const user = await queryOne<{ id: string; role: Role }>(
|
||||||
|
"select id, role from users where email = $1",
|
||||||
|
[email.trim().toLowerCase()]
|
||||||
|
);
|
||||||
|
if (!user) {
|
||||||
|
return errorRedirect(request, "oidc_unknown_user");
|
||||||
|
}
|
||||||
|
|
||||||
|
await createSession(user.id);
|
||||||
|
return NextResponse.redirect(
|
||||||
|
new URL(user.role === "admin" ? "/admin" : "/intern", request.url)
|
||||||
|
);
|
||||||
|
} catch {
|
||||||
|
return errorRedirect(request, "oidc_failed");
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,31 @@
|
|||||||
|
import { createHash, randomBytes } from "node:crypto";
|
||||||
|
import { NextResponse } from "next/server";
|
||||||
|
import { isConfigured } from "@/lib/auth/oidc-config";
|
||||||
|
import { storeState } from "@/lib/auth/oidc-state";
|
||||||
|
import { buildAuthorizeUrl, discover } from "@/lib/auth/oidc-client";
|
||||||
|
|
||||||
|
// Bewusst ein einfacher GET-Link statt eines CSRF-gesicherten POSTs:
|
||||||
|
// der Browser muss hier auf die fremde Login-Seite des Identity
|
||||||
|
// Providers navigieren (funktioniert nicht per fetch/XHR) – identisch
|
||||||
|
// zum Muster jeder "Login mit X"-Schaltfläche. Die Absicherung gegen
|
||||||
|
// Cross-Site-Missbrauch übernimmt der state-Parameter im Callback.
|
||||||
|
export async function GET(request: Request) {
|
||||||
|
if (!isConfigured()) {
|
||||||
|
return NextResponse.json({ error: "oidc_not_configured" }, { status: 404 });
|
||||||
|
}
|
||||||
|
|
||||||
|
const state = randomBytes(32).toString("base64url");
|
||||||
|
const nonce = randomBytes(32).toString("base64url");
|
||||||
|
const codeVerifier = randomBytes(32).toString("base64url");
|
||||||
|
const codeChallenge = createHash("sha256").update(codeVerifier).digest("base64url");
|
||||||
|
|
||||||
|
try {
|
||||||
|
const discovery = await discover();
|
||||||
|
await storeState(state, nonce, codeVerifier);
|
||||||
|
return NextResponse.redirect(
|
||||||
|
buildAuthorizeUrl(discovery, { state, nonce, codeChallenge })
|
||||||
|
);
|
||||||
|
} catch {
|
||||||
|
return NextResponse.redirect(new URL("/login?error=oidc_failed", request.url));
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,6 +1,6 @@
|
|||||||
import { NextResponse } from "next/server";
|
import { NextResponse } from "next/server";
|
||||||
import { query } from "@/lib/db";
|
import { query } from "@/lib/db";
|
||||||
import { getSettings } from "@/lib/db/settings";
|
import { getSettings, type LabelingMode } from "@/lib/db/settings";
|
||||||
import { authErrorResponse, requireRole } from "@/lib/auth/session";
|
import { authErrorResponse, requireRole } from "@/lib/auth/session";
|
||||||
import { isSameOrigin } from "@/lib/origin";
|
import { isSameOrigin } from "@/lib/origin";
|
||||||
|
|
||||||
@@ -8,14 +8,58 @@ export async function GET() {
|
|||||||
return NextResponse.json(await getSettings());
|
return NextResponse.json(await getSettings());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
interface SettingsPatchBody {
|
||||||
|
colors?: Record<string, string>;
|
||||||
|
labeling_mode?: LabelingMode;
|
||||||
|
labeling_notice?: string;
|
||||||
|
labeling_notice_en?: string | null;
|
||||||
|
labeling_notice_pl?: string | null;
|
||||||
|
}
|
||||||
|
|
||||||
export async function PATCH(request: Request) {
|
export async function PATCH(request: Request) {
|
||||||
if (!isSameOrigin(request)) {
|
if (!isSameOrigin(request)) {
|
||||||
return NextResponse.json({ error: "Nicht erlaubt." }, { status: 403 });
|
return NextResponse.json({ error: "Nicht erlaubt." }, { status: 403 });
|
||||||
}
|
}
|
||||||
try {
|
try {
|
||||||
await requireRole(["admin"]);
|
// Farben bleiben admin-only wie bisher; die Allergen-/Zusatzstoff-
|
||||||
const { colors } = (await request.json()) as { colors: Record<string, string> };
|
// Anzeige darf auch Kantinenpersonal umschalten/bearbeiten.
|
||||||
await query("update settings set colors = $1 where id = 1", [JSON.stringify(colors)]);
|
const session = await requireRole(["staff", "admin"]);
|
||||||
|
const body = (await request.json()) as SettingsPatchBody;
|
||||||
|
|
||||||
|
const sets: string[] = [];
|
||||||
|
const params: unknown[] = [];
|
||||||
|
|
||||||
|
if (body.colors !== undefined) {
|
||||||
|
if (session.user.role !== "admin") {
|
||||||
|
return NextResponse.json({ error: "forbidden" }, { status: 403 });
|
||||||
|
}
|
||||||
|
params.push(JSON.stringify(body.colors));
|
||||||
|
sets.push(`colors = $${params.length}`);
|
||||||
|
}
|
||||||
|
if (body.labeling_mode !== undefined) {
|
||||||
|
if (body.labeling_mode !== "detailed" && body.labeling_mode !== "notice") {
|
||||||
|
return NextResponse.json({ error: "invalid_input" }, { status: 400 });
|
||||||
|
}
|
||||||
|
params.push(body.labeling_mode);
|
||||||
|
sets.push(`labeling_mode = $${params.length}`);
|
||||||
|
}
|
||||||
|
if (body.labeling_notice !== undefined) {
|
||||||
|
params.push(body.labeling_notice);
|
||||||
|
sets.push(`labeling_notice = $${params.length}`);
|
||||||
|
}
|
||||||
|
if (body.labeling_notice_en !== undefined) {
|
||||||
|
params.push(body.labeling_notice_en);
|
||||||
|
sets.push(`labeling_notice_en = $${params.length}`);
|
||||||
|
}
|
||||||
|
if (body.labeling_notice_pl !== undefined) {
|
||||||
|
params.push(body.labeling_notice_pl);
|
||||||
|
sets.push(`labeling_notice_pl = $${params.length}`);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (sets.length === 0) {
|
||||||
|
return NextResponse.json({ error: "invalid_input" }, { status: 400 });
|
||||||
|
}
|
||||||
|
await query(`update settings set ${sets.join(", ")} where id = 1`, params);
|
||||||
return NextResponse.json({ ok: true });
|
return NextResponse.json({ ok: true });
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
const res = authErrorResponse(err);
|
const res = authErrorResponse(err);
|
||||||
|
|||||||
@@ -1,11 +1,15 @@
|
|||||||
import CodeListManager from "@/components/CodeListManager";
|
import CodeListManager from "@/components/CodeListManager";
|
||||||
|
import LabelingNoticeEditor from "@/components/LabelingNoticeEditor";
|
||||||
|
|
||||||
export default function KennzeichnungPage() {
|
export default function KennzeichnungPage() {
|
||||||
const translateEnabled = !!process.env.DEEPL_API_KEY;
|
const translateEnabled = !!process.env.DEEPL_API_KEY;
|
||||||
return (
|
return (
|
||||||
<div className="grid gap-6 lg:grid-cols-2">
|
<div className="flex flex-col gap-6">
|
||||||
<CodeListManager table="allergens" translateEnabled={translateEnabled} />
|
<LabelingNoticeEditor />
|
||||||
<CodeListManager table="additives" translateEnabled={translateEnabled} />
|
<div className="grid gap-6 lg:grid-cols-2">
|
||||||
|
<CodeListManager table="allergens" translateEnabled={translateEnabled} />
|
||||||
|
<CodeListManager table="additives" translateEnabled={translateEnabled} />
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|||||||
+9
-143
@@ -1,145 +1,11 @@
|
|||||||
"use client";
|
import LoginForm from "@/components/LoginForm";
|
||||||
|
import { isConfigured } from "@/lib/auth/oidc-config";
|
||||||
|
|
||||||
import { useState } from "react";
|
export default async function LoginPage({
|
||||||
import { useRouter } from "next/navigation";
|
searchParams,
|
||||||
import Link from "next/link";
|
}: {
|
||||||
import { startAuthentication } from "@simplewebauthn/browser";
|
searchParams: Promise<{ error?: string }>;
|
||||||
import { formatMessage } from "@/lib/i18n/shared";
|
}) {
|
||||||
import { useDict } from "@/components/i18n/LocaleProvider";
|
const { error } = await searchParams;
|
||||||
import LanguageSwitcher from "@/components/i18n/LanguageSwitcher";
|
return <LoginForm oidcEnabled={isConfigured()} initialError={error ?? null} />;
|
||||||
import type { Dict } from "@/lib/i18n/shared";
|
|
||||||
|
|
||||||
function authErrorMessage(dict: Dict, code: string): string {
|
|
||||||
if (code === "invalid_credentials") return dict.login.errorInvalidCredentials;
|
|
||||||
if (code === "password_disabled") return dict.login.errorPasswordDisabled;
|
|
||||||
if (/cancelled|aborted|NotAllowedError/i.test(code))
|
|
||||||
return dict.login.errorPasskeyCancelled;
|
|
||||||
return formatMessage(dict.login.errorGeneric, { message: code });
|
|
||||||
}
|
|
||||||
|
|
||||||
function redirectPath(role: string): string {
|
|
||||||
return role === "admin" ? "/admin" : "/intern";
|
|
||||||
}
|
|
||||||
|
|
||||||
export default function LoginPage() {
|
|
||||||
const router = useRouter();
|
|
||||||
const dict = useDict();
|
|
||||||
const [email, setEmail] = useState("");
|
|
||||||
const [password, setPassword] = useState("");
|
|
||||||
const [error, setError] = useState<string | null>(null);
|
|
||||||
const [busy, setBusy] = useState(false);
|
|
||||||
|
|
||||||
async function signInWithPassword(e: React.FormEvent) {
|
|
||||||
e.preventDefault();
|
|
||||||
setError(null);
|
|
||||||
setBusy(true);
|
|
||||||
const res = await fetch("/api/auth/login", {
|
|
||||||
method: "POST",
|
|
||||||
headers: { "Content-Type": "application/json" },
|
|
||||||
body: JSON.stringify({ email, password }),
|
|
||||||
});
|
|
||||||
const data = await res.json().catch(() => ({}));
|
|
||||||
if (!res.ok) {
|
|
||||||
setError(authErrorMessage(dict, data.error ?? "unknown"));
|
|
||||||
setBusy(false);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
router.replace(redirectPath(data.role));
|
|
||||||
router.refresh();
|
|
||||||
}
|
|
||||||
|
|
||||||
async function signInWithPasskey() {
|
|
||||||
setError(null);
|
|
||||||
setBusy(true);
|
|
||||||
try {
|
|
||||||
const optionsRes = await fetch("/api/auth/passkeys/login-options", { method: "POST" });
|
|
||||||
const options = await optionsRes.json();
|
|
||||||
const response = await startAuthentication({ optionsJSON: options });
|
|
||||||
|
|
||||||
const verifyRes = await fetch("/api/auth/passkeys/login-verify", {
|
|
||||||
method: "POST",
|
|
||||||
headers: { "Content-Type": "application/json" },
|
|
||||||
body: JSON.stringify({ response }),
|
|
||||||
});
|
|
||||||
const data = await verifyRes.json().catch(() => ({}));
|
|
||||||
if (!verifyRes.ok) {
|
|
||||||
setError(authErrorMessage(dict, data.error ?? "unknown"));
|
|
||||||
setBusy(false);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
router.replace(redirectPath(data.role));
|
|
||||||
router.refresh();
|
|
||||||
} catch (err) {
|
|
||||||
setError(authErrorMessage(dict, err instanceof Error ? err.message : String(err)));
|
|
||||||
setBusy(false);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return (
|
|
||||||
<div className="flex-1 flex items-center justify-center p-4">
|
|
||||||
<div className="card w-full max-w-sm">
|
|
||||||
<div className="flex justify-between items-center mb-4">
|
|
||||||
<h1 className="text-xl font-bold text-[var(--c-primary)]">
|
|
||||||
{dict.login.title}
|
|
||||||
</h1>
|
|
||||||
<LanguageSwitcher variant="light" />
|
|
||||||
</div>
|
|
||||||
<form onSubmit={signInWithPassword} className="space-y-3">
|
|
||||||
<div>
|
|
||||||
<label className="label" htmlFor="email">
|
|
||||||
{dict.common.email}
|
|
||||||
</label>
|
|
||||||
<input
|
|
||||||
id="email"
|
|
||||||
type="email"
|
|
||||||
className="input"
|
|
||||||
value={email}
|
|
||||||
onChange={(e) => setEmail(e.target.value)}
|
|
||||||
autoComplete="username webauthn"
|
|
||||||
required
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
<div>
|
|
||||||
<label className="label" htmlFor="password">
|
|
||||||
{dict.common.password}
|
|
||||||
</label>
|
|
||||||
<input
|
|
||||||
id="password"
|
|
||||||
type="password"
|
|
||||||
className="input"
|
|
||||||
value={password}
|
|
||||||
onChange={(e) => setPassword(e.target.value)}
|
|
||||||
autoComplete="current-password"
|
|
||||||
required
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
{error && <p className="text-sm text-[var(--c-del)]">{error}</p>}
|
|
||||||
<button type="submit" className="btn btn-primary w-full" disabled={busy}>
|
|
||||||
{dict.login.submit}
|
|
||||||
</button>
|
|
||||||
</form>
|
|
||||||
|
|
||||||
<div className="my-4 flex items-center gap-3 text-xs text-gray-400">
|
|
||||||
<span className="h-px flex-1 bg-gray-200" />
|
|
||||||
{dict.login.or}
|
|
||||||
<span className="h-px flex-1 bg-gray-200" />
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<button
|
|
||||||
type="button"
|
|
||||||
onClick={signInWithPasskey}
|
|
||||||
className="btn btn-neutral w-full"
|
|
||||||
disabled={busy}
|
|
||||||
>
|
|
||||||
{dict.login.passkeyButton}
|
|
||||||
</button>
|
|
||||||
|
|
||||||
<p className="mt-4 text-center text-sm">
|
|
||||||
<Link href="/" className="text-gray-500 hover:text-[var(--c-primary)]">
|
|
||||||
{dict.login.backToMenu}
|
|
||||||
</Link>
|
|
||||||
</p>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
);
|
|
||||||
}
|
}
|
||||||
|
|||||||
+60
-31
@@ -42,6 +42,7 @@ export default async function Home({
|
|||||||
]);
|
]);
|
||||||
|
|
||||||
const logo = logoUrl(settings?.logo_path);
|
const logo = logoUrl(settings?.logo_path);
|
||||||
|
const labelingDetailed = (settings?.labeling_mode ?? "detailed") !== "notice";
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className="flex-1 px-4 py-6 max-w-[1600px] mx-auto w-full">
|
<div className="flex-1 px-4 py-6 max-w-[1600px] mx-auto w-full">
|
||||||
@@ -99,7 +100,12 @@ export default async function Home({
|
|||||||
</header>
|
</header>
|
||||||
|
|
||||||
{/* Mobil: Tag (Standard) oder Woche umschaltbar */}
|
{/* Mobil: Tag (Standard) oder Woche umschaltbar */}
|
||||||
<PublicMobileMenu monday={monday} sections={sections} entries={entries} />
|
<PublicMobileMenu
|
||||||
|
monday={monday}
|
||||||
|
sections={sections}
|
||||||
|
entries={entries}
|
||||||
|
showLabeling={labelingDetailed}
|
||||||
|
/>
|
||||||
|
|
||||||
{/* Ab "sm": klassische Wochentabelle */}
|
{/* Ab "sm": klassische Wochentabelle */}
|
||||||
<div className="hidden sm:block">
|
<div className="hidden sm:block">
|
||||||
@@ -148,7 +154,9 @@ export default async function Home({
|
|||||||
<span className="font-bold">
|
<span className="font-bold">
|
||||||
{localized(e.dish, locale)}
|
{localized(e.dish, locale)}
|
||||||
</span>
|
</span>
|
||||||
{codes && <sup className="dish-codes">{codes}</sup>}
|
{labelingDetailed && codes && (
|
||||||
|
<sup className="dish-codes">{codes}</sup>
|
||||||
|
)}
|
||||||
{" – "}
|
{" – "}
|
||||||
{formatPrice(e.dish.price)}
|
{formatPrice(e.dish.price)}
|
||||||
</div>
|
</div>
|
||||||
@@ -163,35 +171,56 @@ export default async function Home({
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
{/* Allergene & Zusatzstoffe: Legende zu den Kürzeln bei den Gerichten */}
|
{/* Allergene & Zusatzstoffe: entweder Legende zu den Kürzeln bei den
|
||||||
<section className="mt-8 grid gap-6 sm:grid-cols-2 text-sm text-gray-700">
|
Gerichten, oder – falls im Hinweismodus – nur ein Hinweistext. */}
|
||||||
<div>
|
{labelingDetailed ? (
|
||||||
<h2 className="font-bold text-[var(--c-primary)] mb-2">
|
<section className="mt-8 grid gap-6 sm:grid-cols-2 text-sm text-gray-700">
|
||||||
{dict.publicMenu.allergens}
|
<div>
|
||||||
</h2>
|
<h2 className="font-bold text-[var(--c-primary)] mb-2">
|
||||||
<ul className="space-y-0.5">
|
{dict.publicMenu.allergens}
|
||||||
{allergens.map((a) => (
|
</h2>
|
||||||
<li key={a.code}>
|
<ul className="space-y-0.5">
|
||||||
<span className="font-semibold">{a.code}</span> –{" "}
|
{allergens.map((a) => (
|
||||||
{localized(a, locale)}
|
<li key={a.code}>
|
||||||
</li>
|
<span className="font-semibold">{a.code}</span> –{" "}
|
||||||
))}
|
{localized(a, locale)}
|
||||||
</ul>
|
</li>
|
||||||
</div>
|
))}
|
||||||
<div>
|
</ul>
|
||||||
<h2 className="font-bold text-[var(--c-primary)] mb-2">
|
</div>
|
||||||
{dict.publicMenu.additives}
|
<div>
|
||||||
</h2>
|
<h2 className="font-bold text-[var(--c-primary)] mb-2">
|
||||||
<ul className="space-y-0.5">
|
{dict.publicMenu.additives}
|
||||||
{additives.map((a) => (
|
</h2>
|
||||||
<li key={a.code}>
|
<ul className="space-y-0.5">
|
||||||
<span className="font-semibold">{a.code}</span> –{" "}
|
{additives.map((a) => (
|
||||||
{localized(a, locale)}
|
<li key={a.code}>
|
||||||
</li>
|
<span className="font-semibold">{a.code}</span> –{" "}
|
||||||
))}
|
{localized(a, locale)}
|
||||||
</ul>
|
</li>
|
||||||
</div>
|
))}
|
||||||
</section>
|
</ul>
|
||||||
|
</div>
|
||||||
|
</section>
|
||||||
|
) : (
|
||||||
|
settings && (
|
||||||
|
<section className="mt-8 text-sm text-gray-700">
|
||||||
|
<h2 className="font-bold text-[var(--c-primary)] mb-2">
|
||||||
|
{dict.publicMenu.labelingNoticeTitle}
|
||||||
|
</h2>
|
||||||
|
<p>
|
||||||
|
{localized(
|
||||||
|
{
|
||||||
|
name: settings.labeling_notice,
|
||||||
|
name_en: settings.labeling_notice_en,
|
||||||
|
name_pl: settings.labeling_notice_pl,
|
||||||
|
},
|
||||||
|
locale
|
||||||
|
)}
|
||||||
|
</p>
|
||||||
|
</section>
|
||||||
|
)
|
||||||
|
)}
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|||||||
+25
-13
@@ -46,6 +46,7 @@ export default function DishManager({
|
|||||||
const [selected, setSelected] = useState<Set<string>>(new Set());
|
const [selected, setSelected] = useState<Set<string>>(new Set());
|
||||||
const [bulkBusy, setBulkBusy] = useState(false);
|
const [bulkBusy, setBulkBusy] = useState(false);
|
||||||
const [search, setSearch] = useState("");
|
const [search, setSearch] = useState("");
|
||||||
|
const [labelingDetailed, setLabelingDetailed] = useState(true);
|
||||||
const [translateState, setTranslateState] = useState<"idle" | "busy" | "done">(
|
const [translateState, setTranslateState] = useState<"idle" | "busy" | "done">(
|
||||||
"idle"
|
"idle"
|
||||||
);
|
);
|
||||||
@@ -57,10 +58,11 @@ export default function DishManager({
|
|||||||
}, [dishes, search]);
|
}, [dishes, search]);
|
||||||
|
|
||||||
const load = useCallback(async () => {
|
const load = useCallback(async () => {
|
||||||
const [dishesRes, allergensRes, additivesRes] = await Promise.all([
|
const [dishesRes, allergensRes, additivesRes, settingsRes] = await Promise.all([
|
||||||
fetch("/api/dishes"),
|
fetch("/api/dishes"),
|
||||||
fetch("/api/allergens"),
|
fetch("/api/allergens"),
|
||||||
fetch("/api/additives"),
|
fetch("/api/additives"),
|
||||||
|
fetch("/api/settings"),
|
||||||
]);
|
]);
|
||||||
if (!dishesRes.ok || !allergensRes.ok || !additivesRes.ok) {
|
if (!dishesRes.ok || !allergensRes.ok || !additivesRes.ok) {
|
||||||
setError(formatMessage(dict.dishManager.loadError, { message: "load failed" }));
|
setError(formatMessage(dict.dishManager.loadError, { message: "load failed" }));
|
||||||
@@ -69,6 +71,10 @@ export default function DishManager({
|
|||||||
setAllergens(await allergensRes.json());
|
setAllergens(await allergensRes.json());
|
||||||
setAdditives(await additivesRes.json());
|
setAdditives(await additivesRes.json());
|
||||||
}
|
}
|
||||||
|
if (settingsRes.ok) {
|
||||||
|
const settings = await settingsRes.json();
|
||||||
|
setLabelingDetailed((settings?.labeling_mode ?? "detailed") !== "notice");
|
||||||
|
}
|
||||||
setLoading(false);
|
setLoading(false);
|
||||||
}, [dict]);
|
}, [dict]);
|
||||||
|
|
||||||
@@ -390,18 +396,24 @@ export default function DishManager({
|
|||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
|
|
||||||
<ChipPicker
|
{labelingDetailed ? (
|
||||||
label={dict.codeList.allergensTitle}
|
<>
|
||||||
items={allergens}
|
<ChipPicker
|
||||||
selected={form.allergens}
|
label={dict.codeList.allergensTitle}
|
||||||
onToggle={toggleAllergen}
|
items={allergens}
|
||||||
/>
|
selected={form.allergens}
|
||||||
<ChipPicker
|
onToggle={toggleAllergen}
|
||||||
label={dict.codeList.additivesTitle}
|
/>
|
||||||
items={additives}
|
<ChipPicker
|
||||||
selected={form.additives}
|
label={dict.codeList.additivesTitle}
|
||||||
onToggle={toggleAdditive}
|
items={additives}
|
||||||
/>
|
selected={form.additives}
|
||||||
|
onToggle={toggleAdditive}
|
||||||
|
/>
|
||||||
|
</>
|
||||||
|
) : (
|
||||||
|
<p className="text-sm text-gray-500">{dict.dishManager.labelingDisabledHint}</p>
|
||||||
|
)}
|
||||||
<div className="flex gap-2">
|
<div className="flex gap-2">
|
||||||
<button type="submit" className="btn btn-add">
|
<button type="submit" className="btn btn-add">
|
||||||
{dict.common.save}
|
{dict.common.save}
|
||||||
|
|||||||
@@ -0,0 +1,142 @@
|
|||||||
|
"use client";
|
||||||
|
|
||||||
|
// Umschaltung zwischen der detaillierten Allergen-/Zusatzstoff-Auswahl
|
||||||
|
// je Gericht und einem einfachen, editierbaren Hinweistext.
|
||||||
|
|
||||||
|
import { useCallback, useEffect, useState } from "react";
|
||||||
|
import { formatMessage } from "@/lib/i18n/shared";
|
||||||
|
import { useDict } from "@/components/i18n/LocaleProvider";
|
||||||
|
import type { LabelingMode } from "@/lib/db/settings";
|
||||||
|
|
||||||
|
export default function LabelingNoticeEditor() {
|
||||||
|
const dict = useDict();
|
||||||
|
const [mode, setMode] = useState<LabelingMode>("detailed");
|
||||||
|
const [noticeDe, setNoticeDe] = useState("");
|
||||||
|
const [noticeEn, setNoticeEn] = useState("");
|
||||||
|
const [noticePl, setNoticePl] = useState("");
|
||||||
|
const [loading, setLoading] = useState(true);
|
||||||
|
const [busy, setBusy] = useState(false);
|
||||||
|
const [error, setError] = useState<string | null>(null);
|
||||||
|
const [info, setInfo] = useState<string | null>(null);
|
||||||
|
|
||||||
|
const load = useCallback(async () => {
|
||||||
|
const res = await fetch("/api/settings");
|
||||||
|
if (!res.ok) {
|
||||||
|
setError(formatMessage(dict.labelingNotice.loadError, { message: String(res.status) }));
|
||||||
|
setLoading(false);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
const data = await res.json();
|
||||||
|
setMode(data.labeling_mode ?? "detailed");
|
||||||
|
setNoticeDe(data.labeling_notice ?? "");
|
||||||
|
setNoticeEn(data.labeling_notice_en ?? "");
|
||||||
|
setNoticePl(data.labeling_notice_pl ?? "");
|
||||||
|
setLoading(false);
|
||||||
|
}, [dict]);
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
load();
|
||||||
|
}, [load]);
|
||||||
|
|
||||||
|
async function save() {
|
||||||
|
setBusy(true);
|
||||||
|
setError(null);
|
||||||
|
setInfo(null);
|
||||||
|
const res = await fetch("/api/settings", {
|
||||||
|
method: "PATCH",
|
||||||
|
headers: { "Content-Type": "application/json" },
|
||||||
|
body: JSON.stringify({
|
||||||
|
labeling_mode: mode,
|
||||||
|
labeling_notice: noticeDe.trim(),
|
||||||
|
labeling_notice_en: noticeEn.trim() || null,
|
||||||
|
labeling_notice_pl: noticePl.trim() || null,
|
||||||
|
}),
|
||||||
|
});
|
||||||
|
setBusy(false);
|
||||||
|
if (!res.ok) {
|
||||||
|
setError(formatMessage(dict.labelingNotice.saveError, { message: String(res.status) }));
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
setInfo(dict.labelingNotice.saved);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (loading) return null;
|
||||||
|
|
||||||
|
return (
|
||||||
|
<section className="card">
|
||||||
|
<h2 className="font-semibold mb-2">{dict.labelingNotice.title}</h2>
|
||||||
|
<p className="text-sm text-gray-600 mb-3">{dict.labelingNotice.hint}</p>
|
||||||
|
|
||||||
|
{error && (
|
||||||
|
<p className="mb-3 text-sm text-[var(--c-del)]" role="alert">
|
||||||
|
{error}
|
||||||
|
</p>
|
||||||
|
)}
|
||||||
|
{info && <p className="mb-3 text-sm text-green-700">{info}</p>}
|
||||||
|
|
||||||
|
<div className="flex flex-col gap-2 mb-4">
|
||||||
|
<label className="flex items-center gap-2 cursor-pointer">
|
||||||
|
<input
|
||||||
|
type="radio"
|
||||||
|
name="labeling-mode"
|
||||||
|
checked={mode === "detailed"}
|
||||||
|
onChange={() => setMode("detailed")}
|
||||||
|
/>
|
||||||
|
{dict.labelingNotice.modeDetailed}
|
||||||
|
</label>
|
||||||
|
<label className="flex items-center gap-2 cursor-pointer">
|
||||||
|
<input
|
||||||
|
type="radio"
|
||||||
|
name="labeling-mode"
|
||||||
|
checked={mode === "notice"}
|
||||||
|
onChange={() => setMode("notice")}
|
||||||
|
/>
|
||||||
|
{dict.labelingNotice.modeNotice}
|
||||||
|
</label>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div className="space-y-3 mb-4">
|
||||||
|
<div>
|
||||||
|
<label className="label" htmlFor="labeling-notice-de">
|
||||||
|
{dict.labelingNotice.noticeDeLabel}
|
||||||
|
</label>
|
||||||
|
<textarea
|
||||||
|
id="labeling-notice-de"
|
||||||
|
className="input"
|
||||||
|
rows={2}
|
||||||
|
value={noticeDe}
|
||||||
|
onChange={(e) => setNoticeDe(e.target.value)}
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
<div>
|
||||||
|
<label className="label" htmlFor="labeling-notice-en">
|
||||||
|
{dict.labelingNotice.noticeEnLabel}
|
||||||
|
</label>
|
||||||
|
<textarea
|
||||||
|
id="labeling-notice-en"
|
||||||
|
className="input"
|
||||||
|
rows={2}
|
||||||
|
value={noticeEn}
|
||||||
|
onChange={(e) => setNoticeEn(e.target.value)}
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
<div>
|
||||||
|
<label className="label" htmlFor="labeling-notice-pl">
|
||||||
|
{dict.labelingNotice.noticePlLabel}
|
||||||
|
</label>
|
||||||
|
<textarea
|
||||||
|
id="labeling-notice-pl"
|
||||||
|
className="input"
|
||||||
|
rows={2}
|
||||||
|
value={noticePl}
|
||||||
|
onChange={(e) => setNoticePl(e.target.value)}
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<button type="button" className="btn btn-add" onClick={save} disabled={busy}>
|
||||||
|
{dict.labelingNotice.save}
|
||||||
|
</button>
|
||||||
|
</section>
|
||||||
|
);
|
||||||
|
}
|
||||||
@@ -0,0 +1,162 @@
|
|||||||
|
"use client";
|
||||||
|
|
||||||
|
import { useState } from "react";
|
||||||
|
import { useRouter } from "next/navigation";
|
||||||
|
import Link from "next/link";
|
||||||
|
import { startAuthentication } from "@simplewebauthn/browser";
|
||||||
|
import { formatMessage } from "@/lib/i18n/shared";
|
||||||
|
import { useDict } from "@/components/i18n/LocaleProvider";
|
||||||
|
import LanguageSwitcher from "@/components/i18n/LanguageSwitcher";
|
||||||
|
import type { Dict } from "@/lib/i18n/shared";
|
||||||
|
|
||||||
|
function authErrorMessage(dict: Dict, code: string): string {
|
||||||
|
if (code === "invalid_credentials") return dict.login.errorInvalidCredentials;
|
||||||
|
if (code === "password_disabled") return dict.login.errorPasswordDisabled;
|
||||||
|
if (code === "oidc_invalid_state") return dict.login.errorOidcInvalidState;
|
||||||
|
if (code === "oidc_unknown_user") return dict.login.errorOidcUnknownUser;
|
||||||
|
if (code === "oidc_failed") return dict.login.errorOidcFailed;
|
||||||
|
if (/cancelled|aborted|NotAllowedError/i.test(code))
|
||||||
|
return dict.login.errorPasskeyCancelled;
|
||||||
|
return formatMessage(dict.login.errorGeneric, { message: code });
|
||||||
|
}
|
||||||
|
|
||||||
|
function redirectPath(role: string): string {
|
||||||
|
return role === "admin" ? "/admin" : "/intern";
|
||||||
|
}
|
||||||
|
|
||||||
|
export default function LoginForm({
|
||||||
|
oidcEnabled,
|
||||||
|
initialError,
|
||||||
|
}: {
|
||||||
|
oidcEnabled: boolean;
|
||||||
|
initialError: string | null;
|
||||||
|
}) {
|
||||||
|
const router = useRouter();
|
||||||
|
const dict = useDict();
|
||||||
|
const [email, setEmail] = useState("");
|
||||||
|
const [password, setPassword] = useState("");
|
||||||
|
const [error, setError] = useState<string | null>(() =>
|
||||||
|
initialError ? authErrorMessage(dict, initialError) : null
|
||||||
|
);
|
||||||
|
const [busy, setBusy] = useState(false);
|
||||||
|
|
||||||
|
async function signInWithPassword(e: React.FormEvent) {
|
||||||
|
e.preventDefault();
|
||||||
|
setError(null);
|
||||||
|
setBusy(true);
|
||||||
|
const res = await fetch("/api/auth/login", {
|
||||||
|
method: "POST",
|
||||||
|
headers: { "Content-Type": "application/json" },
|
||||||
|
body: JSON.stringify({ email, password }),
|
||||||
|
});
|
||||||
|
const data = await res.json().catch(() => ({}));
|
||||||
|
if (!res.ok) {
|
||||||
|
setError(authErrorMessage(dict, data.error ?? "unknown"));
|
||||||
|
setBusy(false);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
router.replace(redirectPath(data.role));
|
||||||
|
router.refresh();
|
||||||
|
}
|
||||||
|
|
||||||
|
async function signInWithPasskey() {
|
||||||
|
setError(null);
|
||||||
|
setBusy(true);
|
||||||
|
try {
|
||||||
|
const optionsRes = await fetch("/api/auth/passkeys/login-options", { method: "POST" });
|
||||||
|
const options = await optionsRes.json();
|
||||||
|
const response = await startAuthentication({ optionsJSON: options });
|
||||||
|
|
||||||
|
const verifyRes = await fetch("/api/auth/passkeys/login-verify", {
|
||||||
|
method: "POST",
|
||||||
|
headers: { "Content-Type": "application/json" },
|
||||||
|
body: JSON.stringify({ response }),
|
||||||
|
});
|
||||||
|
const data = await verifyRes.json().catch(() => ({}));
|
||||||
|
if (!verifyRes.ok) {
|
||||||
|
setError(authErrorMessage(dict, data.error ?? "unknown"));
|
||||||
|
setBusy(false);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
router.replace(redirectPath(data.role));
|
||||||
|
router.refresh();
|
||||||
|
} catch (err) {
|
||||||
|
setError(authErrorMessage(dict, err instanceof Error ? err.message : String(err)));
|
||||||
|
setBusy(false);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return (
|
||||||
|
<div className="flex-1 flex items-center justify-center p-4">
|
||||||
|
<div className="card w-full max-w-sm">
|
||||||
|
<div className="flex justify-between items-center mb-4">
|
||||||
|
<h1 className="text-xl font-bold text-[var(--c-primary)]">
|
||||||
|
{dict.login.title}
|
||||||
|
</h1>
|
||||||
|
<LanguageSwitcher variant="light" />
|
||||||
|
</div>
|
||||||
|
<form onSubmit={signInWithPassword} className="space-y-3">
|
||||||
|
<div>
|
||||||
|
<label className="label" htmlFor="email">
|
||||||
|
{dict.common.email}
|
||||||
|
</label>
|
||||||
|
<input
|
||||||
|
id="email"
|
||||||
|
type="email"
|
||||||
|
className="input"
|
||||||
|
value={email}
|
||||||
|
onChange={(e) => setEmail(e.target.value)}
|
||||||
|
autoComplete="username webauthn"
|
||||||
|
required
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
<div>
|
||||||
|
<label className="label" htmlFor="password">
|
||||||
|
{dict.common.password}
|
||||||
|
</label>
|
||||||
|
<input
|
||||||
|
id="password"
|
||||||
|
type="password"
|
||||||
|
className="input"
|
||||||
|
value={password}
|
||||||
|
onChange={(e) => setPassword(e.target.value)}
|
||||||
|
autoComplete="current-password"
|
||||||
|
required
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
{error && <p className="text-sm text-[var(--c-del)]">{error}</p>}
|
||||||
|
<button type="submit" className="btn btn-primary w-full" disabled={busy}>
|
||||||
|
{dict.login.submit}
|
||||||
|
</button>
|
||||||
|
</form>
|
||||||
|
|
||||||
|
<div className="my-4 flex items-center gap-3 text-xs text-gray-400">
|
||||||
|
<span className="h-px flex-1 bg-gray-200" />
|
||||||
|
{dict.login.or}
|
||||||
|
<span className="h-px flex-1 bg-gray-200" />
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<button
|
||||||
|
type="button"
|
||||||
|
onClick={signInWithPasskey}
|
||||||
|
className="btn btn-neutral w-full"
|
||||||
|
disabled={busy}
|
||||||
|
>
|
||||||
|
{dict.login.passkeyButton}
|
||||||
|
</button>
|
||||||
|
|
||||||
|
{oidcEnabled && (
|
||||||
|
<a href="/api/auth/oidc/login" className="btn btn-neutral w-full mt-2">
|
||||||
|
{dict.login.ssoButton}
|
||||||
|
</a>
|
||||||
|
)}
|
||||||
|
|
||||||
|
<p className="mt-4 text-center text-sm">
|
||||||
|
<Link href="/" className="text-gray-500 hover:text-[var(--c-primary)]">
|
||||||
|
{dict.login.backToMenu}
|
||||||
|
</Link>
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
@@ -27,10 +27,12 @@ export default function PublicMobileMenu({
|
|||||||
monday,
|
monday,
|
||||||
sections,
|
sections,
|
||||||
entries,
|
entries,
|
||||||
|
showLabeling,
|
||||||
}: {
|
}: {
|
||||||
monday: string;
|
monday: string;
|
||||||
sections: Section[];
|
sections: Section[];
|
||||||
entries: MenuEntry[];
|
entries: MenuEntry[];
|
||||||
|
showLabeling: boolean;
|
||||||
}) {
|
}) {
|
||||||
const router = useRouter();
|
const router = useRouter();
|
||||||
const dict = useDict();
|
const dict = useDict();
|
||||||
@@ -86,7 +88,9 @@ export default function PublicMobileMenu({
|
|||||||
<span className="font-semibold">
|
<span className="font-semibold">
|
||||||
{localized(e.dish, locale)}
|
{localized(e.dish, locale)}
|
||||||
</span>
|
</span>
|
||||||
{codes && <sup className="dish-codes">{codes}</sup>}{" "}
|
{showLabeling && codes && (
|
||||||
|
<sup className="dish-codes">{codes}</sup>
|
||||||
|
)}{" "}
|
||||||
– {formatPrice(e.dish.price)}
|
– {formatPrice(e.dish.price)}
|
||||||
</p>
|
</p>
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -0,0 +1,11 @@
|
|||||||
|
-- Umschaltbare Anzeige der Allergene/Zusatzstoffe: entweder die
|
||||||
|
-- detaillierte Auswahl je Gericht (bisheriges Verhalten) oder
|
||||||
|
-- stattdessen nur ein von Personal/Admin editierbarer Hinweistext
|
||||||
|
-- (z. B. "Bei Fragen bitte das Kantinen-Team fragen").
|
||||||
|
alter table settings
|
||||||
|
add column labeling_mode text not null default 'detailed'
|
||||||
|
check (labeling_mode in ('detailed', 'notice')),
|
||||||
|
add column labeling_notice text not null default
|
||||||
|
'Bei Fragen zu Allergenen und Zusatzstoffen wenden Sie sich bitte an das Kantinen-Team.',
|
||||||
|
add column labeling_notice_en text,
|
||||||
|
add column labeling_notice_pl text;
|
||||||
@@ -0,0 +1,12 @@
|
|||||||
|
-- Kurzlebiger, einmalig verwendbarer State-Store für den OpenID-Connect-
|
||||||
|
-- Login (SSO, z. B. gegen Authentik). Analog zu webauthn_challenges:
|
||||||
|
-- der "state"-Wert selbst ist die CSRF-Absicherung für den Callback
|
||||||
|
-- (der Callback ist ein Cross-Origin-GET vom Identity Provider, der
|
||||||
|
-- normale isSameOrigin()-Check greift dort nicht).
|
||||||
|
create table oidc_states (
|
||||||
|
state text primary key,
|
||||||
|
nonce text not null,
|
||||||
|
code_verifier text not null,
|
||||||
|
expires_at timestamptz not null,
|
||||||
|
created_at timestamptz not null default now()
|
||||||
|
);
|
||||||
@@ -34,6 +34,13 @@ services:
|
|||||||
# (Essenszeiten, Kürzel-Erklärungen) nach Englisch/Polnisch. Ohne Key
|
# (Essenszeiten, Kürzel-Erklärungen) nach Englisch/Polnisch. Ohne Key
|
||||||
# bleibt "Automatisch übersetzen" inaktiv, manuelle Eingabe geht immer.
|
# bleibt "Automatisch übersetzen" inaktiv, manuelle Eingabe geht immer.
|
||||||
DEEPL_API_KEY: ${DEEPL_API_KEY:-}
|
DEEPL_API_KEY: ${DEEPL_API_KEY:-}
|
||||||
|
# Optional: SSO-Login per OpenID Connect (z. B. Authentik). Ohne
|
||||||
|
# diese drei Werte bleibt der SSO-Button ausgeblendet. Funktioniert
|
||||||
|
# nur für bereits angelegte Benutzer (Abgleich per E-Mail), legt nie
|
||||||
|
# neue Konten an.
|
||||||
|
OIDC_ISSUER: ${OIDC_ISSUER:-}
|
||||||
|
OIDC_CLIENT_ID: ${OIDC_CLIENT_ID:-}
|
||||||
|
OIDC_CLIENT_SECRET: ${OIDC_CLIENT_SECRET:-}
|
||||||
# Muss auf das "volumes:"-Ziel unten UND das im Dockerfile per
|
# Muss auf das "volumes:"-Ziel unten UND das im Dockerfile per
|
||||||
# "mkdir/chown" vorbereitete Verzeichnis zeigen – ohne diese
|
# "mkdir/chown" vorbereitete Verzeichnis zeigen – ohne diese
|
||||||
# Variable würde lib/branding.ts auf ${PWD}/data/branding
|
# Variable würde lib/branding.ts auf ${PWD}/data/branding
|
||||||
@@ -77,6 +84,9 @@ services:
|
|||||||
SITE_TITLE: ${SITE_TITLE:-Canteen Menu}
|
SITE_TITLE: ${SITE_TITLE:-Canteen Menu}
|
||||||
ADMIN_EMAIL: ${ADMIN_EMAIL:-}
|
ADMIN_EMAIL: ${ADMIN_EMAIL:-}
|
||||||
DEEPL_API_KEY: ${DEEPL_API_KEY:-}
|
DEEPL_API_KEY: ${DEEPL_API_KEY:-}
|
||||||
|
OIDC_ISSUER: ${OIDC_ISSUER:-}
|
||||||
|
OIDC_CLIENT_ID: ${OIDC_CLIENT_ID:-}
|
||||||
|
OIDC_CLIENT_SECRET: ${OIDC_CLIENT_SECRET:-}
|
||||||
ports:
|
ports:
|
||||||
- "0.0.0.0:3000:3000"
|
- "0.0.0.0:3000:3000"
|
||||||
volumes:
|
volumes:
|
||||||
|
|||||||
@@ -0,0 +1,99 @@
|
|||||||
|
import "server-only";
|
||||||
|
import { createRemoteJWKSet, jwtVerify, type JWTPayload } from "jose";
|
||||||
|
import { clientId, clientSecret, issuer, redirectUri } from "./oidc-config";
|
||||||
|
|
||||||
|
export interface OidcDiscovery {
|
||||||
|
authorization_endpoint: string;
|
||||||
|
token_endpoint: string;
|
||||||
|
jwks_uri: string;
|
||||||
|
userinfo_endpoint?: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Kein Caching des Discovery-Dokuments: Login ist bei ~250 Mitarbeitern
|
||||||
|
// kein Hot Path, ein zusätzlicher HTTPS-Request pro Anmeldeversuch
|
||||||
|
// fällt nicht ins Gewicht – vermeidet Cache-Invalidierungslogik ohne
|
||||||
|
// echten Bedarf.
|
||||||
|
export async function discover(): Promise<OidcDiscovery> {
|
||||||
|
const res = await fetch(`${issuer().replace(/\/$/, "")}/.well-known/openid-configuration`);
|
||||||
|
if (!res.ok) throw new Error(`oidc_discovery_failed_${res.status}`);
|
||||||
|
return (await res.json()) as OidcDiscovery;
|
||||||
|
}
|
||||||
|
|
||||||
|
export function buildAuthorizeUrl(
|
||||||
|
discovery: OidcDiscovery,
|
||||||
|
params: { state: string; nonce: string; codeChallenge: string }
|
||||||
|
): string {
|
||||||
|
const url = new URL(discovery.authorization_endpoint);
|
||||||
|
url.searchParams.set("response_type", "code");
|
||||||
|
url.searchParams.set("client_id", clientId());
|
||||||
|
url.searchParams.set("redirect_uri", redirectUri());
|
||||||
|
url.searchParams.set("scope", "openid email profile");
|
||||||
|
url.searchParams.set("state", params.state);
|
||||||
|
url.searchParams.set("nonce", params.nonce);
|
||||||
|
url.searchParams.set("code_challenge", params.codeChallenge);
|
||||||
|
url.searchParams.set("code_challenge_method", "S256");
|
||||||
|
return url.toString();
|
||||||
|
}
|
||||||
|
|
||||||
|
export async function exchangeCode(
|
||||||
|
discovery: OidcDiscovery,
|
||||||
|
code: string,
|
||||||
|
codeVerifier: string
|
||||||
|
): Promise<{ idToken: string; accessToken: string | null }> {
|
||||||
|
const body = new URLSearchParams({
|
||||||
|
grant_type: "authorization_code",
|
||||||
|
client_id: clientId(),
|
||||||
|
client_secret: clientSecret(),
|
||||||
|
redirect_uri: redirectUri(),
|
||||||
|
code,
|
||||||
|
code_verifier: codeVerifier,
|
||||||
|
});
|
||||||
|
const res = await fetch(discovery.token_endpoint, {
|
||||||
|
method: "POST",
|
||||||
|
headers: { "Content-Type": "application/x-www-form-urlencoded" },
|
||||||
|
body,
|
||||||
|
});
|
||||||
|
if (!res.ok) throw new Error(`oidc_token_exchange_failed_${res.status}`);
|
||||||
|
const data = (await res.json()) as { id_token?: string; access_token?: string };
|
||||||
|
if (!data.id_token) throw new Error("oidc_missing_id_token");
|
||||||
|
return { idToken: data.id_token, accessToken: data.access_token ?? null };
|
||||||
|
}
|
||||||
|
|
||||||
|
// Algorithmus bewusst auf RS256 festgenagelt (Authentik-Standard) statt
|
||||||
|
// dem Token zu vertrauen, welchen Algorithmus es selbst behauptet zu
|
||||||
|
// nutzen ("algorithm confusion"-Angriffsklasse bei JWTs).
|
||||||
|
export async function verifyIdToken(
|
||||||
|
discovery: OidcDiscovery,
|
||||||
|
idToken: string,
|
||||||
|
expectedNonce: string
|
||||||
|
): Promise<JWTPayload> {
|
||||||
|
const jwks = createRemoteJWKSet(new URL(discovery.jwks_uri));
|
||||||
|
const { payload } = await jwtVerify(idToken, jwks, {
|
||||||
|
issuer: issuer(),
|
||||||
|
audience: clientId(),
|
||||||
|
algorithms: ["RS256"],
|
||||||
|
});
|
||||||
|
if (payload.nonce !== expectedNonce) {
|
||||||
|
throw new Error("oidc_nonce_mismatch");
|
||||||
|
}
|
||||||
|
if (payload.email_verified === false) {
|
||||||
|
throw new Error("oidc_email_not_verified");
|
||||||
|
}
|
||||||
|
return payload;
|
||||||
|
}
|
||||||
|
|
||||||
|
/** E-Mail bevorzugt aus dem ID-Token, sonst Fallback auf den Userinfo-Endpoint. */
|
||||||
|
export async function resolveEmail(
|
||||||
|
discovery: OidcDiscovery,
|
||||||
|
payload: JWTPayload,
|
||||||
|
accessToken: string | null
|
||||||
|
): Promise<string | null> {
|
||||||
|
if (typeof payload.email === "string" && payload.email) return payload.email;
|
||||||
|
if (!accessToken || !discovery.userinfo_endpoint) return null;
|
||||||
|
const res = await fetch(discovery.userinfo_endpoint, {
|
||||||
|
headers: { Authorization: `Bearer ${accessToken}` },
|
||||||
|
});
|
||||||
|
if (!res.ok) return null;
|
||||||
|
const info = (await res.json()) as { email?: string };
|
||||||
|
return typeof info.email === "string" && info.email ? info.email : null;
|
||||||
|
}
|
||||||
@@ -0,0 +1,35 @@
|
|||||||
|
import "server-only";
|
||||||
|
|
||||||
|
// SSO-Konfiguration wird direkt aus Env-Vars abgeleitet – kein
|
||||||
|
// Cloud-Konfigurationsschritt, analog zu lib/auth/webauthn-config.ts.
|
||||||
|
// "Aktiviert" ergibt sich implizit aus dem Vorhandensein der drei
|
||||||
|
// Pflicht-Vars (wie bei DEEPL_API_KEY), kein separates Enable-Flag.
|
||||||
|
|
||||||
|
export function isConfigured(): boolean {
|
||||||
|
return !!(
|
||||||
|
process.env.OIDC_ISSUER &&
|
||||||
|
process.env.OIDC_CLIENT_ID &&
|
||||||
|
process.env.OIDC_CLIENT_SECRET
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
export function issuer(): string {
|
||||||
|
return process.env.OIDC_ISSUER!;
|
||||||
|
}
|
||||||
|
|
||||||
|
export function clientId(): string {
|
||||||
|
return process.env.OIDC_CLIENT_ID!;
|
||||||
|
}
|
||||||
|
|
||||||
|
export function clientSecret(): string {
|
||||||
|
return process.env.OIDC_CLIENT_SECRET!;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Bewusst aus APP_URL abgeleitet statt aus Request-Headern (wie z. B.
|
||||||
|
// proxy.ts es für den Login-Redirect tut): der Wert muss exakt mit der
|
||||||
|
// beim Identity Provider hinterlegten Redirect-URI übereinstimmen,
|
||||||
|
// darf sich also nicht je nach eingehendem Host-Header ändern.
|
||||||
|
export function redirectUri(): string {
|
||||||
|
const appUrl = new URL(process.env.APP_URL ?? "http://localhost:3000");
|
||||||
|
return `${appUrl.origin}/api/auth/oidc/callback`;
|
||||||
|
}
|
||||||
@@ -0,0 +1,31 @@
|
|||||||
|
import "server-only";
|
||||||
|
import { query, queryOne } from "@/lib/db";
|
||||||
|
|
||||||
|
const STATE_TTL_MS = 10 * 60 * 1000;
|
||||||
|
|
||||||
|
export async function storeState(
|
||||||
|
state: string,
|
||||||
|
nonce: string,
|
||||||
|
codeVerifier: string
|
||||||
|
): Promise<void> {
|
||||||
|
// Kein Cron nötig: abgelaufene Zeilen bei jedem neuen State gleich
|
||||||
|
// mit aufräumen (wie bei webauthn_challenges).
|
||||||
|
await query("delete from oidc_states where expires_at < now()");
|
||||||
|
await query(
|
||||||
|
"insert into oidc_states (state, nonce, code_verifier, expires_at) values ($1, $2, $3, $4)",
|
||||||
|
[state, nonce, codeVerifier, new Date(Date.now() + STATE_TTL_MS)]
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Einmalig verwendbar: die Zeile wird beim Abruf sofort gelöscht. */
|
||||||
|
export async function consumeState(
|
||||||
|
state: string
|
||||||
|
): Promise<{ nonce: string; codeVerifier: string } | null> {
|
||||||
|
const row = await queryOne<{ nonce: string; code_verifier: string }>(
|
||||||
|
`delete from oidc_states
|
||||||
|
where state = $1 and expires_at > now()
|
||||||
|
returning nonce, code_verifier`,
|
||||||
|
[state]
|
||||||
|
);
|
||||||
|
return row ? { nonce: row.nonce, codeVerifier: row.code_verifier } : null;
|
||||||
|
}
|
||||||
+9
-1
@@ -1,14 +1,22 @@
|
|||||||
import "server-only";
|
import "server-only";
|
||||||
import { queryOne } from "@/lib/db";
|
import { queryOne } from "@/lib/db";
|
||||||
|
|
||||||
|
export type LabelingMode = "detailed" | "notice";
|
||||||
|
|
||||||
export interface Settings {
|
export interface Settings {
|
||||||
colors: Record<string, string>;
|
colors: Record<string, string>;
|
||||||
logo_path: string | null;
|
logo_path: string | null;
|
||||||
favicon_path: string | null;
|
favicon_path: string | null;
|
||||||
|
labeling_mode: LabelingMode;
|
||||||
|
labeling_notice: string;
|
||||||
|
labeling_notice_en: string | null;
|
||||||
|
labeling_notice_pl: string | null;
|
||||||
}
|
}
|
||||||
|
|
||||||
export async function getSettings(): Promise<Settings | null> {
|
export async function getSettings(): Promise<Settings | null> {
|
||||||
return queryOne<Settings>(
|
return queryOne<Settings>(
|
||||||
"select colors, logo_path, favicon_path from settings where id = 1"
|
`select colors, logo_path, favicon_path, labeling_mode,
|
||||||
|
labeling_notice, labeling_notice_en, labeling_notice_pl
|
||||||
|
from settings where id = 1`
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -46,12 +46,18 @@ const de = {
|
|||||||
submit: "Anmelden",
|
submit: "Anmelden",
|
||||||
or: "oder",
|
or: "oder",
|
||||||
passkeyButton: "Mit Passkey anmelden",
|
passkeyButton: "Mit Passkey anmelden",
|
||||||
|
ssoButton: "Mit Single Sign-On anmelden",
|
||||||
backToMenu: "← Zur Speisekarte",
|
backToMenu: "← Zur Speisekarte",
|
||||||
errorInvalidCredentials: "E-Mail-Adresse oder Passwort ist falsch.",
|
errorInvalidCredentials: "E-Mail-Adresse oder Passwort ist falsch.",
|
||||||
errorPasskeyCancelled: "Passkey-Anmeldung wurde abgebrochen.",
|
errorPasskeyCancelled: "Passkey-Anmeldung wurde abgebrochen.",
|
||||||
errorGeneric: "Anmeldung fehlgeschlagen: {message}",
|
errorGeneric: "Anmeldung fehlgeschlagen: {message}",
|
||||||
errorPasswordDisabled:
|
errorPasswordDisabled:
|
||||||
"Die Anmeldung mit Passwort ist für dieses Konto deaktiviert. Bitte mit Passkey anmelden.",
|
"Die Anmeldung mit Passwort ist für dieses Konto deaktiviert. Bitte mit Passkey anmelden.",
|
||||||
|
errorOidcInvalidState:
|
||||||
|
"Die SSO-Anmeldung ist abgelaufen oder ungültig. Bitte erneut versuchen.",
|
||||||
|
errorOidcUnknownUser:
|
||||||
|
"Für diese E-Mail-Adresse existiert kein Konto. Bitte an die Verwaltung wenden.",
|
||||||
|
errorOidcFailed: "SSO-Anmeldung fehlgeschlagen. Bitte erneut versuchen.",
|
||||||
},
|
},
|
||||||
publicMenu: {
|
publicMenu: {
|
||||||
prevWeek: "← Vorherige Woche",
|
prevWeek: "← Vorherige Woche",
|
||||||
@@ -63,6 +69,7 @@ const de = {
|
|||||||
weekTab: "Woche",
|
weekTab: "Woche",
|
||||||
allergens: "Allergene",
|
allergens: "Allergene",
|
||||||
additives: "Zusatzstoffe",
|
additives: "Zusatzstoffe",
|
||||||
|
labelingNoticeTitle: "Allergene & Zusatzstoffe",
|
||||||
suggestDish: "Rezept vorschlagen",
|
suggestDish: "Rezept vorschlagen",
|
||||||
noEntry: "–",
|
noEntry: "–",
|
||||||
rssFeed: "RSS-Feed abonnieren",
|
rssFeed: "RSS-Feed abonnieren",
|
||||||
@@ -113,6 +120,8 @@ const de = {
|
|||||||
importSuccess: "{created} neu angelegt, {updated} aktualisiert.",
|
importSuccess: "{created} neu angelegt, {updated} aktualisiert.",
|
||||||
importSkipped: "{count} Zeile(n) übersprungen: {reasons}",
|
importSkipped: "{count} Zeile(n) übersprungen: {reasons}",
|
||||||
importSkippedRow: "Zeile {row}: {reason}",
|
importSkippedRow: "Zeile {row}: {reason}",
|
||||||
|
labelingDisabledHint:
|
||||||
|
"Allergene/Zusatzstoffe sind aktuell deaktiviert (Hinweismodus aktiv, siehe „Allergene & Zusatzstoffe“).",
|
||||||
},
|
},
|
||||||
codeList: {
|
codeList: {
|
||||||
allergensTitle: "Allergene",
|
allergensTitle: "Allergene",
|
||||||
@@ -199,6 +208,20 @@ const de = {
|
|||||||
confirmRemoveLogo: "Logo wirklich entfernen?",
|
confirmRemoveLogo: "Logo wirklich entfernen?",
|
||||||
confirmRemoveFavicon: "Favicon wirklich entfernen?",
|
confirmRemoveFavicon: "Favicon wirklich entfernen?",
|
||||||
},
|
},
|
||||||
|
labelingNotice: {
|
||||||
|
title: "Anzeige von Allergenen & Zusatzstoffen",
|
||||||
|
hint:
|
||||||
|
"Standardmäßig sieht jeder Gast eine detaillierte Auswahl der Allergene/Zusatzstoffe je Gericht. Alternativ kann stattdessen nur ein Hinweistext angezeigt werden – die Auswahl je Gericht wird dann auch in der Gerichte-Verwaltung ausgeblendet.",
|
||||||
|
modeDetailed: "Detaillierte Auswahl je Gericht anzeigen",
|
||||||
|
modeNotice: "Nur Hinweistext anzeigen",
|
||||||
|
noticeDeLabel: "Hinweistext (Deutsch)",
|
||||||
|
noticeEnLabel: "Hinweistext (Englisch)",
|
||||||
|
noticePlLabel: "Hinweistext (Polnisch)",
|
||||||
|
save: "Speichern",
|
||||||
|
saved: "Gespeichert.",
|
||||||
|
loadError: "Laden fehlgeschlagen: {message}",
|
||||||
|
saveError: "Speichern fehlgeschlagen: {message}",
|
||||||
|
},
|
||||||
passkeys: {
|
passkeys: {
|
||||||
title: "Passkeys",
|
title: "Passkeys",
|
||||||
hint: "Mit einem Passkey (Fingerabdruck, Gesichtserkennung oder Sicherheitsschlüssel) kannst du dich künftig ohne Passwort anmelden. Passkeys gelten pro Domain – nach einem Domainwechsel müssen sie neu registriert werden.",
|
hint: "Mit einem Passkey (Fingerabdruck, Gesichtserkennung oder Sicherheitsschlüssel) kannst du dich künftig ohne Passwort anmelden. Passkeys gelten pro Domain – nach einem Domainwechsel müssen sie neu registriert werden.",
|
||||||
@@ -316,12 +339,17 @@ const en: Dict = {
|
|||||||
submit: "Log in",
|
submit: "Log in",
|
||||||
or: "or",
|
or: "or",
|
||||||
passkeyButton: "Sign in with passkey",
|
passkeyButton: "Sign in with passkey",
|
||||||
|
ssoButton: "Sign in with Single Sign-On",
|
||||||
backToMenu: "← Back to menu",
|
backToMenu: "← Back to menu",
|
||||||
errorInvalidCredentials: "Email address or password is incorrect.",
|
errorInvalidCredentials: "Email address or password is incorrect.",
|
||||||
errorPasskeyCancelled: "Passkey sign-in was cancelled.",
|
errorPasskeyCancelled: "Passkey sign-in was cancelled.",
|
||||||
errorGeneric: "Sign-in failed: {message}",
|
errorGeneric: "Sign-in failed: {message}",
|
||||||
errorPasswordDisabled:
|
errorPasswordDisabled:
|
||||||
"Password sign-in is disabled for this account. Please sign in with a passkey.",
|
"Password sign-in is disabled for this account. Please sign in with a passkey.",
|
||||||
|
errorOidcInvalidState: "The SSO sign-in expired or was invalid. Please try again.",
|
||||||
|
errorOidcUnknownUser:
|
||||||
|
"No account exists for this email address. Please contact your administrator.",
|
||||||
|
errorOidcFailed: "SSO sign-in failed. Please try again.",
|
||||||
},
|
},
|
||||||
publicMenu: {
|
publicMenu: {
|
||||||
prevWeek: "← Previous week",
|
prevWeek: "← Previous week",
|
||||||
@@ -333,6 +361,7 @@ const en: Dict = {
|
|||||||
weekTab: "Week",
|
weekTab: "Week",
|
||||||
allergens: "Allergens",
|
allergens: "Allergens",
|
||||||
additives: "Additives",
|
additives: "Additives",
|
||||||
|
labelingNoticeTitle: "Allergens & additives",
|
||||||
suggestDish: "Suggest a dish",
|
suggestDish: "Suggest a dish",
|
||||||
noEntry: "–",
|
noEntry: "–",
|
||||||
rssFeed: "Subscribe to RSS feed",
|
rssFeed: "Subscribe to RSS feed",
|
||||||
@@ -383,6 +412,8 @@ const en: Dict = {
|
|||||||
importSuccess: "{created} created, {updated} updated.",
|
importSuccess: "{created} created, {updated} updated.",
|
||||||
importSkipped: "{count} row(s) skipped: {reasons}",
|
importSkipped: "{count} row(s) skipped: {reasons}",
|
||||||
importSkippedRow: "Row {row}: {reason}",
|
importSkippedRow: "Row {row}: {reason}",
|
||||||
|
labelingDisabledHint:
|
||||||
|
"Allergens/additives are currently disabled (notice mode active, see \"Allergens & additives\").",
|
||||||
},
|
},
|
||||||
codeList: {
|
codeList: {
|
||||||
allergensTitle: "Allergens",
|
allergensTitle: "Allergens",
|
||||||
@@ -469,6 +500,20 @@ const en: Dict = {
|
|||||||
confirmRemoveLogo: "Really remove the logo?",
|
confirmRemoveLogo: "Really remove the logo?",
|
||||||
confirmRemoveFavicon: "Really remove the favicon?",
|
confirmRemoveFavicon: "Really remove the favicon?",
|
||||||
},
|
},
|
||||||
|
labelingNotice: {
|
||||||
|
title: "Allergen & additive display",
|
||||||
|
hint:
|
||||||
|
"By default every guest sees a detailed allergen/additive selection per dish. Alternatively, only a notice text can be shown instead – the per-dish selection is then also hidden in the dish manager.",
|
||||||
|
modeDetailed: "Show detailed selection per dish",
|
||||||
|
modeNotice: "Show only notice text",
|
||||||
|
noticeDeLabel: "Notice text (German)",
|
||||||
|
noticeEnLabel: "Notice text (English)",
|
||||||
|
noticePlLabel: "Notice text (Polish)",
|
||||||
|
save: "Save",
|
||||||
|
saved: "Saved.",
|
||||||
|
loadError: "Loading failed: {message}",
|
||||||
|
saveError: "Saving failed: {message}",
|
||||||
|
},
|
||||||
passkeys: {
|
passkeys: {
|
||||||
title: "Passkeys",
|
title: "Passkeys",
|
||||||
hint: "With a passkey (fingerprint, face recognition, or a security key) you can sign in without a password in the future. Passkeys are bound to a domain – after a domain change they need to be registered again.",
|
hint: "With a passkey (fingerprint, face recognition, or a security key) you can sign in without a password in the future. Passkeys are bound to a domain – after a domain change they need to be registered again.",
|
||||||
@@ -584,12 +629,18 @@ const pl: Dict = {
|
|||||||
submit: "Zaloguj się",
|
submit: "Zaloguj się",
|
||||||
or: "lub",
|
or: "lub",
|
||||||
passkeyButton: "Zaloguj się kluczem dostępu",
|
passkeyButton: "Zaloguj się kluczem dostępu",
|
||||||
|
ssoButton: "Zaloguj się przez Single Sign-On",
|
||||||
backToMenu: "← Powrót do jadłospisu",
|
backToMenu: "← Powrót do jadłospisu",
|
||||||
errorInvalidCredentials: "Nieprawidłowy adres e-mail lub hasło.",
|
errorInvalidCredentials: "Nieprawidłowy adres e-mail lub hasło.",
|
||||||
errorPasskeyCancelled: "Logowanie kluczem dostępu zostało anulowane.",
|
errorPasskeyCancelled: "Logowanie kluczem dostępu zostało anulowane.",
|
||||||
errorGeneric: "Logowanie nie powiodło się: {message}",
|
errorGeneric: "Logowanie nie powiodło się: {message}",
|
||||||
errorPasswordDisabled:
|
errorPasswordDisabled:
|
||||||
"Logowanie hasłem jest wyłączone dla tego konta. Zaloguj się kluczem dostępu.",
|
"Logowanie hasłem jest wyłączone dla tego konta. Zaloguj się kluczem dostępu.",
|
||||||
|
errorOidcInvalidState:
|
||||||
|
"Logowanie SSO wygasło lub jest nieprawidłowe. Spróbuj ponownie.",
|
||||||
|
errorOidcUnknownUser:
|
||||||
|
"Nie istnieje konto dla tego adresu e-mail. Skontaktuj się z administracją.",
|
||||||
|
errorOidcFailed: "Logowanie SSO nie powiodło się. Spróbuj ponownie.",
|
||||||
},
|
},
|
||||||
publicMenu: {
|
publicMenu: {
|
||||||
prevWeek: "← Poprzedni tydzień",
|
prevWeek: "← Poprzedni tydzień",
|
||||||
@@ -601,6 +652,7 @@ const pl: Dict = {
|
|||||||
weekTab: "Tydzień",
|
weekTab: "Tydzień",
|
||||||
allergens: "Alergeny",
|
allergens: "Alergeny",
|
||||||
additives: "Dodatki",
|
additives: "Dodatki",
|
||||||
|
labelingNoticeTitle: "Alergeny i dodatki",
|
||||||
suggestDish: "Zaproponuj danie",
|
suggestDish: "Zaproponuj danie",
|
||||||
noEntry: "–",
|
noEntry: "–",
|
||||||
rssFeed: "Subskrybuj kanał RSS",
|
rssFeed: "Subskrybuj kanał RSS",
|
||||||
@@ -651,6 +703,8 @@ const pl: Dict = {
|
|||||||
importSuccess: "Utworzono: {created}, zaktualizowano: {updated}.",
|
importSuccess: "Utworzono: {created}, zaktualizowano: {updated}.",
|
||||||
importSkipped: "Pominięto wierszy: {count}: {reasons}",
|
importSkipped: "Pominięto wierszy: {count}: {reasons}",
|
||||||
importSkippedRow: "Wiersz {row}: {reason}",
|
importSkippedRow: "Wiersz {row}: {reason}",
|
||||||
|
labelingDisabledHint:
|
||||||
|
"Alergeny/dodatki są obecnie wyłączone (aktywny tryb komunikatu, patrz „Alergeny i dodatki”).",
|
||||||
},
|
},
|
||||||
codeList: {
|
codeList: {
|
||||||
allergensTitle: "Alergeny",
|
allergensTitle: "Alergeny",
|
||||||
@@ -737,6 +791,20 @@ const pl: Dict = {
|
|||||||
confirmRemoveLogo: "Czy na pewno usunąć logo?",
|
confirmRemoveLogo: "Czy na pewno usunąć logo?",
|
||||||
confirmRemoveFavicon: "Czy na pewno usunąć favicon?",
|
confirmRemoveFavicon: "Czy na pewno usunąć favicon?",
|
||||||
},
|
},
|
||||||
|
labelingNotice: {
|
||||||
|
title: "Wyświetlanie alergenów i dodatków",
|
||||||
|
hint:
|
||||||
|
"Domyślnie każdy gość widzi szczegółowy wybór alergenów/dodatków dla każdego dania. Alternatywnie można zamiast tego wyświetlić tylko komunikat – wybór dla poszczególnych dań zostanie wtedy również ukryty w zarządzaniu daniami.",
|
||||||
|
modeDetailed: "Pokaż szczegółowy wybór dla każdego dania",
|
||||||
|
modeNotice: "Pokaż tylko komunikat",
|
||||||
|
noticeDeLabel: "Tekst komunikatu (niemiecki)",
|
||||||
|
noticeEnLabel: "Tekst komunikatu (angielski)",
|
||||||
|
noticePlLabel: "Tekst komunikatu (polski)",
|
||||||
|
save: "Zapisz",
|
||||||
|
saved: "Zapisano.",
|
||||||
|
loadError: "Wczytywanie nie powiodło się: {message}",
|
||||||
|
saveError: "Zapisywanie nie powiodło się: {message}",
|
||||||
|
},
|
||||||
passkeys: {
|
passkeys: {
|
||||||
title: "Klucze dostępu",
|
title: "Klucze dostępu",
|
||||||
hint: "Dzięki kluczowi dostępu (odcisk palca, rozpoznawanie twarzy lub klucz bezpieczeństwa) możesz w przyszłości logować się bez hasła. Klucze dostępu są przypisane do domeny – po zmianie domeny trzeba je zarejestrować ponownie.",
|
hint: "Dzięki kluczowi dostępu (odcisk palca, rozpoznawanie twarzy lub klucz bezpieczeństwa) możesz w przyszłości logować się bez hasła. Klucze dostępu są przypisane do domeny – po zmianie domeny trzeba je zarejestrować ponownie.",
|
||||||
|
|||||||
Generated
+12
-2
@@ -1,15 +1,16 @@
|
|||||||
{
|
{
|
||||||
"name": "canteen-menu",
|
"name": "canteen-menu",
|
||||||
"version": "1.7.0",
|
"version": "1.8.1",
|
||||||
"lockfileVersion": 3,
|
"lockfileVersion": 3,
|
||||||
"requires": true,
|
"requires": true,
|
||||||
"packages": {
|
"packages": {
|
||||||
"": {
|
"": {
|
||||||
"name": "canteen-menu",
|
"name": "canteen-menu",
|
||||||
"version": "1.7.0",
|
"version": "1.8.1",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@simplewebauthn/browser": "^13.3.0",
|
"@simplewebauthn/browser": "^13.3.0",
|
||||||
"@simplewebauthn/server": "^13.3.2",
|
"@simplewebauthn/server": "^13.3.2",
|
||||||
|
"jose": "^6.2.3",
|
||||||
"next": "16.2.10",
|
"next": "16.2.10",
|
||||||
"pg": "^8.22.0",
|
"pg": "^8.22.0",
|
||||||
"react": "19.2.4",
|
"react": "19.2.4",
|
||||||
@@ -4930,6 +4931,15 @@
|
|||||||
"jiti": "lib/jiti-cli.mjs"
|
"jiti": "lib/jiti-cli.mjs"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"node_modules/jose": {
|
||||||
|
"version": "6.2.3",
|
||||||
|
"resolved": "https://registry.npmjs.org/jose/-/jose-6.2.3.tgz",
|
||||||
|
"integrity": "sha512-YYVDInQKFJfR/xa3ojUTl8c2KoTwiL1R5Wg9YCydwH0x0B9grbzlg5HC7mMjCtUJjbQ/YnGEZIhI5tCgfTb4Hw==",
|
||||||
|
"license": "MIT",
|
||||||
|
"funding": {
|
||||||
|
"url": "https://github.com/sponsors/panva"
|
||||||
|
}
|
||||||
|
},
|
||||||
"node_modules/js-tokens": {
|
"node_modules/js-tokens": {
|
||||||
"version": "4.0.0",
|
"version": "4.0.0",
|
||||||
"resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
|
"resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
|
||||||
|
|||||||
+2
-1
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "canteen-menu",
|
"name": "canteen-menu",
|
||||||
"version": "1.7.0",
|
"version": "1.9.0",
|
||||||
"private": true,
|
"private": true,
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"predev": "node --env-file-if-exists=.env.local db/migrate.mjs && node --env-file-if-exists=.env.local scripts/bootstrap-admin.mjs",
|
"predev": "node --env-file-if-exists=.env.local db/migrate.mjs && node --env-file-if-exists=.env.local scripts/bootstrap-admin.mjs",
|
||||||
@@ -15,6 +15,7 @@
|
|||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@simplewebauthn/browser": "^13.3.0",
|
"@simplewebauthn/browser": "^13.3.0",
|
||||||
"@simplewebauthn/server": "^13.3.2",
|
"@simplewebauthn/server": "^13.3.2",
|
||||||
|
"jose": "^6.2.3",
|
||||||
"next": "16.2.10",
|
"next": "16.2.10",
|
||||||
"pg": "^8.22.0",
|
"pg": "^8.22.0",
|
||||||
"react": "19.2.4",
|
"react": "19.2.4",
|
||||||
|
|||||||
@@ -0,0 +1,45 @@
|
|||||||
|
#!/usr/bin/env bash
|
||||||
|
# Aktualisiert ein per Docker Compose betriebenes Deployment:
|
||||||
|
# Stack stoppen -> lokale docker-compose.yml-Änderungen sichern (git stash)
|
||||||
|
# -> git pull -> Änderungen zurückspielen -> Stack neu bauen und starten.
|
||||||
|
#
|
||||||
|
# Aufruf im Projektverzeichnis (dort, wo docker-compose.yml liegt):
|
||||||
|
# ./update.sh
|
||||||
|
|
||||||
|
set -euo pipefail
|
||||||
|
cd "$(dirname "$0")"
|
||||||
|
|
||||||
|
ENV_FILE=".env.local"
|
||||||
|
if [ ! -f "$ENV_FILE" ]; then
|
||||||
|
echo "Fehler: $ENV_FILE nicht gefunden. Bitte im Projektverzeichnis ausführen." >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
echo "==> Stoppe laufenden Stack..."
|
||||||
|
docker compose --env-file "$ENV_FILE" down
|
||||||
|
|
||||||
|
STASHED=0
|
||||||
|
if ! git diff --quiet -- docker-compose.yml || ! git diff --cached --quiet -- docker-compose.yml; then
|
||||||
|
echo "==> Sichere lokale Änderungen an docker-compose.yml (git stash)..."
|
||||||
|
git stash push --message "update.sh: docker-compose.yml vor Pull gesichert" -- docker-compose.yml
|
||||||
|
STASHED=1
|
||||||
|
fi
|
||||||
|
|
||||||
|
echo "==> Hole neueste Version (git pull)..."
|
||||||
|
git pull
|
||||||
|
|
||||||
|
if [ "$STASHED" -eq 1 ]; then
|
||||||
|
echo "==> Stelle lokale Änderungen an docker-compose.yml wieder her..."
|
||||||
|
if ! git stash pop; then
|
||||||
|
echo "Fehler: git stash pop hatte einen Konflikt in docker-compose.yml." >&2
|
||||||
|
echo "Bitte den Konflikt manuell auflösen (git status), danach Stack manuell starten:" >&2
|
||||||
|
echo " docker compose --env-file $ENV_FILE up -d --build" >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
|
echo "==> Baue und starte Stack neu..."
|
||||||
|
docker compose --env-file "$ENV_FILE" up -d --build
|
||||||
|
|
||||||
|
echo "==> Fertig. Status:"
|
||||||
|
docker compose ps
|
||||||
Reference in New Issue
Block a user