chore(release): publish new version

- @standardnotes/analytics@2.12.16
 - @standardnotes/api-gateway@1.39.20
 - @standardnotes/auth-server@1.66.2
 - @standardnotes/domain-events-infra@1.9.50
 - @standardnotes/domain-events@2.101.0
 - @standardnotes/event-store@1.6.47
 - @standardnotes/files-server@1.8.46
 - @standardnotes/revisions-server@1.9.19
 - @standardnotes/scheduler-server@1.15.0
 - @standardnotes/syncing-server@1.23.0
 - @standardnotes/websockets-server@1.4.47
 - @standardnotes/workspace-server@1.17.46

packages/analytics/CHANGELOG.md

@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.12.16](https://github.com/standardnotes/server/compare/@standardnotes/analytics@2.12.15...@standardnotes/analytics@2.12.16) (2022-12-09)
+
+**Note:** Version bump only for package @standardnotes/analytics
+
 ## [2.12.15](https://github.com/standardnotes/server/compare/@standardnotes/analytics@2.12.14...@standardnotes/analytics@2.12.15) (2022-12-09)
 
 **Note:** Version bump only for package @standardnotes/analytics

packages/analytics/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/analytics",
-  "version": "2.12.15",
+  "version": "2.12.16",
   "engines": {
     "node": ">=18.0.0 <19.0.0"
   },

packages/api-gateway/CHANGELOG.md

@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.39.20](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.39.19...@standardnotes/api-gateway@1.39.20) (2022-12-09)
+
+**Note:** Version bump only for package @standardnotes/api-gateway
+
 ## [1.39.19](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.39.18...@standardnotes/api-gateway@1.39.19) (2022-12-09)
 
 **Note:** Version bump only for package @standardnotes/api-gateway

packages/api-gateway/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/api-gateway",
-  "version": "1.39.19",
+  "version": "1.39.20",
   "engines": {
     "node": ">=18.0.0 <19.0.0"
   },

packages/auth/CHANGELOG.md

@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.66.2](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.66.1...@standardnotes/auth-server@1.66.2) (2022-12-09)
+
+**Note:** Version bump only for package @standardnotes/auth-server
+
 ## [1.66.1](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.66.0...@standardnotes/auth-server@1.66.1) (2022-12-09)
 
 **Note:** Version bump only for package @standardnotes/auth-server

packages/auth/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/auth-server",
-  "version": "1.66.1",
+  "version": "1.66.2",
   "engines": {
     "node": ">=18.0.0 <19.0.0"
   },

packages/domain-events-infra/CHANGELOG.md

