Merge pull request #75 from CyberSource/dec19-dev

Adding logic for auditing

Author: gnongsie

generator/cybersource-csharp-template/ApiClient.mustache

@@ -266,7 +266,7 @@ namespace {{packageName}}.Client
             RestClient.UserAgent = Configuration.UserAgent;
             
             RestClient.ClearHandlers();
-            
+
             if (Configuration.Proxy != null)
             {
                 RestClient.Proxy = Configuration.Proxy;
@@ -668,6 +668,16 @@ namespace {{packageName}}.Client
                 if (merchantConfig.IsPostRequest || merchantConfig.IsPutRequest || merchantConfig.IsPatchRequest)
                     authenticationHeaders.Add("Digest", httpSign.Digest);
             }
+
+            if (!string.IsNullOrEmpty(Configuration.ClientId))
+            {
+                authenticationHeaders.Add("v-c-client-id", Configuration.ClientId);
+            }
+
+            // if (!string.IsNullOrEmpty(Configuration.SolutionId))
+            // {
+            //     authenticationHeaders.Add("v-c-solution-id", Configuration.SolutionId);
+            // }
 
             if (Configuration.Proxy == null && bool.Parse(merchantConfig.UseProxy))
             {
@@ -691,7 +701,7 @@ namespace {{packageName}}.Client
             if (Configuration.Proxy != null)
             {
                 RestClient.Proxy = Configuration.Proxy;
-            }           
+            }
         }
     }
 }

generator/cybersource-csharp-template/Configuration.mustache

@@ -50,6 +50,13 @@ namespace {{packageName}}.Client
             AccessToken = accessToken;
             UserAgent = userAgent;
 
+            ClientId = GetClientId();
+
+            if (merchConfigDictObj != null)
+            {
+                SolutionId = merchConfigDictObj.ContainsKey("solutionID") ? merchConfigDictObj["solutionID"] : null;
+            }
+
             if (merchConfigDictObj != null)
             {
                 if (bool.Parse(merchConfigDictObj["useProxy"])) {
@@ -80,6 +87,15 @@ namespace {{packageName}}.Client
             MerchantConfigDictionaryObj = merchConfigDictObj;
         }
 
+        private string GetClientId()
+        {
+            var assembly = typeof(Configuration).Assembly;
+
+            var assemblyVersion = AssemblyHelper.GetAssemblyAttribute<AssemblyFileVersionAttribute>(assembly).Version;
+
+            return "cybs-rest-sdk-dotnet-" + assemblyVersion;
+        }
+
         /// <summary>
         /// Initializes a new instance of the Configuration class.
         /// </summary>
@@ -250,6 +266,18 @@ namespace {{packageName}}.Client
         /// <value>The API key.</value>
         public Dictionary<String, String> ApiKey = new Dictionary<String, String>();
 
+        /// <summary>
+        /// Gets or sets the Client ID for SDK auditing and/or reporting.
+        /// </summary>
+        /// <value>The Client ID.</value>
+        public String ClientId { get; set; }
+
+        /// <summary>
+        /// Gets or sets the Solution ID for SDK auditing and/or reporting.
+        /// </summary>
+        /// <value>The Solution ID.</value>
+        public String SolutionId { get; set; }
+
         /// <summary>
         /// Gets or sets the prefix (e.g. Token) of the API key based on the authentication name.
         /// </summary>
@@ -373,4 +401,15 @@ namespace {{packageName}}.Client
             return report;
         }
     }
+
+    public static class AssemblyHelper
+    {
+        public static T GetAssemblyAttribute<T>(this System.Reflection.Assembly ass) where T : Attribute
+        {
+            object[] attributes = ass.GetCustomAttributes(typeof(T), false);
+            if (attributes == null || attributes.Length == 0)
+                return null;
+            return attributes.OfType<T>().SingleOrDefault();
+        }
+    }
 }