Expand notifications.

app/Handlers/Events/UserEventHandler.php

@@ -33,15 +33,16 @@ use FireflyIII\Events\RequestedNewPassword;
 use FireflyIII\Events\UserChangedEmail;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Mail\ConfirmEmailChangeMail;
-use FireflyIII\Mail\RegisteredUser as RegisteredUserMail;
-use FireflyIII\Mail\RequestedNewPassword as RequestedNewPasswordMail;
 use FireflyIII\Mail\UndoEmailChangeMail;
 use FireflyIII\Models\GroupMembership;
 use FireflyIII\Models\UserGroup;
 use FireflyIII\Models\UserRole;
+use FireflyIII\Notifications\Admin\UserRegistration as AdminRegistrationNotification;
 use FireflyIII\Notifications\User\UserLogin;
 use FireflyIII\Notifications\User\UserNewPassword;
+use FireflyIII\Notifications\User\UserRegistration as UserRegistrationNotification;
 use FireflyIII\Repositories\User\UserRepositoryInterface;
+use FireflyIII\Support\Facades\FireflyConfig;
 use FireflyIII\User;
 use Illuminate\Auth\Events\Login;
 use Illuminate\Support\Facades\Notification;
@@ -281,26 +282,28 @@ class UserEventHandler
      */
     public function sendRegistrationMail(RegisteredUser $event): void
     {
-        $sendMail = config('firefly.send_registration_mail');
+        $sendMail = FireflyConfig::get('notification_user_new_reg', true)->data;
         if ($sendMail) {
-            // get the email address
-            $email = $event->user->email;
-            $url   = route('index');
+            Notification::send($event->user, new UserRegistrationNotification);
+        }
+    }
 
-            // see if user has alternative email address:
-            $pref = app('preferences')->getForUser($event->user, 'remote_guard_alt_email');
-            if (null !== $pref) {
-                $email = $pref->data;
+    /**
+     * @param RegisteredUser $event
+     * @return void
+     */
+    public function sendAdminRegistrationNotification(RegisteredUser $event): void
+    {
+        $sendMail = FireflyConfig::get('notification_admin_new_reg', true)->data;
+        if ($sendMail) {
+            /** @var UserRepositoryInterface $repository */
+            $repository = app(UserRepositoryInterface::class);
+            $all        = $repository->all();
+            foreach ($all as $user) {
+                if ($repository->hasRole($user, 'owner')) {
+                    Notification::send($user, new AdminRegistrationNotification($event->user));
+                }
             }
-
-            // send email.
-            try {
-                Mail::to($email)->send(new RegisteredUserMail($url));
-
-            } catch (Exception $e) { // @phpstan-ignore-line
-                Log::error($e->getMessage());
-            }
-
         }
     }
 

app/Http/Controllers/Admin/HomeController.php

@@ -26,6 +26,7 @@ use FireflyIII\Events\AdminRequestedTestMessage;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Http\Controllers\Controller;
 use FireflyIII\Http\Middleware\IsDemoUser;
+use FireflyIII\Support\Facades\FireflyConfig;
 use FireflyIII\User;
 use Illuminate\Contracts\View\Factory;
 use Illuminate\Http\RedirectResponse;
@@ -68,9 +69,28 @@ class HomeController extends Controller
         if (null !== $pref && is_string($pref->data)) {
             $email = $pref->data;
         }
-        Log::debug('Email is ', [$email]);
 
-        return view('admin.index', compact('title', 'mainTitleIcon', 'email'));
+        // admin notification settings:
+        $notifications = [];
+        foreach (config('firefly.admin_notifications') as $item) {
+            $notifications[$item] = FireflyConfig::get(sprintf('notification_%s', $item), true)->data;
+        }
+
+        return view('admin.index', compact('title', 'mainTitleIcon', 'email', 'notifications'));
+    }
+
+    public function notifications(Request $request): RedirectResponse
+    {
+        foreach (config('firefly.admin_notifications') as $item) {
+            $value = false;
+            if ($request->has(sprintf('notification_%s', $item))) {
+                $value = true;
+            }
+            FireflyConfig::set(sprintf('notification_%s',$item), $value);
+        }
+
+        session()->flash('success', (string) trans('firefly.notification_settings_saved'));
+        return redirect(route('admin.index'));
     }
 
     /**

app/Notifications/Admin/UserRegistration.php

@@ -22,7 +22,61 @@ declare(strict_types=1);
 
 namespace FireflyIII\Notifications\Admin;
 
-class UserRegistration
-{
+use FireflyIII\User;
+use Illuminate\Bus\Queueable;
+use Illuminate\Notifications\Messages\MailMessage;
+use Illuminate\Notifications\Notification;
 
+class UserRegistration extends Notification
+{
+    use Queueable;
+
+    private User $user;
+
+    /**
+     * Create a new notification instance.
+     *
+     * @return void
+     */
+    public function __construct(User $user)
+    {
+        $this->user = $user;
+    }
+
+    /**
+     * Get the notification's delivery channels.
+     *
+     * @param  mixed  $notifiable
+     * @return array
+     */
+    public function via($notifiable)
+    {
+        return ['mail'];
+    }
+
+    /**
+     * Get the mail representation of the notification.
+     *
+     * @param  mixed  $notifiable
+     * @return \Illuminate\Notifications\Messages\MailMessage
+     */
+    public function toMail($notifiable)
+    {
+        return (new MailMessage)
+            ->markdown('emails.registered-admin', ['email' => $this->user->email, 'id' => $this->user->id])
+            ->subject((string) trans('email.registered_subject_admin'));
+    }
+
+    /**
+     * Get the array representation of the notification.
+     *
+     * @param  mixed  $notifiable
+     * @return array
+     */
+    public function toArray($notifiable)
+    {
+        return [
+            //
+        ];
+    }
 }

