Skip to content

Commit

Permalink
chore: consistent on port 4455 for oathkeeper
Browse files Browse the repository at this point in the history
  • Loading branch information
Nicolas Burtey committed Nov 14, 2023
1 parent 454fda4 commit ab5e4df
Show file tree
Hide file tree
Showing 13 changed files with 136 additions and 136 deletions.
2 changes: 1 addition & 1 deletion apps/consent/cypress/support/commands.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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,
},
Expand Down
12 changes: 6 additions & 6 deletions core/api/dev/ory/kratos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion core/api/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions core/api/src/servers/graphql-server.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}`,
)

Expand Down
2 changes: 1 addition & 1 deletion core/api/test/bats/helpers/_common.bash
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
12 changes: 6 additions & 6 deletions dev/config/ory/kratos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions docs/LEGACY_DEV.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion docs/hydra.md
Original file line number Diff line number Diff line change
Expand Up @@ -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":{}}'
Expand Down
204 changes: 102 additions & 102 deletions docs/postman-collection/galoy-dev.postman_environment.json
Original file line number Diff line number Diff line change
@@ -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"
}
"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"
}
2 changes: 1 addition & 1 deletion quickstart/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion quickstart/bin/helpers.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Loading

0 comments on commit ab5e4df

Please sign in to comment.