Fix default value configuration for public dashboard authentication

(cherry picked from commit 83782dc)
remp2020 · Jan 29, 2025 · b27eed5 · b27eed5
1 parent 91328e2
commit b27eed5
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/Beam/config/dashboard.php b/Beam/config/dashboard.php
@@ -1,9 +1,9 @@
 <?php
 
 return [
-    'username' => env('DASHBOARD_USERNAME', ''),
-    'password' => env('DASHBOARD_PASSWORD', ''),
+    'username' => env('DASHBOARD_USERNAME'),
+    'password' => env('DASHBOARD_PASSWORD'),
     // TODO temporarily support 2 passwords, remove later after authentication is done
-    'username2' => env('DASHBOARD_USERNAME2', ''),
-    'password2' => env('DASHBOARD_PASSWORD2', ''),
+    'username2' => env('DASHBOARD_USERNAME2'),
+    'password2' => env('DASHBOARD_PASSWORD2'),
 ];
diff --git a/Beam/extensions/beam-module/src/Http/Middleware/DashboardBasicAuth.php b/Beam/extensions/beam-module/src/Http/Middleware/DashboardBasicAuth.php
@@ -23,6 +23,8 @@ public function handle($request, Closure $next)
             config('dashboard.username') => config('dashboard.password'),
             config('dashboard.username2') => config('dashboard.password2'),
         ];
+        unset($credentials[null]);
+        unset($credentials['']);
 
         if (array_key_exists($request->getUser(), $credentials)
             && $credentials[$request->getUser()] === $request->getPassword()) {

diff --git a/changelogs/CHANGELOG-v3.10.md b/changelogs/CHANGELOG-v3.10.md
@@ -1,5 +1,8 @@
 ## [3.10] - 2024-10-25
 
+- [3.10.1][Beam]: Fixed default value configuration for public dashboard authentication.
+
+
 ### [Beam]
 
 - [Tracker] Fixed Tracker not publishing messages to pub/sub due to prematurely closed client. remp/remp#1384