dt-common-device 13.4.11 → 13.4.13

package/dist/emails/emailService.d.ts

@@ -1,6 +1,6 @@
 export declare class EmailService {
     private readonly s3Client;
-    private readonly transporter;
+    private readonly sesClient;
     private readonly propertyService;
     constructor();
     getTemplateForProperty(fileName: string, propertyId: string): Promise<import("@aws-sdk/client-s3").GetObjectCommandOutput | undefined>;

package/dist/emails/emailService.js

@@ -73,8 +73,8 @@ var __setFunctionName = (this && this.__setFunctionName) || function (f, name, p
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.EmailService = void 0;
 const client_s3_1 = require("@aws-sdk/client-s3");
+const client_ses_1 = require("@aws-sdk/client-ses");
 const fs = __importStar(require("fs"));
-const nodemailer = __importStar(require("nodemailer"));
 const typedi_1 = __importStar(require("typedi"));
 const Email_1 = require("../constants/Email");
 const Property_service_1 = require("../entities/property/Property.service");
@@ -90,18 +90,13 @@ let EmailService = (() => {
                 accessKeyId: process.env.AWS_ACCESS_KEY_ID ?? "",
                 secretAccessKey: process.env.AWS_SECRET_ACCESS_KEY ?? "",
             };
+            console.log("credentials:------", credentials);
             const region = process.env.AWS_REGION ?? "us-east-1";
             this.s3Client = new client_s3_1.S3Client({ credentials, region });
-            this.transporter = nodemailer.createTransport({
-                host: 'smtp.gmail.com',
-                port: 587,
-                secure: false,
-                auth: {
-                    user: process.env.SMTP_USER,
-                    pass: process.env.SMTP_PASSWORD,
-                },
-            });
+            this.sesClient = new client_ses_1.SESClient({ credentials, region });
             this.propertyService = typedi_1.default.get(Property_service_1.LocalPropertyService);
+            console.log("s3Client:------", this.s3Client);
+            console.log("sesClient:------", this.sesClient);
         }
         async getTemplateForProperty(fileName, propertyId) {
             let res;
@@ -244,47 +239,43 @@ let EmailService = (() => {
                 else {
                     imageURL = `https://api-sandbox-new.devicethread.com/dt-logo.png`;
                 }
-                const CONTACT_US_DETAILS = (0, Email_1.getContactUsDetails)();
-                const from = CONTACT_US_DETAILS?.FROM_EMAIL_ADDRESS;
-                if (!process.env.SMTP_USER || !process.env.SMTP_PASSWORD) {
-                    throw new Error("SMTP credentials are not set");
-                }
-                // Section below is replacing the global variables from template like contact us email, phone and current year.
+                const fromEmail = typeof mailData.fromEmail === "string" ? mailData.fromEmail.trim() : "";
                 const currentYear = new Date().getFullYear().toString();
-                // const logo: any = await GetLogo(ctx);
-                let finalMessage = message
+                const finalMessage = message
                     .replaceAll("{{year}}", currentYear)
-                    .replaceAll("{{contactUsPhone}}", `${CONTACT_US_DETAILS?.PHONE}`)
-                    .replaceAll("{{contactUsEmail}}", `${CONTACT_US_DETAILS?.TO_EMAIL_ADDRESS}`)
+                    .replaceAll("{{contactUsEmail}}", fromEmail)
                     .replaceAll("{{logo}}", `${imageURL}`);
-                // .replaceAll('{{logo}}', `${logo}`);
-                //
-                const mailOptions = {
-                    from: `"devicethread™ Inc." <${from}>`,
-                    to: toAddr,
-                    subject: subject,
-                    html: finalMessage,
-                    replyTo: CONTACT_US_DETAILS?.TO_EMAIL_ADDRESS,
-                };
-                // Add CC addresses if present
+                (0, config_1.getLogger)().info(`sending email (SES) with params: ${JSON.stringify(toAddr)}`);
                 if (ccAddr && Array.isArray(ccAddr) && ccAddr.length > 0) {
-                    mailOptions.cc = ccAddr;
-                }
-                (0, config_1.getLogger)().info(`sending email with params: ${JSON.stringify(toAddr)}`);
-                if (ccAddr && ccAddr.length > 0) {
                     (0, config_1.getLogger)().info(`CC addresses: ${JSON.stringify(ccAddr)}`);
                 }
-                mailData.from = CONTACT_US_DETAILS?.FROM_EMAIL_ADDRESS;
+                mailData.from = fromEmail;
                 if (pdfBuffer) {
-                    // this.sendEmailWithAttachments(this.transporter, mailData, finalMessage, pdfBuffer)
-                }
-                else {
-                    await this.transporter.sendMail(mailOptions);
+                    return;
                 }
+                await this.sesClient.send(new client_ses_1.SendEmailCommand({
+                    Source: fromEmail,
+                    Destination: {
+                        ToAddresses: toAddr,
+                        ...(ccAddr && Array.isArray(ccAddr) && ccAddr.length > 0
+                            ? {
+                                CcAddresses: ccAddr.filter((e) => typeof e === "string" && e.trim()),
+                            }
+                            : {}),
+                    },
+                    Message: {
+                        Subject: { Data: subject, Charset: "UTF-8" },
+                        Body: {
+                            Html: { Data: finalMessage, Charset: "UTF-8" },
+                        },
+                    },
+                    ...(fromEmail ? { ReplyToAddresses: [fromEmail] } : {}),
+                }));
                 const maskedEmailsList = toAddr.map((email) => (0, Email_1.GetMaskedEmail)(email));
                 (0, config_1.getLogger)().info(`Sending email to: ${maskedEmailsList.join(", ")}`);
             }
             catch (error) {
+                console.log("error in sendMail:------", error);
                 (0, config_1.getLogger)().error("sendMail: Error", JSON.stringify(error));
             }
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dt-common-device",
-  "version": "13.4.11",
+  "version": "13.4.13",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "files": [
@@ -38,13 +38,12 @@
   "devDependencies": {
     "@types/lodash": "^4.17.19",
     "@types/node": "^20.0.0",
-    "@types/nodemailer": "7.0.11",
     "@types/pg": "8.15.4",
     "ts-node": "^10.9.2",
     "typescript": "^5.8.3"
   },
   "dependencies": {
-    "@aws-sdk/client-s3": "^3.835.0",
+    "@aws-sdk/client-s3": "3.1015.0",
     "@aws-sdk/client-ses": "3.1003.0",
     "axios": "1.10.0",
     "bullmq": "5.56.4",
@@ -53,7 +52,6 @@
     "ioredis": "5.6.1",
     "lodash": "^4.17.21",
     "mongoose": "8.17.1",
-    "nodemailer": "8.0.1",
     "pg": "8.16.3",
     "svix": "1.84.1",
     "twilio": "5.12.2",