From b31d6a69610f4ad7bdb4a4d6d2f69c22dbd0b722 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" Date: Tue, 5 Feb 2019 04:19:42 +0000 Subject: [PATCH 1/4] chore(deps): update dependency @types/jest to v23.3.14 (#2270) --- package-lock.json | 6 +++--- package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index 6ac852c1..6e977252 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1347,9 +1347,9 @@ } }, "@types/jest": { - "version": "23.3.13", - "resolved": "https://registry.npmjs.org/@types/jest/-/jest-23.3.13.tgz", - "integrity": "sha512-ePl4l+7dLLmCucIwgQHAgjiepY++qcI6nb8eAwGNkB6OxmTe3Z9rQU3rSpomqu42PCCnlThZbOoxsf+qylJsLA==", + "version": "23.3.14", + "resolved": "https://registry.npmjs.org/@types/jest/-/jest-23.3.14.tgz", + "integrity": "sha512-Q5hTcfdudEL2yOmluA1zaSyPbzWPmJ3XfSWeP3RyoYvS9hnje1ZyagrZOuQ6+1nQC1Gw+7gap3pLNL3xL6UBug==", "dev": true }, "@types/joi": { diff --git a/package.json b/package.json index 5942c5aa..9f86b83c 100644 --- a/package.json +++ b/package.json @@ -71,7 +71,7 @@ "@types/fibers": "0.0.30", "@types/graphql": "14.0.5", "@types/hapi": "17.8.5", - "@types/jest": "23.3.13", + "@types/jest": "23.3.14", "@types/koa-multer": "1.0.0", "@types/koa-router": "7.0.39", "@types/lodash": "4.14.120", From e571f72f9323aeb1fddc92178956b12857aa945e Mon Sep 17 00:00:00 2001 From: "renovate[bot]" Date: Tue, 5 Feb 2019 05:23:06 +0000 Subject: [PATCH 2/4] chore(deps): update dependency hapi to v17.8.4 (#2271) --- package-lock.json | 12 ++++++------ package.json | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/package-lock.json b/package-lock.json index 6e977252..1800bdd6 100644 --- a/package-lock.json +++ b/package-lock.json @@ -6491,9 +6491,9 @@ } }, "hapi": { - "version": "17.8.3", - "resolved": "https://registry.npmjs.org/hapi/-/hapi-17.8.3.tgz", - "integrity": "sha512-HH+w5qxtEdnYgwYdeqUbVi7VnWWHl1U2eW6tyu6P681VhJimGYgDBpbcqCjKta61yWS27E1LG8rNLj+0Renj4w==", + "version": "17.8.4", + "resolved": "https://registry.npmjs.org/hapi/-/hapi-17.8.4.tgz", + "integrity": "sha512-KmW0a36iXesMKKGNI4J/Ht37f2HQP6W6iKce8U5lxf+GtSH70zSh7q3D56Ro/a4Q5U5M60gSSU4esMVFxttANQ==", "dev": true, "requires": { "accept": "3.x.x", @@ -6570,9 +6570,9 @@ } }, "bourne": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/bourne/-/bourne-1.0.0.tgz", - "integrity": "sha512-938G7p21n3x3FiGnZcoN8Spv7EHOgFRnUStCby2/2fYnkY+fFU5TobsN4xCo5kW/jniYJP8KWjBFTzM4oq+ewg==", + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/bourne/-/bourne-1.1.1.tgz", + "integrity": "sha512-Ou0l3W8+n1FuTOoIfIrCk9oF9WVWc+9fKoAl67XQr9Ws0z7LgILRZ7qtc9xdT4BveSKtnYXfKPgn8pFAqeQRew==", "dev": true }, "call": { diff --git a/package.json b/package.json index 9f86b83c..443d9a55 100644 --- a/package.json +++ b/package.json @@ -102,7 +102,7 @@ "graphql-subscriptions": "1.0.0", "graphql-tag": "2.10.1", "graphql-tools": "4.0.4", - "hapi": "17.8.3", + "hapi": "17.8.4", "husky": "1.3.1", "jest": "23.6.0", "jest-junit": "5.2.0", From e8e49026dd0529c010e6134ce4403677240d1649 Mon Sep 17 00:00:00 2001 From: Chris Airey Date: Wed, 23 Jan 2019 16:20:35 -0500 Subject: [PATCH 3/4] Serialize arrays as JSON on fetch in RESTDataSource --- CHANGELOG.md | 2 ++ packages/apollo-datasource-rest/package.json | 2 +- .../src/RESTDataSource.ts | 3 ++- .../src/__tests__/RESTDataSource.test.ts | 25 +++++++++++++++++++ 4 files changed, 30 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index fef42260..47f965fb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ### vNEXT +- Fix: Serialize arrays as JSON on fetch in `RESTDataSource`. [PR #2219](https://github.com/apollographql/apollo-server/pull/2219) + ### v2.3.3 - `apollo-server` (only): Stop double-invocation of `serverWillStart` life-cycle event. (More specific integrations - e.g. Express, Koa, Hapi, etc. - were unaffected.) [PR #2239](https://github.com/apollographql/apollo-server/pull/2239) diff --git a/packages/apollo-datasource-rest/package.json b/packages/apollo-datasource-rest/package.json index d5b08204..765adbe5 100644 --- a/packages/apollo-datasource-rest/package.json +++ b/packages/apollo-datasource-rest/package.json @@ -1,6 +1,6 @@ { "name": "apollo-datasource-rest", - "version": "0.2.2", + "version": "0.2.3", "author": "opensource@apollographql.com", "license": "MIT", "repository": { diff --git a/packages/apollo-datasource-rest/src/RESTDataSource.ts b/packages/apollo-datasource-rest/src/RESTDataSource.ts index 0c8f9bf1..26d7a492 100644 --- a/packages/apollo-datasource-rest/src/RESTDataSource.ts +++ b/packages/apollo-datasource-rest/src/RESTDataSource.ts @@ -218,11 +218,12 @@ export abstract class RESTDataSource extends DataSource { url.searchParams.append(name, value); } - // We accept arbitrary objects as body and serialize them as JSON + // We accept arbitrary objects and arrays as body and serialize them as JSON if ( options.body !== undefined && options.body !== null && (options.body.constructor === Object || + Array.isArray(options.body) || ((options.body as any).toJSON && typeof (options.body as any).toJSON === 'function')) ) { diff --git a/packages/apollo-datasource-rest/src/__tests__/RESTDataSource.test.ts b/packages/apollo-datasource-rest/src/__tests__/RESTDataSource.test.ts index 48868de3..477ad4cc 100644 --- a/packages/apollo-datasource-rest/src/__tests__/RESTDataSource.test.ts +++ b/packages/apollo-datasource-rest/src/__tests__/RESTDataSource.test.ts @@ -268,6 +268,31 @@ describe('RESTDataSource', () => { ); }); + it('serializes a request body that is an array as JSON', async () => { + const dataSource = new class extends RESTDataSource { + baseURL = 'https://api.example.com'; + + postFoo(foo) { + return this.post('foo', foo); + } + }(); + + dataSource.httpCache = httpCache; + + fetch.mockJSONResponseOnce(); + + await dataSource.postFoo(['foo', 'bar']); + + expect(fetch.mock.calls.length).toEqual(1); + expect(fetch.mock.calls[0][0].url).toEqual('https://api.example.com/foo'); + expect(fetch.mock.calls[0][0].body).toEqual( + JSON.stringify(['foo', 'bar']), + ); + expect(fetch.mock.calls[0][0].headers.get('Content-Type')).toEqual( + 'application/json', + ); + }); + it('serializes a request body that has a toJSON method as JSON', async () => { const dataSource = new class extends RESTDataSource { baseURL = 'https://api.example.com'; From f99ebd373b682b81fd1e3fcc6fe6e409074ddbc4 Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Tue, 5 Feb 2019 13:11:43 +0200 Subject: [PATCH 4/4] Set `apollo-datasource-rest` version back to v0.2.2. Lerna will take care of this on publishing. --- packages/apollo-datasource-rest/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/apollo-datasource-rest/package.json b/packages/apollo-datasource-rest/package.json index 765adbe5..d5b08204 100644 --- a/packages/apollo-datasource-rest/package.json +++ b/packages/apollo-datasource-rest/package.json @@ -1,6 +1,6 @@ { "name": "apollo-datasource-rest", - "version": "0.2.3", + "version": "0.2.2", "author": "opensource@apollographql.com", "license": "MIT", "repository": {