From f7163a857722e0b34d0d84e020c2ea16b52affa4 Mon Sep 17 00:00:00 2001
From: Florian Zia <zia.florian@gmail.com>
Date: Tue, 8 Oct 2024 19:40:17 +0200
Subject: [PATCH 1/7] feat: Force feature flags for E2E tests

---
 src/db/tables/featureFlags.ts | 22 +++++++++++++++++++---
 src/e2e/pages/authPage.ts     |  2 +-
 src/middleware.ts             |  7 +++++++
 3 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/src/db/tables/featureFlags.ts b/src/db/tables/featureFlags.ts
index 1df406204cb..642b6ca0367 100644
--- a/src/db/tables/featureFlags.ts
+++ b/src/db/tables/featureFlags.ts
@@ -5,6 +5,7 @@
 import createDbConnection from "../connect";
 import { logger } from "../../app/functions/server/logging";
 import { FeatureFlagRow } from "knex/types/tables";
+import { headers } from "next/headers";
 
 const knex = createDbConnection();
 
@@ -75,11 +76,26 @@ export async function getEnabledFeatureFlags(
       return void subQuery;
     });
 
-  const enabledFlagNames = await query;
-
-  return enabledFlagNames.map(
+  const enabledFlagNames = (await query).map(
     (row: { name: string }) => row.name as FeatureFlagName,
   );
+
+  // Enable feature flags for local E2E tests via URL query params
+  if (process.env.E2E_TEST_ENV === "local") {
+    const forcedFeatureFlags = headers().get("x-forced-feature-flags");
+    if (forcedFeatureFlags) {
+      const forcedFeatureFlagsFiltered = forcedFeatureFlags
+        .split(",")
+        .filter((forcedFeatureFlag) =>
+          featureFlagNames.includes(forcedFeatureFlag as FeatureFlagName),
+        );
+      return [
+        ...new Set([...enabledFlagNames, ...forcedFeatureFlagsFiltered]),
+      ] as FeatureFlagName[];
+    }
+  }
+
+  return enabledFlagNames;
 }
 
 /**
diff --git a/src/e2e/pages/authPage.ts b/src/e2e/pages/authPage.ts
index f773efff27f..149edd3b8b1 100644
--- a/src/e2e/pages/authPage.ts
+++ b/src/e2e/pages/authPage.ts
@@ -96,7 +96,7 @@ export class AuthPage {
 
   async initSilentAuth() {
     await this.page.goto(
-      `${process.env.E2E_TEST_BASE_URL as string}/?utm_source=moz-account&utm_campaign=settings-promo&utm_content=monitor-free`,
+      `${process.env.E2E_TEST_BASE_URL as string}/?feature_flags=PromptNoneAuthFlow&utm_source=moz-account&utm_campaign=settings-promo&utm_content=monitor-free`,
     );
     // FxA can take a while to load on stage:
     await this.page.waitForURL("**/oauth/**");
diff --git a/src/middleware.ts b/src/middleware.ts
index ce7b0609530..17799ce7d25 100644
--- a/src/middleware.ts
+++ b/src/middleware.ts
@@ -12,6 +12,13 @@ export function middleware(request: NextRequest) {
 
   const requestHeaders = new Headers(request.headers);
   requestHeaders.set("x-nonce", nonce);
+
+  if (process.env.E2E_TEST_ENV === "local") {
+    const forcedFeatureFlags =
+      request.nextUrl.searchParams.get("feature_flags");
+    requestHeaders.set("x-forced-feature-flags", forcedFeatureFlags ?? "");
+  }
+
   // Add the CSP to the request headers - that will make Next.js detect it and
   // add it to the inline `<script>` tags that it injects itself, as per
   // https://github.com/vercel/next.js/discussions/51039#discussioncomment-6596642

From 0e6d065dda5dcbe2476154a48227435a26010664 Mon Sep 17 00:00:00 2001
From: Florian Zia <zia.florian@gmail.com>
Date: Wed, 9 Oct 2024 11:18:58 +0200
Subject: [PATCH 2/7] chore: Enable ability to force feature flags for all E2E
 test environments

---
 src/db/tables/featureFlags.ts | 4 ++--
 src/middleware.ts             | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/db/tables/featureFlags.ts b/src/db/tables/featureFlags.ts
index 642b6ca0367..7b89e42098f 100644
--- a/src/db/tables/featureFlags.ts
+++ b/src/db/tables/featureFlags.ts
@@ -80,8 +80,8 @@ export async function getEnabledFeatureFlags(
     (row: { name: string }) => row.name as FeatureFlagName,
   );
 
-  // Enable feature flags for local E2E tests via URL query params
-  if (process.env.E2E_TEST_ENV === "local") {
+  // Force feature flags for E2E tests via URL query params
+  if (typeof process.env.E2E_TEST_ENV !== "undefined") {
     const forcedFeatureFlags = headers().get("x-forced-feature-flags");
     if (forcedFeatureFlags) {
       const forcedFeatureFlagsFiltered = forcedFeatureFlags
diff --git a/src/middleware.ts b/src/middleware.ts
index 17799ce7d25..b5aa0cbb378 100644
--- a/src/middleware.ts
+++ b/src/middleware.ts
@@ -13,7 +13,7 @@ export function middleware(request: NextRequest) {
   const requestHeaders = new Headers(request.headers);
   requestHeaders.set("x-nonce", nonce);
 
-  if (process.env.E2E_TEST_ENV === "local") {
+  if (typeof process.env.E2E_TEST_ENV !== "undefined") {
     const forcedFeatureFlags =
       request.nextUrl.searchParams.get("feature_flags");
     requestHeaders.set("x-forced-feature-flags", forcedFeatureFlags ?? "");

From 4ae78594797e925b6e975b4b6ae4d73f019da948 Mon Sep 17 00:00:00 2001
From: Florian Zia <zia.florian@gmail.com>
Date: Wed, 9 Oct 2024 19:18:33 +0200
Subject: [PATCH 3/7] chore: Enable forcing flags only for local environments

---
 src/db/tables/featureFlags.ts | 2 +-
 src/middleware.ts             | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/db/tables/featureFlags.ts b/src/db/tables/featureFlags.ts
index 7b89e42098f..20211907d01 100644
--- a/src/db/tables/featureFlags.ts
+++ b/src/db/tables/featureFlags.ts
@@ -81,7 +81,7 @@ export async function getEnabledFeatureFlags(
   );
 
   // Force feature flags for E2E tests via URL query params
-  if (typeof process.env.E2E_TEST_ENV !== "undefined") {
+  if (process.env.E2E_TEST_ENV === "local") {
     const forcedFeatureFlags = headers().get("x-forced-feature-flags");
     if (forcedFeatureFlags) {
       const forcedFeatureFlagsFiltered = forcedFeatureFlags
diff --git a/src/middleware.ts b/src/middleware.ts
index b5aa0cbb378..17799ce7d25 100644
--- a/src/middleware.ts
+++ b/src/middleware.ts
@@ -13,7 +13,7 @@ export function middleware(request: NextRequest) {
   const requestHeaders = new Headers(request.headers);
   requestHeaders.set("x-nonce", nonce);
 
-  if (typeof process.env.E2E_TEST_ENV !== "undefined") {
+  if (process.env.E2E_TEST_ENV === "local") {
     const forcedFeatureFlags =
       request.nextUrl.searchParams.get("feature_flags");
     requestHeaders.set("x-forced-feature-flags", forcedFeatureFlags ?? "");

From 431b28970f5ae39f9c57ec649b958d4320884591 Mon Sep 17 00:00:00 2001
From: Florian Zia <zia.florian@gmail.com>
Date: Tue, 22 Oct 2024 15:09:44 +0200
Subject: [PATCH 4/7] fix: Silent authentication E2E test flow

---
 .../getDataBrokerRemovalTimeEstimates.ts      | 35 +++++++++++++++++++
 src/e2e/pages/authPage.ts                     |  2 +-
 src/e2e/specs/auth.spec.ts                    | 14 +++-----
 3 files changed, 40 insertions(+), 11 deletions(-)
 create mode 100644 src/app/functions/server/getDataBrokerRemovalTimeEstimates.ts

diff --git a/src/app/functions/server/getDataBrokerRemovalTimeEstimates.ts b/src/app/functions/server/getDataBrokerRemovalTimeEstimates.ts
new file mode 100644
index 00000000000..3741e04b877
--- /dev/null
+++ b/src/app/functions/server/getDataBrokerRemovalTimeEstimates.ts
@@ -0,0 +1,35 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+import { OnerepScanResultRow } from "knex/types/tables";
+import { LatestOnerepScanData } from "../../../db/tables/onerep_scans";
+import { logger } from "@sentry/utils";
+
+/**
+ * @property {OnerepScanResultRow["data_broker"]} d - Data broker domain.
+ * @property {number} t - Estimated data broker removal time in days.
+ */
+export interface DataBrokerRemovalTime {
+  d: OnerepScanResultRow["data_broker"];
+  t: number;
+}
+
+export function getDataBrokerRemovalTimeEstimates(
+  scanData: LatestOnerepScanData,
+): DataBrokerRemovalTime[] {
+  try {
+    const removalTimeData = JSON.parse(
+      process.env.DATA_BROKER_REMOVAL_ESTIMATES_DATA as string,
+    ) as DataBrokerRemovalTime[];
+    return removalTimeData.filter(({ d }) =>
+      scanData.results.find((scan) => scan.data_broker === d),
+    );
+  } catch (error) {
+    logger.error("could_not_parse_data_broker_removal_estimates_data", {
+      message: (error as Error).message,
+      stack_trace: (error as Error).stack,
+    });
+    return [];
+  }
+}
diff --git a/src/e2e/pages/authPage.ts b/src/e2e/pages/authPage.ts
index 149edd3b8b1..ad17423fc7b 100644
--- a/src/e2e/pages/authPage.ts
+++ b/src/e2e/pages/authPage.ts
@@ -99,6 +99,6 @@ export class AuthPage {
       `${process.env.E2E_TEST_BASE_URL as string}/?feature_flags=PromptNoneAuthFlow&utm_source=moz-account&utm_campaign=settings-promo&utm_content=monitor-free`,
     );
     // FxA can take a while to load on stage:
