Middleware: support enums in role/permission middleware

src/Middleware/PermissionMiddleware.php

@@ -28,9 +28,7 @@ public function handle($request, Closure $next, $permission, $guard = null)
             throw UnauthorizedException::missingTraitHasRoles($user);
         }
 
-        $permissions = is_array($permission)
-            ? $permission
-            : explode('|', $permission);
+        $permissions = explode('|', self::parsePermissionsToString($permission));
 
         if (! $user->canAny($permissions)) {
             throw UnauthorizedException::forPermissions($permissions);
@@ -53,16 +51,31 @@ public static function using($permission, $guard = null)
             $permission = $permission->value;
         }
 
-        // Convert array of permissions (including Enum values) to a string
-        if (is_array($permission)) {
-            $permission = array_map(fn ($p) => $p instanceof \BackedEnum ? $p->value : $p, $permission);
-            $permissionString = implode('|', $permission);
-        } else {
-            $permissionString = (string) $permission;
-        }
+        $permissionString = self::parsePermissionsToString($permission);
 
         $args = is_null($guard) ? $permissionString : "$permissionString,$guard";
 
         return static::class.':'.$args;
     }
+
+    /**
+     * Convert array or string of permissions to string representation.
+     *
+     * @return string
+     */
+    protected static function parsePermissionsToString(array|string|\BackedEnum $permission)
+    {
+        // Convert Enum to its value if an Enum is passed
+        if ($permission instanceof \BackedEnum) {
+            $permission = $permission->value;
+        }
+
+        if (is_array($permission)) {
+            $permission = array_map(fn ($r) => $r instanceof \BackedEnum ? $r->value : $r, $permission);
+
+            return implode('|', $permission);
+        }
+
+        return (string) $permission;
+    }
 }

src/Middleware/RoleMiddleware.php

@@ -28,9 +28,7 @@ public function handle($request, Closure $next, $role, $guard = null)
             throw UnauthorizedException::missingTraitHasRoles($user);
         }
 
-        $roles = is_array($role)
-            ? $role
-            : explode('|', $role);
+        $roles = explode('|', self::parseRolesToString($role));
 
         if (! $user->hasAnyRole($roles)) {
             throw UnauthorizedException::forRoles($roles);
@@ -47,6 +45,20 @@ public function handle($request, Closure $next, $role, $guard = null)
      * @return string
      */
     public static function using($role, $guard = null)
+    {
+        $roleString = self::parseRolesToString($role);
+
+        $args = is_null($guard) ? $roleString : "$roleString,$guard";
+
+        return static::class.':'.$args;
+    }
+
+    /**
+     * Convert array or string of roles to string representation.
+     *
+     * @return string
+     */
+    protected static function parseRolesToString(array|string|\BackedEnum $role)
     {
         // Convert Enum to its value if an Enum is passed
         if ($role instanceof \BackedEnum) {
@@ -55,13 +67,10 @@ public static function using($role, $guard = null)
 
         if (is_array($role)) {
             $role = array_map(fn ($r) => $r instanceof \BackedEnum ? $r->value : $r, $role);
-            $roleString = implode('|', $role);
-        } else {
-            $roleString = (string) $role;
+
+            return implode('|', $role);
         }
-
-        $args = is_null($guard) ? $roleString : "$roleString,$guard";
 
-        return static::class.':'.$args;
+        return (string) $role;
     }
 }

tests/PermissionMiddlewareTest.php

@@ -467,6 +467,9 @@ public function the_middleware_can_handle_enum_based_permissions_with_static_usi
     #[Test]
     public function the_middleware_can_handle_enum_based_permissions_with_handle_method()
     {
+        app(Permission::class)->create(['name' => TestModels\TestRolePermissionsEnum::VIEWARTICLES]);
+        app(Permission::class)->create(['name' => TestModels\TestRolePermissionsEnum::EDITARTICLES]);
+
         Auth::login($this->testUser);
         $this->testUser->givePermissionTo(TestModels\TestRolePermissionsEnum::VIEWARTICLES);