fix(notifications): this.fromAddress is undefined for custom transports as it is only constructed after custom transport is initialized.

Author: 3m1n3nc3

packages/notifications/src/drivers/MailNotification.ts

@@ -44,15 +44,23 @@ export class MailNotification extends NotificationContract {
      * Prepare the mail driver so we can use it to relay the message
      */
     private async prepareDriver() {
+        const options = this.options
+
+        this.fromAddress =
+            options.from ??
+            this.driverConfig.from ??
+            env('MAIL_FROM_ADDRESS', 'no-reply@example.com')
+
         if (typeof this.transport !== 'string') {
             this.driver = nodemailer.createTransport(this.transport)
 
             return
         }
 
-        const options = this.options
         const transport = configure(`transports.${this.transport}`, {}) as MergedTransportConfig
 
+        this.fromAddress = transport.from || this.fromAddress
+
         /**
          * Setup nodemailer to stream messages so we can store the mail to file
          */
@@ -62,12 +70,6 @@ export class MailNotification extends NotificationContract {
                 transport.directory ??
                 env('MAIL_FILE_PATH', join(Arkstack.rootDir(), './storage/framework/mails'))
 
-            this.fromAddress =
-                options.from ??
-                this.driverConfig.from ??
-                transport.from ??
-                env('MAIL_FROM_ADDRESS', 'no-reply@example.com')
-
             this.driver = nodemailer.createTransport({
                 streamTransport: true,
                 buffer: true,
@@ -133,12 +135,6 @@ export class MailNotification extends NotificationContract {
             transport.pass ??
             env('MAIL_PASSWORD', '')
 
-        this.fromAddress =
-            options.from ??
-            this.driverConfig.from ??
-            transport.from ??
-            env('MAIL_FROM_ADDRESS', 'no-reply@example.com')
-
         this.driver = nodemailer.createTransport({
             url: transport.url ?? options.url ?? env('MAIL_URL'),
             host: options.host ?? transport.host ?? env('MAIL_HOST', 'localhost'),