From fa578fb37c0c3d80fd236d18bda9114dcca0343c Mon Sep 17 00:00:00 2001 From: Yuya Ochiai Date: Tue, 7 Nov 2017 22:32:23 +0900 Subject: [PATCH] Show error dialog when wrong buildConfig is used --- src/common/config/buildConfig.js | 1 + src/main.js | 9 +++++++++ 2 files changed, 10 insertions(+) diff --git a/src/common/config/buildConfig.js b/src/common/config/buildConfig.js index 141c82f4..c9df6342 100644 --- a/src/common/config/buildConfig.js +++ b/src/common/config/buildConfig.js @@ -6,6 +6,7 @@ * @prop {string} helpLink - The URL for "Help->Learn More..." menu item. * If null is specified, the menu disappears. * @prop {boolean} enableServerManagement - Whether users can edit servers configuration. + * If false is specified, defaultTeams must have a team at least. */ const buildConfig = { defaultTeams: [/* diff --git a/src/main.js b/src/main.js index e8feed53..76d7e1de 100644 --- a/src/main.js +++ b/src/main.js @@ -31,6 +31,7 @@ if (squirrelStartup()) { } var settings = require('./common/settings'); +const buildConfig = require('./common/config/buildConfig'); var certificateStore = require('./main/certificateStore').load(path.resolve(app.getPath('userData'), 'certificate.json')); const {createMainWindow} = require('./main/mainWindow'); const appMenu = require('./main/menus/app'); @@ -367,6 +368,14 @@ app.on('ready', () => { if (global.willAppQuit) { return; } + if (buildConfig.enableServerManagement === false && buildConfig.defaultTeams.length === 0) { + dialog.showMessageBox({ + type: 'error', + title: 'Mattermost', + message: 'When "enableServerManagement: false" is specified in buildConfig.js,\n"defaultTeams" must have one team at least.' + }); + app.exit(); + } if (global.isDev) { installExtension.default(installExtension.REACT_DEVELOPER_TOOLS). then((name) => console.log(`Added Extension: ${name}`)).