jcreek/aspnetcore5-with-postgres-identity-serilog-elasticsearch
1
0
Fork 0
mirror of https://github.com/jcreek/aspnetcore5-with-postgres-identity-serilog-elasticsearch.git synced 2026-07-12 18:33:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor(*): Move EmailService inside the main project

Browse Source
This commit is contained in:
Josh Creek
2021-04-04 09:33:42 +01:00
parent 142c48323c
commit b89a7ab7aa
13 changed files with 23 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
EmailService/EmailService.csproj
-12
View File
@@ -1,12 +0,0 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net5.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Http.Features" Version="5.0.4" />
<PackageReference Include="NETCore.MailKit" Version="2.0.3" />
</ItemGroup>
</Project>
My.ProjectName.sln
-6
View File
@@ -5,8 +5,6 @@ VisualStudioVersion = 16.0.31025.194
MinimumVisualStudioVersion = 10.0.40219.1 MinimumVisualStudioVersion = 10.0.40219.1
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "My.ProjectName", "My.ProjectName\My.ProjectName.csproj", "{DAEED4B6-860F-4622-AE3E-7084CF5A48EF}" Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "My.ProjectName", "My.ProjectName\My.ProjectName.csproj", "{DAEED4B6-860F-4622-AE3E-7084CF5A48EF}"
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EmailService", "EmailService\EmailService.csproj", "{3B7004B2-126B-4458-BA25-3B2F65E28F6E}"
EndProject
Global Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU Debug|Any CPU = Debug|Any CPU
@@ -17,10 +15,6 @@ Global
{DAEED4B6-860F-4622-AE3E-7084CF5A48EF}.Debug|Any CPU.Build.0 = Debug|Any CPU {DAEED4B6-860F-4622-AE3E-7084CF5A48EF}.Debug|Any CPU.Build.0 = Debug|Any CPU
{DAEED4B6-860F-4622-AE3E-7084CF5A48EF}.Release|Any CPU.ActiveCfg = Release|Any CPU {DAEED4B6-860F-4622-AE3E-7084CF5A48EF}.Release|Any CPU.ActiveCfg = Release|Any CPU
{DAEED4B6-860F-4622-AE3E-7084CF5A48EF}.Release|Any CPU.Build.0 = Release|Any CPU {DAEED4B6-860F-4622-AE3E-7084CF5A48EF}.Release|Any CPU.Build.0 = Release|Any CPU
{3B7004B2-126B-4458-BA25-3B2F65E28F6E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{3B7004B2-126B-4458-BA25-3B2F65E28F6E}.Debug|Any CPU.Build.0 = Debug|Any CPU
{3B7004B2-126B-4458-BA25-3B2F65E28F6E}.Release|Any CPU.ActiveCfg = Release|Any CPU
{3B7004B2-126B-4458-BA25-3B2F65E28F6E}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection EndGlobalSection
GlobalSection(SolutionProperties) = preSolution GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE HideSolutionNode = FALSE
My.ProjectName/Areas/Identity/Pages/Account/ExternalLogin.cshtml.cs
+3 -3
View File
@@ -13,7 +13,7 @@ using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Mvc.RazorPages; using Microsoft.AspNetCore.Mvc.RazorPages;
using Microsoft.AspNetCore.WebUtilities; using Microsoft.AspNetCore.WebUtilities;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
using EmailService; using My.ProjectName.Services.EmailService;
namespace My.ProjectName.Areas.Identity.Pages.Account namespace My.ProjectName.Areas.Identity.Pages.Account
{ {
@@ -22,14 +22,14 @@ namespace My.ProjectName.Areas.Identity.Pages.Account
{ {
private readonly SignInManager<IdentityUser> _signInManager; private readonly SignInManager<IdentityUser> _signInManager;
private readonly UserManager<IdentityUser> _userManager; private readonly UserManager<IdentityUser> _userManager;
private readonly EmailService.IEmailSender _emailSender; private readonly Services.EmailService.IEmailSender _emailSender;
private readonly ILogger<ExternalLoginModel> _logger; private readonly ILogger<ExternalLoginModel> _logger;
public ExternalLoginModel( public ExternalLoginModel(
SignInManager<IdentityUser> signInManager, SignInManager<IdentityUser> signInManager,
UserManager<IdentityUser> userManager, UserManager<IdentityUser> userManager,
ILogger<ExternalLoginModel> logger, ILogger<ExternalLoginModel> logger,
EmailService.IEmailSender emailSender) Services.EmailService.IEmailSender emailSender)
{ {
_signInManager = signInManager; _signInManager = signInManager;
_userManager = userManager; _userManager = userManager;
My.ProjectName/Areas/Identity/Pages/Account/ForgotPassword.cshtml.cs
+3 -3
View File
@@ -10,7 +10,7 @@ using Microsoft.AspNetCore.Identity.UI.Services;
using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Mvc.RazorPages; using Microsoft.AspNetCore.Mvc.RazorPages;
using Microsoft.AspNetCore.WebUtilities; using Microsoft.AspNetCore.WebUtilities;
using EmailService; using My.ProjectName.Services.EmailService;
namespace My.ProjectName.Areas.Identity.Pages.Account namespace My.ProjectName.Areas.Identity.Pages.Account
{ {
@@ -18,9 +18,9 @@ namespace My.ProjectName.Areas.Identity.Pages.Account
public class ForgotPasswordModel : PageModel public class ForgotPasswordModel : PageModel
{ {
private readonly UserManager<IdentityUser> _userManager; private readonly UserManager<IdentityUser> _userManager;
private readonly EmailService.IEmailSender _emailSender; private readonly Services.EmailService.IEmailSender _emailSender;
public ForgotPasswordModel(UserManager<IdentityUser> userManager, EmailService.IEmailSender emailSender) public ForgotPasswordModel(UserManager<IdentityUser> userManager, Services.EmailService.IEmailSender emailSender)
{ {
_userManager = userManager; _userManager = userManager;
_emailSender = emailSender; _emailSender = emailSender;
My.ProjectName/Areas/Identity/Pages/Account/Manage/Email.cshtml.cs
+3 -3
View File
@@ -10,7 +10,7 @@ using Microsoft.AspNetCore.Identity.UI.Services;
using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Mvc.RazorPages; using Microsoft.AspNetCore.Mvc.RazorPages;
using Microsoft.AspNetCore.WebUtilities; using Microsoft.AspNetCore.WebUtilities;
using EmailService; using My.ProjectName.Services.EmailService;
namespace My.ProjectName.Areas.Identity.Pages.Account.Manage namespace My.ProjectName.Areas.Identity.Pages.Account.Manage
{ {
@@ -18,12 +18,12 @@ namespace My.ProjectName.Areas.Identity.Pages.Account.Manage
{ {
private readonly UserManager<IdentityUser> _userManager; private readonly UserManager<IdentityUser> _userManager;
private readonly SignInManager<IdentityUser> _signInManager; private readonly SignInManager<IdentityUser> _signInManager;
private readonly EmailService.IEmailSender _emailSender; private readonly Services.EmailService.IEmailSender _emailSender;
public EmailModel( public EmailModel(
UserManager<IdentityUser> userManager, UserManager<IdentityUser> userManager,
SignInManager<IdentityUser> signInManager, SignInManager<IdentityUser> signInManager,
EmailService.IEmailSender emailSender) Services.EmailService.IEmailSender emailSender)
{ {
_userManager = userManager; _userManager = userManager;
_signInManager = signInManager; _signInManager = signInManager;
My.ProjectName/Areas/Identity/Pages/Account/Register.cshtml.cs
+3 -3
View File
@@ -13,7 +13,7 @@ using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Mvc.RazorPages; using Microsoft.AspNetCore.Mvc.RazorPages;
using Microsoft.AspNetCore.WebUtilities; using Microsoft.AspNetCore.WebUtilities;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
using EmailService; using My.ProjectName.Services.EmailService;
namespace My.ProjectName.Areas.Identity.Pages.Account namespace My.ProjectName.Areas.Identity.Pages.Account
{ {
@@ -23,13 +23,13 @@ namespace My.ProjectName.Areas.Identity.Pages.Account
private readonly SignInManager<IdentityUser> _signInManager; private readonly SignInManager<IdentityUser> _signInManager;
private readonly UserManager<IdentityUser> _userManager; private readonly UserManager<IdentityUser> _userManager;
private readonly ILogger<RegisterModel> _logger; private readonly ILogger<RegisterModel> _logger;
private readonly EmailService.IEmailSender _emailSender; private readonly Services.EmailService.IEmailSender _emailSender;
public RegisterModel( public RegisterModel(
UserManager<IdentityUser> userManager, UserManager<IdentityUser> userManager,
SignInManager<IdentityUser> signInManager, SignInManager<IdentityUser> signInManager,
ILogger<RegisterModel> logger, ILogger<RegisterModel> logger,
EmailService.IEmailSender emailSender) Services.EmailService.IEmailSender emailSender)
{ {
_userManager = userManager; _userManager = userManager;
_signInManager = signInManager; _signInManager = signInManager;
My.ProjectName/Areas/Identity/Pages/Account/ResendEmailConfirmation.cshtml.cs
+3 -3
View File
@@ -10,7 +10,7 @@ using Microsoft.AspNetCore.Identity.UI.Services;
using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Mvc.RazorPages; using Microsoft.AspNetCore.Mvc.RazorPages;
using Microsoft.AspNetCore.WebUtilities; using Microsoft.AspNetCore.WebUtilities;
using EmailService; using My.ProjectName.Services.EmailService;
namespace My.ProjectName.Areas.Identity.Pages.Account namespace My.ProjectName.Areas.Identity.Pages.Account
{ {
@@ -18,9 +18,9 @@ namespace My.ProjectName.Areas.Identity.Pages.Account
public class ResendEmailConfirmationModel : PageModel public class ResendEmailConfirmationModel : PageModel
{ {
private readonly UserManager<IdentityUser> _userManager; private readonly UserManager<IdentityUser> _userManager;
private readonly EmailService.IEmailSender _emailSender; private readonly Services.EmailService.IEmailSender _emailSender;
public ResendEmailConfirmationModel(UserManager<IdentityUser> userManager, EmailService.IEmailSender emailSender) public ResendEmailConfirmationModel(UserManager<IdentityUser> userManager, Services.EmailService.IEmailSender emailSender)
{ {
_userManager = userManager; _userManager = userManager;
_emailSender = emailSender; _emailSender = emailSender;
My.ProjectName/My.ProjectName.csproj
+3 -5
View File
@@ -8,6 +8,7 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="5.0.4" /> <PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="5.0.4" />
<PackageReference Include="Microsoft.AspNetCore.Http.Features" Version="5.0.4" />
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="5.0.4" /> <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="5.0.4" />
<PackageReference Include="Microsoft.AspNetCore.Identity.UI" Version="5.0.4" /> <PackageReference Include="Microsoft.AspNetCore.Identity.UI" Version="5.0.4" />
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="5.0.4" /> <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="5.0.4" />
@@ -17,9 +18,10 @@
</PackageReference> </PackageReference>
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.10.13" /> <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.10.13" />
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="5.0.2" /> <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="5.0.2" />
<PackageReference Include="NETCore.MailKit" Version="2.0.3" />
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="5.0.2" /> <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="5.0.2" />
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL.Design" Version="1.1.0" /> <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL.Design" Version="1.1.0" />
<PackageReference Include="Serilog.AspNetCore" Version="4.0.0" /> <PackageReference Include="Serilog.AspNetCore" Version="4.1.0" />
<PackageReference Include="Serilog.Enrichers.Environment" Version="2.1.3" /> <PackageReference Include="Serilog.Enrichers.Environment" Version="2.1.3" />
<PackageReference Include="Serilog.Exceptions" Version="6.1.0" /> <PackageReference Include="Serilog.Exceptions" Version="6.1.0" />
<PackageReference Include="Serilog.Exceptions.EntityFrameworkCore" Version="6.1.0" /> <PackageReference Include="Serilog.Exceptions.EntityFrameworkCore" Version="6.1.0" />
@@ -27,8 +29,4 @@
<PackageReference Include="Serilog.Sinks.Elasticsearch" Version="8.4.1" /> <PackageReference Include="Serilog.Sinks.Elasticsearch" Version="8.4.1" />
</ItemGroup> </ItemGroup>
<ItemGroup>
<ProjectReference Include="..\EmailService\EmailService.csproj" />
</ItemGroup>
</Project> </Project>
EmailService/EmailConfiguration.cs → My.ProjectName/Services/EmailService/EmailConfiguration.cs
+1 -1
View File
@@ -2,7 +2,7 @@
using System.Collections.Generic; using System.Collections.Generic;
using System.Text; using System.Text;
namespace EmailService namespace My.ProjectName.Services.EmailService
{ {
public class EmailConfiguration public class EmailConfiguration
{ {
EmailService/EmailSender.cs → My.ProjectName/Services/EmailService/EmailSender.cs
+1 -1
View File
@@ -5,7 +5,7 @@ using System.IO;
using System.Linq; using System.Linq;
using System.Threading.Tasks; using System.Threading.Tasks;
namespace EmailService namespace My.ProjectName.Services.EmailService
{ {
public class EmailSender : IEmailSender public class EmailSender : IEmailSender
{ {
EmailService/IEmailSender.cs → My.ProjectName/Services/EmailService/IEmailSender.cs
+1 -1
View File
@@ -3,7 +3,7 @@ using System.Collections.Generic;
using System.Text; using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
namespace EmailService namespace My.ProjectName.Services.EmailService
{ {
public interface IEmailSender public interface IEmailSender
{ {
EmailService/Message.cs → My.ProjectName/Services/EmailService/Message.cs
+1 -1
View File
@@ -5,7 +5,7 @@ using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Text; using System.Text;
namespace EmailService namespace My.ProjectName.Services.EmailService
{ {
public class Message public class Message
{ {
My.ProjectName/Startup.cs
+1 -1
View File
@@ -1,4 +1,4 @@
using EmailService; using My.ProjectName.Services.EmailService;
using My.ProjectName.Data; using My.ProjectName.Data;
using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Hosting;