diff --git a/Providers/Resgrid.Providers.Email/PostmarkEmailSender.cs b/Providers/Resgrid.Providers.Email/PostmarkEmailSender.cs index d797b39a..06a32414 100644 --- a/Providers/Resgrid.Providers.Email/PostmarkEmailSender.cs +++ b/Providers/Resgrid.Providers.Email/PostmarkEmailSender.cs @@ -65,10 +65,7 @@ public async Task Send(Email email) { if (SystemBehaviorConfig.OutboundEmailType == OutboundEmailTypes.Postmark) { - if (mail.From != null && mail.From.Address.Contains("resgrid.com") && mail.From.Address != "systemlist@resgrid.com" && - mail.From.Address != "systemcheck@resgrid.com" && mail.From.Address != "systemcheck2@resgrid.com" && - email.To.First() != "systemlist@resgrid.com" && - email.To.First() != "systemcheck@resgrid.com" && email.To.First() != "systemcheck2@resgrid.com") + if (mail.From != null && !String.IsNullOrWhiteSpace(mail.From.Address)) { var to = new StringBuilder(); foreach (var t in email.To) diff --git a/Providers/Resgrid.Providers.Whatsapp/Class1.cs b/Providers/Resgrid.Providers.Messaging/Class1.cs similarity index 100% rename from Providers/Resgrid.Providers.Whatsapp/Class1.cs rename to Providers/Resgrid.Providers.Messaging/Class1.cs diff --git a/Providers/Resgrid.Providers.Whatsapp/Resgrid.Providers.Messaging.csproj b/Providers/Resgrid.Providers.Messaging/Resgrid.Providers.Messaging.csproj similarity index 100% rename from Providers/Resgrid.Providers.Whatsapp/Resgrid.Providers.Messaging.csproj rename to Providers/Resgrid.Providers.Messaging/Resgrid.Providers.Messaging.csproj diff --git a/Resgrid.sln b/Resgrid.sln index 3447b276..77ed4a81 100644 --- a/Resgrid.sln +++ b/Resgrid.sln @@ -86,7 +86,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Resgrid.Repositories.NoSqlR EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Resgrid.Localization", "Core\Resgrid.Localization\Resgrid.Localization.csproj", "{E39D63BA-5CCA-43EC-A3F9-375FA87EFE2F}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Resgrid.Providers.Messaging", "Providers\Resgrid.Providers.Whatsapp\Resgrid.Providers.Messaging.csproj", "{DF0E7C31-64AF-4935-9441-F3162586AFA4}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Resgrid.Providers.Messaging", "Providers\Resgrid.Providers.Messaging\Resgrid.Providers.Messaging.csproj", "{B4D75669-B70B-4B75-8AB9-0B64D0176E2B}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -800,30 +800,30 @@ Global {E39D63BA-5CCA-43EC-A3F9-375FA87EFE2F}.Staging|Any CPU.Build.0 = Debug|Any CPU {E39D63BA-5CCA-43EC-A3F9-375FA87EFE2F}.Staging|x86.ActiveCfg = Debug|Any CPU {E39D63BA-5CCA-43EC-A3F9-375FA87EFE2F}.Staging|x86.Build.0 = Debug|Any CPU - {DF0E7C31-64AF-4935-9441-F3162586AFA4}.Azure|Any CPU.ActiveCfg = Debug|Any CPU - {DF0E7C31-64AF-4935-9441-F3162586AFA4}.Azure|Any CPU.Build.0 = Debug|Any CPU - {DF0E7C31-64AF-4935-9441-F3162586AFA4}.Azure|x86.ActiveCfg = Debug|Any CPU - {DF0E7C31-64AF-4935-9441-F3162586AFA4}.Azure|x86.Build.0 = Debug|Any CPU - {DF0E7C31-64AF-4935-9441-F3162586AFA4}.Cloud|Any CPU.ActiveCfg = Debug|Any CPU - {DF0E7C31-64AF-4935-9441-F3162586AFA4}.Cloud|Any CPU.Build.0 = Debug|Any CPU - {DF0E7C31-64AF-4935-9441-F3162586AFA4}.Cloud|x86.ActiveCfg = Debug|Any CPU - {DF0E7C31-64AF-4935-9441-F3162586AFA4}.Cloud|x86.Build.0 = Debug|Any CPU - {DF0E7C31-64AF-4935-9441-F3162586AFA4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DF0E7C31-64AF-4935-9441-F3162586AFA4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DF0E7C31-64AF-4935-9441-F3162586AFA4}.Debug|x86.ActiveCfg = Debug|Any CPU - {DF0E7C31-64AF-4935-9441-F3162586AFA4}.Debug|x86.Build.0 = Debug|Any CPU - {DF0E7C31-64AF-4935-9441-F3162586AFA4}.Docker|Any CPU.ActiveCfg = Debug|Any CPU - {DF0E7C31-64AF-4935-9441-F3162586AFA4}.Docker|Any CPU.Build.0 = Debug|Any CPU - {DF0E7C31-64AF-4935-9441-F3162586AFA4}.Docker|x86.ActiveCfg = Debug|Any CPU - {DF0E7C31-64AF-4935-9441-F3162586AFA4}.Docker|x86.Build.0 = Debug|Any CPU - {DF0E7C31-64AF-4935-9441-F3162586AFA4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DF0E7C31-64AF-4935-9441-F3162586AFA4}.Release|Any CPU.Build.0 = Release|Any CPU - {DF0E7C31-64AF-4935-9441-F3162586AFA4}.Release|x86.ActiveCfg = Release|Any CPU - {DF0E7C31-64AF-4935-9441-F3162586AFA4}.Release|x86.Build.0 = Release|Any CPU - {DF0E7C31-64AF-4935-9441-F3162586AFA4}.Staging|Any CPU.ActiveCfg = Debug|Any CPU - {DF0E7C31-64AF-4935-9441-F3162586AFA4}.Staging|Any CPU.Build.0 = Debug|Any CPU - {DF0E7C31-64AF-4935-9441-F3162586AFA4}.Staging|x86.ActiveCfg = Debug|Any CPU - {DF0E7C31-64AF-4935-9441-F3162586AFA4}.Staging|x86.Build.0 = Debug|Any CPU + {B4D75669-B70B-4B75-8AB9-0B64D0176E2B}.Azure|Any CPU.ActiveCfg = Debug|Any CPU + {B4D75669-B70B-4B75-8AB9-0B64D0176E2B}.Azure|Any CPU.Build.0 = Debug|Any CPU + {B4D75669-B70B-4B75-8AB9-0B64D0176E2B}.Azure|x86.ActiveCfg = Debug|Any CPU + {B4D75669-B70B-4B75-8AB9-0B64D0176E2B}.Azure|x86.Build.0 = Debug|Any CPU + {B4D75669-B70B-4B75-8AB9-0B64D0176E2B}.Cloud|Any CPU.ActiveCfg = Debug|Any CPU + {B4D75669-B70B-4B75-8AB9-0B64D0176E2B}.Cloud|Any CPU.Build.0 = Debug|Any CPU + {B4D75669-B70B-4B75-8AB9-0B64D0176E2B}.Cloud|x86.ActiveCfg = Debug|Any CPU + {B4D75669-B70B-4B75-8AB9-0B64D0176E2B}.Cloud|x86.Build.0 = Debug|Any CPU + {B4D75669-B70B-4B75-8AB9-0B64D0176E2B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B4D75669-B70B-4B75-8AB9-0B64D0176E2B}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B4D75669-B70B-4B75-8AB9-0B64D0176E2B}.Debug|x86.ActiveCfg = Debug|Any CPU + {B4D75669-B70B-4B75-8AB9-0B64D0176E2B}.Debug|x86.Build.0 = Debug|Any CPU + {B4D75669-B70B-4B75-8AB9-0B64D0176E2B}.Docker|Any CPU.ActiveCfg = Debug|Any CPU + {B4D75669-B70B-4B75-8AB9-0B64D0176E2B}.Docker|Any CPU.Build.0 = Debug|Any CPU + {B4D75669-B70B-4B75-8AB9-0B64D0176E2B}.Docker|x86.ActiveCfg = Debug|Any CPU + {B4D75669-B70B-4B75-8AB9-0B64D0176E2B}.Docker|x86.Build.0 = Debug|Any CPU + {B4D75669-B70B-4B75-8AB9-0B64D0176E2B}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B4D75669-B70B-4B75-8AB9-0B64D0176E2B}.Release|Any CPU.Build.0 = Release|Any CPU + {B4D75669-B70B-4B75-8AB9-0B64D0176E2B}.Release|x86.ActiveCfg = Release|Any CPU + {B4D75669-B70B-4B75-8AB9-0B64D0176E2B}.Release|x86.Build.0 = Release|Any CPU + {B4D75669-B70B-4B75-8AB9-0B64D0176E2B}.Staging|Any CPU.ActiveCfg = Debug|Any CPU + {B4D75669-B70B-4B75-8AB9-0B64D0176E2B}.Staging|Any CPU.Build.0 = Debug|Any CPU + {B4D75669-B70B-4B75-8AB9-0B64D0176E2B}.Staging|x86.ActiveCfg = Debug|Any CPU + {B4D75669-B70B-4B75-8AB9-0B64D0176E2B}.Staging|x86.Build.0 = Debug|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -858,12 +858,12 @@ Global {FFCBA7D4-853A-4D25-935B-F242851752EE} = {F06D475C-635C-4DE4-82BA-C49A90BA8FCD} {086A3F5A-F7D3-4E38-B9CD-B422DD3A709E} = {206D5D48-99B0-4913-B1E2-4BA11D021740} {E39D63BA-5CCA-43EC-A3F9-375FA87EFE2F} = {D43D1D6B-66A9-4A57-9EA3-8DECC92FA583} - {DF0E7C31-64AF-4935-9441-F3162586AFA4} = {F06D475C-635C-4DE4-82BA-C49A90BA8FCD} + {B4D75669-B70B-4B75-8AB9-0B64D0176E2B} = {F06D475C-635C-4DE4-82BA-C49A90BA8FCD} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution - EnterpriseLibraryConfigurationToolBinariesPath = packages\Unity.2.1.505.2\lib\NET35;packages\Unity.Interception.2.1.505.2\lib\NET35;packages\EnterpriseLibrary.Common.5.0.505.0\lib\NET35;packages\TransientFaultHandling.Core.5.1.1209.1\lib\NET4;packages\EnterpriseLibrary.WindowsAzure.TransientFaultHandling.5.1.1212.0\lib\NET4;packages\EnterpriseLibrary.WindowsAzure.TransientFaultHandling.5.1.1212.0\DesignTime - EnterpriseLibraryConfigurationToolBinariesPathV6 = packages\EnterpriseLibrary.Common.6.0.1304.0\lib\NET45 SolutionGuid = {156116FF-243E-45E8-8717-DB72E95F56AF} + EnterpriseLibraryConfigurationToolBinariesPathV6 = packages\EnterpriseLibrary.Common.6.0.1304.0\lib\NET45 + EnterpriseLibraryConfigurationToolBinariesPath = packages\Unity.2.1.505.2\lib\NET35;packages\Unity.Interception.2.1.505.2\lib\NET35;packages\EnterpriseLibrary.Common.5.0.505.0\lib\NET35;packages\TransientFaultHandling.Core.5.1.1209.1\lib\NET4;packages\EnterpriseLibrary.WindowsAzure.TransientFaultHandling.5.1.1212.0\lib\NET4;packages\EnterpriseLibrary.WindowsAzure.TransientFaultHandling.5.1.1212.0\DesignTime EndGlobalSection GlobalSection(CodealikeProperties) = postSolution SolutionGuid = 73e3ec62-fcea-43a4-b9ac-380e73a81ae7