chore: fix card embed endpoints after removing apache dependency

Author: mirek26

lithic-java-core/src/main/kotlin/com/lithic/api/services/async/CardServiceAsyncImpl.kt

@@ -41,14 +41,13 @@ import com.lithic.api.services.async.cards.BalanceServiceAsync
 import com.lithic.api.services.async.cards.BalanceServiceAsyncImpl
 import com.lithic.api.services.async.cards.FinancialTransactionServiceAsync
 import com.lithic.api.services.async.cards.FinancialTransactionServiceAsyncImpl
-import java.net.URI
+import java.net.URLEncoder
 import java.util.Base64
 import java.util.concurrent.CompletableFuture
 import java.util.function.Consumer
 import javax.crypto.Mac
 import javax.crypto.spec.SecretKeySpec
 import kotlin.jvm.optionals.getOrNull
-import org.apache.hc.core5.net.URIBuilder
 
 class CardServiceAsyncImpl internal constructor(private val clientOptions: ClientOptions) :
     CardServiceAsync {
@@ -618,10 +617,14 @@ class CardServiceAsyncImpl internal constructor(private val clientOptions: Clien
         val embed_request_hmac =
             Base64.getEncoder().encodeToString(mac.doFinal(embed_request.toByteArray()))
 
-        return URIBuilder(URI.create(clientOptions.baseUrl()))
-            .appendPathSegments("embed", "card")
-            .addParameter("embed_request", embed_request)
-            .addParameter("hmac", embed_request_hmac)
-            .toString()
+        return buildString {
+            append(clientOptions.baseUrl())
+            if (!endsWith("/")) append("/")
+            append("embed/card")
+            append("?embed_request=")
+            append(URLEncoder.encode(embed_request, "UTF-8"))
+            append("&hmac=")
+            append(URLEncoder.encode(embed_request_hmac, "UTF-8"))
+        }
     }
 }

lithic-java-core/src/main/kotlin/com/lithic/api/services/blocking/CardServiceImpl.kt

@@ -41,13 +41,12 @@ import com.lithic.api.services.blocking.cards.BalanceService
 import com.lithic.api.services.blocking.cards.BalanceServiceImpl
 import com.lithic.api.services.blocking.cards.FinancialTransactionService
 import com.lithic.api.services.blocking.cards.FinancialTransactionServiceImpl
-import java.net.URI
+import java.net.URLEncoder
 import java.util.Base64
 import java.util.function.Consumer
 import javax.crypto.Mac
 import javax.crypto.spec.SecretKeySpec
 import kotlin.jvm.optionals.getOrNull
-import org.apache.hc.core5.net.URIBuilder
 
 class CardServiceImpl internal constructor(private val clientOptions: ClientOptions) : CardService {
 
@@ -553,10 +552,14 @@ class CardServiceImpl internal constructor(private val clientOptions: ClientOpti
         val embed_request_hmac =
             Base64.getEncoder().encodeToString(mac.doFinal(embed_request.toByteArray()))
 
-        return URIBuilder(URI.create(clientOptions.baseUrl()))
-            .appendPathSegments("embed", "card")
-            .addParameter("embed_request", embed_request)
-            .addParameter("hmac", embed_request_hmac)
-            .toString()
+        return buildString {
+            append(clientOptions.baseUrl())
+            if (!endsWith("/")) append("/")
+            append("embed/card")
+            append("?embed_request=")
+            append(URLEncoder.encode(embed_request, "UTF-8"))
+            append("&hmac=")
+            append(URLEncoder.encode(embed_request_hmac, "UTF-8"))
+        }
     }
 }

lithic-java-core/src/test/kotlin/com/lithic/api/services/blocking/CardServiceTest.kt

@@ -7,6 +7,8 @@ import com.lithic.api.client.okhttp.LithicOkHttpClient
 import com.lithic.api.models.CardConvertPhysicalParams
 import com.lithic.api.models.CardCreateParams
 import com.lithic.api.models.CardEmbedParams
+import com.lithic.api.models.CardGetEmbedHtmlParams
+import com.lithic.api.models.CardGetEmbedUrlParams
 import com.lithic.api.models.CardProvisionParams
 import com.lithic.api.models.CardReissueParams
 import com.lithic.api.models.CardRenewParams
@@ -16,6 +18,7 @@ import com.lithic.api.models.CardWebProvisionParams
 import com.lithic.api.models.Carrier
 import com.lithic.api.models.ShippingAddress
 import com.lithic.api.models.SpendLimitDuration
+import org.assertj.core.api.Assertions.assertThat
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.extension.ExtendWith
 
@@ -342,4 +345,34 @@ internal class CardServiceTest {
 
         response.validate()
     }
+
+    @Test
+    fun callGetEmbedHtml() {
+        val client =
+            LithicOkHttpClient.builder()
+                .baseUrl(TestServerExtension.BASE_URL)
+                .apiKey("test-api-key")
+                .webhookSecret("string")
+                .build()
+        val cardService = client.cards()
+        val cardEmbedResponse =
+            cardService.getEmbedHtml(CardGetEmbedHtmlParams.builder().token("foo").build())
+        println(cardEmbedResponse)
+        assertThat(cardEmbedResponse).contains("<html>")
+    }
+
+    @Test
+    fun callGetEmbedUrl() {
+        val client =
+            LithicOkHttpClient.builder()
+                .baseUrl(TestServerExtension.BASE_URL)
+                .apiKey("test-api-key")
+                .webhookSecret("string")
+                .build()
+        val cardService = client.cards()
+        val cardEmbedUrl =
+            cardService.getEmbedUrl(CardGetEmbedUrlParams.builder().token("foo").build())
+        println(cardEmbedUrl)
+        assertThat(cardEmbedUrl).contains("hmac")
+    }
 }