Revert "Merge remote-tracking branch 'origin/master' into dev/hashed-password"

This reverts commit 5341ffc, reversing
changes made to eaa27c9.

Author: olssonm

README.md

@@ -155,6 +155,17 @@ Route::get('/', [
 
 *Note:* inline credentials always take president over the `very_basic_auth.php`-configuration file.
 
+### Generating hash for password
+
+If you want to generate a hash for your password, you can use the `artisan`-command:
+
+``` bash
+php artisan very-basic-auth:generate-password
+```
+
+It will ask you for a password, and then automatically insert the hash into your `.env`-file
+
+
 ## Testing
 
 ``` bash

composer.json

@@ -19,6 +19,7 @@
     "require": {
         "php": "^8.0 || ^8.1 || ^8.2",
         "illuminate/support": "^9.0 || ^10.0 || ^11.0 || ^12.0",
+        "laravel/prompts": "^0.3.5",
         "squizlabs/php_codesniffer": "^3.5"
     },
     "require-dev": {

src/Http/Middleware/VeryBasicAuth.php

@@ -5,6 +5,7 @@
 use Closure;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Hash;
 use Olssonm\VeryBasicAuth\Handlers\ResponseHandler;
 use Symfony\Component\HttpFoundation\Response;
 
@@ -20,15 +21,15 @@ public function __construct(ResponseHandler $responseHandler)
     /**
      * Handle an incoming request
      *
-     * @param  mixed  $username
-     * @param  mixed  $password
+     * @param mixed $username
+     * @param mixed $password
      */
     public function handle(Request $request, Closure $next, $username = null, $password = null): Response
     {
         $active = (count(array_intersect([
-            '*',
-            app()->environment(),
-        ], config('very_basic_auth.envs'))) > 0);
+                '*',
+                app()->environment(),
+            ], config('very_basic_auth.envs'))) > 0);
 
         // Check if middleware is in use in current environment
         if ($active) {

src/VeryBasicAuthServiceProvider.php

@@ -3,6 +3,7 @@
 namespace Olssonm\VeryBasicAuth;
 
 use Illuminate\Support\ServiceProvider;
+use Olssonm\VeryBasicAuth\Console\PasswordGenerateCommand;
 use Olssonm\VeryBasicAuth\Handlers\DefaultResponseHandler;
 use Olssonm\VeryBasicAuth\Handlers\ResponseHandler;
 
@@ -25,7 +26,7 @@ class VeryBasicAuthServiceProvider extends ServiceProvider
     /**
      * Constructor
      *
-     * @param  \Illuminate\Contracts\Foundation\Application  $app
+     * @param \Illuminate\Contracts\Foundation\Application $app
      * @return void
      */
     public function __construct($app)
@@ -52,6 +53,13 @@ public function boot(\Illuminate\Routing\Router $router)
 
         // Register middleware
         $router->aliasMiddleware('auth.very_basic', \Olssonm\VeryBasicAuth\Http\Middleware\VeryBasicAuth::class);
+
+        // Register commands
+        if ($this->app->runningInConsole()) {
+            $this->commands([
+                PasswordGenerateCommand::class,
+            ]);
+        }
     }
 
     /**

tests/VeryBasicAuthTest.php

@@ -55,6 +55,19 @@
     expect($response->getContent())->toEqual(config('very_basic_auth.error_message'));
 });
 
+test('request with incorrect credentials fails - hashed password', function () {
+
+    config()->set('very_basic_auth.user', 'test');
+    config()->set('very_basic_auth.password', app()->make('hash')->make('test'));
+
+    $response = withHeaders([
+        'PHP_AUTH_USER' => str_random(20),
+        'PHP_AUTH_PW' => str_random(20),
+    ])->get('/');
+
+    expect($response->getStatusCode())->toEqual(401);
+});
+
 test('request with incorrect credentials fails - json', function () {
     $response = withHeaders([
         'PHP_AUTH_USER' => str_random(20),
@@ -96,6 +109,19 @@
     expect($response->getContent())->toEqual('ok');
 });
 
+test('request with correct credentials passes - hashed password', function () {
+    config()->set('very_basic_auth.user', 'test');
+    config()->set('very_basic_auth.password', app()->make('hash')->make('test'));
+
+    $response = withHeaders([
+        'PHP_AUTH_USER' => 'test',
+        'PHP_AUTH_PW' => 'test',
+    ])->get('/');
+
+    expect($response->getStatusCode())->toEqual(200);
+    expect($response->getContent())->toEqual('ok');
+});
+
 test('environments', function () {
     config()->set('very_basic_auth.envs', ['production']);
     get('/')->assertStatus(200);