Remove remaining references to Moscary

Vinnl · Vinnl · commit 6c6b417a7579 · 2025-09-25T16:58:05.000+02:00
diff --git a/.env b/.env
@@ -64,9 +64,6 @@ ONEREP_API_BASE=https://mozilla.api.onerep.com
 ONEREP_API_KEY=
 ONEREP_WEBHOOK_SECRET="unsafe-default-secret-for-dev"
 
-# Moscary API
-MOSCARY_API_BASE=http://localhost:8001
-
 # Firefox Remote Settings
 FX_REMOTE_SETTINGS_WRITER_SERVER=https://settings-writer.prod.mozaws.net/v1
 FX_REMOTE_SETTINGS_WRITER_USER=
diff --git a/.env.local.example b/.env.local.example
@@ -12,9 +12,6 @@ HIBP_NOTIFY_TOKEN=
 ONEREP_API_KEY=
 ONEREP_WEBHOOK_SECRET=
 
-# Moscary setup
-MOSCARY_API_BEARER_TOKEN=
-
 # Used for `npm run create-location-data`
 AWS_ACCESS_KEY_ID=
 AWS_SECRET_ACCESS_KEY=
@@ -50,9 +47,6 @@ SUBSCRIPTION_BILLING_AMOUNT_BUNDLE_MONTHLY_US=42
 # HIBP setup
 HIBP_KANON_API_ROOT=https://enterprise.stage-api.haveibeenpwned.com
 
-# Moscary setup
-MOSCARY_API_BASE=http://localhost:8001
-
 # Sentry setup
 SENTRY_DSN=https://573f784b5cc7481ebf8c0c385d2ad776@o1069899.ingest.sentry.io/4504612374052864
 NEXT_PUBLIC_SENTRY_DSN=https://573f784b5cc7481ebf8c0c385d2ad776@o1069899.ingest.sentry.io/4504612374052864
diff --git a/src/app/(proper_react)/(redesign)/(authenticated)/user/(dashboard)/dashboard/fix/data-broker-profiles/manual-remove/ManualRemove.test.tsx b/src/app/(proper_react)/(redesign)/(authenticated)/user/(dashboard)/dashboard/fix/data-broker-profiles/manual-remove/ManualRemove.test.tsx
@@ -8,9 +8,6 @@ import { composeStory } from "@storybook/react";
 import { axe } from "jest-axe";
 import { userEvent } from "@testing-library/user-event";
 
