fix: pass correct keyStore* args when building in release mode

Author: Fatme

lib/controllers/deploy-controller.ts

@@ -1,18 +1,15 @@
 export class DeployController {
 
 	constructor(
-		private $buildDataService: IBuildDataService,
 		private $buildController: IBuildController,
 		private $deviceInstallAppService: IDeviceInstallAppService,
 		private $devicesService: Mobile.IDevicesService
 	) { }
 
-	public async deploy(data: IRunData): Promise<void> {
-		const { liveSyncInfo, deviceDescriptors } = data;
+	public async deploy(data: IDeployData): Promise<void> {
+		const { buildData, deviceDescriptors } = data;
 
 		const executeAction = async (device: Mobile.IDevice) => {
-			const options = { ...liveSyncInfo, buildForDevice: !device.isEmulator };
-			const buildData = this.$buildDataService.getBuildData(liveSyncInfo.projectDir, device.deviceInfo.platform, options);
 			await this.$buildController.prepareAndBuild(buildData);
 			await this.$deviceInstallAppService.installOnDevice(device, buildData);
 		};

lib/definitions/run.d.ts

@@ -7,6 +7,11 @@ declare global {
 		deviceDescriptors: ILiveSyncDeviceDescriptor[];
 	}
 
+	interface IDeployData {
+		buildData: IBuildData;
+		deviceDescriptors: ILiveSyncDeviceDescriptor[];
+	}
+
 	interface IStopRunData {
 		projectDir: string;
 		deviceIdentifiers?: string[];

lib/helpers/deploy-command-helper.ts

@@ -3,6 +3,7 @@ import { BuildController } from "../controllers/build-controller";
 
 export class DeployCommandHelper {
 	constructor(
+		private $buildDataService: IBuildDataService,
 		private $buildController: BuildController,
 		private $devicesService: Mobile.IDevicesService,
 		private $deployController: DeployController,
@@ -25,31 +26,18 @@ export class DeployCommandHelper {
 
 		const deviceDescriptors: ILiveSyncDeviceDescriptor[] = devices
 			.map(d => {
-				const buildConfig: IBuildConfig = {
-					buildForDevice: !d.isEmulator,
-					iCloudContainerEnvironment: this.$options.iCloudContainerEnvironment,
-					projectDir: this.$options.path,
-					clean: this.$options.clean,
-					teamId: this.$options.teamId,
-					device: this.$options.device,
-					provision: this.$options.provision,
-					release: this.$options.release,
-					keyStoreAlias: this.$options.keyStoreAlias,
-					keyStorePath: this.$options.keyStorePath,
-					keyStoreAliasPassword: this.$options.keyStoreAliasPassword,
-					keyStorePassword: this.$options.keyStorePassword
-				};
-
-				const buildAction = additionalOptions && additionalOptions.buildPlatform ?
-					additionalOptions.buildPlatform.bind(additionalOptions.buildPlatform, d.deviceInfo.platform, buildConfig, this.$projectData) :
-					this.$buildController.prepareAndBuild.bind(this.$buildController, d.deviceInfo.platform, buildConfig, this.$projectData);
-
 				const outputPath = additionalOptions && additionalOptions.getOutputDirectory && additionalOptions.getOutputDirectory({
 					platform: d.deviceInfo.platform,
 					emulator: d.isEmulator,
 					projectDir: this.$projectData.projectDir
 				});
 
+				const buildData = this.$buildDataService.getBuildData(this.$projectData.projectDir, d.deviceInfo.platform, { ...this.$options, outputPath, buildForDevice: !d.isEmulator });
+
+				const buildAction = additionalOptions && additionalOptions.buildPlatform ?
+					additionalOptions.buildPlatform.bind(additionalOptions.buildPlatform, d.deviceInfo.platform, buildData, this.$projectData) :
+					this.$buildController.prepareAndBuild.bind(this.$buildController, d.deviceInfo.platform, buildData, this.$projectData);
+
 				const info: ILiveSyncDeviceDescriptor = {
 					identifier: d.deviceInfo.identifier,
 					buildAction,
@@ -62,20 +50,8 @@ export class DeployCommandHelper {
 				return info;
 			});
 
-		const liveSyncInfo: ILiveSyncInfo = {
-			projectDir: this.$projectData.projectDir,
-			skipWatcher: !this.$options.watch,
-			clean: this.$options.clean,
-			release: this.$options.release,
-			env: this.$options.env,
-			timeout: this.$options.timeout,
-			useHotModuleReload: this.$options.hmr,
-			force: this.$options.force,
-			emulator: this.$options.emulator
-		};
-
 		await this.$deployController.deploy({
-			liveSyncInfo,
+			buildData: this.$buildDataService.getBuildData(this.$projectData.projectDir, platform, { ...this.$options, skipWatcher: !this.$options.watch }),
 			deviceDescriptors
 		});
 	}

lib/helpers/livesync-command-helper.ts

@@ -62,31 +62,16 @@ export class LiveSyncCommandHelper implements ILiveSyncCommandHelper {
 		// Now let's take data for each device:
 		const deviceDescriptors: ILiveSyncDeviceDescriptor[] = devices
 			.map(d => {
-				const buildConfig: IBuildConfig = {
-					buildForDevice: !d.isEmulator,
-					iCloudContainerEnvironment: this.$options.iCloudContainerEnvironment,
-					projectDir: this.$options.path,
-					clean: this.$options.clean,
-					teamId: this.$options.teamId,
-					device: this.$options.device,
-					provision: this.$options.provision,
-					release: this.$options.release,
-					keyStoreAlias: this.$options.keyStoreAlias,
-					keyStorePath: this.$options.keyStorePath,
-					keyStoreAliasPassword: this.$options.keyStoreAliasPassword,
-					keyStorePassword: this.$options.keyStorePassword
-				};
-
 				const outputPath = additionalOptions && additionalOptions.getOutputDirectory && additionalOptions.getOutputDirectory({
 					platform: d.deviceInfo.platform,
 					emulator: d.isEmulator,
 					projectDir: this.$projectData.projectDir
 				});
 
-				const buildData = this.$buildDataService.getBuildData(this.$projectData.projectDir, d.deviceInfo.platform, { ...buildConfig, outputPath });
+				const buildData = this.$buildDataService.getBuildData(this.$projectData.projectDir, d.deviceInfo.platform, { ...this.$options, outputPath, buildForDevice: !d.isEmulator });
 
 				const buildAction = additionalOptions && additionalOptions.buildPlatform ?
-					additionalOptions.buildPlatform.bind(additionalOptions.buildPlatform, d.deviceInfo.platform, buildConfig, this.$projectData) :
+					additionalOptions.buildPlatform.bind(additionalOptions.buildPlatform, d.deviceInfo.platform, buildData, this.$projectData) :
 					this.$buildController.build.bind(this.$buildController, buildData);
 
 				const info: ILiveSyncDeviceDescriptor = {
@@ -117,6 +102,11 @@ export class LiveSyncCommandHelper implements ILiveSyncCommandHelper {
 	public async executeLiveSyncOperation(devices: Mobile.IDevice[], platform: string, additionalOptions?: ILiveSyncCommandHelperAdditionalOptions): Promise<void> {
 		const { liveSyncInfo, deviceDescriptors } = await this.executeLiveSyncOperationCore(devices, platform, additionalOptions);
 
+		if (this.$options.release) {
+			await this.runInRelease(platform, deviceDescriptors, liveSyncInfo);
+			return;
+		}
+
 		await this.$runController.run({
 			liveSyncInfo,
 			deviceDescriptors
@@ -173,11 +163,6 @@ export class LiveSyncCommandHelper implements ILiveSyncCommandHelper {
 		const deviceDescriptors = await this.createDeviceDescriptors(devices, platform, additionalOptions);
 		const liveSyncInfo = this.getLiveSyncData(this.$projectData.projectDir);
 
-		if (this.$options.release) {
-			await this.runInRelease(platform, deviceDescriptors, liveSyncInfo);
-			return;
-		}
-
 		return { liveSyncInfo, deviceDescriptors };
 	}
 
@@ -190,8 +175,10 @@ export class LiveSyncCommandHelper implements ILiveSyncCommandHelper {
 			sdk: this.$options.sdk
 		});
 
+		const buildData = this.$buildDataService.getBuildData(liveSyncInfo.projectDir, platform, { ...this.$options, clean: true, skipWatcher: true });
+
 		await this.$deployController.deploy({
-			liveSyncInfo: { ...liveSyncInfo, clean: true, skipWatcher: true },
+			buildData,
 			deviceDescriptors
 		});