env fix

DigitalExcellence · Nov 25, 2021 · fc85f6c · fc85f6c
1 parent b0e8323
commit fc85f6c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/API/Controllers/ProjectController.cs b/API/Controllers/ProjectController.cs
@@ -1523,6 +1523,10 @@ public async Task<IActionResult> InitiateTransfer(string potentialNewOwnerUserEm
                                          .ConfigureAwait(false);
 
 
+            if(user == null)
+            {
+                return NotFound("Could not find current user");
+            }
 
             if(project.UserId != user.Id)
             {
@@ -1548,11 +1552,11 @@ public async Task<IActionResult> InitiateTransfer(string potentialNewOwnerUserEm
                 return NotFound(problem);
             }
 
-            string responseString = "";
+            string responseString = "123";
             try
             {
                 Response response = await projectTransferService.InitiateTransfer(project, potentialNewOwner);
-                responseString = response.StatusCode.ToString() + response.Body.ToString();
+                if(response != null) responseString = response.StatusCode.ToString() + response.Body.ToString();
                 if(response.StatusCode == HttpStatusCode.Accepted)
                 {
                     return Ok("Transfer has been initiated, please check your email");

diff --git a/Services/Resources/MailClient.cs b/Services/Resources/MailClient.cs
@@ -16,8 +16,8 @@ public class MailClient
         //This class might be temporary untill the RabbitMQ emailSender has been fixed
         public MailClient()
         {
-            //sendGridClient = new SendGridClient(Environment.GetEnvironmentVariable("App__SendGrid__ApiKey"));
-            //fromEmailAdress = new EmailAddress(Environment.GetEnvironmentVariable("App__SendGrid__EmailFrom"));
+            sendGridClient = new SendGridClient(Environment.GetEnvironmentVariable("App__SendGrid__ApiKey"));
+            fromEmailAdress = new EmailAddress(Environment.GetEnvironmentVariable("App__SendGrid__EmailFrom"));
         }
 
         public async Task<Response> SendMail(string receiverAdress, string plainTextContent,string subject, string htmlContent)