Merge branch 'codex/file-ownership-foundation' into HEAD

Author: mzxchandra

apps/sim/app/api/v1/admin/workspaces/[id]/members/[memberId]/route.ts

@@ -33,7 +33,7 @@ import {
 } from '@/lib/api/contracts/v1/admin'
 import { parseRequest } from '@/lib/api/server'
 import { withRouteHandler } from '@/lib/core/utils/with-route-handler'
-import { ProjectConflictError } from '@/lib/projects/membership'
+import { ProjectConflictError } from '@/lib/projects/errors'
 import { revokeWorkspaceAccessTx } from '@/lib/workspaces/access/workspace-access'
 import { getWorkspaceById } from '@/lib/workspaces/permissions/utils'
 import { WorkspaceBillingAccountRemovalError } from '@/lib/workspaces/utils'
@@ -286,7 +286,7 @@ export const DELETE = withRouteHandler(
         }
         return true
       })
-      if (!removed) return notFoundResponse('Workspace member')
+      if (!removed) return adminNotFoundResponse('Workspace member')
 
       logger.info(`Admin API: Removed member ${memberId} from workspace ${workspaceId}`, {
         userId: existingMember.userId,
@@ -310,7 +310,7 @@ export const DELETE = withRouteHandler(
         workspaceId,
       })
     } catch (error) {
-      if (error instanceof ProjectConflictError) return conflictResponse(error.message)
+      if (error instanceof ProjectConflictError) return adminConflictResponse(error.message)
       if (error instanceof WorkspaceBillingAccountRemovalError) {
         return adminBadRequestResponse(error.message)
       }

apps/sim/app/api/v1/admin/workspaces/[id]/members/route.ts

@@ -50,7 +50,7 @@ import {
 import { parseRequest } from '@/lib/api/server'
 import { withRouteHandler } from '@/lib/core/utils/with-route-handler'
 import { syncWorkspaceEnvCredentials } from '@/lib/credentials/environment'
-import { ProjectConflictError } from '@/lib/projects/membership'
+import { ProjectConflictError } from '@/lib/projects/errors'
 import { revokeWorkspaceAccessTx } from '@/lib/workspaces/access/workspace-access'
 import { getWorkspaceById } from '@/lib/workspaces/permissions/utils'
 import { WorkspaceBillingAccountRemovalError } from '@/lib/workspaces/utils'
@@ -402,7 +402,7 @@ export const DELETE = withRouteHandler(
         }
         return true
       })
-      if (!removed) return notFoundResponse('Workspace member')
+      if (!removed) return adminNotFoundResponse('Workspace member')
 
       logger.info(`Admin API: Removed user ${userId} from workspace ${workspaceId}`)
 
@@ -419,7 +419,7 @@ export const DELETE = withRouteHandler(
 
       return singleResponse({ removed: true, userId, workspaceId })
     } catch (error) {
-      if (error instanceof ProjectConflictError) return conflictResponse(error.message)
+      if (error instanceof ProjectConflictError) return adminConflictResponse(error.message)
       if (error instanceof WorkspaceBillingAccountRemovalError) {
         return adminBadRequestResponse(error.message)
       }

packages/db/file-folder-version-ownership.integration.ts

@@ -505,90 +505,3 @@ describe('file folder and version ownership in PostgreSQL', () => {
     ])
   })
 })
