From 8b5cd1127de0fbb884a111b323697597979158e7 Mon Sep 17 00:00:00 2001 From: Mehmet Faruk Demirkoparan Date: Tue, 4 Nov 2025 16:00:13 +0300 Subject: [PATCH 1/2] - general updates --- src/AAuthServiceProvider.php | 5 +++++ src/Traits/AAuthUser.php | 18 ++++++++++++++++++ 2 files changed, 23 insertions(+) diff --git a/src/AAuthServiceProvider.php b/src/AAuthServiceProvider.php index 97e6f41..5b24842 100644 --- a/src/AAuthServiceProvider.php +++ b/src/AAuthServiceProvider.php @@ -5,6 +5,7 @@ use AuroraWebSoftware\AAuth\Commands\AAuthCommand; use Illuminate\Support\Facades\Auth; use Illuminate\Support\Facades\Blade; +use Illuminate\Support\Facades\Gate; use Illuminate\Support\Facades\Session; use Spatie\LaravelPackageTools\Package; use Spatie\LaravelPackageTools\PackageServiceProvider; @@ -52,6 +53,10 @@ public function boot(): void ); }); + Gate::before(function ($user, $ability, $arguments = []) { + return app('aauth')->can($ability) ?: null; + }); + Blade::directive('aauth', function ($permission) { return ""; }); diff --git a/src/Traits/AAuthUser.php b/src/Traits/AAuthUser.php index 28f457a..eb35f66 100644 --- a/src/Traits/AAuthUser.php +++ b/src/Traits/AAuthUser.php @@ -71,4 +71,22 @@ public function getDeletableAttribute(): bool // todo new syntax return $this->getAssignedUserCountAttribute() == 0; } + + public function can($abilities, $arguments = []): bool + { + if (is_string($abilities)) { + return app('aauth')->can($abilities); + } + + if (is_array($abilities)) { + foreach ($abilities as $ability) { + if (!app('aauth')->can($ability)) { + return false; + } + } + return true; + } + + return parent::can($abilities, $arguments); + } } From 5af91db99b8217773ebbda00771527c32493b629 Mon Sep 17 00:00:00 2001 From: MFarukDemirkoparan <83613682+MFarukDemirkoparan@users.noreply.github.com> Date: Tue, 4 Nov 2025 13:00:30 +0000 Subject: [PATCH 2/2] Fix styling --- src/Traits/AAuthUser.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Traits/AAuthUser.php b/src/Traits/AAuthUser.php index eb35f66..5d0fda7 100644 --- a/src/Traits/AAuthUser.php +++ b/src/Traits/AAuthUser.php @@ -80,10 +80,11 @@ public function can($abilities, $arguments = []): bool if (is_array($abilities)) { foreach ($abilities as $ability) { - if (!app('aauth')->can($ability)) { + if (! app('aauth')->can($ability)) { return false; } } + return true; }