chore: import upstream snapshot with attribution
Publish CLI Package / publish-npm (push) Waiting to run
Publish Python SDK / publish-pypi (push) Waiting to run
Publish TypeScript SDK / publish-npm (push) Waiting to run
CI / Migrate Dev DB (push) Has been skipped
CI / Detect Version (push) Has been cancelled
CI / Migrate DB (push) Has been cancelled
CI / Build Dev ECR (./docker/app.Dockerfile, ECR_APP) (push) Has been cancelled
CI / Build Dev ECR (./docker/db.Dockerfile, ECR_MIGRATIONS) (push) Has been cancelled
CI / Build Dev ECR (./docker/pii.Dockerfile, ECR_PII) (push) Has been cancelled
CI / Build Dev ECR (./docker/realtime.Dockerfile, ECR_REALTIME) (push) Has been cancelled
CI / Deploy Trigger.dev (Dev) (push) Has been cancelled
CI / Build AMD64 (./docker/app.Dockerfile, ECR_APP, ghcr.io/simstudioai/simstudio) (push) Has been cancelled
CI / Build AMD64 (./docker/db.Dockerfile, ECR_MIGRATIONS, ghcr.io/simstudioai/migrations) (push) Has been cancelled
CI / Build AMD64 (./docker/pii.Dockerfile, ECR_PII, ghcr.io/simstudioai/pii) (push) Has been cancelled
CI / Build AMD64 (./docker/realtime.Dockerfile, ECR_REALTIME, ghcr.io/simstudioai/realtime) (push) Has been cancelled
CI / Build ARM64 (GHCR Only) (./docker/app.Dockerfile, ghcr.io/simstudioai/simstudio) (push) Has been cancelled
CI / Build ARM64 (GHCR Only) (./docker/db.Dockerfile, ghcr.io/simstudioai/migrations) (push) Has been cancelled
CI / Build ARM64 (GHCR Only) (./docker/pii.Dockerfile, ghcr.io/simstudioai/pii) (push) Has been cancelled
CI / Build ARM64 (GHCR Only) (./docker/realtime.Dockerfile, ghcr.io/simstudioai/realtime) (push) Has been cancelled
CI / Create GHCR Manifests (ghcr.io/simstudioai/migrations) (push) Has been cancelled
CI / Create GHCR Manifests (ghcr.io/simstudioai/pii) (push) Has been cancelled
CI / Create GHCR Manifests (ghcr.io/simstudioai/realtime) (push) Has been cancelled
CI / Create GHCR Manifests (ghcr.io/simstudioai/simstudio) (push) Has been cancelled
CI / Check Docs Changes (push) Has been cancelled
CI / Process Docs (push) Has been cancelled
CI / Create GitHub Release (push) Has been cancelled
CI / Test and Build (push) Has been cancelled
Publish CLI Package / publish-npm (push) Waiting to run
Publish Python SDK / publish-pypi (push) Waiting to run
Publish TypeScript SDK / publish-npm (push) Waiting to run
CI / Migrate Dev DB (push) Has been skipped
CI / Detect Version (push) Has been cancelled
CI / Migrate DB (push) Has been cancelled
CI / Build Dev ECR (./docker/app.Dockerfile, ECR_APP) (push) Has been cancelled
CI / Build Dev ECR (./docker/db.Dockerfile, ECR_MIGRATIONS) (push) Has been cancelled
CI / Build Dev ECR (./docker/pii.Dockerfile, ECR_PII) (push) Has been cancelled
CI / Build Dev ECR (./docker/realtime.Dockerfile, ECR_REALTIME) (push) Has been cancelled
CI / Deploy Trigger.dev (Dev) (push) Has been cancelled
CI / Build AMD64 (./docker/app.Dockerfile, ECR_APP, ghcr.io/simstudioai/simstudio) (push) Has been cancelled
CI / Build AMD64 (./docker/db.Dockerfile, ECR_MIGRATIONS, ghcr.io/simstudioai/migrations) (push) Has been cancelled
CI / Build AMD64 (./docker/pii.Dockerfile, ECR_PII, ghcr.io/simstudioai/pii) (push) Has been cancelled
CI / Build AMD64 (./docker/realtime.Dockerfile, ECR_REALTIME, ghcr.io/simstudioai/realtime) (push) Has been cancelled
CI / Build ARM64 (GHCR Only) (./docker/app.Dockerfile, ghcr.io/simstudioai/simstudio) (push) Has been cancelled
CI / Build ARM64 (GHCR Only) (./docker/db.Dockerfile, ghcr.io/simstudioai/migrations) (push) Has been cancelled
CI / Build ARM64 (GHCR Only) (./docker/pii.Dockerfile, ghcr.io/simstudioai/pii) (push) Has been cancelled
CI / Build ARM64 (GHCR Only) (./docker/realtime.Dockerfile, ghcr.io/simstudioai/realtime) (push) Has been cancelled
CI / Create GHCR Manifests (ghcr.io/simstudioai/migrations) (push) Has been cancelled
CI / Create GHCR Manifests (ghcr.io/simstudioai/pii) (push) Has been cancelled
CI / Create GHCR Manifests (ghcr.io/simstudioai/realtime) (push) Has been cancelled
CI / Create GHCR Manifests (ghcr.io/simstudioai/simstudio) (push) Has been cancelled
CI / Check Docs Changes (push) Has been cancelled
CI / Process Docs (push) Has been cancelled
CI / Create GitHub Release (push) Has been cancelled
CI / Test and Build (push) Has been cancelled
This commit is contained in:
@@ -0,0 +1,298 @@
|
||||
import { db } from '@sim/db'
|
||||
import { member, permissions, workspace } from '@sim/db/schema'
|
||||
import { createLogger } from '@sim/logger'
|
||||
import { generateId } from '@sim/utils/id'
|
||||
import { and, eq, inArray } from 'drizzle-orm'
|
||||
import { syncUsageLimitsFromSubscription } from '@/lib/billing/core/usage'
|
||||
import {
|
||||
ensureUserInOrganization,
|
||||
reapplyPaidOrgJoinBillingForExistingMember,
|
||||
} from '@/lib/billing/organizations/membership'
|
||||
import { getOrganizationOwnerId, WORKSPACE_MODE } from '@/lib/workspaces/policy'
|
||||
|
||||
const logger = createLogger('OrganizationWorkspaces')
|
||||
|
||||
export interface AttachOwnedWorkspacesToOrganizationResult {
|
||||
attachedWorkspaceIds: string[]
|
||||
addedMemberIds: string[]
|
||||
skippedMembers: Array<{ userId: string; reason: string }>
|
||||
}
|
||||
|
||||
export interface DetachOrganizationWorkspacesResult {
|
||||
detachedWorkspaceIds: string[]
|
||||
billedAccountUserId: string | null
|
||||
}
|
||||
|
||||
export class WorkspaceOrganizationMembershipConflictError extends Error {
|
||||
conflicts: Array<{ userId: string; organizationId: string }>
|
||||
|
||||
constructor(conflicts: Array<{ userId: string; organizationId: string }>) {
|
||||
super(
|
||||
'One or more workspace members already belong to another organization and cannot be attached.'
|
||||
)
|
||||
this.name = 'WorkspaceOrganizationMembershipConflictError'
|
||||
this.conflicts = conflicts
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* How to treat workspace members that already belong to a *different*
|
||||
* organization when attaching workspaces:
|
||||
* - `reject` (default): throw a conflict — used by manual org creation.
|
||||
* - `keep-external`: skip them (they stay external workspace members) and
|
||||
* attach anyway — used by the Pro→Team conversion, which must not abort
|
||||
* just because a personal workspace already has an external collaborator.
|
||||
*/
|
||||
type ExternalMemberPolicy = 'reject' | 'keep-external'
|
||||
|
||||
interface AttachOwnedWorkspacesToOrganizationParams {
|
||||
ownerUserId: string
|
||||
organizationId: string
|
||||
externalMemberPolicy?: ExternalMemberPolicy
|
||||
}
|
||||
|
||||
export async function attachOwnedWorkspacesToOrganization({
|
||||
ownerUserId,
|
||||
organizationId,
|
||||
externalMemberPolicy = 'reject',
|
||||
}: AttachOwnedWorkspacesToOrganizationParams): Promise<AttachOwnedWorkspacesToOrganizationResult> {
|
||||
const ownedWorkspaces = await db
|
||||
.select({ id: workspace.id })
|
||||
.from(workspace)
|
||||
.where(eq(workspace.ownerId, ownerUserId))
|
||||
|
||||
const billedAccountUserId = await getOrganizationOwnerId(organizationId)
|
||||
if (!billedAccountUserId) {
|
||||
logger.error('Attempted to attach workspaces to an organization without an owner', {
|
||||
organizationId,
|
||||
ownerUserId,
|
||||
})
|
||||
throw new Error(`Organization ${organizationId} has no owner membership`)
|
||||
}
|
||||
const ownedWorkspaceIds = ownedWorkspaces.map((ownedWorkspace) => ownedWorkspace.id)
|
||||
const uniqueWorkspaceMemberIds = await getWorkspaceMemberIds(ownedWorkspaceIds)
|
||||
const { joinableUserIds, externalConflicts } = await partitionWorkspaceMembersByOrg(
|
||||
uniqueWorkspaceMemberIds,
|
||||
organizationId
|
||||
)
|
||||
|
||||
if (externalMemberPolicy === 'reject' && externalConflicts.length > 0) {
|
||||
logger.warn('Workspace attachment blocked by members in another organization', {
|
||||
organizationId,
|
||||
conflictCount: externalConflicts.length,
|
||||
conflictingUserIds: externalConflicts.map((conflict) => conflict.userId),
|
||||
})
|
||||
throw new WorkspaceOrganizationMembershipConflictError(externalConflicts)
|
||||
}
|
||||
|
||||
const skippedMembers = externalConflicts.map((conflict) => ({
|
||||
userId: conflict.userId,
|
||||
reason: 'Already a member of another organization; kept as external workspace member',
|
||||
}))
|
||||
|
||||
const addedMemberIds: string[] = []
|
||||
|
||||
for (const userId of joinableUserIds) {
|
||||
const result = await ensureUserInOrganization({
|
||||
userId,
|
||||
organizationId,
|
||||
role: userId === billedAccountUserId ? 'owner' : 'member',
|
||||
skipSeatValidation: true,
|
||||
})
|
||||
|
||||
if (!result.success) {
|
||||
logger.error('Failed to sync workspace member into organization before attachment', {
|
||||
userId,
|
||||
organizationId,
|
||||
ownerUserId,
|
||||
error: result.error,
|
||||
})
|
||||
throw new Error(result.error || 'Failed to sync workspace member into organization')
|
||||
}
|
||||
|
||||
if (result.alreadyMember) {
|
||||
await reapplyPaidOrgJoinBillingForExistingMember(userId, organizationId)
|
||||
} else {
|
||||
addedMemberIds.push(userId)
|
||||
await syncUsageLimitsFromSubscription(userId)
|
||||
}
|
||||
}
|
||||
|
||||
const attachedWorkspaceIds = await db.transaction(async (tx) => {
|
||||
const touched: string[] = []
|
||||
const now = new Date()
|
||||
|
||||
for (const ownedWorkspace of ownedWorkspaces) {
|
||||
await tx
|
||||
.update(workspace)
|
||||
.set({
|
||||
organizationId,
|
||||
workspaceMode: WORKSPACE_MODE.ORGANIZATION,
|
||||
billedAccountUserId,
|
||||
updatedAt: now,
|
||||
})
|
||||
.where(eq(workspace.id, ownedWorkspace.id))
|
||||
|
||||
await tx
|
||||
.insert(permissions)
|
||||
.values({
|
||||
id: generateId(),
|
||||
userId: billedAccountUserId,
|
||||
entityType: 'workspace',
|
||||
entityId: ownedWorkspace.id,
|
||||
permissionType: 'admin',
|
||||
createdAt: now,
|
||||
updatedAt: now,
|
||||
})
|
||||
.onConflictDoUpdate({
|
||||
target: [permissions.userId, permissions.entityType, permissions.entityId],
|
||||
set: {
|
||||
permissionType: 'admin',
|
||||
updatedAt: now,
|
||||
},
|
||||
})
|
||||
|
||||
touched.push(ownedWorkspace.id)
|
||||
}
|
||||
|
||||
return touched
|
||||
})
|
||||
|
||||
logger.info('Attached owned workspaces to organization', {
|
||||
ownerUserId,
|
||||
organizationId,
|
||||
attachedWorkspaceCount: attachedWorkspaceIds.length,
|
||||
addedMemberCount: addedMemberIds.length,
|
||||
skippedMemberCount: skippedMembers.length,
|
||||
})
|
||||
|
||||
return {
|
||||
attachedWorkspaceIds,
|
||||
addedMemberIds,
|
||||
skippedMembers,
|
||||
}
|
||||
}
|
||||
|
||||
export async function detachOrganizationWorkspaces(
|
||||
organizationId: string
|
||||
): Promise<DetachOrganizationWorkspacesResult> {
|
||||
const organizationOwnerId = await getOrganizationOwnerId(organizationId)
|
||||
if (!organizationOwnerId) {
|
||||
logger.warn(
|
||||
'Detaching workspaces from an organization without an owner; using workspace owner as billed account',
|
||||
{ organizationId }
|
||||
)
|
||||
}
|
||||
|
||||
const organizationWorkspaces = await db
|
||||
.select({ id: workspace.id, ownerId: workspace.ownerId })
|
||||
.from(workspace)
|
||||
.where(
|
||||
and(
|
||||
eq(workspace.organizationId, organizationId),
|
||||
eq(workspace.workspaceMode, WORKSPACE_MODE.ORGANIZATION)
|
||||
)
|
||||
)
|
||||
|
||||
const detachedWorkspaceIds = await db.transaction(async (tx) => {
|
||||
const touched: string[] = []
|
||||
const now = new Date()
|
||||
|
||||
for (const organizationWorkspace of organizationWorkspaces) {
|
||||
const billedAccountUserId = organizationOwnerId ?? organizationWorkspace.ownerId
|
||||
|
||||
await tx
|
||||
.update(workspace)
|
||||
.set({
|
||||
organizationId: null,
|
||||
workspaceMode: WORKSPACE_MODE.GRANDFATHERED_SHARED,
|
||||
billedAccountUserId,
|
||||
updatedAt: now,
|
||||
})
|
||||
.where(eq(workspace.id, organizationWorkspace.id))
|
||||
|
||||
await tx
|
||||
.insert(permissions)
|
||||
.values({
|
||||
id: generateId(),
|
||||
userId: billedAccountUserId,
|
||||
entityType: 'workspace',
|
||||
entityId: organizationWorkspace.id,
|
||||
permissionType: 'admin',
|
||||
createdAt: now,
|
||||
updatedAt: now,
|
||||
})
|
||||
.onConflictDoUpdate({
|
||||
target: [permissions.userId, permissions.entityType, permissions.entityId],
|
||||
set: {
|
||||
permissionType: 'admin',
|
||||
updatedAt: now,
|
||||
},
|
||||
})
|
||||
|
||||
touched.push(organizationWorkspace.id)
|
||||
}
|
||||
|
||||
return touched
|
||||
})
|
||||
|
||||
logger.info('Detached organization workspaces', {
|
||||
organizationId,
|
||||
detachedWorkspaceCount: detachedWorkspaceIds.length,
|
||||
billedAccountUserId: organizationOwnerId,
|
||||
})
|
||||
|
||||
return {
|
||||
detachedWorkspaceIds,
|
||||
billedAccountUserId: organizationOwnerId,
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Split workspace members into those who can join the target organization
|
||||
* (members of no org, or already members of this org) and those who already
|
||||
* belong to a different org (external conflicts). Single-org membership means
|
||||
* each user has at most one membership row, so the split is unambiguous.
|
||||
*/
|
||||
async function partitionWorkspaceMembersByOrg(
|
||||
userIds: string[],
|
||||
organizationId: string
|
||||
): Promise<{
|
||||
joinableUserIds: string[]
|
||||
externalConflicts: Array<{ userId: string; organizationId: string }>
|
||||
}> {
|
||||
if (userIds.length === 0) {
|
||||
return { joinableUserIds: [], externalConflicts: [] }
|
||||
}
|
||||
|
||||
const memberships = await db
|
||||
.select({
|
||||
userId: member.userId,
|
||||
organizationId: member.organizationId,
|
||||
})
|
||||
.from(member)
|
||||
.where(inArray(member.userId, userIds))
|
||||
|
||||
const externalConflicts = memberships.filter(
|
||||
(membership) => membership.organizationId !== organizationId
|
||||
)
|
||||
const externalUserIds = new Set(externalConflicts.map((conflict) => conflict.userId))
|
||||
const joinableUserIds = userIds.filter((userId) => !externalUserIds.has(userId))
|
||||
|
||||
return { joinableUserIds, externalConflicts }
|
||||
}
|
||||
|
||||
async function getWorkspaceMemberIds(workspaceIds: string[]): Promise<string[]> {
|
||||
if (workspaceIds.length === 0) {
|
||||
return []
|
||||
}
|
||||
|
||||
const rows = await db
|
||||
.select({ userId: permissions.userId })
|
||||
.from(permissions)
|
||||
.where(
|
||||
and(eq(permissions.entityType, 'workspace'), inArray(permissions.entityId, workspaceIds))
|
||||
)
|
||||
|
||||
return [...new Set(rows.map((row) => row.userId))]
|
||||
}
|
||||
Reference in New Issue
Block a user