NLIC-2392: Allow custom properties for auto created licensee

* allow custom properties for auto-created licensee

* Allow custom properties for auto-created licensee

Author: v-rudkovskiy

NetLicensingClient/Entities/ValidationParameters.cs

@@ -1,79 +1,91 @@
-using System;
-using System.Collections.Generic;
-
-namespace NetLicensingClient.Entities
-{
-    public class ValidationParameters : IEntity
-    {
-        private String productNumber;
-        private String licenseeName;
-        private String licenseeSecret;
-        private Dictionary<String, Dictionary<String, String>> parameters;
-
-        public void setProductNumber(String productNumber)
-        {
-        	this.productNumber = productNumber;
-        }
-
-        public String getProductNumber ()
-        {
-        	return productNumber;
-        }
-
-        public void setLicenseeName (String licenseeName)
-        {
-            this.licenseeName = licenseeName;
-        }
-
-        public String getLicenseeName ()
-        {
-    	    return licenseeName;
-        }
-
-        [System.Obsolete("setLicenseeSecret() is obsolete, use NodeLocked licensing model instead")]
-        public void setLicenseeSecret (String licenseeSecret)
-        {
-            this.licenseeSecret = licenseeSecret;
-        }
-
-        [System.Obsolete("getLicenseeSecret() is obsolete, use NodeLocked licensing model instead")]
-        public String getLicenseeSecret ()
-        {
-        	return licenseeSecret;
-        }
-
-        public ValidationParameters ()
-        {
-            parameters = new Dictionary<String, Dictionary<String, String>>();
-        }
-
-        public Dictionary<String, Dictionary<String, String>> getParameters()
-        {
-            return parameters;
-        }
-
-        public Dictionary<String, String> getProductModuleValidationParameters(String productModuleNumber) {
-            try
-            {
-                return parameters[productModuleNumber];
-            }
-            catch (KeyNotFoundException)
-            {
-                Dictionary<String, String> productModuleValidationParametes = new Dictionary<String, String> ();
-                parameters.Add(productModuleNumber, productModuleValidationParametes);
-                return productModuleValidationParametes;
-            }
-        }
-
-        internal void setProductModuleValidation(String productModuleNumber, Dictionary<String, String> productModuleValidationParametes)
-        {
-            parameters.Add(productModuleNumber, productModuleValidationParametes);
-        }
-
-        public void put(String productModuleNumber, String key, String value) 
-        {
-            getProductModuleValidationParameters(productModuleNumber).Add(key, value);
-        }
-    }
-}
-
+using System;
+using System.Collections.Generic;
+
+namespace NetLicensingClient.Entities
+{
+    public class ValidationParameters : IEntity
+    {
+        private String productNumber;
+        private Dictionary<String, String> licenseeProperties;
+        private Dictionary<String, Dictionary<String, String>> parameters;
+
+        public void setProductNumber(String productNumber)
+        {
+        	this.productNumber = productNumber;
+        }
+
+        public String getProductNumber ()
+        {
+        	return productNumber;
+        }
+
+        public Dictionary<String, String> getLicenseeProperties() {
+            return licenseeProperties;
+        }
+
+        public void setLicenseeProperty(String key, String value) {
+            licenseeProperties.Add(key, value);
+        }
+
+        public void setLicenseeName (String licenseeName)
+        {
+            setLicenseeProperty(Constants.Licensee.PROP_LICENSEE_NAME, licenseeName);
+        }
+
+        public String getLicenseeName ()
+        {
+            return licenseeProperties.TryGetValue(Constants.Licensee.PROP_LICENSEE_NAME, out string value)
+                ? value
+                : null;
+        }
+
+        [System.Obsolete("setLicenseeSecret() is obsolete, use NodeLocked licensing model instead")]
+        public void setLicenseeSecret (String licenseeSecret)
+        {
+            setLicenseeProperty(Constants.Licensee.PROP_LICENSEE_SECRET, licenseeSecret);
+        }
+
+        [System.Obsolete("getLicenseeSecret() is obsolete, use NodeLocked licensing model instead")]
+        public String getLicenseeSecret ()
+        {
+            return licenseeProperties.TryGetValue(Constants.Licensee.PROP_LICENSEE_SECRET, out string value)
+                ? value
+                : null;
+        }
+
+        public ValidationParameters ()
+        {
+            parameters = new Dictionary<String, Dictionary<String, String>>();
+            licenseeProperties = new Dictionary<String, String>();
+        }
+
+        public Dictionary<String, Dictionary<String, String>> getParameters()
+        {
+            return parameters;
+        }
+
+        public Dictionary<String, String> getProductModuleValidationParameters(String productModuleNumber) {
+            try
+            {
+                return parameters[productModuleNumber];
+            }
+            catch (KeyNotFoundException)
+            {
+                Dictionary<String, String> productModuleValidationParametes = new Dictionary<String, String> ();
+                parameters.Add(productModuleNumber, productModuleValidationParametes);
+                return productModuleValidationParametes;
+            }
+        }
+
+        internal void setProductModuleValidation(String productModuleNumber, Dictionary<String, String> productModuleValidationParametes)
+        {
+            parameters.Add(productModuleNumber, productModuleValidationParametes);
+        }
+
+        public void put(String productModuleNumber, String key, String value) 
+        {
+            getProductModuleValidationParameters(productModuleNumber).Add(key, value);
+        }
+    }
+}
+

NetLicensingClient/LicenseeService.cs

@@ -105,19 +105,15 @@ public static ValidationResult validate(Context context, String number, Validati
             if (!String.IsNullOrEmpty(validationParameters.getProductNumber())) 
             {
                 parameters.Add(Constants.Product.PRODUCT_NUMBER, validationParameters.getProductNumber());
-            }
-            if (!String.IsNullOrEmpty(validationParameters.getLicenseeName())) 
-            {
-                parameters.Add(Constants.Licensee.PROP_LICENSEE_NAME, validationParameters.getLicenseeName());
-            }
-#pragma warning disable 0618
-            // This section is only left to verify backwards compatibility.
-            // Don't use LicenseeSecret, use Node-Locked licensing model instead.
-            if (!String.IsNullOrEmpty(validationParameters.getLicenseeSecret())) 
+            }
+
+            foreach (KeyValuePair<String, String> property in validationParameters.getLicenseeProperties())
             {
-                parameters.Add(Constants.Licensee.PROP_LICENSEE_SECRET, validationParameters.getLicenseeSecret());
+                if (!String.IsNullOrEmpty(property.Key))
+                {
+                    parameters.Add(property.Key, property.Value);
+                }
             }
-#pragma warning restore 0618
 
             int pmIndex = 0;
         	foreach (KeyValuePair<String, Dictionary<String, String>> productModuleValidationParams in validationParameters.getParameters ()) {