Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(cli): Escape appName from invalid characters on add #5325

Merged
merged 1 commit into from
Dec 17, 2021
Merged

fix(cli): Escape appName from invalid characters on add #5325

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions cli/src/android/common.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,11 @@ export async function editProjectSettingsAndroid(
config: Config,
): Promise<void> {
const appId = config.app.appId;
const appName = config.app.appName;
const appName = config.app.appName
.replace(/&/g, '&amp;')
.replace(/</g, '&lt;')
.replace(/"/g, '\\"')
.replace(/'/g, "\\'");

const manifestPath = resolve(
config.android.srcMainDirAbs,
Expand Down Expand Up @@ -140,10 +144,7 @@ export async function editProjectSettingsAndroid(
const stringsPath = resolve(config.android.resDirAbs, 'values/strings.xml');
let stringsContent = await readFile(stringsPath, { encoding: 'utf-8' });
stringsContent = stringsContent.replace(/com.getcapacitor.myapp/g, appId);
stringsContent = stringsContent.replace(
/My App/g,
appName.replace(/'/g, `\\'`),
);
stringsContent = stringsContent.replace(/My App/g, appName);

await writeFile(stringsPath, stringsContent);
}
5 changes: 4 additions & 1 deletion cli/src/ios/common.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,10 @@ export async function resolvePlugin(plugin: Plugin): Promise<Plugin | null> {
*/
export async function editProjectSettingsIOS(config: Config): Promise<void> {
const appId = config.app.appId;
const appName = config.app.appName;
const appName = config.app.appName
.replace(/&/g, '&amp;')
.replace(/</g, '&lt;')
.replace(/>/g, '&gt;');

const pbxPath = `${config.ios.nativeXcodeProjDirAbs}/project.pbxproj`;
const plistPath = resolve(config.ios.nativeTargetDirAbs, 'Info.plist');
Expand Down