From 2de77bde26ccae5b4ff904294d477d14ddeaa5ae Mon Sep 17 00:00:00 2001
From: dominiquekleeven <10584854+dominiquekleeven@users.noreply.github.com>
Date: Wed, 20 May 2026 10:34:30 +0200
Subject: [PATCH] Add properties field to ORConfigChannelProtocol

---
 .../orlib/service/espprovision/DeviceConnection.kt          | 6 ++++--
 .../orlib/service/espprovision/ORConfigChannel.kt           | 4 +++-
 protobuf/src/main/proto/ORConfigChannelProtocol.proto       | 1 +
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/ORLib/src/main/java/io/openremote/orlib/service/espprovision/DeviceConnection.kt b/ORLib/src/main/java/io/openremote/orlib/service/espprovision/DeviceConnection.kt
index d137a4f..48a1bc3 100644
--- a/ORLib/src/main/java/io/openremote/orlib/service/espprovision/DeviceConnection.kt
+++ b/ORLib/src/main/java/io/openremote/orlib/service/espprovision/DeviceConnection.kt
@@ -101,7 +101,8 @@ class DeviceConnection(val deviceRegistry: DeviceRegistry, var callbackChannel:
         mqttBrokerUrl: String,
         mqttUser: String,
         mqttPassword: String,
-        assetId: String
+        assetId: String,
+        properties: Map<String, String> = emptyMap()
     ) {
         if (!isConnected) {
             throw ESPProviderException(
@@ -114,7 +115,8 @@ class DeviceConnection(val deviceRegistry: DeviceRegistry, var callbackChannel:
                 mqttBrokerUrl = mqttBrokerUrl,
                 mqttUser = mqttUser,
                 mqttPassword = mqttPassword,
-                assetId = assetId
+                assetId = assetId,
+                properties = properties
             )
         } catch (e: Exception) {
             throw ESPProviderException(
diff --git a/ORLib/src/main/java/io/openremote/orlib/service/espprovision/ORConfigChannel.kt b/ORLib/src/main/java/io/openremote/orlib/service/espprovision/ORConfigChannel.kt
index 3938fd2..47f4817 100644
--- a/ORLib/src/main/java/io/openremote/orlib/service/espprovision/ORConfigChannel.kt
+++ b/ORLib/src/main/java/io/openremote/orlib/service/espprovision/ORConfigChannel.kt
@@ -47,7 +47,8 @@ class ORConfigChannel(private val device: ESPDevice) {
         mqttUser: String,
         mqttPassword: String,
         realm: String = "master",
-        assetId: String
+        assetId: String,
+        properties: Map<String, String> = emptyMap()
     ) {
         val config = Request.OpenRemoteConfig.newBuilder()
             .setMqttBrokerUrl(mqttBrokerUrl)
@@ -55,6 +56,7 @@ class ORConfigChannel(private val device: ESPDevice) {
             .setMqttPassword(mqttPassword)
             .setAssetId(assetId)
             .setRealm(realm)
+            .putAllProperties(properties)
             .build()
 
         val request = Request.newBuilder()
diff --git a/protobuf/src/main/proto/ORConfigChannelProtocol.proto b/protobuf/src/main/proto/ORConfigChannelProtocol.proto
index f2168a5..9718210 100644
--- a/protobuf/src/main/proto/ORConfigChannelProtocol.proto
+++ b/protobuf/src/main/proto/ORConfigChannelProtocol.proto
@@ -72,6 +72,7 @@ message Request {
         string mqtt_password = 3;
         string realm = 4;
         string asset_id = 5;
+        map<string, string> properties = 6;
     }
     message ExitProvisioning {};
     string id = 1;