@platform-x/hep-notification-client 1.1.21 → 1.2.0

package/dist/src/common/service/secretKeyManager.services.d.ts

@@ -0,0 +1,7 @@
+export declare class SecretKeyServices {
+    private ruleCache;
+    /**
+     * Fetches all the secret keys
+     */
+    getSecretKeys(): Promise<any>;
+}

package/dist/src/common/service/secretKeyManager.services.js

@@ -0,0 +1,58 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SecretKeyServices = void 0;
+const hep_secret_access_1 = require("hep-secret-access");
+const config_1 = __importDefault(require("../../config"));
+const constants_1 = require("../../platform-x/constants");
+class SecretKeyServices {
+    constructor() {
+        this.ruleCache = new Map();
+    }
+    /**
+     * Fetches all the secret keys
+     */
+    getSecretKeys() {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                // Initialize secret manager object
+                if (this.ruleCache.has('secret_data')) {
+                    return this.ruleCache.get('secret_data');
+                }
+                const secretObject = (0, hep_secret_access_1.secretManager)();
+                // If secret mode is ENV – read one by one
+                // for local testing
+                if ((config_1.default === null || config_1.default === void 0 ? void 0 : config_1.default.SECRET_MODE) === 'env') {
+                    const keyConfig = {};
+                    for (const key of Object.values(constants_1.DynamicValues)) {
+                        // Fetch individual value (existing read() method)
+                        const value = yield secretObject.read(key);
+                        keyConfig[key] = value;
+                    }
+                    this.ruleCache.set('secret_data', keyConfig);
+                    return keyConfig;
+                }
+                // else – fetch all secrets from GSM
+                const data = yield secretObject.readAllSecrets();
+                this.ruleCache.set('secret_data', data);
+                return data;
+            }
+            catch (err) {
+                return {};
+            }
+        });
+    }
+}
+exports.SecretKeyServices = SecretKeyServices;
+//# sourceMappingURL=secretKeyManager.services.js.map

package/dist/src/common/service/twilioService.d.ts

