Merge pull request #60 from roycornelissen/feature/fix-cdn-queries

🐛 Fix support for queries with parameters against CDN endpoint

Author: chtombre

src/Sanity.Linq/Sanity.Linq.csproj

@@ -26,7 +26,7 @@ This file is part of Sanity LINQ (https://github.com/oslofjord/sanity-linq).
     <Authors>Oslofjord Operations AS</Authors>
     <Company>Oslofjord Operations AS</Company>
     <Product>Sanity LINQ</Product>
-    <Version>1.5.0</Version>
+    <Version>1.6.0</Version>
     <Description>Strongly-typed .Net Client for Sanity CMS (https://sanity.io)</Description>
     <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
     <Copyright>2018 Oslofjord Operations AS</Copyright>
@@ -35,11 +35,11 @@ This file is part of Sanity LINQ (https://github.com/oslofjord/sanity-linq).
     <RepositoryType>git</RepositoryType>
     <PackageTags>sanity cms dotnet linq client groq</PackageTags>
     <PackageLicenseUrl>https://raw.githubusercontent.com/oslofjord/sanity-linq/master/LICENSE</PackageLicenseUrl>
-    <AssemblyVersion>1.5.0.0</AssemblyVersion>
+    <AssemblyVersion>1.6.0.0</AssemblyVersion>
     <PackageId>Sanity.Linq</PackageId>
     <AssemblyName>Sanity.Linq</AssemblyName>
     <RootNamespace>Sanity.Linq</RootNamespace>
-    <FileVersion>1.5.0.0</FileVersion>
+    <FileVersion>1.6.0.0</FileVersion>
     <PackageReleaseNotes>1.0 - Sanity Linq library
 1.1 - BlockContent library
 1.1.1 - Improvements BlockContent
@@ -60,6 +60,7 @@ This file is part of Sanity LINQ (https://github.com/oslofjord/sanity-linq).
 1.4.4 - SanityFile type added
 1.4.5 - Added support for choosing API-version
 1.5.0 - Updated dependencies and support for source link, some serialization fixes
+1.6.0 - Fixed support for queries with parameters against the CDN endpoint
     </PackageReleaseNotes>
 
 	<PublishRepositoryUrl>true</PublishRepositoryUrl>

src/Sanity.Linq/SanityClient.cs

@@ -71,7 +71,7 @@ public virtual void Initialize()
             {
                 _httpQueryClient.BaseAddress = new Uri($"https://{WebUtility.UrlEncode(_options.ProjectId)}.api.sanity.io/{_options.ApiVersion}/");
             }
-            if (!string.IsNullOrEmpty(_options.Token) && !_options.UseCdn)
+            if (!string.IsNullOrEmpty(_options.Token))
             {
                 _httpQueryClient.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", _options.Token);
             }
@@ -92,7 +92,6 @@ public virtual void Initialize()
                     _httpQueryClient.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", _options.Token);
                 }
             }
-
         }
 
         public virtual async Task<SanityQueryResponse<TResult>> FetchAsync<TResult>(string query, object parameters = null, CancellationToken cancellationToken = default)
@@ -106,23 +105,8 @@ public virtual async Task<SanityQueryResponse<TResult>> FetchAsync<TResult>(stri
                 Query = query,
                 Params = parameters
             };
-            HttpResponseMessage response = null;
-            if (_options.UseCdn)
-            {
-                // CDN only supports GET requests
-                var url = $"data/query/{WebUtility.UrlEncode(_options.Dataset)}?query={WebUtility.UrlEncode(query ?? "")}";
-                if (parameters != null)
-                {
-                    //TODO: Add support for parameters
-                }
-                response = await _httpQueryClient.GetAsync(url, cancellationToken);
-            }
-            else
-            {
-                // Preferred method is POST
-                var json = new StringContent(JsonConvert.SerializeObject(oQuery, Formatting.None, SerializerSettings), Encoding.UTF8, "application/json");
-                response = await _httpQueryClient.PostAsync($"data/query/{WebUtility.UrlEncode(_options.Dataset)}", json, cancellationToken).ConfigureAwait(false);
-            }
+            var json = new StringContent(JsonConvert.SerializeObject(oQuery, Formatting.None, SerializerSettings), Encoding.UTF8, "application/json");
+            HttpResponseMessage response = await _httpQueryClient.PostAsync($"data/query/{WebUtility.UrlEncode(_options.Dataset)}", json, cancellationToken).ConfigureAwait(false);
 
             return await HandleHttpResponseAsync<SanityQueryResponse<TResult>>(response).ConfigureAwait(false);
         }

tests/Sanity.Linq.Tests/Sanity.Linq.Tests.csproj

@@ -11,9 +11,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
-    <PackageReference Include="xunit" Version="2.4.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.1" />
+    <PackageReference Include="xunit" Version="2.4.2" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>