fix #1191: consolidate and clean up utm_* params

mozilla · Nov 22, 2019 · 3961472 · 3961472
1 parent 5920aef
commit 3961472
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 9 deletions.
diff --git a/email-utils.js b/email-utils.js
@@ -81,7 +81,7 @@ const EmailUtils = {
 
   appendUtmParams(url, campaign, content) {
     const utmParameters = {
-      utm_source: "fx-monitor-email",
+      utm_source: "fx-monitor",
       utm_medium: "email",
       utm_campaign: campaign,
       utm_content: content,

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

diff --git a/template-helpers/emails.js b/template-helpers/emails.js
@@ -35,8 +35,8 @@ function emailBreachStats(args) {
 function getPreFxaUtmParams(serverUrl, content, userEmail) {
   const url = new URL(`${serverUrl}/oauth/init`);
   const utmParams = {
-    utm_source: "fx-monitor-email",
-    utm_medium: "email",
+    utm_source: "fx-monitor",
+    utm_medium: "fx-monitor-email",
     utm_content: content,
     utm_campaign: "pre-fxa-subscribers",
     email: userEmail,
@@ -136,7 +136,7 @@ function getEmailHeader(args) {
 function makeFaqLink(target, campaign) {
   const url = new URL(`https://support.mozilla.org/kb/firefox-monitor-faq${target}`);
   const utmParameters = {
-    utm_source: "fx-monitor-email",
+    utm_source: "fx-monitor",
     utm_medium: "email",
     utm_campaign: campaign,
   };
@@ -153,7 +153,7 @@ function makePreFxaSubscriberMessage(args) {
   const url = new URL(`${serverUrl}/#fx-account-features`);
 
   const utmParameters = {
-    utm_source : "fx-monitor-email",
+    utm_source : "fx-monitor",
     utm_medium : "email",
     utm_content : "breach-alert",
     utm_campaign : "pre-fxa-subscribers",

diff --git a/views/partials/email_partials/email_disclaimers.hbs b/views/partials/email_partials/email_disclaimers.hbs
@@ -6,7 +6,7 @@
                   {{ getString "email-sensitive-disclaimer" }}
                 </p>
               {{/if}}
-              <p class="source-info email-small-text" style="color: #5e5e72; padding: 0; margin: 0; font-size: 13px; line-height: 1.5; font-weight: 300; font-family: sans-serif;">{{{ getString "learn-more-about-fxm" fxmLink='<a style="color: #0060df; font-weight: 400;" href="https://monitor.firefox.com?utm_source=fx-monitor-email&utm_medium=email&utm_campaign=learn-more-link" target="_blank" rel="noopener noreferrer">Firefox Monitor</a>'}}}</p>
+              <p class="source-info email-small-text" style="color: #5e5e72; padding: 0; margin: 0; font-size: 13px; line-height: 1.5; font-weight: 300; font-family: sans-serif;">{{{ getString "learn-more-about-fxm" fxmLink='<a style="color: #0060df; font-weight: 400;" href="https://monitor.firefox.com/?utm_source=fx-monitor&utm_medium=email&utm_campaign=learn-more-link" target="_blank" rel="noopener noreferrer">Firefox Monitor</a>'}}}</p>
               <p class="source-info email-small-text" style="color: #5e5e72; padding: 0; margin: 0; font-size: 13px; line-height: 1.5; font-weight: 300; font-family: sans-serif;">{{{ getString "hibp-attribution" hibp-link='<a id="hibp-link" style="color: #0060df; font-weight: 400;" href="https://www.haveibeenpwned.com" target="_blank" rel="noopener noreferrer">Have I Been Pwned</a>' }}}</p>
             </td>
           </tr>

diff --git a/views/partials/email_partials/email_single_breach.hbs b/views/partials/email_partials/email_single_breach.hbs
@@ -17,7 +17,7 @@
           <p class="text-light" style="font-weight: 300; color: #5e5e72; font-size: 13px; font-family: sans-serif; margin: 0px; padding-bottom: 4px;">{{ LocalizedBreachCardStrings.CompromisedData }}</p>
           <span class="text-medium" style="font-weight:600; font-size: 15px; font-family: sans-serif; margin: 0px; color: #20123a;">{{ DataClasses }}</span>
         {{/if}}
-        <p class="more-info-link-wrap" style="padding-top: 20px; margin: 0;"><a class="more-info-link" target="_blank" rel="noopener noreferrer" style="color: #0060df; font-family: sans-serif; font-weight: 500; text-decoration: none;" href="{{ SERVER_URL }}/breach-details/{{ Name }}?utm_source=fx-monitor-email&utm_medium=email&utm_campaign=more-about-this-breach-link&subscriber_id={{ subscriberId }}">{{ LocalizedBreachCardStrings.MoreInfoLink }}</a></p>
+        <p class="more-info-link-wrap" style="padding-top: 20px; margin: 0;"><a class="more-info-link" target="_blank" rel="noopener noreferrer" style="color: #0060df; font-family: sans-serif; font-weight: 500; text-decoration: none;" href="{{ SERVER_URL }}/breach-details/{{ Name }}?utm_source=fx-monitor&utm_medium=email&utm_campaign=more-about-this-breach-link&subscriber_id={{ subscriberId }}">{{ LocalizedBreachCardStrings.MoreInfoLink }}</a></p>
       </td>
     </tr>
   </table>