fix: delete user was logging out when admin calling

wajeht · Oct 13, 2022 · e6ff9ed · e6ff9ed
1 parent 2f6ac43
commit e6ff9ed
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 5 deletions.
diff --git a/src/apps/api/v1/users/users.controller.js b/src/apps/api/v1/users/users.controller.js
@@ -165,11 +165,14 @@ export async function deleteUser(req, res) {
 
   logger.info(`UserID: ${id} has disabled their account!`);
 
-  // clear jwt token
-  res.cookie('token', '', {
-    httpOnly: true,
-    expires: new Date(Date.now()),
-  });
+  // if request was from currently logged in user, log them out
+  if (user.id === req.user.user_id) {
+    // clear jwt token
+    res.cookie('token', '', {
+      httpOnly: true,
+      expires: new Date(Date.now()),
+    });
+  }
 
   await redis.del(`user-id-${req.user.user_id}-users`);
 

diff --git a/src/apps/ui/pages/admin/AdminUsers.vue b/src/apps/ui/pages/admin/AdminUsers.vue
@@ -14,6 +14,8 @@ const loading = ref(false);
 const checkAll = ref(false);
 const searchInput = ref('');
 
+const checkAllRef = ref();
+
 const deleteAUserLoading = ref(false);
 
 const alert = reactive({ type: '', msg: '' });
@@ -76,11 +78,14 @@ async function deleteUser() {
     checkedUsers.value = [];
     checkAll.value = false;
 
+    checkAllRef.value.checked = false;
+
     deleteAUserLoading.value = false;
     clearAndDismissDeleteAUserModal();
   } catch (e) {
     deleteAUserLoading.value = false;
     checkAll.value = false;
+    checkAllRef.value.checked = false;
     checkedUsers.value = [];
     clearAndDismissDeleteAUserModal();
     appStore.loading = false;
@@ -215,6 +220,7 @@ function clearAndDismissDeleteAUserModal() {
                 <input
                   @click="checkAll = !checkAll"
                   class="form-check-input"
+                  ref="checkAllRef"
                   type="checkbox"
                   id="checkbox-for-title"
                 />