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>
195 lines
8.7 KiB
TypeScript
195 lines
8.7 KiB
TypeScript
import { useEffect, useState } from "react";
|
|
import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
|
|
import { UserPlus2 } from "lucide-react";
|
|
import { accessApi } from "@/api/access";
|
|
import { ApiError } from "@/api/client";
|
|
import { Button } from "@/components/ui/button";
|
|
import { Badge } from "@/components/ui/badge";
|
|
import { useBreadcrumbs } from "@/context/BreadcrumbContext";
|
|
import { useCompany } from "@/context/CompanyContext";
|
|
import { useToast } from "@/context/ToastContext";
|
|
import { queryKeys } from "@/lib/queryKeys";
|
|
|
|
export function JoinRequestQueue() {
|
|
const { selectedCompany, selectedCompanyId } = useCompany();
|
|
const { setBreadcrumbs } = useBreadcrumbs();
|
|
const { pushToast } = useToast();
|
|
const queryClient = useQueryClient();
|
|
const [status, setStatus] = useState<"pending_approval" | "approved" | "rejected">("pending_approval");
|
|
const [requestType, setRequestType] = useState<"all" | "human" | "agent">("all");
|
|
|
|
useEffect(() => {
|
|
setBreadcrumbs([
|
|
{ label: selectedCompany?.name ?? "Company", href: "/dashboard" },
|
|
{ label: "Inbox", href: "/inbox" },
|
|
{ label: "Join Requests" },
|
|
]);
|
|
}, [selectedCompany?.name, setBreadcrumbs]);
|
|
|
|
const requestsQuery = useQuery({
|
|
queryKey: queryKeys.access.joinRequests(selectedCompanyId ?? "", `${status}:${requestType}`),
|
|
queryFn: () =>
|
|
accessApi.listJoinRequests(
|
|
selectedCompanyId!,
|
|
status,
|
|
requestType === "all" ? undefined : requestType,
|
|
),
|
|
enabled: !!selectedCompanyId,
|
|
});
|
|
|
|
const approveMutation = useMutation({
|
|
mutationFn: (requestId: string) => accessApi.approveJoinRequest(selectedCompanyId!, requestId),
|
|
onSuccess: async () => {
|
|
await queryClient.invalidateQueries({ queryKey: queryKeys.access.joinRequests(selectedCompanyId!, `${status}:${requestType}`) });
|
|
await queryClient.invalidateQueries({ queryKey: queryKeys.access.companyMembers(selectedCompanyId!) });
|
|
await queryClient.invalidateQueries({ queryKey: queryKeys.access.companyUserDirectory(selectedCompanyId!) });
|
|
pushToast({ title: "Join request approved", tone: "success" });
|
|
},
|
|
});
|
|
|
|
const rejectMutation = useMutation({
|
|
mutationFn: (requestId: string) => accessApi.rejectJoinRequest(selectedCompanyId!, requestId),
|
|
onSuccess: async () => {
|
|
await queryClient.invalidateQueries({ queryKey: queryKeys.access.joinRequests(selectedCompanyId!, `${status}:${requestType}`) });
|
|
pushToast({ title: "Join request rejected", tone: "success" });
|
|
},
|
|
});
|
|
|
|
if (!selectedCompanyId) {
|
|
return <div className="text-sm text-muted-foreground">Select a company to review join requests.</div>;
|
|
}
|
|
|
|
if (requestsQuery.isLoading) {
|
|
return <div className="text-sm text-muted-foreground">Loading join requests…</div>;
|
|
}
|
|
|
|
if (requestsQuery.error) {
|
|
const message =
|
|
requestsQuery.error instanceof ApiError && requestsQuery.error.status === 403
|
|
? "You do not have permission to review join requests for this company."
|
|
: requestsQuery.error instanceof Error
|
|
? requestsQuery.error.message
|
|
: "Failed to load join requests.";
|
|
return <div className="text-sm text-destructive">{message}</div>;
|
|
}
|
|
|
|
return (
|
|
<div className="max-w-6xl space-y-6">
|
|
<div className="space-y-3">
|
|
<div className="flex items-center gap-2">
|
|
<UserPlus2 className="h-5 w-5 text-muted-foreground" />
|
|
<h1 className="text-lg font-semibold">Join Request Queue</h1>
|
|
</div>
|
|
<p className="max-w-3xl text-sm text-muted-foreground">
|
|
Review human and agent join requests outside the mixed inbox feed. This queue uses the same approval mutations as the inline inbox cards.
|
|
</p>
|
|
</div>
|
|
|
|
<div className="flex flex-wrap gap-3 rounded-xl border border-border bg-card p-4">
|
|
<label className="space-y-2 text-sm">
|
|
<span className="font-medium">Status</span>
|
|
<select
|
|
className="rounded-md border border-border bg-background px-3 py-2"
|
|
value={status}
|
|
onChange={(event) =>
|
|
setStatus(event.target.value as "pending_approval" | "approved" | "rejected")
|
|
}
|
|
>
|
|
<option value="pending_approval">Pending approval</option>
|
|
<option value="approved">Approved</option>
|
|
<option value="rejected">Rejected</option>
|
|
</select>
|
|
</label>
|
|
<label className="space-y-2 text-sm">
|
|
<span className="font-medium">Request type</span>
|
|
<select
|
|
className="rounded-md border border-border bg-background px-3 py-2"
|
|
value={requestType}
|
|
onChange={(event) =>
|
|
setRequestType(event.target.value as "all" | "human" | "agent")
|
|
}
|
|
>
|
|
<option value="all">All</option>
|
|
<option value="human">Human</option>
|
|
<option value="agent">Agent</option>
|
|
</select>
|
|
</label>
|
|
</div>
|
|
|
|
<div className="space-y-4">
|
|
{(requestsQuery.data ?? []).length === 0 ? (
|
|
<div className="rounded-xl border border-dashed border-border px-4 py-8 text-sm text-muted-foreground">
|
|
No join requests match the current filters.
|
|
</div>
|
|
) : (
|
|
requestsQuery.data!.map((request) => (
|
|
<div key={request.id} className="rounded-xl border border-border bg-card p-4">
|
|
<div className="flex flex-wrap items-start justify-between gap-4">
|
|
<div className="space-y-2">
|
|
<div className="flex flex-wrap items-center gap-2">
|
|
<Badge variant={request.status === "pending_approval" ? "secondary" : request.status === "approved" ? "outline" : "destructive"}>
|
|
{request.status.replace("_", " ")}
|
|
</Badge>
|
|
<Badge variant="outline">{request.requestType}</Badge>
|
|
{request.adapterType ? <Badge variant="outline">{request.adapterType}</Badge> : null}
|
|
</div>
|
|
<div>
|
|
<div className="text-base font-medium">
|
|
{request.requestType === "human"
|
|
? request.requesterUser?.name || request.requestEmailSnapshot || request.requestingUserId || "Unknown human requester"
|
|
: request.agentName || "Unknown agent requester"}
|
|
</div>
|
|
<div className="text-sm text-muted-foreground">
|
|
{request.requestType === "human"
|
|
? request.requesterUser?.email || request.requestEmailSnapshot || request.requestingUserId
|
|
: request.capabilities || request.requestIp}
|
|
</div>
|
|
</div>
|
|
</div>
|
|
|
|
{request.status === "pending_approval" ? (
|
|
<div className="flex gap-2">
|
|
<Button
|
|
variant="outline"
|
|
onClick={() => rejectMutation.mutate(request.id)}
|
|
disabled={rejectMutation.isPending}
|
|
>
|
|
Reject
|
|
</Button>
|
|
<Button
|
|
onClick={() => approveMutation.mutate(request.id)}
|
|
disabled={approveMutation.isPending}
|
|
>
|
|
Approve
|
|
</Button>
|
|
</div>
|
|
) : null}
|
|
</div>
|
|
|
|
<div className="mt-4 grid gap-3 text-sm text-muted-foreground md:grid-cols-2">
|
|
<div className="rounded-lg border border-border bg-background px-3 py-2">
|
|
<div className="text-xs font-medium uppercase tracking-wide">Invite context</div>
|
|
<div className="mt-2">
|
|
{request.invite
|
|
? `${request.invite.allowedJoinTypes} join invite${request.invite.humanRole ? ` • default role ${request.invite.humanRole}` : ""}`
|
|
: "Invite metadata unavailable"}
|
|
</div>
|
|
{request.invite?.inviteMessage ? (
|
|
<div className="mt-2 text-foreground">{request.invite.inviteMessage}</div>
|
|
) : null}
|
|
</div>
|
|
<div className="rounded-lg border border-border bg-background px-3 py-2">
|
|
<div className="text-xs font-medium uppercase tracking-wide">Request details</div>
|
|
<div className="mt-2">Submitted {new Date(request.createdAt).toLocaleString()}</div>
|
|
<div>Source IP {request.requestIp}</div>
|
|
{request.requestType === "agent" && request.capabilities ? <div>{request.capabilities}</div> : null}
|
|
</div>
|
|
</div>
|
|
</div>
|
|
))
|
|
)}
|
|
</div>
|
|
</div>
|
|
);
|
|
}
|