Fixed template generation of URLs with template parameters. (#497)

Azure · Feb 19, 2020 · 62f4337 · 62f4337
1 parent 1ef837a
commit 62f4337
Showing 1 changed file with 4 additions and 7 deletions.
diff --git a/src/models/console/consoleOperation.ts b/src/models/console/consoleOperation.ts
@@ -75,7 +75,6 @@ export class ConsoleOperation {
 
     private getRequestPath(): string {
         let versionPath = "";
-        const revision = "";
 
         if (this.api.apiVersionSet && this.api.apiVersion && this.api.apiVersionSet.versioningScheme === "Segment") {
             versionPath = `/${this.api.apiVersion}`;
@@ -86,15 +85,13 @@ export class ConsoleOperation {
 
         parameters.forEach(parameter => {
             if (parameter.value()) {
-                const parameterPlaceholder = `{${parameter.name}}`;
-                const parameterName = encodeURIComponent(parameter.name());
-                const parameterValue = encodeURIComponent(parameter.value());
+                const parameterPlaceholder = parameter.name() !== "*" ? `{${parameter.name()}}` : "*";
 
                 if (requestUrl.indexOf(parameterPlaceholder) > -1) {
-                    requestUrl = requestUrl.replace(parameterPlaceholder, parameterValue);
+                    requestUrl = requestUrl.replace(parameterPlaceholder, encodeURI(parameter.value()));
                 }
                 else {
-                    requestUrl = this.addParam(requestUrl, parameterName, parameterValue);
+                    requestUrl = this.addParam(requestUrl, encodeURI(parameter.name()), encodeURI(parameter.value()));
                 }
             }
         });
@@ -103,7 +100,7 @@ export class ConsoleOperation {
             requestUrl = this.addParam(requestUrl, this.api.apiVersionSet.versionQueryName, this.api.apiVersion);
         }
 
-        return `${this.api.path}${versionPath}${revision}${requestUrl}`;
+        return `${this.api.path}${versionPath}${requestUrl}`;
     }
 
 }