test(integration-tests): auth choice port

interledger · May 2, 2024 · 5618d67 · 5618d67
1 parent e7b2286
commit 5618d67
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 1 deletion.
diff --git a/test/integration/lib/config.ts b/test/integration/lib/config.ts
@@ -15,6 +15,7 @@ export type TestConfig = Config & {
 type EnvConfig = {
   OPEN_PAYMENTS_URL: string
   AUTH_SERVER_DOMAIN: string
+  AUTH_CHOICE_SERVER: string
   INTEGRATION_SERVER_PORT: string
   WALLET_ADDRESS_URL: string
   GRAPHQL_URL: string
@@ -23,6 +24,7 @@ type EnvConfig = {
 const REQUIRED_KEYS: (keyof EnvConfig)[] = [
   'OPEN_PAYMENTS_URL',
   'AUTH_SERVER_DOMAIN',
+  'AUTH_CHOICE_SERVER',
   'INTEGRATION_SERVER_PORT',
   'WALLET_ADDRESS_URL',
   'GRAPHQL_URL',
@@ -59,6 +61,7 @@ const createConfig = (name: string): TestConfig => {
     publicHost: env.OPEN_PAYMENTS_URL,
     testnetAutoPeerUrl: '',
     authServerDomain: env.AUTH_SERVER_DOMAIN,
+    authChoiceServer: env.AUTH_CHOICE_SERVER,
     integrationServerPort: parseInt(env.INTEGRATION_SERVER_PORT),
     walletAddressUrl: env.WALLET_ADDRESS_URL,
     graphqlUrl: env.GRAPHQL_URL,

diff --git a/test/integration/lib/test-actions/index.ts b/test/integration/lib/test-actions/index.ts
@@ -119,8 +119,11 @@ async function _startAndAcceptInteraction(
   assert(interactId)
 
   // Accept
+  const url = new URL(senderWalletAddress.authServer);
+  url.port = "3109"
+
   const acceptResponse = await fetch(
-    `${senderWalletAddress.authServer}/grant/${interactId}/${nonce}/accept`,
+    `${url.toString()}grant/${interactId}/${nonce}/accept`,
     {
       method: 'POST',
       headers: {

diff --git a/test/integration/testenv/cloud-nine-wallet/.env b/test/integration/testenv/cloud-nine-wallet/.env
@@ -1,5 +1,6 @@
 OPEN_PAYMENTS_URL=https://cloud-nine-wallet-test-backend:3100
 AUTH_SERVER_DOMAIN=http://cloud-nine-wallet-test-auth:3106
+AUTH_CHOICE_SERVER=http://cloud-nine-wallet-test-auth:3109
 INTEGRATION_SERVER_PORT=8888
 WALLET_ADDRESS_URL=https://cloud-nine-wallet-test-backend:3100/.well-known/pay
 GRAPHQL_URL=http://cloud-nine-wallet-test-backend:3101/graphql

diff --git a/test/integration/testenv/cloud-nine-wallet/docker-compose.yml b/test/integration/testenv/cloud-nine-wallet/docker-compose.yml
@@ -57,6 +57,7 @@ services:
     environment:
       NODE_ENV: ${NODE_ENV:-development}
       AUTH_SERVER_DOMAIN: http://cloud-nine-wallet-test-auth:3106
+      AUTH_CHOICE_SERVER: http://cloud-nine-wallet-test-auth:3109
       AUTH_DATABASE_URL: postgresql://cloud_nine_wallet_test_auth:cloud_nine_wallet_test_auth@shared-database/cloud_nine_wallet_test_auth
       INTROSPECTION_PORT: 3107
       AUTH_PORT: 3106

diff --git a/test/integration/testenv/happy-life-bank/.env b/test/integration/testenv/happy-life-bank/.env
@@ -1,5 +1,6 @@
 OPEN_PAYMENTS_URL=https://happy-life-bank-test-backend:4100
 AUTH_SERVER_DOMAIN=http://happy-life-bank-test-auth:4106
+AUTH_CHOICE_SERVER=http://happy-life-bank-test-auth:4109
 INTEGRATION_SERVER_PORT=8889
 WALLET_ADDRESS_URL=https://happy-life-bank-test-backend:4100/accounts/pfry
 GRAPHQL_URL=http://happy-life-bank-test-backend:4101/graphql

diff --git a/test/integration/testenv/happy-life-bank/docker-compose.yml b/test/integration/testenv/happy-life-bank/docker-compose.yml
@@ -58,6 +58,7 @@ services:
       NODE_ENV: development
       AUTH_DATABASE_URL: postgresql://happy_life_bank_test_auth:happy_life_bank_test_auth@shared-database/happy_life_bank_test_auth
       AUTH_SERVER_DOMAIN: http://happy-life-bank-test-auth:4106
+      AUTH_CHOICE_SERVER: http://happy-life-bank-test-auth:4109
       INTROSPECTION_PORT: 4107
       ADMIN_PORT: 4103
       AUTH_PORT: 4106