Merge branch 'develop' into fix/safe-data-access

This commit is contained in:
Alexander Holliday authored and GitHub committed 2024-08-19 19:06:30 -07:00
commit 4754a056fe
29 files changed
+648 -307

No files matched your search

+2
View File
@@ -450,6 +450,7 @@ const deleteUserController = async (req, res, next) => {
}
// 1. Find all the monitors associated with the user id
const monitors = await req.db.getMonitorsByUserId({
params: { userId: _id },
});
@@ -459,6 +460,7 @@ const deleteUserController = async (req, res, next) => {
await Promise.all(
monitors.map(async (monitor) => {
await req.jobQueue.deleteJob(monitor);
await req.db.deleteChecks(monitor._id);
await req.db.deleteAlertByMonitorId(monitor._id);
await req.db.deletePageSpeedChecksByMonitorId(monitor._id);
+1 -1
View File
@@ -297,7 +297,7 @@ const getMonitorById = async (monitorId) => {
*/
const getMonitorsByUserId = async (req, res) => {
try {
let { limit, type, status, sortOrder, normalize } = req.query;
let { limit, type, status, sortOrder, normalize } = req.query || {};
const monitorQuery = { userId: req.params.userId };
if (type !== undefined) {
@@ -1,3 +1,4 @@
const UserModel = require("../../../models/user");
const RecoveryToken = require("../../../models/RecoveryToken");
const crypto = require("crypto");
const { errorMessages } = require("../../../utils/messages");
+1 -1
View File
@@ -19,7 +19,7 @@ const JobQueue = require("./service/jobQueue");
const NetworkService = require("./service/networkService");
const EmailService = require("./service/emailService");
const PageSpeedService = require("./service/pageSpeedService");
const SERVICE_NAME = "Server";
let cleaningUp = false;
// Need to wrap server setup in a function to handle async nature of JobQueue
+2 -2
View File
@@ -15,12 +15,12 @@ router.get(
checkController.getChecks
);
router.get("/user/:userId", checkController.getUserChecks);
router.delete(
"/:monitorId",
verifyOwnership(Monitor, "monitorId"),
checkController.deleteChecks
);
router.get("/user/:userId", checkController.getUserChecks);
module.exports = router;