Upgrade e-mail config

This commit is contained in:
Daniel J. Summers 2023-07-09 23:08:10 -04:00
parent 5d431b81c7
commit 41c3904e85
4 changed files with 47 additions and 14 deletions

View File

@ -14,6 +14,7 @@ RUN dotnet restore
COPY . ./ COPY . ./
WORKDIR /jjj/JobsJobsJobs/Application WORKDIR /jjj/JobsJobsJobs/Application
RUN dotnet publish -c Release -r linux-x64 RUN dotnet publish -c Release -r linux-x64
RUN rm bin/Release/net7.0/linux-x64/publish/appsettings.*.json
FROM mcr.microsoft.com/dotnet/aspnet:7.0-alpine as final FROM mcr.microsoft.com/dotnet/aspnet:7.0-alpine as final
WORKDIR /app WORKDIR /app

View File

@ -59,6 +59,9 @@ let main args =
opts.Cookie.HttpOnly <- true opts.Cookie.HttpOnly <- true
opts.Cookie.IsEssential <- true) opts.Cookie.IsEssential <- true)
let emailCfg = cfg.GetSection "Email"
if (emailCfg.GetChildren >> Seq.isEmpty >> not) () then ConfigurationBinder.Bind(emailCfg, Email.options)
let app = builder.Build () let app = builder.Build ()
// Unify the endpoints from all features // Unify the endpoints from all features

View File

@ -3,17 +3,41 @@ module JobsJobsJobs.Email
open System.Net open System.Net
open JobsJobsJobs.Domain open JobsJobsJobs.Domain
open MailKit.Net.Smtp open MailKit.Net.Smtp
open MailKit.Security
open MimeKit open MimeKit
/// Options to use when sending e-mail
type EmailOptions() =
/// The hostname of the SMTP server
member val SmtpHost : string = "localhost" with get, set
/// The port over which SMTP communication should occur
member val Port : int = 25 with get, set
/// Whether to use SSL when communicating with the SMTP server
member val UseSsl : bool = false with get, set
/// The authentication to use with the SMTP server
member val Authentication : string = "" with get, set
/// The e-mail address from which messages should be sent
member val FromAddress : string = "nobody@noagendacareers.com" with get, set
/// The name from which messages should be sent
member val FromName : string = "Jobs, Jobs, Jobs" with get, set
/// The options for the SMTP server
let mutable options = EmailOptions ()
/// Private functions for sending e-mail /// Private functions for sending e-mail
[<AutoOpen>] [<AutoOpen>]
module private Helpers = module private Helpers =
/// Create an SMTP client /// Create an SMTP client
let smtpClient () = backgroundTask { let createClient () = backgroundTask {
let client = new SmtpClient () let client = new SmtpClient ()
do! client.ConnectAsync ("localhost", 25, SecureSocketOptions.None) do! client.ConnectAsync (options.SmtpHost, options.Port, options.UseSsl)
do! client.AuthenticateAsync (options.FromAddress, options.Authentication)
return client return client
} }
@ -25,11 +49,17 @@ module private Helpers =
msg.Subject <- subject msg.Subject <- subject
msg msg
/// Send a message
let sendMessage msg = backgroundTask {
use! client = createClient ()
let! result = client.SendAsync msg
do! client.DisconnectAsync true
return result
}
/// Send an account confirmation e-mail /// Send an account confirmation e-mail
let sendAccountConfirmation citizen security = backgroundTask { let sendAccountConfirmation citizen security = backgroundTask {
let token = WebUtility.UrlEncode security.Token.Value let token = WebUtility.UrlEncode security.Token.Value
use! client = smtpClient ()
use msg = createMessage citizen "Account Confirmation Request" use msg = createMessage citizen "Account Confirmation Request"
let text = let text =
@ -57,13 +87,12 @@ let sendAccountConfirmation citizen security = backgroundTask {
use msgText = new TextPart (Text = text) use msgText = new TextPart (Text = text)
msg.Body <- msgText msg.Body <- msgText
return! client.SendAsync msg return! sendMessage msg
} }
/// Send a password reset link /// Send a password reset link
let sendPasswordReset citizen security = backgroundTask { let sendPasswordReset citizen security = backgroundTask {
let token = WebUtility.UrlEncode security.Token.Value let token = WebUtility.UrlEncode security.Token.Value
use! client = smtpClient ()
use msg = createMessage citizen "Reset Password for Jobs, Jobs, Jobs" use msg = createMessage citizen "Reset Password for Jobs, Jobs, Jobs"
let text = let text =
@ -90,5 +119,5 @@ let sendPasswordReset citizen security = backgroundTask {
use msgText = new TextPart (Text = text) use msgText = new TextPart (Text = text)
msg.Body <- msgText msg.Body <- msgText
return! client.SendAsync msg return! sendMessage msg
} }

View File

@ -4,7 +4,7 @@
<Nullable>enable</Nullable> <Nullable>enable</Nullable>
<DebugType>embedded</DebugType> <DebugType>embedded</DebugType>
<GenerateDocumentationFile>false</GenerateDocumentationFile> <GenerateDocumentationFile>false</GenerateDocumentationFile>
<AssemblyVersion>3.1.1.0</AssemblyVersion> <AssemblyVersion>3.1.2.0</AssemblyVersion>
<FileVersion>3.1.1.0</FileVersion> <FileVersion>3.1.2.0</FileVersion>
</PropertyGroup> </PropertyGroup>
</Project> </Project>