X-Git-Url: http://source.bookstackapp.com/bookstack/blobdiff_plain/2c3fb557d6098301f6549fae69ccb1f19d8572b8..refs/pull/665/head:/app/Http/Middleware/Authenticate.php diff --git a/app/Http/Middleware/Authenticate.php b/app/Http/Middleware/Authenticate.php index f0b2f7eda..c9b2726e8 100644 --- a/app/Http/Middleware/Authenticate.php +++ b/app/Http/Middleware/Authenticate.php @@ -1,23 +1,20 @@ auth->guest() && !Setting::get('app-public')) { + if ($this->auth->check()) { + $requireConfirmation = (setting('registration-confirmation') || setting('registration-restrict')); + if ($requireConfirmation && !$this->auth->user()->email_confirmed) { + return redirect('/register/confirm/awaiting'); + } + } + + if ($this->auth->guest() && !setting('app-public')) { if ($request->ajax()) { return response('Unauthorized.', 401); } else { - return redirect()->guest('/login'); + return redirect()->guest(baseUrl('/login')); } }