Perform soft page change on user consistency invalidation to show the error modal

Author: mlt47

src/app/services/history.ts

@@ -1,5 +1,5 @@
 import {createBrowserHistory} from "history";
-import {changePage} from "../state/actions";
+import {registerPageChange} from "../state/actions";
 
 export const history = createBrowserHistory();
 
@@ -8,7 +8,7 @@ let previousPathname = window.location.pathname;
 history.listen((location) => {
     const nextPathname = location.pathname;
     if (previousPathname != nextPathname) {
-        changePage(location.pathname);
+        registerPageChange(location.pathname);
         previousPathname = nextPathname;
     }
 });

src/app/state/actions.tsx

@@ -37,6 +37,7 @@ import {
     AssignmentDTO,
     AuthenticationProvider,
     ChoiceDTO,
+    EmailVerificationStatus,
     GameboardDTO,
     GlossaryTermDTO,
     IsaacQuestionPageDTO,
@@ -46,8 +47,7 @@ import {
     TestCaseDTO,
     UserGroupDTO,
     UserSummaryDTO,
-    UserSummaryWithEmailAddressDTO,
-    EmailVerificationStatus
+    UserSummaryWithEmailAddressDTO
 } from "../../IsaacApiTypes";
 import {
     releaseAllConfirmationModal,
@@ -1711,8 +1711,11 @@ export const fetchConcepts = () => async (dispatch: Dispatch<Action>) => {
 
 
 // SERVICE ACTIONS (w/o dispatch)
-// Page change
 export const changePage = (path: string) => {
+    history.push(path);
+};
+
+export const registerPageChange = (path: string) => {
     store.dispatch({type: ACTION_TYPE.ROUTER_PAGE_CHANGE, path});
 };
 

src/app/state/userConsistencyChecker.tsx

@@ -2,6 +2,7 @@ import {Dispatch, Middleware, MiddlewareAPI} from "redux";
 import {RegisteredUserDTO} from "../../IsaacApiTypes";
 import {ACTION_TYPE} from "../services/constants";
 import {getUserId, setUserId} from "./userConsistencyCheckerCurrentUser";
+import {changePage} from "./actions";
 
 // Generic log action:
 // This is not imported from actions to avoid a circular dependency through store.
@@ -40,6 +41,7 @@ const setCurrentUser = (user: RegisteredUserDTO, api: MiddlewareAPI) => {
     if (setUserId(user._id)) {
         scheduleNextCheck(api);
     } else {
+        // eslint-disable-next-line no-console
         console.error("Cannot perform user consistency checking!");
         const eventDetails = {
             type: "USER_CONSISTENCY_CHECKING_FAILED",
@@ -52,7 +54,7 @@ const setCurrentUser = (user: RegisteredUserDTO, api: MiddlewareAPI) => {
 const clearCurrentUser = () => {
     clearTimeout(timeoutHandle);
     setUserId(undefined);
-    window.document.location.href = "/";
+    changePage("/");
 };
 
 export const userConsistencyCheckerMiddleware: Middleware = (api: MiddlewareAPI) => (next: Dispatch) => action => {