Resend verification email when email changes

Author: driesvints

app/Events/EmailAddressWasChanged.php

@@ -0,0 +1,23 @@
+<?php
+
+namespace App\Events;
+
+use App\User;
+use Illuminate\Foundation\Events\Dispatchable;
+use Illuminate\Queue\SerializesModels;
+
+class EmailAddressWasChanged
+{
+    use Dispatchable;
+    use SerializesModels;
+
+    /**
+     * @var \App\User
+     */
+    public $user;
+
+    public function __construct(User $user)
+    {
+        $this->user = $user;
+    }
+}

app/Http/Controllers/Auth/RegisterController.php

@@ -8,7 +8,6 @@
 use App\Jobs\RegisterUser;
 use App\Providers\RouteServiceProvider;
 use App\User;
-use Illuminate\Auth\Events\Registered;
 use Illuminate\Contracts\Validation\Validator as ValidatorContract;
 use Illuminate\Foundation\Auth\RegistersUsers;
 use Illuminate\Support\Facades\Validator;
@@ -58,10 +57,6 @@ protected function validator(array $data): ValidatorContract
      */
     protected function create(array $data): User
     {
-        $user = $this->dispatchNow(RegisterUser::fromRequest(app(RegisterRequest::class)));
-
-        event(new Registered($user));
-
-        return $user;
+        return $this->dispatchNow(RegisterUser::fromRequest(app(RegisterRequest::class)));
     }
 }

app/Jobs/DisapproveArticle.php

@@ -6,6 +6,9 @@
 
 final class DisapproveArticle
 {
+    /**
+     * @var \App\Models\Thread
+     */
     private $article;
 
     public function __construct(Article $article)

app/Jobs/GenerateSocialShareImage.php

@@ -7,6 +7,9 @@
 
 final class GenerateSocialShareImage
 {
+    /**
+     * @var \App\Models\Thread
+     */
     private $article;
 
     const TEXT_X_POSITION = 50;

app/Jobs/UpdateProfile.php

@@ -2,6 +2,7 @@
 
 namespace App\Jobs;
 
+use App\Events\EmailAddressWasChanged;
 use App\Http\Requests\UpdateProfileRequest;
 use App\User;
 use Illuminate\Support\Arr;
@@ -36,8 +37,17 @@ public static function fromRequest(User $user, UpdateProfileRequest $request): s
 
     public function handle(): User
     {
+        $emailAddress = $this->user->emailAddress();
+
         $this->user->update($this->attributes);
 
+        if ($emailAddress !== $this->user->emailAddress()) {
+            $this->user->email_verified_at = null;
+            $this->user->save();
+
+            event(new EmailAddressWasChanged($this->user));
+        }
+
         return $this->user;
     }
 }

app/Listeners/SendEmailVerificationNotification.php

@@ -0,0 +1,15 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Listeners;
+
+use App\Events\EmailAddressWasChanged;
+
+final class SendEmailVerificationNotification
+{
+    public function handle(EmailAddressWasChanged $event)
+    {
+        $event->user->sendEmailVerificationNotification();
+    }
+}

resources/lang/en/settings.php

@@ -2,7 +2,7 @@
 
 return [
 
-    'updated' => 'Settings successfully saved!',
+    'updated' => 'Settings successfully saved! If you changed your email address you\'ll receive an email address to re-confirm it.',
     'deleted' => 'Account was successfully removed.',
     'password.updated' => 'Password successfully changed!',
 

resources/views/users/settings/profile.blade.php

@@ -24,6 +24,14 @@
             @formGroup('email')
                 <label for="email">Email</label>
                 <input type="email" name="email" id="email" value="{{ Auth::user()->emailAddress() }}" required />
+
+                @unless(Auth::user()->hasVerifiedEmail())
+                    <span class="text-gray-600 text-sm">
+                        This email address is not verified yet.
+                        <a href="{{ route('verification.notice') }}" class="text-green-primary">Resend verification email.</a>
+                    </span>
+                @endunless
+
                 @error('email')
             @endFormGroup
 

tests/Integration/Jobs/UpdateProfileTest.php

@@ -2,8 +2,10 @@
 
 namespace Tests\Integration\Jobs;
 
+use App\Events\EmailAddressWasChanged;
 use App\Jobs\UpdateProfile;
 use Illuminate\Foundation\Testing\DatabaseMigrations;
+use Illuminate\Support\Facades\Event;
 use Tests\TestCase;
 
 class UpdateProfileTest extends TestCase
@@ -15,9 +17,30 @@ public function we_can_update_a_user_profile()
     {
         $user = $this->createUser();
 
+        Event::fake();
+
         $updatedUser = $this->dispatch(new UpdateProfile($user, ['bio' => 'my bio', 'name' => 'John Doe Junior']));
 
         $this->assertEquals('my bio', $updatedUser->bio());
         $this->assertEquals('John Doe Junior', $updatedUser->name());
+        $this->assertDatabaseMissing('users', ['id' => $user->id, 'email_verified_at' => null]);
+
+        Event::assertNotDispatched(EmailAddressWasChanged::class);
+    }
+
+    /** @test */
+    public function changing_the_email_address_emits_an_event()
+    {
+        $user = $this->createUser();
+
+        Event::fake();
+
+        $this->dispatch(new UpdateProfile($user, ['email' => 'foo@example.com']));
+
+        $this->assertDatabaseHas('users', ['id' => $user->id, 'email_verified_at' => null]);
+
+        Event::assertDispatched(EmailAddressWasChanged::class, function (EmailAddressWasChanged $event) {
+            return $event->user->email === 'foo@example.com';
+        });
     }
 }