Skip to content

Commit f8c4684

Browse files
njliemkurapovBlairCurreykoekieboxoana-lolea
authored
feat: Multi-Tenancy v1 (#3413)
* feat(backend): tenants table v1 (#3132) * feat(auth): tenants table v1 (#3133) * feat(auth): tenants table v1 * fix: add updatedAt, createdAt * feat: add deletedAt * feat(auth): tenant service (#3144) * feat(auth): tenant service * chore(auth): format * fix(auth): jest test warning about migration * fix(auth): remove temporary code * feat(auth): soft delete tenants * fix(auth): return erroneously removed tests * feat(backend): tenants service (#3123) (#3140) * feat(backend): tenant service * fix: integration tests * feat: use soft delete * refactor: compare whole object in test * fix: better gql errors in tests * feat: add idp columns to tenant model * feat: pagination tests, push deletedAt to auth api call * feat: add cache * fix: update localenv environment variables * feat: make some tenants fields optional, small refactors * feat(auth, backend): seed operator tenant (#3156) * feat(auth): migration to seed operator tenant * feat(backend): migration to seed operator tenant * chore(localenv): add env vars for operator tenant * test(backend): set operator env variables in jest config * test(auth): set operator env variables in jest config * test(auth, backend): load env vars into jest environment script * feat(auth,backend): update migrations with error messages * test(integration): adding operator tenant vars * chore(backend, localenv): replace OPERATOR_TENANT_SECRET with existing API_SECRET * feat(integration): sign Admin API requests during integration tests (#3177) * fix(backend): await signature verification * test(integration): add signatures to apollo client requests * test(backend): sign GraphQL requests in test environment * Revert "test(backend): sign GraphQL requests in test environment" This reverts commit 0a128d1. * chore(backend): remove sig verification in test files * feat(backend): tenant signature validation for admin api (#3164) * feat(auth): tenants table v1 * feat(backend): tenant service * feat: use soft delete * feat: add idp columns to tenant model * feat: pagination tests, push deletedAt to auth api call * feat: add cache * feat(backend): tenant signature validation for admin api * fix: rebase errors * fix: remove admin api secret check from app * fix: always expect tenant id in request * chore: remove some logs * feat: await signature verification, test improvements * fix: better util parameters * fix: add tenant info to apollo context * feat: fix integration tests * fix: make tenant required on extended apollo context * feat: auth service-to-service api (#3148) * feat(auth): add service api with /healtz endpoint * feat(auth): tenant routes * feat(auth): service api error handling * chore(auth): rm old todo * fix(auth): how errors are set * fix(auth): improve tenant tests, cleanup tenant get response, * feat(backend): auth service api client * fix(auth): change status codes to 204 where no body * fix(backend): format * feat(auth): add required deletedAt to DELETE /tenant body * feat(backend): AUTH_SERVICE_API_URL env var * fix(backend): auth service client tests to mock codes correctly * feat(backend): add AuthServiceClient dep * feat(backend): use auth service client in tenant service * chore(auth): format * chore(auth): format * fix(integration,localenv): auth service api config * fix(backend,auth): update tenant api to support deletedAt * docs: update with env vars * fix(backend): dep container type * fix(localenv): docker compose config * fix(backend): add default header to api client * feat(backend): tenanted assets (#3206) * feat(backend): migration to backfill tenantId on assets * feat(backend): add tenantId to asset, use it in service * feat(backend): use tenantId in asset resolvers * test(backend): update tests to use asset tenantId where necessary * test(backend): truncate tenant table manually in tenant tests * test(backend): update failing accounting tests * test(backend): update tenant service test * test: fix accounting tests linting * test(backend): update accounting tests * feat(backend): use tenantId when fetching asset * test(backend): make tests work with separate middleware * test(backend): keep operator tenant when truncating tables * test(backend): skip tenant pagination tests for now * test(backend): seed operator tenant in truncateTable * test(backend): seed operator tenant after tenants service is done * test(backend): use separate schema for tenant tests * test(backend): pass operator tenant id in pagination tests * feat(backend): make tenantId required in asset pagination * test(backend): update tenant service tests * chore(backend): update config file * test: update truncateTables to take in dbSchema * feat(backend): make tenantId optional in asset pagination * feat(fronted): tenanted admin api credentials (#3213) * feat(frontend): set api credentials on session * chore(frontend): more details in todo comment * refactor(frontend): move credentials form from modal to component on index * chore(frontend): mark dialog for removal - not removing yet because not sure if we might end up using it. could be useful if we want to make global redirect if this is not set. * feat(frontend): store api creds in server side session * feat(frontend): POC for adding tenantId from session to headers for all apollo requests Uses the assets and list asset query. This POC passes the request to the listAsset function. Which imports the apolloClient directly and passes the cookie from request headers in the context. To avoid having to set this on each query as we compose it, my intention is to create a new getApolloClient function and use that insteadof directly importing a single client. This enables us to form a link to handle setting the headers per request (as opposed to static links that are used across all requests as it is currently). * feat(frontend): form apollo client per request - enables authLink to get tenantId, apiSecret from cookie in request - wondered if this was a performance concern (maybe why we had single instance before?) but found several things indicating this is OK and even recommended: - apollographql/apollo-client#9520 (comment) - https://www.apollographql.com/blog/how-to-use-apollo-client-with-remix * fix(mock-ase): update seed script to pass tenant sig/id verifcation * feat(frontend): block api cred form submit on invalid uuid * feat(frontend): handle errors, WIP apollo client - see TODOs in apollo client in frontend. maybe need to remove some env vars and verify how no tenantid/secret are handled * feat(frontend): disable nav links * docs(localenv): update readme to not say kratos is required * chore(frontend): format * chore(frontend): rm unused component * chore(frontend): rm commented out code * chore(frontend): formatting * refactor(frontend): better error parsing * chore(frontend): rm todo * refactor(frontend): use session api for deletion, not manual * fix(frontend): display error based on message reverses previous commit to use apollo error. proved unreliable * fix(frontend): rm SIGNATURE_SECRET, SIGNATURE_VERSION env vars * feat(mock-ase): log operator/tenant details to streamline use of frontend * feat(frontend): dont show nav items if api creds required and not set * feat(frontend): move api credential set action to own endpoint - removes the action from the index. the intention is to expose the remix server port over docker and call this from the MASE to set the api credentials on start * feat(frontend): prefill api credential form * chore(frontend): format * feat(frontend): auto submit form if values passed in requires changing intent to be set as an input. submitting form bypasses the button so the action didnt have the intent and failed when auto submitting. * fix: reinstate sig version env var * feat(backend): tenant support for wallet address (#3114) (#3152) * feat(backend): tenant service * fix: integration tests * feat: use soft delete * refactor: compare whole object in test * fix: better gql errors in tests * feat: add idp columns to tenant model * feat: pagination tests, push deletedAt to auth api call * feat: add cache * fix: update localenv environment variables * feat(3114): add tenant to wallet address. * feat(3114): test fixes. * feat: make some tenants fields optional, small refactors * feat(auth): tenants table v1 * feat(backend): tenant service * feat: use soft delete * feat: add idp columns to tenant model * feat: pagination tests, push deletedAt to auth api call * feat: add cache * feat(backend): tenant signature validation for admin api * fix: rebase errors * feat(3114): update seed.ts * fix: remove admin api secret check from app * fix: always expect tenant id in request * chore: remove some logs * feat(3114): update for auth and resource server. * feat(3114): fix asset service.test.ts * feat(3114): fix tests. * feat(3114): merged with latest tenant changes. * feat(3114): extract tenant id from tenant context instead of admin input variable. * feat(3114): test case updates, obtain tenant from header. * feat(3114): fix test cases for wallet address. * feat(3114): address review comments. * feat(3114): rework tenantId to not be mandatory for wallet address service layer. * feat(3114): rework tenantId to not be mandatory for wallet address service layer. * feat(3114): rework tenantId to not be mandatory for wallet address service layer. * feat(3114): fix tenant service test case. * feat(3114): fix tenant service test case. * feat(3114): fix tenant service test case. * feat(3114): fix tenant service test case. * feat(3114): fix tenant service test case. * feat(3114): force 'forTenantId'. * feat(3114): force 'forTenantId'. * feat(3114): force 'forTenantId'. * feat(3114): enhancements for 'forTenantId'. * feat(3114): test case fixes. * feat(3114): internal server error * feat(3114): test case. * feat(3114): test case. * feat(3114): review feedback. * feat(3114): review feedback. * feat(3114): remove tenant on quote. * feat(3114): default operator tenant. * feat(3114): review feedback. * feat(3114): review feedback from Max. * feat(3114): review feedback from Max. * feat(3114): fixed. * feat(3114): review feedback. * feat(3114): review feedback. * feat(3114): review feedback. do not force error on graphql middleware. * feat(3114): fix the integration test. * feat(3114): further review comments. * feat(3114): further review comments. * feat(3114): final round with Max. * feat(3114): revert. * feat(3114): remove unused. * feat(3114): set the correct operator id. --------- Co-authored-by: Nathan Lie <[email protected]> * feat(backend): backend tenant graphql resolvers (#3234) * feat: backend tenant graphql resolvers * chore: formatting * fix: extra testing db for tenants * feat: bruno collection * feat: update graphql schema comments * fix: review comments * feat: optional idp secret & consent url * feat: tenant response requirement * feat: make delete operator-only * chore: cleanup * chore(integration): fix apollo client constructor * chore(integration): fix & tidy integration tests * chore(backend): update auth apollo client signature timestamp * docs(localenv): add details for tenant credentials for admin ui (#3251) * docs(localenv): add details for tenant credentials for admin ui * doc(localenv): fix typo * chore: admin ui requirement info and add example output * chore: use full name for MASE, instead of acronym * feat(auth): tenanted grants (#3187) * feat(auth): tenanted grants * fix: tests * feat: update bruno collection * fix: tests * feat: update bruno requests, fix integration tests * feat: handle tenants with no idp info * feat: backfill tenants on grants, trim down queries * feat: use tenantId in grant revocation * fix: service function signatures * feat(2915): admin front-end for tenant support (#3254) * feat: backend tenant graphql resolvers * chore: formatting * fix: extra testing db for tenants * feat: bruno collection * feat: update graphql schema comments * fix: review comments * feat: optional idp secret & consent url * feat: tenant response requirement * feat: make delete operator-only * feat(2915): admin front-end for tenant support * feat(2915): apply permissions for tenant screens * feat(2915): improvements * chore: cleanup * feat(2915): merged with tenant branch. updates to update screen. * feat(2915): update fixes. * feat(3180): bug fixes and testing with non operator tenant. * feat(3180): bug fixes and testing with non operator tenant. * feat(2915): review feedback * feat(2915): fix update. field validation for email. * feat(2915): formatting. * feat(2915): fix. * feat(2915): review fixes. --------- Co-authored-by: Nathan Lie <[email protected]> * feat(backend/frontend): 3256 able to view deleted tenant (#3299) * feat(3256): able to view deleted tenant * feat(3256): fix backend tests. * feat(3256): allow for switching between deleted and not. * feat(3256): review comments. * feat(backend): tenanted incoming payments (#3271) * Draft version of tenanted incoming payments * Finished fixing unit and integration tests * PR comments fixes * Created helper function that adds tenantId to incoming payment id * Removed tenantId from url in bruno requests, added tenantId in url of the incoming payment, fixed tests accordingly * Fixed formatting * Replaced get with findOne when querying using id and tenantId. * feat(backend): tenanted quotes and outgoing payments (#3171) * feat: tenanted quotes - first iteration with dummy tenant * feat: tenanted quotes - replace hardcoded tenantId values with creation of tenant * feat: tenanted quotes - formatting * feat: tenanted quotes - fix outgoing payments service test * WIP * Fix tests - TODOs not resolved yet * feat: tenanted quotes and outgoing payments - update resolvers and fix all tests * feat: tenanted quotes and outgoing payments - remove unnecessary comments * feat: tenanted quotes and outgoing payments - fix integration tests * feat: tenanted quotes and outgoing payments - fix vulnerabilities scan * feat: tenanted quotes and outgoing payments - partially fix vulnerabilities scan * feat: tenanted quotes and outgoing payments - fix get routes for quotes and outgoing payments * feat: tenanted quotes and outgoing payments - fix outgoing payments routes unit tests * chore: fix docker image scans (#3272) * chore: fix path-to-regexp lib * chore: update base node image version in Dockerfiles --------- Co-authored-by: bsanduc <[email protected]> * feat: tenanted quotes and outgoing payments - remove tenantId from ILP payment method handler * feat: tenanted quotes and outgoing payments - remove tenantId from StartQuoteOptions in quote service * feat: tenanted quotes and outgoing payments - fix unit tests * feat: tenanted quotes and outgoing payments - remove tenantId from GraphQL Input types * feat: tenanted quotes and outgoing payments - format * feat: tenanted quotes and outgoing payments - remove tenantId from integration test inputs * feat: tenanted quotes and outgoing payments - remove unnecessary tenantId * feat: tenanted quotes and outgoing payments - update Bruno collection * feat: tenanted quotes and outgoing payments - address PR comments * feat: tenanted quotes and outgoing payments - fix Bruno collection merge conflict * feat: tenanted quotes and outgoing payments - add tenantId to outgoing payments routes, add test cases for unknown tenantId * feat: tenanted quotes and outgoing payments - update comments for GraphQL types * feat: tenanted quotes and outgoing payments - update quote resolver context * feat: tenanted quotes and outgoing payments - add tenantId to outgoing payment and quote routes middleware * feat: tenanted quotes and outgoing payments - add test for getting outgoing payments WA middleware * feat: tenanted quotes and outgoing payments - modify get outgoing payment query in service * feat: tenanted quotes and outgoing payments - add test for getting WA from quote middleware * feat: tenanted quotes and outgoing payments - remove unused import * feat: tenanted quotes and outgoing payments - remove unused import * feat: tenanted quotes and outgoing payments - format --------- Co-authored-by: Max Kurapov <[email protected]> * feat(frontend): add operator-contextual dropdowns for tenant selection (#3289) * feat(frontend): add operator-contextual dropdowns for tenant selection during asset, wallet address, and peer creation * feat: improved dropdown labels * fix: use tenantId properly during asset creation * chore: gql type, remove dangling log * chore: regenerate graphql * feat(tenantSettings): initial implementation (#3281) * fix(tenant): duplicate test * feat(tenants): settings * feat(tenants): add default settings when creating tenant * feat(tenantSettings): tests updates * chore(tenantSettings): format * chore(tenantSettings): format * tests(tenantSettings): mock call to auth when creating tenant * tests(tenants): when tenant is created, default settings should be set * feat(graphql): tenant settings * fix(tenantSettings): address PR comments * feat: handle updating operator api secret (#3328) * feat(frontend): disallow api secret update and change tenant form to submit sections independently * feat(backend): disallow tenant api secret update in admin api * feat(backend): add service method to update secret, call on app start * chore: rm log * fix(fronted): 'no any' lint error * fix(backend): error on failed secret update from config * fix(backend): wallet address resolver tests to be operator/non-operator as needed - previous way of controlling if the request was from an operator or not no longer worked after changing app start to sync apiSecret * test(backend): update tenant tests to reflect operator cant update apiSecret * chore: fix format * chore: debug ci test failure (working locally) * chore: fix format * chore: debug ci test failure (working locally) * chore: debug ci test failure (working locally) * chore: debug ci test failure (working locally) * chore: debug ci test failure (working locally) * chore: debug ci test failure (working locally) * chore: debug ci test failure (working locally) * chore: debug ci test failure (working locally) * chore: debug ci test failure (working locally) * chore: debug ci test failure (working locally) * chore: debug ci test failure (working locally) * fix: test side effects * fix(backend): uncomment test * Update packages/backend/src/tenants/service.ts Co-authored-by: Max Kurapov <[email protected]> * fix(backend): rm unushesd nock * feat(backend): set cache on update operator secret method * fix(frontend): typo * fix: typo --------- Co-authored-by: Max Kurapov <[email protected]> * feat: tenanted peers (#3352) * feat: Added tenantId to peers * Added tenantId to getPage, updated contexts * Removed unused imports + updated some tests * Changes following PR comments * Fixes on resolvers: create and get peer, deposit liquidity and create peer liquidity withdrawal * Added missing tests for create and get peer * feat(backend)!: tenanted rates endpoints (#3327) * feat: tenanted rates endpoints - first iteration, WIP * feat: tenanted rates endpoints - format * feat: tenanted rates endpoints - deprecate exchange rates url env var, WIP * feat: tenanted rates endpoints - use operator tenant id for telemetry, internal rates service * feat: tenanted rates endpoints - don't throw if exchange urls is not found * feat: tenanted rates endpoints - more fixes, WIP * feat: tenanted rates endpoints - fix integration tests * feat: tenanted rates endpoints - format * Add optional operator exchange rates URL as env var * Check if exchange rates URL is set when creating assets * Address comments * Address more comments * Format * Add tenantId to ConnectorAccount * Revert pnpm lock file * Restore package.json * Revert "Format" This reverts commit 219baa9. * feat(wallet-address)!: possibility to specify wallet address range (#3325) * feat(graphql): schema update for specifying settings when creating tenant * feat(tenant): add possibility to specify initial tenant settings as an operator * test(tenant): create with settings * feat(wallet-address): rename url to address * fix(tenant-settings): duplicate key for tenant * feat(wallet-address): replace url field with address field url field was replaced with address field, because now with range in wallet address, it is possible for the caller, to specify just the portion of the wallet address url. There is no need to specify the whole url in order to create wallet address. #3278 * chore(backend): format * fix(tests): some of them * fix(frontend): due to wallet address url change * fix(mase): due to wallet address url change * fix(backend): tests due to wallet address url change * test(integration): fix tests and have default address for operator * fix(wallet-address): test for operator can perform cross tenant create@ * test(tenant-settings): remove pagination tests for tenant settings * docs(bruno): rename of the walletaddress url variable * test(wallet-address): create with tenant settings or not as an operator or not * feat(wallet-address): put creation of it into new function * chore(format): everything * feat(tenant-settings): add tests for upsert * feat(tenant-settings): add more tests and remove pagination * Update packages/backend/src/open_payments/wallet_address/service.ts Co-authored-by: Max Kurapov <[email protected]> * Update packages/backend/src/graphql/resolvers/tenant_settings.ts Co-authored-by: Max Kurapov <[email protected]> * Update packages/backend/src/graphql/schema.graphql Co-authored-by: Max Kurapov <[email protected]> * chore(graphql): generate schema * fix(tenant): mapping settings to tenant * chore(graphql): generate schema --------- Co-authored-by: Max Kurapov <[email protected]> * feat(backend): tenanted webhooks (#3317) * tests(tenants): when tenant is created, default settings should be set * feat(graphql): tenant settings * fix(tenantSettings): address PR comments * fix(tenantSettings): address PR comments * feat(backend): tenanted webhooks * fix: rebase * chore: fix some rebasing issues * feat: use resource tenant ids where available * feat: add tenant id to tests; temporary operator tenant id in peer webhook events * fix: build errors * feat: remove temporary tenantId code from before tenanted peers * fix: build errors * feat: update settings formatting, handle NaN * fix: tests * feat: key mapping as const, non-optional settings for webhook event function * fix: prevent tests from failing with default settings --------- Co-authored-by: golobitch <[email protected]> * fix: post-main merge test fixes * feat(backend): also publish webhooks to operators if primary recipient is tenant (#3368) * tests(tenants): when tenant is created, default settings should be set * feat(graphql): tenant settings * fix(tenantSettings): address PR comments * fix(tenantSettings): address PR comments * feat(backend): tenanted webhooks * fix: rebase * chore: fix some rebasing issues * feat: add tenant id to tests; temporary operator tenant id in peer webhook events * fix: build errors * feat: remove temporary tenantId code from before tenanted peers * fix: build errors * tests(tenants): when tenant is created, default settings should be set * fix(tenantSettings): address PR comments * feat(backend): tenanted webhooks * chore: fix some rebasing issues * feat(backend): also publish webhooks to operators if primary recipient is tenant * fix: rebase issues * fix: tests * feat: add webhook model * refactor: move webhook & webhookevent models * feat: include tenant id in webhook gql response * fix: generated files * fix: rebase errors * feat: review comments * feat: remove getWebhook, rename processWebhookEvent to processWebhook * fix: remove operatorSettings from sendWebhook --------- Co-authored-by: golobitch <[email protected]> * fix(localenv): use https in openPaymentsUrl env vars in local backend config (#3417) * feat(backend): try to match 'wallet address not found' webhook to tenant by prefix (#3426) * feat(backend): try to match 'wallet address not found' webhook to tenant by prefix * fix: negative test for prefix matching * fix: tests and withConfigOverride usage * fix: bruno collection for open payments examples (#3421) * fix: bruno collection for open payments examples * fix: bruno graphql resolvers * fix: add tenant id to loadWalletAddressIdsIntoVariables for bruno collection * feat(backend): validate tenant settings inputs (#3435) * feat(backend): validate tenant settings inputs * fix: resolver tests * feat: use error model for tenant setting resolvers * feat: allow 0 for certain settings * feat(backend): make tenantId required when fetching peer by destination address (#3452) * test(backend): update payment method tests after minSendAmount feature merge * feat(localenv): add tenanted mock ASE to local environment (#3451) * feat(localenv): add tenanted mock ASE to local environment * fix: build issues * fix: integration tests * feat: use correct tenant credentials in mock ASE log output * feat: add tenantId filter to list assets query * feat: seed tenant with webhook url * feat: tenanted OP example bruno collection; idp config in ase seed * feat(backend): allow tenant id to be specified during tenant creation (#3457) * feat(backend): allow tenant id to be specified during tenant creation * feat: validate uuid input * fix: tests & gql generation * fix: build issues * feat(backend): abstract away payment method generation, add ILP_ADDRESS tenantSetting (#3460) * feat: add ILP_ADDRESS tenant setting, generate default one using tenant id * chore: decouple incomingPayment from streamCredentialGeneration * chore: generate StreamServer every time we get getStreamCredentials * feat(backend): allowing passing in ilpAddress when generating stream credentials * feat: adding paymentMethodProviderService * feat: use paymentMethodProviderService in receiverService * feat: use paymentMethodProviderService in incomingPayment service & model * feat: use updated receiver structure to resolve ilp payment destination in ilpPaymentMethodService * feat: use updated receiver structure in outgoingPaymentService * chore: add paymentMethodProviderService to app init * chore: update test files to use paymentMethodProviderService * chore: lint * test: use paymentMethodProviderService.getPaymentMethods during outgoingPayment creation * chore(localenv): add ilpAddress for non-operator tenant for happy-life * feat: update connector, peer service to determine & parse destination addresses * fix: use correct redirect for tenanted mock-idp * test(backend): adding test for longest prefix match for peer * test(backend): add tests for stream-address middleware * feat(backend): only set streamDestination & streamServer defined if valid tenantIlpAddress found * chore(backend): remove unused part of account middleware * chore(backend): add types to middleware * test(backend): update stream-address middleware test * test(backend): test fixes --------- Co-authored-by: Nathan Lie <[email protected]> * feat(localenv): tenanted mock ase webhook server apollo client (#3459) * feat: remove tenant id from continuation uri (#3470) * fix(tests): fix performance tests for multi-tenancy (#3475) * feat(backend): add tenantId to webhook, outgoing + combined payments pagination resolvers (#3474) * feat(backend): add tenantId to webhook pagination resolver * feat(backend): add tenantId to outgoing payments pagination resolver * feat(backend): add tenantId to combined payments pagination resolver * feat(backend): add migration to add tenantId to combinedPaymentsView * chore: updated generated graphql types * test(backend): fix tests * feat(localenv): refer to admin UI url as belonging to operator or tenant correctly * chore(bruno): fix grant request outgoing payment in Open Payments example * chore(bruno): fix grant request outgoing payment in Tenanted Open Payments example * feat(backend): add sendAllWebhooksToOperator env variable (#3503) * feat(backend): add sendAllWebhooksToOperator env variable * test(backend): update webhook service test * chore(backend): rename sendTenantWebhooksToOperator env var * test(backend): remove tests which are now encapsulated by finalizeWebhookRecipients tests * chore(backend): send wallet address not found webhook to operator when no matching wallet address prefix for tenant * test(backend): remove wallet address tests which are now encapsulated by finalizeWebhookRecipients tests * chore(backend): linting * test(backend): make actionable incoming payment test less flaky --------- Co-authored-by: Max Kurapov <[email protected]> Co-authored-by: Blair Currey <[email protected]> Co-authored-by: Jason Bruwer <[email protected]> Co-authored-by: oana-lolea <[email protected]> Co-authored-by: sanducb <[email protected]> Co-authored-by: Tadej Golobic <[email protected]> Co-authored-by: golobitch <[email protected]>
1 parent 33e54d5 commit f8c4684

File tree

357 files changed

+17617
-2587
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

357 files changed

+17617
-2587
lines changed

‎bruno/collections/Rafiki/Examples/Open Payments Without Quote/Continuation Request.bru‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ meta {
55
}
66

77
post {
8-
url: {{senderOpenPaymentsAuthHost}}/continue/{{continueId}}
8+
url: {{senderOpenPaymentsContinuationUri}}
99
body: json
1010
auth: none
1111
}

‎bruno/collections/Rafiki/Examples/Open Payments Without Quote/Get receiver wallet address.bru‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,21 @@ script:post-response {
3737
authUrl.hostname.includes('happy-life-bank')
3838
){
3939
const port = authUrl.hostname.includes('cloud-nine-wallet')? authUrl.port: Number(authUrl.port) + 1000
40-
bru.setEnvVar("receiverOpenPaymentsAuthHost", authUrl.protocol + '//localhost:' + port );
40+
bru.setEnvVar("receiverOpenPaymentsAuthHost", authUrl.protocol + '//localhost:' + port + authUrl.path);
4141
} else {
4242
bru.setEnvVar("receiverOpenPaymentsAuthHost", body?.authServer);
4343
}
44+
45+
const resourceUrl = url.parse(body?.resourceServer)
46+
if (
47+
resourceUrl.hostname.includes('cloud-nine-wallet') ||
48+
resourceUrl.hostname.includes('happy-life-bank')
49+
){
50+
const port = resourceUrl.hostname.includes('cloud-nine-wallet') ? 3000 : 4000
51+
bru.setEnvVar("receiverOpenPaymentsHost", 'http://localhost:' + port + resourceUrl.path);
52+
} else {
53+
bru.setEnvVar("receiverOpenPaymentsHost", body?.resourceServer);
54+
}
4455
}
4556

4657
tests {

‎bruno/collections/Rafiki/Examples/Open Payments Without Quote/Get sender wallet address.bru‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ script:post-response {
2828
}
2929

3030
const body = res.getBody()
31-
31+
3232
bru.setEnvVar("senderAssetCode", body?.assetCode)
3333
bru.setEnvVar("senderAssetScale", body?.assetScale)
3434

@@ -38,10 +38,18 @@ script:post-response {
3838
authUrl.hostname.includes('happy-life-bank')
3939
){
4040
const port = authUrl.hostname.includes('cloud-nine-wallet')? authUrl.port: Number(authUrl.port) + 1000
41-
bru.setEnvVar("senderOpenPaymentsAuthHost", authUrl.protocol + '//localhost:' + port );
41+
bru.setEnvVar("senderOpenPaymentsAuthHost", authUrl.protocol + '//localhost:' + port + authUrl.path);
4242
} else {
4343
bru.setEnvVar("senderOpenPaymentsAuthHost", body?.authServer);
4444
}
45+
46+
const resourceUrl = url.parse(body?.resourceServer)
47+
if (resourceUrl.hostname.includes('cloud-nine-wallet') || resourceUrl.hostname.includes('happy-life-bank')) {
48+
const port = resourceUrl.hostname.includes('cloud-nine-wallet') ? bru.getEnvVar('senderOpenPaymentsPort') : bru.getEnvVar('receiverOpenPaymentsPort')
49+
bru.setEnvVar("senderOpenPaymentsHost", 'http://localhost:' + port + resourceUrl.path);
50+
} else {
51+
bru.setEnvVar("senderOpenPaymentsHost", body?.resourceServer);
52+
}
4553
}
4654

4755
tests {

‎bruno/collections/Rafiki/Examples/Open Payments Without Quote/Grant Request Incoming Payment.bru‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ meta {
55
}
66

77
post {
8-
url: {{receiverOpenPaymentsAuthHost}}/
8+
url: {{receiverOpenPaymentsAuthHost}}
99
body: json
1010
auth: none
1111
}

‎bruno/collections/Rafiki/Examples/Open Payments Without Quote/Grant Request Outgoing Payment.bru‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ meta {
55
}
66

77
post {
8-
url: {{senderOpenPaymentsAuthHost}}/
8+
url: {{senderOpenPaymentsAuthHost}}
99
body: json
1010
auth: none
1111
}
@@ -21,8 +21,7 @@ body:json {
2121
],
2222
"identifier": "{{senderWalletAddress}}",
2323
"limits": {
24-
"debitAmount": {{debitAmount}},
25-
"receiveAmount": {{receiveAmount}}
24+
"debitAmount": {{debitAmount}}
2625
}
2726
}
2827
]
@@ -47,6 +46,9 @@ script:post-response {
4746
const scripts = require('./scripts');
4847

4948
scripts.storeTokenDetails();
49+
50+
const body = res.getBody()
51+
bru.setEnvVar("senderOpenPaymentsContinuationUri", body?.continue.uri)
5052
}
5153

