Merge pull request #12 from bitsofinfo/nf/command-import-fix

Added spaces to separate init commands when importing commands into s…

Author: bitsofinfo

README.md

@@ -57,6 +57,9 @@ Three sets of init commands are availiable as of version `1.1.0`:
 ### <a id="history"></a>History
 
 ```
+v1.1.1 - 2020-12-07
+    - Fixed bug import of custom commands if provided for certificate based auth
+
 v1.1.0 - 2020-12-03
     - Added option for key and thumbprint based Exchange authentication
 

o365Utils.js

@@ -146,7 +146,7 @@ module.exports.getO365PSKeyInitCommands = function (pathToDecryptUtilScript,
         '$CertificatePassword = (ConvertTo-SecureString -String "' + authCertificatePassword + '" -AsPlainText -Force)',
 
         // #6 connect to exchange
-        'Connect-ExchangeOnline -CertificateFilePath $CertificateFilePath -CertificatePassword $CertificatePassword  -AppID ' + applicationId + ' -Organization ' + organizationId + psCommandsToImport,
+        'Connect-ExchangeOnline -CertificateFilePath $CertificateFilePath -CertificatePassword $CertificatePassword  -AppID ' + applicationId + ' -Organization ' + organizationId + ' ' + psCommandsToImport,
 
         // #7 cleanup
         'Remove-Variable -Force -ErrorAction SilentlyContinue $PSCredential'
@@ -235,7 +235,7 @@ module.exports.getO365PSThumbprintInitCommands = function (pathToDecryptUtilScri
         ('$sessionOpt = New-PSSessionOption -OpenTimeout ' + openTimeout + ' -OperationTimeout ' + operationTimeout + ' -IdleTimeout ' + idleTimeout),
 
         // #6 connect to exchange
-        'Connect-ExchangeOnline -CertificateThumbPrint ' + certificateThumbPrint + '  -AppID ' + applicationId + ' -Organization ' + organizationId + psCommandsToImport,
+        'Connect-ExchangeOnline -CertificateThumbPrint ' + certificateThumbPrint + '  -AppID ' + applicationId + ' -Organization ' + organizationId + ' ' + psCommandsToImport,
 
         // #7 cleanup
         'Remove-Variable -Force -ErrorAction SilentlyContinue $PSCredential'

package-lock.json

@@ -1,6 +1,6 @@
 {
     "name": "powershell-command-executor",
-    "version": "1.1.0",
+    "version": "1.1.1",
     "description": "Provides a registry and gateway for execution powershell commands through long-lived established remote PSSessions via a stateful-process-command-proxy pool of powershell processes",
     "main": "psCommandService.js",
     "directories": {
@@ -23,9 +23,9 @@
         "exec"
     ],
     "dependencies": {
-        "stateful-process-command-proxy": "latest",
+        "mustache": "^4.1.0",
         "promise": "latest",
-        "mustache": "latest"
+        "stateful-process-command-proxy": "latest"
     },
     "devDependencies": {
         "mocha": "latest"