admin/raven
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Browse Source
This commit is contained in:
John Cardinal
2020-06-11 23:14:12 +00:00
parent f34b3907c7
commit 9a16cd0d2d
2 changed files with 15 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
server/AyaNova/models/dto/RequestTrial.cs
View File

@@ -3,15 +3,19 @@ using System.ComponentModel.DataAnnotations;
namespace AyaNova.Models namespace AyaNova.Models
{ {
public class RequestTrial public class RequestTrial
{
public RequestTrial()
{ {
[Required] 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
public Guid DbId { get; set; }
[Required, EmailAddress]
public string Email { get; set; }
[Required]
public string Company { get; set; }
[Required]
public string Contact { get; set; }
} }
[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; }
}
} }

10
server/AyaNova/util/License.cs
View File

@@ -441,20 +441,14 @@ namespace AyaNova.Core
/// </summary> /// </summary>
/// <returns>Result string</returns> /// <returns>Result string</returns>
internal static async Task<string> RequestTrialAsync(RequestTrial trialRequest, ILogger log) 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; trialRequest.DbId = ServerDbId;
log.LogDebug($"Requesting trial license for DBID {LicenseDbId.ToString()}"); log.LogDebug($"Requesting trial license for DBID {LicenseDbId.ToString()}");
string sUrl = $"{LICENSE_SERVER_URL}rvr" + q.ToQueryString(); string sUrl = $"{LICENSE_SERVER_URL}rvr";
try 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 content = new StringContent(JsonConvert.SerializeObject(trialRequest), Encoding.UTF8, "application/json");
var client = ServiceProviderProvider.HttpClientFactory.CreateClient(); var client = ServiceProviderProvider.HttpClientFactory.CreateClient();
var res = await client.PostAsync(sUrl, content); var res = await client.PostAsync(sUrl, content);
if (res.IsSuccessStatusCode) if (res.IsSuccessStatusCode)