From email needs to be configured in environment variables

Author: areyeslo

source/backend/api/Models/Configuration/ChesConfig.cs

@@ -11,5 +11,7 @@ public class ChesConfig
         public string ServiceClientId { get; set; }
 
         public string ServiceClientSecret { get; set; }
+
+        public string FromEmail { get; set; }
     }
 }

source/backend/api/Services/ChesService.cs

@@ -3,29 +3,37 @@
 using Microsoft.Extensions.Logging;
 using Pims.Api.Models.Ches;
 using Pims.Api.Models.CodeTypes;
+using Pims.Api.Models.Config;
 using Pims.Api.Models.Requests.Http;
 using Pims.Api.Repositories.Ches;
 
 namespace Pims.Api.Services
-    /// <summary>
-    /// Default implementation of IEmailService using CHES.
-    /// </summary>
+/// <summary>
+/// Default implementation of IEmailService using CHES.
+/// </summary>
 {
     public class ChesService : IEmailService
     {
         private readonly IEmailRepository _chesRepository;
         private readonly ILogger<ChesService> _logger;
+        private readonly ChesConfig _chesConfig;
 
-        public ChesService(IEmailRepository chesRepository, ILogger<ChesService> logger)
+        public ChesService(IEmailRepository chesRepository, ILogger<ChesService> logger, ChesConfig chesConfig)
         {
             _chesRepository = chesRepository;
             _logger = logger;
+            _chesConfig = chesConfig;
         }
 
         public async Task<ExternalResponse<EmailResponse>> SendEmailAsync(EmailRequest request)
         {
             _logger.LogInformation("Email send requested. Recipient count: {recipientCount}.", request.To?.Count ?? 0);
 
+            if (string.IsNullOrEmpty(request.From))
+            {
+                request.From = _chesConfig.FromEmail;
+            }
+
             ExternalResponse<EmailResponse>? response = await _chesRepository.SendEmailAsync(request);
 
             if (response == null || response.Payload == null)

source/backend/api/Startup.cs

@@ -586,6 +586,13 @@ private static void AddPimsApiServices(IServiceCollection services)
             services.AddScoped<IManagementActivityService, ManagementActivityService>();
             services.AddScoped<IManagementFileStatusSolver, ManagementFileStatusSolver>();
             services.AddScoped<IFilePropertyLocationUpdateSolver, FilePropertyLocationUpdateSolver>();
+            services.AddSingleton(sp =>
+            {
+                var config = sp.GetRequiredService<IConfiguration>();
+                var chesConfig = new ChesConfig();
+                config.GetSection("Ches").Bind(chesConfig);
+                return chesConfig;
+            });
             services.AddScoped<IEmailService, ChesService>();
         }
 

source/backend/api/appsettings.Development.json

@@ -67,6 +67,7 @@
     "ServiceClientId": "",
     "ServiceClientSecret": "",
     "Issuer": "https://dev.loginproxy.gov.bc.ca/auth/realms/comsvcauth",
-    "AuthEndpoint": "https://dev.loginproxy.gov.bc.ca/auth/realms/comsvcauth/protocol/openid-connect/token"
+    "AuthEndpoint": "https://dev.loginproxy.gov.bc.ca/auth/realms/comsvcauth/protocol/openid-connect/token",
+    "FromEmail": ""
   }
 }

source/backend/api/appsettings.Local.json

@@ -90,6 +90,7 @@
     "ServiceClientId": "",
     "ServiceClientSecret": "",
     "Issuer": "https://dev.loginproxy.gov.bc.ca/auth/realms/comsvcauth",
-    "AuthEndpoint": "https://dev.loginproxy.gov.bc.ca/auth/realms/comsvcauth/protocol/openid-connect/token"
+    "AuthEndpoint": "https://dev.loginproxy.gov.bc.ca/auth/realms/comsvcauth/protocol/openid-connect/token",
+    "FromEmail": ""
   }
 }

source/backend/api/appsettings.json

@@ -161,7 +161,8 @@
     "AuthEndpoint": "[AUTH_ENDPOINT]",
     "ChesHost": "[CDOGS_HOST]",
     "ServiceClientId": "[CLIENT_ID]",
-    "ServiceClientSecret": "[CLIENT_SECRET]"
+    "ServiceClientSecret": "[CLIENT_SECRET]",
+    "FromEmail": "[FROM_EMAIL]"
   },
   "Polly": {
     "MaxRetries": 3,

source/backend/apimodels/Models/Ches/EmailRequest.cs

@@ -32,7 +32,6 @@ public class EmailRequest
         /// All email addresses can be plain 'sender@server.com' or formatted '"Sender Name" sender@server.com'.
         /// </summary>
         [JsonPropertyName("from")]
-        [System.ComponentModel.DataAnnotations.Required]
         public string From { get; set; }
 
         /// <summary>