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,17 +1,13 @@
import { useTranslation } from "react-i18next";
import { ActionFunctionArgs, Link, LoaderFunctionArgs, redirect, useActionData, useLoaderData } from "react-router";
import { adminGetAllUsers, getUser, getUserTotpStatus, updateUserPassword, UserWithDetails } from "~/utils/db/users.db.server";
import { enforceAdminMfa } from "~/utils/auth/mfa/enforcement.server";
import { checkMfaStepUpState } from "~/utils/auth/mfa/step-up.server";
import { createImpersonationStartedAt, createUserSession, getUserInfo, getUserSession, setLoggedUser, validateCSRFToken } from "~/utils/session.server";
import { ActionFunctionArgs, Link, LoaderFunctionArgs, useActionData, useLoaderData } from "react-router";
import { adminGetAllUsers, getUser, updateUserPassword, UserWithDetails } from "~/utils/db/users.db.server";
import { createImpersonationStartedAt, getUserInfo, setLoggedUser, validateCSRFToken } from "~/utils/session.server";
import { getTranslations } from "~/locale/i18next.server";
import { hashPassword } from "~/utils/auth/passwordHasher.server";
import { validatePassword as validatePolicyPassword } from "~/services/auth/password-policy.server";
import { requireAdminMfaForAction } from "~/services/auth/admin-mfa-gate.server";
import UsersTable from "~/components/core/users/UsersTable";
import { deleteUserWithItsTenants } from "~/utils/services/userService";
import { getUserHasPermission } from "~/utils/helpers/PermissionsHelper";
import { verifyUserHasPermission } from "~/utils/helpers/.server/PermissionsService";
import { useAdminData } from "~/utils/data/useAdminData";
import InputFilters from "~/components/ui/input/InputFilters";
import { getFiltersFromCurrentUrl, getPaginationFromCurrentUrl } from "~/utils/helpers/RowPaginationHelper";
@@ -19,25 +15,23 @@ import { FilterablePropertyDto } from "~/application/dtos/data/FilterablePropert
import EventsService from "~/modules/events/services/.server/EventsService";
import { adminGetAllTenantsIdsAndNames, getTenant } from "~/utils/db/tenants.db.server";
import { PaginationDto } from "~/application/dtos/data/PaginationDto";
import type { Log } from "@hivegrid/db/prisma-browser";
import { getLastUserLogsByUserIds } from "~/utils/db/logs.db.server";
import { getLastUserLogsByUserIds, type AdminUserLastActivity } from "~/utils/db/logs.db.server";
import { useNavigate, useOutlet } from "react-router";
import { createMetrics } from "~/modules/metrics/services/.server/MetricTracker";
import { serverTimingHeaders } from "~/modules/metrics/utils/defaultHeaders";
import EditPageLayout from "~/components/ui/layouts/EditPageLayout";
import SlideOverWideEmpty from "~/components/ui/slideOvers/SlideOverWideEmpty";
import { AccountDeletedDto } from "~/modules/events/dtos/AccountDeletedDto";
import { UserPasswordUpdatedDto } from "~/modules/events/dtos/UserPasswordUpdatedDto";
import { UserProfileDeletedDto } from "~/modules/events/dtos/UserProfileDeletedDto";
import { useEffect } from "react";
import toast from "react-hot-toast";
import { toast } from "sonner";
import { Button } from "~/components/ui/button";
import { adminPath } from "~/utils/app/CanonicalUrlUtils";
import { createImpersonationAudit } from "@hivegrid/db/impersonation-audit.server";
import { createAuditEvent } from "@hivegrid/db/audit-events.server";
import { extractWebActorIp, extractWebActorUserAgent } from "~/utils/audit/withAuditContext";
import { loadRequiredWebConfig } from "@hivegrid/config";
import { absoluteAppPath, absoluteAppRootPath, type PublicDomainRoutingConfig } from "~/utils/app/CrossHostUrls";
import { adminPath } from "~/utils/app/CanonicalUrlUtils";
import { revokeAllUserSessionsForUser } from "~/services/auth/sessionStore.server";
import { createSessionHandoffRedirect } from "~/services/auth/session-handoff.server";
import { requireAdminIdentityPermission } from "~/services/admin/admin-identity.server";
import { recordAdminAction } from "~/services/admin/admin-action-audit.server";
export { serverTimingHeaders as headers };
// export const meta: MetaFunction<typeof loader> = ({ data }) => [{ title: data?.title }];
@@ -48,7 +42,7 @@ type LoaderData = {
items: UserWithDetails[];
filterableProperties: FilterablePropertyDto[];
pagination: PaginationDto;
lastLogs: { userId: string; log: Log }[];
lastLogs: { userId: string; log: AdminUserLastActivity }[];
};
export function adminImpersonationRedirectTarget(
@@ -60,7 +54,7 @@ export function adminImpersonationRedirectTarget(
export const loader = async ({ request, params }: LoaderFunctionArgs) => {
const { time, getServerTimingHeader } = await createMetrics({ request, params }, "admin.users");
await time(verifyUserHasPermission(request, "admin.users.view"), "verifyUserHasPermission");
await time(requireAdminIdentityPermission(request, "admin.users.view"), "requireAdminIdentityPermission");
let { t } = await getTranslations(request);
const filterableProperties: FilterablePropertyDto[] = [
@@ -123,12 +117,12 @@ export const loader = async ({ request, params }: LoaderFunctionArgs) => {
const { items, pagination } = await time(adminGetAllUsers(filters, currentPagination), "adminGetAllUsers");
const lastLogsByUserId = await time(getLastUserLogsByUserIds(items.map((user) => user.id)), "getLastUserLogsByUserIds");
const lastLogs: { userId: string; log: Log }[] = items
const lastLogs: { userId: string; log: AdminUserLastActivity }[] = items
.map((user) => {
const log = lastLogsByUserId.get(user.id);
return log ? { userId: user.id, log } : null;
})
.filter((entry): entry is { userId: string; log: Log } => entry !== null);
.filter((entry): entry is { userId: string; log: AdminUserLastActivity } => entry !== null);
const data: LoaderData = {
title: `${t("models.user.plural")} | ${process.env.APP_NAME}`,
@@ -147,9 +141,7 @@ type ActionData = {
const success = (data: ActionData) => Response.json(data, { status: 200 });
const badRequest = (data: ActionData) => Response.json(data, { status: 400 });
export const action = async ({ request }: ActionFunctionArgs) => {
await verifyUserHasPermission(request, "admin.users.view");
await validateCSRFToken(request);
const userInfo = await getUserInfo(request);
const { t } = await getTranslations(request);
const form = await request.formData();
@@ -162,165 +154,82 @@ export const action = async ({ request }: ActionFunctionArgs) => {
}
switch (action) {
case "impersonate": {
await verifyUserHasPermission(request, "admin.users.impersonate");
// Phase 09 #82 — sensitive-action MFA gate (otpauth from #26).
// requireAdminMfaForAction wraps the existing enforceAdminMfa /
// step-up plumbing under a typed action taxonomy so future audit
// events tag the gate consistently.
await requireAdminMfaForAction(request, "impersonation.start", userInfo.userId);
await requireAdminUsersActionMfa(request, userInfo.userId);
const userSession = await setLoggedUser(user);
if (!userSession) {
return badRequest({
error: t("shared.notFound"),
});
const adminSession = await requireAdminIdentityPermission(request, "admin_identity.impersonation.start");
const userInfo = await getUserInfo(request);
const reason = form.get("reason")?.toString().trim() ?? "";
if (reason.length < 10) {
return badRequest({ error: t("admin.users.errors.impersonationReasonRequired") });
}
// Reuse the tenant resolved inside setLoggedUser to avoid a duplicate
// getTenant() round-trip on every impersonation start.
const userSession = await setLoggedUser(user);
const tenant = userSession.defaultTenant ?? (userSession.defaultTenantId ? await getTenant(userSession.defaultTenantId) : null);
await createImpersonationAudit({
actorUserId: userInfo.userId,
targetUserId: user.id,
tenantId: tenant?.id ?? userSession.defaultTenantId ?? null,
action: "start",
reason: "admin.users.impersonate",
requestPath: new URL(request.url).pathname,
});
// Phase 10 Task #67: also emit the consolidated AuditEvent so the
// compliance export picks up admin impersonations without joining
// the legacy ImpersonationAudit table. ImpersonationAudit remains
// for backwards-compat; a future task will retire it.
await createAuditEvent({
tenantId: tenant?.id ?? userSession.defaultTenantId ?? null,
actorId: userInfo.userId,
actorType: "admin",
actorIp: extractWebActorIp(request),
actorUserAgent: extractWebActorUserAgent(request),
action: "admin.impersonation.start",
targetType: "user",
await recordAdminAction({
action: "impersonation.started",
actorUserId: adminSession.adminUserId,
actorEmail: adminSession.adminUser.email,
targetKind: "tenant-user",
targetId: user.id,
sourceModule: "admin",
outcome: "success",
dataSensitivity: "confidential",
regulatoryScope: ["soc2"],
metadata: { requestPath: new URL(request.url).pathname, reason: "admin.users.impersonate" },
reason,
request,
extraMeta: { tenantId: tenant?.id ?? userSession.defaultTenantId ?? null },
});
return createUserSession(
{
return createSessionHandoffRedirect({
request,
session: {
...userInfo,
...userSession,
impersonatingFromUserId: userInfo.userId,
impersonatingFromAdminUserId: adminSession.adminUserId,
impersonatingFromAdminEmail: adminSession.adminUser.email,
impersonatingStartedAt: createImpersonationStartedAt(),
},
adminImpersonationRedirectTarget(tenant)
);
redirectTo: adminImpersonationRedirectTarget(tenant),
});
}
case "change-password": {
await verifyUserHasPermission(request, "admin.users.changePassword");
const actor = await requireAdminUsersActionMfa(request, userInfo.userId);
const adminSession = await requireAdminIdentityPermission(request, "admin.users.changePassword");
const passwordNew = form.get("password-new")?.toString();
if (!passwordNew) {
return badRequest({ error: t("admin.users.errors.passwordMinLength") });
}
if (user?.admin) {
return badRequest({ error: t("admin.users.errors.cannotChangeAdminPassword") });
}
const policyResult = await validatePolicyPassword(passwordNew, user?.email ? { email: user.email } : {});
const policyResult = await validatePolicyPassword(passwordNew, user.email ? { email: user.email } : {});
if (!policyResult.valid) {
const first = policyResult.errors[0];
return badRequest({ error: first ? t(first.code, first.args ?? {}) : t("admin.users.errors.passwordMinLength") });
}
const passwordHash = await hashPassword(passwordNew);
await updateUserPassword({ passwordHash }, user?.id);
await EventsService.create({
request,
event: "user.password.updated",
tenantId: null,
userId: user.id,
data: {
user: { id: user.id, email: user.email },
fromUser: { id: actor?.id ?? "", email: actor?.email ?? "" },
} satisfies UserPasswordUpdatedDto,
});
await revokeAllUserSessionsForUser(user.id);
await EventsService.createUserEventWithMutation(
{
request,
event: "user.password.updated",
userId: adminSession.adminUserId,
data: {
user: { id: user.id, email: user.email },
fromUser: { id: adminSession.adminUserId, email: adminSession.adminUser.email },
} satisfies UserPasswordUpdatedDto,
},
() => updateUserPassword({ passwordHash }, user.id)
);
return success({ success: t("shared.updated") });
}
case "delete-user": {
await verifyUserHasPermission(request, "admin.users.delete");
// Phase 09 #82 — destructive admin action (delete user + cascading
// tenants) goes through the sensitive-action gate before the existing
// step-up enforcement.
await requireAdminMfaForAction(request, "tenant.delete", userInfo.userId);
await requireAdminUsersActionMfa(request, userInfo.userId);
const adminSession = await requireAdminIdentityPermission(request, "admin.users.delete");
try {
const { deletedTenants } = await deleteUserWithItsTenants(userId);
const deletedAccounts = await Promise.all(
deletedTenants.map(async (tenant) => {
const data = {
tenant: { id: tenant.id, name: tenant.name },
user: { id: user.id, email: user.email },
} satisfies AccountDeletedDto;
await EventsService.create({
request,
event: "account.deleted",
tenantId: null,
userId: null,
data,
});
return data;
})
);
await EventsService.create({
await deleteUserWithItsTenants({
actorUserId: adminSession.adminUserId,
targetUser: user,
request,
event: "user.profile.deleted",
tenantId: null,
userId: null,
data: {
id: user.id,
email: user.email,
firstName: user.firstName,
lastName: user.lastName,
deletedAccounts,
} satisfies UserProfileDeletedDto,
});
} catch (error) {
// eslint-disable-next-line no-console
console.error(error);
return badRequest({
error: t("shared.unexpectedError"),
});
return badRequest({ error: t("shared.unexpectedError") });
}
return success({ success: t("shared.deleted") });
}
default: {
default:
return badRequest({ error: t("admin.users.errors.invalidForm") });
}
}
};
async function requireAdminUsersActionMfa(request: Request, actorUserId: string) {
const session = await getUserSession(request);
const actor = await getUser(actorUserId);
const mfaEnforcement = enforceAdminMfa({
requestUrl: request.url,
userId: actor?.id,
isAdmin: Boolean(actor?.admin),
totpStatus: actor ? await getUserTotpStatus(actor.id) : null,
stepUp: actor ? checkMfaStepUpState(session, actor.id) : { verified: false, reason: "missing" },
redirectMode: "host-aware",
appFallbackPath: absoluteAppRootPath(loadRequiredWebConfig().routing),
});
if (mfaEnforcement instanceof Response) {
throw mfaEnforcement;
}
if (!mfaEnforcement.allowed) {
throw redirect(mfaEnforcement.redirectTo);
}
return actor;
}
export default function AdminUsersRoute() {
const { t } = useTranslation();
const data = useLoaderData<LoaderData>();
@@ -344,17 +253,17 @@ export default function AdminUsersRoute() {
<>
<InputFilters size="sm" filters={data.filterableProperties} />
<Button asChild type="button" variant="default" size="sm">
<Link to="new">{t("shared.new")}</Link>
<Link to={adminPath("settings/admin-users", { mode: "host-aware" })}>{t("admin.sales.adminUsers.title")}</Link>
</Button>
</>
}
>
<UsersTable
items={data.items}
canImpersonate={getUserHasPermission(adminData, "admin.users.impersonate")}
canImpersonate={getUserHasPermission(adminData, "admin_identity.impersonation.start")}
canChangePassword={getUserHasPermission(adminData, "admin.users.changePassword")}
canDelete={getUserHasPermission(adminData, "admin.users.delete")}
canSetUserRoles={adminData.isSuperAdmin}
canSetUserRoles={false}
pagination={data.pagination}
lastLogs={data.lastLogs}
/>