Fixed local_secure_restricted preventing attachment uploads

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

diff --git a/app/Http/Middleware/Authenticate.php b/app/Http/Middleware/Authenticate.php
index d840a9b2e05477c8fca1550dad9e9e81adaa8c2c..a320291122b6f632b0bc36a8e96d15e42472a5f8 100644 (file)
--- a/app/Http/Middleware/Authenticate.php
+++ b/app/Http/Middleware/Authenticate.php
@@ -3,46 +3,21 @@
 namespace BookStack\Http\Middleware;
 
 use Closure;
 namespace BookStack\Http\Middleware;
 
 use Closure;

-use Illuminate\Contracts\Auth\Guard;
+use Illuminate\Http\Request;

 
 class Authenticate
 {
 
 class Authenticate
 {

-    /**
-     * The Guard implementation.
-     * @var Guard
-     */
-    protected $auth;
-
-    /**
-     * Create a new filter instance.
-     * @param  Guard $auth
-     */
-    public function __construct(Guard $auth)
-    {
-        $this->auth = $auth;
-    }
-

     /**
      * Handle an incoming request.
     /**
      * Handle an incoming request.

-     * @param  \Illuminate\Http\Request  $request
-     * @param  \Closure  $next
-     * @return mixed

      */
      */

-    public function handle($request, Closure $next)
+    public function handle(Request $request, Closure $next)

     {
     {

-        if ($this->auth->check()) {
-            $requireConfirmation = (setting('registration-confirmation') || setting('registration-restrict'));
-            if ($requireConfirmation && !$this->auth->user()->email_confirmed) {
-                return redirect('/register/confirm/awaiting');
-            }
-        }
-

         if (!hasAppAccess()) {
             if ($request->ajax()) {
                 return response('Unauthorized.', 401);
         if (!hasAppAccess()) {
             if ($request->ajax()) {
                 return response('Unauthorized.', 401);

-            } else {
-                return redirect()->guest(url('/login'));

             }
             }

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

         }
 
         return $next($request);
         }
 
         return $next($request);