added keyed singleton for muilti instances

.gitea/workflows/publish-nugets.yaml

@@ -33,10 +33,6 @@ jobs:
       - name: Build and Pack NuGet Package
         run: dotnet pack -c Release -o ./artifacts -p:Version=${{ env.RELEASE_VERSION }}
 
-      - name: Publish Nugets to NuGet.org
+      - name: Publish to NuGet.org
         run: |
           dotnet nuget push ./artifacts/*.nupkg --source https://api.nuget.org/v3/index.json --api-key ${{ secrets.NUGET_API_KEY }}
-
-      - name: Publish Symbols to NuGet.org
-        run: |
-          dotnet nuget push ./artifacts/*.snupkg --source https://api.nuget.org/v3/index.json --api-key ${{ secrets.NUGET_API_KEY }}   

OpenHarbor.JwtTokenManager.Abstractions/OpenHarbor.JwtTokenManager.Abstractions.csproj

@@ -9,7 +9,7 @@
     <Company>Open Harbor</Company>
     <PackageIcon>icon.png</PackageIcon>
     <PackageReadmeFile>README.md</PackageReadmeFile>
-    <RepositoryUrl>https://git.openharbor.io/Open-Harbor/dotnet-cqrs</RepositoryUrl>
+    <RepositoryUrl>https://git.openharbor.io/Open-Harbor/dotnet-jwt-token-manager</RepositoryUrl>
     <RepositoryType>git</RepositoryType>
     <PublishRepositoryUrl>true</PublishRepositoryUrl>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>

OpenHarbor.JwtTokenManager/JwtTokenManagerOptions.cs

@@ -6,5 +6,6 @@ public class JwtTokenManagerOptions
   public required string ClientId { get; set; }
   public required string ClientSecret { get; set; }
   public IEnumerable<string> Scopes { get; set; } = Array.Empty<string>();
+  public bool IsCredentialsInHeader { get; set; } = false;
 }
 

OpenHarbor.JwtTokenManager/JwtTokenManagerService.cs

@@ -1,5 +1,6 @@
 using System.Net.Http.Headers;
 using System.Net.Http.Json;
+using System.Text;
 using Microsoft.Extensions.Caching.Memory;
 using Microsoft.Extensions.Logging;
 using OpenHarbor.JwtTokenManager.Abstractions;
@@ -24,18 +25,33 @@ public class JwtTokenManagerService(JwtTokenManagerOptions options, IHttpClientF
       }
     }
 
-    var formContent = new FormUrlEncodedContent([
-      new KeyValuePair<string, string>("grant_type", "client_credentials"),
-      new KeyValuePair<string, string>("client_id", options.ClientId),
-      new KeyValuePair<string, string>("client_secret", options.ClientSecret),
-      new KeyValuePair<string, string>("scopes", string.Join(" ", _scopes))
-    ]);
+    var formContentKeyValues = new List<KeyValuePair<string, string>>()
+    {
+      new ("grant_type", "client_credentials"),
+      new ("scopes", string.Join(" ", _scopes))
+    };
+
+    if (false == options.IsCredentialsInHeader)
+    {
+      formContentKeyValues.AddRange([
+        new KeyValuePair<string, string>("client_id", options.ClientId),
+        new KeyValuePair<string, string>("client_secret", options.ClientSecret)
+      ]);
+    }
+    var formContent = new FormUrlEncodedContent(formContentKeyValues);
     
     var request = new HttpRequestMessage(HttpMethod.Post, options.TokenEndpoint)
     {
       Content = formContent
     };
     
+    if (options.IsCredentialsInHeader)
+    {
+      
+      var credentials = Convert.ToBase64String(Encoding.ASCII.GetBytes($"{options.ClientId}:{options.ClientSecret}"));
+      request.Headers.Authorization = new AuthenticationHeaderValue("Basic", credentials);
+    }
+
     request.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue("application/json"));
     
     var response = await _httpClient.SendAsync(request, cancellationToken);

OpenHarbor.JwtTokenManager/OpenHarbor.JwtTokenManager.csproj

@@ -9,7 +9,7 @@
     <Company>Open Harbor</Company>
     <PackageIcon>icon.png</PackageIcon>
     <PackageReadmeFile>README.md</PackageReadmeFile>
-    <RepositoryUrl>https://git.openharbor.io/Open-Harbor/dotnet-cqrs</RepositoryUrl>
+    <RepositoryUrl>https://git.openharbor.io/Open-Harbor/dotnet-jwt-token-manager</RepositoryUrl>
     <RepositoryType>git</RepositoryType>
     <PublishRepositoryUrl>true</PublishRepositoryUrl>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>

OpenHarbor.JwtTokenManager/ServiceCollectionExtensions.cs

@@ -10,11 +10,14 @@ namespace OpenHarbor.JwtTokenManager;
 
 public static class ServiceCollectionExtensions
 {
+  private static bool _defaultRegistered = false;
+  
   [RequiresDynamicCode("Not AoT safe signature. Will add one in the future.")]
   public static IServiceCollection AddJwtTokenManager(
     this IServiceCollection services,
     IConfiguration configuration,
     string sectionName,
+    string? name = null,
     Action<JwtTokenManagerBuilderOptions>? configureBuilderOptions = null) 
   {
     if (configuration == null)
@@ -22,22 +25,20 @@ public static class ServiceCollectionExtensions
     if (string.IsNullOrWhiteSpace(sectionName))
       throw new ArgumentException("Section name must be provided.", nameof(sectionName));
 
-    services.Configure<JwtTokenManagerOptions>(configuration.GetSection(sectionName));
+    name ??= sectionName;
+
+    services.Configure<JwtTokenManagerOptions>(name, configuration.GetSection(sectionName));
 
-    // Apply the builder options
     var builderOptions = new JwtTokenManagerBuilderOptions();
     configureBuilderOptions?.Invoke(builderOptions);
 
-    // Register the service
-    services.AddSingleton<IJwtTokenManagerService>(provider =>
+    services.AddKeyedSingleton<IJwtTokenManagerService>(name, (provider, key) =>
     {
       var optionsMonitor = provider.GetRequiredService<IOptionsMonitor<JwtTokenManagerOptions>>();
-      var options = optionsMonitor.Get(Options.DefaultName);
+      var options = optionsMonitor.Get(name);
 
-      // Apply additional configuration
       builderOptions.AdditionalConfiguration?.Invoke(options);
 
-      // Configure cache options
       var cacheOptions = new JwtTokenManagerCacheOptions();
       builderOptions.CacheOptions?.Invoke(cacheOptions);
 
@@ -48,6 +49,24 @@ public static class ServiceCollectionExtensions
       return new JwtTokenManagerService(options, httpClientFactory, logger, memoryCache, cacheOptions);
     });
 
+    if (!_defaultRegistered)
+    {
+      services.AddSingleton<IJwtTokenManagerService>(sp =>
+        sp.GetRequiredKeyedService<IJwtTokenManagerService>(name));
+
+      _defaultRegistered = true;
+    }
+
     return services;
   }
+  
+  [RequiresDynamicCode("Not AoT safe signature. Will add one in the future.")]
+  public static IServiceCollection AddJwtTokenManager(
+    this IServiceCollection services,
+    IConfiguration configuration,
+    string sectionName,
+    Action<JwtTokenManagerBuilderOptions>? configureBuilderOptions = null)
+  {
+    return AddJwtTokenManager(services, configuration, sectionName, null, configureBuilderOptions);
+  }
 }

README.md

@@ -4,10 +4,10 @@
 
 > Install nuget package to your awesome project.
 
-| Full Version                            | NuGet                                                                                                                                                                                                                                                              |                                                               NuGet Install |
-|-----------------------------------------| ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ |----------------------------------------------------------------------------:|
-| OpenHarbor.JwtTokenManager              | <a href="https://www.nuget.org/packages/OpenHarbor.JwtTokenManager" target="_blank">[![NuGet](https://img.shields.io/nuget/v/OpenHarbor.JwtTokenManager.svg?style=flat-square&label=nuget)](https://www.nuget.org/packages/OpenHarbor.JwtTokenManager/)</a>             |                        ```PM> Install-Package OpenHarbor.JwtTokenManager``` |
-| OpenHarbor.JwtTokenManager.Abstractions | <a href="https://www.nuget.org/packages/OpenHarbor.JwtTokenManager.Abstractions" target="_blank">[![NuGet](https://img.shields.io/nuget/v/OpenHarbor.JwtTokenManager.Abstractions.svg?style=flat-square&label=nuget)](https://www.nuget.org/packages/OpenHarbor.JwtTokenManager.Abstractions/)</a>          |     ```PM> Install-Package OpenHarbor.JwtTokenManager.Abstractions``` |
+| Package Name                            | NuGet                                                                                                                                                                                                                                                          |                                                               NuGet Install |
+|-----------------------------------------| -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |----------------------------------------------------------------------------:|
+| OpenHarbor.JwtTokenManager              | [![NuGet](https://img.shields.io/nuget/v/OpenHarbor.JwtTokenManager.svg?style=flat-square&label=nuget)](https://www.nuget.org/packages/OpenHarbor.JwtTokenManager/)            |                        ```PM> Install-Package OpenHarbor.JwtTokenManager``` |
+| OpenHarbor.JwtTokenManager.Abstractions | [![NuGet](https://img.shields.io/nuget/v/OpenHarbor.JwtTokenManager.Abstractions.svg?style=flat-square&label=nuget)](https://www.nuget.org/packages/OpenHarbor.JwtTokenManager.Abstractions/)      |     ```PM> Install-Package OpenHarbor.JwtTokenManager.Abstractions``` |
 
 # How to use