Fixes supabase-community#57 - Models throwing No Route errors when attempting to Update or Delete

Author: acupofjose

Postgrest/Extensions/UriExtensions.cs

@@ -6,7 +6,7 @@ namespace Postgrest.Extensions
 {
     public static class UriExtensions
     {
-        public static string GetBaseUrl(this Uri uri) =>
-            uri.GetLeftPart(UriPartial.Authority);
+        public static string GetInstanceUrl(this Uri uri) =>
+            uri.GetLeftPart(UriPartial.Authority) + uri.LocalPath;
     }
 }

Postgrest/Responses/ModeledResponse.cs

@@ -41,7 +41,7 @@ public ModeledResponse(BaseResponse baseResponse, JsonSerializerSettings seriali
 					{
 						foreach (var model in Models)
 						{
-							model.BaseUrl = baseResponse.ResponseMessage!.RequestMessage.RequestUri.GetBaseUrl();
+							model.BaseUrl = baseResponse.ResponseMessage!.RequestMessage.RequestUri.GetInstanceUrl().Replace(model.TableName, "").TrimEnd('/');
 							model.RequestClientOptions = ClientOptions;
 							model.GetHeaders = getHeaders;
 						}
@@ -55,7 +55,7 @@ public ModeledResponse(BaseResponse baseResponse, JsonSerializerSettings seriali
 
 					if (obj != null)
 					{
-						obj.BaseUrl = baseResponse.ResponseMessage!.RequestMessage.RequestUri.GetBaseUrl();
+						obj.BaseUrl = baseResponse.ResponseMessage!.RequestMessage.RequestUri.GetInstanceUrl().Replace(obj.TableName, "").TrimEnd('/');
 						obj.RequestClientOptions = ClientOptions;
 						obj.GetHeaders = getHeaders;
 

PostgrestTests/ClientApi.cs

@@ -56,7 +56,7 @@ public void TestTableAttributeDefault()
 		[TestMethod("will set header from options")]
 		public void TestHeadersToken()
 		{
-			var headers = Helpers.PrepareRequestHeaders(HttpMethod.Get, new Dictionary<string, string> { { "Authorization", $"Bearer token" } });
+			var headers = Postgrest.Helpers.PrepareRequestHeaders(HttpMethod.Get, new Dictionary<string, string> { { "Authorization", $"Bearer token" } });
 
 			Assert.AreEqual("Bearer token", headers["Authorization"]);
 		}

PostgrestTests/Extensions.cs

@@ -12,13 +12,13 @@ public class Extensions
         [TestMethod]
         public void UriExtensionGetBaseUri()
         {
-            var uri1 = new Uri("https://abcdefg.supabase.io/testing/123?query=me-big-query");
+            var uri1 = new Uri("https://abcdefg.supabase.io/rest/v1?query=me-big-query");
 
-            Assert.AreEqual("https://abcdefg.supabase.io", uri1.GetBaseUrl());
+            Assert.AreEqual("https://abcdefg.supabase.io/rest/v1", uri1.GetInstanceUrl());
 
             var uri2 = new Uri("http://localhost:3000/testing/123?query=me-big-query");
 
-            Assert.AreEqual("http://localhost:3000", uri2.GetBaseUrl());
+            Assert.AreEqual("http://localhost:3000/testing/123", uri2.GetInstanceUrl());
         }
     }
 }

PostgrestTests/PostgrestTests.csproj

@@ -11,10 +11,11 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.11.0" />
-		<PackageReference Include="MSTest.TestAdapter" Version="2.2.7" />
-		<PackageReference Include="MSTest.TestFramework" Version="2.2.7" />
-		<PackageReference Include="coverlet.collector" Version="3.1.0">
+		<PackageReference Include="gotrue-csharp" Version="3.0.4" />
+		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
+		<PackageReference Include="MSTest.TestAdapter" Version="3.0.2" />
+		<PackageReference Include="MSTest.TestFramework" Version="3.0.2" />
+		<PackageReference Include="coverlet.collector" Version="3.2.0">
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 			<PrivateAssets>all</PrivateAssets>
 		</PackageReference>