better req.query handling

mozilla · Nov 22, 2019 · 8271f5b · 8271f5b
1 parent f04896a
commit 8271f5b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/lib/fxa.js b/lib/fxa.js
@@ -87,11 +87,12 @@ const FXA = {
     };
     try {
       log.info(`GETting ${fxaMetricsFlowUrl}, with options: ${JSON.stringify(fxaMetricsFlowOptions)}`);
-      const resp = await got(fxaMetricsFlowUrl, fxaMetricsFlowOptions);
+      const fxaResp = await got(fxaMetricsFlowUrl, fxaMetricsFlowOptions);
       log.info("pinged FXA metrics flow.");
-      return resp;
+      return fxaResp;
     } catch (e) {
       log.error("sendMetricsFlowPing", {stack: e.stack});
+      return false;
     }
   },
 

diff --git a/middleware.js b/middleware.js
@@ -59,15 +59,15 @@ async function recordVisitFromEmail (req, res, next) {
   if (req.query.utm_medium && req.query.utm_medium !== "email") {
     next();
   }
-  if (!req.query.subscriber_id || !Number.isInteger(req.query.subscriber_id)) {
+  if (!req.query.subscriber_id || !Number.isInteger(Number(req.query.subscriber_id))) {
     next();
   }
   const subscriber = await DB.getSubscriberById(req.query.subscriber_id);
-  if (!subscriber.fxa_uid) {
+  if (!subscriber.fxa_uid || subscriber.fxa_uid === "") {
     next();
   }
   const fxaMetricsFlowPath = `metrics-flow?entrypoint=breach-alert-email&event_type=engage&uid=${subscriber.fxa_uid}&service=${AppConstants.OAUTH_CLIENT_ID}`;
-  await FXA.sendMetricsFlowPing(fxaMetricsFlowPath);
+  const fxaResult = await FXA.sendMetricsFlowPing(fxaMetricsFlowPath);
   next();
 }