Skip to content

Commit f41148c

Browse files
authored
fixing special char issue in clientSecret (Azure#36)
* fixing special char issue in clientSecret * Removing quotes from constants * Adding scriptbuilder.js
1 parent eeeade0 commit f41148c

2 files changed

Lines changed: 8 additions & 8 deletions

File tree

lib/PowerShell/Utilities/ScriptBuilder.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@ class ScriptBuilder {
2020
let command = `Clear-AzContext -Scope Process;
2121
Clear-AzContext -Scope CurrentUser -Force -ErrorAction SilentlyContinue;`;
2222
if (scheme === Constants_1.default.ServicePrincipal) {
23-
command += `Connect-AzAccount -ServicePrincipal -Tenant ${tenantId} -Credential \
24-
(New-Object System.Management.Automation.PSCredential('${args.servicePrincipalId}',(ConvertTo-SecureString ${args.servicePrincipalKey} -AsPlainText -Force))) \
25-
-Environment ${args.environment} | out-null;`;
23+
command += `Connect-AzAccount -ServicePrincipal -Tenant '${tenantId}' -Credential \
24+
(New-Object System.Management.Automation.PSCredential('${args.servicePrincipalId}',(ConvertTo-SecureString '${args.servicePrincipalKey}' -AsPlainText -Force))) \
25+
-Environment '${args.environment}' | out-null;`;
2626
if (args.scopeLevel === Constants_1.default.Subscription) {
27-
command += `Set-AzContext -SubscriptionId ${args.subscriptionId} -TenantId ${tenantId} | out-null;`;
27+
command += `Set-AzContext -SubscriptionId '${args.subscriptionId}' -TenantId '${tenantId}' | out-null;`;
2828
}
2929
}
3030
this.script += `try {

src/PowerShell/Utilities/ScriptBuilder.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@ export default class ScriptBuilder {
99
let command = `Clear-AzContext -Scope Process;
1010
Clear-AzContext -Scope CurrentUser -Force -ErrorAction SilentlyContinue;`;
1111
if (scheme === Constants.ServicePrincipal) {
12-
command += `Connect-AzAccount -ServicePrincipal -Tenant ${tenantId} -Credential \
13-
(New-Object System.Management.Automation.PSCredential('${args.servicePrincipalId}',(ConvertTo-SecureString ${args.servicePrincipalKey} -AsPlainText -Force))) \
14-
-Environment ${args.environment} | out-null;`;
12+
command += `Connect-AzAccount -ServicePrincipal -Tenant '${tenantId}' -Credential \
13+
(New-Object System.Management.Automation.PSCredential('${args.servicePrincipalId}',(ConvertTo-SecureString '${args.servicePrincipalKey}' -AsPlainText -Force))) \
14+
-Environment '${args.environment}' | out-null;`;
1515
if (args.scopeLevel === Constants.Subscription) {
16-
command += `Set-AzContext -SubscriptionId ${args.subscriptionId} -TenantId ${tenantId} | out-null;`;
16+
command += `Set-AzContext -SubscriptionId '${args.subscriptionId}' -TenantId '${tenantId}' | out-null;`;
1717
}
1818
}
1919
this.script += `try {

0 commit comments

Comments
 (0)