Add APP_LOGGING

[bookstack] / app / Http / Middleware / Authenticate.php

diff --git a/app/Http/Middleware/Authenticate.php b/app/Http/Middleware/Authenticate.php
index 81392fe6e94a152faf290271b95554594aa0e18a..b7801668882cd5726c2adad97312228d7c14913b 100644 (file)
--- 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 Closure;
 use Illuminate\Contracts\Auth\Guard;

-use BookStack\Exceptions\UserRegistrationException;
-use Setting;

 
 class Authenticate
 {
     /**
      * The Guard implementation.
 
 class Authenticate
 {
     /**
      * The Guard implementation.

-     *

      * @var Guard
      */
     protected $auth;
 
     /**
      * Create a new filter instance.
      * @var Guard
      */
     protected $auth;
 
     /**
      * Create a new filter instance.

-     *

      * @param  Guard $auth
      */
     public function __construct(Guard $auth)
      * @param  Guard $auth
      */
     public function __construct(Guard $auth)


@@ -28,22 +24,21 @@ class Authenticate
 
     /**
      * Handle an incoming request.
 
     /**
      * Handle an incoming request.

-     *

      * @param  \Illuminate\Http\Request  $request
      * @param  \Closure  $next
      * @return mixed
      */
     public function handle($request, Closure $next)
     {
      * @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('app-public')) {
             if ($request->ajax()) {
                 return response('Unauthorized.', 401);
             } else {
         }
 
         if ($this->auth->guest() && !setting('app-public')) {
             if ($request->ajax()) {
                 return response('Unauthorized.', 401);
             } else {

-                return redirect()->guest('/login');
+                return redirect()->guest(baseUrl('/login'));

             }
         }
 
             }
         }