feat: update dependencies and refactor permission handling to use BaseCollection and replace Auth Facade usage

Author: chinfuyang

LICENSE.md

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) Hyperf
+Copyright (c) Spatie bvba [email protected]
 
 Copyright (c) Taylor Otwell
 

src/permission/composer.json

@@ -27,8 +27,13 @@
     },
     "require": {
         "php": "^8.2",
-        "hyperf/macroable": "~3.1.0",
-        "hypervel/support": "^0.2"
+        "hyperf/context": "~3.1.0",
+        "hyperf/support": "~3.1.0",
+        "hyperf/collection": "~3.1.0",
+        "hyperf/command": "~3.1.0",
+        "hyperf/cache": "~3.1.0",
+        "hyperf/database": "~3.1.0",
+        "hyperf/db-connection": "~3.1.0"
     },
     "config": {
         "sort-packages": true

src/permission/config/permission.php src/permission/publish/permission.phpsrc/permission/config/permission.php renamed to src/permission/publish/permission.php

@@ -4,6 +4,7 @@
 
 namespace Hypervel\Permission;
 
+use Hypervel\Permission\Console\ShowCommand;
 use Hypervel\Permission\Contracts\Factory;
 
 class ConfigProvider
@@ -14,6 +15,17 @@ public function __invoke(): array
             'dependencies' => [
                 Factory::class => PermissionManager::class,
             ],
+            'commands' => [
+                ShowCommand::class,
+            ],
+            'publish' => [
+                [
+                    'id' => 'config',
+                    'description' => 'The config for permission.',
+                    'source' => __DIR__ . '/../publish/permission.php',
+                    'destination' => BASE_PATH . '/config/autoload/permission.php',
+                ],
+            ],
         ];
     }
 }

src/permission/src/ConfigProvider.php

@@ -4,13 +4,15 @@
 
 namespace Hypervel\Permission\Contracts;
 
+use Hypervel\Cache\Contracts\Repository;
+
 interface Factory
 {
     public function getRoleClass();
 
     public function getPermissionClass();
 
-    public function getCache(): ?\Hypervel\Cache\Contracts\Repository;
+    public function getCache(): ?Repository;
 
     public function getOwnerRolesCacheKey(string $ownerType, int|string $ownerId): string;
 

src/permission/src/Contracts/Factory.php

@@ -11,8 +11,8 @@ class PermissionException extends HttpException
 {
     public function __construct(
         int $statusCode,
-        $message = '',
-        $code = 0,
+        string $message = '',
+        int $code = 0,
         ?Throwable $previous = null,
         protected array $headers = [],
         protected array $permissions = []

src/permission/src/Exceptions/PermissionException.php

@@ -11,8 +11,8 @@ class RoleException extends HttpException
 {
     public function __construct(
         int $statusCode,
-        $message = '',
-        $code = 0,
+        string $message = '',
+        int $code = 0,
         ?Throwable $previous = null,
         protected array $headers = [],
         protected array $roles = []

src/permission/src/Exceptions/RoleException.php

@@ -5,9 +5,11 @@
 namespace Hypervel\Permission\Middlewares;
 
 use BackedEnum;
+use Hyperf\Contract\ContainerInterface;
+use Hypervel\Auth\AuthManager;
 use Hypervel\Permission\Exceptions\PermissionException;
 use Hypervel\Permission\Exceptions\UnauthorizedException;
-use Hypervel\Support\Facades\Auth;
+use Hyperf\Collection\Collection;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Server\MiddlewareInterface;
@@ -16,12 +18,20 @@
 
 class PermissionMiddleware implements MiddlewareInterface
 {
+    /**
+     * Create a new middleware instance.
+     */
+    public function __construct(protected ContainerInterface $container)
+    {
+    }
+
     public function process(
         ServerRequestInterface $request,
         RequestHandlerInterface $handler,
         BackedEnum|int|string|UnitEnum ...$permissions
     ): ResponseInterface {
-        $user = Auth::user();
+        $auth = $this->container->get(AuthManager::class);
+        $user = $auth->user();
         if (! $user) {
             throw new UnauthorizedException(
                 401,
@@ -73,13 +83,10 @@ public static function using(array|BackedEnum|int|string|UnitEnum ...$permission
 
     public static function parsePermissionsToString(array $permissions)
     {
-        $permissions = collect($permissions)
+        $permissions = Collection::make($permissions)
             ->flatten()
             ->values()
             ->all();
-        if ($permissions instanceof BackedEnum) {
-            $permissions = $permissions->value;
-        }
 
         $permission = array_map(function ($permission) {
             return match (true) {

src/permission/src/Middlewares/PermissionMiddleware.php

@@ -5,9 +5,11 @@
 namespace Hypervel\Permission\Middlewares;
 
 use BackedEnum;
+use Hyperf\Collection\Collection;
+use Hyperf\Contract\ContainerInterface;
+use Hypervel\Auth\AuthManager;
 use Hypervel\Permission\Exceptions\RoleException;
 use Hypervel\Permission\Exceptions\UnauthorizedException;
-use Hypervel\Support\Facades\Auth;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Server\MiddlewareInterface;
@@ -16,12 +18,20 @@
 
 class RoleMiddleware implements MiddlewareInterface
 {
+    /**
+     * Create a new middleware instance.
+     */
+    public function __construct(protected ContainerInterface $container)
+    {
+    }
+
     public function process(
         ServerRequestInterface $request,
         RequestHandlerInterface $handler,
         BackedEnum|int|string|UnitEnum ...$roles
     ): ResponseInterface {
-        $user = Auth::user();
+        $auth = $this->container->get(AuthManager::class);
+        $user = $auth->user();
         if (! $user) {
             throw new UnauthorizedException(
                 401,
@@ -73,13 +83,10 @@ public static function using(array|BackedEnum|int|string|UnitEnum ...$roles): st
 
     public static function parseRolesToString(array $roles)
     {
-        $roles = collect($roles)
+        $roles = Collection::make($roles)
             ->flatten()
             ->values()
             ->all();
-        if ($roles instanceof BackedEnum) {
-            $roles = $roles->value;
-        }
 
         $role = array_map(function ($role) {
             return match (true) {

src/permission/src/Middlewares/RoleMiddleware.php

@@ -111,7 +111,7 @@ protected function getCacheStoreFromConfig(): Repository
         }
 
         // if an undefined cache store is specified, fallback to 'array' which is Laravel's closest equiv to 'none'
-        if (! \array_key_exists($cacheDriver, config('cache.stores'))) {
+        if (! array_key_exists($cacheDriver, config('cache.stores'))) {
             $cacheDriver = 'array';
         }