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

njlie · 2025-04-02T20:30:49Z

Changes proposed in this pull request

Publishes a second webhook to the operator's webhook URL if primary recipient is a tenant of the Rafiki instance.

Context

Fixes #3283.

Checklist

Related issues linked using fixes #number
Tests added/updated
Make sure that all checks pass
Bruno collection updated (if necessary)
Documentation issue created with user-docs label (if necessary)
OpenAPI specs updated (if necessary)

github-actions · 2025-04-24T22:44:05Z

🚀 Performance Test Results

Performance test summary not found.

📜 Logs


> [email protected] run-tests:testenv /home/runner/work/rafiki/rafiki/test/performance
> ./scripts/run-tests.sh -e test "-k" "-q" "--vus" "4" "--duration" "1m"

Cloud Nine GraphQL API is up: http://localhost:3101/graphql
Cloud Nine Wallet Address is up: http://localhost:3100/
Happy Life Bank Address is up: http://localhost:4100/
cloud-nine-wallet-test-backend already set
cloud-nine-wallet-test-auth already set
happy-life-bank-test-backend already set
happy-life-bank-test-auth already set


  █ TOTAL RESULTS 

    HTTP
    http_req_duration....................: avg=1.5ms min=1.5ms med=1.5ms max=1.5ms p(90)=1.5ms p(95)=1.5ms
    http_req_failed......................: 100.00% 1 out of 1
    http_reqs............................: 1       366.819961/s

    NETWORK
    data_received........................: 232 B   85 kB/s
    data_sent............................: 505 B   185 kB/s



/home/runner/work/rafiki/rafiki/test/performance:
 ERR_PNPM_RECURSIVE_RUN_FIRST_FAIL  [email protected] run-tests:testenv: `./scripts/run-tests.sh -e test "-k" "-q" "--vus" "4" "--duration" "1m"`
Exit status 107

mkurapov

Looks good, some minor comments.

Also, I think it would be good to enable this feature under an environment variable eg (SEND_ALL_WEBHOOKS_TO_OPERATOR). Can do it separately after this is merged in

Also some tests are failing

mkurapov · 2025-04-28T14:16:02Z

packages/frontend/app/lib/api/webhook.server.ts

