Fix tests and dispatch Verified event on manual email verification

nabeelio · Oct 16, 2023 · f8bd633 · f8bd633
1 parent 36ed8d5
commit f8bd633
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/app/Http/Controllers/Admin/UserController.php b/app/Http/Controllers/Admin/UserController.php
@@ -18,6 +18,7 @@
 use App\Services\UserService;
 use App\Support\Timezonelist;
 use App\Support\Utils;
+use Illuminate\Auth\Events\Verified;
 use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\DB;
@@ -337,7 +338,9 @@ public function verify_email(int $id, Request $request): RedirectResponse
             return back();
         }
 
-        $user->markEmailAsVerified();
+        if ($user->markEmailAsVerified()) {
+            event(new Verified($user));
+        }
 
         Flash::success('User email verified successfully');
         return back();

diff --git a/tests/RegistrationTest.php b/tests/RegistrationTest.php
@@ -6,6 +6,7 @@
 use App\Models\User;
 use App\Notifications\Messages\AdminUserRegistered;
 use App\Services\UserService;
+use Illuminate\Auth\Events\Verified;
 use Illuminate\Support\Facades\Hash;
 use Illuminate\Support\Facades\Notification;
 
@@ -29,11 +30,14 @@ public function testRegistration()
 
         $attrs = User::factory()->make()->makeVisible(['api_key', 'name', 'email'])->toArray();
         $attrs['password'] = Hash::make('secret');
+        $attrs['flights'] = 0;
         $user = $userSvc->createUser($attrs);
 
         $this->assertEquals(UserState::ACTIVE, $user->state);
 
-        $user->markEmailAsVerified();
+        if ($user->markEmailAsVerified()) {
+            event(new Verified($user));
+        }
 
         Notification::assertSentTo([$admin], AdminUserRegistered::class);
         Notification::assertNotSentTo([$user], AdminUserRegistered::class);