Merge branch '32-attach-utm-parameters-to-all-requests-2' into 'master'

Resolve "Attach Utm Parameters to all requests"

Closes #32

See merge request pace/mobile/android/pace-cloud-sdk!32

Author: Martin Dinh

library/src/main/java/cloud/pace/sdk/PACECloudSDK.kt

@@ -13,6 +13,7 @@ object PACECloudSDK : CloudSDKKoinComponent {
 
     private val sharedPreferencesModel: SharedPreferencesModel by inject()
     internal lateinit var configuration: Configuration
+    var additionalQueryParams: Map<String, String> = mapOf()
 
     /**
      * Sets up [PACECloudSDK] with the passed [configuration].

library/src/main/java/cloud/pace/sdk/api/poi/generated/request/admin/DeduplicatePoiAPI.kt

@@ -20,6 +20,7 @@ import retrofit2.http.*
 import java.util.*
 import cloud.pace.sdk.api.API.toIso8601
 import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory
+import cloud.pace.sdk.poikit.utils.InterceptorUtils
 
 interface DeduplicatePoiService {
 
@@ -28,20 +29,9 @@ interface DeduplicatePoiService {
     ): Call<Void>
 }
 
-
 private val service: DeduplicatePoiService by lazy {
     Retrofit.Builder()
-        .client(OkHttpClient.Builder().addInterceptor {
-            val builder = it.request()
-                .newBuilder()
-                .header("API-Key", API.apiKey)
-
-            API.additionalHeaders.forEach { header ->
-                builder.header(header.key, header.value)
-            }
-
-            it.proceed(builder.build())
-        }.build())
+        .client(OkHttpClient.Builder().addInterceptor(InterceptorUtils.getInterceptor(null, null)).build())
         .baseUrl(API.baseUrl)
             .addConverterFactory(
                 JsonApiConverterFactory.create(

library/src/main/java/cloud/pace/sdk/api/poi/generated/request/admin/MovePoiAtPositionAPI.kt

@@ -20,6 +20,7 @@ import retrofit2.http.*
 import java.util.*
 import cloud.pace.sdk.api.API.toIso8601
 import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory
+import cloud.pace.sdk.poikit.utils.InterceptorUtils
 
 interface MovePoiAtPositionService {
 
@@ -28,20 +29,9 @@ interface MovePoiAtPositionService {
     ): Call<Void>
 }
 
-
 private val service: MovePoiAtPositionService by lazy {
     Retrofit.Builder()
-        .client(OkHttpClient.Builder().addInterceptor {
-            val builder = it.request()
-                .newBuilder()
-                .header("API-Key", API.apiKey)
-
-            API.additionalHeaders.forEach { header ->
-                builder.header(header.key, header.value)
-            }
-
-            it.proceed(builder.build())
-        }.build())
+        .client(OkHttpClient.Builder().addInterceptor(InterceptorUtils.getInterceptor(null, null)).build())
         .baseUrl(API.baseUrl)
             .addConverterFactory(
                 JsonApiConverterFactory.create(

library/src/main/java/cloud/pace/sdk/api/poi/generated/request/apps/CheckForPaceAppAPI.kt

@@ -20,6 +20,7 @@ import retrofit2.http.*
 import java.util.*
 import cloud.pace.sdk.api.API.toIso8601
 import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory
+import cloud.pace.sdk.poikit.utils.InterceptorUtils
 
 interface CheckForPaceAppService {
 
@@ -38,22 +39,9 @@ Please note that calling this API is very cheap and can be done regularly.
     ): Call<LocationBasedAppsWithRefs>
 }
 
-
 private val service: CheckForPaceAppService by lazy {
     Retrofit.Builder()
-        .client(OkHttpClient.Builder().addInterceptor {
-            val builder = it.request()
-                .newBuilder()
-                .header("Accept", "application/vnd.api+json")
-                .header("Content-Type", "application/vnd.api+json")
-                .header("API-Key", API.apiKey)
-
-            API.additionalHeaders.forEach { header ->
-                builder.header(header.key, header.value)
-            }
-
-            it.proceed(builder.build())
-        }.build())
+        .client(OkHttpClient.Builder().addInterceptor(InterceptorUtils.getInterceptor("application/vnd.api+json", "application/vnd.api+json")).build())
         .baseUrl(API.baseUrl)
             .addConverterFactory(
                 JsonApiConverterFactory.create(

library/src/main/java/cloud/pace/sdk/api/poi/generated/request/apps/CreateAppAPI.kt

@@ -20,6 +20,7 @@ import retrofit2.http.*
 import java.util.*
 import cloud.pace.sdk.api.API.toIso8601
 import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory
+import cloud.pace.sdk.poikit.utils.InterceptorUtils
 
 interface CreateAppService {
 
@@ -29,20 +30,9 @@ interface CreateAppService {
     ): Call<LocationBasedApp>
 }
 
-
 private val service: CreateAppService by lazy {
     Retrofit.Builder()
-        .client(OkHttpClient.Builder().addInterceptor {
-            val builder = it.request()
-                .newBuilder()
-                .header("API-Key", API.apiKey)
-
-            API.additionalHeaders.forEach { header ->
-                builder.header(header.key, header.value)
-            }
-
-            it.proceed(builder.build())
-        }.build())
+        .client(OkHttpClient.Builder().addInterceptor(InterceptorUtils.getInterceptor(null, null)).build())
         .baseUrl(API.baseUrl)
             .addConverterFactory(
                 JsonApiConverterFactory.create(

library/src/main/java/cloud/pace/sdk/api/poi/generated/request/apps/DeleteAppAPI.kt

@@ -20,6 +20,7 @@ import retrofit2.http.*
 import java.util.*
 import cloud.pace.sdk.api.API.toIso8601
 import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory
+import cloud.pace.sdk.poikit.utils.InterceptorUtils
 
 interface DeleteAppService {
 
@@ -30,20 +31,9 @@ interface DeleteAppService {
     ): Call<Void>
 }
 
-
 private val service: DeleteAppService by lazy {
     Retrofit.Builder()
-        .client(OkHttpClient.Builder().addInterceptor {
-            val builder = it.request()
-                .newBuilder()
-                .header("API-Key", API.apiKey)
-
-            API.additionalHeaders.forEach { header ->
-                builder.header(header.key, header.value)
-            }
-
-            it.proceed(builder.build())
-        }.build())
+        .client(OkHttpClient.Builder().addInterceptor(InterceptorUtils.getInterceptor(null, null)).build())
         .baseUrl(API.baseUrl)
             .addConverterFactory(
                 JsonApiConverterFactory.create(

library/src/main/java/cloud/pace/sdk/api/poi/generated/request/apps/GetAppAPI.kt

@@ -20,6 +20,7 @@ import retrofit2.http.*
 import java.util.*
 import cloud.pace.sdk.api.API.toIso8601
 import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory
+import cloud.pace.sdk.poikit.utils.InterceptorUtils
 
 interface GetAppService {
 
@@ -32,22 +33,9 @@ In case the query returns a `404` (`Not Found`) the app was deleted and should b
     ): Call<LocationBasedApp>
 }
 
-
 private val service: GetAppService by lazy {
     Retrofit.Builder()
-        .client(OkHttpClient.Builder().addInterceptor {
-            val builder = it.request()
-                .newBuilder()
-                .header("Accept", "application/vnd.api+json")
-                .header("Content-Type", "application/vnd.api+json")
-                .header("API-Key", API.apiKey)
-
-            API.additionalHeaders.forEach { header ->
-                builder.header(header.key, header.value)
-            }
-
-            it.proceed(builder.build())
-        }.build())
+        .client(OkHttpClient.Builder().addInterceptor(InterceptorUtils.getInterceptor("application/vnd.api+json", "application/vnd.api+json")).build())
         .baseUrl(API.baseUrl)
             .addConverterFactory(
                 JsonApiConverterFactory.create(

library/src/main/java/cloud/pace/sdk/api/poi/generated/request/apps/GetAppPOIsRelationshipsAPI.kt

@@ -20,6 +20,7 @@ import retrofit2.http.*
 import java.util.*
 import cloud.pace.sdk.api.API.toIso8601
 import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory
+import cloud.pace.sdk.poikit.utils.InterceptorUtils
 
 interface GetAppPOIsRelationshipsService {
 
@@ -30,22 +31,9 @@ interface GetAppPOIsRelationshipsService {
     ): Call<List<AppPOIsRelationships>>
 }
 
-
 private val service: GetAppPOIsRelationshipsService by lazy {
     Retrofit.Builder()
-        .client(OkHttpClient.Builder().addInterceptor {
-            val builder = it.request()
-                .newBuilder()
-                .header("Accept", "application/vnd.api+json")
-                .header("Content-Type", "application/vnd.api+json")
-                .header("API-Key", API.apiKey)
-
-            API.additionalHeaders.forEach { header ->
-                builder.header(header.key, header.value)
-            }
-
-            it.proceed(builder.build())
-        }.build())
+        .client(OkHttpClient.Builder().addInterceptor(InterceptorUtils.getInterceptor("application/vnd.api+json", "application/vnd.api+json")).build())
         .baseUrl(API.baseUrl)
             .addConverterFactory(
                 JsonApiConverterFactory.create(

library/src/main/java/cloud/pace/sdk/api/poi/generated/request/apps/GetAppRedirectAPI.kt

@@ -20,6 +20,7 @@ import retrofit2.http.*
 import java.util.*
 import cloud.pace.sdk.api.API.toIso8601
 import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory
+import cloud.pace.sdk.poikit.utils.InterceptorUtils
 
 interface GetAppRedirectService {
 
@@ -29,20 +30,9 @@ interface GetAppRedirectService {
     ): Call<Void>
 }
 
-
 private val service: GetAppRedirectService by lazy {
     Retrofit.Builder()
-        .client(OkHttpClient.Builder().addInterceptor {
-            val builder = it.request()
-                .newBuilder()
-                .header("API-Key", API.apiKey)
-
-            API.additionalHeaders.forEach { header ->
-                builder.header(header.key, header.value)
-            }
-
-            it.proceed(builder.build())
-        }.build())
+        .client(OkHttpClient.Builder().addInterceptor(InterceptorUtils.getInterceptor(null, null)).build())
         .baseUrl(API.baseUrl)
             .addConverterFactory(
                 JsonApiConverterFactory.create(

library/src/main/java/cloud/pace/sdk/api/poi/generated/request/apps/GetAppsAPI.kt

@@ -20,6 +20,7 @@ import retrofit2.http.*
 import java.util.*
 import cloud.pace.sdk.api.API.toIso8601
 import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory
+import cloud.pace.sdk.poikit.utils.InterceptorUtils
 
 interface GetAppsService {
 
@@ -35,22 +36,9 @@ interface GetAppsService {
     ): Call<LocationBasedApps>
 }
 
-
 private val service: GetAppsService by lazy {
     Retrofit.Builder()
-        .client(OkHttpClient.Builder().addInterceptor {
-            val builder = it.request()
-                .newBuilder()
-                .header("Accept", "application/vnd.api+json")
-                .header("Content-Type", "application/vnd.api+json")
-                .header("API-Key", API.apiKey)
-
-            API.additionalHeaders.forEach { header ->
-                builder.header(header.key, header.value)
-            }
-
-            it.proceed(builder.build())
-        }.build())
+        .client(OkHttpClient.Builder().addInterceptor(InterceptorUtils.getInterceptor("application/vnd.api+json", "application/vnd.api+json")).build())
         .baseUrl(API.baseUrl)
             .addConverterFactory(
                 JsonApiConverterFactory.create(