fixing special char issue in clientSecret (#36) (#37)

* fixing special char issue in clientSecret (#36)

* fixing special char issue in clientSecret

* Removing quotes from constants

* Adding scriptbuilder.js

* escaping single quotes

lib/PowerShell/Utilities/PowerShellToolRunner.js

@@ -28,7 +28,7 @@ class PowerShellToolRunner {
     }
     static executePowerShellScriptBlock(scriptBlock, options = {}) {
         return __awaiter(this, void 0, void 0, function* () {
-            yield exec.exec(`${PowerShellToolRunner.psPath} -Command`, [scriptBlock], options);
+            yield exec.exec(`"${PowerShellToolRunner.psPath}" -Command`, [scriptBlock], options);
         });
     }
 }

lib/PowerShell/Utilities/ScriptBuilder.js

@@ -20,11 +20,11 @@ class ScriptBuilder {
         let command = `Clear-AzContext -Scope Process;
              Clear-AzContext -Scope CurrentUser -Force -ErrorAction SilentlyContinue;`;
         if (scheme === Constants_1.default.ServicePrincipal) {
-            command += `Connect-AzAccount -ServicePrincipal -Tenant ${tenantId} -Credential \
-            (New-Object System.Management.Automation.PSCredential('${args.servicePrincipalId}',(ConvertTo-SecureString ${args.servicePrincipalKey} -AsPlainText -Force))) \
-                -Environment ${args.environment} | out-null;`;
+            command += `Connect-AzAccount -ServicePrincipal -Tenant '${tenantId}' -Credential \
+            (New-Object System.Management.Automation.PSCredential('${args.servicePrincipalId}',(ConvertTo-SecureString '${args.servicePrincipalKey.replace("'", "''")}' -AsPlainText -Force))) \
+                -Environment '${args.environment}' | out-null;`;
             if (args.scopeLevel === Constants_1.default.Subscription) {
-                command += `Set-AzContext -SubscriptionId ${args.subscriptionId} -TenantId ${tenantId} | out-null;`;
+                command += `Set-AzContext -SubscriptionId '${args.subscriptionId}' -TenantId '${tenantId}' | out-null;`;
             }
         }
         this.script += `try {

lib/main.js

@@ -87,4 +87,4 @@ function executeAzCliCommand(command, silent) {
         }
     });
 }
-main();
+main();

src/PowerShell/Utilities/PowerShellToolRunner.ts

@@ -11,6 +11,6 @@ export default class PowerShellToolRunner {
     }
 
     static async executePowerShellScriptBlock(scriptBlock: string, options: any = {}) {
-        await exec.exec(`${PowerShellToolRunner.psPath} -Command`, [scriptBlock], options)
+        await exec.exec(`"${PowerShellToolRunner.psPath}" -Command`, [scriptBlock], options)
     }
 }

src/PowerShell/Utilities/ScriptBuilder.ts

@@ -9,11 +9,11 @@ export default class ScriptBuilder {
         let command = `Clear-AzContext -Scope Process;
              Clear-AzContext -Scope CurrentUser -Force -ErrorAction SilentlyContinue;`;
         if (scheme === Constants.ServicePrincipal) {
-            command += `Connect-AzAccount -ServicePrincipal -Tenant ${tenantId} -Credential \
-            (New-Object System.Management.Automation.PSCredential('${args.servicePrincipalId}',(ConvertTo-SecureString ${args.servicePrincipalKey} -AsPlainText -Force))) \
-                -Environment ${args.environment} | out-null;`;
+            command += `Connect-AzAccount -ServicePrincipal -Tenant '${tenantId}' -Credential \
+            (New-Object System.Management.Automation.PSCredential('${args.servicePrincipalId}',(ConvertTo-SecureString '${args.servicePrincipalKey.replace("'", "''")}' -AsPlainText -Force))) \
+                -Environment '${args.environment}' | out-null;`;
             if (args.scopeLevel === Constants.Subscription) {
-                command += `Set-AzContext -SubscriptionId ${args.subscriptionId} -TenantId ${tenantId} | out-null;`;
+                command += `Set-AzContext -SubscriptionId '${args.subscriptionId}' -TenantId '${tenantId}' | out-null;`;
             }
         }
         this.script += `try {
@@ -48,4 +48,5 @@ export default class ScriptBuilder {
         core.debug(`GetLatestModuleScript: ${this.script}`);
         return this.script;
     }
+
 }