@resolveio/server-lib 22.3.91 → 22.3.93

package/collections/email-history.collection.js

@@ -48,6 +48,13 @@ var schema = {
         type: Object,
         blackbox: true
     },
+    cc: {
+        type: Array,
+        optional: true
+    },
+    'cc.$': {
+        type: String
+    },
     send_from: {
         type: String
     },

package/collections/email-history.collection.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/collections/email-history.collection.ts"],"names":[],"mappings":"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","file":"email-history.collection.js","sourcesContent":[" import { MongoManagerCollection, MongoManagerModel } from '../managers/mongo.manager';\nimport { EmailHistoryModel } from '../models/email-history.model';\nimport { ResolveIOServer } from '../resolveio-server-app';\n\nlet schema: any = {\n\t_id: {\n\t\ttype: String,\n\t\toptional: true\n\t},\n\t__v: {\n\t\ttype: Number,\n\t\toptional: true\n\t},\n\tupdatedAt: {\n\t\ttype: Date,\n\t\toptional: true\n\t},\n\tcreatedAt: {\n\t\ttype: Date,\n\t\toptional: true\n\t},\n\tdate: {\n\t\ttype: Date\n\t},\n\tid_user: {\n\t\ttype: String\n\t},\n\tuser: {\n\t\ttype: String\n\t},\n\temail: {\n\t\ttype: String\n\t},\n\tsubject: {\n\t\ttype: String\n\t},\n\ttext: {\n\t\ttype: String\n\t},\n\thtml: {\n\t\ttype: String\n\t},\n\tattachments: {\n\t\ttype: Array\n\t},\n\t'attachments.$': {\n\t\ttype: Object,\n\t\tblackbox: true\n\t},\n\tsend_from: {\n\t\ttype: String\n\t},\n\treply_to: {\n\t\ttype: String\n\t},\n\tstatus: {\n\t\ttype: String\n\t},\n\terror: {\n\t\ttype: String\n\t},\n\tprocessingAt: {\n\t\ttype: Date,\n\t\toptional: true\n\t},\n\tcompletedAt: {\n\t\ttype: Date,\n\t\toptional: true\n\t},\n\tforce_ses: {\n\t\ttype: Boolean,\n\t\toptional: true\n\t},\n\theaders: {\n\t\ttype: Object,\n\t\toptional: true,\n\t\tblackbox: true\n\t},\n\tcorrelationId: {\n\t\ttype: String,\n\t\toptional: true\n\t},\n\tmeta: {\n\t\ttype: Object,\n\t\toptional: true,\n\t\tblackbox: true\n\t},\n\toccurrences: {\n\t\ttype: Array,\n\t\toptional: true\n\t},\n\t'occurrences.$': {\n\t\ttype: Object,\n\t\toptional: true,\n\t\tblackbox: true\n\t}\n};\n\nexport let EmailHistories: MongoManagerCollection<EmailHistoryModel> = null;\n\ninitializeCollection();\n\nfunction initializeCollection() {\n\tif (ResolveIOServer && ResolveIOServer.getMainDB() && MongoManagerModel) {\n\t\tconst model = MongoManagerModel.create<EmailHistoryModel>({\n\t\t\tcollectionName: 'email-histories',\n\t\t\tschema: schema,\n\t\t\tuseVersionCollection: false,\n\t\t\tuseReportBuilder: false,\n\t\t\treportBuilderLookupTables: [],\n\t\t\ttimestamps: true,\n\t\t\tcreateLogs: false,\n\t\t\tcheckSchema: true,\n\t\t\tcollectionOptions: null,\n\t\t\tskipCache: true,\n\t\t\tbypassSession: true\n\t\t});\n\t\tEmailHistories = model.collection_main;\n\t\tEmailHistories.createIndex({status: 1});\n\t\tEmailHistories.createIndex({createdAt: 1}, {expireAfterSeconds: 60 * 60 * 24 * 90});\n\t}\n\telse {\n\t\tsetImmediate(() => {\n\t\t\tinitializeCollection();\n\t\t});\n\t}\n}\n"]}
+{"version":3,"sources":["../../src/collections/email-history.collection.ts"],"names":[],"mappings":";;;AAAC,2DAAsF;AAEvF,gEAA0D;AAE1D,IAAI,MAAM,GAAQ;IACjB,GAAG,EAAE;QACJ,IAAI,EAAE,MAAM;QACZ,QAAQ,EAAE,IAAI;KACd;IACD,GAAG,EAAE;QACJ,IAAI,EAAE,MAAM;QACZ,QAAQ,EAAE,IAAI;KACd;IACD,SAAS,EAAE;QACV,IAAI,EAAE,IAAI;QACV,QAAQ,EAAE,IAAI;KACd;IACD,SAAS,EAAE;QACV,IAAI,EAAE,IAAI;QACV,QAAQ,EAAE,IAAI;KACd;IACD,IAAI,EAAE;QACL,IAAI,EAAE,IAAI;KACV;IACD,OAAO,EAAE;QACR,IAAI,EAAE,MAAM;KACZ;IACD,IAAI,EAAE;QACL,IAAI,EAAE,MAAM;KACZ;IACD,KAAK,EAAE;QACN,IAAI,EAAE,MAAM;KACZ;IACD,OAAO,EAAE;QACR,IAAI,EAAE,MAAM;KACZ;IACD,IAAI,EAAE;QACL,IAAI,EAAE,MAAM;KACZ;IACD,IAAI,EAAE;QACL,IAAI,EAAE,MAAM;KACZ;IACD,WAAW,EAAE;QACZ,IAAI,EAAE,KAAK;KACX;IACD,eAAe,EAAE;QAChB,IAAI,EAAE,MAAM;QACZ,QAAQ,EAAE,IAAI;KACd;IACD,EAAE,EAAE;QACH,IAAI,EAAE,KAAK;QACX,QAAQ,EAAE,IAAI;KACd;IACD,MAAM,EAAE;QACP,IAAI,EAAE,MAAM;KACZ;IACD,SAAS,EAAE;QACV,IAAI,EAAE,MAAM;KACZ;IACD,QAAQ,EAAE;QACT,IAAI,EAAE,MAAM;KACZ;IACD,MAAM,EAAE;QACP,IAAI,EAAE,MAAM;KACZ;IACD,KAAK,EAAE;QACN,IAAI,EAAE,MAAM;KACZ;IACD,YAAY,EAAE;QACb,IAAI,EAAE,IAAI;QACV,QAAQ,EAAE,IAAI;KACd;IACD,WAAW,EAAE;QACZ,IAAI,EAAE,IAAI;QACV,QAAQ,EAAE,IAAI;KACd;IACD,SAAS,EAAE;QACV,IAAI,EAAE,OAAO;QACb,QAAQ,EAAE,IAAI;KACd;IACD,OAAO,EAAE;QACR,IAAI,EAAE,MAAM;QACZ,QAAQ,EAAE,IAAI;QACd,QAAQ,EAAE,IAAI;KACd;IACD,aAAa,EAAE;QACd,IAAI,EAAE,MAAM;QACZ,QAAQ,EAAE,IAAI;KACd;IACD,IAAI,EAAE;QACL,IAAI,EAAE,MAAM;QACZ,QAAQ,EAAE,IAAI;QACd,QAAQ,EAAE,IAAI;KACd;IACD,WAAW,EAAE;QACZ,IAAI,EAAE,KAAK;QACX,QAAQ,EAAE,IAAI;KACd;IACD,eAAe,EAAE;QAChB,IAAI,EAAE,MAAM;QACZ,QAAQ,EAAE,IAAI;QACd,QAAQ,EAAE,IAAI;KACd;CACD,CAAC;AAES,QAAA,cAAc,GAA8C,IAAI,CAAC;AAE5E,oBAAoB,EAAE,CAAC;AAEvB,SAAS,oBAAoB;IAC5B,IAAI,sCAAe,IAAI,sCAAe,CAAC,SAAS,EAAE,IAAI,iCAAiB,EAAE,CAAC;QACzE,IAAM,KAAK,GAAG,iCAAiB,CAAC,MAAM,CAAoB;YACzD,cAAc,EAAE,iBAAiB;YACjC,MAAM,EAAE,MAAM;YACd,oBAAoB,EAAE,KAAK;YAC3B,gBAAgB,EAAE,KAAK;YACvB,yBAAyB,EAAE,EAAE;YAC7B,UAAU,EAAE,IAAI;YAChB,UAAU,EAAE,KAAK;YACjB,WAAW,EAAE,IAAI;YACjB,iBAAiB,EAAE,IAAI;YACvB,SAAS,EAAE,IAAI;YACf,aAAa,EAAE,IAAI;SACnB,CAAC,CAAC;QACH,sBAAc,GAAG,KAAK,CAAC,eAAe,CAAC;QACvC,sBAAc,CAAC,WAAW,CAAC,EAAC,MAAM,EAAE,CAAC,EAAC,CAAC,CAAC;QACxC,sBAAc,CAAC,WAAW,CAAC,EAAC,SAAS,EAAE,CAAC,EAAC,EAAE,EAAC,kBAAkB,EAAE,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,EAAC,CAAC,CAAC;IACrF,CAAC;SACI,CAAC;QACL,YAAY,CAAC;YACZ,oBAAoB,EAAE,CAAC;QACxB,CAAC,CAAC,CAAC;IACJ,CAAC;AACF,CAAC","file":"email-history.collection.js","sourcesContent":[" import { MongoManagerCollection, MongoManagerModel } from '../managers/mongo.manager';\nimport { EmailHistoryModel } from '../models/email-history.model';\nimport { ResolveIOServer } from '../resolveio-server-app';\n\nlet schema: any = {\n\t_id: {\n\t\ttype: String,\n\t\toptional: true\n\t},\n\t__v: {\n\t\ttype: Number,\n\t\toptional: true\n\t},\n\tupdatedAt: {\n\t\ttype: Date,\n\t\toptional: true\n\t},\n\tcreatedAt: {\n\t\ttype: Date,\n\t\toptional: true\n\t},\n\tdate: {\n\t\ttype: Date\n\t},\n\tid_user: {\n\t\ttype: String\n\t},\n\tuser: {\n\t\ttype: String\n\t},\n\temail: {\n\t\ttype: String\n\t},\n\tsubject: {\n\t\ttype: String\n\t},\n\ttext: {\n\t\ttype: String\n\t},\n\thtml: {\n\t\ttype: String\n\t},\n\tattachments: {\n\t\ttype: Array\n\t},\n\t'attachments.$': {\n\t\ttype: Object,\n\t\tblackbox: true\n\t},\n\tcc: {\n\t\ttype: Array,\n\t\toptional: true\n\t},\n\t'cc.$': {\n\t\ttype: String\n\t},\n\tsend_from: {\n\t\ttype: String\n\t},\n\treply_to: {\n\t\ttype: String\n\t},\n\tstatus: {\n\t\ttype: String\n\t},\n\terror: {\n\t\ttype: String\n\t},\n\tprocessingAt: {\n\t\ttype: Date,\n\t\toptional: true\n\t},\n\tcompletedAt: {\n\t\ttype: Date,\n\t\toptional: true\n\t},\n\tforce_ses: {\n\t\ttype: Boolean,\n\t\toptional: true\n\t},\n\theaders: {\n\t\ttype: Object,\n\t\toptional: true,\n\t\tblackbox: true\n\t},\n\tcorrelationId: {\n\t\ttype: String,\n\t\toptional: true\n\t},\n\tmeta: {\n\t\ttype: Object,\n\t\toptional: true,\n\t\tblackbox: true\n\t},\n\toccurrences: {\n\t\ttype: Array,\n\t\toptional: true\n\t},\n\t'occurrences.$': {\n\t\ttype: Object,\n\t\toptional: true,\n\t\tblackbox: true\n\t}\n};\n\nexport let EmailHistories: MongoManagerCollection<EmailHistoryModel> = null;\n\ninitializeCollection();\n\nfunction initializeCollection() {\n\tif (ResolveIOServer && ResolveIOServer.getMainDB() && MongoManagerModel) {\n\t\tconst model = MongoManagerModel.create<EmailHistoryModel>({\n\t\t\tcollectionName: 'email-histories',\n\t\t\tschema: schema,\n\t\t\tuseVersionCollection: false,\n\t\t\tuseReportBuilder: false,\n\t\t\treportBuilderLookupTables: [],\n\t\t\ttimestamps: true,\n\t\t\tcreateLogs: false,\n\t\t\tcheckSchema: true,\n\t\t\tcollectionOptions: null,\n\t\t\tskipCache: true,\n\t\t\tbypassSession: true\n\t\t});\n\t\tEmailHistories = model.collection_main;\n\t\tEmailHistories.createIndex({status: 1});\n\t\tEmailHistories.createIndex({createdAt: 1}, {expireAfterSeconds: 60 * 60 * 24 * 90});\n\t}\n\telse {\n\t\tsetImmediate(() => {\n\t\t\tinitializeCollection();\n\t\t});\n\t}\n}\n"]}

