Added test to cover export body start/end partial usage

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

diff --git a/app/Http/Middleware/Authenticate.php b/app/Http/Middleware/Authenticate.php
index df8c44d351cc92784bc8adaec1f642ea0c1719a0..a320291122b6f632b0bc36a8e96d15e42472a5f8 100644 (file)
--- a/app/Http/Middleware/Authenticate.php
+++ b/app/Http/Middleware/Authenticate.php
@@ -7,47 +7,19 @@ use Illuminate\Http\Request;
 
 class Authenticate
 {
 
 class Authenticate
 {

-    use ChecksForEmailConfirmation;
-

     /**
      * Handle an incoming request.
      */
     public function handle(Request $request, Closure $next)
     {
     /**
      * Handle an incoming request.
      */
     public function handle(Request $request, Closure $next)
     {

-        if ($this->awaitingEmailConfirmation()) {
-            return $this->emailConfirmationErrorResponse($request);
-        }
-

         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 $next($request);
-    }

 
 

-    /**
-     * Provide an error response for when the current user's email is not confirmed
-     * in a system which requires it.
-     */
-    protected function emailConfirmationErrorResponse(Request $request)
-    {
-        if ($request->wantsJson()) {
-            return response()->json([
-                'error' => [
-                    'code' => 401,
-                    'message' => trans('errors.email_confirmation_awaiting')
-                ]
-            ], 401);
+            return redirect()->guest(url('/login'));

         }
 
         }
 

-        if (session()->get('sent-email-confirmation') === true) {
-            return redirect('/register/confirm');
-        }
-
-        return redirect('/register/confirm/awaiting');
+        return $next($request);

     }
 }
     }
 }