diff --git a/src/Http/Requests/UserRegisterRequest.php b/src/Http/Requests/UserRegisterRequest.php index d7bc535d219..bbf9ff3572a 100644 --- a/src/Http/Requests/UserRegisterRequest.php +++ b/src/Http/Requests/UserRegisterRequest.php @@ -52,7 +52,7 @@ public function processedValues() { return $this->blueprintFields->process()->values() ->only(array_keys($this->submittedValues)) - ->except(['email', 'groups', 'roles', 'super']); + ->except(['email', 'groups', 'roles', 'super', 'password_confirmation']); } public function validator() diff --git a/tests/Tags/User/RegisterFormTest.php b/tests/Tags/User/RegisterFormTest.php index eead21e10af..2097688ed2e 100644 --- a/tests/Tags/User/RegisterFormTest.php +++ b/tests/Tags/User/RegisterFormTest.php @@ -4,7 +4,9 @@ use Statamic\Facades\Blueprint; use Statamic\Facades\Parse; +use Statamic\Facades\Role; use Statamic\Facades\User; +use Statamic\Facades\UserGroup; use Statamic\Statamic; use Tests\NormalizesHtml; use Tests\PreventSavingStacheItemsToDisk; @@ -339,6 +341,35 @@ public function it_will_use_redirect_query_param_off_url() $this->assertStringContainsString($expectedErrorRedirect, $output); } + /** @test */ + public function it_ensures_some_fields_arent_saved() + { + UserGroup::make('client')->title('Client')->save(); + Role::make('admin')->title('Admin')->save(); + + $this->assertNull(User::findByEmail('san@holo.com')); + $this->assertFalse(auth()->check()); + + $this + ->post('/!/auth/register', [ + 'email' => 'san@holo.com', + 'password' => 'chewbacca', + 'password_confirmation' => 'chewbacca', + 'groups' => ['client'], + 'roles' => ['admin'], + 'super' => true, + ]) + ->assertSessionHasNoErrors() + ->assertLocation('/'); + + $user = User::findByEmail('san@holo.com'); + + $this->assertEquals($user->groups()->count(), 0); + $this->assertEquals($user->roles()->count(), 0); + $this->assertNull($user->get('super')); + $this->assertNull($user->get('password_confirmation')); + } + private function useCustomBlueprint() { $blueprint = Blueprint::make()->setContents([