Added permission scope to HasRoles trait #454
Conversation
|
This is very similar to what I had come up with. It appears to sufficiently allow the ability to scope users who are authorized for a specified permission whether directly or via a role. 👍 |
src/Traits/HasRoles.php
Outdated
| $permissions = $permissions->toArray(); | ||
| } | ||
|
|
||
| if (! is_array($permissions)) { |
There was a problem hiding this comment.
We could use that shiny new array_wrap function here.
src/Traits/HasRoles.php
Outdated
| } | ||
|
|
||
| $rolesWithPermissions = collect([]); | ||
| $permissions = array_map(function ($permission) use (&$rolesWithPermissions) { |
There was a problem hiding this comment.
This could be cleaned up greatly. Right now this map operation does two things. Making sure the permissions are models and building up that rolesWithPermissions. Do this in two steps (with two map operations I guess) for clarity (so when can use that nasty &)
src/Traits/HasRoles.php
Outdated
| $permissions = array_map(function ($permission) use (&$rolesWithPermissions) { | ||
| if ($permission instanceof Permission) { | ||
| $permissionModel = $permission; | ||
| } else { |
There was a problem hiding this comment.
O how I dislike else statements. Refactor this to it's own protected function where you can use an early return.
src/Traits/HasRoles.php
Outdated
|
|
||
| $rolesWithPermissions = $rolesWithPermissions->unique(); | ||
|
|
||
| return $query-> |
tests/HasPermissionsTest.php
Outdated
| $user1 = User::create(['email' => 'user1@test.com']); | ||
| $user2 = User::create(['email' => 'user2@test.com']); | ||
| $user1->givePermissionTo(['edit-articles', 'edit-news']); | ||
| // giving user2 permission throgth the role |
There was a problem hiding this comment.
remove this comment, I think the code is clear enough.
| @@ -52,4 +52,107 @@ public function it_can_revoke_a_permission_from_a_user() | |||
|
|
|||
| $this->assertFalse($this->testUser->hasPermissionTo($this->testUserPermission)); | |||
| } | |||
|
|
|||
| /** @test */ | |||
| public function it_can_scope_users_using_a_string() | |||
There was a problem hiding this comment.
I can always appreciate a PR that adds tests 👍
tests/HasPermissionsTest.php
Outdated
| $user1 = User::create(['email' => 'user1@test.com']); | ||
| $user2 = User::create(['email' => 'user2@test.com']); | ||
| $user1->givePermissionTo(['edit-articles', 'edit-news']); | ||
| // giving user2 permission throgth the role |
tests/HasPermissionsTest.php
Outdated
| $user1 = User::create(['email' => 'user1@test.com']); | ||
| $user2 = User::create(['email' => 'user2@test.com']); | ||
| $user1->givePermissionTo(['edit-articles', 'edit-news']); | ||
| // giving user2 permission throgth the role |
src/Traits/HasRoles.php
Outdated
| */ | ||
| public function scopePermission(Builder $query, $permissions): Builder | ||
| { | ||
| if ($permissions instanceof Collection) { |
There was a problem hiding this comment.
Let's put everything between line 96 and 108 in it's own dedicated protected function convertToPermissionModels
src/Traits/HasRoles.php
Outdated
|
|
||
| $rolesWithPermissions = collect([]); | ||
|
|
||
| foreach ($permissions as $permission) { |
There was a problem hiding this comment.
seems to me that this is a reduce operation. Let's use array_reduce here.
|
Last remark: could you also add a little explanation + example of the new functionality in the readme? |
|
Thanks! |
|
my pleasure, thank you for the notes. |
No description provided.