Serve index.html instead of redirect to warp

deiu · deiu · commit ce20b6ae50d8 · 2016-03-16T16:15:37.000-04:00
diff --git a/lib/handlers/index.js b/lib/handlers/index.js
@@ -26,10 +26,10 @@ function handler (req, res, next) {
     if (requestedType.indexOf('text/html') !== 0) {
       return next()
     }
-    debug('Looking for index in ' + res.locals.path)
+    debug('Looking for index in ' + req.path)
 
-  // Check if file exists in first place
-    ldp.exists(req.hostname, res.locals.path, function (err) {
+    // Check if file exists in first place
+    ldp.exists(req.hostname, path.join(req.path, indexFile), function (err) {
       if (err) {
         return next()
       }
diff --git a/test/http.js b/test/http.js
@@ -232,7 +232,7 @@ describe('HTTP APIs', function () {
         .expect(200, done)
     })
     it('should redirect to file browser if container was requested as text/html', function (done) {
-      server.get('/sampleContainer/')
+      server.get('/')
         .set('Accept', 'text/html')
         .expect('content-type', /text\/html/)
         .expect(303, done)
@@ -286,7 +286,7 @@ describe('HTTP APIs', function () {
       function (done) {
         server.get('/sampleContainer/')
           .set('accept', 'text/html')
-          .expect(303)
+          .expect(200)
           .expect('content-type', /text\/html/)
           .end(done)
       })

Original file line number	Diff line number	Diff line change
`@@ -26,10 +26,10 @@ function handler (req, res, next) {`
`26`	`26`	`if (requestedType.indexOf('text/html') !== 0) {`
`27`	`27`	`return next()`
`28`	`28`	`}`
`29`		`- debug('Looking for index in ' + res.locals.path)`
	`29`	`+ debug('Looking for index in ' + req.path)`
`30`	`30`
`31`		`- // Check if file exists in first place`
`32`		`- ldp.exists(req.hostname, res.locals.path, function (err) {`
	`31`	`+ // Check if file exists in first place`
	`32`	`+ ldp.exists(req.hostname, path.join(req.path, indexFile), function (err) {`
`33`	`33`	`if (err) {`
`34`	`34`	`return next()`
`35`	`35`	`}`