Make email messages Markdown.

app/Mail/AccessTokenCreatedMail.php

@@ -37,21 +37,11 @@ class AccessTokenCreatedMail extends Mailable
 
     use Queueable, SerializesModels;
 
-    /** @var string Email address of admin */
-    public $email;
-    /** @var string IP address of admin */
-    public $ipAddress;
-
     /**
      * AccessTokenCreatedMail constructor.
-     *
-     * @param string $email
-     * @param string $ipAddress
      */
-    public function __construct(string $email, string $ipAddress)
+    public function __construct()
     {
-        $this->email     = $email;
-        $this->ipAddress = $ipAddress;
     }
 
     /**
@@ -61,7 +51,8 @@ class AccessTokenCreatedMail extends Mailable
      */
     public function build(): self
     {
-        return $this->view('emails.access-token-created-html')->text('emails.access-token-created-text')
-                    ->subject((string)trans('email.access_token_created_subject'));
+        return $this
+            ->markdown('emails.token-created')
+            ->subject((string)trans('email.access_token_created_subject'));
     }
 }

app/Mail/AdminTestMail.php

@@ -38,18 +38,15 @@ class AdminTestMail extends Mailable
     use Queueable, SerializesModels;
 
     public string $email;
-    public string $ipAddress;
 
     /**
      * ConfirmEmailChangeMail constructor.
      *
      * @param string $email
-     * @param string $ipAddress
      */
-    public function __construct(string $email, string $ipAddress)
+    public function __construct(string $email)
     {
         $this->email     = $email;
-        $this->ipAddress = $ipAddress;
     }
 
     /**
@@ -59,7 +56,8 @@ class AdminTestMail extends Mailable
      */
     public function build(): self
     {
-        return $this->view('emails.admin-test-html')->text('emails.admin-test-text')
-                    ->subject((string)trans('email.admin_test_subject'));
+        return $this
+            ->markdown('emails.admin-test')
+            ->subject((string)trans('email.admin_test_subject'));
     }
 }

app/Mail/BillWarningMail.php

@@ -14,7 +14,6 @@ class BillWarningMail extends Mailable
     public Bill   $bill;
     public string $field;
     public int    $diff;
-    public string $ipAddress;
 
     /**
      * ConfirmEmailChangeMail constructor.
@@ -22,14 +21,12 @@ class BillWarningMail extends Mailable
      * @param Bill   $bill
      * @param string $field
      * @param int    $diff
-     * @param string $ipAddress
      */
-    public function __construct(Bill $bill, string $field, int $diff, string $ipAddress)
+    public function __construct(Bill $bill, string $field, int $diff)
     {
         $this->bill      = $bill;
         $this->field     = $field;
         $this->diff      = $diff;
-        $this->ipAddress = $ipAddress;
     }
 
     /**
@@ -45,8 +42,7 @@ class BillWarningMail extends Mailable
         }
 
         return $this
-            ->view('emails.bill-warning-html')
-            ->text('emails.bill-warning-text')
+            ->markdown('emails.bill-warning')
             ->subject($subject);
     }
 }

app/Mail/ConfirmEmailChangeMail.php

@@ -37,25 +37,23 @@ class ConfirmEmailChangeMail extends Mailable
 {
     use Queueable, SerializesModels;
 
-    public string $ipAddress;
     public string $newEmail;
     public string $oldEmail;
-    public string $uri;
+    public string $url;
 
     /**
      * ConfirmEmailChangeMail constructor.
      *
      * @param string $newEmail
      * @param string $oldEmail
-     * @param string $uri
+     * @param string $url
      * @param string $ipAddress
      */
-    public function __construct(string $newEmail, string $oldEmail, string $uri, string $ipAddress)
+    public function __construct(string $newEmail, string $oldEmail, string $url)
     {
         $this->newEmail  = $newEmail;
         $this->oldEmail  = $oldEmail;
-        $this->uri       = $uri;
-        $this->ipAddress = $ipAddress;
+        $this->url       = $url;
     }
 
     /**
@@ -65,7 +63,10 @@ class ConfirmEmailChangeMail extends Mailable
      */
     public function build(): self
     {
-        return $this->view('emails.confirm-email-change-html')->text('emails.confirm-email-change-text')
-                    ->subject((string) trans('email.email_change_subject'));
+        return $this
+            //->view('emails.confirm-email-change-html')
+            //->text('emails.confirm-email-change-text')
+                ->markdown('emails.confirm-email-change')
+            ->subject((string) trans('email.email_change_subject'));
     }
 }

app/Mail/NewIPAddressWarningMail.php

@@ -56,8 +56,6 @@ class NewIPAddressWarningMail extends Mailable
      */
     public function build(): self
     {
-        // time
-
         $this->time = now(config('app.timezone'))->isoFormat((string)trans('config.date_time_js'));
         $this->host = '';
         try {
@@ -69,7 +67,8 @@ class NewIPAddressWarningMail extends Mailable
             $this->host = $hostName;
         }
 
-        return $this->view('emails.new-ip-html')->text('emails.new-ip-text')
+        return $this
+            ->markdown('emails.new-ip')
                     ->subject((string)trans('email.login_from_new_ip'));
     }
 }

app/Mail/OAuthTokenCreatedMail.php

