Update hivegrid-cloud reference to latest main
Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
This commit is contained in:
1 parent
e98d38e716
commit
7b21524c86
3781 files changed
+373484
-225607
No files matched your search
+113
-82
@@ -1,6 +1,6 @@
|
||||
// @vitest-environment node
|
||||
import { beforeEach, describe, expect, it, vi } from "vitest";
|
||||
import type { ActionFunctionArgs } from "react-router";
|
||||
import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";
|
||||
|
||||
vi.mock("react-i18next", () => ({
|
||||
useTranslation: () => ({ t: (key: string) => key }),
|
||||
@@ -12,43 +12,31 @@ vi.mock("react-router", async () => {
|
||||
useActionData: () => undefined,
|
||||
useLoaderData: () => ({}),
|
||||
useNavigate: () => vi.fn(),
|
||||
useNavigation: () => ({ state: "idle" }),
|
||||
useOutlet: () => null,
|
||||
useParams: () => ({}),
|
||||
useSubmit: () => vi.fn(),
|
||||
};
|
||||
});
|
||||
vi.mock("~/components/core/roles/GroupsTable", () => ({ default: () => null }));
|
||||
vi.mock("~/components/core/roles/RoleBadge", () => ({ default: () => null }));
|
||||
vi.mock("~/components/core/roles/RolesAndPermissionsMatrix", () => ({ default: () => null }));
|
||||
vi.mock("~/components/core/roles/UserRolesTable", () => ({ default: () => null }));
|
||||
vi.mock("~/components/core/settings/members/MemberInvitationsListAndTable", () => ({ default: () => null }));
|
||||
vi.mock("~/components/ui/input/InputSearch", () => ({ default: () => null }));
|
||||
vi.mock("react-hot-toast", () => ({ default: { success: vi.fn(), error: vi.fn() } }));
|
||||
vi.mock("~/components/screens/users/MembersPage", () => ({ MembersPage: () => null }));
|
||||
vi.mock("~/ui/components/Dialog", () => ({ Dialog: Object.assign(() => null, { Content: () => null }) }));
|
||||
vi.mock("~/components/ui/layouts/EditPageLayout", () => ({ default: () => null }));
|
||||
vi.mock("~/components/ui/modals/ActionResultModal", () => ({ default: () => null }));
|
||||
vi.mock("~/components/ui/modals/ConfirmModal", () => ({ default: () => null }));
|
||||
vi.mock("~/components/ui/modals/ErrorModal", () => ({ default: () => null }));
|
||||
vi.mock("~/components/ui/modals/Modal", () => ({ default: () => null }));
|
||||
vi.mock("~/components/ui/sections/SettingSection", () => ({ default: () => null }));
|
||||
vi.mock("~/components/ui/slideOvers/SlideOverWideEmpty", () => ({ default: () => null }));
|
||||
vi.mock("~/components/ui/tables/TableSimple", () => ({ default: () => null }));
|
||||
vi.mock("~/utils/app/UrlUtils", () => ({ default: { currentTenantUrl: vi.fn(() => "/acme/settings/subscription") } }));
|
||||
vi.mock("~/utils/data/useAppData", () => ({ useAppData: () => ({}) }));
|
||||
vi.mock("~/utils/app/UrlUtils", () => ({ default: { currentTenantUrl: vi.fn(() => "/acme/settings/members") } }));
|
||||
vi.mock("~/utils/data/useRootData", () => ({ useRootData: () => ({}) }));
|
||||
vi.mock("~/utils/db/logs.db.server", () => ({ createAdminLog: vi.fn() }));
|
||||
vi.mock("~/utils/db/permissions/groups.db.server", () => ({ getAllGroups: vi.fn(), getMyGroups: vi.fn() }));
|
||||
vi.mock("~/utils/db/permissions/permissions.db.server", () => ({ getAllPermissions: vi.fn() }));
|
||||
vi.mock("~/utils/db/permissions/roles.db.server", () => ({ getAllRoles: vi.fn(), getTenantAssignableAppRole: vi.fn() }));
|
||||
vi.mock("~/utils/db/permissions/roles.db.server", () => ({ getTenantAssignableAppRole: vi.fn(), getTenantAssignableAppRoles: vi.fn() }));
|
||||
vi.mock("~/utils/db/permissions/userRoles.db.server", () => ({ createUserRole: vi.fn(), deleteUserRole: vi.fn() }));
|
||||
vi.mock("~/utils/db/tenantUserInvitations.db.server", () => ({ deleteUserInvitation: vi.fn(), getUserInvitation: vi.fn(), getUserInvitations: vi.fn() }));
|
||||
vi.mock("~/utils/db/tenants.db.server", () => ({ getTenant: vi.fn(), getTenantMember: vi.fn(), getTenantUsers: vi.fn() }));
|
||||
vi.mock("~/utils/helpers/PermissionsHelper", () => ({ getUserHasPermission: vi.fn() }));
|
||||
vi.mock("~/utils/helpers/.server/PermissionsService", () => ({ getUserPermission: vi.fn(), verifyUserHasPermission: vi.fn() }));
|
||||
vi.mock("~/locale/i18next.server", () => ({ getTranslations: vi.fn(async () => ({ t: (key: string) => key })) }));
|
||||
vi.mock("~/modules/events/services/.server/EventsService", () => ({ default: { create: vi.fn() } }));
|
||||
vi.mock("~/utils/services/.server/urlService", () => ({ getTenantIdFromUrl: vi.fn() }));
|
||||
vi.mock("~/utils/services/tenantUserLifecycle.server", () => ({ deactivateTenantUser: vi.fn(), reactivateTenantUser: vi.fn() }));
|
||||
vi.mock("~/utils/auth/mfa/enforcement.server", () => ({ enforceAdminMfa: vi.fn() }));
|
||||
vi.mock("~/utils/auth/mfa/step-up.server", () => ({ checkMfaStepUpState: vi.fn() }));
|
||||
vi.mock("~/utils/db/users.db.server", () => ({ getUser: vi.fn(), getUserTotpStatus: vi.fn() }));
|
||||
vi.mock("~/utils/db/users.db.server", () => ({ getUser: vi.fn(), getUserTotpStatus: vi.fn(), getEnabledTotpUserIds: vi.fn() }));
|
||||
vi.mock("~/utils/session.server", () => ({
|
||||
createImpersonationStartedAt: vi.fn(() => "2026-05-08T17:00:00.000Z"),
|
||||
createUserSession: vi.fn(),
|
||||
@@ -57,7 +45,7 @@ vi.mock("~/utils/session.server", () => ({
|
||||
setLoggedUser: vi.fn(),
|
||||
validateCSRFToken: vi.fn(),
|
||||
}));
|
||||
vi.mock("@toolctrl/config", () => ({
|
||||
vi.mock("@hivegrid/config", () => ({
|
||||
loadRequiredWebConfig: () => ({
|
||||
routing: {
|
||||
protocol: "https",
|
||||
@@ -71,15 +59,14 @@ vi.mock("@toolctrl/config", () => ({
|
||||
|
||||
import { enforceAdminMfa } from "~/utils/auth/mfa/enforcement.server";
|
||||
import { checkMfaStepUpState } from "~/utils/auth/mfa/step-up.server";
|
||||
import { getAllRoles, getTenantAssignableAppRole } from "~/utils/db/permissions/roles.db.server";
|
||||
import { getAllGroups, getMyGroups } from "~/utils/db/permissions/groups.db.server";
|
||||
import { getAllPermissions } from "~/utils/db/permissions/permissions.db.server";
|
||||
import { getTenantAssignableAppRole, getTenantAssignableAppRoles } from "~/utils/db/permissions/roles.db.server";
|
||||
import { createUserRole } from "~/utils/db/permissions/userRoles.db.server";
|
||||
import { deleteUserInvitation, getUserInvitation, getUserInvitations } from "~/utils/db/tenantUserInvitations.db.server";
|
||||
import { getTenant, getTenantMember, getTenantUsers } from "~/utils/db/tenants.db.server";
|
||||
import { getUser, getUserTotpStatus } from "~/utils/db/users.db.server";
|
||||
import { getEnabledTotpUserIds, getUser, getUserTotpStatus } from "~/utils/db/users.db.server";
|
||||
import { getUserPermission, verifyUserHasPermission } from "~/utils/helpers/.server/PermissionsService";
|
||||
import { getTenantIdFromUrl } from "~/utils/services/.server/urlService";
|
||||
import { deactivateTenantUser, reactivateTenantUser } from "~/utils/services/tenantUserLifecycle.server";
|
||||
import { createUserSession, getUserInfo, getUserSession, setLoggedUser, validateCSRFToken } from "~/utils/session.server";
|
||||
import { action, loader } from "./members";
|
||||
import { TenantUserStatus } from "~/application/enums/tenants/TenantUserStatus";
|
||||
@@ -122,7 +109,7 @@ async function callLoader() {
|
||||
request: new Request("https://app.example.test/acme/settings/members"),
|
||||
params: { tenant: "acme" },
|
||||
context: {},
|
||||
});
|
||||
} as LoaderFunctionArgs);
|
||||
}
|
||||
|
||||
describe("workspace members impersonation MFA guard", () => {
|
||||
@@ -233,7 +220,7 @@ describe("workspace members impersonation MFA guard", () => {
|
||||
await expect(result.response.json()).resolves.toEqual({ success: "settings.members.success.invitationDeleted" });
|
||||
});
|
||||
|
||||
it("localizes the last-super-admin removal guard response", async () => {
|
||||
it("localizes the last-super-admin removal guard response with the V01 code", async () => {
|
||||
vi.mocked(getTenantMember).mockResolvedValue({ user: targetUser } as never);
|
||||
vi.mocked(getTenantAssignableAppRole).mockResolvedValue({ id: "role-super", name: "SuperUser", description: "Super User", type: "app" } as never);
|
||||
vi.mocked(getTenantUsers).mockResolvedValue([
|
||||
@@ -247,7 +234,7 @@ describe("workspace members impersonation MFA guard", () => {
|
||||
|
||||
expect(result.thrown).toBe(false);
|
||||
expect(result.response.status).toBe(400);
|
||||
await expect(result.response.json()).resolves.toEqual({ error: "settings.members.errors.atLeastOneSuperAdmin" });
|
||||
await expect(result.response.json()).resolves.toEqual({ error: "settings.members.errors.atLeastOneSuperAdmin", code: "last-admin" });
|
||||
});
|
||||
|
||||
it("localizes the own super-admin role removal guard response", async () => {
|
||||
@@ -284,67 +271,111 @@ describe("workspace members impersonation MFA guard", () => {
|
||||
});
|
||||
});
|
||||
|
||||
describe("workspace members loader", () => {
|
||||
describe("workspace member lifecycle intents (R-P2b M03/V01)", () => {
|
||||
beforeEach(() => {
|
||||
vi.clearAllMocks();
|
||||
vi.mocked(getTenantIdFromUrl).mockResolvedValue("tenant-1" as never);
|
||||
vi.mocked(verifyUserHasPermission).mockResolvedValue(undefined as never);
|
||||
vi.mocked(validateCSRFToken).mockResolvedValue(undefined as never);
|
||||
vi.mocked(getUserInfo).mockResolvedValue(actorInfo as never);
|
||||
vi.mocked(getUser).mockResolvedValue(actor as never);
|
||||
vi.mocked(getTenant).mockResolvedValue({ id: "tenant-1", name: "Acme", slug: "acme" } as never);
|
||||
vi.mocked(getTenantMember).mockResolvedValue({ user: targetUser } as never);
|
||||
});
|
||||
|
||||
it("deactivates a member through the lifecycle service without reassign", async () => {
|
||||
vi.mocked(deactivateTenantUser).mockResolvedValue({ ok: true } as never);
|
||||
|
||||
const result = await callAction({ action: "deactivate", "user-id": targetUser.id });
|
||||
|
||||
expect(result.thrown).toBe(false);
|
||||
expect(deactivateTenantUser).toHaveBeenCalledWith({ tenantId: "tenant-1", targetUserId: targetUser.id });
|
||||
await expect(result.response.json()).resolves.toEqual({ success: "settings.members.success.deactivated" });
|
||||
});
|
||||
|
||||
it("maps the last-admin guard to the V01 blocker code", async () => {
|
||||
vi.mocked(deactivateTenantUser).mockResolvedValue({ ok: false, reason: "last-admin" } as never);
|
||||
|
||||
const result = await callAction({ action: "deactivate", "user-id": targetUser.id });
|
||||
|
||||
expect(result.thrown).toBe(false);
|
||||
expect(result.response.status).toBe(400);
|
||||
await expect(result.response.json()).resolves.toEqual({ error: "settings.members.errors.lastAdminBody", code: "last-admin" });
|
||||
});
|
||||
|
||||
it("rejects other deactivation failures with a plain error", async () => {
|
||||
vi.mocked(deactivateTenantUser).mockResolvedValue({ ok: false, reason: "already-inactive" } as never);
|
||||
|
||||
const result = await callAction({ action: "deactivate", "user-id": targetUser.id });
|
||||
|
||||
expect(result.response.status).toBe(400);
|
||||
await expect(result.response.json()).resolves.toEqual({ error: "shared.invalidForm" });
|
||||
});
|
||||
|
||||
it("reactivates a member through the lifecycle service", async () => {
|
||||
vi.mocked(reactivateTenantUser).mockResolvedValue({ ok: true } as never);
|
||||
|
||||
const result = await callAction({ action: "reactivate", "user-id": targetUser.id });
|
||||
|
||||
expect(result.thrown).toBe(false);
|
||||
expect(reactivateTenantUser).toHaveBeenCalledWith({ tenantId: "tenant-1", targetUserId: targetUser.id });
|
||||
await expect(result.response.json()).resolves.toEqual({ success: "settings.members.success.reactivated" });
|
||||
});
|
||||
});
|
||||
|
||||
describe("workspace members loader (MembersListVM)", () => {
|
||||
beforeEach(() => {
|
||||
vi.clearAllMocks();
|
||||
vi.mocked(getTenantIdFromUrl).mockResolvedValue("tenant-1" as never);
|
||||
vi.mocked(verifyUserHasPermission).mockResolvedValue(undefined as never);
|
||||
vi.mocked(getUserInfo).mockResolvedValue(actorInfo as never);
|
||||
vi.mocked(getTenantUsers).mockResolvedValue([{ id: "member-1", user: { id: "user-1" } }] as never);
|
||||
vi.mocked(getUserInvitations).mockResolvedValue([{ id: "invite-1" }] as never);
|
||||
vi.mocked(getAllRoles).mockResolvedValue([{ id: "role-1" }] as never);
|
||||
vi.mocked(getAllPermissions).mockResolvedValue([{ name: "app.settings.members.view" }] as never);
|
||||
vi.mocked(getUserPermission).mockResolvedValue({ permission: null, userPermission: null } as never);
|
||||
vi.mocked(getAllGroups).mockResolvedValue([{ id: "group-1" }] as never);
|
||||
vi.mocked(getMyGroups).mockResolvedValue([{ id: "my-group-1" }] as never);
|
||||
vi.mocked(getEnabledTotpUserIds).mockResolvedValue(["user-1"] as never);
|
||||
vi.mocked(getUserInvitations).mockResolvedValue([{ id: "invite-1", email: "new@example.test", firstName: "New", lastName: "Person" }] as never);
|
||||
// The helper already scopes to assignable defaults + the tenant's own roles.
|
||||
vi.mocked(getTenantAssignableAppRoles).mockResolvedValue([
|
||||
{ id: "role-1", name: "SuperUser", description: "", tenantId: null },
|
||||
{ id: "role-shk", name: "Monteur", description: "", tenantId: "tenant-1" },
|
||||
] as never);
|
||||
vi.mocked(getTenantUsers).mockResolvedValue([
|
||||
{
|
||||
id: "member-1",
|
||||
userId: "user-1",
|
||||
status: TenantUserStatus.ACTIVE,
|
||||
user: {
|
||||
id: "user-1",
|
||||
firstName: "Ada",
|
||||
lastName: "Lovelace",
|
||||
email: "ada@example.test",
|
||||
phone: "+49 1",
|
||||
roles: [{ tenantId: "tenant-1", role: { id: "role-1", name: "SuperUser", description: "" } }],
|
||||
},
|
||||
},
|
||||
{
|
||||
id: "member-2",
|
||||
userId: "user-2",
|
||||
status: TenantUserStatus.INACTIVE,
|
||||
user: { id: "user-2", firstName: "Grace", lastName: "Hopper", email: "grace@example.test", phone: null, roles: [] },
|
||||
},
|
||||
] as never);
|
||||
});
|
||||
|
||||
it("loads independent members settings data in parallel before resolving groups", async () => {
|
||||
const started: string[] = [];
|
||||
vi.mocked(getTenantUsers).mockImplementation(async () => {
|
||||
started.push("users");
|
||||
return [{ id: "member-1", user: { id: "user-1" } }] as never;
|
||||
});
|
||||
vi.mocked(getUserInvitations).mockImplementation(async () => {
|
||||
started.push("invitations");
|
||||
return [{ id: "invite-1" }] as never;
|
||||
});
|
||||
vi.mocked(getAllRoles).mockImplementation(async () => {
|
||||
started.push("roles");
|
||||
return [{ id: "role-1" }] as never;
|
||||
});
|
||||
vi.mocked(getAllPermissions).mockImplementation(async () => {
|
||||
started.push("permissions");
|
||||
return [{ name: "app.settings.members.view" }] as never;
|
||||
});
|
||||
vi.mocked(getUserPermission).mockImplementation(async () => {
|
||||
started.push("group-access");
|
||||
return { permission: null, userPermission: null } as never;
|
||||
});
|
||||
it("builds the VM including deactivated members and the tenant's assignable roles", async () => {
|
||||
const data = (await callLoader()) as { vm: { status: string; data?: any }; canViewRoles: boolean };
|
||||
|
||||
const data = await callLoader();
|
||||
|
||||
expect(started).toEqual(["users", "invitations", "roles", "permissions", "group-access"]);
|
||||
expect(getAllGroups).toHaveBeenCalledWith("tenant-1");
|
||||
expect(getMyGroups).not.toHaveBeenCalled();
|
||||
expect(data).toEqual(
|
||||
expect.objectContaining({
|
||||
users: [{ id: "member-1", user: { id: "user-1" } }],
|
||||
pendingInvitations: [{ id: "invite-1" }],
|
||||
roles: [{ id: "role-1" }],
|
||||
permissions: [{ name: "app.settings.members.view" }],
|
||||
groups: [{ id: "group-1" }],
|
||||
})
|
||||
);
|
||||
});
|
||||
|
||||
it("loads only my groups when the current user lacks full group access", async () => {
|
||||
vi.mocked(getUserPermission).mockResolvedValue({ permission: { name: "app.settings.groups.full" }, userPermission: null } as never);
|
||||
|
||||
const data = await callLoader();
|
||||
|
||||
expect(getAllGroups).not.toHaveBeenCalled();
|
||||
expect(getMyGroups).toHaveBeenCalledWith(actor.id, "tenant-1");
|
||||
expect(data).toEqual(expect.objectContaining({ groups: [{ id: "my-group-1" }] }));
|
||||
expect(getTenantUsers).toHaveBeenCalledWith("tenant-1", { includeInactive: true });
|
||||
expect(getTenantAssignableAppRoles).toHaveBeenCalledWith("tenant-1");
|
||||
expect(data.vm.status).toBe("ready");
|
||||
const rows = data.vm.data.rows;
|
||||
expect(rows).toHaveLength(2);
|
||||
expect(rows[0]).toMatchObject({ name: "Ada Lovelace", status: "active", mfaEnabled: true, roles: [{ id: "role-1" }] });
|
||||
expect(rows[1]).toMatchObject({ name: "Grace Hopper", status: "inactive", mfaEnabled: false, canReactivate: true });
|
||||
// Defaults AND the tenant's own custom/SHK roles feed the D01 dropdown.
|
||||
expect(data.vm.data.assignableRoles).toEqual([
|
||||
{ id: "role-1", name: "SuperUser", description: "" },
|
||||
{ id: "role-shk", name: "Monteur", description: "" },
|
||||
]);
|
||||
expect(data.vm.data.pendingInvitations).toEqual([{ id: "invite-1", email: "new@example.test", name: "New Person", createdAtIso: null }]);
|
||||
expect(data.canViewRoles).toBe(true);
|
||||
});
|
||||
});
|
||||
Reference in new issue
Block a user