Added Credentials support for client mode.

Author: Robert Winkler

kotlin-wot-binding-http/src/main/kotlin/http/HttpProtocolClient.kt

@@ -1,14 +1,10 @@
 package ai.ancf.lmos.wot.binding.http
 
 import ai.ancf.lmos.wot.content.Content
-import ai.ancf.lmos.wot.security.BasicSecurityScheme
-import ai.ancf.lmos.wot.security.BearerSecurityScheme
-import ai.ancf.lmos.wot.security.NoSecurityScheme
-import ai.ancf.lmos.wot.security.SecurityScheme
-import ai.ancf.lmos.wot.thing.form.Form
+import ai.ancf.lmos.wot.credentials.CredentialsProvider
+import ai.ancf.lmos.wot.thing.schema.WoTForm
 import ai.anfc.lmos.wot.binding.ProtocolClient
 import ai.anfc.lmos.wot.binding.ProtocolClientException
-import http.HttpClientConfig
 import io.ktor.client.*
 import io.ktor.client.engine.*
 import io.ktor.client.engine.cio.*
@@ -21,31 +17,29 @@ import kotlinx.coroutines.flow.flow
 import kotlinx.coroutines.flow.flowOn
 import org.slf4j.LoggerFactory
 import java.time.Duration
-import java.util.*
 
 /**
  * Allows consuming Things via HTTP.
  */
 class HttpProtocolClient(
-    private val httpClientConfig: HttpClientConfig? = null,
     private val client: HttpClient = createHttpClient()
 ) : ProtocolClient {
 
-    private var authorization: String? = null
+    private var credentialsProvider: CredentialsProvider? = null
 
-    override suspend fun readResource(form: Form):Content {
+    override suspend fun readResource(form: WoTForm):Content {
         return resolveRequestToContent(form, HttpMethod.Get)
     }
 
-    override suspend fun writeResource(form: Form, content: Content) {
+    override suspend fun writeResource(form: WoTForm, content: Content) {
         resolveRequestToContent(form, HttpMethod.Put, content)
     }
 
-    override suspend fun invokeResource(form: Form, content: Content?): Content {
+    override suspend fun invokeResource(form: WoTForm, content: Content?): Content {
         return resolveRequestToContent(form, HttpMethod.Post, content)
     }
 
-    override suspend fun subscribeResource(form: Form) = flow {
+    override suspend fun subscribeResource(form: WoTForm) = flow {
         // Long-polling logic using Ktor client
         while (true) {
             try {
@@ -68,36 +62,11 @@ class HttpProtocolClient(
         TODO("Not yet implemented")
     }
 
-    override fun setSecurity(metadata: List<SecurityScheme>, credentials: Map<String, String>): Boolean {
-        if (metadata.isEmpty()) {
-            log.warn("HttpClient without security")
-            return false
-        }
-
-        return when (val security = metadata.firstOrNull()) {
-            is BasicSecurityScheme -> {
-                val credentialsMap = credentials
-                val username = credentialsMap["username"]
-                val password = credentialsMap["password"]
-                val basicAuth = Base64.getEncoder().encodeToString("$username:$password".toByteArray())
-                authorization = "Basic $basicAuth"
-                true
-            }
-            is BearerSecurityScheme -> {
-                val credentialsMap = credentials
-                val token = credentialsMap["token"]
-                authorization = "Bearer $token"
-                true
-            }
-            is NoSecurityScheme -> true
-            else -> {
-                log.error("HttpClient cannot set security scheme '{}'", security)
-                false
-            }
-        }
+    override fun setCredentialsProvider(credentialsProvider: CredentialsProvider){
+        this.credentialsProvider = credentialsProvider
     }
 
-    private suspend fun resolveRequestToContent(form: Form, method: HttpMethod, content: Content? = null): Content {
+    private suspend fun resolveRequestToContent(form: WoTForm, method: HttpMethod, content: Content? = null): Content {
         return try {
             val response: HttpResponse = client.request(form.href) {
                 headers {
@@ -106,11 +75,11 @@ class HttpProtocolClient(
                 this.method = method
                 content?.let {
                     headers {
-                        append(HttpHeaders.ContentType, it.type )
+                        append(HttpHeaders.ContentType, form.contentType )
                     }
                     setBody(it.body)
                 }
-                authorization?.let { headers.append(HttpHeaders.Authorization, it) }
+                credentialsProvider?.getCredentials(form).let { headers.append(HttpHeaders.Authorization, it.toString()) }
             }
             checkResponse(response)
         } catch (e: Exception) {

kotlin-wot-binding-http/src/main/kotlin/http/HttpProtocolClientFactory.kt

@@ -1,19 +1,17 @@
 package ai.ancf.lmos.wot.binding.http
 
+import ai.anfc.lmos.wot.binding.ProtocolClient
 import ai.anfc.lmos.wot.binding.ProtocolClientFactory
-import http.HttpClientConfig
 
 /**
  * Creates new [HttpProtocolClient] instances.
  */
-open class HttpProtocolClientFactory(private val httpClientConfig: HttpClientConfig? = null) : ProtocolClientFactory {
+open class HttpProtocolClientFactory() : ProtocolClientFactory {
     override fun toString(): String {
         return "HttpClient"
     }
     override val scheme: String
         get() = "http"
-    override val client: HttpProtocolClient
-        get() = HttpProtocolClient(httpClientConfig)
 
     override suspend fun init() {
        // TODO
@@ -22,4 +20,6 @@ open class HttpProtocolClientFactory(private val httpClientConfig: HttpClientCon
     override suspend fun destroy() {
         // TODO
     }
+
+    override fun createClient(): ProtocolClient = HttpProtocolClient()
 }

kotlin-wot-binding-http/src/main/kotlin/http/routes/AbstractInteractionRoute.kt

@@ -12,6 +12,6 @@ class HttpProtocolClientFactoryTest {
 
     @Test
     fun getClient() {
-        assertIs<HttpProtocolClient>( HttpProtocolClientFactory().client)
+        assertIs<HttpProtocolClient>( HttpProtocolClientFactory().createClient())
     }
 }

kotlin-wot-binding-http/src/test/kotlin/http/HttpProtocolClientFactoryTest.kt

@@ -44,7 +44,7 @@ class HttpProtocolClientTest {
             statusCode = 200
         }
 
-        every { form.href } returns "${wiremock.baseUrl()}/foo"
+        val form = Form("${wiremock.baseUrl()}/foo")
 
         val client = HttpProtocolClient()
         client.readResource(form)
@@ -64,7 +64,7 @@ class HttpProtocolClientTest {
             statusCode = 200
         }
 
-        every { form.href } returns "${wiremock.baseUrl()}/foo"
+        val form = Form("${wiremock.baseUrl()}/foo")
         val jsonContent = """{"key": "value"}"""
         val content = Content("application/json", jsonContent.toByteArray())
 
@@ -86,7 +86,7 @@ class HttpProtocolClientTest {
             statusCode = 200
         }
 
-        every { form.href } returns "${wiremock.baseUrl()}/foo"
+        val form = Form("${wiremock.baseUrl()}/foo")
         val jsonContent = """{"key": "value"}"""
         val content = Content("application/json", jsonContent.toByteArray())
 
@@ -114,48 +114,6 @@ class HttpProtocolClientTest {
 
     }
 
-    @Test
-    fun setSecurityHandlesBasicSecurityScheme() {
-        val client = HttpProtocolClient()
-        val credentials = mapOf("username" to "user", "password" to "pass")
-        val securityScheme = BasicSecurityScheme()
-
-        val result = client.setSecurity(listOf(securityScheme), credentials)
-
-        assert(result)
-    }
-
-    @Test
-    fun setSecurityHandlesBearerSecurityScheme() {
-        val client = HttpProtocolClient()
-        val credentials = mapOf("token" to "token123")
-        val securityScheme = BearerSecurityScheme()
-
-        val result = client.setSecurity(listOf(securityScheme), credentials)
-
-        assert(result)
-    }
-
-    @Test
-    fun setSecurityHandlesNoSecurityScheme() {
-        val client = HttpProtocolClient()
-        val securityScheme = NoSecurityScheme()
-
-        val result = client.setSecurity(listOf(securityScheme), emptyMap())
-
-        assert(result)
-    }
-
-    @Test
-    fun setSecurityThrowsExceptionForUnknownScheme() {
-        val client = HttpProtocolClient()
-        val securityScheme = mockk<SecurityScheme>()
-
-        val result = client.setSecurity(listOf(securityScheme), emptyMap())
-
-        assert(!result)
-    }
-
     @Test
     fun resolveRequestToContentThrowsExceptionForInvalidResponse() = runTest {
         wiremock.get {

kotlin-wot-binding-http/src/test/kotlin/http/HttpProtocolClientTest.kt

@@ -13,6 +13,6 @@ class HttpsProtocolClientFactoryTest {
 
     @Test
     fun getClient() {
-        assertIs<HttpProtocolClient>( HttpsProtocolClientFactory().client)
+        assertIs<HttpProtocolClient>( HttpsProtocolClientFactory().createClient())
     }
 }

kotlin-wot-binding-http/src/test/kotlin/http/HttpsProtocolClientFactoryTest.kt

@@ -1,7 +1,8 @@
 package ai.ancf.lmos.wot.binding.mqtt
 
 import ai.ancf.lmos.wot.content.Content
-import ai.ancf.lmos.wot.thing.form.Form
+import ai.ancf.lmos.wot.credentials.CredentialsProvider
+import ai.ancf.lmos.wot.thing.schema.WoTForm
 import ai.anfc.lmos.wot.binding.ProtocolClient
 import ai.anfc.lmos.wot.binding.ProtocolClientException
 import com.hivemq.client.mqtt.datatypes.MqttQos
@@ -32,7 +33,7 @@ class MqttProtocolClient(
 
     private val topicChannels = ConcurrentHashMap<String, Channel<Content>>()
 
-    override suspend fun invokeResource(form: Form, content: Content?): Content {
+    override suspend fun invokeResource(form: WoTForm, content: Content?): Content {
         val topic = try {
             URI(form.href).path.substring(1)
         } catch (e: URISyntaxException) {
@@ -41,7 +42,7 @@ class MqttProtocolClient(
         return requestReply(form, content, topic)
     }
 
-    override suspend fun subscribeResource(form: Form): Flow<Content> {
+    override suspend fun subscribeResource(form: WoTForm): Flow<Content> {
         val topic = try {
             URI(form.href).path.substring(1)
         }
@@ -51,7 +52,7 @@ class MqttProtocolClient(
         return subscribeToTopic(form, topic)
     }
 
-    override suspend fun unlinkResource(form: Form) {
+    override suspend fun unlinkResource(form: WoTForm) {
         val topic = try {
             URI(form.href).path.substring(1)
         }
@@ -95,7 +96,7 @@ class MqttProtocolClient(
     }
 
     // Function to observe a topic using HiveMQ Mqtt5AsyncClient
-    private suspend fun subscribeToTopic(form: Form, topic: String): Flow<Content> {
+    private suspend fun subscribeToTopic(form: WoTForm, topic: String): Flow<Content> {
         log.debug("MqttClient connected to broker at '{}:{}' subscribing to topic '{}'", client.config.serverHost, client.config.serverPort, topic)
 
         // Create a channel for the topic
@@ -141,7 +142,7 @@ class MqttProtocolClient(
 
 
     // Function to publish content to a topic and return a response
-    private suspend fun requestReply(form: Form, content: Content?, topic: String): Content {
+    private suspend fun requestReply(form: WoTForm, content: Content?, topic: String): Content {
         // Generate a unique response topic for this request
         val responseTopic = "${topic}/reply/${UUID.randomUUID()}"
 
@@ -209,8 +210,11 @@ class MqttProtocolClient(
         }
     }
 
+    override fun setCredentialsProvider(credentialsProvider: CredentialsProvider) {
+    }
+
     // Function to read the resource using the request-reply pattern
-    override suspend fun readResource(form: Form): Content {
+    override suspend fun readResource(form: WoTForm): Content {
         // Extract the content type from the form or use a default if not provided
 
         // Extract the topic from the URI
@@ -227,7 +231,7 @@ class MqttProtocolClient(
     }
 
     // Function to write the resource using the request-reply pattern
-    override suspend fun writeResource(form: Form, content: Content) {
+    override suspend fun writeResource(form: WoTForm, content: Content) {
         // Extract the topic from the URI
         val requestUri = URI(form.href)
         val topic = requestUri.path.removePrefix("/") // Removing leading "/"