Skip to content

Commit 3afb2bb

Browse files
authored
Merge pull request #234 from open-source-labs/cookie-httpHeaders-fix
Cookie Authentication
2 parents b80f42e + 5234d2e commit 3afb2bb

File tree

5 files changed

+22
-11
lines changed

5 files changed

+22
-11
lines changed

httpserver.js

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,11 @@ const port = 7000;
1010
// 3 Swell now has access to unfiltered headers and both a parsed and unparsed version of the api response content
1111

1212
app.get('/', (req, res) => {
13-
fetch(req.headers.url)
13+
fetch(req.headers.url, {
14+
headers: {
15+
cookie: req.headers.cookie
16+
}
17+
})
1418
.then((response) => {
1519
const [contentType] = response.headers._headers['content-type'];
1620
const { headers } = response;

package-lock.json

Lines changed: 9 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,7 @@
130130
"dependencies": {
131131
"apollo-cache-inmemory": "^1.6.2",
132132
"apollo-client": "^2.6.3",
133+
"apollo-link-context": "^1.0.18",
133134
"apollo-link-http": "^1.5.15",
134135
"apollo-link-ws": "^1.0.18",
135136
"chart.js": "^2.7.3",
@@ -139,9 +140,13 @@
139140
"electron-devtools-installer": "^2.2.4",
140141
"electron-log": "^2.2.17",
141142
"electron-updater": "^4.0.5",
143+
"es6-promise": "^4.2.8",
144+
"express": "^4.17.1",
142145
"graphql": "^14.4.2",
143146
"graphql-tag": "^2.10.1",
147+
"isomorphic-fetch": "^2.2.1",
144148
"node-sass": "^4.10.0",
149+
"nodemon": "^1.19.1",
145150
"path": "^0.12.7",
146151
"prop-types": "^15.6.2",
147152
"react": "^16.6.3",
@@ -158,11 +163,7 @@
158163
"status-indicator": "^1.0.9",
159164
"subscriptions-transport-ws": "^0.9.16",
160165
"uuid": "^3.3.2",
161-
"ws": "^6.1.2",
162-
"es6-promise": "^4.2.8",
163-
"express": "^4.17.1",
164-
"isomorphic-fetch": "^2.2.1",
165-
"nodemon": "^1.19.1"
166+
"ws": "^6.1.2"
166167
},
167168
"devDependencies": {
168169
"@babel/core": "^7.1.2",

src/client/controllers/graphQLController.js

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ const graphQLController = {
3535

3636
if (reqResObj.request.method === 'QUERY') {
3737
client.query({ query: body, variables })
38-
// Update the store with the response
3938
.then(data => this.handleResponse(data, reqResObj))
4039
.catch((err) => {
4140
console.error(err);
@@ -66,11 +65,9 @@ const graphQLController = {
6665
reqResCopy.connection = 'closed';
6766
reqResCopy.connectionType = 'plain';
6867
reqResCopy.timeReceived = Date.now();
69-
// console.log("reqResCopy",reqResCopy)
7068
reqResCopy.response.events.push(JSON.stringify(response.data));
71-
// reqResCopy.response.headers = "HI";
7269
store.default.dispatch(actions.reqResUpdate(reqResCopy));
7370
},
7471
};
7572

76-
export default graphQLController;
73+
export default graphQLController;

src/client/controllers/httpController.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -326,7 +326,7 @@ const httpController = {
326326
parseFetchOptionsFromReqRes(reqResObject) {
327327
let {
328328
method, headers, body, cookies
329-
} = reqResObject.request;
329+
} = reqResObject.request;
330330

331331
method = method.toUpperCase();
332332

0 commit comments

Comments
 (0)