jqh 5 yıl önce
ebeveyn
işleme
c5400a0c3e

+ 2 - 0
config/admin.php

@@ -119,6 +119,8 @@ return [
 
         'controller' => Dcat\Admin\Controllers\AuthController::class,
 
+        'login_view' => 'admin::login',
+
         'guard' => 'admin',
 
         'guards' => [

+ 5 - 5
src/Admin.php

@@ -288,11 +288,11 @@ class Admin
             if ($enableAuth) {
                 $authController = config('admin.auth.controller', AuthController::class);
 
-                $router->get('auth/login', $authController . '@getLogin');
-                $router->post('auth/login', $authController . '@postLogin');
-                $router->get('auth/logout', $authController . '@getLogout');
-                $router->get('auth/setting', $authController . '@getSetting');
-                $router->put('auth/setting', $authController . '@putSetting');
+                $router->get('auth/login', $authController.'@getLogin');
+                $router->post('auth/login', $authController.'@postLogin');
+                $router->get('auth/logout', $authController.'@getLogout');
+                $router->get('auth/setting', $authController.'@getSetting');
+                $router->put('auth/setting', $authController.'@putSetting');
             }
         });
 

+ 1 - 1
src/Controllers/AuthController.php

@@ -31,7 +31,7 @@ class AuthController extends Controller
             return redirect($this->redirectPath());
         }
 
-        return view(config('admin.login_view') ?: 'admin::login');
+        return view(config('admin.auth.login_view') ?: 'admin::login');
     }
 
     /**

+ 2 - 7
src/Middleware/Authenticate.php

@@ -33,16 +33,11 @@ class Authenticate
             return response()->json(['message' => 'Unauthorized.', 'login' => $loginPage], 401);
         }
 
-        $response = redirect()->guest($loginPage);
-
         if ($request->pjax()) {
-            $response->headers->remove('Location');
-            $response->setStatusCode(200);
-
-            return $response->setContent("<script>location.href = '$loginPage';</script>");
+            return response("<script>location.href = '$loginPage';</script>");
         }
 
-        return $response;
+        return redirect()->guest($loginPage);
     }
 
     /**