diff --git a/server/src/addie/mcp/admin-tools.ts b/server/src/addie/mcp/admin-tools.ts index d041f4ccba7..88350210244 100644 --- a/server/src/addie/mcp/admin-tools.ts +++ b/server/src/addie/mcp/admin-tools.ts @@ -11259,21 +11259,6 @@ Use add_committee_leader to assign a leader.`; // MEMBERSHIP INVITE HANDLERS // ============================================ - function actionToHeader(action: string): string { - switch (action) { - case "invited": - return "Invitation sent"; - case "member_added": - return "Added to org"; - case "role_updated": - return "Role updated"; - case "no_change": - return "No change"; - default: - return "Done"; - } - } - function formatRelativeDays(d: Date): string { const diffMs = d.getTime() - Date.now(); const days = Math.round(diffMs / 86400000); @@ -11537,126 +11522,11 @@ Use add_committee_leader to assign a leader.`; } }); - handlers.set("add_member_to_org", async (input) => { - const email = ((input.email as string) || "").trim().toLowerCase(); - const orgId = input.org_id as string; - const role = (input.role as string) ?? "member"; - const seatType = (input.seat_type as string) ?? "community_only"; - - if (!email || !email.includes("@")) { - return "❌ email is required (a valid email address)."; - } - if (!orgId || !orgId.startsWith("org_")) { - return "❌ org_id is required (org_…)."; - } - if (!["member", "admin", "owner"].includes(role)) { - return `❌ role must be one of: member, admin, owner (got: ${role}).`; - } - if (!["contributor", "community_only"].includes(seatType)) { - return `❌ seat_type must be one of: contributor, community_only (got: ${seatType}).`; - } - - const adminUser = memberContext?.workos_user; - if (!adminUser) { - return "❌ Cannot add member — no signed-in admin context."; - } - - const apiKey = process.env.ADMIN_API_KEY; - if (!apiKey) { - return "❌ ADMIN_API_KEY is not configured on the server."; - } - // Match the base-URL precedence used by member-tools.ts:getBaseUrl — - // BASE_URL (production) wins; otherwise PORT/CONDUCTOR_PORT for local. - const baseUrl = - process.env.BASE_URL || - `http://localhost:${ - process.env.PORT || process.env.CONDUCTOR_PORT || "3000" - }`; - const endpoint = `${baseUrl}/api/organizations/${encodeURIComponent( - orgId, - )}/members/by-email`; - - try { - const response = await fetch(endpoint, { - method: "POST", - headers: { - "Content-Type": "application/json", - Authorization: `Bearer ${apiKey}`, - }, - body: JSON.stringify({ email, role, seat_type: seatType }), - signal: AbortSignal.timeout(10000), - }); - const data = (await response.json().catch(() => ({}))) as Record< - string, - unknown - >; - if (!response.ok) { - const errorMsg = - (data.message as string) || - (data.error as string) || - `HTTP ${response.status}`; - logger.warn( - { status: response.status, orgId, email, error: errorMsg }, - "add_member_to_org route returned non-OK", - ); - return `❌ Failed to add ${email} to ${orgId}: ${errorMsg}`; - } - - const action = data.action as string; - logger.info( - { - orgId, - email, - action, - role, - seatType, - adminUserId: adminUser.workos_user_id, - }, - "Addie called add_member_to_org", - ); - - // Mirror the route's response shape rather than reflecting the input — - // e.g. the route may keep an existing seat_type when adding to an org - // the user already has a seat in. - const responseSeatType = - (data.seat_type as string | undefined) ?? seatType; - - let md = `## ${actionToHeader(action)}\n\n`; - md += `**Email:** ${email}\n`; - md += `**Org:** ${orgId}\n`; - - if (action === "invited") { - const invitation = data.invitation as - | Record - | undefined; - const expiresAt = invitation?.expires_at as string | undefined; - md += `**Invited as:** member (must be promoted after acceptance for higher roles)\n`; - md += `**Requested role:** ${role}\n`; - md += `**Seat type:** ${responseSeatType}\n`; - if (expiresAt) md += `**Invite expires:** ${expiresAt.slice(0, 10)}\n`; - if (invitation?.accept_invitation_url) { - md += `\nThey'll receive an email with a sign-up link.\n`; - } - } else if (action === "member_added") { - md += `**Role:** ${role}\n`; - md += `**Seat type:** ${responseSeatType}\n`; - md += `\nThey already had a WorkOS account; added directly to the org.\n`; - } else if (action === "role_updated") { - const previousRole = data.previous_role as string | null | undefined; - md += `**New role:** ${role}\n`; - md += `**Previous role:** ${previousRole ?? "(none)"}\n`; - } else if (action === "no_change") { - md += `\nNo change — they already have role ${role}.\n`; - } else { - md += `**Action:** ${action ?? "unknown"}\n`; - } - return md; - } catch (error) { - logger.error({ error, orgId, email }, "Error calling members/by-email"); - return `❌ Failed to add member: ${ - error instanceof Error ? error.message : "Unknown error" - }`; - } + // The old HTTP adapter replaced its human caller with ADMIN_API_KEY. + // MemberContext supplies canonical person metadata, not an immutable exact + // credential/organization/epoch proof. Do not launder that into admin writes. + handlers.set("add_member_to_org", async () => { + return "❌ Organization membership changes require the signed-in organization management page. Addie cannot forward an exact authenticated actor for this operation."; }); handlers.set("diagnose_signin_block", async (input) => { diff --git a/server/src/auth/workos-jwt.ts b/server/src/auth/workos-jwt.ts index 8b672736a84..a9ecfb203d4 100644 --- a/server/src/auth/workos-jwt.ts +++ b/server/src/auth/workos-jwt.ts @@ -7,7 +7,14 @@ * token issued by the MCP OAuth flow works across both surfaces. */ -import { createRemoteJWKSet, errors, jwtVerify, type JWTPayload, type JWTVerifyGetKey } from 'jose'; +import { + createRemoteJWKSet, + decodeProtectedHeader, + errors, + jwtVerify, + type JWTPayload, + type JWTVerifyGetKey, +} from 'jose'; import { createLogger } from '../logger.js'; const logger = createLogger('workos-jwt'); @@ -21,6 +28,7 @@ export function isInvalidWorkOSJWTError(error: unknown): boolean { 'ERR_JWS_INVALID', 'ERR_JWS_SIGNATURE_VERIFICATION_FAILED', 'ERR_JWKS_NO_MATCHING_KEY', 'ERR_JOSE_ALG_NOT_ALLOWED', 'ERR_JOSE_NOT_SUPPORTED', + 'ERR_WORKOS_TOKEN_INVALID_HEADER', 'ERR_WORKOS_TOKEN_INVALID_KID', ].includes(code); } @@ -125,6 +133,18 @@ export function looksLikeJWT(token: string): boolean { * signature verification against our shared JWKS. */ export async function verifyWorkOSJWT(token: string): Promise { + let protectedHeader: ReturnType; + try { + protectedHeader = decodeProtectedHeader(token); + } catch (cause) { + throw Object.assign(new Error('Token protected header is malformed'), { + code: 'ERR_WORKOS_TOKEN_INVALID_HEADER', + cause, + }); + } + if (protectedHeader.kid !== undefined && typeof protectedHeader.kid !== 'string') { + throw Object.assign(new Error('Token key id must be a string'), { code: 'ERR_WORKOS_TOKEN_INVALID_KID' }); + } const jwksInstance = getJWKS(); const { payload } = await jwtVerify(token, diff --git a/server/src/db/api-key-management-db.ts b/server/src/db/api-key-management-db.ts index 57a3cd560a8..940fed8635c 100644 --- a/server/src/db/api-key-management-db.ts +++ b/server/src/db/api-key-management-db.ts @@ -19,6 +19,7 @@ const SNAPSHOT_SQL = ` SELECT pg_catalog.pg_is_in_recovery() AS in_recovery, credential.workos_user_id AS authenticated_user_id, primary_binding.workos_user_id AS canonical_user_id, binding.identity_id, + binding.xmin::text AS binding_version, COALESCE(primary_binding.primary_count, 0)::text AS primary_count, EXISTS ( SELECT 1 FROM registry_audit_log audit @@ -46,6 +47,7 @@ interface SnapshotRow { authenticated_user_id: string | null; canonical_user_id: string | null; identity_id: string | null; + binding_version: string | null; authorization_epoch: string; email: string | null; email_verified: boolean; @@ -57,12 +59,13 @@ function snapshotFromRow(row: SnapshotRow | undefined, organizationId: string | if (!row || row.in_recovery) throw new AuthorizationSnapshotUnavailableError(); // Grant-free management must retain the primary snapshot's terminal // lifecycle boundary, including stale provider recreation and bad routing. - if (row.terminal_marker || !row.authenticated_user_id || !row.identity_id + if (row.terminal_marker || !row.authenticated_user_id || !row.identity_id || !row.binding_version || row.primary_count !== '1' || !row.canonical_user_id) return null; return Object.freeze({ authenticatedUserId: row.authenticated_user_id, canonicalUserId: row.canonical_user_id, identityId: row.identity_id, + bindingVersion: row.binding_version, selectedOrganizationId: organizationId, authorizationEpoch: row.authorization_epoch, credential: Object.freeze({ diff --git a/server/src/db/identity-db.ts b/server/src/db/identity-db.ts index 32c5fafb3a9..9f58de160bc 100644 --- a/server/src/db/identity-db.ts +++ b/server/src/db/identity-db.ts @@ -216,8 +216,9 @@ export const CREDENTIAL_MUTATION_ADMISSION_TIMEOUT_MS = 1_000; /** * Keep one connection free for confirmed deletion and bound admission wait. - * Guard callbacks must use their supplied client and must not perform provider - * I/O, so each admitted mutation consumes exactly one pool connection. + * Guard mutation callbacks must use their supplied client and must not perform + * provider I/O. A serialized prefetch may use the admitted connection before + * the credential lock is acquired, so confirmed deletion can still progress. */ const credentialMutationAdmission = { active: 0, @@ -427,6 +428,7 @@ async function withCredentialEventMutation( workosUserId: string, mode: CredentialMutationMode, mutation: (client: PoolClient) => Promise, + serializedPrefetch?: () => Promise, ): Promise> { const releaseCapacity = await acquireCredentialMutationPoolCapacity(); try { @@ -436,6 +438,45 @@ async function withCredentialEventMutation( try { await client.query('BEGIN'); await client.query(`SET LOCAL lock_timeout = '${CREDENTIAL_MUTATION_LOCK_TIMEOUT_MS}ms'`); + if (serializedPrefetch) { + // Membership provider reads can be slow, so serialize them on a + // distinct lock before taking the credential-revocation lock. This + // preserves webhook ordering without delaying a confirmed deletion. + await client.query(`SELECT pg_advisory_xact_lock(hashtextextended($1, 6828))`, [workosUserId]); + + // Avoid provider reads for a credential that is already inactive. + // This is only an optimization: deletion can race this read, and the + // locked lifecycle check below remains the authority before effects. + const preflight = await client.query<{ + user_exists: boolean; + binding_exists: boolean; + primary_count: string; + }>( + `SELECT EXISTS ( + SELECT 1 FROM users WHERE workos_user_id = $1 + ) AS user_exists, + EXISTS ( + SELECT 1 FROM identity_workos_users WHERE workos_user_id = $1 + ) AS binding_exists, + COALESCE(( + SELECT COUNT(*) + FROM identity_workos_users actor_iwu + JOIN identity_workos_users primary_iwu + ON primary_iwu.identity_id = actor_iwu.identity_id + AND primary_iwu.is_primary = TRUE + WHERE actor_iwu.workos_user_id = $1 + ), 0)::text AS primary_count`, + [workosUserId], + ); + const state = preflight.rows[0]; + if (state?.user_exists !== true + || state.binding_exists !== true + || Number(state.primary_count) !== 1) { + await client.query('COMMIT'); + return { applied: false }; + } + await serializedPrefetch(); + } const { identityId } = await lockCredentialThenIdentityMutation(client, workosUserId); if (await hasConfirmedDeletionTombstone(client, workosUserId)) { await client.query('COMMIT'); @@ -505,6 +546,19 @@ export async function withActiveCredentialEventMutation( return withCredentialEventMutation(workosUserId, 'active', mutation); } +/** + * Serialize read-only provider state for one credential before taking the + * credential lifecycle lock, then recheck the locked lifecycle before local + * effects. The prefetch must be bounded and must not perform provider writes. + */ +export async function withActiveCredentialEventMutationAfterSerializedPrefetch( + workosUserId: string, + prefetch: () => Promise, + mutation: (client: PoolClient) => Promise, +): Promise> { + return withCredentialEventMutation(workosUserId, 'active', mutation, prefetch); +} + /** Apply one atomic authority mutation to a sorted set of live credentials. */ export async function withActiveCredentialSetMutation( workosUserIds: string[], diff --git a/server/src/db/membership-db.ts b/server/src/db/membership-db.ts index 049878031dc..0432b679aa8 100644 --- a/server/src/db/membership-db.ts +++ b/server/src/db/membership-db.ts @@ -8,16 +8,10 @@ import type { WorkOS } from '@workos-inc/node'; import type { PoolClient } from 'pg'; import { getPool, getClient } from './client.js'; -import { findPayingOrgForDomain } from './org-filters.js'; import { createLogger } from '../logger.js'; import { withActiveCredentialEventMutation } from './identity-db.js'; const logger = createLogger('membership-db'); -const OWNERLESS_PROMOTION_LOCK_TIMEOUT_MS = 5_000; - -function shouldDeferAutomaticProviderAuthorityWrites(): boolean { - return true; -} // ── Types ──────────────────────────────────────────────────────────── @@ -52,75 +46,9 @@ export interface MembershipUpsertResult { assigned_role: string; } -async function withOwnerlessOrgPromotionLock( - organizationId: string, - fn: () => Promise, -): Promise { - const client = await getClient(); - let callbackCompleted = false; - - try { - await client.query('BEGIN'); - await client.query("SELECT set_config('lock_timeout', $1, true)", [ - `${OWNERLESS_PROMOTION_LOCK_TIMEOUT_MS}ms`, - ]); - await client.query('SELECT pg_advisory_xact_lock(hashtext($1))', [ - `membership-ownerless-promote:${organizationId}`, - ]); - - const result = await fn(); - callbackCompleted = true; - - try { - await client.query('COMMIT'); - } catch (err) { - logger.warn( - { err, orgId: organizationId }, - 'Failed to commit ownerless-org promotion advisory lock transaction', - ); - try { - await client.query('ROLLBACK'); - } catch (rollbackErr) { - logger.warn( - { err: rollbackErr, orgId: organizationId }, - 'Failed to rollback ownerless-org promotion advisory lock transaction after commit failure', - ); - } - } - - return result; - } catch (err) { - if (!callbackCompleted) { - try { - await client.query('ROLLBACK'); - } catch (rollbackErr) { - logger.warn( - { err: rollbackErr, orgId: organizationId }, - 'Failed to rollback ownerless-org promotion advisory lock transaction', - ); - } - } - throw err; - } finally { - client.release(); - } -} - // ── Upsert ─────────────────────────────────────────────────────────── -/** - * Insert or update an organization membership. Writes the role exactly as - * given — auto-promote decisioning lives in the webhook handler now, so - * WorkOS is the source of truth and local can never disagree. - * - * History: this used to auto-promote inside the SQL via CASE/NOT-EXISTS, - * with the webhook handler pushing the promotion to WorkOS afterward and - * rolling back local on failure. The rollback is best-effort; a missed - * rollback left at least one prod org with role='owner' locally and - * role='member' in WorkOS for months (see ozoneproject incident, 2026-05). - * The webhook handler now resolves the role against WorkOS BEFORE calling - * this function, so local never gets ahead of WorkOS. - */ +/** Mirror the provider role; never infer an owner from organization cardinality. */ export async function upsertOrganizationMembership( params: MembershipUpsertParams, externalClient?: PoolClient, @@ -135,9 +63,9 @@ export async function upsertOrganizationMembership( } return guarded.value; } - const db = externalClient; + const database = externalClient; - const result = await db.query<{ role: string }>( + const result = await database.query<{ role: string }>( `INSERT INTO organization_memberships ( workos_user_id, workos_organization_id, @@ -183,7 +111,10 @@ export async function upsertOrganizationMembership( ], ); - const assigned_role = result.rows[0]?.role || params.role; + if (result.rowCount !== 1 || !result.rows[0]) { + throw new Error('Membership upsert did not write exactly one row'); + } + const assigned_role = result.rows[0].role; logger.info({ membershipId: params.membership_id, @@ -196,19 +127,8 @@ export async function upsertOrganizationMembership( } /** - * Resolve the role to assign for an incoming membership, promoting to - * 'owner' in WorkOS first when the org has no other admin/owner. This - * is the new home for ownerless-org safety-net promotion — performing - * the WorkOS write *before* the local upsert guarantees local can never - * disagree with WorkOS, even if the process crashes mid-flight. - * - * Returns: - * { role, promoted, error? } - * - * `promoted: true` indicates that WorkOS was successfully updated to - * 'owner'; the caller should write an audit row. `error` is set on - * promotion attempts that failed — caller writes a failure audit row - * and falls back to the input role for the local write. + * Compatibility entry point. Ordinary membership events preserve the provider + * role. First-owner and recovery grants require a separate explicit flow. */ export async function resolveRoleWithWorkosFirstPromote(args: { workos: WorkOS; @@ -216,92 +136,8 @@ export async function resolveRoleWithWorkosFirstPromote(args: { userId: string; organizationId: string; incomingRole: string; -}): Promise<{ - role: string; - promoted: boolean; - promotionError?: unknown; -}> { - const { workos, membershipId, userId, organizationId, incomingRole } = args; - - // Upstream role mutation needs a durable intent and reconciliation record: - // a timeout or concurrent credential deletion otherwise leaves an unknown - // provider-side authority outcome that cannot safely be replayed. Preserve - // the signed provider role and defer owner selection to an explicit workflow. - void workos; - logger.warn( - { membershipId, userId, orgId: organizationId, incomingRole }, - 'Automatic ownerless promotion deferred: no durable provider intent journal', - ); - return { role: incomingRole, promoted: false }; - - // Only the 'member' input is eligible for ownerless-org promotion. Any - // explicit role from WorkOS passes through unchanged. - /* c8 ignore start -- retained decisioning for an eventual journaled workflow */ - if (incomingRole !== 'member') { - return { role: incomingRole, promoted: false }; - } - - try { - return await withOwnerlessOrgPromotionLock(organizationId, async () => { - // Source-of-truth check: page through WorkOS memberships and look for - // an existing admin/owner that isn't this same user. - let hasOtherAdmin = false; - try { - let after: string | undefined; - do { - const page = await workos.userManagement.listOrganizationMemberships({ - organizationId, - statuses: ['active'], - limit: 100, - after, - }); - for (const m of page.data) { - if (m.userId === userId) continue; - const slug = m.role?.slug; - if (slug === 'admin' || slug === 'owner') { - hasOtherAdmin = true; - break; - } - } - if (hasOtherAdmin) break; - after = page.listMetadata?.after ?? undefined; - } while (after); - } catch (err) { - // Can't verify WorkOS state — refuse to promote. Writing 'owner' locally - // when we don't know what WorkOS thinks is exactly the drift this rewrite - // is fixing. - logger.warn({ err, orgId: organizationId, userId }, - 'Could not list WorkOS memberships for ownerless-org check — assigning member'); - return { role: 'member', promoted: false, promotionError: err }; - } - - if (hasOtherAdmin) { - return { role: 'member', promoted: false }; - } - - // No other admin/owner — promote this membership to owner in WorkOS. - // If WorkOS rejects the update (role not configured, transient 5xx, etc.) - // we fall back to writing 'member' locally so the two sides stay aligned. - try { - await workos.userManagement.updateOrganizationMembership(membershipId, { - roleSlug: 'owner', - }); - } catch (err) { - logger.warn({ err, orgId: organizationId, userId, membershipId }, - 'Failed to promote member to owner in WorkOS — falling back to member locally'); - return { role: 'member', promoted: false, promotionError: err }; - } - - return { role: 'owner', promoted: true }; - }); - } catch (err) { - logger.warn( - { err, orgId: organizationId, userId, membershipId }, - 'Could not acquire ownerless-org promotion lock — assigning member', - ); - return { role: 'member', promoted: false, promotionError: err }; - } - /* c8 ignore stop */ +}): Promise<{ role: string; promoted: boolean; promotionError?: unknown }> { + return { role: args.incomingRole, promoted: false }; } // ── Delete ─────────────────────────────────────────────────────────── @@ -358,6 +194,34 @@ export async function deleteOrganizationMembership( } } +export interface ExactOrganizationMembershipDeletion { + matched: boolean; + role: string | null; +} + +/** Delete only the exact provider membership represented by a webhook event. */ +export async function deleteExactOrganizationMembership( + userId: string, + organizationId: string, + membershipId: string, + client: PoolClient, +): Promise { + const result = await client.query<{ role: string }>( + `DELETE FROM organization_memberships + WHERE workos_user_id = $1 AND workos_organization_id = $2 AND workos_membership_id = $3 + RETURNING role`, + [userId, organizationId, membershipId], + ); + if (result.rowCount === 1) { + await client.query( + `UPDATE users SET primary_organization_id = NULL, updated_at = NOW() + WHERE workos_user_id = $1 AND primary_organization_id = $2`, + [userId, organizationId], + ); + } + return { matched: result.rowCount === 1, role: result.rows[0]?.role ?? null }; +} + // ── Invitation seat type ───────────────────────────────────────────── /** @@ -370,9 +234,9 @@ export async function consumeInvitationSeatType( email: string, externalClient?: PoolClient, ): Promise<{ seat_type: string; source: ProvisioningSource | null } | null> { - const db = externalClient ?? getPool(); + const database = externalClient ?? getPool(); - const result = await db.query<{ seat_type: string; source: string | null }>( + const result = await database.query<{ seat_type: string; source: string | null }>( `DELETE FROM invitation_seat_types WHERE workos_organization_id = $1 AND lower(email) = lower($2) RETURNING seat_type, source`, @@ -441,171 +305,16 @@ export interface DomainLinkResult { } /** - * Check whether a user's email domain matches a verified domain on an - * organization with an active subscription — directly or via the brand - * registry hierarchy (e.g. AnalyticsIQ → Alliant). If so, and the org has - * consented to the relevant auto-provisioning class, this formerly created a - * WorkOS membership on the resolved paying org. Automatic upstream authority - * is currently deferred until a durable intent/reconciliation journal exists. - * - * Two consent flags on the resolved org, with different defaults: - * - auto_provision_verified_domain (default true) gates DIRECT matches - * where the user's domain is a verified organization_domains row - * (DNS-verified by WorkOS). Low risk, on by default. - * - auto_provision_brand_hierarchy_children (default false) gates - * INHERITED matches where the user's domain reaches the org via - * brands.house_domain ascent. Higher risk because the edge comes from - * LLM classification or admin PATCH, ages on M&A, and the joining user - * gets no domain-level confirmation. Opt-in. - * - * Calls currently fail closed without contacting WorkOS or staging a local - * membership. Keep the legacy decisioning below for an eventual explicitly - * journaled workflow; do not enable it as an untracked automatic mutation. - * - * Hierarchy walk uses the same trust gates as resolveEffectiveMembership - * (high-confidence classifications, 180-day TTL, max 4 hops up) so pre-link - * auto-provisioning and post-link inheritance stay coherent. + * Disabled: an email/domain match is neither exact-credential proof nor subject + * consent. Keep this compatibility entry point inert for background callers. + * Re-enabling requires an explicit authenticated action and durable audit. */ export async function autoLinkByVerifiedDomain( - workos: WorkOS, - userId: string, - email: string, + _workos: WorkOS, + _userId: string, + _email: string, ): Promise { - if (shouldDeferAutomaticProviderAuthorityWrites()) { - logger.warn( - { userId }, - 'Verified-domain auto-provision deferred: no durable exactly-once provider intent journal', - ); - return null; - } - const pool = getPool(); - const emailDomain = email.split('@')[1]?.toLowerCase(); - if (!emailDomain) return null; - - const owner = await findPayingOrgForDomain(emailDomain); - if (!owner) return null; - - // Direct verified-domain auto-provisioning is on by default; hierarchical - // is opt-in. The two flags are separate because the trust models differ: - // direct = WorkOS DNS-verified the user's domain (strong signal); inherited - // = LLM classifier (or admin PATCH) decided the input domain is a child of - // the matched parent (weaker, ages on M&A, no domain-level confirmation - // from the joining user). - if (owner.is_inherited) { - if (!owner.auto_provision_hierarchy_allowed) return null; - - // Cohort gate: only auto-join users whose users.created_at is on or - // after the moment the parent enabled hierarchical auto-provisioning. - // Without this, flipping the flag retroactively grafts the entire - // backlog of child-domain users into the parent on their next request. - // Grandfather semantics matches the SaaS norm. - if (owner.auto_provision_hierarchy_enabled_at) { - const userRow = await pool.query<{ created_at: Date | null }>( - 'SELECT created_at FROM users WHERE workos_user_id = $1', - [userId], - ); - const userCreatedAt = userRow.rows[0]?.created_at ?? null; - // No user row yet → just-created via webhook; treat as new joiner. - // Otherwise require the user's account to post-date the opt-in. - if (userCreatedAt && userCreatedAt < owner.auto_provision_hierarchy_enabled_at) { - logger.info( - { - userId, - email, - orgId: owner.organization_id, - userCreatedAt, - hierarchyEnabledAt: owner.auto_provision_hierarchy_enabled_at, - }, - 'Auto-link skipped: user predates hierarchy opt-in (grandfather semantics)', - ); - return null; - } - } - } else { - if (!owner.auto_provision_direct_allowed) return null; - } - - const orgId = owner.organization_id; - const orgName = owner.organization_name; - - // Already a member of the resolved org? (Post-link, the membership exists - // on the paying org regardless of which child domain the user matched - // from.) - const existing = await pool.query<{ exists: boolean }>( - `SELECT EXISTS ( - SELECT 1 FROM organization_memberships - WHERE workos_organization_id = $1 AND workos_user_id = $2 - ) AS exists`, - [orgId, userId], - ); - if (existing.rows[0]?.exists) return null; - - // Stage the provisioning source so the organization_membership.created - // webhook handler can record 'verified_domain' on the local cache row. - // Clear any stale (org, email) staging row first; consumeInvitationSeatType - // matches by (org, email) and we don't want a leftover row from a prior - // failed attempt to win. - const stagingKey = `verified_domain_${orgId}_${userId}`; - await pool.query( - 'DELETE FROM invitation_seat_types WHERE workos_organization_id = $1 AND lower(email) = lower($2)', - [orgId, email], - ); - await pool.query( - `INSERT INTO invitation_seat_types (workos_invitation_id, workos_organization_id, email, seat_type, source) - VALUES ($1, $2, $3, 'community_only', 'verified_domain') - ON CONFLICT (workos_invitation_id) DO UPDATE SET seat_type = EXCLUDED.seat_type, source = EXCLUDED.source`, - [stagingKey, orgId, email], - ); - - // Always create as member. Auto-promotion to owner for ownerless orgs is - // handled by resolveRoleWithWorkosFirstPromote when the - // organization_membership.created webhook fires — that path pages WorkOS for - // existing admin/owner memberships before promoting, so it reflects live state - // rather than the local cache. - try { - await workos.userManagement.createOrganizationMembership({ - userId, - organizationId: orgId, - roleSlug: 'member', - }); - - logger.info( - { - userId, - email, - orgId, - orgName, - matchedDomain: owner.matched_domain, - isInherited: owner.is_inherited, - hierarchyChain: owner.hierarchy_chain, - }, - owner.is_inherited - ? 'Auto-linked user to organization via inherited brand-hierarchy domain' - : 'Auto-linked user to organization via verified domain', - ); - return { organizationId: orgId, organizationName: orgName, role: 'member' }; - } catch (err: any) { - if (err?.code === 'organization_membership_already_exists') { - // Membership exists but wasn't returned by list — return as success - logger.info({ userId, orgId }, 'Auto-link skipped: membership already exists in WorkOS'); - return { organizationId: orgId, organizationName: orgName, role: 'member' }; - } - // Roll back the staging row so a stale 'verified_domain' source can't be - // consumed by an unrelated future invite for the same (org, email) pair. - try { - await pool.query( - 'DELETE FROM invitation_seat_types WHERE workos_invitation_id = $1', - [stagingKey], - ); - } catch (rollbackErr) { - logger.error( - { err: rollbackErr, userId, orgId, email, stagingKey }, - 'CRITICAL: failed to rollback verified_domain staging row after createOrganizationMembership failure — manually delete row to avoid source leak', - ); - } - logger.warn({ err, userId, orgId }, 'Failed to auto-link user to organization'); - return null; - } + return null; } // ── Auto-provision digest queries ─────────────────────────────────── diff --git a/server/src/db/user-authorization-snapshot-db.ts b/server/src/db/user-authorization-snapshot-db.ts index 68af315dcb2..517a56a27d4 100644 --- a/server/src/db/user-authorization-snapshot-db.ts +++ b/server/src/db/user-authorization-snapshot-db.ts @@ -7,6 +7,8 @@ export interface AuthorizationSnapshot { readonly authenticatedUserId: string; readonly canonicalUserId: string; readonly identityId: string | null; + /** PostgreSQL xmin text for the exact credential-to-identity binding row. */ + readonly bindingVersion: string; readonly selectedOrganizationId: string | null; /** PostgreSQL bigint text: converting to a number would lose revocations above 2^53. */ readonly authorizationEpoch: string; @@ -42,6 +44,7 @@ interface SnapshotRow { authenticated_user_id: string | null; canonical_user_id: string | null; identity_id: string | null; + binding_version: string | null; authorization_epoch: string; email: string | null; email_verified: boolean; @@ -96,7 +99,7 @@ export async function loadAuthorizationSnapshot( `SELECT pg_catalog.pg_is_in_recovery() AS in_recovery, credential.workos_user_id AS authenticated_user_id, primary_binding.workos_user_id AS canonical_user_id, - binding.identity_id, + binding.identity_id, binding.xmin::text AS binding_version, COALESCE(primary_binding.primary_count, 0)::text AS primary_count, EXISTS ( SELECT 1 FROM registry_audit_log audit @@ -142,7 +145,7 @@ export async function loadAuthorizationSnapshot( // recreates a users row. Durable deletion/quarantine markers are terminal. // Missing or ambiguous identity routing is also terminal, never a fallback // to a linked credential or an implicit singleton identity. - if (row.terminal_marker || !row.authenticated_user_id || !row.identity_id + if (row.terminal_marker || !row.authenticated_user_id || !row.identity_id || !row.binding_version || row.primary_count !== '1' || !row.canonical_user_id) return null; const credentialGrant = row.grant_id @@ -158,6 +161,7 @@ export async function loadAuthorizationSnapshot( authenticatedUserId: row.authenticated_user_id, canonicalUserId: row.canonical_user_id, identityId: row.identity_id, + bindingVersion: row.binding_version, selectedOrganizationId: organizationId, authorizationEpoch: row.authorization_epoch, credential: Object.freeze({ @@ -183,6 +187,7 @@ export function sameAuthorizationIdentity( return previous.authenticatedUserId === current.authenticatedUserId && previous.canonicalUserId === current.canonicalUserId && previous.identityId === current.identityId + && previous.bindingVersion === current.bindingVersion && previous.authorizationEpoch === current.authorizationEpoch && previous.credential.email === current.credential.email && previous.credential.emailVerified === current.credential.emailVerified; diff --git a/server/src/http.ts b/server/src/http.ts index d3408d19409..80b809f52ca 100644 --- a/server/src/http.ts +++ b/server/src/http.ts @@ -57,8 +57,9 @@ import { brandJsonCacheControl } from "./services/brand-resolution-cache-policy. import { PropertyDatabase } from "./db/property-db.js"; import * as manifestRefsDb from "./db/manifest-refs-db.js"; import { JoinRequestDatabase } from "./db/join-request-db.js"; +import { cancelJoinRequestForExactCredential, toPublicMembershipMutationError } from "./services/organization-membership-mutation.js"; +import { getOrganizationAuthorizationUserId } from "./auth/organization-principal.js"; import { SlackDatabase } from "./db/slack-db.js"; -import { autoLinkByVerifiedDomain, upsertOrganizationMembership } from "./db/membership-db.js"; import { syncSlackUsers, getSyncStatus, tryAutoLinkWebsiteUserToSlack } from "./slack/sync.js"; import { isSlackConfigured, testSlackConnection } from "./slack/client.js"; import { handleSlashCommand } from "./slack/commands.js"; @@ -177,7 +178,7 @@ import { queuePerspectiveLink } from "./addie/services/content-curator.js"; import { resolveEscalationsForPerspective } from "./db/escalation-db.js"; import { serveHtmlWithMetaTags, injectMetaTagsIntoHtml, enrichUserWithMembership, enrichUserWithAdmin } from "./utils/html-config.js"; import { complete, isLLMConfigured } from "./utils/llm.js"; -import { notifyJoinRequest, notifyMemberAdded, notifySubscriptionThankYou } from "./slack/org-group-dm.js"; +import { notifyMemberAdded, notifySubscriptionThankYou } from "./slack/org-group-dm.js"; import { BansDatabase } from "./db/bans-db.js"; import { registryRequestsDb } from "./db/registry-requests-db.js"; import { notifyRegistryEdit, notifyRegistryCreate, notifyRegistryRollback, notifyRegistryBan } from "./notifications/registry.js"; @@ -783,14 +784,6 @@ Llms-txt: ${baseUrl}/llms.txt `; } -function isPendingWorkOSMembershipError(error: unknown): boolean { - if (!error || typeof error !== 'object') return false; - const candidate = error as { code?: unknown; message?: unknown }; - return candidate.code === 'cannot_reactivate_pending_organization_membership' || - (typeof candidate.message === 'string' && - candidate.message.includes('Pending organization memberships cannot be reactivated')); -} - /** * Consecutive failed DB health probes on this machine. A single transient * connect timeout — common during a rolling deploy or a Managed Postgres @@ -8659,7 +8652,6 @@ ${p.category ? `${p.category}\n` : ''}${publishedUrl}< email: user.email, workos, orgDb, - autoLinkByVerifiedDomain, }); } catch (error) { if (error instanceof CurrentUserOrganizationsUnavailableError) { @@ -9191,357 +9183,21 @@ ${p.category ? `${p.category}\n` : ''}${publishedUrl}< } }); - // POST /api/join-requests - Request to join an organization - this.app.post('/api/join-requests', requireAuth, async (req, res) => { - try { - const user = req.user!; - const { organization_id } = req.body; - - if (!organization_id) { - return res.status(400).json({ - error: 'Missing parameter', - message: 'organization_id is required', - }); - } - - const joinRequestDb = new JoinRequestDatabase(); - - // Check if user is already a member - const memberships = await workos!.userManagement.listOrganizationMemberships({ - userId: user.id, - organizationId: organization_id, - statuses: ['active', 'inactive', 'pending'], - }); - - if (memberships.data.length > 0) { - if (memberships.data.some(m => m.status === 'pending')) { - return res.status(409).json({ - error: 'Pending invitation exists', - message: 'You already have a pending invitation to this organization. Accept the invitation instead of requesting to join again.', - }); - } - return res.status(400).json({ - error: 'Already a member', - message: 'You are already a member of this organization', - }); - } - - // Check if user's email domain is verified for this org - auto-approve if so - const userDomain = user.email.split('@')[1]?.toLowerCase(); - if (userDomain) { - const pool = getPool(); - const verifiedDomainResult = await pool.query( - `SELECT domain FROM organization_domains - WHERE workos_organization_id = $1 AND verified = true AND LOWER(domain) = $2`, - [organization_id, userDomain] - ); - - if (verifiedDomainResult.rows.length > 0) { - // Domain is verified - auto-add user to organization - // If org has no admin/owner yet, promote this user to owner - const existingMembers = await workos!.userManagement.listOrganizationMemberships({ - organizationId: organization_id, - statuses: ['active', 'inactive', 'pending'], - limit: 100, - }); - const hasAdmin = existingMembers.data.some((m) => { - const role = m.role?.slug; - return role === 'admin' || role === 'owner'; - }); - const roleSlug = hasAdmin ? 'member' : 'owner'; - - let membership: any; - try { - membership = await workos!.userManagement.createOrganizationMembership({ - userId: user.id, - organizationId: organization_id, - roleSlug, - }); - } catch (membershipError) { - if (isPendingWorkOSMembershipError(membershipError)) { - return res.status(409).json({ - error: 'Pending invitation exists', - message: 'You already have a pending invitation to this organization. Accept the invitation instead of requesting to join again.', - }); - } - throw membershipError; - } - - // Get org name for response - let orgName = 'Organization'; - try { - const org = await workos!.organizations.getOrganization(organization_id); - orgName = org.name; - } catch { - // Org may not exist - } - - logger.info({ - userId: user.id, - orgId: organization_id, - domain: userDomain, - role: roleSlug, - }, 'User auto-added to organization via verified domain'); - - // Mirror only while the exact credential is still active. A - // provider response that settles after deletion must not restore - // local organization authority. - await upsertOrganizationMembership({ - user_id: user.id, - organization_id, - membership_id: membership.id, - email: user.email, - first_name: user.firstName ?? null, - last_name: user.lastName ?? null, - role: roleSlug, - seat_type: 'community_only', - has_explicit_seat_type: false, - provisioning_source: 'verified_domain', - }); - - // Record audit log - await orgDb.recordAuditLog({ - workos_organization_id: organization_id, - workos_user_id: user.id, - action: 'member_added', - resource_type: 'membership', - resource_id: membership.id, - details: { - user_email: user.email, - method: 'verified_domain_auto_join', - domain: userDomain, - role: roleSlug, - }, - }); - - return res.status(201).json({ - success: true, - message: roleSlug === 'owner' - ? `You've been added as the owner of ${orgName}` - : `You have been added to ${orgName}`, - auto_joined: true, - membership: { - id: membership.id, - organization_id: organization_id, - organization_name: orgName, - role: roleSlug, - }, - }); - } - } - - // Check for existing pending request - const existingRequest = await joinRequestDb.getPendingRequest(user.id, organization_id); - if (existingRequest) { - return res.status(400).json({ - error: 'Request already pending', - message: 'You already have a pending request to join this organization', - request_id: existingRequest.id, - }); - } - - // Get user's full details from WorkOS for name - let firstName: string | undefined; - let lastName: string | undefined; - try { - const workosUser = await workos!.userManagement.getUser(user.id); - firstName = workosUser.firstName || undefined; - lastName = workosUser.lastName || undefined; - } catch (err) { - logger.warn({ err, userId: user.id }, 'Failed to get user details from WorkOS'); - } - - const joinRequestInput = { - workos_user_id: user.id, - user_email: user.email, - first_name: firstName, - last_name: lastName, - workos_organization_id: organization_id, - }; - - // Get org name for response - let orgName = 'Organization'; - try { - const org = await workos!.organizations.getOrganization(organization_id); - orgName = org.name; - } catch { - // Org may not exist - } - - const createAndAuditJoinRequest = async () => { - const request = await joinRequestDb.createRequest(joinRequestInput); - - logger.info({ - userId: user.id, - orgId: organization_id, - requestId: request.id, - }, 'Join request created'); - - await orgDb.recordAuditLog({ - workos_organization_id: organization_id, - workos_user_id: user.id, - action: 'join_request_created', - resource_type: 'join_request', - resource_id: request.id, - details: { - user_email: user.email, - first_name: firstName, - last_name: lastName, - }, - }); - - return request; - }; - - // Check if org has any existing members - const orgMemberships = await workos!.userManagement.listOrganizationMemberships({ - organizationId: organization_id, - statuses: ['active', 'inactive', 'pending'], - }); - - // If org has no members (e.g., prospect org) AND user's email domain matches, - // auto-approve as owner. Domain check prevents unauthorized org claims. - if (orgMemberships.data.length === 0) { - const userDomain = user.email.split('@')[1]?.toLowerCase(); - const pool = getPool(); - const orgDomainResult = await pool.query( - `SELECT domain FROM organization_domains WHERE workos_organization_id = $1 - UNION - SELECT email_domain FROM organizations WHERE workos_organization_id = $1 AND email_domain IS NOT NULL`, - [organization_id] - ); - const orgDomains = orgDomainResult.rows.map((r: { domain?: string; email_domain?: string }) => - (r.domain || r.email_domain)?.toLowerCase() - ); - - if (userDomain && orgDomains.includes(userDomain)) { - logger.info({ - userId: user.id, - orgId: organization_id, - domain: userDomain, - }, 'Ownerless org with matching domain — auto-approving join request as owner'); - - // Add user as owner - try { - await workos!.userManagement.createOrganizationMembership({ - userId: user.id, - organizationId: organization_id, - roleSlug: 'owner', - }); - } catch (membershipError) { - if (isPendingWorkOSMembershipError(membershipError)) { - return res.status(409).json({ - error: 'Pending invitation exists', - message: 'You already have a pending invitation to this organization. Accept the invitation instead of requesting to join again.', - }); - } - throw membershipError; - } - - const request = await createAndAuditJoinRequest(); - - // Mark join request as approved - await joinRequestDb.approveRequest(request.id, user.id); - - // Record audit log - await orgDb.recordAuditLog({ - workos_organization_id: organization_id, - workos_user_id: user.id, - action: 'join_request_auto_approved', - resource_type: 'join_request', - resource_id: request.id, - details: { - reason: 'First member of ownerless organization with matching email domain', - role: 'owner', - domain: userDomain, - }, - }); - - return res.status(201).json({ - success: true, - message: `You've been added as the owner of ${orgName}`, - request: { - id: request.id, - organization_id: organization_id, - organization_name: orgName, - status: 'approved', - created_at: request.created_at, - auto_approved: true, - }, - }); - } - - logger.info({ - userId: user.id, - orgId: organization_id, - userDomain, - orgDomains, - }, 'Ownerless org but domain mismatch — treating as normal join request'); - } - - const request = await createAndAuditJoinRequest(); - - // Org has members — notify admins via Slack group DM (fire-and-forget) - (async () => { - try { - const adminEmails: string[] = []; - for (const membership of orgMemberships.data) { - if (membership.role?.slug === 'admin' || membership.role?.slug === 'owner') { - try { - const adminUser = await workos!.userManagement.getUser(membership.userId); - if (adminUser.email) { - adminEmails.push(adminUser.email); - } - } catch { - // Skip if can't fetch user - } - } - } - - if (adminEmails.length > 0) { - await notifyJoinRequest({ - orgId: organization_id, - orgName, - adminEmails, - requesterEmail: user.email, - requesterFirstName: firstName, - requesterLastName: lastName, - }); - } - } catch (err) { - logger.warn({ err, orgId: organization_id }, 'Failed to notify admins of join request'); - } - })(); - - res.status(201).json({ - success: true, - message: `Request to join ${orgName} submitted`, - request: { - id: request.id, - organization_id: organization_id, - organization_name: orgName, - status: request.status, - created_at: request.created_at, - }, - }); - } catch (error) { - logger.error({ err: error }, 'Create join request error:'); - res.status(500).json({ - error: 'Failed to create join request', - }); - } + // Neither a pending request nor a domain match may transfer a sibling's + // proof to the canonical user. Restore through the explicit consent flow. + this.app.post('/api/join-requests', requireAuth, async (_req, res) => { + return res.status(403).json({ + error: 'organization_onboarding_disabled', + message: 'Organization join onboarding is temporarily unavailable.', + }); }); // DELETE /api/join-requests/:requestId - Cancel a pending join request this.app.delete('/api/join-requests/:requestId', requireAuth, async (req, res) => { try { - const user = req.user!; const { requestId } = req.params; - - const joinRequestDb = new JoinRequestDatabase(); - - // Cancel the request (will only work if it belongs to this user and is pending) - const cancelled = await joinRequestDb.cancelRequest(requestId, user.id); + const actorId = getOrganizationAuthorizationUserId(req.user!); + const cancelled = await cancelJoinRequestForExactCredential(req, requestId); if (!cancelled) { return res.status(404).json({ @@ -9550,7 +9206,7 @@ ${p.category ? `${p.category}\n` : ''}${publishedUrl}< }); } - logger.info({ userId: user.id, requestId }, 'Join request cancelled'); + logger.info({ userId: actorId, requestId }, 'Join request cancelled'); res.json({ success: true, @@ -9558,9 +9214,8 @@ ${p.category ? `${p.category}\n` : ''}${publishedUrl}< }); } catch (error) { logger.error({ err: error }, 'Cancel join request error:'); - res.status(500).json({ - error: 'Failed to cancel join request', - }); + const publicError = toPublicMembershipMutationError(error); + return res.status(publicError.status).json(publicError.body); } }); diff --git a/server/src/middleware/organization-authorization-observer.ts b/server/src/middleware/organization-authorization-observer.ts index 21d141e7839..81412ec6113 100644 --- a/server/src/middleware/organization-authorization-observer.ts +++ b/server/src/middleware/organization-authorization-observer.ts @@ -1,4 +1,4 @@ -import type { Request } from 'express'; +import type { Request, RequestHandler } from 'express'; import { getAuthorizationObserverWorkos } from '../auth/workos-client.js'; import { createLogger } from '../logger.js'; import { resolveUserRole } from '../utils/resolve-user-role.js'; @@ -8,6 +8,16 @@ const logger = createLogger('organization-authorization-observer'); const MAX_CONCURRENT_COMPARISONS = 5; let inFlightComparisons = 0; +// Exact membership mutations have their own mandatory authority checks. Do not +// make additional canonical-credential provider reads after those requests, +// including authentication/preflight denials. This server-only marker changes +// observation only; it never supplies or bypasses authorization. +const excludedRequests = new WeakSet(); +export const excludeOrganizationAuthorizationObservation: RequestHandler = (req, _res, next) => { + excludedRequests.add(req); + next(); +}; + export type OrganizationSelectorSource = | 'header' | 'query_org' @@ -208,7 +218,7 @@ export async function observeLinkedCredentialOrganizationAuthorization( route: string, responseStatus: number, ): Promise { - if (process.env.ORG_AUTHORIZATION_OBSERVER_ENABLED === 'false') return; + if (excludedRequests.has(req) || process.env.ORG_AUTHORIZATION_OBSERVER_ENABLED === 'false') return; const canonicalUserId = req.user?.id; const authenticatedUserId = req.user?.authWorkosUserId; diff --git a/server/src/routes/current-user-organizations.ts b/server/src/routes/current-user-organizations.ts index 06648fe098d..2a125ef7988 100644 --- a/server/src/routes/current-user-organizations.ts +++ b/server/src/routes/current-user-organizations.ts @@ -109,33 +109,19 @@ export async function getCurrentUserOrganizations(args: { email: string; workos: WorkOS | null; orgDb: CurrentUserOrgDb; - autoLinkByVerifiedDomain: AutoLinkByVerifiedDomain; + /** Ignored compatibility dependency; reads never provision membership. */ + autoLinkByVerifiedDomain?: AutoLinkByVerifiedDomain; }): Promise { if (!args.workos) { return getCachedOrganizationsForUser(args.userId); } try { - let memberships = await args.workos.userManagement.listOrganizationMemberships({ + const memberships = await args.workos.userManagement.listOrganizationMemberships({ userId: args.userId, statuses: ['active'], }); - try { - const linked = await args.autoLinkByVerifiedDomain(args.workos, args.userId, args.email); - if (linked) { - memberships = await args.workos.userManagement.listOrganizationMemberships({ - userId: args.userId, - statuses: ['active'], - }); - } - } catch (error) { - logger.warn( - { err: error, userId: args.userId }, - 'Auto-link by verified domain failed during /api/me; continuing with existing memberships', - ); - } - return Promise.all( memberships.data.map((membership) => resolveCurrentUserOrganization(membership, args.orgDb, args.workos!)) ); diff --git a/server/src/routes/invites.ts b/server/src/routes/invites.ts index 1ecbadf86ca..2623853228f 100644 --- a/server/src/routes/invites.ts +++ b/server/src/routes/invites.ts @@ -2,49 +2,24 @@ * Public + authed invite acceptance routes. * * GET /api/invite/:token - public metadata for the invite page - * POST /api/invite/:token/accept - authed: join org, record agreement, - * store billing address, issue invoice + * POST /api/invite/:token/accept - authed: temporarily denied */ import { Router, type Request, type Response } from 'express'; -import { WorkOS } from '@workos-inc/node'; import { createLogger } from '../logger.js'; import { requireAuth } from '../middleware/auth.js'; import { getMembershipInviteByToken, - markMembershipInviteAccepted, inviteStatus, } from '../db/membership-invites-db.js'; import { OrganizationDatabase, - type BillingAddress, } from '../db/organization-db.js'; -import { - createAndSendInvoice, - getProductsForCustomer, - createCoupon, -} from '../billing/stripe-client.js'; -import { sanitizeBillingAddress } from '../billing/billing-address.js'; -import { - blockIfActiveSubscription, - type ActiveSubscriptionBlock, -} from '../billing/active-subscription-guard.js'; -import { withOrgIntakeLock } from '../billing/org-intake-lock.js'; -import * as referralDb from '../db/referral-codes-db.js'; +import { getProductsForCustomer } from '../billing/stripe-client.js'; const logger = createLogger('invites-routes'); const orgDb = new OrganizationDatabase(); -const AUTH_ENABLED = !!( - process.env.WORKOS_API_KEY && - process.env.WORKOS_CLIENT_ID -); -const workos = AUTH_ENABLED - ? new WorkOS(process.env.WORKOS_API_KEY!, { - clientId: process.env.WORKOS_CLIENT_ID!, - }) - : null; - export function createInvitesRouter(): Router { const router = Router(); @@ -87,276 +62,14 @@ export function createInvitesRouter(): Router { } }); - // Authed accept. Body: { billingAddress, agreement_version, marketing_opt_in? } - router.post('/invite/:token/accept', requireAuth, async (req: Request, res: Response) => { - try { - const user = req.user!; - const { token } = req.params; - const { billingAddress, agreement_version } = req.body as { - billingAddress?: BillingAddress; - agreement_version?: string; - }; - - if (!billingAddress) { - return res.status(400).json({ error: 'billingAddress is required' }); - } - if ( - !billingAddress.line1 || - !billingAddress.city || - !billingAddress.state || - !billingAddress.postal_code || - !billingAddress.country - ) { - return res.status(400).json({ error: 'Incomplete billing address' }); - } - // Build a clean, length-capped address object. We persist this to - // organizations.billing_address (JSONB) and pass to Stripe, so we don't - // want arbitrary client fields leaking through. - const sanitizedAddress = sanitizeBillingAddress(billingAddress); - if (!sanitizedAddress) { - return res.status(400).json({ error: 'Billing address fields exceed length limits' }); - } - - if (!agreement_version?.trim()) { - return res.status(400).json({ error: 'agreement_version is required' }); - } - // Server validates against the currently-published agreement version. - // Accepting arbitrary strings would let a caller record a "signed" state - // against a version that never existed, defeating the audit trail. - const currentAgreement = await orgDb.getCurrentAgreementByType('membership'); - if (!currentAgreement || agreement_version.trim() !== currentAgreement.version) { - return res.status(400).json({ - error: 'Agreement version mismatch', - message: 'The membership agreement has changed. Please reload and accept the current version.', - current_version: currentAgreement?.version ?? null, - }); - } - - const invite = await getMembershipInviteByToken(token); - if (!invite) return res.status(404).json({ error: 'Invite not found' }); - - const status = inviteStatus(invite); - if (status !== 'pending') { - return res.status(409).json({ error: `Invite is ${status}` }); - } - - const org = await orgDb.getOrganization(invite.workos_organization_id); - if (!org) { - return res.status(410).json({ error: 'Organization no longer exists' }); - } - - const customerType = org.is_personal ? 'individual' : 'company'; - const eligible = await getProductsForCustomer({ - customerType, - category: 'membership', - }); - const product = eligible.find((p) => p.lookup_key === invite.lookup_key); - if (!product) { - return res.status(410).json({ - error: 'Tier no longer available', - message: 'The membership tier in this invite is no longer available.', - }); - } - - // Refuse if the org already has an active subscription. Accepting this - // invite would mint a duplicate sub on the same Stripe customer — the - // Triton Apr-2026 incident in literal form. - // - // We deliberately omit `customerPortalReturnUrl`: the invite recipient - // gets `member` role on the org (not `admin`), and a Stripe Customer - // Portal session would grant them admin-equivalent control over the - // existing subscription. The 409 message points them at the dashboard - // and finance@ instead. - const activeBlock = await blockIfActiveSubscription( - org.workos_organization_id, - orgDb, - ); - if (activeBlock) { - return res.status(activeBlock.status).json(activeBlock.body); - } - - // Ensure the accepting user is a member of the target org. - // - // Role is always 'member'. We never auto-grant 'owner' via invite accept: - // the invite token is a bearer capability and could be forwarded or - // intercepted (email logs, proxy logs, shared Slack links). An admin can - // promote a member to owner through the normal admin UI once they've - // confirmed the person is the right one. This closes the "anyone with a - // leaked link becomes owner of an empty prospect org" escalation path. - if (workos) { - try { - const existing = await workos.userManagement.listOrganizationMemberships({ - userId: user.id, - organizationId: org.workos_organization_id, - }); - if (!existing.data || existing.data.length === 0) { - try { - await workos.userManagement.createOrganizationMembership({ - userId: user.id, - organizationId: org.workos_organization_id, - roleSlug: 'member', - }); - logger.info( - { userId: user.id, orgId: org.workos_organization_id }, - 'Added user to org via invite accept (role: member)' - ); - } catch (membershipErr) { - const code = (membershipErr as { code?: string }).code; - if (code === 'organization_membership_already_exists') { - logger.info({ userId: user.id, orgId: org.workos_organization_id }, - 'Membership already exists (race) — continuing'); - } else { - throw membershipErr; - } - } - } - } catch (err) { - logger.error({ err, userId: user.id, orgId: org.workos_organization_id }, - 'Failed to ensure org membership on invite accept'); - return res.status(500).json({ - error: 'Could not add you to the organization', - message: 'Please contact finance@agenticadvertising.org.', - }); - } - } - - // Record pending agreement + store billing address on the org in one - // atomic write so a partial failure can't leave pending_agreement set - // without an address (or vice versa). - await orgDb.updateOrganization(org.workos_organization_id, { - pending_agreement_version: currentAgreement.version, - pending_agreement_accepted_at: new Date(), - pending_agreement_user_id: user.id, - billing_address: sanitizedAddress, - }); - - // Referral discount (if invite carried one). - let couponId: string | undefined; - if (invite.referral_code) { - try { - const code = await referralDb.getReferralCode(invite.referral_code); - if (code && code.status === 'active' && code.discount_percent) { - const coupon = await createCoupon({ - name: `Referral: ${code.code}`, - percent_off: code.discount_percent, - duration: 'once', - max_redemptions: 1, - metadata: { referral_code: code.code }, - }); - if (coupon) couponId = coupon.coupon_id; - } - } catch (err) { - logger.warn({ err, referral_code: invite.referral_code }, - 'Failed to resolve referral coupon — continuing without discount'); - } - } - - const contactName = - invite.contact_name || - [user.firstName, user.lastName].filter(Boolean).join(' ') || - user.email; - - // Lock + re-guard + Stripe write must be atomic per-org. The early - // `blockIfActiveSubscription` above handles the common case fast; this - // section closes the race where two concurrent intakes (e.g., two - // invite-accept clicks racing a different intake path) both pass the - // early check before either has minted a sub. - const intake = await withOrgIntakeLock< - | { kind: 'block'; block: ActiveSubscriptionBlock } - | { kind: 'invoiceFailed' } - | { kind: 'success'; invoiceResult: NonNullable>> } - >(org.workos_organization_id, async () => { - const racedBlock = await blockIfActiveSubscription( - org.workos_organization_id, - orgDb, - ); - if (racedBlock) return { kind: 'block', block: racedBlock }; - const result = await createAndSendInvoice({ - lookupKey: invite.lookup_key, - companyName: org.name, - contactName, - contactEmail: user.email, - billingAddress: sanitizedAddress, - workosOrganizationId: org.workos_organization_id, - workosUserId: user.id, - couponId: couponId ?? org.stripe_coupon_id ?? undefined, - // Token-keyed idempotency. Two concurrent clicks converge to one - // subscription on Stripe's side; the DB atomic mark below then picks - // one winner and the other sees 409. - idempotencyKey: `invite_${invite.token}`, - }); - if (!result) return { kind: 'invoiceFailed' }; - return { kind: 'success', invoiceResult: result }; - }); - - if (intake.kind === 'block') { - return res.status(intake.block.status).json(intake.block.body); - } - if (intake.kind === 'invoiceFailed') { - logger.error({ orgId: org.workos_organization_id, lookupKey: invite.lookup_key }, - 'createAndSendInvoice returned null on invite accept'); - return res.status(500).json({ - error: 'Failed to issue invoice', - message: - "We couldn't issue your invoice. Please contact finance@agenticadvertising.org.", - }); - } - const invoiceResult = intake.invoiceResult; - - // INVARIANT: in-lock-guard-re-check - // markMembershipInviteAccepted runs OUTSIDE the lock. That is safe - // only because the in-lock `blockIfActiveSubscription` re-check - // (above, inside withOrgIntakeLock) catches duplicate-sub attempts: - // a third concurrent click on the same invite will block when its - // lock-internal guard reads the Stripe-side sub this acceptance just - // minted. Do not remove the re-guard inside the lock without - // re-thinking this invariant. - const accepted = await markMembershipInviteAccepted( - token, - user.id, - invoiceResult.invoiceId, - ); - if (!accepted) { - // Another tab accepted between our check and now. Still OK — the - // invoice went out; just return a benign response. - logger.warn({ token: token.slice(0, 8) + '...', userId: user.id }, - 'Invite already accepted concurrently'); - } - - // Mark referral as accepted if the invite carried one. - if (invite.referral_code) { - try { - await referralDb.acceptReferralCode( - invite.referral_code, - org.workos_organization_id, - user.id, - ); - } catch (err) { - logger.warn({ err, referral_code: invite.referral_code }, - 'Failed to record referral acceptance — invoice already sent'); - } - } - - logger.info( - { - token: token.slice(0, 8) + '...', - orgId: org.workos_organization_id, - userId: user.id, - invoiceId: invoiceResult.invoiceId, - }, - 'Membership invite accepted' - ); - - res.json({ - success: true, - invoice_id: invoiceResult.invoiceId, - invoice_url: invoiceResult.invoiceUrl, - organization: { id: org.workos_organization_id, name: org.name }, - }); - } catch (err) { - logger.error({ err }, 'Error accepting membership invite'); - res.status(500).json({ error: 'Internal error' }); - } + // The existing token does not bind a credential or a durable billing + // operation. Deny before any lookup, membership write, or billing call. + // Existing invites/acceptances remain untouched for separate adjudication. + router.post('/invite/:token/accept', requireAuth, async (_req: Request, res: Response) => { + return res.status(403).json({ + error: 'organization_onboarding_disabled', + message: 'Invite acceptance is temporarily unavailable.', + }); }); return router; diff --git a/server/src/routes/member-agents.ts b/server/src/routes/member-agents.ts index d4d59b672de..27d86b8c104 100644 --- a/server/src/routes/member-agents.ts +++ b/server/src/routes/member-agents.ts @@ -10,8 +10,8 @@ * bulk PUT path. * * Auth: WorkOS session OR Bearer API key (`requireAuth` handles both). - * Multi-org callers may pass `?org=…` to target a non-primary org; - * verification goes through `resolveUserOrgMembership`. + * Callers must pass `?org=…` to select an existing organization; + * authorization checks the exact authenticated WorkOS credential. * * Concurrency: writes go through a `SELECT … FOR UPDATE` on * `member_profiles` so two parallel POSTs/PATCHes/DELETEs serialize @@ -30,17 +30,13 @@ import { hasApiAccess, resolveMembershipTier, } from '../db/organization-db.js'; -import { resolvePrimaryOrganization } from '../db/users-db.js'; -import { resolveUserOrgMembership } from '../utils/resolve-user-org-membership.js'; +import { getOrganizationAuthorizationUserId } from '../auth/organization-principal.js'; import { getPool } from '../db/client.js'; import { canonicalizeAgentUrl } from '../db/publisher-db.js'; import type { AgentConfig } from '../types.js'; import { isValidAgentType } from '../types.js'; import { resolveAgentTypes, logResolvedTypeChanges } from './member-profiles.js'; import { ensureMemberProfileExists } from '../services/member-profile-autopublish.js'; -import { performCreateOrganization } from '../services/organization-bootstrap.js'; -import { isDevModeEnabled, getDevUser } from '../middleware/auth.js'; -import { isFreeEmail, getCompanyDomain } from '../utils/email-domain.js'; import { validateExternalUrl } from '../utils/url-security.js'; import { gateAgentVisibilityForCaller, @@ -96,146 +92,53 @@ export function createMemberAgentsRouter(config: MemberAgentsRouterConfig): Rout const { orgDb, workos, invalidateMemberContextCache } = config; const router = Router(); - /** - * Pick the org to act on. Honors `?org=…` for multi-org callers (matching - * the `PUT /api/me/member-profile` pattern); falls back to the user's - * primary org when not supplied. Returns null and writes the error - * response when the caller has no associated org or asks for an org - * they're not a member of. - */ + /** Select one explicit organization and resolve only direct WorkOS authority. */ async function resolveOrgOrSendError( req: import('express').Request, res: import('express').Response, ): Promise { - const requestedOrgId = - typeof req.query.org === 'string' && req.query.org.length > 0 - ? req.query.org - : null; - - if (requestedOrgId) { - const membership = await resolveUserOrgMembership( - workos, - req.user!.id, - requestedOrgId, - ); - if (!membership) { - res.status(403).json({ - error: 'Not authorized', - message: 'User is not a member of the requested organization', - }); + const requestedOrgId = typeof req.query.org === 'string' ? req.query.org : null; + if (!requestedOrgId) { + res.status(400).json({ error: 'An explicit ?org= is required' }); + return null; + } + if (!workos) { + res.status(503).json({ error: 'Organization membership temporarily unavailable' }); + return null; + } + const userId = getOrganizationAuthorizationUserId(req.user!); + try { + const memberships = await workos.userManagement.listOrganizationMemberships({ + userId, organizationId: requestedOrgId, statuses: ['active'], + }); + const matching = memberships.data.filter(m => m.userId === userId + && m.organizationId === requestedOrgId && m.status === 'active'); + if (matching.length !== 1 || !['member', 'admin', 'owner'].includes(matching[0].role?.slug ?? '')) { + res.status(403).json({ error: 'Not authorized for the requested organization' }); return null; } return requestedOrgId; - } - - const orgId = await resolvePrimaryOrganization(req.user!.id); - if (!orgId) { - res.status(400).json({ error: 'No organization associated with this account' }); + } catch (err) { + logger.warn({ err }, 'Exact WorkOS membership lookup unavailable'); + res.status(503).json({ error: 'Organization membership temporarily unavailable' }); return null; } - return orgId; } - /** - * Resolve the caller's primary org, auto-bootstrapping a fresh org if the - * caller has zero memberships. The auto-bootstrap path is the - * "true one-call storefront" experience: a third-party app holding only - * a user's OAuth token can `POST /api/me/agents` once and have the org, - * member profile, and agent registration all materialize. - * - * `resolvePrimaryOrganization` already derives from `organization_memberships` - * when `users.primary_organization_id` is null, so a `null` return there - * means the user truly has zero memberships — that's the only signal we - * need to gate auto-bootstrap. - * - * Returns null and writes the error response on failure. - */ - async function resolveOrAutoBootstrapOrg( + /** Explicit organization selection is required; agent writes cannot onboard. */ + async function resolveExplicitRegistrationOrg( req: import('express').Request, res: import('express').Response, ): Promise<{ orgId: string; orgAutoCreated: boolean } | null> { - const requestedOrgId = - typeof req.query.org === 'string' && req.query.org.length > 0 - ? req.query.org - : null; - - if (requestedOrgId) { - const orgId = await resolveOrgOrSendError(req, res); - return orgId ? { orgId, orgAutoCreated: false } : null; - } - - const primaryOrgId = await resolvePrimaryOrganization(req.user!.id); - if (primaryOrgId) return { orgId: primaryOrgId, orgAutoCreated: false }; - - // Fresh-user path: zero memberships → auto-bootstrap. - const user = req.user!; - const isPersonal = isFreeEmail(user.email); - const orgName = deriveDefaultOrgName(user, isPersonal); - - const outcome = await performCreateOrganization( - { - user: { id: user.id, email: user.email }, - organization_name: orgName, - is_personal: isPersonal, - // company_type / revenue_tier / marketing_opt_in: auto-bootstrap has - // no UI to capture these. Caller can patch the org later. - isDevUser: !!(isDevModeEnabled() && getDevUser(req)), - requestContext: { - ip: req.ip || (req.headers['x-forwarded-for'] as string) || 'unknown', - userAgent: (req.headers['user-agent'] as string) || 'unknown', - }, - }, - { workos: workos!, orgDb: config.orgDb }, - ); - - if (outcome.kind === 'created' || outcome.kind === 'adopted') { - return { orgId: outcome.orgId, orgAutoCreated: true }; - } - - // Surface the auto-bootstrap failure honestly. None of these should - // hit a fresh user in normal flow, but mapping them keeps the contract - // legible. - if (outcome.kind === 'domain_taken') { - res.status(409).json({ - error: 'Organization exists', - message: `An organization for ${outcome.domain} already exists: "${outcome.existingOrgName}". Use the join-request flow instead of registering an agent here.`, - existing_org_id: outcome.existingOrgId, - existing_org_name: outcome.existingOrgName, + if (typeof req.query.org !== 'string' || !req.query.org) { + res.status(403).json({ + error: 'organization_onboarding_disabled', + message: 'Select an existing organization explicitly with ?org= to register an agent.', }); return null; } - if (outcome.kind === 'corporate_email_required') { - // Shouldn't happen — `is_personal` is derived from `isFreeEmail`. - res.status(400).json({ error: 'Corporate email required' }); - return null; - } - res.status(400).json({ - error: 'Auto-bootstrap failed', - message: `Could not auto-create an organization for this user (${outcome.kind}). Call POST /api/organizations explicitly.`, - }); - return null; - } - - function deriveDefaultOrgName( - user: { email: string; firstName?: string; lastName?: string }, - isPersonal: boolean, - ): string { - if (isPersonal) { - const suffix = "'s Workspace"; - const fullName = [user.firstName, user.lastName] - .filter(Boolean) - .join(' ') - .normalize('NFC') - .replace(/[^\p{L}\p{N} \-_'.‘’]/gu, '') - .replace(/\s+/g, ' ') - .trim() - .replace(/^[^\p{L}\p{N}]+/u, '') - .substring(0, 100 - suffix.length); - return fullName ? `${fullName}${suffix}` : 'Personal Workspace'; - } - const domain = getCompanyDomain(user.email) || ''; - const root = domain.split('.')[0] || 'Organization'; - return root.charAt(0).toUpperCase() + root.slice(1); + const orgId = await resolveOrgOrSendError(req, res); + return orgId ? { orgId, orgAutoCreated: false } : null; } type AgentRegistrationValidation = @@ -451,7 +354,7 @@ export function createMemberAgentsRouter(config: MemberAgentsRouterConfig): Rout // POST /api/me/agents — register or update a single agent (idempotent on url) router.post('/', requireAuth, brandCreationRateLimiter, async (req, res) => { try { - const resolved = await resolveOrAutoBootstrapOrg(req, res); + const resolved = await resolveExplicitRegistrationOrg(req, res); if (!resolved) return; const { orgId, orgAutoCreated } = resolved; diff --git a/server/src/routes/member-profiles.ts b/server/src/routes/member-profiles.ts index 4b28e3b9397..c3d7d9f67ed 100644 --- a/server/src/routes/member-profiles.ts +++ b/server/src/routes/member-profiles.ts @@ -19,17 +19,11 @@ import { query, getPool } from "../db/client.js"; import { MemberDatabase } from "../db/member-db.js"; import { BrandDatabase, canSurfaceBrandForMember, resolveBrandFromJson } from "../db/brand-db.js"; import { BrandManager } from "../brand-manager.js"; -import { OrganizationDatabase, hasApiAccess, readMembershipTierFromClient, resolveMembershipTier, VALID_REVENUE_TIERS, VALID_MEMBERSHIP_TIERS } from "../db/organization-db.js"; +import { OrganizationDatabase, hasApiAccess, readMembershipTierFromClient, resolveMembershipTier } from "../db/organization-db.js"; import { canonicalizeAgentUrl } from "../db/publisher-db.js"; import { OrgKnowledgeDatabase } from "../db/org-knowledge-db.js"; -import { linkDomain } from "../db/organization-domains-db.js"; -import { autoLinkByVerifiedDomain } from "../db/membership-db.js"; import { resolvePrimaryOrganization } from "../db/users-db.js"; import { AAO_HOST } from "../config/aao.js"; -import { COMPANY_TYPE_VALUES } from "../config/company-types.js"; -import { getCompanyDomain } from "../utils/email-domain.js"; -import { emailPrefsDb } from "../db/email-preferences-db.js"; -import { slugify } from "../services/collection-feed-sync.js"; import { verifyAgentHostname, buildUnverifiedHostnameMessage, @@ -42,12 +36,6 @@ import { memberProfileBootstrapRateLimiter, } from "../middleware/rate-limit.js"; -// Membership tiers a caller may set via the REST bootstrap body. Paid tiers -// (`individual_professional`, `company_*`) require a successful Stripe -// checkout — accepting them here would let a caller stamp a paid tier on -// the org row without billing, fooling any downstream gate that reads -// `membership_tier` directly without also checking `subscription_status`. -const BOOTSTRAP_ALLOWED_MEMBERSHIP_TIERS = ['individual_academic'] as const; import { VALID_MEMBER_OFFERINGS, isValidAgentVisibility, isValidAgentType } from "../types.js"; import type { MemberBrandInfo, AgentVisibility, AgentConfig, AgentType } from "../types.js"; import type { CrawlerService } from "../crawler.js"; @@ -257,422 +245,6 @@ export function createMemberProfileRouter(config: MemberProfileRoutesConfig): Ro const { workos, memberDb, brandDb, orgDb, invalidateMemberContextCache } = config; const router = Router(); - // Domain-shape regex for corporate_domain — same coarse "looks-like-a-domain" - // check used in the org-creation path. Tighter validation (TLD presence, - // length per label) is applied implicitly by the email-domain match below. - const DOMAIN_RE = /^[a-z0-9]([a-z0-9-]*[a-z0-9])?(\.[a-z0-9]([a-z0-9-]*[a-z0-9])?)+$/; - - // Render the spec MemberProfile shape from the DB profile + organization - // rows. This is the response shape documented in - // static/openapi/registry.yaml#MemberProfile — distinct from the legacy - // dashboard JSON which exposes the raw member_profiles row (display_name, - // slug, etc.). Required fields: organization_id, organization_name, - // company_type, corporate_domain, created_at, agents. - function toSpecMemberProfile( - profile: any, - org: any, - corporateDomain: string, - brandPrimaryDomain: string | null, - ): Record { - const created = profile?.created_at instanceof Date - ? profile.created_at.toISOString() - : profile?.created_at; - return { - organization_id: profile.workos_organization_id, - organization_name: org?.name ?? profile.display_name, - company_type: org?.company_type ?? null, - ...(org?.revenue_tier ? { revenue_tier: org.revenue_tier } : {}), - corporate_domain: corporateDomain, - // After Stage 2 of #4159, brand-primary lives on - // organization_domains.is_primary and is resolved via getBrandPrimaryDomain. - // Caller passes the resolved value through so this function stays pure. - ...(brandPrimaryDomain ? { primary_brand_domain: brandPrimaryDomain } : {}), - ...(org?.membership_tier ? { membership_tier: org.membership_tier } : {}), - created_at: created, - agents: Array.isArray(profile.agents) ? profile.agents : [], - }; - } - - // Pick a unique slug from the organization name. Mirrors the helper in - // services/member-profile-autopublish.ts but kept inline so the bootstrap - // path doesn't import a publish-side module. - async function pickAvailableSlug(orgName: string): Promise { - const base = slugify(orgName) || 'member'; - if (await memberDb.isSlugAvailable(base)) return base; - for (let i = 2; i <= 99; i++) { - const candidate = `${base}-${i}`; - if (await memberDb.isSlugAvailable(candidate)) return candidate; - } - return `${base}-${Date.now()}`; - } - - // POST /api/me/member-profile bootstrap path. Documented contract in - // static/openapi/registry.yaml. Idempotent on the (org, profile) pair: - // re-posting against an org that already has a profile returns 200 with - // the existing profile and a `profile_already_exists` warning, NOT 409 — - // the dashboard create flow returns 409 by design (caller should switch - // to PUT), but the REST bootstrap surface is consumed by automation that - // benefits from retry-friendly idempotency. - async function handleBootstrapMemberProfile(req: any, res: any, startTime: number) { - try { - const user = req.user!; - const requestedOrgId = req.query.org as string | undefined; - const { - organization_name, - company_type, - revenue_tier, - corporate_domain, - marketing_opt_in, - membership_tier, - } = req.body as Record; - // After Stage 2 of #4159, brand-primary lives on - // organization_domains.is_primary, not on the member profile. Members - // set it via the Linked Domains UI (PR #4179) or it auto-promotes - // from a verified WorkOS email domain. The bootstrap endpoint no - // longer accepts primary_brand_domain — silently ignored if old - // clients still pass it. - - const trimmedName = typeof organization_name === 'string' ? organization_name.trim() : ''; - if (!trimmedName || trimmedName.length > 200) { - return res.status(400).json({ - error: 'Invalid organization_name', - message: 'organization_name is required and must be 1-200 characters', - }); - } - if (typeof company_type !== 'string' || !(COMPANY_TYPE_VALUES as readonly string[]).includes(company_type)) { - return res.status(400).json({ - error: 'Invalid company_type', - message: `company_type must be one of: ${COMPANY_TYPE_VALUES.join(', ')}`, - }); - } - const corporateDomain = typeof corporate_domain === 'string' - ? corporate_domain.toLowerCase().trim() - : ''; - if (!corporateDomain || corporateDomain.length > 253 || !DOMAIN_RE.test(corporateDomain)) { - return res.status(400).json({ - error: 'Invalid corporate_domain', - message: 'corporate_domain must be a valid domain like "acme.com"', - }); - } - if (revenue_tier !== undefined && (typeof revenue_tier !== 'string' || !(VALID_REVENUE_TIERS as readonly string[]).includes(revenue_tier))) { - return res.status(400).json({ - error: 'Invalid revenue_tier', - message: `revenue_tier must be one of: ${VALID_REVENUE_TIERS.join(', ')}`, - }); - } - if (membership_tier !== undefined) { - if (typeof membership_tier !== 'string' || !(VALID_MEMBERSHIP_TIERS as readonly string[]).includes(membership_tier)) { - return res.status(400).json({ - error: 'Invalid membership_tier', - message: `membership_tier must be one of: ${VALID_MEMBERSHIP_TIERS.join(', ')}`, - }); - } - // Paid tiers cannot be claimed via this endpoint — they require a - // successful Stripe checkout. Accepting `company_leader` etc. here - // would write the tier to the org row without billing, and any - // downstream gate that reads `membership_tier` directly (rather - // than `subscription_status`) could be fooled into granting paid - // entitlements. Direct callers to the dashboard /membership page. - if (!(BOOTSTRAP_ALLOWED_MEMBERSHIP_TIERS as readonly string[]).includes(membership_tier)) { - return res.status(400).json({ - error: 'Paid tier requires checkout', - message: `membership_tier '${membership_tier}' requires a Stripe checkout session — it cannot be claimed via this endpoint. Either omit, set 'individual_academic', or complete checkout via /dashboard/membership and let the webhook stamp the paid tier on the org.`, - }); - } - } - // Email-domain match. getCompanyDomain returns null for personal-email - // domains (gmail.com, yahoo.com, etc.) — those cannot bootstrap a - // corporate profile. Mismatch between the verified email domain and - // the supplied corporate_domain is also rejected. - const userCompanyDomain = getCompanyDomain(user.email); - if (!userCompanyDomain) { - return res.status(403).json({ - error: 'Personal email domain', - message: 'Personal email domains cannot register a corporate member profile. Sign in with a corporate email and try again.', - }); - } - if (userCompanyDomain !== corporateDomain) { - return res.status(403).json({ - error: 'Domain mismatch', - message: `corporate_domain must match your email domain (${userCompanyDomain}).`, - }); - } - - // Resolve target org. Mirrors the legacy POST resolver below. - let targetOrgId: string; - const isDevUserProfile = isDevModeEnabled() - && Object.values(DEV_USERS).some(du => du.id === user.id) - && requestedOrgId?.startsWith('org_dev_'); - if (isDevUserProfile) { - const localOrg = await orgDb.getOrganization(requestedOrgId!); - if (!localOrg) { - return res.status(404).json({ - error: 'Organization not found', - message: 'The requested organization does not exist', - }); - } - targetOrgId = requestedOrgId!; - } else { - let memberships = await workos!.userManagement.listOrganizationMemberships({ - userId: user.id, - }); - const linked = await autoLinkByVerifiedDomain(workos!, user.id, user.email); - if (linked) { - memberships = await workos!.userManagement.listOrganizationMemberships({ - userId: user.id, - }); - } - const selectedMembership = selectedOrganizationMembership(memberships.data, requestedOrgId); - if (!selectedMembership) { - return res.status(requestedOrgId ? 403 : 404).json({ - error: requestedOrgId ? 'Not authorized' : 'No organization', - message: requestedOrgId - ? 'User is not an active member of the requested organization' - : 'User has no active organization membership. Create one via POST /api/organizations first.', - }); - } - targetOrgId = selectedMembership.organizationId; - } - - // Idempotency: existing profile → 200 with current state and a warning, - // not 409. Documented in the spec as the retry-safe behavior. - // Source `corporate_domain` for the response from the org's primary - // verified domain row, not from whatever the caller sent. A multi-domain - // org may legitimately have multiple email-domain memberships; echoing - // the caller's value would leak that detail and could mislead the - // caller about which domain actually owns their profile. - const resolvePrimaryDomain = async (orgId: string, fallback: string): Promise => { - const r = await getPool().query<{ domain: string }>( - `SELECT domain FROM organization_domains - WHERE workos_organization_id = $1 AND is_primary = true AND verified = true - ORDER BY domain ASC - LIMIT 1`, - [orgId], - ); - return r.rows[0]?.domain ?? fallback; - }; - - const existingProfile = await memberDb.getProfileByOrgId(targetOrgId); - if (existingProfile) { - const existingOrg = await orgDb.getOrganization(targetOrgId); - const primaryDomain = await resolvePrimaryDomain(targetOrgId, corporateDomain); - const brandPrimaryDomain = await getBrandPrimaryDomain(targetOrgId); - logger.info({ userId: user.id, orgId: targetOrgId, durationMs: Date.now() - startTime }, 'POST /api/me/member-profile (bootstrap) idempotent hit'); - return res.status(200).json({ - profile: toSpecMemberProfile(existingProfile, existingOrg, primaryDomain, brandPrimaryDomain), - warnings: [{ - code: 'profile_already_exists', - message: 'Member profile already exists for this organization; no fields were mutated.', - }], - }); - } - - // First-time bootstrap: persist the org metadata captured on the form, - // then ensure the corporate domain is recorded as verified (so brand - // resolution + the agent endpoints work), then create the profile. - // - // Org metadata writes are first-time-only. If a field is already set - // (e.g. an admin set `company_type` via the dashboard, or the org - // was bootstrapped in a prior call), we do not overwrite — we surface - // a `metadata_unchanged` warning instead so the caller knows their - // body value was ignored. Without this gate, any caller with a - // matching email domain could clobber org-level fields a workspace - // admin had already curated. - const existingOrg = await orgDb.getOrganization(targetOrgId); - const orgUpdates: Record = {}; - const metadataIgnoredApiFields: string[] = []; - // Map DB column → public API field name. Callers know about - // `organization_name`, not the underlying `organizations.name` column; - // the response-side warning must speak the API's vocabulary. - const COLUMN_TO_API_FIELD: Record = { - name: 'organization_name', - company_type: 'company_type', - revenue_tier: 'revenue_tier', - membership_tier: 'membership_tier', - }; - const considerField = ( - bodyValue: unknown, - column: 'name' | 'company_type' | 'revenue_tier' | 'membership_tier', - ): void => { - if (bodyValue === undefined || bodyValue === null || bodyValue === '') return; - const currentValue = existingOrg ? (existingOrg as any)[column] : null; - if (currentValue === null || currentValue === undefined || currentValue === '') { - (orgUpdates as any)[column] = bodyValue; - } else if (currentValue !== bodyValue) { - metadataIgnoredApiFields.push(COLUMN_TO_API_FIELD[column]); - } - }; - considerField(trimmedName, 'name'); - considerField(company_type, 'company_type'); - considerField(revenue_tier, 'revenue_tier'); - considerField(membership_tier, 'membership_tier'); - if (Object.keys(orgUpdates).length > 0) { - try { - await orgDb.updateOrganization(targetOrgId, orgUpdates); - } catch (err) { - logger.warn({ err, orgId: targetOrgId }, 'Failed to update org metadata during member-profile bootstrap'); - } - } - - // Mirror the email-verified domain insert from the org creation path, - // but check for a pre-existing claim explicitly so we can surface a - // `domain_already_claimed` warning rather than silently no-op'ing - // the link-up. Without this, a caller from acme.com whose domain - // is already bound to a different org would walk away with a profile - // on this org and no domain link — half-broken state, no signal. - // We still create the profile so programmatic callers aren't blocked - // on an admin-resolvable issue. - let domainConflictOrgId: string | null = null; - try { - const result = await linkDomain({ - orgId: targetOrgId, - domain: corporateDomain, - source: 'email_verification', - verified: true, - isPrimary: true, - }); - domainConflictOrgId = result.conflictOrgId; - } catch (err) { - logger.warn({ err, orgId: targetOrgId, domain: corporateDomain }, 'Failed to write organization_domains during bootstrap'); - } - - const slug = await pickAvailableSlug(trimmedName); - - const profile = await memberDb.createProfile({ - workos_organization_id: targetOrgId, - display_name: trimmedName, - slug, - // Default privacy posture for a bootstrapped profile is private — - // the caller can flip is_public via PUT /api/me/member-profile/visibility - // once they have an active subscription. The legacy POST path applies - // the same gating; this surface deliberately doesn't accept is_public. - is_public: false, - show_in_carousel: false, - }); - - // Best-effort marketing opt-in record. Failures must not block bootstrap. - if (typeof marketing_opt_in === 'boolean') { - try { - await emailPrefsDb.setMarketingOptInIfNotSet({ - workos_user_id: user.id, - email: user.email, - optIn: marketing_opt_in, - }); - } catch (err) { - logger.warn({ err, userId: user.id }, 'Failed to record marketing opt-in during bootstrap'); - } - } - - // Record Terms-of-Service and Privacy-Policy acceptance from the - // request context, mirroring the org-creation flow. The OpenAPI body - // documents `marketing_opt_in` as "Independent of Terms of Service - // consent (which is required and recorded server-side from the - // request context)" — without this block that claim is fiction. - // Best-effort; an audit-row failure must not roll back a successful - // profile create. - try { - const tosAgreement = await orgDb.getCurrentAgreementByType('terms_of_service'); - const privacyAgreement = await orgDb.getCurrentAgreementByType('privacy_policy'); - const ipAddress = req.ip - || (typeof req.headers['x-forwarded-for'] === 'string' ? (req.headers['x-forwarded-for'] as string) : 'unknown'); - const userAgent = (req.headers['user-agent'] as string) || 'unknown'; - if (tosAgreement) { - await orgDb.recordUserAgreementAcceptance({ - workos_user_id: user.id, - email: user.email, - agreement_type: 'terms_of_service', - agreement_version: tosAgreement.version, - ip_address: ipAddress, - user_agent: userAgent, - workos_organization_id: targetOrgId, - }); - } - if (privacyAgreement) { - await orgDb.recordUserAgreementAcceptance({ - workos_user_id: user.id, - email: user.email, - agreement_type: 'privacy_policy', - agreement_version: privacyAgreement.version, - ip_address: ipAddress, - user_agent: userAgent, - workos_organization_id: targetOrgId, - }); - } - } catch (err) { - logger.warn({ err, userId: user.id, orgId: targetOrgId }, 'Failed to record ToS / privacy-policy acceptance during bootstrap'); - } - - // Audit-log the bootstrap so org-level mutations (verified domain - // insert, metadata writes) are attributable. Failures here must not - // roll back the profile create — the row is already on disk and the - // call has materially succeeded — so we log-and-swallow. - try { - await orgDb.recordAuditLog({ - workos_organization_id: targetOrgId, - workos_user_id: user.id, - action: 'member_profile_bootstrapped', - resource_type: 'member_profile', - resource_id: profile.id, - details: { - slug, - corporate_domain: corporateDomain, - updated_fields: Object.keys(orgUpdates), - ignored_fields: metadataIgnoredApiFields, - domain_conflict_org_id: domainConflictOrgId, - ...(typeof company_type === 'string' ? { company_type } : {}), - ...(typeof revenue_tier === 'string' ? { revenue_tier } : {}), - ...(typeof membership_tier === 'string' ? { membership_tier } : {}), - ...(typeof marketing_opt_in === 'boolean' ? { marketing_opt_in } : {}), - }, - }); - } catch (err) { - logger.warn({ err, orgId: targetOrgId, profileId: profile.id }, 'Failed to write audit log for member-profile bootstrap'); - } - - invalidateMemberContextCache(); - - const refreshedOrg = await orgDb.getOrganization(targetOrgId); - const primaryDomain = await resolvePrimaryDomain(targetOrgId, corporateDomain); - logger.info({ - profileId: profile.id, - orgId: targetOrgId, - slug, - durationMs: Date.now() - startTime, - metadataIgnoredApiFields, - domainConflictOrgId, - }, 'POST /api/me/member-profile (bootstrap) completed'); - - const warnings: Array> = []; - if (metadataIgnoredApiFields.length > 0) { - warnings.push({ - code: 'metadata_unchanged', - fields: metadataIgnoredApiFields, - message: - 'Some org metadata fields were already set on the organization and were not overwritten. Update them via the dashboard or PUT /api/organizations/:orgId if you need to change them.', - }); - } - if (domainConflictOrgId) { - warnings.push({ - code: 'domain_already_claimed', - domain: corporateDomain, - message: - `corporate_domain '${corporateDomain}' is already linked to a different organization, so it was not attached to this profile's organization. The profile was created, but registry surfaces that resolve via the verified domain (e.g. brand.json publish) won't reflect it. Email support@agenticadvertising.org to resolve the domain ownership.`, - }); - } - - const newBrandPrimaryDomain = await getBrandPrimaryDomain(targetOrgId); - return res.status(201).json({ - profile: toSpecMemberProfile(profile, refreshedOrg, primaryDomain, newBrandPrimaryDomain), - ...(warnings.length ? { warnings } : {}), - }); - } catch (error) { - logger.error({ err: error, durationMs: Date.now() - startTime }, 'POST /api/me/member-profile (bootstrap) error'); - return res.status(500).json({ - error: 'Failed to create member profile', - }); - } - } - // GET /api/me/member-profile - Get current user's organization's member profile router.get('/', requireAuth, async (req, res) => { const startTime = Date.now(); @@ -716,18 +288,10 @@ export function createMemberProfileRouter(config: MemberProfileRoutesConfig): Ro } // Get user's organization memberships - let memberships = await workos!.userManagement.listOrganizationMemberships({ + const memberships = await workos!.userManagement.listOrganizationMemberships({ userId: user.id, }); - // Auto-link any verified-domain orgs the user isn't yet in. - // Helper short-circuits when the user is already a cached member. - const linked = await autoLinkByVerifiedDomain(workos!, user.id, user.email); - if (linked) { - memberships = await workos!.userManagement.listOrganizationMemberships({ - userId: user.id, - }); - } const selectedMembership = selectedOrganizationMembership(memberships.data, requestedOrgId); if (!selectedMembership) { @@ -791,7 +355,10 @@ export function createMemberProfileRouter(config: MemberProfileRoutesConfig): Ro // handler below so /community/profile-edit and /member-profile.html stay // wired to the existing semantics (409 on conflict, full profile body). if (isMemberProfileBootstrapBody(req.body)) { - return handleBootstrapMemberProfile(req, res, startTime); + return res.status(403).json({ + error: 'organization_onboarding_disabled', + message: 'Member profile bootstrap is temporarily unavailable.', + }); } try { const user = req.user!; @@ -871,18 +438,10 @@ export function createMemberProfileRouter(config: MemberProfileRoutesConfig): Ro logger.info({ userId: user.id, orgId: targetOrgId }, 'POST /api/me/member-profile: dev mode bypass'); } else { // Get user's organization memberships - let memberships = await workos!.userManagement.listOrganizationMemberships({ + const memberships = await workos!.userManagement.listOrganizationMemberships({ userId: user.id, }); - // Auto-link any verified-domain orgs the user isn't yet in. - // Helper short-circuits when the user is already a cached member. - const linked = await autoLinkByVerifiedDomain(workos!, user.id, user.email); - if (linked) { - memberships = await workos!.userManagement.listOrganizationMemberships({ - userId: user.id, - }); - } const selectedMembership = selectedOrganizationMembership(memberships.data, requestedOrgId); if (!selectedMembership) { @@ -1187,18 +746,10 @@ export function createMemberProfileRouter(config: MemberProfileRoutesConfig): Ro logger.info({ userId: user.id, orgId: targetOrgId }, 'PUT /api/me/member-profile: dev mode bypass'); } else { // Get user's organization memberships - let memberships = await workos!.userManagement.listOrganizationMemberships({ + const memberships = await workos!.userManagement.listOrganizationMemberships({ userId: user.id, }); - // Auto-link any verified-domain orgs the user isn't yet in. - // Helper short-circuits when the user is already a cached member. - const linked = await autoLinkByVerifiedDomain(workos!, user.id, user.email); - if (linked) { - memberships = await workos!.userManagement.listOrganizationMemberships({ - userId: user.id, - }); - } const selectedMembership = selectedOrganizationMembership(memberships.data, requestedOrgId); if (!selectedMembership) { diff --git a/server/src/routes/organization-membership-mutations.ts b/server/src/routes/organization-membership-mutations.ts new file mode 100644 index 00000000000..0696839577c --- /dev/null +++ b/server/src/routes/organization-membership-mutations.ts @@ -0,0 +1,465 @@ +import type { Request, RequestHandler, Router } from 'express'; +import type { OrganizationMembership, Invitation } from '@workos-inc/node'; +import { getOrganizationAuthorizationUserId } from '../auth/organization-principal.js'; +import { requireAuth } from '../middleware/auth.js'; +import { excludeOrganizationAuthorizationObservation } from '../middleware/organization-authorization-observer.js'; +import { invitationRateLimiter } from '../middleware/rate-limit.js'; +import { validateEmail } from '../middleware/validation.js'; +import { invalidateMembershipCache } from '../db/org-filters.js'; +import type { JoinRequest } from '../db/join-request-db.js'; +import type { SeatType, SeatUpgradeRequest } from '../db/organization-db.js'; +import { + MembershipMutationError, OrganizationMembershipMutation as Mutation, + isMembershipRole, mutationDenied, toPublicMembershipMutationError, type MutationReply, type Role, +} from '../services/organization-membership-mutation.js'; +import { createLogger } from '../logger.js'; +import { notifyMemberSeatChanged } from '../slack/org-group-dm.js'; +import { notifyMembershipSeats, notifyMembershipSeatRequest } from '../services/organization-membership-notifications.js'; + +const logger = createLogger('organization-membership-routes'); +function invalid(message: string): never { throw new MembershipMutationError(400, message); } +function conflict(message: string): never { throw new MembershipMutationError(409, message); } +function notFound(message: string): never { throw new MembershipMutationError(404, message); } + +function emailInput(value: unknown): string { + if (typeof value !== 'string') invalid('email is required'); + const result = validateEmail(value); + if (!result.valid) invalid(result.error ?? 'Invalid email'); + return value.trim().toLowerCase(); +} +function roleInput(value: unknown, allowOwner = true): Role { + const role = value === undefined ? 'member' : value; + if (!isMembershipRole(role) || (!allowOwner && role === 'owner')) invalid('Invalid role'); + return role; +} +function seatInput(value: unknown): SeatType { + if (value === undefined) return 'community_only'; + if (value !== 'contributor' && value !== 'community_only') invalid('Invalid seat type'); + return value; +} +function assignRole(tx: Mutation, role: Role): void { + if (role === 'owner' && tx.role !== 'owner') mutationDenied('Only owners can assign the owner role'); +} +function memberBinding(tx: Mutation, member: OrganizationMembership, userId?: string): void { + if (member.organizationId !== tx.orgId || (userId !== undefined && member.userId !== userId)) notFound('Member not found'); + if (member.status !== 'active' || !isMembershipRole(member.role?.slug)) conflict('Member is not active'); +} + +function expectMember(tx: Mutation, member: OrganizationMembership): void { + const { id, userId, organizationId, status } = member; + const role = member.role.slug; + tx.expectTarget(id, async () => { + const current = await tx.workos.userManagement.getOrganizationMembership(id); + if (current.id !== id || current.userId !== userId || current.organizationId !== organizationId + || current.status !== status || current.role?.slug !== role) conflict('Target membership changed; retry the request'); + }); +} + +function expectInvitation( + tx: Mutation, + invitation: Invitation, + expectedState = invitation.state, + requireOpen = false, +): void { + const { id, organizationId, email, expiresAt } = invitation; + tx.expectTarget(id, async () => { + const current = await tx.workos.userManagement.getInvitation(id); + const currentExpiry = Date.parse(current.expiresAt); + if (current.id !== id || current.organizationId !== organizationId || current.email !== email + || current.expiresAt !== expiresAt || current.state !== expectedState + || (requireOpen && (current.state !== 'pending' || !Number.isFinite(currentExpiry) || currentExpiry <= Date.now()))) { + conflict('Invitation changed; retry the request'); + } + }); +} + +async function targetMember(tx: Mutation, id: string, userId?: string): Promise { + const member = await tx.readProvider(() => tx.workos.userManagement.getOrganizationMembership(id)); + if (member.id !== id) notFound('Member not found'); + memberBinding(tx, member, userId); + const [local] = await tx.rows('SELECT workos_membership_id, role FROM organization_memberships WHERE workos_organization_id = $1 AND workos_user_id = $2', [tx.orgId, member.userId]); + if (!local || local.workos_membership_id !== member.id || local.role !== member.role.slug) conflict('Membership mirror is not current; retry after synchronization'); + expectMember(tx, member); + return member; +} + +async function lastOwner(tx: Mutation, member: OrganizationMembership, role: Role): Promise { + if (member.role.slug !== 'owner' || role === 'owner') return; + let after: string | undefined; + const cursors = new Set(); + const owners = new Map(); + do { + const page = await tx.readProvider(() => tx.workos.userManagement.listOrganizationMemberships({ organizationId: tx.orgId, statuses: ['active'], limit: 100, after })); + for (const row of page.data) { + if (row.organizationId === tx.orgId && row.status === 'active' && row.role?.slug === 'owner') owners.set(row.userId, row); + } + after = page.listMetadata?.after ?? undefined; + if (after && cursors.has(after)) throw new MembershipMutationError(503, 'Owner inventory unavailable'); + if (after) cursors.add(after); + } while (after); + const localOwners = await tx.rows<{ workos_user_id: string; workos_membership_id: string }>("SELECT workos_user_id, workos_membership_id FROM organization_memberships WHERE workos_organization_id = $1 AND role = 'owner'", [tx.orgId]); + const survivor = localOwners.find(row => row.workos_user_id !== member.userId && owners.get(row.workos_user_id)?.id === row.workos_membership_id); + if (!owners.has(member.userId) || !survivor) conflict('The last owner cannot be demoted'); + expectMember(tx, owners.get(survivor.workos_user_id)!); + tx.expectTarget(`owner-mirror:${survivor.workos_user_id}`, async () => { + const rows = await tx.rows("SELECT 1 FROM organization_memberships WHERE workos_organization_id = $1 AND workos_user_id = $2 AND workos_membership_id = $3 AND role = 'owner'", [tx.orgId, survivor.workos_user_id, survivor.workos_membership_id]); + if (rows.length !== 1) conflict('The remaining owner changed; retry the request'); + }); +} + +async function roleChangeAllowed(tx: Mutation, member: OrganizationMembership, role: Role): Promise { + if (member.userId === tx.actorId) invalid('Cannot change own role'); + assignRole(tx, role); + if (member.role.slug === 'owner' && tx.role !== 'owner') mutationDenied("Only owners can change another owner's role"); + await lastOwner(tx, member, role); +} + +async function insertMember(tx: Mutation, member: OrganizationMembership, email: string, seat: SeatType): Promise { + await tx.write( + `INSERT INTO organization_memberships (workos_user_id, workos_organization_id, workos_membership_id, email, role, seat_type, provisioning_source) + VALUES ($1, $2, $3, $4, $5, $6, 'admin_added') + ON CONFLICT (workos_user_id, workos_organization_id) DO UPDATE + SET role = EXCLUDED.role, seat_type = EXCLUDED.seat_type, updated_at = NOW() + WHERE organization_memberships.workos_membership_id = EXCLUDED.workos_membership_id + AND organization_memberships.role = EXCLUDED.role + RETURNING id`, [member.userId, tx.orgId, member.id, email, member.role.slug, seat], + ); +} + +async function createMember(tx: Mutation, userId: string, role: Role): Promise { + assignRole(tx, role); + const member = await tx.providerWrite('create_membership', { user_id: userId, role }, () => tx.workos.userManagement.createOrganizationMembership({ userId, organizationId: tx.orgId, roleSlug: role }), async created => { + // Never delete an unrelated or subsequently promoted membership as compensation. + const current = await tx.workos.userManagement.getOrganizationMembership(created.id); + if (current.userId !== userId || current.organizationId !== tx.orgId || current.role?.slug !== role || current.status !== 'active') throw new Error('Created membership changed; manual reconciliation required'); + await tx.workos.userManagement.deleteOrganizationMembership(created.id); + }); + memberBinding(tx, member, userId); + if (member.role.slug !== role) throw new MembershipMutationError(503, 'Provider role does not match requested role'); + expectMember(tx, member); + return member; +} + +async function stageInvitation(tx: Mutation, invitation: Invitation, email: string, seat: SeatType): Promise { + await tx.write( + `INSERT INTO invitation_seat_types (workos_invitation_id, workos_organization_id, email, seat_type, source) + VALUES ($1, $2, $3, $4, 'invited') RETURNING workos_invitation_id`, + [invitation.id, tx.orgId, email, seat], + ); +} +async function sendInvitation(tx: Mutation, email: string, role: Role): Promise { + assignRole(tx, role); + const invitation = await tx.providerWrite('send_invitation', { email, role }, () => tx.workos.userManagement.sendInvitation({ + email, organizationId: tx.orgId, roleSlug: role, inviterUserId: tx.actorId, + }), async created => { + const current = await tx.workos.userManagement.getInvitation(created.id); + if (current.organizationId !== tx.orgId || current.email.toLowerCase() !== email || current.state !== 'pending') throw new Error('Invitation changed; manual reconciliation required'); + await tx.workos.userManagement.revokeInvitation(created.id); + }); + if (invitation.organizationId !== tx.orgId || invitation.email.toLowerCase() !== email || invitation.state !== 'pending') throw new MembershipMutationError(503, 'Provider invitation does not match the request'); + expectInvitation(tx, invitation, 'pending', true); + return invitation; +} + +async function invitationForMutation(tx: Mutation, id: string): Promise<{ invitation: Invitation; open: boolean }> { + const invitation = await tx.readProvider(() => tx.workos.userManagement.getInvitation(id)); + if (invitation.id !== id || invitation.organizationId !== tx.orgId) notFound('Invitation not found'); + const expiry = Date.parse(invitation.expiresAt); + if (!Number.isFinite(expiry)) conflict('Invitation changed; retry the request'); + const open = invitation.state === 'pending' && expiry > Date.now(); + const terminal = invitation.state === 'expired' || invitation.state === 'revoked' + || (invitation.state === 'pending' && expiry <= Date.now()); + if (!open && !terminal) conflict('Invitation is not pending or expired'); + expectInvitation(tx, invitation, invitation.state, open); + return { invitation, open }; +} + +function invitationReply(invitation: Invitation): Record { + return { id: invitation.id, email: invitation.email, state: invitation.state, expires_at: invitation.expiresAt, accept_invitation_url: invitation.acceptInvitationUrl }; +} + +function handler(minimumRole: Role, operation: (tx: Mutation, req: Request) => Promise): RequestHandler { + return async (req, res) => { + try { + const result = await Mutation.run(req, minimumRole, tx => operation(tx, req)); + res.status(result.status ?? 200).json(result.body); + } catch (error) { + logger.error({ error, actorId: req.user ? getOrganizationAuthorizationUserId(req.user) : undefined, orgId: req.params.orgId }, 'Membership mutation rejected'); + const publicError = toPublicMembershipMutationError(error); + res.status(publicError.status).json(publicError.body); + } + }; +} + +export function registerOrganizationMembershipMutations(router: Router): void { + for (const decision of ['approve', 'reject'] as const) { + router.post(`/:orgId/join-requests/:requestId/${decision}`, excludeOrganizationAuthorizationObservation, requireAuth, handler('admin', async (tx, req) => { + const role = decision === 'approve' ? roleInput(req.body?.role, false) : 'member'; + // Hold the request row through the provider call and local commit. A requester + // cancellation uses a conditional UPDATE on this same row, so approval and + // cancellation now have one database serialization point instead of allowing + // a provider membership to be created from a stale pending snapshot. + const [join] = await tx.rows( + 'SELECT * FROM organization_join_requests WHERE id = $1 AND workos_organization_id = $2 FOR UPDATE', + [req.params.requestId, tx.orgId], + ); + if (!join) notFound('Request not found'); + if (join.status !== 'pending') conflict('Request not pending'); + if (req.body?.reason !== undefined && typeof req.body.reason !== 'string') invalid('Invalid rejection reason'); + let member: OrganizationMembership | undefined; + if (decision === 'approve') { + await tx.requireTeam(); + await tx.seatAvailable('community_only'); + member = await createMember(tx, join.workos_user_id, role); + } + await tx.local([join.workos_user_id], async () => { + if (member) await insertMember(tx, member, join.user_email, 'community_only'); + await tx.write( + `UPDATE organization_join_requests SET status = $1, handled_by_user_id = $2, handled_at = NOW(), rejection_reason = $3, updated_at = NOW() + WHERE id = $4 AND workos_organization_id = $5 AND workos_user_id = $6 AND status = 'pending' RETURNING id`, + [decision === 'approve' ? 'approved' : 'rejected', tx.actorId, decision === 'reject' ? req.body?.reason ?? null : null, join.id, tx.orgId, join.workos_user_id], + ); + await tx.audit(decision === 'approve' ? 'join_request_approved' : 'join_request_rejected', 'join_request', join.id, { requester_user_id: join.workos_user_id, role_assigned: member ? role : undefined }); + }); + if (member) tx.afterCommit.push(() => notifyMembershipSeats(tx.workos, tx.orgId, 'added', { email: join.user_email, role, seat: 'community_only' })); + return { body: { success: true } }; + })); + } + + router.post('/:orgId/invitations', excludeOrganizationAuthorizationObservation, requireAuth, invitationRateLimiter, handler('admin', async (tx, req) => { + const email = emailInput(req.body?.email); + const role = roleInput(req.body?.role); + const seat = seatInput(req.body?.seat_type); + assignRole(tx, role); + await tx.requireTeam(); + await tx.seatAvailable(seat); + const invitation = await sendInvitation(tx, email, role); + await tx.local([], async () => { + await stageInvitation(tx, invitation, email, seat); + await tx.audit('member_invited', 'invitation', invitation.id, { email, role, seat_type: seat }); + }); + return { body: { success: true, invitation: invitationReply(invitation) } }; + })); + + router.delete('/:orgId/invitations/:invitationId', excludeOrganizationAuthorizationObservation, requireAuth, handler('admin', async (tx, req) => { + const { invitation, open } = await invitationForMutation(tx, req.params.invitationId); + const stages = await tx.rows('SELECT workos_invitation_id FROM invitation_seat_types WHERE workos_invitation_id = $1 AND workos_organization_id = $2', [invitation.id, tx.orgId]); + if (open) { + await tx.providerWrite('revoke_invitation', { invitation_id: invitation.id }, () => tx.workos.userManagement.revokeInvitation(invitation.id)); + expectInvitation(tx, invitation, 'revoked'); + } + await tx.local([], async () => { + await tx.write('DELETE FROM invitation_seat_types WHERE workos_invitation_id = $1 AND workos_organization_id = $2', [invitation.id, tx.orgId], stages.length); + await tx.audit(open ? 'invitation_revoked' : 'invitation_reservation_released', 'invitation', invitation.id, { + email: invitation.email, + provider_state: invitation.state, + expired: !open, + }); + }); + return { body: { success: true, message: 'Invitation revoked successfully' } }; + })); + + router.post('/:orgId/invitations/:invitationId/resend', excludeOrganizationAuthorizationObservation, requireAuth, handler('admin', async (tx, req) => { + const { invitation: old, open } = await invitationForMutation(tx, req.params.invitationId); + const stages = await tx.rows<{ seat_type: SeatType }>('SELECT seat_type FROM invitation_seat_types WHERE workos_invitation_id = $1 AND workos_organization_id = $2', [old.id, tx.orgId]); + const seat = stages[0]?.seat_type ?? 'community_only'; + await tx.requireTeam(); + if (!stages.length) await tx.seatAvailable(seat); + if (open) { + await tx.providerWrite('revoke_invitation', { invitation_id: old.id }, () => tx.workos.userManagement.revokeInvitation(old.id)); + expectInvitation(tx, old, 'revoked'); + } + const invitation = await sendInvitation(tx, old.email.toLowerCase(), 'member'); + await tx.local([], async () => { + await tx.write('DELETE FROM invitation_seat_types WHERE workos_invitation_id = $1 AND workos_organization_id = $2', [old.id, tx.orgId], stages.length); + await stageInvitation(tx, invitation, old.email, seat); + await tx.audit('invitation_resent', 'invitation', invitation.id, { + email: old.email, + old_invitation_id: old.id, + old_provider_state: old.state, + seat_type: seat, + }); + }); + return { body: { success: true, invitation: invitationReply(invitation) } }; + })); + + router.post('/:orgId/domain-users/add', excludeOrganizationAuthorizationObservation, requireAuth, handler('admin', async (tx, req) => { + const email = emailInput(req.body?.email); + const role = roleInput(req.body?.role, false); + await tx.requireTeam(); + const domains = await tx.rows<{ domain: string }>('SELECT domain FROM organization_domains WHERE workos_organization_id = $1 AND verified = true', [tx.orgId]); + if (!domains.some(row => row.domain.toLowerCase() === email.split('@')[1])) invalid('Domain not verified'); + const mappings = await tx.rows<{ workos_user_id: string | null }>('SELECT workos_user_id FROM slack_user_mappings WHERE LOWER(slack_email) = $1', [email]); + if (mappings.length !== 1) invalid('User mapping not found or ambiguous'); + await tx.seatAvailable('community_only'); + const userId = mappings[0].workos_user_id; + if (!userId) { + const invitation = await sendInvitation(tx, email, role); + await tx.local([], async () => { + await stageInvitation(tx, invitation, email, 'community_only'); + await tx.audit('member_invited', 'invitation', invitation.id, { email, role, method: 'domain_auto_add' }); + }); + return { body: { success: true, action: 'invited', invitation: invitationReply(invitation) } }; + } + const user = await tx.readProvider(() => tx.workos.userManagement.getUser(userId)); + if (user.id !== userId || user.email.toLowerCase() !== email) conflict('User mapping is not current'); + const existing = await tx.readProvider(() => tx.workos.userManagement.listOrganizationMemberships({ userId, organizationId: tx.orgId, statuses: ['active', 'inactive', 'pending'] })); + if (existing.data.some(row => row.userId === userId && row.organizationId === tx.orgId)) conflict('Membership or pending invitation already exists'); + const member = await createMember(tx, userId, role); + await tx.local([userId], async () => { + await insertMember(tx, member, email, 'community_only'); + const requests = await tx.rows<{ id: string }>("SELECT id FROM organization_join_requests WHERE workos_organization_id = $1 AND workos_user_id = $2 AND status = 'pending' FOR UPDATE", [tx.orgId, userId]); + for (const join of requests) await tx.write("UPDATE organization_join_requests SET status = 'cancelled', handled_by_user_id = $1, handled_at = NOW() WHERE id = $2 AND workos_organization_id = $3 AND workos_user_id = $4 AND status = 'pending'", [tx.actorId, join.id, tx.orgId, userId]); + await tx.audit('member_added', 'membership', member.id, { target_user_id: userId, email, role, method: 'domain_auto_add' }); + }); + tx.afterCommit.push(() => notifyMembershipSeats(tx.workos, tx.orgId, 'added', { email, role, seat: 'community_only' })); + return { body: { success: true, action: 'added', membership: { id: member.id, userId, role } } }; + })); + + router.post('/:orgId/members/by-email', excludeOrganizationAuthorizationObservation, requireAuth, handler('admin', async (tx, req) => { + const email = emailInput(req.body?.email); + const role = roleInput(req.body?.role); + const seat = seatInput(req.body?.seat_type); + assignRole(tx, role); + await tx.requireTeam(); + const users = await tx.readProvider(() => tx.workos.userManagement.listUsers({ email })); + const matches = users.data.filter(user => user.email.toLowerCase() === email); + if (matches.length > 1) conflict('User email is ambiguous'); + const user = matches[0]; + if (!user) { + await tx.seatAvailable(seat); + const invitation = await sendInvitation(tx, email, 'member'); + await tx.local([], async () => { + await stageInvitation(tx, invitation, email, seat); + await tx.audit('member_invited', 'invitation', invitation.id, { email, requested_role: role, invited_role: 'member', seat_type: seat, via: 'by_email' }); + }); + return { status: 201, body: { success: true, action: 'invited', invited_role: 'member', requested_role: role, seat_type: seat, invitation: invitationReply(invitation) } }; + } + const existing = await tx.readProvider(() => tx.workos.userManagement.listOrganizationMemberships({ userId: user.id, organizationId: tx.orgId, statuses: ['active', 'inactive', 'pending'] })); + const members = existing.data.filter(row => row.userId === user.id && row.organizationId === tx.orgId); + if (members.length > 1) conflict('Membership is ambiguous'); + if (!members.length) { + if (user.id === tx.actorId) mutationDenied(); + const local = await tx.rows('SELECT id FROM organization_memberships WHERE workos_organization_id = $1 AND workos_user_id = $2', [tx.orgId, user.id]); + if (local.length) conflict('Membership mirror is not current'); + await tx.seatAvailable(seat); + const member = await createMember(tx, user.id, role); + await tx.local([user.id], async () => { + await insertMember(tx, member, email, seat); + await tx.audit('member_added', 'membership', member.id, { target_user_id: user.id, target_email: email, role, seat_type: seat, via: 'by_email' }); + }); + return { status: 201, body: { success: true, action: 'membership_created', user_id: user.id, role, seat_type: seat } }; + } + const member = await targetMember(tx, members[0].id, user.id); + await roleChangeAllowed(tx, member, role); + if (member.role.slug === role) return { body: { success: true, action: 'no_change', user_id: user.id, role } }; + const updated = await tx.providerWrite('update_membership_role', { membership_id: member.id, user_id: member.userId, old_role: member.role.slug, new_role: role }, () => tx.workos.userManagement.updateOrganizationMembership(member.id, { roleSlug: role })); + memberBinding(tx, updated, member.userId); + if (updated.id !== member.id || updated.role.slug !== role) throw new MembershipMutationError(503, 'Provider role does not match requested role'); + expectMember(tx, updated); + await tx.local([user.id], async () => { + await tx.write('UPDATE organization_memberships SET role = $1, updated_at = NOW() WHERE workos_organization_id = $2 AND workos_user_id = $3 AND workos_membership_id = $4 AND role = $5', [role, tx.orgId, user.id, member.id, member.role.slug]); + await tx.audit('member_role_changed', 'membership', member.id, { target_user_id: user.id, old_role: member.role.slug, new_role: role, via: 'by_email' }); + }); + return { body: { success: true, action: 'role_updated', user_id: user.id, role, previous_role: member.role.slug } }; + })); + + router.patch('/:orgId/members/:membershipId', excludeOrganizationAuthorizationObservation, requireAuth, handler('admin', async (tx, req) => { + if (req.body?.role === undefined && req.body?.seat_type === undefined) invalid('At least one of role or seat_type is required'); + if (req.body?.status !== undefined) invalid('Membership status cannot be changed through this route'); + const role = req.body?.role === undefined ? undefined : roleInput(req.body.role); + const seat = req.body?.seat_type === undefined ? undefined : seatInput(req.body.seat_type); + const member = await targetMember(tx, req.params.membershipId); + if (role) await roleChangeAllowed(tx, member, role); + const oldSeat = await tx.effectiveSeat(member.userId); + const [oldLocal] = await tx.rows<{ seat_type: SeatType }>('SELECT seat_type FROM organization_memberships WHERE workos_organization_id = $1 AND workos_user_id = $2', [tx.orgId, member.userId]); + if (seat === 'contributor' && oldSeat !== 'contributor') await tx.seatAvailable(seat); + if (role && role !== member.role.slug) { + const updated = await tx.providerWrite('update_membership_role', { membership_id: member.id, user_id: member.userId, old_role: member.role.slug, new_role: role }, () => tx.workos.userManagement.updateOrganizationMembership(member.id, { roleSlug: role })); + memberBinding(tx, updated, member.userId); + if (updated.id !== member.id || updated.role.slug !== role) throw new MembershipMutationError(503, 'Provider role does not match requested role'); + expectMember(tx, updated); + } + await tx.local([member.userId], async () => { + await tx.write('UPDATE organization_memberships SET role = $1, seat_type = COALESCE($2, seat_type), updated_at = NOW() WHERE workos_organization_id = $3 AND workos_user_id = $4 AND workos_membership_id = $5 AND role = $6', [role ?? member.role.slug, seat ?? null, tx.orgId, member.userId, member.id, member.role.slug]); + if (role) await tx.audit('member_role_changed', 'membership', member.id, { target_user_id: member.userId, old_role: member.role.slug, new_role: role }); + if (seat) await tx.audit('member_seat_type_changed', 'membership', member.id, { target_user_id: member.userId, old_seat_type: oldLocal.seat_type, new_seat_type: seat }); + }); + if (seat && seat !== oldLocal.seat_type) { + tx.afterCommit.push(() => notifyMemberSeatChanged({ userId: member.userId, newSeatType: seat, context: 'admin_action' })); + tx.afterCommit.push(() => notifyMembershipSeats(tx.workos, tx.orgId, seat === 'contributor' ? 'upgraded' : 'freed')); + } + return { body: { success: true, membership: { id: member.id, user_id: member.userId, role: role ?? member.role.slug, status: member.status, ...(seat ? { seat_type: seat } : {}) } } }; + })); + + router.delete('/:orgId/members/:membershipId', excludeOrganizationAuthorizationObservation, requireAuth, handler('admin', async (tx, req) => { + const member = await targetMember(tx, req.params.membershipId); + if (member.userId === tx.actorId) invalid('Cannot remove self'); + if (member.role.slug === 'owner') invalid('Cannot remove owner'); + if (member.role.slug === 'admin' && tx.role !== 'owner') mutationDenied('Only owners can remove admins'); + const oldSeat = await tx.effectiveSeat(member.userId); + await tx.providerWrite('delete_membership', { membership_id: member.id, user_id: member.userId, old_role: member.role.slug }, () => tx.workos.userManagement.deleteOrganizationMembership(member.id)); + tx.expectTarget(member.id, async () => { + try { await tx.workos.userManagement.getOrganizationMembership(member.id); } + catch (error) { + const status = (error as { status?: number; statusCode?: number }).status ?? (error as { statusCode?: number }).statusCode; + if (status === 404) return; + throw error; + } + conflict('Provider membership deletion is not confirmed'); + }); + await tx.local([member.userId], async () => { + await tx.write('DELETE FROM organization_memberships WHERE workos_user_id = $1 AND workos_organization_id = $2 AND workos_membership_id = $3 AND role = $4', [member.userId, tx.orgId, member.id, member.role.slug]); + const primary = await tx.rows<{ workos_user_id: string }>('SELECT workos_user_id FROM users WHERE workos_user_id = $1 AND primary_organization_id = $2', [member.userId, tx.orgId]); + await tx.write('UPDATE users SET primary_organization_id = NULL, updated_at = NOW() WHERE workos_user_id = $1 AND primary_organization_id = $2', [member.userId, tx.orgId], primary.length); + await tx.audit('member_removed', 'membership', member.id, { removed_user_id: member.userId, removed_role: member.role.slug }); + }); + tx.afterCommit.push(async () => invalidateMembershipCache(tx.orgId)); + if (oldSeat === 'contributor') tx.afterCommit.push(() => notifyMembershipSeats(tx.workos, tx.orgId, 'freed')); + return { body: { success: true, message: 'Member removed successfully' } }; + })); + + router.post('/:orgId/seat-requests', excludeOrganizationAuthorizationObservation, requireAuth, invitationRateLimiter, handler('member', async (tx, req) => { + const { resource_type, resource_id, resource_name } = req.body ?? {}; + if (!['working_group', 'council', 'product_summit'].includes(resource_type)) invalid('Invalid resource type'); + if (resource_id !== undefined && (typeof resource_id !== 'string' || resource_id.length > 255)) invalid('Invalid resource_id'); + if (resource_name !== undefined && (typeof resource_name !== 'string' || resource_name.length > 500)) invalid('Invalid resource_name'); + if (await tx.effectiveSeat(tx.actorId) === 'contributor') invalid('Already a contributor'); + let id = ''; + await tx.local([], async () => { + const [created] = await tx.write<{ id: string }>( + `INSERT INTO seat_upgrade_requests (workos_organization_id, workos_user_id, resource_type, resource_id, resource_name) + VALUES ($1, $2, $3, $4, $5) ON CONFLICT DO NOTHING RETURNING id`, + [tx.orgId, tx.actorId, resource_type, resource_id ?? '', resource_name ?? null], + ); + id = created.id; + await tx.audit('seat_upgrade_requested', 'seat_upgrade_request', id, { resource_type, resource_id, resource_name }); + }); + tx.afterCommit.push(() => notifyMembershipSeatRequest(tx.workos, tx.orgId, tx.actorId, resource_type, resource_name)); + return { body: { id, status: 'pending' } }; + })); + + for (const decision of ['approve', 'deny'] as const) { + router.post(`/:orgId/seat-requests/:requestId/${decision}`, excludeOrganizationAuthorizationObservation, requireAuth, handler('admin', async (tx, req) => { + const [seatRequest] = await tx.rows('SELECT * FROM seat_upgrade_requests WHERE id = $1 AND workos_organization_id = $2', [req.params.requestId, tx.orgId]); + if (!seatRequest) notFound('Request not found'); + if (seatRequest.status !== 'pending') conflict('Request already resolved'); + let member: OrganizationMembership | undefined; + if (decision === 'approve') { + const [local] = await tx.rows<{ workos_membership_id: string }>('SELECT workos_membership_id FROM organization_memberships WHERE workos_organization_id = $1 AND workos_user_id = $2', [tx.orgId, seatRequest.workos_user_id]); + if (!local?.workos_membership_id) conflict('Target is no longer a member'); + member = await targetMember(tx, local.workos_membership_id, seatRequest.workos_user_id); + if (await tx.effectiveSeat(member.userId) !== 'contributor') await tx.seatAvailable('contributor'); + } + const status = decision === 'approve' ? 'approved' : 'denied'; + await tx.local([seatRequest.workos_user_id], async () => { + if (member) await tx.write("UPDATE organization_memberships SET seat_type = 'contributor', updated_at = NOW() WHERE workos_organization_id = $1 AND workos_user_id = $2 AND workos_membership_id = $3 AND role = $4", [tx.orgId, member.userId, member.id, member.role.slug]); + await tx.write('UPDATE seat_upgrade_requests SET status = $1, resolved_at = NOW(), resolved_by = $2 WHERE id = $3 AND workos_organization_id = $4 AND workos_user_id = $5 AND status = \'pending\'', [status, tx.actorId, seatRequest.id, tx.orgId, seatRequest.workos_user_id]); + await tx.audit(decision === 'approve' ? 'seat_upgrade_approved' : 'seat_upgrade_denied', 'seat_upgrade_request', seatRequest.id, { target_user_id: seatRequest.workos_user_id }); + }); + tx.afterCommit.push(() => notifyMemberSeatChanged({ userId: seatRequest.workos_user_id, newSeatType: decision === 'approve' ? 'contributor' : 'community_only', context: decision === 'approve' ? 'request_approved' : 'request_denied', resourceName: seatRequest.resource_name ?? undefined })); + if (decision === 'approve') tx.afterCommit.push(() => notifyMembershipSeats(tx.workos, tx.orgId, 'upgraded')); + return { body: { success: true, status } }; + })); + } +} diff --git a/server/src/routes/organizations.ts b/server/src/routes/organizations.ts index 0093a9077d5..93bbd77b33e 100644 --- a/server/src/routes/organizations.ts +++ b/server/src/routes/organizations.ts @@ -8,6 +8,7 @@ import { respondToAdminAuthorizationError } from '../auth/admin-authorization-re */ import { Router, type Request } from "express"; +import { registerOrganizationMembershipMutations } from "./organization-membership-mutations.js"; import { WorkOS } from "@workos-inc/node"; import { getPool, query } from "../db/client.js"; import { createLogger } from "../logger.js"; @@ -16,34 +17,24 @@ import { isDevModeEnabled, getDevUser, } from "../middleware/auth.js"; -import { invitationRateLimiter, orgCreationRateLimiter } from "../middleware/rate-limit.js"; +import { orgCreationRateLimiter } from "../middleware/rate-limit.js"; import { invalidateMembershipCache } from "../db/org-filters.js"; -import { validateOrganizationName, validateEmail } from "../middleware/validation.js"; -import { OrganizationDatabase, CompanyType, RevenueTier, VALID_REVENUE_TIERS, getSeatUsage, getSeatLimits, canAddSeat, getUserSeatType, resolveMembershipTier, checkAndUpdateSeatWarning, resetSeatWarningIfNeeded, createSeatUpgradeRequest, getSeatUpgradeRequest, listSeatUpgradeRequests, resolveSeatUpgradeRequest, hasPendingSeatRequest, type Organization } from "../db/organization-db.js"; +import { validateOrganizationName } from "../middleware/validation.js"; +import { OrganizationDatabase, CompanyType, RevenueTier, VALID_REVENUE_TIERS, getSeatUsage, getSeatLimits, resolveMembershipTier, listSeatUpgradeRequests, type Organization } from "../db/organization-db.js"; import { COMPANY_TYPE_VALUES } from "../config/company-types.js"; -import { VALID_ORGANIZATION_ROLES, VALID_ASSIGNABLE_ROLES } from "../types.js"; import { JoinRequestDatabase } from "../db/join-request-db.js"; -import { deleteOrganizationMembership } from "../db/membership-db.js"; import * as referralDb from "../db/referral-codes-db.js"; import { SlackDatabase } from "../db/slack-db.js"; import { getCompanyDomain } from "../utils/email-domain.js"; -import { resolveUserRole } from "../utils/resolve-user-role.js"; import { resolveUserOrgMembership } from "../utils/resolve-user-org-membership.js"; -import { isValidWorkOSMembershipId } from "../utils/workos-validation.js"; -import { AAOAdminLookupUnavailableError, isAuthenticatedUserAAOAdmin } from "../addie/admin-status-lookup.js"; +import { + AAOAdminLookupUnavailableError, + isAuthenticatedUserAAOAdmin, +} from "../addie/admin-status-lookup.js"; import { createStripeCustomer, createCustomerPortalSession, } from "../billing/stripe-client.js"; -import { - notifyJoinRequest, - notifyMemberAdded, - notifySeatWarning, - notifySeatFreed, - notifySeatRequest, - notifyMemberSeatChanged, -} from "../slack/org-group-dm.js"; -import { getOrgAdminEmails } from "../utils/org-admins.js"; import { emailPrefsDb } from "../db/email-preferences-db.js"; import { performCreateOrganization } from "../services/organization-bootstrap.js"; import { collectWorkOSPages } from "../services/workos-pagination.js"; @@ -80,6 +71,7 @@ const orgDb = new OrganizationDatabase(); */ export function createOrganizationsRouter(): Router { const router = Router(); + registerOrganizationMembershipMutations(router); // ========================================================================= // ORGANIZATION SEARCH & DISCOVERY @@ -345,263 +337,6 @@ export function createOrganizationsRouter(): Router { } }); - // POST /api/organizations/:orgId/join-requests/:requestId/approve - Approve a join request (admin only) - router.post('/:orgId/join-requests/:requestId/approve', requireAuth, async (req, res) => { - try { - const user = req.user!; - const { orgId, requestId } = req.params; - const { role = 'member' } = req.body; - - // Validate role - only allow member or admin, not owner - if (role !== 'member' && role !== 'admin') { - return res.status(400).json({ - error: 'Invalid role', - message: 'Role must be either "member" or "admin"', - }); - } - - // Verify user is admin/owner of this organization - const membership = await resolveUserOrgMembership(workos, user.id, orgId); - if (!membership) { - return res.status(403).json({ - error: 'Access denied', - message: 'You are not a member of this organization', - }); - } - - const userRole = membership.role; - if (userRole !== 'admin' && userRole !== 'owner') { - return res.status(403).json({ - error: 'Insufficient permissions', - message: 'Only admins and owners can approve join requests', - }); - } - - // Check if organization is personal (cannot have team members) - const localOrg = await orgDb.getOrganization(orgId); - if (localOrg?.is_personal) { - return res.status(400).json({ - error: 'Personal workspace', - message: 'Personal workspaces cannot have team members. Convert to a team workspace first.', - }); - } - - const joinRequestDb = new JoinRequestDatabase(); - - // Get the request - const request = await joinRequestDb.getRequest(requestId); - if (!request || request.workos_organization_id !== orgId) { - return res.status(404).json({ - error: 'Request not found', - message: 'No pending join request found with this ID', - }); - } - - if (request.status !== 'pending') { - return res.status(400).json({ - error: 'Request not pending', - message: 'This join request has already been processed', - }); - } - - // Directly add the user to the organization — join requests are only - // created by users who have already signed up, so we always have their - // workos_user_id and don't need to send an invitation. - try { - await workos!.userManagement.createOrganizationMembership({ - userId: request.workos_user_id, - organizationId: orgId, - roleSlug: role, - }); - } catch (membershipError: any) { - if (membershipError?.code === 'organization_membership_already_exists') { - // Previous approval attempt succeeded in WorkOS but failed before the DB - // update. Clear the stale pending row and surface the error. - logger.info({ adminId: user.id, requestId, orgId }, 'Join request resolved — membership already existed in WorkOS'); - await joinRequestDb.approveRequest(requestId, user.id); - return res.status(400).json({ - error: 'User already a member', - message: 'This user is already a member of the organization', - }); - } - if (membershipError?.code === 'cannot_reactivate_pending_organization_membership') { - // WorkOS has a pending (unaccepted) invitation for this user — they are not - // yet a member. Do not mark the request approved; admin needs to cancel the - // stale invitation in WorkOS first. - return res.status(409).json({ - error: 'Pending invitation exists', - message: 'This user has a pending invitation that must be cancelled before they can be added directly.', - }); - } - throw membershipError; - } - - // Mark request as approved - await joinRequestDb.approveRequest(requestId, user.id); - - logger.info({ - adminId: user.id, - requestId, - orgId, - requesterId: request.workos_user_id, - email: request.user_email, - }, 'Join request approved'); - - // Record audit log for join request approval - await orgDb.recordAuditLog({ - workos_organization_id: orgId, - workos_user_id: user.id, - action: 'join_request_approved', - resource_type: 'join_request', - resource_id: requestId, - details: { - requester_user_id: request.workos_user_id, - requester_email: request.user_email, - role_assigned: role, - }, - }); - - // Notify org admins via Slack (fire-and-forget) - (async () => { - try { - let orgName = 'Organization'; - try { - const org = await workos!.organizations.getOrganization(orgId); - orgName = org.name; - } catch { - // Org may not exist - } - - const adminEmails = await getOrgAdminEmails(workos!, orgId); - if (adminEmails.length === 0) return; - - // Get seat context for the notification - const localOrg = await orgDb.getOrganization(orgId); - const tier = resolveMembershipTier(localOrg); - const seatLimits = getSeatLimits(tier); - const seatUsage = await getSeatUsage(orgId); - const seatType = await getUserSeatType(request.workos_user_id); - - await notifyMemberAdded({ - orgId, - orgName, - adminEmails, - memberEmail: request.user_email, - memberFirstName: request.first_name || undefined, - memberLastName: request.last_name || undefined, - role, - seatType: seatType || 'community_only', - seatUsage, - seatLimits, - }); - - // Check seat warning thresholds for both seat types - for (const st of ['contributor', 'community'] as const) { - const usage = st === 'contributor' ? seatUsage.contributor : seatUsage.community_only; - const limit = st === 'contributor' ? seatLimits.contributor : seatLimits.community; - const warning = await checkAndUpdateSeatWarning(orgId, st, usage, limit, tier); - if (warning?.shouldNotify) { - await notifySeatWarning({ orgId, orgName, adminEmails, seatType: st, threshold: warning.threshold, usage, limit }); - } - } - } catch (err) { - logger.warn({ err, orgId }, 'Failed to notify admins of new member'); - } - })(); - - res.json({ - success: true, - message: `${request.user_email} has been added to the organization`, - }); - } catch (error: any) { - logger.error({ err: error }, 'Approve join request error:'); - - res.status(500).json({ - error: 'Failed to approve join request', - message: 'An internal error occurred while approving the join request.', - }); - } - }); - - // POST /api/organizations/:orgId/join-requests/:requestId/reject - Reject a join request (admin only) - router.post('/:orgId/join-requests/:requestId/reject', requireAuth, async (req, res) => { - try { - const user = req.user!; - const { orgId, requestId } = req.params; - const { reason } = req.body; - - // Verify user is admin/owner of this organization - const membership = await resolveUserOrgMembership(workos, user.id, orgId); - if (!membership) { - return res.status(403).json({ - error: 'Access denied', - message: 'You are not a member of this organization', - }); - } - - const userRole = membership.role; - if (userRole !== 'admin' && userRole !== 'owner') { - return res.status(403).json({ - error: 'Insufficient permissions', - message: 'Only admins and owners can reject join requests', - }); - } - - const joinRequestDb = new JoinRequestDatabase(); - - // Get the request - const request = await joinRequestDb.getRequest(requestId); - if (!request || request.workos_organization_id !== orgId) { - return res.status(404).json({ - error: 'Request not found', - message: 'No pending join request found with this ID', - }); - } - - if (request.status !== 'pending') { - return res.status(400).json({ - error: 'Request not pending', - message: 'This join request has already been processed', - }); - } - - // Mark request as rejected - await joinRequestDb.rejectRequest(requestId, user.id, reason); - - logger.info({ - adminId: user.id, - requestId, - orgId, - requesterId: request.workos_user_id, - reason, - }, 'Join request rejected'); - - // Record audit log for join request rejection - await orgDb.recordAuditLog({ - workos_organization_id: orgId, - workos_user_id: user.id, - action: 'join_request_rejected', - resource_type: 'join_request', - resource_id: requestId, - details: { - requester_user_id: request.workos_user_id, - requester_email: request.user_email, - reason: reason || null, - }, - }); - - res.json({ - success: true, - message: 'Join request rejected', - }); - } catch (error) { - logger.error({ err: error }, 'Reject join request error:'); - res.status(500).json({ - error: 'Failed to reject join request', - }); - } - }); - // ========================================================================= // DOMAIN MANAGEMENT // ========================================================================= @@ -995,260 +730,6 @@ export function createOrganizationsRouter(): Router { }); // POST /api/organizations/:orgId/domain-users/add - Directly add a domain user to org (admin only) - router.post('/:orgId/domain-users/add', requireAuth, async (req, res) => { - try { - const adminUser = req.user!; - const { orgId } = req.params; - const { email, role } = req.body; - - if (!email || typeof email !== 'string') { - return res.status(400).json({ - error: 'Missing required field', - message: 'email is required', - }); - } - - // Basic email format validation - const emailRegex = /^[^\s@]+@[^\s@]+\.[^\s@]{2,}$/; - if (!emailRegex.test(email)) { - return res.status(400).json({ - error: 'Invalid email format', - message: 'Please provide a valid email address', - }); - } - - // Validate role if provided - const roleToAssign = role || 'member'; - if (!(VALID_ASSIGNABLE_ROLES as readonly string[]).includes(roleToAssign)) { - return res.status(400).json({ - error: 'Invalid role', - message: `Role must be one of: ${VALID_ASSIGNABLE_ROLES.join(', ')}`, - }); - } - - // Verify user is admin/owner of this organization - const callerMembership = await resolveUserOrgMembership(workos, adminUser.id, orgId); - if (!callerMembership) { - return res.status(403).json({ - error: 'Access denied', - message: 'You are not a member of this organization', - }); - } - - const userRole = callerMembership.role; - if (userRole !== 'admin' && userRole !== 'owner') { - return res.status(403).json({ - error: 'Insufficient permissions', - message: 'Only admins and owners can add members', - }); - } - - // Check if organization is personal - const localOrg = await orgDb.getOrganization(orgId); - if (localOrg?.is_personal) { - return res.status(400).json({ - error: 'Personal workspace', - message: 'Personal workspaces cannot have team members.', - }); - } - - // Get verified domains for this org - const pool = getPool(); - const domainsResult = await pool.query( - `SELECT domain FROM organization_domains WHERE workos_organization_id = $1 AND verified = true`, - [orgId] - ); - - if (domainsResult.rows.length === 0) { - return res.status(400).json({ - error: 'No verified domains', - message: 'Organization has no verified domains. Use standard invitation instead.', - }); - } - - const verifiedDomains = domainsResult.rows.map(r => r.domain.toLowerCase()); - const emailDomain = email.split('@')[1]?.toLowerCase(); - - if (!emailDomain || !verifiedDomains.includes(emailDomain)) { - return res.status(400).json({ - error: 'Domain not verified', - message: `Email domain ${emailDomain} is not verified for this organization. Use standard invitation instead.`, - }); - } - - // Find the Slack user mapping with WorkOS user ID - const slackUserResult = await pool.query( - `SELECT workos_user_id, slack_real_name, slack_display_name - FROM slack_user_mappings - WHERE LOWER(slack_email) = LOWER($1)`, - [email] - ); - - if (slackUserResult.rows.length === 0) { - return res.status(400).json({ - error: 'User not found', - message: 'User not found in Slack workspace. Use standard invitation instead.', - }); - } - - const slackUser = slackUserResult.rows[0]; - - if (!slackUser.workos_user_id) { - // User exists in Slack but hasn't signed up yet - send invitation instead - const invitation = await workos!.userManagement.sendInvitation({ - email, - organizationId: orgId, - inviterUserId: adminUser.id, - roleSlug: roleToAssign, - }); - - logger.info({ orgId, email, inviterId: adminUser.id }, 'Domain user invited (no WorkOS account yet)'); - - return res.json({ - success: true, - action: 'invited', - message: 'User has not signed up yet. An invitation has been sent.', - invitation: { - id: invitation.id, - email: invitation.email, - state: invitation.state, - }, - }); - } - - // Check if user is already a member (include pending invitations) - const existingMembership = await workos!.userManagement.listOrganizationMemberships({ - userId: slackUser.workos_user_id, - organizationId: orgId, - statuses: ['active', 'inactive', 'pending'], - }); - - if (existingMembership.data.length > 0) { - const pending = existingMembership.data.some(m => m.status === 'pending'); - if (pending) { - return res.status(409).json({ - error: 'Pending invitation exists', - message: 'This user has a pending invitation that must be accepted or cancelled before they can be added directly.', - }); - } - return res.status(400).json({ - error: 'Already a member', - message: 'This user is already a member of the organization.', - }); - } - - // Directly add user to organization - const membership = await workos!.userManagement.createOrganizationMembership({ - userId: slackUser.workos_user_id, - organizationId: orgId, - roleSlug: roleToAssign, - }); - - logger.info({ - orgId, - email, - userId: slackUser.workos_user_id, - addedBy: adminUser.id, - }, 'Domain user directly added to organization'); - - // Record audit log - await orgDb.recordAuditLog({ - workos_organization_id: orgId, - workos_user_id: adminUser.id, - action: 'member_added', - resource_type: 'membership', - resource_id: membership.id, - details: { email, role: roleToAssign, method: 'domain_auto_add' }, - }); - - // Cancel any pending join requests from this user - await pool.query( - `UPDATE organization_join_requests - SET status = 'cancelled', handled_by_user_id = $1, handled_at = NOW() - WHERE workos_organization_id = $2 - AND LOWER(user_email) = LOWER($3) - AND status = 'pending'`, - [adminUser.id, orgId, email] - ); - - // Notify via Slack (fire-and-forget) - (async () => { - try { - let orgName = 'Organization'; - try { - const org = await workos!.organizations.getOrganization(orgId); - orgName = org.name; - } catch { - // Org may not exist - } - - const adminEmails = await getOrgAdminEmails(workos!, orgId); - if (adminEmails.length === 0) return; - - const localOrg = await orgDb.getOrganization(orgId); - const tier = resolveMembershipTier(localOrg); - const seatLimits = getSeatLimits(tier); - const seatUsage = await getSeatUsage(orgId); - - await notifyMemberAdded({ - orgId, - orgName, - adminEmails, - memberEmail: email, - memberFirstName: slackUser.slack_real_name?.split(' ')[0], - memberLastName: slackUser.slack_real_name?.split(' ').slice(1).join(' '), - role: roleToAssign, - seatType: 'community_only', - seatUsage, - seatLimits, - }); - - for (const st of ['contributor', 'community'] as const) { - const usage = st === 'contributor' ? seatUsage.contributor : seatUsage.community_only; - const limit = st === 'contributor' ? seatLimits.contributor : seatLimits.community; - const warning = await checkAndUpdateSeatWarning(orgId, st, usage, limit, tier); - if (warning?.shouldNotify) { - await notifySeatWarning({ orgId, orgName, adminEmails, seatType: st, threshold: warning.threshold, usage, limit }); - } - } - } catch (err) { - logger.warn({ err }, 'Failed to send member added notification'); - } - })(); - - res.json({ - success: true, - action: 'added', - message: 'User has been added to the organization.', - membership: { - id: membership.id, - userId: membership.userId, - role: membership.role?.slug || roleToAssign, - }, - }); - } catch (error: any) { - logger.error({ err: error }, 'Add domain user error'); - - if (error?.code === 'organization_membership_already_exists') { - return res.status(400).json({ - error: 'Already a member', - message: 'This user is already a member of the organization.', - }); - } - - if (error?.code === 'cannot_reactivate_pending_organization_membership') { - return res.status(409).json({ - error: 'Pending invitation exists', - message: 'This user has a pending invitation that must be accepted or cancelled before they can be added directly.', - }); - } - - res.status(500).json({ - error: 'Failed to add domain user', - message: 'An internal error occurred while adding the domain user.', - }); - } - }); // POST /api/organizations/:orgId/domain-verification-link - Generate WorkOS portal link for domain verification router.post('/:orgId/domain-verification-link', requireAuth, async (req, res) => { @@ -1346,6 +827,11 @@ export function createOrganizationsRouter(): Router { ); switch (outcome.kind) { + case 'onboarding_disabled': + return res.status(403).json({ + error: 'organization_onboarding_disabled', + message: 'Organization creation and adoption are temporarily unavailable.', + }); case 'created': return res.json({ success: true, @@ -2145,219 +1631,11 @@ export function createOrganizationsRouter(): Router { } }); - // POST /api/organizations/:orgId/claim - Claim a sales-touched prospect org - // - // The auth/callback redirect surfaces a `?claim_org=` hint to the - // onboarding page when an unowned prospect org matches the user's email - // domain (see findClaimableProspectOrgForDomain). This endpoint completes - // the claim: it re-validates the conditions transactionally and adds the - // user to WorkOS as the org's first member. - // - // Anti-hijack guards (re-checked inside a row lock): - // - Caller's WorkOS email must be verified (the domain match is the - // entire trust signal — an unverified email isn't a trust signal). - // - Org must be non-personal. - // - Org must have no active subscription (paying orgs auto-link via the - // verified-domain path; they're not "claimable"). - // - Org must have zero existing organization_memberships rows. The first - // claimer becomes the de facto owner; once anyone has joined, no one - // else can claim. - // - The user's verified WorkOS email domain must match the org's - // email_domain or a verified organization_domains row. - // - // Concurrency model: the row lock taken on the org persists for the full - // duration of the WorkOS createOrganizationMembership call. Two concurrent - // claims on the same org serialize on the lock — the second one observes - // the membership row inserted by the WorkOS webhook (or by a prior tx that - // hasn't committed yet) and falls through to the "already claimed" 409. - router.post('/:orgId/claim', requireAuth, async (req, res) => { - const user = req.user!; - const { orgId } = req.params; - - if (!user.emailVerified) { - return res.status(403).json({ - error: 'Email not verified', - message: 'Verify your email before claiming an organization.', - }); - } - - if (!workos) { - return res.status(500).json({ - error: 'Auth not configured', - message: 'WorkOS is not configured on this server', - }); - } - - const userDomain = user.email.split('@')[1]?.toLowerCase(); - if (!userDomain) { - return res.status(400).json({ - error: 'Invalid email', - message: 'Cannot determine email domain for claim verification', - }); - } - - const pool = getPool(); - const client = await pool.connect(); - - let claimResult: { ok: true } | { ok: false; status: number; body: Record }; - try { - await client.query('BEGIN'); - - // Lock the org row so concurrent claims serialize cleanly. - const orgRows = await client.query<{ - workos_organization_id: string; - name: string; - is_personal: boolean; - subscription_status: string | null; - email_domain: string | null; - }>( - `SELECT workos_organization_id, name, is_personal, subscription_status, email_domain - FROM organizations - WHERE workos_organization_id = $1 - FOR UPDATE`, - [orgId], - ); - - if (orgRows.rows.length === 0) { - await client.query('ROLLBACK'); - claimResult = { ok: false, status: 404, body: { error: 'Organization not found' } }; - } else { - const org = orgRows.rows[0]; - - if (org.is_personal) { - await client.query('ROLLBACK'); - claimResult = { - ok: false, - status: 400, - body: { error: 'Not claimable', message: 'Personal workspaces cannot be claimed' }, - }; - } else if (org.subscription_status) { - await client.query('ROLLBACK'); - claimResult = { - ok: false, - status: 400, - body: { - error: 'Not claimable', - message: 'This organization already has an active subscription. Ask an existing member to invite you instead.', - }, - }; - } else { - // Domain-match check: user's email domain must equal email_domain - // OR appear as a verified organization_domains row. - const domainMatchRow = await client.query<{ matched: boolean }>( - `SELECT ( - LOWER($2) = LOWER(COALESCE($3, '')) - OR EXISTS ( - SELECT 1 FROM organization_domains od - WHERE od.workos_organization_id = $1 - AND LOWER(od.domain) = LOWER($2) - AND od.verified = true - ) - ) AS matched`, - [orgId, userDomain, org.email_domain], - ); - if (!domainMatchRow.rows[0]?.matched) { - await client.query('ROLLBACK'); - claimResult = { - ok: false, - status: 403, - body: { - error: 'Domain mismatch', - message: `Your email domain (${userDomain}) does not match this organization's verified domain.`, - }, - }; - } else { - // Anti-hijack: zero existing memberships. - const memberCount = await client.query<{ n: string }>( - `SELECT COUNT(*)::text AS n FROM organization_memberships - WHERE workos_organization_id = $1`, - [orgId], - ); - if (Number(memberCount.rows[0]?.n ?? 0) > 0) { - await client.query('ROLLBACK'); - claimResult = { - ok: false, - status: 409, - body: { - error: 'Already claimed', - message: 'This organization already has members. Ask an existing member to invite you.', - }, - }; - } else { - // Add the user to WorkOS *inside* the still-open tx so the row - // lock prevents a second concurrent claim from observing the - // empty membership table while we're mid-flight. Use 'admin' — - // the existing webhook auto-promotes the first admin to owner. - let workosFailed = false; - try { - await workos.userManagement.createOrganizationMembership({ - userId: user.id, - organizationId: orgId, - roleSlug: 'admin', - }); - } catch (err: unknown) { - const code = (err as { code?: string } | null)?.code; - if (code === 'organization_membership_already_exists') { - // Benign — they're already a member. Treat as success. - } else { - logger.error({ err, orgId, userId: user.id }, 'WorkOS createOrganizationMembership failed during claim'); - workosFailed = true; - } - } - if (workosFailed) { - await client.query('ROLLBACK'); - claimResult = { - ok: false, - status: 500, - body: { error: 'Failed to add membership' }, - }; - } else { - await client.query('COMMIT'); - claimResult = { ok: true }; - } - } - } - } - } - } catch (lockErr) { - await client.query('ROLLBACK').catch(() => {}); - logger.error({ err: lockErr, orgId, userId: user.id }, 'Claim pre-validation failed'); - client.release(); - return res.status(500).json({ error: 'Failed to validate claim' }); - } finally { - client.release(); - } - - if (!claimResult.ok) { - return res.status(claimResult.status).json(claimResult.body); - } - - // Membership-resolution cache may have a stale "no membership" entry for - // this user/org pair. Drop it so the next request resolves the new - // membership without waiting for the WorkOS webhook to fire. - invalidateMembershipCache(orgId); - - await orgDb.recordAuditLog({ - workos_organization_id: orgId, - workos_user_id: user.id, - action: 'organization_claimed', - resource_type: 'organization', - resource_id: orgId, - details: { - claimed_via: 'self_claim', - email_domain: userDomain, - }, - }); - - logger.info( - { orgId, userId: user.id, email: user.email }, - 'User claimed prospect org', - ); - - res.json({ - success: true, - organization_id: orgId, - message: 'Organization claimed. You can now sign in to the dashboard.', + // First-owner recovery requires a separate explicit, consented operation. + router.post('/:orgId/claim', requireAuth, async (_req, res) => { + return res.status(403).json({ + error: 'organization_onboarding_disabled', + message: 'Organization claiming is temporarily unavailable.', }); }); @@ -2390,1234 +1668,151 @@ export function createOrganizationsRouter(): Router { // Verify user is member of this organization const callerMembership = await resolveUserOrgMembership(workos, user.id, orgId); - if (!callerMembership) { - return res.status(403).json({ - error: 'Access denied', - message: 'You are not a member of this organization', - }); - } - - const requestingUserRole = callerMembership.role; - - // Get all members of the organization (paginate to handle orgs with >100 members) - // Fetch first page to get type inference, then paginate if needed - let membershipsPage = await workos!.userManagement.listOrganizationMemberships({ - organizationId: orgId, - statuses: ['active', 'pending'], - limit: 100, - }); - const allMemberships = [...membershipsPage.data]; - while (membershipsPage.listMetadata?.after) { - membershipsPage = await workos!.userManagement.listOrganizationMemberships({ - organizationId: orgId, - statuses: ['active', 'pending'], - after: membershipsPage.listMetadata.after, - limit: 100, - }); - allMemberships.push(...membershipsPage.data); - } - - // Get all mapped WorkOS user IDs from Slack - const slackDb = new SlackDatabase(); - const mappedWorkosUserIds = await slackDb.getMappedWorkosUserIds(); - - // Bulk-fetch local membership data and user-set names in parallel - const [localMembersResult, localUsersResult] = await Promise.all([ - query<{ - workos_user_id: string; - seat_type: string; - first_name: string | null; - last_name: string | null; - role: string | null; - }>( - 'SELECT workos_user_id, seat_type, first_name, last_name, role FROM organization_memberships WHERE workos_organization_id = $1', - [orgId] - ), - query<{ - workos_user_id: string; - first_name: string | null; - last_name: string | null; - }>( - 'SELECT workos_user_id, first_name, last_name FROM users WHERE workos_user_id = ANY($1)', - [allMemberships.map(m => m.userId)] - ), - ]); - const localMemberMap = new Map(localMembersResult.rows.map(r => [r.workos_user_id, r])); - const localUserMap = new Map(localUsersResult.rows.map(r => [r.workos_user_id, r])); - - // Fetch user details for each membership - const members = await Promise.all( - allMemberships.map(async (membership) => { - const localMember = localMemberMap.get(membership.userId); - const localUser = localUserMap.get(membership.userId); - try { - const memberUser = await workos!.userManagement.getUser(membership.userId); - // Prefer local user names > local membership names > WorkOS names - const firstName = localUser?.first_name ?? localMember?.first_name ?? memberUser.firstName ?? null; - const lastName = localUser?.last_name ?? localMember?.last_name ?? memberUser.lastName ?? null; - return { - id: membership.id, - user_id: membership.userId, - email: memberUser.email, - first_name: firstName, - last_name: lastName, - role: membership.role?.slug || localMember?.role || 'member', - status: membership.status, - created_at: membership.createdAt, - slack_linked: mappedWorkosUserIds.has(membership.userId), - seat_type: localMember?.seat_type ?? 'community_only', - }; - } catch (error) { - // User might have been deleted - logger.warn({ membershipId: membership.id, userId: membership.userId }, 'Failed to fetch user for membership'); - return { - id: membership.id, - user_id: membership.userId, - email: 'Unknown', - first_name: localUser?.first_name ?? localMember?.first_name ?? null, - last_name: localUser?.last_name ?? localMember?.last_name ?? null, - role: membership.role?.slug || localMember?.role || 'member', - status: membership.status, - created_at: membership.createdAt, - slack_linked: false, - seat_type: localMember?.seat_type ?? 'community_only', - }; - } - }) - ); - - // Get pending invitations for this organization - const invitations = await collectWorkOSPages((after) => - workos!.userManagement.listInvitations({ - organizationId: orgId, - limit: 100, - after, - }) - ); - - // Fetch seat types for pending invitations - const invSeatResult = await query<{ email: string; seat_type: string }>( - 'SELECT email, seat_type FROM invitation_seat_types WHERE workos_organization_id = $1', - [orgId] - ); - const invSeatMap = new Map(invSeatResult.rows.map(r => [r.email.toLowerCase(), r.seat_type])); - - const pendingInvitations = invitations - .filter(inv => inv.state === 'pending') - .map(inv => ({ - id: inv.id, - email: inv.email, - state: inv.state, - expires_at: inv.expiresAt, - created_at: inv.createdAt, - inviter_user_id: inv.inviterUserId, - seat_type: invSeatMap.get(inv.email.toLowerCase()) || 'community_only', - })); - - // Include seat usage and limits only for admins/owners - const isAdmin = requestingUserRole === 'admin' || requestingUserRole === 'owner'; - let seatInfo: { seat_usage?: { contributor: number; community_only: number }; seat_limits?: { contributor: number; community: number } } = {}; - if (isAdmin) { - const seatUsage = await getSeatUsage(orgId); - const localOrg = await orgDb.getOrganization(orgId); - seatInfo = { - seat_usage: seatUsage, - seat_limits: getSeatLimits(resolveMembershipTier(localOrg)), - }; - } - - res.json({ - members, - pending_invitations: pendingInvitations, - ...seatInfo, - }); - } catch (error) { - logger.error({ err: error }, 'List organization members error'); - res.status(500).json({ - error: 'Failed to list organization members', - }); - } - }); - - // POST /api/organizations/:orgId/invitations - Invite a new member - router.post('/:orgId/invitations', requireAuth, invitationRateLimiter, async (req, res) => { - try { - const user = req.user!; - const { orgId } = req.params; - const { email, role, seat_type: requestedSeatType } = req.body; - const seatType = requestedSeatType === 'contributor' ? 'contributor' : 'community_only'; - - if (!email) { - return res.status(400).json({ - error: 'Missing required field', - message: 'email is required', - }); - } - - // Validate email format - const emailValidation = validateEmail(email); - if (!emailValidation.valid) { - return res.status(400).json({ - error: 'Invalid email', - message: emailValidation.error, - }); - } - - // Validate role if provided - if (role && !VALID_ORGANIZATION_ROLES.includes(role as any)) { - return res.status(400).json({ - error: 'Invalid role', - message: `Role must be one of: ${VALID_ORGANIZATION_ROLES.join(', ')}`, - }); - } - - // Verify user is member of this organization - const callerMembership = await resolveUserOrgMembership(workos, user.id, orgId); - if (!callerMembership) { - return res.status(403).json({ - error: 'Access denied', - message: 'You are not a member of this organization', - }); - } - - // Check user's role - only admins or owners can invite - const userRole = callerMembership.role; - if (userRole !== 'admin' && userRole !== 'owner') { - return res.status(403).json({ - error: 'Insufficient permissions', - message: 'Only admins and owners can invite new members', - }); - } - - // Check if organization is personal (cannot invite team members) - const localOrg = await orgDb.getOrganization(orgId); - if (localOrg?.is_personal) { - return res.status(400).json({ - error: 'Personal workspace', - message: 'Personal workspaces cannot have team members. Convert to a team workspace first.', - }); - } - - // Enforce seat limits - const seatCheck = await canAddSeat(orgId, seatType); - if (!seatCheck.allowed) { - return res.status(403).json({ - error: 'Seat limit reached', - message: seatCheck.reason, - }); - } - - // Send invitation via WorkOS - const invitation = await workos!.userManagement.sendInvitation({ - email, - organizationId: orgId, - inviterUserId: user.id, - roleSlug: role || 'member', - }); - - // Persist seat_type intent + provisioning source for when the invitation is accepted - await query( - `INSERT INTO invitation_seat_types (workos_invitation_id, workos_organization_id, email, seat_type, source) - VALUES ($1, $2, $3, $4, 'invited') - ON CONFLICT (workos_invitation_id) DO UPDATE SET seat_type = EXCLUDED.seat_type, source = EXCLUDED.source`, - [invitation.id, orgId, email, seatType] - ); - - logger.info({ orgId, email, inviterId: user.id, seatType }, 'Invitation sent'); - - // Record audit log - await orgDb.recordAuditLog({ - workos_organization_id: orgId, - workos_user_id: user.id, - action: 'member_invited', - resource_type: 'invitation', - resource_id: invitation.id, - details: { email, role: role || 'member', seat_type: seatType }, - }); - - res.json({ - success: true, - invitation: { - id: invitation.id, - email: invitation.email, - state: invitation.state, - expires_at: invitation.expiresAt, - accept_invitation_url: invitation.acceptInvitationUrl, - }, - }); - } catch (error: any) { - // Check for specific WorkOS errors — these are expected race conditions, not server errors - if (error?.code === 'organization_membership_already_exists') { - logger.warn({ err: error }, 'Send invitation skipped: user already a member'); - return res.status(400).json({ - error: 'User already a member', - message: 'This user is already a member of the organization', - }); - } - if (error?.code === 'invitation_already_exists') { - logger.warn({ err: error }, 'Send invitation skipped: invitation already exists'); - return res.status(400).json({ - error: 'Invitation already exists', - message: 'An invitation has already been sent to this email address', - }); - } - - logger.error({ err: error }, 'Send invitation error'); - res.status(500).json({ - error: 'Failed to send invitation', - message: 'An internal error occurred while sending the invitation.', - }); - } - }); - - // DELETE /api/organizations/:orgId/invitations/:invitationId - Revoke an invitation - router.delete('/:orgId/invitations/:invitationId', requireAuth, async (req, res) => { - try { - const user = req.user!; - const { orgId, invitationId } = req.params; - - // Verify user is member of this organization - const callerMembership = await resolveUserOrgMembership(workos, user.id, orgId); - if (!callerMembership) { - return res.status(403).json({ - error: 'Access denied', - message: 'You are not a member of this organization', - }); - } - - // Check user's role - only admins or owners can revoke invitations - const userRole = callerMembership.role; - if (userRole !== 'admin' && userRole !== 'owner') { - return res.status(403).json({ - error: 'Insufficient permissions', - message: 'Only admins and owners can revoke invitations', - }); - } - - // Verify invitation belongs to this organization - const invitation = await workos!.userManagement.getInvitation(invitationId); - if (invitation.organizationId !== orgId) { - return res.status(404).json({ - error: 'Invitation not found', - message: 'This invitation does not belong to this organization', - }); - } - - // Revoke the invitation - await workos!.userManagement.revokeInvitation(invitationId); - - // Clean up seat_type intent - await query('DELETE FROM invitation_seat_types WHERE workos_invitation_id = $1', [invitationId]); - - logger.info({ orgId, invitationId, revokerId: user.id }, 'Invitation revoked'); - - // Record audit log - await orgDb.recordAuditLog({ - workos_organization_id: orgId, - workos_user_id: user.id, - action: 'invitation_revoked', - resource_type: 'invitation', - resource_id: invitationId, - details: { email: invitation.email }, - }); - - res.json({ - success: true, - message: 'Invitation revoked successfully', - }); - } catch (error) { - logger.error({ err: error }, 'Revoke invitation error'); - res.status(500).json({ - error: 'Failed to revoke invitation', - }); - } - }); - - // POST /api/organizations/:orgId/invitations/:invitationId/resend - Resend an invitation - router.post('/:orgId/invitations/:invitationId/resend', requireAuth, async (req, res) => { - try { - const user = req.user!; - const { orgId, invitationId } = req.params; - - // Verify user is member of this organization - const callerMembership = await resolveUserOrgMembership(workos, user.id, orgId); - if (!callerMembership) { - return res.status(403).json({ - error: 'Access denied', - message: 'You are not a member of this organization', - }); - } - - // Check user's role - only admins or owners can resend invitations - const userRole = callerMembership.role; - if (userRole !== 'admin' && userRole !== 'owner') { - return res.status(403).json({ - error: 'Insufficient permissions', - message: 'Only admins and owners can resend invitations', - }); - } - - // Get the invitation to verify it belongs to this org - const invitation = await workos!.userManagement.getInvitation(invitationId); - if (invitation.organizationId !== orgId) { - return res.status(404).json({ - error: 'Invitation not found', - message: 'This invitation does not belong to this organization', - }); - } - - // Preserve seat_type from old invitation before revoking - const oldSeatResult = await query<{ seat_type: string }>( - 'DELETE FROM invitation_seat_types WHERE workos_invitation_id = $1 RETURNING seat_type', - [invitationId] - ); - const preservedSeatType = oldSeatResult.rows[0]?.seat_type || 'community_only'; - - // Revoke the old invitation and send a new one - await workos!.userManagement.revokeInvitation(invitationId); - const newInvitation = await workos!.userManagement.sendInvitation({ - email: invitation.email, - organizationId: orgId, - inviterUserId: user.id, - roleSlug: 'member', - }); - - // Persist seat_type intent + provisioning source for the new invitation - await query( - `INSERT INTO invitation_seat_types (workos_invitation_id, workos_organization_id, email, seat_type, source) - VALUES ($1, $2, $3, $4, 'invited')`, - [newInvitation.id, orgId, invitation.email, preservedSeatType] - ); - - logger.info({ orgId, email: invitation.email, inviterId: user.id, seatType: preservedSeatType }, 'Invitation resent'); - - // Record audit log - await orgDb.recordAuditLog({ - workos_organization_id: orgId, - workos_user_id: user.id, - action: 'invitation_resent', - resource_type: 'invitation', - resource_id: newInvitation.id, - details: { email: invitation.email, old_invitation_id: invitationId, seat_type: preservedSeatType }, - }); - - res.json({ - success: true, - message: 'Invitation resent successfully', - invitation: { - id: newInvitation.id, - email: newInvitation.email, - state: newInvitation.state, - expires_at: newInvitation.expiresAt, - }, - }); - } catch (error: any) { - if (error?.code === 'organization_membership_already_exists') { - logger.warn({ err: error }, 'Resend invitation skipped: user already a member'); - return res.status(400).json({ - error: 'User already a member', - message: 'This user is already a member of the organization', - }); - } - if (error?.code === 'invitation_already_exists') { - logger.warn({ err: error }, 'Resend invitation skipped: invitation already exists'); - return res.status(400).json({ - error: 'Invitation already exists', - message: 'An invitation has already been sent to this email address', - }); - } - - logger.error({ err: error }, 'Resend invitation error'); - res.status(500).json({ - error: 'Failed to resend invitation', - }); - } - }); - - /** - * POST /api/organizations/:orgId/members/by-email - * - * Add or promote a member by email. Walks the four-state machine so callers - * don't need to know whether the user has a WorkOS account, whether they're - * already a member, or how WorkOS membership IDs work: - * - WorkOS user not found -> sendInvitation (always as member; promote after accept) - * - User found, no membership in org -> createOrganizationMembership with target role - * - User found, already in this role -> no_change - * - User found, different role -> updateOrganizationMembership - * - * Authz mirrors the existing patterns: - * - Adding a new member: org admin/owner OR AAO super-admin - * - Updating an existing member's role: org owner OR AAO super-admin - * - Org admins capped at 'admin'/'member' roles. Only owners and AAO - * super-admins can assign 'owner'. - */ - router.post('/:orgId/members/by-email', requireAuth, async (req, res) => { - const user = req.user!; - const { orgId } = req.params; - const body = (req.body ?? {}) as Record; - const email = body.email; - const requestedRole = body.role ?? 'member'; - const requestedSeatType = body.seat_type; - - if (typeof email !== 'string') { - return res.status(400).json({ error: 'Missing required field', message: 'email is required' }); - } - - const emailValidation = validateEmail(email); - if (!emailValidation.valid) { - return res.status(400).json({ error: 'Invalid email', message: emailValidation.error }); - } - - if (typeof requestedRole !== 'string' || !VALID_ORGANIZATION_ROLES.includes(requestedRole as any)) { - return res.status(400).json({ - error: 'Invalid role', - message: `Role must be one of: ${VALID_ORGANIZATION_ROLES.join(', ')}`, - }); - } - const role = requestedRole as 'owner' | 'admin' | 'member'; - - // seat_type is optional. When omitted, inherit the existing /invitations - // default of 'community_only' so callers don't accidentally consume a - // contributor seat without asking for one. - let seatType: 'contributor' | 'community_only' = 'community_only'; - if (requestedSeatType !== undefined) { - if (requestedSeatType !== 'contributor' && requestedSeatType !== 'community_only') { - return res.status(400).json({ - error: 'Invalid seat type', - message: 'seat_type must be one of: contributor, community_only', - }); - } - seatType = requestedSeatType; - } - - const normalizedEmail = email.trim().toLowerCase(); - - try { - const localOrg = await orgDb.getOrganization(orgId); - if (!localOrg) { - return res.status(404).json({ error: 'Organization not found' }); - } - if (localOrg.is_personal) { - return res.status(400).json({ - error: 'Personal workspace', - message: 'Personal workspaces cannot have team members. Convert to a team workspace first.', - }); - } - - // Static admin API key (used by internal tooling and incident scripts) - // grants the same authority as AAO super-admin. requireAuth has already - // verified the key matches ADMIN_API_KEY before reaching this point. - const isStaticAdminApiKey = - (req as Request & { isStaticAdminApiKey?: boolean }).isStaticAdminApiKey === true; - - // Resolve caller authority: org role + AAO super-admin override. - // Skip membership lookup for the static admin API key — 'admin_api_key' - // is a synthetic user id and won't have memberships. - const callerMembership = isStaticAdminApiKey - ? null - : await resolveUserOrgMembership(workos, user.id, orgId); - const callerOrgRole = callerMembership?.role ?? null; - const isAAOAdmin = - isStaticAdminApiKey || (await isAuthenticatedUserAAOAdmin(user)); - - const isOrgAdminOrOwner = callerOrgRole === 'admin' || callerOrgRole === 'owner'; - const isOrgOwner = callerOrgRole === 'owner'; - - if (!isAAOAdmin && !callerMembership) { - return res.status(403).json({ - error: 'Access denied', - message: 'You are not a member of this organization', - }); - } - if (!isAAOAdmin && !isOrgAdminOrOwner) { - return res.status(403).json({ - error: 'Insufficient permissions', - message: 'Only admins and owners can manage members', - }); - } - // Org admins (non-owner, non-AAO) cannot assign 'owner' - if (role === 'owner' && !isAAOAdmin && !isOrgOwner) { - return res.status(403).json({ - error: 'Insufficient permissions', - message: 'Only owners can assign the owner role', - }); - } - - const userLookup = await workos!.userManagement.listUsers({ email: normalizedEmail }); - const workosUser = userLookup.data.find((u) => u.email.toLowerCase() === normalizedEmail); - - // Path 1: WorkOS user does not exist yet — invite as member only. - // - // The WorkOS-hosted invite-accept page would honor whatever roleSlug we pass, - // but invite tokens are bearer credentials (forwarded mail, leaked links). - // We always invite as 'member' and require an explicit promote step after - // acceptance — same discipline as routes/invites.ts uses on the AAO-internal - // accept flow. - if (!workosUser) { - const seatCheck = await canAddSeat(orgId, seatType); - if (!seatCheck.allowed) { - return res.status(403).json({ error: 'Seat limit reached', message: seatCheck.reason }); - } - - // The static ADMIN_API_KEY auth path uses a synthetic user id - // ('admin_api_key') that WorkOS does not recognize; passing it as - // inviterUserId fails with "User not found". Audit attribution is - // captured separately below via inviter_email. - const invitation = await workos!.userManagement.sendInvitation({ - email: normalizedEmail, - organizationId: orgId, - ...(isStaticAdminApiKey ? {} : { inviterUserId: user.id }), - roleSlug: 'member', - }); - - // Persist seat_type intent + provisioning source so the webhook - // handler picks them up when the invitee accepts (mirrors the - // existing /invitations endpoint). - await query( - `INSERT INTO invitation_seat_types (workos_invitation_id, workos_organization_id, email, seat_type, source) - VALUES ($1, $2, $3, $4, 'invited') - ON CONFLICT (workos_invitation_id) DO UPDATE SET seat_type = EXCLUDED.seat_type, source = EXCLUDED.source`, - [invitation.id, orgId, normalizedEmail, seatType], - ); - - await orgDb.recordAuditLog({ - workos_organization_id: orgId, - workos_user_id: user.id, - action: 'member_invited', - resource_type: 'invitation', - resource_id: invitation.id, - details: { - email: normalizedEmail, - requested_role: role, - invited_role: 'member', - seat_type: seatType, - inviter_email: user.email, - via: 'by_email', - }, - }); - - logger.info( - { orgId, email: normalizedEmail, requestedRole: role, seatType, inviterId: user.id }, - 'Invited member by email (no WorkOS account yet)', - ); - - const promoteHint = role !== 'member' - ? ` After they accept, call this endpoint again to promote them to ${role}.` - : ''; - return res.status(201).json({ - success: true, - action: 'invited', - message: `Invitation sent to ${normalizedEmail} as member.${promoteHint}`, - invited_role: 'member', - requested_role: role, - seat_type: seatType, - invitation: { - id: invitation.id, - email: invitation.email, - state: invitation.state, - expires_at: invitation.expiresAt, - accept_invitation_url: invitation.acceptInvitationUrl, - }, - }); - } - - const targetUserId = workosUser.id; - const pool = getPool(); - - const existingRow = await pool.query<{ - workos_membership_id: string | null; - role: string | null; - }>( - `SELECT workos_membership_id, role - FROM organization_memberships - WHERE workos_organization_id = $1 AND workos_user_id = $2`, - [orgId, targetUserId], - ); - - // Path 2: user exists but is not yet a member — create membership - if (existingRow.rows.length === 0) { - const seatCheck = await canAddSeat(orgId, seatType); - if (!seatCheck.allowed) { - return res.status(403).json({ error: 'Seat limit reached', message: seatCheck.reason }); - } - - // Stage seat_type for the membership.created webhook handler to consume. - // - // consumeInvitationSeatType matches by (organization_id, lower(email)), - // ignoring workos_invitation_id, so any prior stale row for this - // (org, email) pair would also be consumed by the next webhook. Clear - // those first so the seat_type the webhook reads is the one this caller - // requested, not a leftover from a previous failed attempt or a - // separate invitation that wasn't consumed yet. - await query( - 'DELETE FROM invitation_seat_types WHERE workos_organization_id = $1 AND lower(email) = lower($2)', - [orgId, normalizedEmail], - ); - const stagingKey = `direct_${orgId}_${targetUserId}`; - await query( - `INSERT INTO invitation_seat_types (workos_invitation_id, workos_organization_id, email, seat_type, source) - VALUES ($1, $2, $3, $4, 'admin_added') - ON CONFLICT (workos_invitation_id) DO UPDATE SET seat_type = EXCLUDED.seat_type, source = EXCLUDED.source`, - [stagingKey, orgId, normalizedEmail, seatType], - ); - - let membership; - try { - membership = await workos!.userManagement.createOrganizationMembership({ - userId: targetUserId, - organizationId: orgId, - roleSlug: role, - }); - } catch (createErr) { - // Roll back the seat_type stage row on failure. If the rollback DELETE - // itself fails (DB blip), log loudly so an operator can clean it up — - // but don't swallow silently, since a stale row would be consumed by - // the next /invitations webhook for the same (org, email) pair. - try { - await query( - 'DELETE FROM invitation_seat_types WHERE workos_invitation_id = $1', - [stagingKey], - ); - } catch (rollbackErr) { - logger.error( - { err: rollbackErr, orgId, email: normalizedEmail, stagingKey }, - 'CRITICAL: failed to rollback invitation_seat_types staging row after createOrganizationMembership failure — manually delete row to avoid seat_type leak', - ); - } - const code = (createErr as { code?: string }).code; - if (code === 'organization_membership_already_exists') { - return res.status(409).json({ - error: 'Membership already exists', - message: 'This user was just added. Try again to update their role.', - }); - } - throw createErr; - } - - await orgDb.recordAuditLog({ - workos_organization_id: orgId, - workos_user_id: user.id, - action: 'member_added', - resource_type: 'membership', - resource_id: membership.id, - details: { - target_user_id: targetUserId, - target_email: normalizedEmail, - role, - seat_type: seatType, - actor_email: user.email, - via: 'by_email', - }, - }); - - logger.info( - { orgId, targetUserId, email: normalizedEmail, role, seatType, actorId: user.id }, - 'Added member by email', - ); - - return res.status(201).json({ - success: true, - action: 'membership_created', - message: `Added ${normalizedEmail} to the organization as ${role}.`, - user_id: targetUserId, - role, - seat_type: seatType, - }); - } - - // Path 3: user is already a member — update role if it differs. - // - // Self-role-change is blocked here even when the caller is the owner. - // Without this guard, an owner who hits this endpoint with their own - // email could demote themselves to member, leaving the org without an - // owner. PATCH /:orgId/members/:membershipId enforces the same rule; - // mirroring it here closes the parallel path. AAO super-admins are - // permitted to act on themselves only when they're not also an org - // member of this org (handled by the org-member check above). - if (targetUserId === user.id) { - return res.status(400).json({ - error: 'Cannot change own role', - message: 'You cannot change your own role', - }); - } - - // Treat NULL local role the same as 'member' for comparison, but log the - // raw value in the audit row so a NULL doesn't get silently rewritten as - // 'member' in the trail. - const rawCurrentRole = existingRow.rows[0].role; - const effectiveCurrentRole = rawCurrentRole || 'member'; - if (effectiveCurrentRole === role) { - return res.json({ - success: true, - action: 'no_change', - message: `${normalizedEmail} is already a ${role}.`, - user_id: targetUserId, - role, - }); - } - - // Role-change authorization (parallel to PATCH /:orgId/members/:membershipId): - // - Owner / AAO super-admin: can change any role to any role - // - Org admin: can change member ↔ admin only; cannot promote anyone - // to owner, and cannot change a current owner's role - // - Anyone else: blocked - const targetIsOwner = effectiveCurrentRole === 'owner'; - if (!isAAOAdmin && !isOrgOwner) { - if (!isOrgAdminOrOwner) { - return res.status(403).json({ - error: 'Insufficient permissions', - message: 'Only owners and admins can change member roles', - }); - } - if (targetIsOwner) { - return res.status(403).json({ - error: 'Insufficient permissions', - message: 'Only owners can change another owner\'s role', - }); - } - // role === 'owner' is already blocked earlier (line ~2691) for non-owner non-AAO callers - } - - // Resolve membership ID (backfill from WorkOS if local cache is missing it) - let membershipId = existingRow.rows[0].workos_membership_id; - if (!membershipId) { - try { - const memberships = await workos!.userManagement.listOrganizationMemberships({ - userId: targetUserId, - organizationId: orgId, - }); - const match = memberships.data.find( - (m) => m.userId === targetUserId && m.organizationId === orgId, - ); - if (!match || !isValidWorkOSMembershipId(match.id)) { - return res.status(400).json({ - error: 'Cannot update role: membership not found in WorkOS', - }); - } - membershipId = match.id; - await pool.query( - `UPDATE organization_memberships SET workos_membership_id = $1 - WHERE workos_organization_id = $2 AND workos_user_id = $3`, - [membershipId, orgId, targetUserId], - ); - } catch (lookupErr) { - logger.error( - { err: lookupErr, orgId, targetUserId, email: normalizedEmail }, - 'Failed to look up membership from WorkOS for backfill', - ); - return res.status(400).json({ - error: 'Cannot update role: unable to resolve WorkOS membership', - }); - } - } - - await workos!.userManagement.updateOrganizationMembership(membershipId, { roleSlug: role }); - - await pool.query( - `UPDATE organization_memberships - SET role = $1, updated_at = NOW() - WHERE workos_organization_id = $2 AND workos_user_id = $3`, - [role, orgId, targetUserId], - ); - - await orgDb.recordAuditLog({ - workos_organization_id: orgId, - workos_user_id: user.id, - action: 'member_role_changed', - resource_type: 'membership', - resource_id: membershipId, - details: { - target_user_id: targetUserId, - target_email: normalizedEmail, - old_role: rawCurrentRole, - new_role: role, - actor_email: user.email, - via: 'by_email', - }, - }); - - logger.info( - { orgId, targetUserId, email: normalizedEmail, oldRole: rawCurrentRole, newRole: role, actorId: user.id }, - 'Updated member role by email', - ); - - return res.json({ - success: true, - action: 'role_updated', - message: `Updated ${normalizedEmail} to ${role}.`, - user_id: targetUserId, - role, - previous_role: rawCurrentRole, - }); - } catch (error) { - if (respondToAdminAuthorizationError(error, res)) return; - const errorMessage = error instanceof Error ? error.message : 'Unknown error'; - logger.error( - { err: error, errorMessage, orgId, email: normalizedEmail, role }, - 'Error in members/by-email', - ); - return res.status(500).json({ - error: 'Internal server error', - message: 'Unable to add or promote member. Please try again or contact support.', - }); - } - }); - - // PATCH /api/organizations/:orgId/members/:membershipId - Update member role and/or seat type - router.patch('/:orgId/members/:membershipId', requireAuth, async (req, res) => { - try { - const user = req.user!; - const { orgId, membershipId } = req.params; - const { role, seat_type } = req.body; - - if (!role && !seat_type) { - return res.status(400).json({ - error: 'Missing required field', - message: 'At least one of role or seat_type is required', - }); - } - - // Validate role if provided - if (role && !VALID_ORGANIZATION_ROLES.includes(role as any)) { - return res.status(400).json({ - error: 'Invalid role', - message: `Role must be one of: ${VALID_ORGANIZATION_ROLES.join(', ')}`, - }); - } - - // Validate seat_type if provided - if (seat_type && !['contributor', 'community_only'].includes(seat_type)) { - return res.status(400).json({ - error: 'Invalid seat type', - message: 'seat_type must be one of: contributor, community_only', - }); - } - - // Verify user is member of this organization - const callerMembership = await resolveUserOrgMembership(workos, user.id, orgId); - if (!callerMembership) { - return res.status(403).json({ - error: 'Access denied', - message: 'You are not a member of this organization', - }); - } - - // Check caller's role first. Detailed role-change caps for admins are - // applied below once we have the target membership in hand. - const userRole = callerMembership.role; - if (role && userRole !== 'owner' && userRole !== 'admin') { - return res.status(403).json({ - error: 'Insufficient permissions', - message: 'Only owners and admins can change member roles', - }); - } - if (seat_type && userRole !== 'owner' && userRole !== 'admin') { - return res.status(403).json({ - error: 'Insufficient permissions', - message: 'Only owners and admins can change seat types', - }); - } - - // Get the target membership - const membership = await workos!.userManagement.getOrganizationMembership(membershipId); - if (membership.organizationId !== orgId) { - return res.status(404).json({ - error: 'Member not found', - message: 'This member does not belong to this organization', - }); - } - - // Cannot change own role - if (role && membership.userId === user.id) { - return res.status(400).json({ - error: 'Cannot change own role', - message: 'You cannot change your own role', - }); - } - - // Admin role-change caps: an org admin (non-owner) cannot promote anyone - // to owner, and cannot change the role of an existing owner. Owners and - // AAO super-admins are unrestricted. - if (role && userRole === 'admin') { - if (role === 'owner') { - return res.status(403).json({ - error: 'Insufficient permissions', - message: 'Only owners can assign the owner role', - }); - } - const targetCurrentRole = membership.role?.slug || 'member'; - if (targetCurrentRole === 'owner') { - return res.status(403).json({ - error: 'Insufficient permissions', - message: "Only owners can change another owner's role", - }); - } - } - - // If upgrading to contributor, enforce seat limits - if (seat_type === 'contributor') { - const currentSeatType = await getUserSeatType(membership.userId); - if (currentSeatType !== 'contributor') { - const seatCheck = await canAddSeat(orgId, 'contributor'); - if (!seatCheck.allowed) { - return res.status(403).json({ - error: 'Seat limit reached', - message: seatCheck.reason, - }); - } - } - } - - // Update role via WorkOS if requested - let updatedRole = membership.role?.slug || 'member'; - if (role) { - const updatedMembership = await workos!.userManagement.updateOrganizationMembership( - membershipId, - { roleSlug: role } - ); - updatedRole = updatedMembership.role?.slug || 'member'; - } - - // Update seat_type in local DB if requested - let updatedSeatType: string | undefined; - if (seat_type) { - // Get old seat_type for audit log - const oldResult = await query<{ seat_type: string }>( - 'SELECT seat_type FROM organization_memberships WHERE workos_organization_id = $1 AND workos_user_id = $2', - [orgId, membership.userId] - ); - const oldSeatType = oldResult.rows[0]?.seat_type || 'community_only'; - - await query( - `UPDATE organization_memberships SET seat_type = $1, updated_at = NOW() - WHERE workos_organization_id = $2 AND workos_user_id = $3`, - [seat_type, orgId, membership.userId] - ); - updatedSeatType = seat_type; - - if (oldSeatType !== seat_type) { - await orgDb.recordAuditLog({ - workos_organization_id: orgId, - workos_user_id: user.id, - action: 'member_seat_type_changed', - resource_type: 'membership', - resource_id: membershipId, - details: { - target_user_id: membership.userId, - old_seat_type: oldSeatType, - new_seat_type: seat_type, - }, - }); - - // Notify the member their seat type changed (fire-and-forget) - notifyMemberSeatChanged({ - userId: membership.userId, - newSeatType: seat_type as 'contributor' | 'community_only', - context: 'admin_action', - }).catch(err => logger.warn({ err }, 'Failed to notify member of seat change')); - - // Check seat warning thresholds (fire-and-forget) - (async () => { - try { - const localOrg = await orgDb.getOrganization(orgId); - const tier = resolveMembershipTier(localOrg); - const seatLimits = getSeatLimits(tier); - const seatUsage = await getSeatUsage(orgId); - let orgName = 'Organization'; - try { const org = await workos!.organizations.getOrganization(orgId); orgName = org.name; } catch {} - const adminEmails = await getOrgAdminEmails(workos!, orgId); - - if (seat_type === 'contributor') { - const warning = await checkAndUpdateSeatWarning(orgId, 'contributor', seatUsage.contributor, seatLimits.contributor, tier); - if (warning?.shouldNotify && adminEmails.length > 0) { - await notifySeatWarning({ orgId, orgName, adminEmails, seatType: 'contributor', threshold: warning.threshold, usage: seatUsage.contributor, limit: seatLimits.contributor }); - } - } else { - // Demoted from contributor — may free a seat - const oldThreshold = await resetSeatWarningIfNeeded(orgId, 'contributor', seatUsage.contributor, seatLimits.contributor); - if (oldThreshold >= 80 && adminEmails.length > 0) { - await notifySeatFreed({ orgId, orgName, adminEmails, seatType: 'contributor', usage: seatUsage.contributor, limit: seatLimits.contributor }); - } - } - } catch (err) { - logger.warn({ err }, 'Failed to check seat warnings after seat type change'); - } - })(); - } - } - - if (role) { - logger.info({ orgId, membershipId, newRole: role, changedBy: user.id }, 'Member role updated'); - - await orgDb.recordAuditLog({ - workos_organization_id: orgId, - workos_user_id: user.id, - action: 'member_role_changed', - resource_type: 'membership', - resource_id: membershipId, - details: { - target_user_id: membership.userId, - old_role: membership.role?.slug || 'member', - new_role: role, - }, - }); - } - - res.json({ - success: true, - membership: { - id: membership.id, - user_id: membership.userId, - role: updatedRole, - status: membership.status, - ...(updatedSeatType && { seat_type: updatedSeatType }), - }, - }); - } catch (error: unknown) { - logger.error({ err: error }, 'Update member error'); - return res.status(500).json({ - error: 'Failed to update member', - message: 'Unable to update member. Please try again or contact support.', - }); - } - }); - - // DELETE /api/organizations/:orgId/members/:membershipId - Remove a member - router.delete('/:orgId/members/:membershipId', requireAuth, async (req, res) => { - try { - const user = req.user!; - const { orgId, membershipId } = req.params; - - // Verify user is member of this organization - const callerMembership = await resolveUserOrgMembership(workos, user.id, orgId); - if (!callerMembership) { - return res.status(403).json({ - error: 'Access denied', - message: 'You are not a member of this organization', - }); - } - - // Check user's role - only admins or owners can remove members - const userRole = callerMembership.role; - if (userRole !== 'admin' && userRole !== 'owner') { - return res.status(403).json({ - error: 'Insufficient permissions', - message: 'Only admins and owners can remove members', - }); - } - - // Get the target membership - const membership = await workos!.userManagement.getOrganizationMembership(membershipId); - if (membership.organizationId !== orgId) { - return res.status(404).json({ - error: 'Member not found', - message: 'This member does not belong to this organization', - }); - } - - // Cannot remove self - if (membership.userId === user.id) { - return res.status(400).json({ - error: 'Cannot remove self', - message: 'You cannot remove yourself from the organization', - }); - } - - // Only owners can remove admins - const targetRole = membership.role?.slug || 'member'; - if (targetRole === 'admin' && userRole !== 'owner') { + if (!callerMembership) { return res.status(403).json({ - error: 'Insufficient permissions', - message: 'Only owners can remove admins', + error: 'Access denied', + message: 'You are not a member of this organization', }); } - // Cannot remove owners - if (targetRole === 'owner') { - return res.status(400).json({ - error: 'Cannot remove owner', - message: 'Organization owners cannot be removed', + const requestingUserRole = callerMembership.role; + + // Get all members of the organization (paginate to handle orgs with >100 members) + // Fetch first page to get type inference, then paginate if needed + let membershipsPage = await workos!.userManagement.listOrganizationMemberships({ + organizationId: orgId, + statuses: ['active', 'pending'], + limit: 100, + }); + const allMemberships = [...membershipsPage.data]; + while (membershipsPage.listMetadata?.after) { + membershipsPage = await workos!.userManagement.listOrganizationMemberships({ + organizationId: orgId, + statuses: ['active', 'pending'], + after: membershipsPage.listMetadata.after, + limit: 100, }); + allMemberships.push(...membershipsPage.data); } - // Get user info and seat type before deletion - let removedUserEmail = 'Unknown'; - try { - const removedUser = await workos!.userManagement.getUser(membership.userId); - removedUserEmail = removedUser.email; - } catch { - // User might already be deleted - } - const removedSeatType = await getUserSeatType(membership.userId); + // Get all mapped WorkOS user IDs from Slack + const slackDb = new SlackDatabase(); + const mappedWorkosUserIds = await slackDb.getMappedWorkosUserIds(); - // Delete the membership from WorkOS - await workos!.userManagement.deleteOrganizationMembership(membershipId); + // Bulk-fetch local membership data and user-set names in parallel + const [localMembersResult, localUsersResult] = await Promise.all([ + query<{ + workos_user_id: string; + seat_type: string; + first_name: string | null; + last_name: string | null; + role: string | null; + }>( + 'SELECT workos_user_id, seat_type, first_name, last_name, role FROM organization_memberships WHERE workos_organization_id = $1', + [orgId] + ), + query<{ + workos_user_id: string; + first_name: string | null; + last_name: string | null; + }>( + 'SELECT workos_user_id, first_name, last_name FROM users WHERE workos_user_id = ANY($1)', + [allMemberships.map(m => m.userId)] + ), + ]); + const localMemberMap = new Map(localMembersResult.rows.map(r => [r.workos_user_id, r])); + const localUserMap = new Map(localUsersResult.rows.map(r => [r.workos_user_id, r])); - // Clean up local organization_memberships table immediately (don't wait for webhook) - // This ensures the user isn't "stuck" with stale membership data. Use the - // membership-db helper so users.primary_organization_id gets cleared in the - // same transaction when it pointed at this org — otherwise read sites - // continue resolving the just-removed user back into the org they no - // longer belong to. - try { - await deleteOrganizationMembership(membership.userId, orgId); - // Drop the membership cache for this org so the next read sees the - // post-removal state instead of the pre-removal snapshot. - invalidateMembershipCache(orgId); - logger.debug({ userId: membership.userId, orgId }, 'Cleaned up local organization_memberships'); - } catch (cleanupError) { - // Log but don't fail - the webhook will eventually clean this up - logger.warn({ error: cleanupError, userId: membership.userId, orgId }, 'Failed to clean up local organization_memberships'); - } + // Fetch user details for each membership + const members = await Promise.all( + allMemberships.map(async (membership) => { + const localMember = localMemberMap.get(membership.userId); + const localUser = localUserMap.get(membership.userId); + try { + const memberUser = await workos!.userManagement.getUser(membership.userId); + // Prefer local user names > local membership names > WorkOS names + const firstName = localUser?.first_name ?? localMember?.first_name ?? memberUser.firstName ?? null; + const lastName = localUser?.last_name ?? localMember?.last_name ?? memberUser.lastName ?? null; + return { + id: membership.id, + user_id: membership.userId, + email: memberUser.email, + first_name: firstName, + last_name: lastName, + role: membership.role?.slug || localMember?.role || 'member', + status: membership.status, + created_at: membership.createdAt, + slack_linked: mappedWorkosUserIds.has(membership.userId), + seat_type: localMember?.seat_type ?? 'community_only', + }; + } catch (error) { + // User might have been deleted + logger.warn({ membershipId: membership.id, userId: membership.userId }, 'Failed to fetch user for membership'); + return { + id: membership.id, + user_id: membership.userId, + email: 'Unknown', + first_name: localUser?.first_name ?? localMember?.first_name ?? null, + last_name: localUser?.last_name ?? localMember?.last_name ?? null, + role: membership.role?.slug || localMember?.role || 'member', + status: membership.status, + created_at: membership.createdAt, + slack_linked: false, + seat_type: localMember?.seat_type ?? 'community_only', + }; + } + }) + ); - logger.info({ orgId, membershipId, removedBy: user.id }, 'Member removed'); + // Get pending invitations for this organization + const invitations = await collectWorkOSPages((after) => + workos!.userManagement.listInvitations({ + organizationId: orgId, + limit: 100, + after, + }) + ); - // Record audit log - await orgDb.recordAuditLog({ - workos_organization_id: orgId, - workos_user_id: user.id, - action: 'member_removed', - resource_type: 'membership', - resource_id: membershipId, - details: { - removed_user_id: membership.userId, - removed_user_email: removedUserEmail, - removed_role: targetRole, - }, - }); + // Fetch seat types for pending invitations + const invSeatResult = await query<{ email: string; seat_type: string }>( + 'SELECT email, seat_type FROM invitation_seat_types WHERE workos_organization_id = $1', + [orgId] + ); + const invSeatMap = new Map(invSeatResult.rows.map(r => [r.email.toLowerCase(), r.seat_type])); - // Check if a seat freed up and notify admins (fire-and-forget) - if (removedSeatType === 'contributor') { - (async () => { - try { - const localOrg = await orgDb.getOrganization(orgId); - const tier = resolveMembershipTier(localOrg); - const seatLimits = getSeatLimits(tier); - const seatUsage = await getSeatUsage(orgId); - const oldThreshold = await resetSeatWarningIfNeeded(orgId, 'contributor', seatUsage.contributor, seatLimits.contributor); - - if (oldThreshold >= 80) { - let orgName = 'Organization'; - try { const org = await workos!.organizations.getOrganization(orgId); orgName = org.name; } catch {} - const adminEmails = await getOrgAdminEmails(workos!, orgId); - if (adminEmails.length > 0) { - await notifySeatFreed({ orgId, orgName, adminEmails, seatType: 'contributor', usage: seatUsage.contributor, limit: seatLimits.contributor }); - } - } - } catch (err) { - logger.warn({ err }, 'Failed to send seat freed notification'); - } - })(); + const pendingInvitations = invitations + .filter(inv => inv.state === 'pending') + .map(inv => ({ + id: inv.id, + email: inv.email, + state: inv.state, + expires_at: inv.expiresAt, + created_at: inv.createdAt, + inviter_user_id: inv.inviterUserId, + seat_type: invSeatMap.get(inv.email.toLowerCase()) || 'community_only', + })); + + // Include seat usage and limits only for admins/owners + const isAdmin = requestingUserRole === 'admin' || requestingUserRole === 'owner'; + let seatInfo: { seat_usage?: { contributor: number; community_only: number }; seat_limits?: { contributor: number; community: number } } = {}; + if (isAdmin) { + const seatUsage = await getSeatUsage(orgId); + const localOrg = await orgDb.getOrganization(orgId); + seatInfo = { + seat_usage: seatUsage, + seat_limits: getSeatLimits(resolveMembershipTier(localOrg)), + }; } res.json({ - success: true, - message: 'Member removed successfully', + members, + pending_invitations: pendingInvitations, + ...seatInfo, }); } catch (error) { - logger.error({ err: error }, 'Remove member error'); + logger.error({ err: error }, 'List organization members error'); res.status(500).json({ - error: 'Failed to remove member', + error: 'Failed to list organization members', }); } }); @@ -3887,118 +2082,6 @@ export function createOrganizationsRouter(): Router { // SEAT UPGRADE REQUESTS // ========================================================================= - const VALID_RESOURCE_TYPES = ['working_group', 'council', 'product_summit']; - - // POST /api/organizations/:orgId/seat-requests - Request a seat upgrade - router.post('/:orgId/seat-requests', requireAuth, invitationRateLimiter, async (req, res) => { - try { - const user = req.user!; - const { orgId } = req.params; - const { resource_type, resource_id, resource_name } = req.body; - - if (!resource_type || !VALID_RESOURCE_TYPES.includes(resource_type)) { - return res.status(400).json({ - error: 'Invalid resource type', - message: `resource_type must be one of: ${VALID_RESOURCE_TYPES.join(', ')}`, - }); - } - - if (resource_id && (typeof resource_id !== 'string' || resource_id.length > 255)) { - return res.status(400).json({ error: 'Invalid resource_id' }); - } - if (resource_name && (typeof resource_name !== 'string' || resource_name.length > 500)) { - return res.status(400).json({ error: 'Invalid resource_name' }); - } - - // Verify user is a member of this org - const membership = await resolveUserOrgMembership(workos, user.id, orgId); - if (!membership) { - return res.status(403).json({ - error: 'Access denied', - message: 'You are not a member of this organization', - }); - } - - // Verify user is community_only - const seatType = await getUserSeatType(user.id); - if (seatType === 'contributor') { - return res.status(400).json({ - error: 'Already a contributor', - message: 'You already have contributor access', - }); - } - - // Check for existing pending request for this resource - const hasPending = await hasPendingSeatRequest(orgId, user.id, resource_type, resource_id); - if (hasPending) { - return res.status(409).json({ - error: 'Request already pending', - message: 'You already have a pending request for this resource', - }); - } - - const request = await createSeatUpgradeRequest({ - orgId, - userId: user.id, - resourceType: resource_type, - resourceId: resource_id, - resourceName: resource_name, - }); - - // Notify admins (fire-and-forget) - (async () => { - try { - let orgName = 'Organization'; - try { const org = await workos!.organizations.getOrganization(orgId); orgName = org.name; } catch {} - const adminEmails = await getOrgAdminEmails(workos!, orgId); - - let memberName = user.email; - try { - const workosUser = await workos!.userManagement.getUser(user.id); - if (workosUser.firstName && workosUser.lastName) { - memberName = `${workosUser.firstName} ${workosUser.lastName}`; - } - } catch {} - - if (adminEmails.length > 0) { - await notifySeatRequest({ - orgId, - orgName, - adminEmails, - memberName, - memberEmail: user.email, - resourceType: resource_type, - resourceName: resource_name, - }); - } - } catch (err) { - logger.warn({ err }, 'Failed to notify admins of seat upgrade request'); - } - })(); - - await orgDb.recordAuditLog({ - workos_organization_id: orgId, - workos_user_id: user.id, - action: 'seat_upgrade_requested', - resource_type: 'seat_upgrade_request', - resource_id: request.id, - details: { resource_type, resource_id, resource_name }, - }); - - res.json({ id: request.id, status: 'pending' }); - } catch (error: any) { - // Handle unique constraint violation (duplicate pending request) - if (error?.code === '23505') { - return res.status(409).json({ - error: 'Request already pending', - message: 'You already have a pending request for this resource', - }); - } - logger.error({ err: error }, 'Create seat upgrade request error'); - res.status(500).json({ error: 'Failed to create seat upgrade request' }); - } - }); - // GET /api/organizations/:orgId/seat-requests - List seat upgrade requests router.get('/:orgId/seat-requests', requireAuth, async (req, res) => { try { @@ -4029,148 +2112,5 @@ export function createOrganizationsRouter(): Router { } }); - // POST /api/organizations/:orgId/seat-requests/:requestId/approve - Approve a seat upgrade request - router.post('/:orgId/seat-requests/:requestId/approve', requireAuth, async (req, res) => { - try { - const user = req.user!; - const { orgId, requestId } = req.params; - - // Verify admin/owner - const membership = await resolveUserOrgMembership(workos, user.id, orgId); - if (!membership) { - return res.status(403).json({ error: 'Access denied' }); - } - const userRole = membership.role; - if (userRole !== 'admin' && userRole !== 'owner') { - return res.status(403).json({ error: 'Only admins and owners can approve seat requests' }); - } - - const request = await getSeatUpgradeRequest(requestId); - if (!request || request.workos_organization_id !== orgId) { - return res.status(404).json({ error: 'Request not found' }); - } - if (request.status !== 'pending') { - return res.status(400).json({ error: 'Request already resolved' }); - } - - // Check seat availability - const seatCheck = await canAddSeat(orgId, 'contributor'); - if (!seatCheck.allowed) { - return res.status(403).json({ - error: 'Seat limit reached', - message: seatCheck.reason, - }); - } - - // Approve the request (atomic: only succeeds if still pending) - const resolved = await resolveSeatUpgradeRequest(requestId, 'approved', user.id); - if (!resolved) { - return res.status(409).json({ error: 'Request was already resolved' }); - } - - // Update the member's seat type - await query( - `UPDATE organization_memberships SET seat_type = 'contributor', updated_at = NOW() - WHERE workos_organization_id = $1 AND workos_user_id = $2`, - [orgId, request.workos_user_id] - ); - - await orgDb.recordAuditLog({ - workos_organization_id: orgId, - workos_user_id: user.id, - action: 'seat_upgrade_approved', - resource_type: 'seat_upgrade_request', - resource_id: requestId, - details: { target_user_id: request.workos_user_id, resource_type: request.resource_type }, - }); - - // Notify member (fire-and-forget) - notifyMemberSeatChanged({ - userId: request.workos_user_id, - newSeatType: 'contributor', - context: 'request_approved', - resourceName: request.resource_name || undefined, - }).catch(err => logger.warn({ err }, 'Failed to notify member of approved seat request')); - - // Check seat warning thresholds after approval (fire-and-forget) - (async () => { - try { - const localOrg = await orgDb.getOrganization(orgId); - const tier = resolveMembershipTier(localOrg); - const seatLimits = getSeatLimits(tier); - const seatUsage = await getSeatUsage(orgId); - const warning = await checkAndUpdateSeatWarning(orgId, 'contributor', seatUsage.contributor, seatLimits.contributor, tier); - if (warning?.shouldNotify) { - let orgName = 'Organization'; - try { const org = await workos!.organizations.getOrganization(orgId); orgName = org.name; } catch {} - const adminEmails = await getOrgAdminEmails(workos!, orgId); - if (adminEmails.length > 0) { - await notifySeatWarning({ orgId, orgName, adminEmails, seatType: 'contributor', threshold: warning.threshold, usage: seatUsage.contributor, limit: seatLimits.contributor }); - } - } - } catch (err) { - logger.warn({ err }, 'Failed to check seat warnings after seat request approval'); - } - })(); - - res.json({ success: true, status: 'approved' }); - } catch (error) { - logger.error({ err: error }, 'Approve seat upgrade request error'); - res.status(500).json({ error: 'Failed to approve seat upgrade request' }); - } - }); - - // POST /api/organizations/:orgId/seat-requests/:requestId/deny - Deny a seat upgrade request - router.post('/:orgId/seat-requests/:requestId/deny', requireAuth, async (req, res) => { - try { - const user = req.user!; - const { orgId, requestId } = req.params; - - // Verify admin/owner - const membership = await resolveUserOrgMembership(workos, user.id, orgId); - if (!membership) { - return res.status(403).json({ error: 'Access denied' }); - } - const userRole = membership.role; - if (userRole !== 'admin' && userRole !== 'owner') { - return res.status(403).json({ error: 'Only admins and owners can deny seat requests' }); - } - - const request = await getSeatUpgradeRequest(requestId); - if (!request || request.workos_organization_id !== orgId) { - return res.status(404).json({ error: 'Request not found' }); - } - if (request.status !== 'pending') { - return res.status(400).json({ error: 'Request already resolved' }); - } - - const resolved = await resolveSeatUpgradeRequest(requestId, 'denied', user.id); - if (!resolved) { - return res.status(409).json({ error: 'Request was already resolved' }); - } - - await orgDb.recordAuditLog({ - workos_organization_id: orgId, - workos_user_id: user.id, - action: 'seat_upgrade_denied', - resource_type: 'seat_upgrade_request', - resource_id: requestId, - details: { target_user_id: request.workos_user_id }, - }); - - // Notify member (fire-and-forget) - notifyMemberSeatChanged({ - userId: request.workos_user_id, - newSeatType: 'community_only', - context: 'request_denied', - }).catch(err => logger.warn({ err }, 'Failed to notify member of denied seat request')); - - res.json({ success: true, status: 'denied' }); - } catch (error) { - logger.error({ err: error }, 'Deny seat upgrade request error'); - res.status(500).json({ error: 'Failed to deny seat upgrade request' }); - } - }); - return router; } diff --git a/server/src/routes/workos-webhooks.ts b/server/src/routes/workos-webhooks.ts index a99b32e39c1..ddeb0d32497 100644 --- a/server/src/routes/workos-webhooks.ts +++ b/server/src/routes/workos-webhooks.ts @@ -27,6 +27,7 @@ import { upsertWorkosUserInCredentialEvent, upsertWorkosUserUnlessConfirmedDeleted, withActiveCredentialEventMutation, + withActiveCredentialEventMutationAfterSerializedPrefetch, withCredentialCreationEventMutation, } from '../db/identity-db.js'; import { @@ -35,24 +36,26 @@ import { removeWorkosDomainAndReselectPrimary, } from '../db/organization-domains-db.js'; import { BrandDatabase } from '../db/brand-db.js'; -import { getWorkos } from '../auth/workos-client.js'; +import { getAuthorizationEnforcementWorkos, getWorkos } from '../auth/workos-client.js'; import { invalidateUnifiedUsersCache } from '../cache/unified-users.js'; import { tryAutoLinkWebsiteUserToSlack } from '../slack/sync.js'; import { resolveUserNameWithFallbacks } from '../utils/resolve-user-name.js'; import { triageAndNotify } from '../services/prospect-triage.js'; import { researchDomain, trackBackground } from '../services/brand-enrichment.js'; -import { isFreeEmailDomain } from '../utils/email-domain.js'; import { notifyBrandClaimOpportunity } from '../notifications/registry.js'; import { getNudgeDismissal, recordNudgeDismissal } from '../db/user-nudges-db.js'; import { getCompanyDomain } from '../utils/email-domain.js'; import { canonicalizeBrandDomain, assertClaimableBrandDomain } from '../services/identifier-normalization.js'; +import { backfillPrimaryOrganization, resolvePreferredOrganization } from '../db/users-db.js'; import { notifySystemError } from '../addie/error-notifier.js'; import { canAddSeat, type SeatType, OrganizationDatabase } from '../db/organization-db.js'; import { sendToOrgAdmins, escapeSlackMrkdwn } from '../slack/org-group-dm.js'; import { upsertOrganizationMembership, deleteOrganizationMembership, + deleteExactOrganizationMembership, consumeInvitationSeatType, + type ProvisioningSource, } from '../db/membership-db.js'; import { boundedRawJson, type RawJsonRequest } from '../middleware/bounded-raw-json.js'; @@ -82,42 +85,6 @@ interface UserData { updated_at: string; } -const PROVIDER_PREFETCH_TIMEOUT_MS = Number( - process.env.WORKOS_PROVIDER_PREFETCH_TIMEOUT_MS ?? 5_000, -); - -async function boundedProviderPrefetch(operation: Promise): Promise { - let timeout: ReturnType | undefined; - try { - return await Promise.race([ - operation, - new Promise((_resolve, reject) => { - timeout = setTimeout( - () => reject(new Error('Provider prefetch timed out')), - PROVIDER_PREFETCH_TIMEOUT_MS, - ); - }), - ]); - } finally { - if (timeout) clearTimeout(timeout); - } -} - -async function fetchMembershipUser(membership: OrganizationMembershipData): Promise { - const workosUser = await boundedProviderPrefetch( - getWorkos().userManagement.getUser(membership.user_id), - ); - return { - id: workosUser.id, - email: workosUser.email, - first_name: workosUser.firstName, - last_name: workosUser.lastName, - email_verified: workosUser.emailVerified, - created_at: workosUser.createdAt, - updated_at: workosUser.updatedAt, - }; -} - interface OrganizationDomainData { domain: string; state: 'verified' | 'pending'; @@ -230,194 +197,240 @@ async function notifyAdminsOfRefusedMembership(input: { } } -async function upsertMembership( - membership: OrganizationMembershipData, - user: UserData, - client: PoolClient, -): Promise { - const userData = user; - - if (membership.status !== 'active') { - logger.info( - { membershipId: membership.id, status: membership.status, userId: membership.user_id, orgId: membership.organization_id }, - 'Removing non-active organization membership from local cache', - ); - await deleteInactiveMembershipCache(membership, client); - return; - } +class MembershipUserSourceUnavailableError extends Error {} - const incomingRole = membership.role?.slug || 'member'; - - // Resolve final role against WorkOS BEFORE we touch local. If we need to - // auto-promote this user (ownerless-org safety net), push the change to - // WorkOS first and only then write the resolved role locally. WorkOS is - // the source of truth — local must never get ahead of it. - // Provider-side owner promotion cannot be made exactly-once without a - // durable event/intent journal. Preserve the signed WorkOS role locally and - // defer ownerless reconciliation rather than perform an upstream authority - // write whose outcome could become unknown during deletion. - const resolution: { role: string; promoted: boolean; promotionError?: unknown } = { - role: incomingRole, - promoted: false, - }; +const PROVIDER_PREFETCH_TIMEOUT_MS = Number( + process.env.WORKOS_PROVIDER_PREFETCH_TIMEOUT_MS ?? 5_000, +); - // Consume any pending seat_type + provisioning_source staged by the - // endpoint that triggered this membership creation. Falls back to defaults - // when no row was staged (e.g. someone added the membership directly in - // WorkOS rather than through one of our endpoints). - const consumed = await consumeInvitationSeatType( - membership.organization_id, - userData.email, - client, - ); - const hasExplicitSeatType = consumed !== null; - const seatType: SeatType = consumed?.seat_type === 'contributor' ? 'contributor' : 'community_only'; - const provisioningSource = consumed?.source || 'webhook'; - - // Seat-cap enforcement for un-staged membership adds. When the membership - // came through one of our invite endpoints, the cap was already checked at - // issue time and the row in invitation_seat_types reserved the seat — the - // consume above releases that reservation, so re-checking would always - // pass. Webhook-driven adds without a staged invite (SSO domain auto-join, - // dashboard direct add, API direct add) bypass our checks entirely. Refuse - // and notify so a multi-user company can't squeeze onto a 1-seat - // individual sub by adding members in WorkOS directly. - if (!hasExplicitSeatType) { - const availability = await canAddSeat(membership.organization_id, seatType, client); - if (!availability.allowed) { - logger.warn({ - orgId: membership.organization_id, - userId: membership.user_id, - email: userData.email, - seatType, - reason: availability.reason, - }, 'Refusing to mirror webhook-driven membership: org over seat cap'); - void notifyAdminsOfRefusedMembership({ - orgId: membership.organization_id, - newUserEmail: userData.email, - seatType, - reason: availability.reason ?? 'Seat cap reached', - }); - return; - } +async function boundedProviderPrefetch(operation: Promise): Promise { + let timeout: ReturnType | undefined; + try { + return await Promise.race([ + operation, + new Promise((_resolve, reject) => { + timeout = setTimeout( + () => reject(new MembershipUserSourceUnavailableError('Membership provider prefetch timed out')), + PROVIDER_PREFETCH_TIMEOUT_MS, + ); + }), + ]); + } finally { + if (timeout) clearTimeout(timeout); } +} - await upsertOrganizationMembership({ - user_id: membership.user_id, - organization_id: membership.organization_id, - membership_id: membership.id, - email: userData.email, - first_name: userData.first_name, - last_name: userData.last_name, - role: resolution.role, - seat_type: seatType, - has_explicit_seat_type: hasExplicitSeatType, - provisioning_source: provisioningSource, - }, client); - - // Audit-log both outcomes of the ownerless-org auto-promote path so future - // role-drift questions have a paper trail in registry_audit_log (and we - // don't have to grep production logs to reconstruct what happened). - if (resolution.promoted) { - logger.info({ - membershipId: membership.id, - userId: membership.user_id, - orgId: membership.organization_id, - }, 'Auto-promoted member to owner in WorkOS — org had no other admin/owner'); - try { - await orgDb.recordAuditLog({ - workos_organization_id: membership.organization_id, - workos_user_id: membership.user_id, - action: 'membership_auto_promoted_to_owner', - resource_type: 'membership', - resource_id: membership.id, - details: { - email: userData.email, - previous_role: incomingRole, - new_role: 'owner', - reason: 'ownerless_org_safety_net', - }, - }); - } catch (auditErr) { - logger.warn({ err: auditErr, membershipId: membership.id }, - 'Failed to write audit log for auto-promotion'); - } - } else if (resolution.promotionError !== undefined) { - const err = resolution.promotionError; - const errMessage = err instanceof Error ? err.message : String(err); - try { - await orgDb.recordAuditLog({ - workos_organization_id: membership.organization_id, - workos_user_id: membership.user_id, - action: 'membership_auto_promote_failed', - resource_type: 'membership', - resource_id: membership.id, - details: { - email: userData.email, - attempted_role: 'owner', - fallback_role: resolution.role, - error: errMessage, - }, +interface ProviderOrganizationMembership { + id: string; + userId: string; + organizationId: string; + status: 'active' | 'pending' | 'inactive'; + role?: { slug: string } | null; +} + +/** Read the provider's current exact membership. + * The caller serializes provider snapshots before taking the credential lock; + * webhook payloads are delivery hints, not an ordering or version authority. + */ +async function currentProviderMembership(event: OrganizationMembershipData): Promise { + const rows = new Map(); + const cursors = new Set(); + let after: string | undefined; + try { + do { + const page = await getAuthorizationEnforcementWorkos().userManagement.listOrganizationMemberships({ + userId: event.user_id, + organizationId: event.organization_id, + statuses: ['active'], + limit: 100, + after, }); - } catch (auditErr) { - logger.warn({ err: auditErr, membershipId: membership.id }, - 'Failed to write audit log for auto-promotion failure'); - } + for (const row of page.data as ProviderOrganizationMembership[]) { + if (row.userId === event.user_id && row.organizationId === event.organization_id && row.status === 'active') { + rows.set(row.id, row); + } + } + after = page.listMetadata?.after ?? undefined; + if (after && cursors.has(after)) throw new Error('Provider membership pagination repeated a cursor'); + if (after) cursors.add(after); + } while (after); + } catch (error) { + logger.error({ error, membershipId: event.id, userId: event.user_id, orgId: event.organization_id }, 'Failed to read current membership from WorkOS'); + throw new MembershipUserSourceUnavailableError('Membership authority source unavailable'); } - + if (rows.size > 1) throw new MembershipUserSourceUnavailableError('Membership authority source is ambiguous'); + return rows.values().next().value ?? null; } -/** - * Delete a non-active membership from the local cache only. - * - * WorkOS membership.updated events can mark a membership inactive. That should - * remove local access immediately, but it must not run owner-succession logic: - * promotion is reserved for explicit organization_membership.deleted events. - */ -async function deleteInactiveMembershipCache( +export async function upsertMembership( membership: OrganizationMembershipData, - client: PoolClient, -): Promise { - const deletedRole = await deleteOrganizationMembership( + user?: UserData +): Promise { + let refusedSeat: { seatType: SeatType; reason: string } | undefined; + let userData = user; + let current: ProviderOrganizationMembership | null = null; + let synchronizedUserId = membership.user_id; + const guarded = await withActiveCredentialEventMutationAfterSerializedPrefetch( membership.user_id, - membership.organization_id, - client, - ); + async () => { + current = await boundedProviderPrefetch(currentProviderMembership(membership)); + if (!current) return; - logger.info({ - membershipId: membership.id, - userId: membership.user_id, - orgId: membership.organization_id, - role: deletedRole, - status: membership.status, - }, 'Deleted non-active organization membership from local cache'); -} + if (!userData) { + try { + const workosUser = await boundedProviderPrefetch( + getAuthorizationEnforcementWorkos().userManagement.getUser(current.userId), + ); + userData = { + id: workosUser.id, + email: workosUser.email, + first_name: workosUser.firstName, + last_name: workosUser.lastName, + email_verified: workosUser.emailVerified, + created_at: workosUser.createdAt, + updated_at: workosUser.updatedAt, + }; + } catch (error) { + logger.error({ error, userId: current.userId }, 'Failed to fetch user from WorkOS'); + throw new MembershipUserSourceUnavailableError('Membership user source unavailable'); + } + } + if (userData.id !== current.userId) { + throw new MembershipUserSourceUnavailableError('Membership user source did not match the current membership'); + } -/** - * Delete organization membership from local database - */ -async function deleteMembership(membership: OrganizationMembershipData): Promise { - const deletedRole = await deleteOrganizationMembership(membership.user_id, membership.organization_id); + const confirmed = await boundedProviderPrefetch(currentProviderMembership(membership)); + if (!confirmed || confirmed.id !== current.id || confirmed.userId !== current.userId + || confirmed.organizationId !== current.organizationId || confirmed.status !== current.status + || confirmed.role?.slug !== current.role?.slug) { + throw new MembershipUserSourceUnavailableError('Membership authority changed during synchronization'); + } + }, + async (client) => { + // Management-side seat decisions lock this row too. Keep the invitation + // reservation visible until the membership is inserted in this same + // transaction, so no concurrent invitation can observe transient capacity. + const org = await client.query( + 'SELECT workos_organization_id FROM organizations WHERE workos_organization_id = $1 FOR UPDATE', + [membership.organization_id], + ); + if (org.rowCount !== 1) throw new Error('Membership organization not found'); - logger.info({ - membershipId: membership.id, - userId: membership.user_id, - orgId: membership.organization_id, - role: deletedRole, - }, 'Deleted organization membership'); - - // Do not automatically promote a successor in WorkOS. Without a durable - // provider-intent journal, deletion can race the upstream call and leave an - // unknown authority outcome that is unsafe to replay. The signed deletion - // remains locally revoked; operators reconcile an ownerless organization - // through the explicit administration workflow. - if (deletedRole === 'admin' || deletedRole === 'owner') { + if (!current) { + const exactDeletion = await deleteExactOrganizationMembership( + membership.user_id, + membership.organization_id, + membership.id, + client, + ); + // Provider absence is authoritative for this exact user/org. Legacy rows + // may have no provider ID, and an older event ID may not match the last + // locally mirrored ID. Once absence is confirmed, neither may retain + // local authority or a cached primary-organization pointer. + const deletedRole = exactDeletion.matched + ? exactDeletion.role + : await deleteOrganizationMembership( + membership.user_id, + membership.organization_id, + client, + ); + logger.info({ + membershipId: membership.id, + userId: membership.user_id, + orgId: membership.organization_id, + role: deletedRole, + exactMembershipIdMatched: exactDeletion.matched, + eventStatus: membership.status, + }, 'Deleted provider-absent organization membership from local cache'); + return false; + } + synchronizedUserId = current.userId; + + if (!userData) throw new MembershipUserSourceUnavailableError('Membership user source unavailable'); + const incomingRole = current.role?.slug || 'member'; + + // A provider update/replay for a row already mirrored locally is not a new + // seat allocation. Lock and preserve that seat while still mirroring the + // provider role, even when the organization is currently at capacity. + const existing = await client.query<{ seat_type: string | null; provisioning_source: ProvisioningSource | null }>( + `SELECT seat_type, provisioning_source FROM organization_memberships + WHERE workos_organization_id = $1 AND workos_user_id = $2 FOR UPDATE`, + [current.organizationId, current.userId], + ); + const existingMembership = existing.rows[0]; + + const consumed = await consumeInvitationSeatType(current.organizationId, userData.email, client); + const hasExplicitSeatType = consumed !== null || existingMembership !== undefined; + const preservedSeat = existingMembership?.seat_type === 'contributor' ? 'contributor' : 'community_only'; + const seatType: SeatType = consumed?.seat_type === 'contributor' ? 'contributor' + : consumed ? 'community_only' : preservedSeat; + const provisioningSource = consumed?.source || existingMembership?.provisioning_source || 'webhook'; + + // Unstaged provider writes have no reservation, so perform the ordinary cap + // check while holding the same organization lock used by management writes. + if (!consumed && !existingMembership) { + const availability = await canAddSeat(current.organizationId, seatType, client); + if (!availability.allowed) { + refusedSeat = { seatType, reason: availability.reason ?? 'Seat cap reached' }; + return false; + } + } + + await upsertOrganizationMembership({ + user_id: current.userId, + organization_id: current.organizationId, + membership_id: current.id, + email: userData.email, + first_name: userData.first_name, + last_name: userData.last_name, + role: incomingRole, + seat_type: seatType, + has_explicit_seat_type: hasExplicitSeatType, + provisioning_source: provisioningSource, + }, client); + return true; + }, + ); + + if (!guarded.applied) { + logger.warn( + { userId: membership.user_id, membershipId: membership.id }, + 'Ignored stale WorkOS membership event after confirmed credential deletion', + ); + return false; + } + + if (refusedSeat) { logger.warn({ orgId: membership.organization_id, - previousOwnerId: membership.user_id, - recoveryState: 'manual_owner_selection_required', - }, 'Automatic successor promotion deferred: no durable provider intent journal'); + userId: synchronizedUserId, + email: userData?.email, + seatType: refusedSeat.seatType, + reason: refusedSeat.reason, + }, 'Refusing to mirror webhook-driven membership: org over seat cap'); + void notifyAdminsOfRefusedMembership({ + orgId: membership.organization_id, + newUserEmail: userData?.email ?? membership.user_id, + seatType: refusedSeat.seatType, + reason: refusedSeat.reason, + }); + } + + const synchronizedActiveMembership = guarded.value ?? false; + if (!synchronizedActiveMembership) return false; + + // Set primary_organization_id if not already set (prefer paying orgs). + // Best-effort — same rationale as upsertUser: a transient backfill failure + // shouldn't fail the membership webhook. Integrity invariant catches drift. + try { + const preferredOrg = await resolvePreferredOrganization(synchronizedUserId); + if (preferredOrg) { + await backfillPrimaryOrganization(synchronizedUserId, preferredOrg); + } + } catch (err) { + logger.warn({ err, userId: synchronizedUserId }, 'primary_organization_id backfill failed during membership upsert'); } + return synchronizedActiveMembership; } /** @@ -903,18 +916,23 @@ export function createWorkOSWebhooksRouter(): Router { switch (event.event) { case 'organization_membership.created': { const membership = event.data as unknown as OrganizationMembershipData; - const userData = await fetchMembershipUser(membership); - const guarded = await withActiveCredentialEventMutation(membership.user_id, async (client) => { - await upsertMembership(membership, userData, client); - }); + const synchronizedActiveMembership = await upsertMembership(membership); // Try to auto-link to Slack account by email (in case user.created didn't catch it) - if (guarded.applied && membership.status === 'active') { + if (synchronizedActiveMembership) { + let workosUser: Awaited['userManagement']['getUser']>> | undefined; + try { + workosUser = await getWorkos().userManagement.getUser(membership.user_id); + } catch (error) { + logger.debug({ error, userId: membership.user_id }, 'Could not fetch user for auto-link on membership'); + } + + if (workosUser) { // Slack auto-link try { - const linkResult = await tryAutoLinkWebsiteUserToSlack(membership.user_id, userData.email); + const linkResult = await tryAutoLinkWebsiteUserToSlack(membership.user_id, workosUser.email); if (linkResult.linked) { logger.info( - { userId: membership.user_id, email: userData.email, slackUserId: linkResult.slack_user_id }, + { userId: membership.user_id, email: workosUser.email, slackUserId: linkResult.slack_user_id }, 'Auto-linked website user to Slack account on membership creation' ); } @@ -927,22 +945,19 @@ export function createWorkOSWebhooksRouter(): Router { const { matchExpectationToUser } = await import('../db/certification-db.js'); const matched = await matchExpectationToUser( membership.organization_id, - userData.email, + workosUser.email, membership.user_id ); if (matched) { logger.info( - { userId: membership.user_id, email: userData.email, orgId: membership.organization_id }, + { userId: membership.user_id, email: workosUser.email, orgId: membership.organization_id }, 'Matched certification expectation to new org member' ); } } catch (certErr) { logger.warn({ error: certErr, userId: membership.user_id }, 'Could not match cert expectation on membership'); } - } - if (!guarded.applied) { - logger.warn({ userId: membership.user_id }, - 'Ignored stale WorkOS membership.created event after confirmed deletion'); + } } invalidateUnifiedUsersCache(); break; @@ -950,21 +965,14 @@ export function createWorkOSWebhooksRouter(): Router { case 'organization_membership.updated': { const membership = event.data as unknown as OrganizationMembershipData; - const userData = await fetchMembershipUser(membership); - const guarded = await withActiveCredentialEventMutation(membership.user_id, async (client) => { - await upsertMembership(membership, userData, client); - }); - if (!guarded.applied) { - logger.warn({ userId: membership.user_id }, - 'Ignored stale WorkOS membership.updated event after confirmed deletion'); - } + await upsertMembership(membership); invalidateUnifiedUsersCache(); break; } case 'organization_membership.deleted': { const membership = event.data as unknown as OrganizationMembershipData; - await deleteMembership(membership); + await upsertMembership(membership); invalidateUnifiedUsersCache(); break; } @@ -983,15 +991,6 @@ export function createWorkOSWebhooksRouter(): Router { 'Auto-linked new website user to Slack account' ); } - // Auto-provision into a verified-domain org if one matches. - // Verified email is the trust gate: skip when WorkOS hasn't confirmed it yet - // (the /api/me/* paths will retry after the user signs in and the email verifies). - if (user.email_verified) { - logger.warn( - { userId: user.id }, - 'Verified-domain upstream auto-provision deferred: no durable exactly-once provider intent journal', - ); - } // Fire-and-forget prospect triage + brand research for business emails. if (user.email) { const domain = user.email.split('@')[1]; @@ -1176,6 +1175,9 @@ export function createWorkOSWebhooksRouter(): Router { const eventType = req.body?.event || 'unknown'; const errMsg = error instanceof Error ? error.message : String(error); logger.error({ error, durationMs, event: eventType }, 'Error processing WorkOS webhook'); + if (error instanceof MembershipUserSourceUnavailableError) { + return res.status(503).json({ error: 'Membership user source temporarily unavailable' }); + } notifySystemError({ source: 'workos-webhook', errorMessage: `Failed to process ${eventType}: ${errMsg}` }); return res.status(500).json({ error: 'Internal error' }); } diff --git a/server/src/services/organization-bootstrap.ts b/server/src/services/organization-bootstrap.ts index 6695512b25d..2faf3656dc2 100644 --- a/server/src/services/organization-bootstrap.ts +++ b/server/src/services/organization-bootstrap.ts @@ -1,36 +1,11 @@ /** - * Service: bootstrap a WorkOS organization + local org row + email-verified - * domain + ToS / privacy acceptance + audit log + marketing opt-in for the - * authenticated caller. - * - * Two callers share this: - * - * 1. `POST /api/organizations` — the dashboard's onboarding form and the - * public storefront-style entry point. Caller picks `organization_name` - * and (for company orgs) supplies `company_type` / `revenue_tier`. - * - * 2. `POST /api/me/agents` — auto-bootstrap when the caller has zero - * memberships. The route derives sensible defaults (personal vs - * corporate based on email, name from domain or `${first} {last}'s - * Workspace`) and lands an org so the agent registration can proceed - * without a separate round trip. - * - * Tier (`membership_tier`) and corporate domain (`corporate_domain`) are - * **not** caller-controlled. Tier is owned exclusively by the Stripe - * webhook (`http.ts:3904`); domain is derived from `user.email` here. + * Organization creation/adoption is suspended until the explicit first-owner + * flow can bind immutable credential proof, current verified domain state, + * consent, and a durable operation to serialized membership/audit/epoch writes. + * Never recover ownership implicitly from email or a canonical person ID. */ - -import { WorkOS } from '@workos-inc/node'; -import { getPool } from '../db/client.js'; -import { createLogger } from '../logger.js'; -import { OrganizationDatabase, CompanyType, RevenueTier, VALID_REVENUE_TIERS } from '../db/organization-db.js'; -import { linkDomain } from '../db/organization-domains-db.js'; -import { COMPANY_TYPE_VALUES } from '../config/company-types.js'; -import { validateOrganizationName } from '../middleware/validation.js'; -import { getCompanyDomain } from '../utils/email-domain.js'; -import { emailPrefsDb } from '../db/email-preferences-db.js'; - -const logger = createLogger('organization-bootstrap'); +import type { WorkOS } from '@workos-inc/node'; +import type { OrganizationDatabase } from '../db/organization-db.js'; export interface CreateOrgRequest { user: { id: string; email: string }; @@ -58,6 +33,7 @@ export interface CreateOrgRequest { * domain-level failure that callers may translate into 4xx. */ export type CreateOrgOutcome = + | { kind: 'onboarding_disabled' } | { kind: 'created'; orgId: string; name: string } | { kind: 'adopted'; orgId: string; name: string } | { kind: 'org_limit_reached' } @@ -70,299 +46,8 @@ export type CreateOrgOutcome = | { kind: 'domain_taken'; existingOrgId: string; existingOrgName: string; domain: string }; export async function performCreateOrganization( - input: CreateOrgRequest, - deps: { workos: WorkOS | null; orgDb: OrganizationDatabase }, + _input: CreateOrgRequest, + _deps: { workos: WorkOS | null; orgDb: OrganizationDatabase }, ): Promise { - const { - user, - organization_name, - is_personal, - company_type, - revenue_tier, - marketing_opt_in, - isDevUser, - requestContext, - } = input; - const { workos, orgDb } = deps; - const pool = getPool(); - - // Per-user org-count cap. - const orgCountResult = await pool.query( - `SELECT COUNT(*) AS count FROM organization_memberships WHERE workos_user_id = $1`, - [user.id], - ); - const orgCount = parseInt(orgCountResult.rows[0].count, 10); - if (orgCount >= 10) return { kind: 'org_limit_reached' }; - - // Personal-workspace uniqueness. - if (is_personal) { - const existingPersonal = await pool.query( - `SELECT 1 FROM organization_memberships om - JOIN organizations o ON o.workos_organization_id = om.workos_organization_id - WHERE om.workos_user_id = $1 AND o.is_personal = true - LIMIT 1`, - [user.id], - ); - if (existingPersonal.rows.length > 0) return { kind: 'personal_workspace_exists' }; - } - - if (!organization_name) return { kind: 'missing_organization_name' }; - - const nameValidation = validateOrganizationName(organization_name); - if (!nameValidation.valid) { - return { kind: 'invalid_organization_name', message: nameValidation.error || 'invalid' }; - } - - if (company_type && !COMPANY_TYPE_VALUES.includes(company_type as any)) { - return { kind: 'invalid_company_type' }; - } - if (revenue_tier && !(VALID_REVENUE_TIERS as readonly string[]).includes(revenue_tier)) { - return { kind: 'invalid_revenue_tier' }; - } - - const userEmailDomain = getCompanyDomain(user.email); - let verifiedDomain: string | null = null; - - if (!is_personal) { - if (!userEmailDomain) return { kind: 'corporate_email_required' }; - verifiedDomain = userEmailDomain; - } - - const trimmedName = organization_name.trim(); - - // Domain-already-claimed branch — adopt prospects, conflict on actives. - if (verifiedDomain) { - const client = await pool.connect(); - try { - await client.query('BEGIN'); - - const existingOrgResult = await client.query( - `SELECT o.workos_organization_id, o.name, o.prospect_status, o.subscription_status - FROM organization_domains od - JOIN organizations o ON o.workos_organization_id = od.workos_organization_id - WHERE LOWER(od.domain) = LOWER($1) - FOR UPDATE OF o`, - [verifiedDomain], - ); - - if (existingOrgResult.rows.length > 0) { - const existing = existingOrgResult.rows[0]; - const existingOrgId = existing.workos_organization_id; - const existingOrgName = existing.name; - - const isAdoptable = !existing.subscription_status - && (!existing.prospect_status || !['joined', 'declined'].includes(existing.prospect_status)); - - if (!isAdoptable) { - await client.query('ROLLBACK'); - return { - kind: 'domain_taken', - existingOrgId, - existingOrgName, - domain: verifiedDomain, - }; - } - - // Release the FOR UPDATE before WorkOS network round-trips. - await client.query('COMMIT'); - - let existingMembership: { id: string; role?: { slug: string } } | null = null; - if (!isDevUser) { - const userMemberships = await workos!.userManagement.listOrganizationMemberships({ - userId: user.id, - organizationId: existingOrgId, - statuses: ['active', 'inactive', 'pending'], - }); - existingMembership = userMemberships.data[0] ?? null; - } - const alreadyMember = !!existingMembership; - const roleSlug = 'owner'; - - if (existingMembership && existingMembership.role?.slug !== 'owner') { - await workos!.userManagement.updateOrganizationMembership(existingMembership.id, { - roleSlug: 'owner', - }); - } - - logger.info({ - userId: user.id, - orgId: existingOrgId, - orgName: existingOrgName, - domain: verifiedDomain, - role: roleSlug, - wasAlreadyMember: alreadyMember, - }, 'User adopting prospect organization'); - - if (!alreadyMember && !isDevUser) { - await workos!.userManagement.createOrganizationMembership({ - userId: user.id, - organizationId: existingOrgId, - roleSlug, - }); - } - - await client.query('BEGIN'); - - await client.query( - `INSERT INTO organization_memberships (workos_user_id, workos_organization_id, email, role, created_at, updated_at, synced_at) - VALUES ($1, $2, $3, $4, NOW(), NOW(), NOW()) - ON CONFLICT (workos_user_id, workos_organization_id) DO UPDATE SET role = $4, updated_at = NOW()`, - [user.id, existingOrgId, user.email, roleSlug], - ); - - await client.query( - `UPDATE organizations SET prospect_status = 'joined', updated_at = NOW() - WHERE workos_organization_id = $1 - AND prospect_status IS NOT NULL - AND prospect_status NOT IN ('joined', 'declined')`, - [existingOrgId], - ); - - await orgDb.recordAuditLog({ - workos_organization_id: existingOrgId, - workos_user_id: user.id, - action: 'organization_adopted', - resource_type: 'organization', - resource_id: existingOrgId, - details: { user_email: user.email, domain: verifiedDomain, role: roleSlug }, - }); - - await client.query('COMMIT'); - - await recordMarketingOptIn(user, marketing_opt_in); - - return { kind: 'adopted', orgId: existingOrgId, name: existingOrgName }; - } - - await client.query('ROLLBACK'); - } catch (adoptError) { - await client.query('ROLLBACK').catch(() => {}); - throw adoptError; - } finally { - client.release(); - } - } - - logger.info({ - organization_name: trimmedName, - is_personal, - company_type, - revenue_tier, - verifiedDomain, - }, 'Creating WorkOS organization'); - - let workosOrgId: string; - let workosOrgName: string; - - if (isDevUser) { - workosOrgId = `org_dev_${Date.now()}_${Math.random().toString(36).substring(7)}`; - workosOrgName = trimmedName; - logger.info({ orgId: workosOrgId, name: trimmedName, devUser: user.email }, 'DEV MODE: Mock organization created (no WorkOS)'); - } else { - const workosOrg = await workos!.organizations.createOrganization({ name: trimmedName }); - workosOrgId = workosOrg.id; - workosOrgName = workosOrg.name; - - logger.info({ orgId: workosOrgId, name: trimmedName }, 'WorkOS organization created'); - - const ownerMembership = await workos!.userManagement.createOrganizationMembership({ - userId: user.id, - organizationId: workosOrgId, - roleSlug: 'owner', - }); - - logger.info({ userId: user.id, orgId: workosOrgId }, 'User added as organization owner'); - - await pool.query( - `INSERT INTO organization_memberships (workos_user_id, workos_organization_id, workos_membership_id, email, role, seat_type, created_at, updated_at, synced_at) - VALUES ($1, $2, $3, $4, 'owner', 'contributor', NOW(), NOW(), NOW()) - ON CONFLICT (workos_user_id, workos_organization_id) DO UPDATE SET role = 'owner', workos_membership_id = $3, updated_at = NOW()`, - [user.id, workosOrgId, ownerMembership.id, user.email], - ); - } - - // Tier is intentionally not set here — Stripe webhook is the sole writer. - const orgRecord = await orgDb.createOrganization({ - workos_organization_id: workosOrgId, - name: trimmedName, - is_personal: is_personal || false, - company_type: (company_type as CompanyType) || undefined, - revenue_tier: (revenue_tier as RevenueTier) || undefined, - }); - - logger.info({ - orgId: workosOrgId, - company_type: orgRecord.company_type, - revenue_tier: orgRecord.revenue_tier, - }, 'Organization record created'); - - if (verifiedDomain) { - const result = await linkDomain({ - orgId: workosOrgId, - domain: verifiedDomain, - source: 'email_verification', - verified: true, - isPrimary: true, - }); - if (result.inserted) { - logger.info({ orgId: workosOrgId, domain: verifiedDomain }, 'Corporate domain auto-verified via email'); - } - } - - await orgDb.recordAuditLog({ - workos_organization_id: workosOrgId, - workos_user_id: user.id, - action: 'organization_created', - resource_type: 'organization', - resource_id: workosOrgId, - details: { - name: trimmedName, - is_personal: is_personal || false, - company_type: company_type || null, - revenue_tier: revenue_tier || null, - }, - }); - - const tosAgreement = await orgDb.getCurrentAgreementByType('terms_of_service'); - const privacyAgreement = await orgDb.getCurrentAgreementByType('privacy_policy'); - - if (tosAgreement) { - await orgDb.recordUserAgreementAcceptance({ - workos_user_id: user.id, - email: user.email, - agreement_type: 'terms_of_service', - agreement_version: tosAgreement.version, - ip_address: requestContext.ip, - user_agent: requestContext.userAgent, - workos_organization_id: workosOrgId, - }); - } - if (privacyAgreement) { - await orgDb.recordUserAgreementAcceptance({ - workos_user_id: user.id, - email: user.email, - agreement_type: 'privacy_policy', - agreement_version: privacyAgreement.version, - ip_address: requestContext.ip, - user_agent: requestContext.userAgent, - workos_organization_id: workosOrgId, - }); - } - - await recordMarketingOptIn(user, marketing_opt_in); - - return { kind: 'created', orgId: workosOrgId, name: workosOrgName }; -} - -async function recordMarketingOptIn(user: { id: string; email: string }, optIn: boolean | undefined) { - if (typeof optIn !== 'boolean') return; - try { - await emailPrefsDb.setMarketingOptInIfNotSet({ - workos_user_id: user.id, - email: user.email, - optIn, - }); - } catch (err) { - logger.error({ err, userId: user.id }, 'Failed to record marketing opt-in'); - } + return { kind: 'onboarding_disabled' }; } diff --git a/server/src/services/organization-membership-mutation.ts b/server/src/services/organization-membership-mutation.ts new file mode 100644 index 00000000000..4ff06e28576 --- /dev/null +++ b/server/src/services/organization-membership-mutation.ts @@ -0,0 +1,529 @@ +import { randomUUID } from 'node:crypto'; +import type { Request } from 'express'; +import type { PoolClient, QueryResultRow } from 'pg'; +import type { WorkOS } from '@workos-inc/node'; +import { getPool } from '../db/client.js'; +import { getOrganizationAuthorizationUserId } from '../auth/organization-principal.js'; +import { getAuthorizationEnforcementWorkos } from '../auth/workos-client.js'; +import { isInvalidWorkOSJWTError, verifyWorkOSJWT } from '../auth/workos-jwt.js'; +import { DEV_USERS, isDevModeEnabled, invalidateSessionsForUsers } from '../middleware/auth.js'; +import { getSeatLimits, resolveMembershipTier, type SeatType, type MembershipTierRow } from '../db/organization-db.js'; +import { createLogger } from '../logger.js'; + +const logger = createLogger('organization-membership-mutation'); +export type Role = 'owner' | 'admin' | 'member'; +const rank: Record = { member: 1, admin: 2, owner: 3 }; +export function isMembershipRole(value: unknown): value is Role { + return value === 'owner' || value === 'admin' || value === 'member'; +} + +export class MembershipMutationError extends Error { + constructor(public status: number, message: string) { super(message); } +} + +export type PublicMembershipMutationError = { + status: 400 | 401 | 403 | 404 | 409 | 500 | 503; + body: { error: 'invalid_request' | 'invalid_credential' | 'access_denied' | 'not_found' + | 'membership_state_conflict' | 'authorization_unavailable' | 'internal_error' }; +}; + +/** Project internal/provider detail onto a finite public protocol vocabulary. */ +export function toPublicMembershipMutationError(error: unknown): PublicMembershipMutationError { + const code = (error as { code?: unknown } | null)?.code; + if (code === '55P03' || code === '40P01' || code === '40001') { + return { status: 409, body: { error: 'membership_state_conflict' } }; + } + if (code === '57014') { + return { status: 503, body: { error: 'authorization_unavailable' } }; + } + if (error instanceof MembershipMutationError) { + switch (error.status) { + case 400: return { status: 400, body: { error: 'invalid_request' } }; + case 401: return { status: 401, body: { error: 'invalid_credential' } }; + case 403: return { status: 403, body: { error: 'access_denied' } }; + case 404: return { status: 404, body: { error: 'not_found' } }; + case 409: return { status: 409, body: { error: 'membership_state_conflict' } }; + case 503: return { status: 503, body: { error: 'authorization_unavailable' } }; + } + } + return { status: 500, body: { error: 'internal_error' } }; +} +export function mutationDenied(message = 'Access denied'): never { + throw new MembershipMutationError(403, message); +} + +async function connectForMembershipMutation(): Promise { + try { return await getPool().connect(); } + catch { throw new MembershipMutationError(503, 'Authorization state unavailable'); } +} + +type Snapshot = { + credential_exists: boolean; + identity_id: string | null; + canonical_user_id: string; + epoch: string; + binding_version: string | null; + membership_id: string | null; + membership_version: string | null; + role: string | null; + banned: boolean; +}; + +type CancellationSnapshot = Pick; + +export type MutationReply = { status?: number; body: Record }; +type Effect = { action: string; target: Record; id?: string; outcome: 'succeeded' | 'unknown'; compensate?: () => Promise }; + +/** All selectors are assertions about one already-resolved explicit organization. */ +export function assertOrganizationSelectors(req: Request, org: string): void { + const selectors: unknown[] = [req.headers['x-organization-id'], req.headers['x-org-id']]; + for (const key of ['organization_id', 'organizationId', 'org_id', 'orgId', 'org']) { + if (req.query && Object.hasOwn(req.query, key)) selectors.push(req.query[key]); + } + for (const key of ['organization_id', 'organizationId', 'org_id', 'orgId']) { + if (req.body && Object.hasOwn(req.body, key)) selectors.push(req.body[key]); + } + for (const value of selectors) { + if (value !== undefined && (typeof value !== 'string' || value !== org)) { + mutationDenied('Organization selectors do not agree'); + } + } +} + +/** Resolve the mandatory route selector, then check every redundant selector. */ +function selectedOrganization(req: Request): string { + const org = req.params.orgId; + if (typeof org !== 'string' || !org.trim()) mutationDenied('An organization must be selected'); + assertOrganizationSelectors(req, org); + return org; +} + +/** + * This fence is deliberately independent of the read canary and credential + * grants. Migration 553 has no mutation capability: a grant never supplies or + * elevates a write role. Platform-admin affiliation, static/API keys and dev + * sessions cannot substitute for a credential's organization membership. + * The local active-membership mirror AND fresh WorkOS + * membership must identify the same exact credential, organization and role. + */ +export class OrganizationMembershipMutation { + readonly operationId = randomUUID(); + readonly effects: Effect[] = []; + readonly afterCommit: Array<() => Promise> = []; + private snapshot!: Snapshot; + private localPhase = false; + private expiresAt?: number; + private readonly targetChecks = new Map Promise>(); + private constructor( + readonly db: PoolClient, + readonly workos: WorkOS, + readonly actorId: string, + readonly orgId: string, + private readonly minimumRole: Role, + ) {} + + get role(): Role { return this.snapshot.role as Role; } + + private async readSnapshot(): Promise { + let rows: Snapshot[]; + try { + rows = (await this.db.query( + `SELECT EXISTS (SELECT 1 FROM users WHERE workos_user_id = $1) AS credential_exists, + iwu.identity_id, COALESCE(primary_iwu.workos_user_id, $1) AS canonical_user_id, + COALESCE(ae.epoch, 0)::text AS epoch, iwu.xmin::text AS binding_version, + om.workos_membership_id AS membership_id, om.xmin::text AS membership_version, + om.role, + EXISTS (SELECT 1 FROM bans WHERE scope = 'platform' + AND (expires_at IS NULL OR expires_at > clock_timestamp()) + AND ((ban_type = 'user' AND entity_id = $1) + OR (ban_type = 'organization' AND entity_id = $2))) AS banned + FROM (SELECT 1) anchor + LEFT JOIN identity_workos_users iwu ON iwu.workos_user_id = $1 + LEFT JOIN identity_workos_users primary_iwu + ON primary_iwu.identity_id = iwu.identity_id AND primary_iwu.is_primary = TRUE + LEFT JOIN authorization_epochs ae ON ae.workos_user_id = $1 + LEFT JOIN organization_memberships om + ON om.workos_user_id = $1 AND om.workos_organization_id = $2`, + [this.actorId, this.orgId], + )).rows; + } catch (error) { + logger.error({ error, actorId: this.actorId, orgId: this.orgId }, 'Authorization snapshot read failed'); + throw new MembershipMutationError(503, 'Authorization state unavailable'); + } + if (rows.length !== 1) throw new MembershipMutationError(503, 'Authorization state unavailable'); + const row = rows[0]; + if (row.banned) mutationDenied('Account suspended'); + if (!row.credential_exists) throw new MembershipMutationError(401, 'Invalid credential'); + if (!row.identity_id || !row.binding_version) mutationDenied('Identity binding changed'); + if (!isMembershipRole(row.role) || rank[row.role] < rank[this.minimumRole]) mutationDenied(); + return row; + } + + async recheck(): Promise { + if (this.expiresAt !== undefined && this.expiresAt <= Date.now() / 1000) { + throw new MembershipMutationError(401, 'Credential expired'); + } + const current = await this.readSnapshot(); + if (JSON.stringify(current) !== JSON.stringify(this.snapshot)) mutationDenied('Authorization changed; retry the request'); + } + + async checkProviderAuthority(): Promise { + await this.recheck(); + let response; + try { + response = await this.workos.userManagement.listOrganizationMemberships({ + userId: this.actorId, organizationId: this.orgId, statuses: ['active'], + }); + } catch { + throw new MembershipMutationError(503, 'Membership authority unavailable'); + } + await this.recheck(); + if (!Array.isArray(response?.data) || response.data.some(row => !row || typeof row !== 'object')) { + throw new MembershipMutationError(503, 'Membership authority unavailable'); + } + const rows = response.data.filter(row => row.userId === this.actorId && row.organizationId === this.orgId && row.status === 'active'); + if (rows.length !== 1 || !isMembershipRole(rows[0].role?.slug) || rows[0].role.slug !== this.snapshot.role) mutationDenied(); + if (rows[0].id !== this.snapshot.membership_id) mutationDenied('Membership changed; retry the request'); + } + + async readProvider(read: () => Promise): Promise { + await this.checkProviderAuthority(); + let result: T; + try { + result = await read(); + // SDK reads used here return an ID-bearing resource or a data page. + // A malformed/missing envelope is source uncertainty, never a denial + // inferred from incomplete membership or owner inventory. + if (!result || typeof result !== 'object' + || ('data' in result + ? !Array.isArray(result.data) || result.data.some(row => !row || typeof row !== 'object') + : !('id' in result) || typeof result.id !== 'string')) { + throw new Error('Invalid membership provider response'); + } + } + catch { throw new MembershipMutationError(503, 'Membership provider unavailable'); } + await this.checkProviderAuthority(); + return result; + } + + expectTarget(id: string, check: () => Promise): void { this.targetChecks.set(id, check); } + async checkTargets(): Promise { + try { + for (const check of this.targetChecks.values()) await check(); + } catch (error) { + if (error instanceof MembershipMutationError) throw error; + throw new MembershipMutationError(503, 'Membership target state unavailable'); + } + // Target reads are awaited provider boundaries too. A delayed webhook must + // not hide an actor revocation committed while those reads were in flight. + await this.checkProviderAuthority(); + } + + async providerWrite(action: string, target: Record, write: () => Promise, compensate?: (value: T) => Promise): Promise { + await this.checkProviderAuthority(); + await this.checkTargets(); + let result: T; + try { result = await write(); } + catch (error) { + const status = (error as { status?: number; statusCode?: number }).status ?? (error as { statusCode?: number }).statusCode; + const code = (error as { code?: string }).code; + if (code === 'organization_membership_already_exists' || code === 'invitation_already_exists' || code === 'cannot_reactivate_pending_organization_membership') { + throw new MembershipMutationError(409, code); + } + // Timeouts, transport errors and server errors do not prove no effect. + if (!status || status === 408 || status >= 500) this.effects.push({ action, target, outcome: 'unknown' }); + throw new MembershipMutationError(status && status >= 400 && status < 500 && status !== 408 && status !== 429 ? 409 : 503, 'Membership provider did not confirm the change'); + } + const id = (result as { id?: string } | undefined)?.id; + this.effects.push({ action, target, id, outcome: 'succeeded', ...(compensate ? { compensate: () => compensate(result) } : {}) }); + await this.checkProviderAuthority(); + return result; + } + + async rows(sql: string, values: unknown[] = []): Promise { + await this.recheck(); + return (await this.db.query(sql, values)).rows; + } + + /** Lock only at the local commit boundary; committed revokes during provider + * waits remain visible. Writers after these locks linearize after this change. + * No helper that opens another transaction may run inside this phase. + */ + async local(targets: string[], work: () => Promise): Promise { + const ids = [...new Set([this.actorId, ...targets])].sort(); + // Existing identity/webhook writers take these rows in differing orders. + // Never wait while holding a competing row: fail closed on contention, + // rather than forming a cycle after an irreversible provider action. + await this.db.query('SELECT workos_user_id FROM users WHERE workos_user_id = ANY($1) ORDER BY workos_user_id FOR UPDATE NOWAIT', [ids]); + await this.db.query('SELECT workos_user_id FROM authorization_epochs WHERE workos_user_id = ANY($1) ORDER BY workos_user_id FOR UPDATE NOWAIT', [ids]); + await this.db.query('SELECT workos_user_id FROM identity_workos_users WHERE workos_user_id = ANY($1) ORDER BY workos_user_id FOR UPDATE NOWAIT', [ids]); + await this.db.query('SELECT workos_user_id FROM organization_memberships WHERE workos_organization_id = $1 ORDER BY workos_user_id FOR UPDATE NOWAIT', [this.orgId]); + // Ban insertion has no existing row to lock. This short shared table lock + // also covers deletes/expiry updates until the local transaction commits. + await this.db.query('LOCK TABLE bans IN SHARE MODE NOWAIT'); + await this.checkProviderAuthority(); + await this.checkTargets(); + this.localPhase = true; + return work(); + } + + async write(sql: string, values: unknown[], expectedRows = 1): Promise { + if (!this.localPhase) throw new Error('Membership writes require the local commit phase'); + await this.recheck(); + await this.checkTargets(); + const result = await this.db.query(sql, values); + if (result.rowCount !== expectedRows) throw new MembershipMutationError(409, 'Membership state changed; no change committed'); + // An allowed self-seat update changes xmin. Rows protecting this snapshot + // are locked, so this can only incorporate our own checked local writes. + this.snapshot = await this.readSnapshot(); + return result.rows; + } + + async audit(action: string, resourceType: string, resourceId: string, details: Record = {}): Promise { + await this.write( + `INSERT INTO registry_audit_log (workos_organization_id, workos_user_id, action, resource_type, resource_id, details) + VALUES ($1, $2, $3, $4, $5, $6) RETURNING id`, + [this.orgId, this.actorId, action, resourceType, resourceId, JSON.stringify({ + ...details, authenticated_workos_user_id: this.actorId, + canonical_workos_user_id: this.snapshot.canonical_user_id, + identity_id: this.snapshot.identity_id, operation_id: this.operationId, + authority: 'exact_membership', + })], + ); + } + + /** Same business seat rules as canAddSeat, using the transaction's org lock. */ + async seatAvailable(seat: SeatType): Promise { + const [org] = await this.rows('SELECT * FROM organizations WHERE workos_organization_id = $1', [this.orgId]); + const limits = getSeatLimits(resolveMembershipTier(org)); + const [usage] = await this.rows<{ contributor: string; community_only: string }>( + `WITH seats AS ( + SELECT (om.seat_type = 'contributor' + OR EXISTS (SELECT 1 FROM slack_user_mappings sm WHERE sm.workos_user_id = om.workos_user_id AND sm.mapping_status = 'mapped') + OR EXISTS (SELECT 1 FROM working_group_memberships wgm JOIN working_groups wg ON wg.id = wgm.working_group_id + WHERE wgm.workos_user_id = om.workos_user_id AND wgm.status = 'active' AND wg.status = 'active')) AS contributor + FROM organization_memberships om WHERE om.workos_organization_id = $1 + UNION ALL SELECT seat_type = 'contributor' FROM invitation_seat_types WHERE workos_organization_id = $1) + SELECT COUNT(*) FILTER (WHERE contributor)::text AS contributor, + COUNT(*) FILTER (WHERE NOT contributor)::text AS community_only FROM seats`, [this.orgId], + ); + const limit = seat === 'contributor' ? limits.contributor : limits.community; + if (limit !== -1 && Number(usage[seat]) >= limit) mutationDenied('Seat limit reached'); + } + + async effectiveSeat(userId: string): Promise { + // Preserve getUserSeatType's business entitlement across organizations. + // This value never supplies an authorization role or selects a write org. + const [row] = await this.rows<{ contributor: boolean }>( + `SELECT (EXISTS (SELECT 1 FROM organization_memberships other WHERE other.workos_user_id = $1 AND other.seat_type = 'contributor') + OR EXISTS (SELECT 1 FROM slack_user_mappings sm WHERE sm.workos_user_id = om.workos_user_id AND sm.mapping_status = 'mapped') + OR EXISTS (SELECT 1 FROM working_group_memberships wgm JOIN working_groups wg ON wg.id = wgm.working_group_id + WHERE wgm.workos_user_id = om.workos_user_id AND wgm.status = 'active' AND wg.status = 'active')) AS contributor + FROM organization_memberships om WHERE om.workos_user_id = $1 LIMIT 1`, [userId], + ); + return row ? row.contributor ? 'contributor' : 'community_only' : null; + } + + async requireTeam(): Promise { + const [org] = await this.rows('SELECT is_personal FROM organizations WHERE workos_organization_id = $1', [this.orgId]); + if (org?.is_personal) throw new MembershipMutationError(400, 'Personal workspaces cannot have team members'); + } + + static async run(req: Request, minimumRole: Role, operation: (tx: OrganizationMembershipMutation) => Promise): Promise { + const orgId = selectedOrganization(req); + if (!req.user) throw new MembershipMutationError(401, 'Authentication required'); + const actorId = getOrganizationAuthorizationUserId(req.user); + const staticAdmin = (req as Request & { isStaticAdminApiKey?: boolean }).isStaticAdminApiKey === true; + if (staticAdmin) mutationDenied(); + if ((req as Request & { apiKey?: unknown }).apiKey) mutationDenied(); + const dev = isDevModeEnabled() && Object.values(DEV_USERS).some(user => user.id === actorId); + // Dev sessions are synthetic even when ALLOW_DEV_MODE_IN_PROD is enabled. + if (dev) mutationDenied('Development sessions cannot manage organization membership'); + let verified: Awaited>; + const header = req.headers.authorization; + if (header !== undefined) { + const match = /^Bearer[\t ]+([^\t ]+)[\t ]*$/i.exec(header); + if (!match || match[1] !== req.accessToken) throw new MembershipMutationError(401, 'Invalid credential'); + } + if (!req.accessToken) throw new MembershipMutationError(401, 'Invalid credential'); + try { verified = await verifyWorkOSJWT(req.accessToken); } + catch (error) { + const invalid = isInvalidWorkOSJWTError(error); + throw new MembershipMutationError(invalid ? 401 : 503, invalid ? 'Invalid credential' : 'authorization_unavailable'); + } + if (verified.isM2M || verified.sub !== actorId) throw new MembershipMutationError(401, 'Credential principal changed'); + if (verified.orgId && verified.orgId !== orgId) mutationDenied('Organization selectors do not agree'); + const db = await connectForMembershipMutation(); + let tx: OrganizationMembershipMutation | undefined; + let commitAttempted = false; + try { + await db.query('BEGIN'); + await db.query("SET LOCAL lock_timeout = '2s'"); + await db.query("SET LOCAL statement_timeout = '5s'"); + tx = new OrganizationMembershipMutation(db, getAuthorizationEnforcementWorkos(), actorId, orgId, minimumRole); + tx.expiresAt = verified?.expiresAt; + tx.snapshot = await tx.readSnapshot(); + const authentication = req.user.authorizationSnapshot; + if (!authentication) throw new MembershipMutationError(503, 'Authentication state unavailable'); + if (authentication.authenticatedUserId !== actorId + || authentication.canonicalUserId !== tx.snapshot.canonical_user_id + || authentication.identityId !== tx.snapshot.identity_id + || authentication.bindingVersion !== tx.snapshot.binding_version + || authentication.authorizationEpoch !== tx.snapshot.epoch + || authentication.selectedOrganizationId !== orgId) { + invalidateSessionsForUsers([actorId, req.user.id]); + mutationDenied('Authentication state changed; retry the request'); + } + if (req.user.identityId !== undefined && req.user.identityId !== tx.snapshot.identity_id) mutationDenied('Identity binding changed'); + if (req.user.id !== tx.snapshot.canonical_user_id) mutationDenied('Identity binding changed'); + // Share the existing webhook promotion lock, then serialize seat/business + // rules on the org row. Capture precedes waiting: queued stale actors fail. + await db.query('SELECT pg_advisory_xact_lock(hashtext($1))', [`membership-ownerless-promote:${orgId}`]); + const org = await db.query('SELECT workos_organization_id FROM organizations WHERE workos_organization_id = $1 FOR UPDATE', [orgId]); + if (org.rowCount !== 1) mutationDenied(); + await tx.checkProviderAuthority(); + const result = await operation(tx); + await tx.recheck(); + await tx.checkTargets(); + commitAttempted = true; + await db.query('COMMIT'); + for (const notify of tx.afterCommit) void Promise.resolve().then(notify).catch(error => logger.warn({ error, operationId: tx?.operationId, orgId, actorId }, 'Membership notification failed')); + return result; + } catch (error) { + await db.query('ROLLBACK').catch(() => {}); + const effects = tx?.effects ?? []; + // A failed COMMIT acknowledgement has an unknown local outcome. Never + // compensate it blindly: the local transaction may already have committed. + if (!commitAttempted) { + for (const effect of [...effects].reverse()) { + if (effect.outcome === 'succeeded' && effect.compensate) { + try { await effect.compensate(); } + catch (compensationError) { logger.error({ compensationError, operationId: tx?.operationId, orgId, actorId, action: effect.action }, 'Membership compensation not confirmed'); } + } + } + } + if (effects.length || commitAttempted) { + logger.error({ error, operationId: tx?.operationId, orgId, actorId, commitAttempted, effects: effects.map(({ action, target, id, outcome }) => ({ action, target, id, outcome })) }, 'Membership mutation requires reconciliation; provider effects are not a local rollback'); + return { status: 503, body: { error: 'Membership change requires reconciliation', reconciliation_required: true, operation_id: tx?.operationId } }; + } + throw error; + } finally { db.release(); } + } +} + +async function readCancellationSnapshot(db: PoolClient, actorId: string, orgId: string): Promise { + let rows: CancellationSnapshot[]; + try { + rows = (await db.query( + `SELECT EXISTS (SELECT 1 FROM users WHERE workos_user_id = $1) AS credential_exists, + iwu.identity_id, COALESCE(primary_iwu.workos_user_id, $1) AS canonical_user_id, + COALESCE(ae.epoch, 0)::text AS epoch, iwu.xmin::text AS binding_version, + EXISTS (SELECT 1 FROM bans WHERE scope = 'platform' + AND (expires_at IS NULL OR expires_at > clock_timestamp()) + AND ((ban_type = 'user' AND entity_id = $1) + OR (ban_type = 'organization' AND entity_id = $2))) AS banned + FROM (SELECT 1) anchor + LEFT JOIN identity_workos_users iwu ON iwu.workos_user_id = $1 + LEFT JOIN identity_workos_users primary_iwu + ON primary_iwu.identity_id = iwu.identity_id AND primary_iwu.is_primary = TRUE + LEFT JOIN authorization_epochs ae ON ae.workos_user_id = $1`, + [actorId, orgId], + )).rows; + } catch (error) { + logger.error({ error, actorId, orgId }, 'Cancellation authorization snapshot read failed'); + throw new MembershipMutationError(503, 'authorization_unavailable'); + } + if (rows.length !== 1) throw new MembershipMutationError(503, 'authorization_unavailable'); + return rows[0]; +} + +/** Cancel only for the immutable credential that created the request. */ +export async function cancelJoinRequestForExactCredential(req: Request, requestId: string): Promise { + if (!req.user) throw new MembershipMutationError(401, 'Authentication required'); + if ((req as Request & { isStaticAdminApiKey?: boolean }).isStaticAdminApiKey + || (req as Request & { apiKey?: unknown }).apiKey) mutationDenied(); + + const actorId = getOrganizationAuthorizationUserId(req.user); + const dev = isDevModeEnabled() && Object.values(DEV_USERS).some(user => user.id === actorId); + if (dev) mutationDenied('Development sessions cannot cancel organization join requests'); + let verified: Awaited>; + const header = req.headers.authorization; + if (header !== undefined) { + const match = /^Bearer[\t ]+([^\t ]+)[\t ]*$/i.exec(header); + if (!match || match[1] !== req.accessToken) throw new MembershipMutationError(401, 'Invalid credential'); + } + if (!req.accessToken) throw new MembershipMutationError(401, 'Invalid credential'); + try { verified = await verifyWorkOSJWT(req.accessToken); } + catch (error) { + const invalid = isInvalidWorkOSJWTError(error); + throw new MembershipMutationError(invalid ? 401 : 503, invalid ? 'Invalid credential' : 'authorization_unavailable'); + } + if (verified.isM2M || verified.sub !== actorId) throw new MembershipMutationError(401, 'Credential principal changed'); + + const db = await connectForMembershipMutation(); + try { + await db.query('BEGIN'); + await db.query("SET LOCAL lock_timeout = '2s'"); + await db.query("SET LOCAL statement_timeout = '5s'"); + const request = await db.query<{ workos_user_id: string; workos_organization_id: string; status: string }>( + 'SELECT workos_user_id, workos_organization_id, status FROM organization_join_requests WHERE id = $1 FOR UPDATE', + [requestId], + ); + const row = request.rows[0]; + if (!row || row.status !== 'pending' || row.workos_user_id !== actorId) { + await db.query('ROLLBACK'); + return false; + } + const orgId = row.workos_organization_id; + if (verified?.orgId && verified.orgId !== orgId) mutationDenied('Organization selectors do not agree'); + assertOrganizationSelectors(req, orgId); + + const snapshot = await readCancellationSnapshot(db, actorId, orgId); + if (snapshot.banned) mutationDenied('Account suspended'); + if (!snapshot.credential_exists) throw new MembershipMutationError(401, 'Invalid credential'); + if (!snapshot.identity_id || !snapshot.binding_version) mutationDenied('Identity binding changed'); + const authentication = req.user.authorizationSnapshot; + if (!authentication) throw new MembershipMutationError(503, 'authorization_unavailable'); + if (authentication.authenticatedUserId !== actorId + || authentication.canonicalUserId !== snapshot.canonical_user_id + || authentication.identityId !== snapshot.identity_id + || authentication.bindingVersion !== snapshot.binding_version + || authentication.authorizationEpoch !== snapshot.epoch + || (authentication.selectedOrganizationId !== null + && authentication.selectedOrganizationId !== orgId) + || req.user.id !== snapshot.canonical_user_id + || (req.user.identityId !== undefined && req.user.identityId !== snapshot.identity_id)) { + invalidateSessionsForUsers([actorId, req.user.id]); + mutationDenied('Authentication state changed; retry the request'); + } + + await db.query('SELECT workos_user_id FROM users WHERE workos_user_id = $1 FOR UPDATE NOWAIT', [actorId]); + await db.query('SELECT workos_user_id FROM authorization_epochs WHERE workos_user_id = $1 FOR UPDATE NOWAIT', [actorId]); + await db.query('SELECT workos_user_id FROM identity_workos_users WHERE workos_user_id = $1 FOR UPDATE NOWAIT', [actorId]); + await db.query('LOCK TABLE bans IN SHARE MODE NOWAIT'); + const current = await readCancellationSnapshot(db, actorId, orgId); + if (current.banned) mutationDenied('Account suspended'); + if (JSON.stringify(current) !== JSON.stringify(snapshot)) mutationDenied('Authorization changed; retry the request'); + if (verified?.expiresAt !== undefined && verified.expiresAt <= Date.now() / 1000) { + throw new MembershipMutationError(401, 'Credential expired'); + } + const cancelled = await db.query( + `UPDATE organization_join_requests SET status = 'cancelled', updated_at = NOW() + WHERE id = $1 AND workos_user_id = $2 AND workos_organization_id = $3 AND status = 'pending' + RETURNING id`, + [requestId, actorId, orgId], + ); + if (cancelled.rowCount !== 1) throw new MembershipMutationError(409, 'Join request state changed; no change committed'); + await db.query('COMMIT'); + return true; + } catch (error) { + await db.query('ROLLBACK').catch(() => {}); + if ((error as { code?: string }).code === '55P03') { + throw new MembershipMutationError(409, 'Authorization state is busy; retry the request'); + } + throw error; + } finally { + db.release(); + } +} diff --git a/server/src/services/organization-membership-notifications.ts b/server/src/services/organization-membership-notifications.ts new file mode 100644 index 00000000000..3488f7ce792 --- /dev/null +++ b/server/src/services/organization-membership-notifications.ts @@ -0,0 +1,37 @@ +import type { WorkOS } from '@workos-inc/node'; +import { + OrganizationDatabase, getSeatUsage, getSeatLimits, resolveMembershipTier, + checkAndUpdateSeatWarning, resetSeatWarningIfNeeded, type SeatType, +} from '../db/organization-db.js'; +import { getOrgAdminEmails } from '../utils/org-admins.js'; +import { notifyMemberAdded, notifySeatWarning, notifySeatFreed, notifySeatRequest } from '../slack/org-group-dm.js'; + +// These helpers run only after the membership transaction and required audit +// commit. Notification delivery never supplies authority or changes its result. +export async function notifyMembershipSeats(workos: WorkOS, orgId: string, change: 'added' | 'upgraded' | 'freed', added?: { email: string; role: string; seat: SeatType }): Promise { + const org = await new OrganizationDatabase().getOrganization(orgId); + const orgName = org?.name ?? 'Organization'; + const tier = resolveMembershipTier(org); + const seatLimits = getSeatLimits(tier); + const seatUsage = await getSeatUsage(orgId); + const adminEmails = await getOrgAdminEmails(workos, orgId); + if (added && adminEmails.length) await notifyMemberAdded({ orgId, orgName, adminEmails, memberEmail: added.email, role: added.role, seatType: added.seat, seatUsage, seatLimits }); + if (change === 'freed') { + const previous = await resetSeatWarningIfNeeded(orgId, 'contributor', seatUsage.contributor, seatLimits.contributor); + if (previous >= 80 && adminEmails.length) await notifySeatFreed({ orgId, orgName, adminEmails, seatType: 'contributor', usage: seatUsage.contributor, limit: seatLimits.contributor }); + return; + } + for (const seat of (change === 'added' ? ['contributor', 'community'] : ['contributor']) as Array<'contributor' | 'community'>) { + const usage = seat === 'contributor' ? seatUsage.contributor : seatUsage.community_only; + const limit = seat === 'contributor' ? seatLimits.contributor : seatLimits.community; + const warning = await checkAndUpdateSeatWarning(orgId, seat, usage, limit, tier); + if (warning?.shouldNotify && adminEmails.length) await notifySeatWarning({ orgId, orgName, adminEmails, seatType: seat, threshold: warning.threshold, usage, limit }); + } +} + +export async function notifyMembershipSeatRequest(workos: WorkOS, orgId: string, actorId: string, resourceType: string, resourceName?: string): Promise { + const org = await new OrganizationDatabase().getOrganization(orgId); + const member = await workos.userManagement.getUser(actorId); + const adminEmails = await getOrgAdminEmails(workos, orgId); + if (adminEmails.length) await notifySeatRequest({ orgId, orgName: org?.name ?? 'Organization', adminEmails, memberName: [member.firstName, member.lastName].filter(Boolean).join(' ') || member.email, memberEmail: member.email, resourceType, resourceName }); +} diff --git a/server/src/slack/sync.ts b/server/src/slack/sync.ts index 3af2586734b..e5d1d2df765 100644 --- a/server/src/slack/sync.ts +++ b/server/src/slack/sync.ts @@ -15,35 +15,11 @@ import { invalidateUnifiedUsersCache } from '../cache/unified-users.js'; import { invalidateMemberContextCache } from '../addie/index.js'; import { invalidateAdminStatusCache, invalidateWebAdminStatusCache } from '../addie/mcp/admin-tools.js'; import { getPool } from '../db/client.js'; -import { getWorkos } from '../auth/workos-client.js'; -import { isFreeEmailDomain } from '../utils/email-domain.js'; import type { SyncSlackUsersResult } from './types.js'; const slackDb = new SlackDatabase(); const workingGroupDb = new WorkingGroupDatabase(); -/** - * Determine the role for a new org member. If the org has no admin or owner, - * the first member gets 'owner' to prevent ownerless orgs. - */ -async function roleForNewMember(orgId: string): Promise<'owner' | 'member'> { - try { - const workos = getWorkos(); - const memberships = await workos.userManagement.listOrganizationMemberships({ - organizationId: orgId, - statuses: ['active', 'inactive', 'pending'], - limit: 100, - }); - const hasAdmin = memberships.data.some((m) => { - const role = m.role?.slug; - return role === 'admin' || role === 'owner'; - }); - return hasAdmin ? 'member' : 'owner'; - } catch { - return 'member'; - } -} - /** * Sync all Slack users to the database * @@ -617,11 +593,7 @@ export async function buildAaoEmailToUserIdMap(): Promise> { return aaoEmailToUserId; } -/** - * Check if a user should be assigned to an organization based on their email domain. - * If the user is in a personal workspace and their email domain matches a registered - * organization domain, adds them to that organization. - */ +/** Disabled pending explicit subject consent and a durable membership operation. */ export async function checkAndAssignOrganizationByDomain( workosUserId: string ): Promise<{ @@ -632,110 +604,10 @@ export async function checkAndAssignOrganizationByDomain( previousOrgName?: string; error?: string; } | null> { - logger.warn( - { workosUserId }, - 'Automatic domain organization assignment deferred: no durable provider intent journal', - ); - return null; - - /* c8 ignore start -- retained discovery for an eventual journaled workflow */ - const pool = getPool(); - - try { - const membershipResult = await pool.query<{ - email: string; - workos_organization_id: string; - org_name: string; - is_personal: boolean; - }>(` - SELECT om.email, om.workos_organization_id, o.name as org_name, o.is_personal - FROM organization_memberships om - JOIN organizations o ON o.workos_organization_id = om.workos_organization_id - WHERE om.workos_user_id = $1 - LIMIT 1 - `, [workosUserId]); - - if (membershipResult.rows.length === 0) { - return null; - } - - const { email, workos_organization_id: currentOrgId, org_name: currentOrgName, is_personal: isPersonal } = membershipResult.rows[0]; - - if (!isPersonal) { - return null; - } - - const domain = email.split('@')[1]?.toLowerCase(); - if (!domain || isFreeEmailDomain(domain)) { - return null; - } - - const domainResult = await pool.query<{ - workos_organization_id: string; - org_name: string; - }>(` - SELECT od.workos_organization_id, o.name as org_name - FROM organization_domains od - JOIN organizations o ON o.workos_organization_id = od.workos_organization_id - WHERE LOWER(od.domain) = $1 - AND o.is_personal = false - LIMIT 1 - `, [domain]); - - if (domainResult.rows.length === 0) { - return null; - } - - const { workos_organization_id: targetOrgId, org_name: targetOrgName } = domainResult.rows[0]; - - const existingMembership = await pool.query(` - SELECT 1 FROM organization_memberships - WHERE workos_user_id = $1 AND workos_organization_id = $2 - LIMIT 1 - `, [workosUserId, targetOrgId]); - - if (existingMembership.rows.length > 0) { - return null; - } + // Slack mapping/email is not the subject's consent to organization access. + void workosUserId; + return { assigned: false }; - const role = await roleForNewMember(targetOrgId); - - logger.info( - { workosUserId, email, domain, targetOrgId, targetOrgName, currentOrgId, currentOrgName, role }, - 'Adding user to organization based on email domain' - ); - - await getWorkos().userManagement.createOrganizationMembership({ - userId: workosUserId, - organizationId: targetOrgId, - roleSlug: role, - }); - - await pool.query(` - INSERT INTO organization_memberships (workos_user_id, workos_organization_id, email, role, created_at, updated_at, synced_at) - VALUES ($1, $2, $3, $4, NOW(), NOW(), NOW()) - ON CONFLICT (workos_user_id, workos_organization_id) DO NOTHING - `, [workosUserId, targetOrgId, email, role]); - - return { - assigned: true, - organizationId: targetOrgId, - organizationName: targetOrgName, - previousOrgId: currentOrgId, - previousOrgName: currentOrgName, - }; - } catch (error: any) { - if (error?.code === 'cannot_reactivate_pending_organization_membership') { - logger.info({ workosUserId }, 'Skipping org assignment — user has a pending invitation'); - return null; - } - logger.error({ err: error, workosUserId }, 'Error checking/assigning organization by domain'); - return { - assigned: false, - error: error instanceof Error ? error.message : 'Unknown error', - }; - } - /* c8 ignore stop */ } /** @@ -818,149 +690,13 @@ export async function autoLinkUnmappedSlackUsers(): Promise<{ }; } -/** - * Auto-add Slack users with WorkOS accounts to their org based on verified email domains. - * Covers users who were linked before their org's domain was added/verified, - * or who have no existing organization membership to trigger checkAndAssignOrganizationByDomain. - * - * Does not call the Slack API — no isSlackConfigured() guard needed. If slack_user_mappings - * is empty (Slack not configured), the query returns zero rows and is a no-op. - * - * Complements the slack-auto-link job: that job populates pending_organization_id for - * unmapped users; this job promotes already-mapped users to full WorkOS org members. - */ +/** Disabled for both scheduled and admin callers; profile sync remains available. */ export async function autoAddVerifiedDomainUsersAsMembers(): Promise<{ added: number; skipped: number; errors: number; }> { - logger.warn('Automatic verified-domain membership sweep deferred: no durable provider intent journal'); + // Verified domains alone cannot authorize scheduled or bulk membership grants. return { added: 0, skipped: 0, errors: 0 }; - /* c8 ignore start -- retained discovery for an eventual journaled workflow */ - const pool = getPool(); - - const result = await pool.query<{ - workos_organization_id: string; - org_name: string; - domain: string; - users: Array<{ email: string; name: string | null; workos_user_id: string }>; - }>(` - WITH verified_domain_orgs AS ( - SELECT - od.workos_organization_id, - LOWER(od.domain) as domain, - o.name as org_name - FROM organization_domains od - JOIN organizations o ON o.workos_organization_id = od.workos_organization_id - WHERE od.verified = true - ), - domain_users_with_workos AS ( - SELECT - vdo.workos_organization_id, - vdo.org_name, - vdo.domain, - sum.slack_email, - sum.slack_real_name, - sum.workos_user_id - FROM verified_domain_orgs vdo - JOIN slack_user_mappings sum ON LOWER(SPLIT_PART(sum.slack_email, '@', 2)) = vdo.domain - WHERE sum.workos_user_id IS NOT NULL - AND sum.slack_is_bot = false - AND sum.slack_is_deleted = false - ) - SELECT - workos_organization_id, - org_name, - domain, - json_agg(json_build_object( - 'email', slack_email, - 'name', slack_real_name, - 'workos_user_id', workos_user_id - )) as users - FROM domain_users_with_workos - GROUP BY workos_organization_id, org_name, domain - `); - - let totalAdded = 0; - let totalSkipped = 0; - let totalErrors = 0; - - for (const row of result.rows) { - const orgId = row.workos_organization_id; - - const existingMemberUserIds = new Set(); - let hasAdmin = false; - try { - let after: string | undefined; - do { - const memberships = await getWorkos().userManagement.listOrganizationMemberships({ - organizationId: orgId, - statuses: ['active', 'inactive', 'pending'], - limit: 100, - after, - }); - for (const m of memberships.data) { - existingMemberUserIds.add(m.userId); - if (m.role?.slug === 'admin' || m.role?.slug === 'owner') { - hasAdmin = true; - } - } - after = memberships.listMetadata?.after ?? undefined; - } while (after); - } catch (err) { - logger.warn({ err, orgId }, 'Failed to list WorkOS memberships for org, skipping'); - continue; - } - - const users = row.users as Array<{ email: string; name: string | null; workos_user_id: string }>; - - for (const user of users) { - if (existingMemberUserIds.has(user.workos_user_id)) { - totalSkipped++; - continue; - } - - // First member added to an ownerless org becomes owner - const role = hasAdmin ? 'member' : 'owner'; - - try { - await getWorkos().userManagement.createOrganizationMembership({ - userId: user.workos_user_id, - organizationId: orgId, - roleSlug: role, - }); - // Mirror the WorkOS membership locally so code reading organization_memberships - // sees the change immediately rather than waiting for the webhook to fire. - await pool.query(` - INSERT INTO organization_memberships (workos_user_id, workos_organization_id, email, role, created_at, updated_at, synced_at) - VALUES ($1, $2, $3, $4, NOW(), NOW(), NOW()) - ON CONFLICT (workos_user_id, workos_organization_id) DO NOTHING - `, [user.workos_user_id, orgId, user.email, role]); - totalAdded++; - if (!hasAdmin) hasAdmin = true; // Only promote the first one - logger.info({ orgId, orgName: row.org_name, email: user.email, role }, 'Auto-added domain user as org member'); - } catch (err: unknown) { - const code = (err as { code?: string })?.code; - const message = (err as { message?: string })?.message || ''; - if (code === 'organization_membership_already_exists') { - totalSkipped++; - } else if ( - message.includes('Pending organization memberships cannot be reactivated') || - code === 'entity_not_found' || - message.includes('User not found') - ) { - // Pending invite or deleted user — skip, not an error - logger.debug({ orgId, email: user.email, code, message }, 'Skipping org membership: user ineligible'); - totalSkipped++; - } else { - logger.error({ err, orgId, email: user.email }, 'Failed to create org membership for domain user'); - totalErrors++; - } - } - } - } - - return { added: totalAdded, skipped: totalSkipped, errors: totalErrors }; - /* c8 ignore stop */ } diff --git a/server/tests/helpers/organization-auth-fixture.ts b/server/tests/helpers/organization-auth-fixture.ts new file mode 100644 index 00000000000..437c0e9e71e --- /dev/null +++ b/server/tests/helpers/organization-auth-fixture.ts @@ -0,0 +1,12 @@ +import type { WorkOSUser } from '../../src/types.js'; +import { loadAuthorizationSnapshot } from '../../src/db/user-authorization-snapshot-db.js'; + +/** Legacy policy fixtures inject authentication. Give those fixtures the same + * server-only stamp as auth; real cookie/JWT verification is tested separately. + */ +export async function stampOrganizationTestUser(user: WorkOSUser, organizationId: string): Promise { + const snapshot = await loadAuthorizationSnapshot(user.id, organizationId); + if (!snapshot) throw new Error('Test credential has no authorization snapshot'); + user.identityId = snapshot.identityId ?? undefined; + Object.defineProperty(user, 'authorizationSnapshot', { value: snapshot }); +} diff --git a/server/tests/integration/admin-invite-tools.test.ts b/server/tests/integration/admin-invite-tools.test.ts index 97235efdf7c..b89b7d1c8f9 100644 --- a/server/tests/integration/admin-invite-tools.test.ts +++ b/server/tests/integration/admin-invite-tools.test.ts @@ -373,47 +373,23 @@ describe('admin invite tools', () => { }); }); - describe('add_member_to_org arg validation', () => { - let addMemberToOrg: (input: Record) => Promise; - beforeAll(() => { - const handlers = createAdminToolHandlers({ - is_mapped: true, - is_member: true, - workos_user: { - workos_user_id: ADMIN_ID, - email: ADMIN_EMAIL, - first_name: 'Admin', - last_name: 'User', - }, - }); - addMemberToOrg = handlers.get('add_member_to_org')!; - }); - - it('rejects missing email', async () => { - expect(await addMemberToOrg({ org_id: ORG_PUBX })).toMatch(/email is required/); - }); - - it('rejects missing or malformed org_id', async () => { - expect(await addMemberToOrg({ email: 'x@y.com' })).toMatch(/org_id is required/); - expect(await addMemberToOrg({ email: 'x@y.com', org_id: 'not-an-org' })).toMatch(/org_id is required/); - }); - - it('rejects invalid role enum', async () => { - expect( - await addMemberToOrg({ email: 'x@y.com', org_id: ORG_PUBX, role: 'superadmin' }) - ).toMatch(/role must be one of/); - }); - - it('rejects invalid seat_type enum', async () => { - expect( - await addMemberToOrg({ email: 'x@y.com', org_id: ORG_PUBX, seat_type: 'corporate' }) - ).toMatch(/seat_type must be one of/); + describe('add_member_to_org exact actor containment', () => { + it('does not replace a canonical admin context with the shared static key', async () => { + const fetchMock = vi.spyOn(globalThis, 'fetch').mockRejectedValue(new Error('Unexpected adapter call')); + try { + const handlers = createAdminToolHandlers({ + is_mapped: true, is_member: true, + workos_user: { workos_user_id: ADMIN_ID, email: ADMIN_EMAIL, first_name: 'Admin', last_name: 'User' }, + }); + const result = await handlers.get('add_member_to_org')!({ email: 'sam@example.test', org_id: ORG_PUBX, role: 'owner' }); + expect(result).toMatch(/cannot forward an exact authenticated actor/); + expect(fetchMock).not.toHaveBeenCalled(); + } finally { fetchMock.mockRestore(); } }); - it('refuses without admin context', async () => { - const handlers = createAdminToolHandlers(null); - const fn = handlers.get('add_member_to_org')!; - expect(await fn({ email: 'x@y.com', org_id: ORG_PUBX })).toMatch(/no signed-in admin/); + it('also fails closed without a signed-in context', async () => { + const result = await createAdminToolHandlers(null).get('add_member_to_org')!({ email: 'sam@example.test', org_id: ORG_PUBX }); + expect(result).toMatch(/cannot forward an exact authenticated actor/); }); }); diff --git a/server/tests/integration/claim-prospect-org.test.ts b/server/tests/integration/claim-prospect-org.test.ts index 3a1bb69efc9..1c5dac751b1 100644 --- a/server/tests/integration/claim-prospect-org.test.ts +++ b/server/tests/integration/claim-prospect-org.test.ts @@ -148,7 +148,6 @@ describe('POST /api/organizations/:orgId/claim', () => { }); await runMigrations(); server = new HTTPServer(); - await server.start(0); app = server.app; }, 60000); @@ -164,124 +163,18 @@ describe('POST /api/organizations/:orgId/claim', () => { userOverride = {}; }); - it('happy path: claims an unmembered prospect, creates WorkOS membership, writes audit log', async () => { + it.each([ + ['verified', true, TEST_DOMAIN], + ['unverified', false, TEST_DOMAIN], + ['wrong domain', true, TEST_OTHER_DOMAIN], + ])('denies %s claim without grants or audits', async (_label, verified, domain) => { + userOverride = { emailVerified: verified as boolean, email: `claimer@${domain}` }; await seedProspect(pool, { orgId: TEST_ORG_PROSPECT, domain: TEST_DOMAIN }); - - const res = await request(app).post(`/api/organizations/${TEST_ORG_PROSPECT}/claim`).send({}); - - expect(res.status).toBe(200); - expect(res.body.success).toBe(true); - expect(res.body.organization_id).toBe(TEST_ORG_PROSPECT); - expect(mockCreateOrganizationMembership).toHaveBeenCalledTimes(1); - expect(mockCreateOrganizationMembership).toHaveBeenCalledWith({ - userId: TEST_USER_ID, - organizationId: TEST_ORG_PROSPECT, - roleSlug: 'admin', - }); - - const auditRows = await pool.query( - `SELECT action, details FROM registry_audit_log WHERE workos_organization_id = $1`, - [TEST_ORG_PROSPECT], - ); - expect(auditRows.rows.length).toBe(1); - expect(auditRows.rows[0].action).toBe('organization_claimed'); - expect(auditRows.rows[0].details).toMatchObject({ claimed_via: 'self_claim', email_domain: TEST_DOMAIN }); - }); - - it('rejects unverified email with 403 (no WorkOS call, no audit row)', async () => { - userOverride = { emailVerified: false }; - await seedProspect(pool, { orgId: TEST_ORG_PROSPECT, domain: TEST_DOMAIN }); - const res = await request(app).post(`/api/organizations/${TEST_ORG_PROSPECT}/claim`).send({}); - expect(res.status).toBe(403); - expect(res.body.error).toBe('Email not verified'); - expect(mockCreateOrganizationMembership).not.toHaveBeenCalled(); - }); - - it('rejects domain mismatch with 403', async () => { - userOverride = { email: `attacker@${TEST_OTHER_DOMAIN}` }; - await seedProspect(pool, { orgId: TEST_ORG_PROSPECT, domain: TEST_DOMAIN }); - - const res = await request(app).post(`/api/organizations/${TEST_ORG_PROSPECT}/claim`).send({}); - - expect(res.status).toBe(403); - expect(res.body.error).toBe('Domain mismatch'); - expect(mockCreateOrganizationMembership).not.toHaveBeenCalled(); - }); - - it('rejects org with active subscription with 400', async () => { - await seedProspect(pool, { - orgId: TEST_ORG_PAYING, - domain: TEST_DOMAIN, - subscriptionStatus: 'active', - }); - - const res = await request(app).post(`/api/organizations/${TEST_ORG_PAYING}/claim`).send({}); - - expect(res.status).toBe(400); - expect(res.body.error).toBe('Not claimable'); - expect(mockCreateOrganizationMembership).not.toHaveBeenCalled(); - }); - - it('rejects org that already has members with 409 (anti-hijack)', async () => { - await seedProspect(pool, { - orgId: TEST_ORG_HAS_MEMBER, - domain: TEST_DOMAIN, - hasMember: true, - }); - - const res = await request(app).post(`/api/organizations/${TEST_ORG_HAS_MEMBER}/claim`).send({}); - - expect(res.status).toBe(409); - expect(res.body.error).toBe('Already claimed'); - expect(mockCreateOrganizationMembership).not.toHaveBeenCalled(); - }); - - it('rejects personal org with 400', async () => { - await seedProspect(pool, { - orgId: TEST_ORG_PERSONAL, - domain: TEST_DOMAIN, - isPersonal: true, - }); - - const res = await request(app).post(`/api/organizations/${TEST_ORG_PERSONAL}/claim`).send({}); - - expect(res.status).toBe(400); - expect(res.body.error).toBe('Not claimable'); - expect(mockCreateOrganizationMembership).not.toHaveBeenCalled(); - }); - - it('returns 404 when the org does not exist', async () => { - const res = await request(app).post(`/api/organizations/org_does_not_exist/claim`).send({}); - - expect(res.status).toBe(404); + expect(res.body.error).toBe('organization_onboarding_disabled'); expect(mockCreateOrganizationMembership).not.toHaveBeenCalled(); - }); - - it('rolls back local state when WorkOS createOrganizationMembership fails', async () => { - mockCreateOrganizationMembership.mockRejectedValueOnce(new Error('WorkOS down')); - await seedProspect(pool, { orgId: TEST_ORG_PROSPECT, domain: TEST_DOMAIN }); - - const res = await request(app).post(`/api/organizations/${TEST_ORG_PROSPECT}/claim`).send({}); - - expect(res.status).toBe(500); - const auditRows = await pool.query( - `SELECT action FROM registry_audit_log WHERE workos_organization_id = $1`, - [TEST_ORG_PROSPECT], - ); - expect(auditRows.rows.length).toBe(0); - }); - - it('treats organization_membership_already_exists as success (no double audit row)', async () => { - const alreadyExistsErr: Error & { code?: string } = new Error('already exists'); - alreadyExistsErr.code = 'organization_membership_already_exists'; - mockCreateOrganizationMembership.mockRejectedValueOnce(alreadyExistsErr); - await seedProspect(pool, { orgId: TEST_ORG_PROSPECT, domain: TEST_DOMAIN }); - - const res = await request(app).post(`/api/organizations/${TEST_ORG_PROSPECT}/claim`).send({}); - - expect(res.status).toBe(200); - expect(res.body.success).toBe(true); + expect((await pool.query('SELECT * FROM organization_memberships WHERE workos_organization_id = $1', [TEST_ORG_PROSPECT])).rowCount).toBe(0); + expect((await pool.query('SELECT * FROM registry_audit_log WHERE workos_organization_id = $1', [TEST_ORG_PROSPECT])).rowCount).toBe(0); }); }); diff --git a/server/tests/integration/implicit-onboarding-containment.test.ts b/server/tests/integration/implicit-onboarding-containment.test.ts new file mode 100644 index 00000000000..5a4a687b449 --- /dev/null +++ b/server/tests/integration/implicit-onboarding-containment.test.ts @@ -0,0 +1,710 @@ +/** Private containment regression: mounted production routes, real auth id-swap and PostgreSQL. */ +import { afterAll, beforeAll, beforeEach, describe, expect, it, vi } from 'vitest'; +import request from 'supertest'; + +const mocks = vi.hoisted(() => { + process.env.WORKOS_WEBHOOK_SECRET = 'private-containment-test-secret'; + return { + sessions: new Map(), + providerMemberships: new Map(), + sendInvitation: vi.fn(), getInvitation: vi.fn(), revokeInvitation: vi.fn(), + listUsers: vi.fn(), list: vi.fn(), getUser: vi.fn(), create: vi.fn(), update: vi.fn(), + createOrg: vi.fn(), invoice: vi.fn(), products: vi.fn(), coupon: vi.fn(), + slackSync: vi.fn(), slackConfigured: false, + jwtOutage: false, + }; +}); +vi.mock('@workos-inc/node', () => ({ WorkOS: class { + userManagement = { + loadSealedSession: ({ sessionData }: any) => ({ authenticate: async () => { + const user = mocks.sessions.get(sessionData); + return { authenticated: true, user, accessToken: `test-access:${user.id}` }; + } }), + listOrganizationMemberships: mocks.list, + sendInvitation: mocks.sendInvitation, getInvitation: mocks.getInvitation, revokeInvitation: mocks.revokeInvitation, + listUsers: mocks.listUsers, + getUser: mocks.getUser, + createOrganizationMembership: mocks.create, + updateOrganizationMembership: mocks.update, + }; + organizations = { + createOrganization: mocks.createOrg, + getOrganization: vi.fn(async (id: string) => ({ id, name: 'Acme Containment' })), + }; + webhooks = { constructEvent: vi.fn().mockResolvedValue({}) }; +} })); +vi.mock('../../src/auth/workos-client.js', async (original) => { + const actual = await original(); + const { WorkOS } = await import('@workos-inc/node'); + const instance = new WorkOS(); + return { ...actual, getWorkos: () => instance, getAuthorizationEnforcementWorkos: () => instance }; +}); +vi.mock('../../src/auth/workos-jwt.js', async (original) => ({ + ...await original(), + verifyWorkOSJWT: async (value: string) => { + if (mocks.jwtOutage) throw Object.assign(new Error('JWKS unavailable'), { code: 'ECONNRESET' }); + return { sub: value.replace(/^test-access:/, ''), isM2M: false }; + }, +})); +vi.mock('../../src/middleware/csrf.js', () => ({ csrfProtection: (_req: any, _res: any, next: any) => next() })); +vi.mock('../../src/middleware/rate-limit.js', async (original) => { + const actual = await original(); + const pass = (_req: any, _res: any, next: any) => next(); + return { ...actual, orgCreationRateLimiter: pass, brandCreationRateLimiter: pass, + memberProfileBootstrapRateLimiter: pass }; +}); +vi.mock('../../src/billing/stripe-client.js', async (original) => ({ + ...await original(), + createAndSendInvoice: mocks.invoice, getProductsForCustomer: mocks.products, + createCoupon: mocks.coupon, +})); +vi.mock('../../src/addie/error-notifier.js', () => ({ notifySystemError: vi.fn() })); +vi.mock('../../src/slack/client.js', async (original) => ({ + ...await original(), + isSlackConfigured: () => mocks.slackConfigured, getSlackUsers: mocks.slackSync, getUserChannels: vi.fn().mockResolvedValue([]), +})); + +import { HTTPServer } from '../../src/http.js'; +import { initializeDatabase, closeDatabase } from '../../src/db/client.js'; +import { runMigrations } from '../../src/db/migrate.js'; +import { invalidateSessionsForUsers } from '../../src/middleware/auth.js'; +import { autoLinkByVerifiedDomain, upsertOrganizationMembership } from '../../src/db/membership-db.js'; +import { checkAndAssignOrganizationByDomain, autoAddVerifiedDomainUsersAsMembers, + autoLinkUnmappedSlackUsers } from '../../src/slack/sync.js'; +import { handleUserChange } from '../../src/slack/events.js'; +import type { Pool } from 'pg'; + +const A = 'user_containment_a'; +const B = 'user_containment_b'; +const ORG = 'org_containment'; +const TOKEN = 'private-containment-token'; +const routes: Array<[string, Record]> = [ + ['/api/organizations', { organization_name: 'Acme Containment', is_personal: false }], + [`/api/organizations/${ORG}/claim`, {}], + ['/api/join-requests', { organization_id: ORG }], + ['/api/me/agents', { url: 'https://agent.containment.test/mcp', type: 'sales' }], + [`/api/invite/${TOKEN}/accept`, { agreement_version: '999.0', billingAddress: { + line1: '1 Example St', city: 'Example', state: 'EX', postal_code: '10000', country: 'US', + } }], +]; +let pool: Pool; +let app: HTTPServer['app']; +let sessionNumber = 0; +function cookie(id = B, emailVerified: boolean | 'missing' = true, email = 'b@containment.test') { + const key = `containment-${++sessionNumber}`; + mocks.sessions.set(key, { id, email, ...(emailVerified === 'missing' ? {} : { emailVerified }), firstName: 'Test', lastName: 'Subject', + createdAt: new Date().toISOString(), updatedAt: new Date().toISOString() }); + return `wos-session=${key}`; +} +async function snapshot() { + const results = await Promise.all([ + pool.query('SELECT * FROM organization_memberships WHERE workos_user_id = ANY($1) ORDER BY workos_user_id, workos_organization_id', [[A, B]]), + pool.query('SELECT * FROM registry_audit_log WHERE workos_user_id = ANY($1) ORDER BY id', [[A, B]]), + pool.query('SELECT * FROM authorization_epochs WHERE workos_user_id = ANY($1) ORDER BY workos_user_id', [[A, B]]), + pool.query('SELECT * FROM membership_invites WHERE token = $1', [TOKEN]), + pool.query('SELECT * FROM organizations WHERE workos_organization_id LIKE $1 ORDER BY workos_organization_id', [ORG + '%']), + pool.query('SELECT * FROM organization_domains WHERE workos_organization_id LIKE $1 ORDER BY id', [ORG + '%']), + pool.query('SELECT * FROM member_profiles WHERE workos_organization_id LIKE $1 ORDER BY id', [ORG + '%']), + pool.query('SELECT * FROM invitation_seat_types WHERE workos_organization_id = $1 ORDER BY workos_invitation_id', [ORG]), + pool.query('SELECT * FROM user_agreement_acceptances WHERE workos_user_id = ANY($1) ORDER BY id', [[A, B]]), + pool.query('SELECT * FROM organization_join_requests WHERE workos_user_id = ANY($1) ORDER BY id', [[A, B]]), + ]); + return results.map(r => r.rows); +} +async function link(primary: string, sibling: string) { + await pool.query('UPDATE identity_workos_users SET is_primary = false WHERE workos_user_id = $1', [sibling]); + await pool.query(`UPDATE identity_workos_users SET identity_id = + (SELECT identity_id FROM identity_workos_users WHERE workos_user_id = $1) + WHERE workos_user_id = $2`, [primary, sibling]); + await pool.query('UPDATE identity_workos_users SET is_primary = true WHERE workos_user_id = $1', [primary]); + invalidateSessionsForUsers([A, B]); +} +function expectNoProviders() { + for (const spy of [mocks.create, mocks.update, mocks.createOrg, mocks.sendInvitation, mocks.invoice, mocks.coupon, mocks.products]) { + expect(spy).not.toHaveBeenCalled(); + } +} +function providerMembership(userId: string, role = 'member', id = `om_${userId}`, organizationId = ORG) { + const value = { id, userId, organizationId, status: 'active', role: { slug: role } }; + mocks.providerMemberships.set(id, value); + return value; +} +async function waitForDatabaseLock(queryFragment: string): Promise { + for (let attempt = 0; attempt < 100; attempt++) { + const result = await pool.query( + `SELECT 1 FROM pg_stat_activity + WHERE datname = current_database() + AND pid <> pg_backend_pid() + AND wait_event_type = 'Lock' + AND query ILIKE '%' || $1 || '%'`, + [queryFragment], + ); + if (result.rowCount) return; + await new Promise(resolve => setTimeout(resolve, 10)); + } + throw new Error(`Timed out waiting for blocked database query containing ${queryFragment}`); +} + +beforeAll(async () => { + const connectionString = process.env.DATABASE_URL; + if (!connectionString || !/^postgres(?:ql)?:\/\/[^/]+@(127\.0\.0\.1|localhost):\d+\/adcp_test$/.test(connectionString)) { + throw new Error('This suite requires an explicit loopback adcp_test database'); + } + pool = initializeDatabase({ connectionString }); + await runMigrations(); + app = new HTTPServer({ backgroundServices: 'refresh-only' }).app; + await pool.query(`INSERT INTO agreements (version, text, effective_date, agreement_type) + VALUES ('999.0', 'Containment test agreement', '2099-01-01', 'membership') ON CONFLICT DO NOTHING`); +}, 60000); + +beforeEach(async () => { + vi.clearAllMocks(); + mocks.slackConfigured = false; + mocks.jwtOutage = false; + mocks.providerMemberships.clear(); + delete process.env.ADMIN_EMAILS; + invalidateSessionsForUsers([A, B]); + await pool.query('DELETE FROM organization_memberships WHERE workos_user_id = ANY($1)', [[A, B]]); + await pool.query('DELETE FROM registry_audit_log WHERE workos_user_id = ANY($1)', [[A, B]]); + await pool.query('DELETE FROM organization_join_requests WHERE workos_user_id = ANY($1)', [[A, B]]); + await pool.query('DELETE FROM membership_invites WHERE token = $1', [TOKEN]); + await pool.query('DELETE FROM certification_expectations WHERE workos_organization_id = $1', [ORG]); + await pool.query('DELETE FROM invitation_seat_types WHERE workos_organization_id = $1', [ORG]); + await pool.query("DELETE FROM slack_user_mappings WHERE slack_user_id = 'U_CONTAINMENT'"); + await pool.query('DELETE FROM users WHERE workos_user_id = ANY($1)', [[A, B]]); + await pool.query(`INSERT INTO users (workos_user_id, email, email_verified) VALUES ($1, 'a@unrelated.test', true), ($2, 'b@containment.test', true)`, [A, B]); + await pool.query(`INSERT INTO organizations (workos_organization_id, name, is_personal, email_domain, subscription_status) + VALUES ($1, 'Acme Containment', false, 'containment.test', NULL) + ON CONFLICT (workos_organization_id) DO UPDATE SET subscription_status = NULL, prospect_status = NULL`, [ORG]); + await pool.query(`INSERT INTO organization_domains (workos_organization_id, domain, verified, is_primary, source) + VALUES ($1, 'containment.test', true, true, 'workos') ON CONFLICT (domain) DO UPDATE SET verified = true`, [ORG]); + await pool.query(`INSERT INTO membership_invites (token, workos_organization_id, lookup_key, contact_email, invited_by_user_id, expires_at) + VALUES ($1, $2, 'test-tier', 'b@containment.test', $3, NOW() + interval '1 day')`, [TOKEN, ORG, A]); + mocks.sendInvitation.mockResolvedValue({ id: 'inv_containment', email: 'b@containment.test', organizationId: ORG, state: 'pending', + expiresAt: new Date(Date.now() + 86400000).toISOString(), acceptInvitationUrl: 'https://example.test/accept' }); + mocks.getInvitation.mockImplementation(async () => mocks.sendInvitation.mock.results.at(-1)?.value); + mocks.listUsers.mockResolvedValue({ data: [] }); + mocks.list.mockImplementation(async ({ userId, organizationId, statuses }: any) => ({ + data: [...mocks.providerMemberships.values()].filter(row => (!userId || row.userId === userId) + && (!organizationId || row.organizationId === organizationId) && (!statuses || statuses.includes(row.status))), + })); + mocks.getUser.mockImplementation(async (id: string) => ({ id, email: id === B ? 'b@containment.test' : 'a@unrelated.test', emailVerified: true })); + mocks.create.mockResolvedValue({ id: 'om_containment', role: { slug: 'member' }, status: 'active' }); + mocks.update.mockResolvedValue({}); + mocks.createOrg.mockResolvedValue({ id: `${ORG}_new`, name: 'Acme New' }); + mocks.products.mockResolvedValue([{ lookup_key: 'test-tier', amount_cents: 100 }]); + mocks.invoice.mockResolvedValue({ invoiceId: 'in_test', invoiceUrl: 'https://example.test/invoice' }); +}); +afterAll(async () => { + await pool.query("DELETE FROM agreements WHERE version = '999.0' AND text = 'Containment test agreement'"); + await closeDatabase(); +}); + +describe('mounted implicit onboarding containment', () => { + it('linked sibling cannot cancel the canonical credential request; exact cancellation is single-use', async () => { + const requestId = (await pool.query(`INSERT INTO organization_join_requests + (workos_user_id, user_email, workos_organization_id) VALUES ($1, 'a@unrelated.test', $2) RETURNING id`, [A, ORG])).rows[0].id; + await link(A, B); + + const sibling = await request(app).delete(`/api/join-requests/${requestId}`).set('Cookie', cookie(B)); + expect(sibling.status).toBe(404); + expect((await pool.query('SELECT status FROM organization_join_requests WHERE id = $1', [requestId])).rows[0].status).toBe('pending'); + + const exact = await request(app).delete(`/api/join-requests/${requestId}`).set('Cookie', cookie(A, true, 'a@unrelated.test')); + expect(exact.status, JSON.stringify(exact.body)).toBe(200); + const replay = await request(app).delete(`/api/join-requests/${requestId}`).set('Cookie', cookie(A, true, 'a@unrelated.test')); + expect(replay.status).toBe(404); + expect((await pool.query('SELECT status FROM organization_join_requests WHERE id = $1', [requestId])).rows[0].status).toBe('cancelled'); + expectNoProviders(); + }); + + it('cancellation rejects a conflicting query org before changing the request or calling a provider', async () => { + const requestId = (await pool.query(`INSERT INTO organization_join_requests + (workos_user_id, user_email, workos_organization_id) VALUES ($1, 'b@containment.test', $2) RETURNING id`, [B, ORG])).rows[0].id; + const response = await request(app).delete(`/api/join-requests/${requestId}`).query({ org: `${ORG}_other` }).set('Cookie', cookie(B)); + expect(response.status).toBe(403); + expect((await pool.query('SELECT status FROM organization_join_requests WHERE id = $1', [requestId])).rows[0].status).toBe('pending'); + expectNoProviders(); + }); + + it('cancellation rejects a same-identity binding delete-and-reinsert before the local write', async () => { + const requestId = (await pool.query(`INSERT INTO organization_join_requests + (workos_user_id, user_email, workos_organization_id) VALUES ($1, 'b@containment.test', $2) RETURNING id`, [B, ORG])).rows[0].id; + const binding = (await pool.query<{ identity_id: string; is_primary: boolean }>( + 'SELECT identity_id, is_primary FROM identity_workos_users WHERE workos_user_id = $1', [B], + )).rows[0]; + const originalConnect = pool.connect.bind(pool); + let checkouts = 0; + let mutated = false; + const spy = vi.spyOn(pool, 'connect').mockImplementation((async (...args: any[]) => { + if (typeof args[0] === 'function') return (originalConnect as any)(...args); + const client = await originalConnect(); + if (++checkouts === 2) { + mutated = true; + await pool.query('DELETE FROM identity_workos_users WHERE workos_user_id = $1', [B]); + await pool.query( + `INSERT INTO identity_workos_users (workos_user_id, identity_id, is_primary) + VALUES ($1, $2, $3)`, + [B, binding.identity_id, binding.is_primary], + ); + } + return client; + }) as any); + try { + const response = await request(app).delete(`/api/join-requests/${requestId}`).set('Cookie', cookie(B)); + expect(response.status).toBe(403); + expect(mutated).toBe(true); + expect((await pool.query( + 'SELECT status FROM organization_join_requests WHERE id = $1', [requestId], + )).rows[0].status).toBe('pending'); + expect((await pool.query( + 'SELECT 1 FROM registry_audit_log WHERE resource_id = $1', [requestId], + )).rowCount).toBe(0); + expectNoProviders(); + } finally { + spy.mockRestore(); + } + }); + + it('warm-cookie cancellation reports authorization_unavailable before changing the request', async () => { + const requestId = (await pool.query(`INSERT INTO organization_join_requests + (workos_user_id, user_email, workos_organization_id) VALUES ($1, 'b@containment.test', $2) RETURNING id`, [B, ORG])).rows[0].id; + const auth = cookie(B); + mocks.jwtOutage = true; + const response = await request(app).delete(`/api/join-requests/${requestId}`).set('Cookie', auth); + expect(response.status).toBe(503); + expect(response.body.error).toBe('authorization_unavailable'); + expect((await pool.query('SELECT status FROM organization_join_requests WHERE id = $1', [requestId])).rows[0].status).toBe('pending'); + expectNoProviders(); + }); + + it('exact cancellation holds the request row, wins deterministically, and blocks approval provider calls', async () => { + const advisoryKey = 6827002; + const blocker = await pool.connect(); + const requestId = (await pool.query(`INSERT INTO organization_join_requests + (workos_user_id, user_email, workos_organization_id) VALUES ($1, 'b@containment.test', $2) RETURNING id`, [B, ORG])).rows[0].id; + await pool.query(`INSERT INTO organization_memberships + (workos_user_id, workos_organization_id, workos_membership_id, email, role, seat_type) + VALUES ($1, $2, 'om_cancel_admin', 'a@unrelated.test', 'admin', 'contributor')`, [A, ORG]); + mocks.list.mockImplementation(async ({ userId }: any) => ({ data: userId === A ? [{ + id: 'om_cancel_admin', userId: A, organizationId: ORG, status: 'active', role: { slug: 'admin' }, + }] : [] })); + try { + await blocker.query('BEGIN'); + await blocker.query('SELECT pg_advisory_xact_lock($1)', [advisoryKey]); + await pool.query(`CREATE FUNCTION containment_cancel_barrier() RETURNS trigger LANGUAGE plpgsql AS $$ + BEGIN IF NEW.status = 'cancelled' THEN PERFORM pg_advisory_xact_lock(${advisoryKey}); END IF; RETURN NEW; END $$`); + await pool.query(`CREATE TRIGGER containment_cancel_barrier BEFORE UPDATE ON organization_join_requests + FOR EACH ROW WHEN (OLD.id = '${requestId}' AND OLD.workos_organization_id = '${ORG}' AND NEW.status = 'cancelled') + EXECUTE FUNCTION containment_cancel_barrier()`); + + const cancellation = request(app).delete(`/api/join-requests/${requestId}`) + .set('Cookie', cookie(B)).then(response => response); + await waitForDatabaseLock('UPDATE organization_join_requests'); + const approval = request(app).post(`/api/organizations/${ORG}/join-requests/${requestId}/approve`) + .set('Cookie', cookie(A, true, 'a@unrelated.test')).send({ role: 'member' }).then(response => response); + await waitForDatabaseLock('SELECT * FROM organization_join_requests'); + expect(mocks.create).not.toHaveBeenCalled(); + + await blocker.query('COMMIT'); + expect((await cancellation).status).toBe(200); + expect((await approval).status).toBe(409); + expect((await pool.query('SELECT status FROM organization_join_requests WHERE id = $1', [requestId])).rows[0].status).toBe('cancelled'); + expect(mocks.create).not.toHaveBeenCalled(); + expect((await pool.query('SELECT 1 FROM registry_audit_log WHERE resource_id = $1', [requestId])).rowCount).toBe(0); + } finally { + await blocker.query('ROLLBACK').catch(() => {}); + blocker.release(); + try { + await pool.query('DROP TRIGGER IF EXISTS containment_cancel_barrier ON organization_join_requests'); + } finally { + await pool.query('DROP FUNCTION IF EXISTS containment_cancel_barrier()'); + } + } + }); + it.each(routes)('invalid auth remains 401 on %s', async (path, body) => { + expect((await request(app).post(path).send(body)).status).toBe(401); + expectNoProviders(); + }); + it.each(routes)('linked B proof never grants canonical A via %s', async (path, body) => { + await link(A, B); + const before = await snapshot(); + const res = await request(app).post(path).set('Cookie', cookie()).send(body); + expectNoProviders(); + expect(res.status).toBe(403); + expect(res.body.error).toBe('organization_onboarding_disabled'); + expect(await snapshot()).toEqual(before); + }); + it.each([true, false, 'missing'] as const)('verification %s cannot enable suspended grants', async (verified) => { + for (const [path, body] of routes) { + const res = await request(app).post(path).set('Cookie', cookie(B, verified)).send(body); + expect(res.status).toBe(403); + } + expectNoProviders(); + }); + it.each([' B@CONTAINMENT.TEST ', 'b@子.test', 'alias@containment.test', 'a@unrelated.test'])('token email %s does not bypass denial', async (email) => { + const before = await snapshot(); + const [path, body] = routes[4]; + expect((await request(app).post(path).set('Cookie', cookie(B, true, email)).send(body)).status).toBe(403); + expect(await snapshot()).toEqual(before); + expectNoProviders(); + }); + it.each(['revoked', 'expired', 'accepted', 'pending'])('token status %s remains side-effect free', async (status) => { + if (status === 'revoked') await pool.query('UPDATE membership_invites SET revoked_at = NOW() WHERE token = $1', [TOKEN]); + if (status === 'accepted') await pool.query('UPDATE membership_invites SET accepted_at = NOW(), accepted_by_user_id = $2 WHERE token = $1', [TOKEN, B]); + if (status === 'expired') await pool.query("UPDATE membership_invites SET expires_at = NOW() - interval '1 day' WHERE token = $1", [TOKEN]); + const before = await snapshot(); + const [path, body] = routes[4]; + const results = await Promise.all([A, B].map(id => request(app).post(path).set('Cookie', cookie(id)).send(body))); + expect(results.map(r => r.status)).toEqual([403, 403]); + expect(await snapshot()).toEqual(before); + expectNoProviders(); + }); + it('opposite linked direction, concurrent independent sessions and unlink preserve zero transferred authority', async () => { + await link(B, A); + const before = await snapshot(); + const requests = routes.flatMap(([path, body]) => [A, B].map(id => + request(app).post(path).set('Cookie', cookie(id)).send(body))); + expect((await Promise.all(requests)).every(r => r.status === 403)).toBe(true); + await pool.query('DELETE FROM identity_workos_users WHERE workos_user_id = $1', [A]); + invalidateSessionsForUsers([A, B]); + expect(await snapshot()).toEqual(before); + expectNoProviders(); + }); + it('source outages do not enable disabled onboarding or trigger downstream calls', async () => { + mocks.list.mockRejectedValue(new Error('required source unavailable')); + mocks.getUser.mockRejectedValue(new Error('required source unavailable')); + const before = await snapshot(); + for (const [path, body] of routes) expect((await request(app).post(path).set('Cookie', cookie()).send(body)).status).toBe(403); + expect(await snapshot()).toEqual(before); + expectNoProviders(); + }); + it.each([0, 1, 2])('does not infer a primary/sole org from %s historical memberships', async (count) => { + for (let i = 0; i < count; i++) await pool.query(`INSERT INTO organization_memberships (workos_user_id, workos_organization_id, email, role) + VALUES ($1, $2, 'b@containment.test', 'owner')`, [B, `${ORG}_${i}`]); + const before = await snapshot(); + const res = await request(app).post('/api/me/agents').set('Cookie', cookie()).send(routes[3][1]); + expect(res.status).toBe(403); + expect(await snapshot()).toEqual(before); + expectNoProviders(); + }); + it('explicit agent organization denies canonical sibling membership and reports provider outage as 503', async () => { + await link(A, B); + mocks.list.mockResolvedValue({ data: [{ userId: A, organizationId: ORG, status: 'active', role: { slug: 'owner' } }] }); + expect((await request(app).post('/api/me/agents').query({ org: ORG }).set('Cookie', cookie()).send(routes[3][1])).status).toBe(403); + expect(mocks.list).toHaveBeenCalledWith({ userId: B, organizationId: ORG, statuses: ['active'] }); + mocks.list.mockRejectedValue(new Error('outage')); + expect((await request(app).post('/api/me/agents').query({ org: ORG }).set('Cookie', cookie()).send(routes[3][1])).status).toBe(503); + expectNoProviders(); + }); + it.each([ + ['get', '/api/me', {}], ['get', '/api/me/member-profile', {}], + ['post', '/api/me/member-profile', { display_name: 'Acme', slug: 'acme-containment' }], + ['post', '/api/me/member-profile', { organization_name: 'Acme', company_type: 'adtech', corporate_domain: 'containment.test' }], + ['put', '/api/me/member-profile', { display_name: 'Acme' }], + ] as const)('%s %s does not auto-link a verified domain', async (method, path, body) => { + await pool.query("UPDATE organizations SET subscription_status = 'active' WHERE workos_organization_id = $1", [ORG]); + const before = await snapshot(); + const res = await request(app)[method](path).set('Cookie', cookie()).send(body); + expect(res.status).toBeLessThan(500); + expect(await snapshot()).toEqual(before); + expectNoProviders(); + }); + it('linked unverified B cannot stamp a verified domain on canonical A existing organization', async () => { + await link(A, B); + await pool.query('UPDATE organization_domains SET verified = false WHERE workos_organization_id = $1', [ORG]); + mocks.list.mockResolvedValue({ data: [{ userId: A, organizationId: ORG, status: 'active', role: { slug: 'owner' } }] }); + const before = await snapshot(); + const res = await request(app).post('/api/me/member-profile').set('Cookie', cookie(B, false)).send({ + organization_name: 'Acme', company_type: 'adtech', corporate_domain: 'containment.test', + }); + expect(res.status).toBe(403); + expect(await snapshot()).toEqual(before); + expectNoProviders(); + }); + it('Slack scheduled/admin/event profile synchronization creates no organization authority', async () => { + mocks.slackConfigured = true; + const slackUser = { id: 'U_CONTAINMENT', is_bot: false, deleted: false, + profile: { email: 'b@containment.test', real_name: 'Profile Only' } }; + mocks.slackSync.mockResolvedValue([slackUser]); + process.env.ADMIN_EMAILS = 'b@containment.test'; + const before = await snapshot(); + const sync = await request(app).post('/api/admin/slack/sync').set('Cookie', cookie()).send({}); + expect(sync.status).toBe(200); + expect(sync.body.total_synced).toBe(1); + const mapped = await request(app).post('/api/admin/slack/users/U_CONTAINMENT/link') + .set('Cookie', cookie()).send({ workos_user_id: B }); + expect(mapped.status).toBe(200); + expect(mapped.body.organization_assignment).toEqual({ assigned: false }); + expect((await autoAddVerifiedDomainUsersAsMembers()).added).toBe(0); + await handleUserChange({ type: 'user_change', user: { ...slackUser, + profile: { ...slackUser.profile, real_name: 'Updated Profile Only' } } }); + expect((await pool.query("SELECT slack_real_name FROM slack_user_mappings WHERE slack_user_id = 'U_CONTAINMENT'")).rows[0].slack_real_name).toBe('Updated Profile Only'); + const after = await snapshot(); + // Current-main's manual Slack mapping fence bumps the exact credential's + // revocation epoch. That lifecycle invalidation is not organization + // authority; every authority-bearing and onboarding surface stays fixed. + expect(after[2]).toEqual([expect.objectContaining({ workos_user_id: B, epoch: '1' })]); + expect([...after.slice(0, 2), before[2], ...after.slice(3)]).toEqual(before); + expectNoProviders(); + }); + it.each([true, false])('Slack/domain bulk writers never grant, even verified=%s', async (verified) => { + await pool.query('UPDATE organization_domains SET verified = $2 WHERE workos_organization_id = $1', [ORG, verified]); + const before = await snapshot(); + expect(await checkAndAssignOrganizationByDomain(B)).toEqual({ assigned: false }); + expect(await autoAddVerifiedDomainUsersAsMembers()).toEqual({ added: 0, skipped: 0, errors: 0 }); + expect((await autoLinkUnmappedSlackUsers()).organizations_assigned).toBe(0); + expect(await autoLinkByVerifiedDomain({ userManagement: { createOrganizationMembership: mocks.create } } as any, B, 'b@containment.test')).toBeNull(); + expect(await snapshot()).toEqual(before); + expectNoProviders(); + }); + it.each(['invited', 'admin_added', 'webhook'])('common membership consumer preserves member for staged source %s', async (source) => { + providerMembership(B, 'member', 'om_containment'); + await pool.query(`INSERT INTO invitation_seat_types (workos_invitation_id, workos_organization_id, email, seat_type, source) + VALUES ($1, $2, 'b@containment.test', 'community_only', $3)`, [source, ORG, source]); + const res = await request(app).post('/api/webhooks/workos').set('WorkOS-Signature', 'test-verified-at-provider-boundary').send({ + id: `evt_${source}`, event: 'organization_membership.created', created_at: new Date().toISOString(), + data: { id: 'om_containment', user_id: B, organization_id: ORG, status: 'active', role: { slug: 'member' } }, + }); + expect(res.status).toBe(200); + const rows = await pool.query('SELECT workos_user_id, role FROM organization_memberships WHERE workos_organization_id = $1', [ORG]); + expect(rows.rows).toEqual([{ workos_user_id: B, role: 'member' }]); + expectNoProviders(); + }); + it('active membership replay at capacity preserves its seat and mirrors the provider role', async () => { + providerMembership(B, 'admin', 'om_containment'); + await pool.query('UPDATE organizations SET membership_tier = NULL, subscription_status = NULL WHERE workos_organization_id = $1', [ORG]); + await pool.query(`INSERT INTO organization_memberships + (workos_user_id, workos_organization_id, workos_membership_id, email, role, seat_type, provisioning_source) + VALUES ($1, $2, 'om_containment', 'b@containment.test', 'member', 'community_only', 'invited')`, [B, ORG]); + const response = await request(app).post('/api/webhooks/workos').set('WorkOS-Signature', 'test').send({ + id: 'evt_replay_at_capacity', event: 'organization_membership.updated', created_at: new Date().toISOString(), + data: { id: 'om_containment', user_id: B, organization_id: ORG, status: 'active', role: { slug: 'admin' } }, + }); + expect(response.status).toBe(200); + expect((await pool.query(`SELECT role, seat_type, provisioning_source FROM organization_memberships + WHERE workos_user_id = $1 AND workos_organization_id = $2`, [B, ORG])).rows) + .toEqual([{ role: 'admin', seat_type: 'community_only', provisioning_source: 'invited' }]); + expectNoProviders(); + }); + it('stale role replay mirrors the current provider role rather than the event role', async () => { + providerMembership(B, 'owner', 'om_containment'); + await pool.query(`INSERT INTO organization_memberships + (workos_user_id, workos_organization_id, workos_membership_id, email, role, seat_type) + VALUES ($1, $2, 'om_containment', 'b@containment.test', 'member', 'community_only')`, [B, ORG]); + const response = await request(app).post('/api/webhooks/workos').set('WorkOS-Signature', 'test').send({ + id: 'evt_stale_role', event: 'organization_membership.updated', created_at: new Date().toISOString(), + data: { id: 'om_containment', user_id: B, organization_id: ORG, status: 'active', role: { slug: 'member' } }, + }); + expect(response.status).toBe(200); + expect((await pool.query('SELECT role FROM organization_memberships WHERE workos_user_id = $1 AND workos_organization_id = $2', [B, ORG])).rows) + .toEqual([{ role: 'owner' }]); + expect(mocks.update).not.toHaveBeenCalled(); + }); + it('provider role change during synchronization rolls back the stale local mirror', async () => { + await pool.query(`INSERT INTO organization_memberships + (workos_user_id, workos_organization_id, workos_membership_id, email, role, seat_type) + VALUES ($1, $2, 'om_containment', 'b@containment.test', 'member', 'community_only')`, [B, ORG]); + let reads = 0; + mocks.list.mockImplementation(async () => ({ + data: [{ + id: 'om_containment', userId: B, organizationId: ORG, status: 'active', + role: { slug: ++reads === 1 ? 'owner' : 'admin' }, + }], + })); + const response = await request(app).post('/api/webhooks/workos').set('WorkOS-Signature', 'test').send({ + id: 'evt_changed_role', event: 'organization_membership.updated', created_at: new Date().toISOString(), + data: { id: 'om_containment', user_id: B, organization_id: ORG, status: 'active', role: { slug: 'member' } }, + }); + expect(response.status).toBe(503); + expect(reads).toBe(2); + expect((await pool.query('SELECT role FROM organization_memberships WHERE workos_user_id = $1 AND workos_organization_id = $2', [B, ORG])).rows) + .toEqual([{ role: 'member' }]); + expect(mocks.update).not.toHaveBeenCalled(); + }); + it('out-of-order stale delete mirrors an active replacement and preserves its primary pointer', async () => { + providerMembership(A, 'owner', 'om_owner_replacement'); + await pool.query(`INSERT INTO organization_memberships + (workos_user_id, workos_organization_id, workos_membership_id, email, role, seat_type) + VALUES ($1, $2, 'om_owner_old', 'a@unrelated.test', 'owner', 'contributor')`, [A, ORG]); + await pool.query('UPDATE users SET primary_organization_id = $2 WHERE workos_user_id = $1', [A, ORG]); + const response = await request(app).post('/api/webhooks/workos').set('WorkOS-Signature', 'test').send({ + id: 'evt_stale_owner_delete', event: 'organization_membership.deleted', created_at: new Date().toISOString(), + data: { id: 'om_owner_old', user_id: A, organization_id: ORG, status: 'inactive', role: { slug: 'owner' } }, + }); + expect(response.status).toBe(200); + expect((await pool.query(`SELECT workos_membership_id, role FROM organization_memberships + WHERE workos_user_id = $1 AND workos_organization_id = $2`, [A, ORG])).rows) + .toEqual([{ workos_membership_id: 'om_owner_replacement', role: 'owner' }]); + expect((await pool.query('SELECT primary_organization_id FROM users WHERE workos_user_id = $1', [A])).rows) + .toEqual([{ primary_organization_id: ORG }]); + expect(mocks.update).not.toHaveBeenCalled(); + }); + it.each([ + ['legacy null provider id', null], + ['mismatched provider id', 'om_replacement_local'], + ] as const)('provider-confirmed absence removes %s authority and its primary pointer', async (_case, localMembershipId) => { + await pool.query(`INSERT INTO organization_memberships + (workos_user_id, workos_organization_id, workos_membership_id, email, role, seat_type) + VALUES ($1, $2, $3, 'b@containment.test', 'member', 'community_only')`, [B, ORG, localMembershipId]); + await pool.query('UPDATE users SET primary_organization_id = $2 WHERE workos_user_id = $1', [B, ORG]); + const response = await request(app).post('/api/webhooks/workos').set('WorkOS-Signature', 'test').send({ + id: 'evt_old_delete', event: 'organization_membership.deleted', created_at: new Date().toISOString(), + data: { id: 'om_old_deleted', user_id: B, organization_id: ORG, status: 'inactive', role: { slug: 'member' } }, + }); + expect(response.status).toBe(200); + expect((await pool.query(`SELECT workos_membership_id, role FROM organization_memberships + WHERE workos_user_id = $1 AND workos_organization_id = $2`, [B, ORG])).rows).toEqual([]); + expect((await pool.query('SELECT primary_organization_id FROM users WHERE workos_user_id = $1', [B])).rows) + .toEqual([{ primary_organization_id: null }]); + expect(mocks.getUser).not.toHaveBeenCalled(); + }); + it.each(['members/by-email', 'invitations', 'certification-invites'])('%s producer followed by acceptance never synthesizes owner', async (producer) => { + await pool.query(`INSERT INTO organization_memberships + (workos_user_id, workos_organization_id, workos_membership_id, email, role, seat_type) + VALUES ($1, $2, 'om_admin', 'a@unrelated.test', 'admin', 'contributor')`, [A, ORG]); + mocks.list.mockImplementation(async ({ userId }: any) => ({ data: userId === A ? [{ + id: 'om_admin', userId: A, organizationId: ORG, status: 'active', role: { slug: 'admin' }, + }] : [] })); + const invitation = await request(app).post(`/api/organizations/${ORG}/${producer}`) + .set('Cookie', cookie(A, true, 'a@unrelated.test')) + .send(producer === 'certification-invites' ? { emails: ['b@containment.test'] } : { email: 'b@containment.test', role: 'member' }); + expect(invitation.status, JSON.stringify(invitation.body)).toBe(producer === 'members/by-email' ? 201 : 200); + expect(mocks.sendInvitation).toHaveBeenCalledTimes(1); + expect(mocks.sendInvitation.mock.calls[0][0]).toMatchObject({ email: 'b@containment.test', organizationId: ORG }); + if (producer !== 'certification-invites') expect(mocks.sendInvitation.mock.calls[0][0].roleSlug).toBe('member'); + // The inviter leaves before the recipient accepts. The provider delivers + // member, so an ownerless local roster must not turn that role into owner. + await pool.query('DELETE FROM organization_memberships WHERE workos_user_id = $1', [A]); + const acceptedMembership = providerMembership(B, 'member', 'om_containment'); + mocks.list.mockImplementation(async ({ userId }: any) => ({ data: userId === B ? [acceptedMembership] : [] })); + mocks.sendInvitation.mockClear(); + const accepted = await request(app).post('/api/webhooks/workos').set('WorkOS-Signature', 'test').send({ + id: `evt_producer_${producer}`, event: 'organization_membership.created', created_at: new Date().toISOString(), + data: { id: 'om_containment', user_id: B, organization_id: ORG, status: 'active', role: { slug: 'member' } }, + }); + expect(accepted.status).toBe(200); + expect((await pool.query('SELECT workos_user_id, role FROM organization_memberships WHERE workos_organization_id = $1', [ORG])).rows) + .toEqual([{ workos_user_id: B, role: 'member' }]); + expectNoProviders(); + }); + it('owner deletion does not promote an ordinary invite recipient', async () => { + for (const [id, role] of [[A, 'owner'], [B, 'member']]) await pool.query(`INSERT INTO organization_memberships + (workos_user_id, workos_organization_id, workos_membership_id, email, role) VALUES ($1, $2, $3, $4, $5)`, + [id, ORG, `om_${id}`, `${id}@containment.test`, role]); + const res = await request(app).post('/api/webhooks/workos').set('WorkOS-Signature', 'test-verified-at-provider-boundary').send({ + id: 'evt_delete', event: 'organization_membership.deleted', created_at: new Date().toISOString(), + data: { id: `om_${A}`, user_id: A, organization_id: ORG, status: 'inactive', role: { slug: 'owner' } }, + }); + expect(res.status).toBe(200); + expect((await pool.query('SELECT role FROM organization_memberships WHERE workos_user_id = $1', [B])).rows).toEqual([{ role: 'member' }]); + expectNoProviders(); + }); + it.each(['outage', 'wrong subject'])('active membership %s fails with 503 before writes', async (condition) => { + providerMembership(B, 'member', 'om_containment'); + if (condition === 'outage') mocks.getUser.mockRejectedValue(new Error('required source unavailable')); + else mocks.getUser.mockResolvedValue({ id: A, email: 'a@unrelated.test' }); + const before = await snapshot(); + const res = await request(app).post('/api/webhooks/workos').set('WorkOS-Signature', 'test').send({ + id: 'evt_source', event: 'organization_membership.updated', created_at: new Date().toISOString(), + data: { id: 'om_containment', user_id: B, organization_id: ORG, status: 'active', role: { slug: 'member' } }, + }); + expect(res.status).toBe(503); + expect(await snapshot()).toEqual(before); + expectNoProviders(); + }); + it('inactive membership removes access during user-source outage without promoting', async () => { + await pool.query(`INSERT INTO organization_memberships (workos_user_id, workos_organization_id, workos_membership_id, email, role) + VALUES ($1, $2, 'om_containment', 'b@containment.test', 'owner')`, [B, ORG]); + mocks.getUser.mockRejectedValue(new Error('unavailable')); + const res = await request(app).post('/api/webhooks/workos').set('WorkOS-Signature', 'test').send({ + id: 'evt_inactive', event: 'organization_membership.updated', created_at: new Date().toISOString(), + data: { id: 'om_containment', user_id: B, organization_id: ORG, status: 'inactive', role: { slug: 'owner' } }, + }); + expect(res.status).toBe(200); + expect(mocks.getUser).not.toHaveBeenCalled(); + expect((await pool.query('SELECT * FROM organization_memberships WHERE workos_user_id = $1', [B])).rows).toEqual([]); + expectNoProviders(); + }); + it('invitation acceptance continuously transfers its seat reservation while a concurrent invite waits', async () => { + const advisoryKey = 6827001; + const blocker = await pool.connect(); + try { + await pool.query('UPDATE organizations SET membership_tier = NULL, subscription_status = NULL WHERE workos_organization_id = $1', [ORG]); + await pool.query(`INSERT INTO organization_memberships + (workos_user_id, workos_organization_id, workos_membership_id, email, role, seat_type) + VALUES ($1, $2, 'om_acceptance_admin', 'a@unrelated.test', 'admin', 'contributor')`, [A, ORG]); + mocks.list.mockImplementation(async ({ userId }: any) => ({ data: userId === A ? [{ + id: 'om_acceptance_admin', userId: A, organizationId: ORG, status: 'active', role: { slug: 'admin' }, + }] : userId === B ? [{ + id: 'om_acceptance_member', userId: B, organizationId: ORG, status: 'active', role: { slug: 'member' }, + }] : [] })); + await pool.query(`INSERT INTO invitation_seat_types + (workos_invitation_id, workos_organization_id, email, seat_type, source) + VALUES ('inv_acceptance_race', $1, 'b@containment.test', 'community_only', 'invited')`, [ORG]); + + await blocker.query('BEGIN'); + await blocker.query('SELECT pg_advisory_xact_lock($1)', [advisoryKey]); + await pool.query(`CREATE FUNCTION containment_acceptance_barrier() RETURNS trigger LANGUAGE plpgsql AS $$ + BEGIN PERFORM pg_advisory_xact_lock(${advisoryKey}); RETURN NEW; END $$`); + await pool.query(`CREATE TRIGGER containment_acceptance_barrier BEFORE INSERT ON organization_memberships + FOR EACH ROW WHEN (NEW.workos_organization_id = '${ORG}' + AND NEW.workos_user_id = '${B}' AND NEW.workos_membership_id = 'om_acceptance_member') + EXECUTE FUNCTION containment_acceptance_barrier()`); + + const acceptance = request(app).post('/api/webhooks/workos').set('WorkOS-Signature', 'test').send({ + id: 'evt_acceptance_reservation', event: 'organization_membership.created', created_at: new Date().toISOString(), + data: { id: 'om_acceptance_member', user_id: B, organization_id: ORG, status: 'active', role: { slug: 'member' } }, + }).then(response => response); + await waitForDatabaseLock('INSERT INTO organization_memberships'); + + const concurrentInvite = request(app).post(`/api/organizations/${ORG}/invitations`) + .set('Cookie', cookie(A, true, 'a@unrelated.test')) + .send({ email: 'later@containment.test', role: 'member', seat_type: 'community_only' }) + .then(response => response); + await waitForDatabaseLock('SELECT workos_organization_id FROM organizations'); + + // The accepting transaction has consumed the row internally, but every + // independent session still observes the reservation until the member + // row is committed. Capacity is never externally released between them. + expect((await pool.query(`SELECT COUNT(*)::int AS count FROM invitation_seat_types + WHERE workos_organization_id = $1 AND seat_type = 'community_only'`, [ORG])).rows[0].count).toBe(1); + expect((await pool.query('SELECT 1 FROM organization_memberships WHERE workos_user_id = $1 AND workos_organization_id = $2', [B, ORG])).rowCount).toBe(0); + + await blocker.query('COMMIT'); + expect((await acceptance).status).toBe(200); + const denied = await concurrentInvite; + expect(denied.status, JSON.stringify(denied.body)).toBe(403); + expect(denied.body.error).toBe('access_denied'); + expect(mocks.sendInvitation).not.toHaveBeenCalled(); + expect((await pool.query('SELECT seat_type FROM organization_memberships WHERE workos_user_id = $1 AND workos_organization_id = $2', [B, ORG])).rows) + .toEqual([{ seat_type: 'community_only' }]); + expect((await pool.query('SELECT 1 FROM invitation_seat_types WHERE workos_organization_id = $1', [ORG])).rowCount).toBe(0); + } finally { + await blocker.query('ROLLBACK').catch(() => {}); + blocker.release(); + try { + await pool.query('DROP TRIGGER IF EXISTS containment_acceptance_barrier ON organization_memberships'); + } finally { + await pool.query('DROP FUNCTION IF EXISTS containment_acceptance_barrier()'); + } + } + }); + it('BEFORE RETURN NULL membership trigger aborts success', async () => { + try { + await pool.query(`CREATE FUNCTION containment_suppress() RETURNS trigger LANGUAGE plpgsql AS $$ BEGIN RETURN NULL; END $$`); + await pool.query(`CREATE TRIGGER containment_suppress BEFORE INSERT ON organization_memberships + FOR EACH ROW WHEN (NEW.workos_organization_id = '${ORG}' + AND NEW.workos_user_id = '${B}' AND NEW.workos_membership_id = 'om_suppressed') + EXECUTE FUNCTION containment_suppress()`); + await expect(upsertOrganizationMembership({ user_id: B, organization_id: ORG, membership_id: 'om_suppressed', email: 'b@containment.test', + first_name: null, last_name: null, role: 'member', seat_type: 'community_only', has_explicit_seat_type: false })).rejects.toThrow('exactly one row'); + } finally { + try { + await pool.query('DROP TRIGGER IF EXISTS containment_suppress ON organization_memberships'); + } finally { + await pool.query('DROP FUNCTION IF EXISTS containment_suppress()'); + } + } + }); +}); diff --git a/server/tests/integration/join-request-approval.test.ts b/server/tests/integration/join-request-approval.test.ts index 0ec589d1e06..e773275f4e3 100644 --- a/server/tests/integration/join-request-approval.test.ts +++ b/server/tests/integration/join-request-approval.test.ts @@ -18,7 +18,7 @@ const { TEST_ADMIN_USER_ID: 'user_join_req_admin', TEST_REQUESTER_USER_ID: 'user_join_req_requester', TEST_ORG_ID: 'org_join_req_test', - mockCreateOrganizationMembership: vi.fn().mockResolvedValue({ id: 'om_test_new' }), + mockCreateOrganizationMembership: vi.fn(), mockSendInvitation: vi.fn(), listOrganizationMemberships: vi.fn(), }; @@ -31,6 +31,8 @@ vi.mock('@workos-inc/node', () => ({ userManagement = { listOrganizationMemberships, createOrganizationMembership: mockCreateOrganizationMembership, + getOrganizationMembership: async () => ({ id: 'om_test_new',userId: TEST_REQUESTER_USER_ID,organizationId: TEST_ORG_ID,status:'active',role:{slug:'member'} }), + deleteOrganizationMembership: vi.fn(), sendInvitation: mockSendInvitation, getUser: vi.fn().mockResolvedValue({ id: TEST_ADMIN_USER_ID, email: 'admin@example.com' }), }; @@ -43,32 +45,21 @@ vi.mock('@workos-inc/node', () => ({ }, })); -vi.mock('../../src/auth/workos-client.js', () => ({ - workos: { - userManagement: { - listOrganizationMemberships, - createOrganizationMembership: mockCreateOrganizationMembership, - sendInvitation: mockSendInvitation, - getUser: vi.fn().mockResolvedValue({ id: TEST_ADMIN_USER_ID, email: 'admin@example.com' }), - }, - organizations: { - getOrganization: vi.fn().mockResolvedValue({ id: TEST_ORG_ID, name: 'Test Org' }), - }, - adminPortal: { - generateLink: vi.fn().mockResolvedValue({ link: 'https://test-portal.workos.com' }), - }, - }, -})); +vi.mock('../../src/auth/workos-client.js', async () => { + const { WorkOS } = await import('@workos-inc/node'); + return { getAuthorizationEnforcementWorkos: () => new WorkOS(), getWorkos: () => new WorkOS() }; +}); import { HTTPServer } from '../../src/http.js'; import request from 'supertest'; import { getPool, initializeDatabase, closeDatabase } from '../../src/db/client.js'; +import { stampOrganizationTestUser } from '../helpers/organization-auth-fixture.js'; import { runMigrations } from '../../src/db/migrate.js'; import type { Pool } from 'pg'; vi.mock('../../src/middleware/auth.js', async (importOriginal) => ({ ...(await importOriginal()), - requireAuth: (req: any, _res: any, next: any) => { + requireAuth: async (req: any, _res: any, next: any) => { req.user = { id: TEST_ADMIN_USER_ID, email: 'admin@example.com', @@ -76,6 +67,13 @@ vi.mock('../../src/middleware/auth.js', async (importOriginal) => ({ lastName: 'User', is_admin: false, }; + if (req.originalUrl.startsWith('/api/organizations/')) { + await getPool().query('INSERT INTO users (workos_user_id,email) VALUES ($1,$2) ON CONFLICT DO NOTHING',[TEST_ADMIN_USER_ID,'admin@example.com']); + await getPool().query(`INSERT INTO organization_memberships (workos_user_id,workos_organization_id,workos_membership_id,email,role) + VALUES ($1,$2,'om_admin','admin@example.com','admin') ON CONFLICT (workos_user_id,workos_organization_id) DO NOTHING`,[TEST_ADMIN_USER_ID,TEST_ORG_ID]); + req.accessToken = TEST_ADMIN_USER_ID; + await stampOrganizationTestUser(req.user, TEST_ORG_ID); + } next(); }, requireAdmin: (_req: any, res: any) => { @@ -125,7 +123,9 @@ describe('Join Request Approval', () => { beforeEach(async () => { vi.clearAllMocks(); - mockCreateOrganizationMembership.mockResolvedValue({ id: 'om_test_new' }); + listOrganizationMemberships.mockReset(); + mockCreateOrganizationMembership.mockReset(); + mockCreateOrganizationMembership.mockResolvedValue({ id: 'om_test_new',userId:TEST_REQUESTER_USER_ID,organizationId:TEST_ORG_ID,status:'active',role:{slug:'member'} }); // Re-establish after clearAllMocks: handler calls workos!.userManagement.listOrganizationMemberships // via the new WorkOS() instance; the mock must return admin membership for test user. listOrganizationMemberships.mockImplementation(({ userId, organizationId }: { userId: string; organizationId: string }) => { @@ -138,8 +138,8 @@ describe('Join Request Approval', () => { }); await pool.query( - `INSERT INTO organizations (workos_organization_id, name, is_personal, created_at, updated_at) - VALUES ($1, $2, false, NOW(), NOW()) + `INSERT INTO organizations (workos_organization_id, name, is_personal, subscription_status, membership_tier, created_at, updated_at) + VALUES ($1, $2, false, 'active', 'company_standard', NOW(), NOW()) ON CONFLICT (workos_organization_id) DO UPDATE SET name = $2, is_personal = false`, [TEST_ORG_ID, 'Test Org'] ); @@ -154,10 +154,11 @@ describe('Join Request Approval', () => { }); afterEach(async () => { + await pool.query('DELETE FROM organization_memberships WHERE workos_organization_id=$1',[TEST_ORG_ID]); await pool.query('DELETE FROM organization_join_requests WHERE workos_organization_id = $1', [TEST_ORG_ID]); }); - it('returns 409 when creating a join request for a pending WorkOS invitation', async () => { + it('denies inline join onboarding even with a pending provider invitation', async () => { listOrganizationMemberships.mockResolvedValueOnce({ data: [{ id: 'om_pending', @@ -171,9 +172,9 @@ describe('Join Request Approval', () => { const response = await request(app) .post('/api/join-requests') .send({ organization_id: TEST_ORG_ID }) - .expect(409); + .expect(403); - expect(response.body.error).toBe('Pending invitation exists'); + expect(response.body.error).toBe('organization_onboarding_disabled'); expect(mockCreateOrganizationMembership).not.toHaveBeenCalled(); }); @@ -192,9 +193,9 @@ describe('Join Request Approval', () => { const response = await request(app) .post('/api/join-requests') .send({ organization_id: TEST_ORG_ID }) - .expect(409); + .expect(403); - expect(response.body.error).toBe('Pending invitation exists'); + expect(response.body.error).toBe('organization_onboarding_disabled'); const result = await pool.query( `SELECT id FROM organization_join_requests @@ -211,7 +212,7 @@ describe('Join Request Approval', () => { .expect(200); expect(response.body.success).toBe(true); - expect(response.body.message).toContain('requester@example.com'); + expect(response.body.success).toBe(true); expect(mockCreateOrganizationMembership).toHaveBeenCalledWith({ userId: TEST_REQUESTER_USER_ID, @@ -234,7 +235,7 @@ describe('Join Request Approval', () => { expect(result.rows[0].status).toBe('approved'); }); - it('returns 400 and clears stale pending row when user is already a member', async () => { + it('returns 409 and preserves pending row for explicit reconciliation when provider reports an existing member', async () => { const alreadyMemberError: any = new Error('Already a member'); alreadyMemberError.code = 'organization_membership_already_exists'; mockCreateOrganizationMembership.mockRejectedValueOnce(alreadyMemberError); @@ -242,16 +243,16 @@ describe('Join Request Approval', () => { const response = await request(app) .post(`/api/organizations/${TEST_ORG_ID}/join-requests/${joinRequestId}/approve`) .send({ role: 'member' }) - .expect(400); + .expect(409); - expect(response.body.error).toBe('User already a member'); + expect(response.body.error).toBe('membership_state_conflict'); - // Stale pending row must be cleaned up so it doesn't keep surfacing in the admin UI + // An already-existing provider member is not proof this request was approved. const result = await pool.query( 'SELECT status FROM organization_join_requests WHERE id = $1', [joinRequestId] ); - expect(result.rows[0].status).toBe('approved'); + expect(result.rows[0].status).toBe('pending'); }); it('returns 409 and leaves pending row intact on cannot_reactivate error', async () => { @@ -266,7 +267,7 @@ describe('Join Request Approval', () => { .send({ role: 'member' }) .expect(409); - expect(response.body.error).toBe('Pending invitation exists'); + expect(response.body.error).toBe('membership_state_conflict'); // Row must stay pending — user was NOT added const result = await pool.query( @@ -282,7 +283,7 @@ describe('Join Request Approval', () => { .send({ role: 'member' }) .expect(404); - expect(response.body.error).toBe('Request not found'); + expect(response.body.error).toBe('not_found'); }); it('returns 400 for invalid role', async () => { @@ -291,6 +292,12 @@ describe('Join Request Approval', () => { .send({ role: 'owner' }) .expect(400); - expect(response.body.error).toBe('Invalid role'); + expect(response.body.error).toBe('invalid_request'); }); }); + +vi.mock('../../src/auth/workos-jwt.js', async (importOriginal) => ({ + ...(await importOriginal()), + verifyWorkOSJWT: async (value: string) => ({ sub: value, isM2M: false }), +})); +vi.mock('../../src/services/organization-membership-notifications.js', () => ({ notifyMembershipSeats: vi.fn(), notifyMembershipSeatRequest: vi.fn() })); diff --git a/server/tests/integration/member-agents-api.test.ts b/server/tests/integration/member-agents-api.test.ts index 6bb96080b5e..74e64fbf4f2 100644 --- a/server/tests/integration/member-agents-api.test.ts +++ b/server/tests/integration/member-agents-api.test.ts @@ -242,7 +242,7 @@ describe('Per-agent REST API (/api/me/agents)', () => { ); }); - it('GET returns 400 when user has no org', async () => { + it('GET requires an explicit organization selector', async () => { (app as any).setCurrentUser('unprovisioned_user'); const res = await request(app).get('/api/me/agents'); expect(res.status).toBe(400); @@ -255,7 +255,7 @@ describe('Per-agent REST API (/api/me/agents)', () => { await provisionUser(userId, orgId); (app as any).setCurrentUser(userId); - const res = await request(app).get('/api/me/agents'); + const res = await request(app).get('/api/me/agents').query({ org: orgId }); expect(res.status).toBe(404); }); @@ -267,7 +267,7 @@ describe('Per-agent REST API (/api/me/agents)', () => { await createProfile(orgId, 'get'); (app as any).setCurrentUser(userId); - const res = await request(app).get('/api/me/agents'); + const res = await request(app).get('/api/me/agents').query({ org: orgId }); expect(res.status).toBe(200); expect(res.body.agents).toHaveLength(1); expect(res.body.agents[0].url).toBe('https://existing.example.test/mcp'); @@ -282,14 +282,14 @@ describe('Per-agent REST API (/api/me/agents)', () => { (app as any).setCurrentUser(userId); const created = await request(app) - .post('/api/me/agents') + .post('/api/me/agents').query({ org: orgId }) .send({ url: 'https://new.example.test/mcp', name: 'New', type: 'sales', visibility: 'private' }); expect(created.status).toBe(201); expect(created.body.agent.url).toBe('https://new.example.test/mcp'); expect(created.body.agent.name).toBe('New'); const updated = await request(app) - .post('/api/me/agents') + .post('/api/me/agents').query({ org: orgId }) .send({ url: 'https://new.example.test/mcp', name: 'Renamed', type: 'sales', visibility: 'private' }); expect(updated.status).toBe(200); expect(updated.body.agent.name).toBe('Renamed'); @@ -311,12 +311,12 @@ describe('Per-agent REST API (/api/me/agents)', () => { // the URL validator and not the new type-required gate (covered // separately below). const noUrl = await request(app) - .post('/api/me/agents') + .post('/api/me/agents').query({ org: orgId }) .send({ name: 'No URL', type: 'sales' }); expect(noUrl.status).toBe(400); const badUrl = await request(app) - .post('/api/me/agents') + .post('/api/me/agents').query({ org: orgId }) .send({ url: 'not a url', type: 'sales' }); expect(badUrl.status).toBe(400); }); @@ -330,7 +330,7 @@ describe('Per-agent REST API (/api/me/agents)', () => { (app as any).setCurrentUser(userId); const res = await request(app) - .post('/api/me/agents') + .post('/api/me/agents').query({ org: orgId }) .send({ url: 'https://upgrade.example.test/mcp', type: 'sales', visibility: 'public' }); expect(res.status).toBe(201); expect(res.body.agent.visibility).toBe('members_only'); @@ -348,7 +348,7 @@ describe('Per-agent REST API (/api/me/agents)', () => { (app as any).setCurrentUser(userId); const target = encodeURIComponent('https://existing.example.test/mcp'); const res = await request(app) - .patch(`/api/me/agents/${target}`) + .patch(`/api/me/agents/${target}`).query({ org: orgId }) .send({ name: 'Renamed' }); expect(res.status).toBe(200); expect(res.body.agent.name).toBe('Renamed'); @@ -365,7 +365,7 @@ describe('Per-agent REST API (/api/me/agents)', () => { (app as any).setCurrentUser(userId); const target = encodeURIComponent('https://existing.example.test/mcp'); const res = await request(app) - .patch(`/api/me/agents/${target}`) + .patch(`/api/me/agents/${target}`).query({ org: orgId }) .send({ name: 'Renamed', url: 'https://attempt-rename.example.test/mcp' }); expect(res.status).toBe(400); expect(res.body.error).toBe('url_immutable'); @@ -380,7 +380,7 @@ describe('Per-agent REST API (/api/me/agents)', () => { (app as any).setCurrentUser(userId); const target = encodeURIComponent('https://missing.example.test/mcp'); - const res = await request(app).patch(`/api/me/agents/${target}`).send({ name: 'X' }); + const res = await request(app).patch(`/api/me/agents/${target}`).query({ org: orgId }).send({ name: 'X' }); expect(res.status).toBe(404); }); @@ -393,7 +393,7 @@ describe('Per-agent REST API (/api/me/agents)', () => { (app as any).setCurrentUser(userId); const target = encodeURIComponent('https://existing.example.test/mcp'); - const res = await request(app).delete(`/api/me/agents/${target}`); + const res = await request(app).delete(`/api/me/agents/${target}`).query({ org: orgId }); expect(res.status).toBe(204); const profile = await memberDb.getProfileByOrgId(orgId); @@ -409,7 +409,7 @@ describe('Per-agent REST API (/api/me/agents)', () => { (app as any).setCurrentUser(userId); const target = encodeURIComponent('https://missing.example.test/mcp'); - const res = await request(app).delete(`/api/me/agents/${target}`); + const res = await request(app).delete(`/api/me/agents/${target}`).query({ org: orgId }); expect(res.status).toBe(404); }); @@ -475,7 +475,7 @@ describe('Per-agent REST API (/api/me/agents)', () => { (app as any).setCurrentUser(userId); const res = await request(app) - .post('/api/me/agents') + .post('/api/me/agents').query({ org: orgId }) .send({ url: targetUrl, type: 'buying', visibility: 'private' }); expect(res.status).toBe(201); // The server-resolved type wins. The smuggle attempt was harmless. @@ -500,7 +500,7 @@ describe('Per-agent REST API (/api/me/agents)', () => { (app as any).setCurrentUser(userId); const res = await request(app) - .post('/api/me/agents') + .post('/api/me/agents').query({ org: orgId }) .send({ url: 'https://no-type.example.test/mcp', visibility: 'private' }); expect(res.status).toBe(400); expect(res.body.error).toBe('type is required'); @@ -515,7 +515,7 @@ describe('Per-agent REST API (/api/me/agents)', () => { (app as any).setCurrentUser(userId); const res = await request(app) - .post('/api/me/agents') + .post('/api/me/agents').query({ org: orgId }) .send({ url: 'https://unknown.example.test/mcp', type: 'unknown', visibility: 'private' }); expect(res.status).toBe(400); expect(res.body.error).toBe('type is required'); @@ -530,7 +530,7 @@ describe('Per-agent REST API (/api/me/agents)', () => { (app as any).setCurrentUser(userId); const res = await request(app) - .post('/api/me/agents') + .post('/api/me/agents').query({ org: orgId }) .send({ url: 'https://garbage.example.test/mcp', type: 'seller', visibility: 'private' }); expect(res.status).toBe(400); expect(res.body.error).toBe('type is required'); @@ -559,27 +559,27 @@ describe('Per-agent REST API (/api/me/agents)', () => { // Invalid type → 400 invalid_type (caller-supplied 'unknown' rejected, // out-of-enum strings rejected). const badEnum = await request(app) - .patch(`/api/me/agents/${target}`) + .patch(`/api/me/agents/${target}`).query({ org: orgId }) .send({ type: 'seller' }); expect(badEnum.status).toBe(400); expect(badEnum.body.error).toBe('invalid_type'); const unknown = await request(app) - .patch(`/api/me/agents/${target}`) + .patch(`/api/me/agents/${target}`).query({ org: orgId }) .send({ type: 'unknown' }); expect(unknown.status).toBe(400); expect(unknown.body.error).toBe('invalid_type'); // Omitting type → existing 'sales' preserved on the row. const renamed = await request(app) - .patch(`/api/me/agents/${target}`) + .patch(`/api/me/agents/${target}`).query({ org: orgId }) .send({ name: 'Renamed' }); expect(renamed.status).toBe(200); expect(renamed.body.agent.type).toBe('sales'); // Valid type → updated. const swapped = await request(app) - .patch(`/api/me/agents/${target}`) + .patch(`/api/me/agents/${target}`).query({ org: orgId }) .send({ type: 'buying' }); expect(swapped.status).toBe(200); expect(swapped.body.agent.type).toBe('buying'); @@ -609,7 +609,7 @@ describe('Per-agent REST API (/api/me/agents)', () => { (app as any).setCurrentUser(userId); const res = await request(app) - .post('/api/me/agents') + .post('/api/me/agents').query({ org: orgId }) .send({ url: targetUrl, type: 'sales', visibility: 'private' }); expect(res.status).toBe(201); @@ -670,6 +670,7 @@ describe('Per-agent REST API (/api/me/agents)', () => { await createProfile(orgId, 'metaexisting'); const targetUrl = 'https://meta-existing.example.test/mcp'; + await pool.query('DELETE FROM agent_registry_metadata WHERE agent_url = $1', [targetUrl]); // Seed metadata with non-default lifecycle and a custom interval — the // re-register MUST preserve these so an owner who tuned cadence / // lifecycle from the dashboard doesn't see it reset by the next save. @@ -681,7 +682,7 @@ describe('Per-agent REST API (/api/me/agents)', () => { (app as any).setCurrentUser(userId); const res = await request(app) - .post('/api/me/agents') + .post('/api/me/agents').query({ org: orgId }) .send({ url: targetUrl, type: 'sales', visibility: 'private' }); expect(res.status).toBe(201); @@ -711,7 +712,7 @@ describe('Per-agent REST API (/api/me/agents)', () => { (app as any).setCurrentUser(userId); const target = encodeURIComponent('https://pub.example.test/mcp'); - const res = await request(app).delete(`/api/me/agents/${target}`); + const res = await request(app).delete(`/api/me/agents/${target}`).query({ org: orgId }); expect(res.status).toBe(409); expect(res.body.error).toBe('unpublish_first'); @@ -738,7 +739,7 @@ describe('Per-agent REST API (/api/me/agents)', () => { (app as any).setCurrentUser(userId); const res = await request(app) - .post('/api/me/agents') + .post('/api/me/agents').query({ org: orgId }) .send({ url: 'HTTPS://Canon.Example.test/Agent/', name: 'C', type: 'sales', visibility: 'private' }); expect(res.status).toBe(201); expect(res.body.agent.url).toBe('https://canon.example.test/agent'); @@ -767,13 +768,13 @@ describe('Per-agent REST API (/api/me/agents)', () => { (app as any).setCurrentUser(userId); const first = await request(app) - .post('/api/me/agents') + .post('/api/me/agents').query({ org: orgId }) .send({ url: 'HTTPS://Idem.Example.test/MCP/', name: 'First', type: 'sales', visibility: 'private' }); expect(first.status).toBe(201); expect(first.body.agent.url).toBe('https://idem.example.test/mcp'); const second = await request(app) - .post('/api/me/agents') + .post('/api/me/agents').query({ org: orgId }) .send({ url: 'https://idem.example.test/mcp', name: 'Second', type: 'sales', visibility: 'private' }); expect(second.status).toBe(200); expect(second.body.agent.name).toBe('Second'); @@ -804,13 +805,13 @@ describe('Per-agent REST API (/api/me/agents)', () => { (app as any).setCurrentUser(userId); // Seed a canonical row first via POST. await request(app) - .post('/api/me/agents') + .post('/api/me/agents').query({ org: orgId }) .send({ url: 'https://patch.example.test/mcp', name: 'P', type: 'sales', visibility: 'private' }); // PATCH with a non-canonical url-encoded path — must collapse onto the canonical row. const noncanonical = encodeURIComponent('HTTPS://Patch.Example.test/MCP/'); const res = await request(app) - .patch(`/api/me/agents/${noncanonical}`) + .patch(`/api/me/agents/${noncanonical}`).query({ org: orgId }) .send({ name: 'Renamed' }); expect(res.status).toBe(200); expect(res.body.agent.name).toBe('Renamed'); @@ -830,12 +831,12 @@ describe('Per-agent REST API (/api/me/agents)', () => { (app as any).setCurrentUser(userId); await request(app) - .post('/api/me/agents') + .post('/api/me/agents').query({ org: orgId }) .send({ url: 'https://patchbody.example.test/mcp', name: 'P', type: 'sales', visibility: 'private' }); const path = encodeURIComponent('https://patchbody.example.test/mcp'); const res = await request(app) - .patch(`/api/me/agents/${path}`) + .patch(`/api/me/agents/${path}`).query({ org: orgId }) .send({ name: 'OK', url: 'HTTPS://PatchBody.Example.test/MCP/' }); expect(res.status).toBe(200); @@ -853,11 +854,11 @@ describe('Per-agent REST API (/api/me/agents)', () => { (app as any).setCurrentUser(userId); await request(app) - .post('/api/me/agents') + .post('/api/me/agents').query({ org: orgId }) .send({ url: 'https://del.example.test/mcp', name: 'D', type: 'sales', visibility: 'private' }); const noncanonical = encodeURIComponent('HTTPS://Del.Example.test/MCP/'); - const res = await request(app).delete(`/api/me/agents/${noncanonical}`); + const res = await request(app).delete(`/api/me/agents/${noncanonical}`).query({ org: orgId }); expect(res.status).toBe(204); const profile = await memberDb.getProfileByOrgId(orgId); @@ -877,12 +878,12 @@ describe('Per-agent REST API (/api/me/agents)', () => { (app as any).setCurrentUser(userId); const withQuery = await request(app) - .post('/api/me/agents') + .post('/api/me/agents').query({ org: orgId }) .send({ url: 'https://q.example.test/mcp?v=1', type: 'sales' }); expect(withQuery.status).toBe(400); const withFrag = await request(app) - .post('/api/me/agents') + .post('/api/me/agents').query({ org: orgId }) .send({ url: 'https://q.example.test/mcp#frag', type: 'sales' }); expect(withFrag.status).toBe(400); }); @@ -898,7 +899,7 @@ describe('Per-agent REST API (/api/me/agents)', () => { (app as any).setCurrentUser(userId); const res = await request(app) - .post('/api/me/agents') + .post('/api/me/agents').query({ org: orgId }) .send({ url, type: 'sales' }); expect(res.status).toBe(400); @@ -918,7 +919,7 @@ describe('Per-agent REST API (/api/me/agents)', () => { credentialedUrl.username = 'test-user'; credentialedUrl.password = 'test-password'; const res = await request(app) - .post('/api/me/agents') + .post('/api/me/agents').query({ org: orgId }) .send({ url: credentialedUrl.toString(), type: 'sales' }); expect(res.status).toBe(400); @@ -936,7 +937,7 @@ describe('Per-agent REST API (/api/me/agents)', () => { // `*` in the path parses cleanly via `new URL` but is rejected by // canonicalizeAgentUrl per migration 440's CHECK constraint. const res = await request(app) - .post('/api/me/agents') + .post('/api/me/agents').query({ org: orgId }) .send({ url: 'https://wild.example.test/*/mcp', type: 'sales' }); expect(res.status).toBe(400); }); @@ -961,7 +962,7 @@ describe('Per-agent REST API (/api/me/agents)', () => { // domain — should be rejected. (app as any).setCurrentUser(userId); const res = await request(app) - .post('/api/me/agents') + .post('/api/me/agents').query({ org: orgId }) .send({ url: 'https://adcp-mcp.celtra.com/mcp', type: 'sales', @@ -986,7 +987,7 @@ describe('Per-agent REST API (/api/me/agents)', () => { // matchhost.example is verified; api.matchhost.example is a subdomain // and should pass the gate. const res = await request(app) - .post('/api/me/agents') + .post('/api/me/agents').query({ org: orgId }) .send({ url: 'https://api.matchhost.example.test/mcp', type: 'sales', @@ -1024,7 +1025,7 @@ describe('Per-agent REST API (/api/me/agents)', () => { (app as any).setCurrentUser(userId); const res = await request(app) - .post('/api/me/agents') + .post('/api/me/agents').query({ org: orgId }) .send({ url: 'https://mcp.acme.example.test/agent', type: 'sales', diff --git a/server/tests/integration/member-agents-auto-bootstrap.test.ts b/server/tests/integration/member-agents-auto-bootstrap.test.ts index 92aedc8185e..73a43487e47 100644 --- a/server/tests/integration/member-agents-auto-bootstrap.test.ts +++ b/server/tests/integration/member-agents-auto-bootstrap.test.ts @@ -221,7 +221,7 @@ describe('POST /api/me/agents (auto-bootstrap)', () => { await seedOrgWithoutProfile(orgId, 'Acme First-Agent Co'); const res = await request(app) - .post('/api/me/agents') + .post('/api/me/agents').query({ org: orgId }) .send({ url: 'https://agent.example.com/mcp', type: 'sales', visibility: 'private' }); expect(res.status).toBe(201); @@ -245,13 +245,13 @@ describe('POST /api/me/agents (auto-bootstrap)', () => { await seedOrgWithoutProfile(orgId); const first = await request(app) - .post('/api/me/agents') + .post('/api/me/agents').query({ org: orgId }) .send({ url: 'https://agent-1.example.com/mcp', type: 'sales', visibility: 'private' }); expect(first.status).toBe(201); expect(first.body.profile_auto_created).toBe(true); const second = await request(app) - .post('/api/me/agents') + .post('/api/me/agents').query({ org: orgId }) .send({ url: 'https://agent-2.example.com/mcp', type: 'sales', visibility: 'private' }); expect(second.status).toBe(201); expect(second.body.profile_auto_created).toBeUndefined(); @@ -262,12 +262,12 @@ describe('POST /api/me/agents (auto-bootstrap)', () => { await seedOrgWithoutProfile(orgId); const first = await request(app) - .post('/api/me/agents') + .post('/api/me/agents').query({ org: orgId }) .send({ url: 'https://agent.example.com/mcp', type: 'sales', visibility: 'private', name: 'v1' }); expect(first.status).toBe(201); const second = await request(app) - .post('/api/me/agents') + .post('/api/me/agents').query({ org: orgId }) .send({ url: 'https://agent.example.com/mcp', type: 'sales', visibility: 'private', name: 'v2' }); expect(second.status).toBe(200); @@ -280,7 +280,7 @@ describe('POST /api/me/agents (auto-bootstrap)', () => { await seedOrgWithoutProfile(orgId); const res = await request(app) - .patch('/api/me/agents/' + encodeURIComponent('https://agent.example.com/mcp')) + .patch('/api/me/agents/' + encodeURIComponent('https://agent.example.com/mcp')).query({ org: orgId }) .send({ name: 'renamed' }); // PATCH should still 404 — auto-bootstrap is intentionally limited to @@ -289,140 +289,15 @@ describe('POST /api/me/agents (auto-bootstrap)', () => { expect(res.status).toBe(404); }); - describe('org auto-bootstrap (caller has zero memberships)', () => { - it('auto-creates a corporate org for a fresh user with a corporate email', async () => { - userOverride.email = `fresh@boot-corp.test`; - userOverride.firstName = 'Fresh'; - userOverride.lastName = 'User'; - - const res = await request(app) - .post('/api/me/agents') + describe('implicit org bootstrap containment', () => { + it.each(['fresh@boot-corp.test', 'solo@freemail.test'])('denies implicit creation from %s without local changes', async (email) => { + userOverride.email = email; + const before = (await pool.query('SELECT * FROM organization_memberships WHERE workos_user_id = $1', [USER_ID])).rows; + const res = await request(app).post('/api/me/agents') .send({ url: 'https://agent.boot-corp.test/mcp', type: 'sales', visibility: 'private' }); - - expect(res.status).toBe(201); - expect(res.body.org_auto_created).toBe(true); - expect(res.body.profile_auto_created).toBe(true); - expect(res.body.agent.url).toBe('https://agent.boot-corp.test/mcp'); - - // Org row should be corporate (is_personal = false), name derived from - // domain root with leading-cap. - const orgRow = await pool.query<{ - workos_organization_id: string; - name: string; - is_personal: boolean; - membership_tier: string | null; - }>( - `SELECT o.workos_organization_id, o.name, o.is_personal, o.membership_tier - FROM organizations o - JOIN organization_memberships om ON om.workos_organization_id = o.workos_organization_id - WHERE om.workos_user_id = $1`, - [USER_ID], - ); - expect(orgRow.rowCount).toBe(1); - expect(orgRow.rows[0].is_personal).toBe(false); - expect(orgRow.rows[0].name).toBe('Boot-corp'); - // Tier MUST be NULL — Stripe webhook is the only writer. - expect(orgRow.rows[0].membership_tier).toBeNull(); - - // Domain should be email-verified. - const domainRow = await pool.query<{ domain: string; verified: boolean }>( - `SELECT domain, verified FROM organization_domains WHERE workos_organization_id = $1`, - [orgRow.rows[0].workos_organization_id], - ); - expect(domainRow.rows.find((r) => r.domain === 'boot-corp.test')).toBeDefined(); - expect(domainRow.rows.find((r) => r.domain === 'boot-corp.test')!.verified).toBe(true); - }); - - it('auto-bootstraps a personal workspace for a fresh free-email user but rejects the agent registration (no hostname claim)', async () => { - // Pre-#4499-MVP this auto-bootstrap succeeded silently with an - // unverified agent registered on whatever hostname the caller - // supplied. With the hardened gate (security review on PR #4648), - // orgs with zero verified domains hard-reject — the org is - // still auto-bootstrapped (resolveOrAutoBootstrapOrg fires before - // the gate) but the agent registration returns 400 - // no_verified_domains. The user gets a personal workspace they - // can use for everything else; they just can't register agents - // until they verify a domain. - userOverride.email = `solo+${Date.now()}@gmail.com`; - userOverride.firstName = 'Solo'; - userOverride.lastName = 'Founder'; - - const res = await request(app) - .post('/api/me/agents') - .send({ url: 'https://agent.solo.test/mcp', type: 'sales', visibility: 'private' }); - - expect(res.status).toBe(400); - expect(res.body.error).toBe('unverified_hostname'); - expect(res.body.reason).toBe('no_verified_domains'); - - // The org bootstrap still fired — failure was on the agent - // registration step, not on org creation. - const orgRow = await pool.query<{ workos_organization_id: string; name: string; is_personal: boolean }>( - `SELECT o.workos_organization_id, o.name, o.is_personal - FROM organizations o - JOIN organization_memberships om ON om.workos_organization_id = o.workos_organization_id - WHERE om.workos_user_id = $1`, - [USER_ID], - ); - expect(orgRow.rowCount).toBe(1); - expect(orgRow.rows[0].is_personal).toBe(true); - expect(orgRow.rows[0].name).toBe("Solo Founder's Workspace"); - - // No member profile should exist either — the gate fires after - // profile auto-bootstrap, so a failed agent registration on a - // brand-new org should NOT leave a half-built profile. Pin this - // so a future regression doesn't silently strand orphan profiles. - const profile = await memberDb.getProfileByOrgId( - orgRow.rows[0].workos_organization_id, - ); - expect(profile).toBeNull(); - }); - - it('does NOT auto-bootstrap when caller already has a membership — registers against the derived primary org instead of forking', async () => { - // resolvePrimaryOrganization derives from organization_memberships when - // users.primary_organization_id is null, so a user with any membership - // already resolves to that org. Auto-bootstrap is gated on a truly - // empty membership set; a stale `users` row never causes a silent - // fork. - const existingOrgId = `${TEST_PREFIX}_existing`; - await pool.query( - `INSERT INTO organizations (workos_organization_id, name, is_personal, created_at, updated_at) - VALUES ($1, $2, false, NOW(), NOW()) - ON CONFLICT (workos_organization_id) DO NOTHING`, - [existingOrgId, 'Already Owned'], - ); - // Verified domain matching the agent URL — required by the - // hostname gate. email_domain is no longer trusted (see #4648). - await pool.query( - `INSERT INTO organization_domains - (workos_organization_id, domain, verified, source, created_at, updated_at) - VALUES ($1, 'no-fork.test', true, 'test', NOW(), NOW()) - ON CONFLICT (domain) DO NOTHING`, - [existingOrgId], - ); - await pool.query( - `INSERT INTO organization_memberships (workos_user_id, workos_organization_id, role, email, created_at, updated_at) - VALUES ($1, $2, 'owner', $3, NOW(), NOW()) - ON CONFLICT (workos_user_id, workos_organization_id) DO NOTHING`, - [USER_ID, existingOrgId, `${USER_ID}@example.com`], - ); - - const res = await request(app) - .post('/api/me/agents') - .send({ url: 'https://agent.no-fork.test/mcp', type: 'sales', visibility: 'private' }); - - expect(res.status).toBe(201); - // Profile auto-bootstrap fires (no profile yet on the existing org) - // but org auto-bootstrap MUST NOT fire — the agent must land on the - // already-owned org, not a fresh fork. - expect(res.body.org_auto_created).toBeUndefined(); - expect(res.body.profile_auto_created).toBe(true); - - const orgRow = await pool.query<{ workos_organization_id: string }>( - `SELECT workos_organization_id FROM member_profiles WHERE workos_organization_id = $1`, - [existingOrgId], - ); - expect(orgRow.rowCount).toBe(1); + expect(res.status).toBe(403); + expect(res.body.error).toBe('organization_onboarding_disabled'); + expect((await pool.query('SELECT * FROM organization_memberships WHERE workos_user_id = $1', [USER_ID])).rows).toEqual(before); }); }); }); diff --git a/server/tests/integration/member-by-email-policy.test.ts b/server/tests/integration/member-by-email-policy.test.ts index f035ef4b563..cca0102962e 100644 --- a/server/tests/integration/member-by-email-policy.test.ts +++ b/server/tests/integration/member-by-email-policy.test.ts @@ -42,6 +42,7 @@ const { TARGET_OWNER_MEMBERSHIP_ID: 'om_target_owner', mockState: { callerRole: 'admin' as 'owner' | 'admin' | 'member', + targetOwnerCurrentRole: 'owner' as 'owner' | 'admin' | 'member', targetMemberCurrentRole: 'member' as 'owner' | 'admin' | 'member', isCallerAAOAdmin: false, isStaticAdminApiKey: false, @@ -50,6 +51,7 @@ const { // and tests can inspect call args. sendInvitationMock: vi.fn().mockResolvedValue({ id: 'inv_test', + organizationId: 'org_role_policy_test', email: 'new-invitee@example.com', state: 'pending', expiresAt: new Date(Date.now() + 7 * 24 * 3600 * 1000).toISOString(), @@ -81,7 +83,12 @@ vi.mock('@workos-inc/node', () => { }], }); } - return Promise.resolve({ data: [] }); + const targets = [ + {id: TARGET_MEMBERSHIP_ID, userId: TARGET_MEMBER_USER_ID, organizationId: TEST_ORG_ID, status: 'active', role: {slug: mockState.targetMemberCurrentRole}}, + {id: TARGET_OWNER_MEMBERSHIP_ID, userId: TARGET_OWNER_USER_ID, organizationId: TEST_ORG_ID, status: 'active', role: {slug: mockState.targetOwnerCurrentRole}}, + {id: 'om_caller', userId: CALLER_USER_ID, organizationId: TEST_ORG_ID, status: 'active', role: {slug: mockState.callerRole}}, + ]; + return Promise.resolve({data: targets.filter(row => !userId || row.userId === userId)}); }), listUsers: vi.fn().mockImplementation(({ email }) => { const e = String(email).toLowerCase(); @@ -117,17 +124,21 @@ vi.mock('@workos-inc/node', () => { id: TARGET_OWNER_MEMBERSHIP_ID, userId: TARGET_OWNER_USER_ID, organizationId: TEST_ORG_ID, - role: { slug: 'owner' }, + role: { slug: mockState.targetOwnerCurrentRole }, status: 'active', }); } + if (membershipId === 'om_caller') return Promise.resolve({id: 'om_caller', userId: CALLER_USER_ID, organizationId: TEST_ORG_ID, status: 'active', role: {slug: mockState.callerRole}}); return Promise.reject(new Error('Membership not found')); }), - updateOrganizationMembership: vi.fn().mockImplementation((id, opts) => - Promise.resolve({ id, role: { slug: opts.roleSlug } }), - ), + updateOrganizationMembership: vi.fn().mockImplementation((id, opts) => { + if (id === TARGET_OWNER_MEMBERSHIP_ID) mockState.targetOwnerCurrentRole = opts.roleSlug; + else mockState.targetMemberCurrentRole = opts.roleSlug; + return Promise.resolve({id, userId: id === TARGET_OWNER_MEMBERSHIP_ID ? TARGET_OWNER_USER_ID : TARGET_MEMBER_USER_ID, organizationId: TEST_ORG_ID, status: 'active', role: {slug: opts.roleSlug}}); + }), createOrganizationMembership: vi.fn().mockResolvedValue({ id: 'om_new_test' }), sendInvitation: sendInvitationMock, + getInvitation: vi.fn().mockImplementation(async () => sendInvitationMock.getMockImplementation()!()), getUser: vi.fn().mockResolvedValue({ id: 'user_x', email: 'x@example.com' }), authenticateWithSessionCookie: vi.fn().mockResolvedValue({ authenticated: false }), }; @@ -154,6 +165,7 @@ vi.mock('../../src/auth/workos-client.js', async () => { return { workos: instance, getWorkos: () => instance, + getAuthorizationEnforcementWorkos: () => instance, }; }); @@ -161,7 +173,7 @@ vi.mock('../../src/middleware/auth.js', async (importOriginal) => { const actual = await importOriginal(); return { ...actual, - requireAuth: (req: any, _res: any, next: any) => { + requireAuth: async (req: any, _res: any, next: any) => { if (mockState.isStaticAdminApiKey) { req.user = { id: 'admin_api_key', @@ -180,6 +192,18 @@ vi.mock('../../src/middleware/auth.js', async (importOriginal) => { is_admin: false, }; } + if (!mockState.isStaticAdminApiKey) { + await getPool().query('INSERT INTO users (workos_user_id,email) VALUES ($1,$2) ON CONFLICT DO NOTHING', [CALLER_USER_ID,'caller@example.com']); + await getPool().query(`INSERT INTO organization_memberships (workos_user_id,workos_organization_id,workos_membership_id,email,role) + VALUES ($1,$2,'om_caller','caller@example.com',$3) ON CONFLICT (workos_user_id,workos_organization_id) DO UPDATE SET role=$3`, [CALLER_USER_ID,TEST_ORG_ID,mockState.callerRole]); + await getPool().query('UPDATE organization_memberships SET role=$1 WHERE workos_user_id=$2 AND workos_organization_id=$3', [mockState.targetMemberCurrentRole,TARGET_MEMBER_USER_ID,TEST_ORG_ID]); + if (mockState.isCallerAAOAdmin) { + const group = await getPool().query("SELECT id FROM working_groups WHERE slug='aao-admin'"); + await getPool().query("INSERT INTO working_group_memberships (working_group_id,workos_user_id,status) VALUES ($1,$2,'active') ON CONFLICT (working_group_id,workos_user_id) DO UPDATE SET status='active'",[group.rows[0].id,CALLER_USER_ID]); + } + req.accessToken = CALLER_USER_ID; + await stampOrganizationTestUser(req.user, TEST_ORG_ID); + } next(); }, requireAdmin: (_req: any, res: any) => res.status(403).json({ error: 'Admin required' }), @@ -226,7 +250,8 @@ vi.mock('../../src/addie/admin-status-lookup.js', async (importOriginal) => { import { HTTPServer } from '../../src/http.js'; import request from 'supertest'; -import { initializeDatabase, closeDatabase } from '../../src/db/client.js'; +import { initializeDatabase, closeDatabase, getPool } from '../../src/db/client.js'; +import { stampOrganizationTestUser } from '../helpers/organization-auth-fixture.js'; import { runMigrations } from '../../src/db/migrate.js'; import type { Pool } from 'pg'; @@ -257,6 +282,8 @@ describe('Member role-cap policy (POST /members/by-email + PATCH /members/:membe beforeEach(async () => { mockState.callerRole = 'admin'; mockState.targetMemberCurrentRole = 'member'; + mockState.targetOwnerCurrentRole = 'owner'; + await pool.query('DELETE FROM working_group_memberships WHERE workos_user_id=$1',[CALLER_USER_ID]); mockState.isCallerAAOAdmin = false; mockState.isStaticAdminApiKey = false; sendInvitationMock.mockClear(); @@ -303,8 +330,7 @@ describe('Member role-cap policy (POST /members/by-email + PATCH /members/:membe .send({ email: 'target-member@example.com', role: 'owner' }) .expect(403); - expect(response.body.error).toBe('Insufficient permissions'); - expect(response.body.message).toMatch(/owner/i); + expect(response.body.error).toBe('access_denied'); }); it("admin cannot change an owner's role", async () => { @@ -315,8 +341,7 @@ describe('Member role-cap policy (POST /members/by-email + PATCH /members/:membe .send({ email: 'target-owner@example.com', role: 'admin' }) .expect(403); - expect(response.body.error).toBe('Insufficient permissions'); - expect(response.body.message).toMatch(/owner/i); + expect(response.body.error).toBe('access_denied'); }); it('owner can promote a member to admin', async () => { @@ -371,7 +396,7 @@ describe('Member role-cap policy (POST /members/by-email + PATCH /members/:membe .send({ email: 'new-invitee@example.com', role: 'member', seat_type: 'gold_tier' }) .expect(400); - expect(response.body.error).toBe('Invalid seat type'); + expect(response.body.error).toBe('invalid_request'); }); }); @@ -395,7 +420,7 @@ describe('Member role-cap policy (POST /members/by-email + PATCH /members/:membe .send({ role: 'owner' }) .expect(403); - expect(response.body.message).toMatch(/owner/i); + expect(response.body.error).toBe('access_denied'); }); it("admin cannot change an owner's role via PATCH", async () => { @@ -406,7 +431,7 @@ describe('Member role-cap policy (POST /members/by-email + PATCH /members/:membe .send({ role: 'member' }) .expect(403); - expect(response.body.message).toMatch(/owner/i); + expect(response.body.error).toBe('access_denied'); }); it('owner can change owner\'s role via PATCH', async () => { @@ -428,10 +453,7 @@ describe('Member role-cap policy (POST /members/by-email + PATCH /members/:membe .send({ role: 'admin' }) .expect(403); - // Specific message confirms we hit the role-cap branch rather than an - // earlier short-circuit; if the route ever drops the early "Only owners - // and admins" check, this assertion still fails the test. - expect(response.body.message).toBe('Only owners and admins can change member roles'); + expect(response.body.error).toBe('access_denied'); }); it('admin can demote another admin to member', async () => { @@ -464,63 +486,22 @@ describe('Member role-cap policy (POST /members/by-email + PATCH /members/:membe expect(args.roleSlug).toBe('member'); }); - it('omits inviterUserId when the caller is the static ADMIN_API_KEY (synthetic id)', async () => { - // 'admin_api_key' is not a real WorkOS user; passing it as inviterUserId - // makes WorkOS reject the call with "User not found: 'admin_api_key'". + it('denies static ADMIN_API_KEY without sending an invitation', async () => { mockState.isStaticAdminApiKey = true; - - await request(app) - .post(`/api/organizations/${TEST_ORG_ID}/members/by-email`) - .send({ email: 'new-invitee@example.com', role: 'member', seat_type: 'community_only' }) - .expect(201); - - expect(sendInvitationMock).toHaveBeenCalledTimes(1); - const args = sendInvitationMock.mock.calls[0][0]; - // The fix uses a conditional spread to omit the key entirely; assert the - // key is absent rather than `=== undefined` (which would also pass if a - // regression reintroduced an explicit `inviterUserId: undefined`). - expect('inviterUserId' in args).toBe(false); - expect(args.email).toBe('new-invitee@example.com'); - expect(args.organizationId).toBe(TEST_ORG_ID); - expect(args.roleSlug).toBe('member'); + await request(app).post(`/api/organizations/${TEST_ORG_ID}/members/by-email`) + .send({ email: 'new-invitee@example.com', role: 'member' }).expect(403); + expect(sendInvitationMock).not.toHaveBeenCalled(); }); }); - describe('AAO super-admin override (covers static admin API key path)', () => { - it('non-member super-admin can promote a member to admin', async () => { - // Caller has no org membership at all — would 403 without the override. - mockState.callerRole = 'member' as 'owner' | 'admin' | 'member'; - mockState.isCallerAAOAdmin = true; - - // Force listOrganizationMemberships to return empty for this caller so - // the AAO override is actually exercised (not the org-membership path). - const originalCallerRole = mockState.callerRole; + describe('Platform admin does not elevate organization authority', () => { + for (const role of ['admin', 'owner']) it(`direct member platform admin cannot assign ${role}`, async () => { mockState.callerRole = 'member'; - // Setting role to a value the caller-membership lookup ignores: - // we override the listOrganizationMemberships mock for this test only. - - const response = await request(app) - .post(`/api/organizations/${TEST_ORG_ID}/members/by-email`) - .send({ email: 'target-member@example.com', role: 'admin' }) - .expect(200); - - expect(response.body.action).toBe('role_updated'); - expect(response.body.role).toBe('admin'); - - mockState.callerRole = originalCallerRole; - }); - - it('non-member super-admin can assign owner', async () => { - mockState.callerRole = 'member' as 'owner' | 'admin' | 'member'; mockState.isCallerAAOAdmin = true; - - const response = await request(app) - .post(`/api/organizations/${TEST_ORG_ID}/members/by-email`) - .send({ email: 'target-member@example.com', role: 'owner' }) - .expect(200); - - expect(response.body.action).toBe('role_updated'); - expect(response.body.role).toBe('owner'); + await request(app).post(`/api/organizations/${TEST_ORG_ID}/members/by-email`) + .send({ email: 'target-member@example.com', role }).expect(403); + expect(mockState.targetMemberCurrentRole).toBe('member'); + expect(sendInvitationMock).not.toHaveBeenCalled(); }); }); @@ -533,7 +514,7 @@ describe('Member role-cap policy (POST /members/by-email + PATCH /members/:membe await pool.query( `INSERT INTO organization_memberships (workos_user_id, workos_organization_id, workos_membership_id, email, role, seat_type, created_at, updated_at, synced_at) - VALUES ($1, $2, 'om_caller_seed', 'caller@example.com', 'owner', 'contributor', NOW(), NOW(), NOW()) + VALUES ($1, $2, 'om_caller', 'caller@example.com', 'owner', 'contributor', NOW(), NOW(), NOW()) ON CONFLICT (workos_user_id, workos_organization_id) DO UPDATE SET role = 'owner'`, [CALLER_USER_ID, TEST_ORG_ID], ); @@ -543,7 +524,7 @@ describe('Member role-cap policy (POST /members/by-email + PATCH /members/:membe .send({ email: 'caller@example.com', role: 'member' }) .expect(400); - expect(response.body.error).toBe('Cannot change own role'); + expect(response.body.error).toBe('invalid_request'); }); }); @@ -567,7 +548,13 @@ describe('Member role-cap policy (POST /members/by-email + PATCH /members/:membe .send({ auto_provision_verified_domain: false }) .expect(403); - expect(response.body.message).toMatch(/owner/i); + expect(response.body.error).toBe('Insufficient permissions'); }); }); }); + +vi.mock('../../src/auth/workos-jwt.js', async (importOriginal) => ({ + ...(await importOriginal()), + verifyWorkOSJWT: async (value: string) => ({ sub: value, isM2M: false }), +})); +vi.mock('../../src/services/organization-membership-notifications.js', () => ({ notifyMembershipSeats: vi.fn(), notifyMembershipSeatRequest: vi.fn() })); diff --git a/server/tests/integration/member-profile-bootstrap.test.ts b/server/tests/integration/member-profile-bootstrap.test.ts index 8a475ab4b5f..e0f25f47aa0 100644 --- a/server/tests/integration/member-profile-bootstrap.test.ts +++ b/server/tests/integration/member-profile-bootstrap.test.ts @@ -179,394 +179,18 @@ describe('POST /api/me/member-profile (REST bootstrap)', () => { ]); }); - it('creates a profile and persists org metadata + verified domain on first call (201)', async () => { - const orgId = `${TEST_PREFIX}_create`; + it.each(['owner', 'member'])('denies bootstrap for existing %s without writing domain proof', async (role) => { + const orgId = `${TEST_PREFIX}_contained`; await seedOrg(orgId); - - const res = await request(app) - .post('/api/me/member-profile') - .send({ - organization_name: 'Acme Media', - company_type: 'publisher', - revenue_tier: '5m_50m', - corporate_domain: 'acme.example', - marketing_opt_in: true, - }); - - expect(res.status).toBe(201); - // primary_brand_domain on the response is derived from - // organization_domains.is_primary, which the bootstrap auto-promotes - // for the corporate_domain. - expect(res.body.profile).toMatchObject({ - organization_id: orgId, - organization_name: 'Acme Media', - company_type: 'publisher', - revenue_tier: '5m_50m', - corporate_domain: 'acme.example', - primary_brand_domain: 'acme.example', - agents: [], - }); - expect(typeof res.body.profile.created_at).toBe('string'); - - const orgRow = await pool.query<{ name: string; company_type: string; revenue_tier: string }>( - `SELECT name, company_type, revenue_tier FROM organizations WHERE workos_organization_id = $1`, - [orgId], - ); - expect(orgRow.rows[0]).toMatchObject({ - name: 'Acme Media', - company_type: 'publisher', - revenue_tier: '5m_50m', + await pool.query('UPDATE organization_memberships SET role = $2 WHERE workos_organization_id = $1', [orgId, role]); + const before = (await pool.query('SELECT * FROM organization_domains WHERE workos_organization_id = $1', [orgId])).rows; + const res = await request(app).post('/api/me/member-profile').send({ + organization_name: 'Acme', company_type: 'adtech', corporate_domain: 'acme.example', }); - - const domainRow = await pool.query<{ verified: boolean; source: string }>( - `SELECT verified, source FROM organization_domains WHERE workos_organization_id = $1 AND domain = $2`, - [orgId, 'acme.example'], - ); - expect(domainRow.rows[0]).toMatchObject({ verified: true, source: 'email_verification' }); - }); - - it('is idempotent — second call returns 200 with profile_already_exists warning', async () => { - const orgId = `${TEST_PREFIX}_idempotent`; - await seedOrg(orgId); - - const first = await request(app) - .post('/api/me/member-profile') - .send({ - organization_name: 'Acme Idempotent', - company_type: 'publisher', - corporate_domain: 'acme.example', - }); - expect(first.status).toBe(201); - - const second = await request(app) - .post('/api/me/member-profile') - .send({ - organization_name: 'Acme Idempotent', - company_type: 'publisher', - corporate_domain: 'acme.example', - }); - expect(second.status).toBe(200); - expect(second.body.profile.organization_id).toBe(orgId); - expect(second.body.warnings).toEqual([ - expect.objectContaining({ code: 'profile_already_exists' }), - ]); - }); - - it('rejects personal email domains with 403', async () => { - currentUserEmail = 'user@gmail.com'; - currentUserId = 'user_boot_personal'; - const orgId = `${TEST_PREFIX}_personal`; - await seedOrg(orgId); - - const res = await request(app) - .post('/api/me/member-profile') - .send({ - organization_name: 'Acme', - company_type: 'publisher', - corporate_domain: 'acme.example', - }); - - expect(res.status).toBe(403); - expect(res.body.error).toBe('Personal email domain'); - }); - - it('rejects domain mismatch with 403', async () => { - currentUserEmail = 'owner@acme.example'; - const orgId = `${TEST_PREFIX}_mismatch`; - await seedOrg(orgId); - - const res = await request(app) - .post('/api/me/member-profile') - .send({ - organization_name: 'Other Co', - company_type: 'publisher', - corporate_domain: 'other.example', - }); - expect(res.status).toBe(403); - expect(res.body.error).toBe('Domain mismatch'); - }); - - it('rejects unknown company_type with 400', async () => { - const orgId = `${TEST_PREFIX}_badtype`; - await seedOrg(orgId); - - const res = await request(app) - .post('/api/me/member-profile') - .send({ - organization_name: 'Acme', - company_type: 'not_a_real_type', - corporate_domain: 'acme.example', - }); - - expect(res.status).toBe(400); - expect(res.body.error).toBe('Invalid company_type'); - }); - - it('returns 404 when caller has no organization', async () => { - currentUserId = 'user_boot_orphan'; - currentUserEmail = 'orphan@acme.example'; - - const res = await request(app) - .post('/api/me/member-profile') - .send({ - organization_name: 'Acme', - company_type: 'publisher', - corporate_domain: 'acme.example', - }); - - expect(res.status).toBe(404); - expect(res.body.error).toBe('No organization'); - }); - - it('rejects paid membership_tier values with 400', async () => { - const orgId = `${TEST_PREFIX}_paid_tier`; - await seedOrg(orgId); - - const res = await request(app) - .post('/api/me/member-profile') - .send({ - organization_name: 'Acme', - company_type: 'publisher', - corporate_domain: 'acme.example', - membership_tier: 'company_leader', - }); - - expect(res.status).toBe(400); - expect(res.body.error).toBe('Paid tier requires checkout'); - - const orgRow = await pool.query<{ membership_tier: string | null }>( - `SELECT membership_tier FROM organizations WHERE workos_organization_id = $1`, - [orgId], - ); - expect(orgRow.rows[0].membership_tier).toBeNull(); - }); - - it('accepts the free Explorer tier (individual_academic)', async () => { - const orgId = `${TEST_PREFIX}_free_tier`; - await seedOrg(orgId); - - const res = await request(app) - .post('/api/me/member-profile') - .send({ - organization_name: 'Acme', - company_type: 'publisher', - corporate_domain: 'acme.example', - membership_tier: 'individual_academic', - }); - - expect(res.status).toBe(201); - - const orgRow = await pool.query<{ membership_tier: string | null }>( - `SELECT membership_tier FROM organizations WHERE workos_organization_id = $1`, - [orgId], - ); - expect(orgRow.rows[0].membership_tier).toBe('individual_academic'); - }); - - it('does not overwrite pre-existing org metadata; surfaces metadata_unchanged warning', async () => { - const orgId = `${TEST_PREFIX}_no_overwrite`; - await seedOrg(orgId, { - name: 'Pre-Curated Co', - company_type: 'agency', - revenue_tier: '50m_250m', - }); - - const res = await request(app) - .post('/api/me/member-profile') - .send({ - organization_name: 'Programmatic Override', - company_type: 'publisher', - revenue_tier: '5m_50m', - corporate_domain: 'acme.example', - }); - - expect(res.status).toBe(201); - expect(res.body.warnings).toEqual( - expect.arrayContaining([ - expect.objectContaining({ - code: 'metadata_unchanged', - // Field names are translated from DB columns to public API field - // names — `organizations.name` surfaces as `organization_name`, - // matching the CreateMemberProfileInput shape. - fields: expect.arrayContaining([ - 'organization_name', - 'company_type', - 'revenue_tier', - ]), - }), - ]), - ); - - const orgRow = await pool.query<{ name: string; company_type: string; revenue_tier: string }>( - `SELECT name, company_type, revenue_tier FROM organizations WHERE workos_organization_id = $1`, - [orgId], - ); - expect(orgRow.rows[0]).toMatchObject({ - name: 'Pre-Curated Co', - company_type: 'agency', - revenue_tier: '50m_250m', - }); - - // The response profile reflects the persisted org row, not the body. - expect(res.body.profile.organization_name).toBe('Pre-Curated Co'); - expect(res.body.profile.company_type).toBe('agency'); - }); - - it('writes a member_profile_bootstrapped audit log entry on success', async () => { - const orgId = `${TEST_PREFIX}_audit`; - await seedOrg(orgId); - - const res = await request(app) - .post('/api/me/member-profile') - .send({ - organization_name: 'Acme Audit', - company_type: 'publisher', - corporate_domain: 'acme.example', - }); - expect(res.status).toBe(201); - - const auditRows = await pool.query<{ action: string; workos_user_id: string; resource_type: string; details: any }>( - `SELECT action, workos_user_id, resource_type, details FROM registry_audit_log WHERE workos_organization_id = $1 AND action = 'member_profile_bootstrapped'`, - [orgId], - ); - expect(auditRows.rows).toHaveLength(1); - expect(auditRows.rows[0]).toMatchObject({ - action: 'member_profile_bootstrapped', - workos_user_id: currentUserId, - resource_type: 'member_profile', - }); - const details = typeof auditRows.rows[0].details === 'string' - ? JSON.parse(auditRows.rows[0].details) - : auditRows.rows[0].details; - expect(details).toMatchObject({ - corporate_domain: 'acme.example', - company_type: 'publisher', - }); - expect(typeof details.slug).toBe('string'); - }); - - it('surfaces domain_already_claimed warning when corporate_domain belongs to a different org', async () => { - const orgId = `${TEST_PREFIX}_dom_conflict`; - const otherOrgId = `${TEST_PREFIX}_dom_owner`; - await seedOrg(orgId); - // Seed the other org first and bind the domain to it. - await pool.query( - `INSERT INTO organizations (workos_organization_id, name, is_personal, created_at, updated_at) - VALUES ($1, $2, false, NOW(), NOW()) - ON CONFLICT (workos_organization_id) DO UPDATE SET name = EXCLUDED.name`, - [otherOrgId, 'Domain Owner Co'], - ); - await pool.query( - `INSERT INTO organization_domains (workos_organization_id, domain, is_primary, verified, source) - VALUES ($1, 'acme.example', true, true, 'email_verification') - ON CONFLICT (domain) DO UPDATE SET workos_organization_id = EXCLUDED.workos_organization_id`, - [otherOrgId], - ); - - const res = await request(app) - .post('/api/me/member-profile') - .send({ - organization_name: 'Acme Conflict', - company_type: 'publisher', - corporate_domain: 'acme.example', - }); - - // Profile is created so the caller isn't blocked by an admin-resolvable - // issue, but the domain is NOT relinked and the conflict is surfaced. - expect(res.status).toBe(201); - expect(res.body.warnings).toEqual( - expect.arrayContaining([ - expect.objectContaining({ - code: 'domain_already_claimed', - domain: 'acme.example', - }), - ]), - ); - - // Verify the existing domain row was not reassigned. - const domainRow = await pool.query<{ workos_organization_id: string }>( - `SELECT workos_organization_id FROM organization_domains WHERE domain = 'acme.example'`, - ); - expect(domainRow.rows[0].workos_organization_id).toBe(otherOrgId); - - // Cleanup - await pool.query(`DELETE FROM organization_domains WHERE workos_organization_id = $1`, [otherOrgId]); - await pool.query(`DELETE FROM organizations WHERE workos_organization_id = $1`, [otherOrgId]); - }); - - it('records ToS and Privacy-Policy acceptance against the bootstrapping user + org', async () => { - const orgId = `${TEST_PREFIX}_tos`; - await seedOrg(orgId); - // Clear any prior acceptance rows for this user — the - // user_agreement_acceptances ON CONFLICT (user, type, version) DO NOTHING - // would otherwise silently skip the test write if a previous run wrote - // the same tuple. - await pool.query(`DELETE FROM user_agreement_acceptances WHERE workos_user_id = $1`, [currentUserId]); - - // Ensure the agreements table has a row for each type so the bootstrap - // path has a version to attach. ON CONFLICT noop keeps the test - // hermetic — CI environments may already have rows for these types. - // - // Versions MUST be dot-separated numerics: getCurrentAgreementByType - // sorts via `string_to_array(version, '.')::int[]`, which throws on - // any non-numeric segment. Use a 9999.x version so this test row wins - // the "current" lookup against any production seeds without depending - // on insertion order. - await pool.query( - `INSERT INTO agreements (agreement_type, version, text, effective_date) - VALUES ('terms_of_service', '9999.1', 'tos test body', NOW()), - ('privacy_policy', '9999.2', 'pp test body', NOW()) - ON CONFLICT (agreement_type, version) DO NOTHING`, - ); - - const res = await request(app) - .post('/api/me/member-profile') - .set('User-Agent', 'BootstrapTest/1.0') - .set('X-Forwarded-For', '203.0.113.42') - .send({ - organization_name: 'Acme ToS', - company_type: 'publisher', - corporate_domain: 'acme.example', - }); - expect(res.status).toBe(201); - - const acceptanceRows = await pool.query<{ agreement_type: string; user_agent: string }>( - `SELECT agreement_type, user_agent FROM user_agreement_acceptances - WHERE workos_user_id = $1 AND workos_organization_id = $2`, - [currentUserId, orgId], - ); - const types = acceptanceRows.rows.map((r) => r.agreement_type).sort(); - expect(types).toContain('terms_of_service'); - expect(types).toContain('privacy_policy'); - expect(acceptanceRows.rows.every((r) => r.user_agent === 'BootstrapTest/1.0')).toBe(true); - - // Cleanup - await pool.query(`DELETE FROM user_agreement_acceptances WHERE workos_user_id = $1`, [currentUserId]); - }); - - it('allows member-role users to bootstrap the org profile (#4839)', async () => { - currentUserEmail = 'member@acme.example'; - currentUserId = 'user_boot_member_role'; - const orgId = `${TEST_PREFIX}_member_role`; - await seedOrg(orgId, { role: 'member' }); - - const res = await request(app) - .post('/api/me/member-profile') - .send({ - organization_name: 'Acme Media', - company_type: 'publisher', - corporate_domain: 'acme.example', - }); - - expect(res.status).toBe(201); - expect(res.body.profile.organization_id).toBe(orgId); - - const profileRow = await pool.query<{ is_public: boolean }>( - `SELECT is_public FROM member_profiles WHERE workos_organization_id = $1`, - [orgId], - ); - expect(profileRow.rows[0]?.is_public).toBe(false); + expect(res.body.error).toBe('organization_onboarding_disabled'); + expect((await pool.query('SELECT * FROM organization_domains WHERE workos_organization_id = $1', [orgId])).rows).toEqual(before); + expect(await memberDb.getProfileByOrgId(orgId)).toBeNull(); }); it('still routes legacy display_name + slug bodies to the original handler', async () => { diff --git a/server/tests/integration/organization-membership-dev-policy.test.ts b/server/tests/integration/organization-membership-dev-policy.test.ts new file mode 100644 index 00000000000..ddef46b19d7 --- /dev/null +++ b/server/tests/integration/organization-membership-dev-policy.test.ts @@ -0,0 +1,128 @@ +import { beforeAll, afterAll, describe, expect, it, vi } from 'vitest'; +import request from 'supertest'; +import type { Pool } from 'pg'; + +const provider = vi.hoisted(() => { + process.env.DEV_USER_EMAIL = 'admin@test.local'; + process.env.DEV_USER_ID = 'user_dev_admin_001'; + process.env.FLY_APP_NAME = 'membership-policy-test'; + process.env.ALLOW_DEV_MODE_IN_PROD = 'true'; + return { calls: vi.fn() }; +}); +vi.mock('@workos-inc/node', () => ({ WorkOS: class { + userManagement = new Proxy({}, { get: () => provider.calls }); +} })); +vi.mock('../../src/addie/mcp/admin-tools.js', () => ({ isWebUserAAOAdmin: vi.fn().mockResolvedValue(false) })); +vi.mock('../../src/middleware/rate-limit.js', async (importOriginal) => ({ + ...(await importOriginal()), + invitationRateLimiter: (_req: unknown, _res: unknown, next: () => void) => next(), + orgCreationRateLimiter: (_req: unknown, _res: unknown, next: () => void) => next(), +})); + +// HTTPServer supplies the production cookie/CSRF/organization route ordering. Keep unrelated +// route graphs inert so this focused harness does not initialize Addie indexes or agent tenants. +vi.mock('../../src/routes/addie-admin.js', async () => { + const express = (await import('express')).default; + return { createAddieAdminRouter: () => ({ pageRouter: express.Router(), apiRouter: express.Router() }) }; +}); +vi.mock('../../src/routes/addie-chat.js', async () => { + const express = (await import('express')).default; + return { createAddieChatRouter: () => ({ pageRouter: express.Router(), apiRouter: express.Router() }), isWebChatReady: () => false }; +}); +vi.mock('../../src/routes/slack.js', async () => { + const express = (await import('express')).default; + return { createSlackRouter: () => ({ aaobotRouter: express.Router(), addieRouter: express.Router() }) }; +}); +vi.mock('../../src/routes/registry-api.js', async () => { + const express = (await import('express')).default; + return { createRegistryApiRouters: () => ({ router: express.Router(), v1AgentsRouter: express.Router(), complianceRefreshQueue: null }) }; +}); +vi.mock('../../src/training-agent/index.js', async () => { + const express = (await import('express')).default; + return { createTrainingAgentRouter: () => express.Router() }; +}); +vi.mock('../../src/creative-agent/index.js', async () => { + const express = (await import('express')).default; + return { createCreativeAgentRouter: () => express.Router() }; +}); +vi.mock('../../src/addie/index.js', () => ({ + sendAccountLinkedMessage: vi.fn(), + invalidateMemberContextCache: vi.fn(), + isAddieBoltReady: () => false, +})); +vi.mock('../../src/addie/jobs/scheduler.js', () => ({ + jobScheduler: { startAll: vi.fn(), stop: vi.fn(), stopAll: vi.fn() }, +})); +vi.mock('../../src/addie/jobs/job-definitions.js', () => ({ + registerAllJobs: vi.fn(), + JOB_NAMES: { GEO_MONITOR: 'geo-monitor', GEO_SNAPSHOT: 'geo-snapshot', GEO_CONTENT_PLANNER: 'geo-content-planner' }, +})); +vi.mock('../../src/services/organization-membership-notifications.js', () => ({ notifyMembershipSeats: vi.fn(), notifyMembershipSeatRequest: vi.fn() })); +vi.mock('../../src/slack/org-group-dm.js', () => ({ notifyMemberSeatChanged: vi.fn() })); + +import { initializeDatabase, closeDatabase } from '../../src/db/client.js'; +import { runMigrations } from '../../src/db/migrate.js'; +import { encodeDevSessionCookie, stopAuthTimers } from '../../src/middleware/auth.js'; + +const org = 'org_membership_dev_policy'; +const actor = 'user_dev_admin_001'; +const csrf = 'd'.repeat(64); +let pool: Pool; +let joinId: string; +let app: Parameters[0]; +beforeAll(async () => { + pool = initializeDatabase({ connectionString: process.env.DATABASE_URL }); + await runMigrations(); + await pool.query('DELETE FROM organization_memberships WHERE workos_organization_id=$1', [org]); + await pool.query('DELETE FROM organization_join_requests WHERE workos_organization_id=$1', [org]); + await pool.query('DELETE FROM organizations WHERE workos_organization_id=$1', [org]); + await pool.query("INSERT INTO organizations (workos_organization_id,name,is_personal) VALUES ($1,'Pinnacle Agency',false)", [org]); + await pool.query("INSERT INTO users (workos_user_id,email) VALUES ($1,'admin@test.local') ON CONFLICT DO NOTHING", [actor]); + await pool.query("INSERT INTO organization_memberships (workos_user_id,workos_organization_id,workos_membership_id,email,role) VALUES ($1,$2,'om_dev_policy','admin@test.local','owner')", [actor,org]); + joinId = (await pool.query('INSERT INTO organization_join_requests (workos_user_id,user_email,workos_organization_id) VALUES ($1,$2,$3) RETURNING id', [actor,'admin@test.local',org])).rows[0].id; + const { HTTPServer } = await import('../../src/http.js'); + app = (new HTTPServer({ backgroundServices: 'refresh-only' }) as unknown as { app: Parameters[0] }).app; +}, 60000); +afterAll(async () => { + try { + await pool.query('DELETE FROM organization_memberships WHERE workos_organization_id=$1', [org]); + await pool.query('DELETE FROM organization_join_requests WHERE workos_organization_id=$1', [org]); + await pool.query('DELETE FROM organizations WHERE workos_organization_id=$1', [org]); + } + finally { stopAuthTimers(); await closeDatabase(); } +}); + +describe('management rejects real dev sessions even with the production override enabled', () => { + const paths = [ + ['post', '/join-requests/00000000-0000-0000-0000-000000000001/approve'], + ['post', '/join-requests/00000000-0000-0000-0000-000000000001/reject'], + ['post', '/domain-users/add'], ['post', '/invitations'], + ['delete', '/invitations/inv_test'], ['post', '/invitations/inv_test/resend'], + ['post', '/members/by-email'], ['patch', '/members/om_target'], ['delete', '/members/om_target'], + ['post', '/seat-requests'], ['post', '/seat-requests/00000000-0000-0000-0000-000000000001/approve'], + ['post', '/seat-requests/00000000-0000-0000-0000-000000000001/deny'], + ] as const; + for (const [method, path] of paths) it(`${method} ${path}: 403 before provider or membership/audit writes`, async () => { + provider.calls.mockClear(); + const response = await request(app)[method](`/api/organizations/${org}${path}`) + .set('Cookie', `dev-session=${encodeDevSessionCookie('admin')}; csrf-token=${csrf}`) + .set('X-Organization-Id', org).set('X-CSRF-Token', csrf).send({ email: 'member@example.test', role: 'owner' }); + expect(response.status, JSON.stringify(response.body)).toBe(403); + expect(response.body).toEqual({ error: 'access_denied' }); + expect(provider.calls).not.toHaveBeenCalled(); + expect((await pool.query('SELECT role FROM organization_memberships WHERE workos_organization_id=$1', [org])).rows).toEqual([{ role: 'owner' }]); + expect((await pool.query('SELECT id FROM registry_audit_log WHERE workos_organization_id=$1', [org])).rowCount).toBe(0); + expect((await pool.query('SELECT workos_invitation_id FROM invitation_seat_types WHERE workos_organization_id=$1', [org])).rowCount).toBe(0); + }); + it('denies dev cancellation even for its own pending request', async () => { + provider.calls.mockClear(); + const response = await request(app).delete(`/api/join-requests/${joinId}`) + .set('Cookie', `dev-session=${encodeDevSessionCookie('admin')}; csrf-token=${csrf}`) + .set('X-CSRF-Token', csrf); + expect(response.status).toBe(403); + expect(response.body).toEqual({ error: 'access_denied' }); + expect(provider.calls).not.toHaveBeenCalled(); + expect((await pool.query('SELECT status FROM organization_join_requests WHERE id=$1', [joinId])).rows).toEqual([{ status: 'pending' }]); + }); + +}); diff --git a/server/tests/integration/organization-membership-mutation-races.test.ts b/server/tests/integration/organization-membership-mutation-races.test.ts new file mode 100644 index 00000000000..af68f2f5113 --- /dev/null +++ b/server/tests/integration/organization-membership-mutation-races.test.ts @@ -0,0 +1,771 @@ +import { beforeAll, afterAll, beforeEach, describe, expect, it, vi } from 'vitest'; +import request from 'supertest'; +import { createLocalJWKSet, exportJWK, generateKeyPair, SignJWT } from 'jose'; +import type { Pool } from 'pg'; + +const state = vi.hoisted(() => { + process.env.ADMIN_API_KEY = 'membership-race-static-key'; + return { + members: new Map(), invitations: new Map(), users: new Map(), sessions: new Map(), + reads: [] as string[], writes: [] as string[], notifications: [] as string[], apiKeyValidations: 0, + beforeRead: undefined as undefined | (() => Promise), + afterWrite: undefined as undefined | (() => Promise), + rejectWrite: undefined as unknown, + outage: false, + afterTargetRead: undefined as undefined | (() => Promise), + rejectActions: new Map(), + }; +}); +vi.mock('@workos-inc/node', () => { + async function read(name: string) { + state.reads.push(name); + if (state.outage) throw new Error('source unavailable'); + if (state.beforeRead) { const hook = state.beforeRead; state.beforeRead = undefined; await hook(); } + } + async function write(name: string, action: () => unknown) { + state.writes.push(name); + if (state.rejectWrite) throw state.rejectWrite; + if (state.rejectActions.has(name)) throw state.rejectActions.get(name); + const value = action(); + if (state.afterWrite) { const hook = state.afterWrite; state.afterWrite = undefined; await hook(); } + return structuredClone(value); + } + return { WorkOS: class { + apiKeys = { createValidation: async () => { state.apiKeyValidations++; return { apiKey: { id: 'key_test', name: 'test', owner: { type: 'organization', id: 'org_mutation_race_test' }, permissions: ['admin'] } }; } }; + userManagement = { + loadSealedSession: ({ sessionData }: any) => ({ authenticate: async () => state.sessions.get(sessionData) ?? { authenticated: false }, refresh: async () => ({ authenticated: false }) }), + listOrganizationMemberships: async ({ userId, organizationId, statuses }: any) => { + await read('list_memberships'); + return { data: structuredClone([...state.members.values()].filter(m => (!userId || m.userId === userId) && (!organizationId || m.organizationId === organizationId) && (!statuses || statuses.includes(m.status)))) }; + }, + getOrganizationMembership: async (id: string) => { + await read('get_membership'); + if (!state.members.has(id)) throw Object.assign(new Error('not found'), { status: 404 }); + const snapshot = structuredClone(state.members.get(id)); + if (id.includes('target') && state.afterTargetRead) { const hook = state.afterTargetRead; state.afterTargetRead = undefined; await hook(); } + return snapshot; + }, + createOrganizationMembership: async ({ userId, organizationId, roleSlug }: any) => write('create_membership', () => { + if ([...state.members.values()].some(m => m.userId === userId && m.organizationId === organizationId)) throw Object.assign(new Error('exists'), { code: 'organization_membership_already_exists' }); + const m = { id: `om_${userId}`, userId, organizationId, status: 'active', role: { slug: roleSlug } }; state.members.set(m.id, m); return m; + }), + updateOrganizationMembership: async (id: string, { roleSlug }: any) => write('update_membership', () => { const m = state.members.get(id); m.role.slug = roleSlug; return m; }), + deleteOrganizationMembership: async (id: string) => write('delete_membership', () => { state.members.delete(id); }), + listUsers: async ({ email }: any) => { await read('list_users'); return { data: structuredClone([...state.users.values()].filter(u => u.email === email)) }; }, + getUser: async (id: string) => { await read('get_user'); return structuredClone(state.users.get(id)); }, + sendInvitation: async ({ email, organizationId, inviterUserId, roleSlug }: any) => write('send_invitation', () => { + const invitation = { id: `inv_${state.invitations.size + 1}`, email, organizationId, inviterUserId, roleSlug, state: 'pending', expiresAt: new Date(Date.now() + 86400000).toISOString(), acceptInvitationUrl: 'https://membership-race.example.test/accept' }; + state.invitations.set(invitation.id, invitation); return invitation; + }), + getInvitation: async (id: string) => { await read('get_invitation'); return structuredClone(state.invitations.get(id)); }, + revokeInvitation: async (id: string) => write('revoke_invitation', () => { state.invitations.get(id).state = 'revoked'; }), + }; + } }; +}); +vi.mock('../../src/services/organization-membership-notifications.js', () => ({ + notifyMembershipSeats: async () => { state.notifications.push('seats'); }, + notifyMembershipSeatRequest: async () => { state.notifications.push('seat_request'); }, +})); +vi.mock('../../src/slack/org-group-dm.js', () => ({ + notifyMemberSeatChanged: async () => { state.notifications.push('member_seat'); }, +})); +vi.mock('../../src/addie/mcp/admin-tools.js', () => ({ isWebUserAAOAdmin: vi.fn().mockResolvedValue(false) })); +vi.mock('../../src/middleware/rate-limit.js', async (importOriginal) => ({ + ...(await importOriginal()), + invitationRateLimiter: (_req: unknown, _res: unknown, next: () => void) => next(), + orgCreationRateLimiter: (_req: unknown, _res: unknown, next: () => void) => next(), +})); + +// HTTPServer supplies the production cookie/CSRF/organization route ordering. Keep unrelated +// route graphs inert so this focused harness does not initialize Addie indexes or agent tenants. +vi.mock('../../src/routes/addie-admin.js', async () => { + const express = (await import('express')).default; + return { createAddieAdminRouter: () => ({ pageRouter: express.Router(), apiRouter: express.Router() }) }; +}); +vi.mock('../../src/routes/addie-chat.js', async () => { + const express = (await import('express')).default; + return { createAddieChatRouter: () => ({ pageRouter: express.Router(), apiRouter: express.Router() }), isWebChatReady: () => false }; +}); +vi.mock('../../src/routes/slack.js', async () => { + const express = (await import('express')).default; + return { createSlackRouter: () => ({ aaobotRouter: express.Router(), addieRouter: express.Router() }) }; +}); +vi.mock('../../src/routes/registry-api.js', async () => { + const express = (await import('express')).default; + return { createRegistryApiRouters: () => ({ router: express.Router(), v1AgentsRouter: express.Router(), complianceRefreshQueue: null }) }; +}); +vi.mock('../../src/training-agent/index.js', async () => { + const express = (await import('express')).default; + return { createTrainingAgentRouter: () => express.Router() }; +}); +vi.mock('../../src/creative-agent/index.js', async () => { + const express = (await import('express')).default; + return { createCreativeAgentRouter: () => express.Router() }; +}); +vi.mock('../../src/addie/index.js', () => ({ + sendAccountLinkedMessage: vi.fn(), + invalidateMemberContextCache: vi.fn(), + isAddieBoltReady: () => false, +})); +vi.mock('../../src/addie/jobs/scheduler.js', () => ({ + jobScheduler: { startAll: vi.fn(), stop: vi.fn(), stopAll: vi.fn() }, +})); +vi.mock('../../src/addie/jobs/job-definitions.js', () => ({ + registerAllJobs: vi.fn(), + JOB_NAMES: { GEO_MONITOR: 'geo-monitor', GEO_SNAPSHOT: 'geo-snapshot', GEO_CONTENT_PLANNER: 'geo-content-planner' }, +})); + +import { initializeDatabase, closeDatabase } from '../../src/db/client.js'; +import { runMigrations } from '../../src/db/migrate.js'; +import { __setJWKSForTesting } from '../../src/auth/workos-jwt.js'; +import { stopAuthTimers } from '../../src/middleware/auth.js'; +import { JoinRequestDatabase } from '../../src/db/join-request-db.js'; + +const org = 'org_mutation_race_test'; +const otherOrg = 'org_mutation_race_other'; +const A = 'user_mutation_race_a'; +const B = 'user_mutation_race_b'; +const target = 'user_mutation_race_target'; +const newcomer = 'user_mutation_race_new'; +let pool: Pool; +let signingKey: Awaited>['privateKey']; +let verificationKey: Awaited>['publicKey']; +let sequence = 0; +let joinId: string; +let seatId: string; +let identityId: string; +let app: Parameters[0]; +const CSRF_TOKEN = 'b'.repeat(64); + +async function token(actor = A, selected: string | undefined = org) { + return new SignJWT({ client_id: 'client_mock_id', ...(selected ? { org_id: selected } : {}) }).setProtectedHeader({ alg: 'RS256' }).setSubject(actor).setIssuedAt().setJti(String(++sequence)).setExpirationTime('5m').sign(signingKey); +} +async function cookie(actor = A, selected: string | undefined = org) { + const value = `session_${++sequence}`; + state.sessions.set(value, { authenticated: true, user: state.users.get(actor), accessToken: await token(actor, selected) }); + return `wos-session=${value}; csrf-token=${CSRF_TOKEN}`; +} +async function member(userId: string, role = 'owner', organizationId = org) { + const id = `om_${userId}`; + state.members.set(id, { id, userId, organizationId, status: 'active', role: { slug: role } }); + await pool.query(`INSERT INTO organization_memberships (workos_user_id, workos_organization_id, workos_membership_id, email, role, seat_type) + VALUES ($1,$2,$3,$4,$5,'community_only') ON CONFLICT (workos_user_id,workos_organization_id) DO UPDATE SET role=$5, workos_membership_id=$3`, [userId, organizationId, id, `${userId}@membership-race.example.test`, role]); +} +async function removeActor(userId = A) { + state.members.delete(`om_${userId}`); + await pool.query('DELETE FROM organization_memberships WHERE workos_user_id=$1 AND workos_organization_id=$2', [userId, org]); +} +async function noEffects() { + expect(state.writes).toEqual([]); + expect(state.notifications).toEqual([]); + expect((await pool.query('SELECT id FROM registry_audit_log WHERE workos_organization_id=$1', [org])).rowCount).toBe(0); +} +function barrier() { + let reached!: () => void; + let release!: () => void; + const arrived = new Promise(resolve => { reached = resolve; }); + const resumed = new Promise(resolve => { release = resolve; }); + return { arrived, release, hook: async () => { reached(); await resumed; } }; +} +async function waitForDatabaseLock(options: { pid?: number; queryFragment?: string }): Promise { + for (let attempt = 0; attempt < 100; attempt++) { + const result = await pool.query( + `SELECT 1 FROM pg_stat_activity + WHERE datname = current_database() + AND pid <> pg_backend_pid() + AND wait_event_type = 'Lock' + AND ($1::int IS NULL OR pid = $1) + AND ($2::text IS NULL OR query ILIKE '%' || $2 || '%')`, + [options.pid ?? null, options.queryFragment ?? null], + ); + if (result.rowCount) return; + await new Promise(resolve => setTimeout(resolve, 10)); + } + throw new Error(`Timed out waiting for blocked database query: ${JSON.stringify(options)}`); +} +type Family = { name: string; method: 'post' | 'patch' | 'delete'; path: () => string; body?: () => object }; +const families: Family[] = [ + { name: 'join approve', method: 'post', path: () => `/join-requests/${joinId}/approve` }, + { name: 'join reject', method: 'post', path: () => `/join-requests/${joinId}/reject` }, + { name: 'domain add', method: 'post', path: () => '/domain-users/add', body: () => ({ email: `${newcomer}@membership-race.example.test` }) }, + { name: 'invite', method: 'post', path: () => '/invitations', body: () => ({ email: 'invitee@membership-race.example.test' }) }, + { name: 'revoke invite', method: 'delete', path: () => '/invitations/inv_existing' }, + { name: 'resend invite', method: 'post', path: () => '/invitations/inv_existing/resend' }, + { name: 'by email create', method: 'post', path: () => '/members/by-email', body: () => ({ email: `${newcomer}@membership-race.example.test` }) }, + { name: 'role and seat', method: 'patch', path: () => `/members/om_${target}`, body: () => ({ role: 'admin', seat_type: 'contributor' }) }, + { name: 'remove member', method: 'delete', path: () => `/members/om_${target}` }, + { name: 'request seat', method: 'post', path: () => '/seat-requests', body: () => ({ resource_type: 'working_group', resource_id: 'new_request' }) }, + { name: 'approve seat', method: 'post', path: () => `/seat-requests/${seatId}/approve` }, + { name: 'deny seat', method: 'post', path: () => `/seat-requests/${seatId}/deny` }, +]; +function call(family: Family, authCookie: string) { + return request(app)[family.method](`/api/organizations/${org}${family.path()}`) + .set('X-Organization-Id', org).set('Cookie', authCookie).set('X-CSRF-Token', CSRF_TOKEN).send(family.body?.() ?? {}); +} + +beforeAll(async () => { + pool = initializeDatabase({ connectionString: process.env.DATABASE_URL || 'postgresql://adcp:localdev@localhost:55432/adcp_mutation_race_test', maxPoolSize: 12 }); + await runMigrations(); + const { HTTPServer } = await import('../../src/http.js'); + app = (new HTTPServer({ backgroundServices: 'refresh-only' }) as unknown as { app: Parameters[0] }).app; + const keys = await generateKeyPair('RS256'); + signingKey = keys.privateKey; + verificationKey = keys.publicKey; + __setJWKSForTesting(async () => verificationKey); +}, 60000); +afterAll(async () => { stopAuthTimers(); __setJWKSForTesting(null); await closeDatabase(); }); +beforeEach(async () => { + state.members.clear(); state.invitations.clear(); state.users.clear(); state.sessions.clear(); state.reads = []; state.writes = []; state.notifications = []; state.apiKeyValidations = 0; + state.beforeRead = undefined; state.afterWrite = undefined; state.rejectWrite = undefined; state.outage = false; state.afterTargetRead = undefined; state.rejectActions.clear(); + await pool.query('DROP TRIGGER IF EXISTS membership_race_audit ON registry_audit_log'); + await pool.query('DROP TRIGGER IF EXISTS membership_race_update ON organization_memberships'); + await pool.query('DELETE FROM bans WHERE entity_id = ANY($1)', [[A, B, org, otherOrg]]); + await pool.query('DELETE FROM registry_audit_log WHERE workos_organization_id = ANY($1)', [[org, otherOrg]]); + await pool.query('DELETE FROM organization_join_requests WHERE workos_organization_id = $1', [org]); + await pool.query('DELETE FROM invitation_seat_types WHERE workos_organization_id = $1', [org]); + await pool.query('DELETE FROM seat_upgrade_requests WHERE workos_organization_id = $1', [org]); + await pool.query('DELETE FROM organization_memberships WHERE workos_organization_id = ANY($1)', [[org, otherOrg]]); + await pool.query('DELETE FROM organizations WHERE workos_organization_id = ANY($1)', [[org, otherOrg]]); + await pool.query('DELETE FROM users WHERE workos_user_id = ANY($1)', [[A, B, target, newcomer]]); + for (const id of [org, otherOrg]) await pool.query("INSERT INTO organizations (workos_organization_id,name,is_personal,membership_tier,subscription_status) VALUES ($1,'Pinnacle Agency',false,'company_standard','active')", [id]); + for (const id of [A, B, target, newcomer]) { + const user = { id, email: `${id}@membership-race.example.test`, firstName: 'Sam', lastName: 'Adeyemi', emailVerified: true, createdAt: new Date(0).toISOString(), updatedAt: new Date(0).toISOString() }; + state.users.set(id, user); + await pool.query('INSERT INTO users (workos_user_id,email,first_name,primary_organization_id) VALUES ($1,$2,$3,$4)', [id,user.email,'Sam',org]); + } + identityId = (await pool.query('SELECT identity_id FROM identity_workos_users WHERE workos_user_id=$1', [B])).rows[0].identity_id; + await pool.query('UPDATE identity_workos_users SET identity_id=$1, is_primary=false WHERE workos_user_id=$2', [identityId,A]); + await member(A); await member(target,'member'); + joinId = (await pool.query('INSERT INTO organization_join_requests (workos_user_id,user_email,workos_organization_id) VALUES ($1,$2,$3) RETURNING id', [newcomer,`${newcomer}@membership-race.example.test`,org])).rows[0].id; + seatId = (await pool.query("INSERT INTO seat_upgrade_requests (workos_organization_id,workos_user_id,resource_type,resource_id) VALUES ($1,$2,'working_group','existing') RETURNING id", [org,target])).rows[0].id; + await pool.query("INSERT INTO organization_domains (workos_organization_id,domain,verified) VALUES ($1,'membership-race.example.test',true) ON CONFLICT DO NOTHING", [org]); + await pool.query("INSERT INTO slack_user_mappings (slack_user_id,slack_email,workos_user_id) VALUES ('U_MEMBERSHIP_RACE_TEST',$1,$2) ON CONFLICT (slack_user_id) DO UPDATE SET slack_email=$1,workos_user_id=$2", [`${newcomer}@membership-race.example.test`,newcomer]); + state.invitations.set('inv_existing', { id:'inv_existing',organizationId:org,email:'existing@membership-race.example.test',state:'pending',expiresAt:new Date(Date.now()+86400000).toISOString() }); +}); + +async function suppressAudit() { + await pool.query('CREATE OR REPLACE FUNCTION membership_race_audit_fn() RETURNS trigger LANGUAGE plpgsql AS $$ BEGIN RETURN NULL; END $$'); + await pool.query("CREATE TRIGGER membership_race_audit BEFORE INSERT ON registry_audit_log FOR EACH ROW WHEN (NEW.workos_organization_id = 'org_mutation_race_test') EXECUTE FUNCTION membership_race_audit_fn()"); +} +async function localTarget() { + return (await pool.query('SELECT role,seat_type FROM organization_memberships WHERE workos_user_id=$1 AND workos_organization_id=$2', [target, org])).rows[0]; +} +async function exactRole(userId: string, role: string, actor = A) { + return request(app).post(`/api/organizations/${org}/members/by-email`) + .set('Cookie', await cookie(actor)).set('X-CSRF-Token', CSRF_TOKEN).send({ email: `${userId}@membership-race.example.test`, role }); +} + +// These barriers exercise changes committed during awaited provider reads. +// WorkOS does not atomically compare actor and target state with the write: +// a target can still change between its read and the final actor read, or +// either can change after the final read. These tests do not claim provider +// CAS/atomicity; detected post-write changes require honest reconciliation. +describe('independent mounted management race and residual-state attacks', () => { + it('production CSRF middleware rejects a mismatched cookie token before any provider or audit effect', async () => { + const response = await request(app).post(`/api/organizations/${org}/invitations`) + .set('Cookie', await cookie()).set('X-CSRF-Token', 'c'.repeat(64)) + .send({ email: 'invitee@membership-race.example.test' }); + expect(response.status).toBe(403); + expect(response.body.error).toBe('CSRF validation failed'); + expect(state.reads).toEqual([]); + await noEffects(); + }); + + it('join approval holds the pending row until commit, then cancellation loses and replay makes no provider call', async () => { + const gate = barrier(); + state.afterWrite = gate.hook; + const approval = call(families[0], await cookie()).then(response => response); + await gate.arrived; + + const cancellation = new JoinRequestDatabase().cancelRequest(joinId, newcomer); + await waitForDatabaseLock({ queryFragment: 'UPDATE organization_join_requests' }); + gate.release(); + + expect((await approval).status).toBe(200); + expect(await cancellation).toBeNull(); + expect((await pool.query('SELECT status FROM organization_join_requests WHERE id=$1', [joinId])).rows[0].status).toBe('approved'); + expect(state.writes).toEqual(['create_membership']); + + const beforeReplay = [...state.writes]; + expect((await call(families[0], await cookie())).status).toBe(409); + expect(state.writes).toEqual(beforeReplay); + expect((await pool.query('SELECT id FROM registry_audit_log WHERE workos_organization_id=$1', [org])).rowCount).toBe(1); + }); + + it('requester cancellation holding the row lock wins before approval and prevents every provider call', async () => { + const canceller = await pool.connect(); + try { + await canceller.query('BEGIN'); + const cancelled = await canceller.query( + "UPDATE organization_join_requests SET status='cancelled', updated_at=NOW() WHERE id=$1 AND workos_user_id=$2 AND status='pending' RETURNING id", + [joinId, newcomer], + ); + expect(cancelled.rowCount).toBe(1); + + const approval = call(families[0], await cookie()).then(response => response); + await waitForDatabaseLock({ queryFragment: 'SELECT * FROM organization_join_requests' }); + expect(state.writes).toEqual([]); + await canceller.query('COMMIT'); + + expect((await approval).status).toBe(409); + expect((await pool.query('SELECT status FROM organization_join_requests WHERE id=$1', [joinId])).rows[0].status).toBe('cancelled'); + await noEffects(); + } finally { + await canceller.query('ROLLBACK').catch(() => {}); + canceller.release(); + } + }); + + it('JWT verification source outage returns authorization_unavailable before provider reads or writes', async () => { + const bearer = await token(); + __setJWKSForTesting(async () => { throw Object.assign(new Error('JWKS unavailable'), { code: 'ECONNRESET' }); }); + try { + const response = await request(app).post(`/api/organizations/${org}/invitations`) + .set('Authorization', `Bearer ${bearer}`).send({ email: 'invitee@membership-race.example.test' }); + expect(response.status).toBe(503); + expect(response.body.error).toBe('Authentication service temporarily unavailable'); + expect(state.reads).toEqual([]); + await noEffects(); + } finally { + __setJWKSForTesting(async () => verificationKey); + } + }); + + it('warm cookie JWT source outage returns authorization_unavailable before provider reads, writes, or audit', async () => { + const auth = await cookie(); + __setJWKSForTesting(async () => { throw Object.assign(new Error('JWKS unavailable'), { code: 'ECONNRESET' }); }); + try { + const response = await request(app).post(`/api/organizations/${org}/invitations`) + .set('Cookie', auth).set('X-CSRF-Token', CSRF_TOKEN).send({ email: 'invitee@membership-race.example.test' }); + expect(response.status).toBe(503); + expect(response.body.error).toBe('authorization_unavailable'); + expect(state.reads).toEqual([]); + await noEffects(); + } finally { + __setJWKSForTesting(async () => verificationKey); + } + }); + + it('unsupported JWT algorithm remains 401 and makes no provider or audit call', async () => { + const payload = Buffer.from(JSON.stringify({ sub: A, client_id: 'client_mock_id', org_id: org })).toString('base64url'); + const bearer = `${Buffer.from(JSON.stringify({ alg: 'none' })).toString('base64url')}.${payload}.unsupported`; + const response = await request(app).post(`/api/organizations/${org}/invitations`) + .set('Authorization', `Bearer ${bearer}`).send({ email: 'invitee@membership-race.example.test' }); + expect(response.status).toBe(401); + expect(state.reads).toEqual([]); + await noEffects(); + }); + + it('an API-key prefix is not reclassified as a malformed JWT and still cannot authorize a human mutation', async () => { + const response = await request(app).post(`/api/organizations/${org}/invitations`) + .set('Authorization', 'Bearer sk_.e30.eA').send({ email: 'invitee@membership-race.example.test' }); + expect(response.status).toBe(403); + expect(state.apiKeyValidations).toBe(1); + expect(state.reads).toEqual([]); + await noEffects(); + }); + + it('a malformed compact JWT without an API-key prefix remains local 401', async () => { + const response = await request(app).post(`/api/organizations/${org}/invitations`) + .set('Authorization', 'Bearer xk_.e30.eA').send({ email: 'invitee@membership-race.example.test' }); + expect(response.status).toBe(401); + expect(response.body.error).toBe('Invalid bearer token'); + expect(state.apiKeyValidations).toBe(0); + expect(state.reads).toEqual([]); + await noEffects(); + }); + + it('unknown kid from a healthy JWKS remains 401 and makes no provider or audit call', async () => { + const jwk = { ...await exportJWK(verificationKey), alg: 'RS256', kid: 'known-key' }; + __setJWKSForTesting(createLocalJWKSet({ keys: [jwk] })); + try { + const bearer = await new SignJWT({ client_id: 'client_mock_id', org_id: org }) + .setProtectedHeader({ alg: 'RS256', kid: 'unknown-key' }) + .setSubject(A) + .setIssuedAt() + .setJti(String(++sequence)) + .setExpirationTime('5m') + .sign(signingKey); + const response = await request(app).post(`/api/organizations/${org}/invitations`) + .set('Authorization', `Bearer ${bearer}`).send({ email: 'invitee@membership-race.example.test' }); + expect(response.status).toBe(401); + expect(state.reads).toEqual([]); + await noEffects(); + } finally { + __setJWKSForTesting(async () => verificationKey); + } + }); + + it('bearer user-source outage returns authorization_unavailable before provider reads or writes', async () => { + const bearer = await token(); + await pool.query('ALTER TABLE users RENAME TO membership_race_users_unavailable'); + try { + const response = await request(app).post(`/api/organizations/${org}/invitations`) + .set('Authorization', `Bearer ${bearer}`).send({ email: 'invitee@membership-race.example.test' }); + expect(response.status).toBe(503); + expect(response.body.error).toBe('Authorization service temporarily unavailable'); + expect(state.reads).toEqual([]); + expect(state.writes).toEqual([]); + } finally { + await pool.query('ALTER TABLE membership_race_users_unavailable RENAME TO users'); + } + await noEffects(); + }); + + it('invalid bearer signature remains 401 and makes no provider call', async () => { + const unrelated = await generateKeyPair('RS256'); + const bearer = await new SignJWT({ client_id: 'client_mock_id', org_id: org }) + .setProtectedHeader({ alg: 'RS256' }).setSubject(A).setIssuedAt().setExpirationTime('5m').sign(unrelated.privateKey); + const response = await request(app).post(`/api/organizations/${org}/invitations`) + .set('Authorization', `Bearer ${bearer}`).send({ email: 'invitee@membership-race.example.test' }); + expect(response.status).toBe(401); + expect(state.reads).toEqual([]); + await noEffects(); + }); + + for (const role of ['owner', 'admin']) it(`target promotion to ${role} before deletion is terminal`, async () => { + await member(A, 'admin'); + const gate = barrier(); + // The first subsequent authority read finishes readProvider(target). The + // second happens after targetMember has checked the local mirror, leaving + // a proved target snapshot that must be invalidated before the mutation. + state.afterTargetRead = async () => { state.beforeRead = async () => { state.beforeRead = gate.hook; }; }; + const pending = call(families[8], await cookie()).then(r => r); + await gate.arrived; + await member(target, role); + gate.release(); + const response = await pending; + expect(response.status).toBeGreaterThanOrEqual(400); + await noEffects(); + expect(state.members.get(`om_${target}`).role.slug).toBe(role); + expect((await localTarget()).role).toBe(role); + }); + + for (const familyIndex of [7, 10]) it(`${families[familyIndex].name}: target inactivity during provider read blocks seat grant`, async () => { + const gate = barrier(); + // The first subsequent authority read finishes readProvider(target). The + // second happens after targetMember has checked the local mirror, leaving + // a proved target snapshot that must be invalidated before the mutation. + state.afterTargetRead = async () => { state.beforeRead = async () => { state.beforeRead = gate.hook; }; }; + const auth = await cookie(); + const pending = (familyIndex === 7 + ? request(app).patch(`/api/organizations/${org}/members/om_${target}`).set('Cookie', auth).set('X-CSRF-Token', CSRF_TOKEN).send({ seat_type: 'contributor' }) + : call(families[familyIndex], auth)).then(r => r); + await gate.arrived; + state.members.get(`om_${target}`).status = 'inactive'; + gate.release(); + const response = await pending; + expect(response.status).toBeGreaterThanOrEqual(400); + await noEffects(); + expect((await localTarget()).seat_type).toBe('community_only'); + expect((await pool.query('SELECT status FROM seat_upgrade_requests WHERE id=$1', [seatId])).rows[0].status).toBe('pending'); + }); + + for (const familyIndex of [7, 8, 10]) it(`${families[familyIndex].name}: provider-only actor revoke during target revalidation is terminal`, async () => { + const gate = barrier(); + // The first target read establishes its binding. The second is the + // mutation fence's awaited target revalidation, after its actor preflight. + state.afterTargetRead = async () => { state.afterTargetRead = gate.hook; }; + const auth = await cookie(); + const pending = (familyIndex === 7 + ? request(app).patch(`/api/organizations/${org}/members/om_${target}`).set('Cookie', auth).set('X-CSRF-Token', CSRF_TOKEN).send({ seat_type: 'contributor' }) + : call(families[familyIndex], auth)).then(r => r); + await gate.arrived; + state.members.delete(`om_${A}`); + // Model a delayed webhook: provider authority is gone, but every local + // membership/epoch/identity value remains identical to the initial stamp. + expect((await pool.query('SELECT role FROM organization_memberships WHERE workos_user_id=$1 AND workos_organization_id=$2', [A, org])).rows[0].role).toBe('owner'); + gate.release(); + expect((await pending).status).toBe(403); + await noEffects(); + expect(state.members.has(`om_${target}`)).toBe(true); + expect(await localTarget()).toMatchObject({ role: 'member', seat_type: 'community_only' }); + expect((await pool.query('SELECT status FROM seat_upgrade_requests WHERE id=$1', [seatId])).rows[0].status).toBe('pending'); + }); + + it('provider-only actor revoke during the required seat audit fence rolls back the preceding local UPDATE', async () => { + const gate = barrier(); + let targetReads = 0; + const duringTargetRead = async () => { + targetReads++; + // Initial binding, local-phase fence, membership UPDATE fence, then + // required audit fence. The fourth read follows the local seat UPDATE. + if (targetReads === 4) await gate.hook(); + else state.afterTargetRead = duringTargetRead; + }; + state.afterTargetRead = duringTargetRead; + const pending = request(app).patch(`/api/organizations/${org}/members/om_${target}`) + .set('Cookie', await cookie()).set('X-CSRF-Token', CSRF_TOKEN).send({ seat_type: 'contributor' }).then(r => r); + await gate.arrived; + state.members.delete(`om_${A}`); + gate.release(); + expect((await pending).status).toBe(403); + expect(targetReads).toBe(4); + await noEffects(); + expect(await localTarget()).toMatchObject({ role: 'member', seat_type: 'community_only' }); + }); + + it('an exact admin cannot demote the sole owner', async () => { + await member(B, 'admin'); + const response = await exactRole(A, 'member', B); + expect(response.status).toBe(403); + await noEffects(); + expect(state.members.get(`om_${A}`).role.slug).toBe('owner'); + }); + + it('an owner absent from the exact local mirror cannot justify demoting the last usable owner', async () => { + state.members.set(`om_${B}`, { id: `om_${B}`, userId: B, organizationId: org, status: 'active', role: { slug: 'owner' } }); + const response = await exactRole(A, 'member', B); + expect(response.status).toBeGreaterThanOrEqual(400); + await noEffects(); + expect(state.members.get(`om_${A}`).role.slug).toBe('owner'); + expect((await pool.query("SELECT workos_user_id FROM organization_memberships WHERE workos_organization_id=$1 AND role='owner'", [org])).rowCount).toBe(1); + }); + + for (const source of ['provider', 'local']) it(`remaining owner ${source} revoke during demotion preflight prevents every write`, async () => { + await member(target, 'owner'); + const gate = barrier(); + // Bind the demotion target first. Pause its next read inside the write + // preflight, before the separately bound surviving owner is revalidated. + state.afterTargetRead = async () => { state.afterTargetRead = gate.hook; }; + const pending = exactRole(target, 'member').then(r => r); + await gate.arrived; + if (source === 'provider') state.members.delete(`om_${A}`); + else await pool.query('DELETE FROM organization_memberships WHERE workos_user_id=$1 AND workos_organization_id=$2', [A, org]); + gate.release(); + const response = await pending; + expect(response.status).toBeGreaterThanOrEqual(400); + expect(response.body.reconciliation_required).toBeUndefined(); + await noEffects(); + expect(state.members.get(`om_${target}`).role.slug).toBe('owner'); + expect((await localTarget()).role).toBe('owner'); + }); + + async function otherOrgContributor(userId: string) { + const id = `om_other_${userId}`; + state.members.set(id, { id, userId, organizationId: otherOrg, status: 'active', role: { slug: 'owner' } }); + await pool.query("INSERT INTO organization_memberships (workos_user_id,workos_organization_id,workos_membership_id,email,role,seat_type) VALUES ($1,$2,$3,$4,'owner','contributor')", [userId, otherOrg, id, `${userId}@membership-race.example.test`]); + } + + it('same exact credential contributor entitlement in another org prevents a redundant seat request', async () => { + await member(A, 'member'); + await otherOrgContributor(A); + const response = await call(families[9], await cookie()); + expect(response.status).toBe(400); + expect(response.body.error).toBe('invalid_request'); + await noEffects(); + expect((await pool.query('SELECT id FROM seat_upgrade_requests WHERE workos_user_id=$1 AND workos_organization_id=$2', [A, org])).rowCount).toBe(0); + }); + + it('canonical sibling contributor entitlement does not suppress an exact actor seat request', async () => { + await member(A, 'member'); + await otherOrgContributor(B); + const response = await call(families[9], await cookie()); + expect(response.status, JSON.stringify(response.body)).toBe(200); + expect((await pool.query('SELECT workos_user_id FROM seat_upgrade_requests WHERE id=$1', [response.body.id])).rows[0].workos_user_id).toBe(A); + expect(state.writes).toEqual([]); + }); + + it('other-org owner and contributor entitlement never supplies selected-org management authority', async () => { + await removeActor(); + await otherOrgContributor(A); + expect((await call(families[3], await cookie())).status).toBe(403); + expect(state.reads).toEqual([]); + await noEffects(); + }); + + it('concurrent exact owner demotions preserve one owner and honest audit', async () => { + await member(target, 'owner'); + const gate = barrier(); state.afterWrite = gate.hook; + const first = exactRole(A, 'member', target).then(r => r); + await gate.arrived; + const second = exactRole(target, 'member').then(r => r); + gate.release(); + const responses = await Promise.all([first, second]); + expect(responses.map(r => r.status).sort()).toEqual([200, 403]); + expect([...state.members.values()].filter(m => m.role.slug === 'owner')).toHaveLength(1); + expect((await pool.query("SELECT workos_user_id FROM organization_memberships WHERE workos_organization_id=$1 AND role='owner'", [org])).rowCount).toBe(1); + expect((await pool.query('SELECT id FROM registry_audit_log WHERE workos_organization_id=$1', [org])).rowCount).toBe(1); + }); + + it('conflicting role writes serialize and audit the actual preceding role', async () => { + const gate = barrier(); state.afterWrite = gate.hook; + const auth = await cookie(); + const first = request(app).patch(`/api/organizations/${org}/members/om_${target}`).set('Cookie', auth).set('X-CSRF-Token', CSRF_TOKEN).send({ role: 'admin' }).then(r => r); + await gate.arrived; + const second = request(app).patch(`/api/organizations/${org}/members/om_${target}`).set('Cookie', auth).set('X-CSRF-Token', CSRF_TOKEN).send({ role: 'owner' }).then(r => r); + gate.release(); + const responses = await Promise.all([first, second]); + expect(responses.map(r => r.status)).toEqual([200, 200]); + expect((await localTarget()).role).toBe('owner'); + expect(state.members.get(`om_${target}`).role.slug).toBe('owner'); + const audit = await pool.query('SELECT details FROM registry_audit_log WHERE workos_organization_id=$1 ORDER BY created_at,id', [org]); + expect(audit.rows.map(row => [row.details.old_role, row.details.new_role])).toEqual([['member', 'admin'], ['admin', 'owner']]); + }); + + it('conflicting seat request decisions cannot overwrite the winner', async () => { + const gate = barrier(); + // The first subsequent authority read finishes readProvider(target). The + // second happens after targetMember has checked the local mirror, leaving + // a proved target snapshot that must be invalidated before the mutation. + state.afterTargetRead = async () => { state.beforeRead = async () => { state.beforeRead = gate.hook; }; }; + const auth = await cookie(); + const approve = call(families[10], auth).then(r => r); + await gate.arrived; + const deny = call(families[11], auth).then(r => r); + gate.release(); + const responses = await Promise.all([approve, deny]); + expect(responses.map(r => r.status)).toEqual([200, 409]); + expect((await pool.query('SELECT status FROM seat_upgrade_requests WHERE id=$1', [seatId])).rows[0].status).toBe('approved'); + expect((await localTarget()).seat_type).toBe('contributor'); + expect((await pool.query('SELECT id FROM registry_audit_log WHERE workos_organization_id=$1', [org])).rowCount).toBe(1); + }); + + it('status input is rejected without role or provider side effects', async () => { + const response = await request(app).patch(`/api/organizations/${org}/members/om_${target}`) + .set('Cookie', await cookie()).set('X-CSRF-Token', CSRF_TOKEN).send({ role: 'admin', status: 'inactive' }); + expect(response.status).toBe(400); + await noEffects(); + expect((await localTarget()).role).toBe('member'); + }); + + for (const familyIndex of [0, 2, 3, 4, 5, 6, 7, 8]) { + const family = families[familyIndex]; + it(`${family.name}: suppressed required audit aborts every local row and reports provider residual`, async () => { + await suppressAudit(); + const response = await call(family, await cookie()); + expect(response.status, JSON.stringify(response.body)).toBe(503); + expect(response.body.reconciliation_required).toBe(true); + expect(state.notifications).toEqual([]); + expect(response.body.operation_id).toEqual(expect.any(String)); + expect((await pool.query('SELECT id FROM registry_audit_log WHERE workos_organization_id=$1', [org])).rowCount).toBe(0); + expect((await pool.query('SELECT status FROM organization_join_requests WHERE id=$1', [joinId])).rows[0].status).toBe('pending'); + expect((await localTarget())).toMatchObject({ role: 'member', seat_type: 'community_only' }); + expect((await pool.query('SELECT id FROM organization_memberships WHERE workos_organization_id=$1 AND workos_user_id=$2', [org, newcomer])).rowCount).toBe(0); + expect((await pool.query('SELECT * FROM invitation_seat_types WHERE workos_organization_id=$1', [org])).rowCount).toBe(0); + if ([0, 2, 6].includes(familyIndex)) expect(state.members.has(`om_${newcomer}`)).toBe(false); + if (familyIndex === 7) expect(state.members.get(`om_${target}`).role.slug).toBe('admin'); + if (familyIndex === 8) expect(state.members.has(`om_${target}`)).toBe(false); + if ([4, 5].includes(familyIndex)) expect(state.invitations.get('inv_existing').state).toBe('revoked'); + }); + } + + for (const familyIndex of [0, 2, 3, 6]) it(`${families[familyIndex].name}: failed compensation keeps explicit reconciliation and real residual`, async () => { + await suppressAudit(); + const invitation = familyIndex === 3; + state.rejectActions.set(invitation ? 'revoke_invitation' : 'delete_membership', Object.assign(new Error('compensation unavailable'), { code: 'ETIMEDOUT' })); + const response = await call(families[familyIndex], await cookie()); + expect(response.status).toBe(503); + expect(response.body.reconciliation_required).toBe(true); + expect(state.notifications).toEqual([]); + expect((await pool.query('SELECT id FROM registry_audit_log WHERE workos_organization_id=$1', [org])).rowCount).toBe(0); + if (invitation) expect([...state.invitations.values()].some(inv => inv.email === 'invitee@membership-race.example.test' && inv.state === 'pending')).toBe(true); + else expect(state.members.get(`om_${newcomer}`).status).toBe('active'); + expect((await pool.query('SELECT id FROM organization_memberships WHERE workos_organization_id=$1 AND workos_user_id=$2', [org, newcomer])).rowCount).toBe(0); + }); + + for (const familyIndex of [0, 3, 8]) it(`${families[familyIndex].name}: applied write with lost acknowledgement preserves actual unknown residual`, async () => { + state.afterWrite = async () => { throw Object.assign(new Error('acknowledgement lost after write'), { code: 'ECONNRESET' }); }; + const response = await call(families[familyIndex], await cookie()); + expect(response.status).toBe(503); + expect(response.body.reconciliation_required).toBe(true); + expect(state.notifications).toEqual([]); + expect(state.writes).toHaveLength(1); + expect((await pool.query('SELECT id FROM registry_audit_log WHERE workos_organization_id=$1', [org])).rowCount).toBe(0); + expect((await localTarget()).role).toBe('member'); + if (familyIndex === 0) expect(state.members.has(`om_${newcomer}`)).toBe(true); + if (familyIndex === 3) expect([...state.invitations.values()].some(inv => inv.email === 'invitee@membership-race.example.test' && inv.state === 'pending')).toBe(true); + if (familyIndex === 8) expect(state.members.has(`om_${target}`)).toBe(false); + }); + + it('epoch bump during target revalidation blocks the already prepared provider deletion', async () => { + const gate = barrier(); + state.afterTargetRead = async () => { state.afterTargetRead = gate.hook; }; + const pending = call(families[8], await cookie()).then(r => r); + await gate.arrived; + await pool.query('INSERT INTO authorization_epochs (workos_user_id,epoch) VALUES ($1,1) ON CONFLICT (workos_user_id) DO UPDATE SET epoch=authorization_epochs.epoch+1', [A]); + gate.release(); + expect((await pending).status).toBe(403); + await noEffects(); + expect(state.members.has(`om_${target}`)).toBe(true); + }); + + for (const familyIndex of [0, 3, 4, 7, 8]) it(`${families[familyIndex].name}: unknown upstream write outcome never reports rollback or success`, async () => { + state.rejectWrite = Object.assign(new Error('network acknowledgement lost'), { code: 'ETIMEDOUT' }); + const response = await call(families[familyIndex], await cookie()); + expect(response.status).toBe(503); + expect(response.body.reconciliation_required).toBe(true); + expect(state.notifications).toEqual([]); + expect(state.writes).toHaveLength(1); + expect((await pool.query('SELECT id FROM registry_audit_log WHERE workos_organization_id=$1', [org])).rowCount).toBe(0); + }); + + for (const familyIndex of [0, 3, 4, 7, 8]) it(`${families[familyIndex].name}: definitive provider rejection reports no local success`, async () => { + const providerSecret = 'provider bearer sk_live_never_serialize'; + state.rejectWrite = Object.assign(new Error(providerSecret), { status: 422 }); + const response = await call(families[familyIndex], await cookie()); + expect(response.status).toBe(409); + expect(response.body).toEqual({ error: 'membership_state_conflict' }); + expect(JSON.stringify(response.body)).not.toContain(providerSecret); + expect(response.body.reconciliation_required).toBeUndefined(); + expect(state.writes).toHaveLength(1); + expect((await pool.query('SELECT id FROM registry_audit_log WHERE workos_organization_id=$1', [org])).rowCount).toBe(0); + }); + + for (const source of ['bans', 'authorization_epochs', 'identity_workos_users', 'organization_memberships']) it(`${source}: required SQL source outage is terminal 503 before every provider call`, async () => { + const auth = await cookie(); + await pool.query(`ALTER TABLE ${source} RENAME TO membership_race_unavailable`); + try { + const response = await call(families[3], auth); + expect(response.status, JSON.stringify(response.body)).toBe(503); + // Current-main distinguishes authentication-snapshot outages from + // later mutation-fence outages while both remain terminal 503s. + const error = source === 'authorization_epochs' || source === 'identity_workos_users' + ? 'Authorization service temporarily unavailable' + : 'authorization_unavailable'; + expect(response.body).toEqual({ error }); + expect(state.reads).toEqual([]); + await noEffects(); + } finally { + await pool.query(`ALTER TABLE membership_race_unavailable RENAME TO ${source}`); + } + }); + + for (const lock of ['organization', 'advisory', 'actor']) it(`${lock} lock contention is a defined 409 without mutation effects`, async () => { + const blocker = await pool.connect(); + try { + await blocker.query('BEGIN'); + if (lock === 'organization') await blocker.query('SELECT 1 FROM organizations WHERE workos_organization_id=$1 FOR UPDATE', [org]); + else if (lock === 'advisory') await blocker.query('SELECT pg_advisory_xact_lock(hashtext($1))', [`membership-ownerless-promote:${org}`]); + else await blocker.query('SELECT 1 FROM users WHERE workos_user_id=$1 FOR UPDATE', [A]); + const response = await call(families[1], await cookie()); + expect(response.status, JSON.stringify(response.body)).toBe(409); + expect(response.body).toEqual({ error: 'membership_state_conflict' }); + if (lock !== 'actor') expect(state.reads).toEqual([]); + await noEffects(); + expect((await pool.query('SELECT status FROM organization_join_requests WHERE id=$1', [joinId])).rows[0].status).toBe('pending'); + } finally { await blocker.query('ROLLBACK'); blocker.release(); } + }); + it('local lock contention after a provider write returns honest reconciliation 503', async () => { + const blocker = await pool.connect(); + try { + await blocker.query('BEGIN'); + await blocker.query('SELECT 1 FROM users WHERE workos_user_id=$1 FOR UPDATE', [A]); + const response = await call(families[3], await cookie()); + expect(response.status).toBe(503); + expect(response.body.reconciliation_required).toBe(true); + expect(state.writes).toContain('send_invitation'); + expect((await pool.query('SELECT id FROM registry_audit_log WHERE workos_organization_id=$1', [org])).rowCount).toBe(0); + expect((await pool.query('SELECT workos_invitation_id FROM invitation_seat_types WHERE workos_organization_id=$1', [org])).rowCount).toBe(0); + } finally { await blocker.query('ROLLBACK'); blocker.release(); } + }); + + it('replaying approved join request never repeats provider mutation', async () => { + const auth = await cookie(); + expect((await call(families[0], auth)).status).toBe(200); + const before = [...state.writes]; + expect((await call(families[0], auth)).status).toBe(409); + expect(state.writes).toEqual(before); + expect((await pool.query('SELECT id FROM registry_audit_log WHERE workos_organization_id=$1', [org])).rowCount).toBe(1); + }); +}); diff --git a/server/tests/integration/organization-membership-mutations.test.ts b/server/tests/integration/organization-membership-mutations.test.ts new file mode 100644 index 00000000000..9408d8feb05 --- /dev/null +++ b/server/tests/integration/organization-membership-mutations.test.ts @@ -0,0 +1,808 @@ +import { beforeAll, afterAll, beforeEach, describe, expect, it, vi } from 'vitest'; +import express, { type Request, type Response } from 'express'; +import request from 'supertest'; +import { generateKeyPair, SignJWT } from 'jose'; +import type { Pool } from 'pg'; + +const state = vi.hoisted(() => { + process.env.ADMIN_API_KEY = 'membership-test-static-key'; + return { + members: new Map(), invitations: new Map(), users: new Map(), sessions: new Map(), + reads: [] as string[], writes: [] as string[], apiKeyValidations: 0, + beforeRead: undefined as undefined | (() => Promise), + afterWrite: undefined as undefined | (() => Promise), + rejectWrite: undefined as unknown, + outage: false, malformedAuthority: false, malformedTarget: false, malformedInventory: false, logs: [] as Array>, authorityRequests: [] as unknown[], + }; +}); +vi.mock('@workos-inc/node', () => { + async function read(name: string) { + state.reads.push(name); + if (state.outage) throw new Error('source unavailable'); + if (state.beforeRead) { const hook = state.beforeRead; state.beforeRead = undefined; await hook(); } + } + async function write(name: string, action: () => unknown) { + state.writes.push(name); + if (state.rejectWrite) throw state.rejectWrite; + const value = action(); + if (state.afterWrite) { const hook = state.afterWrite; state.afterWrite = undefined; await hook(); } + return structuredClone(value); + } + return { WorkOS: class { + apiKeys = { createValidation: async () => { state.apiKeyValidations++; return { apiKey: { id: 'key_test', name: 'test', owner: { type: 'organization', id: 'org_mutation_test' }, permissions: ['admin'] } }; } }; + userManagement = { + loadSealedSession: ({ sessionData }: any) => ({ authenticate: async () => state.sessions.get(sessionData) ?? { authenticated: false }, refresh: async () => ({ authenticated: false }) }), + listOrganizationMemberships: async ({ userId, organizationId, statuses }: any) => { + state.authorityRequests.push({ userId, organizationId, statuses }); + await read('list_memberships'); + if (state.malformedAuthority || (state.malformedInventory && !userId)) return undefined; + return { data: structuredClone([...state.members.values()].filter(m => (!userId || m.userId === userId) && (!organizationId || m.organizationId === organizationId) && (!statuses || statuses.includes(m.status)))) }; + }, + getOrganizationMembership: async (id: string) => { await read('get_membership'); if (state.malformedTarget) return undefined; if (!state.members.has(id)) throw Object.assign(new Error('not found'), { status: 404 }); return structuredClone(state.members.get(id)); }, + createOrganizationMembership: async ({ userId, organizationId, roleSlug }: any) => write('create_membership', () => { + if ([...state.members.values()].some(m => m.userId === userId && m.organizationId === organizationId)) throw Object.assign(new Error('exists'), { code: 'organization_membership_already_exists' }); + const m = { id: `om_${userId}`, userId, organizationId, status: 'active', role: { slug: roleSlug } }; state.members.set(m.id, m); return m; + }), + updateOrganizationMembership: async (id: string, { roleSlug }: any) => write('update_membership', () => { const m = state.members.get(id); m.role.slug = roleSlug; return m; }), + deleteOrganizationMembership: async (id: string) => write('delete_membership', () => { state.members.delete(id); }), + listUsers: async ({ email }: any) => { await read('list_users'); return { data: structuredClone([...state.users.values()].filter(u => u.email === email)) }; }, + getUser: async (id: string) => { await read('get_user'); return structuredClone(state.users.get(id)); }, + sendInvitation: async ({ email, organizationId, inviterUserId, roleSlug }: any) => write('send_invitation', () => { + const invitation = { id: `inv_${state.invitations.size + 1}`, email, organizationId, inviterUserId, roleSlug, state: 'pending', expiresAt: new Date(Date.now() + 86400000).toISOString(), acceptInvitationUrl: 'https://membership-mutation.example.test/accept' }; + state.invitations.set(invitation.id, invitation); return invitation; + }), + getInvitation: async (id: string) => { await read('get_invitation'); return structuredClone(state.invitations.get(id)); }, + revokeInvitation: async (id: string) => write('revoke_invitation', () => { state.invitations.get(id).state = 'revoked'; }), + }; + } }; +}); +vi.mock('../../src/logger.js', async (importOriginal) => { + const actual = await importOriginal(); + return { ...actual, createLogger: (context: string | Record) => { + const logger = actual.createLogger(context); + if (context === 'organization-membership-mutation' || context === 'organization-membership-routes') { + const error = logger.error.bind(logger); + logger.error = ((fields: Record, message: string) => { + state.logs.push({ ...fields, message }); error(fields, message); + }) as typeof logger.error; + } + return logger; + } }; +}); +vi.mock('../../src/addie/mcp/admin-tools.js', () => ({ isWebUserAAOAdmin: vi.fn().mockResolvedValue(false) })); +vi.mock('../../src/middleware/rate-limit.js', async (importOriginal) => ({ + ...(await importOriginal()), + invitationRateLimiter: (_req: unknown, _res: unknown, next: () => void) => next(), + orgCreationRateLimiter: (_req: unknown, _res: unknown, next: () => void) => next(), +})); + +// HTTPServer supplies the production cookie/CSRF/organization route ordering. Keep unrelated +// route graphs inert so this focused harness does not initialize Addie indexes or agent tenants. +vi.mock('../../src/routes/addie-admin.js', async () => { + const express = (await import('express')).default; + return { createAddieAdminRouter: () => ({ pageRouter: express.Router(), apiRouter: express.Router() }) }; +}); +vi.mock('../../src/routes/addie-chat.js', async () => { + const express = (await import('express')).default; + return { createAddieChatRouter: () => ({ pageRouter: express.Router(), apiRouter: express.Router() }), isWebChatReady: () => false }; +}); +vi.mock('../../src/routes/slack.js', async () => { + const express = (await import('express')).default; + return { createSlackRouter: () => ({ aaobotRouter: express.Router(), addieRouter: express.Router() }) }; +}); +vi.mock('../../src/routes/registry-api.js', async () => { + const express = (await import('express')).default; + return { createRegistryApiRouters: () => ({ router: express.Router(), v1AgentsRouter: express.Router(), complianceRefreshQueue: null }) }; +}); +vi.mock('../../src/training-agent/index.js', async () => { + const express = (await import('express')).default; + return { createTrainingAgentRouter: () => express.Router() }; +}); +vi.mock('../../src/creative-agent/index.js', async () => { + const express = (await import('express')).default; + return { createCreativeAgentRouter: () => express.Router() }; +}); +vi.mock('../../src/addie/index.js', () => ({ + sendAccountLinkedMessage: vi.fn(), + invalidateMemberContextCache: vi.fn(), + isAddieBoltReady: () => false, +})); +vi.mock('../../src/addie/jobs/scheduler.js', () => ({ + jobScheduler: { startAll: vi.fn(), stop: vi.fn(), stopAll: vi.fn() }, +})); +vi.mock('../../src/addie/jobs/job-definitions.js', () => ({ + registerAllJobs: vi.fn(), + JOB_NAMES: { GEO_MONITOR: 'geo-monitor', GEO_SNAPSHOT: 'geo-snapshot', GEO_CONTENT_PLANNER: 'geo-content-planner' }, +})); +vi.mock('../../src/services/organization-membership-notifications.js', () => ({ notifyMembershipSeats: vi.fn(), notifyMembershipSeatRequest: vi.fn() })); +vi.mock('../../src/slack/org-group-dm.js', () => ({ notifyMemberSeatChanged: vi.fn() })); + +import { initializeDatabase, closeDatabase } from '../../src/db/client.js'; +import { runMigrations } from '../../src/db/migrate.js'; +import { __setJWKSForTesting } from '../../src/auth/workos-jwt.js'; +import { stopAuthTimers, invalidateBanCache, optionalAuth, requireAuth } from '../../src/middleware/auth.js'; +import { MembershipMutationError, toPublicMembershipMutationError } from '../../src/services/organization-membership-mutation.js'; +import { getOrganizationAuthorizationUserId } from '../../src/auth/organization-principal.js'; + +const org = 'org_mutation_test'; +const otherOrg = 'org_mutation_other'; +const A = 'user_mutation_a'; +const B = 'user_mutation_b'; +const target = 'user_mutation_target'; +const newcomer = 'user_mutation_new'; +let pool: Pool; +let signingKey: Awaited>['privateKey']; +let verificationKey: Awaited>['publicKey']; +let sequence = 0; +let joinId: string; +let seatId: string; +let identityId: string; +let app: Parameters[0]; +const authProbe = (req: Request, res: Response) => res.json({ + canonical_user_id: req.user?.id, + credential_user_id: req.user ? getOrganizationAuthorizationUserId(req.user) : null, +}); +const authProbeApp = express(); +authProbeApp.get('/auth/optional-probe', optionalAuth, authProbe); +authProbeApp.get('/auth/required-probe', requireAuth, authProbe); +const CSRF_TOKEN = 'a'.repeat(64); + +describe('membership mutation public error projection', () => { + const cases = [ + [400, 'invalid_request'], + [401, 'invalid_credential'], + [403, 'access_denied'], + [404, 'not_found'], + [409, 'membership_state_conflict'], + [503, 'authorization_unavailable'], + ] as const; + + for (const [status, code] of cases) { + it(`maps internal status ${status} to finite public code ${code} without detail`, () => { + const secret = `provider-secret-${status}`; + const projected = toPublicMembershipMutationError(new MembershipMutationError(status, secret)); + expect(projected).toEqual({ status, body: { error: code } }); + expect(JSON.stringify(projected)).not.toContain(secret); + }); + } + + for (const [code, status, error] of [ + ['55P03', 409, 'membership_state_conflict'], + ['40P01', 409, 'membership_state_conflict'], + ['40001', 409, 'membership_state_conflict'], + ['57014', 503, 'authorization_unavailable'], + ] as const) it(`projects PostgreSQL ${code} as recoverable ${status}`, () => { + expect(toPublicMembershipMutationError(Object.assign(new Error('private SQL detail'), { code }))) + .toEqual({ status, body: { error } }); + }); + it('maps unknown typed and untyped failures to internal_error without arbitrary detail', () => { + for (const error of [new MembershipMutationError(418, 'database-secret'), new Error('provider-secret')]) { + const projected = toPublicMembershipMutationError(error); + expect(projected).toEqual({ status: 500, body: { error: 'internal_error' } }); + expect(JSON.stringify(projected)).not.toMatch(/database-secret|provider-secret/); + } + }); +}); + +async function token(actor = A, selected: string | undefined = org) { + return new SignJWT({ client_id: 'client_mock_id', ...(selected ? { org_id: selected } : {}) }).setProtectedHeader({ alg: 'RS256' }).setSubject(actor).setIssuedAt().setJti(String(++sequence)).setExpirationTime('5m').sign(signingKey); +} +async function cookie(actor = A, selected: string | undefined = org) { + const value = `session_${++sequence}`; + state.sessions.set(value, { authenticated: true, user: state.users.get(actor), accessToken: await token(actor, selected) }); + return `wos-session=${value}; csrf-token=${CSRF_TOKEN}`; +} +async function member(userId: string, role = 'owner', organizationId = org) { + const id = `om_${userId}`; + state.members.set(id, { id, userId, organizationId, status: 'active', role: { slug: role } }); + await pool.query(`INSERT INTO organization_memberships (workos_user_id, workos_organization_id, workos_membership_id, email, role, seat_type) + VALUES ($1,$2,$3,$4,$5,'community_only') ON CONFLICT (workos_user_id,workos_organization_id) DO UPDATE SET role=$5, workos_membership_id=$3`, [userId, organizationId, id, `${userId}@membership-mutation.example.test`, role]); +} +async function platformAdmin(userId: string) { + await pool.query(`INSERT INTO working_group_memberships (working_group_id,workos_user_id,status) + SELECT id,$1,'active' FROM working_groups WHERE slug='aao-admin' + ON CONFLICT (working_group_id,workos_user_id) DO UPDATE SET status='active'`, [userId]); +} +async function removeActor(userId = A) { + state.members.delete(`om_${userId}`); + await pool.query('DELETE FROM organization_memberships WHERE workos_user_id=$1 AND workos_organization_id=$2', [userId, org]); +} +async function noEffects() { + expect(state.writes).toEqual([]); + expect((await pool.query('SELECT id FROM registry_audit_log WHERE workos_organization_id=$1', [org])).rowCount).toBe(0); +} +async function managementState() { + const tables = ['organization_memberships', 'organization_join_requests', 'invitation_seat_types', 'seat_upgrade_requests', 'registry_audit_log']; + const result: Record = {}; + for (const table of tables) result[table] = (await pool.query( + `SELECT to_jsonb(t) AS row FROM ${table} t WHERE workos_organization_id=$1 ORDER BY to_jsonb(t)::text`, [org], + )).rows; + return result; +} +function barrier() { + let reached!: () => void; + let release!: () => void; + const arrived = new Promise(resolve => { reached = resolve; }); + const resumed = new Promise(resolve => { release = resolve; }); + return { arrived, release, hook: async () => { reached(); await resumed; } }; +} +async function waitForDatabaseLock(queryFragment: string): Promise { + for (let attempt = 0; attempt < 100; attempt++) { + const result = await pool.query( + `SELECT 1 FROM pg_stat_activity + WHERE datname = current_database() AND pid <> pg_backend_pid() + AND wait_event_type = 'Lock' AND query ILIKE '%' || $1 || '%'`, + [queryFragment], + ); + if (result.rowCount) return; + await new Promise(resolve => setTimeout(resolve, 10)); + } + throw new Error(`Timed out waiting for blocked database query containing ${queryFragment}`); +} +type Family = { name: string; method: 'post' | 'patch' | 'delete'; path: () => string; body?: () => object }; +const families: Family[] = [ + { name: 'join approve', method: 'post', path: () => `/join-requests/${joinId}/approve` }, + { name: 'join reject', method: 'post', path: () => `/join-requests/${joinId}/reject` }, + { name: 'domain add', method: 'post', path: () => '/domain-users/add', body: () => ({ email: `${newcomer}@membership-mutation.example.test` }) }, + { name: 'invite', method: 'post', path: () => '/invitations', body: () => ({ email: 'invitee@membership-mutation.example.test' }) }, + { name: 'revoke invite', method: 'delete', path: () => '/invitations/inv_existing' }, + { name: 'resend invite', method: 'post', path: () => '/invitations/inv_existing/resend' }, + { name: 'by email create', method: 'post', path: () => '/members/by-email', body: () => ({ email: `${newcomer}@membership-mutation.example.test` }) }, + { name: 'role and seat', method: 'patch', path: () => `/members/om_${target}`, body: () => ({ role: 'admin', seat_type: 'contributor' }) }, + { name: 'remove member', method: 'delete', path: () => `/members/om_${target}` }, + { name: 'request seat', method: 'post', path: () => '/seat-requests', body: () => ({ resource_type: 'working_group', resource_id: 'new_request' }) }, + { name: 'approve seat', method: 'post', path: () => `/seat-requests/${seatId}/approve` }, + { name: 'deny seat', method: 'post', path: () => `/seat-requests/${seatId}/deny` }, +]; +function call(family: Family, authCookie: string) { + return request(app)[family.method](`/api/organizations/${org}${family.path()}`) + .set('X-Organization-Id', org).set('Cookie', authCookie).set('X-CSRF-Token', CSRF_TOKEN).send(family.body?.() ?? {}); +} + +beforeAll(async () => { + pool = initializeDatabase({ connectionString: process.env.DATABASE_URL || 'postgresql://adcp:localdev@localhost:55432/adcp_test', maxPoolSize: 12 }); + await runMigrations(); + const { HTTPServer } = await import('../../src/http.js'); + app = (new HTTPServer({ backgroundServices: 'refresh-only' }) as unknown as { app: Parameters[0] }).app; + const keys = await generateKeyPair('RS256'); + signingKey = keys.privateKey; + verificationKey = keys.publicKey; + __setJWKSForTesting(async () => verificationKey); +}, 60000); +afterAll(async () => { stopAuthTimers(); __setJWKSForTesting(null); await closeDatabase(); }); +beforeEach(async () => { + for (const id of [A, B, target, newcomer]) invalidateBanCache('user', id); + invalidateBanCache('apikey', 'key_test'); + state.members.clear(); state.invitations.clear(); state.users.clear(); state.sessions.clear(); state.reads = []; state.writes = []; state.apiKeyValidations = 0; + state.beforeRead = undefined; state.afterWrite = undefined; state.rejectWrite = undefined; state.outage = false; state.malformedAuthority = false; state.malformedTarget = false; state.malformedInventory = false; state.logs = []; state.authorityRequests = []; + await pool.query('DROP TRIGGER IF EXISTS membership_test_audit ON registry_audit_log'); + await pool.query('DROP TRIGGER IF EXISTS membership_test_update ON organization_memberships'); + await pool.query('DELETE FROM working_group_memberships WHERE workos_user_id = ANY($1)', [[A, B, target, newcomer]]); + await pool.query('DELETE FROM bans WHERE entity_id = ANY($1)', [[A, B, org, otherOrg]]); + await pool.query('DELETE FROM registry_audit_log WHERE workos_organization_id = ANY($1)', [[org, otherOrg]]); + await pool.query('DELETE FROM organization_join_requests WHERE workos_organization_id = $1', [org]); + await pool.query('DELETE FROM invitation_seat_types WHERE workos_organization_id = $1', [org]); + await pool.query('DELETE FROM seat_upgrade_requests WHERE workos_organization_id = $1', [org]); + await pool.query('DELETE FROM organization_memberships WHERE workos_organization_id = ANY($1)', [[org, otherOrg]]); + await pool.query('DELETE FROM organizations WHERE workos_organization_id = ANY($1)', [[org, otherOrg]]); + await pool.query('DELETE FROM users WHERE workos_user_id = ANY($1)', [[A, B, target, newcomer]]); + for (const id of [org, otherOrg]) await pool.query("INSERT INTO organizations (workos_organization_id,name,is_personal,membership_tier,subscription_status) VALUES ($1,'Pinnacle Agency',false,'company_standard','active')", [id]); + for (const id of [A, B, target, newcomer]) { + const user = { id, email: `${id}@membership-mutation.example.test`, firstName: 'Sam', lastName: 'Adeyemi', emailVerified: true, createdAt: new Date(0).toISOString(), updatedAt: new Date(0).toISOString() }; + state.users.set(id, user); + await pool.query('INSERT INTO users (workos_user_id,email,first_name,primary_organization_id) VALUES ($1,$2,$3,$4)', [id,user.email,'Sam',org]); + } + identityId = (await pool.query('SELECT identity_id FROM identity_workos_users WHERE workos_user_id=$1', [B])).rows[0].identity_id; + await pool.query('UPDATE identity_workos_users SET identity_id=$1, is_primary=false WHERE workos_user_id=$2', [identityId,A]); + await member(A); await member(target,'member'); + joinId = (await pool.query('INSERT INTO organization_join_requests (workos_user_id,user_email,workos_organization_id) VALUES ($1,$2,$3) RETURNING id', [newcomer,`${newcomer}@membership-mutation.example.test`,org])).rows[0].id; + seatId = (await pool.query("INSERT INTO seat_upgrade_requests (workos_organization_id,workos_user_id,resource_type,resource_id) VALUES ($1,$2,'working_group','existing') RETURNING id", [org,target])).rows[0].id; + await pool.query("INSERT INTO organization_domains (workos_organization_id,domain,verified) VALUES ($1,'membership-mutation.example.test',true) ON CONFLICT DO NOTHING", [org]); + await pool.query("INSERT INTO slack_user_mappings (slack_user_id,slack_email,workos_user_id) VALUES ('U_MEMBERSHIP_TEST',$1,$2) ON CONFLICT (slack_user_id) DO UPDATE SET slack_email=$1,workos_user_id=$2", [`${newcomer}@membership-mutation.example.test`,newcomer]); + state.invitations.set('inv_existing', { id:'inv_existing',organizationId:org,email:'existing@membership-mutation.example.test',state:'pending',expiresAt:new Date(Date.now()+86400000).toISOString() }); +}); + +describe('mounted real cookie/JWT organization membership mutation fence', () => { + it('rejects a cookie mutation without the matching production CSRF header before auth or side effects', async () => { + const response = await request(app).post(`/api/organizations/${org}/invitations`) + .set('Cookie', await cookie()).send({ email: 'invitee@membership-mutation.example.test' }); + expect(response.status).toBe(403); + expect(response.body.error).toBe('CSRF validation failed'); + expect(state.reads).toEqual([]); + await noEffects(); + }); + + it('accepts the matching production CSRF cookie and header before the mutation fence', async () => { + const response = await call(families[3], await cookie()); + expect(response.status, JSON.stringify(response.body)).toBe(200); + expect(state.writes).toContain('send_invitation'); + }); + + for (const family of families) { + it(`${family.name}: exact nonprimary owner succeeds with credential and person audit`, async () => { + const response = await call(family, await cookie()); + expect(response.status, JSON.stringify(response.body)).toBeLessThan(300); + const audit = await pool.query('SELECT workos_user_id,details FROM registry_audit_log WHERE workos_organization_id=$1', [org]); + expect(audit.rowCount).toBeGreaterThan(0); + for (const row of audit.rows) { + expect(row.workos_user_id).toBe(A); + expect(row.details).toMatchObject({ authenticated_workos_user_id:A,canonical_workos_user_id:B,identity_id:identityId,authority:'exact_membership' }); + } + }); + for (const direction of ['nonprimary', 'primary']) { + it(`${family.name}: ${direction} credential cannot borrow sibling owner`, async () => { + await removeActor(); + const actor = direction === 'nonprimary' ? A : B; + await member(direction === 'nonprimary' ? B : A); + const response = await call(family, await cookie(actor)); + expect(response.status).toBe(403); + expect(state.reads).toEqual([]); + await noEffects(); + }); + } + it(`${family.name}: pre-provider epoch bump aborts with no effects`, async () => { + const gate = barrier(); state.beforeRead = gate.hook; + const pending = call(family, await cookie()).then(r => r); + await gate.arrived; + await pool.query('INSERT INTO authorization_epochs (workos_user_id,epoch) VALUES ($1,1) ON CONFLICT (workos_user_id) DO UPDATE SET epoch=authorization_epochs.epoch+1',[A]); + gate.release(); + expect((await pending).status).toBe(403); + await noEffects(); + }); + } + + for (const role of ['owner','admin','member']) { + it(`direct ${role} action policy`, async () => { + await member(A,role); + const response = await call(families[3],await cookie()); + expect(response.status).toBe(role === 'member' ? 403 : 200); + }); + } + for (const kind of ['active','revoked','expired','future','sibling']) { + it(`denies ${kind} grant-only authority`, async () => { + await removeActor(); + await pool.query(`INSERT INTO organization_credential_grants (workos_organization_id,workos_user_id,role,granted_by_workos_user_id,effective_from,effective_until,revoked_at,revoked_by_workos_user_id) + VALUES ($1,$2,'owner',$3,$4,$5,$6,$7)`,[org,kind==='sibling'?B:A,B,kind==='future'?new Date(Date.now()+60000):new Date(Date.now()-120000),kind==='expired'?new Date(Date.now()-60000):null,kind==='revoked'?new Date():null,kind==='revoked'?B:null]); + for (const family of [families[3], families[6]]) expect((await call(family,await cookie())).status).toBe(403); await noEffects(); expect(state.reads).toEqual([]); + }); + } + it('grant owner does not elevate a direct member', async () => { + await member(A,'member'); + await pool.query("INSERT INTO organization_credential_grants (workos_organization_id,workos_user_id,role,granted_by_workos_user_id) VALUES ($1,$2,'owner',$3)",[org,A,B]); + expect((await call(families[3],await cookie())).status).toBe(403); await noEffects(); + }); + for (const status of ['pending','inactive']) it(`denies provider ${status} actor`,async()=>{ + state.members.get(`om_${A}`).status=status; + expect((await call(families[3],await cookie())).status).toBe(403); await noEffects(); + }); + it('OAuth JWT exact subject and selected organization succeed',async()=>{ + const response=await request(app).post(`/api/organizations/${org}/invitations`).set('Authorization',`Bearer ${await token()}`).send({email:'invitee@membership-mutation.example.test'}); + expect(response.status,JSON.stringify(response.body)).toBe(200); + }); + it('warm OAuth cache cannot replace the authenticated credential with the canonical sibling', async () => { + const bearer = await token(); + for (const email of ['first@membership-mutation.example.test', 'second@membership-mutation.example.test']) { + const response = await request(app).post(`/api/organizations/${org}/invitations`).set('Authorization', `Bearer ${bearer}`).send({ email }); + expect(response.status, JSON.stringify(response.body)).toBe(200); + } + expect([...state.invitations.values()].filter(inv => inv.inviterUserId === A)).toHaveLength(2); + }); + for (const [credential, direction] of [[A, 'nonprimary-to-primary'], [B, 'primary-to-self']] as const) { + for (const order of [['optional', 'required'], ['required', 'optional']] as const) { + it(`${direction} bearer cache remains exact across ${order.join(' to ')} auth`, async () => { + const bearer = await token(credential); + for (const kind of order) { + const response = await request(authProbeApp).get(`/auth/${kind}-probe`).set('Authorization', `Bearer ${bearer}`); + expect(response.status, JSON.stringify(response.body)).toBe(200); + expect(response.body).toEqual({ canonical_user_id: B, credential_user_id: credential }); + } + if (credential === A) { + const mutation = await request(app).post(`/api/organizations/${org}/invitations`) + .set('Authorization', `Bearer ${bearer}`).send({ email: `${order[0]}@membership-mutation.example.test` }); + expect(mutation.status, JSON.stringify(mutation.body)).toBe(200); + expect([...state.invitations.values()].at(-1)?.inviterUserId).toBe(A); + } + }); + } + } + it('optional bearer cache preserves exact credential ban enforcement', async () => { + const bearer = await token(A); + expect((await request(authProbeApp).get('/auth/optional-probe').set('Authorization', `Bearer ${bearer}`)).status).toBe(200); + await pool.query("INSERT INTO bans (ban_type,entity_id,scope,banned_by_user_id,reason) VALUES ('user',$1,'platform',$2,'test')", [A, B]); + invalidateBanCache('user', A); + const response = await request(authProbeApp).get('/auth/required-probe').set('Authorization', `Bearer ${bearer}`); + expect(response.status).toBe(403); + expect(response.body.error).toBe('Account suspended'); + }); + it('epoch change refreshes authorization without discarding cached provider verification', async () => { + const bearer = await token(A); + expect((await request(authProbeApp).get('/auth/optional-probe').set('Authorization', `Bearer ${bearer}`)).status).toBe(200); + await pool.query('INSERT INTO authorization_epochs (workos_user_id,epoch) VALUES ($1,1) ON CONFLICT (workos_user_id) DO UPDATE SET epoch=authorization_epochs.epoch+1', [A]); + __setJWKSForTesting(async () => { throw Object.assign(new Error('JWKS unavailable'), { code: 'ECONNRESET' }); }); + try { + const response = await request(authProbeApp).get('/auth/required-probe') + .set('Accept', 'application/json').set('Authorization', `Bearer ${bearer}`); + expect(response.status).toBe(200); + expect(response.body).toEqual({ canonical_user_id: B, credential_user_id: A }); + } finally { + __setJWKSForTesting(async () => verificationKey); + } + }); + for (const change of ['epoch', 'binding-round-trip']) it(`${change} between authentication snapshot and route capture fails closed`, async () => { + const originalConnect = pool.connect.bind(pool); + let checkouts = 0; + let mutated = false; + const spy = vi.spyOn(pool, 'connect').mockImplementation((async (...args: any[]) => { + if (typeof args[0] === 'function') return (originalConnect as any)(...args); + const client = await originalConnect(); + if (++checkouts === 2) { + mutated = true; + if (change === 'epoch') await pool.query('INSERT INTO authorization_epochs (workos_user_id,epoch) VALUES ($1,1)', [A]); + else { + await pool.query('DELETE FROM identity_workos_users WHERE workos_user_id=$1', [A]); + await pool.query('INSERT INTO identity_workos_users (workos_user_id,identity_id,is_primary) VALUES ($1,$2,false)', [A,identityId]); + } + } + return client; + }) as any); + try { + expect((await call(families[3], await cookie())).status).toBe(403); + expect(mutated).toBe(true); + expect(state.reads).toEqual([]); + await noEffects(); + } finally { spy.mockRestore(); } + }); + it('binding delete-and-reinsert after cached optional bearer authentication fails before every effect', async () => { + const bearer = await token(A); + const warm = await request(authProbeApp).get('/auth/optional-probe') + .set('Authorization', `Bearer ${bearer}`); + expect(warm.status).toBe(200); + + const originalConnect = pool.connect.bind(pool); + let checkouts = 0; + let mutated = false; + const spy = vi.spyOn(pool, 'connect').mockImplementation((async (...args: any[]) => { + if (typeof args[0] === 'function') return (originalConnect as any)(...args); + const client = await originalConnect(); + if (++checkouts === 2) { + mutated = true; + await pool.query('DELETE FROM identity_workos_users WHERE workos_user_id = $1', [A]); + await pool.query( + 'INSERT INTO identity_workos_users (workos_user_id, identity_id, is_primary) VALUES ($1, $2, false)', + [A, identityId], + ); + } + return client; + }) as any); + try { + const response = await request(app).post(`/api/organizations/${org}/invitations`) + .set('Authorization', `Bearer ${bearer}`) + .send({ email: 'cached-aba@membership-mutation.example.test' }); + expect(response.status).toBe(403); + expect(mutated).toBe(true); + expect(state.reads).toEqual([]); + await noEffects(); + } finally { + spy.mockRestore(); + } + }); + for (const selector of ['header','query','query-org','body','token']) it(`denies conflicting ${selector} organization`,async()=>{ + let r=request(app).post(`/api/organizations/${org}/invitations`).set('Cookie',await cookie(A,selector==='token'?otherOrg:org)).set('X-CSRF-Token', CSRF_TOKEN); + if(selector==='header')r=r.set('X-Organization-Id',otherOrg); + if(selector==='query')r=r.query({organizationId:otherOrg}); + if(selector==='query-org')r=r.query({org:otherOrg}); + const response=await r.send({email:'invitee@membership-mutation.example.test',...(selector==='body'?{org_id:otherOrg}:{})}); + expect(response.status).toBe(403); await noEffects(); expect(state.reads).toEqual([]); + }); + it('does not infer organization from primary or sole membership when path is absent',async()=>{ + expect((await request(app).post('/api/organizations/invitations').set('Cookie',await cookie()).set('X-CSRF-Token', CSRF_TOKEN).send({email:'invitee@membership-mutation.example.test'})).status).toBe(404); await noEffects(); + }); + for (const bearer of ['invalid','native-sealed-session','bearer invalid']) it(`explicit ${bearer} cannot use a valid cookie`,async()=>{ + const header=bearer.startsWith('bearer ')?bearer:`Bearer ${bearer}`; + expect((await request(app).post(`/api/organizations/${org}/invitations`).set('Cookie',await cookie()).set('Authorization',header).send({email:'invitee@membership-mutation.example.test'})).status).toBe(401); await noEffects(); + }); + it('native sealed bearer is unsupported by base requireAuth',async()=>{ + expect((await request(app).post(`/api/organizations/${org}/invitations`).set('Authorization','Bearer native-sealed-session').send({email:'invitee@membership-mutation.example.test'})).status).toBe(401); await noEffects(); + }); + it('anonymous remains 401',async()=>{ + const response = await request(app).post(`/api/organizations/${org}/invitations`) + .set('Cookie', `csrf-token=${CSRF_TOKEN}`).set('X-CSRF-Token', CSRF_TOKEN) + .send({email:'invitee@membership-mutation.example.test'}); + expect(response.status).toBe(401); await noEffects(); + }); + it('organization API key cannot become an actor membership',async()=>{ + expect((await request(app).post(`/api/organizations/${org}/invitations`).set('Authorization','Bearer sk_membership_test').send({email:'invitee@membership-mutation.example.test'})).status).toBe(403); await noEffects(); + }); + for (const family of families) { + for (const bearer of ['membership-test-static-key', 'sk_membership_test']) { + it(`${family.name}: ${bearer.startsWith('sk_') ? 'organization API' : 'static admin'} key has no management authority`, async () => { + const before = await managementState(); + const response = await request(app)[family.method](`/api/organizations/${org}${family.path()}`) + .set('Authorization', `Bearer ${bearer}`).send(family.body?.() ?? {}); + expect(await managementState()).toEqual(before); + expect(response.status).toBe(403); + expect(state.reads).toEqual([]); + await noEffects(); + }); + } + it(`${family.name}: exact platform admin without selected-org membership is denied before provider reads`, async () => { + await removeActor(); + await platformAdmin(A); + const before = await managementState(); + const response = await call(family, await cookie()); + expect(response.status).toBe(403); + expect(state.reads).toEqual([]); + await noEffects(); + expect(await managementState()).toEqual(before); + expect(state.logs).toContainEqual(expect.objectContaining({ actorId: A, orgId: org })); + }); + } + for (const role of ['admin', 'owner']) it(`platform admin with direct ${role} succeeds only as exact_membership`, async () => { + await platformAdmin(A); + await member(A, role); + const response = await call(families[6], await cookie()); + expect(response.status, JSON.stringify(response.body)).toBe(201); + const audit = (await pool.query('SELECT workos_user_id,details FROM registry_audit_log WHERE workos_organization_id=$1', [org])).rows; + expect(audit).toHaveLength(1); + expect(audit[0]).toMatchObject({ workos_user_id: A, details: { authority: 'exact_membership', authenticated_workos_user_id: A, canonical_workos_user_id: B } }); + expect(state.authorityRequests).toContainEqual({ userId: A, organizationId: org, statuses: ['active'] }); + }); + it('platform admin cannot elevate its direct admin membership to owner', async () => { + await platformAdmin(A); + await member(A, 'admin'); + const response = await request(app).post(`/api/organizations/${org}/members/by-email`) + .set('Cookie', await cookie()).set('X-CSRF-Token', CSRF_TOKEN) + .send({ email: `${target}@membership-mutation.example.test`, role: 'owner' }); + expect(response.status).toBe(403); + await noEffects(); + }); + for (const family of [families[3], families[6]]) it(`${family.name}: an unavailable authentication grant store fails closed before mutation`, async () => { + await pool.query('ALTER TABLE organization_credential_grants RENAME TO membership_policy_grants_unavailable'); + try { + const response = await call(family, await cookie()); + expect(response.status).toBe(503); + expect(response.body).toEqual({ error: 'Authorization service temporarily unavailable' }); + expect(state.writes).toHaveLength(0); + } finally { await pool.query('ALTER TABLE membership_policy_grants_unavailable RENAME TO organization_credential_grants'); } + }); + for (const role of ['owner', 'invalid', 7, { slug: 'owner' }]) it(`reject ignores unused role ${JSON.stringify(role)}`, async () => { + const response = await request(app).post(`/api/organizations/${org}/join-requests/${joinId}/reject`) + .set('Cookie', await cookie()).set('X-CSRF-Token', CSRF_TOKEN).send({ role, reason: 'Declined' }); + expect(response.status).toBe(200); + expect(state.writes).toEqual([]); + const row = (await pool.query('SELECT status,handled_by_user_id FROM organization_join_requests WHERE id=$1', [joinId])).rows[0]; + expect(row).toEqual({ status: 'rejected', handled_by_user_id: A }); + const audit = (await pool.query('SELECT details FROM registry_audit_log WHERE workos_organization_id=$1', [org])).rows[0].details; + expect(audit.role_assigned).toBeUndefined(); + }); + it('transaction connection uncertainty is a terminal 503 with zero effects', async () => { + const original = pool.connect.bind(pool); + let checkouts = 0; + let failures = 0; + const spy = vi.spyOn(pool, 'connect').mockImplementation(((...args: any[]) => { + // Pool.query uses callback acquisition; fail only the explicit transaction + // client so real authentication can finish against the healthy pool. + if (typeof args[0] !== 'function' && ++checkouts === 2) { + failures++; + return Promise.reject(Object.assign(new Error('pool unavailable'), { code: 'ECONNRESET' })); + } + return (original as any)(...args); + }) as any); + try { + const response = await call(families[6], await cookie()); + expect(response.status).toBe(503); + expect(response.body).toEqual({ error: 'authorization_unavailable' }); + expect(failures).toBe(1); + expect(state.reads).toEqual([]); + await noEffects(); + } finally { spy.mockRestore(); } + }); + for (const source of ['target', 'owner inventory']) it(`missing provider ${source} is 503 before effects`, async () => { + await member(target, 'owner'); + state.malformedTarget = source === 'target'; + state.malformedInventory = source === 'owner inventory'; + const response = await call(families[7], await cookie()); + expect(response.status).toBe(503); + expect(response.body).toEqual({ error: 'authorization_unavailable' }); + await noEffects(); + }); + it('target revalidation outage is 503 before provider mutation', async () => { + let targetReads = 0; + const hook = async () => { + if (state.reads.at(-1) === 'get_membership' && ++targetReads === 2) throw new Error('target source unavailable'); + state.beforeRead = hook; + }; + state.beforeRead = hook; + const response = await call(families[7], await cookie()); + expect(response.status).toBe(503); + expect(response.body).toEqual({ error: 'authorization_unavailable' }); + expect(targetReads).toBe(2); + await noEffects(); + }); + it('by-email provider authority uncertainty is terminal 503', async () => { + state.malformedAuthority = true; + const response = await call(families[6], await cookie()); + expect(response.status).toBe(503); + expect(response.body).toEqual({ error: 'authorization_unavailable' }); + await noEffects(); + }); + it('invitation provider actor and residual log preserve the exact credential', async () => { + state.afterWrite = async () => { await removeActor(); }; + const response = await call(families[3], await cookie()); + expect(response.status).toBe(503); + expect(response.body.reconciliation_required).toBe(true); + expect(state.invitations.get('inv_2').inviterUserId).toBe(A); + expect(state.logs).toContainEqual(expect.objectContaining({ actorId: A, orgId: org, operationId: response.body.operation_id })); + expect((await pool.query('SELECT id FROM registry_audit_log WHERE workos_organization_id=$1', [org])).rowCount).toBe(0); + }); + + for(const entity of [A,org])it(`fresh ${entity===A?'credential':'organization'} ban is terminal`,async()=>{ + await pool.query("INSERT INTO bans (ban_type,entity_id,scope,banned_by_user_id,reason) VALUES ($1,$2,'platform',$3,'test')",[entity===A?'user':'organization',entity,B]); + expect((await call(families[3],await cookie())).status).toBe(403); await noEffects(); + }); + it('WorkOS authority outage is recoverable and never mutates',async()=>{ + state.outage=true; + expect((await call(families[3],await cookie())).status).toBe(503); await noEffects(); + }); + for(const change of ['revoke','demote','detach'])it(`${change} during authority await aborts`,async()=>{ + const gate=barrier();state.beforeRead=gate.hook; + const pending=call(families[3],await cookie()).then(r=>r);await gate.arrived; + if(change==='revoke')await removeActor(); + if(change==='demote')await member(A,'member'); + if(change==='detach')await pool.query('DELETE FROM identity_workos_users WHERE workos_user_id=$1',[A]); + gate.release();expect((await pending).status).toBe(403);await noEffects(); + }); + it('provider success then epoch revoke returns reconciliation and no local success',async()=>{ + const gate=barrier();state.afterWrite=gate.hook; + const pending=call(families[3],await cookie()).then(r=>r);await gate.arrived; + await pool.query('INSERT INTO authorization_epochs (workos_user_id,epoch) VALUES ($1,1)',[A]); + gate.release();const response=await pending; + expect(response.status).toBe(503);expect(response.body.reconciliation_required).toBe(true); + expect((await pool.query('SELECT * FROM invitation_seat_types WHERE workos_organization_id=$1',[org])).rowCount).toBe(0); + expect([...state.invitations.values()].some(inv=>inv.email==='invitee@membership-mutation.example.test'&&inv.state==='pending')).toBe(false); + }); + for(const mode of ['exception','suppression'])for(const familyIndex of [1,3,7,9,10,11])it(`${families[familyIndex].name}: audit ${mode} aborts local success`,async()=>{ + const databaseSecret = 'database password=never-serialize'; + await pool.query(`CREATE OR REPLACE FUNCTION membership_test_audit_fn() RETURNS trigger LANGUAGE plpgsql AS $$ BEGIN ${mode==='exception'?`RAISE EXCEPTION '${databaseSecret}';`:'RETURN NULL;'} END $$`); + await pool.query("CREATE TRIGGER membership_test_audit BEFORE INSERT ON registry_audit_log FOR EACH ROW WHEN (NEW.workos_organization_id = 'org_mutation_test') EXECUTE FUNCTION membership_test_audit_fn()"); + const response=await call(families[familyIndex],await cookie()); + expect(response.status).toBeGreaterThanOrEqual(400); + expect(JSON.stringify(response.body)).not.toContain(databaseSecret); + expect((await pool.query('SELECT status FROM organization_join_requests WHERE id=$1',[joinId])).rows[0].status).toBe('pending'); + expect((await pool.query('SELECT status FROM seat_upgrade_requests WHERE id=$1',[seatId])).rows[0].status).toBe('pending'); + expect((await pool.query('SELECT role,seat_type FROM organization_memberships WHERE workos_user_id=$1 AND workos_organization_id=$2',[target,org])).rows[0]).toMatchObject({role:'member',seat_type:'community_only'}); + }); + it('suppressed membership UPDATE cannot report success',async()=>{ + await pool.query('CREATE OR REPLACE FUNCTION membership_test_update_fn() RETURNS trigger LANGUAGE plpgsql AS $$ BEGIN RETURN NULL; END $$'); + await pool.query("CREATE TRIGGER membership_test_update BEFORE UPDATE ON organization_memberships FOR EACH ROW WHEN (NEW.workos_organization_id = 'org_mutation_test') EXECUTE FUNCTION membership_test_update_fn()"); + const response=await call(families[7],await cookie()); + expect(response.status).toBe(503);expect(response.body.reconciliation_required).toBe(true); + }); + it('two owners cannot demote each other concurrently',async()=>{ + await member(B); + const gate=barrier();state.afterWrite=gate.hook; + const first=request(app).patch(`/api/organizations/${org}/members/om_${B}`).set('Cookie',await cookie(A)).set('X-CSRF-Token', CSRF_TOKEN).send({role:'member'}).then(r=>r); + await gate.arrived; + const second=request(app).patch(`/api/organizations/${org}/members/om_${A}`).set('Cookie',await cookie(B)).set('X-CSRF-Token', CSRF_TOKEN).send({role:'member'}).then(r=>r); + gate.release();const responses=await Promise.all([first,second]); + expect(responses.map(r=>r.status).sort()).toEqual([200,403]); + expect([...state.members.values()].filter(m=>m.role.slug==='owner')).toHaveLength(1); + }); + it('admin cannot issue an owner invitation',async()=>{ + await member(A,'admin'); + const response=await request(app).post(`/api/organizations/${org}/invitations`).set('Cookie',await cookie()).set('X-CSRF-Token', CSRF_TOKEN).send({email:'invitee@membership-mutation.example.test',role:'owner'}); + expect(response.status).toBe(403);await noEffects(); + }); + it('expired invitation release is provider-confirmed, exact, audited, and does not call revoke', async () => { + state.invitations.get('inv_existing').state = 'expired'; + state.invitations.get('inv_existing').expiresAt = new Date(Date.now() - 1000).toISOString(); + await pool.query(`INSERT INTO invitation_seat_types + (workos_invitation_id,workos_organization_id,email,seat_type,source) + VALUES ('inv_existing',$1,'existing@membership-mutation.example.test','community_only','invited')`, [org]); + const response = await call(families[4], await cookie()); + expect(response.status, JSON.stringify(response.body)).toBe(200); + expect(state.writes).toEqual([]); + expect((await pool.query('SELECT 1 FROM invitation_seat_types WHERE workos_invitation_id=$1 AND workos_organization_id=$2', ['inv_existing', org])).rowCount).toBe(0); + expect((await pool.query('SELECT action,details FROM registry_audit_log WHERE resource_id=$1', ['inv_existing'])).rows) + .toEqual([expect.objectContaining({ action: 'invitation_reservation_released', details: expect.objectContaining({ provider_state: 'expired', expired: true }) })]); + }); + it('expired invitation resend atomically replaces the exact seat reservation without revoke', async () => { + state.invitations.get('inv_existing').state = 'expired'; + state.invitations.get('inv_existing').expiresAt = new Date(Date.now() - 1000).toISOString(); + await pool.query(`INSERT INTO invitation_seat_types + (workos_invitation_id,workos_organization_id,email,seat_type,source) + VALUES ('inv_existing',$1,'existing@membership-mutation.example.test','community_only','invited')`, [org]); + const response = await call(families[5], await cookie()); + expect(response.status, JSON.stringify(response.body)).toBe(200); + expect(state.writes).toEqual(['send_invitation']); + expect((await pool.query(`SELECT workos_invitation_id,seat_type FROM invitation_seat_types + WHERE workos_organization_id=$1`, [org])).rows) + .toEqual([{ workos_invitation_id: response.body.invitation.id, seat_type: 'community_only' }]); + expect((await pool.query('SELECT action FROM registry_audit_log WHERE resource_id=$1', [response.body.invitation.id])).rows) + .toEqual([{ action: 'invitation_resent' }]); + }); + it('accepted invitation cannot release or replace a seat reservation', async () => { + state.invitations.get('inv_existing').state = 'accepted'; + await pool.query(`INSERT INTO invitation_seat_types + (workos_invitation_id,workos_organization_id,email,seat_type,source) + VALUES ('inv_existing',$1,'existing@membership-mutation.example.test','community_only','invited')`, [org]); + for (const family of [families[4], families[5]]) { + state.writes = []; + const response = await call(family, await cookie()); + expect(response.status).toBe(409); + expect(state.writes).toEqual([]); + expect((await pool.query('SELECT 1 FROM invitation_seat_types WHERE workos_invitation_id=$1 AND workos_organization_id=$2', ['inv_existing', org])).rowCount).toBe(1); + expect((await pool.query('SELECT 1 FROM registry_audit_log WHERE resource_id=$1', ['inv_existing'])).rowCount).toBe(0); + } + }); + it('expired resend keeps its seat reserved while a concurrent invitation waits', async () => { + state.invitations.get('inv_existing').state = 'expired'; + state.invitations.get('inv_existing').expiresAt = new Date(Date.now() - 1000).toISOString(); + await pool.query("UPDATE organizations SET membership_tier=NULL,subscription_status=NULL WHERE workos_organization_id=$1", [org]); + await pool.query("UPDATE organization_memberships SET seat_type='contributor' WHERE workos_organization_id=$1", [org]); + await pool.query(`INSERT INTO invitation_seat_types + (workos_invitation_id,workos_organization_id,email,seat_type,source) + VALUES ('inv_existing',$1,'existing@membership-mutation.example.test','community_only','invited')`, [org]); + const gate = barrier(); + state.afterWrite = gate.hook; + const resend = call(families[5], await cookie()).then(response => response); + await gate.arrived; + const concurrent = request(app).post(`/api/organizations/${org}/invitations`).set('Cookie', await cookie()).set('X-CSRF-Token', CSRF_TOKEN) + .send({ email: 'concurrent@membership-mutation.example.test', seat_type: 'community_only' }).then(response => response); + await waitForDatabaseLock('pg_advisory_xact_lock'); + expect((await pool.query('SELECT workos_invitation_id FROM invitation_seat_types WHERE workos_organization_id=$1', [org])).rows) + .toEqual([{ workos_invitation_id: 'inv_existing' }]); + gate.release(); + expect((await resend).status).toBe(200); + const denied = await concurrent; + expect(denied.status).toBe(403); + expect(denied.body.error).toBe('access_denied'); + expect(state.writes).toEqual(['send_invitation']); + expect((await pool.query('SELECT COUNT(*)::int AS count FROM invitation_seat_types WHERE workos_organization_id=$1', [org])).rows[0].count).toBe(1); + }); + it('expired reservation rowCount mismatch rolls back without audit or provider calls', async () => { + state.invitations.get('inv_existing').state = 'expired'; + state.invitations.get('inv_existing').expiresAt = new Date(Date.now() - 1000).toISOString(); + await pool.query(`INSERT INTO invitation_seat_types + (workos_invitation_id,workos_organization_id,email,seat_type,source) + VALUES ('inv_existing',$1,'existing@membership-mutation.example.test','community_only','invited')`, [org]); + await pool.query('CREATE OR REPLACE FUNCTION membership_test_stage_delete_fn() RETURNS trigger LANGUAGE plpgsql AS $$ BEGIN RETURN NULL; END $$'); + await pool.query("CREATE TRIGGER membership_test_stage_delete BEFORE DELETE ON invitation_seat_types FOR EACH ROW WHEN (OLD.workos_organization_id = 'org_mutation_test') EXECUTE FUNCTION membership_test_stage_delete_fn()"); + try { + const response = await call(families[4], await cookie()); + expect(response.status).toBe(409); + expect(state.writes).toEqual([]); + expect((await pool.query('SELECT 1 FROM invitation_seat_types WHERE workos_invitation_id=$1', ['inv_existing'])).rowCount).toBe(1); + expect((await pool.query('SELECT 1 FROM registry_audit_log WHERE resource_id=$1', ['inv_existing'])).rowCount).toBe(0); + } finally { + await pool.query('DROP TRIGGER membership_test_stage_delete ON invitation_seat_types'); + await pool.query('DROP FUNCTION membership_test_stage_delete_fn()'); + } + }); + it('expired reservation release requires audit and rolls back when audit is suppressed', async () => { + state.invitations.get('inv_existing').state = 'expired'; + state.invitations.get('inv_existing').expiresAt = new Date(Date.now() - 1000).toISOString(); + await pool.query(`INSERT INTO invitation_seat_types + (workos_invitation_id,workos_organization_id,email,seat_type,source) + VALUES ('inv_existing',$1,'existing@membership-mutation.example.test','community_only','invited')`, [org]); + await pool.query('CREATE OR REPLACE FUNCTION membership_test_audit_fn() RETURNS trigger LANGUAGE plpgsql AS $$ BEGIN RETURN NULL; END $$'); + await pool.query("CREATE TRIGGER membership_test_audit BEFORE INSERT ON registry_audit_log FOR EACH ROW WHEN (NEW.workos_organization_id = 'org_mutation_test') EXECUTE FUNCTION membership_test_audit_fn()"); + const response = await call(families[4], await cookie()); + expect(response.status).toBe(409); + expect(state.writes).toEqual([]); + expect((await pool.query('SELECT 1 FROM invitation_seat_types WHERE workos_invitation_id=$1', ['inv_existing'])).rowCount).toBe(1); + expect((await pool.query('SELECT 1 FROM registry_audit_log WHERE resource_id=$1', ['inv_existing'])).rowCount).toBe(0); + }); + it('resend rejection preserves honest revoked upstream state',async()=>{ + state.afterWrite=async()=>{state.rejectWrite=Object.assign(new Error('reject'),{status:422});}; + const response=await call(families[5],await cookie()); + expect(response.status).toBe(503);expect(response.body.reconciliation_required).toBe(true); + expect(state.invitations.get('inv_existing').state).toBe('revoked'); + }); + it('provider timeout has unknown outcome, never an invented rollback',async()=>{ + state.rejectWrite=Object.assign(new Error('timeout'),{code:'ETIMEDOUT'}); + const response=await call(families[3],await cookie()); + expect(response.status).toBe(503);expect(response.body.reconciliation_required).toBe(true); + expect(state.writes).toEqual(['send_invitation']); + }); +}); diff --git a/server/tests/integration/organizations-tier-not-caller-controlled.test.ts b/server/tests/integration/organizations-tier-not-caller-controlled.test.ts index 8ecc03207ca..a1ffdbae259 100644 --- a/server/tests/integration/organizations-tier-not-caller-controlled.test.ts +++ b/server/tests/integration/organizations-tier-not-caller-controlled.test.ts @@ -119,7 +119,6 @@ describe('POST /api/organizations: tier and domain are not caller-controlled', ( }); await runMigrations(); server = new HTTPServer(); - await server.start(0); app = server.app; }); @@ -136,7 +135,6 @@ describe('POST /api/organizations: tier and domain are not caller-controlled', ( await pool.query(`DELETE FROM organizations WHERE workos_organization_id LIKE $1`, [ `${TEST_ORG_PREFIX}%`, ]); - await server?.stop(); await closeDatabase(); }); @@ -153,7 +151,7 @@ describe('POST /api/organizations: tier and domain are not caller-controlled', ( await pool.query(`DELETE FROM organization_domains WHERE domain LIKE $1`, [`%${TEST_DOMAIN}`]); }); - it('ignores caller-supplied membership_tier — DB row stores NULL', async () => { + it('denies onboarding without persisting caller-supplied membership_tier', async () => { const res = await request(app) .post('/api/organizations') .send({ @@ -166,21 +164,15 @@ describe('POST /api/organizations: tier and domain are not caller-controlled', ( membership_tier: 'company_leader', }); - expect(res.status).toBeGreaterThanOrEqual(200); - expect(res.status).toBeLessThan(300); + expect(res.status).toBe(403); + expect(res.body.error).toBe('organization_onboarding_disabled'); + expect(mockCreateOrganization).not.toHaveBeenCalled(); + expect(mockCreateOrganizationMembership).not.toHaveBeenCalled(); + expect((await pool.query('SELECT * FROM organizations WHERE workos_organization_id = $1', [createdOrgId])).rowCount).toBe(0); - const orgId = res.body?.organization?.id ?? res.body?.id; - expect(orgId).toBeTruthy(); - - const row = await pool.query<{ membership_tier: string | null }>( - `SELECT membership_tier FROM organizations WHERE workos_organization_id = $1`, - [orgId], - ); - expect(row.rowCount).toBe(1); - expect(row.rows[0].membership_tier).toBeNull(); }); - it('does not 400 when caller-supplied corporate_domain disagrees with email — field is ignored', async () => { + it('denies onboarding without attaching a caller-supplied corporate_domain', async () => { const res = await request(app) .post('/api/organizations') .send({ @@ -192,16 +184,11 @@ describe('POST /api/organizations: tier and domain are not caller-controlled', ( corporate_domain: 'someone-else.example', }); - expect(res.status).not.toBe(400); - expect(res.status).toBeGreaterThanOrEqual(200); - expect(res.status).toBeLessThan(300); - - const orgId = res.body?.organization?.id ?? res.body?.id; - const domainRow = await pool.query<{ domain: string }>( - `SELECT domain FROM organization_domains WHERE workos_organization_id = $1`, - [orgId], - ); - expect(domainRow.rows.map((r) => r.domain)).toContain(TEST_DOMAIN); - expect(domainRow.rows.map((r) => r.domain)).not.toContain('someone-else.example'); + expect(res.status).toBe(403); + expect(res.body.error).toBe('organization_onboarding_disabled'); + expect(mockCreateOrganization).not.toHaveBeenCalled(); + expect(mockCreateOrganizationMembership).not.toHaveBeenCalled(); + expect((await pool.query('SELECT * FROM organization_domains WHERE workos_organization_id = $1', [createdOrgId])).rowCount).toBe(0); + }); }); diff --git a/server/tests/integration/personal-workspace-restrictions.test.ts b/server/tests/integration/personal-workspace-restrictions.test.ts index 61401958297..69212586d88 100644 --- a/server/tests/integration/personal-workspace-restrictions.test.ts +++ b/server/tests/integration/personal-workspace-restrictions.test.ts @@ -19,7 +19,7 @@ const { TEST_PERSONAL_ORG_ID: 'org_personal_test', TEST_TEAM_ORG_ID: 'org_team_test', listOrganizationMemberships: vi.fn(), - sendInvitation: vi.fn().mockResolvedValue({ id: 'inv_test' }), + sendInvitation: vi.fn(), generateAdminPortalLink: vi.fn().mockResolvedValue({ link: 'https://test-portal.workos.com' }), }; }); @@ -31,6 +31,7 @@ vi.mock('@workos-inc/node', () => ({ userManagement = { listOrganizationMemberships, sendInvitation, + getInvitation: async () => sendInvitation.mock.results.at(-1)?.value, }; organizations = { getOrganization: vi.fn().mockImplementation((orgId: string) => Promise.resolve({ @@ -44,35 +45,30 @@ vi.mock('@workos-inc/node', () => ({ }, })); -// Mock WorkOS client BEFORE any imports that use it -vi.mock('../../src/auth/workos-client.js', () => ({ - workos: { - userManagement: { - listOrganizationMemberships, - sendInvitation, - }, - organizations: { - getOrganization: vi.fn().mockImplementation((orgId: string) => Promise.resolve({ - id: orgId, - name: orgId === TEST_PERSONAL_ORG_ID ? 'Personal Workspace' : 'Team Workspace', - })), - }, - adminPortal: { - generateLink: generateAdminPortalLink, - }, - }, +// The mutation boundary uses the enforcement wrapper; both clients expose the +// same provider fixture. Real cookie/JWT authentication is covered separately. +vi.mock('../../src/auth/workos-client.js', async () => { + const { WorkOS } = await import('@workos-inc/node'); + const instance = new WorkOS(); + return { workos: instance, getWorkos: () => instance, getAuthorizationEnforcementWorkos: () => instance }; +}); + +vi.mock('../../src/auth/workos-jwt.js', async (importOriginal) => ({ + ...(await importOriginal()), + verifyWorkOSJWT: async (value: string) => ({ sub: value, isM2M: false }), })); import { HTTPServer } from '../../src/http.js'; import request from 'supertest'; import { getPool, initializeDatabase, closeDatabase } from '../../src/db/client.js'; +import { stampOrganizationTestUser } from '../helpers/organization-auth-fixture.js'; import { runMigrations } from '../../src/db/migrate.js'; import type { Pool } from 'pg'; // Mock auth middleware to bypass authentication in tests vi.mock('../../src/middleware/auth.js', async (importOriginal) => ({ ...(await importOriginal()), - requireAuth: (req: any, _res: any, next: any) => { + requireAuth: async (req: any, _res: any, next: any) => { req.user = { id: TEST_USER_ID, email: 'owner@test.com', @@ -80,6 +76,8 @@ vi.mock('../../src/middleware/auth.js', async (importOriginal) => ({ lastName: 'User', is_admin: false }; + req.accessToken = TEST_USER_ID; + await stampOrganizationTestUser(req.user, req.params.orgId); next(); }, requireAdmin: (_req: any, res: any) => { @@ -131,13 +129,19 @@ describe('Personal Workspace Restrictions', () => { beforeEach(async () => { generateAdminPortalLink.mockClear(); + sendInvitation.mockReset().mockImplementation(async ({ email, organizationId }) => ({ + id: 'inv_personal_policy_test', email, organizationId, state: 'pending', + expiresAt: new Date(Date.now() + 86400000).toISOString(), + })); + await pool.query('DELETE FROM registry_audit_log WHERE workos_organization_id = ANY($1)', [[TEST_PERSONAL_ORG_ID, TEST_TEAM_ORG_ID]]); + await pool.query('DELETE FROM organization_memberships WHERE workos_organization_id = ANY($1)', [[TEST_PERSONAL_ORG_ID, TEST_TEAM_ORG_ID]]); // Reset per-test: handler calls workos!.userManagement.listOrganizationMemberships via the new // WorkOS() instance; return owner membership for test user in known org IDs. // Note: the invitation test (team org) relies on community_only seat limit = 1 from DEFAULT_SEAT_LIMITS. listOrganizationMemberships.mockReset().mockImplementation(({ organizationId }: { organizationId: string }) => { if (organizationId === TEST_PERSONAL_ORG_ID || organizationId === TEST_TEAM_ORG_ID) { return Promise.resolve({ - data: [{ id: 'om_test', userId: TEST_USER_ID, organizationId, role: { slug: 'owner' }, status: 'active' }], + data: [{ id: `om_${organizationId}`, userId: TEST_USER_ID, organizationId, role: { slug: 'owner' }, status: 'active' }], }); } return Promise.resolve({ data: [] }); @@ -157,10 +161,20 @@ describe('Personal Workspace Restrictions', () => { ON CONFLICT (workos_organization_id) DO UPDATE SET name = $2, is_personal = false`, [TEST_TEAM_ORG_ID, 'Team Workspace'] ); + + await pool.query('INSERT INTO users (workos_user_id, email) VALUES ($1, $2) ON CONFLICT DO NOTHING', [TEST_USER_ID, 'owner@test.com']); + // Exact owner authority must exist locally and at WorkOS. A contributor + // owner leaves the existing one-community-seat invitation allowance free. + for (const orgId of [TEST_PERSONAL_ORG_ID, TEST_TEAM_ORG_ID]) { + await pool.query(`INSERT INTO organization_memberships + (workos_user_id, workos_organization_id, workos_membership_id, email, role, seat_type) + VALUES ($1, $2, $3, 'owner@test.com', 'owner', 'contributor')`, [TEST_USER_ID, orgId, `om_${orgId}`]); + } }); afterEach(async () => { // Clean up test data; invitation_seat_types has no FK to organizations so must be deleted explicitly. + await pool.query('DELETE FROM organization_memberships WHERE workos_organization_id = ANY($1)', [[TEST_PERSONAL_ORG_ID, TEST_TEAM_ORG_ID]]); await pool.query('DELETE FROM invitation_seat_types WHERE workos_organization_id LIKE $1', ['org_team%']); await pool.query('DELETE FROM organizations WHERE workos_organization_id LIKE $1', ['org_personal%']); await pool.query('DELETE FROM organizations WHERE workos_organization_id LIKE $1', ['org_team%']); @@ -173,8 +187,9 @@ describe('Personal Workspace Restrictions', () => { .send({ email: 'test@example.com', role: 'member' }) .expect(400); - expect(response.body.error).toBe('Personal workspace'); - expect(response.body.message).toContain('Personal workspaces cannot have team members'); + expect(response.body.error).toBe('invalid_request'); + expect(sendInvitation).not.toHaveBeenCalled(); + expect((await pool.query('SELECT 1 FROM registry_audit_log WHERE workos_organization_id = $1', [TEST_PERSONAL_ORG_ID])).rowCount).toBe(0); }); it('should allow invitations to team workspaces', async () => { @@ -184,6 +199,9 @@ describe('Personal Workspace Restrictions', () => { .expect(200); expect(response.body.invitation).toBeDefined(); + expect(sendInvitation).toHaveBeenCalledWith(expect.objectContaining({ inviterUserId: TEST_USER_ID, organizationId: TEST_TEAM_ORG_ID })); + const audit = await pool.query('SELECT workos_user_id FROM registry_audit_log WHERE workos_organization_id = $1', [TEST_TEAM_ORG_ID]); + expect(audit.rows).toEqual([{ workos_user_id: TEST_USER_ID }]); }); }); diff --git a/server/tests/integration/user-authorization-snapshot.test.ts b/server/tests/integration/user-authorization-snapshot.test.ts index d95cb8ac288..9a99b2cffd7 100644 --- a/server/tests/integration/user-authorization-snapshot.test.ts +++ b/server/tests/integration/user-authorization-snapshot.test.ts @@ -118,6 +118,7 @@ describe('primary database authorization snapshots', () => { expect(cold).toMatchObject({ authenticatedUserId: PERSONAL_ID, canonicalUserId: PERSONAL_ID, + bindingVersion: expect.any(String), authorizationEpoch: '0', selectedOrganizationId: null, credentialGrant: null, @@ -209,6 +210,32 @@ describe('primary database authorization snapshots', () => { expect(sameAuthorizationSnapshot(bumped, absent)).toBe(false); }); + it('rejects delete-and-reinsert replay of the same identity binding', async () => { + const before = await snapshot(PERSONAL_ID, PERSONAL_ORG); + const binding = await pool.query<{ identity_id: string; is_primary: boolean }>( + 'SELECT identity_id, is_primary FROM identity_workos_users WHERE workos_user_id = $1', + [PERSONAL_ID], + ); + await pool.query('DELETE FROM identity_workos_users WHERE workos_user_id = $1', [PERSONAL_ID]); + await pool.query( + `INSERT INTO identity_workos_users (workos_user_id, identity_id, is_primary) + VALUES ($1, $2, $3)`, + [PERSONAL_ID, binding.rows[0].identity_id, binding.rows[0].is_primary], + ); + const after = await snapshot(PERSONAL_ID, PERSONAL_ORG); + + expect(after).toMatchObject({ + authenticatedUserId: before.authenticatedUserId, + canonicalUserId: before.canonicalUserId, + identityId: before.identityId, + authorizationEpoch: before.authorizationEpoch, + }); + expect(after.bindingVersion).not.toBe(before.bindingVersion); + expect(sameAuthorizationIdentity(before, after)).toBe(false); + expect(sameAuthorizationSnapshot(before, after)).toBe(false); + expect(sameAuthorizationSnapshot(after, before)).toBe(false); + }); + it('rejects replays with altered credential, identity, selection, or grant details', async () => { await grant(PERSONAL_ID, PERSONAL_ORG, { until: '2999-01-01T00:00:00.654321Z' }); const current = await snapshot(PERSONAL_ID, PERSONAL_ORG); @@ -218,6 +245,7 @@ describe('primary database authorization snapshots', () => { { authenticatedUserId: CORPORATE_ID }, { canonicalUserId: CORPORATE_ID }, { identityId: null }, + { bindingVersion: `${current.bindingVersion}-replacement` }, { authorizationEpoch: '1' }, { credential: { ...current.credential, email: 'changed@example.test' } }, ]; @@ -367,6 +395,7 @@ describe('primary database authorization snapshots', () => { authenticated_user_id: hasUser ? primary.authenticatedUserId : null, canonical_user_id: hasUser ? primary.canonicalUserId : null, identity_id: hasUser ? primary.identityId : null, + binding_version: hasUser ? primary.bindingVersion : null, authorization_epoch: '0', email: hasUser ? primary.credential.email : null, first_name: hasUser ? primary.credential.firstName : null, diff --git a/server/tests/integration/workos-user-deletion-race.test.ts b/server/tests/integration/workos-user-deletion-race.test.ts index 823b2da15ea..2f27d6290f2 100644 --- a/server/tests/integration/workos-user-deletion-race.test.ts +++ b/server/tests/integration/workos-user-deletion-race.test.ts @@ -6,6 +6,7 @@ import type { Pool } from 'pg'; const mocks = vi.hoisted(() => ({ constructEvent: vi.fn(), getUser: vi.fn(), + listOrganizationMemberships: vi.fn(), listUsers: vi.fn(), invalidateSessionsForUsers: vi.fn(), notifySystemError: vi.fn(), @@ -17,6 +18,12 @@ const mocks = vi.hoisted(() => ({ vi.mock('../../src/auth/workos-client.js', async (importOriginal) => ({ ...(await importOriginal()), + getAuthorizationEnforcementWorkos: () => ({ + userManagement: { + getUser: mocks.getUser, + listOrganizationMemberships: mocks.listOrganizationMemberships, + }, + }), getWorkos: () => ({ webhooks: { constructEvent: mocks.constructEvent }, userManagement: { @@ -74,6 +81,7 @@ const { IDENTITY_DELETION_SNAPSHOT_POLICY, IDENTITY_RECOVERY_STATE, withActiveCredentialEventMutation, + withActiveCredentialEventMutationAfterSerializedPrefetch, withCredentialCreationEventMutation, upsertWorkosUserInCredentialEvent, } = await import('../../src/db/identity-db.js'); @@ -124,6 +132,19 @@ describe('WorkOS webhook vs sync-users deletion', () => { mocks.deletionWaiters.length = 0; mocks.coordinateDeletionCallers = false; mocks.tryAutoLinkWebsiteUserToSlack.mockResolvedValue({ linked: false, reason: 'no_slack_user' }); + mocks.listOrganizationMemberships.mockImplementation(async (input: { + userId: string; + organizationId: string; + }) => ({ + data: [{ + id: 'om_race_restore', + userId: input.userId, + organizationId: input.organizationId, + status: 'active', + role: { slug: 'admin' }, + }], + listMetadata: {}, + })); }); async function cleanup() { @@ -962,15 +983,63 @@ describe('WorkOS webhook vs sync-users deletion', () => { )).rows).toEqual([]); }); - it('does not hold the credential lock while membership provider prefetch is hung', async () => { + it('serializes membership provider prefetch without blocking confirmed deletion', async () => { + await seedIdentity(); + let releasePrefetch!: () => void; + let prefetchEntered!: () => void; + const entered = new Promise((resolve) => { prefetchEntered = resolve; }); + const release = new Promise((resolve) => { releasePrefetch = resolve; }); + const first = withActiveCredentialEventMutationAfterSerializedPrefetch( + PRIMARY, + async () => { + prefetchEntered(); + await release; + }, + async () => { + throw new Error('deleted credential must not reach local mutation'); + }, + ); + await entered; + + let secondPrefetchRan = false; + const second = withActiveCredentialEventMutationAfterSerializedPrefetch( + PRIMARY, + async () => { secondPrefetchRan = true; }, + async () => { + throw new Error('deleted credential must not reach local mutation'); + }, + ); + + const deletion = await within(deleteIdentityCredential(PRIMARY, 'workos_webhook'), 1_000); + expect(deletion.deleted).toBe(true); + expect(secondPrefetchRan).toBe(false); + + releasePrefetch(); + await expect(within(Promise.all([first, second]), 1_000)).resolves.toEqual([ + { applied: false }, + { applied: false }, + ]); + expect(secondPrefetchRan).toBe(false); + }); + + it.each(['membership', 'user'] as const)( + 'does not hold the credential lock while the %s provider prefetch is hung', + async (hungRead) => { await seedIdentity(); mocks.constructEvent.mockResolvedValue(undefined); let providerEntered!: () => void; const entered = new Promise((resolve) => { providerEntered = resolve; }); - mocks.getUser.mockImplementation(async () => { - providerEntered(); - return new Promise(() => undefined); - }); + if (hungRead === 'membership') { + mocks.listOrganizationMemberships.mockImplementationOnce(async () => { + providerEntered(); + return new Promise(() => undefined); + }); + } else { + mocks.getUser.mockImplementation(async () => { + providerEntered(); + return new Promise(() => undefined); + }); + } const app = express(); app.use('/api/webhooks', createWorkOSWebhooksRouter()); const started = Date.now(); @@ -989,11 +1058,15 @@ describe('WorkOS webhook vs sync-users deletion', () => { const eventResponse = await within(event, 1_000); expect(deletion.deleted).toBe(true); - expect(eventResponse.status).toBe(500); + // The repaired webhook classifies a bounded provider-read timeout as + // temporary authority-source unavailability, matching its existing 503 + // contract for provider membership/user reads rather than a generic 500. + expect(eventResponse.status).toBe(503); expect(Date.now() - started).toBeLessThan(1_000); expect((await pool.query(`SELECT 1 FROM users WHERE workos_user_id = $1`, [PRIMARY])).rows) .toEqual([]); - }); + }, + ); it('fails a signed stale writer closed after bounded credential-lock retries', async () => { await seedIdentity(); diff --git a/server/tests/unit/addie-admin-global-auth.test.ts b/server/tests/unit/addie-admin-global-auth.test.ts index 33ed901af67..d1bb5dda062 100644 --- a/server/tests/unit/addie-admin-global-auth.test.ts +++ b/server/tests/unit/addie-admin-global-auth.test.ts @@ -138,6 +138,7 @@ describe('Addie real global-admin boundary', () => { authenticated_user_id: 'user_sso_admin', canonical_user_id: 'user_sso_admin', identity_id: 'identity_sso_admin', + binding_version: 'binding_sso_admin', authorization_epoch: '0', email: 'sso-admin@example.test', email_verified: true, first_name: 'SSO', last_name: 'Admin', grant_id: null, @@ -273,7 +274,8 @@ describe('Addie real global-admin boundary', () => { mocks.snapshotQuery.mockResolvedValue({ rows: [{ in_recovery: false, terminal_marker: false, primary_count: '1', authenticated_user_id: 'user_sso_admin', canonical_user_id: 'user_linked_primary', - identity_id: '00000000-0000-4000-8000-000000000001', authorization_epoch: '0', + identity_id: '00000000-0000-4000-8000-000000000001', binding_version: 'binding_sso_admin', + authorization_epoch: '0', email: 'sso-admin@example.test', email_verified: true, first_name: 'SSO', last_name: 'Admin', grant_id: null, }] }); diff --git a/server/tests/unit/api-key-exact-credential-auth.test.ts b/server/tests/unit/api-key-exact-credential-auth.test.ts index f39e26b3250..afe871538f3 100644 --- a/server/tests/unit/api-key-exact-credential-auth.test.ts +++ b/server/tests/unit/api-key-exact-credential-auth.test.ts @@ -100,7 +100,7 @@ beforeEach(() => { mocks.getRefreshedSession.mockResolvedValue(null); mocks.loadAuthorizationSnapshot.mockImplementation(async (id: string, org: string | null) => ({ authenticatedUserId: id, canonicalUserId: id, identityId: 'identity_one', - authorizationEpoch: '1', selectedOrganizationId: org, credentialGrant: null, + bindingVersion: 'binding-1', authorizationEpoch: '1', selectedOrganizationId: org, credentialGrant: null, credential: { email: 'sam@example.test', emailVerified: true, firstName: 'Sam', lastName: 'Adeyemi' }, })); }); diff --git a/server/tests/unit/api-key-issuance-permissions.test.ts b/server/tests/unit/api-key-issuance-permissions.test.ts index b99c5a27220..b0f845bb628 100644 --- a/server/tests/unit/api-key-issuance-permissions.test.ts +++ b/server/tests/unit/api-key-issuance-permissions.test.ts @@ -73,7 +73,7 @@ function snapshotRow(userId: string, organizationId?: string, role?: 'owner' | ' return { in_recovery: false, terminal_marker: false, primary_count: '1', authenticated_user_id: userId, canonical_user_id: userId === 'user_linked' ? 'user_primary' : userId, - identity_id: 'identity_original', authorization_epoch: '1', + identity_id: 'identity_original', binding_version: `binding_${userId}`, authorization_epoch: '1', email: 'caller@example.test', email_verified: true, first_name: null, last_name: null, grant_id: role ? 'grant_scoped' : null, grant_organization_id: role ? organizationId : null, grant_role: role ?? null, grant_effective_from: role ? '2026-01-01T00:00:00.000000Z' : null, diff --git a/server/tests/unit/api-key-validation-timeout.test.ts b/server/tests/unit/api-key-validation-timeout.test.ts index 1effd7815ab..f76921b8b8d 100644 --- a/server/tests/unit/api-key-validation-timeout.test.ts +++ b/server/tests/unit/api-key-validation-timeout.test.ts @@ -115,7 +115,7 @@ describe('actual WorkOS client API-key request budget', () => { sessionData: bearer, cookiePassword: process.env.WORKOS_COOKIE_PASSWORD!, }).authenticate()).rejects.toMatchObject({ code: 'ERR_JOSE_NOT_SUPPORTED' }); snapshotMock.mockImplementation(async (id: string, org: string | null) => ({ - authenticatedUserId: id, canonicalUserId: id, identityId: null, authorizationEpoch: '1', + authenticatedUserId: id, canonicalUserId: id, identityId: null, bindingVersion: 'binding-1', authorizationEpoch: '1', selectedOrganizationId: org, credentialGrant: null, credential: { email: `${id}@example.test`, emailVerified: true, firstName: null, lastName: null }, })); diff --git a/server/tests/unit/authorization-epoch-session.test.ts b/server/tests/unit/authorization-epoch-session.test.ts index f9d33a086c3..4b359a0ba65 100644 --- a/server/tests/unit/authorization-epoch-session.test.ts +++ b/server/tests/unit/authorization-epoch-session.test.ts @@ -58,7 +58,8 @@ let sequence = 0; function snapshot(overrides: Partial = {}): AuthorizationSnapshot { return { authenticatedUserId: AUTHENTICATED_ID, canonicalUserId: AUTHENTICATED_ID, - identityId: 'identity_epoch', authorizationEpoch: '1', selectedOrganizationId: null, + identityId: 'identity_epoch', bindingVersion: 'binding-1', + authorizationEpoch: '1', selectedOrganizationId: null, credential: { email: PROVIDER_USER.email, firstName: 'Sam', lastName: 'Adeyemi', emailVerified: true }, credentialGrant: null, ...overrides, }; diff --git a/server/tests/unit/current-user-organizations.test.ts b/server/tests/unit/current-user-organizations.test.ts index 5b51504e71c..5a9e973c19e 100644 --- a/server/tests/unit/current-user-organizations.test.ts +++ b/server/tests/unit/current-user-organizations.test.ts @@ -96,39 +96,17 @@ describe('current user organization resolution', () => { }); }); - it('refreshes WorkOS memberships after verified-domain auto-link succeeds', async () => { - const listOrganizationMemberships = vi.fn() - .mockResolvedValueOnce({ data: [] }) - .mockResolvedValueOnce({ - data: [{ - organizationId: 'org_linked', - role: { slug: 'member' }, - status: 'active', - }], - }); - const workos = { - userManagement: { listOrganizationMemberships }, - organizations: { - getOrganization: vi.fn().mockResolvedValue({ name: 'Linked Org' }), - }, - } as any; - + it('does not invoke provisioning while resolving a read', async () => { + const autoLinkByVerifiedDomain = vi.fn().mockResolvedValue(true); + const listOrganizationMemberships = vi.fn().mockResolvedValue({ data: [] }); const organizations = await getCurrentUserOrganizations({ - userId: 'user_123', - email: 'user@example.com', - workos, - orgDb: { getOrganization: vi.fn().mockResolvedValue({ is_personal: false }) }, - autoLinkByVerifiedDomain: vi.fn().mockResolvedValue(true), + userId: 'user_exact', email: 'member@acme.test', + workos: { userManagement: { listOrganizationMemberships } } as any, + orgDb: { getOrganization: vi.fn() }, autoLinkByVerifiedDomain, }); - - expect(listOrganizationMemberships).toHaveBeenCalledTimes(2); - expect(organizations).toEqual([{ - id: 'org_linked', - name: 'Linked Org', - role: 'member', - status: 'active', - is_personal: false, - }]); + expect(organizations).toEqual([]); + expect(listOrganizationMemberships).toHaveBeenCalledTimes(1); + expect(autoLinkByVerifiedDomain).not.toHaveBeenCalled(); }); it('normalizes missing or blank membership roles to member', () => { diff --git a/server/tests/unit/db-client-checkout.test.ts b/server/tests/unit/db-client-checkout.test.ts index 2629a2d0ee3..c3301926b27 100644 --- a/server/tests/unit/db-client-checkout.test.ts +++ b/server/tests/unit/db-client-checkout.test.ts @@ -516,6 +516,7 @@ describe('db client checkout and health checks', () => { authenticated_user_id: `user_${suffix}`, canonical_user_id: `canonical_${suffix}`, identity_id: `identity_${suffix}`, + binding_version: `binding_${suffix}`, authorization_epoch: epoch, email: `${suffix}@example.test`, email_verified: true, @@ -620,6 +621,7 @@ describe('db client checkout and health checks', () => { authenticated_user_id: 'user_retry_checkout', canonical_user_id: 'user_retry_checkout', identity_id: 'fd3043f7-cb4f-43c7-9b81-22ac97576150', + binding_version: 'binding_retry_checkout', authorization_epoch: '11', email: 'sam@pinnacle.example', email_verified: true, diff --git a/server/tests/unit/member-profile-membership-authorization.test.ts b/server/tests/unit/member-profile-membership-authorization.test.ts index 3df70410ed7..e7f4b544cbc 100644 --- a/server/tests/unit/member-profile-membership-authorization.test.ts +++ b/server/tests/unit/member-profile-membership-authorization.test.ts @@ -25,10 +25,11 @@ describe('member profile membership authorization', () => { expect(selectedOrganizationMembership(memberships, 'org_active_member')).toEqual(memberships[1]); }); - it('uses the active selector across every WorkOS-backed profile route', async () => { + it('uses the active selector across the remaining WorkOS-backed profile routes', async () => { const source = await readFile(new URL('../../src/routes/member-profiles.ts', import.meta.url), 'utf8'); + // The seventh selector belonged to spec bootstrap, which is now suspended. expect(source.match(/selectedOrganizationMembership\(memberships\.data, requestedOrgId\)/g)?.length) - .toBeGreaterThanOrEqual(7); + .toBeGreaterThanOrEqual(6); expect(source).toContain('Only organization admins or owners can update brand identity'); }); }); diff --git a/server/tests/unit/network-health-security.test.ts b/server/tests/unit/network-health-security.test.ts index f95460c602d..e7251625ba6 100644 --- a/server/tests/unit/network-health-security.test.ts +++ b/server/tests/unit/network-health-security.test.ts @@ -209,6 +209,7 @@ describe('network-health global authorization boundary', () => { authenticated_user_id: userId, canonical_user_id: userId, identity_id: `identity_${userId}`, + binding_version: `binding_${userId}`, authorization_epoch: '0', email: isAdmin ? 'platform-admin@example.test' : 'user@example.test', email_verified: true, diff --git a/server/tests/unit/organization-authorization-observer.test.ts b/server/tests/unit/organization-authorization-observer.test.ts index faf808b7e13..e72611d21c6 100644 --- a/server/tests/unit/organization-authorization-observer.test.ts +++ b/server/tests/unit/organization-authorization-observer.test.ts @@ -20,6 +20,7 @@ vi.mock('../../src/logger.js', () => ({ import { authorizationRouteFamily, + excludeOrganizationAuthorizationObservation, classifyAuthorizationObservation, observeLinkedCredentialOrganizationAuthorization, organizationSelectorFromRequest, @@ -65,6 +66,25 @@ describe('organization authorization rollout observer', () => { expect(authorizationRouteFamily('GET /api/__proto__/private')).toBe('other'); }); + for (const status of [200, 403, 503]) it(`excluded mutation at ${status} performs no shadow reads or telemetry`, async () => { + const req = { + headers: { 'x-organization-id': 'org_selected' }, query: {}, body: {}, params: {}, method: 'POST', + user: { id: 'user_canonical', authWorkosUserId: 'user_authenticated' }, + } as any; + const next = vi.fn(); + excludeOrganizationAuthorizationObservation(req, {} as any, next); + expect(next).toHaveBeenCalledOnce(); + await observeLinkedCredentialOrganizationAuthorization(req, 'POST /api/organizations/org_selected/invitations', status); + expect(listOrganizationMemberships).not.toHaveBeenCalled(); + expect(captureEvent).not.toHaveBeenCalled(); + expect(loggerInfo).not.toHaveBeenCalled(); + + // The marker is attached to this request, not an identity/org or global flag. + listOrganizationMemberships.mockResolvedValue({ data: [] }); + await observeLinkedCredentialOrganizationAuthorization({ ...req }, 'GET /api/example', 200); + expect(listOrganizationMemberships).toHaveBeenCalledTimes(2); + }); + it('compares the canonical and authenticated credentials without exposing IDs', async () => { listOrganizationMemberships .mockResolvedValueOnce({ diff --git a/server/tests/unit/resolve-user-org-authorization.test.ts b/server/tests/unit/resolve-user-org-authorization.test.ts index 75912943f00..e81cfbe04b0 100644 --- a/server/tests/unit/resolve-user-org-authorization.test.ts +++ b/server/tests/unit/resolve-user-org-authorization.test.ts @@ -14,7 +14,8 @@ const AUTHENTICATED_ID = 'user_authenticated'; function snapshot(overrides: Partial = {}): AuthorizationSnapshot { return { authenticatedUserId: AUTHENTICATED_ID, canonicalUserId: 'user_canonical', - identityId: 'identity_linked', selectedOrganizationId: ORGANIZATION_ID, authorizationEpoch: '1', + identityId: 'identity_linked', bindingVersion: 'binding-1', + selectedOrganizationId: ORGANIZATION_ID, authorizationEpoch: '1', credential: { email: 'sam@example.test', firstName: 'Sam', lastName: 'Adeyemi', emailVerified: true }, credentialGrant: null, ...overrides, }; @@ -139,6 +140,7 @@ describe('resolveUserOrgAuthorization', () => { ['epoch moved backwards', { authorizationEpoch: '0' }], ['canonical identity changed', { canonicalUserId: 'user_new_primary' }], ['binding changed without a matching epoch', { identityId: 'identity_new' }], + ['binding generation changed', { bindingVersion: 'binding-2' }], ['credential changed', { authenticatedUserId: 'user_other' }], ] as const)('rejects replayed request state when %s', async (_case, change) => { const workos = workosWithMemberships([membership()]); @@ -157,6 +159,7 @@ describe('resolveUserOrgAuthorization', () => { }); it.each([ ['identity binding', { canonicalUserId: 'user_new_primary', identityId: 'identity_new', authorizationEpoch: '2' }], + ['identity binding generation', { bindingVersion: 'binding-2' }], ['epoch alone', { authorizationEpoch: '2' }], ['grant revoked', { credentialGrant: null }], ['grant role', { credentialGrant: grant('member') }], diff --git a/server/tests/unit/sealed-organization-boundary.test.ts b/server/tests/unit/sealed-organization-boundary.test.ts index 17b02ac1c63..0ca9f06298a 100644 --- a/server/tests/unit/sealed-organization-boundary.test.ts +++ b/server/tests/unit/sealed-organization-boundary.test.ts @@ -103,6 +103,7 @@ beforeEach(() => { row = { in_recovery: false, terminal_marker: false, primary_count: '1', authenticated_user_id: 'user_primary', canonical_user_id: 'user_linked', identity_id: 'identity_linked', + binding_version: 'binding_user_primary', authorization_epoch: '7', email: 'sam@pinnacle.example', email_verified: true, first_name: 'Sam', last_name: 'Adeyemi', grant_id: null, grant_organization_id: null, grant_role: null, diff --git a/server/tests/unit/user-authorization-snapshot-timeout.test.ts b/server/tests/unit/user-authorization-snapshot-timeout.test.ts index ae5adc89708..a4581a2a0c8 100644 --- a/server/tests/unit/user-authorization-snapshot-timeout.test.ts +++ b/server/tests/unit/user-authorization-snapshot-timeout.test.ts @@ -22,6 +22,7 @@ function queryResult(overrides: Record = {}) { authenticated_user_id: USER_ID, canonical_user_id: USER_ID, identity_id: 'fd3043f7-cb4f-43c7-9b81-22ac97576150', + binding_version: '42', authorization_epoch: '7', email: 'sam@pinnacle.example', email_verified: true, @@ -54,7 +55,7 @@ describe('authorization snapshot query deadline and connection retry', () => { it.each([ { terminal_marker: true }, { primary_count: '0' }, { primary_count: '2' }, - { identity_id: null }, { canonical_user_id: null }, + { identity_id: null }, { binding_version: null }, { canonical_user_id: null }, ])('denies terminal lifecycle state without retrying: %j', async invalid => { boundedQuery.mockResolvedValue(queryResult(invalid)); expect(await loadAuthorizationSnapshot(USER_ID, ORGANIZATION_ID)).toBeNull(); @@ -64,7 +65,7 @@ describe('authorization snapshot query deadline and connection retry', () => { it.each([ { terminal_marker: true }, { primary_count: '0' }, { primary_count: '2' }, { primary_count: undefined }, { authenticated_user_id: null }, - { identity_id: null }, { canonical_user_id: null }, + { identity_id: null }, { binding_version: null }, { canonical_user_id: null }, ])('management denies terminal or ambiguous lifecycle state without retry: %j', async invalid => { boundedQuery.mockResolvedValue(queryResult(invalid)); expect(await loadApiKeyManagementSnapshot(USER_ID, ORGANIZATION_ID)).toBeNull(); @@ -76,7 +77,7 @@ describe('authorization snapshot query deadline and connection retry', () => { const snapshot = await loadApiKeyManagementSnapshot(USER_ID, ORGANIZATION_ID); expect(snapshot).toMatchObject({ authenticatedUserId: USER_ID, canonicalUserId: USER_ID, - authorizationEpoch: '9007199254740993', credentialGrant: null, + bindingVersion: '42', authorizationEpoch: '9007199254740993', credentialGrant: null, }); expect(boundedQuery).toHaveBeenCalledOnce(); expect(boundedQuery.mock.calls[0][0]).not.toContain('organization_credential_grants'); diff --git a/server/tests/unit/working-group-admin-global-auth.test.ts b/server/tests/unit/working-group-admin-global-auth.test.ts index 8fab4c86c1e..48b69af1b94 100644 --- a/server/tests/unit/working-group-admin-global-auth.test.ts +++ b/server/tests/unit/working-group-admin-global-auth.test.ts @@ -148,6 +148,7 @@ describe('working-group real global-admin boundary', () => { authenticated_user_id: 'user_sso_admin', canonical_user_id: 'user_sso_admin', identity_id: 'identity_sso_admin', + binding_version: 'binding_sso_admin', authorization_epoch: '0', email: 'sso-admin@example.test', email_verified: true, first_name: 'SSO', last_name: 'Admin', grant_id: null, diff --git a/server/tests/unit/workos-client-timeout.test.ts b/server/tests/unit/workos-client-timeout.test.ts index d11502cfecc..420363f1f44 100644 --- a/server/tests/unit/workos-client-timeout.test.ts +++ b/server/tests/unit/workos-client-timeout.test.ts @@ -38,6 +38,20 @@ describe('WorkOS client request budgets', () => { }); }); + it('bounds exact-credential provider reads without automatic retries', async () => { + const { getAuthorizationEnforcementWorkos } = await import('../../src/auth/workos-client.js'); + + getAuthorizationEnforcementWorkos(); + getAuthorizationEnforcementWorkos(); + + expect(mocks.constructWorkOS).toHaveBeenCalledOnce(); + expect(mocks.constructWorkOS).toHaveBeenCalledWith('sk_test_timeout', { + clientId: 'client_test_timeout', + timeout: 5_000, + maxRetries: 0, + }); + }); + it('does not change retry or timeout policy for the general shared client', async () => { const { getWorkos } = await import('../../src/auth/workos-client.js'); diff --git a/server/tests/unit/workos-jwt.test.ts b/server/tests/unit/workos-jwt.test.ts index a4118b9fe8b..c056aca8f49 100644 --- a/server/tests/unit/workos-jwt.test.ts +++ b/server/tests/unit/workos-jwt.test.ts @@ -1,10 +1,10 @@ -import { describe, it, expect, beforeAll, beforeEach, afterAll } from 'vitest'; +import { describe, it, expect, beforeAll, beforeEach, afterAll, vi } from 'vitest'; import { SignJWT, generateKeyPair, exportJWK, createLocalJWKSet, errors, type KeyLike } from 'jose'; import { looksLikeJWT, verifyWorkOSJWT, - __setJWKSForTesting, isInvalidWorkOSJWTError, + __setJWKSForTesting, } from '../../src/auth/workos-jwt.js'; // WORKOS_CLIENT_ID must be set before workos-jwt.ts is imported for the @@ -48,6 +48,26 @@ describe('looksLikeJWT', () => { }); }); +describe('isInvalidWorkOSJWTError', () => { + it.each([ + ['JOSENotSupported', 'ERR_JOSE_NOT_SUPPORTED'], + ['JOSEAlgNotAllowed', 'ERR_JOSE_ALG_NOT_ALLOWED'], + ])('classifies unsupported token algorithm %s as an invalid credential', (name, code) => { + expect(isInvalidWorkOSJWTError(Object.assign(new Error('unsupported token'), { name, code }))).toBe(true); + }); + + it('does not classify a JWKS transport outage as an invalid credential', () => { + expect(isInvalidWorkOSJWTError(Object.assign(new Error('source unavailable'), { code: 'ECONNRESET' }))).toBe(false); + }); + + it('classifies a healthy JWKS no-matching-key result as an invalid credential', () => { + expect(isInvalidWorkOSJWTError(Object.assign(new Error('no applicable key found'), { + name: 'JWKSNoMatchingKey', + code: 'ERR_JWKS_NO_MATCHING_KEY', + }))).toBe(true); + }); +}); + describe('verifyWorkOSJWT', () => { let privateKey: KeyLike; let publicKey: KeyLike; @@ -184,6 +204,55 @@ describe('verifyWorkOSJWT', () => { expect(isInvalidWorkOSJWTError(error)).toBe(true); }); + it('treats an unknown kid from a healthy JWKS as an invalid credential', async () => { + const jwk = { ...await exportJWK(publicKey), alg: 'RS256', kid: 'known-key' }; + __setJWKSForTesting(createLocalJWKSet({ keys: [jwk] })); + try { + const token = await new SignJWT({ sub: 'user_01ABC', azp: EXPECTED_AZP }) + .setProtectedHeader({ alg: 'RS256', kid: 'unknown-key' }) + .setExpirationTime('5m') + .sign(privateKey); + let failure: unknown; + try { await verifyWorkOSJWT(token); } catch (error) { failure = error; } + expect(failure).toBeDefined(); + expect(isInvalidWorkOSJWTError(failure)).toBe(true); + } finally { + __setJWKSForTesting(async () => ({ ...jwk, kid: undefined })); + } + }); + + it('treats a malformed protected header as invalid before consulting JWKS', async () => { + const resolver = vi.fn(async () => publicKey); + __setJWKSForTesting(resolver); + try { + let failure: unknown; + try { await verifyWorkOSJWT('aaaa.bbbb.cccc'); } catch (error) { failure = error; } + expect(isInvalidWorkOSJWTError(failure)).toBe(true); + expect(resolver).not.toHaveBeenCalled(); + } finally { + const jwk = await exportJWK(publicKey); + __setJWKSForTesting(async () => ({ ...jwk, alg: 'RS256' })); + } + }); + + it('rejects a non-string kid before consulting the JWKS source', async () => { + const resolver = vi.fn(async () => publicKey); + __setJWKSForTesting(resolver); + try { + const token = await new SignJWT({ sub: 'user_01ABC', azp: EXPECTED_AZP }) + .setProtectedHeader({ alg: 'RS256', kid: 7 } as any) + .setExpirationTime('5m') + .sign(privateKey); + let failure: unknown; + try { await verifyWorkOSJWT(token); } catch (error) { failure = error; } + expect(isInvalidWorkOSJWTError(failure)).toBe(true); + expect(resolver).not.toHaveBeenCalled(); + } finally { + const jwk = await exportJWK(publicKey); + __setJWKSForTesting(async () => ({ ...jwk, alg: 'RS256' })); + } + }); + it('flags M2M tokens (client_credentials)', async () => { const token = await mint({ sub: 'client_01APP', diff --git a/server/tests/unit/workos-webhook-inactive-membership.test.ts b/server/tests/unit/workos-webhook-inactive-membership.test.ts index bcdc5e20ba9..1afdf18c6de 100644 --- a/server/tests/unit/workos-webhook-inactive-membership.test.ts +++ b/server/tests/unit/workos-webhook-inactive-membership.test.ts @@ -5,24 +5,36 @@ import * as path from 'path'; const WEBHOOK_FILE = path.resolve(__dirname, '../../src/routes/workos-webhooks.ts'); const source = fs.readFileSync(WEBHOOK_FILE, 'utf-8'); -describe('non-active organization_membership webhook handling', () => { - const nonActiveBlock = source.match( - /if \(membership\.status !== 'active'\) \{([\s\S]*?)\n\s{2}\}/, +describe('organization_membership webhook reconciliation', () => { + const upsertStart = source.indexOf('async function upsertMembership('); + const upsertEnd = source.indexOf('async function upsertUser(', upsertStart); + const upsertHelper = source.slice(upsertStart, upsertEnd); + const absentStart = upsertHelper.indexOf('if (!current) {'); + const absentEnd = upsertHelper.indexOf('// Fetch the user only after', absentStart); + const providerAbsentBlock = upsertHelper.slice(absentStart, absentEnd); + const updatedBlock = source.match( + /case 'organization_membership\.updated': \{([\s\S]*?)break;/, + )?.[1] ?? ''; + const deletedBlock = source.match( + /case 'organization_membership\.deleted': \{([\s\S]*?)break;/, )?.[1] ?? ''; - const localDeleteHelper = source.match( - /async function deleteInactiveMembershipCache[\s\S]*?\n\}/, - )?.[0] ?? ''; - - it('routes non-active membership updates through local cache deletion only', () => { - expect(nonActiveBlock).toContain('deleteInactiveMembershipCache(membership, client)'); - expect(nonActiveBlock).not.toContain('deleteMembership(membership)'); + it('reconciles both role updates and delete replays against current provider state', () => { + expect(updatedBlock).toContain('await upsertMembership(membership)'); + expect(deletedBlock).toContain('await upsertMembership(membership)'); + expect(upsertHelper).toContain('currentProviderMembership(membership)'); }); - it('does not run owner-succession promotion for inactive memberships', () => { - expect(localDeleteHelper).toContain('deleteOrganizationMembership'); - expect(localDeleteHelper).not.toContain('findSuccessorForPromotion'); - expect(localDeleteHelper).not.toContain('updateOrganizationMembership'); - expect(localDeleteHelper).not.toContain('setMembershipRole'); + it('cleans authoritative provider absence without owner succession', () => { + expect(providerAbsentBlock).toContain('deleteExactOrganizationMembership('); + expect(providerAbsentBlock).toContain('exactDeletion.matched'); + expect(providerAbsentBlock).toContain('deleteOrganizationMembership('); + expect(providerAbsentBlock).toContain('membership.user_id,'); + expect(providerAbsentBlock).toContain('membership.organization_id,'); + expect(providerAbsentBlock).toContain('membership.id,'); + expect(providerAbsentBlock).not.toContain('getUser'); + expect(providerAbsentBlock).not.toContain('findSuccessorForPromotion'); + expect(providerAbsentBlock).not.toContain('updateOrganizationMembership'); + expect(providerAbsentBlock).not.toContain('setMembershipRole'); }); }); diff --git a/server/tests/unit/workos-webhook-membership-lock-timeout.test.ts b/server/tests/unit/workos-webhook-membership-lock-timeout.test.ts new file mode 100644 index 00000000000..0944b2f21ad --- /dev/null +++ b/server/tests/unit/workos-webhook-membership-lock-timeout.test.ts @@ -0,0 +1,190 @@ +import { beforeEach, describe, expect, it, vi } from 'vitest'; + +const mocks = vi.hoisted(() => ({ + connect: vi.fn(), + enforcementWorkos: { + userManagement: { + listOrganizationMemberships: vi.fn(), + getUser: vi.fn(), + }, + }, + getEnforcementWorkos: vi.fn(), + getDefaultWorkos: vi.fn(), + upsertOrganizationMembership: vi.fn(), + deleteOrganizationMembership: vi.fn(), + deleteExactOrganizationMembership: vi.fn(), + consumeInvitationSeatType: vi.fn(), + canAddSeat: vi.fn(), + activeCredentialMutation: vi.fn(), +})); + +vi.mock('../../src/db/client.js', () => ({ + getPool: () => ({ connect: mocks.connect }), +})); + +vi.mock('../../src/auth/workos-client.js', () => ({ + getAuthorizationEnforcementWorkos: mocks.getEnforcementWorkos, + getWorkos: mocks.getDefaultWorkos, +})); + +vi.mock('../../src/db/identity-db.js', () => ({ + upsertWorkosUserInCredentialEvent: vi.fn(), + upsertWorkosUserUnlessConfirmedDeleted: vi.fn(), + withCredentialCreationEventMutation: vi.fn(), + withActiveCredentialEventMutation: mocks.activeCredentialMutation, + withActiveCredentialEventMutationAfterSerializedPrefetch: mocks.activeCredentialMutation, +})); + +vi.mock('../../src/db/membership-db.js', () => ({ + upsertOrganizationMembership: mocks.upsertOrganizationMembership, + deleteOrganizationMembership: mocks.deleteOrganizationMembership, + deleteExactOrganizationMembership: mocks.deleteExactOrganizationMembership, + consumeInvitationSeatType: mocks.consumeInvitationSeatType, +})); + +vi.mock('../../src/db/organization-db.js', () => ({ + OrganizationDatabase: class MockOrganizationDatabase {}, + canAddSeat: mocks.canAddSeat, +})); + +vi.mock('../../src/db/users-db.js', async (importOriginal) => ({ + ...(await importOriginal()), + resolvePreferredOrganization: vi.fn().mockResolvedValue(null), + backfillPrimaryOrganization: vi.fn(), +})); + +import { upsertMembership } from '../../src/routes/workos-webhooks.js'; + +const membership = { + id: 'om_webhook_lock_test', + user_id: 'user_webhook_lock_test', + organization_id: 'org_webhook_lock_test', + status: 'active' as const, + role: { slug: 'member' }, + created_at: '2026-09-17T00:00:00.000Z', + updated_at: '2026-09-17T00:00:00.000Z', +}; + +type MockClient = { + query: ReturnType; + release: ReturnType; +}; + +function clientWith(query: (sql: string) => Promise): MockClient { + return { query: vi.fn(query), release: vi.fn() }; +} + +beforeEach(() => { + mocks.connect.mockReset(); + mocks.getEnforcementWorkos.mockReset().mockReturnValue(mocks.enforcementWorkos); + mocks.getDefaultWorkos.mockReset(); + mocks.enforcementWorkos.userManagement.listOrganizationMemberships.mockReset(); + mocks.enforcementWorkos.userManagement.getUser.mockReset(); + mocks.upsertOrganizationMembership.mockReset().mockResolvedValue(undefined); + mocks.deleteOrganizationMembership.mockReset().mockResolvedValue(null); + mocks.deleteExactOrganizationMembership.mockReset().mockResolvedValue({ matched: false, role: null }); + mocks.consumeInvitationSeatType.mockReset().mockResolvedValue(null); + mocks.canAddSeat.mockReset().mockResolvedValue({ allowed: true }); + mocks.activeCredentialMutation.mockReset().mockImplementation(async (_userId, prefetch, mutation) => { + await prefetch(); + const client = await mocks.connect(); + try { + await client.query('BEGIN'); + await client.query("SET LOCAL lock_timeout = '1s'"); + const value = await mutation(client); + await client.query('COMMIT'); + return { applied: true, value }; + } catch (error) { + await client.query('ROLLBACK'); + throw error; + } finally { + client.release(); + } + }); +}); + +describe('organization membership webhook lock budgets', () => { + it('does not consult the provider when the exact credential lifecycle fence rejects the event', async () => { + mocks.activeCredentialMutation.mockResolvedValueOnce({ applied: false }); + + await expect(upsertMembership(membership)).resolves.toBe(false); + + expect(mocks.enforcementWorkos.userManagement.listOrganizationMemberships).not.toHaveBeenCalled(); + expect(mocks.enforcementWorkos.userManagement.getUser).not.toHaveBeenCalled(); + expect(mocks.upsertOrganizationMembership).not.toHaveBeenCalled(); + expect(mocks.deleteOrganizationMembership).not.toHaveBeenCalled(); + expect(mocks.deleteExactOrganizationMembership).not.toHaveBeenCalled(); + expect(mocks.connect).not.toHaveBeenCalled(); + }); + + it('uses the fail-fast exact-credential client during serialized prefetch before local writes', async () => { + const active = { + id: membership.id, + userId: membership.user_id, + organizationId: membership.organization_id, + status: membership.status, + role: membership.role, + }; + mocks.enforcementWorkos.userManagement.listOrganizationMemberships + .mockResolvedValue({ data: [active], listMetadata: {} }); + mocks.enforcementWorkos.userManagement.getUser.mockResolvedValue({ + id: membership.user_id, + email: 'member@example.test', + firstName: 'Sam', + lastName: 'Adeyemi', + emailVerified: true, + createdAt: membership.created_at, + updatedAt: membership.updated_at, + }); + const client = clientWith(async (sql) => { + if (sql.includes('FROM organizations')) return { rowCount: 1, rows: [{}] }; + if (sql.includes('FROM organization_memberships')) { + return { rowCount: 1, rows: [{ seat_type: 'community_only', provisioning_source: 'webhook' }] }; + } + return { rowCount: 0, rows: [] }; + }); + mocks.connect.mockResolvedValue(client); + + await expect(upsertMembership(membership)).resolves.toBe(true); + + expect(mocks.enforcementWorkos.userManagement.listOrganizationMemberships).toHaveBeenCalledTimes(2); + expect(mocks.enforcementWorkos.userManagement.getUser).toHaveBeenCalledOnce(); + expect(mocks.getDefaultWorkos).not.toHaveBeenCalled(); + expect(client.query.mock.calls.map(([sql]) => sql).slice(0, 3)).toEqual([ + 'BEGIN', + "SET LOCAL lock_timeout = '1s'", + 'SELECT workos_organization_id FROM organizations WHERE workos_organization_id = $1 FOR UPDATE', + ]); + expect(client.release).toHaveBeenCalledOnce(); + }); + + it('does not enter the local mutation while serialized provider prefetch is pending', async () => { + let releaseProvider!: () => void; + const providerStarted = new Promise((resolveStarted) => { + mocks.enforcementWorkos.userManagement.listOrganizationMemberships.mockImplementationOnce(() => + new Promise((resolveProvider) => { + releaseProvider = () => resolveProvider({ data: [], listMetadata: {} }); + resolveStarted(); + }), + ); + }); + const client = clientWith(async (sql) => { + if (sql.includes('FROM organizations')) return { rowCount: 1, rows: [{}] }; + return { rowCount: 0, rows: [] }; + }); + mocks.connect.mockResolvedValue(client); + + const holdingWrite = upsertMembership(membership); + await providerStarted; + expect(mocks.connect).not.toHaveBeenCalled(); + expect(mocks.upsertOrganizationMembership).not.toHaveBeenCalled(); + expect(mocks.deleteOrganizationMembership).not.toHaveBeenCalled(); + expect(mocks.deleteExactOrganizationMembership).not.toHaveBeenCalled(); + + releaseProvider(); + await expect(holdingWrite).resolves.toBe(false); + expect(mocks.deleteExactOrganizationMembership).toHaveBeenCalledOnce(); + expect(mocks.deleteOrganizationMembership).toHaveBeenCalledOnce(); + expect(client.release).toHaveBeenCalledOnce(); + }); +}); diff --git a/server/tests/unit/workos-webhook-user-deleted-wiring.test.ts b/server/tests/unit/workos-webhook-user-deleted-wiring.test.ts index d8efec499f7..9c10e28cd51 100644 --- a/server/tests/unit/workos-webhook-user-deleted-wiring.test.ts +++ b/server/tests/unit/workos-webhook-user-deleted-wiring.test.ts @@ -55,12 +55,22 @@ describe('user.deleted containment wiring (#6827)', () => { }); it('guards every authority-bearing provider writer with the deletion lock seam', () => { - for (const eventType of [ - 'organization_membership.created', - 'organization_membership.updated', - 'user.created', - 'user.updated', - ]) { + for (const eventType of ['organization_membership.created', 'organization_membership.updated']) { + const eventStart = webhookSource.indexOf(`case '${eventType}'`); + const eventEnd = webhookSource.indexOf('\n case ', eventStart + 1); + const eventBlock = webhookSource.slice(eventStart, eventEnd); + expect(eventStart).toBeGreaterThan(-1); + expect(eventBlock).toContain('upsertMembership(membership)'); + } + const membershipHelper = webhookSource.slice( + webhookSource.indexOf('export async function upsertMembership('), + webhookSource.indexOf('/**\n * Upsert user to local users table'), + ); + expect(membershipHelper).toContain( + 'withActiveCredentialEventMutationAfterSerializedPrefetch(', + ); + expect(membershipHelper).toContain('boundedProviderPrefetch(currentProviderMembership(membership))'); + for (const eventType of ['user.created', 'user.updated']) { const eventStart = webhookSource.indexOf(`case '${eventType}'`); const eventEnd = webhookSource.indexOf('\n case ', eventStart + 1); const eventBlock = webhookSource.slice(eventStart, eventEnd); @@ -76,8 +86,9 @@ describe('user.deleted containment wiring (#6827)', () => { 'credentialClient ?? pool, user.id, user.first_name, user.last_name', ); expect(webhookSource).toContain( - 'canAddSeat(membership.organization_id, seatType, client)', + 'canAddSeat(current.organizationId, seatType, client)', ); + expect(webhookSource).toContain('}, client);'); }); it('uses one credential-first lock order and fails closed after bounded retries', () => { diff --git a/tests/billing/invoice-signer-metadata.test.ts b/tests/billing/invoice-signer-metadata.test.ts index 7e9c752789f..0a42f363027 100644 --- a/tests/billing/invoice-signer-metadata.test.ts +++ b/tests/billing/invoice-signer-metadata.test.ts @@ -19,11 +19,9 @@ describe('invoice signer metadata invariants', () => { ); }); - test('membership invite acceptance passes the signer into Stripe invoice creation', () => { + test('suspended membership invite acceptance cannot issue an invoice', () => { const source = readRepoFile('server/src/routes/invites.ts'); - - expect(source).toMatch( - /createAndSendInvoice\(\{[\s\S]*workosOrganizationId: org\.workos_organization_id,\s*workosUserId: user\.id,[\s\S]*\}\);/ - ); + expect(source).toContain("error: 'organization_onboarding_disabled'"); + expect(source).not.toContain('createAndSendInvoice'); }); });