-
-describe('file ownership composed with enforced Project membership', () => {
-  it('preserves Project lifecycle checks and public metadata through folder, file, and version writes', async () => {
-    const admin = postgres(databaseUrl, { max: 1, onnotice: () => undefined })
-    const name = `file_owner_chain_test_${generateId().replaceAll('-', '')}`
-    const url = new URL(databaseUrl)
-    url.pathname = `/${name}`
-    await admin.unsafe(`CREATE DATABASE "${name}"`)
-    const chain = postgres(url.toString(), { max: 1, onnotice: () => undefined })
-    try {
-      await chain.unsafe(`
-        CREATE TABLE "user" (id text PRIMARY KEY);
-        CREATE TABLE organization (id text PRIMARY KEY);
-        CREATE TABLE workspace (
-          id text PRIMARY KEY, name text NOT NULL, owner_id text NOT NULL,
-          organization_id text, archived_at timestamp,
-          forked_from_workspace_id text REFERENCES workspace(id) ON DELETE SET NULL
-        );
-        CREATE TABLE workflow (
-          id text PRIMARY KEY, workspace_id text REFERENCES workspace(id) ON DELETE CASCADE,
-          archived_at timestamp
-        );
-        CREATE TABLE folder (
-          id text PRIMARY KEY, name text NOT NULL,
-          user_id text NOT NULL REFERENCES "user"(id) ON DELETE CASCADE,
-          workspace_id text NOT NULL REFERENCES workspace(id) ON DELETE CASCADE,
-          resource_type text NOT NULL, parent_id text REFERENCES folder(id) ON DELETE SET NULL,
-          deleted_at timestamp
-        );
-        CREATE TABLE workspace_files (
-          id text PRIMARY KEY, context text NOT NULL,
-          user_id text NOT NULL REFERENCES "user"(id) ON DELETE CASCADE,
-          workspace_id text REFERENCES workspace(id) ON DELETE CASCADE,
-          organization_id text REFERENCES organization(id) ON DELETE CASCADE,
-          folder_id text REFERENCES folder(id) ON DELETE SET NULL,
-          chat_id text, original_name text NOT NULL DEFAULT 'document.md', deleted_at timestamp
-        );
-        CREATE TABLE workspace_file_version (
-          id text PRIMARY KEY, file_id text NOT NULL REFERENCES workspace_files(id) ON DELETE CASCADE,
-          workspace_id text NOT NULL REFERENCES workspace(id) ON DELETE CASCADE
-        );
-        INSERT INTO "user" VALUES ('owner'), ('creator');
-        INSERT INTO workspace (id, name, owner_id) VALUES ('environment', 'Production', 'owner');
-      `)
-      for (const source of [
-        readFileSync(new URL('./migrations/0394_project_foundation.sql', import.meta.url), 'utf8'),
-        readFileSync(
-          new URL('./migrations/0403_project_membership_enforcement.sql', import.meta.url),
-          'utf8'
-        ),
-        ...migrations,
-      ]) {
-        for (const statement of source.split('--> statement-breakpoint')) {
-          if (statement.trim()) await chain.unsafe(statement)
-        }
-      }
-      const [project] = await chain<{ id: string }[]>`SELECT id FROM project`
-      const [before] = await chain`SELECT * FROM project WHERE id = ${project.id}`
-      await chain`INSERT INTO folder (id, name, user_id, resource_type, project_id)
-        VALUES ('folder', 'Architecture', 'creator', 'file', ${project.id})`
-      await chain`INSERT INTO workspace_files (id, context, user_id, project_id, folder_id)
-        VALUES ('file', 'project', 'creator', ${project.id}, 'folder')`
-      await chain`INSERT INTO workspace_file_version (id, file_id) VALUES ('version', 'file')`
-      const [after] = await chain`SELECT * FROM project WHERE id = ${project.id}`
-      expect(after).toEqual(before)
-      await expect(chain`DELETE FROM "user" WHERE id = 'creator'`).rejects.toMatchObject({
-        code: '23503',
-      })
-      await expect(chain`DELETE FROM workspace WHERE id = 'environment'`).rejects.toMatchObject({
-        code: '23514',
-      })
-      await chain.begin(async (tx) => {
-        await tx`UPDATE workspace SET archived_at = now() WHERE id = 'environment'`
-        await tx`UPDATE project SET archived_at = now() WHERE id = ${project.id}`
-      })
-      expect(await chain`SELECT id, workspace_id FROM workspace_file_version`).toEqual([
-        { id: 'version', workspace_id: null },
-      ])
-      expect(await chain`SELECT id FROM folder`).toEqual([{ id: 'folder' }])
-      expect(await chain`SELECT id FROM workspace_files`).toEqual([{ id: 'file' }])
-    } finally {
-      await chain.end({ timeout: 2 })
-      await admin.unsafe(`DROP DATABASE "${name}" WITH (FORCE)`)
-      await admin.end()
-    }
-  })
-})