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

feat(cli): supports secure live updates in Portals for Capacitor config #5955

Merged
merged 4 commits into from
Oct 3, 2022
Merged

feat(cli): supports secure live updates in Portals for Capacitor config #5955

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4dbeb59
added liveUpdatesKey to Portals plugin declaration
carlpoole Sep 21, 2022
16c437b
Refined copySecureLiveUpdatesKey to work with Portals for Capacitor key
carlpoole Sep 26, 2022
178dfc9
Removed variable to make code cleaner
carlpoole Sep 26, 2022
491cc2b
Merge branch 'main' into slu-pforc
carlpoole Oct 3, 2022
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
1 change: 1 addition & 0 deletions cli/src/declarations.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -592,6 +592,7 @@ export interface PluginsConfig {
Portals?: {
shell: Portal;
apps: Portal[];
liveUpdatesKey?: string;
};

/**
Expand Down
45 changes: 33 additions & 12 deletions cli/src/tasks/copy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,31 +97,53 @@ export async function copy(
if (platformName === config.ios.name) {
if (usesCapacitorPortals) {
await copyFederatedWebDirs(config, await config.ios.webDirAbs);
if (config.app.extConfig?.plugins?.Portals?.liveUpdatesKey) {
await copySecureLiveUpdatesKey(
config.app.extConfig.plugins.Portals.liveUpdatesKey,
config.app.rootDir,
config.ios.nativeTargetDirAbs,
);
}
} else {
await copyWebDir(
config,
await config.ios.webDirAbs,
config.app.webDirAbs,
);
}
if (usesLiveUpdates) {
await copySecureLiveUpdatesKey(config, config.ios.nativeTargetDirAbs);
if (usesLiveUpdates && config.app.extConfig?.plugins?.LiveUpdates?.key) {
await copySecureLiveUpdatesKey(
config.app.extConfig.plugins.LiveUpdates.key,
config.app.rootDir,
config.ios.nativeTargetDirAbs,
);
}
await copyCapacitorConfig(config, config.ios.nativeTargetDirAbs);
const cordovaPlugins = await getCordovaPlugins(config, platformName);
await handleCordovaPluginsJS(cordovaPlugins, config, platformName);
} else if (platformName === config.android.name) {
if (usesCapacitorPortals) {
await copyFederatedWebDirs(config, config.android.webDirAbs);
if (config.app.extConfig?.plugins?.Portals?.liveUpdatesKey) {
await copySecureLiveUpdatesKey(
config.app.extConfig.plugins.Portals.liveUpdatesKey,
config.app.rootDir,
config.android.assetsDirAbs,
);
}
} else {
await copyWebDir(
config,
config.android.webDirAbs,
config.app.webDirAbs,
);
}
if (usesLiveUpdates) {
await copySecureLiveUpdatesKey(config, config.android.assetsDirAbs);
if (usesLiveUpdates && config.app.extConfig?.plugins?.LiveUpdates?.key) {
await copySecureLiveUpdatesKey(
config.app.extConfig.plugins.LiveUpdates.key,
config.app.rootDir,
config.android.assetsDirAbs,
);
}
await copyCapacitorConfig(config, config.android.assetsDirAbs);
const cordovaPlugins = await getCordovaPlugins(config, platformName);
Expand Down Expand Up @@ -229,15 +251,14 @@ function isPortal(config: any): config is Portal {
);
}

async function copySecureLiveUpdatesKey(config: Config, nativeAbsDir: string) {
if (!config.app.extConfig?.plugins?.LiveUpdates?.key) {
return;
}

const secureLiveUpdatesKeyFile = config.app.extConfig.plugins.LiveUpdates.key;
const keyAbsFromPath = join(config.app.rootDir, secureLiveUpdatesKeyFile);
async function copySecureLiveUpdatesKey(
secureLiveUpdatesKeyFile: string,
rootDir: string,
nativeAbsDir: string,
) {
const keyAbsFromPath = join(rootDir, secureLiveUpdatesKeyFile);
const keyAbsToPath = join(nativeAbsDir, basename(keyAbsFromPath));
const keyRelToDir = relative(config.app.rootDir, nativeAbsDir);
const keyRelToDir = relative(rootDir, nativeAbsDir);

if (!(await pathExists(keyAbsFromPath))) {
logger.warn(
Expand Down