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

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

Browse Source
This commit is contained in:
James Cole
2020-10-03 07:03:41 +02:00
parent 96028e91be
commit aadcb2cc5b
10 changed files with 74 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -78,6 +78,15 @@ class RemoteUserGuard implements Guard
/** @var User $user */
$user = $this->provider->retrieveById($userID);
// store email address if present in header and not already set.
$header = config('auth.guard_email');
$emailAddress = request()->server($header) ?? null;
$preference = app('preferences')->getForUser($user, 'remote_guard_alt_email', null);
if (null !== $emailAddress && null === $preference && $emailAddress !== $userID) {
app('preferences')->setForUser($user, 'remote_guard_alt_email', $emailAddress);
}
Log::debug(sprintf('Result of getting user from provider: %s', $user->email));
$this->user = $user;
}