Add error messages, fix LDAP error

[bookstack] / app / Http / Controllers / Auth / RegisterController.php

diff --git a/app/Http/Controllers/Auth/RegisterController.php b/app/Http/Controllers/Auth/RegisterController.php
index dd60c741681e7c98239fa92356a00ccbd748bf88..a285899ccb9cfc40eb911933591e18e2d6239df0 100644 (file)
--- a/app/Http/Controllers/Auth/RegisterController.php
+++ b/app/Http/Controllers/Auth/RegisterController.php
@@ -2,21 +2,25 @@
 
 namespace BookStack\Http\Controllers\Auth;
 
 
 namespace BookStack\Http\Controllers\Auth;
 

-use BookStack\Exceptions\SocialSignInAccountNotUsed;
-use BookStack\Exceptions\SocialSignInException;
-use BookStack\Exceptions\UserRegistrationException;
-use BookStack\Auth\UserRepo;

 use BookStack\Auth\Access\EmailConfirmationService;
 use BookStack\Auth\Access\SocialAuthService;
 use BookStack\Auth\SocialAccount;
 use BookStack\Auth\User;
 use BookStack\Auth\Access\EmailConfirmationService;
 use BookStack\Auth\Access\SocialAuthService;
 use BookStack\Auth\SocialAccount;
 use BookStack\Auth\User;

+use BookStack\Auth\UserRepo;
+use BookStack\Exceptions\SocialDriverNotConfigured;
+use BookStack\Exceptions\SocialSignInAccountNotUsed;
+use BookStack\Exceptions\SocialSignInException;
+use BookStack\Exceptions\UserRegistrationException;
+use BookStack\Http\Controllers\Controller;

 use Exception;
 use Exception;

+use Illuminate\Foundation\Auth\RegistersUsers;
+use Illuminate\Http\RedirectResponse;

 use Illuminate\Http\Request;
 use Illuminate\Http\Response;
 use Illuminate\Http\Request;
 use Illuminate\Http\Response;

-use Validator;
-use BookStack\Http\Controllers\Controller;
-use Illuminate\Foundation\Auth\RegistersUsers;
+use Illuminate\Routing\Redirector;
+use Illuminate\View\View;

 use Laravel\Socialite\Contracts\User as SocialUser;
 use Laravel\Socialite\Contracts\User as SocialUser;

