Merge pull request #39 from ondrejmyska/master

Fix suggestion for 404 in Language
jtwotimes · Sep 16, 2022 · 65c462e · 65c462e
2 parents 4ae5822 + 93b94f6
commit 65c462e
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 2 deletions.
diff --git a/PokeApiNet/Models/Common.cs b/PokeApiNet/Models/Common.cs
@@ -41,6 +41,11 @@ public class Language : NamedApiResource
         /// The name of this resource listed in different languages.
         /// </summary>
         public List<Names> Names { get; set; }
+
+        /// <summary>
+        /// Is endpoint case sensitive
+        /// </summary>
+        internal new static bool IsApiEndpointCaseSensitive { get; } = true;
     }
 
     /// <summary>

diff --git a/PokeApiNet/Models/ResourceBase.cs b/PokeApiNet/Models/ResourceBase.cs
@@ -15,6 +15,11 @@ public abstract class ResourceBase
         /// The endpoint string for this resource
         /// </summary>
         public static string ApiEndpoint { get; }
+
+        /// <summary>
+        /// Is endpoint case sensitive
+        /// </summary>
+        public static bool IsApiEndpointCaseSensitive { get; }
     }
 
     /// <summary>

diff --git a/PokeApiNet/PokeApiClient.cs b/PokeApiNet/PokeApiClient.cs
@@ -109,8 +109,9 @@ private static ProductHeaderValue GetDefaultUserAgent()
         private async Task<T> GetResourcesWithParamsAsync<T>(string apiParam, CancellationToken cancellationToken)
             where T : ResourceBase
         {
-            // lowercase the resource name as the API doesn't recognize upper case and lower case as the same
-            string sanitizedApiParam = apiParam.ToLowerInvariant();
+            // check for case sensitive API endpoint
+            bool isApiEndpointCaseSensitive = IsApiEndpointCaseSensitive<T>();
+            string sanitizedApiParam = isApiEndpointCaseSensitive ? apiParam : apiParam.ToLowerInvariant();
             string apiEndpoint = GetApiEndpointString<T>();
 
             return await GetAsync<T>($"{apiEndpoint}/{sanitizedApiParam}/", cancellationToken);
@@ -444,5 +445,11 @@ private static string GetApiEndpointString<T>()
             PropertyInfo propertyInfo = typeof(T).GetProperty("ApiEndpoint", BindingFlags.Static | BindingFlags.NonPublic);
             return propertyInfo.GetValue(null).ToString();
         }
+
+        private static bool IsApiEndpointCaseSensitive<T>()
+        {
+            PropertyInfo propertyInfo = typeof(T).GetProperty("IsApiEndpointCaseSensitive", BindingFlags.Static | BindingFlags.NonPublic);
+            return propertyInfo == null ? false : (bool)propertyInfo.GetValue(null);
+        }
     }
 }