Merge branch 'main' into dependabot/docker/node-20.11-alpine

.eslintrc.json

@@ -117,7 +117,8 @@
         "src/views/**/*.js",
         "src/middleware/**/*.js",
         "src/controllers/**/*.js",
-        "src/app/(nextjs_migration)/**/*",
+        "src/app/deprecated/**/*",
+        "src/app/(migration_remnants)/**/*",
         "src/app/functions/server/breachResolution.ts"
       ],
       "rules": {
@@ -132,11 +133,12 @@
     {
       // Only enable rules that depend on type checking on TS files,
       // except for files that include a lot of copy-pasted pre-TypeScript code
-      // (i.e. the code inside `(nextjs_migration)`),
+      // (i.e. the code inside `src/app/deprecated/`),
       // to avoid a barrage of warnings for older code:
       "files": ["**/*.{ts,tsx}"],
       "excludedFiles": [
-        "./src/app/(nextjs_migration)/**/*"
+        "./src/app/deprecated/**/*",
+        "./src/app/(migration_remnants)/**/*"
       ],
       "extends": [
         "plugin:@typescript-eslint/recommended-requiring-type-checking"

.github/workflows/e2e_cron.yml

@@ -14,7 +14,7 @@ on:
           - prod
           - heroku
 jobs:
-  test:
+  e2e-tests:
     timeout-minutes: 60
     runs-on: ubuntu-latest
     steps:
@@ -56,6 +56,7 @@ jobs:
           ADMINS: ${{ secrets.ADMINS }}
           FXA_ENABLED: true
           OAUTH_CLIENT_SECRET: ${{ secrets.OAUTH_CLIENT_SECRET }}
+          ONEREP_API_KEY: ${{ secrets.ONEREP_API_KEY }}
           NEXTAUTH_SECRET: ${{ secrets.NEXTAUTH_SECRET }}
           NEXTAUTH_URL: ${{ secrets.NEXTAUTH_URL }}
           HIBP_KANON_API_TOKEN: ${{ secrets.HIBP_KANON_API_TOKEN }}

.github/workflows/e2e_pr.yml

@@ -5,7 +5,7 @@ on:
   pull_request:
     branches: [ main ]
 jobs:
-  test:
+  e2e-tests:
     timeout-minutes: 60
     runs-on: ubuntu-latest
     # Service containers to run with `container-job`
@@ -72,6 +72,7 @@ jobs:
           ADMINS: ${{ secrets.ADMINS }}
           FXA_ENABLED: true
           OAUTH_CLIENT_SECRET: ${{ secrets.OAUTH_CLIENT_SECRET }}
+          ONEREP_API_KEY: ${{ secrets.ONEREP_API_KEY }}
           NEXTAUTH_SECRET: ${{ secrets.NEXTAUTH_SECRET }}
           NEXTAUTH_URL: ${{ secrets.NEXTAUTH_URL }}
           DATABASE_URL: postgres://postgres:postgres@localhost:5432/blurts

.github/workflows/reference_linter.yaml

@@ -4,7 +4,7 @@ on:
   pull_request:
   workflow_dispatch:
 jobs:
-  linter:
+  l10n-lint:
     runs-on: ubuntu-latest
     steps:
       - name: Clone repository

.github/workflows/unittests.yaml

@@ -3,7 +3,7 @@ name: Unit Tests
 on: [push]
 
 jobs:
-  test:
+  unit-tests:
 
     runs-on: ubuntu-latest
 

.storybook/preview.tsx

@@ -63,23 +63,22 @@ const preview: Preview = {
         push(path: string, ...otherArgs: unknown[]) {
           action("nextNavigation.push")(path, ...otherArgs);
 
-          if (path === "/redesign/user/dashboard") {
+          if (path === "/user/dashboard") {
             linkTo(
               "Pages/Dashboard",
               "US user, without Premium, with unresolved scan results, with unresolved breaches",
             )();
           }
 
           if (
-            path ===
-            "/redesign/user/dashboard/fix/data-broker-profiles/start-free-scan"
+            path === "/user/dashboard/fix/data-broker-profiles/start-free-scan"
           ) {
             linkTo("Pages/Guided resolution/1a. Free scan")();
           }
 
           if (
             path ===
-            "/redesign/user/dashboard/fix/data-broker-profiles/view-data-brokers"
+            "/user/dashboard/fix/data-broker-profiles/view-data-brokers"
           ) {
             linkTo(
               "Pages/Guided resolution/1b. Scan results",
@@ -88,23 +87,22 @@ const preview: Preview = {
           }
 
           if (
-            path ===
-            "/redesign/user/dashboard/fix/data-broker-profiles/manual-remove"
+            path === "/user/dashboard/fix/data-broker-profiles/manual-remove"
           ) {
             linkTo("Pages/Guided resolution/1c. Manually resolve brokers")();
           }
 
           if (
-            path ===
-            "/redesign/user/dashboard/fix/data-broker-profiles/automatic-remove"
+            path === "/user/dashboard/fix/data-broker-profiles/automatic-remove"
           ) {
             linkTo(
               "Pages/Guided resolution/1d. Automatically resolve brokers",
             )();
           }
 
           if (
-            path === "/redesign/user/dashboard/fix/high-risk-data-breaches/ssn"
+            path ===
+            "/user/dashboard/fix/high-risk-data-breaches/social-security-number"
           ) {
             linkTo(
               "Pages/Guided resolution/2. High-risk data breaches",
@@ -113,8 +111,7 @@ const preview: Preview = {
           }
 
           if (
-            path ===
-            "/redesign/user/dashboard/fix/high-risk-data-breaches/credit-card"
+            path === "/user/dashboard/fix/high-risk-data-breaches/credit-card"
           ) {
             linkTo(
               "Pages/Guided resolution/2. High-risk data breaches",
@@ -123,45 +120,37 @@ const preview: Preview = {
           }
 
           if (
-            path ===
-            "/redesign/user/dashboard/fix/high-risk-data-breaches/bank-account"
+            path === "/user/dashboard/fix/high-risk-data-breaches/bank-account"
           ) {
             linkTo(
               "Pages/Guided resolution/2. High-risk data breaches",
               "2c. Bank account",
             )();
           }
 
-          if (
-            path === "/redesign/user/dashboard/fix/high-risk-data-breaches/pin"
-          ) {
+          if (path === "/user/dashboard/fix/high-risk-data-breaches/pin") {
             linkTo(
               "Pages/Guided resolution/2. High-risk data breaches",
               "2d. PIN",
             )();
           }
 
-          if (
-            path === "/redesign/user/dashboard/fix/high-risk-data-breaches/done"
-          ) {
+          if (path === "/user/dashboard/fix/high-risk-data-breaches/done") {
             linkTo(
               "Pages/Guided resolution/2. High-risk data breaches",
               "2e. Done",
             )();
           }
 
-          if (
-            path === "/redesign/user/dashboard/fix/leaked-passwords/passwords"
-          ) {
+          if (path === "/user/dashboard/fix/leaked-passwords/passwords") {
             linkTo(
               "Pages/Guided resolution/3. Leaked passwords",
               "3a. Passwords",
             )();
           }
 
           if (
-            path ===
-            "/redesign/user/dashboard/fix/leaked-passwords/security-questions"
+            path === "/user/dashboard/fix/leaked-passwords/security-questions"
           ) {
             linkTo(
               "Pages/Guided resolution/3. Leaked passwords",
@@ -170,47 +159,35 @@ const preview: Preview = {
           }
 
           if (
+            path === "/user/dashboard/fix/leaked-passwords/passwords-done" ||
             path ===
-              "/redesign/user/dashboard/fix/leaked-passwords/passwords-done" ||
-            path ===
-              "/redesign/user/dashboard/fix/leaked-passwords/security-questions-done"
+              "/user/dashboard/fix/leaked-passwords/security-questions-done"
           ) {
             linkTo("Pages/Guided resolution/3. Leaked passwords", "3c. Done")();
           }
 
-          if (
-            path ===
-            "/redesign/user/dashboard/fix/security-recommendations/phone"
-          ) {
+          if (path === "/user/dashboard/fix/security-recommendations/phone") {
             linkTo(
               "Pages/Guided resolution/4. Security recommendations",
               "4a. Phone number",
             )();
           }
 
-          if (
-            path ===
-            "/redesign/user/dashboard/fix/security-recommendations/email"
-          ) {
+          if (path === "/user/dashboard/fix/security-recommendations/email") {
             linkTo(
               "Pages/Guided resolution/4. Security recommendations",
               "4b. Email address",
             )();
           }
 
-          if (
-            path === "/redesign/user/dashboard/fix/security-recommendations/ip"
-          ) {
+          if (path === "/user/dashboard/fix/security-recommendations/ip") {
             linkTo(
               "Pages/Guided resolution/4. Security recommendations",
               "4c. IP address",
             )();
           }
 
-          if (
-            path ===
-            "/redesign/user/dashboard/fix/security-recommendations/done"
-          ) {
+          if (path === "/user/dashboard/fix/security-recommendations/done") {
             linkTo(
               "Pages/Guided resolution/4. Security recommendations",
               "4d. Done",

.stylelintignore

@@ -1,2 +1,3 @@
 src/client/
 src/app/(nextjs_migration)/
+src/app/deprecated/

.vscode/extensions.json

@@ -8,6 +8,8 @@
 		"stylelint.vscode-stylelint",
 		"esbenp.prettier-vscode",
 		"eamodio.gitlens",
+		"Orta.vscode-jest",
+		"macabeus.vscode-fluent",
 	],
 	// List of extensions recommended by VS Code that should not be recommended for users of this workspace.
 	"unwantedRecommendations": []

.vscode/settings.json

@@ -7,36 +7,24 @@
     "eslint.validate": [
         "javascript"
     ],
-    "[javascript]": {
-        "editor.defaultFormatter": "esbenp.prettier-vscode",
-        "editor.codeActionsOnSave": {
-            "source.fixAll.eslint": true
-        }
-    },
-    "[typescript]": {
-        "editor.defaultFormatter": "esbenp.prettier-vscode",
-        "editor.codeActionsOnSave": {
-            "source.fixAll.eslint": true
-        }
-    },
-    "[typescriptreact]": {
-        "editor.defaultFormatter": "esbenp.prettier-vscode",
-        "editor.codeActionsOnSave": {
-            "source.fixAll.eslint": true
-        }
-    },
-    "[css]": {
-        "editor.codeActionsOnSave": {
-            "source.fixAll.stylelint": "explicit"
-        }
-    },
     "gitlens.advanced.blame.customArguments": [
         "--ignore-revs-file",
         ".git-blame-ignore-revs"
     ],
+    "[css][scss]": {
+        "editor.codeActionsOnSave": {
+            "source.fixAll.stylelint": "explicit"
+        }
+    },
     "[javascript][typescript][typescriptreact]": {
         "editor.codeActionsOnSave": {
             "source.fixAll.eslint": "explicit"
         }
     },
+    "[javascript][typescript][typescriptreact][markdown][html][css][scss]": {
+        "editor.defaultFormatter": "esbenp.prettier-vscode",
+    },
+  "[fluent]": {
+    "files.trimTrailingWhitespace": true
+  },
 }

catalog-info.yaml

@@ -0,0 +1,18 @@
+apiVersion: backstage.io/v1alpha1
+kind: System
+metadata:
+  name: mozilla-monitor
+  annotations:
+    github.com/project-slug: mozilla/blurts-server
+    github.com/team-slug: smozilla/teams/firefox-monitor-engineering
+    circleci.com/project-slug: github/mozilla/blurts-server
+    sentry.io/project-slug: mozilla/firefox-monitor
+  description: Firefox Monitor notifies users when their credentials have been compromised in a data breach.
+  tags:
+    - nextjs
+    - nodejs
+    - reactjs
+spec:
+  type: website
+  lifecycle: production
+  owner: group:firefox-monitor-engineering

locales-pending/onboarding.ftl

@@ -50,6 +50,7 @@ onboarding-enter-details-label-last-name = Last name
 onboarding-enter-details-placeholder-last-name = Enter last name
 onboarding-enter-details-label-location = City and state
 onboarding-enter-details-placeholder-location = Enter city and state
+onboarding-enter-details-placeholder-location-results = No location found
 onboarding-enter-details-label-date-of-birth = Date of birth
 onboarding-enter-details-input-error-message-generic = Required to complete the scan
 onboarding-enter-details-input-error-message-location = Type location and select from list

locales/el/app.ftl

@@ -870,5 +870,5 @@ floating-banner-dismiss-button-label = Όχι, ευχαριστώ
 ## Firefox Monitor -> Mozilla Monitor rebrand banner
 
 banner-monitor-rebrand-text = <b>{ -brand-mozilla-monitor }</b>: Νέο όνομα, εμφάνιση και ακόμα περισσότεροι τρόποι <b>διεκδίκησης του απορρήτου σας</b>.
-banner-monitor-rebrand-dismiss-button-label = ΟΚ
+banner-monitor-rebrand-dismiss-button-label = OK
 banner-monitor-rebrand-dismiss-button-tooltip = Απόρριψη

locales/el/dashboard.ftl

@@ -40,8 +40,8 @@ modal-active-number-of-exposures-part-one-all =
     }
 modal-active-number-of-exposures-part-two = Για παράδειγμα, αν έχετε 10 εκθέσεις του αριθμού τηλεφώνου σας, αυτό μπορεί να σημαίνει ότι ένας αριθμός τηλεφώνου εκτίθεται σε 10 διαφορετικούς ιστοτόπους ή ότι 2 διαφορετικοί αριθμοί τηλεφώνου έχουν εκτεθεί σε 5 διαφορετικούς ιστοτόπους.
 modal-active-number-of-exposures-part-three-all = Μόλις επιλυθούν, θα προστεθούν στον συνολικό αριθμό διορθωμένων εκθέσεων στη σελίδα «Διορθώσεις».
-modal-fixed-number-of-exposures-title = Σχετικά με τον αριθμό σταθερών προβολών σας
-modal-fixed-number-of-exposures-all = Αυτό το γράφημα περιλαμβάνει τον συνολικό αριθμό παραβιάσεων δεδομένων που έχουν διορθωθεί για όλες τις διευθύνσεις email που εποπτεύετε αυτήν τη στιγμή. Μόλις οι προθέσεις επισημανθούν ως σταθερές, θα προστεθούν στο σύνολο εδώ.
+modal-fixed-number-of-exposures-title = Σχετικά με τον αριθμό διορθωμένων εκθέσεών σας
+modal-fixed-number-of-exposures-all = Αυτό το γράφημα περιλαμβάνει τον συνολικό αριθμό παραβιάσεων δεδομένων που έχουν διορθωθεί για όλες τις διευθύνσεις email που εποπτεύετε αυτήν τη στιγμή. Μόλις οι εκθέσεις επισημανθούν ως διορθωμένες, θα προστεθούν στο παρόν σύνολο.
 modal-cta-ok = OK
 modal-open-alt = Άνοιγμα
 modal-close-alt = Κλείσιμο

locales/es-CL/app.ftl

@@ -801,3 +801,8 @@ breach-detail-cta-signup = Busca filtraciones
 floating-banner-text = Mejora tu seguridad en línea con noticias, consejos y actualizaciones de { -brand-Mozilla }.
 floating-banner-link-label = Registrarse
 floating-banner-dismiss-button-label = No, gracias
+
+## Firefox Monitor -> Mozilla Monitor rebrand banner
+
+banner-monitor-rebrand-dismiss-button-label = Aceptar
+banner-monitor-rebrand-dismiss-button-tooltip = Ocultar

locales/es-ES/add-email.ftl

@@ -7,16 +7,17 @@
 
 add-email-add-another-heading = Añadir otra dirección de correo electrónico
 close-dialog-alt = Cerrar el diálogo
-
 # $total is the number of emails a user is allowed to add
 add-email-your-account-includes =
     { $total ->
         [one] Tu cuenta incluye la supervisión de hasta { $total } dirección de correo electrónico. Añade una nueva dirección de correo electrónico para ver si se ha visto afectada por una filtración.
        *[other] Tu cuenta incluye la supervisión de hasta { $total } direcciones de correo electrónico. Añade una nueva dirección de correo electrónico para ver si se ha visto afectada por una filtración.
     }
-
 add-email-address-input-label = Correo electrónico
 add-email-send-verification-button = Enviar enlace de verificación
-
 # $email is the newly added email address. $settings-href is the URL for the Settings page. HTML tags should not be translated, e.g. `<a>`
+# This string will be deprecated when the new Plus plan is live.
 add-email-verify-the-link = Verifica el enlace enviado a { $email } para añadirlo a { -brand-fx-monitor }. Gestiona todas las direcciones de correo en <a { $settings-href }>Ajustes</a>.
+# Variables:
+#   $email (string) - An email address submitted by the user for monitoring, e.g. `example@example.com`
+add-email-verify-the-link-2 = Verifica el enlace enviado a <b>{ $email }</b> para añadirlo a { -brand-mozilla-monitor }.