Anmeldung und Rollen: eigene Zugänge, Benutzerverwaltung, Mitarbeiter-Ansicht (0.7.0)
Stufe 2, Schritt 1 (U1, U2, E27, P13). Passwörter mit scrypt, Sitzung als HttpOnly-Cookie (90 Tage, gleitend), in der Datenbank nur der SHA-256. Rollen Inhaber, Büro, Mitarbeiter; Mitarbeiter sehen nur eigene Einsätze und die Ablage ihrer Projekte. Testversion ohne Passwörter mit Auswahl, als wer gearbeitet wird. Anmeldung am Proxy entfällt. Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01AmyPfuNc4sCRfaF3oURXZz
This commit is contained in:
@@ -10,6 +10,8 @@ export interface Anfrage {
|
||||
query: Record<string, string>;
|
||||
body: unknown;
|
||||
headers: Record<string, string>;
|
||||
routeOptions: { url?: string };
|
||||
wer?: unknown;
|
||||
}
|
||||
|
||||
export class Antwort {
|
||||
@@ -30,12 +32,14 @@ export default function Fastify(_o?: unknown) {
|
||||
const routen: Route[] = [];
|
||||
let fehlerHandler: (err: unknown, req: Anfrage, reply: Antwort) => unknown = (err, _r, reply) =>
|
||||
reply.status(500).send({ fehler: (err as Error).message });
|
||||
const haken: Handler[] = [];
|
||||
const neu = (methode: string) => (pfad: string, handler: Handler) => { routen.push({ methode, teile: pfad.split("/"), handler }); };
|
||||
|
||||
const app = {
|
||||
log: { error: console.error, warn: console.warn, info: () => {} },
|
||||
get: neu("GET"), post: neu("POST"), put: neu("PUT"), patch: neu("PATCH"), delete: neu("DELETE"),
|
||||
setErrorHandler(fn: typeof fehlerHandler) { fehlerHandler = fn; },
|
||||
addHook(_art: "onRequest", fn: Handler) { haken.push(fn); },
|
||||
setNotFoundHandler() {},
|
||||
async register() {},
|
||||
async close() {},
|
||||
@@ -55,11 +59,13 @@ export default function Fastify(_o?: unknown) {
|
||||
break;
|
||||
}
|
||||
}
|
||||
const req: Anfrage = { method: methode, url: u.pathname + u.search, params, query: Object.fromEntries(u.searchParams), body, headers };
|
||||
const req: Anfrage = { method: methode, url: u.pathname + u.search, params, query: Object.fromEntries(u.searchParams), body, headers,
|
||||
routeOptions: { url: route?.teile.join("/") } };
|
||||
if (!route) reply.status(404).send({ fehler: "Nicht gefunden" });
|
||||
else {
|
||||
try {
|
||||
const erg = await route.handler(req, reply);
|
||||
for (const h of haken) if (!reply.gesendet) await h(req, reply);
|
||||
const erg = reply.gesendet ? reply : await route.handler(req, reply);
|
||||
if (!reply.gesendet && erg !== reply) reply.send(erg);
|
||||
} catch (err) {
|
||||
await fehlerHandler(err, req, reply);
|
||||
|
||||
@@ -10,6 +10,7 @@
|
||||
<aside id="seitenleiste">
|
||||
<div id="marke"><img src="/*LOGO*/" alt="Holzbau Schaarschmidt"></div>
|
||||
<nav id="reiter"></nav>
|
||||
<div id="wer"></div>
|
||||
<span id="version"></span>
|
||||
</aside>
|
||||
<main id="inhalt"></main>
|
||||
|
||||
@@ -8,10 +8,12 @@ import m003 from "../src/server/migrations/003_vorgangsnummer.sql";
|
||||
import m004 from "../src/server/migrations/004_besetzung.sql";
|
||||
import m005 from "../src/server/migrations/005_projektseite_kategorien.sql";
|
||||
import m006 from "../src/server/migrations/006_zahlungsplan_automatisch.sql";
|
||||
import m007 from "../src/server/migrations/007_anmeldung.sql";
|
||||
|
||||
const MIGRATIONEN: [string, string][] = [
|
||||
["001_grundlage.sql", m001], ["002_v70_uebernahme.sql", m002], ["003_vorgangsnummer.sql", m003], ["004_besetzung.sql", m004],
|
||||
["005_projektseite_kategorien.sql", m005], ["006_zahlungsplan_automatisch.sql", m006],
|
||||
["007_anmeldung.sql", m007],
|
||||
];
|
||||
|
||||
export async function starte(db: PGlite, v70?: unknown) {
|
||||
@@ -24,7 +26,7 @@ export async function starte(db: PGlite, v70?: unknown) {
|
||||
await t.query("insert into schema_version (name) values ($1)", [name]);
|
||||
});
|
||||
}
|
||||
const app = (await baueApp({ pool: alsPool(db) as any })) as unknown as {
|
||||
const app = (await baueApp({ pool: alsPool(db) as any, anmeldung: "testversion" })) as unknown as {
|
||||
verarbeite(methode: string, adresse: string, body?: unknown, headers?: Record<string, string>): Promise<Response>;
|
||||
};
|
||||
if (v70 && (await db.query("select 1 from projekt limit 1")).rows.length === 0) {
|
||||
|
||||
@@ -62,7 +62,7 @@ async function main() {
|
||||
if (speicher) {
|
||||
melde("Deine Daten werden geladen …");
|
||||
const daten: Record<string, Record<string, unknown>[]> = {};
|
||||
for (const t of TABELLEN) daten[t.pfad] = await nochmal(() => alle(speicher, t.pfad));
|
||||
for (const pfad of [...TABELLEN.map((t) => t.pfad), "benutzer"]) daten[pfad] = await nochmal(() => alle(speicher, pfad));
|
||||
const e = await nochmal(() => speicher.doc("meta/einstellungen").get());
|
||||
if (Object.values(daten).some((z) => z.length) || e.exists) {
|
||||
const r = await app.verarbeite("POST", "/api/import/stand", { programm: "betrieb", einstellungen: e.data()?.daten, daten });
|
||||
@@ -104,7 +104,8 @@ async function main() {
|
||||
if (!adresse.startsWith("/api/")) return original(eingabe, init);
|
||||
const methode = (init?.method ?? "GET").toUpperCase();
|
||||
const body = typeof init?.body === "string" ? JSON.parse(init.body) : undefined;
|
||||
const antwort = await app.verarbeite(methode, adresse, body, { "x-benutzer": "henning" });
|
||||
// die Oberfläche schickt mit, als wer Henning gerade arbeitet (x-test-benutzer)
|
||||
const antwort = await app.verarbeite(methode, adresse, body, Object.fromEntries(new Headers(init?.headers).entries()));
|
||||
if (methode !== "GET" && antwort.ok) await speichern();
|
||||
return antwort;
|
||||
};
|
||||
|
||||
@@ -13,3 +13,8 @@ export function timingSafeEqual(a: Uint8Array, b: Uint8Array): boolean {
|
||||
}
|
||||
|
||||
(globalThis as any).Buffer ??= { from: (s: string) => new TextEncoder().encode(s) };
|
||||
|
||||
// Passwörter gibt es in der Testversion nicht (src/server/passwort.ts)
|
||||
const ohne = () => { throw new Error("In der Testversion gibt es keine Passwörter."); };
|
||||
export const scrypt = ohne;
|
||||
export const createHash = () => ({ update: () => ({ digest: () => "" }) });
|
||||
|
||||
Reference in New Issue
Block a user