Skip to content

An open-source, self-hostable PaaS alternative to Vercel, Heroku & Netlify that lets you easily deploy static sites, databases, full-stack applications and 360+ one-click services on your own servers.

refactor(auth): drop implicit email verification on invitation link login

Andras Bacsai9b37a1a7eb98
diff --git a/app/Http/Controllers/Controller.php b/app/Http/Controllers/Controller.php
index 17d14296bc..a6b7f6440b 100644
--- a/app/Http/Controllers/Controller.php
+++ b/app/Http/Controllers/Controller.php
@@ -94,10 +94,6 @@ class Controller extends BaseController
} else {
$team = $user->teams()->first();
}
- if (is_null(data_get($user, 'email_verified_at'))) {
- $user->email_verified_at = now();
- $user->save();
- }
Auth::login($user);
session(['currentTeam' => $team]);
diff --git a/tests/Feature/LinkLoginEmailVerificationTest.php b/tests/Feature/LinkLoginEmailVerificationTest.php
new file mode 100644
index 0000000000..036584e1e9
--- /dev/null
+++ b/tests/Feature/LinkLoginEmailVerificationTest.php
@@ -0,0 +1,60 @@
+<?php
+
+use App\Http\Middleware\CheckForcePasswordReset;
+use App\Http\Middleware\DecideWhatToDoWithUser;
+use App\Models\InstanceSettings;
+use App\Models\Team;
+use App\Models\User;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Illuminate\Support\Facades\Crypt;
+use Illuminate\Support\Facades\Hash;
+use Illuminate\Support\Once;
+
+uses(RefreshDatabase::class);
+
+beforeEach(function () {
+ $this->withoutMiddleware([DecideWhatToDoWithUser::class, CheckForcePasswordReset::class]);
+ Once::flush();
+ if (! InstanceSettings::find(0)) {
+ $settings = new InstanceSettings;
+ $settings->id = 0;
+ $settings->saveQuietly();
+ }
+});
+
+describe('invitation link login', function () {
+ test('does not auto-verify the email address', function () {
+ $team = Team::factory()->create();
+ $password = 'test-password-123';
+ $user = User::factory()->create([
+ 'email' => '[email protected]',
+ 'password' => Hash::make($password),
+ 'email_verified_at' => null,
+ ]);
+ $user->teams()->attach($team->id, ['role' => 'member']);
+
+ $token = Crypt::encryptString("{$user->email}@@@{$password}");
+
+ $this->get(route('auth.link', ['token' => $token]));
+
+ $user->refresh();
+ expect($user->email_verified_at)->toBeNull();
+ });
+
+ test('still logs the user in', function () {
+ $team = Team::factory()->create();
+ $password = 'test-password-123';
+ $user = User::factory()->create([
+ 'email' => '[email protected]',
+ 'password' => Hash::make($password),
+ 'email_verified_at' => null,
+ ]);
+ $user->teams()->attach($team->id, ['role' => 'member']);
+
+ $token = Crypt::encryptString("{$user->email}@@@{$password}");
+
+ $this->get(route('auth.link', ['token' => $token]));
+
+ expect(auth()->id())->toBe($user->id);
+ });
+});