refactor how Content-Type headers are checked

thehabes · thehabes · commit e8dff8d69879 · 2026-03-24T13:02:55.000-05:00
diff --git a/controllers/bulk.js b/controllers/bulk.js
@@ -7,8 +7,8 @@
  */
 
 import { newID, isValidID, db } from '../database/index.js'
-import utils from '../utils.js'
-import { _contextid, ObjectID, createExpressError, getAgentClaim, parseDocumentID, idNegotiation } from './utils.js'
+import utils, { createExpressError } from '../utils.js'
+import { _contextid, ObjectID, getAgentClaim, parseDocumentID, idNegotiation } from './utils.js'
 
 /**
  * Create many objects at once with the power of MongoDB bulkWrite() operations.
diff --git a/controllers/crud.js b/controllers/crud.js
@@ -5,8 +5,8 @@
  * @author Claude Sonnet 4, cubap, thehabes
  */
 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 utils, { createExpressError } from '../utils.js'
+import { _contextid, idNegotiation, generateSlugId, ObjectID, getAgentClaim, parseDocumentID } from './utils.js'
 
 /**
  * Create a new Linked Open Data object in RERUM v1.
diff --git a/controllers/delete.js b/controllers/delete.js
@@ -5,8 +5,8 @@
  * @author Claude Sonnet 4, cubap, thehabes
  */
 import { newID, isValidID, db } from '../database/index.js'
-import utils from '../utils.js'
-import { createExpressError, getAgentClaim, parseDocumentID, getAllVersions, getAllDescendants } from './utils.js'
+import utils, { createExpressError } from '../utils.js'
+import { getAgentClaim, parseDocumentID, getAllVersions, getAllDescendants } from './utils.js'
 
 /**
  * Mark an object as deleted in the database.
diff --git a/controllers/gog.js b/controllers/gog.js
@@ -7,8 +7,8 @@
  */
 
 import { newID, isValidID, db } from '../database/index.js'
