Merge pull request #112 from qnnp-me/main

refactor(admin): 重构 401 错误处理逻辑- 在 Middleware 和 AccessControl 中移除重复的 4…

Author: walkor

src/plugin/admin/api/Middleware.php

@@ -32,14 +32,7 @@ public function process(Request $request, callable $handler): Response
                 $response = json(['code' => $code, 'msg' => $msg, 'type' => 'error']);
             } else {
                 if ($code === 401) {
-                    $response = response(<<<EOF
-<script>
-    if (self !== top) {
-        parent.location.reload();
-    }
-</script>
-EOF
-                    );
+                    $response = admin_error_401_script();
                 } else {
                     $request->app = '';
                     $request->plugin = 'admin';

src/plugin/admin/app/functions.php

@@ -5,6 +5,7 @@
 
 use plugin\admin\app\model\Admin;
 use plugin\admin\app\model\AdminRole;
+use support\Response;
 
 /**
  * 当前管理员id
@@ -84,3 +85,10 @@ function refresh_admin_session(bool $force = false)
     $session->set('admin', $admin);
 }
 
+function admin_error_401_script(): Response
+{
+  return response(<<<EOF
+<script>top.location.href = '/app/admin';</script>
+EOF
+  );
+}

src/plugin/admin/app/middleware/AccessControl.php

@@ -28,14 +28,7 @@ public function process(Request $request, callable $handler): Response
                 $response = json(['code' => $code, 'msg' => $msg, 'data' => []]);
             } else {
                 if ($code === 401) {
-                    $response = response(<<<EOF
-<script>
-    if (self !== top) {
-        parent.location.reload();
-    }
-</script>
-EOF
-                    );
+                  $response = admin_error_401_script();
                 } else {
                     $request->app = '';
                     $request->plugin = 'admin';