Fix trailing slash issue (#2137)

* fix trailing slash * fix the replace * handle edge cases * remove log
Azure · Mar 24, 2023 · 76d5918 · 76d5918
1 parent ef9ff61
commit 76d5918
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/src/models/console/consoleOperation.ts b/src/models/console/consoleOperation.ts
@@ -110,11 +110,14 @@ export class ConsoleOperation {
         }
 
         let requestUrl = this.urlTemplate;
-        const parameters = this.templateParameters().concat(this.request.queryParameters());
+        let parameters = this.templateParameters().concat(this.request.queryParameters());
+
+        const wildcardName = "{*}"
+        requestUrl = requestUrl.replace("*", wildcardName);
 
         parameters.forEach(parameter => {
             if (parameter.value()) {
-                const parameterPlaceholder = parameter.name() !== "*" ? `{${parameter.name()}}` : "*";
+                const parameterPlaceholder = `{${parameter.name()}}`;
 
                 if (requestUrl.indexOf(parameterPlaceholder) > -1) {
                     requestUrl = requestUrl.replace(parameterPlaceholder,
@@ -132,7 +135,8 @@ export class ConsoleOperation {
         if (this.api.apiVersionSet && this.api.apiVersionSet.versioningScheme === "Query") {
             requestUrl = this.addParam(requestUrl, this.api.apiVersionSet.versionQueryName, this.api.apiVersion);
         }
-        requestUrl = requestUrl.replace("/*", "");
+
+        requestUrl = requestUrl.replace(wildcardName, "");
 
         return `${this.api.path}${versionPath}${requestUrl}`;
     }