Fix query parameter serialization

nylas · Nov 8, 2023 · c1e885b · c1e885b
1 parent 4151b69
commit c1e885b
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 4 deletions.
diff --git a/src/main/kotlin/com/nylas/NylasClient.kt b/src/main/kotlin/com/nylas/NylasClient.kt
@@ -321,7 +321,21 @@ class NylasClient(
 
   private fun addQueryParams(url: HttpUrl.Builder, params: Map<String, Any>): HttpUrl.Builder {
     for ((key, value) in params) {
-      url.addQueryParameter(key, value.toString())
+      when (value) {
+        is List<*> -> {
+          for (item in value) {
+            url.addQueryParameter(key, item.toString())
+          }
+        }
+        is Map<*, *> -> {
+          for ((k, v) in value) {
+            url.addQueryParameter(key, "$k:$v")
+          }
+        }
+        else -> {
+          url.addQueryParameter(key, value.toString())
+        }
+      }
     }
     return url
   }

diff --git a/src/main/kotlin/com/nylas/models/IQueryParams.kt b/src/main/kotlin/com/nylas/models/IQueryParams.kt
@@ -10,7 +10,7 @@ interface IQueryParams {
    * Convert the query parameters to a json-formatted map.
    * @return Map of query parameters
    */
-  fun convertToMap(): Map<String, String> {
+  fun convertToMap(): Map<String, Any> {
     val json = JsonHelper.moshi()
       .adapter(this.javaClass)
       .toJson(this)

diff --git a/src/main/kotlin/com/nylas/util/JsonHelper.kt b/src/main/kotlin/com/nylas/util/JsonHelper.kt
@@ -141,8 +141,8 @@ class JsonHelper {
      * @suppress Not for public use.
      */
     @JvmStatic
-    val jsonMapAdapter = moshi.adapter<Map<String, String>>(
-      mapTypeOf(String::class.java, String::class.java),
+    val jsonMapAdapter = moshi.adapter<Map<String, Any>>(
+      mapTypeOf(String::class.java, Any::class.java),
     ).indent("  ")
 
     /**