updated user agent logic

Author: amitsendinblue

src/sib_api_v3_sdk/Client/ApiClient.cs

@@ -77,7 +77,7 @@ public ApiClient(Configuration config)
         /// <param name="basePath">The base path.</param>
         public ApiClient(String basePath = "https://api.sendinblue.com/v3")
         {
-           if (String.IsNullOrEmpty(basePath))
+            if (String.IsNullOrEmpty(basePath))
                 throw new ArgumentException("basePath cannot be empty");
 
             RestClient = new RestClient(basePath);
@@ -121,23 +121,23 @@ private RestRequest PrepareRequest(
             request.Serializer = null;
 
             // add path parameter, if any
-            foreach(var param in pathParams)
+            foreach (var param in pathParams)
                 request.AddParameter(param.Key, param.Value, ParameterType.UrlSegment);
 
             // add header parameter, if any
-            foreach(var param in headerParams)
+            foreach (var param in headerParams)
                 request.AddHeader(param.Key, param.Value);
 
             // add query parameter, if any
-            foreach(var param in queryParams)
+            foreach (var param in queryParams)
                 request.AddQueryParameter(param.Key, param.Value);
 
             // add form parameter, if any
-            foreach(var param in formParams)
+            foreach (var param in formParams)
                 request.AddParameter(param.Key, param.Value);
 
             // add file parameter, if any
-            foreach(var param in fileParams)
+            foreach (var param in fileParams)
             {
                 request.AddFile(param.Value);
             }
@@ -175,15 +175,18 @@ public Object CallApi(
 
             // set timeout
             RestClient.Timeout = TimeSpan.FromMilliseconds(Configuration.Timeout);
-            
+
             // set user agent
-            RestClient.UserAgent = Configuration.UserAgent.Replace("v#", "v3.1.0");
+            if (!Configuration.UserAgent.ToLower().StartsWith("sendinblue_"))
+                Configuration.UserAgent = "sendinblue_clientAPI/v3.1.0/c#";
+
+            RestClient.UserAgent = Configuration.UserAgent;
 
             InterceptRequest(request);
             var response = RestClient.Execute(request).Result;
             InterceptResponse(request, response);
 
-            return (Object) response;
+            return (Object)response;
         }
         /// <summary>
         /// Makes the asynchronous HTTP request.
@@ -251,13 +254,13 @@ public string ParameterToString(object obj)
                 // Defaults to an ISO 8601, using the known as a Round-trip date/time pattern ("o")
                 // https://msdn.microsoft.com/en-us/library/az4se3k1(v=vs.110).aspx#Anchor_8
                 // For example: 2009-06-15T13:45:30.0000000
-                return ((DateTime)obj).ToString (Configuration.DateTimeFormat);
+                return ((DateTime)obj).ToString(Configuration.DateTimeFormat);
             else if (obj is DateTimeOffset)
                 // Return a formatted date string - Can be customized with Configuration.DateTimeFormat
                 // Defaults to an ISO 8601, using the known as a Round-trip date/time pattern ("o")
                 // https://msdn.microsoft.com/en-us/library/az4se3k1(v=vs.110).aspx#Anchor_8
                 // For example: 2009-06-15T13:45:30.0000000
-                return ((DateTimeOffset)obj).ToString (Configuration.DateTimeFormat);
+                return ((DateTimeOffset)obj).ToString(Configuration.DateTimeFormat);
             else if (obj is IList)
             {
                 var flattenedString = new StringBuilder();
@@ -272,7 +275,7 @@ public string ParameterToString(object obj)
             else if (obj is bool)
                 return ((bool)obj).ToString().ToLower();
             else
-                return Convert.ToString (obj);
+                return Convert.ToString(obj);
         }
 
         /// <summary>
@@ -315,7 +318,7 @@ public object Deserialize(IRestResponse response, Type type)
 
             if (type.Name.StartsWith("System.Nullable`1[[System.DateTime")) // return a datetime object
             {
-                return DateTime.Parse(response.Content,  null, System.Globalization.DateTimeStyles.RoundtripKind);
+                return DateTime.Parse(response.Content, null, System.Globalization.DateTimeStyles.RoundtripKind);
             }
 
             if (type == typeof(String) || type.Name.StartsWith("System.Nullable")) // return primitive type
@@ -434,7 +437,7 @@ public static dynamic ConvertType(dynamic fromObject, Type toObject)
         /// <returns>Byte array</returns>
         public static byte[] ReadAsBytes(Stream inputStream)
         {
-            byte[] buf = new byte[16*1024];
+            byte[] buf = new byte[16 * 1024];
             using (MemoryStream ms = new MemoryStream())
             {
                 int count;

src/sib_api_v3_sdk/Client/Configuration.cs

@@ -57,7 +57,7 @@ public class Configuration : IReadableConfiguration
                     string.Format("Error calling {0}: {1}", methodName, response.Content),
                     response.Content);
             }
-            
+
             return null;
         };
 
@@ -110,7 +110,7 @@ static Configuration()
         /// </summary>
         public Configuration()
         {
-            UserAgent = "sendinblue_clientAPI/v#/c#";
+            UserAgent = "sendinblue_clientAPI/v" + Version + "/c#";
             BasePath = "https://api.sendinblue.com/v3";
             DefaultHeader = new ConcurrentDictionary<string, string>();
             ApiKey = new ConcurrentDictionary<string, string>();
@@ -183,7 +183,7 @@ public Configuration(
             string tempFolderPath = null,
             string dateTimeFormat = null,
             int timeout = 100000,
-            string userAgent = "sendinblue_clientAPI/v#/c#"
+            string userAgent = "sendinblue_clientAPI/v" + Version + "/c#"
             // ReSharper restore UnusedParameter.Local
             )
         {
@@ -223,12 +223,15 @@ public virtual ApiClient ApiClient
         /// <summary>
         /// Gets or sets the base path for API access.
         /// </summary>
-        public virtual string BasePath {
+        public virtual string BasePath
+        {
             get { return _basePath; }
-            set {
+            set
+            {
                 _basePath = value;
                 // pass-through to ApiClient if it's set.
-                if(_apiClient != null) {
+                if (_apiClient != null)
+                {
                     _apiClient.RestClient.BaseUrl = new Uri(_basePath);
                 }
             }
@@ -274,9 +277,9 @@ public virtual int Timeout
         public string GetApiKeyWithPrefix(string apiKeyIdentifier)
         {
             var apiKeyValue = "";
-            ApiKey.TryGetValue (apiKeyIdentifier, out apiKeyValue);
+            ApiKey.TryGetValue(apiKeyIdentifier, out apiKeyValue);
             var apiKeyPrefix = "";
-            if (ApiKeyPrefix.TryGetValue (apiKeyIdentifier, out apiKeyPrefix))
+            if (ApiKeyPrefix.TryGetValue(apiKeyIdentifier, out apiKeyPrefix))
                 return apiKeyPrefix + " " + apiKeyValue;
             else
                 return apiKeyValue;
@@ -416,7 +419,7 @@ public static String ToDebugReport()
             String report = "C# SDK (sib_api_v3_sdk) Debug Report:\n";
             report += "    OS: " + System.Runtime.InteropServices.RuntimeInformation.OSDescription + "\n";
             report += "    Version of the API: 3.0.0\n";
-            report += "    SDK Package Version: 3.1.0\n";
+            report += "    SDK Package Version: " + Version + "\n";
 
             return report;
         }

src/sib_api_v3_sdk/Client/IReadableConfiguration.cs

@@ -70,7 +70,7 @@ public interface IReadableConfiguration
         /// Gets the user agent.
         /// </summary>
         /// <value>User agent.</value>
-        string UserAgent { get; }
+        string UserAgent { get; set; }
 
         /// <summary>
         /// Gets the username.