Skip to content

Commit f855a55

Browse files
authored
Merge pull request #15 from oslabs-beta/billy-sam/gql-to-main
Billy sam/gql to main, fix destructuring bug that caused missing headers …
2 parents 2f9cc5f + 9f7f407 commit f855a55

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

main.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -332,7 +332,6 @@ ipcMain.on('open-gql', (event, args) => {
332332
return forward(operation).map(response => {
333333
const context = operation.getContext();
334334
const headers = context.response.headers.entries();
335-
336335
for (let headerItem of headers) {
337336
const key = headerItem[0].split('-').map(item => item[0].toUpperCase() + item.slice(1)).join('-');
338337
reqResObj.response.headers[key] = headerItem[1];
@@ -381,7 +380,9 @@ ipcMain.on('open-gql', (event, args) => {
381380

382381
if (reqResObj.request.method === 'QUERY') {
383382
client.query({ query: body, variables })
384-
.then(data => event.sender.send('reply-gql', {reqResObj, data}))
383+
384+
.then(data => {
385+
event.sender.send('reply-gql', {reqResObj, data})})
385386
.catch((err) => {
386387
console.error(err);
387388
event.sender.send('reply-gql', {error: err.networkError, reqResObj});

src/client/controllers/graphQLController.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,7 @@ const graphQLController = {
2222

2323
this.sendGqlToMain({reqResObj})
2424
.then(response => {
25-
const { data, error, resReqObj } = response
26-
error ? this.handleError(error, reqResObj) : this.handleResponse(data, reqResObj);
25+
response.error ? this.handleError(response.error, response.reqResObj) : this.handleResponse(response.data, response.reqResObj);
2726
});
2827
},
2928

0 commit comments

Comments
 (0)