Fixed OAuth sign-in card flow.

CHANGELOG.md

@@ -14,6 +14,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Fixed 
 - [client/main] Auto update is now opt-in by default and changed UX to reflect this in PR [1575](https://github.com/microsoft/BotFramework-Emulator/pull/1575)
+- [client/main] Fixed OAuth card sign-in flow when not using magic code in PR [1660](https://github.com/microsoft/BotFramework-Emulator/pull/1660)
 
 ## v4.4.2 - 2019 - 05 - 28
 ## Fixed

packages/app/main/src/appUpdater.spec.ts

@@ -111,6 +111,18 @@ jest.mock('./utils/sendNotificationToClient', () => ({
   },
 }));
 
+jest.mock('./emulator', () => ({
+  Emulator: {
+    getInstance: () => ({
+      ngrok: {
+        ngrokEmitter: {
+          on: () => null,
+        },
+      },
+    }),
+  },
+}));
+
 describe('AppUpdater', () => {
   let mockTrackEvent;
   const trackEventBackup = TelemetryService.trackEvent;

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

@@ -35,7 +35,6 @@ import { SharedConstants } from '@bfemulator/app-shared';
 import { Command } from '@bfemulator/sdk-shared';
 
 import { Emulator } from '../emulator';
-import { kill } from '../ngrok';
 
 const Commands = SharedConstants.Commands.Ngrok;
 
@@ -56,6 +55,6 @@ export class NgrokCommands {
 
   @Command(Commands.KillProcess)
   protected killNgrokProcess() {
-    return kill();
+    Emulator.getInstance().ngrok.kill();
   }
 }

packages/app/main/src/main.ts

@@ -45,7 +45,6 @@ import * as commandLine from './commandLine';
 import { Protocol } from './constants';
 import { 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';
@@ -157,7 +156,7 @@ class EmulatorApplication {
   }
 
   private initializeNgrokListeners() {
-    ngrokEmitter.on('expired', this.onNgrokSessionExpired);
+    Emulator.getInstance().ngrok.ngrokEmitter.on('expired', this.onNgrokSessionExpired);
   }
 
   private initializeAppListeners() {

packages/app/main/src/ngrok.spec.ts

@@ -31,8 +31,7 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 import './fetchProxy';
-import { ngrokEmitter } from './ngrok';
-import * as ngrok from './ngrok';
+import { intervals, NgrokInstance } from './ngrok';
 
 const mockSpawn = {
   on: () => {},
@@ -76,6 +75,8 @@ jest.mock('node-fetch', () => {
 });
 
 describe('the ngrok ', () => {
+  const ngrok = new NgrokInstance();
+
   afterEach(() => {
     ngrok.kill();
   });
@@ -106,9 +107,9 @@ describe('the ngrok ', () => {
 
   it('should emit when the ngrok session is expired', async () => {
     mockOk = 0;
-    ngrok.intervals.retry = 100;
-    ngrok.intervals.expirationPoll = 1;
-    ngrok.intervals.expirationTime = -1;
+    intervals.retry = 100;
+    intervals.expirationPoll = 1;
+    intervals.expirationTime = -1;
     let emitted = false;
     ngrok.ngrokEmitter.on('expired', () => {
       emitted = true;
@@ -127,7 +128,7 @@ describe('the ngrok ', () => {
 
   it('should disconnect', async () => {
     let disconnected = false;
-    ngrokEmitter.on('disconnect', url => {
+    ngrok.ngrokEmitter.on('disconnect', url => {
       disconnected = true;
     });
 
@@ -144,7 +145,7 @@ describe('the ngrok ', () => {
   it('should throw when the number of reties to retrieve the ngrok url are exhausted', async () => {
     mockOk = -101;
     let threw = false;
-    ngrok.intervals.retry = 1;
+    intervals.retry = 1;
     try {
       await ngrok.connect({
         addr: 61914,