Merge pull request #19 from zarathustra323/hotfix-2.1

Force https in prod, do not delete host
cygnusb2b · Aug 14, 2018 · a25bb70 · a25bb70
2 parents 01add6b + 6f1cadc
commit a25bb70
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "fortnight-web",
-  "version": "1.0.0-rc.2",
+  "version": "1.0.0-rc.2.1",
   "main": "index.js",
   "author": "Jacob Bare <[email protected]>",
   "license": "MIT",

diff --git a/src/apollo/config.js b/src/apollo/config.js
@@ -5,11 +5,12 @@ import fetch from 'isomorphic-unfetch';
 
 export default (req) => {
   const headers = req ? req.headers : {};
-  const uri = (req) ? `${req.protocol}://${req.get('host')}` : '';
-  if (headers.host) {
-    headers['x-forwarded-host'] = headers.host;
-    delete headers.host;
-  }
+  const protocol = process.env.NODE_ENV === 'production' ? 'https' : 'http';
+  const uri = (req) ? `${protocol}://${req.get('host')}` : '';
+  // if (headers.host) {
+  //   headers['x-forwarded-host'] = headers.host;
+  //   delete headers.host;
+  // }
   return {
     link: ApolloLink.from([
       onError(({ graphQLErrors, networkError }) => {