Merge branch 'wip/fx16-http' into wip/platform-org-wiring

Author: waleedlatif1

apps/sim/scripts/test-assistant-actions-e2e.ts

@@ -843,8 +843,9 @@ try {
         await expect(
           page.getByRole('region', { name: 'Connected credentials', exact: true }).getByRole('link')
         ).toHaveCount(0)
-        // With no connectable option left the page offers no connection at all.
-        await expect(connectIntegration).toHaveCount(0)
+        // No member method is left and this deployment configures no Salesforce client for the
+        // workspace, so the page keeps Connect integration only as a disabled control naming why.
+        await expect(connectIntegration).toBeDisabled()
         await capture('integration-disabled-app-empty')
       } finally {
         await sql`update credential set managed_oauth_status = 'active' where id = ${nativeCredentialId}`

apps/sim/scripts/test-browser-extension-e2e.ts

@@ -2266,8 +2266,9 @@ try {
     async () => {
       assert(userId)
       const viewer = userId
-      // A workspace of its own, owned by someone else and shared with the viewer, so revoking the
-      // share leaves the viewer no other way in.
+      // A workspace of the viewer's organization, owned by someone else and shared with the viewer.
+      // Organization owners inherit admin on its workspaces, so access is gone only once the share
+      // is revoked and the viewer is demoted to a plain member.
       const scopedWorkspaceId = generateId()
       const scopedChatId = generateId()
       await sql.begin(async (tx) => {
@@ -2288,10 +2289,13 @@ try {
             response.request().method() === 'POST' &&
             new URL(response.url()).pathname === '/api/mothership/chat'
         )
-      const runs = () =>
-        sql<{ workspaceId: string | null; organizationId: string | null }[]>`
-          select workspace_id as "workspaceId", organization_id as "organizationId"
-          from copilot_runs where chat_id = ${scopedChatId}`
+      const runs = async () =>
+        (
+          await sql<{ workspaceId: string | null; organizationId: string | null }[]>`
+            select workspace_id as "workspaceId", organization_id as "organizationId"
+            from copilot_runs where chat_id = ${scopedChatId}`
+        ).map(({ workspaceId, organizationId }) => ({ workspaceId, organizationId }))
+      let demoted = false
       try {
         await navigate(`${base.origin}/extension/o/${organizationId}?chat=${scopedChatId}`)
         await expect(frame().getByText('QA scoped response.', { exact: true })).toBeVisible()
@@ -2321,19 +2325,29 @@ try {
           .toMatch(/^(?!active$)\w+$/)
         assert.deepEqual(await runs(), [{ workspaceId: scopedWorkspaceId, organizationId: null }])
 
-        await sql`delete from permissions where entity_type = 'workspace' and entity_id = ${scopedWorkspaceId} and user_id = ${viewer}`
+        await sql.begin(async (tx) => {
+          await tx`delete from permissions where entity_type = 'workspace' and entity_id = ${scopedWorkspaceId} and user_id = ${viewer}`
+          await tx`update member set role = 'member' where organization_id = ${organizationId} and user_id = ${viewer}`
+        })
+        demoted = true
         const followUp = chatPost()
         await composer.fill('QA scoped follow-up')
         await composer.press('Enter')
         const refusal = (await followUp).status()
-        assert(refusal === 403 || refusal === 404, `The follow-up was answered ${refusal}`)
+        // The chat route answers a workspace the sender cannot reach with 400, before any run.
+        assert(
+          refusal === 400 || refusal === 403 || refusal === 404,
+          `The follow-up was answered ${refusal}`
+        )
         // Refused, not re-scoped: no run under the organization, and the chat keeps its workspace.
         assert.deepEqual(await runs(), [{ workspaceId: scopedWorkspaceId, organizationId: null }])
         const [chat] = await sql<{ workspaceId: string | null; organizationId: string | null }[]>`
           select workspace_id as "workspaceId", organization_id as "organizationId"
           from copilot_chats where id = ${scopedChatId}`
         assert.deepEqual(chat, { workspaceId: scopedWorkspaceId, organizationId: null })
       } finally {
+        if (demoted)
+          await sql`update member set role = 'owner' where organization_id = ${organizationId} and user_id = ${viewer}`
         await sql`delete from permissions where entity_type = 'workspace' and entity_id = ${scopedWorkspaceId}`
         await sql`delete from workspace where id = ${scopedWorkspaceId}`
       }

apps/sim/scripts/test-file-list-realtime-e2e.ts

@@ -347,11 +347,14 @@ try {
             revision = required(json(await request(`${prefix()}/${fileId}/versions`)).revision)
           })
       )
-      assert.equal(
-        toRecord(json(await request(`${prefix()}/${fileId}`, 'GET', undefined, readerCookie)).file)
-          .id,
-        fileId
+      const readable = await request(
+        `${prefix()}/${fileId}/content`,
+        'GET',
+        undefined,
+        readerCookie
       )
+      assert.equal(readable.status, 200, 'Unexpected HTTP status; inspect private app logs')
+      assert.equal(readable.text, 'first version')
       assert.equal(retainedMembership.projectId, fixture.projectId)
       assert.equal(workspaceEvents.length, 0)
     }