diff --git a/package-lock.json b/package-lock.json index 012ea6969..76d487065 100644 --- a/package-lock.json +++ b/package-lock.json @@ -6153,7 +6153,7 @@ }, "css-select": { "version": "1.2.0", - "resolved": "https://registry.npmjs.org/css-select/-/css-select-1.2.0.tgz", + "resolved": "http://registry.npmjs.org/css-select/-/css-select-1.2.0.tgz", "integrity": "sha1-KzoRBTnFNV8c2NMUYj6HCxIeyFg=", "requires": { "boolbase": "~1.0.0", @@ -6573,7 +6573,7 @@ "dependencies": { "pify": { "version": "2.3.0", - "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", + "resolved": "http://registry.npmjs.org/pify/-/pify-2.3.0.tgz", "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=" } } @@ -6790,7 +6790,7 @@ "dependencies": { "domelementtype": { "version": "1.1.3", - "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.1.3.tgz", + "resolved": "http://registry.npmjs.org/domelementtype/-/domelementtype-1.1.3.tgz", "integrity": "sha1-vSh3PiZCiBrsUVRJJCmcXNgiGFs=" } } @@ -7364,7 +7364,7 @@ }, "electron-osx-sign": { "version": "0.4.10", - "resolved": "https://registry.npmjs.org/electron-osx-sign/-/electron-osx-sign-0.4.10.tgz", + "resolved": "http://registry.npmjs.org/electron-osx-sign/-/electron-osx-sign-0.4.10.tgz", "integrity": "sha1-vk87ibKnWh3F8eckkIGrKSnKOiY=", "requires": { "bluebird": "^3.5.0", @@ -10912,7 +10912,7 @@ }, "isemail": { "version": "1.2.0", - "resolved": "https://registry.npmjs.org/isemail/-/isemail-1.2.0.tgz", + "resolved": "http://registry.npmjs.org/isemail/-/isemail-1.2.0.tgz", "integrity": "sha1-vgPfjMPineTSxd9lASY/H6RZXpo=" }, "isexe": { @@ -11432,7 +11432,7 @@ }, "jest-environment-jsdom": { "version": "22.4.3", - "resolved": "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-22.4.3.tgz", + "resolved": "http://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-22.4.3.tgz", "integrity": "sha512-FviwfR+VyT3Datf13+ULjIMO5CSeajlayhhYQwpzgunswoaLIPutdbrnfUHEMyJCwvqQFaVtTmn9+Y8WCt6n1w==", "requires": { "jest-mock": "^22.4.3", @@ -11442,7 +11442,7 @@ }, "jest-message-util": { "version": "22.4.3", - "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-22.4.3.tgz", + "resolved": "http://registry.npmjs.org/jest-message-util/-/jest-message-util-22.4.3.tgz", "integrity": "sha512-iAMeKxhB3Se5xkSjU0NndLLCHtP4n+GtCqV0bISKA5dmOXQfEbdEmYiu2qpnWBDCQdEafNDDU6Q+l6oBMd/+BA==", "requires": { "@babel/code-frame": "^7.0.0-beta.35", @@ -11454,12 +11454,12 @@ }, "jest-mock": { "version": "22.4.3", - "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-22.4.3.tgz", + "resolved": "http://registry.npmjs.org/jest-mock/-/jest-mock-22.4.3.tgz", "integrity": "sha512-+4R6mH5M1G4NK16CKg9N1DtCaFmuxhcIqF4lQK/Q1CIotqMs/XBemfpDPeVZBFow6iyUNu6EBT9ugdNOTT5o5Q==" }, "jest-util": { "version": "22.4.3", - "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-22.4.3.tgz", + "resolved": "http://registry.npmjs.org/jest-util/-/jest-util-22.4.3.tgz", "integrity": "sha512-rfDfG8wyC5pDPNdcnAlZgwKnzHvZDu8Td2NJI/jAGKEGxJPYiE4F0ss/gSAkG4778Y23Hvbz+0GMrDJTeo7RjQ==", "requires": { "callsites": "^2.0.0", @@ -11546,7 +11546,7 @@ }, "jest-get-type": { "version": "22.4.3", - "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-22.4.3.tgz", + "resolved": "http://registry.npmjs.org/jest-get-type/-/jest-get-type-22.4.3.tgz", "integrity": "sha512-/jsz0Y+V29w1chdXVygEKSz2nBoHoYqNShPe+QgxSNjAuP1i8+k4LbQNrfoliKej0P45sivkSCh7yiD6ubHS3w==" }, "jest-haste-map": { @@ -13076,7 +13076,7 @@ }, "media-typer": { "version": "0.3.0", - "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz", + "resolved": "http://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz", "integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=" }, "mem": { diff --git a/packages/app/main/src/services/conversationService.spec.ts b/packages/app/main/src/services/conversationService.spec.ts index ca0f0c354..da1d76f9c 100644 --- 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 index 7ebf79478..743094359 100644 --- 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 index 61b43d114..184d3e5e4 100644 --- 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 index 61b690590..88d99c5d2 100644 --- 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 => { 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) {