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>
360 lines
12 KiB
TypeScript
360 lines
12 KiB
TypeScript
import { createHash, randomBytes, timingSafeEqual } from "node:crypto";
|
|
import { and, eq, isNull, sql } from "drizzle-orm";
|
|
import type { Db } from "@paperclipai/db";
|
|
import {
|
|
authUsers,
|
|
boardApiKeys,
|
|
cliAuthChallenges,
|
|
companies,
|
|
companyMemberships,
|
|
instanceUserRoles,
|
|
} from "@paperclipai/db";
|
|
import { conflict, forbidden, notFound } from "../errors.js";
|
|
|
|
export const BOARD_API_KEY_TTL_MS = 30 * 24 * 60 * 60 * 1000;
|
|
export const CLI_AUTH_CHALLENGE_TTL_MS = 10 * 60 * 1000;
|
|
|
|
export type CliAuthChallengeStatus = "pending" | "approved" | "cancelled" | "expired";
|
|
|
|
export function hashBearerToken(token: string) {
|
|
return createHash("sha256").update(token).digest("hex");
|
|
}
|
|
|
|
export function tokenHashesMatch(left: string, right: string) {
|
|
const leftBytes = Buffer.from(left, "utf8");
|
|
const rightBytes = Buffer.from(right, "utf8");
|
|
return leftBytes.length === rightBytes.length && timingSafeEqual(leftBytes, rightBytes);
|
|
}
|
|
|
|
export function createBoardApiToken() {
|
|
return `pcp_board_${randomBytes(24).toString("hex")}`;
|
|
}
|
|
|
|
export function createCliAuthSecret() {
|
|
return `pcp_cli_auth_${randomBytes(24).toString("hex")}`;
|
|
}
|
|
|
|
export function boardApiKeyExpiresAt(nowMs: number = Date.now()) {
|
|
return new Date(nowMs + BOARD_API_KEY_TTL_MS);
|
|
}
|
|
|
|
export function cliAuthChallengeExpiresAt(nowMs: number = Date.now()) {
|
|
return new Date(nowMs + CLI_AUTH_CHALLENGE_TTL_MS);
|
|
}
|
|
|
|
function challengeStatusForRow(row: typeof cliAuthChallenges.$inferSelect): CliAuthChallengeStatus {
|
|
if (row.cancelledAt) return "cancelled";
|
|
if (row.expiresAt.getTime() <= Date.now()) return "expired";
|
|
if (row.approvedAt && row.boardApiKeyId) return "approved";
|
|
return "pending";
|
|
}
|
|
|
|
export function boardAuthService(db: Db) {
|
|
async function resolveBoardAccess(userId: string) {
|
|
const [user, memberships, adminRole] = await Promise.all([
|
|
db
|
|
.select({
|
|
id: authUsers.id,
|
|
name: authUsers.name,
|
|
email: authUsers.email,
|
|
})
|
|
.from(authUsers)
|
|
.where(eq(authUsers.id, userId))
|
|
.then((rows) => rows[0] ?? null),
|
|
db
|
|
.select({
|
|
companyId: companyMemberships.companyId,
|
|
membershipRole: companyMemberships.membershipRole,
|
|
status: companyMemberships.status,
|
|
})
|
|
.from(companyMemberships)
|
|
.where(
|
|
and(
|
|
eq(companyMemberships.principalType, "user"),
|
|
eq(companyMemberships.principalId, userId),
|
|
eq(companyMemberships.status, "active"),
|
|
),
|
|
)
|
|
.then((rows) => rows),
|
|
db
|
|
.select({ id: instanceUserRoles.id })
|
|
.from(instanceUserRoles)
|
|
.where(and(eq(instanceUserRoles.userId, userId), eq(instanceUserRoles.role, "instance_admin")))
|
|
.then((rows) => rows[0] ?? null),
|
|
]);
|
|
|
|
return {
|
|
user,
|
|
companyIds: memberships.map((row) => row.companyId),
|
|
memberships,
|
|
isInstanceAdmin: Boolean(adminRole),
|
|
};
|
|
}
|
|
|
|
async function resolveBoardActivityCompanyIds(input: {
|
|
userId: string;
|
|
requestedCompanyId?: string | null;
|
|
boardApiKeyId?: string | null;
|
|
}) {
|
|
const access = await resolveBoardAccess(input.userId);
|
|
const companyIds = new Set(access.companyIds);
|
|
|
|
if (companyIds.size === 0 && input.requestedCompanyId?.trim()) {
|
|
companyIds.add(input.requestedCompanyId.trim());
|
|
}
|
|
|
|
if (companyIds.size === 0 && input.boardApiKeyId?.trim()) {
|
|
const challengeCompanyIds = await db
|
|
.select({ requestedCompanyId: cliAuthChallenges.requestedCompanyId })
|
|
.from(cliAuthChallenges)
|
|
.where(eq(cliAuthChallenges.boardApiKeyId, input.boardApiKeyId.trim()))
|
|
.then((rows) =>
|
|
rows
|
|
.map((row) => row.requestedCompanyId?.trim() ?? null)
|
|
.filter((value): value is string => Boolean(value)),
|
|
);
|
|
for (const companyId of challengeCompanyIds) {
|
|
companyIds.add(companyId);
|
|
}
|
|
}
|
|
|
|
if (companyIds.size === 0 && access.isInstanceAdmin) {
|
|
const allCompanyIds = await db
|
|
.select({ id: companies.id })
|
|
.from(companies)
|
|
.then((rows) => rows.map((row) => row.id));
|
|
for (const companyId of allCompanyIds) {
|
|
companyIds.add(companyId);
|
|
}
|
|
}
|
|
|
|
return Array.from(companyIds);
|
|
}
|
|
|
|
async function findBoardApiKeyByToken(token: string) {
|
|
const tokenHash = hashBearerToken(token);
|
|
const now = new Date();
|
|
return db
|
|
.select()
|
|
.from(boardApiKeys)
|
|
.where(
|
|
and(
|
|
eq(boardApiKeys.keyHash, tokenHash),
|
|
isNull(boardApiKeys.revokedAt),
|
|
),
|
|
)
|
|
.then((rows) => rows.find((row) => !row.expiresAt || row.expiresAt.getTime() > now.getTime()) ?? null);
|
|
}
|
|
|
|
async function touchBoardApiKey(id: string) {
|
|
await db.update(boardApiKeys).set({ lastUsedAt: new Date() }).where(eq(boardApiKeys.id, id));
|
|
}
|
|
|
|
async function revokeBoardApiKey(id: string) {
|
|
const now = new Date();
|
|
return db
|
|
.update(boardApiKeys)
|
|
.set({ revokedAt: now, lastUsedAt: now })
|
|
.where(and(eq(boardApiKeys.id, id), isNull(boardApiKeys.revokedAt)))
|
|
.returning()
|
|
.then((rows) => rows[0] ?? null);
|
|
}
|
|
|
|
async function createCliAuthChallenge(input: {
|
|
command: string;
|
|
clientName?: string | null;
|
|
requestedAccess: "board" | "instance_admin_required";
|
|
requestedCompanyId?: string | null;
|
|
}) {
|
|
const challengeSecret = createCliAuthSecret();
|
|
const pendingBoardToken = createBoardApiToken();
|
|
const expiresAt = cliAuthChallengeExpiresAt();
|
|
const labelBase = input.clientName?.trim() || "paperclipai cli";
|
|
const pendingKeyName =
|
|
input.requestedAccess === "instance_admin_required"
|
|
? `${labelBase} (instance admin)`
|
|
: `${labelBase} (board)`;
|
|
|
|
const created = await db
|
|
.insert(cliAuthChallenges)
|
|
.values({
|
|
secretHash: hashBearerToken(challengeSecret),
|
|
command: input.command.trim(),
|
|
clientName: input.clientName?.trim() || null,
|
|
requestedAccess: input.requestedAccess,
|
|
requestedCompanyId: input.requestedCompanyId?.trim() || null,
|
|
pendingKeyHash: hashBearerToken(pendingBoardToken),
|
|
pendingKeyName,
|
|
expiresAt,
|
|
})
|
|
.returning()
|
|
.then((rows) => rows[0]);
|
|
|
|
return {
|
|
challenge: created,
|
|
challengeSecret,
|
|
pendingBoardToken,
|
|
};
|
|
}
|
|
|
|
async function getCliAuthChallenge(id: string) {
|
|
return db
|
|
.select()
|
|
.from(cliAuthChallenges)
|
|
.where(eq(cliAuthChallenges.id, id))
|
|
.then((rows) => rows[0] ?? null);
|
|
}
|
|
|
|
async function getCliAuthChallengeBySecret(id: string, token: string) {
|
|
const challenge = await getCliAuthChallenge(id);
|
|
if (!challenge) return null;
|
|
if (!tokenHashesMatch(challenge.secretHash, hashBearerToken(token))) return null;
|
|
return challenge;
|
|
}
|
|
|
|
async function describeCliAuthChallenge(id: string, token: string) {
|
|
const challenge = await getCliAuthChallengeBySecret(id, token);
|
|
if (!challenge) return null;
|
|
|
|
const [company, approvedBy] = await Promise.all([
|
|
challenge.requestedCompanyId
|
|
? db
|
|
.select({ id: companies.id, name: companies.name })
|
|
.from(companies)
|
|
.where(eq(companies.id, challenge.requestedCompanyId))
|
|
.then((rows) => rows[0] ?? null)
|
|
: Promise.resolve(null),
|
|
challenge.approvedByUserId
|
|
? db
|
|
.select({ id: authUsers.id, name: authUsers.name, email: authUsers.email })
|
|
.from(authUsers)
|
|
.where(eq(authUsers.id, challenge.approvedByUserId))
|
|
.then((rows) => rows[0] ?? null)
|
|
: Promise.resolve(null),
|
|
]);
|
|
|
|
return {
|
|
id: challenge.id,
|
|
status: challengeStatusForRow(challenge),
|
|
command: challenge.command,
|
|
clientName: challenge.clientName ?? null,
|
|
requestedAccess: challenge.requestedAccess as "board" | "instance_admin_required",
|
|
requestedCompanyId: challenge.requestedCompanyId ?? null,
|
|
requestedCompanyName: company?.name ?? null,
|
|
approvedAt: challenge.approvedAt?.toISOString() ?? null,
|
|
cancelledAt: challenge.cancelledAt?.toISOString() ?? null,
|
|
expiresAt: challenge.expiresAt.toISOString(),
|
|
approvedByUser: approvedBy
|
|
? {
|
|
id: approvedBy.id,
|
|
name: approvedBy.name,
|
|
email: approvedBy.email,
|
|
}
|
|
: null,
|
|
};
|
|
}
|
|
|
|
async function approveCliAuthChallenge(id: string, token: string, userId: string) {
|
|
const access = await resolveBoardAccess(userId);
|
|
return db.transaction(async (tx) => {
|
|
await tx.execute(
|
|
sql`select ${cliAuthChallenges.id} from ${cliAuthChallenges} where ${cliAuthChallenges.id} = ${id} for update`,
|
|
);
|
|
|
|
const challenge = await tx
|
|
.select()
|
|
.from(cliAuthChallenges)
|
|
.where(eq(cliAuthChallenges.id, id))
|
|
.then((rows) => rows[0] ?? null);
|
|
if (!challenge || !tokenHashesMatch(challenge.secretHash, hashBearerToken(token))) {
|
|
throw notFound("CLI auth challenge not found");
|
|
}
|
|
|
|
const status = challengeStatusForRow(challenge);
|
|
if (status === "expired") return { status, challenge };
|
|
if (status === "cancelled") return { status, challenge };
|
|
|
|
if (challenge.requestedAccess === "instance_admin_required" && !access.isInstanceAdmin) {
|
|
throw forbidden("Instance admin required");
|
|
}
|
|
|
|
let boardKeyId = challenge.boardApiKeyId;
|
|
if (!boardKeyId) {
|
|
const createdKey = await tx
|
|
.insert(boardApiKeys)
|
|
.values({
|
|
userId,
|
|
name: challenge.pendingKeyName,
|
|
keyHash: challenge.pendingKeyHash,
|
|
expiresAt: boardApiKeyExpiresAt(),
|
|
})
|
|
.returning()
|
|
.then((rows) => rows[0]);
|
|
boardKeyId = createdKey.id;
|
|
}
|
|
|
|
const approvedAt = challenge.approvedAt ?? new Date();
|
|
const updated = await tx
|
|
.update(cliAuthChallenges)
|
|
.set({
|
|
approvedByUserId: userId,
|
|
boardApiKeyId: boardKeyId,
|
|
approvedAt,
|
|
updatedAt: new Date(),
|
|
})
|
|
.where(eq(cliAuthChallenges.id, challenge.id))
|
|
.returning()
|
|
.then((rows) => rows[0] ?? challenge);
|
|
|
|
return { status: "approved" as const, challenge: updated };
|
|
});
|
|
}
|
|
|
|
async function cancelCliAuthChallenge(id: string, token: string) {
|
|
const challenge = await getCliAuthChallengeBySecret(id, token);
|
|
if (!challenge) throw notFound("CLI auth challenge not found");
|
|
|
|
const status = challengeStatusForRow(challenge);
|
|
if (status === "approved") return { status, challenge };
|
|
if (status === "expired") return { status, challenge };
|
|
if (status === "cancelled") return { status, challenge };
|
|
|
|
const updated = await db
|
|
.update(cliAuthChallenges)
|
|
.set({
|
|
cancelledAt: new Date(),
|
|
updatedAt: new Date(),
|
|
})
|
|
.where(eq(cliAuthChallenges.id, challenge.id))
|
|
.returning()
|
|
.then((rows) => rows[0] ?? challenge);
|
|
|
|
return { status: "cancelled" as const, challenge: updated };
|
|
}
|
|
|
|
async function assertCurrentBoardKey(keyId: string | undefined, userId: string | undefined) {
|
|
if (!keyId || !userId) throw conflict("Board API key context is required");
|
|
const key = await db
|
|
.select()
|
|
.from(boardApiKeys)
|
|
.where(and(eq(boardApiKeys.id, keyId), eq(boardApiKeys.userId, userId)))
|
|
.then((rows) => rows[0] ?? null);
|
|
if (!key || key.revokedAt) throw notFound("Board API key not found");
|
|
return key;
|
|
}
|
|
|
|
return {
|
|
resolveBoardAccess,
|
|
findBoardApiKeyByToken,
|
|
touchBoardApiKey,
|
|
revokeBoardApiKey,
|
|
createCliAuthChallenge,
|
|
getCliAuthChallengeBySecret,
|
|
describeCliAuthChallenge,
|
|
approveCliAuthChallenge,
|
|
cancelCliAuthChallenge,
|
|
assertCurrentBoardKey,
|
|
resolveBoardActivityCompanyIds,
|
|
};
|
|
}
|