kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-18 18:44:16 +00:00
Code Issues Projects Releases Wiki Activity

Fix https://github.com/firefly-iii/firefly-iii/issues/7278

Browse Source
This commit is contained in:
James Cole
2023-03-26 19:19:10 +02:00
parent 70c11d6634
commit 36b0cf04ba
3 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/Console/Commands/Integrity/CreateGroupMemberships.php
View File

@@ -79,17 +79,18 @@ class CreateGroupMemberships extends Command
/** @var User $user */ /** @var User $user */
foreach ($users as $user) { foreach ($users as $user) {
Log::debug(sprintf('Manage group memberships for user #%d', $user->id)); Log::debug(sprintf('Manage group memberships for user #%d', $user->id));
$this->createGroupMembership($user); self::createGroupMembership($user);
Log::debug(sprintf('Done with user #%d', $user->id)); Log::debug(sprintf('Done with user #%d', $user->id));
} }
} }
/** /**
* TODO move to helper.
* @param User $user * @param User $user
* *
* @throws FireflyException * @throws FireflyException
*/ */
private function createGroupMembership(User $user): void public static function createGroupMembership(User $user): void
{ {
// check if membership exists // check if membership exists
$userGroup = UserGroup::where('title', $user->email)->first(); $userGroup = UserGroup::where('title', $user->email)->first();

4
app/Support/Authentication/RemoteUserGuard.php
View File

@@ -41,8 +41,8 @@ use Psr\Container\NotFoundExceptionInterface;
class RemoteUserGuard implements Guard class RemoteUserGuard implements Guard
{ {
protected Application $application; protected Application $application;
protected $provider; protected $provider;
protected $user; protected $user;
/** /**
* Create a new authentication guard. * Create a new authentication guard.

3
app/Support/Authentication/RemoteUserProvider.php
View File

@@ -24,6 +24,7 @@ declare(strict_types=1);
namespace FireflyIII\Support\Authentication; namespace FireflyIII\Support\Authentication;
use FireflyIII\Console\Commands\Integrity\CreateGroupMemberships;
use FireflyIII\Exceptions\FireflyException; use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Models\Role; use FireflyIII\Models\Role;
use FireflyIII\User; use FireflyIII\User;
@@ -68,6 +69,8 @@ class RemoteUserProvider implements UserProvider
$roleObject = Role::where('name', 'owner')->first(); $roleObject = Role::where('name', 'owner')->first();
$user->roles()->attach($roleObject); $user->roles()->attach($roleObject);
} }
// make sure the user gets an administration as well.
CreateGroupMemberships::createGroupMembership($user);
} }
Log::debug(sprintf('Going to return user #%d (%s)', $user->id, $user->email)); Log::debug(sprintf('Going to return user #%d (%s)', $user->id, $user->email));