Fix proxy hosts routes throwing errors

Author: jc21

backend/internal/proxy-host.js

@@ -420,41 +420,38 @@ const internalProxyHost = {
 	 * @param   {String}  [search_query]
 	 * @returns {Promise}
 	 */
-	getAll: (access, expand, search_query) => {
-		return access
-			.can("proxy_hosts:list")
-			.then((access_data) => {
-				const query = proxyHostModel
-					.query()
-					.where("is_deleted", 0)
-					.groupBy("id")
-					.allowGraph("[owner,access_list,certificate]")
-					.orderBy(castJsonIfNeed("domain_names"), "ASC");
+	getAll: async (access, expand, searchQuery) => {
+		const accessData = await access.can("proxy_hosts:list");
+
+		const query = proxyHostModel
+			.query()
+			.where("is_deleted", 0)
+			.groupBy("id")
+			.allowGraph("[owner,access_list,certificate]")
+			.orderBy(castJsonIfNeed("domain_names"), "ASC");
+
+		if (accessData.permission_visibility !== "all") {
+			query.andWhere("owner_user_id", access.token.getUserId(1));
+		}
 
-				if (access_data.permission_visibility !== "all") {
-					query.andWhere("owner_user_id", access.token.getUserId(1));
-				}
+		// Query is used for searching
+		if (typeof searchQuery === "string" && searchQuery.length > 0) {
+			query.where(function () {
+				this.where(castJsonIfNeed("domain_names"), "like", `%${searchQuery}%`);
+			});
+		}
 
-				// Query is used for searching
-				if (typeof search_query === "string" && search_query.length > 0) {
-					query.where(function () {
-						this.where(castJsonIfNeed("domain_names"), "like", `%${search_query}%`);
-					});
-				}
+		if (typeof expand !== "undefined" && expand !== null) {
+			query.withGraphFetched(`[${expand.join(", ")}]`);
+		}
 
-				if (typeof expand !== "undefined" && expand !== null) {
-					query.withGraphFetched(`[${expand.join(", ")}]`);
-				}
+		const rows = await query.then(utils.omitRows(omissions()));
 
-				return query.then(utils.omitRows(omissions()));
-			})
-			.then((rows) => {
-				if (typeof expand !== "undefined" && expand !== null && expand.indexOf("certificate") !== -1) {
-					return internalHost.cleanAllRowsCertificateMeta(rows);
-				}
+		if (typeof expand !== "undefined" && expand !== null && expand.indexOf("certificate") !== -1) {
+			return internalHost.cleanAllRowsCertificateMeta(rows);
+		}
 
-				return rows;
-			});
+		return rows;
 	},
 
 	/**

backend/lib/access.js

@@ -107,7 +107,6 @@ export default function (tokenString) {
 			}
 
 			const tokenUserId = tokenData.attrs.id ? tokenData.attrs.id : 0;
-			let query;
 
 			if (typeof objectCache[objectType] !== "undefined") {
 				objects = objectCache[objectType];
@@ -120,12 +119,16 @@ export default function (tokenString) {
 
 					// Proxy Hosts
 					case "proxy_hosts": {
-						query = proxyHostModel.query().select("id").andWhere("is_deleted", 0);
+						const query = proxyHostModel
+							.query()
+							.select("id")
+							.andWhere("is_deleted", 0);
+
 						if (permissions.visibility === "user") {
 							query.andWhere("owner_user_id", tokenUserId);
 						}
 
-						const rows = await query();
+						const rows = await query;
 						objects = [];
 						_.forEach(rows, (ruleRow) => {
 							result.push(ruleRow.id);
@@ -141,7 +144,6 @@ export default function (tokenString) {
 				objectCache[objectType] = objects;
 			}
 		}
-
 		return objects;
 	};
 

backend/nodemon.json

@@ -3,5 +3,5 @@
   "ignore": [
     "data"
   ],
-  "ext": "js json ejs"
+  "ext": "js json ejs cjs"
 }