IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-02-25 18:45:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7279 from firefly-iii/fix-7278

Browse Source 
Fix https://github.com/firefly-iii/firefly-iii/issues/7278
This commit is contained in:
James Cole 2023-03-27 06:22:42 +02:00 committed by GitHub
commit 98b28c75b7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 4 deletions
Show Stats 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 */
foreach ($users as $user) {
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));
}
}
/**
* TODO move to helper.
* @param User $user
*
* @throws FireflyException
*/
private function createGroupMembership(User $user): void
public static function createGroupMembership(User $user): void
{
// check if membership exists
$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
{
protected Application $application;
protected $provider;
protected $user;
protected $provider;
protected $user;
/**
* 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;
use FireflyIII\Console\Commands\Integrity\CreateGroupMemberships;
use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Models\Role;
use FireflyIII\User;
@ -68,6 +69,8 @@ class RemoteUserProvider implements UserProvider
$roleObject = Role::where('name', 'owner')->first();
$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));