Merge pull request #71 from zingz0r/fix/dnsrecord-import

Fix DNS record import issue
zingz0r · Oct 4, 2022 · 62e7197 · 62e7197
2 parents bc703c0 + bba1a17
commit 62e7197
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 9 deletions.
diff --git a/CloudFlare.Client.Test/Zones/DnsRecordUnitTests.cs b/CloudFlare.Client.Test/Zones/DnsRecordUnitTests.cs
@@ -81,7 +81,7 @@ public async Task TestCreateDataDnsRecordAsync()
             _wireMockServer
                 .Given(Request.Create().WithPath($"/{ZoneEndpoints.Base}/{zone.Id}/{DnsRecordEndpoints.Base}").UsingPost())
                 .RespondWith(Response.Create().WithStatusCode(200)
-                    .WithBody(x => 
+                    .WithBody(x =>
                     {
                         var dnsRecord = DnsRecordTestData.DnsRecords.First().DeepClone();
                         dnsRecord.Type = newRecord.Type;
@@ -103,7 +103,7 @@ public async Task TestCreateDataDnsRecordAsync()
             created.Result.Priority.Should().Be(newRecord.Data.Priority);
         }
 
-        
+
         [Fact]
         public async Task TestExportDnsRecordsAsync()
         {
@@ -228,16 +228,15 @@ public async Task TestDeleteDnsRecordAsync()
 
             using var client = new CloudFlareClient(WireMockConnection.ApiKeyAuthentication, _connectionInfo);
 
-            var deleteCustomHostname = await client.Zones.DnsRecords.DeleteAsync(zone.Id, record.Id);
+            var delete = await client.Zones.DnsRecords.DeleteAsync(zone.Id, record.Id);
 
-            deleteCustomHostname.Result.Should().BeEquivalentTo(expected);
+            delete.Result.Should().BeEquivalentTo(expected);
         }
 
         [Fact]
         public async Task TestImportDnsRecordAsync()
         {
             var zone = ZoneTestData.Zones.First();
-            var record = DnsRecordTestData.DnsRecords.First();
             var file = FileHelper.CreateTempFile("test.txt");
 
             _wireMockServer
@@ -247,10 +246,10 @@ public async Task TestImportDnsRecordAsync()
 
             using var client = new CloudFlareClient(WireMockConnection.ApiKeyAuthentication, _connectionInfo);
 
-            var deleteCustomHostname = await client.Zones.DnsRecords.ImportAsync(zone.Id, file, false);
+            var import = await client.Zones.DnsRecords.ImportAsync(zone.Id, file, false);
             file.Delete();
 
-            deleteCustomHostname.Result.Should().BeEquivalentTo(DnsRecordTestData.DnsRecordImports.First());
+            import.Result.Should().BeEquivalentTo(DnsRecordTestData.DnsRecordImports.First());
         }
     }
 }
diff --git a/CloudFlare.Client/Client/Zones/DnsRecords.cs b/CloudFlare.Client/Client/Zones/DnsRecords.cs
@@ -81,7 +81,7 @@ public async Task<CloudFlareResult<DnsRecordImport>> ImportAsync(string zoneId,
             var form = new MultipartFormDataContent
             {
                 { new StringContent(proxied.ToString()), Filtering.Proxied },
-                { new ByteArrayContent(await FileHelper.ReadAsync(fileInfo.FullName, cancellationToken), 0, Convert.ToInt32(fileInfo.Length)), "file", "upload.txt" }
+                { new ByteArrayContent(await FileHelper.ReadAsync(fileInfo.FullName, cancellationToken), 0, Convert.ToInt32(fileInfo.Length)), "file", fileInfo.Name }
             };
 
             var requestUri = $"{ZoneEndpoints.Base}/{zoneId}/{DnsRecordEndpoints.Base}/{DnsRecordEndpoints.Import}";

diff --git a/CloudFlare.Client/Contexts/Connection.cs b/CloudFlare.Client/Contexts/Connection.cs
@@ -102,7 +102,10 @@ public async Task<CloudFlareResult<TResult>> PostAsync<TResult>(string requestUr
 
         public async Task<CloudFlareResult<TResult>> PostAsync<TResult, TContent>(string requestUri, TContent content, CancellationToken cancellationToken)
         {
-            var response = await HttpClient.PostAsync(requestUri, content, _formatter, cancellationToken).ConfigureAwait(false);
+            var response = content is HttpContent httpContent
+                ? await HttpClient.PostAsync(requestUri, httpContent, cancellationToken).ConfigureAwait(false)
+                : await HttpClient.PostAsync(requestUri, content, _formatter, cancellationToken).ConfigureAwait(false);
+
             return await response.GetCloudFlareResultAsync<TResult>().ConfigureAwait(false);
         }
 
@@ -139,6 +142,7 @@ private static HttpClient CreateHttpClient(IAuthentication authentication, Conne
             {
                 BaseAddress = connectionInfo.Address
             };
+            client.DefaultRequestHeaders.UserAgent.Add(new ProductInfoHeaderValue("CloudFlareClient", "1.0.0"));
             client.DefaultRequestHeaders.Accept.Add(new MediaTypeWithQualityHeaderValue(HttpContentTypesHelper.Json));
             client.DefaultRequestHeaders.ExpectContinue = connectionInfo.ExpectContinue;