@@ -37,25 +37,16 @@ class OAuthTokenCreatedMail extends Mailable
 {
     use Queueable, SerializesModels;
 
-    /** @var Client The client */
-    public $client;
-    /** @var string Email address of admin */
-    public $email;
-    /** @var string IP address of admin */
-    public $ipAddress;
+    public Client $client;
 
     /**
      * OAuthTokenCreatedMail constructor.
      *
-     * @param string $email
-     * @param string $ipAddress
      * @param Client $client
      */
-    public function __construct(string $email, string $ipAddress, Client $client)
+    public function __construct(Client $client)
     {
-        $this->email     = $email;
-        $this->ipAddress = $ipAddress;
-        $this->client    = $client;
+        $this->client = $client;
     }
 
     /**
@@ -65,7 +56,8 @@ class OAuthTokenCreatedMail extends Mailable
      */
     public function build(): self
     {
-        return $this->view('emails.oauth-client-created-html')->text('emails.oauth-client-created-text')
-                    ->subject((string)trans('email.oauth_created_subject'));
+        return $this
+            ->markdown('emails.oauth-client-created')
+            ->subject((string) trans('email.oauth_created_subject'));
     }
 }

app/Mail/RegisteredUser.php

@@ -38,21 +38,16 @@ class RegisteredUser extends Mailable
 {
     use Queueable, SerializesModels;
 
-    /** @var string Email address of user */
-    public $address;
-    /** @var string IP address of user */
-    public $ipAddress;
+    public string $address;
 
     /**
      * Create a new message instance.
      *
      * @param string $address
-     * @param string $ipAddress
      */
-    public function __construct(string $address, string $ipAddress)
+    public function __construct(string $address)
     {
         $this->address   = $address;
-        $this->ipAddress = $ipAddress;
     }
 
     /**
@@ -62,6 +57,8 @@ class RegisteredUser extends Mailable
      */
     public function build(): self
     {
-        return $this->view('emails.registered-html')->text('emails.registered-text')->subject((string)trans('email.registered_subject'));
+        return $this
+            ->markdown('emails.registered')
+            ->subject((string)trans('email.registered_subject'));
     }
 }

app/Mail/ReportNewJournalsMail.php

@@ -40,23 +40,17 @@ class ReportNewJournalsMail extends Mailable
 {
     use Queueable, SerializesModels;
 
-    public string     $email;
     public Collection $groups;
-    public string     $ipAddress;
     public array      $transformed;
 
     /**
      * ConfirmEmailChangeMail constructor.
      *
-     * @param string     $email
-     * @param string     $ipAddress
      * @param Collection $groups
      */
-    public function __construct(string $email, string $ipAddress, Collection $groups)
+    public function __construct(Collection $groups)
     {
-        $this->email     = $email;
-        $this->ipAddress = $ipAddress;
-        $this->groups    = $groups;
+        $this->groups = $groups;
     }
 
     /**
@@ -68,8 +62,9 @@ class ReportNewJournalsMail extends Mailable
     {
         $this->transform();
 
-        return $this->view('emails.report-new-journals-html')->text('emails.report-new-journals-text')
-                    ->subject((string)trans_choice('email.new_journals_subject', $this->groups->count()));
+        return $this
+            ->markdown('emails.report-new-journals')
+            ->subject((string) trans_choice('email.new_journals_subject', $this->groups->count()));
     }
 
     private function transform(): void

app/Mail/RequestedNewPassword.php

@@ -37,21 +37,16 @@ class RequestedNewPassword extends Mailable
 {
     use Queueable, SerializesModels;
 
-    /** @var string IP address of user */
-    public $ipAddress;
-    /** @var string URI of password change link */
-    public $url;
+    public string $url;
 
     /**
      * RequestedNewPassword constructor.
      *
      * @param string $url
-     * @param string $ipAddress
      */
-    public function __construct(string $url, string $ipAddress)
+    public function __construct(string $url)
     {
         $this->url       = $url;
-        $this->ipAddress = $ipAddress;
     }
 
     /**
@@ -61,6 +56,8 @@ class RequestedNewPassword extends Mailable
      */
     public function build(): self
     {
-        return $this->view('emails.password-html')->text('emails.password-text')->subject((string)trans('email.reset_pw_subject'));
+        return $this
+            ->markdown('emails.password')
+            ->subject((string)trans('email.reset_pw_subject'));
     }
 }

app/Mail/UndoEmailChangeMail.php

@@ -35,29 +35,22 @@ class UndoEmailChangeMail extends Mailable
 {
     use Queueable, SerializesModels;
 
-    /** @var string IP address of user */
-    public $ipAddress;
-    /** @var string New email address */
-    public $newEmail;
-    /** @var string Old email address */
-    public $oldEmail;
-    /** @var string URI to undo */
-    public $uri;
+    public string $newEmail;
+    public string $oldEmail;
+    public string $url;
 
     /**
      * UndoEmailChangeMail constructor.
      *
      * @param string $newEmail
      * @param string $oldEmail
-     * @param string $uri
-     * @param string $ipAddress
+     * @param string $url
      */
-    public function __construct(string $newEmail, string $oldEmail, string $uri, string $ipAddress)
+    public function __construct(string $newEmail, string $oldEmail, string $url)
     {
         $this->newEmail  = $newEmail;
         $this->oldEmail  = $oldEmail;
-        $this->uri       = $uri;
-        $this->ipAddress = $ipAddress;
+        $this->url       = $url;
     }
 
     /**
@@ -67,7 +60,8 @@ class UndoEmailChangeMail extends Mailable
      */
     public function build(): self
     {
-        return $this->view('emails.undo-email-change-html')->text('emails.undo-email-change-text')
-                    ->subject((string)trans('email.email_change_subject'));
+        return $this
+            ->markdown('emails.undo-email-change')
+            ->subject((string)trans('email.email_change_subject'));
     }
 }