Consistently call getContentType helper when needed

Author: rubensworks

lib/handlers/patch.js

@@ -9,6 +9,7 @@ const error = require('../http-error')
 const $rdf = require('rdflib')
 const crypto = require('crypto')
 const overQuota = require('../utils').overQuota
+const getContentType = require('../utils').getContentType
 
 // Patch parsers by request body content type
 const PATCH_PARSERS = {
@@ -42,7 +43,7 @@ async function patchHandler (req, res, next) {
     const patch = {}
     patch.text = req.body ? req.body.toString() : ''
     patch.uri = `${url}#patch-${hash(patch.text)}`
-    patch.contentType = (req.get('content-type') || '').match(/^[^;\s]*/)[0]
+    patch.contentType = getContentType(req.headers)
     debug('PATCH -- Received patch (%d bytes, %s)', patch.text.length, patch.contentType)
     const parsePatch = PATCH_PARSERS[patch.contentType]
     if (!parsePatch) {

lib/handlers/post.js

@@ -7,10 +7,11 @@ const header = require('../header')
 const patch = require('./patch')
 const error = require('../http-error')
 const { extensions } = require('mime-types')
+const getContentType = require('../utils').getContentType
 
 async function handler (req, res, next) {
   const ldp = req.app.locals.ldp
-  const contentType = req.get('content-type')
+  const contentType = getContentType(req.headers)
   debug('content-type is ', contentType)
   // Handle SPARQL(-update?) query
   if (contentType === 'application/sparql' ||

lib/ldp-copy.js

@@ -7,6 +7,7 @@ const error = require('./http-error')
 const path = require('path')
 const http = require('http')
 const https = require('https')
+const getContentType = require('./utils').getContentType
 
 /**
  * Cleans up a file write stream (ends stream, deletes the file).
@@ -45,7 +46,7 @@ function copy (resourceMapper, copyToUri, copyFromUri) {
           return reject(error)
         }
         // Grab the content type from the source
-        const contentType = response.headers['content-type']
+        const contentType = getContentType(response.headers)
         resourceMapper.mapUrlToFile({ url: copyToUri, createIfNotExists: true, contentType })
           .then(({ path: copyToPath }) => {
             mkdirp(path.dirname(copyToPath), function (err) {