Ensure {{ user:is }} and {{ user:isnt }} work with roles fieldtype

ryanmitchell · Nov 21, 2023 · f57d12c · f57d12c
1 parent 2dbbb0f
commit f57d12c
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 4 deletions.
diff --git a/src/Auth/UserTags.php b/src/Auth/UserTags.php
@@ -2,6 +2,7 @@
 
 namespace Statamic\Auth;
 
+use Illuminate\Support\Collection;
 use Statamic\Facades\URL;
 use Statamic\Facades\User;
 use Statamic\Fields\Field;
@@ -505,7 +506,11 @@ public function is()
             return $this->parser ? null : false;
         }
 
-        $roles = Arr::wrap($this->params->explode(['role', 'roles']));
+        $roles = $this->params->get(['role', 'roles']);
+
+        if (! $roles instanceof Collection) {
+            $roles = Arr::wrap($this->params->explode(['role', 'roles']));
+        }
 
         foreach ($roles as $role) {
             if ($user->hasRole($role)) {
@@ -529,7 +534,11 @@ public function isnt()
             return $this->parser ? $this->parse() : true;
         }
 
-        $roles = Arr::wrap($this->params->explode(['roles', 'role']));
+        $roles = $this->params->get(['role', 'roles']);
+
+        if (! $roles instanceof Collection) {
+            $roles = Arr::wrap($this->params->explode(['roles', 'role']));
+        }
 
         $is = false;
 

diff --git a/tests/Tags/User/UserTagsTest.php b/tests/Tags/User/UserTagsTest.php
@@ -4,6 +4,7 @@
 
 use Illuminate\Http\Exceptions\HttpResponseException;
 use Statamic\Facades\Parse;
+use Statamic\Facades\Role;
 use Statamic\Facades\User;
 use Tests\FakesRoles;
 use Tests\FakesUserGroups;
@@ -16,9 +17,9 @@ class UserTagsTest extends TestCase
         FakesUserGroups,
         PreventSavingStacheItemsToDisk;
 
-    private function tag($tag)
+    private function tag($tag, $params = [])
     {
-        return Parse::template($tag, []);
+        return Parse::template($tag, $params);
     }
 
     /** @test */
@@ -68,6 +69,10 @@ public function it_renders_user_is_tag_content()
         // Test if user is assigned any of these roles
         $this->assertEquals('yes', $this->tag('{{ user:is role="webmaster|admin" }}yes{{ /user:is }}'));
         $this->assertEquals('', $this->tag('{{ user:isnt role="webmaster|admin" }}yes{{ /user:isnt }}'));
+
+        // test if it handles the value of a user_roles tag
+        $this->assertEquals('yes', $this->tag('{{ user:is :roles="roles" }}yes{{ /user:is }}', ['roles' => Role::all()]));
+        $this->assertEquals('', $this->tag('{{ user:isnt :roles="roles" }}yes{{ /user:isnt }}', ['roles' => Role::all()]));
     }
 
     /** @test */