app/Notifications/User/UserRegistration.php

@@ -0,0 +1,79 @@
+<?php
+declare(strict_types=1);
+/*
+ * UserRegistration.php
+ * Copyright (c) 2022 james@firefly-iii.org
+ *
+ * This file is part of Firefly III (https://github.com/firefly-iii).
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+namespace FireflyIII\Notifications\User;
+
+use Illuminate\Bus\Queueable;
+use Illuminate\Notifications\Messages\MailMessage;
+use Illuminate\Notifications\Notification;
+
+class UserRegistration extends Notification
+{
+    use Queueable;
+
+    /**
+     * Create a new notification instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+    }
+
+    /**
+     * Get the notification's delivery channels.
+     *
+     * @param  mixed  $notifiable
+     * @return array
+     */
+    public function via($notifiable)
+    {
+        return ['mail'];
+    }
+
+    /**
+     * Get the mail representation of the notification.
+     *
+     * @param  mixed  $notifiable
+     * @return \Illuminate\Notifications\Messages\MailMessage
+     */
+    public function toMail($notifiable)
+    {
+        return (new MailMessage)
+            ->markdown('emails.registered', ['address' => route('index')])
+            ->subject((string) trans('email.registered_subject'));
+    }
+
+    /**
+     * Get the array representation of the notification.
+     *
+     * @param  mixed  $notifiable
+     * @return array
+     */
+    public function toArray($notifiable)
+    {
+        return [
+            //
+        ];
+    }
+}
+

app/Providers/EventServiceProvider.php

@@ -73,6 +73,7 @@ class EventServiceProvider extends ServiceProvider
             // is a User related event.
             RegisteredUser::class               => [
                 'FireflyIII\Handlers\Events\UserEventHandler@sendRegistrationMail',
+                'FireflyIII\Handlers\Events\UserEventHandler@sendAdminRegistrationNotification',
                 'FireflyIII\Handlers\Events\UserEventHandler@attachUserRole',
                 'FireflyIII\Handlers\Events\UserEventHandler@createGroupMembership',
                 'FireflyIII\Handlers\Events\UserEventHandler@createExchangeRates',