mirror of
https://github.com/BookStackApp/BookStack.git
synced 2024-08-26 20:22:18 +00:00
Fixed validation issue on register post
Added test to cover and also cleaned up RegisterController comments. Fixes #670
This commit is contained in:
parent
62342433f4
commit
ec050a5eef
@ -91,6 +91,7 @@ class RegisterController extends Controller
|
|||||||
/**
|
/**
|
||||||
* Show the application registration form.
|
* Show the application registration form.
|
||||||
* @return Response
|
* @return Response
|
||||||
|
* @throws UserRegistrationException
|
||||||
*/
|
*/
|
||||||
public function getRegister()
|
public function getRegister()
|
||||||
{
|
{
|
||||||
@ -102,21 +103,13 @@ class RegisterController extends Controller
|
|||||||
/**
|
/**
|
||||||
* Handle a registration request for the application.
|
* Handle a registration request for the application.
|
||||||
* @param Request|\Illuminate\Http\Request $request
|
* @param Request|\Illuminate\Http\Request $request
|
||||||
* @return Response
|
* @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
|
||||||
* @throws UserRegistrationException
|
* @throws UserRegistrationException
|
||||||
* @throws \Illuminate\Validation\ValidationException
|
|
||||||
*/
|
*/
|
||||||
public function postRegister(Request $request)
|
public function postRegister(Request $request)
|
||||||
{
|
{
|
||||||
$this->checkRegistrationAllowed();
|
$this->checkRegistrationAllowed();
|
||||||
$validator = $this->validator($request->all());
|
$this->validator($request->all())->validate();
|
||||||
|
|
||||||
if ($validator->fails()) {
|
|
||||||
$this->throwValidationException(
|
|
||||||
$request,
|
|
||||||
$validator
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
$userData = $request->all();
|
$userData = $request->all();
|
||||||
return $this->registerUser($userData);
|
return $this->registerUser($userData);
|
||||||
@ -142,7 +135,6 @@ class RegisterController extends Controller
|
|||||||
* @param bool|false|SocialAccount $socialAccount
|
* @param bool|false|SocialAccount $socialAccount
|
||||||
* @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
|
* @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
|
||||||
* @throws UserRegistrationException
|
* @throws UserRegistrationException
|
||||||
* @throws ConfirmationEmailException
|
|
||||||
*/
|
*/
|
||||||
protected function registerUser(array $userData, $socialAccount = false)
|
protected function registerUser(array $userData, $socialAccount = false)
|
||||||
{
|
{
|
||||||
@ -240,6 +232,8 @@ class RegisterController extends Controller
|
|||||||
* Redirect to the social site for authentication intended to register.
|
* Redirect to the social site for authentication intended to register.
|
||||||
* @param $socialDriver
|
* @param $socialDriver
|
||||||
* @return mixed
|
* @return mixed
|
||||||
|
* @throws UserRegistrationException
|
||||||
|
* @throws \BookStack\Exceptions\SocialDriverNotConfigured
|
||||||
*/
|
*/
|
||||||
public function socialRegister($socialDriver)
|
public function socialRegister($socialDriver)
|
||||||
{
|
{
|
||||||
@ -296,7 +290,6 @@ class RegisterController extends Controller
|
|||||||
* Register a new user after a registration callback.
|
* Register a new user after a registration callback.
|
||||||
* @param $socialDriver
|
* @param $socialDriver
|
||||||
* @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
|
* @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
|
||||||
* @throws ConfirmationEmailException
|
|
||||||
* @throws UserRegistrationException
|
* @throws UserRegistrationException
|
||||||
* @throws \BookStack\Exceptions\SocialDriverNotConfigured
|
* @throws \BookStack\Exceptions\SocialDriverNotConfigured
|
||||||
*/
|
*/
|
||||||
|
@ -1,6 +1,7 @@
|
|||||||
<?php namespace Tests;
|
<?php namespace Tests;
|
||||||
|
|
||||||
use BookStack\Notifications\ConfirmEmail;
|
use BookStack\Notifications\ConfirmEmail;
|
||||||
|
use BookStack\User;
|
||||||
use Illuminate\Support\Facades\Notification;
|
use Illuminate\Support\Facades\Notification;
|
||||||
|
|
||||||
class AuthTest extends BrowserKitTest
|
class AuthTest extends BrowserKitTest
|
||||||
@ -41,7 +42,7 @@ class AuthTest extends BrowserKitTest
|
|||||||
{
|
{
|
||||||
// Set settings and get user instance
|
// Set settings and get user instance
|
||||||
$this->setSettings(['registration-enabled' => 'true']);
|
$this->setSettings(['registration-enabled' => 'true']);
|
||||||
$user = factory(\BookStack\User::class)->make();
|
$user = factory(User::class)->make();
|
||||||
|
|
||||||
// Test form and ensure user is created
|
// Test form and ensure user is created
|
||||||
$this->visit('/register')
|
$this->visit('/register')
|
||||||
@ -55,6 +56,18 @@ class AuthTest extends BrowserKitTest
|
|||||||
->seeInDatabase('users', ['name' => $user->name, 'email' => $user->email]);
|
->seeInDatabase('users', ['name' => $user->name, 'email' => $user->email]);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function test_empty_registration_redirects_back_with_errors()
|
||||||
|
{
|
||||||
|
// Set settings and get user instance
|
||||||
|
$this->setSettings(['registration-enabled' => 'true']);
|
||||||
|
|
||||||
|
// Test form and ensure user is created
|
||||||
|
$this->visit('/register')
|
||||||
|
->press('Create Account')
|
||||||
|
->see('The name field is required')
|
||||||
|
->seePageIs('/register');
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
public function test_confirmed_registration()
|
public function test_confirmed_registration()
|
||||||
{
|
{
|
||||||
@ -63,7 +76,7 @@ class AuthTest extends BrowserKitTest
|
|||||||
|
|
||||||
// Set settings and get user instance
|
// Set settings and get user instance
|
||||||
$this->setSettings(['registration-enabled' => 'true', 'registration-confirmation' => 'true']);
|
$this->setSettings(['registration-enabled' => 'true', 'registration-confirmation' => 'true']);
|
||||||
$user = factory(\BookStack\User::class)->make();
|
$user = factory(User::class)->make();
|
||||||
|
|
||||||
// Go through registration process
|
// Go through registration process
|
||||||
$this->visit('/register')
|
$this->visit('/register')
|
||||||
@ -76,7 +89,7 @@ class AuthTest extends BrowserKitTest
|
|||||||
->seeInDatabase('users', ['name' => $user->name, 'email' => $user->email, 'email_confirmed' => false]);
|
->seeInDatabase('users', ['name' => $user->name, 'email' => $user->email, 'email_confirmed' => false]);
|
||||||
|
|
||||||
// Ensure notification sent
|
// Ensure notification sent
|
||||||
$dbUser = \BookStack\User::where('email', '=', $user->email)->first();
|
$dbUser = User::where('email', '=', $user->email)->first();
|
||||||
Notification::assertSentTo($dbUser, ConfirmEmail::class);
|
Notification::assertSentTo($dbUser, ConfirmEmail::class);
|
||||||
|
|
||||||
// Test access and resend confirmation email
|
// Test access and resend confirmation email
|
||||||
@ -104,7 +117,7 @@ class AuthTest extends BrowserKitTest
|
|||||||
public function test_restricted_registration()
|
public function test_restricted_registration()
|
||||||
{
|
{
|
||||||
$this->setSettings(['registration-enabled' => 'true', 'registration-confirmation' => 'true', 'registration-restrict' => 'example.com']);
|
$this->setSettings(['registration-enabled' => 'true', 'registration-confirmation' => 'true', 'registration-restrict' => 'example.com']);
|
||||||
$user = factory(\BookStack\User::class)->make();
|
$user = factory(User::class)->make();
|
||||||
// Go through registration process
|
// Go through registration process
|
||||||
$this->visit('/register')
|
$this->visit('/register')
|
||||||
->type($user->name, '#name')
|
->type($user->name, '#name')
|
||||||
@ -136,7 +149,7 @@ class AuthTest extends BrowserKitTest
|
|||||||
public function test_restricted_registration_with_confirmation_disabled()
|
public function test_restricted_registration_with_confirmation_disabled()
|
||||||
{
|
{
|
||||||
$this->setSettings(['registration-enabled' => 'true', 'registration-confirmation' => 'false', 'registration-restrict' => 'example.com']);
|
$this->setSettings(['registration-enabled' => 'true', 'registration-confirmation' => 'false', 'registration-restrict' => 'example.com']);
|
||||||
$user = factory(\BookStack\User::class)->make();
|
$user = factory(User::class)->make();
|
||||||
// Go through registration process
|
// Go through registration process
|
||||||
$this->visit('/register')
|
$this->visit('/register')
|
||||||
->type($user->name, '#name')
|
->type($user->name, '#name')
|
||||||
@ -167,7 +180,7 @@ class AuthTest extends BrowserKitTest
|
|||||||
|
|
||||||
public function test_user_creation()
|
public function test_user_creation()
|
||||||
{
|
{
|
||||||
$user = factory(\BookStack\User::class)->make();
|
$user = factory(User::class)->make();
|
||||||
|
|
||||||
$this->asAdmin()
|
$this->asAdmin()
|
||||||
->visit('/settings/users')
|
->visit('/settings/users')
|
||||||
@ -215,13 +228,13 @@ class AuthTest extends BrowserKitTest
|
|||||||
->press('Save')
|
->press('Save')
|
||||||
->seePageIs('/settings/users');
|
->seePageIs('/settings/users');
|
||||||
|
|
||||||
$userPassword = \BookStack\User::find($user->id)->password;
|
$userPassword = User::find($user->id)->password;
|
||||||
$this->assertTrue(\Hash::check('newpassword', $userPassword));
|
$this->assertTrue(\Hash::check('newpassword', $userPassword));
|
||||||
}
|
}
|
||||||
|
|
||||||
public function test_user_deletion()
|
public function test_user_deletion()
|
||||||
{
|
{
|
||||||
$userDetails = factory(\BookStack\User::class)->make();
|
$userDetails = factory(User::class)->make();
|
||||||
$user = $this->getEditor($userDetails->toArray());
|
$user = $this->getEditor($userDetails->toArray());
|
||||||
|
|
||||||
$this->asAdmin()
|
$this->asAdmin()
|
||||||
@ -272,7 +285,7 @@ class AuthTest extends BrowserKitTest
|
|||||||
'email' => 'admin@admin.com'
|
'email' => 'admin@admin.com'
|
||||||
]);
|
]);
|
||||||
|
|
||||||
$user = \BookStack\User::where('email', '=', 'admin@admin.com')->first();
|
$user = User::where('email', '=', 'admin@admin.com')->first();
|
||||||
|
|
||||||
Notification::assertSentTo($user, \BookStack\Notifications\ResetPassword::class);
|
Notification::assertSentTo($user, \BookStack\Notifications\ResetPassword::class);
|
||||||
$n = Notification::sent($user, \BookStack\Notifications\ResetPassword::class);
|
$n = Notification::sent($user, \BookStack\Notifications\ResetPassword::class);
|
||||||
|
Loading…
Reference in New Issue
Block a user