package/managers/method.manager.d.ts

@@ -7,6 +7,7 @@ interface SendEmailOptions {
     correlationId?: string;
     meta?: Record<string, any>;
     headers?: Record<string, string>;
+    cc?: string | string[];
     waitForCompletion?: boolean;
     waitForCompletionTimeoutMs?: number;
     waitForCompletionPollMs?: number;

package/managers/method.manager.js

@@ -149,6 +149,22 @@ function appendCorrelationIdToSubject(subject, correlationId) {
     }
     return "".concat(subject, " ").concat(correlationTag).trim();
 }
+function isDevEmailRedirectEnvironment() {
+    var rootUrl = resolveio_server_app_1.ResolveIOServer.getServerConfig()['ROOT_URL'];
+    return !!(rootUrl.match(/https:\/\/dev\./) ||
+        rootUrl.match(/https:\/\/www\.dev\./) ||
+        rootUrl === 'http://localhost:4200');
+}
+function normalizeEmailRecipients(recipients) {
+    if (!recipients) {
+        return [];
+    }
+    var list = Array.isArray(recipients) ? recipients : [recipients];
+    return list
+        .flatMap(function (recipient) { return String(recipient).split(/[;,]/); })
+        .map(function (recipient) { return recipient.trim(); })
+        .filter(Boolean);
+}
 function createEmailOccurrence(subject, text, html, meta) {
     return {
         _id: (0, common_1.objectIdHexString)(),
@@ -1461,6 +1477,7 @@ var MethodManager = /** @class */ (function () {
                                             replyTo: emailHistory.reply_to || (resolveio_server_app_1.ResolveIOServer.getServerConfig()['MAIL_REPLY_TO'] || undefined),
                                             from: emailHistory.send_from || resolveio_server_app_1.ResolveIOServer.getServerConfig().MAIL_FROM,
                                             to: emailHistory.email,
+                                            cc: emailHistory.cc && emailHistory.cc.length ? emailHistory.cc : undefined,
                                             subject: (resolveio_server_app_1.ResolveIOServer.getServerConfig()['ROOT_URL'].match(/https:\/\/dev\./) ||
                                                 resolveio_server_app_1.ResolveIOServer.getServerConfig()['ROOT_URL'].match(/https:\/\/www\.dev\./)
                                                 ? '(DEV SERVER) - '
@@ -1735,6 +1752,7 @@ var MethodManager = /** @class */ (function () {
                                     send_from: 1,
                                     reply_to: 1,
                                     force_ses: 1,
+                                    cc: 1,
                                     headers: 1,
                                     correlationId: 1,
                                     meta: 1,
@@ -1767,17 +1785,18 @@ var MethodManager = /** @class */ (function () {
     };
     MethodManager.prototype.sendEmail = function (sendTo_1, subject_1, text_1, html_1, attachments_1, send_from_1, reply_to_1) {
         return __awaiter(this, arguments, void 0, function (sendTo, subject, text, html, attachments, send_from, reply_to, force_ses, local_override, options) {
-            var normalizedSubject, correlationId, finalSubject, groupByCorrelationId, normalizedText, normalizedHtml, occurrence, allowGrouping, normalizedAttachments, merged, emailHistory, _a, aggregatedText, aggregatedHtml, history_1, err_7;
+            var isDevEmailEnvironment, cc, normalizedSubject, correlationId, finalSubject, groupByCorrelationId, normalizedText, normalizedHtml, occurrence, allowGrouping, normalizedAttachments, merged, emailHistory, _a, aggregatedText, aggregatedHtml, history_1, err_7;
             if (force_ses === void 0) { force_ses = false; }
             if (local_override === void 0) { local_override = false; }
             return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
-                        // Modify sendTo in development environments
-                        if ((resolveio_server_app_1.ResolveIOServer.getServerConfig()['ROOT_URL'].match(/https:\/\/dev\./) ||
-                            resolveio_server_app_1.ResolveIOServer.getServerConfig()['ROOT_URL'].match(/https:\/\/www\.dev\./) ||
-                            resolveio_server_app_1.ResolveIOServer.getServerConfig()['ROOT_URL'] === 'http://localhost:4200') &&
-                            !sendTo.match(/\@resolveio\.com/)) {
+                        isDevEmailEnvironment = isDevEmailRedirectEnvironment();
+                        cc = normalizeEmailRecipients(options === null || options === void 0 ? void 0 : options.cc);
+                        if (isDevEmailEnvironment) {
+                            cc = cc.filter(function (email) { return email.match(/\@resolveio\.com/); });
+                        }
+                        if (isDevEmailEnvironment && !sendTo.match(/\@resolveio\.com/)) {
                             sendTo = 'dev@resolveio.com';
                         }
                         normalizedSubject = subject || '';
@@ -1811,6 +1830,9 @@ var MethodManager = /** @class */ (function () {
                         if (normalizedAttachments.length > 0) {
                             allowGrouping = false;
                         }
+                        if (cc.length > 0) {
+                            allowGrouping = false;
+                        }
                         if (!(allowGrouping && occurrence && correlationId)) return [3 /*break*/, 2];
                         return [4 /*yield*/, this.tryMergeEmailOccurrence(sendTo, finalSubject, correlationId, occurrence, options === null || options === void 0 ? void 0 : options.meta)];
                     case 1:
@@ -1831,6 +1853,7 @@ var MethodManager = /** @class */ (function () {
                             text: normalizedText,
                             html: normalizedHtml,
                             attachments: normalizedAttachments,
+                            cc: cc,
                             send_from: send_from || '',
                             reply_to: reply_to || '',
                             status: 'pending',
@@ -1873,7 +1896,7 @@ var MethodManager = /** @class */ (function () {
                         throw err_7;
                     case 8: return [3 /*break*/, 10];
                     case 9:
-                        console.log('Send email', sendTo, finalSubject, normalizedText, normalizedHtml, attachments, send_from, force_ses, correlationId);
+                        console.log('Send email', sendTo, finalSubject, normalizedText, normalizedHtml, attachments, send_from, force_ses, correlationId, cc);
                         return [2 /*return*/, true];
                     case 10: return [3 /*break*/, 12];
                     case 11: return [2 /*return*/, true];