mirror of
https://github.com/BookStackApp/BookStack.git
synced 2024-08-26 04:05:57 +00:00
Merge branch 'fix/registraion-form-validation' of git://github.com/cw1998/BookStack into cw1998-fix/registraion-form-validation
This commit is contained in:
commit
4e49d06182
@ -70,7 +70,7 @@ class RegisterController extends Controller
|
|||||||
protected function validator(array $data)
|
protected function validator(array $data)
|
||||||
{
|
{
|
||||||
return Validator::make($data, [
|
return Validator::make($data, [
|
||||||
'name' => 'required|max:255',
|
'name' => 'required|min:2|max:255',
|
||||||
'email' => 'required|email|max:255|unique:users',
|
'email' => 'required|email|max:255|unique:users',
|
||||||
'password' => 'required|min:6',
|
'password' => 'required|min:6',
|
||||||
]);
|
]);
|
||||||
|
@ -6,5 +6,10 @@
|
|||||||
<div class="form-group">
|
<div class="form-group">
|
||||||
<label for="password">{{ trans('auth.password') }}</label>
|
<label for="password">{{ trans('auth.password') }}</label>
|
||||||
@include('form.password', ['name' => 'password', 'tabindex' => 1])
|
@include('form.password', ['name' => 'password', 'tabindex' => 1])
|
||||||
<span class="block small mt-s"><a href="{{ baseUrl('/password/email') }}">{{ trans('auth.forgot_password') }}</a></span>
|
<span class="block small mt-s">
|
||||||
|
<a href="{{ baseUrl('/password/email') }}">{{ trans('auth.forgot_password') }}</a>
|
||||||
|
@if(setting('registration-enabled', false))
|
||||||
|
• <a href="{{ baseUrl('/register') }}">{{ trans('auth.sign_up') }}</a>
|
||||||
|
@endif
|
||||||
|
</span>
|
||||||
</div>
|
</div>
|
@ -9,7 +9,7 @@
|
|||||||
<div class="card content-wrap">
|
<div class="card content-wrap">
|
||||||
<h1 class="list-heading">{{ title_case(trans('auth.log_in')) }}</h1>
|
<h1 class="list-heading">{{ title_case(trans('auth.log_in')) }}</h1>
|
||||||
|
|
||||||
<form action="{{ baseUrl("/login") }}" method="POST" id="login-form" class="mt-l">
|
<form action="{{ baseUrl('/login') }}" method="POST" id="login-form" class="mt-l">
|
||||||
{!! csrf_field() !!}
|
{!! csrf_field() !!}
|
||||||
|
|
||||||
<div class="stretch-inputs">
|
<div class="stretch-inputs">
|
||||||
|
@ -41,7 +41,7 @@
|
|||||||
|
|
||||||
@if(!signedInUser())
|
@if(!signedInUser())
|
||||||
@if(setting('registration-enabled', false))
|
@if(setting('registration-enabled', false))
|
||||||
<a href="{{ baseUrl("/register") }}">@icon('new-user') {{ trans('auth.sign_up') }}</a>
|
<a href="{{ baseUrl('/register') }}">@icon('new-user') {{ trans('auth.sign_up') }}</a>
|
||||||
@endif
|
@endif
|
||||||
<a href="{{ baseUrl('/login') }}">@icon('login') {{ trans('auth.log_in') }}</a>
|
<a href="{{ baseUrl('/login') }}">@icon('login') {{ trans('auth.log_in') }}</a>
|
||||||
@endif
|
@endif
|
||||||
|
@ -69,6 +69,31 @@ class AuthTest extends BrowserKitTest
|
|||||||
->seePageIs('/register');
|
->seePageIs('/register');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function test_registration_validation()
|
||||||
|
{
|
||||||
|
$this->setSettings(['registration-enabled' => 'true']);
|
||||||
|
|
||||||
|
$this->visit('/register')
|
||||||
|
->type('1', '#name')
|
||||||
|
->type('1', '#email')
|
||||||
|
->type('1', '#password')
|
||||||
|
->press('Create Account')
|
||||||
|
->see('The name must be at least 2 characters.')
|
||||||
|
->see('The email must be a valid email address.')
|
||||||
|
->see('The password must be at least 6 characters.')
|
||||||
|
->seePageIs('/register');
|
||||||
|
}
|
||||||
|
|
||||||
|
public function test_sign_up_link_on_login()
|
||||||
|
{
|
||||||
|
$this->visit('/login')
|
||||||
|
->dontSee('Sign up');
|
||||||
|
|
||||||
|
$this->setSettings(['registration-enabled' => 'true']);
|
||||||
|
|
||||||
|
$this->visit('/login')
|
||||||
|
->see('Sign up');
|
||||||
|
}
|
||||||
|
|
||||||
public function test_confirmed_registration()
|
public function test_confirmed_registration()
|
||||||
{
|
{
|
||||||
|
Loading…
Reference in New Issue
Block a user