apply remaining CR

ipfs · Sep 8, 2017 · 45cc11b · 45cc11b
1 parent 0913191
commit 45cc11b
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 12 deletions.
diff --git a/src/http/gateway/resources/gateway.js b/src/http/gateway/resources/gateway.js
@@ -75,6 +75,7 @@ module.exports = {
       if (err) {
         return handleGatewayResolverError(err)
       }
+
       ipfs.files.cat(data.multihash, (err, stream) => {
         if (err) {
           log.error(err)
@@ -91,6 +92,7 @@ module.exports = {
             stream._read = () => {}
             stream._readableState = {}
           }
+
           //  response.continue()
           let filetypeChecked = false
           let stream2 = new Stream.PassThrough({highWaterMark: 1})
@@ -106,7 +108,8 @@ module.exports = {
                 log('file type: ', fileSignature)
 
                 filetypeChecked = true
-                const mimeType = mime.lookup((fileSignature) ? fileSignature.ext : null)
+                const mimeType = mime.lookup(fileSignature ? fileSignature.ext : null)
+
                 log('ref ', ref)
                 log('mime-type ', mimeType)
 
@@ -115,18 +118,9 @@ module.exports = {
 
                   response
                     .header('Content-Type', mime.contentType(mimeType))
-                    .header('Access-Control-Allow-Headers', 'X-Stream-Output, X-Chunked-Ouput')
-                    .header('Access-Control-Allow-Methods', 'GET')
-                    .header('Access-Control-Allow-Origin', '*')
-                    .header('Access-Control-Expose-Headers', 'X-Stream-Output, X-Chunked-Ouput')
                     .send()
                 } else {
-                  response
-                   .header('Access-Control-Allow-Headers', 'X-Stream-Output, X-Chunked-Ouput')
-                   .header('Access-Control-Allow-Methods', 'GET')
-                   .header('Access-Control-Allow-Origin', '*')
-                   .header('Access-Control-Expose-Headers', 'X-Stream-Output, X-Chunked-Ouput')
-                   .send()
+                  response.send()
                 }
               }
 

diff --git a/test/gateway/index.js b/test/gateway/index.js
@@ -9,6 +9,7 @@ const series = require('async/series')
 const API = require('../../src/http')
 const loadFixture = require('aegir/fixtures')
 const os = require('os')
+const path = require('path')
 
 const bigFile = loadFixture(__dirname, '../../node_modules/interface-ipfs-core/test/fixtures/15mb.random', 'ipfs')
 const directoryContent = {
@@ -23,7 +24,10 @@ describe('HTTP Gateway', () => {
   let gateway
 
   before((done) => {
-    const repoPath = os.tmpdir() + '/ipfs-' + Math.random().toString().substring(2, 8) + '-' + Date.now()
+    const repoPath = path.join(
+      os.tmpdir(),
+      '/ipfs-' + Math.random().toString().substring(2, 8) + '-' + Date.now()
+    )
 
     http.api = new API(repoPath, {
       Bootstrap: [],