@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.9.50](https://github.com/standardnotes/server/compare/@standardnotes/domain-events-infra@1.9.49...@standardnotes/domain-events-infra@1.9.50) (2022-12-09)
+
+**Note:** Version bump only for package @standardnotes/domain-events-infra
+
 ## [1.9.49](https://github.com/standardnotes/server/compare/@standardnotes/domain-events-infra@1.9.48...@standardnotes/domain-events-infra@1.9.49) (2022-12-09)
 
 **Note:** Version bump only for package @standardnotes/domain-events-infra

packages/domain-events-infra/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/domain-events-infra",
-  "version": "1.9.49",
+  "version": "1.9.50",
   "engines": {
     "node": ">=18.0.0 <19.0.0"
   },

packages/domain-events/CHANGELOG.md

@@ -3,6 +3,12 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [2.101.0](https://github.com/standardnotes/server/compare/@standardnotes/domain-events@2.100.0...@standardnotes/domain-events@2.101.0) (2022-12-09)
+
+### Features
+
+* **syncing-server:** replace one drive backup failed event with email requested ([130f90b](https://github.com/standardnotes/server/commit/130f90bdb6cc88e073b9380e8aed5eebe8c49c1e))
+
 # [2.100.0](https://github.com/standardnotes/server/compare/@standardnotes/domain-events@2.99.0...@standardnotes/domain-events@2.100.0) (2022-12-09)
 
 ### Features

packages/domain-events/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/domain-events",
-  "version": "2.100.0",
+  "version": "2.101.0",
   "engines": {
     "node": ">=18.0.0 <19.0.0"
   },

packages/domain-events/src/Domain/Event/DropboxBackupFailedEvent.ts

@@ -1,8 +0,0 @@
-import { DomainEventInterface } from './DomainEventInterface'
-
-import { DropboxBackupFailedEventPayload } from './DropboxBackupFailedEventPayload'
-
-export interface DropboxBackupFailedEvent extends DomainEventInterface {
-  type: 'DROPBOX_BACKUP_FAILED'
-  payload: DropboxBackupFailedEventPayload
-}

packages/domain-events/src/Domain/Event/DropboxBackupFailedEventPayload.ts

@@ -1,5 +0,0 @@
-export interface DropboxBackupFailedEventPayload {
-  muteCloudEmailsSettingUuid: string
-  extensionSettingUuid?: string
-  email: string
-}

packages/domain-events/src/Domain/Event/OneDriveBackupFailedEvent.ts

@@ -1,8 +0,0 @@
-import { DomainEventInterface } from './DomainEventInterface'
-
-import { OneDriveBackupFailedEventPayload } from './OneDriveBackupFailedEventPayload'
-
-export interface OneDriveBackupFailedEvent extends DomainEventInterface {
-  type: 'ONE_DRIVE_BACKUP_FAILED'
-  payload: OneDriveBackupFailedEventPayload
-}

packages/domain-events/src/Domain/Event/OneDriveBackupFailedEventPayload.ts

@@ -1,5 +0,0 @@
-export interface OneDriveBackupFailedEventPayload {
-  muteCloudEmailsSettingUuid: string
-  extensionSettingUuid?: string
-  email: string
-}

packages/domain-events/src/Domain/index.ts

@@ -10,8 +10,6 @@ export * from './Event/DiscountWithdrawRequestedEvent'
 export * from './Event/DiscountWithdrawRequestedEventPayload'
 export * from './Event/DomainEventInterface'
 export * from './Event/DomainEventService'
-export * from './Event/DropboxBackupFailedEvent'
-export * from './Event/DropboxBackupFailedEventPayload'
 export * from './Event/DuplicateItemSyncedEvent'
 export * from './Event/DuplicateItemSyncedEventPayload'
 export * from './Event/EmailArchiveExtensionSyncedEvent'
@@ -48,8 +46,6 @@ export * from './Event/ListedAccountRequestedEvent'
 export * from './Event/ListedAccountRequestedEventPayload'
 export * from './Event/MuteEmailsSettingChangedEvent'
 export * from './Event/MuteEmailsSettingChangedEventPayload'
-export * from './Event/OneDriveBackupFailedEvent'
-export * from './Event/OneDriveBackupFailedEventPayload'
 export * from './Event/PaymentFailedEvent'
 export * from './Event/PaymentFailedEventPayload'
 export * from './Event/PaymentSuccessEvent'

packages/event-store/CHANGELOG.md

@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.6.47](https://github.com/standardnotes/server/compare/@standardnotes/event-store@1.6.46...@standardnotes/event-store@1.6.47) (2022-12-09)
+
+**Note:** Version bump only for package @standardnotes/event-store
+
 ## [1.6.46](https://github.com/standardnotes/server/compare/@standardnotes/event-store@1.6.45...@standardnotes/event-store@1.6.46) (2022-12-09)
 
 **Note:** Version bump only for package @standardnotes/event-store

packages/event-store/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/event-store",
-  "version": "1.6.46",
+  "version": "1.6.47",
   "description": "Event Store Service",
   "private": true,
   "main": "dist/src/index.js",

packages/files/CHANGELOG.md

@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.8.46](https://github.com/standardnotes/files/compare/@standardnotes/files-server@1.8.45...@standardnotes/files-server@1.8.46) (2022-12-09)
+
+**Note:** Version bump only for package @standardnotes/files-server
+
 ## [1.8.45](https://github.com/standardnotes/files/compare/@standardnotes/files-server@1.8.44...@standardnotes/files-server@1.8.45) (2022-12-09)
 
 **Note:** Version bump only for package @standardnotes/files-server

packages/files/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/files-server",
-  "version": "1.8.45",
+  "version": "1.8.46",
   "engines": {
     "node": ">=18.0.0 <19.0.0"
   },

packages/revisions/CHANGELOG.md

@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.9.19](https://github.com/standardnotes/server/compare/@standardnotes/revisions-server@1.9.18...@standardnotes/revisions-server@1.9.19) (2022-12-09)
+
+**Note:** Version bump only for package @standardnotes/revisions-server
+
 ## [1.9.18](https://github.com/standardnotes/server/compare/@standardnotes/revisions-server@1.9.17...@standardnotes/revisions-server@1.9.18) (2022-12-09)
 
 **Note:** Version bump only for package @standardnotes/revisions-server

packages/revisions/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/revisions-server",
-  "version": "1.9.18",
+  "version": "1.9.19",
   "engines": {
     "node": ">=18.0.0 <19.0.0"
   },

packages/scheduler/CHANGELOG.md

@@ -3,6 +3,12 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [1.15.0](https://github.com/standardnotes/server/compare/@standardnotes/scheduler-server@1.14.10...@standardnotes/scheduler-server@1.15.0) (2022-12-09)
+
+### Features
+
+* **syncing-server:** replace one drive backup failed event with email requested ([130f90b](https://github.com/standardnotes/server/commit/130f90bdb6cc88e073b9380e8aed5eebe8c49c1e))
+
 ## [1.14.10](https://github.com/standardnotes/server/compare/@standardnotes/scheduler-server@1.14.9...@standardnotes/scheduler-server@1.14.10) (2022-12-09)
 
 **Note:** Version bump only for package @standardnotes/scheduler-server

packages/scheduler/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/scheduler-server",
-  "version": "1.14.10",
+  "version": "1.15.0",
   "engines": {
     "node": ">=18.0.0 <19.0.0"
   },

packages/scheduler/src/Domain/Job/JobDoneInterpreter.spec.ts

@@ -2,7 +2,7 @@ import {
   DiscountApplyRequestedEvent,
   DiscountWithdrawRequestedEvent,
   DomainEventPublisherInterface,
-  EmailMessageRequestedEvent,
+  EmailRequestedEvent,
   ExitDiscountWithdrawRequestedEvent,
 } from '@standardnotes/domain-events'
 import { PredicateName } from '@standardnotes/predicates'
@@ -45,9 +45,7 @@ describe('JobDoneInterpreter', () => {
     predicateRepository.findByJobUuid = jest.fn().mockReturnValue([])
 
     domainEventFactory = {} as jest.Mocked<DomainEventFactoryInterface>
-    domainEventFactory.createEmailRequestedEvent = jest
-      .fn()
-      .mockReturnValue({} as jest.Mocked<EmailMessageRequestedEvent>)
+    domainEventFactory.createEmailRequestedEvent = jest.fn().mockReturnValue({} as jest.Mocked<EmailRequestedEvent>)
     domainEventFactory.createDiscountApplyRequestedEvent = jest
       .fn()
       .mockReturnValue({} as jest.Mocked<DiscountApplyRequestedEvent>)

packages/syncing-server/CHANGELOG.md

@@ -3,6 +3,18 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [1.23.0](https://github.com/standardnotes/syncing-server-js/compare/@standardnotes/syncing-server@1.22.0...@standardnotes/syncing-server@1.23.0) (2022-12-09)
+
+### Features
+
+* **syncing-server:** replace one drive backup failed event with email requested ([130f90b](https://github.com/standardnotes/syncing-server-js/commit/130f90bdb6cc88e073b9380e8aed5eebe8c49c1e))
+
+# [1.22.0](https://github.com/standardnotes/syncing-server-js/compare/@standardnotes/syncing-server@1.21.0...@standardnotes/syncing-server@1.22.0) (2022-12-09)
+
+### Features
+
+* **syncing-serfver:** remove dropbox backup failed event in favour of email requested ([118156c](https://github.com/standardnotes/syncing-server-js/commit/118156c62de70eca8fd89414f6e409abd0363e62))
+
 # [1.21.0](https://github.com/standardnotes/syncing-server-js/compare/@standardnotes/syncing-server@1.20.17...@standardnotes/syncing-server@1.21.0) (2022-12-09)
 
 ### Features

packages/syncing-server/jest.config.js

@@ -7,6 +7,6 @@ module.exports = {
   transform: {
     ...tsjPreset.transform,
   },
-  coveragePathIgnorePatterns: ['/Bootstrap/', 'HealthCheckController', '/Infra/'],
+  coveragePathIgnorePatterns: ['/Bootstrap/', 'HealthCheckController', '/Infra/', '/Domain/Email/'],
   setupFilesAfterEnv: ['./test-setup.ts'],
 }

packages/syncing-server/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/syncing-server",
-  "version": "1.21.0",
+  "version": "1.23.0",
   "engines": {
     "node": ">=18.0.0 <19.0.0"
   },

packages/syncing-server/src/Domain/Email/DropboxBackupFailed.ts

@@ -0,0 +1,9 @@
+import { html } from './dropbox-backup-failed.html'
+
+export function getSubject(): string {
+  return 'Failed Daily Backup to Dropbox'
+}
+
+export function getBody(): string {
+  return html
+}

packages/syncing-server/src/Domain/Email/OneDriveBackupFailed.ts

@@ -0,0 +1,9 @@
+import { html } from './one-drive-backup-failed.html'
+
+export function getSubject(): string {
+  return 'Failed Daily Backup to OneDrive Sync'
+}
+
+export function getBody(): string {
+  return html
+}

packages/syncing-server/src/Domain/Email/dropbox-backup-failed.html.ts

@@ -0,0 +1,17 @@
+export const html = `<p>Hello,</p>
+<p>We recently tried backing up your data to <strong>Dropbox</strong>, but an issue prevented us from doing so.</p>
+<p>
+  The usual cause is an expired or revoked token from your sync provider. Please follow
+  <a href='https://standardnotes.com/help/27/how-do-i-enable-dropbox-google-drive-or-onedrive-backups'>these
+    instructions</a>
+  to use CloudLink on the web or desktop Standard Notes application to uninstall then reinstall this sync provider.
+</p>
+<p>
+  We apologize for any inconvenience this may cause.
+  If you have any questions, please feel free to reply directly to this email.
+</p>
+<p>
+  Thanks,
+  <br>SN</br>
+</p>
+<a href='https://app.standardnotes.com/?settings=backups'>Mute these emails</a>`

packages/syncing-server/src/Domain/Email/one-drive-backup-failed.html.ts

@@ -0,0 +1,18 @@
+export const html = `<p>Hello,</p>
+<p>We recently tried backing up your data to <strong>OneDrive Sync</strong>, but an issue prevented us from doing
+  so.</p>
+<p>
+  The usual cause is an expired or revoked token from your sync provider. Please follow
+  <a href='https://standardnotes.com/help/27/how-do-i-enable-dropbox-google-drive-or-onedrive-backups'>these
+    instructions</a>
+  to use CloudLink on the web or desktop Standard Notes application to uninstall then reinstall this sync provider.
+</p>
+<p>
+  We apologize for any inconvenience this may cause.
+  If you have any questions, please feel free to reply directly to this email.
+</p>
+<p>
+  Thanks,
+  <br>SN</br>
+</p>
+<a href='https://app.standardnotes.com/?settings=backups'>Mute these emails</a>`

packages/syncing-server/src/Domain/Event/DomainEventFactory.ts

@@ -1,7 +1,6 @@
 /* istanbul ignore file */
 import {
   DomainEventService,
-  DropboxBackupFailedEvent,
   DuplicateItemSyncedEvent,
   EmailArchiveExtensionSyncedEvent,
   EmailBackupAttachmentCreatedEvent,
@@ -9,7 +8,6 @@ import {
   ItemDumpedEvent,
   ItemRevisionCreationRequestedEvent,
   ItemsSyncedEvent,
-  OneDriveBackupFailedEvent,
   RevisionsCopyRequestedEvent,
   RevisionsOwnershipUpdateRequestedEvent,
   UserContentSizeRecalculationRequestedEvent,
@@ -131,24 +129,6 @@ export class DomainEventFactory implements DomainEventFactoryInterface {
     }
   }
 
-  createDropboxBackupFailedEvent(muteCloudEmailsSettingUuid: string, email: string): DropboxBackupFailedEvent {
-    return {
-      type: 'DROPBOX_BACKUP_FAILED',
-      createdAt: this.timer.getUTCDate(),
-      meta: {
-        correlation: {
-          userIdentifier: email,
-          userIdentifierType: 'email',
-        },
-        origin: DomainEventService.SyncingServer,
-      },
-      payload: {
-        muteCloudEmailsSettingUuid,
-        email,
-      },
-    }
-  }
-
   createEmailRequestedEvent(dto: {
     userEmail: string
     messageIdentifier: string
@@ -170,24 +150,6 @@ export class DomainEventFactory implements DomainEventFactoryInterface {
     }
   }
 
-  createOneDriveBackupFailedEvent(muteCloudEmailsSettingUuid: string, email: string): OneDriveBackupFailedEvent {
-    return {
-      type: 'ONE_DRIVE_BACKUP_FAILED',
-      createdAt: this.timer.getUTCDate(),
-      meta: {
-        correlation: {
-          userIdentifier: email,
-          userIdentifierType: 'email',
-        },
-        origin: DomainEventService.SyncingServer,
-      },
-      payload: {
-        muteCloudEmailsSettingUuid,
-        email,
-      },
-    }
-  }
-
   createItemsSyncedEvent(dto: {
     userUuid: string
     extensionUrl: string

packages/syncing-server/src/Domain/Event/DomainEventFactoryInterface.ts

@@ -1,5 +1,4 @@
 import {
-  DropboxBackupFailedEvent,
   DuplicateItemSyncedEvent,
   EmailArchiveExtensionSyncedEvent,
   EmailBackupAttachmentCreatedEvent,
@@ -7,7 +6,6 @@ import {
   ItemDumpedEvent,
   ItemRevisionCreationRequestedEvent,
   ItemsSyncedEvent,
-  OneDriveBackupFailedEvent,
   RevisionsCopyRequestedEvent,
   RevisionsOwnershipUpdateRequestedEvent,
   UserContentSizeRecalculationRequestedEvent,
@@ -15,7 +13,6 @@ import {
 
 export interface DomainEventFactoryInterface {
   createUserContentSizeRecalculationRequestedEvent(userUuid: string): UserContentSizeRecalculationRequestedEvent
-  createDropboxBackupFailedEvent(muteCloudEmailsSettingUuid: string, email: string): DropboxBackupFailedEvent
   createEmailRequestedEvent(dto: {
     userEmail: string
     messageIdentifier: string
@@ -23,7 +20,6 @@ export interface DomainEventFactoryInterface {
     body: string
     subject: string
   }): EmailRequestedEvent
-  createOneDriveBackupFailedEvent(muteCloudEmailsSettingUuid: string, email: string): OneDriveBackupFailedEvent
   createItemsSyncedEvent(dto: {
     userUuid: string
     extensionUrl: string

packages/syncing-server/src/Domain/Extension/ExtensionsHttpService.spec.ts

@@ -50,9 +50,7 @@ describe('ExtensionsHttpService', () => {
     domainEventPublisher.publish = jest.fn()
 
     domainEventFactory = {} as jest.Mocked<DomainEventFactoryInterface>
-    domainEventFactory.createDropboxBackupFailedEvent = jest.fn()
-    domainEventFactory.createGoogleDriveBackupFailedEvent = jest.fn()
-    domainEventFactory.createOneDriveBackupFailedEvent = jest.fn()
+    domainEventFactory.createEmailRequestedEvent = jest.fn()
 
     contentDecoder = {} as jest.Mocked<ContentDecoderInterface>
     contentDecoder.decode = jest.fn().mockReturnValue({ name: 'Dropbox' })
@@ -65,7 +63,6 @@ describe('ExtensionsHttpService', () => {
       forceMute: false,
       backupFilename: 'test',
       authParams,
-      muteEmailsSettingUuid: '3-4-5',
       cloudProvider: 'DROPBOX',
     })
 
@@ -73,7 +70,6 @@ describe('ExtensionsHttpService', () => {
       data: {
         auth_params: authParams,
         backup_filename: 'test',
-        settings_id: '3-4-5',
         silent: false,
         user_uuid: '1-2-3',
       },
@@ -99,12 +95,11 @@ describe('ExtensionsHttpService', () => {
       forceMute: false,
       backupFilename: 'test',
       authParams,
-      muteEmailsSettingUuid: '3-4-5',
       cloudProvider: 'DROPBOX',
     })
 
     expect(domainEventPublisher.publish).toHaveBeenCalled()
-    expect(domainEventFactory.createDropboxBackupFailedEvent).toHaveBeenCalled()
+    expect(domainEventFactory.createEmailRequestedEvent).toHaveBeenCalled()
   })
 
   it('should send items to extensions server', async () => {
@@ -116,7 +111,6 @@ describe('ExtensionsHttpService', () => {
       items: [item],
       backupFilename: '',
       authParams,
-      muteEmailsSettingUuid: '3-4-5',
     })
 
     expect(httpClient.request).toHaveBeenCalledWith({
@@ -124,7 +118,6 @@ describe('ExtensionsHttpService', () => {
         auth_params: authParams,
         backup_filename: '',
         items: [item],
-        settings_id: '3-4-5',
         silent: false,
         user_uuid: '1-2-3',
       },
@@ -145,14 +138,12 @@ describe('ExtensionsHttpService', () => {
       forceMute: false,
       backupFilename: 'backup-file',
       authParams,
-      muteEmailsSettingUuid: '3-4-5',
     })
 
     expect(httpClient.request).toHaveBeenCalledWith({
       data: {
         auth_params: authParams,
         backup_filename: 'backup-file',
-        settings_id: '3-4-5',
         silent: false,
         user_uuid: '1-2-3',
       },
@@ -180,11 +171,10 @@ describe('ExtensionsHttpService', () => {
       items: [item],
       backupFilename: 'backup-file',
       authParams,
-      muteEmailsSettingUuid: '3-4-5',
     })
 
     expect(domainEventPublisher.publish).toHaveBeenCalled()
-    expect(domainEventFactory.createDropboxBackupFailedEvent).toHaveBeenCalled()
+    expect(domainEventFactory.createEmailRequestedEvent).toHaveBeenCalled()
   })
 
   it('should publish a failed Dropbox backup event if request was sent and extensions server responded not ok', async () => {
@@ -200,11 +190,10 @@ describe('ExtensionsHttpService', () => {
       items: [item],
       backupFilename: 'backup-file',
       authParams,
-      muteEmailsSettingUuid: '3-4-5',
     })
 
     expect(domainEventPublisher.publish).toHaveBeenCalled()
-    expect(domainEventFactory.createDropboxBackupFailedEvent).toHaveBeenCalled()
+    expect(domainEventFactory.createEmailRequestedEvent).toHaveBeenCalled()
   })
 
   it('should publish a failed Google Drive backup event if request was not sent successfully', async () => {
@@ -222,11 +211,10 @@ describe('ExtensionsHttpService', () => {
       items: [item],
       backupFilename: 'backup-file',
       authParams,
-      muteEmailsSettingUuid: '3-4-5',
     })
 
     expect(domainEventPublisher.publish).toHaveBeenCalled()
-    expect(domainEventFactory.createGoogleDriveBackupFailedEvent).toHaveBeenCalled()
+    expect(domainEventFactory.createEmailRequestedEvent).toHaveBeenCalled()
   })
 
   it('should publish a failed One Drive backup event if request was not sent successfully', async () => {
@@ -244,11 +232,10 @@ describe('ExtensionsHttpService', () => {
       items: [item],
       backupFilename: 'backup-file',
       authParams,
-      muteEmailsSettingUuid: '3-4-5',
     })
 
     expect(domainEventPublisher.publish).toHaveBeenCalled()
-    expect(domainEventFactory.createOneDriveBackupFailedEvent).toHaveBeenCalled()
+    expect(domainEventFactory.createEmailRequestedEvent).toHaveBeenCalled()
   })
 
   it('should not publish a failed backup event if emailes are force muted', async () => {
@@ -266,7 +253,6 @@ describe('ExtensionsHttpService', () => {
       items: [item],
       backupFilename: 'backup-file',
       authParams,
-      muteEmailsSettingUuid: '3-4-5',
     })
 
     expect(domainEventPublisher.publish).not.toHaveBeenCalled()
@@ -289,7 +275,6 @@ describe('ExtensionsHttpService', () => {
         items: [item],
         backupFilename: 'backup-file',
         authParams,
-        muteEmailsSettingUuid: '3-4-5',
       })
     } catch (e) {
       error = e
@@ -316,7 +301,6 @@ describe('ExtensionsHttpService', () => {
         items: [item],
         backupFilename: 'backup-file',
         authParams,
-        muteEmailsSettingUuid: '3-4-5',
       })
     } catch (e) {
       error = e
@@ -340,11 +324,10 @@ describe('ExtensionsHttpService', () => {
       items: [item],
       backupFilename: 'backup-file',
       authParams,
-      muteEmailsSettingUuid: '3-4-5',
     })
 
     expect(domainEventPublisher.publish).toHaveBeenCalled()
-    expect(domainEventFactory.createDropboxBackupFailedEvent).toHaveBeenCalled()
+    expect(domainEventFactory.createEmailRequestedEvent).toHaveBeenCalled()
   })
 
   it('should publish a failed Google Drive backup event judging by extension url if request was not sent successfully', async () => {
@@ -362,11 +345,10 @@ describe('ExtensionsHttpService', () => {
       items: [item],
       backupFilename: 'backup-file',
       authParams,
-      muteEmailsSettingUuid: '3-4-5',
     })
 
     expect(domainEventPublisher.publish).toHaveBeenCalled()
-    expect(domainEventFactory.createGoogleDriveBackupFailedEvent).toHaveBeenCalled()
+    expect(domainEventFactory.createEmailRequestedEvent).toHaveBeenCalled()
   })
 
   it('should publish a failed One Drive backup event judging by extension url if request was not sent successfully', async () => {
@@ -384,11 +366,10 @@ describe('ExtensionsHttpService', () => {
       items: [item],
       backupFilename: 'backup-file',
       authParams,
-      muteEmailsSettingUuid: '3-4-5',
     })
 
     expect(domainEventPublisher.publish).toHaveBeenCalled()
-    expect(domainEventFactory.createOneDriveBackupFailedEvent).toHaveBeenCalled()
+    expect(domainEventFactory.createEmailRequestedEvent).toHaveBeenCalled()
   })
 
   it('should throw an error if cannot deduce extension by judging from the url', async () => {
@@ -408,7 +389,6 @@ describe('ExtensionsHttpService', () => {
         items: [item],
         backupFilename: 'backup-file',
         authParams,
-        muteEmailsSettingUuid: '3-4-5',
       })
     } catch (e) {
       error = e
@@ -434,7 +414,6 @@ describe('ExtensionsHttpService', () => {
         items: [item],
         backupFilename: 'backup-file',
         authParams,
-        muteEmailsSettingUuid: '3-4-5',
       })
     } catch (e) {
       error = e

packages/syncing-server/src/Domain/Extension/ExtensionsHttpService.ts

@@ -11,7 +11,9 @@ import { ItemRepositoryInterface } from '../Item/ItemRepositoryInterface'
 import { ExtensionName } from './ExtensionName'
 import { ExtensionsHttpServiceInterface } from './ExtensionsHttpServiceInterface'
 import { SendItemsToExtensionsServerDTO } from './SendItemsToExtensionsServerDTO'
-import { getBody, getSubject } from '../Email/GoogleDriveBackupFailed'
+import { getBody as googleDriveBody, getSubject as googleDriveSubject } from '../Email/GoogleDriveBackupFailed'
+import { getBody as dropboxBody, getSubject as dropboxSubject } from '../Email/DropboxBackupFailed'
+import { getBody as oneDriveBody, getSubject as oneDriveSubject } from '../Email/OneDriveBackupFailed'
 
 @injectable()
 export class ExtensionsHttpService implements ExtensionsHttpServiceInterface {
@@ -31,7 +33,6 @@ export class ExtensionsHttpService implements ExtensionsHttpServiceInterface {
     authParams: KeyParamsData
     forceMute: boolean
     userUuid: string
-    muteEmailsSettingUuid: string
   }): Promise<void> {
     let sent = false
     try {
@@ -40,7 +41,6 @@ export class ExtensionsHttpService implements ExtensionsHttpServiceInterface {
         auth_params: dto.authParams,
         silent: dto.forceMute,
         user_uuid: dto.userUuid,
-        settings_id: dto.muteEmailsSettingUuid,
       }
 
       const response = await this.httpClient.request({
@@ -60,13 +60,9 @@ export class ExtensionsHttpService implements ExtensionsHttpServiceInterface {
       this.logger.error(`[${dto.userUuid}] Failed to send a request to extensions server: ${(error as Error).message}`)
     }
 
-    if (!sent && !dto.forceMute && dto.muteEmailsSettingUuid !== undefined) {
+    if (!sent && !dto.forceMute) {
       await this.domainEventPublisher.publish(
-        this.createCloudBackupFailedEventBasedOnProvider(
-          dto.cloudProvider,
-          dto.authParams.identifier as string,
-          dto.muteEmailsSettingUuid,
-        ),
+        this.createCloudBackupFailedEventBasedOnProvider(dto.cloudProvider, dto.authParams.identifier as string),
       )
     }
   }
@@ -79,7 +75,6 @@ export class ExtensionsHttpService implements ExtensionsHttpServiceInterface {
         auth_params: dto.authParams,
         silent: dto.forceMute,
         user_uuid: dto.userUuid,
-        settings_id: dto.muteEmailsSettingUuid,
       }
       if (dto.items !== undefined) {
         payload.items = dto.items
@@ -102,14 +97,9 @@ export class ExtensionsHttpService implements ExtensionsHttpServiceInterface {
       this.logger.error(`[${dto.userUuid}] Failed to send a request to extensions server: ${(error as Error).message}`)
     }
 
-    if (!sent && !dto.forceMute && dto.muteEmailsSettingUuid !== undefined) {
+    if (!sent && !dto.forceMute) {
       await this.domainEventPublisher.publish(
-        await this.getBackupFailedEvent(
-          dto.muteEmailsSettingUuid,
-          dto.extensionId,
-          dto.userUuid,
-          dto.authParams.identifier as string,
-        ),
+        await this.getBackupFailedEvent(dto.extensionId, dto.userUuid, dto.authParams.identifier as string),
       )
     }
   }
@@ -117,26 +107,36 @@ export class ExtensionsHttpService implements ExtensionsHttpServiceInterface {
   private createCloudBackupFailedEventBasedOnProvider(
     cloudProvider: 'DROPBOX' | 'GOOGLE_DRIVE' | 'ONE_DRIVE',
     email: string,
-    muteCloudEmailsSettingUuid: string,
   ): DomainEventInterface {
     switch (cloudProvider) {
       case 'DROPBOX':
-        return this.domainEventFactory.createDropboxBackupFailedEvent(muteCloudEmailsSettingUuid, email)
+        return this.domainEventFactory.createEmailRequestedEvent({
+          userEmail: email,
+          level: EmailLevel.LEVELS.FailedCloudBackup,
+          body: dropboxBody(),
+          messageIdentifier: 'FAILED_DROPBOX_BACKUP',
+          subject: dropboxSubject(),
+        })
       case 'GOOGLE_DRIVE':
         return this.domainEventFactory.createEmailRequestedEvent({
           userEmail: email,
           level: EmailLevel.LEVELS.FailedCloudBackup,
-          body: getBody(),
+          body: googleDriveBody(),
           messageIdentifier: 'FAILED_GOOGLE_DRIVE_BACKUP',
-          subject: getSubject(),
+          subject: googleDriveSubject(),
         })
       case 'ONE_DRIVE':
-        return this.domainEventFactory.createOneDriveBackupFailedEvent(muteCloudEmailsSettingUuid, email)
+        return this.domainEventFactory.createEmailRequestedEvent({
+          userEmail: email,
+          level: EmailLevel.LEVELS.FailedCloudBackup,
+          body: oneDriveBody(),
+          messageIdentifier: 'FAILED_ONE_DRIVE_BACKUP',
+          subject: oneDriveSubject(),
+        })
     }
   }
 
   private async getBackupFailedEvent(
-    muteCloudEmailsSettingUuid: string,
     extensionId: string,
     userUuid: string,
     email: string,
@@ -149,11 +149,11 @@ export class ExtensionsHttpService implements ExtensionsHttpServiceInterface {
     const content = this.contentDecoder.decode(extension.content)
     switch (this.getExtensionName(content)) {
       case ExtensionName.Dropbox:
-        return this.createCloudBackupFailedEventBasedOnProvider('DROPBOX', muteCloudEmailsSettingUuid, email)
+        return this.createCloudBackupFailedEventBasedOnProvider('DROPBOX', email)
       case ExtensionName.GoogleDrive:
-        return this.createCloudBackupFailedEventBasedOnProvider('GOOGLE_DRIVE', muteCloudEmailsSettingUuid, email)
+        return this.createCloudBackupFailedEventBasedOnProvider('GOOGLE_DRIVE', email)
       case ExtensionName.OneDrive:
-        return this.createCloudBackupFailedEventBasedOnProvider('ONE_DRIVE', muteCloudEmailsSettingUuid, email)
+        return this.createCloudBackupFailedEventBasedOnProvider('ONE_DRIVE', email)
     }
   }
 

packages/syncing-server/src/Domain/Extension/SendItemsToExtensionsServerDTO.ts

@@ -1,4 +1,5 @@
 import { KeyParamsData } from '@standardnotes/responses'
+
 import { Item } from '../Item/Item'
 
 export type SendItemsToExtensionsServerDTO = {
@@ -8,6 +9,5 @@ export type SendItemsToExtensionsServerDTO = {
   authParams: KeyParamsData
   forceMute: boolean
   userUuid: string
-  muteEmailsSettingUuid?: string
   items?: Array<Item>
 }

packages/websockets/CHANGELOG.md

@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.4.47](https://github.com/standardnotes/server/compare/@standardnotes/websockets-server@1.4.46...@standardnotes/websockets-server@1.4.47) (2022-12-09)
+
+**Note:** Version bump only for package @standardnotes/websockets-server
+
 ## [1.4.46](https://github.com/standardnotes/server/compare/@standardnotes/websockets-server@1.4.45...@standardnotes/websockets-server@1.4.46) (2022-12-09)
 
 **Note:** Version bump only for package @standardnotes/websockets-server

packages/websockets/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/websockets-server",
-  "version": "1.4.46",
+  "version": "1.4.47",
   "engines": {
     "node": ">=18.0.0 <19.0.0"
   },

packages/workspace/CHANGELOG.md

@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.17.46](https://github.com/standardnotes/server/compare/@standardnotes/workspace-server@1.17.45...@standardnotes/workspace-server@1.17.46) (2022-12-09)
+
+**Note:** Version bump only for package @standardnotes/workspace-server
+
 ## [1.17.45](https://github.com/standardnotes/server/compare/@standardnotes/workspace-server@1.17.44...@standardnotes/workspace-server@1.17.45) (2022-12-09)
 
 **Note:** Version bump only for package @standardnotes/workspace-server

packages/workspace/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/workspace-server",
-  "version": "1.17.45",
+  "version": "1.17.46",
   "engines": {
     "node": ">=18.0.0 <19.0.0"
   },