dt-common-device 13.4.2 → 13.4.5

package/dist/config/constants.js

@@ -85,6 +85,7 @@ exports.CONFIG_KEYS = {
             "ADMIN_DB_URI",
             "ACCESS_DB_URI",
             "AWS_SQS_URL",
+            "ADMIN_SERVICE",
             "HEARTBEAT_SQS_URL",
             "CRONICLE_ENDPOINT",
             "CRONICLE_API_KEY",

package/dist/emails/emailService.d.ts

@@ -1,6 +1,6 @@
 export declare class EmailService {
     private readonly s3Client;
-    private readonly sesClient;
+    private readonly transporter;
     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");
@@ -92,7 +92,15 @@ let EmailService = (() => {
             };
             const region = process.env.AWS_REGION ?? "us-east-1";
             this.s3Client = new client_s3_1.S3Client({ credentials, region });
-            this.sesClient = new client_ses_1.SESClient({ 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.propertyService = typedi_1.default.get(Property_service_1.LocalPropertyService);
         }
         async getTemplateForProperty(fileName, propertyId) {
@@ -238,9 +246,8 @@ let EmailService = (() => {
                 }
                 const CONTACT_US_DETAILS = (0, Email_1.getContactUsDetails)();
                 const from = CONTACT_US_DETAILS?.FROM_EMAIL_ADDRESS;
-                if (!process.env.AWS_ACCESS_KEY_ID ||
-                    !process.env.AWS_SECRET_ACCESS_KEY) {
-                    throw new Error("AWS credentials are not set");
+                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 currentYear = new Date().getFullYear().toString();
@@ -252,28 +259,16 @@ let EmailService = (() => {
                     .replaceAll("{{logo}}", `${imageURL}`);
                 // .replaceAll('{{logo}}', `${logo}`);
                 //
-                const params = {
-                    Destination: {
-                        ToAddresses: toAddr,
-                    },
-                    Message: {
-                        Body: {
-                            Html: {
-                                Charset: "UTF-8",
-                                Data: finalMessage,
-                            },
-                        },
-                        Subject: {
-                            Charset: "UTF-8",
-                            Data: subject,
-                        },
-                    },
-                    Source: from, // SENDER_ADDRESS
-                    ReplyToAddresses: [CONTACT_US_DETAILS?.TO_EMAIL_ADDRESS],
+                const mailOptions = {
+                    from: `"devicethread™ Inc." <${from}>`,
+                    to: toAddr,
+                    subject: subject,
+                    html: finalMessage,
+                    replyTo: CONTACT_US_DETAILS?.TO_EMAIL_ADDRESS,
                 };
                 // Add CC addresses if present
                 if (ccAddr && Array.isArray(ccAddr) && ccAddr.length > 0) {
-                    params.Destination.CcAddresses = ccAddr;
+                    mailOptions.cc = ccAddr;
                 }
                 (0, config_1.getLogger)().info(`sending email with params: ${JSON.stringify(toAddr)}`);
                 if (ccAddr && ccAddr.length > 0) {
@@ -281,10 +276,10 @@ let EmailService = (() => {
                 }
                 mailData.from = CONTACT_US_DETAILS?.FROM_EMAIL_ADDRESS;
                 if (pdfBuffer) {
-                    // this.sendEmailWithAttachments(this.sesClient, mailData, finalMessage, pdfBuffer)
+                    // this.sendEmailWithAttachments(this.transporter, mailData, finalMessage, pdfBuffer)
                 }
                 else {
-                    await this.sesClient.send(new client_ses_1.SendEmailCommand(params));
+                    await this.transporter.sendMail(mailOptions);
                 }
                 const maskedEmailsList = toAddr.map((email) => (0, Email_1.GetMaskedEmail)(email));
                 (0, config_1.getLogger)().info(`Sending email to: ${maskedEmailsList.join(", ")}`);

package/dist/entities/admin/Admin.repository.d.ts

@@ -1,4 +1,4 @@
-import { IAccessGroup, IUser, IZone, IZoneAccessGroup } from "./IAdmin";
+import { IAccessGroup, INotificationTemplate, INotificationTemplateResolve, IUser, IZone, IZoneAccessGroup } from "./IAdmin";
 export declare class AdminRepository {
     private readonly deviceRepository;
     private readonly postgres;
@@ -23,4 +23,5 @@ export declare class AdminRepository {
     getChildCollectionsByParentIds(parentIds: string[]): Promise<any[]>;
     deleteAllCollectionHierarchy(propertyId: string, source: string): Promise<void>;
     getCollectionByName(name: string, propertyId: string): Promise<any | null>;
+    getNotificationTemplate(payload: INotificationTemplateResolve): Promise<INotificationTemplate | null>;
 }

package/dist/entities/admin/Admin.repository.js

@@ -536,6 +536,16 @@ let AdminRepository = (() => {
                 return null;
             }
         }
+        async getNotificationTemplate(payload) {
+            if (!payload.propertyId ||
+                !payload.organizationId ||
+                !payload.eventName ||
+                !payload.channel) {
+                throw new Error("Property ID, Organization ID, Event Name, and Channel are required in payload");
+            }
+            const response = await (0, utils_1.getAdminServiceAxiosInstance)().post(`/notification-templates/resolve`, payload);
+            return response.data.data;
+        }
     };
     __setFunctionName(_classThis, "AdminRepository");
     (() => {

package/dist/entities/admin/Admin.service.d.ts

@@ -1,4 +1,4 @@
-import { IAccessGroup, IUser, IZone } from "./IAdmin";
+import { IAccessGroup, INotificationTemplate, INotificationTemplateResolve, IUser, IZone } from "./IAdmin";
 export declare class AdminService {
     private readonly adminRepository;
     private readonly redisUtils;
@@ -17,4 +17,5 @@ export declare class AdminService {
     deleteAllCollectionHierarchy(propertyId: string, source: string): Promise<void>;
     getCollectionByName(name: string, propertyId: string): Promise<any | null>;
     propertyHasSaltoConnection(propertyId: string): Promise<boolean>;
+    getNotificationTemplate(payload: INotificationTemplateResolve): Promise<INotificationTemplate | null>;
 }

package/dist/entities/admin/Admin.service.js

@@ -310,6 +310,15 @@ let AdminService = (() => {
             return connections.every((connection) => connection.connectionProvider === connection_1.ConnectionProvider.SaltoKS ||
                 connection.connectionProvider === connection_1.ConnectionProvider.SaltoSpace);
         }
+        async getNotificationTemplate(payload) {
+            if (!payload.propertyId ||
+                !payload.organizationId ||
+                !payload.eventName ||
+                !payload.channel) {
+                throw new Error("Property ID, Organization ID, Event Name, and Channel are required");
+            }
+            return await this.adminRepository.getNotificationTemplate(payload);
+        }
     };
     __setFunctionName(_classThis, "AdminService");
     (() => {

package/dist/entities/admin/IAdmin.d.ts

@@ -48,3 +48,31 @@ export interface IUser {
     deletedAt?: Date | null;
     imageURL?: string | null;
 }
+export type NotificationChannel = "email" | "sms";
+export type NotificationScope = "platform" | "organization" | "property";
+export interface INotificationTemplate {
+    _id?: string;
+    id?: string;
+    eventName: string;
+    channel: NotificationChannel;
+    scope: NotificationScope;
+    organizationId: string | null;
+    propertyId: string | null;
+    subject?: string;
+    template: string;
+    variables: string[];
+    isActive: boolean;
+    isDeleted?: boolean;
+    createdBy?: string;
+    updatedBy?: string;
+    createdAt?: Date;
+    updatedAt?: Date;
+    deletedAt?: Date;
+    deletedBy?: string;
+}
+export interface INotificationTemplateResolve {
+    propertyId?: string;
+    organizationId?: string;
+    eventName?: string;
+    channel?: NotificationChannel;
+}

package/dist/entities/property/Property.repository.d.ts

@@ -4,5 +4,6 @@ export declare class PropertyRepository {
     constructor();
     getPropertyPreferences(propertyId: string, keys?: string[]): Promise<IPropertySettings | null>;
     getProperty(propertyId: string): Promise<IProperty | null>;
+    getOrganizationByPropertyId(propertyId: string): Promise<any | null>;
     getAllProperties(): Promise<any[]>;
 }

package/dist/entities/property/Property.repository.js

@@ -41,6 +41,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.PropertyRepository = void 0;
 const db_1 = require("../../db");
 const typedi_1 = require("typedi");
+const utils_1 = require("../../utils");
 let PropertyRepository = (() => {
     let _classDecorators = [(0, typedi_1.Service)()];
     let _classDescriptor;
@@ -84,6 +85,10 @@ let PropertyRepository = (() => {
             }
             return null;
         }
+        async getOrganizationByPropertyId(propertyId) {
+            const organization = await (0, utils_1.getAdminServiceAxiosInstance)().get(`/properties/${propertyId}/organizations`);
+            return organization.data.data;
+        }
         async getAllProperties() {
             try {
                 //Retrieve all the properties ids from the database where isDeleted is false

package/dist/entities/property/Property.service.d.ts

@@ -5,4 +5,5 @@ export declare class LocalPropertyService {
     getProperty(propertyId: string): Promise<import("./IProperty").IProperty | null>;
     getPropertyTimeZone(propertyId: string): Promise<string>;
     getAllProperties(): Promise<any[]>;
+    getOrganizationByPropertyId(propertyId: string): Promise<any>;
 }

package/dist/entities/property/Property.service.js

@@ -110,6 +110,12 @@ let LocalPropertyService = (() => {
             const properties = await this.propertyRepository.getAllProperties();
             return properties;
         }
+        async getOrganizationByPropertyId(propertyId) {
+            if (!propertyId) {
+                throw new Error("Property ID is required");
+            }
+            return await this.propertyRepository.getOrganizationByPropertyId(propertyId);
+        }
     };
     __setFunctionName(_classThis, "LocalPropertyService");
     (() => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dt-common-device",
-  "version": "13.4.2",
+  "version": "13.4.5",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "files": [
@@ -38,6 +38,7 @@
   "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"
@@ -52,6 +53,7 @@
     "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",