Improved changes regarding TimeProvider.

Author: prochnowc

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

@@ -13,10 +13,6 @@
     <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

@@ -11,7 +11,6 @@
 using AppCoreNet.Diagnostics;
 using IdentityModel;
 using IdentityModel.Client;
-using Microsoft.AspNetCore.Authentication;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 
@@ -27,7 +26,6 @@ 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 TimeProvider _timeProvider;
     private readonly IOptionsMonitor<TOptions> _optionsMonitor;
     private readonly ILogger _logger;
 
@@ -36,25 +34,21 @@ 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="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,
-        TimeProvider timeProvider,
         IOptionsMonitor<TOptions> optionsMonitor,
         ILogger logger)
     {
         Ensure.Arg.NotNull(client);
         Ensure.Arg.NotNull(store);
-        Ensure.Arg.NotNull(timeProvider);
         Ensure.Arg.NotNull(optionsMonitor);
         Ensure.Arg.NotNull(logger);
 
         _client = client;
         _store = store;
-        _timeProvider = timeProvider;
         _optionsMonitor = optionsMonitor;
         _logger = logger;
     }
@@ -94,10 +88,11 @@ public async Task<OAuthUserToken> GetAccessTokenAsync(
         EnsureCompatibleScheme(scheme);
 
         TOptions options = _optionsMonitor.Get(scheme.Name);
+        TimeProvider timeProvider = options.TimeProvider ?? TimeProvider.System;
         OAuthUserToken token = await _store.GetTokenAsync(scheme, user, cancellationToken);
 
         DateTimeOffset? refreshAt = token.Expires?.Subtract(options.RefreshBeforeExpiration);
-        if ((refreshAt.HasValue && refreshAt < _timeProvider.GetUtcNow())
+        if ((refreshAt.HasValue && refreshAt < timeProvider.GetUtcNow())
             || (parameters?.ForceRenewal).GetValueOrDefault())
         {
             if (!options.AllowTokenRefresh)
@@ -144,10 +139,13 @@ await _client.RequestRefreshTokenAsync(
                 $"Error refreshing access token for client scheme '{scheme.Name}': {response.Error}");
         }
 
+        TOptions options = _optionsMonitor.Get(scheme.Name);
+        TimeProvider timeProvider = options.TimeProvider ?? TimeProvider.System;
+
         OAuthUserToken refreshedToken = new (
             response.AccessToken,
             response.RefreshToken,
-            response.ExpiresIn > 0 ? _timeProvider.GetUtcNow() + 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,7 +78,6 @@ 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,7 +1,6 @@
 // Licensed under the MIT license.
 // Copyright (c) The AppCore .NET project.
 
-using System;
 using AppCoreNet.Extensions.Http.Authentication.OAuth.AspNetCore;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
@@ -18,16 +17,14 @@ public class OpenIdConnectUserTokenService : OAuthUserTokenService<OpenIdConnect
     /// </summary>
     /// <param name="client">The <see cref="IOAuthTokenClient"/>.</param>
     /// <param name="store">The <see cref="OpenIdConnectUserTokenStore"/>.</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,
-        TimeProvider timeProvider,
         IOptionsMonitor<OpenIdConnectUserOptions> optionsMonitor,
         ILogger<OpenIdConnectUserTokenService> logger)
-        : base(client, store, timeProvider, optionsMonitor, logger)
+        : base(client, store, optionsMonitor, logger)
     {
     }
 

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

@@ -14,6 +14,7 @@
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFrameworks)' != 'net8.0'">
+    <PackageReference Include="Microsoft.Bcl.TimeProvider" Version="8.0.1" />
     <PackageReference Include="Microsoft.Extensions.Http" Version="6.0.0" />
   </ItemGroup>
 

Http/src/AppCoreNet.Extensions.Http.Authentication/AuthenticationSchemeOptions.cs

@@ -1,11 +1,17 @@
 // Licensed under the MIT license.
 // Copyright (c) The AppCore .NET project.
 
+using System;
+
 namespace AppCoreNet.Extensions.Http.Authentication;
 
 /// <summary>
 /// Provides the base class for authentication scheme options.
 /// </summary>
 public abstract class AuthenticationSchemeOptions
 {
+    /// <summary>
+    /// Gets or sets the <see cref="System.TimeProvider"/> used for testing.
+    /// </summary>
+    public TimeProvider? TimeProvider { get; set; }
 }

Http/src/AppCoreNet.Extensions.Http.Authentication/DependencyInjection/HttpClientAuthenticationBuilderExtensions.cs

@@ -7,6 +7,7 @@
 using AppCoreNet.Extensions.Http.Authentication;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.DependencyInjection.Extensions;
+using Microsoft.Extensions.Options;
 
 // ReSharper disable once CheckNamespace
 namespace AppCoreNet.Extensions.DependencyInjection;
@@ -53,6 +54,14 @@ public static IHttpClientAuthenticationBuilder AddScheme<TOptions, TParameters,
             services.Configure(name, configure);
         }
 
+        services.TryAddEnumerable(
+            new[]
+            {
+                ServiceDescriptor.Singleton<IPostConfigureOptions<TOptions>>(
+                    sp => new PostConfigureAuthenticationSchemeOptions<TOptions>(
+                        sp.GetRequiredService<TimeProvider>())),
+            });
+
         return builder;
     }
 }

Http/src/AppCoreNet.Extensions.Http.Authentication/DependencyInjection/HttpClientAuthenticationServiceCollectionExtensions.cs

@@ -1,6 +1,7 @@
 // Licensed under the MIT license.
 // Copyright (c) The AppCore .NET project.
 
+using System;
 using AppCoreNet.Extensions.Http.Authentication;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.DependencyInjection.Extensions;
@@ -20,7 +21,9 @@ public static class HttpClientAuthenticationServiceCollectionExtensions
     /// <returns>The <see cref="IHttpClientAuthenticationBuilder"/> to configure the authentication.</returns>
     public static IHttpClientAuthenticationBuilder AddHttpClientAuthentication(this IServiceCollection services)
     {
+        services.TryAddSingleton(TimeProvider.System);
         services.TryAddSingleton<IAuthenticationSchemeProvider, AuthenticationSchemeProvider>();
+
         return new HttpClientAuthenticationBuilder(services);
     }
 }

Http/src/AppCoreNet.Extensions.Http.Authentication/PostConfigureAuthenticationSchemeOptions.cs

@@ -0,0 +1,20 @@
+using System;
+using Microsoft.Extensions.Options;
+
+namespace AppCoreNet.Extensions.Http.Authentication;
+
+internal sealed class PostConfigureAuthenticationSchemeOptions<TOptions> : IPostConfigureOptions<TOptions>
+    where TOptions : AuthenticationSchemeOptions
+{
+    private readonly TimeProvider _timeProvider;
+
+    public PostConfigureAuthenticationSchemeOptions(TimeProvider timeProvider)
+    {
+        _timeProvider = timeProvider;
+    }
+
+    public void PostConfigure(string name, TOptions options)
+    {
+        options.TimeProvider ??= _timeProvider;
+    }
+}