forked from farhoodlabs/paperclip
b9a80dcf22
## Thinking Path > - Paperclip is the control plane for autonomous AI companies. > - V1 needs to stay local-first while also supporting shared, authenticated deployments. > - Human operators need real identities, company membership, invite flows, profile surfaces, and company-scoped access controls. > - Agents and operators also need the existing issue, inbox, workspace, approval, and plugin flows to keep working under those authenticated boundaries. > - This branch accumulated the multi-user implementation, follow-up QA fixes, workspace/runtime refinements, invite UX improvements, release-branch conflict resolution, and review hardening. > - This pull request consolidates that branch onto the current `master` branch as a single reviewable PR. > - The benefit is a complete multi-user implementation path with tests and docs carried forward without dropping existing branch work. ## What Changed - Added authenticated human-user access surfaces: auth/session routes, company user directory, profile settings, company access/member management, join requests, and invite management. - Added invite creation, invite landing, onboarding, logo/branding, invite grants, deduped join requests, and authenticated multi-user E2E coverage. - Tightened company-scoped and instance-admin authorization across board, plugin, adapter, access, issue, and workspace routes. - Added profile-image URL validation hardening, avatar preservation on name-only profile updates, and join-request uniqueness migration cleanup for pending human requests. - Added an atomic member role/status/grants update path so Company Access saves no longer leave partially updated permissions. - Improved issue chat, inbox, assignee identity rendering, sidebar/account/company navigation, workspace routing, and execution workspace reuse behavior for multi-user operation. - Added and updated server/UI tests covering auth, invites, membership, issue workspace inheritance, plugin authz, inbox/chat behavior, and multi-user flows. - Merged current `public-gh/master` into this branch, resolved all conflicts, and verified no `pnpm-lock.yaml` change is included in this PR diff. ## Verification - `pnpm exec vitest run server/src/__tests__/issues-service.test.ts ui/src/components/IssueChatThread.test.tsx ui/src/pages/Inbox.test.tsx` - `pnpm run preflight:workspace-links && pnpm exec vitest run server/src/__tests__/plugin-routes-authz.test.ts` - `pnpm exec vitest run server/src/__tests__/plugin-routes-authz.test.ts server/src/__tests__/workspace-runtime-service-authz.test.ts server/src/__tests__/access-validators.test.ts` - `pnpm exec vitest run server/src/__tests__/authz-company-access.test.ts server/src/__tests__/routines-routes.test.ts server/src/__tests__/sidebar-preferences-routes.test.ts server/src/__tests__/approval-routes-idempotency.test.ts server/src/__tests__/openclaw-invite-prompt-route.test.ts server/src/__tests__/agent-cross-tenant-authz-routes.test.ts server/src/__tests__/routines-e2e.test.ts` - `pnpm exec vitest run server/src/__tests__/auth-routes.test.ts ui/src/pages/CompanyAccess.test.tsx` - `pnpm --filter @paperclipai/shared typecheck && pnpm --filter @paperclipai/db typecheck && pnpm --filter @paperclipai/server typecheck` - `pnpm --filter @paperclipai/shared typecheck && pnpm --filter @paperclipai/server typecheck` - `pnpm --filter @paperclipai/ui typecheck` - `pnpm db:generate` - `npx playwright test --config tests/e2e/playwright.config.ts --list` - Confirmed branch has no uncommitted changes and is `0` commits behind `public-gh/master` before PR creation. - Confirmed no `pnpm-lock.yaml` change is staged or present in the PR diff. ## Risks - High review surface area: this PR contains the accumulated multi-user branch plus follow-up fixes, so reviewers should focus especially on company-boundary enforcement and authenticated-vs-local deployment behavior. - UI behavior changed across invites, inbox, issue chat, access settings, and sidebar navigation; no browser screenshots are included in this branch-consolidation PR. - Plugin install, upgrade, and lifecycle/config mutations now require instance-admin access, which is intentional but may change expectations for non-admin board users. - A join-request dedupe migration rejects duplicate pending human requests before creating unique indexes; deployments with unusual historical duplicates should review the migration behavior. - Company member role/status/grant saves now use a new combined endpoint; older separate endpoints remain for compatibility. - Full production build was not run locally in this heartbeat; CI should cover the full matrix. ## Model Used - OpenAI Codex coding agent, GPT-5-based model, CLI/tool-use environment. Exact deployed model identifier and context window were not exposed by the runtime. ## 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 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 Note on screenshots: this is a branch-consolidation PR for an already-developed multi-user branch, and no browser screenshots were captured during this heartbeat. --------- Co-authored-by: dotta <dotta@example.com> Co-authored-by: Paperclip <noreply@paperclip.ing> Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com>
294 lines
8.3 KiB
TypeScript
294 lines
8.3 KiB
TypeScript
import express from "express";
|
|
import request from "supertest";
|
|
import { beforeEach, describe, expect, it, vi } from "vitest";
|
|
|
|
const mockAccessService = vi.hoisted(() => ({
|
|
hasPermission: vi.fn(),
|
|
canUser: vi.fn(),
|
|
isInstanceAdmin: vi.fn(),
|
|
getMembership: vi.fn(),
|
|
ensureMembership: vi.fn(),
|
|
listMembers: vi.fn(),
|
|
setMemberPermissions: vi.fn(),
|
|
promoteInstanceAdmin: vi.fn(),
|
|
demoteInstanceAdmin: vi.fn(),
|
|
listUserCompanyAccess: vi.fn(),
|
|
setUserCompanyAccess: vi.fn(),
|
|
setPrincipalGrants: vi.fn(),
|
|
}));
|
|
|
|
const mockAgentService = vi.hoisted(() => ({
|
|
getById: vi.fn(),
|
|
}));
|
|
|
|
const mockBoardAuthService = vi.hoisted(() => ({
|
|
createCliAuthChallenge: vi.fn(),
|
|
describeCliAuthChallenge: vi.fn(),
|
|
approveCliAuthChallenge: vi.fn(),
|
|
cancelCliAuthChallenge: vi.fn(),
|
|
resolveBoardAccess: vi.fn(),
|
|
assertCurrentBoardKey: vi.fn(),
|
|
revokeBoardApiKey: vi.fn(),
|
|
}));
|
|
|
|
const mockLogActivity = vi.hoisted(() => vi.fn());
|
|
const mockStorage = vi.hoisted(() => ({
|
|
headObject: vi.fn(),
|
|
}));
|
|
|
|
function registerModuleMocks() {
|
|
vi.doMock("../services/index.js", () => ({
|
|
accessService: () => mockAccessService,
|
|
agentService: () => mockAgentService,
|
|
boardAuthService: () => mockBoardAuthService,
|
|
deduplicateAgentName: vi.fn(),
|
|
logActivity: mockLogActivity,
|
|
notifyHireApproved: vi.fn(),
|
|
}));
|
|
}
|
|
|
|
vi.mock("../storage/index.js", () => ({
|
|
getStorageService: () => mockStorage,
|
|
}));
|
|
|
|
function createDbStub() {
|
|
const createdInvite = {
|
|
id: "invite-1",
|
|
companyId: "company-1",
|
|
inviteType: "company_join",
|
|
allowedJoinTypes: "agent",
|
|
defaultsPayload: null,
|
|
expiresAt: new Date("2099-03-07T00:10:00.000Z"),
|
|
invitedByUserId: null,
|
|
tokenHash: "hash",
|
|
revokedAt: null,
|
|
acceptedAt: null,
|
|
createdAt: new Date("2099-03-07T00:00:00.000Z"),
|
|
updatedAt: new Date("2099-03-07T00:00:00.000Z"),
|
|
};
|
|
const returning = vi.fn().mockResolvedValue([createdInvite]);
|
|
const values = vi.fn().mockReturnValue({ returning });
|
|
const insert = vi.fn().mockReturnValue({ values });
|
|
const isInvitesTable = (table: unknown) =>
|
|
!!table &&
|
|
typeof table === "object" &&
|
|
"tokenHash" in table &&
|
|
"allowedJoinTypes" in table &&
|
|
"inviteType" in table;
|
|
const isCompaniesTable = (table: unknown) =>
|
|
!!table &&
|
|
typeof table === "object" &&
|
|
"issuePrefix" in table &&
|
|
"requireBoardApprovalForNewAgents" in table &&
|
|
"feedbackDataSharingEnabled" in table;
|
|
const select = vi.fn((selection?: unknown) => ({
|
|
from(table: unknown) {
|
|
const query = {
|
|
leftJoin: vi.fn().mockReturnThis(),
|
|
where: vi.fn().mockImplementation(() => {
|
|
if (isInvitesTable(table)) {
|
|
return Promise.resolve([createdInvite]);
|
|
}
|
|
if (selection && typeof selection === "object" && "objectKey" in selection) {
|
|
return Promise.resolve([{
|
|
companyId: "company-1",
|
|
objectKey: "company-1/assets/companies/logo-1",
|
|
contentType: "image/png",
|
|
byteSize: 3,
|
|
originalFilename: "logo.png",
|
|
}]);
|
|
}
|
|
if (
|
|
(selection && typeof selection === "object" && "name" in selection) ||
|
|
isCompaniesTable(table)
|
|
) {
|
|
return Promise.resolve([{
|
|
name: "Acme AI",
|
|
brandColor: "#225577",
|
|
logoAssetId: "logo-1",
|
|
}]);
|
|
}
|
|
return Promise.resolve([]);
|
|
}),
|
|
};
|
|
return query;
|
|
},
|
|
}));
|
|
return {
|
|
insert,
|
|
select,
|
|
__insertValues: values,
|
|
};
|
|
}
|
|
|
|
async function createApp(actor: Record<string, unknown>, db: Record<string, unknown>) {
|
|
const [{ accessRoutes }, { errorHandler }] = await Promise.all([
|
|
vi.importActual<typeof import("../routes/access.js")>("../routes/access.js"),
|
|
vi.importActual<typeof import("../middleware/index.js")>("../middleware/index.js"),
|
|
]);
|
|
const app = express();
|
|
app.use(express.json());
|
|
app.use((req, _res, next) => {
|
|
(req as any).actor = actor;
|
|
next();
|
|
});
|
|
app.use(
|
|
"/api",
|
|
accessRoutes(db as any, {
|
|
deploymentMode: "local_trusted",
|
|
deploymentExposure: "private",
|
|
bindHost: "127.0.0.1",
|
|
allowedHostnames: [],
|
|
}),
|
|
);
|
|
app.use(errorHandler);
|
|
return app;
|
|
}
|
|
|
|
describe("POST /companies/:companyId/openclaw/invite-prompt", () => {
|
|
beforeEach(() => {
|
|
vi.resetModules();
|
|
vi.doUnmock("../services/index.js");
|
|
vi.doUnmock("../routes/access.js");
|
|
vi.doUnmock("../routes/authz.js");
|
|
vi.doUnmock("../middleware/index.js");
|
|
registerModuleMocks();
|
|
vi.resetAllMocks();
|
|
mockAccessService.canUser.mockResolvedValue(false);
|
|
mockAgentService.getById.mockReset();
|
|
mockLogActivity.mockResolvedValue(undefined);
|
|
mockStorage.headObject.mockResolvedValue({ exists: true, contentLength: 3, contentType: "image/png" });
|
|
});
|
|
|
|
it("rejects non-CEO agent callers", async () => {
|
|
const db = createDbStub();
|
|
mockAgentService.getById.mockResolvedValue({
|
|
id: "agent-1",
|
|
companyId: "company-1",
|
|
role: "engineer",
|
|
});
|
|
const app = await createApp(
|
|
{
|
|
type: "agent",
|
|
agentId: "agent-1",
|
|
companyId: "company-1",
|
|
source: "agent_key",
|
|
},
|
|
db,
|
|
);
|
|
|
|
const res = await request(app)
|
|
.post("/api/companies/company-1/openclaw/invite-prompt")
|
|
.send({});
|
|
|
|
expect(res.status).toBe(403);
|
|
expect(res.body.error).toContain("Only CEO agents");
|
|
});
|
|
|
|
it("allows CEO agent callers and creates an agent-only invite", async () => {
|
|
const db = createDbStub();
|
|
mockAgentService.getById.mockResolvedValue({
|
|
id: "agent-1",
|
|
companyId: "company-1",
|
|
role: "ceo",
|
|
});
|
|
const app = await createApp(
|
|
{
|
|
type: "agent",
|
|
agentId: "agent-1",
|
|
companyId: "company-1",
|
|
source: "agent_key",
|
|
},
|
|
db,
|
|
);
|
|
|
|
const res = await request(app)
|
|
.post("/api/companies/company-1/openclaw/invite-prompt")
|
|
.send({ agentMessage: "Join and configure OpenClaw gateway." });
|
|
|
|
expect([200, 201]).toContain(res.status);
|
|
expect(res.body.companyName).toBe("Acme AI");
|
|
expect(res.body.onboardingTextPath).toContain("/api/invites/");
|
|
expect((db as any).__insertValues).toHaveBeenCalledWith(
|
|
expect.objectContaining({
|
|
companyId: "company-1",
|
|
inviteType: "company_join",
|
|
allowedJoinTypes: "agent",
|
|
}),
|
|
);
|
|
});
|
|
|
|
it("includes companyName in invite summary responses", async () => {
|
|
const db = createDbStub();
|
|
const app = await createApp(
|
|
{
|
|
type: "board",
|
|
userId: "user-1",
|
|
companyIds: ["company-1"],
|
|
source: "session",
|
|
isInstanceAdmin: false,
|
|
},
|
|
db,
|
|
);
|
|
|
|
const res = await request(app).get("/api/invites/pcp_invite_test");
|
|
|
|
expect(res.status).toBe(200);
|
|
expect(res.body.companyName).toBe("Acme AI");
|
|
expect(res.body.companyBrandColor).toBe("#225577");
|
|
expect(res.body.companyLogoUrl).toBe("/api/invites/pcp_invite_test/logo");
|
|
expect(res.body.inviteType).toBe("company_join");
|
|
expect(res.body.allowedJoinTypes).toBe("agent");
|
|
});
|
|
|
|
it("allows board callers with invite permission", async () => {
|
|
const db = createDbStub();
|
|
mockAccessService.canUser.mockResolvedValue(true);
|
|
const app = await createApp(
|
|
{
|
|
type: "board",
|
|
userId: "user-1",
|
|
companyIds: ["company-1"],
|
|
source: "session",
|
|
isInstanceAdmin: false,
|
|
},
|
|
db,
|
|
);
|
|
|
|
const res = await request(app)
|
|
.post("/api/companies/company-1/openclaw/invite-prompt")
|
|
.send({});
|
|
|
|
expect(res.status).toBe(201);
|
|
expect((db as any).__insertValues).toHaveBeenCalledWith(
|
|
expect.objectContaining({
|
|
companyId: "company-1",
|
|
inviteType: "company_join",
|
|
allowedJoinTypes: "agent",
|
|
}),
|
|
);
|
|
}, 15_000);
|
|
|
|
it("rejects board callers without invite permission", async () => {
|
|
const db = createDbStub();
|
|
mockAccessService.canUser.mockResolvedValue(false);
|
|
const app = await createApp(
|
|
{
|
|
type: "board",
|
|
userId: "user-1",
|
|
companyIds: ["company-1"],
|
|
source: "session",
|
|
isInstanceAdmin: false,
|
|
},
|
|
db,
|
|
);
|
|
|
|
const res = await request(app)
|
|
.post("/api/companies/company-1/openclaw/invite-prompt")
|
|
.send({});
|
|
|
|
expect(res.status).toBe(403);
|
|
expect(res.body.error).toBe("Permission denied");
|
|
});
|
|
});
|