Added fix for MTM-37025

SoftwareAG · Feb 25, 2021 · e0fce46 · e0fce46
1 parent 2d20204
commit e0fce46
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 2 deletions.
diff --git a/MQTT-SDK/src/Cumulocity.SDK.MQTT/Model/MqttTopics.cs b/MQTT-SDK/src/Cumulocity.SDK.MQTT/Model/MqttTopics.cs
@@ -38,6 +38,12 @@ public class MqttTopics
         // smartrest downlink template creation
         public const string BASE_SMARTREST_TEMPLATE_CREATION_SUBSCRIBE = "s/dt";
 
+        // uplink device credentials
+        public const string BASE_DEVICE_CREDENTIALS_PUBLISH = "s/ucr";
+
+        // downlink device credentials
+        public const string BASE_DEVICE_CREDENTIALS_SUBSCRIBE = "s/dcr";
+
         // JSON via MQTT
         public static readonly List<string> BASE_JSON_via_MQTT_TEMPLATE_ENDPOINTS = new List<string>() { "event/events", "alarm/alarms", "measurement/measurements", "inventory/managedObjects", "error" };
     }

diff --git a/MQTT-SDK/src/Cumulocity.SDK.MQTT/Util/MqttTopicValidator.cs b/MQTT-SDK/src/Cumulocity.SDK.MQTT/Util/MqttTopicValidator.cs
@@ -16,7 +16,7 @@ public static bool IsTopicValidForPublish(string topic)
                 return false;
             }
 
-            return IsSmartRestStaticPublishTopic(topic) || IsSmartRestLegacyPublishTopic(topic) || IsSmartRestPublishTopic(topic) || IsSmartRestTemplateCreationPublishTopic(topic) || IsJsonViaMqttTopic(topic);
+            return IsSmartRestStaticPublishTopic(topic) || IsSmartRestLegacyPublishTopic(topic) || IsSmartRestPublishTopic(topic) || IsSmartRestTemplateCreationPublishTopic(topic) || IsJsonViaMqttTopic(topic) || IsDeviceCredentialsPublishTopic(topic);
         }
 
 
@@ -27,7 +27,7 @@ public static bool IsTopicValidForSubscribe(string topic)
                 return false;
             }
 
-            return IsSmartRestExceptionsTopic(topic) || IsSmartRestStaticSubscribeTopic(topic) || IsSmartRestLegacySubscribeTopic(topic) || IsSmartRestSubscribeTopic(topic) || IsSmartRestTemplateCreationSubscribeTopic(topic) || IsSmartRestLegacyOperationsTopic(topic) || IsJsonViaMqttTopic(topic);
+            return IsSmartRestExceptionsTopic(topic) || IsSmartRestStaticSubscribeTopic(topic) || IsSmartRestLegacySubscribeTopic(topic) || IsSmartRestSubscribeTopic(topic) || IsSmartRestTemplateCreationSubscribeTopic(topic) || IsSmartRestLegacyOperationsTopic(topic) || IsJsonViaMqttTopic(topic) || IsDeviceCredentialsSubscribeTopic(topic);
         }
 
 
@@ -81,6 +81,16 @@ private static bool IsSmartRestTemplateCreationSubscribeTopic(string topic)
             return topic.Contains(MqttTopics.BASE_SMARTREST_TEMPLATE_CREATION_SUBSCRIBE);
         }
 
+        private static bool IsDeviceCredentialsPublishTopic(string topic)
+        {
+            return topic.Contains(MqttTopics.BASE_DEVICE_CREDENTIALS_PUBLISH);
+        }
+
+        private static bool IsDeviceCredentialsSubscribeTopic(string topic)
+        {
+            return topic.Contains(MqttTopics.BASE_DEVICE_CREDENTIALS_SUBSCRIBE);
+        }
+
         private static bool IsJsonViaMqttTopic(string topic)
         {
             return MqttTopics.BASE_JSON_via_MQTT_TEMPLATE_ENDPOINTS.Any(l => topic.Contains(l));