diff --git a/src/notifications.js b/src/notifications.js index 79fa281e2..1614d9f5f 100644 --- a/src/notifications.js +++ b/src/notifications.js @@ -31,6 +31,27 @@ const TYPE_MANUAL_APP_UPDATE_NEEDED = 'manualAppUpdate'; const TYPE_APP_AUTO_UPDATE_FAILED = 'appAutoUpdateFailed'; const TYPE_MANUAL_UPDATE_REQUIRED = 'manualUpdateRequired'; +const DEFAULT_NOTIFICATIONS = [ + TYPE_CLOUDRON_INSTALLED, + TYPE_CLOUDRON_UPDATED, + TYPE_CLOUDRON_UPDATE_FAILED, + TYPE_CERTIFICATE_RENEWAL_FAILED, + TYPE_BACKUP_CONFIG, + TYPE_APP_OOM, + TYPE_APP_UPDATED, + TYPE_BACKUP_FAILED, + TYPE_APP_DOWN, + TYPE_APP_UP, + TYPE_DISK_SPACE, + TYPE_MAIL_STATUS, + TYPE_REBOOT, + TYPE_UPDATE_UBUNTU, + TYPE_BOX_UPDATE, + TYPE_MANUAL_APP_UPDATE_NEEDED, + TYPE_APP_AUTO_UPDATE_FAILED, + TYPE_MANUAL_UPDATE_REQUIRED, +]; + const NOTIFICATION_FIELDS = [ 'id', 'eventId', 'type', 'title', 'message', 'creationTime', 'acknowledged', 'context' ]; function postProcess(result) { @@ -457,6 +478,7 @@ export default { TYPE_APP_AUTO_UPDATE_FAILED, TYPE_MANUAL_UPDATE_REQUIRED, TYPE_DOMAIN_CONFIG_CHECK_FAILED, + DEFAULT_NOTIFICATIONS, pin, unpin, manualAppUpdate, diff --git a/src/users.js b/src/users.js index fe67fddc8..3a2adb5bf 100644 --- a/src/users.js +++ b/src/users.js @@ -179,7 +179,7 @@ async function add(email, data, auditSource) { let fallbackEmail = data.fallbackEmail || ''; const source = data.source || ''; // empty is local user const role = data.role || ROLE_USER; - const notificationConfig = 'notificationConfig' in data ? data.notificationConfig : null; + const notificationConfig = 'notificationConfig' in data ? data.notificationConfig : notifications.DEFAULT_NOTIFICATIONS; let error; @@ -837,8 +837,7 @@ async function createOwner(email, username, password, displayName, auditSource) const activated = await isActivated(); if (activated) throw new BoxError(BoxError.ALREADY_EXISTS, 'Cloudron already activated'); - const notificationConfig = [notifications.TYPE_BACKUP_FAILED, notifications.TYPE_CERTIFICATE_RENEWAL_FAILED, notifications.TYPE_MANUAL_APP_UPDATE_NEEDED, notifications.TYPE_APP_DOWN, notifications.TYPE_CLOUDRON_UPDATE_FAILED, notifications.TYPE_APP_AUTO_UPDATE_FAILED ]; - return await add(email, { username, password, fallbackEmail: '', displayName, role: ROLE_OWNER, notificationConfig }, auditSource); + return await add(email, { username, password, fallbackEmail: '', displayName, role: ROLE_OWNER, notificationConfig: notifications.DEFAULT_NOTIFICATIONS }, auditSource); } async function getInviteLink(user, auditSource) {