Merge branch 'main' of https://github.com/Microsoft/BotFramework-Emulator into toanzian/blank-inspector-fix

tonyanziano · tonyanziano · commit b561cbb354a3 · 2021-11-11T12:38:20.000-08:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,8 +7,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## Unreleased
 ## Added
 - [main] Bumped `electron` to v13.6.1 in PR [2318](https://github.com/microsoft/BotFramework-Emulator/pull/2318)
+- [main] Fixed early restify route termination in `replyToActivity` handler in PR [2320](https://github.com/microsoft/BotFramework-Emulator/pull/2320)
 - [client] Set `contextIsolation` to `false` in Inspector `<webview>` elements in PR [2321](https://github.com/microsoft/BotFramework-Emulator/pull/2321)
-
+ 
 ## v4.14.0 - 2021 - 7 - 15
 ## Added
 - [client] Bumped `botframework-webchat` to v4.14.0 in PR [2275](https://github.com/microsoft/BotFramework-Emulator/pull/2275)
diff --git a/packages/app/main/src/server/routes/channel/conversations/handlers/replyToActivity.spec.ts b/packages/app/main/src/server/routes/channel/conversations/handlers/replyToActivity.spec.ts
@@ -105,7 +105,6 @@ describe('replyToActivity route middleware', () => {
     });
     expect(mockRes.send).toHaveBeenCalledWith(OK, { id: 'someActivityId' });
     expect(mockRes.end).toHaveBeenCalled();
-    expect(mockNext).toHaveBeenCalled();
   });
 
   it('should resolve any OAuth cards, post the activity (with a null id) to the user, and send an OK response', async () => {
@@ -123,7 +122,6 @@ describe('replyToActivity route middleware', () => {
     });
     expect(mockRes.send).toHaveBeenCalledWith(OK, { id: null });
     expect(mockRes.end).toHaveBeenCalled();
-    expect(mockNext).toHaveBeenCalled();
 
     mockReq.body.id = 'someActivityId';
   });
@@ -147,6 +145,5 @@ describe('replyToActivity route middleware', () => {
     });
     expect(mockRes.send).toHaveBeenCalledWith(OK, { id: 'someActivityId' });
     expect(mockRes.end).toHaveBeenCalled();
-    expect(mockNext).toHaveBeenCalled();
   });
 });
diff --git a/packages/app/main/src/server/routes/channel/conversations/handlers/replyToActivity.ts b/packages/app/main/src/server/routes/channel/conversations/handlers/replyToActivity.ts
@@ -85,7 +85,5 @@ export function createReplyToActivityHandler(emulatorServer: EmulatorRestServer)
     } catch (err) {
       sendErrorResponse(req, res, next, err);
     }
-
-    next();
   };
 }

Original file line number	Diff line number	Diff line change
`@@ -85,7 +85,5 @@ export function createReplyToActivityHandler(emulatorServer: EmulatorRestServer)`
`85`	`85`	`} catch (err) {`
`86`	`86`	`sendErrorResponse(req, res, next, err);`
`87`	`87`	`}`
`88`		`-`
`89`		`- next();`
`90`	`88`	`};`
`91`	`89`	`}`