d8b63a18e7
## Thinking Path > - Paperclip is moving from a solo local operator model toward teams supervising AI-agent companies. > - Human access management and human-visible profile surfaces are part of that multiple-user path. > - The branch included related access cleanup, archived-member removal, permission protection, and a user profile page. > - These changes share company membership, user attribution, and access-service behavior. > - This pull request groups those human access/profile changes into one standalone branch. > - The benefit is safer member removal behavior and a first profile surface for user work, activity, and cost attribution. ## What Changed - Added archived company member removal support across shared contracts, server routes/services, and UI. - Protected company member removal with stricter permission checks and tests. - Added company user profile API, shared types, route wiring, client API, route, and UI page. - Simplified the user profile page visual design to a neutral typography-led layout. ## Verification - `pnpm install --frozen-lockfile` - `pnpm exec vitest run server/src/__tests__/access-service.test.ts server/src/__tests__/user-profile-routes.test.ts ui/src/pages/CompanyAccess.test.tsx --hookTimeout=30000` - `pnpm exec vitest run server/src/__tests__/user-profile-routes.test.ts --testTimeout=30000 --hookTimeout=30000` after an initial local embedded-Postgres hook timeout in the combined run. - Split integration check: merged after runtime/governance and dev-infra/backups with no merge conflicts. - Confirmed this branch does not include `pnpm-lock.yaml`. ## Risks - Medium risk: changes member removal permissions and adds a new user profile route with cross-table stats. - The profile page is a new UI surface and may need visual follow-up in browser QA. - No database migrations are included. > For core feature work, check [`ROADMAP.md`](ROADMAP.md) first and discuss it in `#dev` before opening the PR. Feature PRs that overlap with planned core work may need to be redirected — check the roadmap first. See `CONTRIBUTING.md`. ## Model Used - OpenAI Codex, GPT-5.4 tool-enabled coding model, agentic code-editing/runtime with local shell and GitHub CLI access; exact context window and reasoning mode are not exposed by the Paperclip harness. ## Checklist - [x] I have included a thinking path that traces from project context to this change - [x] I have specified the model used (with version and capability details) - [x] I have checked ROADMAP.md and confirmed this PR does not duplicate planned core work - [x] I have run tests locally and they pass - [x] I have added or updated tests where applicable - [x] If this change affects the UI, I have included before/after screenshots - [x] I have updated relevant documentation to reflect my changes - [x] I have considered and documented any risks above - [x] I will address all Greptile and reviewer comments before requesting merge --------- Co-authored-by: Paperclip <noreply@paperclip.ing>
386 lines
12 KiB
TypeScript
386 lines
12 KiB
TypeScript
// @vitest-environment jsdom
|
|
|
|
import { act } from "react";
|
|
import { createRoot } from "react-dom/client";
|
|
import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
|
|
import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
|
|
import { CompanyAccess } from "./CompanyAccess";
|
|
|
|
const listMembersMock = vi.hoisted(() => vi.fn());
|
|
const listJoinRequestsMock = vi.hoisted(() => vi.fn());
|
|
const updateMemberAccessMock = vi.hoisted(() => vi.fn());
|
|
const archiveMemberMock = vi.hoisted(() => vi.fn());
|
|
const listAgentsMock = vi.hoisted(() => vi.fn());
|
|
const listIssuesMock = vi.hoisted(() => vi.fn());
|
|
|
|
vi.mock("@/api/access", () => ({
|
|
accessApi: {
|
|
listMembers: (companyId: string) => listMembersMock(companyId),
|
|
listJoinRequests: (companyId: string, status: string) => listJoinRequestsMock(companyId, status),
|
|
updateMember: vi.fn(),
|
|
updateMemberPermissions: vi.fn(),
|
|
updateMemberAccess: (companyId: string, memberId: string, input: unknown) =>
|
|
updateMemberAccessMock(companyId, memberId, input),
|
|
archiveMember: (companyId: string, memberId: string, input: unknown) =>
|
|
archiveMemberMock(companyId, memberId, input),
|
|
approveJoinRequest: vi.fn(),
|
|
rejectJoinRequest: vi.fn(),
|
|
},
|
|
}));
|
|
|
|
vi.mock("@/api/agents", () => ({
|
|
agentsApi: {
|
|
list: (companyId: string) => listAgentsMock(companyId),
|
|
},
|
|
}));
|
|
|
|
vi.mock("@/api/issues", () => ({
|
|
issuesApi: {
|
|
list: (companyId: string, filters: unknown) => listIssuesMock(companyId, filters),
|
|
},
|
|
}));
|
|
|
|
vi.mock("@/context/CompanyContext", () => ({
|
|
useCompany: () => ({
|
|
selectedCompanyId: "company-1",
|
|
selectedCompany: { id: "company-1", name: "Paperclip" },
|
|
}),
|
|
}));
|
|
|
|
vi.mock("@/context/BreadcrumbContext", () => ({
|
|
useBreadcrumbs: () => ({ setBreadcrumbs: vi.fn() }),
|
|
}));
|
|
|
|
vi.mock("@/context/ToastContext", () => ({
|
|
useToast: () => ({ pushToast: vi.fn() }),
|
|
}));
|
|
|
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
(globalThis as any).IS_REACT_ACT_ENVIRONMENT = true;
|
|
|
|
async function flushReact() {
|
|
await act(async () => {
|
|
await Promise.resolve();
|
|
await new Promise((resolve) => window.setTimeout(resolve, 0));
|
|
});
|
|
}
|
|
|
|
describe("CompanyAccess", () => {
|
|
let container: HTMLDivElement;
|
|
|
|
beforeEach(() => {
|
|
container = document.createElement("div");
|
|
document.body.appendChild(container);
|
|
listMembersMock.mockResolvedValue({
|
|
members: [
|
|
{
|
|
id: "member-1",
|
|
companyId: "company-1",
|
|
principalType: "user",
|
|
principalId: "user-1",
|
|
status: "active",
|
|
membershipRole: "owner",
|
|
createdAt: "2026-04-10T00:00:00.000Z",
|
|
updatedAt: "2026-04-10T00:00:00.000Z",
|
|
user: {
|
|
id: "user-1",
|
|
email: "codexcoder@paperclip.local",
|
|
name: "Codex Coder",
|
|
image: null,
|
|
},
|
|
grants: [],
|
|
},
|
|
{
|
|
id: "member-2",
|
|
companyId: "company-1",
|
|
principalType: "user",
|
|
principalId: "user-2",
|
|
status: "active",
|
|
membershipRole: "operator",
|
|
createdAt: "2026-04-10T00:00:00.000Z",
|
|
updatedAt: "2026-04-10T00:00:00.000Z",
|
|
user: {
|
|
id: "user-2",
|
|
email: "board@paperclip.local",
|
|
name: "Board User",
|
|
image: null,
|
|
},
|
|
grants: [],
|
|
},
|
|
],
|
|
access: {
|
|
currentUserRole: "owner",
|
|
canManageMembers: true,
|
|
canInviteUsers: true,
|
|
canApproveJoinRequests: true,
|
|
},
|
|
});
|
|
listJoinRequestsMock.mockResolvedValue([
|
|
{
|
|
id: "join-1",
|
|
requestType: "human",
|
|
createdAt: "2026-04-10T00:00:00.000Z",
|
|
requesterUser: {
|
|
id: "user-2",
|
|
email: "board@paperclip.local",
|
|
name: "Board User",
|
|
image: null,
|
|
},
|
|
requestEmailSnapshot: "board@paperclip.local",
|
|
requestingUserId: "user-2",
|
|
invite: {
|
|
allowedJoinTypes: "human",
|
|
humanRole: "operator",
|
|
},
|
|
},
|
|
{
|
|
id: "join-2",
|
|
requestType: "agent",
|
|
createdAt: "2026-04-10T00:00:00.000Z",
|
|
agentName: "Codex Worker",
|
|
adapterType: "codex_local",
|
|
capabilities: "Implements code changes",
|
|
invite: {
|
|
allowedJoinTypes: "agent",
|
|
humanRole: null,
|
|
},
|
|
},
|
|
]);
|
|
updateMemberAccessMock.mockResolvedValue({});
|
|
archiveMemberMock.mockResolvedValue({ reassignedIssueCount: 1 });
|
|
listAgentsMock.mockResolvedValue([
|
|
{
|
|
id: "agent-1",
|
|
name: "Codex Worker",
|
|
role: "engineer",
|
|
status: "active",
|
|
},
|
|
]);
|
|
listIssuesMock.mockResolvedValue([
|
|
{
|
|
id: "issue-1",
|
|
identifier: "PAP-1",
|
|
title: "Assigned to removed user",
|
|
status: "todo",
|
|
},
|
|
]);
|
|
});
|
|
|
|
afterEach(() => {
|
|
container.remove();
|
|
document.body.innerHTML = "";
|
|
vi.clearAllMocks();
|
|
});
|
|
|
|
it("keeps the page human-focused and explains implicit versus explicit grants", async () => {
|
|
const root = createRoot(container);
|
|
const queryClient = new QueryClient({
|
|
defaultOptions: { queries: { retry: false } },
|
|
});
|
|
|
|
await act(async () => {
|
|
root.render(
|
|
<QueryClientProvider client={queryClient}>
|
|
<CompanyAccess />
|
|
</QueryClientProvider>,
|
|
);
|
|
});
|
|
await flushReact();
|
|
await flushReact();
|
|
|
|
expect(container.textContent).toContain("Manage company user memberships");
|
|
expect(container.textContent).toContain("Humans");
|
|
expect(container.textContent).toContain("Pending human joins");
|
|
expect(container.textContent).toContain("User account");
|
|
expect(container.textContent).not.toContain("Agents");
|
|
expect(container.textContent).not.toContain("Pending agent joins");
|
|
expect(container.textContent).not.toContain("Open join request queue");
|
|
expect(container.textContent).not.toContain("Manage invites");
|
|
expect(container.textContent).not.toContain("Active user accounts");
|
|
expect(container.textContent).not.toContain("Suspended user accounts");
|
|
expect(container.textContent).not.toContain("Pending user joins");
|
|
|
|
const editButton = Array.from(container.querySelectorAll("button")).find(
|
|
(button) => button.textContent === "Edit",
|
|
);
|
|
expect(editButton).toBeTruthy();
|
|
|
|
await act(async () => {
|
|
editButton?.dispatchEvent(new MouseEvent("click", { bubbles: true }));
|
|
});
|
|
await flushReact();
|
|
|
|
expect(document.body.textContent).toContain("Implicit grants from role");
|
|
expect(document.body.textContent).toContain("Owner currently includes these permissions automatically.");
|
|
expect(document.body.textContent).toContain(
|
|
"Included implicitly by the Owner role. Add an explicit grant only if it should stay after the role changes.",
|
|
);
|
|
|
|
await act(async () => {
|
|
root.unmount();
|
|
});
|
|
});
|
|
|
|
it("saves member role, status, and grants in one request", async () => {
|
|
const root = createRoot(container);
|
|
const queryClient = new QueryClient({
|
|
defaultOptions: { queries: { retry: false } },
|
|
});
|
|
|
|
await act(async () => {
|
|
root.render(
|
|
<QueryClientProvider client={queryClient}>
|
|
<CompanyAccess />
|
|
</QueryClientProvider>,
|
|
);
|
|
});
|
|
await flushReact();
|
|
await flushReact();
|
|
|
|
const editButton = Array.from(container.querySelectorAll("button")).find(
|
|
(button) => button.textContent === "Edit",
|
|
);
|
|
expect(editButton).toBeTruthy();
|
|
|
|
await act(async () => {
|
|
editButton?.dispatchEvent(new MouseEvent("click", { bubbles: true }));
|
|
});
|
|
await flushReact();
|
|
|
|
const saveButton = Array.from(document.body.querySelectorAll("button")).find(
|
|
(button) => button.textContent === "Save access",
|
|
);
|
|
expect(saveButton).toBeTruthy();
|
|
|
|
await act(async () => {
|
|
saveButton?.dispatchEvent(new MouseEvent("click", { bubbles: true }));
|
|
});
|
|
await flushReact();
|
|
|
|
expect(updateMemberAccessMock).toHaveBeenCalledWith("company-1", "member-1", {
|
|
membershipRole: "owner",
|
|
status: "active",
|
|
grants: [],
|
|
});
|
|
|
|
await act(async () => {
|
|
root.unmount();
|
|
});
|
|
});
|
|
|
|
it("removes a member with an issue reassignment target", async () => {
|
|
const root = createRoot(container);
|
|
const queryClient = new QueryClient({
|
|
defaultOptions: { queries: { retry: false } },
|
|
});
|
|
|
|
await act(async () => {
|
|
root.render(
|
|
<QueryClientProvider client={queryClient}>
|
|
<CompanyAccess />
|
|
</QueryClientProvider>,
|
|
);
|
|
});
|
|
await flushReact();
|
|
await flushReact();
|
|
|
|
const removeButtons = Array.from(container.querySelectorAll("button")).filter(
|
|
(button) => button.textContent?.includes("Remove"),
|
|
);
|
|
expect(removeButtons.length).toBeGreaterThan(0);
|
|
|
|
await act(async () => {
|
|
removeButtons[0]?.dispatchEvent(new MouseEvent("click", { bubbles: true }));
|
|
});
|
|
await flushReact();
|
|
|
|
expect(document.body.textContent).toContain("Remove member");
|
|
expect(document.body.textContent).toContain("Assigned to removed user");
|
|
|
|
const reassignmentSelect = document.body.querySelector("select");
|
|
expect(reassignmentSelect).toBeTruthy();
|
|
await act(async () => {
|
|
reassignmentSelect!.value = "user:user-2";
|
|
reassignmentSelect!.dispatchEvent(new Event("change", { bubbles: true }));
|
|
});
|
|
|
|
const confirmButton = Array.from(document.body.querySelectorAll("button")).find(
|
|
(button) => button.textContent === "Remove member",
|
|
);
|
|
expect(confirmButton).toBeTruthy();
|
|
|
|
await act(async () => {
|
|
confirmButton?.dispatchEvent(new MouseEvent("click", { bubbles: true }));
|
|
});
|
|
await flushReact();
|
|
|
|
expect(archiveMemberMock).toHaveBeenCalledWith("company-1", "member-1", {
|
|
reassignment: { assigneeAgentId: null, assigneeUserId: "user-2" },
|
|
});
|
|
|
|
await act(async () => {
|
|
root.unmount();
|
|
});
|
|
});
|
|
|
|
it("shows protected member removal reasons from the API", async () => {
|
|
listMembersMock.mockResolvedValueOnce({
|
|
members: [
|
|
{
|
|
id: "member-admin",
|
|
companyId: "company-1",
|
|
principalType: "user",
|
|
principalId: "admin-user",
|
|
status: "active",
|
|
membershipRole: "admin",
|
|
createdAt: "2026-04-10T00:00:00.000Z",
|
|
updatedAt: "2026-04-10T00:00:00.000Z",
|
|
user: {
|
|
id: "admin-user",
|
|
email: "admin@paperclip.local",
|
|
name: "Admin User",
|
|
image: null,
|
|
},
|
|
grants: [],
|
|
removal: {
|
|
canArchive: false,
|
|
reason: "Company admins cannot be removed from company access.",
|
|
},
|
|
},
|
|
],
|
|
access: {
|
|
currentUserRole: "owner",
|
|
canManageMembers: true,
|
|
canInviteUsers: true,
|
|
canApproveJoinRequests: false,
|
|
},
|
|
});
|
|
|
|
const root = createRoot(container);
|
|
const queryClient = new QueryClient({
|
|
defaultOptions: { queries: { retry: false } },
|
|
});
|
|
|
|
await act(async () => {
|
|
root.render(
|
|
<QueryClientProvider client={queryClient}>
|
|
<CompanyAccess />
|
|
</QueryClientProvider>,
|
|
);
|
|
});
|
|
await flushReact();
|
|
await flushReact();
|
|
|
|
expect(container.textContent).toContain("Company admins cannot be removed from company access.");
|
|
const removeButton = Array.from(container.querySelectorAll("button")).find(
|
|
(button) => button.textContent?.includes("Remove"),
|
|
);
|
|
expect(removeButton).toBeTruthy();
|
|
expect(removeButton).toHaveProperty("disabled", true);
|
|
|
|
await act(async () => {
|
|
root.unmount();
|
|
});
|
|
});
|
|
});
|