feat: Add CORS support and refactor response handling in Lambda funct…

amplify/backend/function/createDeadline/src/index.js

@@ -1,7 +1,15 @@
 const { createDbConnection } = require("/opt/nodejs/dbConnection");
-const { validateDeadline } = require("/opt/nodejs/helper");
+const {
+  validateDeadline,
+  createCorsResponse,
+  handleOptionsRequest,
+} = require("/opt/nodejs/helper");
 
 exports.handler = async (event) => {
+  if (event.httpMethod === "OPTIONS") {
+    return handleOptionsRequest();
+  }
+
   let connection;
 
   try {
@@ -19,15 +27,7 @@ exports.handler = async (event) => {
       type,
     });
     if (error) {
-      return {
-        statusCode: 400,
-        headers: {
-          "Access-Control-Allow-Origin": "*",
-          "Access-Control-Allow-Headers": "*",
-          "Content-Type": "application/json",
-        },
-        body: JSON.stringify({ message: error.details[0].message }),
-      };
+      return createCorsResponse(400, { message: error.details[0].message });
     }
 
     connection = await createDbConnection({
@@ -42,15 +42,7 @@ exports.handler = async (event) => {
       user_id,
     ]);
     if (user.length === 0) {
-      return {
-        statusCode: 400,
-        headers: {
-          "Access-Control-Allow-Origin": "*",
-          "Access-Control-Allow-Headers": "*",
-          "Content-Type": "application/json",
-        },
-        body: JSON.stringify({ message: "Utente non trovato." }),
-      };
+      return createCorsResponse(400, { message: "Utente non trovato." });
     }
 
     // Inserisci la deadline
@@ -59,35 +51,16 @@ exports.handler = async (event) => {
       [title, description, due_date, notifications_on, user_id, type]
     );
 
-    return {
-      statusCode: 201,
-      headers: {
-        "Access-Control-Allow-Origin": "*",
-        "Access-Control-Allow-Headers":
-          "Content-Type,X-Amz-Date,Authorization,X-Api-Key,X-Amz-Security-Token",
-        "Access-Control-Allow-Methods":
-          "DELETE,GET,HEAD,OPTIONS,PATCH,POST,PUT",
-        "Content-Type": "application/json",
-      },
-      body: JSON.stringify({
-        message: "Scadenza creata con successo",
-        id: result.insertId,
-      }),
-    };
+    return createCorsResponse(201, {
+      message: "Scadenza creata con successo",
+      id: result.insertId,
+    });
   } catch (err) {
     console.error("❌ Errore in createDeadline:", err);
-    return {
-      statusCode: 500,
-      headers: {
-        "Access-Control-Allow-Origin": "*",
-        "Access-Control-Allow-Headers": "*",
-        "Content-Type": "application/json",
-      },
-      body: JSON.stringify({
-        message: "Errore durante la creazione della deadline.",
-        error: err,
-      }),
-    };
+    return createCorsResponse(500, {
+      message: "Errore durante la creazione della deadline.",
+      error: err.message,
+    });
   } finally {
     if (connection) await connection.end();
   }

amplify/backend/function/createUsers/src/index.js

@@ -1,7 +1,15 @@
 const { createDbConnection } = require("/opt/nodejs/dbConnection");
-const { getS3AvatarConfig } = require("/opt/nodejs/helper");
+const {
+  getS3AvatarConfig,
+  createCorsResponse,
+  handleOptionsRequest,
+} = require("/opt/nodejs/helper");
 
 exports.handler = async (event) => {
+  if (event.httpMethod === "OPTIONS") {
+    return handleOptionsRequest();
+  }
+
   let connection;
 
   try {
@@ -28,18 +36,10 @@ exports.handler = async (event) => {
     );
 
     if (existingUsers.length > 0) {
-      return {
-        statusCode: 409, // Conflict
-        headers: {
-          "Access-Control-Allow-Origin": "*",
-          "Access-Control-Allow-Headers": "*",
-          "Content-Type": "application/json",
-        },
-        body: JSON.stringify({
-          message: "Un utente con questa email esiste già.",
-          code: "USER_ALREADY_EXISTS",
-        }),
-      };
+      return createCorsResponse(409, {
+        message: "Un utente con questa email esiste già.",
+        code: "USER_ALREADY_EXISTS",
+      });
     }
 
     // Inserisci il nuovo utente
@@ -56,49 +56,22 @@ exports.handler = async (event) => {
       profileImageUrl: `https://${s3Config.bucketName}.s3.${s3Config.region}.amazonaws.com/${s3Config.folderName}/${profileImageId}.jpg`,
     };
 
-    return {
-      statusCode: 201,
-      headers: {
-        "Access-Control-Allow-Origin": "*",
-        "Access-Control-Allow-Headers":
-          "Content-Type,X-Amz-Date,Authorization,X-Api-Key,X-Amz-Security-Token",
-        "Access-Control-Allow-Methods":
-          "DELETE,GET,HEAD,OPTIONS,PATCH,POST,PUT",
-        "Content-Type": "application/json",
-      },
-      body: JSON.stringify(newUser),
-    };
+    return createCorsResponse(201, newUser);
   } catch (err) {
     console.error("❌ Errore in createUsers:", err);
 
     // Gestisci errori specifici del database
     if (err.code === "ER_DUP_ENTRY") {
-      return {
-        statusCode: 409,
-        headers: {
-          "Access-Control-Allow-Origin": "*",
-          "Access-Control-Allow-Headers": "*",
-          "Content-Type": "application/json",
-        },
-        body: JSON.stringify({
-          message: "Un utente con questa email esiste già.",
-          code: "USER_ALREADY_EXISTS",
-        }),
-      };
+      return createCorsResponse(409, {
+        message: "Un utente con questa email esiste già.",
+        code: "USER_ALREADY_EXISTS",
+      });
     }
 
-    return {
-      statusCode: 500,
-      headers: {
-        "Access-Control-Allow-Origin": "*",
-        "Access-Control-Allow-Headers": "*",
-        "Content-Type": "application/json",
-      },
-      body: JSON.stringify({
-        message: "Errore del server durante la creazione dell'utente.",
-        error: err.message,
-      }),
-    };
+    return createCorsResponse(500, {
+      message: "Errore del server durante la creazione dell'utente.",
+      error: err.message,
+    });
   } finally {
     if (connection) {
       await connection.end();

amplify/backend/function/deleteDeadlines/src/index.js

@@ -1,6 +1,14 @@
 const { createDbConnection } = require("/opt/nodejs/dbConnection");
+const {
+  createCorsResponse,
+  handleOptionsRequest,
+} = require("/opt/nodejs/helper");
 
 exports.handler = async (event) => {
+  if (event.httpMethod === "OPTIONS") {
+    return handleOptionsRequest();
+  }
+
   let connection;
 
   try {
@@ -16,15 +24,7 @@ exports.handler = async (event) => {
     console.log("ID ricevuto per delete:", id, "Body:", body);
 
     if (!id) {
-      return {
-        statusCode: 400,
-        headers: {
-          "Access-Control-Allow-Origin": "*",
-          "Access-Control-Allow-Headers": "*",
-          "Content-Type": "application/json",
-        },
-        body: JSON.stringify({ message: "ID obbligatorio." }),
-      };
+      return createCorsResponse(400, { message: "ID obbligatorio." });
     }
 
     connection = await createDbConnection({
@@ -40,43 +40,18 @@ exports.handler = async (event) => {
     );
 
     if (result.affectedRows === 0) {
-      return {
-        statusCode: 404,
-        headers: {
-          "Access-Control-Allow-Origin": "*",
-          "Access-Control-Allow-Headers": "*",
-          "Content-Type": "application/json",
-        },
-        body: JSON.stringify({ message: "Scadenza non trovata" }),
-      };
+      return createCorsResponse(404, { message: "Scadenza non trovata" });
     }
 
-    return {
-      statusCode: 200,
-      headers: {
-        "Access-Control-Allow-Origin": "*",
-        "Access-Control-Allow-Headers":
-          "Content-Type,X-Amz-Date,Authorization,X-Api-Key,X-Amz-Security-Token",
-        "Access-Control-Allow-Methods":
-          "DELETE,GET,HEAD,OPTIONS,PATCH,POST,PUT",
-        "Content-Type": "application/json",
-      },
-      body: JSON.stringify({ message: "Scadenza eliminata con successo" }),
-    };
+    return createCorsResponse(200, {
+      message: "Scadenza eliminata con successo",
+    });
   } catch (err) {
     console.error("❌ Errore in deleteDeadlines:", err);
-    return {
-      statusCode: 500,
-      headers: {
-        "Access-Control-Allow-Origin": "*",
-        "Access-Control-Allow-Headers": "*",
-        "Content-Type": "application/json",
-      },
-      body: JSON.stringify({
-        message: "Errore del server. Impossibile eliminare la scadenza.",
-        error: err.message,
-      }),
-    };
+    return createCorsResponse(500, {
+      message: "Errore del server. Impossibile eliminare la scadenza.",
+      error: err.message,
+    });
   } finally {
     if (connection) await connection.end();
   }

amplify/backend/function/deleteUser/src/index.js

@@ -1,6 +1,14 @@
 const { createDbConnection } = require("/opt/nodejs/dbConnection");
+const {
+  createCorsResponse,
+  handleOptionsRequest,
+} = require("/opt/nodejs/helper");
 
 exports.handler = async (event) => {
+  if (event.httpMethod === "OPTIONS") {
+    return handleOptionsRequest();
+  }
+
   let connection;
 
   try {
@@ -19,34 +27,15 @@ exports.handler = async (event) => {
     // Elimina l'utente
     await connection.execute("DELETE FROM users WHERE id = ?", [id]);
 
-    return {
-      statusCode: 200,
-      headers: {
-        "Access-Control-Allow-Origin": "*",
-        "Access-Control-Allow-Headers":
-          "Content-Type,X-Amz-Date,Authorization,X-Api-Key,X-Amz-Security-Token",
-        "Access-Control-Allow-Methods":
-          "DELETE,GET,HEAD,OPTIONS,PATCH,POST,PUT",
-        "Content-Type": "application/json",
-      },
-      body: JSON.stringify({
-        message: `Utente con id ${id} eliminato con successo.`,
-      }),
-    };
+    return createCorsResponse(200, {
+      message: `Utente con id ${id} eliminato con successo.`,
+    });
   } catch (err) {
     console.error("❌ Errore in deleteUser:", err);
-    return {
-      statusCode: 500,
-      headers: {
-        "Access-Control-Allow-Origin": "*",
-        "Access-Control-Allow-Headers": "*",
-        "Content-Type": "application/json",
-      },
-      body: JSON.stringify({
-        message: "Errore del server durante l'eliminazione dell'utente.",
-        error: err,
-      }),
-    };
+    return createCorsResponse(500, {
+      message: "Errore del server durante l'eliminazione dell'utente.",
+      error: err.message,
+    });
   } finally {
     if (connection) {
       await connection.end();

amplify/backend/function/getAppConfig/src/index.js

@@ -1,7 +1,15 @@
-const { getS3LogoConfig } = require("/opt/nodejs/helper");
+const {
+  getS3LogoConfig,
+  createCorsResponse,
+  handleOptionsRequest,
+} = require("/opt/nodejs/helper");
 const AWS = require("aws-sdk");
 
 exports.handler = async (event) => {
+  if (event.httpMethod === "OPTIONS") {
+    return handleOptionsRequest();
+  }
+
   console.log("=== getAppConfig START ===");
   console.log("getAppConfig - Event:", JSON.stringify(event, null, 2));
 
@@ -102,18 +110,7 @@ exports.handler = async (event) => {
     console.log("Final app config:", appConfig);
     console.log("=== getAppConfig SUCCESS ===");
 
-    return {
-      statusCode: 200,
-      headers: {
-        "Access-Control-Allow-Origin": "*",
-        "Access-Control-Allow-Headers":
-          "Content-Type,X-Amz-Date,Authorization,X-Api-Key,X-Amz-Security-Token",
-        "Access-Control-Allow-Methods":
-          "DELETE,GET,HEAD,OPTIONS,PATCH,POST,PUT",
-        "Content-Type": "application/json",
-      },
-      body: JSON.stringify(appConfig),
-    };
+    return createCorsResponse(200, appConfig);
   } catch (err) {
     console.error("=== getAppConfig ERROR ===");
     console.error("Error details:", {
@@ -123,19 +120,11 @@ exports.handler = async (event) => {
       statusCode: err.statusCode,
     });
 
-    return {
-      statusCode: 500,
-      headers: {
-        "Access-Control-Allow-Origin": "*",
-        "Access-Control-Allow-Headers": "*",
-        "Content-Type": "application/json",
-      },
-      body: JSON.stringify({
-        message: "Errore del server durante il recupero della configurazione.",
-        error: err.message,
-        logos: {},
-        logoUrl: null,
-      }),
-    };
+    return createCorsResponse(500, {
+      message: "Errore del server durante il recupero della configurazione.",
+      error: err.message,
+      logos: {},
+      logoUrl: null,
+    });
   }
 };