+use Validator;

 
 class RegisterController extends Controller
 {
 
 class RegisterController extends Controller
 {


@@ -48,18 +52,18 @@ class RegisterController extends Controller
     /**
      * Create a new controller instance.
      *
     /**
      * Create a new controller instance.
      *

-     * @param \BookStack\Auth\Access\SocialAuthService $socialAuthService
+     * @param SocialAuthService $socialAuthService

      * @param \BookStack\Auth\EmailConfirmationService $emailConfirmationService
      * @param \BookStack\Auth\EmailConfirmationService $emailConfirmationService

-     * @param \BookStack\Auth\UserRepo $userRepo
+     * @param UserRepo $userRepo

      */
      */

-    public function __construct(\BookStack\Auth\Access\SocialAuthService $socialAuthService, \BookStack\Auth\Access\EmailConfirmationService $emailConfirmationService, UserRepo $userRepo)
+    public function __construct(SocialAuthService $socialAuthService, EmailConfirmationService $emailConfirmationService, UserRepo $userRepo)

     {
         $this->middleware('guest')->only(['getRegister', 'postRegister', 'socialRegister']);
         $this->socialAuthService = $socialAuthService;
         $this->emailConfirmationService = $emailConfirmationService;
         $this->userRepo = $userRepo;
     {
         $this->middleware('guest')->only(['getRegister', 'postRegister', 'socialRegister']);
         $this->socialAuthService = $socialAuthService;
         $this->emailConfirmationService = $emailConfirmationService;
         $this->userRepo = $userRepo;

-        $this->redirectTo = baseUrl('/');
-        $this->redirectPath = baseUrl('/');
+        $this->redirectTo = url('/');
+        $this->redirectPath = url('/');

         parent::__construct();
     }
 
         parent::__construct();
     }
 


@@ -72,7 +76,7 @@ class RegisterController extends Controller
     protected function validator(array $data)
     {
         return Validator::make($data, [
     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',
         ]);
             'email' => 'required|email|max:255|unique:users',
             'password' => 'required|min:6',
         ]);


@@ -103,8 +107,8 @@ class RegisterController extends Controller
 
     /**
      * Handle a registration request for the application.
 
     /**
      * Handle a registration request for the application.

-     * @param Request|\Illuminate\Http\Request $request
-     * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
+     * @param Request|Request $request
+     * @return RedirectResponse|Redirector

      * @throws UserRegistrationException
      */
     public function postRegister(Request $request)
      * @throws UserRegistrationException
      */
     public function postRegister(Request $request)


@@ -119,7 +123,7 @@ class RegisterController extends Controller
     /**
      * Create a new user instance after a valid registration.
      * @param  array  $data
     /**
      * Create a new user instance after a valid registration.
      * @param  array  $data

-     * @return \BookStack\Auth\User
+     * @return User

      */
     protected function create(array $data)
     {
      */
     protected function create(array $data)
     {


@@ -135,7 +139,7 @@ class RegisterController extends Controller
      * @param array $userData
      * @param bool|false|SocialAccount $socialAccount
      * @param bool $emailVerified
      * @param array $userData
      * @param bool|false|SocialAccount $socialAccount
      * @param bool $emailVerified

-     * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
+     * @return RedirectResponse|Redirector

      * @throws UserRegistrationException
      */
     protected function registerUser(array $userData, $socialAccount = false, $emailVerified = false)
      * @throws UserRegistrationException
      */
     protected function registerUser(array $userData, $socialAccount = false, $emailVerified = false)


@@ -144,7 +148,7 @@ class RegisterController extends Controller
 
         if ($registrationRestrict) {
             $restrictedEmailDomains = explode(',', str_replace(' ', '', $registrationRestrict));
 
         if ($registrationRestrict) {
             $restrictedEmailDomains = explode(',', str_replace(' ', '', $registrationRestrict));

-            $userEmailDomain = $domain = substr(strrchr($userData['email'], "@"), 1);
+            $userEmailDomain = $domain = mb_substr(mb_strrchr($userData['email'], "@"), 1);

             if (!in_array($userEmailDomain, $restrictedEmailDomains)) {
                 throw new UserRegistrationException(trans('auth.registration_email_domain_invalid'), '/register');
             }
             if (!in_array($userEmailDomain, $restrictedEmailDomains)) {
                 throw new UserRegistrationException(trans('auth.registration_email_domain_invalid'), '/register');
             }


@@ -178,13 +182,13 @@ class RegisterController extends Controller
      */
     public function getRegisterConfirmation()
     {
      */
     public function getRegisterConfirmation()
     {

-        return view('auth/register-confirm');
+        return view('auth.register-confirm');

     }
 
     /**
      * Confirms an email via a token and logs the user into the system.
      * @param $token
     }
 
     /**
      * Confirms an email via a token and logs the user into the system.
      * @param $token

-     * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
+     * @return RedirectResponse|Redirector

      * @throws UserRegistrationException
      */
     public function confirmEmail($token)
      * @throws UserRegistrationException
      */
     public function confirmEmail($token)


@@ -202,17 +206,17 @@ class RegisterController extends Controller
     /**
      * Shows a notice that a user's email address has not been confirmed,
      * Also has the option to re-send the confirmation email.
     /**
      * Shows a notice that a user's email address has not been confirmed,
      * Also has the option to re-send the confirmation email.

-     * @return \Illuminate\View\View
+     * @return View

      */
     public function showAwaitingConfirmation()
     {
      */
     public function showAwaitingConfirmation()
     {

-        return view('auth/user-unconfirmed');
+        return view('auth.user-unconfirmed');

     }
 
     /**
      * Resend the confirmation email
      * @param Request $request
     }
 
     /**
      * Resend the confirmation email
      * @param Request $request

-     * @return \Illuminate\View\View
+     * @return View

      */
     public function resendConfirmation(Request $request)
     {
      */
     public function resendConfirmation(Request $request)
     {


@@ -237,7 +241,7 @@ class RegisterController extends Controller
      * @param $socialDriver
      * @return mixed
      * @throws UserRegistrationException
      * @param $socialDriver
      * @return mixed
      * @throws UserRegistrationException

-     * @throws \BookStack\Exceptions\SocialDriverNotConfigured
+     * @throws SocialDriverNotConfigured

      */
     public function socialRegister($socialDriver)
     {
      */
     public function socialRegister($socialDriver)
     {


@@ -250,10 +254,10 @@ class RegisterController extends Controller
      * The callback for social login services.
      * @param $socialDriver
      * @param Request $request
      * The callback for social login services.
      * @param $socialDriver
      * @param Request $request

-     * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
+     * @return RedirectResponse|Redirector

      * @throws SocialSignInException
      * @throws UserRegistrationException
      * @throws SocialSignInException
      * @throws UserRegistrationException

-     * @throws \BookStack\Exceptions\SocialDriverNotConfigured
+     * @throws SocialDriverNotConfigured

      */
     public function socialCallback($socialDriver, Request $request)
     {
      */
     public function socialCallback($socialDriver, Request $request)
     {


@@ -294,7 +298,7 @@ class RegisterController extends Controller
     /**
      * Detach a social account from a user.
      * @param $socialDriver
     /**
      * Detach a social account from a user.
      * @param $socialDriver

-     * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
+     * @return RedirectResponse|Redirector

      */
     public function detachSocialAccount($socialDriver)
     {
      */
     public function detachSocialAccount($socialDriver)
     {


@@ -305,7 +309,7 @@ class RegisterController extends Controller
      * Register a new user after a registration callback.
      * @param string $socialDriver
      * @param SocialUser $socialUser
      * Register a new user after a registration callback.
      * @param string $socialDriver
      * @param SocialUser $socialUser

-     * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
+     * @return RedirectResponse|Redirector

      * @throws UserRegistrationException
      */
     protected function socialRegisterCallback(string $socialDriver, SocialUser $socialUser)
      * @throws UserRegistrationException
      */
     protected function socialRegisterCallback(string $socialDriver, SocialUser $socialUser)