5254
tests {

‎bruno/collections/Rafiki/Examples/Open Payments/Continuation Request.bru‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ meta {
55
}
66

77
post {
8-
url: {{senderOpenPaymentsAuthHost}}/continue/{{continueId}}
8+
url: {{senderOpenPaymentsContinuationUri}}
99
body: json
1010
auth: none
1111
}

‎bruno/collections/Rafiki/Examples/Open Payments/Create Incoming Payment.bru‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ script:pre-request {
4141

4242
script:post-response {
4343
const body = res.getBody();
44-
44+
4545
if (body?.id) {
4646
bru.setEnvVar("incomingPaymentId", body.id.split("/").pop());
4747
}

‎bruno/collections/Rafiki/Examples/Open Payments/Create Outgoing Payment.bru‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ script:pre-request {
3434

3535
script:post-response {
3636
const body = res.getBody();
37-
37+
3838
if (body?.id) {
3939
bru.setEnvVar("outgoingPaymentId", body.id.split("/").pop());
4040
}

‎bruno/collections/Rafiki/Examples/Open Payments/Get receiver wallet address.bru‎

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@ script:pre-request {
2222

2323
script:post-response {
2424
const url = require('url')
25-
25+
2626
if (res.getStatus() !== 200) {
2727
return
2828
}
29-
29+
3030
const body = res.getBody()
3131
bru.setEnvVar("receiverAssetCode", body?.assetCode)
3232
bru.setEnvVar("receiverAssetScale", body?.assetScale)
@@ -37,10 +37,21 @@ script:post-response {
3737
authUrl.hostname.includes('happy-life-bank')
3838
){
3939
const port = authUrl.hostname.includes('cloud-nine-wallet')? authUrl.port: Number(authUrl.port) + 1000
40-
bru.setEnvVar("receiverOpenPaymentsAuthHost", authUrl.protocol + '//localhost:' + port );
40+
bru.setEnvVar("receiverOpenPaymentsAuthHost", authUrl.protocol + '//localhost:' + port + authUrl.path);
4141
} else {
4242
bru.setEnvVar("receiverOpenPaymentsAuthHost", body?.authServer);
4343
}
44+
45+
const resourceUrl = url.parse(body?.resourceServer)
46+
if (
47+
resourceUrl.hostname.includes('cloud-nine-wallet') ||
48+
resourceUrl.hostname.includes('happy-life-bank')
49+
){
50+
const port = resourceUrl.hostname.includes('cloud-nine-wallet') ? 3000 : 4000
51+
bru.setEnvVar("receiverOpenPaymentsHost", 'http://localhost:' + port + resourceUrl.path);
52+
} else {
53+
bru.setEnvVar("receiverOpenPaymentsHost", body?.resourceServer);
54+
}
4455
}
4556

4657
tests {

‎bruno/collections/Rafiki/Examples/Open Payments/Get sender wallet address.bru‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,18 @@ script:post-response {
3737
authUrl.hostname.includes('happy-life-bank')
3838
){
3939
const port = authUrl.hostname.includes('cloud-nine-wallet')? authUrl.port: Number(authUrl.port) + 1000
40-
bru.setEnvVar("senderOpenPaymentsAuthHost", authUrl.protocol + '//localhost:' + port );
40+
bru.setEnvVar("senderOpenPaymentsAuthHost", authUrl.protocol + '//localhost:' + port + authUrl.path);
4141
} else {
4242
bru.setEnvVar("senderOpenPaymentsAuthHost", body?.authServer);
4343
}
44+
45+
const resourceUrl = url.parse(body?.resourceServer)
46+
if (resourceUrl.hostname.includes('cloud-nine-wallet') || resourceUrl.hostname.includes('happy-life-bank')) {
47+
const port = resourceUrl.hostname.includes('cloud-nine-wallet') ? bru.getEnvVar('senderOpenPaymentsPort') : bru.getEnvVar('receiverOpenPaymentsPort')
48+
bru.setEnvVar("senderOpenPaymentsHost", 'http://localhost:' + port + resourceUrl.path);
49+
} else {
50+
bru.setEnvVar("senderOpenPaymentsHost", body?.resourceServer);
51+
}
4452
}
4553

4654
tests {

0 commit comments

Comments
 (0)