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

Simplify code.

Browse Source
This commit is contained in:
James Cole
2020-10-24 18:40:17 +02:00
parent 3979e12043
commit 9d826519e3
3 changed files with 54 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -75,20 +75,20 @@ class RemoteUserGuard implements Guard
throw new FireflyException('The guard header was unexpectedly empty. See the logs.');
}
/** @var User $user */
$user = $this->provider->retrieveById($userID);
/** @var User $retrievedUser */
$retrievedUser = $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);
$preference = app('preferences')->getForUser($retrievedUser, 'remote_guard_alt_email', null);
if (null !== $emailAddress && null === $preference && $emailAddress !== $userID) {
app('preferences')->setForUser($user, 'remote_guard_alt_email', $emailAddress);
app('preferences')->setForUser($retrievedUser, 'remote_guard_alt_email', $emailAddress);
}
Log::debug(sprintf('Result of getting user from provider: %s', $user->email));
$this->user = $user;
Log::debug(sprintf('Result of getting user from provider: %s', $retrievedUser->email));
$this->user = $retrievedUser;
}
/**