Merge pull request #7 from pepijntb/feature/add_api_key

Adds ApiKey to configuration and headers.

Author: Daeda88

sdk/src/main/java/com/jedlix/sdk/JedlixSDK.kt

@@ -31,7 +31,8 @@ import java.util.concurrent.atomic.AtomicReference
 class JedlixSDK private constructor(
     private val apiHost: String = "",
     private val apiBasePath: String = "",
-    private val authentication: Authentication
+    private val authentication: Authentication,
+    private val apiKey: String? = null,
 ) {
 
     /**
@@ -63,15 +64,17 @@ class JedlixSDK private constructor(
          */
         fun configure(
             baseURL: URL,
-            authentication: Authentication
+            authentication: Authentication,
+            apiKey: String? = null,
         ): JedlixSDK {
             if (
                 !sdk.compareAndSet(
                     null,
                     JedlixSDK(
-                        baseURL.host,
-                        baseURL.path.substringBefore(EndpointBuilder().path),
-                        authentication
+                        apiHost = baseURL.host,
+                        apiBasePath = baseURL.path.substringBefore(EndpointBuilder().path),
+                        authentication = authentication,
+                        apiKey = apiKey,
                     )
                 )
             ) {
@@ -100,9 +103,10 @@ class JedlixSDK private constructor(
         val api: Api
             get() = sdk.get()!!.run {
                 KtorApi(
-                    apiHost,
-                    apiBasePath,
-                    authentication
+                    apiHost = apiHost,
+                    basePath = apiBasePath,
+                    authentication = authentication,
+                    apiKey = apiKey,
                 )
             }
 

sdk/src/main/java/com/jedlix/sdk/networking/Api.kt

@@ -31,6 +31,7 @@ abstract class Api {
         private const val HEADER_CORRELATION_ID = "Jedlix-CorrelationId"
         private const val HEADER_ACCEPT_LANGUAGE = "Accept-Language"
         private const val HEADER_AUTHORIZATION = "Authorization"
+        private const val HEADER_API_KEY = "ApiKey"
 
         private const val AUTHORIZATION_FORMAT = "Bearer %s"
 
@@ -79,12 +80,14 @@ abstract class Api {
     protected abstract val apiHost: String
     protected abstract val basePath: String
     protected abstract val authentication: Authentication
+    protected abstract val apiKey: String?
 
     protected suspend fun headers(): Map<String, String> = mapOf(
         HEADER_CORRELATION_ID to UUID.randomUUID().toString(),
         HEADER_AUTHORIZATION to authentication.getAccessToken()
             ?.let { AUTHORIZATION_FORMAT.format(it) },
-        HEADER_ACCEPT_LANGUAGE to Locale.getDefault().toLanguageTag()
+        HEADER_ACCEPT_LANGUAGE to Locale.getDefault().toLanguageTag(),
+        HEADER_API_KEY to apiKey,
     )
         .mapNotNull { (key, value) -> value?.let { key to it } }
         .toMap()

sdk/src/main/java/com/jedlix/sdk/networking/KtorApi.kt

@@ -25,17 +25,16 @@ import io.ktor.client.features.json.serializer.*
 import io.ktor.client.features.logging.*
 import io.ktor.client.request.*
 import io.ktor.client.statement.*
-import io.ktor.client.utils.*
 import io.ktor.http.*
-import io.ktor.util.*
 import io.ktor.utils.io.errors.*
 import kotlinx.serialization.SerializationException
 import kotlinx.serialization.builtins.serializer
 
 internal class KtorApi(
     override val apiHost: String,
     override val basePath: String,
-    override val authentication: Authentication
+    override val authentication: Authentication,
+    override val apiKey: String?,
 ) : Api() {
 
     private val json = kotlinx.serialization.json.Json {