<?php
-namespace Oxbow\Http\Middleware;
+namespace BookStack\Http\Middleware;
use Closure;
use Illuminate\Contracts\Auth\Guard;
-use Oxbow\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)
/**
* 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'));
}
}