This commit is contained in:
@@ -23,7 +23,7 @@ namespace rockfishCore.Controllers
|
||||
|
||||
//### CUSTOMER ROUTE CALLED FROM RAVEN ####
|
||||
[HttpGet("{dbid}")]
|
||||
public async Task<IActionResult> Get([FromRoute] Guid dbid)
|
||||
public async Task<IActionResult> Get([FromRoute] string dbid)
|
||||
{
|
||||
if (!ModelState.IsValid)
|
||||
{
|
||||
|
||||
@@ -31,7 +31,7 @@ namespace rockfishCore.Controllers
|
||||
[Required]
|
||||
public string RegisteredTo { get; set; }
|
||||
[Required]
|
||||
public Guid DbId { get; set; }
|
||||
public string DbId { get; set; }
|
||||
[Required]
|
||||
public bool LicenseExpires { get; set; }
|
||||
[Required]
|
||||
|
||||
@@ -25,7 +25,7 @@ namespace rockfishCore.Controllers
|
||||
public class dtoRequest
|
||||
{
|
||||
[Required]
|
||||
public Guid DbId { get; set; }
|
||||
public string DbId { get; set; }
|
||||
[Required, EmailAddress]
|
||||
public string Email { get; set; }
|
||||
[Required]
|
||||
@@ -51,7 +51,8 @@ namespace rockfishCore.Controllers
|
||||
return BadRequest(ModelState);
|
||||
}
|
||||
|
||||
if (r.DbId == Guid.Empty)
|
||||
// if (r.DbId == Guid.Empty)
|
||||
if(string.IsNullOrWhiteSpace(r.DbId))
|
||||
{
|
||||
return BadRequest("E1000 - DBId invalid");
|
||||
}
|
||||
|
||||
@@ -20,7 +20,7 @@ namespace rockfishCore.Models
|
||||
public string FetchFrom { get; set; }
|
||||
public long? DtFetched { get; set; }
|
||||
public bool Fetched { get; set; }
|
||||
public Guid DbId { get; set; }
|
||||
public string DbId { get; set; }
|
||||
public long DtLicenseExpiration { get; set; }
|
||||
public long DtMaintenanceExpiration { get; set; }
|
||||
|
||||
|
||||
@@ -30,7 +30,7 @@ namespace rockfishCore.Models
|
||||
EmailConfirmCode = "?";
|
||||
}
|
||||
public long Id { get; set; }
|
||||
public Guid DbId { get; set; }
|
||||
public string DbId { get; set; }
|
||||
public string CompanyName { get; set; }
|
||||
public string ContactName { get; set; }
|
||||
public string Notes { get; set; }
|
||||
|
||||
@@ -215,7 +215,7 @@ Plugins:
|
||||
public string LicenseFormat { get; set; }
|
||||
public string Id { get; set; }
|
||||
public string RegisteredTo { get; set; }
|
||||
public Guid DbId { get; set; }
|
||||
public string DbId { get; set; }
|
||||
public DateTime LicenseExpiration { get; set; }
|
||||
public DateTime MaintenanceExpiration { get; set; }
|
||||
public List<LicenseFeature> Features { get; set; }
|
||||
@@ -264,7 +264,7 @@ Plugins:
|
||||
|
||||
|
||||
|
||||
public static string GetRavenTrialKey(Guid dbid, string CompanyName)
|
||||
public static string GetRavenTrialKey(string dbid, string CompanyName)
|
||||
{
|
||||
|
||||
//Build a sample test key, sign it and return it
|
||||
@@ -309,7 +309,8 @@ Plugins:
|
||||
if (string.IsNullOrWhiteSpace(k.RegisteredTo))
|
||||
throw new ArgumentException("RegisteredTo is required", "RegisteredTo");
|
||||
|
||||
if (k.DbId == Guid.Empty)
|
||||
// if (k.DbId == Guid.Empty)
|
||||
if (string.IsNullOrWhiteSpace(k.DbId))
|
||||
throw new ArgumentException("DBId is required", "RegisteredTo");
|
||||
|
||||
try
|
||||
|
||||
Reference in New Issue
Block a user