Updated AuthorizationHeaderValueGetter to support passing HttpRequest…

…Message into getToken() as OAuth signature generation may rely on having access to properties in the request (example: Twitter reuest signing)
reactiveui · Feb 27, 2019 · 0d2b8b8 · 0d2b8b8
1 parent bddddc2
commit 0d2b8b8
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/Refit/AuthenticatedHttpClientHandler.cs b/Refit/AuthenticatedHttpClientHandler.cs
@@ -10,9 +10,9 @@ namespace Refit
 {
     class AuthenticatedHttpClientHandler : DelegatingHandler
     {
-        readonly Func<Task<string>> getToken;
+        readonly Func<HttpRequestMessage, Task<string>> getToken;
 
-        public AuthenticatedHttpClientHandler(Func<Task<string>> getToken, HttpMessageHandler innerHandler = null)
+        public AuthenticatedHttpClientHandler(Func<HttpRequestMessage, Task<string>> getToken, HttpMessageHandler innerHandler = null)
             : base(innerHandler ?? new HttpClientHandler())
         {
             this.getToken = getToken ?? throw new ArgumentNullException(nameof(getToken));
@@ -24,7 +24,7 @@ protected override async Task<HttpResponseMessage> SendAsync(HttpRequestMessage
             var auth = request.Headers.Authorization;
             if (auth != null)
             {
-                var token = await getToken().ConfigureAwait(false);
+                var token = await getToken(request).ConfigureAwait(false);
                 request.Headers.Authorization = new AuthenticationHeaderValue(auth.Scheme, token);
             }
 

diff --git a/Refit/RefitSettings.cs b/Refit/RefitSettings.cs
@@ -21,7 +21,7 @@ public RefitSettings()
             ContentSerializer = new JsonContentSerializer();
         }
 
-        public Func<Task<string>> AuthorizationHeaderValueGetter { get; set; }
+        public Func<HttpRequestMessage, Task<string>> AuthorizationHeaderValueGetter { get; set; }
         public Func<HttpMessageHandler> HttpMessageHandlerFactory { get; set; }
 
         [Obsolete("Set RefitSettings.ContentSerializer = new JsonContentSerializer(JsonSerializerSettings) instead.", false)]