webapp/bookstack
1
0
Fork 0
mirror of https://github.com/BookStackApp/BookStack.git synced 2025-07-31 15:24:31 +03:00
Code Activity

Fixed required email confirmation with domain restriction

Browse Source 
Added test to cover scenario.

Closes #573
This commit is contained in:
Dan Brown
2017-11-11 18:09:48 +00:00
parent 08e58bab79
commit d89440d198
3 changed files with 45 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/Http/Middleware/Authenticate.php
View File

@ -30,8 +30,11 @@ class Authenticate
*/
public function handle($request, Closure $next)
{
if ($this->auth->check() && setting('registration-confirmation') && !$this->auth->user()->email_confirmed) {
return redirect(baseUrl('/register/confirm/awaiting'));
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')) {