Merge pull request #83 from ahmedkrmn/admin-signout

Fix server hang/crash on admin deletion
llaske · Mar 12, 2019 · 98a7993 · 98a7993
2 parents 8f2a820 + ceeda69
commit 98a7993
Show file tree

Hide file tree

Showing 6 changed files with 34 additions and 0 deletions.
diff --git a/api/controller/users.js b/api/controller/users.js
@@ -627,7 +627,16 @@ exports.removeUser = function(req, res) {
 			});
 			return;
 		}
+	} else{
+		if (req.user._id == req.params.uid) {
+			res.status(400).send({
+				'error': 'Please login with another admin account before deleting your account',
+				'code': 20
+			});
+			return;
+		}
 	}
+
 	//delete user from db
 	var uid = req.params.uid;
 	db.collection(usersCollection, function(err, collection) {

diff --git a/dashboard/public/l10n/locales.ini b/dashboard/public/l10n/locales.ini
@@ -92,6 +92,7 @@ ErrorCode15=Error while deleting journal entry!
 ErrorCode16=Invalid object
 ErrorCode18=Invalid user id
 ErrorCode19=You don't have permission to perform this action
+ErrorCode20=Please login with another admin account before deleting your account
 ErrorCode21=User not defined!
 ErrorCode22=An user with same name already exist
 ErrorCode23=Inexisting user
@@ -206,6 +207,7 @@ ErrorCode15=Error while deleting journal entry!
 ErrorCode16=Invalid object
 ErrorCode18=Invalid user id
 ErrorCode19=You don't have permission to perform this action
+ErrorCode20=Please login with another admin account before deleting your account
 ErrorCode21=User not defined!
 ErrorCode22=An user with same name already exist
 ErrorCode23=Inexisting user
@@ -320,6 +322,7 @@ ErrorCode15=जर्नल एन्ट्री को हटाते सम
 ErrorCode16=अमान्य वस्तु
 ErrorCode18=अमान्य उपयोगकर्ता आइ डी
 ErrorCode19=आपको यह क्रिया करने की अनुमति नहीं है
+ErrorCode20=कृपया अपना खाता हटाने से पहले किसी अन्य व्यवस्थापक खाते से लॉगिन करें
 ErrorCode21=उपयोगकर्ता परिभाषित नहीं है!
 ErrorCode22=समान नाम वाला उपयोगकर्ता पहले से मौजूद है
 ErrorCode23=निष्क्रिय उपयोगकर्ता
@@ -435,6 +438,7 @@ ErrorCode15=Erreur de suppression de l'entrée !
 ErrorCode16=Objet invalide
 ErrorCode18=Utilisateur invalide
 ErrorCode19=Vous n'avez pas l'autorisation d'effectuer cette action
+ErrorCode20=Veuillez vous connecter avec un autre compte administrateur avant de supprimer votre compte
 ErrorCode21=Utilisateur inexistant !
 ErrorCode22=Un utilisateur ayant le même nom existe déjà
 ErrorCode23=Utilisateur inexistant
@@ -549,6 +553,7 @@ ErrorCode15=¡Error al eliminar la entrada de diario!
 ErrorCode16=Objeto inválido
 ErrorCode18=Identificación de usuario inválida
 ErrorCode19=No tienes permiso para realizar esta acción.
+ErrorCode20=Por favor ingrese con otra cuenta de administrador antes de borrar su cuenta
 ErrorCode21=Usuario no definido!
 ErrorCode22=Ya existe un usuario con el mismo nombre.
 ErrorCode23=Usuario inexistente

diff --git a/dashboard/public/l10n/po/en.po b/dashboard/public/l10n/po/en.po
@@ -436,6 +436,11 @@ msgctxt "ErrorCode19"
 msgid "You don't have permission to perform this action"
 msgstr "You don't have permission to perform this action"
 
+#: ErrorCode20
+msgctxt "ErrorCode20"
+msgid "Please login with another admin account before deleting your account"
+msgstr "Please login with another admin account before deleting your account"
+
 #: ErrorCode21
 msgctxt "ErrorCode21"
 msgid "User not defined!"

diff --git a/dashboard/public/l10n/po/es.po b/dashboard/public/l10n/po/es.po
@@ -430,6 +430,11 @@ msgctxt "ErrorCode19"
 msgid "You don't have permission to perform this action"
 msgstr "You don't have permission to perform this action"
 
+#: ErrorCode20
+msgctxt "ErrorCode20"
+msgid "Please login with another admin account before deleting your account"
+msgstr "Please login with another admin account before deleting your account"
+
 #: ErrorCode21
 msgctxt "ErrorCode21"
 msgid "User not defined!"

diff --git a/dashboard/public/l10n/po/fr.po b/dashboard/public/l10n/po/fr.po
@@ -436,6 +436,11 @@ msgctxt "ErrorCode19"
 msgid "You don't have permission to perform this action"
 msgstr "Vous n'avez pas l'autorisation d'effectuer cette action"
 
+#: ErrorCode20
+msgctxt "ErrorCode20"
+msgid "Please login with another admin account before deleting your account"
+msgstr "Please login with another admin account before deleting your account"
+
 #: ErrorCode21
 msgctxt "ErrorCode21"
 msgid "User not defined!"

diff --git a/dashboard/public/l10n/po/hi.po b/dashboard/public/l10n/po/hi.po
@@ -436,6 +436,11 @@ msgctxt "ErrorCode19"
 msgid "You don't have permission to perform this action"
 msgstr "You don't have permission to perform this action"
 
+#: ErrorCode20
+msgctxt "ErrorCode20"
+msgid "Please login with another admin account before deleting your account"
+msgstr "Please login with another admin account before deleting your account"
+
 #: ErrorCode21
 msgctxt "ErrorCode21"
 msgid "User not defined!"