add script to send email to pre-fxa subscribers

smileys2 · Oct 31, 2019 · 71bc0bb · 71bc0bb
1 parent 3ff522f
commit 71bc0bb
Show file tree

Hide file tree

Showing 5 changed files with 63 additions and 41 deletions.
diff --git a/controllers/hibp.js b/controllers/hibp.js
@@ -5,7 +5,6 @@ const { negotiateLanguages, acceptedLanguages } = require("fluent-langneg");
 const AppConstants = require("../app-constants");
 const DB = require("../db/DB");
 const EmailUtils = require("../email-utils");
-const EmailHelpers = require("../template-helpers/emails.js");
 const HIBP = require("../hibp");
 const { LocaleUtils } = require ("../locale-utils");
 const mozlog = require("../log");
@@ -123,42 +122,6 @@ async function notify (req, res) {
   );
 }
 
-async function sendEmailToPreFxaSubscribers (req, res) {
-const subscribers = [ /* summoning groooooovecoder */  ];
-  const notifiedSubscribers = [];
-  const utmID = "pre-fxa";
-  for (const subscriber of subscribers) {
-    const signupLanguage = subscriber.signup_language;
-    const subscriberEmail = subscriber.email;
-    const requestedLanguage = signupLanguage ? acceptedLanguages(signupLanguage) : "";
-    const supportedLocales = negotiateLanguages(
-      requestedLanguage,
-      req.app.locals.AVAILABLE_LANGUAGES,
-      {defaultLocale: "en"}
-    );
-
-    if (!notifiedSubscribers.includes(subscriberEmail)) {
-      await EmailUtils.sendEmail(
-        subscriberEmail,
-        LocaleUtils.fluentFormat(supportedLocales, "pre-fxa-subject"), // email subject
-        "default_email", // email template
-        {
-          supportedLocales,
-          SERVER_URL: req.app.locals.SERVER_URL,
-          unsubscribeUrl: EmailUtils.getUnsubscribeUrl(subscriber, utmID), // need to test the flow for legacy users who want to unsubscribe
-          ctaHref: EmailHelpers.getPreFxaUtmParams(req.app.locals.SERVER_URL, "create-account-button", subscriberEmail),
-          whichPartial: "email_partials/pre-fxa",
-          preFxaEmail: true,
-          email: subscriberEmail,
-        },
-      );
-      notifiedSubscribers.push(subscriberEmail);
-    }
-  }
-
-  res.redirect("/email-l10n");
-
-}
 
 async function breaches (req, res, next) {
   res.append("Last-Modified", req.app.locals.mostRecentBreachDateTime);
@@ -167,9 +130,7 @@ async function breaches (req, res, next) {
 
 
 
-
 module.exports = {
   notify,
   breaches,
-  sendEmailToPreFxaSubscribers,
 };
diff --git a/db/DB.js b/db/DB.js
@@ -79,6 +79,18 @@ const DB = {
     return subscriberAndEmails;
   },
 
+  async getPreFxaSubscribers() {
+    // We don't want to get subscribers records where the email address has
+    // since been added "under" an FxA subscription
+    const allEmailAddressesSubquery = knex("email_addresses").select("email");
+    const preFxaSubscribers = await knex("subscribers").where({
+      "fxa_uid": "",
+    }).andWhere(
+      "primary_email", "not in", allEmailAddressesSubquery
+    );
+    return preFxaSubscribers;
+  },
+
   async getSubscriberByEmail(email) {
     const [subscriber] = await knex("subscribers").where({
       "primary_email": email,

diff --git a/locale-utils.js b/locale-utils.js
@@ -61,6 +61,7 @@ const LocaleUtils = {
     }
     log.info("LocaleUtils.init", {availableLanguages});
     log.info("LocaleUtils.init", {fluentBundles});
+    return {availableLanguages, fluentBundles};
   },
 
   loadLanguagesIntoApp (app) {

diff --git a/routes/hibp.js b/routes/hibp.js
@@ -6,7 +6,7 @@ const bodyParser = require("body-parser");
 const bearerToken = require("express-bearer-token");
 
 const {asyncMiddleware} = require("../middleware");
-const {notify, breaches, sendEmailToPreFxaSubscribers} = require("../controllers/hibp");
+const {notify, breaches} = require("../controllers/hibp");
 
 
 const router = express.Router();
@@ -15,6 +15,5 @@ const jsonParser = bodyParser.json();
 router.use("/notify", bearerToken());
 router.post("/notify", jsonParser, asyncMiddleware(notify));
 router.get("/breaches", jsonParser, asyncMiddleware(breaches));
-router.get("/sendPreFxaEmail", jsonParser, asyncMiddleware(sendEmailToPreFxaSubscribers));
 
 module.exports = router;
diff --git a/scripts/send-email-to-pre-fxa-subscribers.js b/scripts/send-email-to-pre-fxa-subscribers.js
@@ -0,0 +1,49 @@
+"use strict";
+
+const { negotiateLanguages, acceptedLanguages } = require("fluent-langneg");
+
+const AppConstants = require("../app-constants");
+const DB = require("../db/DB");
+const EmailHelpers = require("../template-helpers/emails.js");
+const EmailUtils = require("../email-utils");
+const { LocaleUtils } = require ("../locale-utils");
+
+
+(async (req) => {
+  const localeUtils = LocaleUtils.init();
+  EmailUtils.init();
+
+  const subscribers = await DB.getPreFxaSubscribers();
+  console.log(`Found ${subscribers.length} pre-FxA subscribers whose email hasn't been added to an FxA subscription.`);
+  const notifiedSubscribers = [];
+  const utmID = "pre-fxa";
+  for (const subscriber of subscribers) {
+    const signupLanguage = subscriber.signup_language;
+    const subscriberEmail = subscriber.primary_email;
+    const requestedLanguage = signupLanguage ? acceptedLanguages(signupLanguage) : "";
+    const supportedLocales = negotiateLanguages(
+      requestedLanguage,
+      localeUtils.availableLanguages,
+      {defaultLocale: "en"}
+    );
+
+    if (!notifiedSubscribers.includes(subscriberEmail)) {
+      await EmailUtils.sendEmail(
+        subscriberEmail,
+        LocaleUtils.fluentFormat(supportedLocales, "pre-fxa-subject"), // email subject
+        "default_email", // email template
+        {
+          supportedLocales,
+          SERVER_URL: AppConstants.SERVER_URL,
+          unsubscribeUrl: EmailUtils.getUnsubscribeUrl(subscriber, utmID), // need to test the flow for legacy users who want to unsubscribe
+          ctaHref: EmailHelpers.getPreFxaUtmParams(AppConstants.SERVER_URL, "create-account-button", subscriberEmail),
+          whichPartial: "email_partials/pre-fxa",
+          preFxaEmail: true,
+          email: subscriberEmail,
+        },
+      );
+      notifiedSubscribers.push(subscriberEmail);
+    }
+  }
+  console.log(`Notified subscribers: ${JSON.stringify(notifiedSubscribers)}`);
+})();