Merge branch 'cloudconvert:master' into convert-to-system-text-json

Author: TP125487

CloudConvert.API/CloudConvert.API.csproj

@@ -5,7 +5,7 @@
     <AssemblyName>CloudConvert.API</AssemblyName>
     <RootNamespace>CloudConvert.API</RootNamespace>
     <Description>Official SDK for the CloudConvert API</Description>
-    <Version>1.2.0</Version>
+    <Version>1.3.0</Version>
     <PackageProjectUrl>https://github.com/cloudconvert/cloudconvert-dotnet</PackageProjectUrl>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>

CloudConvert.API/CloudConvertAPI.cs

@@ -26,7 +26,7 @@ public interface ICloudConvertAPI
     #region Tasks
     Task<ListResponse<TaskResponse>> GetAllTasksAsync(TaskListFilter jobFilter);
     Task<Response<TaskResponse>> CreateTaskAsync<T>(string operation, T request);
-    Task<Response<TaskResponse>> GetTaskAsync(string id, string[] include = null);
+    Task<Response<TaskResponse>> GetTaskAsync(string id, string include = null);
     Task<Response<TaskResponse>> WaitTaskAsync(string id);
     Task DeleteTaskAsync(string id);
     #endregion
@@ -189,7 +189,7 @@ private HttpRequestMessage GetMultipartFormDataRequest(string endpoint, HttpMeth
     /// <param name="id"></param>
     /// <param name="include"></param>
     /// <returns></returns>
-    public Task<Response<TaskResponse>> GetTaskAsync(string id, string[] include = null) => _restHelper.RequestAsync<Response<TaskResponse>>(GetRequest($"{_apiUrl}/tasks/{id}?include={include}", HttpMethod.Get));
+    public Task<Response<TaskResponse>> GetTaskAsync(string id, string include = null) => _restHelper.RequestAsync<Response<TaskResponse>>(GetRequest($"{_apiUrl}/tasks/{id}?include={include}", HttpMethod.Get));
 
     /// <summary>
     /// Wait until the task status is finished or error. This makes the request block until the task has been completed. Requires the task.read scope.

CloudConvert.Test/IntegrationTests.cs

@@ -8,6 +8,8 @@
 using CloudConvert.API.Models.JobModels;
 using System;
 using System.Net.Http;
+using CloudConvert.API.Models.TaskOperations;
+using System.Collections.Generic;
 
 namespace CloudConvert.Test
 {
@@ -83,6 +85,49 @@ public async Task CreateJob(string streamingMethod)
       await File.WriteAllBytesAsync(fileExport.Filename, fileBytes);
     }
 
+    
+    [Test]
+    public async Task CreateJobWithOptions()
+    {
+      var job = await _cloudConvertAPI.CreateJobAsync(new JobCreateRequest
+      {
+        Tasks = new
+        {
+          import_it = new ImportUploadCreateRequest(),
+          convert_it = new ConvertCreateRequest
+          {
+            Input = "import_it", 
+            Input_Format = "pdf",
+            Output_Format = "jpg",
+            Options = new Dictionary<string, object> {
+                  { "width", 800 },
+                  { "height", 600 },
+                  { "fit", "max" }
+                }
+            }
+        },
+        Tag = "integration-test-convert-with-options"
+      });
+
+      var uploadTask = job.Data.Tasks.FirstOrDefault(t => t.Name == "import_it");
+
+      var path = AppDomain.CurrentDomain.BaseDirectory + @"TestFiles/input.pdf";
+
+      byte[] file = File.ReadAllBytes(path);
+      await _cloudConvertAPI.UploadAsync(uploadTask.Result.Form.Url.ToString(), file, "input.pdf", uploadTask.Result.Form.Parameters);
+
+
+      // get created convert task
+
+      var convertTask = await _cloudConvertAPI.GetTaskAsync(job.Data.Tasks.FirstOrDefault(t => t.Name == "convert_it").Id, "payload");
+      var payload = ((Newtonsoft.Json.Linq.JObject)convertTask.Data.Payload).ToObject<Dictionary<string, object>>();
+      Assert.IsNotNull(payload);
+      Assert.AreEqual(800, payload["width"]);
+      Assert.AreEqual(600, payload["height"]);
+      Assert.AreEqual("max", payload["fit"]);
+
+    }
+
     [TestCase("stream")]
     [TestCase("bytes")]
     public async Task CreateTask(string streamingMethod)