jxp 2.11.0 → 2.11.2

package/libs/docs.js

@@ -46,29 +46,32 @@ class Docs {
         }
     }
 
-    metaModel(req, res) {
+    metaModel(req, res, next) {
         try {
             if (!req.Model) {
                 return res.send(404, { status: "error", error: "Model not found" })
             }
             res.send(req.Model.schema.paths);
+            next();
         } catch (err) {
             console.error(err);
             return res.send(500, { status: "error", error: err, message: err.toString() });
         }
     }
 
-    dbDiagram(req, res) {
+    dbDiagram(req, res, next) {
         try {
             res.send(this.models);
+            next();
         } catch(err) {
             res.send(500, { status: "error", error: err, message: err.toString() });
         }
     }
 
-    frontPage(req, res) {
+    frontPage(req, res, next) {
         try {
             this.renderTemplate(res, "index", {});
+            next();
         } catch(err) {
             res.send(500, { status: "error", error: err, message: err.toString() });
         }
@@ -84,7 +87,7 @@ class Docs {
         }
     }
 
-    model(req, res) {
+    model(req, res, next) {
         try {
             const model = this.models[req.params.modelname];
             console.dir(model.schema.opts);
@@ -92,6 +95,7 @@ class Docs {
             fields.sort();
             const perms = model.schema.opts.perms;
             this.renderTemplate(res, "model", { model, fields, perms });
+            next();
         } catch(err) {
             res.send(500, { status: "error", error: err, message: err.toString() });
         }

package/libs/jxp.js

@@ -49,12 +49,13 @@ const middlewareCheckAdmin = (req, res, next) => {
 };
 
 // Outputs whatever is in res.result as JSON
-const outputJSON = (req, res) => {
+const outputJSON = (req, res, next) => {
 	res.send(res.result);
+	next();
 }
 
 // Outputs whatever is in res.result as CSV
-const outputCSV = (req, res) => {
+const outputCSV = (req, res, next) => {
 	const json2csv = require('json2csv').parse;
 	const opts = { "flatten": true };
 	if (!res.result.data) {
@@ -71,6 +72,7 @@ const outputCSV = (req, res) => {
 		});
 		const csv = json2csv(data, opts);
 		res.end(csv);
+		next();
 	} catch (err) {
 		console.error(err);
 		res.send(500, { status: "error", error: err, message: err.toString() });
@@ -78,16 +80,9 @@ const outputCSV = (req, res) => {
 }
 
 // Actions (verbs)
-const actionGet = async (req, res, next) => {
+const actionGet = async (req, res) => {
 	const opname = `get ${req.modelname} ${ops++}`;
 	console.time(opname);
-	try {
-		if (res.user) {
-			req.Model.__user = res.user;
-		}
-	} catch(err) {
-		console.error(err);
-	}
 	const parseSearch = function(search) {
 		let result = {};
 		for (let i in search) {
@@ -122,6 +117,9 @@ const actionGet = async (req, res, next) => {
 		countquery = Object.assign({ $text: { $search: req.query.search }}, countquery);
 		qcount = req.Model.find({ $text: { $search: req.query.search }});
 	}
+	if (res.user) {
+		q.options({ user: res.user });
+	}
 	try {
 		let count = await req.Model.estimatedDocumentCount();
 		if (count < 100000 && Object.keys(countquery).length !== 0) {
@@ -184,7 +182,6 @@ const actionGet = async (req, res, next) => {
 		result.data = await q.exec();
 		res.result = result;
 		if (debug) console.timeEnd(opname);
-		next();
 	} catch(err) {
 		console.error(new Date(), err);
 		if (debug) console.timeEnd(opname);
@@ -196,10 +193,7 @@ const actionGetOne = async (req, res) => {
 	const opname = `getOne ${req.modelname}/${req.params.item_id} ${ops++}`;
 	console.time(opname);
 	try {
-		if (res.user) {
-			req.Model.__user = res.user;
-		}
-		const data = await getOne(req.Model, req.params.item_id, req.query);
+		const data = await getOne(req.Model, req.params.item_id, req.query, { user: res.user });
 		res.send({ data });
 		if (debug) console.timeEnd(opname);
 	} catch(err) {
@@ -213,7 +207,7 @@ const actionGetOne = async (req, res) => {
 	}
 };
 
-const actionPost = async (req, res, next) => {
+const actionPost = async (req, res) => {
 	const opname = `post ${req.modelname} ${ops++}`;
 	console.time(opname);
 	try {
@@ -236,7 +230,6 @@ const actionPost = async (req, res, next) => {
 			data: item
 		});
 		if (debug) console.timeEnd(opname);
-		next();
 	} catch (err) {
 		console.error(new Date(), err);
 		if (debug) console.timeEnd(opname);
@@ -244,7 +237,7 @@ const actionPost = async (req, res, next) => {
 	}
 };
 
-const actionPut = async (req, res, next) => {
+const actionPut = async (req, res) => {
 	const opname = `put ${req.modelname}/${req.params.item_id} ${ops++}`;
 	console.time(opname);
 	try {
@@ -273,7 +266,6 @@ const actionPut = async (req, res, next) => {
 			data: data
 		});
 		if (debug) console.timeEnd(opname);
-		next();
 	} catch (err) {
 		console.error(new Date(), err);
 		if (debug) console.timeEnd(opname);
@@ -282,24 +274,10 @@ const actionPut = async (req, res, next) => {
 	}
 };
 
-const actionUpdate = async (req, res, next) => {
+const actionUpdate = async (req, res) => {
 	const opname = `update ${req.modelname}/${req.params.item_id} ${ops++}`;
 	console.time(opname);
 	try {
-		// let item = await req.Model.findById(req.params.item_id);
-		// if (!item) {
-		// 	console.error(new Date(), "Document not found");
-		// 	res.send(404, { status: "error", message: "Document not found" });
-		// 	return;
-		// }
-		// _populateItem(item, datamunging.deserialize(req.body));
-		// _versionItem(item);
-		// if (res.user) {
-		// 	item.__user = res.user;
-		// 	item._updated_by_id = res.user._id;
-		// }
-		// const data = await item.save();
-		console.log({ body: req.body });
 		let body_data =  datamunging.deserialize(req.body);
 		const data = await req.Model.update({ _id: req.params.item_id }, body_data);
 		let silence = req.params._silence;
@@ -314,7 +292,6 @@ const actionUpdate = async (req, res, next) => {
 			data
 		});
 		if (debug) console.timeEnd(opname);
-		next();
 	} catch (err) {
 		console.error(new Date(), err);
 		if (debug) console.timeEnd(opname);
@@ -323,7 +300,7 @@ const actionUpdate = async (req, res, next) => {
 	}
 };
 
-const actionDelete = async (req, res, next) => {
+const actionDelete = async (req, res) => {
 	const permaDelete = req.query._permaDelete;
 	const cascade = req.query._cascade;
 	let silence = req.query._silence || (req.body && req.body._silence);
@@ -394,7 +371,6 @@ const actionDelete = async (req, res, next) => {
 			message: `${req.modelname}/${ req.params.item_id } deleted`
 		});
 		if (debug) console.timeEnd(opname);
-		next();
 	} catch(err) {
 		console.error(new Date(), err);
 		if (debug) console.timeEnd(opname);
@@ -403,7 +379,7 @@ const actionDelete = async (req, res, next) => {
 	}
 };
 
-const actionCount = async (req, res, next) => {
+const actionCount = async (req, res) => {
 	const opname = `count ${req.modelname} ${ops++}`;
 	console.time(opname);
 	const parseSearch = function(search) {
@@ -432,7 +408,6 @@ const actionCount = async (req, res, next) => {
 		const count = await req.Model.countDocuments(filters).exec();
 		res.result = { count };
 		if (debug) console.timeEnd(opname);
-		next();
 	} catch(err) {
 		console.error(new Date(), err);
 		if (debug) console.timeEnd(opname);
@@ -453,29 +428,21 @@ const actionCall = async (req, res) => {
 	}
 };
 
-const actionCallItem = (req, res) => {
-	req.Model.findById(req.params.item_id, function(err, item) {
+const actionCallItem = async (req, res) => {
+	try {
+		const item = req.Model.findById(req.params.item_id);
 		if (!item) {
 			res.send(404, "Document not found for " + req.params.method_name);
 			return;
 		}
-		if (err) {
-			console.trace(err);
-			res.send(500, { status: "error", message: err.toString() });
-			return;
-		}
 		req.params.__user = res.user || null;
-		req.Model[req.params.method_name](item).then(
-			function(item) {
-				// console.log({ action_id: 7, action: "Method called", type: req.modelname, id: item._id, method: req.params.method_name, user: filterLogUser(res.user) });
-				res.json(item);
-			},
-			function(err) {
-				console.trace(err);
-				res.send(500, { status: "error", message: err.toString() });
-			}
-		);
-	});
+		const result = await req.Model[req.params.method_name](item);
+		res.json(result);
+			
+	} catch(err) {
+		console.trace(err);
+		res.send(500, { status: "error", message: err.toString() });
+	}
 };
 
 // Actions (verbs)
@@ -583,7 +550,7 @@ const actionAggregate = async (req, res) => {
 };
 
 // Actions (verbs)
-const actionBulkWrite = async (req, res, next) => {
+const actionBulkWrite = async (req, res) => {
 	if (!req.body || !Array.isArray(req.body)) {
 		console.error("query missing or not of type array")
 		return res.send(500, { status: "error", message: "query missing or not of type array" });
@@ -598,7 +565,6 @@ const actionBulkWrite = async (req, res, next) => {
 		res.result = result;
 		if (debug) console.timeEnd(opname);
 		res.json(result);
-		next();
 	} catch (err) {
 		console.error(new Date(), err);
 		if (debug) console.timeEnd(opname);
@@ -640,8 +606,8 @@ const actionBulkWrite = async (req, res, next) => {
 
 // Utitlities
 
-const getOne = async (Model, item_id, params) => {
-	const query = Model.findById(item_id);
+const getOne = async (Model, item_id, params, options) => {
+	const query = Model.findById(item_id, {}, options);
 	if (params.populate) {
 		if ((typeof params.populate === "object")  && !Array.isArray(params.populate)) {
 			for (let i in params.populate) {
@@ -838,8 +804,7 @@ const JXP = function(options) {
 			}
 		},
 		post_hooks: {
-			login: async (req, res, next) => {
-				next();
+			login: async () => {
 			},
 		},
 		cache_timeout: "5 minutes",

package/libs/login.js

@@ -83,7 +83,7 @@ const oauth = (req, res, next) => { // Log in through an OAuth2 provider, define
 	res.redirect(uri, next);
 }
 
-const oauth_callback = async (req, res, next) => {
+const oauth_callback = async (req, res) => {
 	const provider = req.params.provider;
 	const provider_config = req.config.oauth[provider];
 	const code = req.query.code;
@@ -126,19 +126,19 @@ const oauth_callback = async (req, res, next) => {
 		var jwt_token = jwt.sign({ apikey: apikey.apikey, user: user }, req.config.shared_secret, {
 			expiresIn: "1m"
 		});
-		res.redirect(`${req.config.oauth.success_uri}?token=${jwt_token}`, next);
+		res.redirect(`${req.config.oauth.success_uri}?token=${jwt_token}`);
 	} catch (err) {
 		console.error(err);
 		if (typeof err === 'string' || err instanceof String) {
-			res.redirect(`${req.config.oauth.fail_uri}?error=${err}&provider=${provider}`, next);
+			res.redirect(`${req.config.oauth.fail_uri}?error=${err}&provider=${provider}`);
 		} else {
-			res.redirect(`${req.config.oauth.fail_uri}?error=unknown&provider=${provider}`, next);
+			res.redirect(`${req.config.oauth.fail_uri}?error=unknown&provider=${provider}`);
 		}
 		return;
 	}
 }
 
-const login = async (req, res, next) => {
+const login = async (req, res) => {
 	const ip = req.headers['x-forwarded-for'] || req.connection.remoteAddress;
 	let email = req.params.email || req.body.email;
 	let password = req.params.password || req.body.password;
@@ -170,7 +170,6 @@ const login = async (req, res, next) => {
 			refresh_token_expires: security.tokenExpires(refreshtoken),
 			provider: token.provider,
 		});
-		next();
 	} catch (err) {
 		res.send(401, { status: "fail", message: "Authentication failed", err });
 		console.error(new Date(), `Authentication failed`, ip, err);
@@ -178,7 +177,7 @@ const login = async (req, res, next) => {
 	}
 }
 
-const getJWT = (req, res) => {
+const getJWT = async (req, res) => {
 	var user = null;
 	if (!res.user.admin) {
 		res.send(403, { status: "fail", message: "Unauthorized" });
@@ -189,27 +188,26 @@ const getJWT = (req, res) => {
 		res.send(400, { status: "fail", message: "Email required" });
 		return;
 	}
-	User.findOne({ email: email }, function (err, result) {
-		if (err) {
-			res.send(500, { status: "error", error: err });
-			return;
-		}
+	try {
+		const result = await User.findOne({ email: email });
 		if (!result || !result._id) {
 			res.send(404, { status: "fail", message: "User not found" });
 			return;
 		}
 		user = result;
-		security.generateApiKey(user._id)
-			.then(function (result) {
-				var token = jwt.sign({ apikey: result.apikey, email: user.email, id: user._id }, req.config.shared_secret, {
-					expiresIn: "2d"
-				});
-				res.send({ email: user.email, token: token });
-			}, function () {
-				res.send(403, { status: "fail", message: "Unauthorized" });
+		try {
+			const apikey = await security.generateApiKey(user._id)
+			var token = jwt.sign({ apikey: apikey.apikey, email: user.email, id: user._id }, req.config.shared_secret, {
+				expiresIn: "2d"
 			});
-	});
-	return;
+			res.send({ email: user.email, token: token });
+		} catch (err) {
+			res.send(403, { status: "fail", message: "Unauthorized" });
+			return;
+		}
+	} catch (err) {
+		res.send(500, { status: "error", error: err });
+	}
 }
 
 const Login = {

package/libs/security.js

@@ -204,7 +204,7 @@ const revokeRefreshToken = async user_id => {
 	return true;
 }
 
-const refresh = async (req, res, next) => {
+const refresh = async (req, res) => {
 	try {
 		if(req.headers.authorization && req.headers.authorization.trim().toLowerCase().indexOf("bearer") === 0) {
 			const refresh_token = await RefreshToken.findOne({ refresh_token: bearerAuthData(req) }).exec();
@@ -221,27 +221,24 @@ const refresh = async (req, res, next) => {
 				refresh_token: new_refresh_token.refresh_token,
 				refresh_token_expires: tokenExpires(new_refresh_token)
 			});
-			next();
 		} else {
 			throw("Missing refresh token")
 		}
-		next();
 	} catch (err) {
 		console.error(err);
 		return fail(res, 403, err);
 	}
 }
 
-const login = async (req, res, next) => {
+const login = async (req, res) => {
 	try {
 		const authenticate_result = await authenticate(req);
 		if (!authenticate_result) {
 			res.user = null;
 			res.groups = [];
-			return next();
+			return;
 		}
 		res = Object.assign(res, authenticate_result);
-		next();
 	} catch(err) {
 		console.error(err);
 		return fail(res, 403, err);
@@ -282,7 +279,7 @@ const authenticate = async req => {
 	}
 }
 
-const auth = async (req, res, next) => {
+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");
@@ -304,7 +301,6 @@ const auth = async (req, res, next) => {
 			return fail(res, 500, "Unsupported operation: " + req.method);
 		}
 		await check_perms(res.user, res.groups, req.Model, method, req.params.item_id);
-		next();
 	} catch(err) {
 		console.error(err);
 		return fail(res, 403, { status: "Unauthorized", error: err });
@@ -312,13 +308,12 @@ const auth = async (req, res, next) => {
 };
 
 // Bulk auth requires all CRUD permissions
-const bulkAuth = async (req, res, next) => {
+const bulkAuth = async (req, res,) => {
 	try {
 		await check_perms(res.user, res.groups, req.Model, "c");
 		await check_perms(res.user, res.groups, req.Model, "r");
 		await check_perms(res.user, res.groups, req.Model, "u");
 		await check_perms(res.user, res.groups, req.Model, "d");
-		next();
 	} catch (err) {
 		console.error(err);
 		return fail(res, 403, { status: "Unauthorized", error: err });

package/libs/setup.js

@@ -9,14 +9,12 @@ const init = config => {
 	User = require(path.join(config.model_dir, "user_model"));
 }
 
-const checkUserDoesNotExist = async (req, res, next) => {
+const checkUserDoesNotExist = async (req, res) => {
 	try {
 		const count = await User.countDocuments();
 		if (count) {
-			const users = await User.find();
 			return res.send(403, { status: "failed", error: "Cannot setup if user exists" });
 		}
-		return next();
 	} catch(err) {
 		console.error(err);
 		res.send(500, { status: "error", error: err.message });

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "jxp",
   "description:": "An opinionated RESTful API library based on Mongoose and Restify. Make an API by just writing Mongoose models.",
-  "version": "2.11.0",
+  "version": "2.11.2",
   "private": false,
   "main": "libs/jxp.js",
   "scripts": {
@@ -59,6 +59,7 @@
     "chai": "^4.3.7",
     "chai-http": "^4.3.0",
     "mocha": "^10.1.0",
-    "should": "^13.2.3"
+    "should": "^13.2.3",
+    "moment": "^2.29.4"
   }
 }