Preinstall PS Gallery

Author: pkarpovich

tools/office-cmdlet-updater/constants/commands.js

@@ -1,16 +1,18 @@
 module.exports = {
 	GET_TEAM: 'Get-Team',
+	INSTALL_PS_GALLERY: 'Set-PSRepository -Name "PSGallery" -InstallationPolicy Trusted',
 	INSTALL_PACKAGE_PROVIDER: 'Install-PackageProvider -Name NuGet -MinimumVersion 2.8.5.201 -Force',
 	INSTALL_MICROSOFT_TEAM: 'Install-Module MicrosoftTeams -SkipPublisherCheck -Force',
 	CONNECT_MICROSOFT_TEAM: 'Connect-MicrosoftTeams',
 	INSTALL_PLATYPS: 'Install-Module -Name platyPS -SkipPublisherCheck -Scope CurrentUser -Force',
 	IMPORT_PLATYPS: 'Import-Module platyPS',
 	UPDATE_MARKDOWN: 'Update-MarkdownHelp -Path "{}" -LogPath "{}" -Session $Session',
-	SKYPE_SET_POLICY: 'Set-ExecutionPolicy RemoteSigned ',
-	SKYPE_INSTALL_MODULE: 'Import-Module "C:\\\\Program Files\\\\Common Files\\\\Skype for Business Online\\\\Modules\\\\SkypeOnlineConnector\\\\SkypeOnlineConnector.psd1" -Force',
+	SKYPE_ENABLE_WIN_RM: 'sc.exe start WinRM',
+	SKYPE_INSTALL_LYNC_MODULE: 'Import-Module LyncOnlineConnector',
+	SKYPE_INSTALL_MODULE: 'Import-Module SkypeOnlineConnector -Force',
 	SKYPE_GET_CRED: '$cred = Get-Credential',
 	SKYPE_CREATE_SESSION: '$session = New-CsOnlineSession -Credential $cred -Verbose',
-	SKYPE_IMPORT_SESSION: 'Import-PSSession -Session $session',
+	SKYPE_IMPORT_SESSION: 'Import-PSSession -Session $session -Verbose',
 	SHAREPOINT_INSTALL_MODULE: 'Import-Module Microsoft.Online.SharePoint.PowerShell -DisableNameChecking',
 	WHITEBOARD_INSTALL_MODULE: 'Install-Module -Name WhiteboardAdmin -Force',
 	EXCHANGE_INSTALL_MODULE: 'Install-Module -Name ExchangeOnlineShell -Force',

tools/office-cmdlet-updater/constants/errors.js

@@ -1,9 +1,11 @@
 module.exports.powerShellErrors = {
+	PS_GALLERY_INSTALL_ERROR: "You should using x64 version of PowerShell",
 	DOC_PATH_DOESNT_EXIST: "Path to documentation folder doesn't exist",
 	INSTALL_PLATYPS_ERROR: "Can't install 'platyPS' module",
 	IMPORT_PLATYPS_ERROR: "Cant't import 'platyPS' module",
 	INSTALL_MICROSOFT_TEAM_ERROR: "Can't install 'Microsoft team' module",
-	AUTH_MICROSOFT_TEAM_ERROR: "Can't auth into 'Microsoft team'"
+	AUTH_MICROSOFT_TEAM_ERROR: "Can't auth into 'Microsoft team'",
+	EMPTY_CONFIG_CREDENTIALS: "Empty credentials fields in a config file. Please, feel 'platyPS.credentials' section into a config file"
 };
 
 module.exports.markdownErrors = {

tools/office-cmdlet-updater/controllers/cli.controller.js

@@ -65,12 +65,18 @@ class CliController {
 				createPr: isNeedPullRequest
 			} = cli;
 
-			await this.markdownController.updateMarkdown({
-				cliModuleName,
-				cliCmdletName,
-				isNeedPullRequest,
-				isNeedEmail
-			});
+			await this.markdownController
+				.updateMarkdown({
+					cliModuleName,
+					cliCmdletName,
+					isNeedPullRequest,
+					isNeedEmail
+				})
+				.catch((err) => {
+					console.error(err);
+
+					this.powerShellService.dispose();
+				});
 		});
 	}
 }

