mirror of
https://github.com/alkimake/paperclip.git
synced 2026-06-15 18:30:39 +09:00
feat: implement multi-user access and invite flows (#3784)
## 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>
This commit is contained in:
Dotta
GitHub
parent
e93e418cbf
commit
b9a80dcf22
150 changed files with 26872 additions and 1289 deletions
|
|
@ -1,12 +1,17 @@
|
|||
import type { AgentAdapterType, JoinRequest } from "@paperclipai/shared";
|
||||
import type { AgentAdapterType, JoinRequest, PermissionKey } from "@paperclipai/shared";
|
||||
import { api } from "./client";
|
||||
|
||||
export type HumanCompanyRole = "owner" | "admin" | "operator" | "viewer";
|
||||
|
||||
type InviteSummary = {
|
||||
id: string;
|
||||
companyId: string | null;
|
||||
companyName?: string | null;
|
||||
companyLogoUrl?: string | null;
|
||||
companyBrandColor?: string | null;
|
||||
inviteType: "company_join" | "bootstrap_ceo";
|
||||
allowedJoinTypes: "human" | "agent" | "both";
|
||||
humanRole?: HumanCompanyRole | null;
|
||||
expiresAt: string;
|
||||
onboardingPath?: string;
|
||||
onboardingUrl?: string;
|
||||
|
|
@ -15,6 +20,9 @@ type InviteSummary = {
|
|||
skillIndexPath?: string;
|
||||
skillIndexUrl?: string;
|
||||
inviteMessage?: string | null;
|
||||
invitedByUserName?: string | null;
|
||||
joinRequestStatus?: JoinRequest["status"] | null;
|
||||
joinRequestType?: JoinRequest["requestType"] | null;
|
||||
};
|
||||
|
||||
type AcceptInviteInput =
|
||||
|
|
@ -88,17 +96,162 @@ type CompanyInviteCreated = {
|
|||
inviteUrl: string;
|
||||
expiresAt: string;
|
||||
allowedJoinTypes: "human" | "agent" | "both";
|
||||
humanRole?: HumanCompanyRole | null;
|
||||
companyName?: string | null;
|
||||
onboardingTextPath?: string;
|
||||
onboardingTextUrl?: string;
|
||||
inviteMessage?: string | null;
|
||||
};
|
||||
|
||||
export type CompanyMemberGrant = {
|
||||
id: string;
|
||||
companyId: string;
|
||||
principalType: "user";
|
||||
principalId: string;
|
||||
permissionKey: PermissionKey;
|
||||
scope: Record<string, unknown> | null;
|
||||
grantedByUserId: string | null;
|
||||
createdAt: string;
|
||||
updatedAt: string;
|
||||
};
|
||||
|
||||
export type CompanyMember = {
|
||||
id: string;
|
||||
companyId: string;
|
||||
principalType: "user";
|
||||
principalId: string;
|
||||
status: "pending" | "active" | "suspended";
|
||||
membershipRole: HumanCompanyRole | null;
|
||||
createdAt: string;
|
||||
updatedAt: string;
|
||||
user: { id: string; email: string | null; name: string | null; image: string | null } | null;
|
||||
grants: CompanyMemberGrant[];
|
||||
};
|
||||
|
||||
export type CompanyMembersResponse = {
|
||||
members: CompanyMember[];
|
||||
access: {
|
||||
currentUserRole: HumanCompanyRole | null;
|
||||
canManageMembers: boolean;
|
||||
canInviteUsers: boolean;
|
||||
canApproveJoinRequests: boolean;
|
||||
};
|
||||
};
|
||||
|
||||
export type CompanyUserDirectoryEntry = {
|
||||
principalId: string;
|
||||
status: "active";
|
||||
user: { id: string; email: string | null; name: string | null; image: string | null } | null;
|
||||
};
|
||||
|
||||
export type CompanyUserDirectoryResponse = {
|
||||
users: CompanyUserDirectoryEntry[];
|
||||
};
|
||||
|
||||
export type CompanyInviteRecord = {
|
||||
id: string;
|
||||
companyId: string | null;
|
||||
companyName: string | null;
|
||||
inviteType: "company_join" | "bootstrap_ceo";
|
||||
allowedJoinTypes: "human" | "agent" | "both";
|
||||
humanRole: HumanCompanyRole | null;
|
||||
defaultsPayload: Record<string, unknown> | null;
|
||||
expiresAt: string;
|
||||
invitedByUserId: string | null;
|
||||
revokedAt: string | null;
|
||||
acceptedAt: string | null;
|
||||
createdAt: string;
|
||||
updatedAt: string;
|
||||
inviteMessage: string | null;
|
||||
state: "active" | "revoked" | "accepted" | "expired";
|
||||
invitedByUser: { id: string; email: string | null; name: string | null; image: string | null } | null;
|
||||
relatedJoinRequestId: string | null;
|
||||
};
|
||||
|
||||
export type CompanyInviteListResponse = {
|
||||
invites: CompanyInviteRecord[];
|
||||
nextOffset: number | null;
|
||||
};
|
||||
|
||||
export type CompanyJoinRequest = JoinRequest & {
|
||||
requesterUser: { id: string; email: string | null; name: string | null; image: string | null } | null;
|
||||
approvedByUser: { id: string; email: string | null; name: string | null; image: string | null } | null;
|
||||
rejectedByUser: { id: string; email: string | null; name: string | null; image: string | null } | null;
|
||||
invite: {
|
||||
id: string;
|
||||
inviteType: "company_join" | "bootstrap_ceo";
|
||||
allowedJoinTypes: "human" | "agent" | "both";
|
||||
humanRole: HumanCompanyRole | null;
|
||||
inviteMessage: string | null;
|
||||
createdAt: string;
|
||||
expiresAt: string;
|
||||
revokedAt: string | null;
|
||||
acceptedAt: string | null;
|
||||
invitedByUser: { id: string; email: string | null; name: string | null; image: string | null } | null;
|
||||
} | null;
|
||||
};
|
||||
|
||||
export type AdminUserDirectoryEntry = {
|
||||
id: string;
|
||||
email: string | null;
|
||||
name: string | null;
|
||||
image: string | null;
|
||||
isInstanceAdmin: boolean;
|
||||
activeCompanyMembershipCount: number;
|
||||
};
|
||||
|
||||
export type UserCompanyAccessEntry = {
|
||||
id: string;
|
||||
companyId: string;
|
||||
principalType: "user";
|
||||
principalId: string;
|
||||
status: "pending" | "active" | "suspended";
|
||||
membershipRole: HumanCompanyRole | "member" | null;
|
||||
createdAt: string;
|
||||
updatedAt: string;
|
||||
companyName: string | null;
|
||||
companyStatus: "active" | "paused" | "archived" | null;
|
||||
};
|
||||
|
||||
export type UserCompanyAccessResponse = {
|
||||
user: {
|
||||
id: string;
|
||||
email: string | null;
|
||||
name: string | null;
|
||||
image: string | null;
|
||||
isInstanceAdmin: boolean;
|
||||
} | null;
|
||||
companyAccess: UserCompanyAccessEntry[];
|
||||
};
|
||||
|
||||
export type CurrentBoardAccess = {
|
||||
user: { id: string; email: string | null; name: string | null; image: string | null } | null;
|
||||
userId: string;
|
||||
isInstanceAdmin: boolean;
|
||||
companyIds: string[];
|
||||
source: string;
|
||||
keyId: string | null;
|
||||
};
|
||||
|
||||
function buildInviteListQuery(options: {
|
||||
state?: "active" | "revoked" | "accepted" | "expired";
|
||||
limit?: number;
|
||||
offset?: number;
|
||||
}) {
|
||||
const params = new URLSearchParams();
|
||||
if (options.state) params.set("state", options.state);
|
||||
if (options.limit) params.set("limit", String(options.limit));
|
||||
if (options.offset) params.set("offset", String(options.offset));
|
||||
const query = params.toString();
|
||||
return query ? `?${query}` : "";
|
||||
}
|
||||
|
||||
export const accessApi = {
|
||||
createCompanyInvite: (
|
||||
companyId: string,
|
||||
input: {
|
||||
allowedJoinTypes?: "human" | "agent" | "both";
|
||||
humanRole?: HumanCompanyRole | null;
|
||||
defaultsPayload?: Record<string, unknown> | null;
|
||||
agentMessage?: string | null;
|
||||
} = {},
|
||||
|
|
@ -126,8 +279,67 @@ export const accessApi = {
|
|||
input,
|
||||
),
|
||||
|
||||
listJoinRequests: (companyId: string, status: "pending_approval" | "approved" | "rejected" = "pending_approval") =>
|
||||
api.get<JoinRequest[]>(`/companies/${companyId}/join-requests?status=${status}`),
|
||||
listInvites: (
|
||||
companyId: string,
|
||||
options: {
|
||||
state?: "active" | "revoked" | "accepted" | "expired";
|
||||
limit?: number;
|
||||
offset?: number;
|
||||
} = {},
|
||||
) =>
|
||||
api.get<CompanyInviteListResponse>(
|
||||
`/companies/${companyId}/invites${buildInviteListQuery(options)}`,
|
||||
),
|
||||
|
||||
revokeInvite: (inviteId: string) => api.post(`/invites/${inviteId}/revoke`, {}),
|
||||
|
||||
listJoinRequests: (
|
||||
companyId: string,
|
||||
status: "pending_approval" | "approved" | "rejected" = "pending_approval",
|
||||
requestType?: "human" | "agent",
|
||||
) =>
|
||||
api.get<CompanyJoinRequest[]>(
|
||||
`/companies/${companyId}/join-requests?status=${status}${requestType ? `&requestType=${requestType}` : ""}`,
|
||||
),
|
||||
|
||||
listMembers: (companyId: string) =>
|
||||
api.get<CompanyMembersResponse>(`/companies/${companyId}/members`),
|
||||
|
||||
listUserDirectory: (companyId: string) =>
|
||||
api.get<CompanyUserDirectoryResponse>(`/companies/${companyId}/user-directory`),
|
||||
|
||||
updateMember: (
|
||||
companyId: string,
|
||||
memberId: string,
|
||||
input: {
|
||||
membershipRole?: HumanCompanyRole | null;
|
||||
status?: "pending" | "active" | "suspended";
|
||||
},
|
||||
) => api.patch<CompanyMember>(`/companies/${companyId}/members/${memberId}`, input),
|
||||
|
||||
updateMemberPermissions: (
|
||||
companyId: string,
|
||||
memberId: string,
|
||||
input: {
|
||||
grants: Array<{
|
||||
permissionKey: PermissionKey;
|
||||
scope?: Record<string, unknown> | null;
|
||||
}>;
|
||||
},
|
||||
) => api.patch<CompanyMember>(`/companies/${companyId}/members/${memberId}/permissions`, input),
|
||||
|
||||
updateMemberAccess: (
|
||||
companyId: string,
|
||||
memberId: string,
|
||||
input: {
|
||||
membershipRole?: HumanCompanyRole | null;
|
||||
status?: "pending" | "active" | "suspended";
|
||||
grants: Array<{
|
||||
permissionKey: PermissionKey;
|
||||
scope?: Record<string, unknown> | null;
|
||||
}>;
|
||||
},
|
||||
) => api.patch<CompanyMember>(`/companies/${companyId}/members/${memberId}/role-and-grants`, input),
|
||||
|
||||
approveJoinRequest: (companyId: string, requestId: string) =>
|
||||
api.post<JoinRequest>(`/companies/${companyId}/join-requests/${requestId}/approve`, {}),
|
||||
|
|
@ -158,4 +370,22 @@ export const accessApi = {
|
|||
|
||||
cancelCliAuthChallenge: (id: string, token: string) =>
|
||||
api.post<{ cancelled: boolean; status: string }>(`/cli-auth/challenges/${id}/cancel`, { token }),
|
||||
|
||||
searchAdminUsers: (query: string) =>
|
||||
api.get<AdminUserDirectoryEntry[]>(`/admin/users?query=${encodeURIComponent(query)}`),
|
||||
|
||||
promoteInstanceAdmin: (userId: string) =>
|
||||
api.post(`/admin/users/${userId}/promote-instance-admin`, {}),
|
||||
|
||||
demoteInstanceAdmin: (userId: string) =>
|
||||
api.post(`/admin/users/${userId}/demote-instance-admin`, {}),
|
||||
|
||||
getUserCompanyAccess: (userId: string) =>
|
||||
api.get<UserCompanyAccessResponse>(`/admin/users/${userId}/company-access`),
|
||||
|
||||
setUserCompanyAccess: (userId: string, companyIds: string[]) =>
|
||||
api.put<UserCompanyAccessResponse>(`/admin/users/${userId}/company-access`, { companyIds }),
|
||||
|
||||
getCurrentBoardAccess: () =>
|
||||
api.get<CurrentBoardAccess>("/cli-auth/me"),
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,27 +1,63 @@
|
|||
export type AuthSession = {
|
||||
session: { id: string; userId: string };
|
||||
user: { id: string; email: string | null; name: string | null };
|
||||
};
|
||||
import {
|
||||
authSessionSchema,
|
||||
currentUserProfileSchema,
|
||||
type AuthSession,
|
||||
type CurrentUserProfile,
|
||||
type UpdateCurrentUserProfile,
|
||||
} from "@paperclipai/shared";
|
||||
|
||||
type AuthErrorBody =
|
||||
| {
|
||||
code?: string;
|
||||
message?: string;
|
||||
error?: string | { code?: string; message?: string };
|
||||
}
|
||||
| null;
|
||||
|
||||
export class AuthApiError extends Error {
|
||||
status: number;
|
||||
code: string | null;
|
||||
body: unknown;
|
||||
|
||||
constructor(message: string, status: number, body: unknown, code: string | null = null) {
|
||||
super(message);
|
||||
this.name = "AuthApiError";
|
||||
this.status = status;
|
||||
this.code = code;
|
||||
this.body = body;
|
||||
}
|
||||
}
|
||||
|
||||
function toSession(value: unknown): AuthSession | null {
|
||||
const direct = authSessionSchema.safeParse(value);
|
||||
if (direct.success) return direct.data;
|
||||
|
||||
if (!value || typeof value !== "object") return null;
|
||||
const record = value as Record<string, unknown>;
|
||||
const sessionValue = record.session;
|
||||
const userValue = record.user;
|
||||
if (!sessionValue || typeof sessionValue !== "object") return null;
|
||||
if (!userValue || typeof userValue !== "object") return null;
|
||||
const session = sessionValue as Record<string, unknown>;
|
||||
const user = userValue as Record<string, unknown>;
|
||||
if (typeof session.id !== "string" || typeof session.userId !== "string") return null;
|
||||
if (typeof user.id !== "string") return null;
|
||||
return {
|
||||
session: { id: session.id, userId: session.userId },
|
||||
user: {
|
||||
id: user.id,
|
||||
email: typeof user.email === "string" ? user.email : null,
|
||||
name: typeof user.name === "string" ? user.name : null,
|
||||
},
|
||||
};
|
||||
const nested = authSessionSchema.safeParse((value as Record<string, unknown>).data);
|
||||
return nested.success ? nested.data : null;
|
||||
}
|
||||
|
||||
function extractAuthError(payload: AuthErrorBody, status: number) {
|
||||
const nested =
|
||||
payload?.error && typeof payload.error === "object"
|
||||
? payload.error
|
||||
: null;
|
||||
const code =
|
||||
typeof nested?.code === "string"
|
||||
? nested.code
|
||||
: typeof payload?.code === "string"
|
||||
? payload.code
|
||||
: null;
|
||||
const message =
|
||||
typeof nested?.message === "string" && nested.message.trim().length > 0
|
||||
? nested.message
|
||||
: typeof payload?.message === "string" && payload.message.trim().length > 0
|
||||
? payload.message
|
||||
: typeof payload?.error === "string" && payload.error.trim().length > 0
|
||||
? payload.error
|
||||
: `Request failed: ${status}`;
|
||||
|
||||
return new AuthApiError(message, status, payload, code);
|
||||
}
|
||||
|
||||
async function authPost(path: string, body: Record<string, unknown>) {
|
||||
|
|
@ -33,16 +69,25 @@ async function authPost(path: string, body: Record<string, unknown>) {
|
|||
});
|
||||
const payload = await res.json().catch(() => null);
|
||||
if (!res.ok) {
|
||||
const message =
|
||||
(payload as { error?: { message?: string } | string } | null)?.error &&
|
||||
typeof (payload as { error?: { message?: string } | string }).error === "object"
|
||||
? ((payload as { error?: { message?: string } }).error?.message ?? `Request failed: ${res.status}`)
|
||||
: (payload as { error?: string } | null)?.error ?? `Request failed: ${res.status}`;
|
||||
throw new Error(message);
|
||||
throw extractAuthError(payload as AuthErrorBody, res.status);
|
||||
}
|
||||
return payload;
|
||||
}
|
||||
|
||||
async function authPatch<T>(path: string, body: Record<string, unknown>, parse: (value: unknown) => T): Promise<T> {
|
||||
const res = await fetch(`/api/auth${path}`, {
|
||||
method: "PATCH",
|
||||
credentials: "include",
|
||||
headers: { "Content-Type": "application/json", Accept: "application/json" },
|
||||
body: JSON.stringify(body),
|
||||
});
|
||||
const payload = await res.json().catch(() => null);
|
||||
if (!res.ok) {
|
||||
throw extractAuthError(payload as AuthErrorBody, res.status);
|
||||
}
|
||||
return parse(payload);
|
||||
}
|
||||
|
||||
export const authApi = {
|
||||
getSession: async (): Promise<AuthSession | null> => {
|
||||
const res = await fetch("/api/auth/get-session", {
|
||||
|
|
@ -68,6 +113,21 @@ export const authApi = {
|
|||
await authPost("/sign-up/email", input);
|
||||
},
|
||||
|
||||
getProfile: async (): Promise<CurrentUserProfile> => {
|
||||
const res = await fetch("/api/auth/profile", {
|
||||
credentials: "include",
|
||||
headers: { Accept: "application/json" },
|
||||
});
|
||||
const payload = await res.json().catch(() => null);
|
||||
if (!res.ok) {
|
||||
throw new Error((payload as { error?: string } | null)?.error ?? `Failed to load profile (${res.status})`);
|
||||
}
|
||||
return currentUserProfileSchema.parse(payload);
|
||||
},
|
||||
|
||||
updateProfile: async (input: UpdateCurrentUserProfile): Promise<CurrentUserProfile> =>
|
||||
authPatch("/profile", input, (payload) => currentUserProfileSchema.parse(payload)),
|
||||
|
||||
signOut: async () => {
|
||||
await authPost("/sign-out", {});
|
||||
},
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue