jxp 2.12.1 → 2.12.3

package/bin/setup.js

@@ -70,7 +70,7 @@ async function main() {
 				"start": "node bin/server.js"
 			},
 			"dependencies": {
-				"jxp": "^2.0.1-4"
+				"jxp": "^2.12.3"
 			},
 			"author": app_author,
 			"license": app_license

package/libs/docs.js

@@ -33,7 +33,7 @@ class Docs {
             res.end();
         } catch(err) {
             console.error(err);
-            return errors.InternalServerError({ message: err.toString() });
+            return new errors.InternalServerError(err.toString());
         }
     }
 
@@ -43,20 +43,20 @@ class Docs {
             res.send(models);
         } catch (err) {
             console.error(err);
-            return errors.InternalServerError({ message: err.toString() });
+            return new errors.InternalServerError(err.toString());
         }
     }
 
     metaModel(req, res, next) {
         try {
             if (!req.Model) {
-                return errors.NotFoundError({ status: "error", error: "Model not found" })
+                return new errors.NotFoundError("Model not found")
             }
             res.send(req.Model.schema.paths);
             next();
         } catch (err) {
             console.error(err);
-            return errors.InternalServerError({ message: err.toString() });
+            return new errors.InternalServerError(err.toString());
         }
     }
 
@@ -65,7 +65,7 @@ class Docs {
             res.send(this.models);
             next();
         } catch(err) {
-            errors.InternalServerError({ message: err.toString() });
+            return new errors.InternalServerError(err.toString());
         }
     }
 
@@ -74,7 +74,7 @@ class Docs {
             this.renderTemplate(res, "index", {});
             next();
         } catch(err) {
-            errors.InternalServerError({ message: err.toString() });
+            return new errors.InternalServerError(err.toString());
         }
     }
 
@@ -84,7 +84,7 @@ class Docs {
             const md_contents = md.render(body.toString()).body;
             this.renderTemplate(res, "md", { md_contents });
         } catch(err) {
-            errors.InternalServerError({ message: err.toString() });
+            return new errors.InternalServerError(err.toString());
         }
     }
 
@@ -98,7 +98,7 @@ class Docs {
             this.renderTemplate(res, "model", { model, fields, perms });
             next();
         } catch(err) {
-            errors.InternalServerError({ message: err.toString() });
+            return new errors.InternalServerError(err.toString());
         }
     }
 }

package/libs/groups.js

