From 144bb685415e34ef5051401aa16a0a215a1c6ca1 Mon Sep 17 00:00:00 2001 From: fatemeh imanipour Date: Thu, 30 Jul 2026 16:37:30 +0330 Subject: [PATCH 1/2] Fix confirm registration service --- .../co/nilin/opex/api/core/inout/auth/UserRegister.kt | 2 ++ .../co/nilin/opex/api/ports/proxy/impl/AuthProxyImpl.kt | 2 +- .../main/kotlin/co/nilin/opex/auth/model/UserRegister.kt | 2 ++ .../kotlin/co/nilin/opex/auth/service/RegisterService.kt | 2 ++ .../nilin/opex/matching/engine/app/config/AppConfig.kt | 9 +++++++-- 5 files changed, 14 insertions(+), 3 deletions(-) diff --git a/api/api-core/src/main/kotlin/co/nilin/opex/api/core/inout/auth/UserRegister.kt b/api/api-core/src/main/kotlin/co/nilin/opex/api/core/inout/auth/UserRegister.kt index 917fcd1fd..fbe3e3cff 100644 --- a/api/api-core/src/main/kotlin/co/nilin/opex/api/core/inout/auth/UserRegister.kt +++ b/api/api-core/src/main/kotlin/co/nilin/opex/api/core/inout/auth/UserRegister.kt @@ -25,6 +25,8 @@ data class ConfirmRegisterRequest( val token: String, val clientId: String?, val clientSecret: String?, + val referralCode: String?, + val rememberMe: Boolean? ) : Device() data class TokenData( diff --git a/api/api-ports/api-proxy-rest/src/main/kotlin/co/nilin/opex/api/ports/proxy/impl/AuthProxyImpl.kt b/api/api-ports/api-proxy-rest/src/main/kotlin/co/nilin/opex/api/ports/proxy/impl/AuthProxyImpl.kt index ca831aa51..8f702d2a4 100644 --- a/api/api-ports/api-proxy-rest/src/main/kotlin/co/nilin/opex/api/ports/proxy/impl/AuthProxyImpl.kt +++ b/api/api-ports/api-proxy-rest/src/main/kotlin/co/nilin/opex/api/ports/proxy/impl/AuthProxyImpl.kt @@ -107,7 +107,7 @@ class AuthProxyImpl(@Qualifier("generalWebClient") private val webClient: WebCli override suspend fun confirmRegister(request: ConfirmRegisterRequest): Token { return webClient.post() - .uri("$baseUrl/v1/user/public/register/ccofirm") + .uri("$baseUrl/v1/user/public/register/confirm") .accept(MediaType.APPLICATION_JSON) .body(Mono.just(request)) .retrieve() diff --git a/auth-gateway/auth-gateway-app/src/main/kotlin/co/nilin/opex/auth/model/UserRegister.kt b/auth-gateway/auth-gateway-app/src/main/kotlin/co/nilin/opex/auth/model/UserRegister.kt index 88cdb430a..1b5359d0c 100644 --- a/auth-gateway/auth-gateway-app/src/main/kotlin/co/nilin/opex/auth/model/UserRegister.kt +++ b/auth-gateway/auth-gateway-app/src/main/kotlin/co/nilin/opex/auth/model/UserRegister.kt @@ -24,6 +24,8 @@ data class ConfirmRegisterRequest( val token: String, val clientId: String?, val clientSecret: String?, + val rememberMe: Boolean? = false, + val referralCode: String? ) : Device() data class TokenData( diff --git a/auth-gateway/auth-gateway-app/src/main/kotlin/co/nilin/opex/auth/service/RegisterService.kt b/auth-gateway/auth-gateway-app/src/main/kotlin/co/nilin/opex/auth/service/RegisterService.kt index 4f95d9e40..5d2799d20 100644 --- a/auth-gateway/auth-gateway-app/src/main/kotlin/co/nilin/opex/auth/service/RegisterService.kt +++ b/auth-gateway/auth-gateway-app/src/main/kotlin/co/nilin/opex/auth/service/RegisterService.kt @@ -81,6 +81,8 @@ class RegisterService( null else { val token = keycloakProxy.getUserToken(username, request.password, request.clientId, request.clientSecret) + if (request.rememberMe == false) + token.refreshToken = null sendLoginEvent(user.id, token.sessionState, request, token.expiresIn) return token } diff --git a/matching-engine/matching-engine-app/src/main/kotlin/co/nilin/opex/matching/engine/app/config/AppConfig.kt b/matching-engine/matching-engine-app/src/main/kotlin/co/nilin/opex/matching/engine/app/config/AppConfig.kt index 246c936ee..e2f415ebb 100644 --- a/matching-engine/matching-engine-app/src/main/kotlin/co/nilin/opex/matching/engine/app/config/AppConfig.kt +++ b/matching-engine/matching-engine-app/src/main/kotlin/co/nilin/opex/matching/engine/app/config/AppConfig.kt @@ -4,6 +4,8 @@ import co.nilin.opex.matching.engine.app.bl.ExchangeEventHandler import co.nilin.opex.matching.engine.app.bl.OrderBooks import co.nilin.opex.matching.engine.app.listener.MatchingEngineEventListener import co.nilin.opex.matching.engine.app.listener.OrderListener +import co.nilin.opex.matching.engine.core.engine.MatchingEngineRecoveryManager +import co.nilin.opex.matching.engine.core.engine.OrderCommandProcessor import co.nilin.opex.matching.engine.core.model.PersistentOrderBook import co.nilin.opex.matching.engine.core.spi.OrderBookPersister import co.nilin.opex.matching.engine.ports.kafka.listener.consumer.EventKafkaListener @@ -17,7 +19,10 @@ import org.springframework.context.annotation.Bean import org.springframework.context.annotation.Configuration @Configuration -class AppConfig { +class AppConfig( + private val recoveryManager: MatchingEngineRecoveryManager, + private val orderCommandProcessor: OrderCommandProcessor +) { @Autowired private lateinit var symbols: List @@ -55,7 +60,7 @@ class AppConfig { @Bean fun orderListener(): OrderListener { - return OrderListener() + return OrderListener(orderCommandProcessor,recoveryManager) } @Autowired From 4a64a5509926129128b7d241abcce8f4c9da529d Mon Sep 17 00:00:00 2001 From: fatemeh imanipour Date: Thu, 30 Jul 2026 17:08:39 +0330 Subject: [PATCH 2/2] Fix a mistake in app config --- .../co/nilin/opex/matching/engine/app/config/AppConfig.kt | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/matching-engine/matching-engine-app/src/main/kotlin/co/nilin/opex/matching/engine/app/config/AppConfig.kt b/matching-engine/matching-engine-app/src/main/kotlin/co/nilin/opex/matching/engine/app/config/AppConfig.kt index e2f415ebb..85808b5c8 100644 --- a/matching-engine/matching-engine-app/src/main/kotlin/co/nilin/opex/matching/engine/app/config/AppConfig.kt +++ b/matching-engine/matching-engine-app/src/main/kotlin/co/nilin/opex/matching/engine/app/config/AppConfig.kt @@ -4,8 +4,6 @@ import co.nilin.opex.matching.engine.app.bl.ExchangeEventHandler import co.nilin.opex.matching.engine.app.bl.OrderBooks import co.nilin.opex.matching.engine.app.listener.MatchingEngineEventListener import co.nilin.opex.matching.engine.app.listener.OrderListener -import co.nilin.opex.matching.engine.core.engine.MatchingEngineRecoveryManager -import co.nilin.opex.matching.engine.core.engine.OrderCommandProcessor import co.nilin.opex.matching.engine.core.model.PersistentOrderBook import co.nilin.opex.matching.engine.core.spi.OrderBookPersister import co.nilin.opex.matching.engine.ports.kafka.listener.consumer.EventKafkaListener @@ -20,8 +18,6 @@ import org.springframework.context.annotation.Configuration @Configuration class AppConfig( - private val recoveryManager: MatchingEngineRecoveryManager, - private val orderCommandProcessor: OrderCommandProcessor ) { @Autowired private lateinit var symbols: List @@ -60,7 +56,7 @@ class AppConfig( @Bean fun orderListener(): OrderListener { - return OrderListener(orderCommandProcessor,recoveryManager) + return OrderListener() } @Autowired