wip

Author: tomschlick

.github/workflows/run-tests.yml

@@ -14,11 +14,13 @@ jobs:
       matrix:
         os: [ubuntu-latest]
         php: [8.0, 8.1]
-        laravel: [8.*]
+        laravel: [8.*, 9.*]
         stability: [prefer-stable]
         include:
           - laravel: 8.*
             testbench: ^6.6
+          - laravel: 9.*
+            testbench: ^7.3
 
     name: PHP ${{ matrix.php }} - Laravel ${{ matrix.laravel }}
 
@@ -44,4 +46,4 @@ jobs:
           composer update --${{ matrix.stability }} --prefer-dist --no-interaction
 
       - name: Execute tests
-        run: vendor/bin/pest
+        run: vendor/bin/phpunit

.php_cs.dist.php

@@ -13,6 +13,9 @@
 return (new PhpCsFixer\Config())
     ->setRules([
         '@PSR12' => true,
+        '@PHP80Migration' => true,
+        '@PHP80Migration:risky' => true,
+        'declare_strict_types' => true,
         'array_syntax' => ['syntax' => 'short'],
         'ordered_imports' => ['sort_algorithm' => 'alpha'],
         'no_unused_imports' => true,

composer.json

@@ -17,15 +17,12 @@
     "require": {
         "php": "^8.0",
         "spatie/laravel-package-tools": "^1.4.3",
-        "illuminate/contracts": "^8.37"
+        "illuminate/contracts": ">=8.37"
     },
     "require-dev": {
-        "nunomaduro/collision": "^5.3",
-        "orchestra/testbench": "^6.15",
-        "pestphp/pest": "^1.18",
-        "pestphp/pest-plugin-laravel": "^1.1",
-        "spatie/laravel-ray": "^1.23",
-        "vimeo/psalm": "^4.8"
+        "nunomaduro/collision": "^6.0",
+        "orchestra/testbench": "^7.0",
+        "phpunit/phpunit": "^9.5"
     },
     "autoload": {
         "psr-4": {
@@ -38,7 +35,7 @@
         }
     },
     "scripts": {
-        "test": "./vendor/bin/pest --no-coverage",
+        "test": "./vendor/bin/phpunit --no-coverage",
         "test-coverage": "vendor/bin/phpunit --coverage-html coverage"
     },
     "config": {

config/auth-notifications.php

@@ -2,28 +2,73 @@
 
 use AlwaysOpen\AuthNotifications\Events\LoginWasChanged;
 use AlwaysOpen\AuthNotifications\Events\PasswordWasChanged;
+use AlwaysOpen\AuthNotifications\Events\TwoFactorWasDisabled;
 use AlwaysOpen\AuthNotifications\Events\TwoFactorWasEnabled;
+use AlwaysOpen\AuthNotifications\Notifications\Credentials\LoginChanged;
+use AlwaysOpen\AuthNotifications\Notifications\Credentials\PasswordChanged;
+use AlwaysOpen\AuthNotifications\Notifications\Credentials\TwoFactorDisabled;
+use AlwaysOpen\AuthNotifications\Notifications\Credentials\TwoFactorEnabled;
+use AlwaysOpen\AuthNotifications\Notifications\Login\Failed as LoginFailed;
+use AlwaysOpen\AuthNotifications\Notifications\Login\Lockout as LoginLockout;
+use AlwaysOpen\AuthNotifications\Notifications\Login\Validated as LoginValidated;
+use App\Models\User;
 use Illuminate\Auth\Events\Failed;
 use Illuminate\Auth\Events\Lockout;
 use Illuminate\Auth\Events\Validated;
 
 return [
+    'user_model' => env('AUTH_NOTIFICATIONS_USER_MODEL', User::class),
+
     'listen_to' => [
         // Laravel Auth Events
 
         // When the user's credentials are accepted at login
-        Validated::class,
+        'login_validated' => [
+            'event' => Validated::class,
+            'enabled' => env('AUTH_NOTIFICATIONS_LOGIN_VALIDATED', false),
+            'notification' => LoginValidated::class,
+            'guards' => ['web'],
+        ],
 
         // When the user's credentials are rejected at login
-        Failed::class,
+        'login_failed' => [
+            'event' => Failed::class,
+            'enabled' => env('AUTH_NOTIFICATIONS_LOGIN_FAILED', false),
+            'notification' => LoginFailed::class,
+            'guards' => ['web'],
+        ],
 
         // When the user is locked out for too many login attempts
-        Lockout::class,
+        'login_lockout' => [
+            'event' => Lockout::class,
+            'enabled' => env('AUTH_NOTIFICATIONS_LOGIN_LOCKOUT', false),
+            'notification' => LoginLockout::class,
+        ],
 
         // Laravel Auth Notifications Custom Events
-        LoginWasChanged::class,
-        PasswordWasChanged::class,
-        TwoFactorWasEnabled::class,
-        TwoFactorWasEnabled::class,
+        'login_changed' => [
+            'event' => LoginWasChanged::class,
+            'enabled' => env('AUTH_NOTIFICATIONS_CREDENTIALS_LOGINCHANGED', false),
+            'notification' => LoginChanged::class,
+            'field' => 'email',
+        ],
+        'password_changed' => [
+            'event' => PasswordWasChanged::class,
+            'enabled' => env('AUTH_NOTIFICATIONS_CREDENTIALS_PASSWORDCHANGED', false),
+            'notification' => PasswordChanged::class,
+            'field' => 'password',
+        ],
+        'twofactor_enabled' => [
+            'event' => TwoFactorWasEnabled::class,
+            'enabled' => env('AUTH_NOTIFICATIONS_CREDENTIALS_TWOFACTORENABLED', false),
+            'notification' => TwoFactorEnabled::class,
+            'field' => 'two_factor_secret',
+        ],
+        'twofactor_disabled' => [
+            'event' => TwoFactorWasDisabled::class,
+            'enabled' => env('AUTH_NOTIFICATIONS_CREDENTIALS_TWOFACTORDISABLED', false),
+            'notification' => TwoFactorDisabled::class,
+            'field' => 'two_factor_secret',
+        ],
     ],
 ];