Handle Bad Content-Type Headers RESTfully

app.js

@@ -57,9 +57,8 @@ app.use(
   })
 )
 app.use(logger('dev'))
-app.use(express.json())
+app.use(express.json({ type: ["application/json", "application/ld+json"] }))
 app.use(express.text())
-app.use(express.urlencoded({ extended: true }))
 app.use(cookieParser())
 
 //Publicly available scripts, CSS, and HTML pages.

controllers/bulk.js

@@ -8,7 +8,7 @@
 
 import { newID, isValidID, db } from '../database/index.js'
 import utils from '../utils.js'
-import { _contextid, ObjectID, createExpressError, getAgentClaim, parseDocumentID, idNegotiation } from './utils.js'
+import { _contextid, ObjectID, getAgentClaim, parseDocumentID, idNegotiation } from './utils.js'
 
 /**
  * Create many objects at once with the power of MongoDB bulkWrite() operations.
@@ -22,13 +22,13 @@ const bulkCreate = async function (req, res, next) {
     if (!Array.isArray(documents)) {
         err.message = "The request body must be an array of objects."
         err.status = 400
-        next(createExpressError(err))
+        next(utils.createExpressError(err))
         return
     }
     if (documents.length === 0) {
         err.message = "No action on an empty array."
         err.status = 400
-        next(createExpressError(err))
+        next(utils.createExpressError(err))
         return
     }
     const gatekeep = documents.filter(d=> {
@@ -46,7 +46,7 @@ const bulkCreate = async function (req, res, next) {
     if (gatekeep.length > 0) {
         err.message = "All objects in the body of a `/bulkCreate` must be JSON and must not contain a declared identifier property."
         err.status = 400
-        next(createExpressError(err))
+        next(utils.createExpressError(err))
         return
     }
 
@@ -55,7 +55,7 @@ const bulkCreate = async function (req, res, next) {
     // if(slug){
     //     const slugError = await exports.generateSlugId(slug)
     //     if(slugError){
-    //         next(createExpressError(slugError))
+    //         next(utils.createExpressError(slugError))
     //         return
     //     }
     //     else{
@@ -92,7 +92,7 @@ const bulkCreate = async function (req, res, next) {
     }
     catch (error) {
         //MongoServerError from the client has the following properties: index, code, keyPattern, keyValue
-        next(createExpressError(error))
+        next(utils.createExpressError(error))
     }
 }
 
@@ -111,13 +111,13 @@ const bulkUpdate = async function (req, res, next) {
     if (!Array.isArray(documents)) {
         err.message = "The request body must be an array of objects."
         err.status = 400
-        next(createExpressError(err))
+        next(utils.createExpressError(err))
         return
     }
     if (documents.length === 0) {
         err.message = "No action on an empty array."
         err.status = 400
-        next(createExpressError(err))
+        next(utils.createExpressError(err))
         return
     }
     const gatekeep = documents.filter(d => {
@@ -136,7 +136,7 @@ const bulkUpdate = async function (req, res, next) {
     if (gatekeep.length > 0) {
         err.message = "All objects in the body of a `/bulkUpdate` must be JSON and must contain a declared identifier property."
         err.status = 400
-        next(createExpressError(err))
+        next(utils.createExpressError(err))
         return
     }
     // unordered bulkWrite() operations have better performance metrics.
@@ -154,7 +154,7 @@ const bulkUpdate = async function (req, res, next) {
         try {
             originalObject = await db.findOne({"$or":[{"_id": id}, {"__rerum.slug": id}]})
         } catch (error) {
-            next(createExpressError(error))
+            next(utils.createExpressError(error))
             return
         }
         if (null === originalObject) continue
@@ -196,7 +196,7 @@ const bulkUpdate = async function (req, res, next) {
     }
     catch (error) {
         //MongoServerError from the client has the following properties: index, code, keyPattern, keyValue
-        next(createExpressError(error))
+        next(utils.createExpressError(error))
     }
 }
 

controllers/crud.js

@@ -6,7 +6,7 @@
  */
 import { newID, isValidID, db } from '../database/index.js'
 import utils from '../utils.js'