-import Meta, { ManualRemoveViewStory } from "./ManualRemove.stories";
-import { useTelemetry as useTelemetryImported } from "../../../../../../../../../hooks/useTelemetry";
-
 const mockedRouterRefresh = jest.fn();
 
 jest.mock("next/navigation", () => {
@@ -22,6 +19,9 @@ jest.mock("next/navigation", () => {
   };
 });
 
+import Meta, { ManualRemoveViewStory } from "./ManualRemove.stories";
+import { useTelemetry as useTelemetryImported } from "../../../../../../../../../hooks/useTelemetry";
+
 jest.mock("../../../../../../../../../hooks/useTelemetry");
 jest.mock(
   "../../../../../../../../../components/client/exposure_card/DataBrokerImage",
@@ -54,9 +54,9 @@ it("passes the axe accessibility test suite", async () => {
 
 it("removes the manual resolution button once a profile has been resolved", async () => {
   const user = userEvent.setup();
-  const resolveScanResult = jest.fn().mockResolvedValueOnce({ ok: true });
+  global.fetch = jest.fn().mockResolvedValueOnce({ ok: true });
   const ComposedManualRemoveView = composeStory(ManualRemoveViewStory, Meta);
-  render(<ComposedManualRemoveView resolveScanResult={resolveScanResult} />);
+  render(<ComposedManualRemoveView />);
 
   const resolveButtonsBeforeResolving = screen.getAllByRole("button", {
     name: "Mark as fixed",
@@ -74,9 +74,9 @@ it("removes the manual resolution button once a profile has been resolved", asyn
 
 it("refreshes the client-side router cache after resolving a profile", async () => {
   const user = userEvent.setup();
-  const resolveScanResult = jest.fn().mockResolvedValueOnce({ ok: true });
+  global.fetch = jest.fn().mockResolvedValueOnce({ ok: true });
   const ComposedManualRemoveView = composeStory(ManualRemoveViewStory, Meta);
-  render(<ComposedManualRemoveView resolveScanResult={resolveScanResult} />);
+  render(<ComposedManualRemoveView />);
 
   expect(mockedRouterRefresh).not.toHaveBeenCalled();
 
@@ -92,11 +92,9 @@ it("refreshes the client-side router cache after resolving a profile", async ()
 
 it("keeps the manual resolution button if resolving a profile failed", async () => {
   const user = userEvent.setup();
-  const resolveScanResult = jest
-    .fn()
-    .mockRejectedValueOnce(new Error("Failed to resolve scan result"));
+  global.fetch = jest.fn().mockResolvedValueOnce({ ok: false });
   const ComposedManualRemoveView = composeStory(ManualRemoveViewStory, Meta);
-  render(<ComposedManualRemoveView resolveScanResult={resolveScanResult} />);
+  render(<ComposedManualRemoveView />);
 
   const resolveButtonsBeforeResolving = screen.getAllByRole("button", {
     name: "Mark as fixed",
diff --git a/src/app/(proper_react)/(redesign)/(authenticated)/user/(dashboard)/settings/SettingsPage.test.tsx b/src/app/(proper_react)/(redesign)/(authenticated)/user/(dashboard)/settings/SettingsPage.test.tsx
@@ -124,7 +124,6 @@ const mockedSubscriber: SubscriberRow = {
   monthly_email_optout: false,
   signup_language: "fr-CH, fr;q=0.9, en;q=0.8, de;q=0.7,*;q=0.5",
   onerep_profile_id: null,
-  moscary_id: null,
   monthly_monitor_report_at: null,
   monthly_monitor_report: false,
   sign_in_count: null,
diff --git a/src/app/(proper_react)/(redesign)/(authenticated)/user/(dashboard)/settings/panels/SettingsPanelEditProfile/EditProfileFormInputs.tsx b/src/app/(proper_react)/(redesign)/(authenticated)/user/(dashboard)/settings/panels/SettingsPanelEditProfile/EditProfileFormInputs.tsx
@@ -255,6 +255,9 @@ function EditProfileFormInputs(props: {
               })
             }
             name={`${props.profileDataKey}-0`}
+            // Used to be covered by a test that was removed;
+            // not worth re-testing at this point:
+            /* c8 ignore next */
             value={primaryPhoneItem.value ?? ""}
             isInvalid={!primaryPhoneItem.isValid}
             label={l10n.getString(
@@ -290,6 +293,9 @@ function EditProfileFormInputs(props: {
                           })
                         }
                         name={inputKey}
+                        // Used to be covered by a test that was removed;
+                        // not worth re-testing at this point:
+                        /* c8 ignore next */
                         value={item.value ?? ""}
                         isInvalid={!item.isValid || item.isDuplicate}
                         label={l10n.getString(
diff --git a/src/app/(proper_react)/(redesign)/(authenticated)/user/(dashboard)/settings/stories/settingsMockData.ts b/src/app/(proper_react)/(redesign)/(authenticated)/user/(dashboard)/settings/stories/settingsMockData.ts
@@ -93,7 +93,6 @@ export const mockedSubscriber: SubscriberRow = {
   monthly_email_at: "2022-08-07 14:22:00.000-05",
   monthly_email_optout: false,
   signup_language: "fr-CH, fr;q=0.9, en;q=0.8, de;q=0.7,*;q=0.5",
-  moscary_id: null,
   onerep_profile_id: null,
   monthly_monitor_report_at: null,
   monthly_monitor_report: false,
diff --git a/src/app/api/v1/admin/users/[fxaUid]/route.ts b/src/app/api/v1/admin/users/[fxaUid]/route.ts
@@ -30,7 +30,6 @@ import { isMozMail } from "../../../../../functions/universal/isMozMail";
 export type GetUserStateResponseBody = {
   success: true;
   subscriberId: SubscriberRow["id"];
-  moscaryId: SubscriberRow["moscary_id"];
   /** @deprecated */
   onerepProfileId: SubscriberRow["onerep_profile_id"];
   createdAt: SubscriberRow["created_at"];
@@ -78,7 +77,6 @@ export async function GET(
       const responseBody: GetUserStateResponseBody = {
         success: true,
         subscriberId: subscriber.id,
-        moscaryId: subscriber.moscary_id,
         onerepProfileId: subscriber.onerep_profile_id,
         createdAt: subscriber.created_at,
         updatedAt: subscriber.updated_at,
diff --git a/src/app/functions/server/getRelevantGuidedSteps.ts b/src/app/functions/server/getRelevantGuidedSteps.ts
@@ -288,6 +288,9 @@ export function hasCompletedStep(
     const scanStatus = data.latestScanData?.scan?.onerep_scan_status;
     const hasResolvedAllScanResults =
       (scanStatus === "finished" || scanStatus === "in_progress") &&
+      // Used to be covered by a test that was removed;
+      // not worth re-testing at this point:
+      /* c8 ignore next */
       (data.latestScanData!.results ?? []).every(
         (scanResult) =>
           scanResult.manually_resolved || scanResult.status !== "new",
diff --git a/src/app/functions/server/onerep.ts b/src/app/functions/server/onerep.ts
@@ -554,7 +554,7 @@ async function fetchAllPages<Data>(
 // Local instance map to cache results to prevent excessive API requests
 // Would be nice to share this cache with other pod via Redis in the future
 const profileStatsCache = new Map<string, ProfileStats>();
-/** @deprecated Only used to check whether we've hit OneRep quota compared to env vars, so doesn't need Moscary equialent check whether we've hit OneRep quota compared to env vars, so doesn't need Moscary equialents. */
+/** @deprecated Only used to check whether we've hit OneRep quota compared to env vars. */
 export async function getProfilesStats(
   from?: Date,
   to?: Date,
diff --git a/src/app/functions/server/sanitize.ts b/src/app/functions/server/sanitize.ts
@@ -61,7 +61,6 @@ export type SanitizedSubscriberRow = SanitizationMarker &
     | "waitlists_joined"
     | "breach_stats"
     | "monthly_monitor_report"
-    | "moscary_id"
     | "onerep_profile_id"
     | "email_addresses"
   >;
@@ -92,7 +91,6 @@ export function sanitizeSubscriberRow(
     waitlists_joined: subscriber.waitlists_joined,
     breach_stats: subscriber.breach_stats,
     monthly_monitor_report: subscriber.monthly_monitor_report,
-    moscary_id: subscriber.moscary_id,
     onerep_profile_id: subscriber.onerep_profile_id,
     email_addresses: subscriber.email_addresses,
     // If we want to avoid passing this property to the client-side, we can also
diff --git a/src/app/functions/server/updateDataBrokerScanProfile.test.ts b/src/app/functions/server/updateDataBrokerScanProfile.test.ts
@@ -50,11 +50,6 @@ jest.mock("./logging", () => {
   };
 });
 
-jest.mock("./moscary", () => ({
-  getProfile: jest.fn(),
-  updateProfile: jest.fn(),
-}));
-
 describe("Update broker scan profile (OneRep)", () => {
   it("does not throw errors when passing data to the relevant backends", async () => {
     jest.mock("../../../db/tables/onerep_profiles", () => ({
diff --git a/src/db/tables/subscribers.ts b/src/db/tables/subscribers.ts
@@ -281,22 +281,6 @@ async function setBreachResolution(
 }
 /* c8 ignore stop */
 
-// Not covered by tests; mostly side-effects. See test-coverage.md#mock-heavy
-/* c8 ignore start */
-async function setMoscaryId(
-  user: SubscriberRow,
-  moscaryId: NonNullable<SubscriberRow["moscary_id"]>,
-): Promise<(SubscriberRow & WithEmailAddresses) | null> {
-  await knex("subscribers").where("id", user.id).update({
-    moscary_id: moscaryId,
-    // @ts-ignore knex.fn.now() results in it being set to a date,
-    // even if it's not typed as a JS date object:
-    updated_at: knex.fn.now(),
-  });
-  return (await getSubscriberByFxaUid(user.fxa_uid)) ?? null;
-}
-/* c8 ignore stop */
-
 // Not covered by tests; mostly side-effects. See test-coverage.md#mock-heavy
 /* c8 ignore start */
 async function deleteUnverifiedSubscribers() {
@@ -356,9 +340,9 @@ async function deleteResolutionsWithEmail(id: number, email: string) {
 
 // Not covered by tests; mostly side-effects. See test-coverage.md#mock-heavy
 /* c8 ignore start */
-async function getPotentialSubscribersWaitingForFirstDataBrokerRemovalFixedEmail(options: {
-  stillOnOnerep: boolean;
-}): Promise<SubscriberRow[]> {
+async function getPotentialSubscribersWaitingForFirstDataBrokerRemovalFixedEmail(): Promise<
+  SubscriberRow[]
+> {
   const rows = await knex("subscribers")
     .select()
     // Only send to Plus users...
@@ -367,7 +351,7 @@ async function getPotentialSubscribersWaitingForFirstDataBrokerRemovalFixedEmail
       MONITOR_PREMIUM_CAPABILITY,
     )
     // ...with an OneRep account...
-    .whereNotNull(options.stillOnOnerep ? "onerep_profile_id" : "moscary_id")
+    .whereNotNull("onerep_profile_id")
     // ...who haven't received the email...
     .andWhere("first_broker_removal_email_sent", false)
     // ...and signed up after the feature flag `FirstDataBrokerRemovalFixedEmail`
@@ -630,9 +614,7 @@ async function incrementSignInCountForEligibleFreeUser(
 ) {
   return await knex("subscribers")
     .where("fxa_uid", fxaId)
-    .where((clause) =>
-      clause.whereNotNull("onerep_profile_id").orWhereNotNull("moscary_id"),
-    )
+    .whereNotNull("onerep_profile_id")
     .increment("sign_in_count", 1);
 }
 /* c8 ignore stop */
@@ -685,7 +667,6 @@ export {
   setAllEmailsToPrimary,
   setMonthlyMonitorReport,
   setBreachResolution,
-  setMoscaryId,
   getPotentialSubscribersWaitingForFirstDataBrokerRemovalFixedEmail,
   getFreeSubscribersWaitingForMonthlyEmail,
   getPlusSubscribersWaitingForMonthlyEmail,
diff --git a/src/emails/templates/monthlyActivityFree/MonthlyActivityFreeEmail.test.tsx b/src/emails/templates/monthlyActivityFree/MonthlyActivityFreeEmail.test.tsx
@@ -11,7 +11,6 @@ import Meta, {
   MonthlyReportFreeUserWithScanNoRemainingExposures,
   MonthlyReportFreeUserWithScanWithExposuresNothingResolved,
   MonthlyReportFreeUserWithScanWithExposuresResolved,
-  MonthlyReportFreeUserWithMoscaryEnabled,
 } from "./MonthlyActivityFreeEmail.stories";
 
 it("shows the right label in the right box if a scan hasn't been run", () => {
@@ -108,16 +107,3 @@ it("shows the congratulatory banner if no exposures remaining after scan", () =>
 
   expect(greatNewsHeader).toBeInTheDocument();
 });
-
-it("lists data exposures also for users who ran a scan through Moscary", () => {
-  const ComposedEmail = composeStory(
-    MonthlyReportFreeUserWithMoscaryEnabled,
-    Meta,
-  );
-  render(<ComposedEmail />);
-
-  const dataExposures = screen.getByText("Data exposures", { exact: true });
-
-  expect(screen.queryByText("Data breaches", { exact: true })).toBeNull();
-  expect(dataExposures).toBeInTheDocument();
-});
diff --git a/src/knex-tables.d.ts b/src/knex-tables.d.ts
@@ -4,7 +4,6 @@
 
 import { Knex } from "knex";
 import { Profile } from "next-auth";
-import type { UUID } from "node:crypto";
 import { OnerepUsPhoneNumber, Scan } from "./app/functions/server/onerep";
 import { ISO8601DateString } from "./utils/parse";
 import { StateAbbr } from "./utils/states";
@@ -164,7 +163,6 @@ declare module "knex/types/tables" {
     monthly_monitor_report_at: null | Date;
     monthly_monitor_report: boolean;
     breach_resolution: BreachResolution;
-    moscary_id: null | UUID;
     /** @deprecated */
     onerep_profile_id: null | number;
     sign_in_count: null | number;
@@ -190,7 +188,6 @@ declare module "knex/types/tables" {
     | "monthly_monitor_report_at"
     | "monthly_monitor_report"
     | "breach_resolution"
-    | "moscary_id"
     | "onerep_profile_id"
     | "email_addresses"
     | "first_broker_removal_email_sent"
diff --git a/src/scripts/cronjobs/firstDataBrokerRemovalFixed.tsx b/src/scripts/cronjobs/firstDataBrokerRemovalFixed.tsx
@@ -49,15 +49,8 @@ async function run() {
       `Could not send first data broker removal fixed emails, because the env var FIRST_DATA_BROKER_REMOVAL_FIXED_EMAIL_BATCH_SIZE has a non-numeric value: [${process.env.FIRST_DATA_BROKER_REMOVAL_FIXED_EMAIL_BATCH_SIZE}].`,
     );
   }
-  const potentialSubscribersToEmail = (
-    await getPotentialSubscribersWaitingForFirstDataBrokerRemovalFixedEmail({
-      stillOnOnerep: true,
-    })
-  ).concat(
-    await getPotentialSubscribersWaitingForFirstDataBrokerRemovalFixedEmail({
-      stillOnOnerep: false,
-    }),
-  );
+  const potentialSubscribersToEmail =
+    await getPotentialSubscribersWaitingForFirstDataBrokerRemovalFixedEmail();
 
   const subscribersToEmailWithData = (
     await Promise.allSettled(
diff --git a/src/utils/subscriberBreaches.test.ts b/src/utils/subscriberBreaches.test.ts
@@ -97,7 +97,6 @@ const subscriber: SubscriberRow = {
   monthly_email_optout: false,
   signup_language: "fr-CH, fr;q=0.9, en;q=0.8, de;q=0.7,*;q=0.5",
   onerep_profile_id: null,
-  moscary_id: null,
   monthly_monitor_report_at: null,
   monthly_monitor_report: false,
   sign_in_count: null,
@@ -550,7 +549,6 @@ describe("getSubBreaches", () => {
       monthly_monitor_report_at: null,
       monthly_monitor_report: false,
       onerep_profile_id: null,
-      moscary_id: null,
       sign_in_count: null,
       first_broker_removal_email_sent: false,
       churn_prevention_email_sent_at: null,
@@ -651,7 +649,6 @@ describe("getSubBreaches", () => {
       monthly_monitor_report_at: null,
       monthly_monitor_report: false,
       onerep_profile_id: null,
-      moscary_id: null,
       sign_in_count: null,
       first_broker_removal_email_sent: false,
       churn_prevention_email_sent_at: null,
@@ -760,7 +757,6 @@ describe("getSubBreaches", () => {
       monthly_monitor_report_at: null,
       monthly_monitor_report: false,
       onerep_profile_id: null,
-      moscary_id: null,
       sign_in_count: null,
       first_broker_removal_email_sent: false,
       churn_prevention_email_sent_at: null,
@@ -879,7 +875,6 @@ describe("getSubBreaches", () => {
       monthly_monitor_report_at: null,
       monthly_monitor_report: false,
       onerep_profile_id: null,
-      moscary_id: null,
       sign_in_count: null,
       first_broker_removal_email_sent: false,
       churn_prevention_email_sent_at: null,
@@ -998,7 +993,6 @@ describe("getSubBreaches", () => {
       monthly_monitor_report_at: null,
       monthly_monitor_report: false,
       onerep_profile_id: null,
-      moscary_id: null,
       sign_in_count: null,
       first_broker_removal_email_sent: false,
       churn_prevention_email_sent_at: null,
@@ -1113,7 +1107,6 @@ describe("getSubBreaches", () => {
       monthly_monitor_report_at: null,
       monthly_monitor_report: false,
       onerep_profile_id: null,
-      moscary_id: null,
       sign_in_count: null,
       first_broker_removal_email_sent: false,
       churn_prevention_email_sent_at: null,
