Use application/octet-stream as default content type in ResourceMapper

Author: rubensworks

config/defaults.js

@@ -13,8 +13,7 @@ module.exports = {
   'webid': true,
   'strictOrigin': true,
   'originsAllowed': ['https://apps.solid.invalid'],
-  'dataBrowserPath': 'default',
-  'defaultContentType': 'application/octet-stream'
+  'dataBrowserPath': 'default'
 
   // For use in Enterprises to configure a HTTP proxy for all outbound HTTP requests from the SOLID server (we use
   // https://www.npmjs.com/package/global-tunnel-ng).

lib/resource-mapper.js

@@ -11,8 +11,8 @@ class ResourceMapper {
   constructor ({
     rootUrl,
     rootPath,
-    includeHost,
-    defaultContentType,
+    includeHost = false,
+    defaultContentType = 'application/octet-stream',
     indexName = 'index',
     overrideTypes = { acl: 'text/turtle', meta: 'text/turtle' }
   }) {

test/integration/account-manager-test.js

@@ -33,8 +33,7 @@ describe('AccountManager', () => {
       let resourceMapper = new ResourceMapper({
         rootUrl: 'https://localhost:8443/',
         rootPath: process.cwd(),
-        includeHost: multiuser,
-        defaultContentType: 'application/octet-stream'
+        includeHost: multiuser
       })
       let store = new LDP({ multiuser, resourceMapper })
       let options = { multiuser, store, host }
@@ -64,8 +63,7 @@ describe('AccountManager', () => {
         let resourceMapper = new ResourceMapper({
           rootUrl: 'https://localhost:8443/',
           includeHost: multiuser,
-          rootPath: path.join(testAccountsDir, 'tim.localhost'),
-          defaultContentType: 'application/octet-stream'
+          rootPath: path.join(testAccountsDir, 'tim.localhost')
         })
         let store = new LDP({
           multiuser,
@@ -84,8 +82,7 @@ describe('AccountManager', () => {
         let resourceMapper = new ResourceMapper({
           rootUrl: 'https://localhost:8443/',
           includeHost: multiuser,
-          rootPath: testAccountsDir,
-          defaultContentType: 'application/octet-stream'
+          rootPath: testAccountsDir
         })
         let store = new LDP({
           multiuser,
@@ -108,8 +105,7 @@ describe('AccountManager', () => {
       let resourceMapper = new ResourceMapper({
         rootUrl: 'https://localhost:8443/',
         includeHost: multiuser,
-        rootPath: testAccountsDir,
-        defaultContentType: 'application/octet-stream'
+        rootPath: testAccountsDir
       })
       let store = new LDP({ multiuser, resourceMapper })
       let options = { host, multiuser, store, accountTemplatePath }

test/integration/ldp-test.js

@@ -22,8 +22,7 @@ describe('LDP', function () {
   var resourceMapper = new ResourceMapper({
     rootUrl: 'https://localhost:8443/',
     rootPath: root,
-    includeHost: false,
-    defaultContentType: 'text/turtle'
+    includeHost: false
   })
 
   var ldp = new LDP({

test/unit/account-manager-test.js

@@ -106,8 +106,7 @@ describe('AccountManager', () => {
       let resourceMapper = new ResourceMapper({
         rootUrl: 'https://localhost:8443/',
         includeHost: multiuser,
-        rootPath: testAccountsDir,
-        defaultContentType: 'application/octet-stream'
+        rootPath: testAccountsDir
       })
       let store = new LDP({ multiuser, resourceMapper })
       let options = { multiuser, store, host }
@@ -122,8 +121,7 @@ describe('AccountManager', () => {
       let resourceMapper = new ResourceMapper({
         rootUrl: 'https://localhost:8443/',
         includeHost: multiuser,
-        rootPath: testAccountsDir,
-        defaultContentType: 'application/octet-stream'
+        rootPath: testAccountsDir
       })
       let store = new LDP({ multiuser, resourceMapper })
       let host = SolidHost.from({ serverUri: 'https://localhost' })
@@ -318,7 +316,6 @@ describe('AccountManager', () => {
       let resourceMapper = new ResourceMapper({
         rootUrl: 'https://localhost:8443/',
         rootPath: process.cwd(),
-        defaultContentType: 'application/octet-stream',
         includeHost: false
       })
       let store = new LDP({ suffixAcl: '.acl', multiuser: false, resourceMapper })
@@ -336,7 +333,6 @@ describe('AccountManager', () => {
       let resourceMapper = new ResourceMapper({
         rootUrl: 'https://localhost:8443/',
         rootPath: process.cwd(),
-        defaultContentType: 'application/octet-stream',
         includeHost: true
       })
       let store = new LDP({ suffixAcl: '.acl', multiuser: true, resourceMapper })

test/unit/resource-mapper-test.js

@@ -14,8 +14,7 @@ describe('ResourceMapper', () => {
     const mapper = new ResourceMapper({
       rootUrl,
       rootPath,
-      includeHost: false,
-      defaultContentType: 'application/octet-stream'
+      includeHost: false
     })
 
     // PUT base cases from https://www.w3.org/DesignIssues/HTTPFilenameMapping.html

test/unit/user-accounts-api-test.js

@@ -30,8 +30,7 @@ describe('api/accounts/user-accounts', () => {
       let resourceMapper = new ResourceMapper({
         rootUrl: 'https://localhost:8443/',
         includeHost: multiuser,
-        rootPath: testAccountsDir,
-        defaultContentType: 'application/octet-stream'
+        rootPath: testAccountsDir
       })
       let store = new LDP({ multiuser, resourceMapper })