@@ -50,6 +51,7 @@ export const listWebhooks = async (
    `,
    variables: args
  })
+  console.log('response.data.webhookEvents=', response.data.webhookEvents)


Suggested change

console.log('response.data.webhookEvents=', response.data.webhookEvents)

mkurapov · 2025-04-28T14:17:01Z

packages/backend/src/webhook/service.ts

@@ -32,6 +33,7 @@ interface GetPageOptions {

 export interface WebhookService {
  getEvent(id: string): Promise<WebhookEvent | undefined>
+  getWebhook(id: string): Promise<Webhook | undefined>


is getWebhook used?

Looks like its used for testing

I managed to rewrite the tests such that it's not necessary anymore. So it can be removed.

mkurapov · 2025-04-28T14:20:36Z

packages/backend/src/open_payments/wallet_address/service.ts

@@ -379,12 +379,13 @@ async function getOrPollByUrl(
  const existingWalletAddress = await getWalletAddressByUrl(deps, url)
  if (existingWalletAddress) return existingWalletAddress

-  await WalletAddressEvent.query(deps.knex).insert({
+  await WalletAddressEvent.query(deps.knex).insertGraph({


Maybe we can make an nice-to-have issue for this:
We should check the path/prefix of the wallet address, and if it matches a particular tenant, we send that to them instead of the operator tenant

Captured in #3414

…bhook events

…t is tenant

BlairCurrey · 2025-04-30T16:13:06Z

packages/backend/src/webhook/service.ts

-  )
+      const formattedSettings = formatSettings(settings)
+
+      await sendWebhookEvent(deps, webhook, formattedSettings)


do we need to pass operatorSettings into sendWebhookEvent? Otherwise i dont think we ever do the duplicate publish to operator?

So sendWebhookEvent does not actually distinguish between if a webhook is for an operator or a tenant. Rather, webhooks for tenants and the operator are all occupying the same queue that sendWebhookEvent processes. So each time another service determines that a webhook event has occurred, it will create 1-2 webhooks depending on if the recipient is the operator or not.

This does conflict with the concept I'm introducing in this PR which is the distinction between webhooks and webhook events. This would probably make more sense if it were renamed to processWebhook instead of processWebhookEvent.

as discussed in slack, it looks like the optional operatorSettings just needs to be removed from sendWebhookEvent args then

github-actions bot added type: tests Testing related pkg: backend Changes in the backend package. type: source Changes business logic labels Apr 2, 2025

njlie force-pushed the nl/3121/tenanted-webhooks branch from 7cfa385 to 14fe53f Compare April 2, 2025 22:28

njlie force-pushed the nl/3283/operator-webhooks branch 2 times, most recently from a5ce199 to 98b1291 Compare April 8, 2025 17:59

njlie force-pushed the nl/3121/tenanted-webhooks branch from 4260036 to 5c51d6d Compare April 8, 2025 18:45

njlie force-pushed the nl/3283/operator-webhooks branch from 98b1291 to 64973e7 Compare April 8, 2025 20:20

Base automatically changed from nl/3121/tenanted-webhooks to 2893/multi-tenancy-v1 April 15, 2025 23:13

github-actions bot added pkg: frontend Changes in the frontend package. pkg: mock-account-service-lib labels Apr 17, 2025

njlie force-pushed the nl/3283/operator-webhooks branch from 1950deb to d241f0f Compare April 17, 2025 21:54

github-actions bot added the pkg: mock-ase label Apr 17, 2025

njlie marked this pull request as ready for review April 18, 2025 20:26

njlie requested review from BlairCurrey, mkurapov, golobitch, sanducb and oana-lolea April 18, 2025 20:26

njlie force-pushed the nl/3283/operator-webhooks branch from 886bdac to 38510de Compare April 24, 2025 22:41

mkurapov reviewed Apr 28, 2025

View reviewed changes

golobitch and others added 8 commits April 29, 2025 12:02

tests(tenants): when tenant is created, default settings should be set

3f8304f

feat(graphql): tenant settings

f045e16

fix(tenantSettings): address PR comments

5dbad86

fix(tenantSettings): address PR comments

c81e36e

feat(backend): tenanted webhooks

cfb41c5

fix: rebase

912bc59

chore: fix some rebasing issues

7d6f53b

feat: add tenant id to tests; temporary operator tenant id in peer we…

d212132

…bhook events

njlie and others added 15 commits April 29, 2025 12:02

fix: build errors

8907eb5

feat: remove temporary tenantId code from before tenanted peers

3eacf38

fix: build errors

7a649bb

tests(tenants): when tenant is created, default settings should be set

bfb9619

fix(tenantSettings): address PR comments

6a16fa2

feat(backend): tenanted webhooks

b642b1d

chore: fix some rebasing issues

980a881

feat(backend): also publish webhooks to operators if primary recipien…

505ca58

…t is tenant

fix: rebase issues

1b5c5ba

fix: tests

4bff86c

feat: add webhook model

ad1256f

refactor: move webhook & webhookevent models

ee4bbcc

feat: include tenant id in webhook gql response

f63fb51

fix: generated files

659895b

fix: rebase errors

3324c3b

njlie force-pushed the nl/3283/operator-webhooks branch from 38510de to 3324c3b Compare April 29, 2025 19:02

feat: review comments

284c049

mkurapov approved these changes Apr 30, 2025

View reviewed changes

BlairCurrey reviewed Apr 30, 2025

View reviewed changes

feat: remove getWebhook, rename processWebhookEvent to processWebhook

406d636

mkurapov approved these changes May 1, 2025

View reviewed changes

njlie requested a review from BlairCurrey May 1, 2025 17:39

BlairCurrey approved these changes May 1, 2025

View reviewed changes

fix: remove operatorSettings from sendWebhook

a09ef79

njlie merged commit 800935b into 2893/multi-tenancy-v1 May 1, 2025
38 checks passed

njlie deleted the nl/3283/operator-webhooks branch May 1, 2025 23:11

mkurapov mentioned this pull request Jun 9, 2025

[Multi-Tenant] Have duplicate webhook publishing to operator behind ENV flag #3454

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

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

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

Uh oh!

njlie commented Apr 2, 2025 •

edited

Loading

Uh oh!

github-actions bot commented Apr 24, 2025 •

edited

Loading

Uh oh!

mkurapov left a comment

Uh oh!

mkurapov Apr 28, 2025

Uh oh!

mkurapov Apr 28, 2025

Uh oh!

mkurapov Apr 30, 2025

Uh oh!

njlie Apr 30, 2025

Uh oh!

mkurapov Apr 28, 2025

Uh oh!

njlie Apr 29, 2025

Uh oh!

BlairCurrey Apr 30, 2025 •

edited

Loading

Uh oh!

njlie Apr 30, 2025

Uh oh!

BlairCurrey May 1, 2025 •

edited

Loading

Uh oh!

Uh oh!

Uh oh!

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

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

Uh oh!

Conversation

njlie commented Apr 2, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Changes proposed in this pull request

Context

Checklist

Uh oh!

github-actions bot commented Apr 24, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

🚀 Performance Test Results

Uh oh!

mkurapov left a comment

Choose a reason for hiding this comment

Uh oh!

mkurapov Apr 28, 2025

Choose a reason for hiding this comment

Uh oh!

mkurapov Apr 28, 2025

Choose a reason for hiding this comment

Uh oh!

mkurapov Apr 30, 2025

Choose a reason for hiding this comment

Uh oh!

njlie Apr 30, 2025

Choose a reason for hiding this comment

Uh oh!

mkurapov Apr 28, 2025

Choose a reason for hiding this comment

Uh oh!

njlie Apr 29, 2025

Choose a reason for hiding this comment

Uh oh!

BlairCurrey Apr 30, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

njlie Apr 30, 2025

Choose a reason for hiding this comment

Uh oh!

BlairCurrey May 1, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

njlie commented Apr 2, 2025 •

edited

Loading

github-actions bot commented Apr 24, 2025 •

edited

Loading

BlairCurrey Apr 30, 2025 •

edited

Loading

BlairCurrey May 1, 2025 •

edited

Loading