gh-mirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-12-10 13:21:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Reset the anonimity.

Browse Source
This commit is contained in:
James Cole
2025-10-27 08:51:50 +01:00
parent 14a9bede11
commit 9312ddbb7b
1 changed files with 22 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
app/Handlers/Events/UserEventHandler.php
View File

@@ -91,8 +91,8 @@ class UserEventHandler
$repository = app(UserRepositoryInterface::class); $repository = app(UserRepositoryInterface::class);
/** @var User $user */ /** @var User $user */
$user = $event->user; $user = $event->user;
$count = $repository->count(); $count = $repository->count();
// only act when there is 1 user in the system and he has no admin rights. // only act when there is 1 user in the system and he has no admin rights.
if (1 === $count && !$repository->hasRole($user, 'owner')) { if (1 === $count && !$repository->hasRole($user, 'owner')) {
@@ -124,13 +124,13 @@ class UserEventHandler
*/ */
public function createGroupMembership(RegisteredUser $event): void public function createGroupMembership(RegisteredUser $event): void
{ {
$user = $event->user; $user = $event->user;
$groupExists = true; $groupExists = true;
$groupTitle = $user->email; $groupTitle = $user->email;
$index = 1; $index = 1;
/** @var null|UserGroup $group */ /** @var null|UserGroup $group */
$group = null; $group = null;
// create a new group. // create a new group.
while (true === $groupExists) { // @phpstan-ignore-line while (true === $groupExists) { // @phpstan-ignore-line
@@ -140,7 +140,7 @@ class UserEventHandler
break; break;
} }
$groupTitle = sprintf('%s-%d', $user->email, $index); $groupTitle = sprintf('%s-%d', $user->email, $index);
++$index; ++$index;
if ($index > 99) { if ($index > 99) {
throw new FireflyException('Email address can no longer be used for registrations.'); throw new FireflyException('Email address can no longer be used for registrations.');
@@ -148,7 +148,7 @@ class UserEventHandler
} }
/** @var null|UserRole $role */ /** @var null|UserRole $role */
$role = UserRole::where('title', UserRoleEnum::OWNER->value)->first(); $role = UserRole::where('title', UserRoleEnum::OWNER->value)->first();
if (null === $role) { if (null === $role) {
throw new FireflyException('The user role is unexpectedly empty. Did you run all migrations?'); throw new FireflyException('The user role is unexpectedly empty. Did you run all migrations?');
} }
@@ -172,11 +172,12 @@ class UserEventHandler
$repository = app(UserRepositoryInterface::class); $repository = app(UserRepositoryInterface::class);
/** @var User $user */ /** @var User $user */
$user = $event->user; $user = $event->user;
if ($repository->hasRole($user, 'demo')) { if ($repository->hasRole($user, 'demo')) {
// set user back to English. // set user back to English.
Preferences::setForUser($user, 'language', 'en_US'); Preferences::setForUser($user, 'language', 'en_US');
Preferences::setForUser($user, 'locale', 'equal'); Preferences::setForUser($user, 'locale', 'equal');
Preferences::setForUser($user, 'anonymous', false);
Preferences::mark(); Preferences::mark();
} }
} }
@@ -223,7 +224,7 @@ class UserEventHandler
public function sendAdminRegistrationNotification(RegisteredUser $event): void public function sendAdminRegistrationNotification(RegisteredUser $event): void
{ {
$sendMail = (bool) app('fireflyconfig')->get('notification_admin_new_reg', true)->data; $sendMail = (bool)app('fireflyconfig')->get('notification_admin_new_reg', true)->data;
if ($sendMail) { if ($sendMail) {
$owner = $event->owner; $owner = $event->owner;
@@ -283,7 +284,7 @@ class UserEventHandler
$oldEmail = $event->oldEmail; $oldEmail = $event->oldEmail;
$user = $event->user; $user = $event->user;
$token = Preferences::getForUser($user, 'email_change_undo_token', 'invalid'); $token = Preferences::getForUser($user, 'email_change_undo_token', 'invalid');
$hashed = hash('sha256', sprintf('%s%s', (string) config('app.key'), $oldEmail)); $hashed = hash('sha256', sprintf('%s%s', (string)config('app.key'), $oldEmail));
$url = route('profile.undo-email-change', [$token->data, $hashed]); $url = route('profile.undo-email-change', [$token->data, $hashed]);
try { try {
@@ -366,7 +367,7 @@ class UserEventHandler
*/ */
public function sendRegistrationMail(RegisteredUser $event): void public function sendRegistrationMail(RegisteredUser $event): void
{ {
$sendMail = (bool) app('fireflyconfig')->get('notification_user_new_reg', true)->data; $sendMail = (bool)app('fireflyconfig')->get('notification_user_new_reg', true)->data;
if ($sendMail) { if ($sendMail) {
try { try {
Notification::send($event->user, new UserRegistrationNotification()); Notification::send($event->user, new UserRegistrationNotification());
@@ -406,10 +407,10 @@ class UserEventHandler
break; break;
// case 'ntfy': // case 'ntfy':
// $class = UserTestNotificationNtfy::class; // $class = UserTestNotificationNtfy::class;
// //
// break; // break;
case 'pushover': case 'pushover':
$class = UserTestNotificationPushover::class; $class = UserTestNotificationPushover::class;
@@ -446,7 +447,7 @@ class UserEventHandler
public function storeUserIPAddress(ActuallyLoggedIn $event): void public function storeUserIPAddress(ActuallyLoggedIn $event): void
{ {
app('log')->debug('Now in storeUserIPAddress'); app('log')->debug('Now in storeUserIPAddress');
$user = $event->user; $user = $event->user;
if ($user->hasRole('demo')) { if ($user->hasRole('demo')) {
app('log')->debug('Do not log demo user logins'); app('log')->debug('Do not log demo user logins');
@@ -463,8 +464,8 @@ class UserEventHandler
return; return;
} }
$inArray = false; $inArray = false;
$ip = request()->ip(); $ip = request()->ip();
app('log')->debug(sprintf('User logging in from IP address %s', $ip)); app('log')->debug(sprintf('User logging in from IP address %s', $ip));
// update array if in array // update array if in array
@@ -492,7 +493,7 @@ class UserEventHandler
$preference = array_values($preference); $preference = array_values($preference);
/** @var bool $send */ /** @var bool $send */
$send = Preferences::getForUser($user, 'notification_user_login', true)->data; $send = Preferences::getForUser($user, 'notification_user_login', true)->data;
Preferences::setForUser($user, 'login_ip_history', $preference); Preferences::setForUser($user, 'login_ip_history', $preference);
if (false === $inArray && true === $send) { if (false === $inArray && true === $send) {