Switched from ApiKey as query parameter to bearer token in HTTP header (for V5 API only).

Author: Dmitry Koval

route4me-csharp-sdk/Route4MeSDKLibrary/HttpClientHolderManager.cs

@@ -24,7 +24,7 @@ static HttpClientHolderManager()
             new SequentialTimer(OnTimerCallback, TimeSpan.FromHours(2));
         }
 
-        public static HttpClientHolder AcquireHttpClientHolder(string baseAddress)
+        public static HttpClientHolder AcquireHttpClientHolder(string baseAddress, string apiKey = null)
         {
             lock (SyncRoot)
             {
@@ -37,7 +37,7 @@ public static HttpClientHolder AcquireHttpClientHolder(string baseAddress)
                 }
                 else
                 {
-                    wrapper = new HttpClientWrapper(CreateHttpClient(baseAddress));
+                    wrapper = new HttpClientWrapper(CreateHttpClient(baseAddress, apiKey));
                     HttpClientWrappers.Add(baseAddress, wrapper);
                 }
 
@@ -57,13 +57,17 @@ public static void ReleaseHttpClientHolder(string baseAddress)
             }
         }
 
-        private static HttpClient CreateHttpClient(string baseAddress)
+        private static HttpClient CreateHttpClient(string baseAddress, string apiKey = null)
         {
             var result = new HttpClient {BaseAddress = new Uri(baseAddress), Timeout = TimeSpan.FromMinutes(30)};
 
             result.DefaultRequestHeaders.Accept.Clear();
             result.DefaultRequestHeaders.ConnectionClose = false;
             result.DefaultRequestHeaders.Accept.Add(new MediaTypeWithQualityHeaderValue("application/json"));
+            if (apiKey != null)
+            {
+                result.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", apiKey);
+            }
 
             ServicePointManager.FindServicePoint(new Uri(baseAddress)).ConnectionLeaseTimeout = 60 * 1000;
 

route4me-csharp-sdk/Route4MeSDKLibrary/Managers/Route4MeManagerBase.cs

@@ -141,13 +141,15 @@ protected async Task<Tuple<T, ResultResponse, string>> GetJsonObjectFromAPIAsync
             var resultResponse = default(ResultResponse);
             string jobId = default(string);
 
-            var parametersURI = optimizationParameters.Serialize(ApiKey);
+            bool v5 = R4MeUtils.IsV5(url);
+
+            var parametersURI = optimizationParameters.Serialize(v5 ? null : ApiKey);
             var uri = new Uri($"{url}{parametersURI}");
 
             try
             {
                 using (var httpClientHolder =
-                       HttpClientHolderManager.AcquireHttpClientHolder(uri.GetLeftPart(UriPartial.Authority)))
+                       HttpClientHolderManager.AcquireHttpClientHolder(uri.GetLeftPart(UriPartial.Authority), v5 ? ApiKey : null))
                 {
                     switch (httpMethod)
                     {
@@ -382,14 +384,14 @@ protected T GetJsonObjectFromAPI<T>(GenericParameters optimizationParameters,
         {
             var result = default(T);
             resultResponse = default;
-
-            var parametersUri = optimizationParameters.Serialize(ApiKey);
+            bool v5 = R4MeUtils.IsV5(url);
+            var parametersUri = optimizationParameters.Serialize(v5 ? null : ApiKey);
             var uri = new Uri($"{url}{parametersUri}");
 
             try
             {
                 using (var httpClientHolder =
-                       HttpClientHolderManager.AcquireHttpClientHolder(uri.GetLeftPart(UriPartial.Authority)))
+                       HttpClientHolderManager.AcquireHttpClientHolder(uri.GetLeftPart(UriPartial.Authority), v5 ? ApiKey : null))
                 {
                     switch (httpMethod)
                     {

route4me-csharp-sdk/Route4MeSDKLibrary/Utils.cs

@@ -938,5 +938,16 @@ public static string GenerateTestEmail(string emailTemplate)
             string[] emailParts = emailTemplate.Split('@');
             return emailParts[0] + "+" + ConvertToUnixTimestamp(DateTime.Now)+GenerateRandomString(4) + "@" + emailParts[1];
         }
+
+        public static bool IsV5(string url)
+        {
+            bool v5 = false;
+            if (Uri.TryCreate(url, UriKind.Absolute, out var u))
+            {
+                v5 = u.Host.StartsWith("wh");
+            }
+
+            return v5;
+        }
     }
 }