Merge pull request #8 from Keyfactor/customfields

Fix for sending custom field values to API

Author: dgaley

CHANGELOG.md

@@ -1,2 +1,6 @@
-1.0.0
-Inital Release.  Support for Enroll, Sync, and Revocation. 
+1.0.0  
+Inital Release.  Support for Enroll, Sync, and Revocation. 
+
+1.0.1  
+Bugfix - sync records with null serial    
+Bugfix - Fix for custom fields in enrollment  

sectigo-scm-caplugin/Models/CustomField.cs

@@ -1,4 +1,6 @@
-using System;
+using Newtonsoft.Json;
+
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
@@ -12,6 +14,7 @@ public class CustomField
 
 		public string value { get; set; }
 
+		[JsonIgnore]
 		public bool mandatory { get; set; }
 	}
 }

sectigo-scm-caplugin/SectigoCAPlugin.cs

@@ -90,16 +90,30 @@ public async Task<EnrollmentResult> Enroll(string csr, string subject, Dictionar
 				}
 				var client = SectigoClient.InitializeClient(_config);
 				var fieldList = Task.Run(async () => await client.ListCustomFields()).Result;
-				var mandatoryFields = fieldList.CustomFields?.Where(f => f.mandatory);
+				var allFields = fieldList.CustomFields?.Select(f => f);
 
-				_logger.LogDebug("Check for mandatory custom fields");
-				foreach (CustomField reqField in mandatoryFields)
+				_logger.LogDebug("Check for custom fields");
+				List<CustomField> customFields = new List<CustomField>();
+				foreach (CustomField field in allFields)
 				{
-					_logger.LogTrace($"Checking product parameters for {reqField.name}");
-					if (!productInfo.ProductParameters.ContainsKey(reqField.name))
+					_logger.LogTrace($"Checking product parameters for {field.name}");
+					if (productInfo.ProductParameters.ContainsKey(field.name) && !string.IsNullOrEmpty(productInfo.ProductParameters[field.name]))
 					{
-						_logger.MethodExit(LogLevel.Debug);
-						throw new Exception($"Template {productInfo.ProductID} or Enrollment Fields do not contain a mandatory custom field value for of {reqField.name}");
+						var value = productInfo.ProductParameters[field.name];
+						_logger.LogDebug($"Found value for custom field {field.name}: {value}");
+						customFields.Add(new CustomField() { name = field.name, value = value });
+					}
+					else
+					{
+						if (field.mandatory)
+						{
+							_logger.MethodExit(LogLevel.Debug);
+							throw new Exception($"Custom field {field.name} is mandatory, but no value provided by template {productInfo.ProductID} or Enrollment Fields");
+						}
+						else
+						{
+							_logger.LogDebug($"No value found for custom field {field.name}, but it is not mandatory.");
+						}
 					}
 				}
 				_logger.LogDebug($"Search for Organization by Name {orgStr}");
@@ -207,7 +221,8 @@ public async Task<EnrollmentResult> Enroll(string csr, string subject, Dictionar
 							numberServers = 1,
 							serverType = -1,
 							subjAltNames = sanList,//,
-							comments = comment
+							comments = comment,
+							customFields = customFields
 						};
 
 						_logger.LogDebug($"Submit {enrollmentType} request");