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 1bbd5e2ba5e2b6bcd8d9527742978d70a20e3188..a285899ccb9cfc40eb911933591e18e2d6239df0 100644 (file)
--- a/app/Http/Controllers/Auth/RegisterController.php
+++ b/app/Http/Controllers/Auth/RegisterController.php
@@ -2,20 +2,25 @@
 
 namespace BookStack\Http\Controllers\Auth;
 
 
 namespace BookStack\Http\Controllers\Auth;
 

-use BookStack\Exceptions\ConfirmationEmailException;
+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\Exceptions\SocialSignInException;
 use BookStack\Exceptions\UserRegistrationException;

-use BookStack\Repos\UserRepo;
-use BookStack\Services\EmailConfirmationService;
-use BookStack\Services\SocialAuthService;
-use BookStack\SocialAccount;
-use BookStack\User;
+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 Illuminate\Routing\Redirector;
+use Illuminate\View\View;
+use Laravel\Socialite\Contracts\User as SocialUser;

 use Validator;
 use Validator;

-use BookStack\Http\Controllers\Controller;
-use Illuminate\Foundation\Auth\RegistersUsers;

 
 class RegisterController extends Controller
 {
 
 class RegisterController extends Controller
 {


@@ -48,7 +53,7 @@ class RegisterController extends Controller
      * Create a new controller instance.
      *
      * @param SocialAuthService $socialAuthService
      * Create a new controller instance.
      *
      * @param SocialAuthService $socialAuthService

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

      * @param UserRepo $userRepo
      */
     public function __construct(SocialAuthService $socialAuthService, EmailConfirmationService $emailConfirmationService, UserRepo $userRepo)
      * @param UserRepo $userRepo
      */
     public function __construct(SocialAuthService $socialAuthService, EmailConfirmationService $emailConfirmationService, UserRepo $userRepo)


@@ -57,8 +62,8 @@ class RegisterController extends Controller
         $this->socialAuthService = $socialAuthService;
         $this->emailConfirmationService = $emailConfirmationService;
         $this->userRepo = $userRepo;
         $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();
     }
 


@@ -71,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',
         ]);


@@ -102,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)


@@ -133,25 +138,28 @@ class RegisterController extends Controller
      * The registrations flow for all users.
      * @param array $userData
      * @param bool|false|SocialAccount $socialAccount
      * The registrations flow for all users.
      * @param array $userData
      * @param bool|false|SocialAccount $socialAccount

-     * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
+     * @param bool $emailVerified
+     * @return RedirectResponse|Redirector

      * @throws UserRegistrationException
      */
      * @throws UserRegistrationException
      */

-    protected function registerUser(array $userData, $socialAccount = false)
+    protected function registerUser(array $userData, $socialAccount = false, $emailVerified = false)

     {
     {

-        if (setting('registration-restrict')) {
-            $restrictedEmailDomains = explode(',', str_replace(' ', '', setting('registration-restrict')));
-            $userEmailDomain = $domain = substr(strrchr($userData['email'], "@"), 1);
+        $registrationRestrict = setting('registration-restrict');
+
+        if ($registrationRestrict) {
+            $restrictedEmailDomains = explode(',', str_replace(' ', '', $registrationRestrict));
+            $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');
             }
         }
 

-        $newUser = $this->userRepo->registerNew($userData);
+        $newUser = $this->userRepo->registerNew($userData, $emailVerified);

         if ($socialAccount) {
             $newUser->socialAccounts()->save($socialAccount);
         }
 
         if ($socialAccount) {
             $newUser->socialAccounts()->save($socialAccount);
         }
 

-        if (setting('registration-confirmation') || setting('registration-restrict')) {
+        if ((setting('registration-confirmation') || $registrationRestrict) && !$emailVerified) {

             $newUser->save();
 
             try {
             $newUser->save();
 
             try {


@@ -174,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)


@@ -198,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)
     {


@@ -233,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)
     {


@@ -246,11 +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 ConfirmationEmailException
+     * @throws SocialDriverNotConfigured

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


@@ -267,19 +274,31 @@ class RegisterController extends Controller
         }
 
         $action = session()->pull('social-callback');
         }
 
         $action = session()->pull('social-callback');

+
+        // Attempt login or fall-back to register if allowed.
+        $socialUser = $this->socialAuthService->getSocialUser($socialDriver);

         if ($action == 'login') {
         if ($action == 'login') {

-            return $this->socialAuthService->handleLoginCallback($socialDriver);
+            try {
+                return $this->socialAuthService->handleLoginCallback($socialDriver, $socialUser);
+            } catch (SocialSignInAccountNotUsed $exception) {
+                if ($this->socialAuthService->driverAutoRegisterEnabled($socialDriver)) {
+                    return $this->socialRegisterCallback($socialDriver, $socialUser);
+                }
+                throw $exception;
+            }

         }
         }

+

         if ($action == 'register') {
         if ($action == 'register') {

-            return $this->socialRegisterCallback($socialDriver);
+            return $this->socialRegisterCallback($socialDriver, $socialUser);

         }
         }

+

         return redirect()->back();
     }
 
     /**
      * Detach a social account from a user.
      * @param $socialDriver
         return redirect()->back();
     }
 
     /**
      * 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)
     {


@@ -288,15 +307,16 @@ class RegisterController extends Controller
 
     /**
      * Register a new user after a registration callback.
 
     /**
      * Register a new user after a registration callback.

-     * @param $socialDriver
-     * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
+     * @param string $socialDriver
+     * @param SocialUser $socialUser
+     * @return RedirectResponse|Redirector

      * @throws UserRegistrationException
      * @throws UserRegistrationException

-     * @throws \BookStack\Exceptions\SocialDriverNotConfigured

      */
      */

-    protected function socialRegisterCallback($socialDriver)
+    protected function socialRegisterCallback(string $socialDriver, SocialUser $socialUser)

     {
     {

-        $socialUser = $this->socialAuthService->handleRegistrationCallback($socialDriver);
+        $socialUser = $this->socialAuthService->handleRegistrationCallback($socialDriver, $socialUser);

         $socialAccount = $this->socialAuthService->fillSocialAccount($socialDriver, $socialUser);
         $socialAccount = $this->socialAuthService->fillSocialAccount($socialDriver, $socialUser);

+        $emailVerified = $this->socialAuthService->driverAutoConfirmEmailEnabled($socialDriver);

 
         // Create an array of the user data to create a new user instance
         $userData = [
 
         // Create an array of the user data to create a new user instance
         $userData = [


@@ -304,6 +324,6 @@ class RegisterController extends Controller
             'email' => $socialUser->getEmail(),
             'password' => str_random(30)
         ];
             'email' => $socialUser->getEmail(),
             'password' => str_random(30)
         ];

-        return $this->registerUser($userData, $socialAccount);
+        return $this->registerUser($userData, $socialAccount, $emailVerified);

     }
 }
     }
 }