@dnax/core 0.10.3 → 0.10.5

package/config/index.ts

@@ -24,7 +24,8 @@ const Cfg: Config = {
 
 function setCfg(config: Config) {
   Cfg.server = config.server;
-  Cfg.tenants = config.tenants;
+  Cfg.tenants = config?.tenants;
+  Cfg.email = config?.email;
 
   Cfg.studio = {
     enabled: config.studio?.enabled ?? false,
@@ -56,7 +57,7 @@ async function loadCfg() {
     .then((inject: { default: Config }) => {
       // Cfg.tenants = inject.default?.tenants || [];
       // Cfg.server = inject.default?.server || [];
-      ///console.log(inject.default);
+
       setCfg(inject.default);
       //console.log(Cfg);
     })

package/lib/mail.ts

@@ -111,7 +111,7 @@ function verifySmtpConnection(smtpConfig: emailConfigType["smtpOptions"]) {
 
 function send(
   options: {
-    emailConfig?: emailConfigType;
+    config?: emailConfigType;
     mailOptions?: {
       from?: string;
       text?: string;
@@ -126,17 +126,20 @@ function send(
 ) {
   return new Promise(async (resolve, reject) => {
     try {
-      const smtp = Cfg.email?.smtpOptions;
-      const transport = createTransport(
-        options?.emailConfig?.smtpOptions || smtp
-      );
+      const smtp = options?.config?.smtpOptions || Cfg.email?.smtpOptions;
+
+      const transport = createTransport({
+        ...smtp,
+      });
+
+      let from = options?.mailOptions?.from || (
+      `${options?.config?.fromName || ""} <${
+        options?.config?.fromAddress || ""
+      }>`), 
 
       var response = await transport.sendMail({
         from:
-          options?.mailOptions?.from ||
-          `${options?.emailConfig?.fromName || ""} <${
-            options?.emailConfig?.fromAddress || ""
-          }>`,
+         
         to: options?.mailOptions?.to || undefined,
         subject: options?.mailOptions?.subject || "",
         text: options?.mailOptions?.text || "",
@@ -152,7 +155,12 @@ function send(
   });
 }
 
+function getConfig() {
+  return Cfg?.email || {};
+}
+
 const email = {
+  getConfig,
   send,
   sendEmail,
   sendLocalEmail,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dnax/core",
-  "version": "0.10.3",
+  "version": "0.10.5",
   "module": "index.ts",
   "type": "module",
   "bin": {

package/types/index.ts

@@ -306,7 +306,7 @@ export type loggerFunction = (
     action?: string;
     collection?: string;
     cleanDeep?: boolean;
-    
+
     useCache?: boolean;
     method: string;
     url?: string;
@@ -477,8 +477,8 @@ export type Service = {
 
 export type emailConfigType = {
   provider: "smtp";
-  fromName: string;
-  fromAddress: string;
+  fromName?: string;
+  fromAddress?: string;
   smtpOptions?: {
     host: string;
     port: number;