diff --git a/apps/consent/cypress/support/commands.ts b/apps/consent/cypress/support/commands.ts index 3bacca45f2..6d77917e8e 100644 --- a/apps/consent/cypress/support/commands.ts +++ b/apps/consent/cypress/support/commands.ts @@ -62,7 +62,7 @@ Cypress.Commands.add("requestEmailCode", (email) => { return cy .request({ method: "POST", - url: "http://localhost:4002/auth/email/code", + url: "http://localhost:4455/auth/email/code", body: { email: email, }, diff --git a/core/api/dev/ory/kratos.yml b/core/api/dev/ory/kratos.yml index 3af5389f2b..b4e87909f4 100644 --- a/core/api/dev/ory/kratos.yml +++ b/core/api/dev/ory/kratos.yml @@ -35,7 +35,7 @@ serve: selfservice: default_browser_return_url: http://localhost:3000/ allowed_return_urls: - - http://127.0.0.1:4002/ + - http://127.0.0.1:4455/ - http://localhost:3000/ methods: @@ -56,10 +56,10 @@ selfservice: flows: error: - ui_url: http://127.0.0.1:4002/error + ui_url: http://127.0.0.1:4455/error settings: - ui_url: http://127.0.0.1:4002/settings + ui_url: http://127.0.0.1:4455/settings # very short time frame because this has impact in the totp flow privileged_session_max_age: 1s @@ -72,7 +72,7 @@ selfservice: hooks: - hook: web_hook config: - # url: http://bats-tests:4002/auth/after_settings_hooks + # url: http://bats-tests:4455/auth/after_settings_hooks url: http://invalid-because-we-dont-want-profile-to-be-updated method: POST body: file:///home/ory/body.jsonnet @@ -85,7 +85,7 @@ selfservice: recovery: enabled: true - ui_url: http://127.0.0.1:4002/recovery + ui_url: http://127.0.0.1:4455/recovery verification: use: code @@ -95,7 +95,7 @@ selfservice: logout: after: - default_browser_return_url: http://127.0.0.1:4002/login + default_browser_return_url: http://127.0.0.1:4455/login login: ui_url: http://localhost:3000/login diff --git a/core/api/docker-compose.yml b/core/api/docker-compose.yml index f739596113..4876e73f6e 100644 --- a/core/api/docker-compose.yml +++ b/core/api/docker-compose.yml @@ -361,7 +361,7 @@ services: oathkeeper: image: oryd/oathkeeper:v0.40.6-distroless ports: - - "4002:4455" + - "4455:4455" - "4456:4456" extra_hosts: - "bats-tests:host-gateway" diff --git a/core/api/src/servers/graphql-server.ts b/core/api/src/servers/graphql-server.ts index 74401d3d0a..82d02b02a8 100644 --- a/core/api/src/servers/graphql-server.ts +++ b/core/api/src/servers/graphql-server.ts @@ -174,8 +174,8 @@ export const startApolloServer = async ({ console.log( `in dev mode, ${type} server should be accessed through oathkeeper reverse proxy at ${ type === "admin" - ? "http://localhost:4002/admin/graphql" - : "http://localhost:4002/graphql" + ? "http://localhost:4455/admin/graphql" + : "http://localhost:4455/graphql" }`, ) diff --git a/core/api/test/bats/helpers/_common.bash b/core/api/test/bats/helpers/_common.bash index 097c05306a..be40c7b015 100644 --- a/core/api/test/bats/helpers/_common.bash +++ b/core/api/test/bats/helpers/_common.bash @@ -11,7 +11,7 @@ COMPOSE_PROJECT_NAME="${COMPOSE_PROJECT_NAME:-${CORE_ROOT##*/}}" CACHE_DIR=${BATS_TMPDIR:-tmp/bats}/galoy-bats-cache mkdir -p $CACHE_DIR -GALOY_ENDPOINT=${GALOY_ENDPOINT:-localhost:4002} +GALOY_ENDPOINT=${GALOY_ENDPOINT:-localhost:4455} ALICE_TOKEN_NAME="alice" ALICE_PHONE="+16505554328" diff --git a/dev/config/ory/kratos.yml b/dev/config/ory/kratos.yml index 3af5389f2b..b4e87909f4 100644 --- a/dev/config/ory/kratos.yml +++ b/dev/config/ory/kratos.yml @@ -35,7 +35,7 @@ serve: selfservice: default_browser_return_url: http://localhost:3000/ allowed_return_urls: - - http://127.0.0.1:4002/ + - http://127.0.0.1:4455/ - http://localhost:3000/ methods: @@ -56,10 +56,10 @@ selfservice: flows: error: - ui_url: http://127.0.0.1:4002/error + ui_url: http://127.0.0.1:4455/error settings: - ui_url: http://127.0.0.1:4002/settings + ui_url: http://127.0.0.1:4455/settings # very short time frame because this has impact in the totp flow privileged_session_max_age: 1s @@ -72,7 +72,7 @@ selfservice: hooks: - hook: web_hook config: - # url: http://bats-tests:4002/auth/after_settings_hooks + # url: http://bats-tests:4455/auth/after_settings_hooks url: http://invalid-because-we-dont-want-profile-to-be-updated method: POST body: file:///home/ory/body.jsonnet @@ -85,7 +85,7 @@ selfservice: recovery: enabled: true - ui_url: http://127.0.0.1:4002/recovery + ui_url: http://127.0.0.1:4455/recovery verification: use: code @@ -95,7 +95,7 @@ selfservice: logout: after: - default_browser_return_url: http://127.0.0.1:4002/login + default_browser_return_url: http://127.0.0.1:4455/login login: ui_url: http://localhost:3000/login diff --git a/docs/LEGACY_DEV.md b/docs/LEGACY_DEV.md index f137cc9087..cee311d33a 100644 --- a/docs/LEGACY_DEV.md +++ b/docs/LEGACY_DEV.md @@ -93,8 +93,8 @@ fees: You can load the Apollo GraphQL Playground, a web GUI for GraphQL. Start the server and open the following url: -- http://localhost:4002/admin/graphql (admin API, proxied thru oathkeeper) -- http://localhost:4002/graphql (end user API, proxied thru oathkeeper) +- http://localhost:4455/admin/graphql (admin API, proxied thru oathkeeper) +- http://localhost:4455/graphql (end user API, proxied thru oathkeeper) ### Honeycomb diff --git a/docs/hydra.md b/docs/hydra.md index 0cadcd3b68..d972266b08 100644 --- a/docs/hydra.md +++ b/docs/hydra.md @@ -138,7 +138,7 @@ curl -X POST http://localhost:4445/admin/oauth2/introspect -d token=$ory_at_TOKE curl -I -X POST http://localhost:4456/decisions/graphql -H "Oauth2-Token: $ory_at_TOKEN" -curl --location 'http://localhost:4002/graphql' \ +curl --location 'http://localhost:4455/graphql' \ --header 'Content-Type: application/json' \ --header "Oauth2-Token: $ory_at_TOKEN" \ --data '{"query":"query me {\n me {\n id\n defaultAccount {\n id\n }\n }\n}","variables":{}}' diff --git a/docs/postman-collection/galoy-dev.postman_environment.json b/docs/postman-collection/galoy-dev.postman_environment.json index 6f73088dc7..cb6b436648 100644 --- a/docs/postman-collection/galoy-dev.postman_environment.json +++ b/docs/postman-collection/galoy-dev.postman_environment.json @@ -1,103 +1,103 @@ { - "id": "b83e4600-64ca-4bed-addf-57213f5811e8", - "name": "galoy-devnet", - "values": [ - { - "key": "protocol", - "value": "http", - "enabled": true - }, - { - "key": "domain", - "value": "localhost", - "enabled": true - }, - { - "key": "port", - "value": "4002", - "enabled": true - }, - { - "key": "currency", - "value": "BTC", - "enabled": true - }, - { - "key": "phone", - "value": "+16505554322", - "enabled": true - }, - { - "key": "code", - "value": "321432", - "enabled": true - }, - { - "key": "token", - "value": "", - "enabled": true - }, - { - "key": "walletId", - "value": "", - "enabled": true - }, - { - "key": "testnet-p2pkh-address", - "value": "mkHS9ne12qx9pS9VojpwU5xtRd4T7X7ZUt", - "enabled": true - }, - { - "key": "testnet-p2sh-address", - "value": "2NGYHfoNUterKvuLVyVU5npmJPKmBwtoMzu", - "enabled": true - }, - { - "key": "testnet-segwitV0-address", - "value": "tb1ql7w62elx9ucw4pj5lgw4l028hmuw80sndtntxt", - "enabled": true - }, - { - "key": "signet-p2pkh-address", - "value": "mkHS9ne12qx9pS9VojpwU5xtRd4T7X7ZUt", - "enabled": true - }, - { - "key": "signet-p2sh-address", - "value": "2NGYHfoNUterKvuLVyVU5npmJPKmBwtoMzu", - "enabled": true - }, - { - "key": "signet-segwitV0-address", - "value": "tb1ql7w62elx9ucw4pj5lgw4l028hmuw80sndtntxt", - "enabled": true - }, - { - "key": "twoFASecret", - "value": "", - "type": "any", - "enabled": true - }, - { - "key": "walletIdUsd", - "value": "", - "type": "any", - "enabled": true - }, - { - "key": "walletIdBtc", - "value": "", - "type": "any", - "enabled": true - }, - { - "key": "regtest-segwitV0-address", - "value": "bcrt1qy7msr5csmlmcwfqpafzvaapjr29ez9y40h40ge", - "type": "default", - "enabled": true - } - ], - "_postman_variable_scope": "environment", - "_postman_exported_at": "2022-05-04T21:10:11.016Z", - "_postman_exported_using": "Postman/9.17.1" -} \ No newline at end of file + "id": "b83e4600-64ca-4bed-addf-57213f5811e8", + "name": "galoy-devnet", + "values": [ + { + "key": "protocol", + "value": "http", + "enabled": true + }, + { + "key": "domain", + "value": "localhost", + "enabled": true + }, + { + "key": "port", + "value": "4455", + "enabled": true + }, + { + "key": "currency", + "value": "BTC", + "enabled": true + }, + { + "key": "phone", + "value": "+16505554322", + "enabled": true + }, + { + "key": "code", + "value": "321432", + "enabled": true + }, + { + "key": "token", + "value": "", + "enabled": true + }, + { + "key": "walletId", + "value": "", + "enabled": true + }, + { + "key": "testnet-p2pkh-address", + "value": "mkHS9ne12qx9pS9VojpwU5xtRd4T7X7ZUt", + "enabled": true + }, + { + "key": "testnet-p2sh-address", + "value": "2NGYHfoNUterKvuLVyVU5npmJPKmBwtoMzu", + "enabled": true + }, + { + "key": "testnet-segwitV0-address", + "value": "tb1ql7w62elx9ucw4pj5lgw4l028hmuw80sndtntxt", + "enabled": true + }, + { + "key": "signet-p2pkh-address", + "value": "mkHS9ne12qx9pS9VojpwU5xtRd4T7X7ZUt", + "enabled": true + }, + { + "key": "signet-p2sh-address", + "value": "2NGYHfoNUterKvuLVyVU5npmJPKmBwtoMzu", + "enabled": true + }, + { + "key": "signet-segwitV0-address", + "value": "tb1ql7w62elx9ucw4pj5lgw4l028hmuw80sndtntxt", + "enabled": true + }, + { + "key": "twoFASecret", + "value": "", + "type": "any", + "enabled": true + }, + { + "key": "walletIdUsd", + "value": "", + "type": "any", + "enabled": true + }, + { + "key": "walletIdBtc", + "value": "", + "type": "any", + "enabled": true + }, + { + "key": "regtest-segwitV0-address", + "value": "bcrt1qy7msr5csmlmcwfqpafzvaapjr29ez9y40h40ge", + "type": "default", + "enabled": true + } + ], + "_postman_variable_scope": "environment", + "_postman_exported_at": "2022-05-04T21:10:11.016Z", + "_postman_exported_using": "Postman/9.17.1" +} diff --git a/quickstart/README.md b/quickstart/README.md index 67eeaf1130..c40657be11 100644 --- a/quickstart/README.md +++ b/quickstart/README.md @@ -7,7 +7,7 @@ This folder hosts all configuration needed to run the galoy stack locally to pla To open the graphql playground start docker compose and bring up the public endpoint of the oathkeeper proxy in your browser. ``` docker compose up -d -open http://localhost:4002/graphql +open http://localhost:4455/graphql ``` ## Embedded diff --git a/quickstart/bin/helpers.sh b/quickstart/bin/helpers.sh index ad6eb52734..4b6b1188f9 100644 --- a/quickstart/bin/helpers.sh +++ b/quickstart/bin/helpers.sh @@ -4,7 +4,7 @@ set -e COMPOSE_PROJECT_NAME="${COMPOSE_PROJECT_NAME:-quickstart}" # default is oathkeeper endpoint -GALOY_ENDPOINT=${GALOY_ENDPOINT:-localhost:4002} +GALOY_ENDPOINT=${GALOY_ENDPOINT:-localhost:4455} if [ -n "$HOST_PROJECT_PATH" ]; then GALOY_DIR="./vendor/galoy-quickstart" diff --git a/quickstart/dev/ory/kratos.yml b/quickstart/dev/ory/kratos.yml index 3af5389f2b..b4e87909f4 100644 --- a/quickstart/dev/ory/kratos.yml +++ b/quickstart/dev/ory/kratos.yml @@ -35,7 +35,7 @@ serve: selfservice: default_browser_return_url: http://localhost:3000/ allowed_return_urls: - - http://127.0.0.1:4002/ + - http://127.0.0.1:4455/ - http://localhost:3000/ methods: @@ -56,10 +56,10 @@ selfservice: flows: error: - ui_url: http://127.0.0.1:4002/error + ui_url: http://127.0.0.1:4455/error settings: - ui_url: http://127.0.0.1:4002/settings + ui_url: http://127.0.0.1:4455/settings # very short time frame because this has impact in the totp flow privileged_session_max_age: 1s @@ -72,7 +72,7 @@ selfservice: hooks: - hook: web_hook config: - # url: http://bats-tests:4002/auth/after_settings_hooks + # url: http://bats-tests:4455/auth/after_settings_hooks url: http://invalid-because-we-dont-want-profile-to-be-updated method: POST body: file:///home/ory/body.jsonnet @@ -85,7 +85,7 @@ selfservice: recovery: enabled: true - ui_url: http://127.0.0.1:4002/recovery + ui_url: http://127.0.0.1:4455/recovery verification: use: code @@ -95,7 +95,7 @@ selfservice: logout: after: - default_browser_return_url: http://127.0.0.1:4002/login + default_browser_return_url: http://127.0.0.1:4455/login login: ui_url: http://localhost:3000/login diff --git a/quickstart/galoy/dev/ory/kratos.yml b/quickstart/galoy/dev/ory/kratos.yml index 3af5389f2b..b4e87909f4 100644 --- a/quickstart/galoy/dev/ory/kratos.yml +++ b/quickstart/galoy/dev/ory/kratos.yml @@ -35,7 +35,7 @@ serve: selfservice: default_browser_return_url: http://localhost:3000/ allowed_return_urls: - - http://127.0.0.1:4002/ + - http://127.0.0.1:4455/ - http://localhost:3000/ methods: @@ -56,10 +56,10 @@ selfservice: flows: error: - ui_url: http://127.0.0.1:4002/error + ui_url: http://127.0.0.1:4455/error settings: - ui_url: http://127.0.0.1:4002/settings + ui_url: http://127.0.0.1:4455/settings # very short time frame because this has impact in the totp flow privileged_session_max_age: 1s @@ -72,7 +72,7 @@ selfservice: hooks: - hook: web_hook config: - # url: http://bats-tests:4002/auth/after_settings_hooks + # url: http://bats-tests:4455/auth/after_settings_hooks url: http://invalid-because-we-dont-want-profile-to-be-updated method: POST body: file:///home/ory/body.jsonnet @@ -85,7 +85,7 @@ selfservice: recovery: enabled: true - ui_url: http://127.0.0.1:4002/recovery + ui_url: http://127.0.0.1:4455/recovery verification: use: code @@ -95,7 +95,7 @@ selfservice: logout: after: - default_browser_return_url: http://127.0.0.1:4002/login + default_browser_return_url: http://127.0.0.1:4455/login login: ui_url: http://localhost:3000/login