Refactor BasicAuth Lib

Author: HungNA - Technical Manager

config/config.php

@@ -1,7 +1,7 @@
 <?php
 
 return [
-    'enabled' => env('ENABLED_BASIC_AUTH', true), // Default is true
+    'enabled' => env('ENABLED_BASIC_AUTH', false), // Default is true
     'in_production' => env('ENABLED_BASIC_AUTH_IN_PRODUCTION', false), // Default is false
     'username' => env('BASIC_AUTH_USERNAME', 'hungna'),
     'password' => env('BASIC_AUTH_PASSWORD', 'HungNA@Password@2024'),

src/LaravelBasicAuthServiceProvider.php

@@ -13,12 +13,9 @@ class LaravelBasicAuthServiceProvider extends ServiceProvider
      */
     public function boot()
     {
-        $this->publishes([
-            __DIR__ . '/../config/config.php' => config_path('laravel-basic-auth.php'),
-        ]);
-
         $this->mergeConfigFrom(
-            __DIR__ . '/../config/config.php', 'laravel-basic-auth'
+            __DIR__ . '/../config/config.php',
+            'laravel-basic-auth'
         );
     }
 

src/Middleware/BasicAuth.php

@@ -10,10 +10,11 @@
 
 class BasicAuth
 {
-    protected array $defaultWhitelist = [
+    protected $forceEnabled = false;
+    protected $defaultWhitelist = [
         '127.0.0.1',
     ];
-    protected array $defaultEnvUseBasicAuth = [
+    protected $defaultEnvUseBasicAuth = [
         'beta',
         'staging',
         'test',
@@ -28,7 +29,7 @@ class BasicAuth
      */
     protected function promptForBasicAuthCredentials(Request $request)
     {
-        Log::info('BasicAuthCredentials::Failed', [
+        Log::info('Laravel::BasicAuthCredentials::Failed', [
             'request_ip' => $request->ip() ?? null,
             'request_method' => $request->method() ?? '',
             'request_full_url' => $request->fullUrl() ?? '',
@@ -54,7 +55,9 @@ public function handle(Request $request, Closure $next)
         $envUseBasicAuth = $this->defaultEnvUseBasicAuth;
         $appENV = config('app.env');
         $isEnabled = config('laravel-basic-auth.enabled');
-
+        if ($this->forceEnabled === true) {
+            $isEnabled = $this->forceEnabled;
+        }
         // Enable basic authentication for Production environments
         $isEnabledInProduction = config('laravel-basic-auth.in_production');
         if ($isEnabled === true && $isEnabledInProduction === true) {