Merge pull request #1194 from mathematicalthinking/adminActionButtons

Log user out when admin status changes

Author: exidy80

client/package.json

@@ -1,6 +1,6 @@
 {
   "name": "client",
-  "version": "3.3.5",
+  "version": "3.3.6",
   "private": true,
   "dependencies": {
     "@xstate/react": "^3.0.1",

client/src/Containers/Dashboard.js

@@ -239,12 +239,16 @@ class Dashboard extends Component {
     });
 
   removeAsAdmin = (userId) =>
-    this._buttonAction(() => API.removeAsAdmin(userId), userId, {
-      isAdmin: false,
-    });
+    this.logoutUser(userId).then(() =>
+      this._buttonAction(() => API.removeAsAdmin(userId), userId, {
+        isAdmin: false,
+      })
+    );
 
   makeAdmin = (userId) =>
-    this._buttonAction(() => API.makeAdmin(userId), userId, { isAdmin: true });
+    this.logoutUser(userId).then(() =>
+      this._buttonAction(() => API.makeAdmin(userId), userId, { isAdmin: true })
+    );
 
   updateVisibleResource = (itemId, update) => {
     const { visibleResources } = this.state;

client/src/Routes/MyVmt.js

@@ -32,60 +32,60 @@ const pages = [
   {
     path: '/courses/:course_id/:resource',
     component: Course,
-    redirectPath: '/classcode',
+    redirectPath: '/',
   },
   {
     path: '/courses/:course_id/activities/:activity_id/:resource',
     // component: Activity,
     component: withPopulatedActivity(Activity),
-    redirectPath: '/classcode',
+    redirectPath: '/',
   },
   {
     path:
       '/courses/:course_id/activities/:activity_id/rooms/:room_id/:resource',
     component: Room,
-    redirectPath: '/classcode',
+    redirectPath: '/',
   },
   {
     path: '/activities/:activity_id/rooms/:room_id/:resource',
     component: Room,
-    redirectPath: '/signup',
+    redirectPath: '/',
   },
   {
     path: '/courses/:course_id/rooms/:room_id/:resource',
     component: Room,
-    redirectPath: '/classcode',
+    redirectPath: '/',
   },
   {
     path: '/courses/:course_id/rooms/:room_id/:resource',
     component: Room,
-    redirectPath: '/classcode',
+    redirectPath: '/',
   },
   {
     path: '/rooms/:room_id/:resource',
     component: Room,
-    redirectPath: '/signup',
+    redirectPath: '/',
   },
   {
     path: '/activities/:activity_id/:resource',
     // component: Activity,
     component: withPopulatedActivity(Activity),
-    redirectPath: '/signup',
+    redirectPath: '/',
   },
   {
     path: '/workspace/:room_id/replayer',
     component: withPopulatedRoom(SharedReplayer),
-    redirectPath: '/signup',
+    redirectPath: '/',
   },
   {
     path: '/workspace/:activity_id/activity',
     component: ActivityWorkspace,
-    redirectPath: '/signup',
+    redirectPath: '/',
   },
   {
     path: '/workspace/:room_id',
     component: withPopulatedRoom(withControlMachine(Workspace)),
-    redirectPath: '/signup',
+    redirectPath: '/',
   },
   {
     path: '/confirmation',