Update.

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

diff --git a/app/Http/Controllers/Auth/RegisterController.php b/app/Http/Controllers/Auth/RegisterController.php
index 5b3719bc08ae50f6352959efbd22f0e936fcf691..8b0ef309aeba8c61d156a4fd0692dbc94e2ba712 100644 (file)
--- a/app/Http/Controllers/Auth/RegisterController.php
+++ b/app/Http/Controllers/Auth/RegisterController.php
@@ -3,11 +3,13 @@
 namespace BookStack\Http\Controllers\Auth;
 
 use BookStack\Exceptions\ConfirmationEmailException;
 namespace BookStack\Http\Controllers\Auth;
 
 use BookStack\Exceptions\ConfirmationEmailException;

+use BookStack\Exceptions\SocialSignInException;

 use BookStack\Exceptions\UserRegistrationException;
 use BookStack\Repos\UserRepo;
 use BookStack\Services\EmailConfirmationService;
 use BookStack\Services\SocialAuthService;
 use BookStack\User;
 use BookStack\Exceptions\UserRegistrationException;
 use BookStack\Repos\UserRepo;
 use BookStack\Services\EmailConfirmationService;
 use BookStack\Services\SocialAuthService;
 use BookStack\User;

+use Exception;

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


@@ -50,13 +52,12 @@ class RegisterController extends Controller
      */
     public function __construct(SocialAuthService $socialAuthService, EmailConfirmationService $emailConfirmationService, UserRepo $userRepo)
     {
      */
     public function __construct(SocialAuthService $socialAuthService, EmailConfirmationService $emailConfirmationService, UserRepo $userRepo)
     {

-        $this->middleware('guest');
+        $this->middleware('guest')->except(['socialCallback', 'detachSocialAccount']);

         $this->socialAuthService = $socialAuthService;
         $this->emailConfirmationService = $emailConfirmationService;
         $this->userRepo = $userRepo;
         $this->redirectTo = baseUrl('/');
         $this->redirectPath = baseUrl('/');
         $this->socialAuthService = $socialAuthService;
         $this->emailConfirmationService = $emailConfirmationService;
         $this->userRepo = $userRepo;
         $this->redirectTo = baseUrl('/');
         $this->redirectPath = baseUrl('/');

-        $this->username = config('auth.method') === 'standard' ? 'email' : 'username';

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


@@ -82,7 +83,7 @@ class RegisterController extends Controller
     protected function checkRegistrationAllowed()
     {
         if (!setting('registration-enabled')) {
     protected function checkRegistrationAllowed()
     {
         if (!setting('registration-enabled')) {

-            throw new UserRegistrationException('Registrations are currently disabled.', '/login');
+            throw new UserRegistrationException(trans('auth.registrations_disabled'), '/login');

         }
     }
 
         }
     }
 


@@ -147,7 +148,7 @@ class RegisterController extends Controller
             $restrictedEmailDomains = explode(',', str_replace(' ', '', setting('registration-restrict')));
             $userEmailDomain = $domain = substr(strrchr($userData['email'], "@"), 1);
             if (!in_array($userEmailDomain, $restrictedEmailDomains)) {
             $restrictedEmailDomains = explode(',', str_replace(' ', '', setting('registration-restrict')));
             $userEmailDomain = $domain = substr(strrchr($userData['email'], "@"), 1);
             if (!in_array($userEmailDomain, $restrictedEmailDomains)) {

-                throw new UserRegistrationException('That email domain does not have access to this application', '/register');
+                throw new UserRegistrationException(trans('auth.registration_email_domain_invalid'), '/register');

             }
         }
 
             }
         }
 


@@ -158,12 +159,18 @@ class RegisterController extends Controller
 
         if (setting('registration-confirmation') || setting('registration-restrict')) {
             $newUser->save();
 
         if (setting('registration-confirmation') || setting('registration-restrict')) {
             $newUser->save();

-            $this->emailConfirmationService->sendConfirmation($newUser);
+
+            try {
+                $this->emailConfirmationService->sendConfirmation($newUser);
+            } catch (Exception $e) {
+                session()->flash('error', trans('auth.email_confirm_send_error'));
+            }
+

             return redirect('/register/confirm');
         }
 
         auth()->login($newUser);
             return redirect('/register/confirm');
         }
 
         auth()->login($newUser);

-        session()->flash('success', 'Thanks for signing up! You are now registered and signed in.');
+        session()->flash('success', trans('auth.register_success'));

         return redirect($this->redirectPath());
     }
 
         return redirect($this->redirectPath());
     }
 


@@ -189,7 +196,7 @@ class RegisterController extends Controller
         $user->email_confirmed = true;
         $user->save();
         auth()->login($user);
         $user->email_confirmed = true;
         $user->save();
         auth()->login($user);

-        session()->flash('success', 'Your email has been confirmed!');
+        session()->flash('success', trans('auth.email_confirm_success'));

         $this->emailConfirmationService->deleteConfirmationsByUser($user);
         return redirect($this->redirectPath);
     }
         $this->emailConfirmationService->deleteConfirmationsByUser($user);
         return redirect($this->redirectPath);
     }


@@ -215,8 +222,16 @@ class RegisterController extends Controller
             'email' => 'required|email|exists:users,email'
         ]);
         $user = $this->userRepo->getByEmail($request->get('email'));
             'email' => 'required|email|exists:users,email'
         ]);
         $user = $this->userRepo->getByEmail($request->get('email'));

+
+        try {
+            $this->emailConfirmationService->sendConfirmation($user);
+        } catch (Exception $e) {
+            session()->flash('error', trans('auth.email_confirm_send_error'));
+            return redirect('/register/confirm');
+        }
+

         $this->emailConfirmationService->sendConfirmation($user);
         $this->emailConfirmationService->sendConfirmation($user);

-        session()->flash('success', 'Confirmation email resent, Please check your inbox.');
+        session()->flash('success', trans('auth.email_confirm_resent'));

         return redirect('/register/confirm');
     }
 
         return redirect('/register/confirm');
     }
 


@@ -248,7 +263,7 @@ class RegisterController extends Controller
                 return $this->socialRegisterCallback($socialDriver);
             }
         } else {
                 return $this->socialRegisterCallback($socialDriver);
             }
         } else {

-            throw new SocialSignInException('No action defined', '/login');
+            throw new SocialSignInException(trans('errors.social_no_action_defined'), '/login');

         }
         return redirect()->back();
     }
         }
         return redirect()->back();
     }


@@ -283,5 +298,4 @@ class RegisterController extends Controller
         return $this->registerUser($userData, $socialAccount);
     }
 
         return $this->registerUser($userData, $socialAccount);
     }
 

-

 }
\ No newline at end of file
 }
\ No newline at end of file