Merge remote-tracking branch 'upstream/develop' into feat/incidents

This commit is contained in:
Alex Holliday
2024-07-22 15:18:52 -07:00
14 changed files with 305 additions and 35 deletions

View File

@@ -158,6 +158,17 @@ const deleteUser = async (req, res) => {
}
};
const getAllUsers = async (req, res) => {
try {
const users = await UserModel.find()
.select("-password")
.select("-profileImage");
return users;
} catch (error) {
throw error;
}
};
const requestInviteToken = async (req, res) => {
try {
await InviteToken.deleteMany({ email: req.body.email });
@@ -680,6 +691,7 @@ module.exports = {
getUserByEmail,
updateUser,
deleteUser,
getAllUsers,
requestInviteToken,
requestRecoveryToken,
validateRecoveryToken,