kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-12 15:35:15 +00:00
Code Issues Projects Releases Wiki Activity

Extend acceptedRoles array in AC controllers.

Browse Source
This commit is contained in:
James Cole
2025-08-15 19:50:12 +02:00
parent 87d292ca27
commit ab773c9052
16 changed files with 92 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Support/Http/Api/ValidatesUserGroupTrait.php
View File

@@ -39,6 +39,7 @@ use Illuminate\Support\Facades\Log;
trait ValidatesUserGroupTrait
{
protected ?UserGroup $userGroup = null;
protected ?User $user = null;
/**
* An "undocumented" filter
@@ -101,6 +102,7 @@ trait ValidatesUserGroupTrait
if ($user->hasRoleInGroupOrOwner($group, $role)) {
Log::debug(sprintf('validateUserGroup: User has role "%s" in group #%d, return the group.', $role->value, $groupId));
$this->userGroup = $group;
$this->user = $user;
return $group;
}

4
app/Support/Repositories/UserGroup/UserGroupTrait.php
View File

@@ -72,8 +72,8 @@ trait UserGroupTrait
return;
}
throw new FireflyException(sprintf('Object is of class %s, not User.', $user::class));
$class = null === $user ? 'NULL' : $user::class;
throw new FireflyException(sprintf('Object is %s, not User.', $class));
}
public function getUserGroup(): ?UserGroup