#11 Introduce IClock dependency

natemcmaster · May 12, 2020 · b886c86 · b886c86
1 parent b5404b3
commit b886c86
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 1 deletion.
diff --git a/src/LetsEncrypt/Internal/AcmeCertificateLoader.cs b/src/LetsEncrypt/Internal/AcmeCertificateLoader.cs
@@ -8,6 +8,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 using McMaster.AspNetCore.LetsEncrypt.Accounts;
+using McMaster.AspNetCore.LetsEncrypt.Internal.IO;
 using Microsoft.AspNetCore.Hosting.Server;
 using Microsoft.AspNetCore.Server.Kestrel.Core;
 using Microsoft.Extensions.Configuration;
@@ -37,6 +38,7 @@ internal class AcmeCertificateLoader : BackgroundService
         private readonly IConfiguration _config;
         private readonly TermsOfServiceChecker _tosChecker;
         private readonly IEnumerable<ICertificateRepository> _certificateRepositories;
+        private readonly IClock _clock;
 
         private const string ErrorMessage = "Failed to create certificate";
 
@@ -50,6 +52,7 @@ public AcmeCertificateLoader(
             IConfiguration config,
             TermsOfServiceChecker tosChecker,
             IEnumerable<ICertificateRepository> certificateRepositories,
+            IClock clock,
             IAccountStore? accountStore = default)
         {
             _selector = selector;
@@ -62,6 +65,7 @@ public AcmeCertificateLoader(
             _config = config;
             _tosChecker = tosChecker;
             _certificateRepositories = certificateRepositories;
+            _clock = clock;
         }
 
         protected override async Task ExecuteAsync(CancellationToken stoppingToken)
@@ -201,7 +205,7 @@ private async Task MonitorRenewal(CancellationToken cancellationToken)
                     {
                         if (!_selector.TryGet(domainName, out var cert)
                             || cert == null
-                            || cert.NotAfter <= DateTime.Now + daysInAdvance.Value)
+                            || cert.NotAfter <= _clock.Now.LocalDateTime + daysInAdvance.Value)
                         {
                             await CreateCertificateAsync(domainNames, cancellationToken);
                             break;

diff --git a/src/LetsEncrypt/Internal/IO/IClock.cs b/src/LetsEncrypt/Internal/IO/IClock.cs
@@ -0,0 +1,9 @@
+using System;
+
+namespace McMaster.AspNetCore.LetsEncrypt.Internal.IO
+{
+    internal interface IClock
+    {
+        DateTimeOffset Now { get; }
+    }
+}
diff --git a/src/LetsEncrypt/Internal/IO/SystemClock.cs b/src/LetsEncrypt/Internal/IO/SystemClock.cs
@@ -0,0 +1,9 @@
+using System;
+
+namespace McMaster.AspNetCore.LetsEncrypt.Internal.IO
+{
+    internal class SystemClock: IClock
+    {
+        public DateTimeOffset Now => DateTimeOffset.Now;
+    }
+}