From 523d4f087f22e1ebad02a8a4b5d2ff500ad5f2b7 Mon Sep 17 00:00:00 2001 From: Mark Gregory Date: Mon, 16 Nov 2026 10:12:10 +0000 Subject: [PATCH] enable us to disable registration --- .env.example | 2 +- .../Http/Controllers/UserController.php | 16 ++++++- Modules/UserManagement/Routes/web.php | 2 + .../EnsurePublicRegistrationEnabled.php | 20 +++++++++ app/Support/PublicRegistration.php | 24 +++++++++++ config/fortify.php | 7 ++- ...ate_public_registration_settings_table.php | 27 ++++++++++++ .../views/livewire/auth/login.blade.php | 2 +- .../modules/user-management/index.blade.php | 11 +++++ .../themes/frontend/views/welcome.blade.php | 2 +- tests/Feature/Auth/RegistrationTest.php | 43 +++++++++++++++++++ 11 files changed, 150 insertions(+), 6 deletions(-) create mode 100644 app/Http/Middleware/EnsurePublicRegistrationEnabled.php create mode 100644 app/Support/PublicRegistration.php create mode 100644 database/migrations/2026_11_16_094610_create_public_registration_settings_table.php diff --git a/.env.example b/.env.example index 0e0dba3..dd2941a 100644 --- a/.env.example +++ b/.env.example @@ -4,7 +4,7 @@ APP_KEY= APP_DEBUG=true APP_URL=http://localhost:8000 -# Set to false to disable public account registration. +# Default for public registration until an administrator saves a choice in Users. PUBLIC_REGISTRATION_ENABLED=true APP_LOCALE=en diff --git a/Modules/UserManagement/Http/Controllers/UserController.php b/Modules/UserManagement/Http/Controllers/UserController.php index 1d977b5..247cd3a 100755 --- a/Modules/UserManagement/Http/Controllers/UserController.php +++ b/Modules/UserManagement/Http/Controllers/UserController.php @@ -5,6 +5,7 @@ declare(strict_types=1); namespace Modules\UserManagement\Http\Controllers; use App\Models\User; +use App\Support\PublicRegistration; use Illuminate\Contracts\View\View; use Illuminate\Http\RedirectResponse; use Illuminate\Http\Request; @@ -32,7 +33,20 @@ final class UserController extends Controller ->paginate(5) ->withQueryString(); - return view('modules.user-management.index', compact('users', 'search')); + return view('modules.user-management.index', [ + 'users' => $users, + 'search' => $search, + 'publicRegistrationEnabled' => PublicRegistration::enabled(), + ]); + } + + public function updatePublicRegistration(Request $request): RedirectResponse + { + $request->validate(['enabled' => ['required', 'boolean']]); + + PublicRegistration::setEnabled($request->boolean('enabled')); + + return redirect()->route('user-management.index')->with('status', 'Public registration setting saved.'); } public function create(): View diff --git a/Modules/UserManagement/Routes/web.php b/Modules/UserManagement/Routes/web.php index 29c2e65..ee7ad5a 100755 --- a/Modules/UserManagement/Routes/web.php +++ b/Modules/UserManagement/Routes/web.php @@ -23,5 +23,7 @@ Route::put('/permissions/{permission}', [UserController::class, 'updatePermissio Route::delete('/permissions/{permission}', [UserController::class, 'destroyPermission'])->name('permissions.destroy'); Route::get('/{user}/edit', [UserController::class, 'edit'])->name('edit'); +Route::put('/public-registration', [UserController::class, 'updatePublicRegistration'])->name('public-registration.update'); + Route::put('/{user}', [UserController::class, 'update'])->name('update'); Route::delete('/{user}', [UserController::class, 'destroy'])->name('destroy'); diff --git a/app/Http/Middleware/EnsurePublicRegistrationEnabled.php b/app/Http/Middleware/EnsurePublicRegistrationEnabled.php new file mode 100644 index 0000000..1bd476b --- /dev/null +++ b/app/Http/Middleware/EnsurePublicRegistrationEnabled.php @@ -0,0 +1,20 @@ +routeIs('register', 'register.store')) { + abort_unless(PublicRegistration::enabled(), 404); + } + + return $next($request); + } +} diff --git a/app/Support/PublicRegistration.php b/app/Support/PublicRegistration.php new file mode 100644 index 0000000..459c267 --- /dev/null +++ b/app/Support/PublicRegistration.php @@ -0,0 +1,24 @@ +where('id', 1)->value('enabled'); + + return (bool) ($enabled ?? config('fortify.public_registration_default')); + } + + public static function setEnabled(bool $enabled): void + { + DB::table('public_registration_settings')->upsert( + ['id' => 1, 'enabled' => $enabled], + ['id'], + ['enabled'], + ); + } +} diff --git a/config/fortify.php b/config/fortify.php index 533adfc..401f65c 100644 --- a/config/fortify.php +++ b/config/fortify.php @@ -1,5 +1,6 @@ ['web'], + 'middleware' => ['web', EnsurePublicRegistrationEnabled::class], + + 'public_registration_default' => env('PUBLIC_REGISTRATION_ENABLED', true), /* |-------------------------------------------------------------------------- @@ -161,7 +164,7 @@ return [ */ 'features' => [ - ...(env('PUBLIC_REGISTRATION_ENABLED', true) ? [Features::registration()] : []), + Features::registration(), Features::resetPasswords(), Features::emailVerification(), Features::twoFactorAuthentication([ diff --git a/database/migrations/2026_11_16_094610_create_public_registration_settings_table.php b/database/migrations/2026_11_16_094610_create_public_registration_settings_table.php new file mode 100644 index 0000000..0d24b7f --- /dev/null +++ b/database/migrations/2026_11_16_094610_create_public_registration_settings_table.php @@ -0,0 +1,27 @@ +unsignedTinyInteger('id')->primary(); + $table->boolean('enabled'); + }); + } + + /** + * Reverse the migrations. + */ + public function down(): void + { + Schema::dropIfExists('public_registration_settings'); + } +}; diff --git a/resources/themes/backend/views/livewire/auth/login.blade.php b/resources/themes/backend/views/livewire/auth/login.blade.php index 1a34f05..a5d286c 100644 --- a/resources/themes/backend/views/livewire/auth/login.blade.php +++ b/resources/themes/backend/views/livewire/auth/login.blade.php @@ -58,7 +58,7 @@ - @if (Route::has('register')) + @if (Route::has('register') && \App\Support\PublicRegistration::enabled())

