feat(backend): wallet address response with tenant id (#2986)

* feat(backend): create operator kratos identity on backend startup * chore: formatting * fix: handle new cases * Add migration files * Update migration files * feat(tenant): basic tenant admin api schema and service * Fix file name for migrations * feat(auth): create basic tenant service and model plus graphql schema * feat(graphql): generated data * feat(auth): add basic tenant schema and appropriate resources like model and service * feat(backend): add apollo client do dependencies * feat(auth): delete tenant * chore(auth): format * feat(backend): create tenant service implementation * feat(packages): make multi tenant work wip * feat(backend): update resolvers with tenant id and finish the tenant creation * feat(backend): small changes to schema + mapping of tenant to graphql + bruno * feat(backend,frontend): create kratos identity when tenants are created, permissioned admin UI pages * feat(wip): use tenantId in OP flow * feat: quote grant requests with tenantId * feat: outgoing payment with tenantId * chore: formatting * feat: bruno updates * chore: remove some dangling merge stuff --------- Co-authored-by: bsanduc <[email protected]> Co-authored-by: golobitch <[email protected]>
interledger · Sep 30, 2024 · 3ab716c · 3ab716c
1 parent d0867fa
commit 3ab716c
Show file tree

Hide file tree

Showing 53 changed files with 148 additions and 85 deletions.
diff --git a/bruno/collections/Rafiki/Examples/Open Payments Without Quote/Create Incoming Payment.bru b/bruno/collections/Rafiki/Examples/Open Payments Without Quote/Create Incoming Payment.bru
@@ -5,7 +5,7 @@ meta {
 }
 
 post {
-  url: {{receiverOpenPaymentsHost}}/incoming-payments
+  url: {{receiverOpenPaymentsHost}}/{{receiverTenantId}}/incoming-payments
   body: json
   auth: none
 }

diff --git a/bruno/collections/Rafiki/Examples/Open Payments Without Quote/Create Outgoing Payment.bru b/bruno/collections/Rafiki/Examples/Open Payments Without Quote/Create Outgoing Payment.bru
@@ -5,7 +5,7 @@ meta {
 }
 
 post {
-  url: {{senderOpenPaymentsHost}}/outgoing-payments
+  url: {{senderOpenPaymentsHost}}/{{senderTenantId}}/outgoing-payments
   body: json
   auth: none
 }
@@ -35,7 +35,7 @@ script:pre-request {
 
 script:post-response {
   const body = res.getBody();
-
+  
   if (body?.id) {
     bru.setEnvVar("outgoingPaymentId", body.id.split("/").pop());
   }

diff --git a/bruno/collections/Rafiki/Examples/Open Payments Without Quote/Get Outgoing Payment.bru b/bruno/collections/Rafiki/Examples/Open Payments Without Quote/Get Outgoing Payment.bru
@@ -5,7 +5,7 @@ meta {
 }
 
 get {
-  url: {{senderOpenPaymentsHost}}/outgoing-payments/{{outgoingPaymentId}}
+  url: {{senderOpenPaymentsHost}}/{{senderTenantId}}/outgoing-payments/{{outgoingPaymentId}}
   body: none
   auth: none
 }

diff --git a/...o/collections/Rafiki/Examples/Open Payments Without Quote/Get receiver wallet address.bru b/...o/collections/Rafiki/Examples/Open Payments Without Quote/Get receiver wallet address.bru
@@ -32,6 +32,8 @@ script:post-response {
   bru.setEnvVar("receiverAssetScale", body?.assetScale)
 
   const authUrl = url.parse(body?.authServer)
+  const receiverTenantId = authUrl.pathname.split('/')[1]
+  bru.setEnvVar('receiverTenantId', receiverTenantId)
   if (
       authUrl.hostname.includes('cloud-nine-wallet') || 
       authUrl.hostname.includes('happy-life-bank')

diff --git a/bruno/collections/Rafiki/Examples/Open Payments Without Quote/Get sender wallet address.bru b/bruno/collections/Rafiki/Examples/Open Payments Without Quote/Get sender wallet address.bru
@@ -28,11 +28,13 @@ script:post-response {
   }
 
   const body = res.getBody()
-
+  
   bru.setEnvVar("senderAssetCode", body?.assetCode)
   bru.setEnvVar("senderAssetScale", body?.assetScale)
 
   const authUrl = url.parse(body?.authServer)
+  const senderTenantId = authUrl.pathname.split('/')[1]
+  bru.setEnvVar('senderTenantId', senderTenantId)
   if (
       authUrl.hostname.includes('cloud-nine-wallet') || 
       authUrl.hostname.includes('happy-life-bank')

diff --git a/...ollections/Rafiki/Examples/Open Payments Without Quote/Grant Request Incoming Payment.bru b/...ollections/Rafiki/Examples/Open Payments Without Quote/Grant Request Incoming Payment.bru
@@ -5,7 +5,7 @@ meta {
 }
 
 post {
-  url: {{receiverOpenPaymentsAuthHost}}/
+  url: {{receiverOpenPaymentsAuthHost}}/{{receiverTenantId}}
   body: json
   auth: none
 }

diff --git a/...ollections/Rafiki/Examples/Open Payments Without Quote/Grant Request Outgoing Payment.bru b/...ollections/Rafiki/Examples/Open Payments Without Quote/Grant Request Outgoing Payment.bru
@@ -5,7 +5,7 @@ meta {
 }
 
 post {
-  url: {{senderOpenPaymentsAuthHost}}/
+  url: {{senderOpenPaymentsAuthHost}}/{{senderTenantId}}
   body: json
   auth: none
 }

diff --git a/bruno/collections/Rafiki/Examples/Open Payments/Create Incoming Payment.bru b/bruno/collections/Rafiki/Examples/Open Payments/Create Incoming Payment.bru
@@ -5,13 +5,14 @@ meta {
 }
 
 post {
-  url: {{receiverOpenPaymentsHost}}/incoming-payments
+  url: {{receiverOpenPaymentsHost}}/{{receiverTenantId}}/incoming-payments
   body: json
   auth: none
 }
 
 headers {
   Authorization: GNAP {{accessToken}}
+  x-operator-secret: {{operatorApiSecret}}
 }
 
 body:json {
@@ -41,7 +42,7 @@ script:pre-request {
 
 script:post-response {
   const body = res.getBody();
-
+  
   if (body?.id) {
     bru.setEnvVar("incomingPaymentId", body.id.split("/").pop());
   }

diff --git a/bruno/collections/Rafiki/Examples/Open Payments/Create Outgoing Payment.bru b/bruno/collections/Rafiki/Examples/Open Payments/Create Outgoing Payment.bru
@@ -5,7 +5,7 @@ meta {
 }
 
 post {
-  url: {{senderOpenPaymentsHost}}/outgoing-payments
+  url: {{senderOpenPaymentsHost}}/{{senderTenantId}}/outgoing-payments
   body: json
   auth: none
 }
@@ -34,7 +34,7 @@ script:pre-request {
 
 script:post-response {
   const body = res.getBody();
-
+  
   if (body?.id) {
     bru.setEnvVar("outgoingPaymentId", body.id.split("/").pop());
   }

diff --git a/bruno/collections/Rafiki/Examples/Open Payments/Create Quote.bru b/bruno/collections/Rafiki/Examples/Open Payments/Create Quote.bru
@@ -5,7 +5,7 @@ meta {
 }
 
 post {
-  url: {{senderOpenPaymentsHost}}/quotes
+  url: {{senderOpenPaymentsHost}}/{{senderTenantId}}/quotes
   body: json
   auth: none
 }
@@ -17,7 +17,7 @@ headers {
 body:json {
   {
       "walletAddress": "{{senderWalletAddress}}",
-      "receiver": "{{receiverOpenPaymentsHost}}/incoming-payments/{{incomingPaymentId}}",
+      "receiver": "{{receiverOpenPaymentsHost}}/{{receiverTenantId}}/incoming-payments/{{incomingPaymentId}}",
       "method": "ilp"
   }
 }

diff --git a/bruno/collections/Rafiki/Examples/Open Payments/Get Outgoing Payment.bru b/bruno/collections/Rafiki/Examples/Open Payments/Get Outgoing Payment.bru
@@ -5,7 +5,7 @@ meta {
 }
 
 get {
-  url: {{senderOpenPaymentsHost}}/outgoing-payments/{{outgoingPaymentId}}
+  url: {{senderOpenPaymentsHost}}/{{senderTenantId}}/outgoing-payments/{{outgoingPaymentId}}
   body: none
   auth: none
 }

diff --git a/bruno/collections/Rafiki/Examples/Open Payments/Get receiver wallet address.bru b/bruno/collections/Rafiki/Examples/Open Payments/Get receiver wallet address.bru
@@ -22,22 +22,24 @@ script:pre-request {
 
 script:post-response {
   const url = require('url')
-
+  
   if (res.getStatus() !== 200) {
     return
   }
-
+  
   const body = res.getBody()
   bru.setEnvVar("receiverAssetCode", body?.assetCode)
   bru.setEnvVar("receiverAssetScale", body?.assetScale)
 
   const authUrl = url.parse(body?.authServer)
+  const receiverTenantId = authUrl.pathname.split('/')[1]
+  bru.setEnvVar("receiverTenantId", receiverTenantId)
   if (
       authUrl.hostname.includes('cloud-nine-wallet') || 
       authUrl.hostname.includes('happy-life-bank')
   ){
       const port = authUrl.hostname.includes('cloud-nine-wallet')? authUrl.port: Number(authUrl.port) + 1000
-      bru.setEnvVar("receiverOpenPaymentsAuthHost", authUrl.protocol + '//localhost:' + port );
+      bru.setEnvVar("receiverOpenPaymentsAuthHost", authUrl.protocol + '//localhost:' + port);
   } else {
       bru.setEnvVar("receiverOpenPaymentsAuthHost", body?.authServer);
   }

diff --git a/bruno/collections/Rafiki/Examples/Open Payments/Get sender wallet address.bru b/bruno/collections/Rafiki/Examples/Open Payments/Get sender wallet address.bru
@@ -32,15 +32,18 @@ script:post-response {
   bru.setEnvVar("senderAssetScale", body?.assetScale)
 
   const authUrl = url.parse(body?.authServer)
+  const senderTenantId = authUrl.pathname.split('/')[1]
+  bru.setEnvVar("senderTenantId", senderTenantId)
   if (
       authUrl.hostname.includes('cloud-nine-wallet') || 
       authUrl.hostname.includes('happy-life-bank')
   ){
       const port = authUrl.hostname.includes('cloud-nine-wallet')? authUrl.port: Number(authUrl.port) + 1000
-      bru.setEnvVar("senderOpenPaymentsAuthHost", authUrl.protocol + '//localhost:' + port );
+      bru.setEnvVar("senderOpenPaymentsAuthHost", authUrl.protocol + '//localhost:' + port);
   } else {
       bru.setEnvVar("senderOpenPaymentsAuthHost", body?.authServer);
   }
+
 }
 
 tests {

diff --git a/bruno/collections/Rafiki/Examples/Open Payments/Grant Request Incoming Payment.bru b/bruno/collections/Rafiki/Examples/Open Payments/Grant Request Incoming Payment.bru
@@ -5,7 +5,7 @@ meta {
 }
 
 post {
-  url: {{receiverOpenPaymentsAuthHost}}/
+  url: {{receiverOpenPaymentsAuthHost}}/{{receiverTenantId}}
   body: json
   auth: none
 }

diff --git a/bruno/collections/Rafiki/Examples/Open Payments/Grant Request Outgoing Payment.bru b/bruno/collections/Rafiki/Examples/Open Payments/Grant Request Outgoing Payment.bru
@@ -5,7 +5,7 @@ meta {
 }
 
 post {
-  url: {{senderOpenPaymentsAuthHost}}/
+  url: {{senderOpenPaymentsAuthHost}}/{{senderTenantId}}
   body: json
   auth: none
 }

diff --git a/bruno/collections/Rafiki/Examples/Open Payments/Grant Request Quote.bru b/bruno/collections/Rafiki/Examples/Open Payments/Grant Request Quote.bru
@@ -5,11 +5,15 @@ meta {
 }
 
 post {
-  url: {{senderOpenPaymentsAuthHost}}/
+  url: {{senderOpenPaymentsAuthHost}}/{{senderTenantId}}
   body: json
   auth: none
 }
 
+headers {
+  x-operator-secret: {{operatorApiSecret}}
+}
+
 body:json {
   {
       "access_token": {

diff --git a/bruno/collections/Rafiki/Examples/Web Monetization/Create Incoming Payment.bru b/bruno/collections/Rafiki/Examples/Web Monetization/Create Incoming Payment.bru
@@ -5,7 +5,7 @@ meta {
 }
 
 post {
-  url: {{receiverOpenPaymentsHost}}/incoming-payments
+  url: {{receiverOpenPaymentsHost}}/{{receiverTenantId}}/incoming-payments
   body: json
   auth: none
 }
@@ -36,7 +36,7 @@ script:pre-request {
 
 script:post-response {
   const body = res.getBody();
-
+  
   if (body?.id) {
     bru.setEnvVar("incomingPaymentId", body.id.split("/").pop());
     bru.setEnvVar("quoteDebitAmount", JSON.stringify({

diff --git a/bruno/collections/Rafiki/Examples/Web Monetization/Create Outgoing Payment 1.bru b/bruno/collections/Rafiki/Examples/Web Monetization/Create Outgoing Payment 1.bru
@@ -5,7 +5,7 @@ meta {
 }
 
 post {
-  url: {{senderOpenPaymentsHost}}/outgoing-payments
+  url: {{senderOpenPaymentsHost}}/{{senderTenantId}}/outgoing-payments
   body: json
   auth: none
 }
@@ -17,7 +17,7 @@ headers {
 body:json {
   {
     "walletAddress": "{{senderWalletAddress}}",
-    "incomingPayment": "{{receiverOpenPaymentsHost}}/incoming-payments/{{incomingPaymentId}}",
+    "incomingPayment": "{{receiverOpenPaymentsHost}}/{{receiverTenantId}}/incoming-payments/{{incomingPaymentId}}",
     "debitAmount": {
       "value": "300",
       "assetCode": "USD",
@@ -40,7 +40,7 @@ script:pre-request {
 
 script:post-response {
   const body = res.getBody();
-
+  
   if (body?.id) {
     bru.setEnvVar("outgoingPaymentId", body.id.split("/").pop());
   }

diff --git a/bruno/collections/Rafiki/Examples/Web Monetization/Create Outgoing Payment 2.bru b/bruno/collections/Rafiki/Examples/Web Monetization/Create Outgoing Payment 2.bru
@@ -5,7 +5,7 @@ meta {
 }
 
 post {
-  url: {{senderOpenPaymentsHost}}/outgoing-payments
+  url: {{senderOpenPaymentsHost}}/{{senderTenantId}}/outgoing-payments
   body: json
   auth: none
 }
@@ -17,7 +17,7 @@ headers {
 body:json {
   {
     "walletAddress": "{{senderWalletAddress}}",
-    "incomingPayment": "{{receiverOpenPaymentsHost}}/incoming-payments/{{incomingPaymentId}}",
+    "incomingPayment": "{{receiverOpenPaymentsHost}}/{{receiverTenantId}}/incoming-payments/{{incomingPaymentId}}",
     "debitAmount": {
       "value": "300",
       "assetCode": "USD",

diff --git a/bruno/collections/Rafiki/Examples/Web Monetization/Create Outgoing Payment 3.bru b/bruno/collections/Rafiki/Examples/Web Monetization/Create Outgoing Payment 3.bru
@@ -5,7 +5,7 @@ meta {
 }
 
 post {
-  url: {{senderOpenPaymentsHost}}/outgoing-payments
+  url: {{senderOpenPaymentsHost}}/{{senderTenantId}}/outgoing-payments
   body: json
   auth: none
 }
@@ -17,7 +17,7 @@ headers {
 body:json {
   {
     "walletAddress": "{{senderWalletAddress}}",
-    "incomingPayment": "{{receiverOpenPaymentsHost}}/incoming-payments/{{incomingPaymentId}}",
+    "incomingPayment": "{{receiverOpenPaymentsHost}}/{{receiverTenantId}}/incoming-payments/{{incomingPaymentId}}",
     "debitAmount": {
       "value": "300",
       "assetCode": "USD",

diff --git a/bruno/collections/Rafiki/Examples/Web Monetization/Get Outgoing Payment.bru b/bruno/collections/Rafiki/Examples/Web Monetization/Get Outgoing Payment.bru
@@ -5,7 +5,7 @@ meta {
 }
 
 get {
-  url: {{senderOpenPaymentsHost}}/outgoing-payments/{{outgoingPaymentId}}
+  url: {{senderOpenPaymentsHost}}/{{senderTenantId}}/outgoing-payments/{{outgoingPaymentId}}
   body: none
   auth: none
 }

diff --git a/bruno/collections/Rafiki/Examples/Web Monetization/Get receiver wallet address.bru b/bruno/collections/Rafiki/Examples/Web Monetization/Get receiver wallet address.bru
@@ -28,11 +28,13 @@ script:post-response {
   }
 
   const body = res.getBody()
-
+  
   bru.setEnvVar("receiverAssetCode", body?.assetCode)
   bru.setEnvVar("receiverAssetScale", body?.assetScale)
 
   const authUrl = url.parse(body?.authServer)
+  const receiverTenantId = authUrl.pathname.split('/')[1]
+  bru.setEnvVar('receiverTenantId', receiverTenantId)
   if (
       authUrl.hostname.includes('cloud-nine-wallet') || 
       authUrl.hostname.includes('happy-life-bank')

diff --git a/bruno/collections/Rafiki/Examples/Web Monetization/Get sender wallet address.bru b/bruno/collections/Rafiki/Examples/Web Monetization/Get sender wallet address.bru
@@ -32,6 +32,8 @@ script:post-response {
   bru.setEnvVar("senderAssetScale", body?.assetScale)
 
   const authUrl = url.parse(body?.authServer)
+  const senderTenantId = authUrl.pathname.split('/')[1]
+  bru.setEnvVar('senderTenantId', senderTenantId)
   if (
       authUrl.hostname.includes('cloud-nine-wallet') || 
       authUrl.hostname.includes('happy-life-bank')

diff --git a/bruno/collections/Rafiki/Examples/Web Monetization/Grant Request Incoming Payment.bru b/bruno/collections/Rafiki/Examples/Web Monetization/Grant Request Incoming Payment.bru
@@ -5,7 +5,7 @@ meta {
 }
 
 post {
-  url: {{receiverOpenPaymentsAuthHost}}/
+  url: {{receiverOpenPaymentsAuthHost}}/{{receiverTenantId}}
   body: json
   auth: none
 }

diff --git a/bruno/collections/Rafiki/Examples/Web Monetization/Grant Request Outgoing Payment.bru b/bruno/collections/Rafiki/Examples/Web Monetization/Grant Request Outgoing Payment.bru
@@ -5,7 +5,7 @@ meta {
 }
 
 post {
-  url: {{senderOpenPaymentsAuthHost}}/
+  url: {{senderOpenPaymentsAuthHost}}/{{senderTenantId}}
   body: json
   auth: none
 }

diff --git a/bruno/collections/Rafiki/Open Payments APIs/Incoming Payments/Complete Incoming Payment.bru b/bruno/collections/Rafiki/Open Payments APIs/Incoming Payments/Complete Incoming Payment.bru
@@ -5,7 +5,7 @@ meta {
 }
 
 post {
-  url: {{receiverOpenPaymentsHost}}/incoming-payments/{{incomingPaymentId}}/complete
+  url: {{receiverOpenPaymentsHost}}/{{receiverTenantId}}/incoming-payments/{{incomingPaymentId}}/complete
   body: json
   auth: none
 }

diff --git a/bruno/collections/Rafiki/Open Payments APIs/Incoming Payments/Create Incoming Payment.bru b/bruno/collections/Rafiki/Open Payments APIs/Incoming Payments/Create Incoming Payment.bru
@@ -5,7 +5,7 @@ meta {
 }
 
 post {
-  url: {{receiverOpenPaymentsHost}}/incoming-payments
+  url: {{receiverOpenPaymentsHost}}/{{receiverTenantId}}/incoming-payments
   body: json
   auth: none
 }
@@ -42,7 +42,7 @@ script:pre-request {
 
 script:post-response {
   const body = res.getBody();
-
+  
   if (body?.id) {
     bru.setEnvVar("incomingPaymentId", body.id.split("/").pop());
   }

diff --git a/...ns/Rafiki/Open Payments APIs/Incoming Payments/Get Incoming Payment -Unauthenticated-.bru b/...ns/Rafiki/Open Payments APIs/Incoming Payments/Get Incoming Payment -Unauthenticated-.bru
@@ -5,7 +5,7 @@ meta {
 }
 
 get {
-  url: {{receiverOpenPaymentsHost}}/incoming-payments/{{incomingPaymentId}}
+  url: {{receiverOpenPaymentsHost}}/{{receiverTenantId}}/incoming-payments/{{incomingPaymentId}}
   body: none
   auth: none
 }