Error redo

Author: thehabes

db-controller.js

@@ -1574,8 +1574,7 @@ async function newTreePrime(obj) {
 
 /**
  * 
- * @param {Object} update `message` and `status` for creating a custom Error
- * @param {Error} originalError `source` for tracing this Error
+ * @param {Object} err An object with `statusMessage` and `statusCode` for error reporting.
  * @returns Error for use in Express.next(err)
  */
 function createExpressError(err) {

rest.js

@@ -29,16 +29,16 @@ const checkPatchOverrideSupport = function (req, res) {
  * REST is all about communication.  The response code and the textual body are particular.
  * RERUM is all about being clear.  It will build custom responses sometimes for certain scenarios, will remaining RESTful.
  * 
- * Note that the res upstream from this has been converted into err.  res will not have what you are looking for, check err instead. 
+ * You have likely reached this with a next(createExpressError(err)) call.  End here and send the error.
  */
 const messenger = function (err, req, res, next) {
     if (res.headersSent) {
         next(err)
         return
     }
     let error = {}
-    error.message = err.statusMessage ?? err.message ?? res.statusMessage ?? res.message ?? ``
-    error.status = err.statusCode ?? res.statusCode ?? 500
+    error.message = err.statusMessage ?? err.message ?? ``
+    error.status = err.statusCode ?? 500
     if (error.status === 401) {
         //Special handler for token errors from the oauth module
         //Token errors come through with a message that we want.  That message is in the error's WWW-Authenticate header
@@ -47,7 +47,6 @@ const messenger = function (err, req, res, next) {
             error.message += err.headers["WWW-Authenticate"]
         }
     }
-    let genericMessage = ""
     let token = req.header("Authorization")
     if(token && !token.startsWith("Bearer ")){
         error.message +=`
@@ -96,7 +95,7 @@ The requested web page or resource could not be found.`
             // These are all handled in api-routes.js already.
             break
         case 409:
-            // These are all handled in db-controller createExpressError() already.
+            // These are all handled in db-controller.js already.
             break
         case 503:
             //RERUM is down or readonly.  Handled upstream.

routes/__tests__/idNegotiation.test.js

@@ -1,29 +1,31 @@
 import { jest } from "@jest/globals"
+import dotenv from "dotenv"
+dotenv.config()
 import controller from '../../db-controller.js'
 
 it("Functional '@id-id' negotiation on objects returned.", async () => {
   let negotiate = {
     "@context": "http://iiif.io/api/presentation/3/context.json",
     "_id": "example",
-    "@id": "https://store.rerum.io/v1/id/example",
+    "@id": `${process.env.RERUM_ID_PREFIX}example`,
     "test": "item"
   }
   negotiate = controller.idNegotiation(negotiate)
   expect(negotiate._id).toBeUndefined()
   expect(negotiate["@id"]).toBeUndefined()
-  expect(negotiate.id).toBe("https://store.rerum.io/v1/id/example")
+  expect(negotiate.id).toBe(`${process.env.RERUM_ID_PREFIX}example`)
   expect(negotiate.test).toBe("item")
 
   let nonegotiate = {
     "@context":"http://example.org/context.json",
     "_id": "example",
-    "@id": "https://store.rerum.io/v1/id/example",
+    "@id": `${process.env.RERUM_ID_PREFIX}example`,
     "id": "test_example",
     "test":"item"
   }
   nonegotiate = controller.idNegotiation(nonegotiate)
   expect(nonegotiate._id).toBeUndefined()
-  expect(nonegotiate["@id"]).toBe("https://store.rerum.io/v1/id/example")
+  expect(nonegotiate["@id"]).toBe(`${process.env.RERUM_ID_PREFIX}example`)
   expect(nonegotiate.id).toBe("test_example")
   expect(nonegotiate.test).toBe("item")
 })