diff --git a/lib/gui/app/modules/analytics.ts b/lib/gui/app/modules/analytics.ts index 1bc95117..f62f10ac 100644 --- a/lib/gui/app/modules/analytics.ts +++ b/lib/gui/app/modules/analytics.ts @@ -55,10 +55,7 @@ async function initConfig() { await installCorvus(); let validatedConfig = null; try { - const configUrl = - (await settings.get('configUrl')) || - 'https://balena.io/etcher/static/config.json'; - const config = await getConfig(configUrl); + const config = await getConfig(); const mixpanel = _.get(config, ['analytics', 'mixpanel'], {}); mixpanelSample = mixpanel.probability || DEFAULT_PROBABILITY; if (isClientEligible(mixpanelSample)) { diff --git a/lib/gui/etcher.ts b/lib/gui/etcher.ts index c644281a..0e4debd5 100644 --- a/lib/gui/etcher.ts +++ b/lib/gui/etcher.ts @@ -114,10 +114,7 @@ async function createMainWindow() { }); if (packageUpdatable) { try { - const configUrl = - (await settings.get('configUrl')) || - 'https://balena.io/etcher/static/config.json'; - const onlineConfig = await getConfig(configUrl); + const onlineConfig = await getConfig(); const autoUpdaterConfig = _.get( onlineConfig, ['autoUpdates', 'autoUpdaterConfig'], diff --git a/lib/shared/utils.ts b/lib/shared/utils.ts index 7d58626a..557cb934 100755 --- a/lib/shared/utils.ts +++ b/lib/shared/utils.ts @@ -21,6 +21,7 @@ import * as tmp from 'tmp'; import { promisify } from 'util'; import * as errors from './errors'; +import * as settings from '../gui/app/models/settings'; const getAsync = promisify(request.get); @@ -50,7 +51,10 @@ export function hasProps(obj: any, props: string[]): boolean { * @summary Get etcher configs stored online * @param {String} - url where config.json is stored */ -export async function getConfig(configUrl: string): Promise { +export async function getConfig(): Promise<_.Dictionary> { + const configUrl = + (await settings.get('configUrl')) || + 'https://balena.io/etcher/static/config.json'; return (await getAsync({ url: configUrl, json: true })).body; }