-import { _contextid, idNegotiation, generateSlugId, ObjectID, createExpressError, getAgentClaim, parseDocumentID } from './utils.js'
+import { _contextid, idNegotiation, generateSlugId, ObjectID, getAgentClaim, parseDocumentID } from './utils.js'
 
 /**
  * Create a new Linked Open Data object in RERUM v1.
@@ -19,7 +19,7 @@ const create = async function (req, res, next) {
     if(req.get("Slug")){
         let slug_json = await generateSlugId(req.get("Slug"), next)
         if(slug_json.code){
-            next(createExpressError(slug_json))
+            next(utils.createExpressError(slug_json))
             return
         }
         else{
@@ -43,7 +43,6 @@ const create = async function (req, res, next) {
     delete provided["@context"]
 
     let newObject = Object.assign(context, { "@id": process.env.RERUM_ID_PREFIX + id }, provided, rerumProp, { "_id": id })
-    console.log("CREATE")
     try {
         let result = await db.insertOne(newObject)
         res.set(utils.configureWebAnnoHeadersFor(newObject))
@@ -55,7 +54,7 @@ const create = async function (req, res, next) {
     }
     catch (error) {
         //MongoServerError from the client has the following properties: index, code, keyPattern, keyValue
-        next(createExpressError(error))
+        next(utils.createExpressError(error))
     }
 }
 
@@ -75,7 +74,7 @@ const query = async function (req, res, next) {
             message: "Detected empty JSON object.  You must provide at least one property in the /query request body JSON.",
             status: 400
         }
-        next(createExpressError(err))
+        next(utils.createExpressError(err))
         return
     }
     try {
@@ -84,7 +83,7 @@ const query = async function (req, res, next) {
         res.set(utils.configureLDHeadersFor(matches))
         res.json(matches)
     } catch (error) {
-        next(createExpressError(error))
+        next(utils.createExpressError(error))
     }
 }
 
@@ -116,9 +115,9 @@ const id = async function (req, res, next) {
             "message": `No RERUM object with id '${id}'`,
             "status": 404
         } 
-        next(createExpressError(err))
+        next(utils.createExpressError(err))
     } catch (error) {
-        next(createExpressError(error))
+        next(utils.createExpressError(error))
     }
 }
 

controllers/delete.js

@@ -6,7 +6,7 @@
  */
 import { newID, isValidID, db } from '../database/index.js'
 import utils from '../utils.js'
