feat/integration gateway email fix

Author: rashed99mm

backend/src/CCE.Api.External/appsettings.Development.json

@@ -64,7 +64,7 @@
     "RequireConfirmedEmail": false
   },
   "Email": {
-    "Provider": "smtp",
+    "Provider": "gateway",
     "Host": "localhost",
     "Port": 1025,
     "FromAddress": "no-reply@cce.local",
@@ -75,12 +75,8 @@
   },
   "ExternalApis": {
     "CommunicationGateway": {
-      "BaseUrl": "https://gateway.example.com",
-      "TimeoutSeconds": 30,
-      "Auth": {
-        "Type": "Bearer",
-        "Token": "dev-gateway-token-change-me"
-      }
+      "BaseUrl": "http://localhost:3001",
+      "TimeoutSeconds": 30
     }
   }
 }

backend/src/CCE.Api.External/appsettings.Production.json

@@ -64,13 +64,19 @@
     "RequireConfirmedEmail": false
   },
   "Email": {
-    "Provider": "smtp",
+    "Provider": "gateway",
     "Host": "localhost",
     "Port": 1025,
     "FromAddress": "no-reply@cce.local",
     "FromName": "CCE Knowledge Center",
     "Username": "",
     "Password": "",
     "EnableSsl": false
+  },
+  "ExternalApis": {
+    "CommunicationGateway": {
+      "BaseUrl": "https://cce-mocks.bonto.run",
+      "TimeoutSeconds": 30
+    }
   }
 }

backend/src/CCE.Api.Internal/appsettings.Development.json

@@ -51,7 +51,7 @@
     "RequireConfirmedEmail": false
   },
   "Email": {
-    "Provider": "smtp",
+    "Provider": "gateway",
     "Host": "localhost",
     "Port": 1025,
     "FromAddress": "no-reply@cce.local",
@@ -62,12 +62,8 @@
   },
   "ExternalApis": {
     "CommunicationGateway": {
-      "BaseUrl": "https://gateway.example.com",
-      "TimeoutSeconds": 30,
-      "Auth": {
-        "Type": "Bearer",
-        "Token": "dev-gateway-token-change-me"
-      }
+      "BaseUrl": "http://localhost:3001",
+      "TimeoutSeconds": 30
     }
   }
 }

backend/src/CCE.Api.Internal/appsettings.Production.json

@@ -51,13 +51,19 @@
     "RequireConfirmedEmail": false
   },
   "Email": {
-    "Provider": "smtp",
+    "Provider": "gateway",
     "Host": "localhost",
     "Port": 1025,
     "FromAddress": "no-reply@cce.local",
     "FromName": "CCE Knowledge Center",
     "Username": "",
     "Password": "",
     "EnableSsl": false
+  },
+  "ExternalApis": {
+    "CommunicationGateway": {
+      "BaseUrl": "https://cce-mocks.bonto.run",
+      "TimeoutSeconds": 30
+    }
   }
 }

backend/src/CCE.Application/Common/Interfaces/IEmailSender.cs

@@ -29,6 +29,7 @@ public interface IEmailSender
     /// <param name="to">Recipient address. Must be a valid RFC-5322 address.</param>
     /// <param name="subject">Subject line. Plain text; no formatting.</param>
     /// <param name="htmlBody">HTML body. Sanitized HTML allowed.</param>
+    /// <param name="templateId">Optional gateway template identifier.</param>
     /// <param name="ct">Cancellation token.</param>
-    Task SendAsync(string to, string subject, string htmlBody, CancellationToken ct = default);
+    Task SendAsync(string to, string subject, string htmlBody, string? templateId = null, CancellationToken ct = default);
 }

backend/src/CCE.Infrastructure/Communication/GatewayEmailSender.cs

@@ -1,6 +1,8 @@
 using CCE.Application.Common.Interfaces;
+using CCE.Infrastructure.Email;
 using CCE.Integration.Communication;
 using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Options;
 
 namespace CCE.Infrastructure.Communication;
 
