Fix environment variable things, add dev docker compose

Author: LucHeart

.gitignore

@@ -2,4 +2,6 @@
 .idea
 obj/
 bin/
-*.user
+*.user
+Dev/dragonfly
+Dev/postgres

API/Options/MailOptions.cs

@@ -1,6 +1,5 @@
-using Microsoft.Extensions.Options;
+using System.ComponentModel.DataAnnotations;
 using OpenShock.API.Services.Email.Mailjet.Mail;
-using System.ComponentModel.DataAnnotations;
 
 namespace OpenShock.API.Options;
 
@@ -13,19 +12,12 @@ public sealed class MailOptions
     [Required]
     public required MailType Type { get; init; }
 
-    [Required]
-    [ValidateObjectMembers]
-    public required Contact Sender { get; init; }
-
-    [ValidateObjectMembers]
-    public MailJetOptions? Mailjet {  get; init; }
-
-    [ValidateObjectMembers]
-    public SmtpOptions? Smtp { get; init; }
-
     public enum MailType
     {
         Mailjet = 0,
-        Smtp = 1
+        Smtp = 1,
+        None = 2
     }
+
+    public sealed class MailSenderContact : Contact;
 }

API/Services/Email/EmailServiceExtension.cs

@@ -2,17 +2,24 @@
 using OpenShock.API.Services.Email.Mailjet;
 using OpenShock.API.Services.Email.Mailjet.Mail;
 using OpenShock.API.Services.Email.Smtp;