@@ -12,11 +12,11 @@ const actionPut = async (req, res) => {
 	const group = req.body.group;
 	if (!group) {
 		console.error("Group required");
-		return errors.BadRequestError("Group required");
+		return new errors.BadRequestError("Group required");
 	}
 	if (!user_id) {
 		console.error("user_id required");
-		return errors.BadRequestError("user_id required", { message: "user_id is required" });
+		return new errors.BadRequestError("user_id is required");
 	}
 	try {
 		let userGroup = await Groups.findOne({ user_id: user_id });
@@ -39,7 +39,7 @@ const actionPut = async (req, res) => {
 		res.send(await userGroup.save());
 	} catch(err) {
 			console.error(err);
-			return errors.InternalServerError({ message: err.toString()});
+			return new errors.InternalServerError(err.toString());
 	}
 };
 
@@ -48,11 +48,11 @@ const actionPost = async (req, res) => {
 	const group = req.body.group;
 	if (!group) {
 		console.error("Group required");
-		return errors.BadRequestError("Group required");
+		return new errors.BadRequestError("Group required");
 	}
 	if (!user_id) {
 		console.error("user_id required");
-		return errors.BadRequestError("user_id required", { message: "user_id is required" });
+		return new errors.BadRequestError("user_id required");
 	}
 	try {
 		let userGroup = await Groups.findOne({ user_id: user_id });
@@ -75,7 +75,7 @@ const actionPost = async (req, res) => {
 		res.send(await userGroup.save());
 	} catch (err) {
 		console.error(err);
-		return errors.InternalServerError({ message: err.toString()});
+		return new errors.InternalServerError(err.toString());
 	}
 };
 
@@ -83,7 +83,7 @@ const actionGet = async (req, res) => {
 	var user_id = req.params.user_id;
 	if (!user_id) {
 		console.error("user_id required");
-		return errors.BadRequestError("user_id required", { message: "user_id is required" });
+		return new errors.BadRequestError("user_id required");
 	}
 	try {
 		let userGroup = await Groups.findOne({ user_id });
@@ -94,7 +94,7 @@ const actionGet = async (req, res) => {
 		res.send(userGroup);
 	} catch (err) {
 		console.error(err);
-		return errors.InternalServerError({ message: err.toString()});
+		return new errors.InternalServerError(err.toString());
 	}
 };
 
@@ -102,16 +102,16 @@ const actionDelete = async (req, res) => {
 	const user_id = req.params.user_id;
 	const group = req.query.group;
 	if (!group) {
-		return errors.BadRequestError("Group required");
+		return new errors.BadRequestError("Group required");
 	}
 	if (!user_id) {
 		console.error("user_id required");
-		return errors.BadRequestError("user_id required", { message: "user_id is required" });
+		return new errors.BadRequestError("user_id required");
 	}
 	try {
 		let userGroup = await Groups.findOne({ user_id });
 		if (!userGroup) {
-			return errors.BadRequestError("User not found");
+			return new errors.BadRequestError("User not found");
 		}
 		let i = userGroup.groups.indexOf(group);
 		if (i > -1) {
@@ -120,7 +120,7 @@ const actionDelete = async (req, res) => {
 		res.send(await userGroup.save());
 	} catch (err) {
 		console.error(err);
-		return errors.InternalServerError({ message: err.toString() });
+		return new errors.InternalServerError(err.toString());
 	}
 };
 

package/libs/jxp.js

@@ -13,6 +13,9 @@ const morgan = require("morgan");
 const ws = require("./ws");
 const modeldir = require("./modeldir");
 const query_manipulation = require("./query_manipulation");
+const corsMiddleware = require('restify-cors-middleware2');
+const json2csv = require('json2csv').parse;
+global.JXPSchema = require("./schema");
 
 var models = {};
 
@@ -30,7 +33,7 @@ const middlewareModel = (req, res, next) => {
 		return next();
 	} catch (err) {
 		console.error(new Date, err);
-		throw new errors.NotFoundError("Not Found", { message: `Model ${modelname} not found` });
+		throw new errors.NotFoundError(`Model ${modelname} not found`);
 	}
 };
 
@@ -56,16 +59,15 @@ const outputJSON = (req, res, next) => {
 		next();
 	} catch (err) {
 		console.error(new Date(), err);
-		throw new errors.InternalServerError("Error generating output", { message: err.toString() });
+		throw new errors.InternalServerError(err.toString());
 	}
 }
 
 // Outputs whatever is in res.result as CSV
 const outputCSV = (req, res, next) => {
-	const json2csv = require('json2csv').parse;
 	const opts = { "flatten": true };
 	if (!res.result.data) {
-		throw new errors.InternalServerError("Error generating output", { message: "Not CSVable data" });
+		throw new errors.InternalServerError("Error generating CSV");
 	}
 	try {
 		const data = res.result.data.map(row => row._doc);
@@ -81,7 +83,7 @@ const outputCSV = (req, res, next) => {
 		next();
 	} catch (err) {
 		console.error(err);
-		throw new errors.InternalServerError("Internal Error", { message: err.toString() });
+		throw new errors.InternalServerError(err.toString());
 	}
 }
 
@@ -101,7 +103,7 @@ const actionGet = async (req, res) => {
 		filters = parseFilter(req.query.filter);
 	} catch (err) {
 		console.trace(new Date(), err);
-		throw new errors.InternalServerError("Internal Error", { message: err.toString() });
+		throw new errors.InternalServerError(err.toString());
 	}
 	let search = parseSearch(req.query.search);
 	for (let i in search) {
@@ -191,7 +193,7 @@ const actionGet = async (req, res) => {
 		console.error(new Date(), err);
 		if (debug) console.timeEnd(opname);
 		if (err.code) throw err;
-		throw new errors.InternalServerError("Internal Error", { message: err.toString() });
+		throw new errors.InternalServerError(err.toString());
 	}
 };
 
@@ -206,7 +208,7 @@ const actionGetOne = async (req, res) => {
 		console.error(new Date(), err);
 		if (debug) console.timeEnd(opname);
 		if (err.code) throw err;
-		throw new errors.InternalServerError("Internal Error", { message: err.toString() });
+		throw new errors.InternalServerError(err.toString());
 	}
 };
 
@@ -236,7 +238,8 @@ const actionPost = async (req, res) => {
 	} catch (err) {
 		console.error(new Date(), err);
 		if (debug) console.timeEnd(opname);
-		throw new errors.InternalServerError("Internal Error", { message: err.toString() });
+		if (err.code) throw err;
+		throw new errors.InternalServerError(err.toString());
 	}
 };
 
@@ -247,7 +250,7 @@ const actionPut = async (req, res) => {
 		let item = await req.Model.findById(req.params.item_id);
 		if (!item) {
 			console.error(new Date(), "Document not found");
-			throw new errors.NotFoundError("Not Found", { message: "Document not found" });
+			throw new errors.NotFoundError(`Document ${req.params.item_id} not found on ${req.modelname}`);
 		}
 		_populateItem(item, datamunging.deserialize(req.body));
 		_versionItem(item);
@@ -271,7 +274,8 @@ const actionPut = async (req, res) => {
 	} catch (err) {
 		console.error(new Date(), err);
 		if (debug) console.timeEnd(opname);
-		throw new errors.InternalServerError("Internal Error", { message: err.toString() });
+		if (err.code) throw err;
+		throw new errors.InternalServerError(err.toString());
 	}
 };
 
@@ -289,14 +293,15 @@ const actionUpdate = async (req, res) => {
 		}
 		res.json({
 			status: "ok",
-			message: req.modelname + " updateed",
+			message: req.modelname + " updated",
 			data
 		});
 		if (debug) console.timeEnd(opname);
 	} catch (err) {
 		console.error(new Date(), err);
 		if (debug) console.timeEnd(opname);
-		throw new errors.InternalServerError("Internal Error", { message: err.toString() });
+		if (err.code) throw err;
+		throw new errors.InternalServerError(err.toString());
 	}
 };
 
