passes all tests except for those in purchase spec

src/app/api/mock/hibp/data/fakeAllBreaches.json

@@ -47,6 +47,36 @@
       "IsSpamList": false,
       "IsMalware": false,
       "FaviconUrl": null
-    }
+    },
+    {
+      "Id": 95,
+      "Name": "Bonobos",
+      "Title": "Bonobos",
+      "Domain": "bonobos.com",
+      "BreachDate": "2020-08-14T07:00:00.000Z",
+      "AddedDate": "2021-01-31T00:09:25.000Z",
+      "ModifiedDate": "2021-01-31T00:12:58.000Z",
+      "PwnCount": 2811929,
+      "Description": "In August 2020, the clothing store <a href=\"https://www.bleepingcomputer.com/news/security/bonobos-clothing-store-suffers-a-data-breach-hacker-leaks-70gb-database/\" target=\"_blank\" rel=\"noopener\">Bonobos suffered a data breach</a> that exposed almost 70GB of data containing 2.8 million unique email addresses. The breach also exposed names, physical and IP addresses, phone numbers, order histories and passwords stored as salted SHA-512 hashes, including historical passwords. The breach also exposed partial credit card data including card type, the name on the card, expiry date and the last 4 digits of the card. The data was provided to HIBP by <a href=\"https://dehashed.com/\" target=\"_blank\" rel=\"noopener\">dehashed.com</a>.",
+      "LogoPath": "https://haveibeenpwned.com/Content/Images/PwnedLogos/Bonobos.png",
+      "DataClasses": [
+        "email-addresses",
+        "historical-passwords",
+        "ip-addresses",
+        "names",
+        "partial-credit-card-data",
+        "passwords",
+        "phone-numbers",
+        "physical-addresses",
+        "purchases"
+      ],
+      "IsVerified": true,
+      "IsFabricated": false,
+      "IsSensitive": false,
+      "IsRetired": false,
+      "IsSpamList": false,
+      "IsMalware": false,
+      "FaviconUrl": null
+    }    
   ]
 }

src/app/api/mock/hibp/data/fakeBreaches.json

@@ -2,7 +2,7 @@
   "data": [
     {
       "hashSuffix": "",
-      "websites": ["000webhost", "123RF"]
+      "websites": ["000webhost", "123RF", "Bonobos"]
     }
   ]
 }

src/app/api/mock/hibp/breachedaccount/range/[hashPrefix]/route.ts → src/app/api/mock/hibp/range/search/[hashPrefix]/route.ts

@@ -28,13 +28,15 @@ export function GET() {
   const userEmail = process.env.E2E_TEST_ACCOUNT_EMAIL;
   //TODO: getServerSession doesn't work here for some reason
   const currentUserSha = getSha1(userEmail as BinaryLike);
-  logger.info("Mock endpoint: /breachedaccount/range/");
+  logger.info("Mock endpoint: /range/search/");
 
   let data = fakeBreaches.data as BreachedAccountResponse;
 
   data = data.map((elem) => ({
     ...elem,
     hashSuffix: currentUserSha.slice(6).toUpperCase(),
   }));
-  return NextResponse.json(data);
+  const res = NextResponse.json(data);
+  console.log("opa1", data);
+  return res;
 }

src/app/api/mock/onerep/config/config.ts

@@ -2,8 +2,10 @@
  * 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 { randomInt } from "crypto";
 import { StateAbbr } from "../../../../../utils/states";
 import MockUser from "./mockUser.json";
+// import { getLatestOnerepScanResults } from "../../../../../db/tables/onerep_scans";
 
 interface Broker {
   id: number;
@@ -31,8 +33,8 @@ export function MOCK_ONEREP_PROFILE_ID() {
   return MockUser.PROFILE_ID;
 }
 
-export function MOCK_ONEREP_SCAN_ID() {
-  return MockUser.SCAN_ID;
+export function MOCK_ONEREP_MAGIC_NUM_0() {
+  return MockUser.MAGIC_NUM_0;
 }
 
 export function MOCK_ONEREP_TIME() {
@@ -68,16 +70,30 @@ export function MOCK_ONEREP_ADDRESSES() {
   })) as typeOfAddr;
 }
 
-const DEFAULT_NUMBER_BREACHES = 10;
-const magicNum0 = 37680;
-const magicNum1 = 23;
+const DEFAULT_NUMBER_BREACHES = 5;
+const MAGIC_NUM_brokerId = 78127;
+const MAGIC_NUM_1 = 24623;
+const MAGIC_NUM_2 = 2161;
+
+export function MOCK_ONEREP_MAGIC_NUM_1() {
+  return MAGIC_NUM_1;
+}
+
+export function MOCK_ONEREP_MAGIC_NUM_2() {
+  return MAGIC_NUM_2;
+}
+
+function getScanId(profileId: string) {
+  return (Number(profileId) * MAGIC_NUM_1) % MAGIC_NUM_2;
+}
 
 export function MOCK_ONEREP_BROKERS(
   profileId: string,
   page: string,
   perPage: string,
 ) {
   const mockResponseData = MockUser.BROKERS_LIST;
+  const latestScanId = getScanId(profileId);
 
   const mockLinks = {
     first: `${process.env.ONEREP_API_BASE}/scan-results?profile_id%5B0%5D=${profileId}&per_page=${perPage}&page=${page}`,
@@ -112,19 +128,21 @@ export function MOCK_ONEREP_BROKERS(
         return {
           ...(broker as Broker),
           profile_id: profileId,
-          scan_id: MOCK_ONEREP_SCAN_ID(),
+          scan_id: latestScanId,
         };
       });
     }
 
     return mockResponseData;
   }
 
