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..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 @@ -17,7 +17,8 @@ import org.springframework.context.annotation.Bean import org.springframework.context.annotation.Configuration @Configuration -class AppConfig { +class AppConfig( +) { @Autowired private lateinit var symbols: List