X-Git-Url: http://source.bookstackapp.com/bookstack/blobdiff_plain/88049476fe496de3a3b767a4305d985f78a96db8..refs/pull/261/head:/app/Http/Middleware/Authenticate.php diff --git a/app/Http/Middleware/Authenticate.php b/app/Http/Middleware/Authenticate.php index ebd830ffe..b78016688 100644 --- a/app/Http/Middleware/Authenticate.php +++ b/app/Http/Middleware/Authenticate.php @@ -4,21 +4,17 @@ namespace BookStack\Http\Middleware; use Closure; use Illuminate\Contracts\Auth\Guard; -use BookStack\Exceptions\UserRegistrationException; -use Setting; class Authenticate { /** * The Guard implementation. - * * @var Guard */ protected $auth; /** * Create a new filter instance. - * * @param Guard $auth */ public function __construct(Guard $auth) @@ -28,21 +24,21 @@ class Authenticate /** * Handle an incoming request. - * * @param \Illuminate\Http\Request $request * @param \Closure $next * @return mixed */ public function handle($request, Closure $next) { - if(auth()->check() && auth()->user()->email_confirmed == false) { - return redirect()->guest('/register/confirm/awaiting'); + if ($this->auth->check() && setting('registration-confirmation') && !$this->auth->user()->email_confirmed) { + return redirect(baseUrl('/register/confirm/awaiting')); } - if ($this->auth->guest() && !Setting::get('app-public')) { + + if ($this->auth->guest() && !setting('app-public')) { if ($request->ajax()) { return response('Unauthorized.', 401); } else { - return redirect()->guest('/login'); + return redirect()->guest(baseUrl('/login')); } }