@@ -11,20 +13,31 @@ namespace CCE.Infrastructure.Communication;
 public sealed class GatewayEmailSender : IEmailSender
 {
     private readonly ICommunicationGatewayClient _client;
+    private readonly IOptions<EmailOptions> _options;
     private readonly ILogger<GatewayEmailSender> _logger;
 
-    public GatewayEmailSender(ICommunicationGatewayClient client, ILogger<GatewayEmailSender> logger)
+    public GatewayEmailSender(
+        ICommunicationGatewayClient client,
+        IOptions<EmailOptions> options,
+        ILogger<GatewayEmailSender> logger)
     {
         _client = client;
+        _options = options;
         _logger = logger;
     }
 
-    public async Task SendAsync(string to, string subject, string htmlBody, CancellationToken ct = default)
+    public async Task SendAsync(string to, string subject, string htmlBody, string? templateId = null, CancellationToken ct = default)
     {
-        var request = new SendEmailRequest(to, subject, htmlBody);
+        var request = new SendEmailRequest(
+            To: to,
+            From: _options.Value.FromAddress,
+            Subject: subject,
+            Html: htmlBody,
+            TemplateId: templateId);
+
         var response = await _client.SendEmailAsync(request, ct).ConfigureAwait(false);
 
-        if (!response.Success)
+        if (!"success".Equals(response.Status, StringComparison.OrdinalIgnoreCase))
         {
             _logger.LogError(
                 "Gateway email send failed for {To} with subject {Subject}: {Error}",
@@ -33,7 +46,7 @@ public async Task SendAsync(string to, string subject, string htmlBody, Cancella
         }
 
         _logger.LogInformation(
-            "Sent email via gateway to {To} with subject {Subject} (messageId {MessageId})",
-            to, subject, response.MessageId);
+            "Sent email via gateway to {To} with subject {Subject} (id {Id})",
+            to, subject, response.Id);
     }
 }

backend/src/CCE.Infrastructure/Email/NullEmailSender.cs

@@ -18,7 +18,7 @@ public sealed class NullEmailSender : IEmailSender
 
     public NullEmailSender(ILogger<NullEmailSender> logger) => _logger = logger;
 
-    public Task SendAsync(string to, string subject, string htmlBody, CancellationToken ct = default)
+    public Task SendAsync(string to, string subject, string htmlBody, string? templateId = null, CancellationToken ct = default)
     {
         _logger.LogInformation(
             "[NullEmailSender] Would have sent email to {To} with subject {Subject} (body suppressed)",

backend/src/CCE.Infrastructure/Email/SmtpEmailSender.cs

@@ -23,7 +23,7 @@ public SmtpEmailSender(IOptions<EmailOptions> options, ILogger<SmtpEmailSender>
         _logger = logger;
     }
 
-    public async Task SendAsync(string to, string subject, string htmlBody, CancellationToken ct = default)
+    public async Task SendAsync(string to, string subject, string htmlBody, string? templateId = null, CancellationToken ct = default)
     {
         var opts = _options.Value;
         using var message = new MimeMessage();

backend/src/CCE.Infrastructure/ExternalApis/ExternalApiServiceCollectionExtensions.cs

@@ -28,7 +28,8 @@ public static IServiceCollection AddExternalApiClient<TClient>(
             ContentSerializer = new SystemTextJsonContentSerializer(
                 new System.Text.Json.JsonSerializerOptions
                 {
-                    PropertyNameCaseInsensitive = true
+                    PropertyNameCaseInsensitive = true,
+                    PropertyNamingPolicy = System.Text.Json.JsonNamingPolicy.CamelCase
                 })
         };
 

backend/src/CCE.Infrastructure/Identity/EntraIdRegistrationService.cs

@@ -103,7 +103,7 @@ public async Task<RegistrationResult> CreateUserAsync(RegistrationRequest dto, C
         {
             var subject = "Welcome to CCE — your account is ready";
             var body = BuildWelcomeEmailHtml(dto, tempPassword);
-            await _emailSender.SendAsync(created.UserPrincipalName!, subject, body, ct).ConfigureAwait(false);
+            await _emailSender.SendAsync(created.UserPrincipalName!, subject, body, ct: ct).ConfigureAwait(false);
         }
         catch (Exception ex)
         {