Merge pull request #315 from GregFinzer/ChangeEmailProvider

Change Email Provider
GregFinzer · Aug 16, 2024 · 8007afc · 8007afc
2 parents 8dac98e + 9c9c13b
commit 8007afc
Show file tree

Hide file tree

Showing 18 changed files with 1,359 additions and 108 deletions.
diff --git a/BedBrigade.Client/Components/Pages/Administration/Admin/Email.razor.cs b/BedBrigade.Client/Components/Pages/Administration/Admin/Email.razor.cs
@@ -43,8 +43,8 @@ protected override async Task OnInitializedAsync()
                 Model.EmailRecipientOptions = EnumHelper.GetEnumNameValues<EmailRecipientOption>().Where(x => x.Value != EmailRecipientOption.Everyone).ToList();
             }
 
-            Model.CurrentEmailRecipientOption = EmailRecipientOption.BedBrigadeLeadersForLocation;
-            Model.ShowLocationDropdown = isNationalAdmin;
+            Model.CurrentEmailRecipientOption = EmailRecipientOption.Myself;
+            Model.ShowLocationDropdown = false;
             Model.ShowEventDropdown = false;
             await BuildPlan();
         }

diff --git a/BedBrigade.Client/Program.cs b/BedBrigade.Client/Program.cs
@@ -8,5 +8,5 @@
 await StartupLogic.SetupDatabase(app);
 await StartupLogic.SetupCaching(app);
 //TODO:  Renable later
-//StartupLogic.SetupEmailQueueProcessing(app);
+StartupLogic.SetupEmailQueueProcessing(app);
 app.Run();
diff --git a/BedBrigade.Client/appsettings.Development.json b/BedBrigade.Client/appsettings.Development.json
@@ -35,15 +35,5 @@
         }
       }
     ]
-  },
-  "EmailConfiguration": {
-    "From": "noreply@bedbrigade.org",
-    "SmtpServer": "localhost",
-    "Port": 25,
-    "UserName": "national.admin@bedbrigade.org",
-    "Password": "Password",
-    "EnableSsl": false,
-    "UseFileMock": true,
-    "FileMockPath": "..\\logs\\EmailFileMock.txt"
   }
 }
diff --git a/BedBrigade.Client/appsettings.Local.json b/BedBrigade.Client/appsettings.Local.json
@@ -35,15 +35,5 @@
         }
       }
     ]
-  },
-  "EmailConfiguration": {
-    "From": "noreply@bedbrigade.org",
-    "SmtpServer": "localhost",
-    "Port": 25,
-    "UserName": "national.admin@bedbrigade.org",
-    "Password": "Password",
-    "EnableSsl": false,
-    "UseFileMock": true,
-    "FileMockPath": "..\\logs\\EmailFileMock.txt"
   }
 }
diff --git a/BedBrigade.Client/appsettings.Production.json b/BedBrigade.Client/appsettings.Production.json
@@ -35,15 +35,5 @@
         }
       }
     ]
-  },
-  "EmailConfiguration": {
-    "From": "noreply@bedbrigade.org",
-    "SmtpServer": "localhost",
-    "Port": 25,
-    "UserName": "national.admin@bedbrigade.org",
-    "Password": "Password",
-    "EnableSsl": false,
-    "UseFileMock": true,
-    "FileMockPath": "..\\logs\\EmailFileMock.txt"
   }
 }
diff --git a/BedBrigade.Client/appsettings.json b/BedBrigade.Client/appsettings.json
@@ -35,15 +35,5 @@
         }
       }
     ]
-  },
-  "EmailConfiguration": {
-    "From": "noreply@bedbrigade.org",
-    "SmtpServer": "localhost",
-    "Port": 25,
-    "UserName": "national.admin@bedbrigade.org",
-    "Password": "Password",
-    "EnableSsl": false,
-    "UseFileMock": true,
-    "FileMockPath": "../logs/EmailFileMock.txt"
   }
 }
diff --git a/BedBrigade.Common/Constants/ConfigNames.cs b/BedBrigade.Common/Constants/ConfigNames.cs
@@ -2,6 +2,23 @@
 {
     public static class ConfigNames
     {
+        //System
+        public const string TokenExpiration = "TokenExpiration";
+        public const string ReCaptchaSecret = "ReCaptchaSecret";
+        public const string ReCaptchaSiteKey = "ReCaptchaSiteKey";
+        public const string IsCachingEnabled = "IsCachingEnabled";
+        public const string BedBrigadeNearMeMaxMiles = "BedBrigadeNearMeMaxMiles";
+        public const string DisplayIdFields = "DisplayIdFields";
+        public const string EmptyGridText = "EmptyGridText";
+
+        //Media
+        public const string AllowedFileExtensions = "AllowedFileExtensions";
+        public const string AllowedVideoExtensions = "AllowedVideoExtensions";
+        public const string MediaFolder = "MediaFolder";
+        public const string MainMediaSubFolder = "MainMediaSubFolder";
+        public const string MaxFileSize = "MaxFileSize";
+        public const string MaxVideoSize = "MaxVideoSize";
+
         //Email Section
         public const string FromEmailAddress = "FromEmailAddress";
         public const string FromEmailDisplayName = "FromEmailDisplayName";
@@ -16,20 +33,11 @@ public static class ConfigNames
         public const string EmailKeepDays = "EmailKeepDays";
         public const string EmailMaxPerChunk = "EmailMaxPerChunk";
         public const string EmailUseFileMock = "EmailUseFileMock";
+        public const string EmailHost = "EmailHost";
+        public const string EmailPort = "EmailPort";
+        public const string EmailUserName = "EmailUserName";
+        public const string EmailPassword = "EmailPassword";
 
-        //Other
-        public const string TokenExpiration = "TokenExpiration";
-        public const string AllowedFileExtensions = "AllowedFileExtensions";
-        public const string AllowedVideoExtensions = "AllowedVideoExtensions";
-        public const string MediaFolder = "MediaFolder";
-        public const string MainMediaSubFolder = "MainMediaSubFolder";
-        public const string MaxFileSize = "MaxFileSize";
-        public const string MaxVideoSize = "MaxVideoSize";
-        public const string IsCachingEnabled = "IsCachingEnabled";
-        public const string BedBrigadeNearMeMaxMiles = "BedBrigadeNearMeMaxMiles";
-        public const string ReCaptchaSecret = "ReCaptchaSecret";
-        public const string ReCaptchaSiteKey = "ReCaptchaSiteKey";
-        public const string DisplayIdFields = "DisplayIdFields";
-        public const string EmptyGridText = "EmptyGridText";
+
     }
 }
