Add base64 encoding to body string and update header

Trendyol · Jul 11, 2024 · cfb7c70 · cfb7c70
1 parent 275263d
commit cfb7c70
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 6 deletions.
diff --git a/mockingstar/build.gradle.kts b/mockingstar/build.gradle.kts
@@ -21,7 +21,7 @@ publishing {
 		create<MavenPublication>("release") {
 			groupId = "com.trendyol.mockingstar"
 			artifactId = "mockingstar"
-			version = "1.0.1"
+			version = "1.0.2"
 			afterEvaluate {
 				from(components["java"])
 			}

diff --git a/mockingstar/src/main/java/com/trendyol/mockingstar/MockingStarInterceptor.kt b/mockingstar/src/main/java/com/trendyol/mockingstar/MockingStarInterceptor.kt
@@ -11,13 +11,15 @@ import okhttp3.Response
 import okio.Buffer
 import java.nio.charset.Charset
 import java.nio.charset.StandardCharsets
+import kotlin.io.encoding.Base64
+import kotlin.io.encoding.ExperimentalEncodingApi
 
 class MockingStarInterceptor(
 	private val params: MockUrlParams = MockUrlParams(),
 	private val header: Map<String, String> = emptyMap(),
 ) : Interceptor {
 
-	@OptIn(ExperimentalSerializationApi::class)
+	@OptIn(ExperimentalSerializationApi::class, ExperimentalEncodingApi::class)
 	override fun intercept(chain: Interceptor.Chain): Response {
 		val originalRequest = chain.request()
 
@@ -26,13 +28,18 @@ class MockingStarInterceptor(
 		originalRequest.body?.writeTo(buffer)
 
 		val contentType = originalRequest.body?.contentType()
-		val charset: Charset = contentType?.charset(StandardCharsets.UTF_8) ?: StandardCharsets.UTF_8
+		val charset: Charset =
+			contentType?.charset(StandardCharsets.UTF_8) ?: StandardCharsets.UTF_8
+
+		val bodyString = buffer.readString(charset)
+			.takeIf { it.isNotEmpty() }
+			?.let { Base64.UrlSafe.encode(it.toByteArray()) }
 
 		val requestBody = MockingStarRequestBody(
 			method = originalRequest.method,
 			url = originalRequest.url.toString(),
-			headers = originalRequest.headers.toMap(),
-			body = buffer.readString(charset).takeIf { it.isNotEmpty() },
+			header = originalRequest.headers.toMap(),
+			body = bodyString
 		)
 		val json = Json { explicitNulls = false }
 		val requestString = json.encodeToString(requestBody)

diff --git a/mockingstar/src/main/java/com/trendyol/mockingstar/MockingStarRequestBody.kt b/mockingstar/src/main/java/com/trendyol/mockingstar/MockingStarRequestBody.kt
@@ -6,6 +6,6 @@ import kotlinx.serialization.Serializable
 internal class MockingStarRequestBody(
 	val method: String,
 	val url: String,
-	val headers: Map<String, String>,
+	val header: Map<String, String>,
 	val body: String?,
 )