From 9a16cd0d2d7bbdd7f667b195ef170e32d9cc74ae Mon Sep 17 00:00:00 2001
From: John Cardinal <support@ayanova.com>
Date: Thu, 11 Jun 2020 23:14:12 +0000
Subject: [PATCH]

---
 server/AyaNova/models/dto/RequestTrial.cs | 22 +++++++++++++---------
 server/AyaNova/util/License.cs            | 10 ++--------
 2 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/server/AyaNova/models/dto/RequestTrial.cs b/server/AyaNova/models/dto/RequestTrial.cs
index 2ee73d22..5617b461 100644
--- a/server/AyaNova/models/dto/RequestTrial.cs
+++ b/server/AyaNova/models/dto/RequestTrial.cs
@@ -3,15 +3,19 @@ using System.ComponentModel.DataAnnotations;
 namespace AyaNova.Models
 {
 
-       public class RequestTrial
+    public class RequestTrial
+    {
+        public RequestTrial()
         {
-            [Required]
-            public Guid DbId { get; set; }
-            [Required, EmailAddress]
-            public string Email { get; set; }
-            [Required]
-            public string Company { get; set; }
-            [Required]
-            public string Contact { get; set; }
+            DbId = Guid.Empty;//default this because it's coming from the client without a dbid as the server will set it before forwarding it on
         }
+        [Required]
+        public Guid DbId { get; set; }
+        [Required, EmailAddress]
+        public string Email { get; set; }
+        [Required]
+        public string Company { get; set; }
+        [Required]
+        public string Contact { get; set; }
+    }
 }
diff --git a/server/AyaNova/util/License.cs b/server/AyaNova/util/License.cs
index 89d1550c..7965be96 100644
--- a/server/AyaNova/util/License.cs
+++ b/server/AyaNova/util/License.cs
@@ -441,20 +441,14 @@ namespace AyaNova.Core
         /// </summary>      
         /// <returns>Result string</returns>
         internal static async Task<string> RequestTrialAsync(RequestTrial trialRequest, ILogger log)
-        {
-
-            Microsoft.AspNetCore.Http.Extensions.QueryBuilder q = new Microsoft.AspNetCore.Http.Extensions.QueryBuilder();
+        {            
             trialRequest.DbId = ServerDbId;
 
             log.LogDebug($"Requesting trial license for DBID {LicenseDbId.ToString()}");
-            string sUrl = $"{LICENSE_SERVER_URL}rvr" + q.ToQueryString();
+            string sUrl = $"{LICENSE_SERVER_URL}rvr";
             try
             {
-                // var content = new StringContent(jsonObject.ToString(), Encoding.UTF8, "application/json");
-                // var result = client.PostAsync(url, content).Result;
-
                 var content = new StringContent(JsonConvert.SerializeObject(trialRequest), Encoding.UTF8, "application/json");
-
                 var client = ServiceProviderProvider.HttpClientFactory.CreateClient();
                 var res = await client.PostAsync(sUrl, content);
                 if (res.IsSuccessStatusCode)