Error redo

Author: thehabes

db-controller.js

@@ -1578,9 +1578,9 @@ async function newTreePrime(obj) {
  * @param {Error} originalError `source` for tracing this Error
  * @returns Error for use in Express.next(err)
  */
-function createExpressError(update, originalError = {}) {
-    let err = Error("detected error", { cause: originalError })
-    if (update.code) {
+function createExpressError(err) {
+    let error = {}
+    if (err.code) {
         /**
          * Detection that createExpressError(error) passed in a mongo client error.
          * IMPORTANT!  If you try to write to 'update' when it comes in as a mongo error...
@@ -1591,24 +1591,20 @@ function createExpressError(update, originalError = {}) {
          * If you do update.statusMessage or update.statusCode YOU WILL CAUSE THIS ERROR.
          * Make sure you write to err instead.  Object.assign() will have the same result.
          */
-        switch (update.code) {
+        switch (err.code) {
             case 11000:
                 //Duplicate _id key error, specific to SLUG support.  This is a Conflict.
-                err.statusMessage = `The id provided in the Slug header already exists.  Please use a different Slug.`
-                err.statusCode = 409
+                error.statusMessage = `The id provided already exists.  Please use a different _id or Slug.`
+                error.statusCode = 409
                 break
             default:
-                err.statusMessage = "There was a mongo error that prevented this request from completing successfully."
-                err.statusCode = 500
+                error.statusMessage = "There was a mongo error that prevented this request from completing successfully."
+                error.statusCode = 500
         }
     }
-    else {
-        //Warning!  If 'update' is considered sent, this will cause a 500.  See notes above.
-        update.statusMessage = update.message
-        update.statusCode = update.status
-    }
-    Object.assign(err, update)
-    return err
+    if(!err.statusCode) error.statusCode === "500"
+    if(!err.statusMessage) error.statusMessage === "Detected Error"
+    return error
 }
 
 /**

rest.js

@@ -36,47 +36,51 @@ const messenger = function (err, req, res, next) {
         next(err)
         return
     }
-    err.message = err.message ?? res.message ?? ``
-    if (err.statusCode === 401) {
+    console.log("Error into messenger")
+    console.log(err)
+    let error = {}
+    error.message = err.statusMessage ?? err.message ?? res.statusMessage ?? res.message ?? ``
+    error.status = err.statusCode ?? res.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
         //Other 401s from our app come through with a status message.  They may not have headers.
         if (err.headers?.["WWW-Authenticate"]) {
-            err.message += err.headers["WWW-Authenticate"]
+            error.message += err.headers["WWW-Authenticate"]
         }
     }
     let genericMessage = ""
     let token = req.header("Authorization")
     if(token && !token.startsWith("Bearer ")){
-        err.message +=`
+        error.message +=`
 Your token is not in the correct format.  It should be a Bearer token formatted like: "Bearer <token>"`
         next(err)
         return
     }
-    switch (err.statusCode) {
+    switch (error.status) {
         case 400:
             //"Bad Request", most likely because the body and Content-Type are not aligned.  Could be bad JSON.
-            err.message += `
+            error.message += `
 The body of your request was invalid. Please make sure it is a valid content-type and that the body matches that type.
 If the body is JSON, make sure it is valid JSON.`
             break
         case 401:
             //The requesting agent is known from the request.  That agent does not match __rerum.generatedBy.  Unauthorized.
             if (token) {
-                err.message += `
+                error.message += `
 The token provided is Unauthorized.  Please check that it is your token and that it is not expired. 
 Token: ${token} `
             }
             else {
-                err.message += `
+                error.message += `
 The request does not contain an "Authorization" header and so is Unauthorized. Please include a token with your requests
 like "Authorization: Bearer <token>". Make sure you have registered at ${process.env.RERUM_PREFIX}.`
             }
             break
         case 403:
             //Forbidden to use this.  The provided Bearer does not have the required privileges. 
             if (token) {
-                err.message += `
+                error.message += `
 You are Forbidden from performing this action.  Check your privileges.
 Token: ${token}`
             }
@@ -87,24 +91,28 @@ You are Forbidden from performing this action. The request does not contain an "
 Make sure you have registered at ${process.env.RERUM_PREFIX}. `
             }
         case 404:
-            err.message += `
+            error.message += `
 The requested web page or resource could not be found.`
             break
         case 405:
             // These are all handled in api-routes.js already.
             break
+        case 409:
+            break
         case 503:
             //RERUM is down or readonly.  Handled upstream.
             break
         case 500:
         default:
             //Really bad, probably not specifically caught.  
-            err.message += `
+            error.message += `
 RERUM experienced a server issue while performing this action.
 It may not have completed at all, and most likely did not complete successfully.`
     }
-    //    res.status(statusCode).send(err.statusMessage)
-    next(err)
+    console.log("Error out with res")
+    console.log(error)
+    res.set("Content-Type", "text/plain; charset=utf-8")
+    res.status(error.status).send(error.message).end()
 }
 
 export default { checkPatchOverrideSupport, messenger }

routes/api-routes.js

@@ -80,7 +80,7 @@ router.use('/history', historyRouter)
  */
 router.use((req, res, next) => {
     const code = res?.statusCode
-    const handledCodes = [401, 403, 405, 500, 501]
+    const handledCodes = [401, 403, 405, 409, 500, 501]
     let msg = res.statusMessage ?? `${code} Route Error`
     if(code && handledCodes.includes(code)) {
         // It was handled upstream in a route file.  It is already the right error and message so send it out.