Track HiveGrid Cloud planning reference
This commit is contained in:
1 parent
b3d5ea6764
commit
e341c5938a
5784 files changed
+1104929
-3
No files matched your search
+41
@@ -0,0 +1,41 @@
|
||||
import { LoaderFunctionArgs, MetaFunction, useLoaderData } from "react-router";
|
||||
import { getTranslations } from "~/locale/i18next.server";
|
||||
import { getAllPermissions, PermissionWithRoles } from "~/utils/db/permissions/permissions.db.server";
|
||||
import PermissionsTable from "~/components/core/roles/PermissionsTable";
|
||||
import { useAppData } from "~/utils/data/useAppData";
|
||||
import { requireAuth } from "~/utils/loaders.middleware";
|
||||
import { getTenantIdFromUrl } from "~/utils/services/.server/urlService";
|
||||
import { verifyUserHasPermission } from "~/utils/helpers/.server/PermissionsService";
|
||||
|
||||
type LoaderData = {
|
||||
title: string;
|
||||
items: PermissionWithRoles[];
|
||||
};
|
||||
|
||||
export const loader = async ({ request, params }: LoaderFunctionArgs) => {
|
||||
await requireAuth({ request, params });
|
||||
const { t } = await getTranslations(request);
|
||||
const tenantId = await getTenantIdFromUrl(params);
|
||||
await verifyUserHasPermission(request, "app.settings.roles.view", tenantId);
|
||||
|
||||
const items = await getAllPermissions("app");
|
||||
|
||||
const data: LoaderData = {
|
||||
title: `${t("models.permission.plural")} | ${process.env.APP_NAME}`,
|
||||
items,
|
||||
};
|
||||
return data;
|
||||
};
|
||||
|
||||
export const meta: MetaFunction<typeof loader> = ({ data }) => [{ title: data?.title }];
|
||||
|
||||
export default function PermissionsRoute() {
|
||||
const data = useLoaderData<LoaderData>();
|
||||
const appData = useAppData();
|
||||
|
||||
return (
|
||||
<div data-ui-id="ui.settings.rolesAndPermissions.permissions">
|
||||
<PermissionsTable items={data.items} canCreate={false} canUpdate={false} tenantId={appData.currentTenant.id} />
|
||||
</div>
|
||||
);
|
||||
}
|
||||
+325
@@ -0,0 +1,325 @@
|
||||
import { beforeEach, describe, expect, it, vi } from "vitest";
|
||||
import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";
|
||||
|
||||
vi.mock("~/locale/i18next.server", () => ({
|
||||
getTranslations: vi.fn(async () => ({ t: (key: string) => key })),
|
||||
}));
|
||||
vi.mock("~/utils/services/.server/urlService", () => ({
|
||||
getTenantIdFromUrl: vi.fn(),
|
||||
}));
|
||||
vi.mock("~/utils/services/workspaceRoles.server", () => ({
|
||||
createWorkspaceRole: vi.fn(),
|
||||
deleteWorkspaceRole: vi.fn(),
|
||||
requireWorkspaceRolesBuilderAccess: vi.fn(),
|
||||
updateWorkspaceRole: vi.fn(),
|
||||
}));
|
||||
vi.mock("~/utils/db/permissions/roles.db.server", () => ({
|
||||
getAllRolesWithUsers: vi.fn(),
|
||||
getTenantMutableAppRole: vi.fn(),
|
||||
}));
|
||||
vi.mock("~/utils/db/permissions/permissions.db.server", () => ({
|
||||
getAllPermissions: vi.fn(),
|
||||
}));
|
||||
vi.mock("~/utils/app/UrlUtils", () => ({
|
||||
default: {
|
||||
currentTenantUrl: vi.fn((_params: Record<string, string | undefined>, path: string) => `/acme/${path}`),
|
||||
slugify: vi.fn((value: string) => value.toLowerCase().replace(/[^a-z0-9]+/g, "-").replace(/^-|-$/g, "")),
|
||||
},
|
||||
}));
|
||||
vi.mock("~/utils/session.server", () => ({
|
||||
validateCSRFToken: vi.fn(),
|
||||
}));
|
||||
|
||||
import { getAllPermissions } from "~/utils/db/permissions/permissions.db.server";
|
||||
import { getAllRolesWithUsers, getTenantMutableAppRole } from "~/utils/db/permissions/roles.db.server";
|
||||
import { getTenantIdFromUrl } from "~/utils/services/.server/urlService";
|
||||
import { createWorkspaceRole, deleteWorkspaceRole, requireWorkspaceRolesBuilderAccess, updateWorkspaceRole } from "~/utils/services/workspaceRoles.server";
|
||||
import { action as editAction, loader as editLoader } from "./roles/$id";
|
||||
import { loader as listLoader } from "./roles";
|
||||
import { action as newAction, loader as newLoader } from "./roles/new";
|
||||
|
||||
const params = { tenant: "acme", id: "role_1" };
|
||||
const request = new Request("https://app.example.test/acme/settings/roles-and-permissions/roles");
|
||||
const now = new Date("2026-01-01T00:00:00.000Z");
|
||||
const appPermission = {
|
||||
id: "perm_1",
|
||||
name: "app.settings.members.view",
|
||||
type: "app",
|
||||
description: "View members",
|
||||
order: 1,
|
||||
inRoles: [],
|
||||
createdAt: now,
|
||||
updatedAt: now,
|
||||
entityId: null,
|
||||
isDefault: false,
|
||||
};
|
||||
const adminPermission = {
|
||||
id: "perm_2",
|
||||
name: "admin.roles.delete",
|
||||
type: "admin",
|
||||
description: "Delete admin roles",
|
||||
order: 2,
|
||||
inRoles: [],
|
||||
createdAt: now,
|
||||
updatedAt: now,
|
||||
entityId: null,
|
||||
isDefault: false,
|
||||
};
|
||||
const role = {
|
||||
id: "role_1",
|
||||
name: "Workspace editor",
|
||||
description: "Can edit workspace data",
|
||||
type: "app",
|
||||
isDefault: false,
|
||||
assignToNewUsers: false,
|
||||
order: 1,
|
||||
createdAt: now,
|
||||
updatedAt: now,
|
||||
permissions: [{ id: "role_perm_1", roleId: "role_1", permissionId: "perm_1", permission: appPermission }],
|
||||
users: [],
|
||||
};
|
||||
|
||||
async function callListLoader() {
|
||||
return listLoader({ request, params, context: {}, unstable_pattern: "app.$tenant/settings/roles-and-permissions/roles" } as LoaderFunctionArgs);
|
||||
}
|
||||
|
||||
async function callNewLoader() {
|
||||
return newLoader({ request, params, context: {}, unstable_pattern: "app.$tenant/settings/roles-and-permissions/roles/new" } as LoaderFunctionArgs);
|
||||
}
|
||||
|
||||
async function callNewAction(form: FormData) {
|
||||
return newAction({
|
||||
request: new Request(request.url, { method: "POST", headers: { "Content-Type": "application/x-www-form-urlencoded" }, body: new URLSearchParams(form as unknown as Record<string, string>) }),
|
||||
params,
|
||||
context: {},
|
||||
unstable_pattern: "app.$tenant/settings/roles-and-permissions/roles/new",
|
||||
} as ActionFunctionArgs);
|
||||
}
|
||||
|
||||
async function callEditAction(form: FormData) {
|
||||
return editAction({
|
||||
request: new Request(`${request.url}/role_1`, { method: "POST", headers: { "Content-Type": "application/x-www-form-urlencoded" }, body: new URLSearchParams(form as unknown as Record<string, string>) }),
|
||||
params,
|
||||
context: {},
|
||||
unstable_pattern: "app.$tenant/settings/roles-and-permissions/roles/$id",
|
||||
} as ActionFunctionArgs);
|
||||
}
|
||||
|
||||
async function callEditLoader() {
|
||||
return editLoader({ request, params, context: {}, unstable_pattern: "app.$tenant/settings/roles-and-permissions/roles/$id" } as LoaderFunctionArgs);
|
||||
}
|
||||
|
||||
function roleForm(overrides?: Record<string, string>) {
|
||||
const form = new FormData();
|
||||
form.set("action", "edit");
|
||||
form.set("name", "Workspace editor");
|
||||
form.set("description", "Can edit workspace data");
|
||||
form.set("type", "app");
|
||||
form.append("permissions[]", "app.settings.members.view");
|
||||
Object.entries(overrides ?? {}).forEach(([key, value]) => form.set(key, value));
|
||||
return form;
|
||||
}
|
||||
|
||||
async function responseJson(result: unknown) {
|
||||
expect(result).toBeInstanceOf(Response);
|
||||
return (result as Response).json();
|
||||
}
|
||||
|
||||
describe("tenant workspace role routes", () => {
|
||||
beforeEach(() => {
|
||||
vi.clearAllMocks();
|
||||
vi.mocked(getTenantIdFromUrl).mockResolvedValue("tenant_1");
|
||||
vi.mocked(requireWorkspaceRolesBuilderAccess).mockResolvedValue({ tenantId: "tenant_1" });
|
||||
vi.mocked(getAllRolesWithUsers).mockResolvedValue([role] as Awaited<ReturnType<typeof getAllRolesWithUsers>>);
|
||||
vi.mocked(getAllPermissions).mockResolvedValue([appPermission] as Awaited<ReturnType<typeof getAllPermissions>>);
|
||||
vi.mocked(getTenantMutableAppRole).mockResolvedValue(role as Awaited<ReturnType<typeof getTenantMutableAppRole>>);
|
||||
});
|
||||
|
||||
it("blocks the list loader through the workspace-role feature gate", async () => {
|
||||
const disabled = new Response("Workspace roles are not enabled", { status: 404 });
|
||||
vi.mocked(requireWorkspaceRolesBuilderAccess).mockRejectedValueOnce(disabled);
|
||||
|
||||
await expect(callListLoader()).rejects.toBe(disabled);
|
||||
expect(getAllRolesWithUsers).not.toHaveBeenCalled();
|
||||
});
|
||||
|
||||
it("uses global default and tenant-owned app roles for the list loader after requiring builder access", async () => {
|
||||
const defaultRole = { ...role, id: "role_default", isDefault: true };
|
||||
vi.mocked(getAllRolesWithUsers).mockResolvedValueOnce([role, defaultRole] as Awaited<ReturnType<typeof getAllRolesWithUsers>>);
|
||||
|
||||
const data = await callListLoader();
|
||||
|
||||
expect(requireWorkspaceRolesBuilderAccess).toHaveBeenCalledWith({ request, params, tenantId: "tenant_1" });
|
||||
expect(getAllRolesWithUsers).toHaveBeenCalledWith("app", undefined, "tenant_1");
|
||||
expect(data).toMatchObject({ items: [role, defaultRole] });
|
||||
});
|
||||
|
||||
it("new role loader exposes only app permissions", async () => {
|
||||
vi.mocked(getAllPermissions).mockResolvedValueOnce([appPermission, adminPermission] as Awaited<ReturnType<typeof getAllPermissions>>);
|
||||
|
||||
const data = await callNewLoader();
|
||||
|
||||
expect(getAllPermissions).toHaveBeenCalledWith("app");
|
||||
expect(JSON.stringify(data)).not.toContain("admin.roles.delete");
|
||||
});
|
||||
|
||||
it("create action delegates mutation to the workspace role service", async () => {
|
||||
const form = new FormData();
|
||||
form.set("action", "create");
|
||||
form.set("name", " Workspace editor ");
|
||||
form.set("description", "Can edit workspace data");
|
||||
form.set("type", "app");
|
||||
form.append("permissions[]", "app.settings.members.view");
|
||||
|
||||
const result = await callNewAction(form);
|
||||
|
||||
expect(createWorkspaceRole).toHaveBeenCalledWith({
|
||||
request: expect.any(Request),
|
||||
tenantId: "tenant_1",
|
||||
data: {
|
||||
name: " Workspace editor ",
|
||||
description: "Can edit workspace data",
|
||||
assignToNewUsers: false,
|
||||
type: "app",
|
||||
permissionNames: ["app.settings.members.view"],
|
||||
},
|
||||
});
|
||||
expect(result).toBeInstanceOf(Response);
|
||||
expect((result as Response).status).toBe(302);
|
||||
});
|
||||
|
||||
it("create action returns bounded 400 JSON for service-denied admin type tampering", async () => {
|
||||
vi.mocked(createWorkspaceRole).mockRejectedValueOnce(new Response("Workspace roles cannot grant admin capabilities", { status: 400 }));
|
||||
const form = new FormData();
|
||||
form.set("action", "create");
|
||||
form.set("name", "Escalate");
|
||||
form.set("description", "Tampered payload");
|
||||
form.set("type", "admin");
|
||||
form.append("permissions[]", "app.settings.members.view");
|
||||
|
||||
const result = await callNewAction(form);
|
||||
|
||||
expect(createWorkspaceRole).toHaveBeenCalledWith(expect.objectContaining({ data: expect.objectContaining({ type: "admin" }) }));
|
||||
expect((result as Response).status).toBe(400);
|
||||
await expect(responseJson(result)).resolves.toEqual({ error: "Workspace roles cannot grant admin capabilities" });
|
||||
});
|
||||
|
||||
it("create action returns bounded 400 JSON for service-denied admin permission tampering", async () => {
|
||||
vi.mocked(createWorkspaceRole).mockRejectedValueOnce(new Response("Workspace roles cannot grant admin permissions", { status: 400 }));
|
||||
const form = new FormData();
|
||||
form.set("action", "create");
|
||||
form.set("name", "Escalate");
|
||||
form.set("description", "Tampered payload");
|
||||
form.set("type", "app");
|
||||
form.append("permissions[]", "admin.roles.delete");
|
||||
|
||||
const result = await callNewAction(form);
|
||||
|
||||
expect(createWorkspaceRole).toHaveBeenCalledWith(expect.objectContaining({ data: expect.objectContaining({ permissionNames: ["admin.roles.delete"] }) }));
|
||||
expect((result as Response).status).toBe(400);
|
||||
await expect(responseJson(result)).resolves.toEqual({ error: "Workspace roles cannot grant admin permissions" });
|
||||
});
|
||||
|
||||
it("create action propagates access denial before parsing or mutating", async () => {
|
||||
const denied = new Response(null, { status: 302, headers: { Location: "/login?redirectTo=%2Facme%2Fsettings%2Froles" } });
|
||||
vi.mocked(requireWorkspaceRolesBuilderAccess).mockRejectedValueOnce(denied);
|
||||
const form = new FormData();
|
||||
form.set("action", "create");
|
||||
form.set("name", "No access");
|
||||
form.set("type", "admin");
|
||||
|
||||
await expect(callNewAction(form)).rejects.toBe(denied);
|
||||
expect(createWorkspaceRole).not.toHaveBeenCalled();
|
||||
});
|
||||
|
||||
it("edit action returns bounded 400 responses for service validation errors", async () => {
|
||||
vi.mocked(updateWorkspaceRole).mockRejectedValueOnce(new Response("Default roles cannot be changed", { status: 400 }));
|
||||
|
||||
const result = await callEditAction(roleForm({ name: "Default", description: "Protected" }));
|
||||
|
||||
expect((result as Response).status).toBe(400);
|
||||
await expect(responseJson(result)).resolves.toEqual({ error: "Default roles cannot be changed" });
|
||||
});
|
||||
|
||||
it("edit action returns bounded 400 JSON for service-denied admin type tampering", async () => {
|
||||
vi.mocked(updateWorkspaceRole).mockRejectedValueOnce(new Response("Workspace roles cannot grant admin capabilities", { status: 400 }));
|
||||
|
||||
const result = await callEditAction(roleForm({ type: "admin" }));
|
||||
|
||||
expect(updateWorkspaceRole).toHaveBeenCalledWith(expect.objectContaining({ data: expect.objectContaining({ type: "admin" }) }));
|
||||
expect((result as Response).status).toBe(400);
|
||||
await expect(responseJson(result)).resolves.toEqual({ error: "Workspace roles cannot grant admin capabilities" });
|
||||
});
|
||||
|
||||
it("edit action returns bounded 400 JSON for service-denied admin permission tampering", async () => {
|
||||
vi.mocked(updateWorkspaceRole).mockRejectedValueOnce(new Response("Workspace roles cannot grant admin permissions", { status: 400 }));
|
||||
const form = roleForm();
|
||||
form.delete("permissions[]");
|
||||
form.append("permissions[]", "admin.roles.delete");
|
||||
|
||||
const result = await callEditAction(form);
|
||||
|
||||
expect(updateWorkspaceRole).toHaveBeenCalledWith(expect.objectContaining({ data: expect.objectContaining({ permissionNames: ["admin.roles.delete"] }) }));
|
||||
expect((result as Response).status).toBe(400);
|
||||
await expect(responseJson(result)).resolves.toEqual({ error: "Workspace roles cannot grant admin permissions" });
|
||||
});
|
||||
|
||||
it("edit action propagates access denial before mutation", async () => {
|
||||
const denied = new Response("Forbidden", { status: 403 });
|
||||
vi.mocked(requireWorkspaceRolesBuilderAccess).mockRejectedValueOnce(denied);
|
||||
|
||||
await expect(callEditAction(roleForm({ type: "admin" }))).rejects.toBe(denied);
|
||||
expect(updateWorkspaceRole).not.toHaveBeenCalled();
|
||||
});
|
||||
|
||||
it("delete action propagates access denial before mutation", async () => {
|
||||
const denied = new Response("Forbidden", { status: 403 });
|
||||
vi.mocked(requireWorkspaceRolesBuilderAccess).mockRejectedValueOnce(denied);
|
||||
const form = new FormData();
|
||||
form.set("action", "delete");
|
||||
|
||||
await expect(callEditAction(form)).rejects.toBe(denied);
|
||||
expect(deleteWorkspaceRole).not.toHaveBeenCalled();
|
||||
});
|
||||
|
||||
it("edit loader exposes only app permissions", async () => {
|
||||
vi.mocked(getAllPermissions).mockResolvedValueOnce([appPermission, adminPermission] as Awaited<ReturnType<typeof getAllPermissions>>);
|
||||
|
||||
const data = await callEditLoader();
|
||||
|
||||
expect(getTenantMutableAppRole).toHaveBeenCalledWith("role_1", "tenant_1");
|
||||
expect(getAllPermissions).toHaveBeenCalledWith("app");
|
||||
expect(JSON.stringify(data)).not.toContain("admin.roles.delete");
|
||||
});
|
||||
|
||||
it("edit loader redirects guessed roles outside the tenant scope", async () => {
|
||||
vi.mocked(getTenantMutableAppRole).mockResolvedValueOnce(null);
|
||||
|
||||
await expect(callEditLoader()).rejects.toMatchObject({ status: 302 });
|
||||
expect(getAllPermissions).not.toHaveBeenCalled();
|
||||
});
|
||||
|
||||
it("edit loader rejects default roles before exposing permission data", async () => {
|
||||
vi.mocked(getTenantMutableAppRole).mockResolvedValueOnce({ ...role, isDefault: true } as Awaited<ReturnType<typeof getTenantMutableAppRole>>);
|
||||
|
||||
const result = callEditLoader();
|
||||
|
||||
await expect(result).rejects.toMatchObject({ status: 400 });
|
||||
await result.catch(async (response: Response) => {
|
||||
await expect(response.text()).resolves.toBe("settings.rolesAndPermissions.errors.onlyNonDefaultAppRolesEditable");
|
||||
});
|
||||
expect(getAllPermissions).not.toHaveBeenCalled();
|
||||
});
|
||||
|
||||
it("edit loader rejects non-app roles before exposing permission data", async () => {
|
||||
vi.mocked(getTenantMutableAppRole).mockResolvedValueOnce({ ...role, type: "admin" } as Awaited<ReturnType<typeof getTenantMutableAppRole>>);
|
||||
|
||||
const result = callEditLoader();
|
||||
|
||||
await expect(result).rejects.toMatchObject({ status: 400 });
|
||||
await result.catch(async (response: Response) => {
|
||||
await expect(response.text()).resolves.toBe("settings.rolesAndPermissions.errors.onlyNonDefaultAppRolesEditable");
|
||||
});
|
||||
expect(getAllPermissions).not.toHaveBeenCalled();
|
||||
});
|
||||
});
|
||||
+60
@@ -0,0 +1,60 @@
|
||||
import { LoaderFunctionArgs, MetaFunction, useLoaderData, useNavigate, useOutlet, useParams } from "react-router";
|
||||
import { t } from "i18next";
|
||||
import { getTranslations } from "~/locale/i18next.server";
|
||||
import RolesListView from "~/modules/users/components/RolesListView";
|
||||
import { getAllRolesWithUsers, RoleWithPermissionsAndUsers } from "~/utils/db/permissions/roles.db.server";
|
||||
import { useAppData } from "~/utils/data/useAppData";
|
||||
import { getUserHasPermission } from "~/utils/helpers/PermissionsHelper";
|
||||
import { getTenantIdFromUrl } from "~/utils/services/.server/urlService";
|
||||
import { requireWorkspaceRolesBuilderAccess } from "~/utils/services/workspaceRoles.server";
|
||||
import SlideOverWideEmpty from "~/components/ui/slideOvers/SlideOverWideEmpty";
|
||||
|
||||
type LoaderData = {
|
||||
title: string;
|
||||
items: RoleWithPermissionsAndUsers[];
|
||||
};
|
||||
|
||||
export const loader = async ({ request, params }: LoaderFunctionArgs) => {
|
||||
const tenantId = await getTenantIdFromUrl(params);
|
||||
await requireWorkspaceRolesBuilderAccess({ request, params, tenantId });
|
||||
const { t } = await getTranslations(request);
|
||||
|
||||
const items = await getAllRolesWithUsers("app", undefined, tenantId);
|
||||
|
||||
const data: LoaderData = {
|
||||
title: `${t("models.role.plural")} | ${process.env.APP_NAME}`,
|
||||
items,
|
||||
};
|
||||
return data;
|
||||
};
|
||||
|
||||
export const meta: MetaFunction<typeof loader> = ({ data }) => [{ title: data?.title }];
|
||||
|
||||
export default function RolesRoute() {
|
||||
const data = useLoaderData<LoaderData>();
|
||||
const appData = useAppData();
|
||||
const navigate = useNavigate();
|
||||
const outlet = useOutlet();
|
||||
const params = useParams();
|
||||
const canUpdate = getUserHasPermission(appData, "app.settings.roles.set");
|
||||
|
||||
return (
|
||||
<div data-ui-id="ui.settings.rolesAndPermissions.roles" className="space-y-2">
|
||||
<RolesListView items={data.items} canUpdate={canUpdate} tenantId={appData.currentTenant.id} />
|
||||
|
||||
<SlideOverWideEmpty
|
||||
title={params.id ? t("shared.edit") : t("shared.new")}
|
||||
open={!!outlet}
|
||||
onClose={() => {
|
||||
navigate(".", { replace: true });
|
||||
}}
|
||||
className="sm:max-w-lg"
|
||||
overflowYScroll={true}
|
||||
>
|
||||
<div className="-mx-1 -mt-3">
|
||||
<div className="space-y-4">{outlet}</div>
|
||||
</div>
|
||||
</SlideOverWideEmpty>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
+118
@@ -0,0 +1,118 @@
|
||||
import { ActionFunction, LoaderFunctionArgs, MetaFunction, redirect, useActionData, useLoaderData, useNavigate, useParams } from "react-router";
|
||||
import { useEffect } from "react";
|
||||
import toast from "react-hot-toast";
|
||||
import RoleForm from "~/components/core/roles/RoleForm";
|
||||
import { getTranslations } from "~/locale/i18next.server";
|
||||
import UrlUtils from "~/utils/app/UrlUtils";
|
||||
import { getAllPermissions, PermissionWithRoles } from "~/utils/db/permissions/permissions.db.server";
|
||||
import { getTenantMutableAppRole, RoleWithPermissions } from "~/utils/db/permissions/roles.db.server";
|
||||
import { getUserHasPermission } from "~/utils/helpers/PermissionsHelper";
|
||||
import { useAppData } from "~/utils/data/useAppData";
|
||||
import { getTenantIdFromUrl } from "~/utils/services/.server/urlService";
|
||||
import { deleteWorkspaceRole, requireWorkspaceRolesBuilderAccess, updateWorkspaceRole } from "~/utils/services/workspaceRoles.server";
|
||||
import { validateCSRFToken } from "~/utils/session.server";
|
||||
|
||||
type LoaderData = {
|
||||
title: string;
|
||||
item: RoleWithPermissions;
|
||||
permissions: PermissionWithRoles[];
|
||||
};
|
||||
|
||||
type ActionData = {
|
||||
success?: string;
|
||||
error?: string;
|
||||
};
|
||||
|
||||
const badRequest = (data: ActionData) => Response.json(data, { status: 400 });
|
||||
const rolesPath = (params: Record<string, string | undefined>) => UrlUtils.currentTenantUrl(params, "settings/roles-and-permissions/roles");
|
||||
|
||||
export const loader = async ({ request, params }: LoaderFunctionArgs) => {
|
||||
const tenantId = await getTenantIdFromUrl(params);
|
||||
await requireWorkspaceRolesBuilderAccess({ request, params, tenantId });
|
||||
const { t } = await getTranslations(request);
|
||||
|
||||
const item = await getTenantMutableAppRole(params.id ?? "", tenantId);
|
||||
if (!item) {
|
||||
throw redirect(rolesPath(params));
|
||||
}
|
||||
if (item.type !== "app" || item.isDefault) {
|
||||
throw new Response(t("settings.rolesAndPermissions.errors.onlyNonDefaultAppRolesEditable"), { status: 400 });
|
||||
}
|
||||
|
||||
const permissions = (await getAllPermissions("app")).filter((permission) => permission.type === "app");
|
||||
const data: LoaderData = {
|
||||
title: `${item.name} | ${t("models.role.object")} | ${process.env.APP_NAME}`,
|
||||
item,
|
||||
permissions,
|
||||
};
|
||||
return data;
|
||||
};
|
||||
|
||||
export const action: ActionFunction = async ({ request, params }) => {
|
||||
const tenantId = await getTenantIdFromUrl(params);
|
||||
await requireWorkspaceRolesBuilderAccess({ request, params, tenantId });
|
||||
const { t } = await getTranslations(request);
|
||||
const roleId = params.id ?? "";
|
||||
if (!roleId) {
|
||||
return badRequest({ error: t("shared.invalidForm") });
|
||||
}
|
||||
|
||||
await validateCSRFToken(request);
|
||||
const form = await request.formData();
|
||||
const action = form.get("action")?.toString() ?? "";
|
||||
|
||||
try {
|
||||
if (action === "edit") {
|
||||
await updateWorkspaceRole({
|
||||
request,
|
||||
tenantId,
|
||||
roleId,
|
||||
data: {
|
||||
name: form.get("name")?.toString() ?? "",
|
||||
description: form.get("description")?.toString() ?? "",
|
||||
assignToNewUsers: Boolean(form.get("assign-to-new-users")),
|
||||
type: form.get("type")?.toString() === "admin" ? "admin" : "app",
|
||||
permissionNames: form.getAll("permissions[]").map((permission) => permission.toString()),
|
||||
},
|
||||
});
|
||||
return Response.json({ success: t("shared.updated") });
|
||||
}
|
||||
|
||||
if (action === "delete") {
|
||||
await deleteWorkspaceRole({ request, tenantId, roleId });
|
||||
return redirect(rolesPath(params));
|
||||
}
|
||||
} catch (error) {
|
||||
if (error instanceof Response && error.status >= 400 && error.status < 500) {
|
||||
return badRequest({ error: await error.text() });
|
||||
}
|
||||
throw error;
|
||||
}
|
||||
|
||||
return badRequest({ error: t("shared.invalidForm") });
|
||||
};
|
||||
|
||||
export const meta: MetaFunction<typeof loader> = ({ data }) => [{ title: data?.title }];
|
||||
|
||||
export default function EditWorkspaceRoleRoute() {
|
||||
const data = useLoaderData<LoaderData>();
|
||||
const actionData = useActionData<ActionData>();
|
||||
const appData = useAppData();
|
||||
const navigate = useNavigate();
|
||||
const params = useParams();
|
||||
const canUpdate = getUserHasPermission(appData, "app.settings.roles.set");
|
||||
|
||||
useEffect(() => {
|
||||
if (actionData?.success) {
|
||||
toast.success(actionData.success);
|
||||
} else if (actionData?.error) {
|
||||
toast.error(actionData.error);
|
||||
}
|
||||
}, [actionData]);
|
||||
|
||||
function goBack() {
|
||||
navigate(rolesPath(params));
|
||||
}
|
||||
|
||||
return <RoleForm item={data.item} permissions={data.permissions} onCancel={goBack} canUpdate={canUpdate} canDelete={canUpdate} defaultType="app" lockType />;
|
||||
}
|
||||
+81
@@ -0,0 +1,81 @@
|
||||
import { ActionFunction, LoaderFunctionArgs, MetaFunction, redirect, useLoaderData, useNavigate, useParams } from "react-router";
|
||||
import RoleForm from "~/components/core/roles/RoleForm";
|
||||
import { getTranslations } from "~/locale/i18next.server";
|
||||
import { getAllPermissions, PermissionWithRoles } from "~/utils/db/permissions/permissions.db.server";
|
||||
import UrlUtils from "~/utils/app/UrlUtils";
|
||||
import { getTenantIdFromUrl } from "~/utils/services/.server/urlService";
|
||||
import { createWorkspaceRole, requireWorkspaceRolesBuilderAccess } from "~/utils/services/workspaceRoles.server";
|
||||
import { validateCSRFToken } from "~/utils/session.server";
|
||||
|
||||
type LoaderData = {
|
||||
title: string;
|
||||
permissions: PermissionWithRoles[];
|
||||
};
|
||||
|
||||
type ActionData = {
|
||||
error?: string;
|
||||
};
|
||||
|
||||
const badRequest = (data: ActionData) => Response.json(data, { status: 400 });
|
||||
const rolesPath = (params: Record<string, string | undefined>) => UrlUtils.currentTenantUrl(params, "settings/roles-and-permissions/roles");
|
||||
|
||||
export const loader = async ({ request, params }: LoaderFunctionArgs) => {
|
||||
const tenantId = await getTenantIdFromUrl(params);
|
||||
await requireWorkspaceRolesBuilderAccess({ request, params, tenantId });
|
||||
const { t } = await getTranslations(request);
|
||||
|
||||
const permissions = (await getAllPermissions("app")).filter((permission) => permission.type === "app");
|
||||
const data: LoaderData = {
|
||||
title: `${t("models.role.object")} | ${process.env.APP_NAME}`,
|
||||
permissions,
|
||||
};
|
||||
return data;
|
||||
};
|
||||
|
||||
export const action: ActionFunction = async ({ request, params }) => {
|
||||
const tenantId = await getTenantIdFromUrl(params);
|
||||
await requireWorkspaceRolesBuilderAccess({ request, params, tenantId });
|
||||
const { t } = await getTranslations(request);
|
||||
|
||||
await validateCSRFToken(request);
|
||||
const form = await request.formData();
|
||||
const action = form.get("action")?.toString() ?? "";
|
||||
if (action !== "create") {
|
||||
return badRequest({ error: t("shared.invalidForm") });
|
||||
}
|
||||
|
||||
try {
|
||||
await createWorkspaceRole({
|
||||
request,
|
||||
tenantId,
|
||||
data: {
|
||||
name: form.get("name")?.toString() ?? "",
|
||||
description: form.get("description")?.toString() ?? "",
|
||||
assignToNewUsers: Boolean(form.get("assign-to-new-users")),
|
||||
type: form.get("type")?.toString() === "admin" ? "admin" : "app",
|
||||
permissionNames: form.getAll("permissions[]").map((permission) => permission.toString()),
|
||||
},
|
||||
});
|
||||
} catch (error) {
|
||||
if (error instanceof Response && error.status >= 400 && error.status < 500) {
|
||||
return badRequest({ error: await error.text() });
|
||||
}
|
||||
throw error;
|
||||
}
|
||||
|
||||
return redirect(rolesPath(params));
|
||||
};
|
||||
|
||||
export const meta: MetaFunction<typeof loader> = ({ data }) => [{ title: data?.title }];
|
||||
|
||||
export default function NewWorkspaceRoleRoute() {
|
||||
const data = useLoaderData<LoaderData>();
|
||||
const navigate = useNavigate();
|
||||
const params = useParams();
|
||||
|
||||
function goBack() {
|
||||
navigate(rolesPath(params));
|
||||
}
|
||||
|
||||
return <RoleForm permissions={data.permissions} onCancel={goBack} defaultType="app" lockType />;
|
||||
}
|
||||
+180
@@ -0,0 +1,180 @@
|
||||
import { ActionFunction, LoaderFunctionArgs, MetaFunction, useLoaderData } from "react-router";
|
||||
import { useSubmit } from "react-router";
|
||||
import { getTranslations } from "~/locale/i18next.server";
|
||||
import { getAllRoles, getTenantAssignableAppRole, RoleWithPermissions } from "~/utils/db/permissions/roles.db.server";
|
||||
import { getTenantScopedUsersWithDetails, getUser, UserWithDetails, UserWithRoles } from "~/utils/db/users.db.server";
|
||||
import UserRolesTable from "~/components/core/roles/UserRolesTable";
|
||||
import { useEffect, useState } from "react";
|
||||
import InputSearch from "~/components/ui/input/InputSearch";
|
||||
import { createUserRole, deleteUserRole } from "~/utils/db/permissions/userRoles.db.server";
|
||||
import { getTenant, getTenantMember } from "~/utils/db/tenants.db.server";
|
||||
import { createAdminLog } from "~/utils/db/logs.db.server";
|
||||
import { getTenantIdFromUrl } from "~/utils/services/.server/urlService";
|
||||
import { useAppData } from "~/utils/data/useAppData";
|
||||
import { getUserInfo, validateCSRFToken } from "~/utils/session.server";
|
||||
import { getUserHasPermission } from "~/utils/helpers/PermissionsHelper";
|
||||
import EventsService from "~/modules/events/services/.server/EventsService";
|
||||
import { RoleAssignedDto } from "~/modules/events/dtos/RoleAssignedDto";
|
||||
import { RoleUnassignedDto } from "~/modules/events/dtos/RoleUnassignedDto";
|
||||
import { requireAuth } from "~/utils/loaders.middleware";
|
||||
import { verifyUserHasPermission } from "~/utils/helpers/.server/PermissionsService";
|
||||
import { useRootData } from "~/utils/data/useRootData";
|
||||
|
||||
type LoaderData = {
|
||||
title: string;
|
||||
items: UserWithRoles[];
|
||||
roles: RoleWithPermissions[];
|
||||
};
|
||||
|
||||
export const loader = async ({ request, params }: LoaderFunctionArgs) => {
|
||||
await requireAuth({ request, params });
|
||||
const { t } = await getTranslations(request);
|
||||
const tenantId = await getTenantIdFromUrl(params);
|
||||
await verifyUserHasPermission(request, "app.settings.roles.view", tenantId);
|
||||
|
||||
const tenantUsers = await getTenantScopedUsersWithDetails(tenantId);
|
||||
const roles = await getAllRoles("app");
|
||||
|
||||
const items: UserWithDetails[] = [];
|
||||
tenantUsers.forEach((user) => {
|
||||
if (!items.find((f) => f.id === user.id)) {
|
||||
items.push(user);
|
||||
}
|
||||
});
|
||||
|
||||
const data: LoaderData = {
|
||||
title: `${t("models.permission.userRoles")} | ${process.env.APP_NAME}`,
|
||||
items,
|
||||
roles,
|
||||
};
|
||||
return data;
|
||||
};
|
||||
|
||||
type ActionData = {
|
||||
error?: string;
|
||||
};
|
||||
const badRequest = (data: ActionData) => Response.json(data, { status: 400 });
|
||||
export const action: ActionFunction = async ({ request, params }) => {
|
||||
await requireAuth({ request, params });
|
||||
const { t } = await getTranslations(request);
|
||||
const tenantId = await getTenantIdFromUrl(params);
|
||||
await verifyUserHasPermission(request, "app.settings.roles.set", tenantId);
|
||||
const userInfo = await getUserInfo(request);
|
||||
const fromUser = await getUser(userInfo.userId);
|
||||
if (!fromUser) {
|
||||
return badRequest({ error: t("shared.invalidUser") });
|
||||
}
|
||||
|
||||
await validateCSRFToken(request);
|
||||
const form = await request.formData();
|
||||
const action = form.get("action")?.toString() ?? "";
|
||||
if (action === "edit") {
|
||||
const userId = form.get("user-id")?.toString() ?? "";
|
||||
const roleId = form.get("role-id")?.toString() ?? "";
|
||||
const add = form.get("add") === "true";
|
||||
|
||||
const tenant = await getTenant(tenantId);
|
||||
const tenantMember = await getTenantMember(userId, tenantId);
|
||||
const user = tenantMember?.user ?? null;
|
||||
const role = await getTenantAssignableAppRole(roleId, tenantId);
|
||||
|
||||
if (!tenant || !tenantMember || !user || !role || role.type !== "app") {
|
||||
return badRequest({ error: t("shared.invalidForm") });
|
||||
}
|
||||
|
||||
if (add) {
|
||||
await createUserRole(userId, roleId, tenantId);
|
||||
if (fromUser && user && role) {
|
||||
await EventsService.create({
|
||||
request,
|
||||
event: "role.assigned",
|
||||
tenantId: tenant?.id ?? null,
|
||||
userId: fromUser.id,
|
||||
data: {
|
||||
fromUser: { id: fromUser.id, email: fromUser.email },
|
||||
toUser: { id: user.id, email: user.email },
|
||||
role: { id: role.id, name: role.name, description: role.description },
|
||||
} satisfies RoleAssignedDto,
|
||||
});
|
||||
}
|
||||
createAdminLog(request, "settings.rolesAndPermissions.userRoles.created", `[${tenant?.name}] ${user?.email} - ${role?.name}`);
|
||||
} else {
|
||||
if (fromUser && user && role) {
|
||||
await EventsService.create({
|
||||
request,
|
||||
event: "role.unassigned",
|
||||
tenantId: tenant?.id ?? null,
|
||||
userId: fromUser.id,
|
||||
data: {
|
||||
fromUser: { id: fromUser.id, email: fromUser.email },
|
||||
toUser: { id: user.id, email: user.email },
|
||||
role: { id: role.id, name: role.name, description: role.description },
|
||||
} satisfies RoleUnassignedDto,
|
||||
});
|
||||
}
|
||||
await deleteUserRole(userId, roleId, tenantId);
|
||||
createAdminLog(request, "settings.rolesAndPermissions.userRoles.deleted", `[${tenant?.name}] ${user?.email} - ${role?.name}`);
|
||||
}
|
||||
|
||||
return Response.json({});
|
||||
} else {
|
||||
return badRequest({ error: t("shared.invalidForm") });
|
||||
}
|
||||
};
|
||||
|
||||
export const meta: MetaFunction<typeof loader> = ({ data }) => [{ title: data?.title }];
|
||||
|
||||
export default function AdminAccountUsersFromTenant() {
|
||||
const data = useLoaderData<LoaderData>();
|
||||
const appData = useAppData();
|
||||
const rootData = useRootData();
|
||||
const [items, setItems] = useState(data.items);
|
||||
const submit = useSubmit();
|
||||
|
||||
const [searchInput, setSearchInput] = useState("");
|
||||
|
||||
useEffect(() => {
|
||||
setItems(data.items);
|
||||
}, [data]);
|
||||
|
||||
const filteredItems = () => {
|
||||
if (!items) {
|
||||
return [];
|
||||
}
|
||||
return items.filter(
|
||||
(f) =>
|
||||
f.email?.toString().toUpperCase().includes(searchInput.toUpperCase()) ||
|
||||
f.firstName?.toString().toUpperCase().includes(searchInput.toUpperCase()) ||
|
||||
f.lastName?.toString().toUpperCase().includes(searchInput.toUpperCase()) ||
|
||||
f.roles.find(
|
||||
(f) => f.role.name.toUpperCase().includes(searchInput.toUpperCase()) || f.role.description.toUpperCase().includes(searchInput.toUpperCase())
|
||||
)
|
||||
);
|
||||
};
|
||||
|
||||
function onChange(item: UserWithRoles, role: RoleWithPermissions, add: any) {
|
||||
const form = new FormData();
|
||||
form.set("action", "edit");
|
||||
form.set("user-id", item.id);
|
||||
form.set("role-id", role.id);
|
||||
form.set("add", add ? "true" : "false");
|
||||
form.set("csrf", rootData.csrf ?? "");
|
||||
submit(form, {
|
||||
method: "post",
|
||||
});
|
||||
}
|
||||
|
||||
return (
|
||||
<div data-ui-id="ui.settings.rolesAndPermissions.users" className="space-y-2">
|
||||
<InputSearch value={searchInput} setValue={setSearchInput} />
|
||||
|
||||
<UserRolesTable
|
||||
items={filteredItems()}
|
||||
roles={data.roles}
|
||||
onChange={onChange}
|
||||
tenantId={appData.currentTenant.id}
|
||||
disabled={!getUserHasPermission(appData, "app.settings.roles.set")}
|
||||
/>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
Reference in new issue
Block a user