redirect with query param regression

src/app/content/hooks/receivePageNotFoundId.spec.ts

@@ -1,9 +1,12 @@
 import createTestServices from '../../../test/createTestServices';
 import createTestStore from '../../../test/createTestStore';
-import { replace } from '../../navigation/actions';
-import { AnyMatch } from '../../navigation/types';
+import { createRouterService } from '../../navigation/routerService';
 import { MiddlewareAPI, Store } from '../../types';
+import { assertWindow } from '../../utils';
 import { receivePageNotFoundId } from '../actions';
+import { processBrowserRedirect } from '../utils/processBrowserRedirect';
+import * as errors from '../../errors';
+import * as content from '../../content';
 
 const mockFetch = (valueToReturn: any, error?: any) => () => new Promise((resolve, reject) => {
   if (error) {
@@ -17,14 +20,21 @@ describe('receivePageNotFoundId hook', () => {
   let store: Store;
   let helpers: MiddlewareAPI & ReturnType<typeof createTestServices>;
   let historyReplaceSpy: jest.SpyInstance;
-  let dispatch: jest.SpyInstance;
   let fetchBackup: any;
+  let window: Window;
 
   beforeEach(() => {
     store = createTestStore();
+    window = assertWindow();
+    delete (window as any).location;
+
+    window.location = {
+      origin: 'openstax.org',
+    } as any as Window['location'];
 
     helpers = {
       ...createTestServices(),
+      router: createRouterService([...Object.values(content.routes), ...Object.values(errors.routes)]),
       dispatch: store.dispatch,
       getState: store.getState,
     };
@@ -33,8 +43,6 @@ describe('receivePageNotFoundId hook', () => {
       pathname: '/books/physics/pages/1-introduction301',
     } as any;
 
-    dispatch = jest.spyOn(helpers, 'dispatch');
-
     historyReplaceSpy = jest.spyOn(helpers.history, 'replace')
       .mockImplementation(jest.fn());
 
@@ -66,8 +74,16 @@ describe('receivePageNotFoundId hook', () => {
   it('calls history.replace if redirect is found', async() => {
     (globalThis as any).fetch = mockFetch([{ from: helpers.history.location.pathname, to: '/books/redirected' }]);
 
-    await hook(receivePageNotFoundId('asdf'));
+    await processBrowserRedirect(helpers);
+
+    expect(historyReplaceSpy).toHaveBeenCalledWith('/books/redirected');
+  });
+
+  it('updates window.location if target is not within rex', async() => {
+    (globalThis as any).fetch = mockFetch([{ from: helpers.history.location.pathname, to: '/redirected' }]);
+
+    await processBrowserRedirect(helpers);
 
-    expect(dispatch).toHaveBeenCalledWith(replace(helpers.router.findRoute('/books/redirected') as AnyMatch));
+    expect(window.location.href).toEqual('openstax.org/redirected');
   });
 });

src/app/content/utils/processBrowserRedirect.ts

@@ -1,22 +1,22 @@
 import { History } from 'history';
 import { Redirects } from '../../../../data/redirects/types';
 import { RouterService } from '../../navigation/routerService';
-import { Dispatch } from '../../types';
-import { replace } from '../../navigation/actions';
-import { AnyMatch } from '../../navigation/types';
+import { assertWindow } from '../../utils';
+import { matchForRoute } from '../../navigation/utils';
+import { external } from '../../errors/routes';
 
-export const processBrowserRedirect = async(services: {
-  router: RouterService,
-  history: History,
-  dispatch: Dispatch
-}) => {
+export const processBrowserRedirect = async(services: {router: RouterService, history: History}) => {
+  const window = assertWindow();
   const redirects: Redirects = await fetch('/rex/redirects.json')
     .then((res) => res.json())
     .catch(() => []);
 
   for (const {from, to} of redirects) {
     if (from === services.history.location.pathname) {
-      services.dispatch(replace(services.router.findRoute(to) as AnyMatch));
+      if (matchForRoute(external, services.router.findRoute(to))) {
+        window.location.href = window.location.origin + to;
+      }
+      services.history.replace(to);
       return true;
     }
   }