-import { createExpressError, getAgentClaim, parseDocumentID, getAllVersions, getAllDescendants } from './utils.js'
+import { getAgentClaim, parseDocumentID, getAllVersions, getAllDescendants } from './utils.js'
 
 /**
  * Mark an object as deleted in the database.
@@ -26,15 +26,15 @@ const deleteObj = async function(req, res, next) {
     try {
         id = req.params["_id"] ?? parseDocumentID(JSON.parse(JSON.stringify(req.body))["@id"]) ?? parseDocumentID(JSON.parse(JSON.stringify(req.body))["id"])
     } catch(error){
-        next(createExpressError(error))
+        next(utils.createExpressError(error))
         return
     }
     let agentRequestingDelete = getAgentClaim(req, next)
     let originalObject
     try {
         originalObject = await db.findOne({"$or":[{"_id": id}, {"__rerum.slug": id}]})
     } catch (error) {
-        next(createExpressError(error))
+        next(utils.createExpressError(error))
         return
     }
     if (null !== originalObject) {
@@ -58,7 +58,7 @@ const deleteObj = async function(req, res, next) {
             })
         }
         if (err.status) {
-            next(createExpressError(err))
+            next(utils.createExpressError(err))
             return
         }
         let preserveID = safe_original["@id"]
@@ -76,14 +76,14 @@ const deleteObj = async function(req, res, next) {
             try {
                 result = await db.replaceOne({ "_id": originalObject["_id"] }, deletedObject)
             } catch (error) {
-                next(createExpressError(error))
+                next(utils.createExpressError(error))
                 return
             }
             if (result.modifiedCount === 0) {
                 //result didn't error out, the action was not performed.  Sometimes, this is a neutral thing.  Sometimes it is indicative of an error.
                 err.message = "The original object was not replaced with the deleted object in the database."
                 err.status = 500
-                next(createExpressError(err))
+                next(utils.createExpressError(err))
                 return
             }
             //204 to say it is deleted and there is nothing in the body
@@ -94,12 +94,12 @@ const deleteObj = async function(req, res, next) {
         //Not sure we can get here, as healHistoryTree might throw and error.
         err.message = "The history tree for the object being deleted could not be mended."
         err.status = 500
-        next(createExpressError(err))
+        next(utils.createExpressError(err))
         return
     }
     err.message = "No object with this id could be found in RERUM.  Cannot delete."
     err.status = 404
-    next(createExpressError(err))
+    next(utils.createExpressError(err))
 }
 
 /**

controllers/gog.js

@@ -8,7 +8,7 @@
 
 import { newID, isValidID, db } from '../database/index.js'
 import utils from '../utils.js'
-import { _contextid, ObjectID, createExpressError, getAgentClaim, parseDocumentID, idNegotiation } from './utils.js'
+import { _contextid, ObjectID, getAgentClaim, parseDocumentID, idNegotiation } from './utils.js'
 
 /**
  * THIS IS SPECIFICALLY FOR 'Gallery of Glosses'
@@ -44,7 +44,7 @@ const _gog_fragments_from_manuscript = async function (req, res, next) {
         })
     }
     if (err.status) {
-        next(createExpressError(err))
+        next(utils.createExpressError(err))
         return
     }
     try {
@@ -138,7 +138,7 @@ const _gog_fragments_from_manuscript = async function (req, res, next) {
     }
     catch (error) {
         console.error(error)
-        next(createExpressError(error))
+        next(utils.createExpressError(error))
     }
 }
 
@@ -162,7 +162,7 @@ const _gog_glosses_from_manuscript = async function (req, res, next) {
     const skip = parseInt(req.query.skip ?? 0)
     let err = { message: `` }
     // This request can only be made my Gallery of Glosses production apps.
-    if (!agentID === "61043ad4ffce846a83e700dd") {
+    if (agentID !== "61043ad4ffce846a83e700dd") {
         err = Object.assign(err, {
             message: `Only the Gallery of Glosses can make this request.`,
             status: 403
@@ -176,7 +176,7 @@ const _gog_glosses_from_manuscript = async function (req, res, next) {
         })
     }
     if (err.status) {
-        next(createExpressError(err))
+        next(utils.createExpressError(err))
         return
     }
     try {
@@ -300,7 +300,7 @@ const _gog_glosses_from_manuscript = async function (req, res, next) {
     }
     catch (error) {
         console.error(error)
-        next(createExpressError(error))
+        next(utils.createExpressError(error))
     }
 }
 

controllers/history.js

@@ -8,7 +8,7 @@
 
 import { newID, isValidID, db } from '../database/index.js'
 import utils from '../utils.js'
-import { _contextid, ObjectID, createExpressError, getAgentClaim, parseDocumentID, idNegotiation, getAllVersions, getAllAncestors, getAllDescendants } from './utils.js'
+import { _contextid, ObjectID, getAgentClaim, parseDocumentID, idNegotiation, getAllVersions, getAllAncestors, getAllDescendants } from './utils.js'
 
 /**
  * Public facing servlet to gather for all versions downstream from a provided `key object`.
@@ -23,15 +23,15 @@ const since = async function (req, res, next) {
     try {
         obj = await db.findOne({"$or":[{"_id": id}, {"__rerum.slug": id}]})
     } catch (error) {
-        next(createExpressError(error))
+        next(utils.createExpressError(error))
         return
     }
     if (null === obj) {
         let err = {
             message: `Cannot produce a history. There is no object in the database with id '${id}'.  Check the URL.`,
             status: 404
         }
-        next(createExpressError(err))
+        next(utils.createExpressError(err))
         return
     }
     let all = await getAllVersions(obj)
@@ -60,15 +60,15 @@ const history = async function (req, res, next) {
     try {
         obj = await db.findOne({"$or":[{"_id": id}, {"__rerum.slug": id}]})
     } catch (error) {
-        next(createExpressError(error))
+        next(utils.createExpressError(error))
         return
     }
     if (null === obj) {
         let err = {
             message: `Cannot produce a history. There is no object in the database with id '${id}'.  Check the URL.`,
             status: 404
         }
-        next(createExpressError(err))
+        next(utils.createExpressError(err))
         return
     }
     let all = await getAllVersions(obj)
@@ -103,9 +103,9 @@ const idHeadRequest = async function (req, res, next) {
             "message": `No RERUM object with id '${id}'`,
             "status": 404
         }
-        next(createExpressError(err))
+        next(utils.createExpressError(err))
     } catch (error) {
-        next(createExpressError(error))
+        next(utils.createExpressError(error))
     }
 }
 
@@ -128,9 +128,9 @@ const queryHeadRequest = async function (req, res, next) {
             "message": `There are no objects in the database matching the query. Check the request body.`,
             "status": 404
         } 
-        next(createExpressError(err))
+        next(utils.createExpressError(err))
     } catch (error) {
-        next(createExpressError(error))
+        next(utils.createExpressError(error))
     }
 }
 
@@ -145,15 +145,15 @@ const sinceHeadRequest = async function (req, res, next) {
     try {
         obj = await db.findOne({"$or":[{"_id": id}, {"__rerum.slug": id}]})
     } catch (error) {
-        next(createExpressError(error))
+        next(utils.createExpressError(error))
         return
     }
     if (null === obj) {
         let err = {
             message: `Cannot produce a history. There is no object in the database with id '${id}'.  Check the URL.`,
             status: 404
         }
-        next(createExpressError(err))
+        next(utils.createExpressError(err))
         return
     }
     let all = await getAllVersions(obj)
@@ -183,15 +183,15 @@ const historyHeadRequest = async function (req, res, next) {
     try {
         obj = await db.findOne({"$or":[{"_id": id}, {"__rerum.slug": id}]})
     } catch (error) {
-        next(createExpressError(error))
+        next(utils.createExpressError(error))
         return
     }
     if (null === obj) {
         let err = {
             message: "Cannot produce a history. There is no object in the database with this id. Check the URL.",
             status: 404
         }
-        next(createExpressError(err))
+        next(utils.createExpressError(err))
         return
     }
     let all = await getAllVersions(obj)