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

Wallet Public endpoints for import

Author: borbuevbeksultan

.gitignore

@@ -18,9 +18,12 @@
 *.ipr
 /out/
 
+/payment-chooser/build/static/js/
+/payment-chooser/build/resources/static/js/
+/payment-chooser/node_modules/
+
 ### NetBeans ###
 /nbproject/private/
-/build/
 /nbbuild/
 /dist/
 /nbdist/

payment-chooser/build/resources/static/static/js/payment-chooser.js

@@ -54,9 +54,9 @@ function fetchTransactionData() {
 }
 
 function loadTransactionData(result) {
-
-    amountSelector.innerHTML = `${result.orderAmount}` + ` ${currency}`;
-    leftAmount = result.orderAmount - result.paid;
+    console.log("Load data : " + result.order_amount);
+    amountSelector.innerHTML = `${result.order_amount}` + ` ${currency}`;
+    leftAmount = result.order_amount - result.paid;
     remainingSelector.innerHTML = `${leftAmount}` + ` ${currency}`;
 
     if (result.orderAmount <= result.paid) {
@@ -130,11 +130,11 @@ async function openPaymentWidget() {
 
     widgetData = await getAddressData(OPEN_URL);
 
-    amountSelector.innerHTML = `${widgetData.orderAmount}` + ` ${currency}`;
-    leftAmount = widgetData.orderAmount - widgetData.paid;
+    amountSelector.innerHTML = `${widgetData.order_amount}` + ` ${currency}`;
+    leftAmount = widgetData.order_amount - widgetData.paid;
     remainingSelector.innerHTML = `${leftAmount}` + ` ${currency}`;
 
-    countdownTimer(new Date(`${widgetData.orderDate}`).getTime(), widgetData.orderAmount, widgetData.paid);
+    countdownTimer(new Date(`${widgetData.order_date}`).getTime(), widgetData.order_amount, widgetData.paid);
 
     const accordion = document.querySelector(".accordion");
     let i = 1;

payment-chooser/build/resources/static/static/js/payment-chooser.js.map

@@ -1,8 +1,12 @@
 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 org.springframework.stereotype.Component
 import org.springframework.web.client.RestTemplate
+import java.util.*
 
 
 @Component
@@ -20,8 +24,23 @@ class DefaultKeyApi(
         return response.body!!
     }
 
-    override fun generateMultipleWallets(createMultipleKeyRequest: CreateMultipleKeyRequest): Array<KeyWalletDto> {
-        val response = keyRestTemplate.postForEntity("/key/multiple", createMultipleKeyRequest, Array<KeyWalletDto>::class.java)
+    override fun importWalletV2(request: ImportWalletOpenKeyRequest): KeyWalletDto {
+        val response = keyRestTemplate.postForEntity("/key/importWallet", 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)
+        return response.body!!
+    }
+
+    override fun generateMultipleWalletsWithOrder(request: GenerateMultipleWalletForOrderRequest): Array<KeyWalletDto> {
+        val response = keyRestTemplate.postForEntity("/key/generateMultipleForOrder", 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)
         return response.body!!
     }
 
@@ -30,9 +49,23 @@ class DefaultKeyApi(
         return response.body!!
     }
 
-    override fun getAllWalletsByApplication(applicationId: String): Array<KeyWalletEncryptedDto> {
-        val response = keyRestTemplate.getForEntity("/key?applicationId={applicationId}", Array<KeyWalletEncryptedDto>::class.java, applicationId)
-        return response.body!!
+    override fun getAllWalletsByApplication(applicationId: String, userId: Optional<String>, orderKey: Optional<String>): Array<KeyWalletDto> {
+        if (userId.isPresent){
+            val response = keyRestTemplate.getForEntity("/key?applicationId={applicationId}&userId={userId}", Array<KeyWalletDto>::class.java, applicationId, userId.get())
+            return response.body!!
+        } else if (orderKey.isPresent){
+            val url = "/key/order/${orderKey.get()}"
+            val response = keyRestTemplate.getForEntity(url, Array<KeyWalletDto>::class.java)
+            return response.body!!
+
+        } else {
+            val response = keyRestTemplate.getForEntity(
+                "/key?applicationId={applicationId}",
+                Array<KeyWalletDto>::class.java,
+                applicationId
+            )
+            return response.body!!
+        }
     }
 
     override fun getAllWalletsByOrderKey(orderKey: String): Array<KeyWalletDto> {

payment-chooser/build/static/js/payment-chooser.js

@@ -1,13 +1,20 @@
 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 java.util.*
 
 interface KeyApi {
     fun generateWallet(createKeyRequest: CreateKeyRequest): KeyWalletDto
     fun importWallet(request: ImportKeyRequest): KeyWalletDto
-    fun generateMultipleWallets(createMultipleKeyRequest: CreateMultipleKeyRequest): Array<KeyWalletDto>
+    fun importWalletV2(request: ImportWalletOpenKeyRequest): KeyWalletDto
+    fun generateMultipleWallets(request: GenerateMultipleWalletRequest): Array<KeyWalletDto>
+    fun generateMultipleWalletsWithOrder(request: GenerateMultipleWalletForOrderRequest): Array<KeyWalletDto>
+    fun generateMultipleWalletsWithUser(request: GenerateMultipleWalletForUserRequest): Array<KeyWalletDto>
     fun updateWallets(createMultipleKeyRequest: CreateMultipleKeyRequest): Array<KeyWalletDto>
-    fun getAllWalletsByApplication(applicationId: String): Array<KeyWalletEncryptedDto>
+    fun getAllWalletsByApplication(applicationId: String, userId: Optional<String>, orderKey: Optional<String>): Array<KeyWalletDto>
     fun getAllWalletsByOrderKey(orderKey: String): Array<KeyWalletDto>
     fun getApplicationByAddress(address: String): WalletAddressResponse
     fun deleteAllWalletsByApplicationAddress(applicationId: String, address: String)

payment-chooser/build/static/js/payment-chooser.js.map

@@ -17,7 +17,7 @@ class DefaultStateApi(private val stateRestTemplate: RestTemplate) : StateApi {
         blockchain: Blockchain,
         applicationId: String
     ): StateWalletDto {
-        val request = CreateStateWalletRequest(address, webHook, blockchain.getValue(), applicationId)
+        val request = CreateStateWalletRequest(address, applicationId, blockchain.getValue(), webHook)
         val response = stateRestTemplate.postForEntity("/wallets/single", request, StateWalletDto::class.java)
         return response.body!!
     }
@@ -26,6 +26,10 @@ class DefaultStateApi(private val stateRestTemplate: RestTemplate) : StateApi {
         return stateRestTemplate.postForEntity("/wallets", request, CreateStateWalletResponse::class.java).body!!
     }
 
+    override fun createWallet(request: CreateStateWithUserRequest): AddWatchResponse {
+        return stateRestTemplate.postForEntity("/wallets/v2/add", request, AddWatchResponse::class.java).body!!
+    }
+
     override fun updateWalletWithMetadata(request: UpdateStateWalletMetadata) {
         stateRestTemplate.postForEntity("/wallets/update", request, Void::class.java)
     }
@@ -40,9 +44,9 @@ class DefaultStateApi(private val stateRestTemplate: RestTemplate) : StateApi {
         return stateRestTemplate.getForEntity(url, WalletApiStateResponse::class.java).body!!
     }
 
-    override fun getAddressTransactionsByAddress(address: String): StateWalletTransactionDetail {
+    override fun getOrderTransactionsByAddress(address: String): OrderTransactionDetail {
         val url = "/wallets/transactions/address/${address}"
-        return stateRestTemplate.getForEntity(url, StateWalletTransactionDetail::class.java).body!!
+        return stateRestTemplate.getForEntity(url, OrderTransactionDetail::class.java).body!!
     }
 
     override fun getTransactionsByAddress(address: String): Array<TransactionDto> {
@@ -52,11 +56,10 @@ class DefaultStateApi(private val stateRestTemplate: RestTemplate) : StateApi {
 
     override fun getPaymentDetailByOrder(orderKey: String): PaymentWidgetResponse {
         val url = "/orders/${orderKey}"
-        println("Order key : $orderKey")
         return stateRestTemplate.getForEntity(url, PaymentWidgetResponse::class.java).body!!
     }
 
-    override fun getOrderDetailsByApplication(applicationId: String): Array<StateOrderDetail> {
+    override fun getOrdersByApplication(applicationId: String): Array<StateOrderDetail> {
         val url = "/wallets/application/${applicationId}"
         return stateRestTemplate.getForEntity(url, Array<StateOrderDetail>::class.java).body!!
     }

payment-chooser/src/index.js

@@ -18,11 +18,13 @@ interface StateApi {
 
     fun getWallet(address: String, blockchain: Blockchain): WalletApiStateResponse
 
-    fun getAddressTransactionsByAddress(address: String): StateWalletTransactionDetail
+    fun getOrderTransactionsByAddress(address: String): OrderTransactionDetail
 
     fun getTransactionsByAddress(address: String): Array<TransactionDto>
 
     fun getPaymentDetailByOrder(orderKey: String): PaymentWidgetResponse
 
-    fun getOrderDetailsByApplication(applicationId: String): Array<StateOrderDetail>
+    fun getOrdersByApplication(applicationId: String): Array<StateOrderDetail>
+
+    fun createWallet(request: CreateStateWithUserRequest): AddWatchResponse
 }