Use 'TimeProvider' instead of 'ISystemClock'.

Author: prochnowc

Http/src/AppCoreNet.Extensions.Http.Authentication.OAuth.AspNetCore/AppCoreNet.Extensions.Http.Authentication.OAuth.AspNetCore.csproj

@@ -13,6 +13,10 @@
     <FrameworkReference Include="Microsoft.AspNetCore.App" />
   </ItemGroup>
 
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Bcl.TimeProvider" Condition="'$(TargetFramework)'=='net6.0'" Version="8.0.1" />
+  </ItemGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\AppCoreNet.Extensions.Http.Authentication.OAuth\AppCoreNet.Extensions.Http.Authentication.OAuth.csproj" />
   </ItemGroup>

Http/src/AppCoreNet.Extensions.Http.Authentication.OAuth.AspNetCore/OAuthUserTokenService.cs

@@ -27,7 +27,7 @@ public abstract class OAuthUserTokenService<TOptions> : IOAuthUserTokenService
     private static readonly ConcurrentDictionary<string, Lazy<Task<OAuthUserToken>>> _sync = new ();
     private readonly IOAuthTokenClient _client;
     private readonly IOAuthUserTokenStore _store;
-    private readonly ISystemClock _clock;
+    private readonly TimeProvider _timeProvider;
     private readonly IOptionsMonitor<TOptions> _optionsMonitor;
     private readonly ILogger _logger;
 
@@ -36,25 +36,25 @@ public abstract class OAuthUserTokenService<TOptions> : IOAuthUserTokenService
     /// </summary>
     /// <param name="client">The <see cref="IOAuthTokenClient"/>.</param>
     /// <param name="store">The <see cref="IOAuthUserTokenStore"/>.</param>
-    /// <param name="clock">The <see cref="ISystemClock"/>.</param>
+    /// <param name="timeProvider">The <see cref="TimeProvider"/>.</param>
     /// <param name="optionsMonitor">The <see cref="IOptionsMonitor{TOptions}"/>. </param>
     /// <param name="logger">The <see cref="ILogger"/>.</param>
     protected OAuthUserTokenService(
         IOAuthTokenClient client,
         IOAuthUserTokenStore store,
-        ISystemClock clock,
+        TimeProvider timeProvider,
         IOptionsMonitor<TOptions> optionsMonitor,
         ILogger logger)
     {
         Ensure.Arg.NotNull(client);
         Ensure.Arg.NotNull(store);
-        Ensure.Arg.NotNull(clock);
+        Ensure.Arg.NotNull(timeProvider);
         Ensure.Arg.NotNull(optionsMonitor);
         Ensure.Arg.NotNull(logger);
 
         _client = client;
         _store = store;
-        _clock = clock;
+        _timeProvider = timeProvider;
         _optionsMonitor = optionsMonitor;
         _logger = logger;
     }
@@ -97,7 +97,7 @@ public async Task<OAuthUserToken> GetAccessTokenAsync(
         OAuthUserToken token = await _store.GetTokenAsync(scheme, user, cancellationToken);
 
         DateTimeOffset? refreshAt = token.Expires?.Subtract(options.RefreshBeforeExpiration);
-        if ((refreshAt.HasValue && refreshAt < _clock.UtcNow)
+        if ((refreshAt.HasValue && refreshAt < _timeProvider.GetUtcNow())
             || (parameters?.ForceRenewal).GetValueOrDefault())
         {
             if (!options.AllowTokenRefresh)
@@ -147,7 +147,7 @@ await _client.RequestRefreshTokenAsync(
         OAuthUserToken refreshedToken = new (
             response.AccessToken,
             response.RefreshToken,
-            response.ExpiresIn > 0 ? DateTimeOffset.UtcNow + TimeSpan.FromSeconds(response.ExpiresIn) : null);
+            response.ExpiresIn > 0 ? _timeProvider.GetUtcNow() + TimeSpan.FromSeconds(response.ExpiresIn) : null);
 
         _logger.LogDebug(
             "Refreshed access token for client scheme {SchemeName}. Expiration: {Expiration}",

Http/src/AppCoreNet.Extensions.Http.Authentication.OAuth.OpenIdConnect/DependencyInjection/OpenIdConnectHttpClientAuthenticationBuilderExtensions.cs

@@ -78,6 +78,7 @@ public static IHttpClientAuthenticationBuilder AddOpenIdConnect(
 
         services.TryAdd(new[]
         {
+            ServiceDescriptor.Singleton(TimeProvider.System),
             ServiceDescriptor.Scoped<OpenIdConnectUserTokenService, OpenIdConnectUserTokenService>(),
             ServiceDescriptor.Scoped<OpenIdConnectUserTokenStore, OpenIdConnectUserTokenStore>(),
         });

Http/src/AppCoreNet.Extensions.Http.Authentication.OAuth.OpenIdConnect/OpenIdConnectUserTokenService.cs

@@ -1,8 +1,8 @@
 // Licensed under the MIT license.
 // Copyright (c) The AppCore .NET project.
 
+using System;
 using AppCoreNet.Extensions.Http.Authentication.OAuth.AspNetCore;
-using Microsoft.AspNetCore.Authentication;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 
@@ -18,16 +18,16 @@ public class OpenIdConnectUserTokenService : OAuthUserTokenService<OpenIdConnect
     /// </summary>
     /// <param name="client">The <see cref="IOAuthTokenClient"/>.</param>
     /// <param name="store">The <see cref="OpenIdConnectUserTokenStore"/>.</param>
-    /// <param name="clock">The <see cref="ISystemClock"/>.</param>
+    /// <param name="timeProvider">The <see cref="TimeProvider"/>.</param>
     /// <param name="optionsMonitor">The <see cref="IOptionsMonitor{TOptions}"/>.</param>
     /// <param name="logger">The <see cref="ILogger"/>.</param>
     public OpenIdConnectUserTokenService(
         IOAuthTokenClient client,
         OpenIdConnectUserTokenStore store,
-        ISystemClock clock,
+        TimeProvider timeProvider,
         IOptionsMonitor<OpenIdConnectUserOptions> optionsMonitor,
         ILogger<OpenIdConnectUserTokenService> logger)
-        : base(client, store, clock, optionsMonitor, logger)
+        : base(client, store, timeProvider, optionsMonitor, logger)
     {
     }