Finished refactor of entity repos

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

diff --git a/app/Http/Middleware/Authenticate.php b/app/Http/Middleware/Authenticate.php
index 599f40c84a7f61ccf9bf497d152dfb39726a0e81..b7801668882cd5726c2adad97312228d7c14913b 100644 (file)
--- a/app/Http/Middleware/Authenticate.php
+++ b/app/Http/Middleware/Authenticate.php
@@ -4,8 +4,6 @@ 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
 {
 
 class Authenticate
 {


@@ -33,14 +31,14 @@ class Authenticate
     public function handle($request, Closure $next)
     {
         if ($this->auth->check() && setting('registration-confirmation') && !$this->auth->user()->email_confirmed) {
     public function handle($request, Closure $next)
     {
         if ($this->auth->check() && setting('registration-confirmation') && !$this->auth->user()->email_confirmed) {

-            return redirect()->guest('/register/confirm/awaiting');
+            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'));

             }
         }
 
             }
         }