ReactReduxSpa's boot-server now supports redirections issued by react-router

SteveSandersonMS · SteveSandersonMS · commit 28550784edb6 · 2016-09-09T11:12:59.000+01:00
diff --git a/templates/ReactReduxSpa/ClientApp/boot-server.tsx b/templates/ReactReduxSpa/ClientApp/boot-server.tsx
@@ -5,15 +5,22 @@ import { match, RouterContext } from 'react-router';
 import createMemoryHistory from 'history/lib/createMemoryHistory';
 import routes from './routes';
 import configureStore from './configureStore';
+type BootResult = { html?: string, globals?: { [key: string]: any }, redirectUrl?: string};
 
 export default function (params: any): Promise<{ html: string }> {
-    return new Promise<{ html: string, globals: { [key: string]: any } }>((resolve, reject) => {
+    return new Promise<BootResult>((resolve, reject) => {
         // Match the incoming request against the list of client-side routes
         match({ routes, location: params.location }, (error, redirectLocation, renderProps: any) => {
             if (error) {
                 throw error;
             }
 
+            // If there's a redirection, just send this information back to the host application
+            if (redirectLocation) {
+                resolve({ redirectUrl: redirectLocation.pathname });
+                return;
+            }
+
             // If it didn't match any route, renderProps will be undefined
             if (!renderProps) {
                 throw new Error(`The location '${ params.url }' doesn't match any route configured in react-router.`);