+  const idStart = latestScanId * MOCK_ONEREP_MAGIC_NUM_0();
+
   const responseData = {
     data: new Array(DEFAULT_NUMBER_BREACHES).fill(null).map((_, index) => ({
-      id: magicNum0 - index,
+      id: idStart - index,
       profile_id: profileId,
-      scan_id: MOCK_ONEREP_SCAN_ID(),
+      scan_id: latestScanId,
       status: "new",
       first_name: MOCK_ONEREP_FIRSTNAME(),
       middle_name: null,
@@ -136,11 +154,11 @@ export function MOCK_ONEREP_BROKERS(
       relatives: [],
       link: `https://mockexample.com/link-to-databroker${index}`,
       data_broker: `mockexample${index}.com`,
-      data_broker_id: magicNum1 - index,
+      data_broker_id: MAGIC_NUM_brokerId - index,
       optout_attempts: 0,
       created_at: MOCK_ONEREP_TIME(),
       updated_at: MOCK_ONEREP_TIME(),
-      url: `${process.env.ONEREP_API_BASE}scan-results/${magicNum0 - index}`,
+      url: `${process.env.ONEREP_API_BASE}scan-results/${idStart - index}`,
     })),
     links: mockLinks,
     meta: mockMeta,

src/app/api/mock/onerep/config/mockUser.json

@@ -1,6 +1,6 @@
 {
   "PROFILE_ID": 777,
-  "SCAN_ID": 129837123,
+  "MAGIC_NUM_0": 2914,
   "TIME": "2024-06-19T01:37:02+0000",
   "FIRSTNAME": "John",
   "LASTNAME": "Doe",
@@ -19,4 +19,4 @@
     "meta": {},
     "valid": false
   }
-}
+}

src/app/api/mock/onerep/config/route.ts

@@ -5,6 +5,7 @@
 import { NextRequest, NextResponse } from "next/server";
 import fs from "fs";
 import path from "path";
