From 48ea38a21830b62110218b57cc6d30d16c40fbaf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Halil=20=C4=B0brahim=20Kalkan?= <hi_kalkan@yahoo.com>
Date: Thu, 30 Jul 2020 18:31:02 +0300
Subject: [PATCH] Resolved #4929: Replace IEmailSender with NullEmailSender on
 DEBUG for the application template

---
 .../MyCompanyName.MyProjectName.Domain.csproj      |  1 +
 .../MyProjectNameDomainModule.cs                   | 14 +++++++++++---
 .../appsettings.json                               | 11 -----------
 3 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Domain/MyCompanyName.MyProjectName.Domain.csproj b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Domain/MyCompanyName.MyProjectName.Domain.csproj
index 5f7dc8c7b0..415647a729 100644
--- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Domain/MyCompanyName.MyProjectName.Domain.csproj
+++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Domain/MyCompanyName.MyProjectName.Domain.csproj
@@ -12,6 +12,7 @@
   </ItemGroup>
 
   <ItemGroup>
+    <ProjectReference Include="..\..\..\..\..\framework\src\Volo.Abp.Emailing\Volo.Abp.Emailing.csproj" />
     <ProjectReference Include="..\..\..\..\..\modules\identity\src\Volo.Abp.Identity.Domain\Volo.Abp.Identity.Domain.csproj" />
     <ProjectReference Include="..\..\..\..\..\modules\identity\src\Volo.Abp.PermissionManagement.Domain.Identity\Volo.Abp.PermissionManagement.Domain.Identity.csproj" />
     <ProjectReference Include="..\..\..\..\..\modules\identityserver\src\Volo.Abp.IdentityServer.Domain\Volo.Abp.IdentityServer.Domain.csproj" />
diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Domain/MyProjectNameDomainModule.cs b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Domain/MyProjectNameDomainModule.cs
index 84e7f88791..014594801f 100644
--- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Domain/MyProjectNameDomainModule.cs
+++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Domain/MyProjectNameDomainModule.cs
@@ -1,7 +1,10 @@
-using MyCompanyName.MyProjectName.MultiTenancy;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.DependencyInjection.Extensions;
+using MyCompanyName.MyProjectName.MultiTenancy;
 using MyCompanyName.MyProjectName.ObjectExtending;
 using Volo.Abp.AuditLogging;
 using Volo.Abp.BackgroundJobs;
+using Volo.Abp.Emailing;
 using Volo.Abp.FeatureManagement;
 using Volo.Abp.Identity;
 using Volo.Abp.IdentityServer;
@@ -24,8 +27,9 @@ namespace MyCompanyName.MyProjectName
         typeof(AbpIdentityServerDomainModule),
         typeof(AbpPermissionManagementDomainIdentityServerModule),
         typeof(AbpSettingManagementDomainModule),
-        typeof(AbpTenantManagementDomainModule)
-        )]
+        typeof(AbpTenantManagementDomainModule),
+        typeof(AbpEmailingModule)
+    )]
     public class MyProjectNameDomainModule : AbpModule
     {
         public override void PreConfigureServices(ServiceConfigurationContext context)
@@ -39,6 +43,10 @@ namespace MyCompanyName.MyProjectName
             {
                 options.IsEnabled = MultiTenancyConsts.IsEnabled;
             });
+
+#if DEBUG
+            context.Services.Replace(ServiceDescriptor.Singleton<IEmailSender, NullEmailSender>());
+#endif
         }
     }
 }
diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/appsettings.json b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/appsettings.json
index 18e3e01313..e9330b776e 100644
--- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/appsettings.json
+++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/appsettings.json
@@ -14,16 +14,5 @@
     "Authority": "https://localhost:44301",
     "ClientId": "MyProjectName_Web",
     "ClientSecret": "1q2w3e*"
-  },
-  "Settings": {
-    "Abp.Mailing.Smtp.Host": "127.0.0.1",
-    "Abp.Mailing.Smtp.Port": "25",
-    "Abp.Mailing.Smtp.UserName": "",
-    "Abp.Mailing.Smtp.Password": "",
-    "Abp.Mailing.Smtp.Domain": "",
-    "Abp.Mailing.Smtp.EnableSsl": "false",
-    "Abp.Mailing.Smtp.UseDefaultCredentials": "true",
-    "Abp.Mailing.DefaultFromAddress": "noreply@abp.io",
-    "Abp.Mailing.DefaultFromDisplayName": "ABP application"
   }
 }