Merge remote-tracking branch 'upstream/develop' into feat/incidents
This commit is contained in:
commit
0a8cb5f6bf
14 files changed
+305
-35
No files matched your search
@@ -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,
|
||||
|
||||
Reference in new issue
Block a user