Save email preferences changes (#4548)

* Email pref saved * fix unit test break * remove typeguard func * right val
mozilla · May 21, 2024 · 6928aba · 6928aba
1 parent 6f9e52b
commit 6928aba
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 15 deletions.
diff --git a/.../(proper_react)/(redesign)/(authenticated)/user/(dashboard)/settings/AlertAddressForm.tsx b/.../(proper_react)/(redesign)/(authenticated)/user/(dashboard)/settings/AlertAddressForm.tsx
@@ -76,7 +76,6 @@ export const AlertAddressForm = (props: Props) => {
       const chosenOption = newValue as EmailUpdateCommTypeOfOptions;
       const body: EmailUpdateCommOptionRequest = {
         instantBreachAlerts: chosenOption,
-        monthlyMonitorReport: monitorReportAllowed,
       };
       void fetch("/api/v1/user/update-comm-option", {
         method: "POST",
@@ -85,11 +84,6 @@ export const AlertAddressForm = (props: Props) => {
         // Fetch a new token with up-to-date subscriber info - specifically,
         // with this setting updated.
         void session.update();
-        // Make sure the dashboard re-fetches the breaches on the next visit,
-        // in order to make resolved breaches move to the "Fixed" tab.
-        // If we had used server actions, we could've called
-        // `revalidatePath("/user/dashboard")` there, but the API doesn't appear
-        // to necessarily share a cache with the client.
         router.refresh();
       });
     },
@@ -98,12 +92,12 @@ export const AlertAddressForm = (props: Props) => {
   const handleMonthlyMonitorReportToggle = () => {
     const newValue = !activateMonthlyMonitorReport;
     setActivateMonthlyMonitorReport(newValue);
+    const body: EmailUpdateCommOptionRequest = {
+      monthlyMonitorReport: newValue,
+    };
     void fetch("/api/v1/user/update-comm-option", {
       method: "POST",
-      body: JSON.stringify({
-        instantBreachAlerts: commsValue(),
-        monthlyMonitorReport: newValue,
-      }),
+      body: JSON.stringify(body),
     }).then(() => {
       void session.update();
       router.refresh();

diff --git a/...(proper_react)/(redesign)/(authenticated)/user/(dashboard)/settings/SettingsPage.test.tsx b/...(proper_react)/(redesign)/(authenticated)/user/(dashboard)/settings/SettingsPage.test.tsx
@@ -619,7 +619,6 @@ it("sends an API call to disable monthly monitor reports", async () => {
 
   expect(global.fetch).toHaveBeenCalledWith("/api/v1/user/update-comm-option", {
     body: JSON.stringify({
-      instantBreachAlerts: "primary",
       monthlyMonitorReport: false,
     }),
     method: "POST",

diff --git a/src/app/api/v1/user/update-comm-option/route.ts b/src/app/api/v1/user/update-comm-option/route.ts
@@ -17,8 +17,8 @@ import {
 export type EmailUpdateCommTypeOfOptions = "null" | "affected" | "primary";
 
 export interface EmailUpdateCommOptionRequest {
-  instantBreachAlerts: EmailUpdateCommTypeOfOptions;
-  monthlyMonitorReport: boolean;
+  instantBreachAlerts?: EmailUpdateCommTypeOfOptions;
+  monthlyMonitorReport?: boolean;
 }
 
 export async function POST(req: NextRequest) {
@@ -48,8 +48,13 @@ export async function POST(req: NextRequest) {
         default:
           allEmailsToPrimary = null;
       }
-      await setAllEmailsToPrimary(subscriber, allEmailsToPrimary);
-      await setMonthlyMonitorReport(subscriber, monthlyMonitorReport);
+
+      if (typeof instantBreachAlerts !== "undefined") {
+        await setAllEmailsToPrimary(subscriber, allEmailsToPrimary);
+      }
+      if (typeof monthlyMonitorReport === "boolean") {
+        await setMonthlyMonitorReport(subscriber, monthlyMonitorReport);
+      }
 
       return NextResponse.json({
         success: true,