Service endpoint uri (#5)

* - service channel send methods: add support for calling service endpoints with endpoint uri prefixes

* - add existing license file to solution items
- bump version

Author: modabas

Directory.Build.props

@@ -17,6 +17,6 @@
     <PackageReadmeFile>README.md</PackageReadmeFile>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
 
-    <Version>0.4.1</Version>
+    <Version>0.4.2</Version>
   </PropertyGroup>
 </Project>

ModEndpoints.sln

@@ -7,6 +7,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "__SolutionItems", "__Soluti
 	ProjectSection(SolutionItems) = preProject
 		.editorconfig = .editorconfig
 		Directory.Build.props = Directory.Build.props
+		LICENSE.txt = LICENSE.txt
 		README.md = README.md
 	EndProjectSection
 EndProject

samples/Client/Program.cs

@@ -9,7 +9,7 @@
 
 HostApplicationBuilder builder = Host.CreateApplicationBuilder(args);
 
-var baseAddress = "https://localhost:7012/api/v1/storesWithServiceEndpoint/";
+var baseAddress = "https://localhost:7012/api/";
 var clientName = "ShowcaseApi.Client";
 //builder.Services.AddRemoteServiceWithNewClient<ListStoresRequest>(clientName,
 //  (sp, client) =>
@@ -48,7 +48,10 @@ static async Task CallRemoteServicesAsync(IServiceProvider hostProvider)
   //resolve service channel from DI
   var channel = provider.GetRequiredService<IServiceChannel>();
   //send request over channel to remote ServiceResultEndpoint
-  var listResult = await channel.SendAsync<ListStoresRequest, ListStoresResponse>(new ListStoresRequest(), default);
+  var listResult = await channel.SendAsync<ListStoresRequest, ListStoresResponse>(
+    new ListStoresRequest(),
+    default,
+    endpointUriPrefix: "v1/storesWithServiceEndpoint/");
 
   if (listResult.IsOk)
   {
@@ -57,7 +60,10 @@ static async Task CallRemoteServicesAsync(IServiceProvider hostProvider)
     if (id is not null)
     {
       //send request over channel to remote ServiceResultEndpoint
-      var getResult = await channel.SendAsync<GetStoreByIdRequest, GetStoreByIdResponse>(new GetStoreByIdRequest(Id: id.Value), default);
+      var getResult = await channel.SendAsync<GetStoreByIdRequest, GetStoreByIdResponse>(
+        new GetStoreByIdRequest(Id: id.Value),
+        default,
+        endpointUriPrefix: "v1/storesWithServiceEndpoint/");
       if (getResult.IsOk)
       {
         Console.WriteLine(getResult.Value);

src/ModEndpoints.RemoteServices/IServiceChannel.cs

@@ -9,6 +9,7 @@ public interface IServiceChannel
   Task<Result<TResponse>> SendAsync<TRequest, TResponse>(
     TRequest req,
     CancellationToken ct,
+    string? endpointUriPrefix = null,
     MediaTypeHeaderValue? mediaType = null,
     JsonSerializerOptions? jsonSerializerOptions = null,
     Action<HttpRequestHeaders>? configureRequestHeaders = null,
@@ -18,6 +19,7 @@ Task<Result<TResponse>> SendAsync<TRequest, TResponse>(
   Task<Result> SendAsync<TRequest>(
     TRequest req,
     CancellationToken ct,
+    string? endpointUriPrefix = null,
     MediaTypeHeaderValue? mediaType = null,
     JsonSerializerOptions? jsonSerializerOptions = null,
     Action<HttpRequestHeaders>? configureRequestHeaders = null,

src/ModEndpoints.RemoteServices/ServiceChannel.cs

@@ -17,6 +17,7 @@ public class ServiceChannel(
   public async Task<Result<TResponse>> SendAsync<TRequest, TResponse>(
     TRequest req,
     CancellationToken ct,
+    string? endpointUriPrefix = null,
     MediaTypeHeaderValue? mediaType = null,
     JsonSerializerOptions? jsonSerializerOptions = null,
     Action<HttpRequestHeaders>? configureRequestHeaders = null,
@@ -39,7 +40,9 @@ public async Task<Result<TResponse>> SendAsync<TRequest, TResponse>(
         {
           return Result<TResponse>.CriticalError(string.Format(NoChannelRegistrationFound, typeof(TRequest)));
         }
-        using (HttpRequestMessage httpReq = new(HttpMethod.Post, requestUriResult.Value))
+        using (HttpRequestMessage httpReq = new(
+          HttpMethod.Post,
+          ServiceChannel.Combine(endpointUriPrefix, requestUriResult.Value)))
         {
           httpReq.Content = JsonContent.Create(req, mediaType, jsonSerializerOptions);
           configureRequestHeaders?.Invoke(httpReq.Headers);
@@ -60,6 +63,7 @@ public async Task<Result<TResponse>> SendAsync<TRequest, TResponse>(
   public async Task<Result> SendAsync<TRequest>(
     TRequest req,
     CancellationToken ct,
+    string? endpointUriPrefix = null,
     MediaTypeHeaderValue? mediaType = null,
     JsonSerializerOptions? jsonSerializerOptions = null,
     Action<HttpRequestHeaders>? configureRequestHeaders = null,
@@ -81,7 +85,9 @@ public async Task<Result> SendAsync<TRequest>(
         {
           return Result.CriticalError(string.Format(NoChannelRegistrationFound, typeof(TRequest)));
         }
-        using (HttpRequestMessage httpReq = new(HttpMethod.Post, requestUriResult.Value))
+        using (HttpRequestMessage httpReq = new(
+          HttpMethod.Post,
+          ServiceChannel.Combine(endpointUriPrefix, requestUriResult.Value)))
         {
           httpReq.Content = JsonContent.Create(req, mediaType, jsonSerializerOptions);
           configureRequestHeaders?.Invoke(httpReq.Headers);
@@ -98,4 +104,16 @@ public async Task<Result> SendAsync<TRequest>(
       return ex;
     }
   }
+
+  private static string Combine(string? endpointUriPrefix, string endpointUri)
+  {
+    if (string.IsNullOrWhiteSpace(endpointUriPrefix))
+    {
+      return endpointUri;
+    }
+    return string.Format(
+      "{0}/{1}",
+      endpointUriPrefix.TrimEnd('/'),
+      endpointUri.TrimStart('/'));
+  }
 }