-    await this.page.waitForURL("**/oauth/**");
+    await this.page.waitForURL("**/authorization?**");
   }
 }
diff --git a/src/e2e/specs/auth.spec.ts b/src/e2e/specs/auth.spec.ts
index 59a8dd6e60a..6962510543c 100644
--- a/src/e2e/specs/auth.spec.ts
+++ b/src/e2e/specs/auth.spec.ts
@@ -72,7 +72,6 @@ test.describe(`${process.env.E2E_TEST_ENV} - Authentication flow verification @s
   test("Verify successful silent authentication with existing user", async ({
     page,
     authPage,
-    dashboardPage,
   }, testInfo) => {
     // speed up test by ignoring non-necessary requests
     await page.route(/(analytics)/, async (route) => {
@@ -89,8 +88,7 @@ test.describe(`${process.env.E2E_TEST_ENV} - Authentication flow verification @s
     await authPage.initSilentAuth();
 
     // assert successful login
-    await expect(dashboardPage.fixedTab).toBeVisible();
-    await expect(dashboardPage.actionNeededTab).toBeVisible();
+    await page.waitForURL("**/user/dashboard/**");
 
     await testInfo.attach(
       `${process.env.E2E_TEST_ENV}-silent-authentication-monitor-dashboard.png`,
@@ -104,7 +102,7 @@ test.describe(`${process.env.E2E_TEST_ENV} - Authentication flow verification @s
   test("Verify failed silent authentication with existing user", async ({
     page,
     authPage,
-    dashboardPage,
+    landingPage,
   }, testInfo) => {
     // speed up test by ignoring non-necessary requests
     await page.route(/(analytics)/, async (route) => {
@@ -114,12 +112,8 @@ test.describe(`${process.env.E2E_TEST_ENV} - Authentication flow verification @s
     // start authentication flow
     await authPage.initSilentAuth();
 
-    // sign in
-    await authPage.signIn(process.env.E2E_TEST_ACCOUNT_EMAIL as string);
-
-    // assert successful login
-    await expect(dashboardPage.fixedTab).toBeVisible();
-    await expect(dashboardPage.actionNeededTab).toBeVisible();
+    // assert failed login
+    await expect(landingPage.monitorLandingHeader).toBeVisible();
 
     await testInfo.attach(
       `${process.env.E2E_TEST_ENV}-silent-authentication-monitor-dashboard.png`,

From e62b3be5b290461ef5280b6ff0112dc99c01d0c2 Mon Sep 17 00:00:00 2001
From: Florian Zia <zia.florian@gmail.com>
Date: Fri, 25 Oct 2024 14:13:49 +0200
Subject: [PATCH 5/7] wip: Debug post authentication state

---
 src/e2e/specs/auth.spec.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/e2e/specs/auth.spec.ts b/src/e2e/specs/auth.spec.ts
index 6962510543c..80265e79c82 100644
--- a/src/e2e/specs/auth.spec.ts
+++ b/src/e2e/specs/auth.spec.ts
@@ -9,7 +9,7 @@ test.describe(`${process.env.E2E_TEST_ENV} - Authentication flow verification @s
     await landingPage.open();
   });
 
-  test("Verify sign up with new user", async ({
+  test.skip("Verify sign up with new user", async ({
     page,
     authPage,
     landingPage,
@@ -39,7 +39,7 @@ test.describe(`${process.env.E2E_TEST_ENV} - Authentication flow verification @s
     );
   });
 
-  test("Verify sign in with existing user", async ({
+  test.skip("Verify sign in with existing user", async ({
     page,
     authPage,
     landingPage,
@@ -99,7 +99,7 @@ test.describe(`${process.env.E2E_TEST_ENV} - Authentication flow verification @s
     );
   });
 
-  test("Verify failed silent authentication with existing user", async ({
+  test.skip("Verify failed silent authentication with existing user", async ({
     page,
     authPage,
     landingPage,

From 7f3feeaca6ffce562b3ab32e7319ebe97b26fda4 Mon Sep 17 00:00:00 2001
From: Florian Zia <zia.florian@gmail.com>
Date: Wed, 30 Oct 2024 17:31:03 +0100
Subject: [PATCH 6/7] chore: Set forced feature flags via setExtraHTTPHeaders

---
 src/e2e/pages/authPage.ts  | 5 ++++-
 src/e2e/specs/auth.spec.ts | 6 +++---
 src/middleware.ts          | 6 ------
 3 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/src/e2e/pages/authPage.ts b/src/e2e/pages/authPage.ts
index ad17423fc7b..b61e27a4aa2 100644
--- a/src/e2e/pages/authPage.ts
+++ b/src/e2e/pages/authPage.ts
@@ -95,8 +95,11 @@ export class AuthPage {
   }
 
   async initSilentAuth() {
+    await this.page.setExtraHTTPHeaders({
+      "x-forced-feature-flags": "PromptNoneAuthFlow",
+    });
     await this.page.goto(
-      `${process.env.E2E_TEST_BASE_URL as string}/?feature_flags=PromptNoneAuthFlow&utm_source=moz-account&utm_campaign=settings-promo&utm_content=monitor-free`,
+      `${process.env.E2E_TEST_BASE_URL as string}/?utm_source=moz-account&utm_campaign=settings-promo&utm_content=monitor-free`,
     );
     // FxA can take a while to load on stage:
     await this.page.waitForURL("**/authorization?**");
diff --git a/src/e2e/specs/auth.spec.ts b/src/e2e/specs/auth.spec.ts
index 80265e79c82..6962510543c 100644
--- a/src/e2e/specs/auth.spec.ts
+++ b/src/e2e/specs/auth.spec.ts
@@ -9,7 +9,7 @@ test.describe(`${process.env.E2E_TEST_ENV} - Authentication flow verification @s
     await landingPage.open();
   });
 
-  test.skip("Verify sign up with new user", async ({
+  test("Verify sign up with new user", async ({
     page,
     authPage,
     landingPage,
@@ -39,7 +39,7 @@ test.describe(`${process.env.E2E_TEST_ENV} - Authentication flow verification @s
     );
   });
 
-  test.skip("Verify sign in with existing user", async ({
+  test("Verify sign in with existing user", async ({
     page,
     authPage,
     landingPage,
@@ -99,7 +99,7 @@ test.describe(`${process.env.E2E_TEST_ENV} - Authentication flow verification @s
     );
   });
 
-  test.skip("Verify failed silent authentication with existing user", async ({
+  test("Verify failed silent authentication with existing user", async ({
     page,
     authPage,
     landingPage,
diff --git a/src/middleware.ts b/src/middleware.ts
index 6fd9942afe5..4a805f5277d 100644
--- a/src/middleware.ts
+++ b/src/middleware.ts
@@ -13,12 +13,6 @@ export function middleware(request: NextRequest) {
   const requestHeaders = new Headers(request.headers);
   requestHeaders.set("x-nonce", nonce);
 
-  if (process.env.E2E_TEST_ENV === "local") {
-    const forcedFeatureFlags =
-      request.nextUrl.searchParams.get("feature_flags");
-    requestHeaders.set("x-forced-feature-flags", forcedFeatureFlags ?? "");
-  }
-
   // Add the CSP to the request headers - that will make Next.js detect it and
   // add it to the inline `<script>` tags that it injects itself, as per
   // https://github.com/vercel/next.js/discussions/51039#discussioncomment-6596642

From 9769e0ad7f9dac895bb206acd6806cf99794de6a Mon Sep 17 00:00:00 2001
From: Florian Zia <zia.florian@gmail.com>
Date: Wed, 30 Oct 2024 18:02:59 +0100
Subject: [PATCH 7/7] fix: Set timeout for landing page header to show

---
 src/e2e/specs/auth.spec.ts | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/e2e/specs/auth.spec.ts b/src/e2e/specs/auth.spec.ts
index 6962510543c..9dae4de91fc 100644
--- a/src/e2e/specs/auth.spec.ts
+++ b/src/e2e/specs/auth.spec.ts
@@ -113,7 +113,10 @@ test.describe(`${process.env.E2E_TEST_ENV} - Authentication flow verification @s
     await authPage.initSilentAuth();
 
     // assert failed login
-    await expect(landingPage.monitorLandingHeader).toBeVisible();
+    await expect(landingPage.monitorLandingHeader).toBeVisible({
+      // The header can take a while to show in Playwright.
+      timeout: 5000,
+    });
 
     await testInfo.attach(
       `${process.env.E2E_TEST_ENV}-silent-authentication-monitor-dashboard.png`,