Merge pull request #885 from bluewave-labs/fix/delete-super-admin

Update delete user to handle superadmin case
This commit is contained in:
Alexander Holliday authored and GitHub committed 2024-09-25 20:51:40 -07:00
commit b2bc441c7f
4 files changed
+51 -15

No files matched your search

+1 -1
View File
@@ -33,7 +33,7 @@ const Settings = ({ isAdmin }) => {
const { timezone } = useSelector((state) => state.ui); const { timezone } = useSelector((state) => state.ui);
const [checksIsLoading, setChecksIsLoading] = useState(false); const [checksIsLoading, setChecksIsLoading] = useState(false);
const [form, setForm] = useState({ const [form, setForm] = useState({
ttl: (checkTTL / SECONDS_PER_DAY).toString(), ttl: checkTTL ? (checkTTL / SECONDS_PER_DAY).toString() : 0,
}); });
const [errors, setErrors] = useState({}); const [errors, setErrors] = useState({});
const dispatch = useDispatch(); const dispatch = useDispatch();
+17 -14
View File
@@ -16,7 +16,7 @@ const logger = require("../utils/logger");
require("dotenv").config(); require("dotenv").config();
const { errorMessages, successMessages } = require("../utils/messages"); const { errorMessages, successMessages } = require("../utils/messages");
var jwt = require("jsonwebtoken"); var jwt = require("jsonwebtoken");
const SERVICE_NAME = "auth"; const SERVICE_NAME = "AuthController";
const { getTokenFromHeaders } = require("../utils/utils"); const { getTokenFromHeaders } = require("../utils/utils");
/** /**
@@ -466,23 +466,26 @@ const deleteUserController = async (req, res, next) => {
const result = await req.db.getMonitorsByTeamId({ const result = await req.db.getMonitorsByTeamId({
params: { teamId: user.teamId }, params: { teamId: user.teamId },
}); });
if (user.role.includes("superadmin") && result?.monitors.length > 0) { if (user.role.includes("superadmin")) {
//2. Remove all jobs, delete checks and alerts //2. Remove all jobs, delete checks and alerts
await Promise.all( result?.monitors.length > 0 &&
monitors.map(async (monitor) => { (await Promise.all(
await req.jobQueue.deleteJob(monitor); result.monitors.map(async (monitor) => {
await req.jobQueue.deleteJob(monitor);
await req.db.deleteChecks(monitor._id);
await req.db.deletePageSpeedChecksByMonitorId(monitor._id);
await req.db.deleteNotificationsByMonitorId(monitor._id);
})
));
await req.db.deleteChecks(monitor._id); // 3. Delete team
await req.db.deleteAlertByMonitorId(monitor._id); await req.db.deleteTeam(user.teamId);
await req.db.deletePageSpeedChecksByMonitorId(monitor._id); // 4. Delete all other team members
await req.db.deleteNotificationsByMonitorId(monitor._id); await req.db.deleteAllOtherUsers();
}) // 5. Delete each monitor
);
// 3. Delete each monitor
await req.db.deleteMonitorsByUserId(user._id); await req.db.deleteMonitorsByUserId(user._id);
} }
// 4. Delete the user by id // 6. Delete the user by id
await req.db.deleteUser(user._id); await req.db.deleteUser(user._id);
return res.status(200).json({ return res.status(200).json({
+4
View File
@@ -36,6 +36,8 @@ const {
getUserByEmail, getUserByEmail,
updateUser, updateUser,
deleteUser, deleteUser,
deleteTeam,
deleteAllOtherUsers,
getAllUsers, getAllUsers,
logoutUser, logoutUser,
} = require("./modules/userModule"); } = require("./modules/userModule");
@@ -125,6 +127,8 @@ module.exports = {
getUserByEmail, getUserByEmail,
updateUser, updateUser,
deleteUser, deleteUser,
deleteTeam,
deleteAllOtherUsers,
getAllUsers, getAllUsers,
logoutUser, logoutUser,
requestInviteToken, requestInviteToken,
+29
View File
@@ -156,6 +156,33 @@ const deleteUser = async (userId) => {
} }
}; };
/**
* Delete a user by ID
* @async
* @param {string} teamId
* @returns {void}
* @throws {Error}
*/
const deleteTeam = async (teamId) => {
try {
await TeamModel.findByIdAndDelete(teamId);
} catch (error) {
error.service = SERVICE_NAME;
error.method = "deleteTeam";
throw error;
}
};
const deleteAllOtherUsers = async () => {
try {
await UserModel.deleteMany({ role: { $ne: "superadmin" } });
} catch (error) {
error.service = SERVICE_NAME;
error.method = "deleteAllOtherUsers";
throw error;
}
};
const getAllUsers = async (req, res) => { const getAllUsers = async (req, res) => {
try { try {
const users = await UserModel.find() const users = await UserModel.find()
@@ -185,6 +212,8 @@ module.exports = {
getUserByEmail, getUserByEmail,
updateUser, updateUser,
deleteUser, deleteUser,
deleteTeam,
deleteAllOtherUsers,
getAllUsers, getAllUsers,
logoutUser, logoutUser,
}; };