Make TokenProvider not contain state so subclassing actually works correctly with JIT requested tokens (for long lived ApiClients)

Author: EraYaN

modules/openapi-generator/src/main/resources/csharp/libraries/generichost/RateLimitProvider`1.mustache

@@ -1,6 +1,5 @@
 // <auto-generated>
 {{>partial_header}}
-
 {{#nrt}}
 #nullable enable
 
@@ -17,21 +16,21 @@ namespace {{packageName}}.{{clientPackage}}
     /// <typeparam name="TTokenBase"></typeparam>
     {{>visibility}} class RateLimitProvider<TTokenBase> : TokenProvider<TTokenBase> where TTokenBase : TokenBase
     {
-        internal Dictionary<string, global::System.Threading.Channels.Channel<TTokenBase>> AvailableTokens { get; } = new{{^net70OrLater}} Dictionary<string, global::System.Threading.Channels.Channel<TTokenBase>>{{/net70OrLater}}();
+        public Dictionary<string, global::System.Threading.Channels.Channel<TTokenBase>> AvailableTokens { get; } = new{{^net70OrLater}} Dictionary<string, global::System.Threading.Channels.Channel<TTokenBase>>{{/net70OrLater}}();
 
         /// <summary>
         /// Instantiates a ThrottledTokenProvider. Your tokens will be rate limited based on the token's timeout.
         /// </summary>
         /// <param name="container"></param>
-        public RateLimitProvider(TokenContainer<TTokenBase> container) : base(container.Tokens)
+        public RateLimitProvider(TokenContainer<TTokenBase> container) : base()
         {
-            foreach(TTokenBase token in _tokens)
+            foreach(TTokenBase token in container.Tokens)
                 token.StartTimer(token.Timeout ?? TimeSpan.FromMilliseconds(40));
 
             {{#lambda.copy}}
-            global::System.Threading.Channels.BoundedChannelOptions options = new global::System.Threading.Channels.BoundedChannelOptions(_tokens.Length)
+            global::System.Threading.Channels.BoundedChannelOptions options = new global::System.Threading.Channels.BoundedChannelOptions(container.Tokens.Count)
             {
-                FullMode = global::System.Threading.Channels.BoundedChannelFullMode.DropWrite
+                FullMode = global::System.Threading.Channels.BoundedChannelFullMode.DropOldest
             };
 
             AvailableTokens.Add(string.Empty, global::System.Threading.Channels.Channel.CreateBounded<TTokenBase>(options));
@@ -45,7 +44,7 @@ namespace {{packageName}}.{{clientPackage}}
                 {
                     global::System.Threading.Channels.BoundedChannelOptions options = new global::System.Threading.Channels.BoundedChannelOptions(apiKeyTokenContainer.Tokens.Count(t => ClientUtils.ApiKeyHeaderToString(t.Header).Equals(header)))
                     {
-                        FullMode = global::System.Threading.Channels.BoundedChannelFullMode.DropWrite
+                        FullMode = global::System.Threading.Channels.BoundedChannelFullMode.DropOldest
                     };
 
                     AvailableTokens.Add(header, global::System.Threading.Channels.Channel.CreateBounded<TTokenBase>(options));
@@ -65,7 +64,7 @@ namespace {{packageName}}.{{clientPackage}}
             {{/hasApiKeyMethods}}
 
             foreach (var availableToken in AvailableTokens)
-                foreach(TTokenBase token in _tokens)
+                foreach(TTokenBase token in container.Tokens)
                 {
                     {{#hasApiKeyMethods}}
                     if (token is ApiKeyToken apiKeyToken)
@@ -85,7 +84,7 @@ namespace {{packageName}}.{{clientPackage}}
                 }
         }
 
-        internal override async System.Threading.Tasks.ValueTask<TTokenBase> GetAsync(string header = "", System.Threading.CancellationToken cancellation = default{{^netstandard20OrLater}}(global::System.Threading.CancellationToken){{/netstandard20OrLater}})
+        public override async System.Threading.Tasks.ValueTask<TTokenBase> GetAsync(string header = "", System.Threading.CancellationToken cancellation = default{{^netstandard20OrLater}}(global::System.Threading.CancellationToken){{/netstandard20OrLater}})
         {
             if (!AvailableTokens.TryGetValue(header, out global::System.Threading.Channels.Channel<TTokenBase>{{nrt?}} tokens))
                 throw new KeyNotFoundException($"Could not locate a token for header '{header}'.");

modules/openapi-generator/src/main/resources/csharp/libraries/generichost/TokenBase.mustache

@@ -19,8 +19,8 @@ namespace {{packageName}}.{{clientPackage}}
 
 
         internal TimeSpan? Timeout { get; set; }
-        internal delegate void TokenBecameAvailableEventHandler(object sender);
-        internal event TokenBecameAvailableEventHandler{{nrt?}} TokenBecameAvailable;
+        public delegate void TokenBecameAvailableEventHandler(object sender);
+        public event TokenBecameAvailableEventHandler{{nrt?}} TokenBecameAvailable;
 
 
         /// <summary>

modules/openapi-generator/src/main/resources/csharp/libraries/generichost/TokenProvider`1.mustache

@@ -1,6 +1,5 @@
 // <auto-generated>
 {{>partial_header}}
-
 {{#nrt}}
 #nullable enable
 
@@ -17,23 +16,6 @@ namespace {{packageName}}
     /// </summary>
     {{>visibility}} abstract class TokenProvider<TTokenBase> where TTokenBase : TokenBase
     {
-        /// <summary>
-        /// The array of tokens.
-        /// </summary>
-        protected TTokenBase[] _tokens;
-
-        internal abstract System.Threading.Tasks.ValueTask<TTokenBase> GetAsync(string header = "", System.Threading.CancellationToken cancellation = default{{^netstandard20OrLater}}(global::System.Threading.CancellationToken){{/netstandard20OrLater}});
-
-        /// <summary>
-        /// Instantiates a TokenProvider.
-        /// </summary>
-        /// <param name="tokens"></param>
-        public TokenProvider(IEnumerable<TTokenBase> tokens)
-        {
-            _tokens = tokens.ToArray();
-
-            if (_tokens.Length == 0)
-                throw new ArgumentException("You did not provide any tokens.");
-        }
+        public abstract System.Threading.Tasks.ValueTask<TTokenBase> GetAsync(string header = "", System.Threading.CancellationToken cancellation = default{{^netstandard20OrLater}}(global::System.Threading.CancellationToken){{/netstandard20OrLater}});
     }
 }