feat(notifications): added a custom notify email field, managed account now get mail

seerr-api.yml

@@ -1939,6 +1939,10 @@ components:
         pgpKey:
           type: string
           nullable: true
+        notifyEmail:
+          type: string
+          format: email
+          nullable: true
         discordEnabled:
           type: boolean
         discordEnabledTypes:

server/entity/UserSettings.ts

@@ -42,6 +42,9 @@ export class UserSettings {
   @Column({ nullable: true })
   public pgpKey?: string;
 
+  @Column({ nullable: true })
+  public notifyEmail?: string;
+
   @Column({ nullable: true })
   public discordId?: string;
 

server/interfaces/api/userSettingsInterfaces.ts

@@ -24,6 +24,7 @@ export type NotificationAgentTypes = Record<NotificationAgentKey, number>;
 export interface UserSettingsNotificationsResponse {
   emailEnabled?: boolean;
   pgpKey?: string;
+  notifyEmail?: string;
   discordEnabled?: boolean;
   discordEnabledTypes?: number;
   discordId?: string;

server/lib/notifications/agents/email.ts

@@ -215,20 +215,20 @@ class EmailAgent
           type: Notification[type],
           subject: payload.subject,
         });
-
         try {
           const email = new PreparedEmail(
             this.getSettings(),
             payload.notifyUser.settings?.pgpKey
           );
-          if (
-            validator.isEmail(payload.notifyUser.email, { require_tld: false })
-          ) {
+          const userEmail =
+            payload.notifyUser.settings?.notifyEmail ||
+            payload.notifyUser.email;
+          if (validator.isEmail(userEmail, { require_tld: false })) {
             await email.send(
               this.buildMessage(
                 type,
                 payload,
-                payload.notifyUser.email,
+                userEmail,
                 payload.notifyUser.displayName
               )
             );
@@ -285,9 +285,10 @@ class EmailAgent
                 this.getSettings(),
                 user.settings?.pgpKey
               );
-              if (validator.isEmail(user.email, { require_tld: false })) {
+              const userEmail = user.settings?.notifyEmail || user.email;
+              if (validator.isEmail(userEmail, { require_tld: false })) {
                 await email.send(
-                  this.buildMessage(type, payload, user.email, user.displayName)
+                  this.buildMessage(type, payload, userEmail, user.displayName)
                 );
               } else {
                 logger.warn('Invalid email address provided for user', {

server/migration/postgres/1769971931384-CustomNotifyEmailMigration.ts

@@ -0,0 +1,17 @@
+import type { MigrationInterface, QueryRunner } from 'typeorm';
+
+export class CustomNotifyEmailMigration1769971931384 implements MigrationInterface {
+  name = 'CustomNotifyEmailMigration1769971931384';
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `ALTER TABLE "user_settings" ADD "notifyEmail" character varying`
+    );
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `ALTER TABLE "user_settings" DROP COLUMN "notifyEmail"`
+    );
+  }
+}

server/routes/user/usersettings.ts

@@ -562,6 +562,7 @@ userSettingsRoutes.get<{ id: string }, UserSettingsNotificationsResponse>(
       return res.status(200).json({
         emailEnabled: settings.email.enabled,
         pgpKey: user.settings?.pgpKey,
+        notifyEmail: user.settings?.notifyEmail,
         discordEnabled:
           settings?.discord.enabled && settings.discord.options.enableMentions,
         discordEnabledTypes:
@@ -614,6 +615,7 @@ userSettingsRoutes.post<{ id: string }, UserSettingsNotificationsResponse>(
         user.settings = new UserSettings({
           user: req.user,
           pgpKey: req.body.pgpKey,
+          notifyEmail: req.body.notifyEmail,
           discordId: req.body.discordId,
           pushbulletAccessToken: req.body.pushbulletAccessToken,
           pushoverApplicationToken: req.body.pushoverApplicationToken,
@@ -625,6 +627,7 @@ userSettingsRoutes.post<{ id: string }, UserSettingsNotificationsResponse>(
         });
       } else {
         user.settings.pgpKey = req.body.pgpKey;
+        user.settings.notifyEmail = req.body.notifyEmail;
         user.settings.discordId = req.body.discordId;
         user.settings.pushbulletAccessToken = req.body.pushbulletAccessToken;
         user.settings.pushoverApplicationToken =
@@ -646,6 +649,7 @@ userSettingsRoutes.post<{ id: string }, UserSettingsNotificationsResponse>(
 
       return res.status(200).json({
         pgpKey: user.settings.pgpKey,
+        notifyEmail: user.settings.notifyEmail,
         discordId: user.settings.discordId,
         pushbulletAccessToken: user.settings.pushbulletAccessToken,
         pushoverApplicationToken: user.settings.pushoverApplicationToken,

src/components/UserProfile/UserSettings/UserNotificationSettings/UserNotificationsDiscord.tsx

@@ -70,6 +70,7 @@ const UserNotificationsDiscord = () => {
         try {
           await axios.post(`/api/v1/user/${user?.id}/settings/notifications`, {
             pgpKey: data?.pgpKey,
+            notifyEmail: data?.notifyEmail,
             discordId: values.discordId,
             pushbulletAccessToken: data?.pushbulletAccessToken,
             pushoverApplicationToken: data?.pushoverApplicationToken,

src/components/UserProfile/UserSettings/UserNotificationSettings/UserNotificationsEmail.tsx

@@ -12,11 +12,12 @@ import defineMessages from '@app/utils/defineMessages';
 import { ArrowDownOnSquareIcon } from '@heroicons/react/24/outline';
 import type { UserSettingsNotificationsResponse } from '@server/interfaces/api/userSettingsInterfaces';
 import axios from 'axios';
-import { Form, Formik } from 'formik';
+import { Field, Form, Formik } from 'formik';
 import { useRouter } from 'next/router';
 import { useIntl } from 'react-intl';
 import { useToasts } from 'react-toast-notifications';
 import useSWR from 'swr';
+import validator from 'validator';
 import * as Yup from 'yup';
 
 const messages = defineMessages(
@@ -27,6 +28,10 @@ const messages = defineMessages(
     pgpPublicKey: 'PGP Public Key',
     pgpPublicKeyTip:
       'Encrypt email messages using <OpenPgpLink>OpenPGP</OpenPgpLink>',
+    notifyEmail: 'Custom Notify Email address',
+    notifyEmailTip:
+      "Email address to send notifications to if you don't want to send notifications to your login email",
+    validationEmail: 'You must provide a valid email address',
     validationPgpPublicKey: 'You must provide a valid PGP public key',
   }
 );
@@ -51,6 +56,14 @@ const UserEmailSettings = () => {
         /-----BEGIN PGP PUBLIC KEY BLOCK-----.+-----END PGP PUBLIC KEY BLOCK-----/s,
         intl.formatMessage(messages.validationPgpPublicKey)
       ),
+    notifyEmail: Yup.string()
+      .nullable()
+      .notRequired()
+      .test(
+        'email',
+        intl.formatMessage(messages.validationEmail),
+        (value) => !value || validator.isEmail(value, { require_tld: false })
+      ),
   });
 
   if (!data && !error) {
@@ -61,6 +74,7 @@ const UserEmailSettings = () => {
     <Formik
       initialValues={{
         pgpKey: data?.pgpKey,
+        notifyEmail: data?.notifyEmail,
         types: data?.notificationTypes.email ?? ALL_NOTIFICATIONS,
       }}
       validationSchema={UserNotificationsEmailSchema}
@@ -69,6 +83,7 @@ const UserEmailSettings = () => {
         try {
           await axios.post(`/api/v1/user/${user?.id}/settings/notifications`, {
             pgpKey: values.pgpKey,
+            notifyEmail: values.notifyEmail || null,
             discordId: data?.discordId,
             pushbulletAccessToken: data?.pushbulletAccessToken,
             pushoverApplicationToken: data?.pushoverApplicationToken,
@@ -134,6 +149,37 @@ const UserEmailSettings = () => {
                   )}
               </div>
             </div>
+            <div className="form-row">
+              <label htmlFor="notifyEmail" className="text-label">
+                <span className="mr-2">
+                  {intl.formatMessage(messages.notifyEmail)}
+                </span>
+                <SettingsBadge badgeType="advanced" />
+                <span className="label-tip">
+                  {intl.formatMessage(messages.notifyEmailTip)}
+                </span>
+              </label>
+              <div className="form-input-area">
+                <div className="form-input-field">
+                  <Field
+                    id="notifyEmail"
+                    name="notifyEmail"
+                    type="text"
+                    inputMode="email"
+                    autoComplete="off"
+                    data-form-type="other"
+                    data-1pignore="true"
+                    data-lpignore="true"
+                    data-bwignore="true"
+                  />
+                </div>
+                {errors.notifyEmail &&
+                  touched.notifyEmail &&
+                  typeof errors.notifyEmail === 'string' && (
+                    <div className="error">{errors.notifyEmail}</div>
+                  )}
+              </div>
+            </div>
             <NotificationTypeSelector
               user={user}
               currentTypes={values.types}

src/components/UserProfile/UserSettings/UserNotificationSettings/UserNotificationsPushbullet.tsx

@@ -67,6 +67,7 @@ const UserPushbulletSettings = () => {
         try {
           await axios.post(`/api/v1/user/${user?.id}/settings/notifications`, {
             pgpKey: data?.pgpKey,
+            notifyEmail: data?.notifyEmail,
             discordId: data?.discordId,
             pushbulletAccessToken: values.pushbulletAccessToken,
             pushoverApplicationToken: data?.pushoverApplicationToken,

src/components/UserProfile/UserSettings/UserNotificationSettings/UserNotificationsPushover.tsx

@@ -99,6 +99,7 @@ const UserPushoverSettings = () => {
         try {
           await axios.post(`/api/v1/user/${user?.id}/settings/notifications`, {
             pgpKey: data?.pgpKey,
+            notifyEmail: data?.notifyEmail,
             discordId: data?.discordId,
             pushbulletAccessToken: data?.pushbulletAccessToken,
             pushoverApplicationToken: values.pushoverApplicationToken,

src/components/UserProfile/UserSettings/UserNotificationSettings/UserNotificationsTelegram.tsx

@@ -93,6 +93,7 @@ const UserTelegramSettings = () => {
         try {
           await axios.post(`/api/v1/user/${user?.id}/settings/notifications`, {
             pgpKey: data?.pgpKey,
+            notifyEmail: data?.notifyEmail,
             discordId: data?.discordId,
             pushbulletAccessToken: data?.pushbulletAccessToken,
             pushoverApplicationToken: data?.pushoverApplicationToken,

src/components/UserProfile/UserSettings/UserNotificationSettings/UserNotificationsWebPush/index.tsx

@@ -256,6 +256,7 @@ const UserWebPushSettings = () => {
               `/api/v1/user/${user?.id}/settings/notifications`,
               {
                 pgpKey: data?.pgpKey,
+                notifyEmail: data?.notifyEmail,
                 discordId: data?.discordId,
                 pushbulletAccessToken: data?.pushbulletAccessToken,
                 pushoverApplicationToken: data?.pushoverApplicationToken,

src/i18n/locale/en.json

@@ -1473,6 +1473,8 @@
   "components.UserProfile.UserSettings.UserNotificationSettings.emailsettingssaved": "Email notification settings saved successfully!",
   "components.UserProfile.UserSettings.UserNotificationSettings.notifications": "Notifications",
   "components.UserProfile.UserSettings.UserNotificationSettings.notificationsettings": "Notification Settings",
+  "components.UserProfile.UserSettings.UserNotificationSettings.notifyEmail": "Custom Notify Email address",
+  "components.UserProfile.UserSettings.UserNotificationSettings.notifyEmailTip": "Email address to send notifications to if you don't want to send notifications to your login email",
   "components.UserProfile.UserSettings.UserNotificationSettings.pgpPublicKey": "PGP Public Key",
   "components.UserProfile.UserSettings.UserNotificationSettings.pgpPublicKeyTip": "Encrypt email messages using <OpenPgpLink>OpenPGP</OpenPgpLink>",
   "components.UserProfile.UserSettings.UserNotificationSettings.pushbulletAccessToken": "Access Token",
@@ -1495,6 +1497,7 @@
   "components.UserProfile.UserSettings.UserNotificationSettings.telegramsettingsfailed": "Telegram notification settings failed to save.",
   "components.UserProfile.UserSettings.UserNotificationSettings.telegramsettingssaved": "Telegram notification settings saved successfully!",
   "components.UserProfile.UserSettings.UserNotificationSettings.validationDiscordId": "You must provide a valid user ID",
+  "components.UserProfile.UserSettings.UserNotificationSettings.validationEmail": "You must provide a valid email address",
   "components.UserProfile.UserSettings.UserNotificationSettings.validationPgpPublicKey": "You must provide a valid PGP public key",
   "components.UserProfile.UserSettings.UserNotificationSettings.validationPushbulletAccessToken": "You must provide an access token",
   "components.UserProfile.UserSettings.UserNotificationSettings.validationPushoverApplicationToken": "You must provide a valid application token",