Fix email template setup

Author: LucHeart

API/Program.cs

@@ -106,7 +106,7 @@ static void DefaultOptions(RemoteAuthenticationOptions options, string provider)
 builder.AddSwaggerExt<Program>();
 
 builder.AddCloudflareTurnstileService();
-builder.AddEmailService();
+await builder.AddEmailService();
 
 //services.AddHealthChecks().AddCheck<DatabaseHealthCheck>("database");
 

API/Services/Email/EmailServiceExtension.cs

@@ -6,7 +6,7 @@ namespace OpenShock.API.Services.Email;
 
 public static class EmailServiceExtension
 {
-    public static WebApplicationBuilder AddEmailService(this WebApplicationBuilder builder)
+    public static async Task<WebApplicationBuilder> AddEmailService(this WebApplicationBuilder builder)
     {
         var mailOptions = builder.Configuration.GetRequiredSection(MailOptions.SectionName).Get<MailOptions>() ?? throw new NullReferenceException();
 
@@ -18,7 +18,7 @@ public static WebApplicationBuilder AddEmailService(this WebApplicationBuilder b
 
         // Add sender contact configuration
         builder.AddSenderContactConfiguration();
-        builder.AddEmailServiceTemplates();
+        await builder.AddEmailServiceTemplates();
 
         switch (mailOptions.Type)
         {
@@ -41,14 +41,21 @@ private static WebApplicationBuilder AddSenderContactConfiguration(this WebAppli
         return builder;
     }
 
-    private static WebApplicationBuilder AddEmailServiceTemplates(this WebApplicationBuilder builder)
+    private static async Task<WebApplicationBuilder> AddEmailServiceTemplates(this WebApplicationBuilder builder)
     {
+        var accountActivation = EmailTemplate.ParseFromFileThrow("SmtpTemplates/AccountActivation.liquid");
+        var passwordReset = EmailTemplate.ParseFromFileThrow("SmtpTemplates/PasswordReset.liquid");
+        var emailVerification = EmailTemplate.ParseFromFileThrow("SmtpTemplates/EmailVerification.liquid");
+        var emailChangeNotice = EmailTemplate.ParseFromFileThrow("SmtpTemplates/EmailChangeNotice.liquid");
+
+        await Task.WhenAll(accountActivation, passwordReset, emailVerification, emailChangeNotice);
+
         builder.Services.AddSingleton(new EmailServiceTemplates
         {
-            AccountActivation = EmailTemplate.ParseFromFileThrow("SmtpTemplates/AccountActivation.liquid").Result,
-            PasswordReset = EmailTemplate.ParseFromFileThrow("SmtpTemplates/PasswordReset.liquid").Result,
-            EmailVerification = EmailTemplate.ParseFromFileThrow("SmtpTemplates/EmailVerification.liquid").Result,
-            EmailChangeNotice = EmailTemplate.ParseFromFileThrow("SmtpTemplates/EmailChangeNotice.liquid").Result,
+            AccountActivation = await accountActivation,
+            PasswordReset = await passwordReset,
+            EmailVerification = await emailVerification,
+            EmailChangeNotice = await emailChangeNotice,
         });
         return builder;
     }

API/Services/Email/EmailTemplate.cs

@@ -30,14 +30,13 @@ private static TemplateOptions CreateOptions()
     public static async Task<EmailTemplate> ParseFromFileThrow(string filePath)
     {
         var result = await ParseFromFile(filePath);
-        if (result.IsT0) return result.AsT0;
-        throw new InvalidDataException(result.AsT1);
+        return result.IsT0 ? result.AsT0 : throw new InvalidDataException(result.AsT1);
     }
 
-    public static Task<OneOf.OneOf<EmailTemplate, string>> ParseFromFile(string filePath) =>
+    private static Task<OneOf.OneOf<EmailTemplate, string>> ParseFromFile(string filePath) =>
         ParseFromFile(File.OpenRead(filePath));
 
-    public static async Task<OneOf.OneOf<EmailTemplate, string>> ParseFromFile(FileStream fileStream)
+    private static async Task<OneOf.OneOf<EmailTemplate, string>> ParseFromFile(FileStream fileStream)
     {
         using var streamReader = new StreamReader(fileStream);
         var subject = await streamReader.ReadLineAsync();