Merge ca4db39 into 7c49920

packages/app/main/src/commands/botCommands.ts

@@ -33,6 +33,7 @@
 
 import * as path from 'path';
 
+import { dialog } from 'electron';
 import { BotInfo, getBotDisplayName, SharedConstants } from '@bfemulator/app-shared';
 import { BotConfigWithPath, CommandRegistryImpl, mergeEndpoints, uniqueId } from '@bfemulator/sdk-shared';
 import { BotConfigurationBase } from 'botframework-config/lib';
@@ -132,12 +133,7 @@ export function registerCommands(commandRegistry: CommandRegistryImpl) {
       try {
         bot = await loadBotWithRetry(botPath, secret);
       } catch (e) {
-        const errMessage = `Failed to open the bot with error: ${e.message}`;
-        await Electron.dialog.showMessageBox(mainWindow.browserWindow, {
-          type: 'error',
-          message: errMessage,
-        });
-        throw new Error(errMessage);
+        await dialog.showErrorBox('Failed to open the bot', e.message);
       }
       if (!bot) {
         // user couldn't provide correct secret, abort

packages/app/main/src/commands/electronCommands.ts

@@ -35,15 +35,15 @@ import * as path from 'path';
 import { SharedConstants } from '@bfemulator/app-shared';
 import { CommandRegistryImpl } from '@bfemulator/sdk-shared';
 import * as Electron from 'electron';
-import { app, Menu, MessageBoxOptions } from 'electron';
+import { app, dialog, Menu, MessageBoxOptions } from 'electron';
 import * as fs from 'fs-extra';
 
 import { AppMenuBuilder } from '../appMenuBuilder';
 import { getStore } from '../botData/store';
 import { mainWindow } from '../main';
 import { ContextMenuService } from '../services/contextMenuService';
-import { showOpenDialog, showSaveDialog } from '../utils';
 import { TelemetryService } from '../telemetry';
+import { showOpenDialog, showSaveDialog } from '../utils';
 
 const { shell } = Electron;
 
@@ -62,7 +62,7 @@ export function registerCommands(commandRegistry: CommandRegistryImpl) {
       ...options,
     };
     const args = modal ? [mainWindow.browserWindow, options] : [options];
-    return Electron.dialog.showMessageBox.apply(Electron.dialog, args);
+    return dialog.showMessageBox.apply(dialog, args);
   });
 
   // ---------------------------------------------------------------------------

packages/app/main/src/main.ts

@@ -37,8 +37,7 @@ import * as url from 'url';
 import { newNotification, Notification, PersistentSettings, Settings, SharedConstants } from '@bfemulator/app-shared';
 import { Users } from '@bfemulator/emulator-core';
 import { ProgressInfo } from 'builder-util-runtime';
-import * as Electron from 'electron';
-import { app, systemPreferences } from 'electron';
+import { app, dialog, systemPreferences } from 'electron';
 import { UpdateInfo } from 'electron-updater';
 import { Store } from 'redux';
 
@@ -48,19 +47,19 @@ import { AppUpdater } from './appUpdater';
 import { getStore } from './botData/store';
 import * as commandLine from './commandLine';
 import { CommandRegistry, registerAllCommands } from './commands';
+import { Protocol } from './constants';
 import { Emulator, emulator } from './emulator';
 import './fetchProxy';
 import { ngrokEmitter } from './ngrok';
 import { Window } from './platform/window';
 import { azureLoggedInUserChanged } from './settingsData/actions/azureAuthActions';
 import { rememberBounds, rememberTheme } from './settingsData/actions/windowStateActions';
 import { dispatch, getSettings, getStore as getSettingsStore } from './settingsData/store';
-import { botListsAreDifferent, ensureStoragePath, saveSettings, writeFile, isMac } from './utils';
+import { TelemetryService } from './telemetry';
+import { botListsAreDifferent, ensureStoragePath, isMac, saveSettings, writeFile } from './utils';
 import { openFileFromCommandLine } from './utils/openFileFromCommandLine';
 import { sendNotificationToClient } from './utils/sendNotificationToClient';
 import { WindowManager } from './windowManager';
-import { Protocol } from './constants';
-import { TelemetryService } from './telemetry';
 
 export let mainWindow: Window;
 export let windowManager: WindowManager;
@@ -341,10 +340,7 @@ const createMainWindow = async () => {
   windowManager = new WindowManager();
 
   AppMenuBuilder.initAppMenu().catch(err => {
-    Electron.dialog.showErrorBox(
-      'Bot Framework Emulator',
-      `An error occurred while initializing the application menu: ${err}`
-    );
+    dialog.showErrorBox('Bot Framework Emulator', `An error occurred while initializing the application menu: ${err}`);
   });
 
   const rememberCurrentBounds = () => {

packages/emulator/core/src/utils/oauthLinkEncoder.ts

@@ -31,12 +31,13 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
+import * as crypto from 'crypto';
+
 import { Attachment, AttachmentContentTypes, GenericActivity, OAuthCard } from '@bfemulator/sdk-shared';
 
 import { BotEmulator } from '../botEmulator';
-import uniqueId from './uniqueId';
 
-import * as crypto from 'crypto';
+import uniqueId from './uniqueId';
 
 export default class OAuthLinkEncoder {
   public static OAuthUrlProtocol: string = 'oauthlink:';