Merge pull request #124 from OpenFuturePlatform/public-api-elaman

AccessKey Interceptor save

Author: borbuevbeksultan

src/main/kotlin/io/openfuture/api/component/key/DefaultKeyApi.kt

@@ -3,7 +3,7 @@ package io.openfuture.api.component.key
 import io.openfuture.api.domain.key.*
 import io.openfuture.keymanagementservice.dto.GenerateMultipleWalletForOrderRequest
 import io.openfuture.keymanagementservice.dto.GenerateMultipleWalletForUserRequest
-import io.openfuture.keymanagementservice.dto.GenerateMultipleWalletRequest
+import io.openfuture.api.domain.key.creation.GenerateMultipleWalletRequest
 import org.springframework.stereotype.Component
 import org.springframework.web.client.RestTemplate
 import java.util.*
@@ -25,22 +25,22 @@ class DefaultKeyApi(
     }
 
     override fun importWalletV2(request: ImportWalletOpenKeyRequest): KeyWalletDto {
-        val response = keyRestTemplate.postForEntity("/key/importWallet", request, KeyWalletDto::class.java)
+        val response = keyRestTemplate.postForEntity("/key/wallet", request, KeyWalletDto::class.java)
         return response.body!!
     }
 
     override fun generateMultipleWallets(request: GenerateMultipleWalletRequest): Array<KeyWalletDto> {
-        val response = keyRestTemplate.postForEntity("/key/generateMultiple", request, Array<KeyWalletDto>::class.java)
+        val response = keyRestTemplate.postForEntity("/key/multiple", request, Array<KeyWalletDto>::class.java)
         return response.body!!
     }
 
     override fun generateMultipleWalletsWithOrder(request: GenerateMultipleWalletForOrderRequest): Array<KeyWalletDto> {
-        val response = keyRestTemplate.postForEntity("/key/generateMultipleForOrder", request, Array<KeyWalletDto>::class.java)
+        val response = keyRestTemplate.postForEntity("/key/order", request, Array<KeyWalletDto>::class.java)
         return response.body!!
     }
 
     override fun generateMultipleWalletsWithUser(request: GenerateMultipleWalletForUserRequest): Array<KeyWalletDto> {
-        val response = keyRestTemplate.postForEntity("/key/generateMultipleForUser", request, Array<KeyWalletDto>::class.java)
+        val response = keyRestTemplate.postForEntity("/key/user", request, Array<KeyWalletDto>::class.java)
         return response.body!!
     }
 

src/main/kotlin/io/openfuture/api/component/key/KeyApi.kt

@@ -3,7 +3,7 @@ package io.openfuture.api.component.key
 import io.openfuture.api.domain.key.*
 import io.openfuture.keymanagementservice.dto.GenerateMultipleWalletForOrderRequest
 import io.openfuture.keymanagementservice.dto.GenerateMultipleWalletForUserRequest
-import io.openfuture.keymanagementservice.dto.GenerateMultipleWalletRequest
+import io.openfuture.api.domain.key.creation.GenerateMultipleWalletRequest
 import java.util.*
 
 interface KeyApi {

src/main/kotlin/io/openfuture/api/config/WebMvcConfig.kt

@@ -1,10 +1,17 @@
 package io.openfuture.api.config
 
 import io.openfuture.api.annotation.resolver.CurrentUserArgumentResolver
+import io.openfuture.api.config.interceptor.AccessKeyHolder
+import io.openfuture.api.config.interceptor.AccessKeyInterceptor
 import io.openfuture.api.service.UserService
+import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.Configuration
+import org.springframework.context.annotation.Scope
+import org.springframework.context.annotation.ScopedProxyMode
+import org.springframework.web.context.WebApplicationContext
 import org.springframework.web.method.support.HandlerMethodArgumentResolver
 import org.springframework.web.servlet.config.annotation.CorsRegistry
+import org.springframework.web.servlet.config.annotation.InterceptorRegistry
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer
 
 
@@ -24,4 +31,19 @@ class WebMvcConfig(
             .maxAge(3600)
     }
 
+    /*override fun addInterceptors(registry: InterceptorRegistry) {
+        registry.addInterceptor(accessKeyInterceptor())
+    }
+
+    @Bean
+    fun accessKeyInterceptor(): AccessKeyInterceptor {
+        return AccessKeyInterceptor(accessKeyHolder())
+    }
+
+    @Bean
+    @Scope(value = WebApplicationContext.SCOPE_REQUEST, proxyMode = ScopedProxyMode.TARGET_CLASS)
+    fun accessKeyHolder(): AccessKeyHolder {
+        return AccessKeyHolder("")
+    }*/
+
 }

src/main/kotlin/io/openfuture/api/config/interceptor/AccessKeyHolder.kt

@@ -0,0 +1,5 @@
+package io.openfuture.api.config.interceptor
+
+open class AccessKeyHolder (
+    var accessKey: String
+)

src/main/kotlin/io/openfuture/api/config/interceptor/AccessKeyInterceptor.kt

@@ -0,0 +1,15 @@
+package io.openfuture.api.config.interceptor
+
+import org.springframework.web.servlet.HandlerInterceptor
+import javax.servlet.http.HttpServletRequest
+import javax.servlet.http.HttpServletResponse
+
+class AccessKeyInterceptor(
+    private val accessKeyHolder: AccessKeyHolder
+    ) : HandlerInterceptor {
+
+    override fun preHandle(requests: HttpServletRequest, response: HttpServletResponse, handler: Any): Boolean {
+        accessKeyHolder.accessKey = requests.getHeader("X-API-KEY")
+        return true
+    }
+}

src/main/kotlin/io/openfuture/api/controller/api/PublicHDWalletController.kt

@@ -5,6 +5,7 @@ import io.openfuture.api.entity.application.BlockchainType
 import io.openfuture.api.service.ApplicationService
 import io.openfuture.api.service.ApplicationWalletService
 import io.openfuture.api.service.WalletApiService
+import org.springframework.security.access.prepost.PreAuthorize
 import org.springframework.web.bind.annotation.*
 
 @RestController

src/main/kotlin/io/openfuture/api/domain/key/creation/GenerateMultipleWalletRequest.kt

@@ -1,4 +1,4 @@
-package io.openfuture.keymanagementservice.dto
+package io.openfuture.api.domain.key.creation
 
 import io.openfuture.api.entity.application.BlockchainType