Stop using Team.plugins_opt_in

src/sql.ts

@@ -6,7 +6,7 @@ export async function getPluginRows(server: PluginsServer): Promise<Plugin[]> {
             (SELECT posthog_pluginconfig.plugin_id
                 FROM posthog_pluginconfig
                 LEFT JOIN posthog_team ON posthog_team.id = posthog_pluginconfig.team_id
-                WHERE (posthog_team.id IS NULL OR posthog_team.plugins_opt_in='t') AND posthog_pluginconfig.enabled='t'
+                WHERE posthog_pluginconfig.enabled='t'
                 GROUP BY posthog_pluginconfig.plugin_id)`
     )
     return pluginRows
@@ -18,7 +18,7 @@ export async function getPluginAttachmentRows(server: PluginsServer): Promise<Pl
             (SELECT posthog_pluginconfig.id
                 FROM posthog_pluginconfig
                 LEFT JOIN posthog_team ON posthog_team.id = posthog_pluginconfig.team_id
-                WHERE (posthog_team.id IS NULL OR posthog_team.plugins_opt_in='t') AND posthog_pluginconfig.enabled='t')`
+                WHERE posthog_pluginconfig.enabled='t')`
     )
     return rows
 }
@@ -28,7 +28,7 @@ export async function getPluginConfigRows(server: PluginsServer): Promise<Plugin
         `SELECT posthog_pluginconfig.*
             FROM posthog_pluginconfig
             LEFT JOIN posthog_team ON posthog_team.id = posthog_pluginconfig.team_id
-            WHERE (posthog_team.id IS NULL OR posthog_team.plugins_opt_in='t') AND posthog_pluginconfig.enabled='t'`
+            WHERE posthog_pluginconfig.enabled='t'`
     )
     return rows
 }

tests/sql.test.ts

@@ -16,7 +16,8 @@ afterEach(async () => {
 
 test('getPluginAttachmentRows', async () => {
     const rows1 = await getPluginAttachmentRows(server)
-    expect(rows1).toEqual([
+
+    const rowsExpected = [
         {
             content_type: 'application/octet-stream',
             contents: Buffer.from([116, 101, 115, 116]),
@@ -27,16 +28,20 @@ test('getPluginAttachmentRows', async () => {
             plugin_config_id: 39,
             team_id: 2,
         },
-    ])
+    ]
+    expect(rows1).toEqual(rowsExpected)
+
     await server.db.postgresQuery("update posthog_team set plugins_opt_in='f'")
     const rows2 = await getPluginAttachmentRows(server)
-    expect(rows2).toEqual([])
+
+    expect(rows2).toEqual(rowsExpected)
 })
 
 test('getPluginConfigRows', async () => {
     await resetTestDatabase(`const processEvent = event => event`)
     const rows1 = await getPluginConfigRows(server)
-    expect(rows1).toEqual([
+
+    const rowsExpected = [
         {
             config: {
                 localhostIP: '94.224.212.175',
@@ -48,16 +53,20 @@ test('getPluginConfigRows', async () => {
             plugin_id: 60,
             team_id: 2,
         },
-    ])
+    ]
+    expect(rows1).toEqual(rowsExpected)
+
     await server.db.postgresQuery("update posthog_team set plugins_opt_in='f'")
     const rows2 = await getPluginConfigRows(server)
-    expect(rows2).toEqual([])
+
+    expect(rows2).toEqual(rowsExpected)
 })
 
 test('getPluginRows', async () => {
     await resetTestDatabase(`const processEvent = event => event`)
     const rows1 = await getPluginRows(server)
-    expect(rows1).toEqual([
+
+    const rowsExpected = [
         {
             archive: expect.any(Buffer),
             config_schema: {
@@ -93,10 +102,13 @@ test('getPluginRows', async () => {
             tag: '0.0.2',
             url: 'https://www.npmjs.com/package/posthog-maxmind-plugin',
         },
-    ])
+    ]
+    expect(rows1).toEqual(rowsExpected)
+
     await server.db.postgresQuery("update posthog_team set plugins_opt_in='f'")
     const rows2 = await getPluginRows(server)
-    expect(rows2).toEqual([])
+
+    expect(rows2).toEqual(rowsExpected)
 })
 
 test('setError', async () => {