-using System.Configuration;
 
 namespace OpenShock.API.Services.Email;
 
 public static class EmailServiceExtension
 {
     public static WebApplicationBuilder AddEmailService(this WebApplicationBuilder builder)
     {
-        builder.Services.Configure<Contact>(MailOptions.SenderOptionName, builder.Configuration.GetRequiredSection(MailOptions.SenderSectionName));
-
         var mailOptions = builder.Configuration.GetRequiredSection(MailOptions.SectionName).Get<MailOptions>() ?? throw new NullReferenceException();
+        
+        if(mailOptions.Type == MailOptions.MailType.None)
+        {
+            builder.Services.AddSingleton<IEmailService, NoneEmailService>(); // Add a dummy email service
+            return builder;
+        }
+
+        // Add sender contact configuration
+        builder.AddSenderContactConfiguration();
+        
         switch (mailOptions.Type)
         {
             case MailOptions.MailType.Mailjet:
@@ -27,4 +34,11 @@ public static WebApplicationBuilder AddEmailService(this WebApplicationBuilder b
 
         return builder;
     }
+
+    private static WebApplicationBuilder AddSenderContactConfiguration(this WebApplicationBuilder builder)
+    {
+        builder.Services.Configure<Contact>(MailOptions.SenderSectionName,
+            builder.Configuration.GetRequiredSection(MailOptions.SectionName));
+        return builder;
+    }
 }

API/Services/Email/Mailjet/Mail/Contact.cs

@@ -3,7 +3,7 @@
 
 namespace OpenShock.API.Services.Email.Mailjet.Mail;
 
-public sealed class Contact
+public class Contact
 {
     [Required(AllowEmptyStrings = false)]
     public required string Email { get; set; }

API/Services/Email/Mailjet/MailjetEmailService.cs

@@ -10,26 +10,26 @@ namespace OpenShock.API.Services.Email.Mailjet;
 public sealed class MailjetEmailService : IEmailService, IDisposable
 {
     private readonly HttpClient _httpClient;
-    private readonly Contact _sender;
     private readonly MailJetOptions _options;
     private readonly ILogger<MailjetEmailService> _logger;
+    private readonly MailOptions.MailSenderContact _sender;
 
     /// <summary>
     /// DI Constructor
     /// </summary>
     /// <param name="httpClient"></param>
-    /// <param name="senderOptions"></param>
     /// <param name="options"></param>
+    /// <param name="sender"></param>
     /// <param name="logger"></param>
     public MailjetEmailService(
             HttpClient httpClient,
-            IOptionsSnapshot<Contact> senderOptions,
             IOptions<MailJetOptions> options,
+            IOptions<MailOptions.MailSenderContact> sender,
             ILogger<MailjetEmailService> logger
         )
     {
         _httpClient = httpClient;
-        _sender = senderOptions.Get(MailOptions.SenderOptionName);
+        _sender = sender.Value;
         _options = options.Value;
         _logger = logger;
     }

API/Services/Email/Mailjet/MailjetEmailServiceExtension.cs

@@ -1,6 +1,7 @@
 using OpenShock.API.Options;
 using System.Net.Http.Headers;
 using System.Text;
+using Microsoft.Extensions.Options;
 
 namespace OpenShock.API.Services.Email.Mailjet;
 
@@ -11,7 +12,7 @@ public static WebApplicationBuilder AddMailjetEmailService(this WebApplicationBu
         var section = builder.Configuration.GetRequiredSection(MailJetOptions.SectionName);
 
         builder.Services.Configure<MailJetOptions>(section);
-        builder.Services.AddSingleton<MailJetOptionsValidator>();
+        builder.Services.AddSingleton<IValidateOptions<MailJetOptions>, MailJetOptionsValidator>();
 
         var options = section.Get<MailJetOptions>() ?? throw new NullReferenceException("MailJetOptions is null!");
         var basicAuthValue = Convert.ToBase64String(Encoding.UTF8.GetBytes($"{options.Key}:{options.Secret}"));

API/Services/Email/NoneEmailService.cs

@@ -0,0 +1,21 @@
+using OpenShock.API.Services.Email.Mailjet.Mail;
+
+namespace OpenShock.API.Services.Email;
+
+/// <summary>
+/// This is a noop implementation of the email service. It does nothing.
+/// Consumers should properly handle when this service is used, so realistaically this should never be used.
+/// But we need it for DI satisfaction.
+/// </summary>
+public class NoneEmailService : IEmailService
+{
+    public Task PasswordReset(Contact to, Uri resetLink, CancellationToken cancellationToken = default)
+    {
+        return Task.CompletedTask;
+    }
+
+    public Task VerifyEmail(Contact to, Uri activationLink, CancellationToken cancellationToken = default)
+    {
+        return Task.CompletedTask;
+    }
+}

API/Services/Email/Smtp/SmtpEmailServiceExtension.cs

@@ -1,4 +1,5 @@
-using OpenShock.API.Options;
+using Microsoft.Extensions.Options;
+using OpenShock.API.Options;
 
 namespace OpenShock.API.Services.Email.Smtp;
 
@@ -9,7 +10,7 @@ public static WebApplicationBuilder AddSmtpEmailService(this WebApplicationBuild
         var section = builder.Configuration.GetRequiredSection(SmtpOptions.SectionName);
 
         builder.Services.Configure<SmtpOptions>(section);
-        builder.Services.AddSingleton<SmtpOptionsValidator>();
+        builder.Services.AddSingleton<IValidateOptions<SmtpOptions>, SmtpOptionsValidator>();
 
         builder.Services.AddSingleton(new SmtpServiceTemplates
         {

Dev/docker-compose.yml

@@ -0,0 +1,36 @@
+# THIS IS MEANT FOR DEVELOPMENT; NOT PRODUCTION; DATA SAVED BY THIS STACK IS NOT CONSIDERED SECRET AND SAFE
+
+services:
+  postgres:
+    image: postgres:17
+    container_name: openshock-postgres
+    healthcheck:
+      test: [ "CMD-SHELL", "pg_isready -d $${POSTGRES_DB} -U $${POSTGRES_USER}" ]
+      start_period: 20s
+      interval: 30s
+      retries: 5
+      timeout: 5s
+    networks:
+      - openshock
+    environment:
+      POSTGRES_PASSWORD: openshock # This is not safe for production
+      POSTGRES_USER: openshock
+      POSTGRES_DB: openshock
+    volumes:
+      - ./postgres:/var/lib/postgresql/data
+    ports:
+      - 5432:5432
+
+  dragonfly:
+    image: ghcr.io/dragonflydb/dragonfly:latest
+    container_name: openshock-dragonfly
+    command: '--notify_keyspace_events=Ex'
+    volumes:
+      - ./dragonfly:/data
+    networks:
+      - openshock
+    ports:
+      - 6379:6379
+
+networks:
+  openshock: