Browse Source

init saas support username

peterguo 2 months ago
parent
commit
2d738af369
1 changed files with 9 additions and 4 deletions
  1. 9 4
      app/Http/Middleware/GetTenancyByUsername.php

+ 9 - 4
app/Http/Middleware/GetTenancyByUsername.php

@@ -16,16 +16,21 @@ class GetTenancyByUsername
      */
     public function handle(Request $request, Closure $next): Response
     {
-        if ($request->has('username') && $request->input('username')
-            && !$request->has('X-Tenant')) {
-            $username = $request->input('username');
+        $username = $request->input('username');
+
+        if (!$username) {
+            $username = $request->header('X-Username');
+        }
+
+        if ($username && !$request->hasHeader('X-Tenant')) {
             $user = GlobalUser::where('username', $username)->first();
             if ($user) {
-                // 将租户 ID 添加到请求头 X-Tenant
+                // 将租户 ID 添加到请求头 X-Tenant,交给 InitializeTenancyByRequestData::class 处理
                 $request->headers->set('X-Tenant', $user->tenant_id);
             }
         }
 
         return $next($request);
     }
+
 }