wip

Author: nasrulhazim

config/laravel-expiry.php

@@ -0,0 +1,16 @@
+<?php
+
+use CleaniqueCoders\LaravelExpiry\Events\ExpiredAccount;
+use CleaniqueCoders\LaravelExpiry\Events\ExpiredPassword;
+use CleaniqueCoders\LaravelExpiry\Listeners\LogoutOnExpired;
+
+return [
+    'events' => [
+        ExpiredAccount::class => [
+            LogoutOnExpired::class,
+        ],
+        ExpiredPassword::class => [
+            LogoutOnExpired::class,
+        ],
+    ],
+];

database/migrations/2020_03_27_000000_add_expiry_columns.php renamed to database/migrations/add_expiry_columns.php.stub

@@ -4,7 +4,7 @@
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-class AddExpiryColumns extends Migration
+return new class extends Migration
 {
     /**
      * Run the migrations.
@@ -27,4 +27,4 @@ public function down()
             $table->dropColumn('account_expired_at');
         });
     }
-}
+};

phpunit.xml

@@ -11,6 +11,8 @@
     <env name="SESSION_DRIVER" value="array"/>
     <env name="QUEUE_DRIVER" value="sync"/>
     <env name="APP_KEY" value="base64:BQ5eDl9HCEwtIe+tozAZuDN8XLadbq84WUAGnpCcD6g="/>
+    <env name="DB_CONNECTION" value="sqlite"/>
+    <env name="DB_DATABASE" value=":memory:"/>
   </php>
   <source>
     <include>

src/Exceptions/ExpiredAccountException.php

@@ -18,9 +18,6 @@ public function handle($request, Closure $next)
             event(
                 new \CleaniqueCoders\LaravelExpiry\Events\ExpiredAccount(auth()->user())
             );
-            auth()->logout();
-
-            throw new \CleaniqueCoders\LaravelExpiry\Exceptions\ExpiredAccountException;
         }
 
         return $next($request);

src/Exceptions/ExpiredPasswordException.php

@@ -18,9 +18,6 @@ public function handle($request, Closure $next)
             event(
                 new \CleaniqueCoders\LaravelExpiry\Events\ExpiredPassword(auth()->user())
             );
-            auth()->logout();
-
-            throw new \CleaniqueCoders\LaravelExpiry\Exceptions\ExpiredPasswordException;
         }
 
         return $next($request);

src/Http/Middleware/AccountExpiry.php

@@ -2,15 +2,28 @@
 
 namespace CleaniqueCoders\LaravelExpiry;
 
-use Spatie\LaravelPackageTools\PackageServiceProvider;
+use Illuminate\Support\Facades\Event;
 use Spatie\LaravelPackageTools\Package;
+use Spatie\LaravelPackageTools\PackageServiceProvider;
 
 class LaravelExpiryServiceProvider extends PackageServiceProvider
 {
     public function configurePackage(Package $package): void
     {
         $package
             ->name('laravel-expiry')
-            ->hasMigration('add_expiry_columns');
+            ->hasMigration('add_expiry_columns')
+            ->hasConfigFile('laravel-expiry');
+    }
+
+    public function packageRegistered()
+    {
+        $events = config('laravel-expiry.events');
+
+        foreach ($events as $event => $listeners) {
+            foreach ($listeners as $listener) {
+                Event::listen($event, $listener);
+            }
+        }
     }
 }

src/Http/Middleware/PasswordExpiry.php

@@ -0,0 +1,26 @@
+<?php
+
+namespace CleaniqueCoders\LaravelExpiry\Listeners;
+
+use CleaniqueCoders\LaravelExpiry\Events\ExpiredAccount;
+use CleaniqueCoders\LaravelExpiry\Events\ExpiredPassword;
+use Illuminate\Support\Facades\Auth;
+
+class LogoutOnExpired
+{
+    /**
+     * Create the event listener.
+     */
+    public function __construct()
+    {
+        //
+    }
+
+    /**
+     * Handle the event.
+     */
+    public function handle(ExpiredAccount|ExpiredPassword $event): void
+    {
+        Auth::logout();
+    }
+}

src/LaravelExpiryServiceProvider.php

@@ -0,0 +1,5 @@
+<?php
+
+it('will not use debugging functions')
+    ->expect(['dd', 'dump', 'ray'])
+    ->not->toBeUsed();

src/Listeners/LogoutOnExpired.php

@@ -0,0 +1,5 @@
+<?php
+
+use CleaniqueCoders\LaravelExpiry\Tests\TestCase;
+
+uses(TestCase::class)->in(__DIR__);

tests/ArchTest.php

@@ -2,20 +2,33 @@
 
 namespace CleaniqueCoders\LaravelExpiry\Tests;
 
-class TestCase extends \Orchestra\Testbench\TestCase
+use CleaniqueCoders\LaravelExpiry\LaravelExpiryServiceProvider;
+use Illuminate\Database\Eloquent\Factories\Factory;
+use Orchestra\Testbench\TestCase as Orchestra;
+
+class TestCase extends Orchestra
 {
-    use Traits\TestCaseTrait;
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        Factory::guessFactoryNamesUsing(
+            fn (string $modelName) => 'Workbench\\Database\\Factories\\'.class_basename($modelName).'Factory'
+        );
+    }
 
-    /**
-     * Load Package Service Provider.
-     *
-     * @param  \Illuminate\Foundation\Application  $app
-     * @return array List of Service Provider
-     */
     protected function getPackageProviders($app)
     {
         return [
-            \CleaniqueCoders\LaravelExpiry\LaravelExpiryServiceProvider::class,
+            LaravelExpiryServiceProvider::class,
         ];
     }
+
+    public function getEnvironmentSetUp($app)
+    {
+        config()->set('database.default', 'testing');
+
+        // $migration = include __DIR__.'/../database/migrations/add_expiry_columns.php.stub';
+        // $migration->up();
+    }
 }