tango-app-api-infra 3.0.52-dev → 3.0.53-dev

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-infra",
-    "version": "3.0.52-dev",
+    "version": "3.0.53-dev",
     "description": "infra",
     "main": "index.js",
     "type": "module",

package/src/controllers/infra.controllers.js

@@ -75,7 +75,7 @@ export async function createTicket( req, res ) {
     let Uidomain = `${appConfig.url.domain}/manage/stores/infra-ticket?storeId=${req.body.basicDetails.storeId}`;
 
     const html = htmlContent( { ...req.body, Uidomain: Uidomain, domain: appConfig.url.apiDomain, date: dayjs( req.body.issueDate ).format( 'YYYY-MM-DD' ), downtimetotal: downtimetotal, Timestamp: Timestamp } );
-    if ( req.body.spocEmail&&req.body.issueType == 'infra' ) {
+    if ( req.body.spocEmail&&req.body.issueType == 'infra'&&isValidEmail( req.body.spocEmail ) ) {
       await sendEmailWithSES( req.body.spocEmail, subject, html, attachments, appConfig.cloud.aws.ses.adminEmail );
     }
     if ( create ) {
@@ -86,6 +86,10 @@ export async function createTicket( req, res ) {
     return res.sendError( error, 500 );
   }
 }
+function isValidEmail( email ) {
+  const emailRegex = /^[^\s@]+@[^\s@]+\.[^\s@]+$/;
+  return emailRegex.test( email );
+}
 export async function bulkcreateTicket( req, res ) {
   try {
     let response = {};

package/src/controllers/internalInfra.controller.js

@@ -201,7 +201,7 @@ export async function updateRefreshTicket( req, res ) {
         }
         let Uidomain = `${appConfig.url.domain}/manage/stores/infra-ticket?storeId=${getTicket.basicDetails.storeId}`;
         const html = htmlContent( { ...getTicket, Uidomain: Uidomain, primary: primaryIssue, storeName: getTicket.basicDetails.storeName, hibernation: '', spocName: spocName, date: dayjs( getTicket.issueDate ).format( 'YYYY-MM-DD' ), downtimetotal: downtimetotal, Timestamp: Timestamp, domain: appConfig.url.apiDomain } );
-        if ( spocEmail ) {
+        if ( spocEmail && isValidEmail( spocEmail ) ) {
           await sendEmailWithSES( spocEmail, subject, html, attachments, appConfig.cloud.aws.ses.adminEmail );
         }
       }
@@ -221,6 +221,7 @@ export async function closeTicket( req, res ) {
         if ( ticket.status == 'closed' ) {
           getTicket.ticketActivity.push( {
             actionType: 'dataRecived',
+            timeStamp: new Date(),
             actionBy: 'Tango',
           } );
         }
@@ -282,7 +283,7 @@ export async function closeTicket( req, res ) {
           let spocName = store.spocDetails[0].name;
           let Uidomain = `${appConfig.url.domain}/manage/stores/infra-ticket?storeId=${getTicket.basicDetails.storeId}`;
           const html = htmlContent( { ...getTicket, Uidomain: Uidomain, primaryIssue: primaryIssue, storeName: getTicket.basicDetails.storeName, spocName: spocName, date: dayjs( getTicket.issueDate ).format( 'YYYY-MM-DD HH:mm' ), downtimetotal: downtimetotal, Timestamp: Timestamp, domain: appConfig.url.apiDomain } );
-          if ( spocEmail && spocEmail != '' &&spocEmail!='none'&& spocEmail != undefined ) {
+          if ( spocEmail && isValidEmail( spocEmail ) ) {
             await sendEmailWithSES( spocEmail, subject, html, attachments, appConfig.cloud.aws.ses.adminEmail );
           }
         }
@@ -295,6 +296,10 @@ export async function closeTicket( req, res ) {
     res.sendError( error, 500 );
   }
 }
+function isValidEmail( email ) {
+  const emailRegex = /^[^\s@]+@[^\s@]+\.[^\s@]+$/;
+  return emailRegex.test( email );
+}
 export async function emailUserList( req, res ) {
   try {
     let clientList = await aggregateClient( [
@@ -600,7 +605,10 @@ export async function infraReportSent( req, res ) {
 
 
     const html = htmlContent( { ...req.body, Uidomain: Uidomain, issueCount: issueCount, avgDownTime: avgDownTime, reportdate: reportdate, content: response, date: date, domain: appConfig.url.apiDomain } );
-    const result = await sendEmailWithSES( req.body.email, subject, html, attachments, appConfig.cloud.aws.ses.adminEmail );
+    if ( isValidEmail( req.body.email ) ) {
+      const result = await sendEmailWithSES( req.body.email, subject, html, attachments, appConfig.cloud.aws.ses.adminEmail );
+      res.sendSuccess( result );
+    }
     res.sendSuccess( result );
   } catch ( error ) {
     logger.error( { error: error, function: 'infraReportSent' } );