feat(backend): also publish webhooks to operators if primary recipient is tenant

Author: njlie

packages/backend/src/tenants/service.test.ts

@@ -146,7 +146,6 @@ describe('Tenant Service', (): void => {
       expect(tenantSettings.length).toBeGreaterThan(0)
     })
 
-<<<<<<< HEAD
     test('can create a tenant with a setting', async () => {
       const walletAddressUrl = 'https://example.com'
       const createOptions = {
@@ -176,8 +175,6 @@ describe('Tenant Service', (): void => {
       expect(tenantSetting[0].value).toEqual(walletAddressUrl)
     })
 
-=======
->>>>>>> 1fa35ba66 (chore: fix some rebasing issues)
     test('tenant creation rolls back if auth tenant create fails', async (): Promise<void> => {
       const createOptions = {
         apiSecret: 'test-api-secret',

packages/backend/src/webhook/service.test.ts

@@ -33,6 +33,7 @@ import {
 import { createOutgoingPayment } from '../tests/outgoingPayment'
 import { TenantSetting, TenantSettingKeys } from '../tenants/settings/model'
 import { faker } from '@faker-js/faker'
+import { createTenant } from '../tests/tenant'
 
 const nock = (global as unknown as { nock: typeof import('nock') }).nock
 
@@ -565,5 +566,53 @@ describe('Webhook Service', (): void => {
 
       scope.done()
     })
+
+    test('Also sends webhook to operator if tenant is primary recipient', async (): Promise<void> => {
+      const tenant = await createTenant(deps)
+      const tenantWebhookUrl = faker.internet.url()
+      await TenantSetting.query(knex).insertAndFetch({
+        tenantId: tenant.id,
+        key: TenantSettingKeys.WEBHOOK_URL.name,
+        value: tenantWebhookUrl
+      })
+
+      const operatorWebhookUrl = faker.internet.url()
+      await TenantSetting.query(knex).insertAndFetch({
+        tenantId: Config.operatorTenantId,
+        key: TenantSettingKeys.WEBHOOK_URL.name,
+        value: operatorWebhookUrl
+      })
+
+      const tenantedEvent = await WebhookEvent.query(knex).patchAndFetchById(
+        event.id,
+        {
+          tenantId: tenant.id
+        }
+      )
+
+      const tenantScope = mockWebhookServer(
+        200,
+        tenantedEvent,
+        new URL(tenantWebhookUrl)
+      )
+      const operatorScope = mockWebhookServer(
+        200,
+        tenantedEvent,
+        new URL(operatorWebhookUrl)
+      )
+      await expect(webhookService.processNext()).resolves.toEqual(
+        tenantedEvent.id
+      )
+      await expect(
+        webhookService.getEvent(tenantedEvent.id)
+      ).resolves.toMatchObject({
+        attempts: 1,
+        statusCode: 200,
+        processAt: null
+      })
+
+      tenantScope.done()
+      operatorScope.done()
+    })
   })
 })

packages/backend/src/webhook/service.ts

@@ -164,7 +164,31 @@ async function processNextWebhookEvent(
         })
         const formattedSettings = formatSettings(settings)
 
-        await sendWebhookEvent(deps, event, formattedSettings)
+        // await sendWebhookEvent(deps, event, formattedSettings)
+
+        // if (event.tenantId !== deps_.config.operatorTenantId) {
+        //   const operatorSettings = await deps_.tenantSettingService.get({
+        //     tenantId: deps_.config.operatorTenantId
+        //   })
+        //   const formattedOperatorSettings = formatSettings(operatorSettings)
+        //   await sendWebhookEvent(deps, event, formattedOperatorSettings)
+        // }
+
+        if (event.tenantId !== deps_.config.operatorTenantId) {
+          const operatorSettings = await deps_.tenantSettingService.get({
+            tenantId: deps_.config.operatorTenantId
+          })
+          const formattedOperatorSettings = formatSettings(operatorSettings)
+          await sendWebhookEvent(
+            deps,
+            event,
+            formattedSettings,
+            formattedOperatorSettings
+          )
+        } else {
+          await sendWebhookEvent(deps, event, formattedSettings)
+        }
+
         span.end()
         return event.id
       })
@@ -180,11 +204,8 @@ type WebhookHeaders = {
 async function sendWebhookEvent(
   deps: ServiceDependencies,
   event: WebhookEvent,
-<<<<<<< HEAD
-  settings: Partial<FormattedTenantSettings>
-=======
-  settings?: Partial<FormattedTenantSettings>
->>>>>>> 1245e0341 (feat(backend): tenanted webhooks)
+  settings: Partial<FormattedTenantSettings>,
+  operatorSettings?: Partial<FormattedTenantSettings>
 ): Promise<void> {
   try {
     const requestHeaders: WebhookHeaders = {
@@ -205,27 +226,24 @@ async function sendWebhookEvent(
       )
     }
 
-<<<<<<< HEAD
-    await axios.post(settings?.webhookUrl ?? deps.config.webhookUrl, body, {
-      timeout: Number(settings?.webhookTimeout)
-        ? Number(settings?.webhookTimeout)
-        : deps.config.webhookTimeout,
-      headers: requestHeaders,
-      validateStatus: (status) => status === 200
-    })
-=======
-    await axios.post(
-      settings?.webhookUrl?.value ?? deps.config.webhookUrl,
-      body,
-      {
-        timeout: settings?.webhookTimeout?.value
-          ? Number(settings?.webhookTimeout?.value)
+    await Promise.all([
+      axios.post(settings?.webhookUrl ?? deps.config.webhookUrl, body, {
+        timeout: settings?.webhookTimeout
+          ? Number(settings?.webhookTimeout)
           : deps.config.webhookTimeout,
         headers: requestHeaders,
         validateStatus: (status) => status === 200
-      }
-    )
->>>>>>> 1245e0341 (feat(backend): tenanted webhooks)
+      }),
+      operatorSettings?.webhookUrl
+        ? axios.post(operatorSettings?.webhookUrl, body, {
+            timeout: operatorSettings?.webhookTimeout
+              ? Number(operatorSettings?.webhookTimeout)
+              : deps.config.webhookTimeout,
+            headers: requestHeaders,
+            validateStatus: (status) => status === 200
+          })
+        : null
+    ])
 
     await event.$query(deps.knex).patch({
       attempts: event.attempts + 1,