fixed minor registration error

essentials-framework/Essentials Core/PepperDashEssentialsBase/Extensions/JsonExtensions.cs

@@ -0,0 +1,42 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Crestron.SimplSharp;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+
+namespace PepperDash.Essentials.Core
+{
+    public static class JsonExtensions
+    {
+        public static List<JToken> FindTokens(this JToken containerToken, string name)
+        {
+            List<JToken> matches = new List<JToken>();
+            FindTokens(containerToken, name, matches);
+            return matches;
+        }
+
+        private static void FindTokens(JToken containerToken, string name, List<JToken> matches)
+        {
+            if (containerToken.Type == JTokenType.Object)
+            {
+                foreach (JProperty child in containerToken.Children<JProperty>())
+                {
+                    if (child.Name == name)
+                    {
+                        matches.Add(child.Value);
+                    }
+                    FindTokens(child.Value, name, matches);
+                }
+            }
+            else if (containerToken.Type == JTokenType.Array)
+            {
+                foreach (JToken child in containerToken.Children())
+                {
+                    FindTokens(child, name, matches);
+                }
+            }
+        }
+    }
+}

essentials-framework/Essentials Core/PepperDashEssentialsBase/Factory/DeviceFactory.cs

@@ -105,15 +105,20 @@ namespace PepperDash.Essentials.Core
 		        var name = localDc.Name;
 		        var type = localDc.Type;
                 var properties = localDc.Properties;
-
+		        //var propRecurse = properties;
-
 
 		        var typeName = localDc.Type.ToLower();
 
                 Debug.Console(2, "typeName = {0}", typeName);
 		        // Check for types that have been added by plugin dlls. 
-		        if (FactoryMethods.ContainsKey(typeName))
+		        if (!FactoryMethods.ContainsKey(typeName)) return null;
+
+                /*foreach (var obj in (propRecurse as JObject).FindTokens("secret").OfType<JObject>())
                 {
+                    Debug.Console(2, obj.ToString());
+                }*/
+
+
                 //look for secret in username
 		        var userSecretToken = properties["control"]["tcpSshProperties"]["username"]["secret"];
 
@@ -163,8 +168,6 @@ namespace PepperDash.Essentials.Core
 
 		        return FactoryMethods[typeName].FactoryMethod(localDc);
 		    }
-		        return null;
-		    }
 		    catch (Exception ex)
 		    {
 		        Debug.Console(2, "Issue with getting device - {0}", ex.Message);

essentials-framework/Essentials Core/PepperDashEssentialsBase/PepperDash_Essentials_Core.csproj

@@ -209,6 +209,7 @@
     <Compile Include="DeviceTypeInterfaces\IHasFarEndContentStatus.cs" />
     <Compile Include="DeviceTypeInterfaces\IHasPhoneDialing.cs" />
     <Compile Include="DeviceTypeInterfaces\IMobileControl.cs" />
+    <Compile Include="Extensions\JsonExtensions.cs" />
     <Compile Include="Factory\DeviceFactory.cs" />
     <Compile Include="Factory\IDeviceFactory.cs" />
     <Compile Include="Factory\ReadyEventArgs.cs" />