(fix, csharp): sdk respects service level path and path parameters (#…

…3900)

generators/csharp/codegen/src/asIs/RawClient.Template.cs

@@ -108,7 +108,9 @@ public class ApiResponse
 
   private string BuildUrl(string path, Dictionary<string, object> query)
   {
-    var url = $"{_clientOptions.BaseUrl}{path}";
+    uri1 = _clientOptions.BaseUrl.TrimEnd('/');
+    uri2 = path.TrimStart('/');
+    var url = $"{uri1}/{uri2}";
     if (query.Count > 0)
     {
       url += "?";

generators/csharp/sdk/CHANGELOG.md

@@ -5,6 +5,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.0.29 - 2024-06-20]
+
+- Fix: The generated SDK now respects service base paths. Previously they were omitted. 
+
 ## [0.0.28 - 2024-06-19]
 
 - Improvement: Query parameter and header parameters with optional datetimes are

generators/csharp/sdk/VERSION

@@ -1 +1 @@
-0.0.28
+0.0.29

generators/csharp/sdk/src/endpoint/EndpointGenerator.ts

@@ -112,8 +112,9 @@ export class EndpointGenerator {
         pathParameterReferences: Record<string, string>;
     } {
         const parameters: csharp.Parameter[] = [];
+        const service = this.context.getHttpServiceOrThrow(serviceId);
         const pathParameterReferences: Record<string, string> = {};
-        for (const pathParam of endpoint.pathParameters) {
+        for (const pathParam of [...service.pathParameters, ...endpoint.pathParameters]) {
             const parameterName = pathParam.name.camelCase.safeName;
             pathParameterReferences[pathParam.name.originalName] = parameterName;
             parameters.push(

generators/csharp/sdk/src/endpoint/RawClient.ts

@@ -48,7 +48,10 @@ export class RawClient {
             {
                 name: "Path",
                 assignment: csharp.codeblock(
-                    `${this.getPathString({ endpoint, pathParameterReferences: pathParameterReferences ?? {} })}`
+                    `${this.getPathString({
+                        endpoint,
+                        pathParameterReferences: pathParameterReferences ?? {}
+                    })}`
                 )
             }
         ];
@@ -114,14 +117,14 @@ export class RawClient {
         endpoint: HttpEndpoint;
         pathParameterReferences: Record<string, string>;
     }): string {
-        let path = endpoint.path.head;
+        let path = endpoint.fullPath.head;
         let pathParametersPresent = false;
-        for (const part of endpoint.path.parts) {
+        for (const part of endpoint.fullPath.parts) {
             pathParametersPresent = true;
             const reference = pathParameterReferences[part.pathParameter];
             if (reference == null) {
                 throw new Error(
-                    `Failed to find request parameter for the endpointt ${endpoint.id} with path parameter ${part.pathParameter}`
+                    `Failed to find request parameter for the endpointt${endpoint.id} with path parameter ${part.pathParameter}`
                 );
             }
             path += `{${reference}}${part.tail}`;