From c8cf6731e2be8f8a9bf7aa15b864690e71507548 Mon Sep 17 00:00:00 2001
From: Christopher Wilkinson <cwilkinson000@gmail.com>
Date: Tue, 16 Apr 2019 12:18:51 +0100
Subject: [PATCH] Add min length validation on name on register form & add sign
 up link

---
 .../Controllers/Auth/RegisterController.php   |  2 +-
 .../views/auth/forms/login/standard.blade.php |  9 +++++--
 resources/views/auth/login.blade.php          |  2 +-
 resources/views/common/header.blade.php       |  2 +-
 tests/Auth/AuthTest.php                       | 25 +++++++++++++++++++
 5 files changed, 35 insertions(+), 5 deletions(-)

diff --git a/app/Http/Controllers/Auth/RegisterController.php b/app/Http/Controllers/Auth/RegisterController.php
index da4f42bb1..79d696652 100644
--- a/app/Http/Controllers/Auth/RegisterController.php
+++ b/app/Http/Controllers/Auth/RegisterController.php
@@ -70,7 +70,7 @@ class RegisterController extends Controller
     protected function validator(array $data)
     {
         return Validator::make($data, [
-            'name' => 'required|max:255',
+            'name' => 'required|min:2|max:255',
             'email' => 'required|email|max:255|unique:users',
             'password' => 'required|min:6',
         ]);
diff --git a/resources/views/auth/forms/login/standard.blade.php b/resources/views/auth/forms/login/standard.blade.php
index a12fbd753..0e580943e 100644
--- a/resources/views/auth/forms/login/standard.blade.php
+++ b/resources/views/auth/forms/login/standard.blade.php
@@ -6,5 +6,10 @@
 <div class="form-group">
     <label for="password">{{ trans('auth.password') }}</label>
     @include('form.password', ['name' => 'password', 'tabindex' => 1])
-    <span class="block small mt-s"><a href="{{ baseUrl('/password/email') }}">{{ trans('auth.forgot_password') }}</a></span>
-</div>
\ No newline at end of file
+    <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>
diff --git a/resources/views/auth/login.blade.php b/resources/views/auth/login.blade.php
index eb7ca2da8..6e3f12a85 100644
--- a/resources/views/auth/login.blade.php
+++ b/resources/views/auth/login.blade.php
@@ -9,7 +9,7 @@
         <div class="card content-wrap">
             <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() !!}
 
                 <div class="stretch-inputs">
diff --git a/resources/views/common/header.blade.php b/resources/views/common/header.blade.php
index c9c301572..7fab6cfda 100644
--- a/resources/views/common/header.blade.php
+++ b/resources/views/common/header.blade.php
@@ -41,7 +41,7 @@
 
                     @if(!signedInUser())
                         @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
                         <a href="{{ baseUrl('/login') }}">@icon('login') {{ trans('auth.log_in') }}</a>
                     @endif
diff --git a/tests/Auth/AuthTest.php b/tests/Auth/AuthTest.php
index 0aa0e2a23..c39ef68e5 100644
--- a/tests/Auth/AuthTest.php
+++ b/tests/Auth/AuthTest.php
@@ -69,6 +69,31 @@ class AuthTest extends BrowserKitTest
             ->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()
     {