Merge pull request #88 from Microsoft/eanders-MS

Eanders ms

src/client/emulator.ts

@@ -111,4 +111,13 @@ export class Emulator {
         };
         request(options);
     }
+
+    public static quitAndInstall() {
+        const settings = getSettings();
+        let options: request.OptionsWithUrl = {
+            url: `${this.serviceUrl}/emulator/system/quitAndInstall`,
+            method: "POST"
+        };
+        request(options);
+    }
 }

src/client/hyperlinkHandler.ts

@@ -31,12 +31,13 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-import { shell, remote } from 'electron';
+import { shell } from 'electron';
 import * as URL from 'url';
 import * as QueryString from 'querystring';
 import { InspectorActions, AddressBarActions } from './reducers';
 import { getSettings, selectedActivity$, deselectActivity } from './settings';
 import { Settings as ServerSettings } from '../types/serverSettingsTypes';
+import { Emulator } from './emulator';
 import * as log from './log';
 
 
@@ -116,9 +117,7 @@ function navigateCommandUrl(params: string[]) {
         return;
     const json = decodeURIComponent(params['args']);
     const args = JSON.parse(json);
-    if (args.cmd === 'autoUpdater.quitAndInstall') {
-        if (remote.autoUpdater) {
-            remote.autoUpdater.quitAndInstall();
-        }
+    if (args === 'autoUpdater.quitAndInstall') {
+        Emulator.quitAndInstall();
     }
 }

src/server/controllers/emulator/emulatorController.ts

@@ -33,6 +33,7 @@
 
 import * as Restify from 'restify';
 import * as HttpStatus from "http-status-codes";
+import { autoUpdater } from 'electron';
 import { getSettings, getStore } from '../../settings';
 import { emulator } from '../../emulator';
 import { RestServer } from '../../restServer';
@@ -68,6 +69,7 @@ export class EmulatorController {
         server.router.post('/emulator/:conversationId/typing', this.typing);
         server.router.post('/emulator/:conversationId/ping', this.ping);
         server.router.del('/emulator/:conversationId/userdata', this.deleteUserData);
+        server.router.post('/emulator/system/quitAndInstall', this.quitAndInstall);
     }
 
     static getUsers = (req: Restify.Request, res: Restify.Response, next: Restify.Next): any => {
@@ -168,4 +170,16 @@ export class EmulatorController {
             ResponseTypes.sendErrorResponse(req, res, next, err);
         }
     }
+
+    static quitAndInstall = (req: Restify.Request, res: Restify.Response, next: Restify.Next): any => {
+        try {
+            if (autoUpdater) {
+                autoUpdater.quitAndInstall();
+            }
+            res.send(HttpStatus.OK);
+            res.end();
+        } catch (err) {
+            ResponseTypes.sendErrorResponse(req, res, next, err);
+        }
+    }
 }

src/server/emulator.ts

@@ -62,7 +62,7 @@ export class Emulator {
         // Note: We're intentionally sending and ISettings here, not a Settings. This
         // is why we're getting the value from getStore().getState().
         Electron.ipcMain.on('clientStarted', () => {
-            // DISABLED: Use chrome's proxy settings for all outgoing requests
+            // Use system proxy settings for outgoing requests
             const session = Electron.session.defaultSession;
             this.proxyAgent = new ElectronProxyAgent(session);
             http.globalAgent = this.proxyAgent;