diff --git a/bootstrap/helpers/subscriptions.php b/bootstrap/helpers/subscriptions.php index 0967ed604f..971afdfb79 100644 --- a/bootstrap/helpers/subscriptions.php +++ b/bootstrap/helpers/subscriptions.php @@ -80,7 +80,6 @@ function allowedPathsForUnsubscribedAccounts() 'logout', 'force-password-reset', 'two-factor-challenge', - 'email/verify', 'livewire/update', 'admin', // Account basics stay available without a paid plan. @@ -101,7 +100,6 @@ function allowedPathsForInvalidAccounts() return [ 'logout', 'verify', - 'email/verify', 'force-password-reset', 'two-factor-challenge', 'livewire/update', diff --git a/routes/web.php b/routes/web.php index 7df21dbfeb..712c415b79 100644 --- a/routes/web.php +++ b/routes/web.php @@ -119,7 +119,6 @@ use Symfony\Component\HttpFoundation\File\Exception\FileNotFoundException; Route::post('/forgot-password', [Controller::class, 'forgot_password'])->name('password.forgot')->middleware('throttle:forgot-password'); Route::get('/realtime', [Controller::class, 'realtime_test'])->middleware('auth'); Route::get('/verify', [Controller::class, 'verify'])->middleware('auth')->name('verify.email'); -Route::get('/email/verify', [Controller::class, 'verify'])->middleware('auth')->name('verification.notice'); Route::get('/email/verify/{id}/{hash}', [Controller::class, 'email_verify'])->middleware(['auth'])->name('verify.verify'); Route::get('/auth/link', [Controller::class, 'link'])->name('auth.link'); Route::post('/auth/link', [Controller::class, 'acceptLink'])->middleware('throttle:magic-link')->name('auth.link.accept'); diff --git a/tests/Feature/EmailVerificationMiddlewareTest.php b/tests/Feature/EmailVerificationMiddlewareTest.php index 715c973745..7f5ce58d01 100644 --- a/tests/Feature/EmailVerificationMiddlewareTest.php +++ b/tests/Feature/EmailVerificationMiddlewareTest.php @@ -5,6 +5,7 @@ use App\Models\Team; use App\Models\User; use Illuminate\Foundation\Testing\RefreshDatabase; use Illuminate\Support\Facades\Cache; +use Illuminate\Support\Facades\Route; uses(RefreshDatabase::class); @@ -16,3 +17,8 @@ it('lets unverified users access protected web routes without email delivery', f $this->actingAs($user)->get('/analytics')->assertOk(); }); + +it('does not register an email verification notice route', function () { + expect(Route::has('verification.notice'))->toBeFalse() + ->and(Route::has('verify.verify'))->toBeTrue(); +});