Merge pull request #1201 from mathematicalthinking/adminActionButtons

Admin action buttons -- another force logout try

Author: exidy80

client/src/Containers/Dashboard.js

@@ -239,20 +239,22 @@ class Dashboard extends Component {
       isSuspended: false,
     });
 
-  removeAsAdmin = (userId) => {
-    const { user } = this.props;
-    console.log('about to force logout', userId, user._id);
-    socket.emit('FORCE_LOGOUT', userId, user._id);
+  removeAsAdmin = (userId, details) => {
+    if (this._isOkToForceLogout(details)) {
+      const { user } = this.props;
+      socket.emit('FORCE_LOGOUT', userId, user._id);
+    }
     this._buttonAction(() => API.removeAsAdmin(userId), userId, {
       isAdmin: false,
       socketId: null,
     });
   };
 
   makeAdmin = (userId) => {
-    const { user } = this.props;
-    console.log('about to force logout', userId, user._id);
-    socket.emit('FORCE_LOGOUT', userId, user._id);
+    if (this._isOkToForceLogout(details)) {
+      const { user } = this.props;
+      socket.emit('FORCE_LOGOUT', userId, user._id);
+    }
     this._buttonAction(() => API.makeAdmin(userId), userId, {
       isAdmin: true,
       socketId: null,
@@ -336,12 +338,13 @@ class Dashboard extends Component {
         };
 
     const iconActions = [];
-    if (details.socketId && !details.doForceLogout)
-      iconActions.push(forceLogoutAction);
+    if (this._isOkToForceLogout(details)) iconActions.push(forceLogoutAction);
     if (!isSelf) iconActions.push(suspendReinstateAction, makeRemoveAdmin);
     return iconActions;
   };
 
+  _isOkToForceLogout = (user) => user.socketId && !user.doForceLogout;
+
   render() {
     const { match, user } = this.props;
     const {
@@ -410,7 +413,7 @@ class Dashboard extends Component {
             <Button
               data-testid={manageUserAction}
               click={() => {
-                this[manageUserAction](userToManage._id);
+                this[manageUserAction](userToManage._id, userToManage);
               }}
               m={5}
             >

server/sockets.js

@@ -241,7 +241,6 @@ module.exports = function() {
       try {
         const allSockets = await getAllSocketsForUser(userId);
         io.in(allSockets).emit('FORCED_LOGOUT');
-        // forceUserLogout(userId, userId);
       } catch (error) {
         console.error(
           `Error forcing logout by user ${userId}: ${error.message}`