Add support for Custom entitlements files #2753
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,72 @@ | ||
| import * as path from "path"; | ||
| import * as constants from "../constants"; | ||
| import { PlistSession } from "plist-merge-patch"; | ||
|
|
||
| export class IOSEntitlementsService { | ||
| constructor(private $fs: IFileSystem, | ||
| private $logger: ILogger, | ||
| private $devicePlatformsConstants: Mobile.IDevicePlatformsConstants, | ||
| private $mobileHelper: Mobile.IMobileHelper, | ||
| private $pluginsService: IPluginsService) { | ||
| } | ||
|
|
||
| public static readonly DefaultEntitlementsName: string = "app.entitlements"; | ||
|
|
||
| private getDefaultAppEntitlementsPath(projectData: IProjectData) : string { | ||
| const entitlementsName = IOSEntitlementsService.DefaultEntitlementsName; | ||
| const entitlementsPath = path.join(projectData.projectDir, | ||
| constants.APP_FOLDER_NAME, constants.APP_RESOURCES_FOLDER_NAME, | ||
| this.$mobileHelper.normalizePlatformName(this.$devicePlatformsConstants.iOS), | ||
| entitlementsName); | ||
| return entitlementsPath; | ||
| } | ||
|
|
||
| public getPlatformsEntitlementsPath(projectData: IProjectData) : string { | ||
| return path.join(projectData.platformsDir, this.$devicePlatformsConstants.iOS, | ||
| projectData.projectName, projectData.projectName + ".entitlements"); | ||
| } | ||
| public getPlatformsEntitlementsRelativePath(projectData: IProjectData): string { | ||
| return path.join(projectData.projectName, projectData.projectName + ".entitlements"); | ||
| } | ||
|
|
||
| public async merge(projectData: IProjectData): Promise<void> { | ||
| let session = new PlistSession({ log: (txt: string) => this.$logger.trace("App.entitlements: " + txt) }); | ||
|
|
||
| let projectDir = projectData.projectDir; | ||
| let makePatch = (plistPath: string) => { | ||
| if (!this.$fs.exists(plistPath)) { | ||
| this.$logger.trace("No plist found at: " + plistPath); | ||
| return; | ||
| } | ||
|
|
||
| this.$logger.trace("Schedule merge plist at: " + plistPath); | ||
| session.patch({ | ||
| name: path.relative(projectDir, plistPath), | ||
| read: () => this.$fs.readText(plistPath) | ||
| }); | ||
| }; | ||
|
|
||
| let allPlugins = await this.getAllInstalledPlugins(projectData); | ||
| for (let plugin of allPlugins) { | ||
| let pluginInfoPlistPath = path.join(plugin.pluginPlatformsFolderPath(this.$devicePlatformsConstants.iOS), | ||
| IOSEntitlementsService.DefaultEntitlementsName); | ||
| makePatch(pluginInfoPlistPath); | ||
| } | ||
|
|
||
| let appEntitlementsPath = this.getDefaultAppEntitlementsPath(projectData); | ||
| if (this.$fs.exists(appEntitlementsPath)) { | ||
| makePatch(appEntitlementsPath); | ||
| } | ||
|
|
||
| let plistContent = session.build(); | ||
| this.$logger.trace("App.entitlements: Write to: " + this.getPlatformsEntitlementsPath(projectData)); | ||
| this.$fs.writeFile(this.getPlatformsEntitlementsPath(projectData), plistContent); | ||
| return; | ||
| } | ||
|
|
||
| private getAllInstalledPlugins(projectData: IProjectData): Promise<IPluginData[]> { | ||
| return this.$pluginsService.getAllInstalledPlugins(projectData); | ||
| } | ||
| } | ||
|
|
||
| $injector.register("iOSEntitlementsService", IOSEntitlementsService); | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,40 @@ | ||
| export class XCConfigService { | ||
| constructor(private $fs: IFileSystem) { | ||
| } | ||
|
|
||
| /** | ||
| * Returns the Value of a Property from a XC Config file. | ||
| * @param xcconfigFilePath | ||
| * @param propertyName | ||
| */ | ||
| public readPropertyValue(xcconfigFilePath: string, propertyName: string): string { | ||
| if (this.$fs.exists(xcconfigFilePath)) { | ||
| let text = this.$fs.readText(xcconfigFilePath); | ||
|
|
||
| let property: string; | ||
| let isPropertyParsed: boolean = false; | ||
| text.split(/\r?\n/).forEach((line) => { | ||
| line = line.replace(/\/(\/)[^\n]*$/, ""); | ||
| if (line.indexOf(propertyName) >= 0) { | ||
| let parts = line.split("="); | ||
| if (parts.length > 1 && parts[1]) { | ||
| property = parts[1].trim(); | ||
| isPropertyParsed = true; | ||
| if (property[property.length - 1] === ';') { | ||
| property = property.slice(0, -1); | ||
| } | ||
| } | ||
| } | ||
| }); | ||
|
|
||
| if (isPropertyParsed) { | ||
| // property can be an empty string, so we don't check for that. | ||
| return property; | ||
| } | ||
| } | ||
|
|
||
| return null; | ||
| } | ||
| } | ||
|
|
||
| $injector.register("xCConfigService", XCConfigService); |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
you do not need this return