ECWID-161269 - add a new modified RequestKind to replace ApiCredentials

Author: ArAkAru

src/main/kotlin/com/ecwid/apiclient/v3/ApiClientHelper.kt

@@ -43,7 +43,8 @@ class ApiClientHelper private constructor(
 	private val credentials: ApiCredentials,
 	private val loggingSettings: LoggingSettings,
 	val httpTransport: HttpTransport,
-	val jsonTransformer: JsonTransformer
+	val jsonTransformer: JsonTransformer,
+	private val requestKind: RequestKind? = null,
 ) {
 
 	private val log = Logger.getLogger(this::class.qualifiedName)
@@ -76,6 +77,22 @@ class ApiClientHelper private constructor(
 		jsonTransformer = jsonTransformerProvider.build(createPolymorphicTypeList())
 	)
 
+	constructor(
+		apiServerDomain: ApiServerDomain,
+		credentials: ApiCredentials,
+		loggingSettings: LoggingSettings,
+		httpTransport: HttpTransport,
+		jsonTransformerProvider: JsonTransformerProvider,
+		requestKind: RequestKind?,
+	) : this(
+		apiServerDomain = apiServerDomain,
+		credentials = credentials,
+		loggingSettings = loggingSettings,
+		httpTransport = httpTransport,
+		jsonTransformer = jsonTransformerProvider.build(createPolymorphicTypeList()),
+		requestKind = requestKind,
+	)
+
 	@PublishedApi
 	internal fun <V> makeRequestInt(request: ApiRequest, responseParser: ResponseParser<V>, responseFieldsOverride: ResponseFields? = null): V {
 		val requestId = generateRequestId()
@@ -260,7 +277,12 @@ class ApiClientHelper private constructor(
 	internal fun RequestInfo.toHttpRequest(requestId: String, responseFieldsOverride: ResponseFields?): HttpRequest {
 		val uri = createApiEndpointUri(pathSegments)
 		val params = if (responseFieldsOverride != null) params.withResponseFieldsParam(responseFieldsOverride) else params
-		val headers = headers.withRequestId(requestId).withCredentials(credentials)
+		val headers = headers.withRequestId(requestId)
+		if (requestKind != null) {
+			headers.withRequestKind(requestKind)
+		} else {
+			headers.withCredentials(credentials)
+		}
 
 		return when (method) {
 			HttpMethod.GET -> HttpRequest.HttpGetRequest(
@@ -302,7 +324,12 @@ class ApiClientHelper private constructor(
 			null,
 			null
 		)
-		val encodedPath = buildBaseEndpointPath(credentials) + "/" + buildEndpointPath(pathSegments)
+
+		val encodedPath = if (requestKind != null) {
+			requestKind.buildBaseEndpointPath() + "/" + buildEndpointPath(pathSegments)
+		} else {
+			buildBaseEndpointPath(credentials) + "/" + buildEndpointPath(pathSegments)
+		}
 		return uri.toString() + encodedPath
 	}
 
@@ -443,6 +470,11 @@ internal fun Map<String, String>.withCredentials(credentials: ApiCredentials) =
 	is ApiAppCredentials -> withAppCredentialsHeaders(credentials)
 }
 
+@PublishedApi
+internal fun Map<String, String>.withRequestKind(requestKind: RequestKind) = toMutableMap().apply {
+	putAll(requestKind.buildHeaders())
+}
+
 internal fun Map<String, String>.withResponseFieldsParam(responseFields: ResponseFields): Map<String, String> {
 	return if (responseFields.isAll()) {
 		this - RESPONSE_FIELDS_PARAM_NAME

src/main/kotlin/com/ecwid/apiclient/v3/config/ApiV3AppRequestKind.kt

@@ -0,0 +1,20 @@
+package com.ecwid.apiclient.v3.config
+
+private const val APP_CLIENT_ID_HEADER_NAME = "X-Ecwid-App-Client-Id"
+private const val APP_CLIENT_SECRET_HEADER_NAME = "X-Ecwid-App-Secret-Key"
+
+class ApiV3AppRequestKind(
+	private val clientId: String,
+	private val clientSecret: String,
+) : RequestKind() {
+	override fun buildBaseEndpointPath(): String {
+		return "/api/v3"
+	}
+
+	override fun buildHeaders(): Map<String, String> {
+		return mapOf(
+			APP_CLIENT_ID_HEADER_NAME to clientId,
+			APP_CLIENT_SECRET_HEADER_NAME to clientSecret
+		)
+	}
+}

src/main/kotlin/com/ecwid/apiclient/v3/config/ApiV3InstantSiteRequestKind.kt

@@ -0,0 +1,14 @@
+package com.ecwid.apiclient.v3.config
+
+class ApiV3InstantSiteRequestKind(
+	private val storeId: Long,
+	private val apiToken: String,
+) : RequestKind() {
+	override fun buildBaseEndpointPath(): String {
+		return "/instantsite/api/v1/$storeId"
+	}
+
+	override fun buildHeaders(): Map<String, String> {
+		return mapOf("Authorization" to "Bearer $apiToken")
+	}
+}

src/main/kotlin/com/ecwid/apiclient/v3/config/ApiV3StoreRequestKind.kt

@@ -0,0 +1,14 @@
+package com.ecwid.apiclient.v3.config
+
+class ApiV3StoreRequestKind(
+	private val storeId: Long,
+	private val apiToken: String,
+) : RequestKind() {
+	override fun buildBaseEndpointPath(): String {
+		return "/api/v3/$storeId"
+	}
+
+	override fun buildHeaders(): Map<String, String> {
+		return mapOf("Authorization" to "Bearer $apiToken")
+	}
+}

src/main/kotlin/com/ecwid/apiclient/v3/config/RequestKind.kt

@@ -0,0 +1,6 @@
+package com.ecwid.apiclient.v3.config
+
+abstract class RequestKind {
+	abstract fun buildBaseEndpointPath(): String
+	abstract fun buildHeaders(): Map<String, String>
+}