mirror of
				https://github.com/BookStackApp/BookStack.git
				synced 2025-10-28 05:14:50 +03:00 
			
		
		
		
	* Started mass-refactoring of the current entity repos * Rewrote book tree logic - Now does two simple queries instead of one really complex one. - Extracted logic into its own class. - Remove model-level akward union field listing. - Logic now more readable than being large separate query and compilation functions. * Extracted and split book sort logic * Finished up Book controller/repo organisation * Refactored bookshelves controllers and repo parts * Fixed issues found via phpunit * Refactored Chapter controller * Updated Chapter export controller * Started Page controller/repo refactor * Refactored another chunk of PageController * Completed initial pagecontroller refactor pass * Fixed tests and continued reduction of old repos * Removed old page remove and further reduced entity repo * Removed old entity repo, split out page controller * Ran phpcbf and split out some page content methods * Tidied up some EntityProvider elements * Fixed issued caused by viewservice change
		
			
				
	
	
		
			117 lines
		
	
	
		
			3.5 KiB
		
	
	
	
		
			PHP
		
	
	
	
	
	
			
		
		
	
	
			117 lines
		
	
	
		
			3.5 KiB
		
	
	
	
		
			PHP
		
	
	
	
	
	
| <?php
 | |
| 
 | |
| namespace BookStack\Http\Controllers\Auth;
 | |
| 
 | |
| use BookStack\Auth\Access\EmailConfirmationService;
 | |
| use BookStack\Auth\UserRepo;
 | |
| use BookStack\Exceptions\ConfirmationEmailException;
 | |
| use BookStack\Exceptions\UserTokenExpiredException;
 | |
| use BookStack\Exceptions\UserTokenNotFoundException;
 | |
| use BookStack\Http\Controllers\Controller;
 | |
| use Exception;
 | |
| use Illuminate\Http\RedirectResponse;
 | |
| use Illuminate\Http\Request;
 | |
| use Illuminate\Routing\Redirector;
 | |
| use Illuminate\View\View;
 | |
| 
 | |
| class ConfirmEmailController extends Controller
 | |
| {
 | |
|     protected $emailConfirmationService;
 | |
|     protected $userRepo;
 | |
| 
 | |
|     /**
 | |
|      * Create a new controller instance.
 | |
|      *
 | |
|      * @param EmailConfirmationService $emailConfirmationService
 | |
|      * @param UserRepo $userRepo
 | |
|      */
 | |
|     public function __construct(EmailConfirmationService $emailConfirmationService, UserRepo $userRepo)
 | |
|     {
 | |
|         $this->emailConfirmationService = $emailConfirmationService;
 | |
|         $this->userRepo = $userRepo;
 | |
|         parent::__construct();
 | |
|     }
 | |
| 
 | |
| 
 | |
|     /**
 | |
|      * Show the page to tell the user to check their email
 | |
|      * and confirm their address.
 | |
|      */
 | |
|     public function show()
 | |
|     {
 | |
|         return view('auth.register-confirm');
 | |
|     }
 | |
| 
 | |
|     /**
 | |
|      * Shows a notice that a user's email address has not been confirmed,
 | |
|      * Also has the option to re-send the confirmation email.
 | |
|      * @return View
 | |
|      */
 | |
|     public function showAwaiting()
 | |
|     {
 | |
|         return view('auth.user-unconfirmed');
 | |
|     }
 | |
| 
 | |
|     /**
 | |
|      * Confirms an email via a token and logs the user into the system.
 | |
|      * @param $token
 | |
|      * @return RedirectResponse|Redirector
 | |
|      * @throws ConfirmationEmailException
 | |
|      * @throws Exception
 | |
|      */
 | |
|     public function confirm($token)
 | |
|     {
 | |
|         try {
 | |
|             $userId = $this->emailConfirmationService->checkTokenAndGetUserId($token);
 | |
|         } catch (Exception $exception) {
 | |
|             if ($exception instanceof UserTokenNotFoundException) {
 | |
|                 $this->showErrorNotification(trans('errors.email_confirmation_invalid'));
 | |
|                 return redirect('/register');
 | |
|             }
 | |
| 
 | |
|             if ($exception instanceof UserTokenExpiredException) {
 | |
|                 $user = $this->userRepo->getById($exception->userId);
 | |
|                 $this->emailConfirmationService->sendConfirmation($user);
 | |
|                 $this->showErrorNotification(trans('errors.email_confirmation_expired'));
 | |
|                 return redirect('/register/confirm');
 | |
|             }
 | |
| 
 | |
|             throw $exception;
 | |
|         }
 | |
| 
 | |
|         $user = $this->userRepo->getById($userId);
 | |
|         $user->email_confirmed = true;
 | |
|         $user->save();
 | |
| 
 | |
|         auth()->login($user);
 | |
|         $this->showSuccessNotification(trans('auth.email_confirm_success'));
 | |
|         $this->emailConfirmationService->deleteByUser($user);
 | |
| 
 | |
|         return redirect('/');
 | |
|     }
 | |
| 
 | |
| 
 | |
|     /**
 | |
|      * Resend the confirmation email
 | |
|      * @param Request $request
 | |
|      * @return View
 | |
|      */
 | |
|     public function resend(Request $request)
 | |
|     {
 | |
|         $this->validate($request, [
 | |
|             'email' => 'required|email|exists:users,email'
 | |
|         ]);
 | |
|         $user = $this->userRepo->getByEmail($request->get('email'));
 | |
| 
 | |
|         try {
 | |
|             $this->emailConfirmationService->sendConfirmation($user);
 | |
|         } catch (Exception $e) {
 | |
|             $this->showErrorNotification(trans('auth.email_confirm_send_error'));
 | |
|             return redirect('/register/confirm');
 | |
|         }
 | |
| 
 | |
|         $this->showSuccessNotification(trans('auth.email_confirm_resent'));
 | |
|         return redirect('/register/confirm');
 | |
|     }
 | |
| }
 |