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

Merge branch 'develop' into 5.8-dev

Browse Source
This commit is contained in:
James Cole
2022-09-24 07:03:03 +02:00
parent 4ca346fc4d 6f9482fc1b
commit 416fe0c147
16 changed files with 331 additions and 305 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
app/Handlers/Events/APIEventHandler.php
View File

@@ -26,7 +26,10 @@ namespace FireflyIII\Handlers\Events;
use Exception;
use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Mail\AccessTokenCreatedMail;
use FireflyIII\Notifications\Admin\TestNotification;
use FireflyIII\Notifications\User\NewAccessToken;
use FireflyIII\Repositories\User\UserRepositoryInterface;
use Illuminate\Support\Facades\Notification;
use Laravel\Passport\Events\AccessTokenCreated;
use Log;
use Mail;
@@ -42,45 +45,18 @@ class APIEventHandler
*
* @param AccessTokenCreated $event
*
* @return bool
* @throws FireflyException
* @deprecated
*/
public function accessTokenCreated(AccessTokenCreated $event): bool
public function accessTokenCreated(AccessTokenCreated $event): void
{
Log::debug(__METHOD__);
/** @var UserRepositoryInterface $repository */
$repository = app(UserRepositoryInterface::class);
$user = $repository->find((int) $event->userId);
if (null !== $user) {
$email = $user->email;
// if user is demo user, send to owner:
if ($user->hasRole('demo')) {
$email = config('firefly.site_owner');
}
// see if user has alternative email address:
$pref = app('preferences')->getForUser($user, 'remote_guard_alt_email');
if (null !== $pref) {
$email = (string) (is_array($pref->data) ? $email : $pref->data);
}
Log::debug(sprintf('Now in APIEventHandler::accessTokenCreated. Email is %s', $email));
try {
Log::debug('Trying to send message...');
Mail::to($email)->send(new AccessTokenCreatedMail);
} catch (Exception $e) { // @phpstan-ignore-line
Log::debug('Send message failed! :(');
Log::error($e->getMessage());
Log::error($e->getTraceAsString());
Session::flash('error', 'Possible email error: ' . $e->getMessage());
}
Log::debug('If no error above this line, message was sent.');
Notification::send($user, new NewAccessToken);
}
return true;
}
}