Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,13 +1,20 @@
using System.Collections.Generic;
using System.Linq;
using Microsoft.AspNetCore.Mvc;
using O2NextGen.ESender.Api.Helpers;
using O2NextGen.ESender.Api.Models;

namespace O2NextGen.ESender.Api.Controllers
{
[Route("emailsender")]
public class EmailSenderController : Controller
{
{
private readonly IEmailSender _emailSender;

public EmailSenderController(IEmailSender emailSender)
{
_emailSender = emailSender;
}
private static long _currentCertificateId = 1;

private static List<MailViewModel> _mailLetters = new List<MailViewModel>()
Expand Down Expand Up @@ -59,6 +66,7 @@ public IActionResult CreateReally(MailViewModel model)
{
model.Id = _currentCertificateId++;
_mailLetters.Add(model);
_emailSender.Send(model.To, model.Subject, model.Body);
return RedirectToAction("Index");
}
}
Expand Down
18 changes: 15 additions & 3 deletions src/Services/e-sender/O2NextGen.ESender.Api/Helpers/EmailSender.cs
Original file line number Diff line number Diff line change
@@ -1,15 +1,20 @@
using System.Net.Mail;
using System.Threading.Tasks;
using Microsoft.Extensions.Logging;
using O2NextGen.ESender.Api.Setup;

namespace O2NextGen.ESender.Api.Helpers
{
public class EmailSender
public class EmailSender : IEmailSender
{
public EmailSender()
private readonly ILogger<EmailSender> _logger;

public EmailSender(SenderConfig senderConfig,ILogger<EmailSender> logger)
{
_logger = logger;
SmtpServerHost = "localhost";
SmtpServerPort = 25;
From="example@example.com";
From= "support@pfr-centr.com";
}

public string From { get; set; }
Expand All @@ -25,14 +30,21 @@ public async Task Send(string to, string subject, string bodyHtml)
client.DeliveryMethod = SmtpDeliveryMethod.Network;
client.Host = SmtpServerHost;
client.Port = SmtpServerPort;
//client.Credentials = new System.Net.NetworkCredential("support@pfr-centr.com", "password");
_logger.LogInformation($">> Settings for email server host={client.Host} port={client.Port}");
using (var message = new MailMessage(From, to))
{
message.Subject = subject;
message.IsBodyHtml = true;
message.Body = bodyHtml;
_logger.LogInformation($">> Send email to={to} subject={subject} message={message}");
await client.SendMailAsync(message).ConfigureAwait(false);
}
}
}
}
public interface IEmailSender
{
Task Send(string to, string subject, string bodyHtml);
}
}
2 changes: 2 additions & 0 deletions src/Services/e-sender/O2NextGen.ESender.Api/Startup.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
using Microsoft.AspNetCore.Mvc;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection;
using O2NextGen.ESender.Api.Helpers;
using O2NextGen.ESender.Api.IoC;
using O2NextGen.ESender.Api.Setup;

Expand All @@ -21,6 +22,7 @@ public void ConfigureServices(IServiceCollection services)
{
services.AddMvc().SetCompatibilityVersion(CompatibilityVersion.Version_2_1);
services.ConfigurePOCO<SenderConfig>(AppConfiguration.GetSection("Sender"));
services.AddSingleton<IEmailSender, EmailSender>();
}

public void Configure(IApplicationBuilder app, IHostingEnvironment env)
Expand Down
6 changes: 3 additions & 3 deletions src/Services/e-sender/O2NextGen.ESender.Api/appsettings.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@
},
"AllowedHosts": "*",
"Sender": {
"SmtpServerHost": "",
"SmtpServerPort": "",
"From": ""
"SmtpServerHost": "localhost",
"SmtpServerPort": "25",
"From": "support@pfr-centr.com"
}
}