Resolved controller test failure - Improved how the check for req.par…

…ams qualifies
smileys2 · Aug 17, 2020 · 8b3cd29 · 8b3cd29
1 parent 0016158
commit 8b3cd29
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/controllers/home.js b/controllers/home.js
@@ -16,11 +16,6 @@ function _getFeaturedBreach(allBreaches, breachQueryValue) {
   return HIBP.getBreachByName(allBreaches, lowercaseBreachValue);
 }
 
-function _getBreachRequest(query = false, param = false) {
-  if (query) { return query; }
-  if (param) { return param; }
-}
-
 async function home(req, res) {
   const formTokens = {
     pageToken: AppConstants.PAGE_TOKEN_TIMER > 0 ? generatePageToken(req) : "",
@@ -44,11 +39,13 @@ async function home(req, res) {
     });
   }
 
-  if (req.query.breach || req.params.breach) {
+  if (req.params && req.params.breach) {
+    req.query.breach = req.params.breach;
+  }
 
-    const requestedBreach = _getBreachRequest(req.query.breach, req.params.breach);
+  if (req.query.breach) {
 
-    featuredBreach = _getFeaturedBreach(req.app.locals.breaches, requestedBreach);
+    featuredBreach = _getFeaturedBreach(req.app.locals.breaches, req.query.breach);
 
     if (!featuredBreach) {
       return notFound(req, res);
@@ -71,6 +68,8 @@ async function home(req, res) {
     });
   }
 
+
+
   res.render("monitor", {
     title: req.fluentFormat("home-title"),
     featuredBreach: featuredBreach,

diff --git a/routes/home.js b/routes/home.js
@@ -9,6 +9,7 @@ const router = express.Router();
 const csrfProtection = csrf();
 
 router.get("/", csrfProtection, home);
+router.get("/share/", csrfProtection, home);
 router.get("/share/purple", csrfProtection, home);
 router.get("/share/red", csrfProtection, home);
 router.get("/share/blue", csrfProtection, home);