Fixed #991 - multiple add user calls being made

microsoft · Oct 26, 2018 · 24bb069 · 24bb069
1 parent e71a384
commit 24bb069
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 18 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/app/main/src/services/conversationService.spec.ts b/packages/app/main/src/services/conversationService.spec.ts
@@ -40,8 +40,9 @@ describe('The ConversationService should call "fetch" with the expected paramete
     expect(headers instanceof nodeFetch.Headers).toBeTruthy();
     expect(headers === headers).toBeTruthy();
     expect(method).toBe('POST');
-    expect(body[0].name).toBeFalsy();
-    expect(body[0].id).toBeFalsy();
+    const members = JSON.parse(body);
+    expect(members[0].name).toBeFalsy();
+    expect(members[0].id).toBeFalsy();
     expect(headersInstance).toEqual(headers);
   });
 
@@ -54,7 +55,8 @@ describe('The ConversationService should call "fetch" with the expected paramete
     expect(headers instanceof nodeFetch.Headers).toBeTruthy();
     expect(headers === headers).toBeTruthy();
     expect(method).toBe('DELETE');
-    expect(body[0].id).toBe('1234');
+    const users = JSON.parse(body);
+    expect(users[0].id).toBe('1234');
     expect(headersInstance).toEqual(headers);
   });
 

diff --git a/packages/app/main/src/services/conversationService.ts b/packages/app/main/src/services/conversationService.ts
@@ -11,7 +11,7 @@ export class ConversationService {
     return fetch(url, {
       headers,
       method: 'POST',
-      body: [{ name, id }]
+      body: JSON.stringify([{ name, id }])
     });
   }
 
@@ -20,7 +20,7 @@ export class ConversationService {
     return fetch(url, {
       headers,
       method: 'DELETE',
-      body: [{ id }]
+      body: JSON.stringify([{ id }])
     });
   }
 

diff --git a/packages/emulator/core/package.json b/packages/emulator/core/package.json
@@ -8,7 +8,7 @@
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
   "scripts": {
-    "build": "babel ./src --out-dir lib --extensions \".ts,.tsx\" --ignore \"**/*.spec.ts\" && tsc --emitDeclarationOnly --declaration",
+    "build": "babel ./src --out-dir lib --extensions \".ts,.tsx\" --ignore \"**/*.spec.ts\" --source-maps inline && tsc --emitDeclarationOnly --declaration",
     "build:watch": "npm run build:prod --outdir lib --watch",
     "clean": "rimraf lib",
     "lint": "tslint --project tslint.json",

diff --git a/packages/emulator/core/src/emulator/middleware/addUsers.ts b/packages/emulator/core/src/emulator/middleware/addUsers.ts
@@ -42,7 +42,7 @@ import { ConversationAware } from './fetchConversation';
 export default function addUsers(_botEmulator: BotEmulator) {
   return async (req: ConversationAware, res: Restify.Response, next: Restify.Next): Promise<any> => {
     try {
-      const members: ChannelAccount[] = req.body;
+      const members: ChannelAccount[] = JSON.parse(req.body || '[]');
       const it = members[Symbol.iterator](); // Node does not support array.values() :(
       let member;
       while (member = it.next().value) {