-import utils from '../utils.js'
-import { _contextid, ObjectID, createExpressError, getAgentClaim, parseDocumentID, idNegotiation } from './utils.js'
+import utils, { createExpressError } from '../utils.js'
+import { _contextid, ObjectID, getAgentClaim, parseDocumentID, idNegotiation } from './utils.js'
 
 /**
  * THIS IS SPECIFICALLY FOR 'Gallery of Glosses'
diff --git a/controllers/history.js b/controllers/history.js
@@ -7,8 +7,8 @@
  */
 
 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 utils, { createExpressError } 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`.
diff --git a/controllers/overwrite.js b/controllers/overwrite.js
@@ -7,8 +7,8 @@
  */
 
 import { newID, isValidID, db } from '../database/index.js'
-import utils from '../utils.js'
-import { _contextid, ObjectID, createExpressError, getAgentClaim, parseDocumentID, idNegotiation } from './utils.js'
+import utils, { createExpressError } from '../utils.js'
+import { _contextid, ObjectID, getAgentClaim, parseDocumentID, idNegotiation } from './utils.js'
 
 /**
  * Replace some existing object in MongoDB with the JSON object in the request body.
diff --git a/controllers/patchSet.js b/controllers/patchSet.js
@@ -7,8 +7,8 @@
  */
 
 import { newID, isValidID, db } from '../database/index.js'
-import utils from '../utils.js'
-import { _contextid, ObjectID, createExpressError, getAgentClaim, parseDocumentID, idNegotiation, alterHistoryNext } from './utils.js'
+import utils, { createExpressError } from '../utils.js'
+import { _contextid, ObjectID, getAgentClaim, parseDocumentID, idNegotiation, alterHistoryNext } from './utils.js'
 
 /**
  * Update some existing object in MongoDB by adding the keys from the JSON object in the request body.
diff --git a/controllers/patchUnset.js b/controllers/patchUnset.js
@@ -7,8 +7,8 @@
  */
 
 import { newID, isValidID, db } from '../database/index.js'
-import utils from '../utils.js'
-import { _contextid, ObjectID, createExpressError, getAgentClaim, parseDocumentID, idNegotiation, alterHistoryNext } from './utils.js'
+import utils, { createExpressError } from '../utils.js'
+import { _contextid, ObjectID, getAgentClaim, parseDocumentID, idNegotiation, alterHistoryNext } from './utils.js'
 
 /**
  * Update some existing object in MongoDB by removing the keys noted in the JSON object in the request body.
diff --git a/controllers/patchUpdate.js b/controllers/patchUpdate.js
@@ -7,8 +7,8 @@
  */
 
 import { newID, isValidID, db } from '../database/index.js'
-import utils from '../utils.js'
-import { _contextid, ObjectID, createExpressError, getAgentClaim, parseDocumentID, idNegotiation, alterHistoryNext } from './utils.js'
+import utils, { createExpressError } from '../utils.js'
+import { _contextid, ObjectID, getAgentClaim, parseDocumentID, idNegotiation, alterHistoryNext } from './utils.js'
 
 /**
  * Update some existing object in MongoDB by changing the keys from the JSON object in the request body.
diff --git a/controllers/putUpdate.js b/controllers/putUpdate.js
@@ -7,8 +7,8 @@
  */
 
 import { newID, isValidID, db } from '../database/index.js'
-import utils from '../utils.js'
-import { _contextid, ObjectID, createExpressError, getAgentClaim, parseDocumentID, idNegotiation, alterHistoryNext } from './utils.js'
+import utils, { createExpressError } from '../utils.js'
+import { _contextid, ObjectID, getAgentClaim, parseDocumentID, idNegotiation, alterHistoryNext } from './utils.js'
 
 /**
  * Replace some existing object in MongoDB with the JSON object in the request body.
diff --git a/controllers/release.js b/controllers/release.js
@@ -7,8 +7,8 @@
  */
 
 import { newID, isValidID, db } from '../database/index.js'
-import utils from '../utils.js'
-import { _contextid, ObjectID, createExpressError, getAgentClaim, parseDocumentID, idNegotiation, generateSlugId, establishReleasesTree, healReleasesTree } from './utils.js'
+import utils, { createExpressError } from '../utils.js'
+import { _contextid, ObjectID, getAgentClaim, parseDocumentID, idNegotiation, generateSlugId, establishReleasesTree, healReleasesTree } from './utils.js'
 
 /**
  * Public facing servlet to release an existing RERUM object. This will not
diff --git a/controllers/search.js b/controllers/search.js
@@ -5,8 +5,8 @@
  * @author thehabes
  */
 import { db } from '../database/index.js'
-import utils from '../utils.js'
-import { idNegotiation, createExpressError } from './utils.js'
+import utils, { createExpressError } from '../utils.js'
+import { idNegotiation } from './utils.js'
 
 /**
  * Merges and deduplicates results from multiple MongoDB Atlas Search index queries.
diff --git a/controllers/utils.js b/controllers/utils.js
@@ -5,6 +5,7 @@
  * @author Claude Sonnet 4, cubap, thehabes
  */
 import { newID, isValidID, db } from '../database/index.js'
+import { createExpressError } from '../utils.js'
 
 const ObjectID = newID
 
@@ -98,18 +99,6 @@ const index = function (req, res, next) {
     })
 }
 
-function createExpressError(err) {
-    let error = {
-        statusCode: err.statusCode ?? err.status ?? 500,
-        statusMessage: err.statusMessage ?? err.message ?? "There was an error that prevented this request from completing successfully."
-    }
-    if (err.code === 11000) {
-        error.statusMessage = `The id provided already exists.  Please use a different _id or Slug.`
-        error.statusCode = 409
-    }
-    return error
-}
-
 /**
  * An internal helper for removing a document from the database using a known _id or __rerums.slug.
  * This is not exposed over the http request and response.
@@ -461,7 +450,6 @@ export {
     generateSlugId,
     index,
     ObjectID,
-    createExpressError,
     remove,
     getAgentClaim,
     parseDocumentID,
diff --git a/rest.js b/rest.js
@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 
-import { createExpressError } from './controllers/utils.js'
+import { createExpressError } from './utils.js'
 
 /**
  * This module is used for any REST support functionality.  It is used as middleware and so
diff --git a/utils.js b/utils.js
@@ -239,8 +239,28 @@ const configureLastModifiedHeader = function(obj){
     return {"Last-Modified":new Date(date).toUTCString()}
 }
 
+/**
+ * Create a standardized Express error object from an error or error-like input.
+ * Handles MongoDB duplicate key errors (code 11000) as 409 Conflict.
+ *
+ * @param {Object} err - An error or object with statusCode/status and statusMessage/message properties
+ * @return {Object} A normalized error object with statusCode and statusMessage
+ */
+export function createExpressError(err) {
+    let error = {
+        statusCode: err.statusCode ?? err.status ?? 500,
+        statusMessage: err.statusMessage ?? err.message ?? "There was an error that prevented this request from completing successfully."
+    }
+    if (err.code === 11000) {
+        error.statusMessage = `The id provided already exists.  Please use a different _id or Slug.`
+        error.statusCode = 409
+    }
+    return error
+}
+
 export default {
     configureRerumOptions,
+    createExpressError,
     isDeleted,
     isReleased,
     isGenerator,
@@ -249,4 +269,4 @@ export default {
     isContainerType,
     isLD,
     configureLastModifiedHeader
-}
+}
