From e794f99ead77c0c03316481e6e68784cd7935966 Mon Sep 17 00:00:00 2001
From: Andy Heathershaw <andy@andysh.uk>
Date: Sun, 14 Jul 2019 14:35:26 +0100
Subject: [PATCH] #124: Updated the change e-mail confirmation to be a
 notification

---
 .../Controllers/Gallery/UserController.php    |  7 +---
 app/Mail/UserChangeEmailRequired.php          |  4 +-
 app/Notifications/UserChangeEmailRequired.php | 39 +++++++++++++++++++
 3 files changed, 42 insertions(+), 8 deletions(-)
 create mode 100644 app/Notifications/UserChangeEmailRequired.php

diff --git a/app/Http/Controllers/Gallery/UserController.php b/app/Http/Controllers/Gallery/UserController.php
index 6f1f3c3..5d5f4b3 100644
--- a/app/Http/Controllers/Gallery/UserController.php
+++ b/app/Http/Controllers/Gallery/UserController.php
@@ -2,20 +2,17 @@
 
 namespace App\Http\Controllers\Gallery;
 
-use App\Album;
 use App\Facade\Theme;
 use App\Facade\UserConfig;
 use App\Helpers\DbHelper;
 use App\Http\Controllers\Controller;
 use App\Http\Requests\SaveUserSettingsRequest;
-use App\Mail\UserChangeEmailRequired;
+use App\Notifications\UserChangeEmailRequired;
 use App\User;
 use App\UserActivity;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\App;
-use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\DB;
-use Illuminate\Support\Facades\Mail;
 use Symfony\Component\HttpFoundation\Request;
 
 class UserController extends Controller
@@ -528,7 +525,7 @@ class UserController extends Controller
         $oldEmailAddress = $user->email;
         $user->email = $newEmailAddress;
 
-        Mail::to($user)->send(new UserChangeEmailRequired($user));
+        $user->notify(new UserChangeEmailRequired());
         $user->email = $oldEmailAddress;
     }
 }
\ No newline at end of file
diff --git a/app/Mail/UserChangeEmailRequired.php b/app/Mail/UserChangeEmailRequired.php
index 6f39a27..407b504 100644
--- a/app/Mail/UserChangeEmailRequired.php
+++ b/app/Mail/UserChangeEmailRequired.php
@@ -6,11 +6,9 @@ use App\Facade\Theme;
 use App\Facade\UserConfig;
 use App\User;
 use Illuminate\Bus\Queueable;
-use Illuminate\Mail\Mailable;
 use Illuminate\Queue\SerializesModels;
-use Illuminate\Contracts\Queue\ShouldQueue;
 
-class UserChangeEmailRequired extends Mailable
+class UserChangeEmailRequired extends MailableBase
 {
     use Queueable, SerializesModels;
 
diff --git a/app/Notifications/UserChangeEmailRequired.php b/app/Notifications/UserChangeEmailRequired.php
new file mode 100644
index 0000000..4c61d0e
--- /dev/null
+++ b/app/Notifications/UserChangeEmailRequired.php
@@ -0,0 +1,39 @@
+<?php
+
+namespace App\Notifications;
+
+use App\Mail\MailableBase;
+use App\Mail\UserChangeEmailRequired as UserChangeEmailRequiredMailable;
+use Illuminate\Bus\Queueable;
+use Illuminate\Notifications\Notification;
+
+class UserChangeEmailRequired extends Notification
+{
+    use Queueable;
+    use DatabaseEmailNotification;
+
+    /**
+     * Create a new notification instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        //
+    }
+
+    /**
+     * Get the mail representation of the notification.
+     *
+     * @param  mixed  $notifiable
+     * @return \Illuminate\Notifications\Messages\MailMessage|MailableBase
+     */
+    public function toMail($notifiable)
+    {
+        $mailable = new UserChangeEmailRequiredMailable($notifiable);
+
+        $this->setPropertiesOnMailable($mailable, $notifiable);
+
+        return $mailable;
+    }
+}