From 490423a708eadd0985ef50fe53a457814b35ae28 Mon Sep 17 00:00:00 2001
From: John Cardinal <support@ayanova.com>
Date: Fri, 12 Jun 2020 19:45:53 +0000
Subject: [PATCH]

---
 Controllers/RvrController.cs | 11 +++++++----
 Models/TrialRequest.cs       | 18 ++++++++++--------
 2 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/Controllers/RvrController.cs b/Controllers/RvrController.cs
index bb51a72..780b8bc 100644
--- a/Controllers/RvrController.cs
+++ b/Controllers/RvrController.cs
@@ -38,8 +38,10 @@ namespace rockfishCore.Controllers
 
 #if (DEBUG)
         private const string LICENSE_SERVER_URL = "http://localhost:3001/";
+        private const string SUPPORT_EMAIL = "cardjohn@ayanova.com";
 #else
         private const string LICENSE_SERVER_URL = "https://rockfish.ayanova.com/";
+        private const string SUPPORT_EMAIL="support@ayanova.com";
 #endif
 
         [HttpPost]
@@ -80,15 +82,16 @@ namespace rockfishCore.Controllers
             await ct.SaveChangesAsync();
             NewRequest.EmailConfirmCode = NewRequest.Id.ToString() + FetchKeyCode.generate();
             await ct.SaveChangesAsync();
-            var verifyUrl = LICENSE_SERVER_URL + $"rvr/verify?code={NewRequest.EmailConfirmCode}";
+            var verifyUrl = LICENSE_SERVER_URL + $"rvr/verify/{NewRequest.EmailConfirmCode}";
             var body = $"Please verify your email address by clicking the link below or copy and pasting into a browser\r\n{verifyUrl}\r\n(If you did not request this you can ignore this message)";
             //send confirmation email
             RfMail.SendMessage("support@ayanova.com", NewRequest.Email, "AyaNova trial request email verification", body, false);
-            return Ok(new { Accepted = true });
+            //return Ok(new { Accepted = true });
+            return Accepted();
 
         }
 
-        [HttpGet("verify")]
+        [HttpGet("verify/{code}")]
         public async Task<IActionResult> GetVerify([FromRoute] string code)
         {
             //is there a valid trial request
@@ -108,7 +111,7 @@ namespace rockfishCore.Controllers
 
             //notify *us*
             //http://localhost:3001/default.htm#!/trials/[id]
-            var rfUrl = LICENSE_SERVER_URL + $"default.htm#!/trials/{req.Id}";
+            var rfUrl = LICENSE_SERVER_URL + $"default.htm#!/trialEdit/{req.Id}";
             var body = $"Email address {req.Email} was just verified for {req.ContactName} at {req.CompanyName}.\r\nTrial key is ready to be processed now:\r\n{rfUrl}";
             //send confirmation email
             RfMail.SendMessage("support@ayanova.com", "support@ayanova.com", "AyaNova trial request requiring action", body, false);
diff --git a/Models/TrialRequest.cs b/Models/TrialRequest.cs
index 031ec70..83c9db8 100644
--- a/Models/TrialRequest.cs
+++ b/Models/TrialRequest.cs
@@ -16,16 +16,18 @@ namespace rockfishCore.Models
 
     public partial class TrialRequest
     {
-        public enum TrialRequestStatus{
-            NotSet=0,
-            Approved=1,
-            Rejected=2
+        public enum TrialRequestStatus
+        {
+            NotSet = 0,
+            Approved = 1,
+            Rejected = 2
         }
         public TrialRequest()
         {
-            DtRequested=DateUtil.NowAsEpoch();
-            EmailValidated=false;
-            Status=TrialRequestStatus.NotSet;
+            DtRequested = DateUtil.NowAsEpoch();
+            EmailValidated = false;
+            Status = TrialRequestStatus.NotSet;
+            EmailConfirmCode = "?";
         }
         public long Id { get; set; }
         public Guid DbId { get; set; }
@@ -33,7 +35,7 @@ namespace rockfishCore.Models
         public string ContactName { get; set; }
         public string Notes { get; set; }
         public string Email { get; set; }
-        public string EmailConfirmCode {get;set;}
+        public string EmailConfirmCode { get; set; }
         public bool EmailValidated { get; set; }
         public long? DtRequested { get; set; }
         public long? DtProcessed { get; set; }