@@ -309,8 +314,7 @@ const actionDelete = async (req, res) => {
 	try {
 		let item = await req.Model.findById(req.params.item_id);
 		if (!item) {
-			console.error(new Date(), "Couldn't find item for delete");
-			throw new errors.NotFoundError("Not Found", { message: "Couldn't find item for delete" });
+			throw new errors.NotFoundError(`Couldn't find item ${req.params.item_id} for delete on ${req.modelname}`);
 		}
 		// Get linked models
 		const linked_models = [];
@@ -339,7 +343,7 @@ const actionDelete = async (req, res) => {
 						await models[linked_model.modelname].updateMany(q, { _deleted: true });
 					}
 				} else {
-					throw new errors.ConflictError("Conflict Error", { message: `Parent link item exists in ${linked_model.modelname}/${linked_model.field}` });
+					throw new errors.ConflictError(`Parent link item exists in ${linked_model.modelname}/${linked_model.field}`);
 				}
 			}
 		}
@@ -373,7 +377,7 @@ const actionDelete = async (req, res) => {
 		console.error(new Date(), err);
 		if (debug) console.timeEnd(opname);
 		if (err.code) throw err;
-		throw new errors.InternalServerError("Internal Error", { message: err.toString() });
+		throw new errors.InternalServerError(err.toString());
 	}
 };
 
@@ -392,7 +396,7 @@ const actionCount = async (req, res) => {
 		filters = parseFilter(req.query.filter);
 	} catch (err) {
 		console.trace(new Date(), err);
-		throw new errors.InternalServerError("Internal Error", { message: err.toString() });
+		throw new errors.InternalServerError(err.toString());
 	}
 	let search = parseSearch(req.query.search);
 	for (let i in search) {
@@ -409,7 +413,7 @@ const actionCount = async (req, res) => {
 		console.error(new Date(), err);
 		if (debug) console.timeEnd(opname);
 		if (err.code) throw err;
-		throw new errors.InternalServerError("Internal Error", { message: err.toString() });
+		throw new errors.InternalServerError(err.toString());
 	}
 };
 
@@ -423,7 +427,7 @@ const actionCall = async (req, res) => {
 	} catch(err) {
 		console.error(new Date(), err);
 		if (err.code) throw err;
-		throw new errors.InternalServerError("Internal Error", { message: err.toString() });
+		throw new errors.InternalServerError(err.toString());
 	}
 };
 
