make sure UserVerified is only emitted once #9

Author: josiasmontag

src/EmailVerification.php

@@ -150,9 +150,11 @@ public function verify(array $credentials, Closure $callback)
             return $user;
         }
 
-        $callback($user);
+        if($callback($user)) {
 
-        $this->events->dispatch(new UserVerified($user));
+            $this->events->dispatch(new UserVerified($user));
+
+        }
 
         return static::VERIFIED;
     }

src/Traits/VerifiesEmail.php

@@ -39,7 +39,7 @@ public function verify(Request $request, EmailVerification $emailVerification)
             $request->only(
                 'email', 'expiration', 'token'
             ), function ($user) {
-            $this->verifiedEmail($user);
+            return $this->verifiedEmail($user);
         }
         );
 
@@ -90,14 +90,20 @@ public function resendVerificationEmail(Request $request)
      * Store the user's verification
      *
      * @param  \Illuminate\Contracts\Auth\CanResetPassword $user
-     * @return void
+     * @return boolean
      */
     protected function verifiedEmail($user)
     {
-        $user->forceFill([
-            'verified' => true
-        ])->save();
         $this->guard()->login($user);
+
+        if(!(boolean)$user->verified) {
+            $user->forceFill([
+                'verified' => true
+            ])->save();
+            return true;
+        }
+
+        return false;
     }
 
     /**

tests/Feature/RegistrationTest.php

@@ -9,7 +9,9 @@
 
 
 
+use Illuminate\Support\Facades\Event;
 use Illuminate\Support\Facades\Notification;
+use Lunaweb\EmailVerification\Events\UserVerified;
 use Lunaweb\EmailVerification\Notifications\EmailVerification;
 
 class RegistrationTest extends TestCase
@@ -26,6 +28,7 @@ public function setUp()
         Notification::fake();
 
 
+
     }
 
 
@@ -66,4 +69,43 @@ public function testRegistration() {
 
 
 
+    public function testEmitsUserVerifedEventOnce() {
+
+
+        Event::fake();
+
+        $user =  User::create(['email' => '[email protected]', 'verified' => false]);
+
+        app(\Lunaweb\EmailVerification\EmailVerification::class)->sendVerifyLink($user);
+
+        $notification = Notification::sent($user, EmailVerification::class)->first();
+        $activationUrl = $notification->toMail($user)->actionUrl;
+
+        // Open activation URL first time
+
+        $this->get($activationUrl);
+
+        Event::assertDispatched(UserVerified::class, function ($e) use ($user) {
+            return $e->user->is($user);
+        });
+
+        $this->assertTrue((boolean)$user->fresh()->verified);
+
+
+
+        // Open activation URL second time
+
+        $this->get($activationUrl);
+
+        Event::assertDispatchedTimes(UserVerified::class, 1);
+
+        $this->assertTrue((boolean)$user->fresh()->verified);
+
+
+
+
+    }
+
+
+
 }

tests/Feature/ResendVerificationMailTest.php

@@ -57,7 +57,7 @@ public function testResend() {
 
         $user->refresh();
         $this->assertTrue((boolean)$user->verified);
-        $this->assertTrue($user->email === '[email protected]');
+        $this->assertEquals('[email protected]', $user->email);
 
 
     }