Merge pull request #1832 from Mephistic/use-profile-email

Use Profile Email Instead of Firebase Auth

Author: Mephistic

functions/src/notifications/deliverNotifications.ts

@@ -1,7 +1,8 @@
 import * as functions from "firebase-functions"
 import * as handlebars from "handlebars"
 import * as fs from "fs"
-import { auth, db, Timestamp } from "../firebase"
+import { db, Timestamp } from "../firebase"
+//import { auth, db, Timestamp } from "../firebase" // Temporarily using email from the profile to test the non-auth issues
 import { getNextDigestAt, getNotificationStartDate } from "./helpers"
 import { startOfDay } from "date-fns"
 import { TestimonySubmissionNotificationFields, Profile } from "./types"
@@ -21,14 +22,15 @@ const EMAIL_TEMPLATE_PATH = "../email/digestEmail.handlebars"
 
 const path = require("path")
 
-const getVerifiedUserEmail = async (uid: string) => {
-  const userRecord = await auth.getUser(uid)
-  if (userRecord && userRecord.email && userRecord.emailVerified) {
-    return userRecord.email
-  } else {
-    return null
-  }
-}
+// Temporarily using email from the profile to test the non-auth issues
+// const getVerifiedUserEmail = async (uid: string) => {
+//   const userRecord = await auth.getUser(uid)
+//   if (userRecord && userRecord.email && userRecord.emailVerified) {
+//     return userRecord.email
+//   } else {
+//     return null
+//   }
+// }
 
 // TODO: Batching (at both user + email level)?
 //       Going to wait until we have a better idea of the performance impact
@@ -44,6 +46,12 @@ const deliverEmailNotifications = async () => {
     .where("nextDigestAt", "<=", now)
     .get()
 
+  console.log(
+    `Processing ${
+      profilesSnapshot.size
+    } profiles with nextDigestAt <= ${now.toDate()}`
+  )
+
   const emailPromises = profilesSnapshot.docs.map(async profileDoc => {
     const profile = profileDoc.data() as Profile
     if (!profile || !profile.notificationFrequency) {
@@ -53,7 +61,8 @@ const deliverEmailNotifications = async () => {
       return
     }
 
-    const verifiedEmail = await getVerifiedUserEmail(profileDoc.id)
+    // Temporarily using email from the profile to test the non-auth issues
+    const verifiedEmail = profile.email //await getVerifiedUserEmail(profileDoc.id)
     if (!verifiedEmail) {
       console.log(
         `Skipping user ${profileDoc.id} because they have no verified email address`
@@ -223,6 +232,7 @@ const renderToHtmlString = (digestData: NotificationEmailDigest) => {
 // Firebase Functions
 export const deliverNotifications = functions.pubsub
   .schedule("47 9 1 * 2") // 9:47 AM on the first day of the month and on Tuesdays
+  .timeZone("America/New_York")
   .onRun(deliverEmailNotifications)
 
 export const httpsDeliverNotifications = functions.https.onRequest(

functions/src/notifications/types.ts

@@ -65,6 +65,7 @@ export interface BillHistoryUpdateNotificationFields {
 }
 
 export interface Profile {
+  email?: string
   notificationFrequency?: Frequency
   nextDigestAt?: FirebaseFirestore.Timestamp
 }