{{ __('Don\'t have an account?') }} {{ __('Sign up') }}

@endif diff --git a/resources/themes/backend/views/modules/user-management/index.blade.php b/resources/themes/backend/views/modules/user-management/index.blade.php index 075dec8..0c864b3 100755 --- a/resources/themes/backend/views/modules/user-management/index.blade.php +++ b/resources/themes/backend/views/modules/user-management/index.blade.php @@ -15,6 +15,17 @@
{{ session('status') }}
@endif +
+ @csrf + @method('PUT') + + + +
+
diff --git a/resources/themes/frontend/views/welcome.blade.php b/resources/themes/frontend/views/welcome.blade.php index 13545d0..4867b00 100755 --- a/resources/themes/frontend/views/welcome.blade.php +++ b/resources/themes/frontend/views/welcome.blade.php @@ -36,7 +36,7 @@ Log in - @if (Route::has('register')) + @if (Route::has('register') && \App\Support\PublicRegistration::enabled()) diff --git a/tests/Feature/Auth/RegistrationTest.php b/tests/Feature/Auth/RegistrationTest.php index f9c6493..a592567 100755 --- a/tests/Feature/Auth/RegistrationTest.php +++ b/tests/Feature/Auth/RegistrationTest.php @@ -1,9 +1,11 @@ skipUnlessFortifyHas(Features::registration()); + config(['fortify.public_registration_default' => true]); }); test('registration screen can be rendered', function () { @@ -25,3 +27,44 @@ test('new users can register', function () { $this->assertAuthenticated(); }); + +test('administrators can disable and re-enable public registration from Users', function () { + $admin = User::factory()->create(['helpdesk_admin' => true]); + $settingsUrl = '/admin/users/public-registration'; + + $this->actingAs($admin)->get('/admin/users') + ->assertOk() + ->assertSee('Allow public registration'); + + $this->put($settingsUrl, ['enabled' => '0'])->assertRedirect('/admin/users'); + + auth()->logout(); + $this->get('/register')->assertNotFound(); + $this->postJson('/register', [ + 'name' => 'New User', + 'email' => 'public@example.com', + 'password' => 'password', + 'password_confirmation' => 'password', + ])->assertNotFound(); + $this->assertDatabaseMissing('users', ['email' => 'public@example.com']); + $this->get('/login')->assertOk()->assertDontSee('href="'.url('/register').'"', false); + $this->view('stylist-theme-frontend::welcome')->assertDontSee('href="'.url('/register').'"', false); + + config(['fortify.public_registration_default' => false]); + $this->actingAs($admin)->put($settingsUrl, ['enabled' => '1'])->assertRedirect('/admin/users'); + + auth()->logout(); + $this->get('/register')->assertOk(); + $this->get('/login')->assertOk()->assertSee('href="'.url('/register').'"', false); +}); + +test('only administrators can change public registration', function () { + $settingsUrl = '/admin/users/public-registration'; + $this->put($settingsUrl, ['enabled' => '0'])->assertRedirect(route('login')); + + $this->actingAs(User::factory()->create()) + ->put($settingsUrl, ['enabled' => '0'])->assertForbidden(); + + auth()->logout(); + $this->get('/register')->assertOk(); +});