@@ -7,7 +7,8 @@ export declare class TwilioService {
      * @param authToken - Twilio Auth Token
      * @param senderNumber - Twilio Sender Phone Number
      */
-    constructor();
+    private constructor();
+    static TwilioClassObject(): Promise<TwilioService>;
     /**
      * Send an SMS using Twilio
      * @param to - Recipient's phone number

package/dist/src/common/service/twilioService.js

@@ -15,7 +15,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.TwilioService = void 0;
 const twilio_1 = __importDefault(require("twilio"));
 const logger_1 = require("../util/logger");
-const config_1 = __importDefault(require("../../config"));
+const secretKeyManager_services_1 = require("./secretKeyManager.services");
+const constants_1 = require("../../platform-x/constants");
 class TwilioService {
     /**
      * Constructor to initialize Twilio client and sender number
@@ -23,9 +24,15 @@ class TwilioService {
      * @param authToken - Twilio Auth Token
      * @param senderNumber - Twilio Sender Phone Number
      */
-    constructor() {
-        this.client = (0, twilio_1.default)(config_1.default === null || config_1.default === void 0 ? void 0 : config_1.default.TWILIO.ACCOUNT_SID, config_1.default === null || config_1.default === void 0 ? void 0 : config_1.default.TWILIO.AUTH_TOKEN);
-        this.senderNumber = config_1.default === null || config_1.default === void 0 ? void 0 : config_1.default.TWILIO.SENDER_NUMBER;
+    constructor(twilioConfig) {
+        this.client = (0, twilio_1.default)(twilioConfig === null || twilioConfig === void 0 ? void 0 : twilioConfig[constants_1.DynamicValues === null || constants_1.DynamicValues === void 0 ? void 0 : constants_1.DynamicValues.TWILIO_ACCOUNT_SID], twilioConfig === null || twilioConfig === void 0 ? void 0 : twilioConfig[constants_1.DynamicValues === null || constants_1.DynamicValues === void 0 ? void 0 : constants_1.DynamicValues.TWILIO_AUTH_TOKEN]);
+        this.senderNumber = twilioConfig === null || twilioConfig === void 0 ? void 0 : twilioConfig[constants_1.DynamicValues === null || constants_1.DynamicValues === void 0 ? void 0 : constants_1.DynamicValues.TWILIO_SENDER_NUMBER];
+    }
+    static TwilioClassObject() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const secrets = yield new secretKeyManager_services_1.SecretKeyServices().getSecretKeys();
+            return new TwilioService(secrets);
+        });
     }
     /**
      * Send an SMS using Twilio

package/dist/src/config/index.d.ts

@@ -25,5 +25,6 @@ declare const _default: {
     };
     MULTISITE_WITH_SOLR: string | boolean;
     CFF_MAIL_FROM: string;
+    SECRET_MODE: string;
 };
 export default _default;

package/dist/src/config/index.js

@@ -35,5 +35,6 @@ exports.default = {
     },
     MULTISITE_WITH_SOLR: process.env.MULTISITE_WITH_SOLR || false,
     CFF_MAIL_FROM: process.env.CFF_MAIL_FROM || '',
+    SECRET_MODE: process.env.SECRET_MODE || 'gsm'
 };
 //# sourceMappingURL=index.js.map

package/dist/src/platform-x/constants/index.d.ts

@@ -9,3 +9,10 @@ export declare const TRACE_ID_HEADER_NAME = "Platform-X-Trace-Id";
 export declare const DEFAULT_APP_PORT = 8080;
 export declare const DEFAULT_APP_NAME = "api-gateway";
 export declare const DEFAULT_REALM_NAME = "platform-x";
+export declare const DynamicValues: {
+    SENDGRID_API_KEY: string;
+    TWILIO_ACCOUNT_SID: string;
+    TWILIO_AUTH_TOKEN: string;
+    TWILIO_SENDER_NUMBER: string;
+    MONGO_PASS: string;
+};

package/dist/src/platform-x/constants/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DEFAULT_REALM_NAME = exports.DEFAULT_APP_NAME = exports.DEFAULT_APP_PORT = exports.TRACE_ID_HEADER_NAME = exports.HTTP_CONTENT_TYPE_JSON = exports.CREATE_USER_EMAIL_TEMPLATE = exports.DEFAULT_SOLR_ROWS = void 0;
+exports.DynamicValues = exports.DEFAULT_REALM_NAME = exports.DEFAULT_APP_NAME = exports.DEFAULT_APP_PORT = exports.TRACE_ID_HEADER_NAME = exports.HTTP_CONTENT_TYPE_JSON = exports.CREATE_USER_EMAIL_TEMPLATE = exports.DEFAULT_SOLR_ROWS = void 0;
 exports.DEFAULT_SOLR_ROWS = 2147483647;
 exports.CREATE_USER_EMAIL_TEMPLATE = [{
         subject: 'Plat-x User Registration',
@@ -12,4 +12,11 @@ exports.TRACE_ID_HEADER_NAME = 'Platform-X-Trace-Id';
 exports.DEFAULT_APP_PORT = 8080;
 exports.DEFAULT_APP_NAME = 'api-gateway';
 exports.DEFAULT_REALM_NAME = 'platform-x';
+exports.DynamicValues = {
+    SENDGRID_API_KEY: 'SENDGRID_API_KEY',
+    TWILIO_ACCOUNT_SID: 'TWILIO_ACCOUNT_SID',
+    TWILIO_AUTH_TOKEN: 'TWILIO_AUTH_TOKEN',
+    TWILIO_SENDER_NUMBER: 'TWILIO_SENDER_NUMBER',
+    MONGO_PASS: 'MONGO_PASS',
+};
 //# sourceMappingURL=index.js.map

package/dist/src/platform-x/database/connection.d.ts

@@ -2,7 +2,7 @@ import mongoose from 'mongoose';
 declare const _default: {
     database: mongoose.Connection;
     mongoose: typeof mongoose;
-    connect: () => void;
+    connect: () => Promise<void>;
     disconnect: () => void;
 };
 export default _default;

package/dist/src/platform-x/database/connection.js

@@ -15,17 +15,21 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const mongoose_1 = __importDefault(require("mongoose"));
 const logger_1 = require("../../common/util/logger");
 const index_1 = __importDefault(require("../../config/index"));
+const secretKeyManager_services_1 = require("../../common/service/secretKeyManager.services");
+const constants_1 = require("../constants");
 let database = mongoose_1.default.connection;
 // Exit on error
 mongoose_1.default.connection.on('error', (err) => {
     logger_1.Logger.info(`MongoDB connection error: ${err}`, 'mongoose');
     process.exit(-1);
 });
-const connect = () => {
+const connect = () => __awaiter(void 0, void 0, void 0, function* () {
     if (database.readyState) {
         return;
     }
-    mongoose_1.default.connect(`mongodb://${index_1.default.MONGO.USER}:${index_1.default.MONGO.PASS}@${index_1.default.MONGO.HOST}:${index_1.default.MONGO.PORT}/${index_1.default.MONGO.DB_NAME}?directConnection=true&authMechanism=DEFAULT&authSource=${index_1.default.MONGO.DB_NAME}`);
+    const secrets = yield new secretKeyManager_services_1.SecretKeyServices().getSecretKeys();
+    console.log('>>>>>>>>>>>>>>>>>>>>>>>>>.', secrets);
+    mongoose_1.default.connect(`mongodb://${index_1.default.MONGO.USER}:${secrets === null || secrets === void 0 ? void 0 : secrets[constants_1.DynamicValues === null || constants_1.DynamicValues === void 0 ? void 0 : constants_1.DynamicValues.MONGO_PASS]}@${index_1.default.MONGO.HOST}:${index_1.default.MONGO.PORT}/${index_1.default.MONGO.DB_NAME}?directConnection=true&authMechanism=DEFAULT&authSource=${index_1.default.MONGO.DB_NAME}`);
     database = mongoose_1.default.connection;
     database.once('open', () => __awaiter(void 0, void 0, void 0, function* () {
         logger_1.Logger.info(`[Server] connected to MongoDB`, 'connect');
@@ -34,7 +38,7 @@ const connect = () => {
         logger_1.Logger.error(`[Server] error connecting to MongoDB`, 'connect', err);
         process.exit(-1);
     });
-};
+});
 const disconnect = () => {
     if (!database) {
         return;

package/dist/src/platform-x/database/index.d.ts

@@ -1,7 +1,7 @@
 declare const db: {
     database: import("mongoose").Connection;
     mongoose: typeof import("mongoose");
-    connect: () => void;
+    connect: () => Promise<void>;
     disconnect: () => void;
 };
 export default db;

package/dist/src/platform-x/database/models/formBuilder.model.d.ts

@@ -10,37 +10,25 @@ declare const dynamicModelName: (collectionName: string) => Promise<mongoose.Mod
 } & {}, {}, {}, {}, mongoose.Document<unknown, {}, {
     createdAt: NativeDate;
     updatedAt: NativeDate;
-} & {}, {}, {
-    timestamps: true;
-    minimize: false;
-    strict: false;
-}> & {
+} & {}> & Omit<{
     createdAt: NativeDate;
     updatedAt: NativeDate;
 } & {} & {
     _id: mongoose.Types.ObjectId;
-} & {
-    __v: number;
-}, mongoose.Schema<any, mongoose.Model<any, any, any, any, any, any>, {}, {}, {}, {}, {
+}, never>, mongoose.Schema<any, mongoose.Model<any, any, any, any, any, any>, {}, {}, {}, {}, mongoose.ResolveSchemaOptions<{
     timestamps: true;
     minimize: false;
     strict: false;
-}, {
+}>, {
     createdAt: NativeDate;
     updatedAt: NativeDate;
 } & {}, mongoose.Document<unknown, {}, mongoose.FlatRecord<{
     createdAt: NativeDate;
     updatedAt: NativeDate;
-} & {}>, {}, mongoose.ResolveSchemaOptions<{
-    timestamps: true;
-    minimize: false;
-    strict: false;
-}>> & mongoose.FlatRecord<{
+} & {}>> & Omit<mongoose.FlatRecord<{
     createdAt: NativeDate;
     updatedAt: NativeDate;
 } & {}> & {
     _id: mongoose.Types.ObjectId;
-} & {
-    __v: number;
-}>>>;
+}, never>>>>;
 export default dynamicModelName;

package/dist/src/platform-x/util/emailHandler.js

@@ -63,6 +63,7 @@ const dompurify_1 = __importDefault(require("dompurify"));
 const jsdom_1 = require("jsdom");
 const logger_1 = require("../../common/util/logger");
 const path_1 = __importDefault(require("path"));
+const secretKeyManager_services_1 = require("../../common/service/secretKeyManager.services");
 const window = new jsdom_1.JSDOM('').window;
 const DOMPurify = (0, dompurify_1.default)(window);
 // NOSONAR-NEXT-LINE
@@ -76,7 +77,8 @@ class EmailHandler {
     sendEmail(emailConfig) {
         return __awaiter(this, void 0, void 0, function* () {
             logger_1.Logger.info('EmailHandler: Reached sendEmail method', 'sendEmail');
-            sgMail.setApiKey(config_1.default.SENDGRID_API_KEY);
+            const secrets = yield new secretKeyManager_services_1.SecretKeyServices().getSecretKeys();
+            sgMail.setApiKey(secrets === null || secrets === void 0 ? void 0 : secrets[constants_1.DynamicValues === null || constants_1.DynamicValues === void 0 ? void 0 : constants_1.DynamicValues.SENDGRID_API_KEY]);
             // Build personalization object
             const personalization = {
                 to: [{ email: emailConfig.email }],
@@ -226,14 +228,14 @@ class EmailHandler {
      */
     sendEmailWithPersonalizations(emailConfig, isCFF) {
         return __awaiter(this, void 0, void 0, function* () {
-            var _a, _b, _c, _d, _e, _f;
             logger_1.Logger.info(`EmailHandler: Reached sendEmailWithPersonalizations method with emailConfig: ${JSON.stringify(emailConfig)}`, 'sendEmailWithPersonalizations');
-            logger_1.Logger.info(`SENDGRID CREDENTIALS-----------------> ${config_1.default === null || config_1.default === void 0 ? void 0 : config_1.default.SENDGRID_API_KEY} EMAIL_FROM-------> ${config_1.default === null || config_1.default === void 0 ? void 0 : config_1.default.EMAIL_FROM}`, 'triggerEmails');
+            logger_1.Logger.info(`EMAIL_FROM-------> ${config_1.default === null || config_1.default === void 0 ? void 0 : config_1.default.EMAIL_FROM}`, 'triggerEmails');
             const Mail = sgHelpers.classes.Mail;
             let email_from = isCFF ? config_1.default === null || config_1.default === void 0 ? void 0 : config_1.default.CFF_MAIL_FROM : config_1.default === null || config_1.default === void 0 ? void 0 : config_1.default.EMAIL_FROM;
             logger_1.Logger.info('sendEmailWithPersonalizations : Email From:', JSON.stringify(email_from));
             const Personalization = sgHelpers.classes.Personalization;
-            sgMail.setApiKey(config_1.default.SENDGRID_API_KEY);
+            const secrets = yield new secretKeyManager_services_1.SecretKeyServices().getSecretKeys();
+            sgMail.setApiKey(secrets === null || secrets === void 0 ? void 0 : secrets[constants_1.DynamicValues === null || constants_1.DynamicValues === void 0 ? void 0 : constants_1.DynamicValues.SENDGRID_API_KEY]);
             const mail = new Mail();
             mail.setFrom(email_from);
             mail.setSubject(emailConfig.subject);
@@ -243,38 +245,28 @@ class EmailHandler {
             if ((emailConfig === null || emailConfig === void 0 ? void 0 : emailConfig.personalizations) &&
                 (emailConfig === null || emailConfig === void 0 ? void 0 : emailConfig.personalizations.to.length)) {
                 const { to, cc } = emailConfig === null || emailConfig === void 0 ? void 0 : emailConfig.personalizations;
-                // First personalization with TO and CC
-                const firstPersonalization = new Personalization();
-                firstPersonalization.addTo(to[0].to);
-                // Add CC emails to first personalization only (to avoid duplicate CC emails)
-                if (cc && cc.length > 0) {
-                    cc.forEach((ccData) => {
-                        firstPersonalization.addCc(ccData.to);
-                        logger_1.Logger.info(`Adding CC email to personalized email: ${ccData.to}`, 'sendEmailWithPersonalizations');
-                    });
-                }
-                // Add TO substitutions for first recipient
-                if ((_a = to[0]) === null || _a === void 0 ? void 0 : _a.substitutions) {
-                    for (const key in (_b = to[0]) === null || _b === void 0 ? void 0 : _b.substitutions) {
-                        if (key) {
-                            firstPersonalization === null || firstPersonalization === void 0 ? void 0 : firstPersonalization.addSubstitution(key, (_c = to[0]) === null || _c === void 0 ? void 0 : _c.substitutions[key]);
-                        }
-                    }
-                }
-                mail.addPersonalization(firstPersonalization);
-                // Remaining personalizations with only TO (no CC to avoid duplicates)
-                for (let i = 1; i < to.length; i++) {
+                // Create separate personalization for each TO recipient with their unique substitutions
+                to.forEach((toData, index) => {
                     const personalization = new Personalization();
-                    personalization.addTo(to[i].to);
-                    if ((_d = to[i]) === null || _d === void 0 ? void 0 : _d.substitutions) {
-                        for (const key in (_e = to[i]) === null || _e === void 0 ? void 0 : _e.substitutions) {
+                    personalization.addTo(toData.to);
+                    // Add CC emails to EACH personalization (CC gets email for each TO recipient)
+                    if (cc && cc.length > 0) {
+                        cc.forEach((ccData) => {
+                            personalization.addCc(ccData.to);
+                            logger_1.Logger.info(`Adding CC email ${ccData.to} to personalization ${index + 1} for TO: ${toData.to}`, 'sendEmailWithPersonalizations');
+                        });
+                    }
+                    // Add unique substitutions for each TO recipient
+                    if (toData === null || toData === void 0 ? void 0 : toData.substitutions) {
+                        for (const key in toData === null || toData === void 0 ? void 0 : toData.substitutions) {
                             if (key) {
-                                personalization === null || personalization === void 0 ? void 0 : personalization.addSubstitution(key, (_f = to[i]) === null || _f === void 0 ? void 0 : _f.substitutions[key]);
+                                personalization === null || personalization === void 0 ? void 0 : personalization.addSubstitution(key, toData === null || toData === void 0 ? void 0 : toData.substitutions[key]);
                             }
                         }
                     }
                     mail.addPersonalization(personalization);
-                }
+                    logger_1.Logger.info(`Personalization ${index + 1} created for TO: ${toData.to} with ${(cc === null || cc === void 0 ? void 0 : cc.length) || 0} CC recipients`, 'sendEmailWithPersonalizations');
+                });
                 // Handle attachments
                 if ((emailConfig === null || emailConfig === void 0 ? void 0 : emailConfig.attachments) && Array.isArray(emailConfig.attachments)) {
                     emailConfig.attachments.forEach((attachment) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@platform-x/hep-notification-client",
-  "version": "1.1.21",
+  "version": "1.2.0",
   "description": "@platform-x/hep-notification-client",
   "main": "dist/src/index.js",
   "types": "dist/src/index.d.ts",
@@ -31,6 +31,7 @@
     "@types/node": "^15.12.2",
     "@types/twilio": "^3.19.2",
     "apollo-server-caching": "^3.3.0",
+    "axios": "0.21.4",
     "bunyan": "^1.8.15",
     "bunyan-format": "^0.2.1",
     "cls-hooked": "^4.2.2",
@@ -40,19 +41,19 @@
     "ejs": "^3.1.10",
     "express": "^4.17.1",
     "fs": "^0.0.1-security",
+    "hep-secret-access": "^1.3.4",
     "jsdom": "^26.1.0",
     "lodash": "4.17.21",
     "moment": "2.29.4",
     "moment-timezone": "0.5.34",
+    "mongodb": "5.9.2",
+    "mongoose": "7.0.3",
     "mysql2": "2.3.3",
     "node-html-parser": "5.1.0",
     "request-ip": "2.1.3",
     "solr-client": "0.10.0-rc6",
     "twilio": "^5.3.6",
-    "uuid": "8.3.2",
-    "mongodb": "5.9.2",
-    "mongoose": "7.0.3",
-    "axios": "0.21.4"
+    "uuid": "8.3.2"
   },
   "private": false,
   "publishConfig": {