From 6ea0ad43f77f302964d8a9c6fd531a47001b8b9a Mon Sep 17 00:00:00 2001 From: Chris Brame Date: Wed, 21 Nov 2018 07:58:38 -0500 Subject: [PATCH] fix(accounts): crash if user was deleted with active conversations #109 --- src/controllers/api/v1/users.js | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/controllers/api/v1/users.js b/src/controllers/api/v1/users.js index a083d7b26..0db81bd27 100644 --- a/src/controllers/api/v1/users.js +++ b/src/controllers/api/v1/users.js @@ -521,9 +521,17 @@ apiUsers.deleteUser = function(req, res) { }); }, function(hasTickets, user, cb) { - if (hasTickets) { - //Disable if the user has tickets + var conversationSchema = require('../../../models/chat/conversation'); + conversationSchema.getConversationsWithLimit(user._id, 10, function(err, conversations) { + if (err) return cb(err); + var hasConversations = _.size(conversations) > 0; + return cb(null, hasTickets, hasConversations, user); + }); + }, + function(hasTickets, hasConversations, user, cb) { + if (hasTickets || hasConversations) { + //Disable if the user has tickets or conversations user.softDelete(function(err) { if (err) return cb(err);