mirror of
https://github.com/alkimake/paperclip.git
synced 2026-06-17 03:10:38 +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
File diff suppressed because it is too large
Load diff
|
|
@ -41,7 +41,7 @@ import type { AdapterPluginRecord } from "../services/adapter-plugin-store.js";
|
|||
import type { ServerAdapterModule, AdapterConfigSchema } from "../adapters/types.js";
|
||||
import { loadExternalAdapterPackage, getUiParserSource, getOrExtractUiParserSource, reloadExternalAdapter } from "../adapters/plugin-loader.js";
|
||||
import { logger } from "../middleware/logger.js";
|
||||
import { assertBoard } from "./authz.js";
|
||||
import { assertBoardOrgAccess } from "./authz.js";
|
||||
import { BUILTIN_ADAPTER_TYPES } from "../adapters/builtin-adapter-types.js";
|
||||
|
||||
const execFileAsync = promisify(execFile);
|
||||
|
|
@ -192,7 +192,7 @@ export function adapterRoutes() {
|
|||
* its model count, and load status.
|
||||
*/
|
||||
router.get("/adapters", async (_req, res) => {
|
||||
assertBoard(_req);
|
||||
assertBoardOrgAccess(_req);
|
||||
|
||||
const registeredAdapters = listServerAdapters();
|
||||
const externalRecords = new Map(
|
||||
|
|
@ -218,7 +218,7 @@ export function adapterRoutes() {
|
|||
* - version?: string — target version for npm packages
|
||||
*/
|
||||
router.post("/adapters/install", async (req, res) => {
|
||||
assertBoard(req);
|
||||
assertBoardOrgAccess(req);
|
||||
|
||||
const { packageName, isLocalPath = false, version } = req.body as AdapterInstallRequest;
|
||||
|
||||
|
|
@ -350,7 +350,7 @@ export function adapterRoutes() {
|
|||
* Request body: { "disabled": boolean }
|
||||
*/
|
||||
router.patch("/adapters/:type", async (req, res) => {
|
||||
assertBoard(req);
|
||||
assertBoardOrgAccess(req);
|
||||
|
||||
const adapterType = req.params.type;
|
||||
const { disabled } = req.body as { disabled?: boolean };
|
||||
|
|
@ -385,7 +385,7 @@ export function adapterRoutes() {
|
|||
* keep the adapter they started with.
|
||||
*/
|
||||
router.patch("/adapters/:type/override", async (req, res) => {
|
||||
assertBoard(req);
|
||||
assertBoardOrgAccess(req);
|
||||
|
||||
const adapterType = req.params.type;
|
||||
const { paused } = req.body as { paused?: boolean };
|
||||
|
|
@ -413,7 +413,7 @@ export function adapterRoutes() {
|
|||
* Unregister an external adapter. Built-in adapters cannot be removed.
|
||||
*/
|
||||
router.delete("/adapters/:type", async (req, res) => {
|
||||
assertBoard(req);
|
||||
assertBoardOrgAccess(req);
|
||||
|
||||
const adapterType = req.params.type;
|
||||
|
||||
|
|
@ -488,7 +488,7 @@ export function adapterRoutes() {
|
|||
* Cannot be used on built-in adapter types.
|
||||
*/
|
||||
router.post("/adapters/:type/reload", async (req, res) => {
|
||||
assertBoard(req);
|
||||
assertBoardOrgAccess(req);
|
||||
|
||||
const type = req.params.type;
|
||||
|
||||
|
|
@ -540,7 +540,7 @@ export function adapterRoutes() {
|
|||
// This is a convenience shortcut for remove + install with the same
|
||||
// package name, but without the risk of losing the store record.
|
||||
router.post("/adapters/:type/reinstall", async (req, res) => {
|
||||
assertBoard(req);
|
||||
assertBoardOrgAccess(req);
|
||||
|
||||
const type = req.params.type;
|
||||
|
||||
|
|
@ -613,7 +613,7 @@ export function adapterRoutes() {
|
|||
const CONFIG_SCHEMA_TTL_MS = 30_000;
|
||||
|
||||
router.get("/adapters/:type/config-schema", async (req, res) => {
|
||||
assertBoard(req);
|
||||
assertBoardOrgAccess(req);
|
||||
const { type } = req.params;
|
||||
|
||||
const adapter = findActiveServerAdapter(type);
|
||||
|
|
@ -651,7 +651,7 @@ export function adapterRoutes() {
|
|||
// The adapter package must export a "./ui-parser" entry in package.json
|
||||
// pointing to a self-contained ESM module with zero runtime dependencies.
|
||||
router.get("/adapters/:type/ui-parser.js", (req, res) => {
|
||||
assertBoard(req);
|
||||
assertBoardOrgAccess(req);
|
||||
const { type } = req.params;
|
||||
const source = getOrExtractUiParserSource(type);
|
||||
if (!source) {
|
||||
|
|
|
|||
100
server/src/routes/auth.ts
Normal file
100
server/src/routes/auth.ts
Normal file
|
|
@ -0,0 +1,100 @@
|
|||
import { Router } from "express";
|
||||
import { eq } from "drizzle-orm";
|
||||
import type { Db } from "@paperclipai/db";
|
||||
import { authUsers } from "@paperclipai/db";
|
||||
import {
|
||||
authSessionSchema,
|
||||
currentUserProfileSchema,
|
||||
updateCurrentUserProfileSchema,
|
||||
} from "@paperclipai/shared";
|
||||
import { unauthorized } from "../errors.js";
|
||||
import { validate } from "../middleware/validate.js";
|
||||
|
||||
async function loadCurrentUserProfile(db: Db, userId: string) {
|
||||
const user = await db
|
||||
.select({
|
||||
id: authUsers.id,
|
||||
email: authUsers.email,
|
||||
name: authUsers.name,
|
||||
image: authUsers.image,
|
||||
})
|
||||
.from(authUsers)
|
||||
.where(eq(authUsers.id, userId))
|
||||
.then((rows) => rows[0] ?? null);
|
||||
|
||||
if (!user) {
|
||||
throw unauthorized("Signed-in user not found");
|
||||
}
|
||||
|
||||
return currentUserProfileSchema.parse({
|
||||
id: user.id,
|
||||
email: user.email ?? null,
|
||||
name: user.name ?? null,
|
||||
image: user.image ?? null,
|
||||
});
|
||||
}
|
||||
|
||||
export function authRoutes(db: Db) {
|
||||
const router = Router();
|
||||
|
||||
router.get("/get-session", async (req, res) => {
|
||||
if (req.actor.type !== "board" || !req.actor.userId) {
|
||||
throw unauthorized("Board authentication required");
|
||||
}
|
||||
|
||||
const user = await loadCurrentUserProfile(db, req.actor.userId);
|
||||
res.json(authSessionSchema.parse({
|
||||
session: {
|
||||
id: `paperclip:${req.actor.source ?? "none"}:${req.actor.userId}`,
|
||||
userId: req.actor.userId,
|
||||
},
|
||||
user,
|
||||
}));
|
||||
});
|
||||
|
||||
router.get("/profile", async (req, res) => {
|
||||
if (req.actor.type !== "board" || !req.actor.userId) {
|
||||
throw unauthorized("Board authentication required");
|
||||
}
|
||||
|
||||
res.json(await loadCurrentUserProfile(db, req.actor.userId));
|
||||
});
|
||||
|
||||
router.patch("/profile", validate(updateCurrentUserProfileSchema), async (req, res) => {
|
||||
if (req.actor.type !== "board" || !req.actor.userId) {
|
||||
throw unauthorized("Board authentication required");
|
||||
}
|
||||
|
||||
const patch = updateCurrentUserProfileSchema.parse(req.body);
|
||||
const now = new Date();
|
||||
|
||||
const updated = await db
|
||||
.update(authUsers)
|
||||
.set({
|
||||
name: patch.name,
|
||||
...(patch.image !== undefined ? { image: patch.image } : {}),
|
||||
updatedAt: now,
|
||||
})
|
||||
.where(eq(authUsers.id, req.actor.userId))
|
||||
.returning({
|
||||
id: authUsers.id,
|
||||
email: authUsers.email,
|
||||
name: authUsers.name,
|
||||
image: authUsers.image,
|
||||
})
|
||||
.then((rows) => rows[0] ?? null);
|
||||
|
||||
if (!updated) {
|
||||
throw unauthorized("Signed-in user not found");
|
||||
}
|
||||
|
||||
res.json(currentUserProfileSchema.parse({
|
||||
id: updated.id,
|
||||
email: updated.email ?? null,
|
||||
name: updated.name ?? null,
|
||||
image: updated.image ?? null,
|
||||
}));
|
||||
});
|
||||
|
||||
return router;
|
||||
}
|
||||
|
|
@ -13,6 +13,24 @@ export function assertBoard(req: Request) {
|
|||
}
|
||||
}
|
||||
|
||||
export function hasBoardOrgAccess(req: Request) {
|
||||
if (req.actor.type !== "board") {
|
||||
return false;
|
||||
}
|
||||
if (req.actor.source === "local_implicit" || req.actor.isInstanceAdmin) {
|
||||
return true;
|
||||
}
|
||||
return Array.isArray(req.actor.companyIds) && req.actor.companyIds.length > 0;
|
||||
}
|
||||
|
||||
export function assertBoardOrgAccess(req: Request) {
|
||||
assertBoard(req);
|
||||
if (hasBoardOrgAccess(req)) {
|
||||
return;
|
||||
}
|
||||
throw forbidden("Company membership or instance admin access required");
|
||||
}
|
||||
|
||||
export function assertInstanceAdmin(req: Request) {
|
||||
assertBoard(req);
|
||||
if (req.actor.source === "local_implicit" || req.actor.isInstanceAdmin) {
|
||||
|
|
@ -26,11 +44,22 @@ export function assertCompanyAccess(req: Request, companyId: string) {
|
|||
if (req.actor.type === "agent" && req.actor.companyId !== companyId) {
|
||||
throw forbidden("Agent key cannot access another company");
|
||||
}
|
||||
if (req.actor.type === "board" && req.actor.source !== "local_implicit" && !req.actor.isInstanceAdmin) {
|
||||
if (req.actor.type === "board" && req.actor.source !== "local_implicit") {
|
||||
const allowedCompanies = req.actor.companyIds ?? [];
|
||||
if (!allowedCompanies.includes(companyId)) {
|
||||
throw forbidden("User does not have access to this company");
|
||||
}
|
||||
const method = typeof req.method === "string" ? req.method.toUpperCase() : "GET";
|
||||
const isSafeMethod = ["GET", "HEAD", "OPTIONS"].includes(method);
|
||||
if (!isSafeMethod && !req.actor.isInstanceAdmin && Array.isArray(req.actor.memberships)) {
|
||||
const membership = req.actor.memberships.find((item) => item.companyId === companyId);
|
||||
if (!membership || membership.status !== "active") {
|
||||
throw forbidden("User does not have active company access");
|
||||
}
|
||||
if (membership.membershipRole === "viewer") {
|
||||
throw forbidden("Viewer access is read-only");
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -4,6 +4,7 @@ import { and, count, eq, gt, inArray, isNull, sql } from "drizzle-orm";
|
|||
import { heartbeatRuns, instanceUserRoles, invites } from "@paperclipai/db";
|
||||
import type { DeploymentExposure, DeploymentMode } from "@paperclipai/shared";
|
||||
import { readPersistedDevServerStatus, toDevServerHealthStatus } from "../dev-server-status.js";
|
||||
import { logger } from "../middleware/logger.js";
|
||||
import { instanceSettingsService } from "../services/instance-settings.js";
|
||||
import { serverVersion } from "../version.js";
|
||||
|
||||
|
|
@ -49,11 +50,12 @@ export function healthRoutes(
|
|||
|
||||
try {
|
||||
await db.execute(sql`SELECT 1`);
|
||||
} catch {
|
||||
} catch (error) {
|
||||
logger.warn({ err: error }, "Health check database probe failed");
|
||||
res.status(503).json({
|
||||
status: "unhealthy",
|
||||
version: serverVersion,
|
||||
error: "database_unreachable",
|
||||
error: "database_unreachable"
|
||||
});
|
||||
return;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ import { patchInstanceExperimentalSettingsSchema, patchInstanceGeneralSettingsSc
|
|||
import { forbidden } from "../errors.js";
|
||||
import { validate } from "../middleware/validate.js";
|
||||
import { instanceSettingsService, logActivity } from "../services/index.js";
|
||||
import { getActorInfo } from "./authz.js";
|
||||
import { assertBoardOrgAccess, getActorInfo } from "./authz.js";
|
||||
|
||||
function assertCanManageInstanceSettings(req: Request) {
|
||||
if (req.actor.type !== "board") {
|
||||
|
|
@ -22,10 +22,8 @@ export function instanceSettingsRoutes(db: Db) {
|
|||
|
||||
router.get("/instance/settings/general", async (req, res) => {
|
||||
// General settings (e.g. keyboardShortcuts) are readable by any
|
||||
// authenticated board user. Only PATCH requires instance-admin.
|
||||
if (req.actor.type !== "board") {
|
||||
throw forbidden("Board access required");
|
||||
}
|
||||
// authenticated org member or instance admin. Only PATCH requires instance-admin.
|
||||
assertBoardOrgAccess(req);
|
||||
res.json(await svc.getGeneral());
|
||||
});
|
||||
|
||||
|
|
@ -60,11 +58,9 @@ export function instanceSettingsRoutes(db: Db) {
|
|||
);
|
||||
|
||||
router.get("/instance/settings/experimental", async (req, res) => {
|
||||
// Experimental settings are readable by any authenticated board user.
|
||||
// Only PATCH requires instance-admin.
|
||||
if (req.actor.type !== "board") {
|
||||
throw forbidden("Board access required");
|
||||
}
|
||||
// Experimental settings are readable by any authenticated org member
|
||||
// or instance admin. Only PATCH requires instance-admin.
|
||||
assertBoardOrgAccess(req);
|
||||
res.json(await svc.getExperimental());
|
||||
});
|
||||
|
||||
|
|
|
|||
|
|
@ -48,7 +48,7 @@ import type { PluginStreamBus } from "../services/plugin-stream-bus.js";
|
|||
import type { PluginToolDispatcher } from "../services/plugin-tool-dispatcher.js";
|
||||
import type { ToolRunContext } from "@paperclipai/plugin-sdk";
|
||||
import { JsonRpcCallError, PLUGIN_RPC_ERROR_CODES } from "@paperclipai/plugin-sdk";
|
||||
import { assertBoard, assertCompanyAccess, assertInstanceAdmin, getActorInfo } from "./authz.js";
|
||||
import { assertBoardOrgAccess, assertCompanyAccess, assertInstanceAdmin, getActorInfo } from "./authz.js";
|
||||
import { validateInstanceConfig } from "../services/plugin-config-validator.js";
|
||||
|
||||
/** UI slot declaration extracted from plugin manifest */
|
||||
|
|
@ -372,7 +372,7 @@ export function pluginRoutes(
|
|||
* Response: `PluginRecord[]`
|
||||
*/
|
||||
router.get("/plugins", async (req, res) => {
|
||||
assertBoard(req);
|
||||
assertBoardOrgAccess(req);
|
||||
const rawStatus = req.query.status;
|
||||
if (rawStatus !== undefined) {
|
||||
if (typeof rawStatus !== "string" || !(PLUGIN_STATUSES as readonly string[]).includes(rawStatus)) {
|
||||
|
|
@ -396,7 +396,7 @@ export function pluginRoutes(
|
|||
* These can be installed through the normal local-path install flow.
|
||||
*/
|
||||
router.get("/plugins/examples", async (req, res) => {
|
||||
assertBoard(req);
|
||||
assertBoardOrgAccess(req);
|
||||
res.json(listBundledPluginExamples());
|
||||
});
|
||||
|
||||
|
|
@ -441,7 +441,7 @@ export function pluginRoutes(
|
|||
* Response: PluginUiContribution[]
|
||||
*/
|
||||
router.get("/plugins/ui-contributions", async (req, res) => {
|
||||
assertBoard(req);
|
||||
assertBoardOrgAccess(req);
|
||||
const plugins = await registry.listByStatus("ready");
|
||||
|
||||
const contributions: PluginUiContribution[] = plugins
|
||||
|
|
@ -484,7 +484,7 @@ export function pluginRoutes(
|
|||
* Errors: 501 if tool dispatcher is not configured
|
||||
*/
|
||||
router.get("/plugins/tools", async (req, res) => {
|
||||
assertBoard(req);
|
||||
assertBoardOrgAccess(req);
|
||||
|
||||
if (!toolDeps) {
|
||||
res.status(501).json({ error: "Plugin tool dispatch is not enabled" });
|
||||
|
|
@ -518,7 +518,7 @@ export function pluginRoutes(
|
|||
* - 502 if the plugin worker is unavailable or the RPC call fails
|
||||
*/
|
||||
router.post("/plugins/tools/execute", async (req, res) => {
|
||||
assertBoard(req);
|
||||
assertBoardOrgAccess(req);
|
||||
|
||||
if (!toolDeps) {
|
||||
res.status(501).json({ error: "Plugin tool dispatch is not enabled" });
|
||||
|
|
@ -797,7 +797,7 @@ export function pluginRoutes(
|
|||
* @see PLUGIN_SPEC.md §19.7 — Error Propagation Through The Bridge
|
||||
*/
|
||||
router.post("/plugins/:pluginId/bridge/data", async (req, res) => {
|
||||
assertBoard(req);
|
||||
assertBoardOrgAccess(req);
|
||||
|
||||
if (!bridgeDeps) {
|
||||
res.status(501).json({ error: "Plugin bridge is not enabled" });
|
||||
|
|
@ -880,7 +880,7 @@ export function pluginRoutes(
|
|||
* @see PLUGIN_SPEC.md §19.7 — Error Propagation Through The Bridge
|
||||
*/
|
||||
router.post("/plugins/:pluginId/bridge/action", async (req, res) => {
|
||||
assertBoard(req);
|
||||
assertBoardOrgAccess(req);
|
||||
|
||||
if (!bridgeDeps) {
|
||||
res.status(501).json({ error: "Plugin bridge is not enabled" });
|
||||
|
|
@ -964,7 +964,7 @@ export function pluginRoutes(
|
|||
* @see PLUGIN_SPEC.md §19.7 — Error Propagation Through The Bridge
|
||||
*/
|
||||
router.post("/plugins/:pluginId/data/:key", async (req, res) => {
|
||||
assertBoard(req);
|
||||
assertBoardOrgAccess(req);
|
||||
|
||||
if (!bridgeDeps) {
|
||||
res.status(501).json({ error: "Plugin bridge is not enabled" });
|
||||
|
|
@ -1043,7 +1043,7 @@ export function pluginRoutes(
|
|||
* @see PLUGIN_SPEC.md §19.7 — Error Propagation Through The Bridge
|
||||
*/
|
||||
router.post("/plugins/:pluginId/actions/:key", async (req, res) => {
|
||||
assertBoard(req);
|
||||
assertBoardOrgAccess(req);
|
||||
|
||||
if (!bridgeDeps) {
|
||||
res.status(501).json({ error: "Plugin bridge is not enabled" });
|
||||
|
|
@ -1124,7 +1124,7 @@ export function pluginRoutes(
|
|||
* - 501 if bridge deps or stream bus are not configured
|
||||
*/
|
||||
router.get("/plugins/:pluginId/bridge/stream/:channel", async (req, res) => {
|
||||
assertBoard(req);
|
||||
assertBoardOrgAccess(req);
|
||||
|
||||
if (!bridgeDeps?.streamBus) {
|
||||
res.status(501).json({ error: "Plugin stream bridge is not enabled" });
|
||||
|
|
@ -1202,7 +1202,7 @@ export function pluginRoutes(
|
|||
* Errors: 404 if plugin not found
|
||||
*/
|
||||
router.get("/plugins/:pluginId", async (req, res) => {
|
||||
assertBoard(req);
|
||||
assertBoardOrgAccess(req);
|
||||
const { pluginId } = req.params;
|
||||
const plugin = await resolvePlugin(registry, pluginId);
|
||||
if (!plugin) {
|
||||
|
|
@ -1232,7 +1232,7 @@ export function pluginRoutes(
|
|||
* Errors: 404 if plugin not found, 400 for lifecycle errors
|
||||
*/
|
||||
router.delete("/plugins/:pluginId", async (req, res) => {
|
||||
assertBoard(req);
|
||||
assertInstanceAdmin(req);
|
||||
const { pluginId } = req.params;
|
||||
const purge = req.query.purge === "true";
|
||||
|
||||
|
|
@ -1268,7 +1268,7 @@ export function pluginRoutes(
|
|||
* Errors: 404 if plugin not found, 400 for lifecycle errors
|
||||
*/
|
||||
router.post("/plugins/:pluginId/enable", async (req, res) => {
|
||||
assertBoard(req);
|
||||
assertInstanceAdmin(req);
|
||||
const { pluginId } = req.params;
|
||||
|
||||
const plugin = await resolvePlugin(registry, pluginId);
|
||||
|
|
@ -1306,7 +1306,7 @@ export function pluginRoutes(
|
|||
* Errors: 404 if plugin not found, 400 for lifecycle errors
|
||||
*/
|
||||
router.post("/plugins/:pluginId/disable", async (req, res) => {
|
||||
assertBoard(req);
|
||||
assertInstanceAdmin(req);
|
||||
const { pluginId } = req.params;
|
||||
const body = req.body as { reason?: string } | undefined;
|
||||
const reason = body?.reason;
|
||||
|
|
@ -1347,7 +1347,7 @@ export function pluginRoutes(
|
|||
* Errors: 404 if plugin not found
|
||||
*/
|
||||
router.get("/plugins/:pluginId/health", async (req, res) => {
|
||||
assertBoard(req);
|
||||
assertBoardOrgAccess(req);
|
||||
const { pluginId } = req.params;
|
||||
|
||||
const plugin = await resolvePlugin(registry, pluginId);
|
||||
|
|
@ -1415,7 +1415,7 @@ export function pluginRoutes(
|
|||
* Response: Array of log entries, newest first.
|
||||
*/
|
||||
router.get("/plugins/:pluginId/logs", async (req, res) => {
|
||||
assertBoard(req);
|
||||
assertBoardOrgAccess(req);
|
||||
const { pluginId } = req.params;
|
||||
|
||||
const plugin = await resolvePlugin(registry, pluginId);
|
||||
|
|
@ -1517,7 +1517,7 @@ export function pluginRoutes(
|
|||
* Errors: 404 if plugin not found
|
||||
*/
|
||||
router.get("/plugins/:pluginId/config", async (req, res) => {
|
||||
assertBoard(req);
|
||||
assertBoardOrgAccess(req);
|
||||
const { pluginId } = req.params;
|
||||
|
||||
const plugin = await resolvePlugin(registry, pluginId);
|
||||
|
|
@ -1547,7 +1547,7 @@ export function pluginRoutes(
|
|||
* - 404 if plugin not found
|
||||
*/
|
||||
router.post("/plugins/:pluginId/config", async (req, res) => {
|
||||
assertBoard(req);
|
||||
assertInstanceAdmin(req);
|
||||
const { pluginId } = req.params;
|
||||
|
||||
const plugin = await resolvePlugin(registry, pluginId);
|
||||
|
|
@ -1652,7 +1652,7 @@ export function pluginRoutes(
|
|||
* - 502 if the worker is unavailable
|
||||
*/
|
||||
router.post("/plugins/:pluginId/config/test", async (req, res) => {
|
||||
assertBoard(req);
|
||||
assertBoardOrgAccess(req);
|
||||
|
||||
if (!bridgeDeps) {
|
||||
res.status(501).json({ error: "Plugin bridge is not enabled" });
|
||||
|
|
@ -1749,7 +1749,7 @@ export function pluginRoutes(
|
|||
* Errors: 404 if plugin not found
|
||||
*/
|
||||
router.get("/plugins/:pluginId/jobs", async (req, res) => {
|
||||
assertBoard(req);
|
||||
assertBoardOrgAccess(req);
|
||||
if (!jobDeps) {
|
||||
res.status(501).json({ error: "Job scheduling is not enabled" });
|
||||
return;
|
||||
|
|
@ -1795,7 +1795,7 @@ export function pluginRoutes(
|
|||
* Errors: 404 if plugin not found
|
||||
*/
|
||||
router.get("/plugins/:pluginId/jobs/:jobId/runs", async (req, res) => {
|
||||
assertBoard(req);
|
||||
assertBoardOrgAccess(req);
|
||||
if (!jobDeps) {
|
||||
res.status(501).json({ error: "Job scheduling is not enabled" });
|
||||
return;
|
||||
|
|
@ -1843,7 +1843,7 @@ export function pluginRoutes(
|
|||
* - 400 if job not found, not active, already running, or worker unavailable
|
||||
*/
|
||||
router.post("/plugins/:pluginId/jobs/:jobId/trigger", async (req, res) => {
|
||||
assertBoard(req);
|
||||
assertBoardOrgAccess(req);
|
||||
if (!jobDeps) {
|
||||
res.status(501).json({ error: "Job scheduling is not enabled" });
|
||||
return;
|
||||
|
|
@ -2049,7 +2049,7 @@ export function pluginRoutes(
|
|||
* Errors: 404 if plugin not found
|
||||
*/
|
||||
router.get("/plugins/:pluginId/dashboard", async (req, res) => {
|
||||
assertBoard(req);
|
||||
assertBoardOrgAccess(req);
|
||||
const { pluginId } = req.params;
|
||||
|
||||
const plugin = await resolvePlugin(registry, pluginId);
|
||||
|
|
|
|||
|
|
@ -5,6 +5,7 @@ import { inboxDismissals, joinRequests } from "@paperclipai/db";
|
|||
import { sidebarBadgeService } from "../services/sidebar-badges.js";
|
||||
import { accessService } from "../services/access.js";
|
||||
import { dashboardService } from "../services/dashboard.js";
|
||||
import { collapseDuplicatePendingHumanJoinRequests } from "../lib/join-request-dedupe.js";
|
||||
import { assertCompanyAccess } from "./authz.js";
|
||||
|
||||
function buildDismissedAtByKey(
|
||||
|
|
@ -35,14 +36,24 @@ export function sidebarBadgeRoutes(db: Db) {
|
|||
}
|
||||
|
||||
const visibleJoinRequests = canApproveJoins
|
||||
? await db
|
||||
.select({
|
||||
id: joinRequests.id,
|
||||
updatedAt: joinRequests.updatedAt,
|
||||
createdAt: joinRequests.createdAt,
|
||||
})
|
||||
.from(joinRequests)
|
||||
.where(and(eq(joinRequests.companyId, companyId), eq(joinRequests.status, "pending_approval")))
|
||||
? collapseDuplicatePendingHumanJoinRequests(
|
||||
await db
|
||||
.select({
|
||||
id: joinRequests.id,
|
||||
requestType: joinRequests.requestType,
|
||||
status: joinRequests.status,
|
||||
requestingUserId: joinRequests.requestingUserId,
|
||||
requestEmailSnapshot: joinRequests.requestEmailSnapshot,
|
||||
updatedAt: joinRequests.updatedAt,
|
||||
createdAt: joinRequests.createdAt,
|
||||
})
|
||||
.from(joinRequests)
|
||||
.where(and(eq(joinRequests.companyId, companyId), eq(joinRequests.status, "pending_approval")))
|
||||
).map(({ id, updatedAt, createdAt }) => ({
|
||||
id,
|
||||
updatedAt,
|
||||
createdAt,
|
||||
}))
|
||||
: [];
|
||||
|
||||
const dismissedAtByKey =
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue