Fix some issues about the provision switch

Author: PanayotCankov

lib/definitions/project.d.ts

@@ -258,6 +258,12 @@ interface IPlatformProjectService extends NodeJS.EventEmitter {
 	 * @returns {void}
 	 */
 	cleanProject(projectRoot: string, projectData: IProjectData): Promise<void>
+
+	/**
+	 * Check the current state of the project, and validate against the options.
+	 * If there are parts in the project that are inconsistent with the desired options, marks them in the changeset flags.
+	 */
+	checkForChanges(changeset: IProjectChangesInfo, options: IProjectChangesOptions, projectData: IProjectData): void;
 }
 
 interface IAndroidProjectPropertiesManager {

lib/services/android-project-service.ts

@@ -430,6 +430,9 @@ export class AndroidProjectService extends projectServiceBaseLib.PlatformProject
 		await adb.executeShellCommand(["rm", "-rf", deviceRootPath]);
 	}
 
+	public checkForChanges(changesInfo: IProjectChangesInfo, options: IProjectChangesOptions, projectData: IProjectData): void {
+	}
+
 	private _canUseGradle: boolean;
 	private canUseGradle(projectData: IProjectData, frameworkVersion?: string): boolean {
 		if (!this._canUseGradle) {

lib/services/ios-project-service.ts

@@ -12,6 +12,7 @@ import * as temp from "temp";
 import * as plist from "plist";
 import { Xcode } from "pbxproj-dom/xcode";
 import { IOSProvisionService } from "./ios-provision-service";
+import * as fs from "fs";
 
 export class IOSProjectService extends projectServiceBaseLib.PlatformProjectServiceBase implements IPlatformProjectService {
 	private static XCODE_PROJECT_EXT_NAME = ".xcodeproj";
@@ -372,10 +373,9 @@ export class IOSProjectService extends projectServiceBaseLib.PlatformProjectServ
 		await this.createIpa(projectRoot, projectData, buildConfig);
 	}
 
-	private async setupSigningFromProvision(projectRoot: string, projectData: IProjectData, provision?: any): Promise<void> {
+	private async setupSigningFromProvision(projectRoot: string, projectData: IProjectData, provision?: string): Promise<void> {
 		if (provision) {
-			const pbxprojPath = path.join(projectRoot, projectData.projectName + ".xcodeproj", "project.pbxproj");
-			const xcode = Xcode.open(pbxprojPath);
+			const xcode = Xcode.open(this.getPbxProjPath(projectData));
 			const signing = xcode.getSigning(projectData.projectName);
 
 			let shouldUpdateXcode = false;
@@ -421,11 +421,16 @@ export class IOSProjectService extends projectServiceBaseLib.PlatformProjectServ
 	}
 
 	private async setupSigningForDevice(projectRoot: string, buildConfig: IiOSBuildConfig, projectData: IProjectData): Promise<void> {
-		const pbxprojPath = path.join(projectRoot, projectData.projectName + ".xcodeproj", "project.pbxproj");
-		const xcode = Xcode.open(pbxprojPath);
+		const xcode = Xcode.open(this.getPbxProjPath(projectData));
 		const signing = xcode.getSigning(projectData.projectName);
 
-		if ((this.readXCConfigProvisioningProfile(projectData) || this.readXCConfigProvisioningProfileForIPhoneOs(projectData)) && (!signing || signing.style !== "Manual")) {
+		const hasProvisioningProfileInXCConfig =
+			this.readXCConfigProvisioningProfile(projectData) ||
+			this.readXCConfigProvisioningProfileForIPhoneOs(projectData) ||
+			this.readXCConfigProvisioningProfileSpecifier(projectData) ||
+			this.readXCConfigProvisioningProfileSpecifierForIPhoneOs(projectData);
+
+		if (hasProvisioningProfileInXCConfig && (!signing || signing.style !== "Manual")) {
 			xcode.setManualSigningStyle(projectData.projectName);
 			xcode.save();
 		} else if (!buildConfig.provision && !(signing && signing.style === "Manual" && !buildConfig.teamId)) {
@@ -616,7 +621,7 @@ We will now place an empty obsolete compatability white screen LauncScreen.xib f
 
 		if (provision) {
 			let projectRoot = path.join(projectData.platformsDir, "ios");
-			await this.setupSigningFromProvision(projectRoot, provision);
+			await this.setupSigningFromProvision(projectRoot, projectData, provision);
 		}
 
 		let project = this.createPbxProj(projectData);
@@ -837,6 +842,41 @@ We will now place an empty obsolete compatability white screen LauncScreen.xib f
 		return Promise.resolve();
 	}
 
+	public checkForChanges(changesInfo: IProjectChangesInfo, options: IProjectChangesOptions, projectData: IProjectData): void {
+		const nextCommandProvisionUUID = options.provision;
+
+		if (typeof nextCommandProvisionUUID === "string") {
+			const pbxprojPath = this.getPbxProjPath(projectData);
+
+			// Check if the native project's signing is set to the provided provision...
+			let signingChanged = false;
+			if (!fs.existsSync(pbxprojPath)) {
+				const xcode = Xcode.open(pbxprojPath);
+				const signing = xcode.getSigning(projectData.projectName);
+				if (signing.style === "Manual") {
+					for (let name in signing.configurations) {
+						let config = signing.configurations[name];
+						if (config.uuid != nextCommandProvisionUUID && config.name != nextCommandProvisionUUID) {
+							signingChanged = true;
+							break;
+						}
+					}
+				} else {
+					signingChanged = true;
+				}
+			} else {
+				signingChanged = true;
+			}
+
+			if (signingChanged) {
+				changesInfo.nativeChanged = true;
+				changesInfo.configChanged = true;
+				// TRICKY: The native project is prepared only if appResourcesChanged.
+				changesInfo.appResourcesChanged = true;
+			}
+		}
+	}
+
 	private getAllLibsForPluginWithFileExtension(pluginData: IPluginData, fileExtension: string): string[] {
 		let filterCallback = (fileName: string, pluginPlatformsFolderPath: string) => path.extname(fileName) === fileExtension;
 		return this.getAllNativeLibrariesForPlugin(pluginData, IOSProjectService.IOS_PLATFORM_NAME, filterCallback);
@@ -1179,6 +1219,14 @@ We will now place an empty obsolete compatability white screen LauncScreen.xib f
 		return this.readXCConfig("PROVISIONING_PROFILE[sdk=iphoneos*]", projectData);
 	}
 
+	private readXCConfigProvisioningProfileSpecifier(projectData: IProjectData): string {
+		return this.readXCConfig("PROVISIONING_PROFILE_SPECIFIER", projectData);
+	}
+
+	private readXCConfigProvisioningProfileSpecifierForIPhoneOs(projectData: IProjectData): string {
+		return this.readXCConfig("PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]", projectData);
+	}
+
 	private async getDevelopmentTeam(projectData: IProjectData, teamId?: string): Promise<string> {
 		teamId = teamId || this.readTeamId(projectData);
 

lib/services/project-changes-service.ts

@@ -75,16 +75,10 @@ export class ProjectChangesService implements IProjectChangesService {
 				]);
 			}
 		}
-		if (platform.toLowerCase() === this.$devicePlatformsConstants.iOS.toLowerCase()) {
-			const nextCommandProvisionUUID = projectChangesOptions.provision;
-			// We should consider reading here the provisioning profile UUID from the xcodeproj and xcconfig.
-			const prevProvisionUUID = this._prepareInfo.iOSProvisioningProfileUUID;
-			if (nextCommandProvisionUUID !== prevProvisionUUID) {
-				this._changesInfo.nativeChanged = true;
-				this._changesInfo.configChanged = true;
-				this._prepareInfo.iOSProvisioningProfileUUID = nextCommandProvisionUUID;
-			}
-		}
+		
+		let projectService = platformData.platformProjectService;
+		projectService.checkForChanges(this._changesInfo, projectChangesOptions, projectData);
+
 		if (projectChangesOptions.bundle !== this._prepareInfo.bundle || projectChangesOptions.release !== this._prepareInfo.release) {
 			this._changesInfo.appFilesChanged = true;
 			this._changesInfo.appResourcesChanged = true;

package.json

@@ -56,7 +56,7 @@
     "mute-stream": "0.0.5",
     "open": "0.0.5",
     "osenv": "0.1.3",
-    "pbxproj-dom": "1.0.9",
+    "pbxproj-dom": "1.0.11",
     "plist": "1.1.0",
     "plist-merge-patch": "0.0.9",
     "plistlib": "0.2.1",