Skip intermediate login page with single provider

[bookstack] / app / Notifications / ConfirmEmail.php

diff --git a/app/Notifications/ConfirmEmail.php b/app/Notifications/ConfirmEmail.php
index 858b12166be9411ed28fe047c739b304f9da9152..5399c25a8492eca5bdbfd52236c439630e02d45c 100644 (file)
--- a/app/Notifications/ConfirmEmail.php
+++ b/app/Notifications/ConfirmEmail.php
@@ -2,20 +2,13 @@
 
 namespace BookStack\Notifications;
 
 
 namespace BookStack\Notifications;
 

-use Illuminate\Bus\Queueable;
-use Illuminate\Notifications\Notification;
-use Illuminate\Contracts\Queue\ShouldQueue;
-use Illuminate\Notifications\Messages\MailMessage;
-
-class ConfirmEmail extends Notification implements ShouldQueue
+class ConfirmEmail extends MailNotification

 {
 {

-
-    use Queueable;
-    

     public $token;
 
     /**
      * Create a new notification instance.
     public $token;
 
     /**
      * Create a new notification instance.

+     *

      * @param string $token
      */
     public function __construct($token)
      * @param string $token
      */
     public function __construct($token)


@@ -23,30 +16,21 @@ class ConfirmEmail extends Notification implements ShouldQueue
         $this->token = $token;
     }
 
         $this->token = $token;
     }
 

-    /**
-     * Get the notification's delivery channels.
-     *
-     * @param  mixed  $notifiable
-     * @return array
-     */
-    public function via($notifiable)
-    {
-        return ['mail'];
-    }
-

     /**
      * Get the mail representation of the notification.
      *
     /**
      * Get the mail representation of the notification.
      *

-     * @param  mixed  $notifiable
+     * @param mixed $notifiable
+     *

      * @return \Illuminate\Notifications\Messages\MailMessage
      */
     public function toMail($notifiable)
     {
         $appName = ['appName' => setting('app-name')];
      * @return \Illuminate\Notifications\Messages\MailMessage
      */
     public function toMail($notifiable)
     {
         $appName = ['appName' => setting('app-name')];

-        return (new MailMessage)
-                    ->subject(trans('auth.email_confirm_subject', $appName))
-                    ->greeting(trans('auth.email_confirm_greeting', $appName))
-                    ->line(trans('auth.email_confirm_text'))
-                    ->action(trans('auth.email_confirm_action'), baseUrl('/register/confirm/' . $this->token));
+
+        return $this->newMailMessage()
+                ->subject(trans('auth.email_confirm_subject', $appName))
+                ->greeting(trans('auth.email_confirm_greeting', $appName))
+                ->line(trans('auth.email_confirm_text'))
+                ->action(trans('auth.email_confirm_action'), url('/register/confirm/' . $this->token));

     }
 }
     }
 }