enable privacy popups for everyobe

Author: dr3

functions/utilities/getTypeSafeUser.js

@@ -66,5 +66,6 @@ const getTypeSafeUser = (user) => {
 }
 
 module.exports = {
-    getTypeSafeUser
+    getTypeSafeUser,
+    getGuardianEmails
 }

functions/utilities/privacy/debugRouter.js

@@ -83,6 +83,11 @@ router.post("/reset", studentMiddleware, async (req, res) => {
     birthYear: req.body.birthYear || "2025",
   };
 
+  if (req.body.emails) {
+    updateBody.emails = req.body.emails;
+    updateBody.guardianEmail = null;
+  }
+
   await userDB.doc(req.user.uid).update(updateBody);
 
   return res.status(200).send(getResponseBody(req, updateBody));

functions/utilities/privacy/router.js

@@ -15,6 +15,9 @@ const {
   latestTouchKey
 } = require("./privacyKeys");
 const debugRouter = require("./debugRouter");
+const {
+  getGuardianEmails
+} = require("../getTypeSafeUser");
 
 router.use("/student/ultra-secret", debugRouter);
 
@@ -140,14 +143,18 @@ router.get("/student/delay", studentMiddleware, async (req, res) => {
 
 router.post("/student/update", studentMiddleware, async (req, res) => {
   try {
+    const emails = mergeAccountEmailsWithReqBodyGuardianEmails(req, res);
+    const hasGuardianEmails = emails.some(e => e?.type === 'guardian');
+    const guardianTouchKey = req.user[userNeedsGuardianTouchKey] || Date.now();
+
     const updateBody = {
-      emails: mergeAccountEmailsWithReqBodyGuardianEmails(req, res),
+      emails,
       guardianEmail: null,
       [guardianPrivacyAuthTokenKey]:
         req.user[guardianPrivacyAuthTokenKey] ||
         generateGuardianPrivacyAuthToken(),
       [userNeedsGuardianTouchKey]:
-        req.user[userNeedsGuardianTouchKey] || Date.now(),
+        hasGuardianEmails ? guardianTouchKey : null,
       [firstSeenKey]: req.user[firstSeenKey] || Date.now(),
       [dueByKey]: req.user[dueByKey] || Date.now() + SevenDays,
       [latestTouchKey]: Date.now(),

functions/utilities/privacy/utils.js

@@ -6,6 +6,9 @@ const {
   acceptedKey,
   variantModeKey,
 } = require("./privacyKeys");
+const {
+  getGuardianEmails
+} = require("../getTypeSafeUser");
 
 const userDB = firebase.firestore().collection("users");
 
@@ -41,6 +44,10 @@ const isUnderThirteen = (user) => {
     return false;
   }
 
+  if (user.code) {
+    return false; // assume teachers are over 13
+  }
+
   return true;
 };
 
@@ -56,8 +63,8 @@ const getPrivacyVariant = (user) => {
   }
 }
 
-const shouldRetryPopup = (lastTouched, isUnder13) => {
-  if (isUnder13) return false;
+const shouldRetryPopup = (lastTouched, isUnder13, guardianEmails) => {
+  if (isUnder13 && guardianEmails.length) return false;
 
   try {
     if (!lastTouched) return false;
@@ -71,21 +78,10 @@ const shouldRetryPopup = (lastTouched, isUnder13) => {
 const getPrivacyState = (email, user) => {
   const isUnder13 = isUnderThirteen(user);
   const variant = getPrivacyVariant(user);
+  const guardianEmails = getGuardianEmails(user);
 
   const useUnder13 = isUnder13 && variant !== 'year8webinar'
 
-  if (
-    !email.includes("@mcmill.co.uk") ||
-    process.env.IS_FIREBASE_CLI == "true"
-  ) {
-    return {
-      debug: 1,
-      visible: false,
-      mode: "none",
-      variant
-    };
-  }
-
   if (user[acceptedKey]) {
     // User has already accepted
     return {
@@ -100,7 +96,7 @@ const getPrivacyState = (email, user) => {
   const dueBy = user[dueByKey];
   const latestTouch = user[latestTouchKey];
 
-  const shouldRetry = shouldRetryPopup(latestTouch, useUnder13);
+  const shouldRetry = shouldRetryPopup(latestTouch, useUnder13, guardianEmails);
 
   const delayResponse = {
     visible: true,