impl: extract http client interceptors logic into a reusable utility

The objective is to be able to reuse the interceptors from multiple places.

Author: fioan89

src/main/kotlin/com/coder/toolbox/sdk/CoderHttpClientBuilder.kt

@@ -1,13 +1,10 @@
 package com.coder.toolbox.sdk
 
 import com.coder.toolbox.CoderToolboxContext
-import com.coder.toolbox.sdk.interceptors.LoggingInterceptor
+import com.coder.toolbox.sdk.interceptors.Interceptors
 import com.coder.toolbox.util.CoderHostnameVerifier
 import com.coder.toolbox.util.coderSocketFactory
 import com.coder.toolbox.util.coderTrustManagers
-import com.coder.toolbox.util.getArch
-import com.coder.toolbox.util.getHeaders
-import com.coder.toolbox.util.getOS
 import com.jetbrains.toolbox.api.remoteDev.connection.ProxyAuth
 import okhttp3.Credentials
 import okhttp3.OkHttpClient
@@ -53,36 +50,16 @@ object CoderHttpClientBuilder {
             if (token.isNullOrBlank()) {
                 throw IllegalStateException("Token is required for $url deployment")
             }
-            builder = builder.addInterceptor {
-                it.proceed(
-                    it.request().newBuilder().addHeader("Coder-Session-Token", token).build()
-                )
-            }
+            builder = builder.addInterceptor(Interceptors.tokenAuth(token))
         }
 
         return builder
             .sslSocketFactory(socketFactory, trustManagers[0] as X509TrustManager)
             .hostnameVerifier(CoderHostnameVerifier(settings.tls.altHostname))
             .retryOnConnectionFailure(true)
-            .addInterceptor {
-                it.proceed(
-                    it.request().newBuilder().addHeader(
-                        "User-Agent",
-                        "Coder Toolbox/$pluginVersion (${getOS()}; ${getArch()})",
-                    ).build(),
-                )
-            }
-            .addInterceptor {
-                var request = it.request()
-                val headers = getHeaders(url, settings.headerCommand)
-                if (headers.isNotEmpty()) {
-                    val reqBuilder = request.newBuilder()
-                    headers.forEach { h -> reqBuilder.addHeader(h.key, h.value) }
-                    request = reqBuilder.build()
-                }
-                it.proceed(request)
-            }
-            .addInterceptor(LoggingInterceptor(context))
+            .addInterceptor(Interceptors.userAgent(pluginVersion))
+            .addInterceptor(Interceptors.externalHeaders(context, url))
+            .addInterceptor(Interceptors.logging(context))
             .build()
     }
 }

src/main/kotlin/com/coder/toolbox/sdk/interceptors/Interceptors.kt

@@ -0,0 +1,64 @@
+package com.coder.toolbox.sdk.interceptors
+
+import com.coder.toolbox.CoderToolboxContext
+import com.coder.toolbox.util.getArch
+import com.coder.toolbox.util.getHeaders
+import com.coder.toolbox.util.getOS
+import okhttp3.Interceptor
+import java.net.URL
+
+/**
+ * Factory of okhttp interceptors
+ */
+object Interceptors {
+
+    /**
+     * Creates a token authentication interceptor
+     */
+    fun tokenAuth(token: String): Interceptor {
+        return Interceptor { chain ->
+            chain.proceed(
+                chain.request().newBuilder()
+                    .addHeader("Coder-Session-Token", token)
+                    .build()
+            )
+        }
+    }
+
+    /**
+     * Creates a User-Agent header interceptor
+     */
+    fun userAgent(pluginVersion: String): Interceptor {
+        return Interceptor { chain ->
+            chain.proceed(
+                chain.request().newBuilder()
+                    .addHeader("User-Agent", "Coder Toolbox/$pluginVersion (${getOS()}; ${getArch()})")
+                    .build()
+            )
+        }
+    }
+
+    /**
+     * Adds headers generated by executing a native command
+     */
+    fun externalHeaders(context: CoderToolboxContext, url: URL): Interceptor {
+        val settings = context.settingsStore.readOnly()
+        return Interceptor { chain ->
+            var request = chain.request()
+            val headers = getHeaders(url, settings.headerCommand)
+            if (headers.isNotEmpty()) {
+                val reqBuilder = request.newBuilder()
+                headers.forEach { h -> reqBuilder.addHeader(h.key, h.value) }
+                request = reqBuilder.build()
+            }
+            chain.proceed(request)
+        }
+    }
+
+    /**
+     * Creates a logging interceptor
+     */
+    fun logging(context: CoderToolboxContext): Interceptor {
+        return LoggingInterceptor(context)
+    }
+}