refactor: netlify function

Author: nhestrompia

web/netlify/functions/update-settings.ts

@@ -0,0 +1,63 @@
+import { createClient } from "@supabase/supabase-js";
+import { ethers } from "ethers";
+
+// Configuration
+const SUPABASE_KEY = process.env.SUPABASE_CLIENT_API_KEY;
+const SUPABASE_URL = process.env.SUPABASE_URL;
+const supabase = createClient(SUPABASE_URL!, SUPABASE_KEY!);
+
+export const handler = async function (event: any, context: any) {
+  try {
+    // Assuming the event.body contains the data we need
+    const { message, signature, address } = JSON.parse(event.body);
+
+    // Recover the address from the signature
+    const recoveredAddress = ethers.utils.verifyMessage(message, signature);
+
+    // If the recovered address does not match the provided address, return an error
+    if (recoveredAddress !== address) {
+      throw new Error("Signature verification failed");
+    }
+
+    // Allowed columns to update
+    const allowedColumns = ["discord", "telegram", "twitter", "matrix", "push", "email"];
+
+    // If the message is empty, delete the user record
+    if (message === "{}") {
+      let { data, error } = await supabase.from("users").delete().match({ address: recoveredAddress });
+
+      if (error) throw error;
+
+      return {
+        statusCode: 200,
+        body: JSON.stringify({ message: "Record deleted successfully." }),
+      };
+    }
+
+    // Parse the signed message
+    const parsedMessage = JSON.parse(message);
+
+    // Prepare the record data based on the allowed columns
+    let recordData: { [key: string]: any } = {};
+    for (const key in parsedMessage) {
+      if (allowedColumns.includes(key)) {
+        recordData[key] = parsedMessage[key];
+      }
+    }
+
+    // Assuming you have a 'users' table with 'address' and allowedColumns fields
+    let { data, error } = await supabase.from("user-settings").upsert(recordData).match({ address: recoveredAddress });
+
+    if (error) throw error;
+
+    return {
+      statusCode: 200,
+      body: JSON.stringify({ message: "Record updated successfully." }),
+    };
+  } catch (err) {
+    return {
+      statusCode: 500,
+      body: JSON.stringify({ message: `Error: ` }),
+    };
+  }
+};

web/src/layout/Header/navbar/Menu/Settings/SendMeNotifications/FormNotifs/index.tsx

@@ -50,16 +50,15 @@ const FormNotifs: React.FC = () => {
       account: address,
       message: emailInput,
     });
-    const data = {
-      body: {
-        email: emailInput,
+    const data = [
+      {
+        message: emailInput,
         address,
         signature: tx,
       },
-    };
-    toast.info("Updating notification settings", toastOptions);
-    await uploadSettingsToSupabase(data, {});
-    toast.success("Update is successful", toastOptions);
+    ];
+
+    await uploadSettingsToSupabase(data);
     console.log("🚀 ~ file: index.tsx:123 ~ handleSubmit ~ tx:", tx);
   };
 

web/src/utils/uploadSettingsToSupabase.ts

@@ -1,77 +1,29 @@
-import { verifyMessage } from "viem";
-import { createClient } from "@supabase/supabase-js";
-
-const SUPABASE_KEY = process.env.SUPABASE_CLIENT_API_KEY;
-const SUPABASE_URL = process.env.SUPABASE_URL;
-const supabase = createClient(SUPABASE_URL!, SUPABASE_KEY!);
-
-export const uploadSettingsToSupabase = async function (event: any, context: any) {
-  try {
-    // Assuming the event.body contains the data we need
-    const { email, signature, address } = event.body;
-    console.log("🚀 ~ file: index.tsx:42 ~ handleSupabase ~ email:", email, signature, address);
-
-    // Recover the address from the signature
-    const recoveredAddress = await verifyMessage({
-      address,
-      message: email,
-      signature,
-    });
-    console.log("🚀 ~ file: index.tsx:45 ~ handleSupabase ~ recoveredAddress:", recoveredAddress);
-
-    // If the recovered address does not match the provided address, return an error
-    if (!recoveredAddress) {
-      throw new Error("Signature verification failed");
-    }
-
-    // Allowed columns to update
-    const allowedColumns = ["discord", "telegram", "twitter", "matrix", "push", "email"];
-
-    console.log("1");
-
-    // If the message is empty, delete the user record
-    if (email === "{}") {
-      let { data, error } = await supabase.from("users").delete().match({ address: recoveredAddress });
-
-      if (error) throw error;
-
-      return {
-        statusCode: 200,
-        body: JSON.stringify({ message: "Record deleted successfully." }),
-      };
-    }
-
-    // Parse the signed message
-    console.log("2", email);
-
-    const parsedMessage = JSON.parse(JSON.stringify(email));
-    console.log("🚀 ~ file: index.tsx:69 ~ handleSupabase ~ parsedMessage:", parsedMessage);
-
-    // Prepare the record data based on the allowed columns
-    let recordData: { [key: string]: any } = {};
-    for (const key in parsedMessage) {
-      if (allowedColumns.includes(key)) {
-        recordData[key] = parsedMessage[key];
+import { toast } from "react-toastify";
+import { OPTIONS } from "utils/wrapWithToast";
+
+export function uploadSettingsToSupabase(formData: any): Promise<Response> {
+  console.log("form", formData);
+
+  return toast.promise<Response, Error>(
+    fetch("./netlify/functions/update-settings", {
+      method: "POST",
+      body: formData,
+    }).then(async (response) => {
+      if (response.status !== 200) {
+        const error = await response.json().catch(() => ({ message: "Error uploading to Supabase" }));
+        throw new Error(error.message);
       }
-    }
-
-    // Assuming you have a 'users' table with 'address' and allowedColumns fields
-    let { data, error } = await supabase
-      .from("user-settings")
-      .upsert({ address, email: email })
-      .match({ address: address });
-
-    console.log("🚀 ~ file: index.tsx:89 ~ handleSupabase ~ data:", data);
-    if (error) throw error;
-
-    return {
-      statusCode: 200,
-      body: JSON.stringify({ message: "Record updated successfully." }),
-    };
-  } catch (err) {
-    return {
-      statusCode: 500,
-      body: JSON.stringify({ message: `Error: ` }),
-    };
-  }
-};
+      return response;
+    }),
+    {
+      pending: "Uploading settings to Supabase...",
+      success: "Uploaded successfully!",
+      error: {
+        render({ data: error }) {
+          return `Upload failed: ${error?.message}`;
+        },
+      },
+    },
+    OPTIONS
+  );
+}