@@ -431,7 +435,7 @@ const actionCallItem = async (req, res) => {
 	try {
 		const item = req.Model.findById(req.params.item_id);
 		if (!item) {
-			throw new errors.NotFoundError("Not Found", { message: "Couldn't find item for call" });
+			throw new errors.NotFoundError(`Couldn't find item ${req.params.item_id} on ${req.modelname} for call`);
 		}
 		req.params.__user = res.user || null;
 		const result = await req.Model[req.params.method_name](item);
@@ -439,15 +443,14 @@ const actionCallItem = async (req, res) => {
 	} catch(err) {
 		console.trace(err);
 		if (err.code) throw err;
-		throw new errors.InternalServerError("Internal Error", { message: err.toString() });
+		throw new errors.InternalServerError(err.toString());
 	}
 };
 
 // Actions (verbs)
 const actionQuery = async (req, res) => {
 	if (!req.body || !req.body.query || typeof req.body.query !== "object") {
-		console.error("query missing or not of type object")
-		throw new errors.InternalServerError("Query missing", { message: "query missing or not of type object" });
+		throw new errors.BadRequestError("Query missing or not of type object");
 	}
 	const opname = `query ${req.modelname} ${ops++}`;
 	console.time(opname);
@@ -517,7 +520,7 @@ const actionQuery = async (req, res) => {
 		console.error(new Date(), err);
 		if (debug) console.timeEnd(opname);
 		if (err.code) throw err;
-		throw new errors.InternalServerError("Internal Error", { message: err.toString() });
+		throw new errors.InternalServerError(err.toString());
 	}
 };
 
@@ -526,7 +529,7 @@ const actionAggregate = async (req, res) => {
 	let query = (req.body.query) ? req.body.query : req.body; // Don't require to embed in query anymore
 	if (!query || !Array.isArray(query)) {
 		console.error("query missing or not of type array")
-		throw new errors.InternalServerError("Query missing", { message: "query missing or not of type array" });
+		throw new errors.BadRequestError("Query missing or not of type array");
 	}
 	query = query_manipulation.fix_query(query);
 	const opname = `aggregate ${req.modelname} ${ops++}`;
@@ -544,7 +547,7 @@ const actionAggregate = async (req, res) => {
 	} catch (err) {
 		console.error(new Date(), err);
 		if (debug) console.timeEnd(opname);
-		throw new errors.InternalServerError("Internal Error", { message: err.toString() });
+		throw new errors.InternalServerError(err.toString());
 	}
 };
 
@@ -552,7 +555,7 @@ const actionAggregate = async (req, res) => {
 const actionBulkWrite = async (req, res) => {
 	if (!req.body || !Array.isArray(req.body)) {
 		console.error("query missing or not of type array")
-		throw new errors.InternalServerError("Query Missing", { message: "query missing or not of type array" });
+		throw new errors.BadRequestError("Query missing or not of type array");
 	}
 	const opname = `bulkwrite ${req.modelname} ${ops++}`;
 	console.time(opname);
@@ -567,7 +570,7 @@ const actionBulkWrite = async (req, res) => {
 	} catch (err) {
 		console.error(new Date(), err);
 		if (debug) console.timeEnd(opname);
-		throw new errors.InternalServerError("Internal Error", { message: err.toString() });
+		throw new errors.InternalServerError(err.toString());
 	}
 };
 
@@ -628,11 +631,11 @@ const getOne = async (Model, item_id, params, options) => {
 		var item = await query.exec();
 		if (!item) {
 			// console.error("Could not find document");
-			throw new errors.NotFoundError("Could not find document", { message: "Could not find document" });
+			throw new errors.NotFoundError(`Could not find document ${item_id} on ${Model.modelName}`);
 		}
 		if (item._deleted && !params.showDeleted) {
 			// console.error("Document is deleted");
-			throw new errors.NotFoundError("Document is deleted", { message: "Document is deleted" });
+			throw new errors.NotFoundError(`Document ${item_id} is deleted on ${Model.modelName}`);
 		}
 		item = item.toObject();
 		//Don't ever return passwords
@@ -641,7 +644,7 @@ const getOne = async (Model, item_id, params, options) => {
 	} catch(err) {
 		console.error(err);
 		if (err.code) throw err;
-		throw new errors.InternalServerError("Internal Error", { message: err.toString() });
+		throw new errors.InternalServerError(err.toString());
 	}
 };
 
@@ -762,8 +765,6 @@ const changeUrlParams = (req, key, val) => {
 	return req.config.url + req.path() + "?" + querystring.stringify(q);
 };
 
-global.JXPSchema = require("./schema");
-
 const JXP = function(options) {
 	const server = restify.createServer();
 	const model_dir = options.model_dir || modeldir.findModelDir(path.dirname(process.argv[1]));
@@ -872,8 +873,6 @@ const JXP = function(options) {
 	server.use(morgan("combined", { stream: accessLogStream }));
 
 	// CORS
-	const corsMiddleware = require('restify-cors-middleware');
-
 	const cors = corsMiddleware({
 		preflightMaxAge: 5, //Optional
 		origins: ['*'],
@@ -894,6 +893,12 @@ const JXP = function(options) {
 		next();
 	});
 
+	// Set req.username = "anonymous" if not logged in
+	server.use((req, res, next) => {
+		if (!req.username) req.username = "anonymous";
+		next();
+	});
+
 	// Define our endpoints
 
 	/* Our API endpoints */

package/libs/login.js

@@ -29,11 +29,11 @@ const recover = async (req, res) => {
 		const email = req.body.email;
 		if (!email) {
 			console.error("Missing email parameter");
-			throw new errors.BadRequestError("Bad Request", { status: "fail", message: "Missing email parameter" });
+			throw new errors.BadRequestError("Missing email parameter");
 		}
 		const user = await User.findOne({ email });
 		if (!user) {
-			throw new errors.NotFoundError("User Not Found", { status: "fail", message: "User not found" });
+			throw new errors.NotFoundError(`User with email ${email} Not Found`);
 		}
 		const result = await security.generateApiKey(user._id);
 		const token = jwt.sign({ apikey: result.apikey, email: user.email, id: user._id }, req.config.shared_secret, { expiresIn: "2d" });
@@ -56,26 +56,26 @@ const recover = async (req, res) => {
 		res.send({ status: "ok", message: "Sent recovery email" });
 	} catch (err) {
 		if (err.code) throw err;
-		throw new errors.UnauthorizedError("Unauthorized", { status: "fail", message: "Unauthorized", info: err });
+		throw new errors.UnauthorizedError(err.toString());
 	}
 }
 
 const logout = async (req, res) => {
 	try {
-		if (!res.user) throw new errors.ForbiddenError("Forbidden", { message: "You don't seem to be logged in" });
+		if (!res.user) throw new errors.ForbiddenError("You don't seem to be logged in");
 		await security.revokeToken(res.user._id);
 		res.send({ status: "ok", message: "User logged out" });
 	} catch(err) {
 		console.error(err);
 		if (err.code) throw err;
-		throw new errors.InternalServerError("Server Error", { status: "error", message: err.toString() });
+		throw new errors.InternalServerError(err.toString());
 	}
 }
 
 const oauth = (req, res, next) => { // Log in through an OAuth2 provider, defined in config.js
 	const provider_config = req.config.oauth[req.params.provider];
 	if (!provider_config) {
-		throw new errors.InternalServerError("Internal Server Error", { message: req.params.provider + " config not defined" });
+		throw new errors.InternalServerError(`oAuth ${req.params.provider} config not defined`);
 	}
 	const state = Math.random().toString(36).substring(7);
 	const uri = `${provider_config.auth_uri}?client_id=${provider_config.app_id}&redirect_uri=${req.config.url}/login/oauth/callback/${req.params.provider}&scope=${provider_config.scope}&state=${state}&response_type=code`;
@@ -148,7 +148,7 @@ const login = async (req, res) => {
 	}
 	if ((!password) || (!email)) {
 		console.error(new Date(), "Missing email or password parameters");
-		return errors.ForbiddenError({ status: "fail", message: "Missing email or password parameters" });
+		return new errors.ForbiddenError("Missing email or password parameters");
 	}
 	try {
 		const user = await User.findOne({ email });
@@ -171,23 +171,23 @@ const login = async (req, res) => {
 	} catch (err) {
 		console.error(new Date(), `Authentication failed`, ip, err);
 		if (err.code) throw err;
-		return errors.ForbiddenError({ status: "fail", message: "Authentication failed" });
+		return new errors.ForbiddenError(err.toString());
 	}
 }
 
 const getJWT = async (req, res) => {
 	var user = null;
 	if (!res.user.admin) {
-		throw new errors.UnauthorizedError("Unauthorized", { status: "fail", message: "Unauthorized" });
+		throw new errors.UnauthorizedError("Unauthorized");
 	}
 	var email = req.params.email || req.body.email;
 	if (!email) {
-		throw new errors.BadRequestError("Bad Request", { status: "fail", message: "Email required" });
+		throw new errors.BadRequestError("Email required");
 	}
 	try {
 		const result = await User.findOne({ email: email });
 		if (!result || !result._id) {
-			throw new errors.NotFoundError("Not Found", { status: "fail", message: "User not found" });
+			throw new errors.NotFoundError("User not found");
 		}
 		user = result;
 		try {
@@ -197,11 +197,11 @@ const getJWT = async (req, res) => {
 			});
 			res.send({ email: user.email, token: token });
 		} catch (err) {
-			throw new errors.UnauthorizedError("Unauthorized", { status: "fail", message: "Unauthorized" });
+			throw new errors.UnauthorizedError("Unauthorized");
 		}
 	} catch (err) {
 		if (err.code) throw err;
-		throw new errors.InternalServerError("Internal Server Error", { status: "error", message: err.toString() });
+		throw new errors.InternalServerError(err.toString());
 	}
 }
 

package/libs/security.js

@@ -229,7 +229,7 @@ const refresh = async (req, res) => {
 	} catch (err) {
 		console.error(err);
 		if (err.code) throw err;
-		throw new errors.ForbiddenError("Forbidden", { message: err.toString() });
+		throw new errors.ForbiddenError(err.toString());
 	}
 }
 
@@ -245,7 +245,7 @@ const login = async (req, res) => {
 	} catch(err) {
 		console.error(err);
 		if (err.code) throw err;
-		throw new errors.ForbiddenError("Forbidden", { message: err.toString() });
+		throw new errors.ForbiddenError(err.toString());
 	}
 };
 
@@ -275,6 +275,7 @@ const authenticate = async req => {
 		token: await ensureToken(user._id),
 		refresh_token: await ensureRefreshToken(user._id),
 		groups: await getGroups(user._id),
+		username: user.email,
 		user
 	}
 	
@@ -283,8 +284,8 @@ const authenticate = async req => {
 const auth = async (req, res) => {
 	// Check against model as to whether we're allowed to edit this model
 	if (!req.Model) {
-		console.error("Model missing");
-		throw new errors.InternalServerError("Model missing", { message: "Model missing" });
+		// console.error("Model missing");
+		throw new errors.BadRequestError("Model missing");
 	}
 	try {
 		var method = null;
@@ -298,14 +299,14 @@ const auth = async (req, res) => {
 		} else if (req.method == "DELETE") {
 			method = "d";
 		} else {
-			console.error("Unsupported operation", req.method);
-			throw new errors.InternalServerError("Unsupported operation", { message: "Unsupported operation: " + req.method});
+			// console.error("Unsupported operation", req.method);
+			throw new errors.InternalServerError(`Unsupported operation: ${req.method}`);
 		}
 		return await check_perms(res.user, res.groups, req.Model, method, req.params.item_id);
 	} catch(err) {
 		console.error(err);
 		if (err.code) throw err;
-		throw new errors.ForbiddenError("Forbidden", { message: err.toString() });
+		throw new errors.ForbiddenError(err.toString());
 	}
 };
 
@@ -319,7 +320,7 @@ const bulkAuth = async (req, res,) => {
 	} catch (err) {
 		console.error(err);
 		if (err.code) throw err;
-		throw new errors.ForbiddenError("Forbidden", { message: err.toString() });
+		throw new errors.ForbiddenError(err.toString());
 	}
 };
 
@@ -329,7 +330,7 @@ const check_perms = async (user, groups, model, method, item_id) => {
 		//If no perms are set, then this isn't an available model
 		if (!perms.admin) {
 			console.error("Model permissions not set correctly - add an admin section");
-			throw new errors.InternalServerError("Model permissions not set correctly - add an admin section", { message: "Model permissions not set correctly - add an admin section" });
+			throw new errors.InternalServerError("Model permissions not set correctly - add an admin section");
 		}
 		//First check if "all" is able to do this. If so, let's get on with it.
 		if (perms.all && perms.all.length) {
@@ -339,7 +340,7 @@ const check_perms = async (user, groups, model, method, item_id) => {
 		}
 		//This isn't an 'all' situation, so let's bail if the user isn't logged in
 		if (!user) {
-			throw new errors.ForbiddenError("User not logged in", { message: "User not logged in" });
+			throw new errors.ForbiddenError("User not logged in");
 		}
 		//Let's check perms in this order - admin, user, group, owner
 		//Admin check
@@ -366,16 +367,16 @@ const check_perms = async (user, groups, model, method, item_id) => {
 		throw ("Authorization failed");
 	} catch (err) {
 		if (err.code) throw err;
-		throw new errors.ForbiddenError("Forbidden", { message: err.toString() });
+		throw new errors.ForbiddenError(err.toString());
 	}
 }
 
 const admin_only = (req, res, next) => { // Chain after login
 	if (!res.user) {
-		throw new errors.ForbiddenError("Unauthorized", { message: "Unauthorized" });
+		throw new errors.ForbiddenError("User not logged in");
 	}
 	if (!res.user.admin) {
-		throw new errors.ForbiddenError("Unauthorized", { message: "Unauthorized" });
+		throw new errors.ForbiddenError("User not admin");
 	}
 	next();
 }

package/libs/setup.js

@@ -14,11 +14,12 @@ const checkUserDoesNotExist = async () => {
 	try {
 		const count = await User.countDocuments();
 		if (count) {
-			throw new errors.ConflictError("Conflict Error", { status: "failed", error: "Cannot setup if user exists" });
+			throw new errors.ConflictError("Cannot setup if user exists");
 		}
 	} catch(err) {
 		console.error(err);
-		throw new errors.InternalServerError("Internal Server Error", { status: "error", error: err.message });
+		if (err.code) throw err;
+		throw new errors.InternalServerError(err.toString());
 	}
 };
 
@@ -47,7 +48,7 @@ const setup = async (req, res) => {
 		});
 	} catch(err) {
 		console.error(err);
-		throw new errors.InternalServerError("Internal Server Error", { status: "error", error: err.message });
+		throw new errors.InternalServerError(err.toString());
 	}
 };
 
@@ -77,7 +78,7 @@ const data_setup = async (req, res) => {
 		res.send({ status: "success", results });
 	} catch(err) {
 		console.error(err);
-		throw new errors.InternalServerError("Internal Server Error", { status: "error", error: err.message });
+		throw new errors.InternalServerError(err.toString());
 	}
 }
 

