- Use supabase-core and implement IGettableHeaders on Client

Author: acupofjose

Functions/Client.cs

@@ -1,5 +1,6 @@
 using Newtonsoft.Json;
-using Supabase.Functions.Extensions;
+using Supabase.Core;
+using Supabase.Core.Extensions;
 using Supabase.Functions.Interfaces;
 using Supabase.Functions.Responses;
 using System;
@@ -14,11 +15,16 @@
 namespace Supabase.Functions
 {
 
-    public class Client : IFunctionsClient
+    public partial class Client : IFunctionsClient
     {
         private static readonly HttpClient client = new HttpClient();
         private string baseUrl;
 
+        /// <summary>
+        /// Function that can be set to return dynamic headers.
+        /// 
+        /// Headers specified in the method parameters will ALWAYS take precendece over headers returned by this function.
+        /// </summary>
         public Func<Dictionary<string, string>>? GetHeaders { get; set; }
 
         public Client(string baseUrl)
@@ -98,7 +104,7 @@ internal async Task<HttpResponseMessage> HandleRequest(string url, string? token
                 options.Headers["Authorization"] = $"Bearer {token}";
             }
 
-            options.Headers["X-Client-Info"] = Util.GetAssemblyVersion();
+            options.Headers["X-Client-Info"] = Util.GetAssemblyVersion(typeof(Client));
 
             var builder = new UriBuilder(url);
             var query = HttpUtility.ParseQueryString(builder.Query);
@@ -146,25 +152,5 @@ public RequestException(HttpResponseMessage response, ErrorResponse error) : bas
                 Error = error;
             }
         }
-
-        /// <summary>
-        /// Options that can be supplied to a function invocation.
-        /// 
-        /// Note: If Headers.Authorization is set, it can be later overriden if a token is supplied in the method call.
-        /// </summary>
-        public class InvokeFunctionOptions
-        {
-            /// <summary>
-            /// Headers to be included on the request.
-            /// </summary>
-            public Dictionary<string, string> Headers { get; set; } = new Dictionary<string, string>();
-
-
-            /// <summary>
-            /// Body of the Request
-            /// </summary>
-            [JsonProperty("body")]
-            public Dictionary<string, object> Body { get; set; } = new Dictionary<string, object>();
-        }
     }
 }

Functions/Extensions/DictionaryExtensions.cs

@@ -39,5 +39,6 @@
 	</PropertyGroup>
 	<ItemGroup>
 		<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
+		<PackageReference Include="supabase-core" Version="0.0.2" />
 	</ItemGroup>
 </Project>

Functions/Functions.csproj

@@ -1,13 +1,13 @@
-using System;
+using Supabase.Core.Interfaces;
+using System;
 using System.Collections.Generic;
 using System.Net.Http;
 using System.Threading.Tasks;
 
 namespace Supabase.Functions.Interfaces
 {
-    public interface IFunctionsClient
+    public interface IFunctionsClient : IGettableHeaders
     {
-        Func<Dictionary<string, string>>? GetHeaders { get; set; }
         Task<string> Invoke(string url, string? token = null, Client.InvokeFunctionOptions? options = null);
         Task<T?> Invoke<T>(string url, string? token = null, Client.InvokeFunctionOptions? options = null) where T : class;
         Task<HttpContent> RawInvoke(string url, string? token = null, Client.InvokeFunctionOptions? options = null);

Functions/Interfaces/IFunctionsClient.cs

@@ -0,0 +1,29 @@
+using Newtonsoft.Json;
+using System.Collections.Generic;
+
+namespace Supabase.Functions
+{
+
+    public partial class Client
+    {
+        /// <summary>
+        /// Options that can be supplied to a function invocation.
+        /// 
+        /// Note: If Headers.Authorization is set, it can be later overriden if a token is supplied in the method call.
+        /// </summary>
+        public class InvokeFunctionOptions
+        {
+            /// <summary>
+            /// Headers to be included on the request.
+            /// </summary>
+            public Dictionary<string, string> Headers { get; set; } = new Dictionary<string, string>();
+
+
+            /// <summary>
+            /// Body of the Request
+            /// </summary>
+            [JsonProperty("body")]
+            public Dictionary<string, object> Body { get; set; } = new Dictionary<string, object>();
+        }
+    }
+}