Merge branch 'refactor-currency-services-focused-on-symbols' of https…

…://github.com/opexdev/core into otc_to_dev_currency_services
opexdev · Dec 15, 2024 · ad05a2e · ad05a2e
2 parents 13f88c1 + 564a545
commit ad05a2e
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git a/...-auth-proxy/src/main/kotlin/co/nilin/opex/bcgateway/ports/authproxy/impl/AuthProxyImpl.kt b/...-auth-proxy/src/main/kotlin/co/nilin/opex/bcgateway/ports/authproxy/impl/AuthProxyImpl.kt
@@ -5,6 +5,7 @@ import co.nilin.opex.bcgateway.core.model.otc.LoginResponse
 import co.nilin.opex.bcgateway.core.spi.AuthProxy
 import kotlinx.coroutines.reactive.awaitFirst
 import org.springframework.beans.factory.annotation.Value
+import org.springframework.context.annotation.Profile
 import org.springframework.core.ParameterizedTypeReference
 import org.springframework.http.HttpHeaders
 import org.springframework.http.MediaType
@@ -16,6 +17,7 @@ import java.net.URI
 inline fun <reified T : Any> typeRef(): ParameterizedTypeReference<T> = object : ParameterizedTypeReference<T>() {}
 
 @Component
+@Profile("otc")
 class AuthProxyImpl(private val webClient: WebClient) : AuthProxy {
 
 

diff --git a/docker-compose-otc.yml b/docker-compose-otc.yml
@@ -33,8 +33,8 @@ services:
       - DRIVE_FOLDER_ID=$DRIVE_FOLDER_ID
       - BACKUP_ENABLED=$WALLET_BACKUP_ENABLED
       - SPRING_PROFILES_ACTIVE=otc
-      - auth_url=${AUTH_URL}
-      - auth_jwk_endpoint=${JWK_ENDPOINT}
+      - AUTH_URL=${AUTH_URL}
+      - AUTH_JWK_ENDPOINT=${JWK_ENDPOINT}
     extra_hosts:
       - "host.docker.internal:host-gateway"
     #    configs:
@@ -95,9 +95,9 @@ services:
       - PREFERENCES=$PREFERENCES
       - ADDRESS_EXP_TIME=7200
       - SPRING_PROFILES_ACTIVE=otc
-      - auth_url=${AUTH_URL}
-      - auth_jwk_endpoint=${JWK_ENDPOINT}
-      - omni_url=${OMNI_URL}
+      - AUTH_URL=${AUTH_URL}
+      - AUTH_JWK_ENDPOINT=${JWK_ENDPOINT}
+      - OMNI_URL=${OMNI_URL}
     extra_hosts:
       - "host.docker.internal:host-gateway"
     #    configs:

diff --git a/wallet/wallet-app/src/main/resources/application-otc.yml b/wallet/wallet-app/src/main/resources/application-otc.yml
@@ -71,8 +71,8 @@ spring:
     import: vault://secret/${spring.application.name}
 app:
   auth:
-    url: ${auth_url}
-    cert-url: ${auth_jwk_endpoint}
+    url: ${AUTH_URL}
+    cert-url: ${AUTH_JWK_ENDPOINT}
     client-id: ${client_id}
     client-secret: ${client_secret}
   system: