Skip to content

Commit

Permalink
Fix env var naming
Browse files Browse the repository at this point in the history
  • Loading branch information
louptheron committed Oct 23, 2024
1 parent f5170a8 commit ee08555
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 5 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ install-front:
.PHONY: run-back ##LOCAL ▶️ Run backend API
run-back: run-stubbed-apis
docker compose up -d --quiet-pull --wait db keycloak
cd backend && MONITORFISH_KEYCLOAK_PROXY_ENABLED=true ./gradlew bootRun --args='--spring.profiles.active=local --spring.config.additional-location=$(INFRA_FOLDER)'
cd backend && MONITORFISH_KEYCLOAK_PROXY_ENABLED=true FRONTEND_OIDC_PROXY_URL=http://localhost:8085 ./gradlew bootRun --args='--spring.profiles.active=local --spring.config.additional-location=$(INFRA_FOLDER)'

.PHONY: run-front ##LOCAL ▶️ Run frontend for development
run-front:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@ class OIDCProperties {
var enabled: Boolean? = false
var userinfoEndpoint: String? = null
var issuerUri: String? = null
var proxyURL: String? = null
var proxyUrl: String? = null
}
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ class KeycloakProxyController (
request: HttpServletRequest,
): ResponseEntity<*> {
val params = request.parameterMap
val targetUri = StringBuilder("${oidcProperties.proxyURL}/${request.requestURI}")
val targetUri = StringBuilder("${oidcProperties.proxyUrl}/${request.requestURI}")

if (params.isNotEmpty()) {
targetUri.append("?")
Expand Down
4 changes: 2 additions & 2 deletions infra/docker/docker-compose.cypress.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,12 +41,12 @@ services:
- FRONTEND_OIDC_AUTHORITY=http://0.0.0.0:8880/realms/monitor
- FRONTEND_OIDC_CLIENT_ID=monitorfish
- MONITORFISH_OIDC_ENABLED=true
- FRONTEND_OIDC_ENABLED=true
- MONITORFISH_OIDC_PROXY_URL=http://keycloak:8085
- MONITORFISH_KEYCLOAK_PROXY_ENABLED=true
- FRONTEND_OIDC_ENABLED=true
- MONITORFISH_SCHEDULING_ENABLED=false
- FRONTEND_OIDC_REDIRECT_URI=http://0.0.0.0:8880
- FRONTEND_OIDC_LOGOUT_REDIRECT_URI=http://0.0.0.0:8880/login
- FRONTEND_OIDC_PROXY_URL=http://keycloak:8085
- FRONTEND_MONITORFISH_VERSION=
- FRONTEND_SENTRY_DSN=https://a5f3272efa794bb9ada2ffea90f2fec5@sentry.incubateur.net/8
- FRONTEND_SENTRY_TRACING_ORIGINS=
Expand Down
2 changes: 2 additions & 0 deletions infra/docker/docker-compose.puppeteer.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,8 @@ services:
- FRONTEND_OIDC_CLIENT_ID=monitorfish
- MONITORFISH_OIDC_ENABLED=false
- MONITORFISH_SCHEDULING_ENABLED=false
- MONITORFISH_OIDC_PROXY_URL=http://keycloak:8085
- MONITORFISH_KEYCLOAK_PROXY_ENABLED=true
- FRONTEND_OIDC_ENABLED=false
- FRONTEND_OIDC_REDIRECT_URI=http://0.0.0.0:8880
- FRONTEND_OIDC_LOGOUT_REDIRECT_URI=http://0.0.0.0:8880/login
Expand Down

0 comments on commit ee08555

Please sign in to comment.