Merge pull request #1200 from mathematicalthinking/adminActionButtons

avoid an odd bug

Author: exidy80

client/src/Containers/Dashboard.js

@@ -241,6 +241,7 @@ class Dashboard extends Component {
 
   removeAsAdmin = (userId) => {
     const { user } = this.props;
+    console.log('about to force logout', userId, user._id);
     socket.emit('FORCE_LOGOUT', userId, user._id);
     this._buttonAction(() => API.removeAsAdmin(userId), userId, {
       isAdmin: false,
@@ -250,6 +251,7 @@ class Dashboard extends Component {
 
   makeAdmin = (userId) => {
     const { user } = this.props;
+    console.log('about to force logout', userId, user._id);
     socket.emit('FORCE_LOGOUT', userId, user._id);
     this._buttonAction(() => API.makeAdmin(userId), userId, {
       isAdmin: true,

server/sockets.js

@@ -232,7 +232,7 @@ module.exports = function() {
 
     // implement a tiny bit of authentication: requestor must be an admin
     socket.on('FORCE_LOGOUT', async (userId, requestingId) => {
-      if (!userId) return;
+      if (!userId || userId === requestingId) return;
       const requestor = await controllers.user.getById(requestingId);
       if (requestor && requestor.isAdmin) await forceLogout(userId);
     });