Refresh HiveGrid Cloud reference snapshot

This commit is contained in:
david committed 2026-08-03 15:31:14 +02:00
1 parent 5e99e14772
commit 7f88026f79
5955 files changed
+1177325 -188362

No files matched your search

@@ -1,12 +1,10 @@
import type { LoaderFunctionArgs } from "react-router";
import { serverOnly$ } from "vite-env-only/macros";
import { requireAuth } from "~/utils/loaders.middleware";
import { loadAdminDashboardRouteData, type AdminDashboardLoaderData } from "~/utils/data/.server/adminDashboardRouteData";
export type { AdminDashboardLoaderData };
export const loader = serverOnly$(async ({ request, params }: LoaderFunctionArgs) => {
await requireAuth({ request, params });
const { data, headers } = await loadAdminDashboardRouteData({ request, params });
return Response.json(data, { headers });
})!;
@@ -1,62 +0,0 @@
import { Form, Link, useActionData, useLoaderData, useNavigation } from "react-router";
import { useTranslation } from "react-i18next";
import { ADMIN_MFA_ENROLLMENT_PATH } from "~/utils/auth/mfa/paths";
import { useRootData } from "~/utils/data/useRootData";
import type { ActionData, LoaderData } from "~/routeModules/admin/mfa-challenge.impl";
export default function AdminMfaChallengeRoute() {
const { t } = useTranslation();
const data = useLoaderData<LoaderData>();
const actionData = useActionData<ActionData>();
const navigation = useNavigation();
const rootData = useRootData();
const isSubmitting = navigation.state === "submitting";
return (
<main className="mx-auto flex min-h-screen max-w-md flex-col justify-center px-6 py-12">
<div className="rounded-lg border border-gray-200 bg-white p-6 shadow-sm">
<h1 className="text-xl font-semibold text-gray-900">{t("admin.mfaChallenge.title")}</h1>
<p className="mt-2 text-sm text-gray-600">{t("admin.mfaChallenge.description")}</p>
{actionData?.error ? <p className="mt-4 rounded-md bg-red-50 p-3 text-sm text-red-700">{actionData.error}</p> : null}
<Form method="post" className="mt-6 space-y-4">
{rootData.csrf && <input type="hidden" name="csrf" value={rootData.csrf} />}
<input type="hidden" name="redirectTo" value={actionData?.redirectTo ?? data.redirectTo} />
<div>
<label htmlFor="code" className="block text-sm font-medium text-gray-700">
{t("admin.mfaChallenge.fields.authenticatorCode")}
</label>
<input
id="code"
name="code"
inputMode="numeric"
autoComplete="one-time-code"
pattern="[0-9]{6}"
className="mt-1 block w-full rounded-md border border-gray-300 px-3 py-2 text-gray-900 shadow-sm focus:border-gray-900 focus:outline-none focus:ring-1 focus:ring-gray-900"
/>
</div>
<div>
<label htmlFor="recoveryCode" className="block text-sm font-medium text-gray-700">
{t("admin.mfaChallenge.fields.recoveryCode")}
</label>
<input
id="recoveryCode"
name="recoveryCode"
autoComplete="off"
className="mt-1 block w-full rounded-md border border-gray-300 px-3 py-2 uppercase text-gray-900 shadow-sm focus:border-gray-900 focus:outline-none focus:ring-1 focus:ring-gray-900"
/>
</div>
<button
type="submit"
disabled={isSubmitting || !data.totpEnabled}
className="w-full rounded-md bg-gray-900 px-4 py-2 text-sm font-medium text-white hover:bg-gray-800 disabled:cursor-not-allowed disabled:opacity-60"
>
{isSubmitting ? t("admin.mfaChallenge.actions.verifying") : t("admin.mfaChallenge.actions.verifyAndContinue")}
</button>
</Form>
<Link to={data.enrollmentPath || ADMIN_MFA_ENROLLMENT_PATH} className="mt-4 inline-block text-sm text-gray-600 hover:text-gray-900">
{t("admin.mfaChallenge.actions.manageSettings")}
</Link>
</div>
</main>
);
}
@@ -1,166 +0,0 @@
import { redirect, type ActionFunctionArgs, type LoaderFunctionArgs } from "react-router";
import { serverOnly$ } from "vite-env-only/macros";
import { loadRequiredWebConfig } from "@hivegrid/config";
import { getTranslations } from "~/locale/i18next.server";
import { ADMIN_MFA_DEFAULT_REDIRECT_PATH, ADMIN_MFA_ENROLLMENT_PATH } from "~/utils/auth/mfa/paths";
import { setMfaStepUpState, type MfaStepUpMethod } from "~/utils/auth/mfa/step-up.server";
import { verifyTotpCode } from "~/services/auth/totp.server";
import { checkMfaChallengeRateLimit, mfaChallengeRateLimitKey, recordFailedMfaChallengeAttempt, resetMfaChallengeRateLimit } from "~/utils/auth/mfa/challenge-rate-limit.server";
import { absoluteAdminPath } from "~/utils/app/CrossHostUrls";
import { getHostRoutingContextFromRequest } from "~/utils/app/HostRouting.server";
import { safeRedirectPath } from "~/utils/app/RedirectSafety.server";
import { consumeUserMfaRecoveryCode, getUser, getUserTotpStatus } from "~/utils/db/users.db.server";
import { db } from "~/utils/db.server";
import { commitSession, getUserSession, validateCSRFToken } from "~/utils/session.server";
export type LoaderData = {
redirectTo: string;
totpEnabled: boolean;
enrollmentPath: string;
};
export type ActionData = {
error?: string;
redirectTo: string;
};
function isAdminHostRequest(request: Request) {
return getHostRoutingContextFromRequest(request) === "admin";
}
function getCanonicalAdminChallengeUrl(request: Request) {
const url = new URL(request.url);
return absoluteAdminPath(loadRequiredWebConfig().routing, `mfa-challenge${url.search}`);
}
function safeRedirectTo(value: FormDataEntryValue | string | null | undefined) {
return safeRedirectPath(typeof value === "string" ? value : null, { fallbackPath: ADMIN_MFA_DEFAULT_REDIRECT_PATH });
}
function isSixDigitTotpCode(code: FormDataEntryValue | null): code is string {
return typeof code === "string" && /^\d{6}$/.test(code);
}
function normalizeRecoveryCode(code: FormDataEntryValue | null) {
if (typeof code !== "string") {
return "";
}
return code.trim().toUpperCase();
}
async function getActiveTotpSecret(userId: string) {
const user = await db.user.findUnique({
where: { id: userId },
select: { totpSecretEncrypted: true, totpEnabledAt: true },
});
if (!user?.totpSecretEncrypted || !user.totpEnabledAt) {
return null;
}
return user.totpSecretEncrypted;
}
export const loader = serverOnly$(async ({ request }: LoaderFunctionArgs) => {
if (!isAdminHostRequest(request)) {
throw redirect(getCanonicalAdminChallengeUrl(request));
}
const session = await getUserSession(request);
const userId = session.get("userId");
if (typeof userId !== "string" || userId.length === 0) {
throw redirect("/login");
}
const url = new URL(request.url);
const { t } = await getTranslations(request);
const redirectTo = safeRedirectTo(url.searchParams.get("redirectTo"));
const user = await getUser(userId);
if (!user?.admin) {
throw Response.json({ error: t("admin.mfaChallenge.errors.adminAccessRequired"), redirectTo } satisfies ActionData, { status: 403 });
}
const totpStatus = await getUserTotpStatus(userId);
if (!totpStatus?.enabled) {
throw redirect(ADMIN_MFA_ENROLLMENT_PATH);
}
return Response.json({ redirectTo, totpEnabled: true, enrollmentPath: ADMIN_MFA_ENROLLMENT_PATH } satisfies LoaderData);
})!;
export const action = serverOnly$(async ({ request }: ActionFunctionArgs) => {
const { t } = await getTranslations(request);
if (!isAdminHostRequest(request)) {
return Response.json(
{ error: t("admin.mfaChallenge.errors.adminHostRequired"), redirectTo: getCanonicalAdminChallengeUrl(request) } satisfies ActionData,
{ status: 403 }
);
}
const session = await getUserSession(request);
const userId = session.get("userId");
if (typeof userId !== "string" || userId.length === 0) {
throw redirect("/login");
}
await validateCSRFToken(request);
const form = await request.formData();
const redirectTo = safeRedirectTo(form.get("redirectTo") ?? new URL(request.url).searchParams.get("redirectTo"));
const user = await getUser(userId);
if (!user?.admin) {
return Response.json({ error: t("admin.mfaChallenge.errors.adminAccessRequired"), redirectTo } satisfies ActionData, { status: 403 });
}
const totpStatus = await getUserTotpStatus(user.id);
if (!totpStatus?.enabled) {
throw redirect(ADMIN_MFA_ENROLLMENT_PATH);
}
const rateLimitKey = mfaChallengeRateLimitKey(request, user.id);
const rateLimit = await checkMfaChallengeRateLimit(rateLimitKey);
if (!rateLimit.allowed) {
return Response.json({ error: t("admin.mfaChallenge.errors.tooManyAttempts"), redirectTo } satisfies ActionData, {
status: 429,
headers: { "Retry-After": String(rateLimit.retryAfterSeconds) },
});
}
const code = form.get("code");
let method: MfaStepUpMethod | null = null;
if (isSixDigitTotpCode(code)) {
const encryptedSecret = await getActiveTotpSecret(user.id);
let totpMatches = false;
try {
totpMatches = Boolean(encryptedSecret && verifyTotpCode(encryptedSecret, code));
} catch {
totpMatches = false;
}
if (totpMatches) {
method = "totp";
}
}
if (!method) {
const recoveryCode = normalizeRecoveryCode(form.get("recoveryCode"));
if (recoveryCode.length > 0) {
const result = await consumeUserMfaRecoveryCode(user.id, recoveryCode);
if (result?.consumed) {
method = "recovery-code";
}
}
}
if (!method) {
await recordFailedMfaChallengeAttempt(rateLimitKey);
return Response.json({ error: t("admin.mfaChallenge.errors.invalidCode"), redirectTo } satisfies ActionData, { status: 400 });
}
await resetMfaChallengeRateLimit(rateLimitKey);
setMfaStepUpState(session, { userId: user.id, method, redirectTo });
throw redirect(redirectTo, {
headers: {
"Set-Cookie": await commitSession(session),
},
});
})!;
@@ -14,6 +14,7 @@ import { Tooltip } from "~/ui/components/Tooltip";
import { AuthShell } from "~/components/auth/AuthShell";
import type { RoleTone } from "@hivegrid/view-models";
import type { ActionData, LoaderData } from "~/routeModules/auth/select-tenant.impl";
import { useRedirectToast } from "~/hooks/use-save-toast";
// D-D0a / WF-P2 — Flow "Workspace Auswahl". 1:1 an Davids Subframe-Page "S01 Workspace Auswahl":
// AuthShell (Davids echte Card, large) + Titel mit Info-Tooltip + Untertitel + Such-Feld (TextInput
@@ -32,6 +33,7 @@ const ROLE_BADGE_FARBE: Record<RoleTone, "subtle-negative" | "subtle-blue" | "su
};
export default function SelectTenantRoute() {
useRedirectToast();
const { t } = useTranslation();
const { csrf } = useRootData();
const { vm, copy, showCreateAction = true } = useLoaderData<LoaderData>();
@@ -84,23 +86,10 @@ export default function SelectTenantRoute() {
showLogo={true}
dataUiId="ui.auth.selectTenant.page"
>
{actionData?.error ? (
<ErrorState
variant="full-width"
hideCancel
title={t(actionData.error)}
data-ui-id="ui.auth.selectTenant.error"
/>
) : null}
{actionData?.error ? <ErrorState variant="full-width" hideCancel title={t(actionData.error)} data-ui-id="ui.auth.selectTenant.error" /> : null}
{vm.status === "ready" ? (
<TextInput
className="h-auto w-full flex-none"
variant="filled"
fillContainer
type="search"
data-ui-id="ui.auth.selectTenant.search"
>
<TextInput className="h-auto w-full flex-none" variant="filled" fillContainer type="search" data-ui-id="ui.auth.selectTenant.search">
<TextInput.Input
type="search"
placeholder={t(copy?.searchPlaceholderKey ?? "account.selectTenant.searchPlaceholder")}
@@ -124,7 +113,7 @@ export default function SelectTenantRoute() {
</span>
<div className="flex w-full flex-col items-start">
{visibleTenants.length === 0 ? (
<p className="w-full py-4 text-center text-body-small-regular-150 font-body-small-regular-150 text-text-neutral-tertiary">
<p className="text-body-small-regular-150 font-body-small-regular-150 text-text-neutral-tertiary w-full py-4 text-center">
{t(copy?.noResultsKey ?? "account.selectTenant.noResults")}
</p>
) : (
@@ -136,27 +125,23 @@ export default function SelectTenantRoute() {
<button
type="submit"
disabled={isSubmitting}
className="group/row flex w-full cursor-pointer items-center gap-3 rounded-md px-3 py-3 text-left transition hover:bg-surface-neutral-tertiary disabled:cursor-default disabled:opacity-60"
className="group/row hover:bg-surface-neutral-tertiary flex w-full cursor-pointer items-center gap-3 rounded-md px-3 py-3 text-left transition disabled:cursor-default disabled:opacity-60"
data-ui-id="ui.auth.selectTenant.card"
>
<Avatar size="medium" color={tenant.avatarColor} image={tenant.avatarImage}>
{tenant.avatarInitials}
</Avatar>
<div className="flex grow shrink-0 basis-0 flex-col items-start gap-0.5">
<div className="flex shrink-0 grow basis-0 flex-col items-start gap-0.5">
<div className="flex w-full items-center gap-2">
<span className="text-body-default-medium-0 font-body-default-medium-0 text-text-neutral-primary">
{tenant.name}
</span>
<span className="text-body-default-medium-0 font-body-default-medium-0 text-text-neutral-primary">{tenant.name}</span>
{tenant.role && tenant.roleTone ? (
<BadgeFeedback farbe={ROLE_BADGE_FARBE[tenant.roleTone]} size="small">
{t(tenant.roleLabelKey ?? "")}
</BadgeFeedback>
) : null}
</div>
<span className="w-full text-body-extra-small-regular-150 font-body-extra-small-regular-150 text-text-neutral-tertiary">
{[tenant.subtitle, tenant.isCurrent ? t("account.selectTenant.lastUsed") : null]
.filter(Boolean)
.join(" · ")}
<span className="text-body-extra-small-regular-150 font-body-extra-small-regular-150 text-text-neutral-tertiary w-full">
{[tenant.subtitle, tenant.isCurrent ? t("account.selectTenant.lastUsed") : null].filter(Boolean).join(" · ")}
</span>
</div>
<FeatherChevronRight className="text-body-default-regular-0 font-body-default-regular-0 text-icon-neutral-tertiary group-hover/row:text-icon-neutral-primary" />
@@ -170,15 +155,10 @@ export default function SelectTenantRoute() {
{showCreateAction ? (
<>
<div className="flex h-px w-full flex-none flex-col items-center bg-border-default" />
<div className="bg-border-default flex h-px w-full flex-none flex-col items-center" />
<div className="flex w-full flex-col items-center justify-center gap-6">
<LinkButton
icon={<FeatherPlus />}
iconRight={null}
onClick={() => navigate("/new-account")}
data-ui-id="ui.auth.selectTenant.addNew"
>
<LinkButton icon={<FeatherPlus />} iconRight={null} onClick={() => navigate("/new-account")} data-ui-id="ui.auth.selectTenant.addNew">
{t("account.selectTenant.addNew")}
</LinkButton>
</div>