diff --git a/BedBrigade.Common/Enums/EmailRecipientOption.cs b/BedBrigade.Common/Enums/EmailRecipientOption.cs
@@ -9,6 +9,8 @@ namespace BedBrigade.Common.Enums
 {
     public enum EmailRecipientOption
     {
+        [Description("Myself (used for testing)")]
+        Myself,
         [Description("Bed Brigade Leaders Nationwide")]
         BedBrigadeLeadersNationwide,
         [Description("Bed Brigade Leaders for Location")]

diff --git a/BedBrigade.Common/Models/EmailQueue.cs b/BedBrigade.Common/Models/EmailQueue.cs
@@ -16,9 +16,15 @@ public class EmailQueue : BaseEntity
         [Required, MaxLength(100)]
         public string FromAddress { get; set; } = string.Empty;
 
+        [MaxLength(100)]
+        public string? ReplyToAddress { get; set; }
+
         [Required, MaxLength(100)]
         public string ToAddress { get; set; } = string.Empty;
 
+        [MaxLength(100)]
+        public string? ToDisplayName { get; set; }
+
         [Required, MaxLength(100)]
         public string Subject { get; set; } = string.Empty;
 

diff --git a/BedBrigade.Data/BedBrigade.Data.csproj b/BedBrigade.Data/BedBrigade.Data.csproj
@@ -49,7 +49,6 @@
 
 
     <ItemGroup>
-    <PackageReference Include="Azure.Communication.Email" Version="1.0.1" />
     <PackageReference Include="BetterAddressParser" Version="1.18.0" />
     <PackageReference Include="Blazored.SessionStorage" Version="2.4.0" />
     <PackageReference Include="EntityFramework" Version="6.5.1" />

diff --git a/BedBrigade.Data/Data/Seeding/Seed.cs b/BedBrigade.Data/Data/Seeding/Seed.cs
@@ -216,12 +216,6 @@ private static async Task SeedConfigurations(IDbContextFactory<DataContext> cont
             Log.Logger.Information("No configurations found, adding");
             var configurations = new List<Configuration>
             {
-                new()
-                {
-                    ConfigurationKey = ConfigNames.FromEmailAddress,
-                    ConfigurationValue = "DoNotReply@89a27aba-71cb-4968-863a-b1e5203187d5.azurecomm.net",
-                    Section = ConfigSection.Email
-                },
                 new()
                 {
                     ConfigurationKey = ConfigNames.TokenExpiration,
@@ -289,6 +283,12 @@ private static async Task SeedConfigurations(IDbContextFactory<DataContext> cont
                     Section = ConfigSection.System
                 },
                 new()
+                {
+                    ConfigurationKey = ConfigNames.FromEmailAddress,
+                    ConfigurationValue = "devtest@bedbrigadecolumbus.org",
+                    Section = ConfigSection.Email
+                },
+                new()
                 {
                     ConfigurationKey = ConfigNames.EmailBeginHour,
                     ConfigurationValue = "0",
@@ -361,6 +361,30 @@ private static async Task SeedConfigurations(IDbContextFactory<DataContext> cont
                     Section = ConfigSection.Email
                 },
                 new()
+                {
+                    ConfigurationKey = ConfigNames.EmailHost,
+                    ConfigurationValue = "mail5019.site4now.net",
+                    Section = ConfigSection.Email
+                },
+                new()
+                {
+                    ConfigurationKey = ConfigNames.EmailPort,
+                    ConfigurationValue = "8889",
+                    Section = ConfigSection.Email
+                },
+                new()
+                {
+                    ConfigurationKey = ConfigNames.EmailUserName,
+                    ConfigurationValue = "devtest@bedbrigadecolumbus.org",
+                    Section = ConfigSection.Email
+                },
+                new()
+                {
+                    ConfigurationKey = ConfigNames.EmailPassword,
+                    ConfigurationValue = "AskGregForPassword",
+                    Section = ConfigSection.Email
+                },
+                new()
                 {
                     ConfigurationKey = ConfigNames.DisplayIdFields,
                     ConfigurationValue = "No",