Merge branch 'master' of https://github.com/ParallelMaths/parallel

Author: mrmmarsh

functions/utilities/privacy/debugRouter.js

@@ -8,6 +8,7 @@ const {
   userNeedsGuardianTouchKey,
   acceptedKey,
   acceptedByKey,
+  variantModeKey,
   isUnderThirteen,
   getPrivacyState,
   generateGuardianPrivacyAuthToken,
@@ -18,6 +19,8 @@ const {
 // /api/privacy/student/ultra-secret/reset/under13/8daysago
 // /api/privacy/student/ultra-secret/reset/over13/new
 // /api/privacy/student/ultra-secret/reset/over13/8daysago
+// /api/privacy/student/ultra-secret/reset/year8webinar/new
+// /api/privacy/student/ultra-secret/reset/year8webinar/31daysago
 
 const userDB = firebase.firestore().collection("users");
 
@@ -36,6 +39,7 @@ const getViewData = (req) => {
     guardianPrivacyAuthTokenKey,
     acceptedKey,
     acceptedByKey,
+    variantModeKey,
     "birthMonth",
     "birthYear",
   ];
@@ -74,6 +78,7 @@ router.get("/reset/under13/new", studentMiddleware, async (req, res) => {
     [userNeedsGuardianTouchKey]: null,
     [acceptedKey]: null,
     [acceptedByKey]: null,
+    [variantModeKey]: null,
     birthMonth: "1",
     birthYear: "2025",
   };
@@ -91,6 +96,7 @@ router.get("/reset/over13/new", studentMiddleware, async (req, res) => {
     [userNeedsGuardianTouchKey]: null,
     [acceptedKey]: null,
     [acceptedByKey]: null,
+    [variantModeKey]: null,
     birthMonth: "1",
     birthYear: "1990",
   };
@@ -100,6 +106,43 @@ router.get("/reset/over13/new", studentMiddleware, async (req, res) => {
   return res.status(200).send(getResponseBody(req, updateBody));
 });
 
+
+router.get("/reset/year8webinar/new", studentMiddleware, async (req, res) => {
+  const updateBody = {
+    [firstSeenKey]: null,
+    [dueByKey]: Date.now() + 30 * 24 * 60 * 60 * 1000, // 30 days from now
+    [guardianPrivacyAuthTokenKey]: null,
+    [userNeedsGuardianTouchKey]: null,
+    [acceptedKey]: null,
+    [acceptedByKey]: null,
+    [variantModeKey]: 'year8webinar',
+    birthMonth: "1",
+    birthYear: "1990",
+  };
+
+  await userDB.doc(req.user.uid).update(updateBody);
+
+  return res.status(200).send(getResponseBody(req, updateBody));
+});
+
+router.get("/reset/year8webinar/31daysago", studentMiddleware, async (req, res) => {
+  const updateBody = {
+    [firstSeenKey]: Date.now() - 31 * 24 * 60 * 60 * 1000, // first seen was 31 days ago
+    [dueByKey]: Date.now() - 24 * 60 * 60 * 1000, // due date was 1 day ago
+    [userNeedsGuardianTouchKey]: null,
+    [guardianPrivacyAuthTokenKey]: null,
+    [acceptedKey]: null,
+    [acceptedByKey]: null,
+    [variantModeKey]: 'year8webinar',
+    birthMonth: "1",
+    birthYear: "2025", // Age doesn't matter for this variant
+  };
+
+  await userDB.doc(req.user.uid).update(updateBody);
+
+  return res.status(200).send(getResponseBody(req, updateBody));
+});
+
 router.get("/reset/under13/8daysago", studentMiddleware, async (req, res) => {
   const updateBody = {
     [firstSeenKey]: Date.now() - 8 * 24 * 60 * 60 * 1000, // first seen was 8 days ago
@@ -108,6 +151,7 @@ router.get("/reset/under13/8daysago", studentMiddleware, async (req, res) => {
     [guardianPrivacyAuthTokenKey]: generateGuardianPrivacyAuthToken(),
     [acceptedKey]: null,
     [acceptedByKey]: null,
+    [variantModeKey]: null,
     birthMonth: "1",
     birthYear: "2025",
   };
@@ -125,6 +169,7 @@ router.get("/reset/over13/8daysago", studentMiddleware, async (req, res) => {
     [guardianPrivacyAuthTokenKey]: null,
     [acceptedKey]: null,
     [acceptedByKey]: null,
+    [variantModeKey]: null,
     birthMonth: "1",
     birthYear: "1990",
   };

functions/utilities/privacy/utils.js

@@ -17,6 +17,9 @@ const userNeedsGuardianTouchKey = `${latestPrivacyVersion}-ng-touch`;
 const guardianPrivacyAuthTokenKey = "guardianPrivacyAuthToken";
 const acceptedKey = `${latestPrivacyVersion}-accepted`;
 const acceptedByKey = `${latestPrivacyVersion}-acceptedBy`;
+const variantModeKey = `${latestPrivacyVersion}-variant`;
+
+const supportedCustomVariants = ['year8webinar']
 
 const getCleanNumber = (n) => {
   if (!n) return null;
@@ -45,8 +48,23 @@ const isUnderThirteen = (user) => {
   return true;
 };
 
+const getPrivacyVariant = (user) => {
+  try {
+    const variant = user?.[variantModeKey];
+    if (supportedCustomVariants.includes(variant)) {
+      return variant;
+    }
+    return null;
+  } catch {
+    return null;
+  }
+} 
+
 const getPrivacyState = (email, user) => {
   const isUnder13 = isUnderThirteen(user);
+  const variant = getPrivacyVariant(user);
+
+  const useUnder13 = isUnder13 && variant !== 'year8webinar'
 
   if (
     !email.includes("@mcmill.co.uk") ||
@@ -56,6 +74,7 @@ const getPrivacyState = (email, user) => {
       debug: 1,
       visible: false,
       mode: "none",
+      variant
     };
   }
 
@@ -65,20 +84,23 @@ const getPrivacyState = (email, user) => {
       debug: 2,
       visible: false,
       mode: "none",
+      variant
     };
   }
 
+  const firstSeen = user[firstSeenKey];
   const dueBy = user[dueByKey];
 
-  if (dueBy) {
+  if (firstSeen && dueBy) {
     // User has seen popup before
 
     if (Date.now() > dueBy) {
       // if 7 days or more since first seen, show block
       return {
         debug: 3,
         visible: true,
-        mode: isUnder13 ? "under-13-block" : "over-13-block",
+        mode: useUnder13 ? "under-13-block" : "over-13-block",
+        variant
       };
     }
 
@@ -87,6 +109,7 @@ const getPrivacyState = (email, user) => {
       debug: 4,
       visible: false,
       mode: "none",
+      variant
     };
   }
 
@@ -95,7 +118,8 @@ const getPrivacyState = (email, user) => {
     debug: 5,
     visible: true,
     isUnder13,
-    mode: isUnder13 ? "under-13-delay" : "over-13-delay",
+    mode: useUnder13 ? "under-13-delay" : "over-13-delay",
+    variant
   };
 };
 
@@ -126,3 +150,4 @@ exports.latestPrivacyVersion = latestPrivacyVersion;
 exports.validateGuardianToken = validateGuardianToken;
 exports.userNeedsGuardianTouchKey = userNeedsGuardianTouchKey;
 exports.isUnderThirteen = isUnderThirteen;
+exports.variantModeKey = variantModeKey;