Merge pull request #456 from aidenkeating/INTLY-1814

INTLY-1814 Don't crash when walkthrough isn't found

Author: pb82

server.js

@@ -131,17 +131,18 @@ app.get('/about', (_, res) => {
 
 app.get('/about/walkthrough/:walkthroughId', (req, res) => {
   const { walkthroughId } = req.params;
+  const walkthrough = walkthroughs.find(w => w.id === walkthroughId);
+  if (!walkthrough) {
+    console.error('Could not find walkthrough with ID', walkthroughId);
+    res.sendStatus(404);
+    return;
+  }
   res.json({
     walkthroughId,
-    walkthroughLocation: getWalkthroughLocationInfoForWalkthrough(walkthroughId)
+    walkthroughLocation: walkthrough.walkthroughLocationInfo
   });
 });
 
-function getWalkthroughLocationInfoForWalkthrough(walkthroughId) {
-  const walkthrough = walkthroughs.find(w => w.id === walkthroughId);
-  return walkthrough.walkthroughLocationInfo;
-}
-
 function getUniqueWalkthroughLocationInfos(walkthroughs) {
   const infos = {};
   walkthroughs.forEach(walkthrough => {

src/redux/reducers/walkthroughServiceReducers.js

@@ -107,6 +107,9 @@ const walkthroughServiceReducers = (state = initialState, action) => {
         }
       );
     case FULFILLED_ACTION(walkthroughTypes.GET_WALKTHROUGH_INFO):
+      if (!action.payload.data || !action.payload.data.walkthroughLocation) {
+        return state;
+      }
       return setStateProp(
         'walkthroughInfo',
         {

src/services/middlewareServices.js

@@ -163,7 +163,7 @@ const getCustomConfig = (dispatch, user) => {
   return fetch(`/customConfig?username=${parsedUsername}`)
     .then(res => res.json())
     .then(config => {
-      if (config && config.services) {
+      if (config) {
         dispatch({
           type: FULFILLED_ACTION(middlewareTypes.GET_CUSTOM_CONFIG),
           payload: config