admin/rockfish
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-23 18:20:51 +00:00
parent 1e87f9b077
commit 93db555bb7
6 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Controllers/RvfController.cs
View File

@@ -23,7 +23,7 @@ namespace rockfishCore.Controllers
//### CUSTOMER ROUTE CALLED FROM RAVEN #### //### CUSTOMER ROUTE CALLED FROM RAVEN ####
[HttpGet("{dbid}")] [HttpGet("{dbid}")]
public async Task<IActionResult> Get([FromRoute] Guid dbid) public async Task<IActionResult> Get([FromRoute] string dbid)
{ {
if (!ModelState.IsValid) if (!ModelState.IsValid)
{ {

2
Controllers/RvlController.cs
View File

@@ -31,7 +31,7 @@ namespace rockfishCore.Controllers
[Required] [Required]
public string RegisteredTo { get; set; } public string RegisteredTo { get; set; }
[Required] [Required]
public Guid DbId { get; set; } public string DbId { get; set; }
[Required] [Required]
public bool LicenseExpires { get; set; } public bool LicenseExpires { get; set; }
[Required] [Required]

5
Controllers/RvrController.cs
View File

@@ -25,7 +25,7 @@ namespace rockfishCore.Controllers
public class dtoRequest public class dtoRequest
{ {
[Required] [Required]
public Guid DbId { get; set; } public string DbId { get; set; }
[Required, EmailAddress] [Required, EmailAddress]
public string Email { get; set; } public string Email { get; set; }
[Required] [Required]
@@ -51,7 +51,8 @@ namespace rockfishCore.Controllers
return BadRequest(ModelState); return BadRequest(ModelState);
} }
if (r.DbId == Guid.Empty) // if (r.DbId == Guid.Empty)
if(string.IsNullOrWhiteSpace(r.DbId))
{ {
return BadRequest("E1000 - DBId invalid"); return BadRequest("E1000 - DBId invalid");
} }

2
Models/License.cs
View File

@@ -20,7 +20,7 @@ namespace rockfishCore.Models
public string FetchFrom { get; set; } public string FetchFrom { get; set; }
public long? DtFetched { get; set; } public long? DtFetched { get; set; }
public bool Fetched { get; set; } public bool Fetched { get; set; }
public Guid DbId { get; set; } public string DbId { get; set; }
public long DtLicenseExpiration { get; set; } public long DtLicenseExpiration { get; set; }
public long DtMaintenanceExpiration { get; set; } public long DtMaintenanceExpiration { get; set; }

2
Models/TrialRequest.cs
View File

@@ -30,7 +30,7 @@ namespace rockfishCore.Models
EmailConfirmCode = "?"; EmailConfirmCode = "?";
} }
public long Id { get; set; } public long Id { get; set; }
public Guid DbId { get; set; } public string DbId { get; set; }
public string CompanyName { get; set; } public string CompanyName { get; set; }
public string ContactName { get; set; } public string ContactName { get; set; }
public string Notes { get; set; } public string Notes { get; set; }

7
util/RavenKeyFactory.cs
View File

@@ -215,7 +215,7 @@ Plugins:
public string LicenseFormat { get; set; } public string LicenseFormat { get; set; }
public string Id { get; set; } public string Id { get; set; }
public string RegisteredTo { get; set; } public string RegisteredTo { get; set; }
public Guid DbId { get; set; } public string DbId { get; set; }
public DateTime LicenseExpiration { get; set; } public DateTime LicenseExpiration { get; set; }
public DateTime MaintenanceExpiration { get; set; } public DateTime MaintenanceExpiration { get; set; }
public List<LicenseFeature> Features { 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 //Build a sample test key, sign it and return it
@@ -309,7 +309,8 @@ Plugins:
if (string.IsNullOrWhiteSpace(k.RegisteredTo)) if (string.IsNullOrWhiteSpace(k.RegisteredTo))
throw new ArgumentException("RegisteredTo is required", "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"); throw new ArgumentException("DBId is required", "RegisteredTo");
try try