package/models/test_model.js

@@ -1,4 +1,5 @@
 /* global JXPSchema ObjectId Mixed */
+const errors = require("restify-errors");
 
 const TestSchema = new JXPSchema({
     foo: String, // A normal string
@@ -33,6 +34,14 @@ TestSchema.statics.test = function() {
     return "Testing OKAY!";
 };
 
+TestSchema.pre("save", function(next) {
+    // If we have the setting "error" set to true, we will throw an error
+    if (this.bar == "Throw an error") {
+        throw new errors.ImATeapotError("I'm a teapot");
+    }
+    next();
+});
+
 // Finally, we export our model. Make sure to change the name!
 const Test = JXPSchema.model('Test', TestSchema);
 module.exports = Test;

package/package.json

@@ -1,15 +1,17 @@
 {
   "name": "jxp",
   "description:": "An opinionated RESTful API library based on Mongoose and Restify. Make an API by just writing Mongoose models.",
-  "version": "2.12.1",
+  "version": "2.12.3",
   "private": false,
   "main": "libs/jxp.js",
   "scripts": {
     "start": "node bin/server.js",
-    "test": "mocha --timeout 10000 -b --exit",
-    "wstest": "mocha test/wstest"
+    "test": "mocha --timeout 1000 -b --exit",
+    "wstest": "mocha test/wstest",
+    "setup": "node bin/setup.js"
   },
   "bin": {
+    "jxp": "bin/setup.js",
     "jxp-setup": "bin/setup.js",
     "jxp-add-admin": "bin/init_db.js"
   },
@@ -27,40 +29,41 @@
     "url": "https://github.com/j-norwood-young/jexpress-2/issues"
   },
   "dependencies": {
-    "axios": "^1.2.0",
+    "axios": "^1.2.3",
     "bcryptjs": "^2.4.3",
-    "commander": "^9.4.1",
-    "config": "^3.3.8",
+    "commander": "^10.0.0",
+    "config": "^3.3.9",
     "dotenv": "^16.0.3",
-    "glob": "8.0.3",
+    "glob": "8.1.0",
     "js-yaml": "4.1.0",
     "json2csv": "^5.0.7",
-    "jsonwebtoken": "^8.5.1",
+    "jsonwebtoken": "^9.0.0",
     "jstransformer-markdown-it": "^3.0.0",
     "jxp-helper": "^1.4.0",
-    "mkdirp": "^1.0.4",
-    "mongoose": "6.7.5",
+    "mkdirp": "^2.1.3",
+    "moment": "^2.29.4",
+    "mongoose": "6.8.4",
     "mongoose-friendly": "^0.1.4",
     "morgan": "^1.10.0",
-    "nodemailer": "^6.8.0",
+    "nodemailer": "^6.9.0",
     "nodemailer-smtp-transport": "^2.7.4",
     "path": "^0.12.7",
     "pug": "^3.0.2",
     "querystring": "^0.2.1",
     "rand-token": "^1.0.1",
     "readline-sync": "^1.4.10",
-    "restify": "^10.0.0",
-    "restify-cors-middleware": "^1.1.1",
+    "restify": "^11.0.0",
+    "restify-cors-middleware2": "^2.2.0",
     "restify-errors": "^8.0.2",
     "traverse": "^0.6.7",
     "underscore": "^1.13.6",
-    "ws": "^8.11.0"
+    "ws": "^8.12.0"
   },
   "devDependencies": {
     "chai": "^4.3.7",
     "chai-http": "^4.3.0",
-    "mocha": "^10.1.0",
-    "should": "^13.2.3",
-    "moment": "^2.29.4"
+    "mocha": "^10.2.0",
+    "moment": "^2.29.4",
+    "should": "^13.2.3"
   }
 }

package/test/test.js

@@ -15,11 +15,17 @@ var server = require("../bin/server");
 
 chai.use(chaiHttp);
 
+const pause = ms => new Promise(res => setTimeout(res, ms));
+
 describe('Test', () => {
 	before(async function() {
 		await init.init();
     })
 
+	beforeEach(async function() {
+		await pause(0);
+	})
+
 
 	var apikey = null;
 	var token = null;
@@ -438,7 +444,7 @@ describe('Test', () => {
 			.get(`/api/test/${post_id}?populate=link`)
 			.auth(init.email, init.password)
 			.end((err, res) => {
-				// console.log(res.body);
+				console.log(res.body);
 				res.should.have.status(200);
 				res.body.should.have.property("data");
 				res.body.data.should.have.property("link")
@@ -870,7 +876,7 @@ describe('Test', () => {
 				.del(`/api/test/${post_id}`)
 				.auth(init.email, init.password)
 				.end((err, res) => {
-					console.log(res.body);
+					// console.log(res.body);
 					res.should.have.status(200);
 					res.body.status.should.equal('ok');
 					done();
@@ -881,9 +887,9 @@ describe('Test', () => {
 				.get(`/api/test/${post_id}`)
 				.auth(init.email, init.password)
 				.end((err, res) => {
-					console.log(res.body);
+					// console.log(res.body);
 					res.should.have.status(404);
-					res.body.message.should.equal('Document is deleted');
+					res.body.message.should.equal(`Document ${post_id} is deleted on Test`);
 					res.body.code.should.equal('NotFound');
 					done();
 				});
@@ -986,7 +992,8 @@ describe('Test', () => {
 				.auth(init.email, init.password)
 				.end((err, res) => {
 					res.should.have.status(409);
-					res.body.message.should.equal(`Conflict Error`);
+					// console.log(res.body.message);
+					res.body.message.should.equal(`Parent link item exists in test/link_id`);
 					done();
 				});
 		});
@@ -1007,7 +1014,7 @@ describe('Test', () => {
 				.auth(init.email, init.password)
 				.end((err, res) => {
 					res.should.have.status(404);
-					res.body.message.should.equal('Document is deleted');
+					res.body.message.should.equal(`Document ${test_with_links_id} is deleted on Test`);
 					done();
 				});
 		});
@@ -1063,7 +1070,7 @@ describe('Test', () => {
 				.auth(init.email, init.password)
 				.end((err, res) => {
 					res.should.have.status(409);
-					res.body.message.should.equal(`Conflict Error`);
+					res.body.message.should.equal(`Parent link item exists in test/link_id`);
 					done();
 				});
 		});
@@ -1115,4 +1122,23 @@ describe('Test', () => {
 			});
 		});
 	});
+
+	describe("Error Handling", () => {
+		it ("should get an error", (done) => {
+			chai.request(server)
+			.post("/api/test")
+			.auth(init.email, init.password)
+			.send({
+				error: true,
+				bar: "Throw an error"
+			})
+			.end((err, res) => {
+				// console.log(res.body);
+				console.log(res.headers);
+				res.should.have.status(418);
+				res.body.message.should.equal(`I'm a teapot`);
+				done();
+			});
+		})
+	});
 });