+import { randomInt } from "crypto";
 
 /* 
 
@@ -43,6 +44,7 @@ export async function POST(req: NextRequest) {
     if (erase) {
       jsonData.BROKERS_LIST.data = [];
       jsonData.BROKERS_LIST.valid = false;
+      jsonData.MAGIC_NUM_0 = randomInt(1000, 100000);
     } else {
       if (!newData.brokers || !newData.brokers.data) {
         return NextResponse.json(

src/app/api/mock/onerep/config/test.json

@@ -2,8 +2,8 @@
   "data": [
     {
       "id": 45000,
-      "profile_id": 0,
-      "scan_id": 0,
+      "profile_id": -1,
+      "scan_id": -1,
       "status": "new",
       "first_name": "John",
       "middle_name": null,

src/app/api/mock/onerep/profiles/[profileId]/optout/route.ts

@@ -4,7 +4,7 @@
 
 import { NextRequest, NextResponse } from "next/server";
 
-export function PUT(req: NextRequest) {
+export function POST(req: NextRequest) {
   const profileId: number = Number(req.url.match(/profiles\/([0-9]+)/)![1]);
 
   if (!profileId || isNaN(profileId)) {

src/app/api/mock/onerep/profiles/[profileId]/scans/[scanId]/route.ts

@@ -11,7 +11,6 @@ export function GET(req: NextRequest) {
   const profileId = Number(req.url.match(/profiles\/([0-9]+)/)![1]);
   const scanId = Number(req.url.match(/scans\/([0-9]+)/)![1]);
 
-  // Check for the availability of the scan
   const responseData = {
     id: scanId,
     profile_id: profileId,

src/app/api/mock/onerep/profiles/[profileId]/scans/route.ts

@@ -2,30 +2,38 @@
  * 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 { MOCK_ONEREP_SCAN_ID, MOCK_ONEREP_TIME } from "../../../config/config";
 import { NextRequest, NextResponse } from "next/server";
-
-//TODO: mock out the id field and url
+import {
+  MOCK_ONEREP_TIME,
+  MOCK_ONEREP_MAGIC_NUM_1,
+  MOCK_ONEREP_MAGIC_NUM_2,
+} from "../../../config/config";
 
 function extractProfileId(req: NextRequest) {
   const idFromUrl = Number(req.url.match(/profiles\/([0-9]+)\/scans/)![1]);
   return idFromUrl;
 }
 
+function getScanId(profileId: number) {
+  return (profileId * MOCK_ONEREP_MAGIC_NUM_1()) % MOCK_ONEREP_MAGIC_NUM_2();
+}
+
 export function POST(req: NextRequest) {
   const profileId: number = extractProfileId(req);
   if (!profileId || isNaN(profileId)) {
     return NextResponse.json({ error: "Invalid profile ID" });
   }
 
+  const scanId = getScanId(profileId);
+
   const mockResponse = {
-    id: MOCK_ONEREP_SCAN_ID(),
+    id: scanId,
     profile_id: profileId,
     status: "finished",
     reason: "manual",
     created_at: MOCK_ONEREP_TIME(),
     updated_at: MOCK_ONEREP_TIME(),
-    url: `${process.env.ONEREP_API_BASE}/profiles/${profileId}/scans/${MOCK_ONEREP_SCAN_ID()}`,
+    url: `${process.env.ONEREP_API_BASE}/profiles/${profileId}/scans/${scanId}`,
   };
 
   return NextResponse.json(mockResponse);
@@ -38,17 +46,18 @@ export function GET(req: NextRequest) {
     return NextResponse.json({ error: "Invalid profile ID" });
   }
 
-  //TODO: mock out ID here and urls
+  const scandId = getScanId(profileId);
+
   const responseData = {
     data: [
       {
-        id: MOCK_ONEREP_SCAN_ID(),
+        id: scandId,
         profile_id: profileId,
         status: "finished",
         reason: "manual",
         created_at: MOCK_ONEREP_TIME(),
         updated_at: MOCK_ONEREP_TIME(),
-        url: `${process.env.ONEREP_API_BASE}/profiles/${profileId}/scans/${MOCK_ONEREP_SCAN_ID()}`,
+        url: `${process.env.ONEREP_API_BASE}/profiles/${profileId}/scans/${scandId}`,
       },
     ],
     links: {

src/db/tables/onerep_scans.ts

@@ -4,7 +4,6 @@
 
 import createDbConnection from "../connect.js";
 import { logger } from "../../app/functions/server/logging";
-import { MOCK_ONEREP_SCAN_ID } from "../../app/api/mock/onerep/config/config.ts";
 
 import {
   ScanResult,
@@ -206,7 +205,7 @@ async function addOnerepScanResults(
   onerepProfileId: number,
   onerepScanResults: Array<ScanResult>,
 ) {
-  const scanResultsMap = onerepScanResults.map((scanResult) => ({
+  let scanResultsMap = onerepScanResults.map((scanResult) => ({
     onerep_scan_result_id: scanResult.id,
     onerep_scan_id: scanResult.scan_id,
     link: scanResult.link,
@@ -241,11 +240,35 @@ async function addOnerepScanResults(
   });
 
   if (scanResultsMap.length > 0) {
-    //Delete previous records to allow dynamic mock data configuration.
-    if (process.env.ONEREP_API_BASE!.includes("localhost")) {
-      await knex("onerep_scan_results")
-        .where("onerep_scan_id", MOCK_ONEREP_SCAN_ID())
-        .del();
+    const scan_id = scanResultsMap[0].onerep_scan_id;
+
+    // Delete previous records to allow dynamic mock data configuration, maintaining the 'manually_resolved' field.
+    if (!process.env.ONEREP_API_BASE!.includes("mozilla.api.onerep.com")) {
+      const existingRecords = await knex("onerep_scan_results")
+        .where("onerep_scan_id", scan_id)
+        .select("onerep_scan_result_id", "manually_resolved");
+
+      const resolvedStatusMap = new Map();
+      existingRecords.forEach((record) => {
+        resolvedStatusMap.set(
+          record.onerep_scan_result_id,
+          record.manually_resolved,
+        );
+      });
+
+      await knex("onerep_scan_results").where("onerep_scan_id", scan_id).del();
+
+      scanResultsMap = scanResultsMap.map((item) => {
+        if (resolvedStatusMap.has(item.onerep_scan_result_id)) {
+          return {
+            ...item,
+            manually_resolved: resolvedStatusMap.get(
+              item.onerep_scan_result_id,
+            ),
+          };
+        }
+        return item;
+      });
     }
 
     await knex("onerep_scan_results")

src/e2e/specs/auth.spec.ts

@@ -27,10 +27,7 @@ test.describe(`${process.env.E2E_TEST_ENV} - Authentication flow verification @s
     await authPage.signUp(randomEmail, page);
 
     // assert successful login
-    const successUrl =
-      process.env.E2E_TEST_ENV === "local"
-        ? "/user/dashboard"
-        : "/user/welcome";
+    const successUrl = "/user/welcome";
     expect(page.url()).toBe(`${process.env.E2E_TEST_BASE_URL}${successUrl}`);
 
     await testInfo.attach(