tools/office-cmdlet-updater/services/cmdlet.dependencies.service.js

@@ -1,4 +1,5 @@
 const commands = require('../constants/commands');
+const errors = require('../constants/errors');
 const format = require('string-format');
 
 class CmdletDependenciesService {
@@ -8,7 +9,7 @@ class CmdletDependenciesService {
 	}
 
 	async installDependencies({ cmdletName }) {
-		await this.installPlatyPs();
+		await this.installGlobalDependencies();
 
 		switch (cmdletName) {
 			case 'teams': {
@@ -39,15 +40,31 @@ class CmdletDependenciesService {
 				await this.preInstallStuffHub();
 				break;
 			}
+			default: {
+
+			}
 		}
 	}
 
+	async installGlobalDependencies() {
+		await this.installPsGallery();
+		await this.installPlatyPs();
+	}
+
 	async installPlatyPs() {
 		await this.ps.invokeCommand(commands.INSTALL_PACKAGE_PROVIDER);
 		await this.ps.invokeCommand(commands.INSTALL_PLATYPS);
 		await this.ps.invokeCommand(commands.IMPORT_PLATYPS);
 	}
 
+	async installPsGallery() {
+		try {
+			await this.ps.invokeCommand(commands.INSTALL_PS_GALLERY);
+		} catch (e) {
+			throw errors.powerShellErrors.PS_GALLERY_INSTALL_ERROR;
+		}
+	}
+
 	async preInstallTeams() {
 		// TODO: check if user already auth
 
@@ -62,7 +79,14 @@ class CmdletDependenciesService {
 	async preInstallSkype({ login, pass }) {
 		await this._createCredInPs({ login, pass });
 
-		// await this.ps.invokeCommand(commands.SKYPE_INSTALL_MODULE);
+		await this.ps.invokeCommandAndIgnoreError({
+			command: commands.SKYPE_ENABLE_WIN_RM,
+			printError: true
+		});
+
+		//await this.ps.invokeCommand(commands.SKYPE_GET_CRED);
+		await this.ps.invokeCommand(commands.SKYPE_INSTALL_LYNC_MODULE);
+		await this.ps.invokeCommand(commands.SKYPE_INSTALL_MODULE);
 		await this.ps.invokeCommand(commands.SKYPE_CREATE_SESSION);
 		await this.ps.invokeCommand(commands.SKYPE_IMPORT_SESSION);
 	}
@@ -74,6 +98,11 @@ class CmdletDependenciesService {
 	async preInstallExchange({ login, pass }) {
 		await this._createCredInPs({ login, pass });
 
+		await this.ps.invokeCommandAndIgnoreError({
+			command: commands.SKYPE_ENABLE_WIN_RM,
+			printError: true
+		});
+
 		//await this.ps.invokeCommand(commands.EXCHANGE_INSTALL_MODULE);
 		await this.ps.invokeCommand(commands.EXCHANGE_GET_SESSION);
 		await this.ps.invokeCommand(commands.EXCHANGE_SESSION_IMPORT);
@@ -88,7 +117,7 @@ class CmdletDependenciesService {
 		const { login, pass } = this.config.get('platyPS.credentials');
 
 		if (!login || !pass) {
-			throw new Error('Invalid credentials');
+			throw new Error(errors.powerShellErrors.EMPTY_CONFIG_CREDENTIALS);
 		}
 
 		return { login, pass };

tools/office-cmdlet-updater/services/power.shell.service.js

@@ -7,7 +7,7 @@ class PowerShellService {
 	constructor(config) {
 		this.config = config;
 		this.ps = new Shell({
-			executionPolicy: 'Bypass',
+			executionPolicy: 'Unrestricted',
 			noProfile: true
 		});
 	}
@@ -32,6 +32,18 @@ class PowerShellService {
 		return output;
 	}
 
+	async invokeCommandAndIgnoreError({ command, printError = false }) {
+		await this.ps.addCommand(command);
+
+		const [output, err] = await of(this.ps.invoke());
+
+		if (err && printError) {
+			console.error(err);
+		}
+
+		return output;
+	}
+
 	async dispose() {
 		return await this.ps.dispose();
 	}