chore(release): publish new version

- @standardnotes/event-store@1.6.38

.pnp.cjs

@@ -3056,6 +3056,7 @@ const RAW_RUNTIME_STATE =
           ["@newrelic/winston-enricher", "virtual:c66bf20e88479ada0172094776519a9f51acc4731d22079b60a295bcec7ea42d5545cbce58a77a50d932bf953298799135e99707486e343da6d99ba1d167bdbd#npm:4.0.0"],\
           ["@sentry/node", "npm:7.19.0"],\
           ["@standardnotes/common", "workspace:packages/common"],\
+          ["@standardnotes/domain-core", "workspace:packages/domain-core"],\
           ["@standardnotes/domain-events", "workspace:packages/domain-events"],\
           ["@standardnotes/domain-events-infra", "workspace:packages/domain-events-infra"],\
           ["@standardnotes/predicates", "workspace:packages/predicates"],\

.prettierrc

@@ -0,0 +1,6 @@
+{
+  "singleQuote": true,
+  "trailingComma": "all",
+  "printWidth": 120,
+  "semi": false
+}

packages/analytics/CHANGELOG.md

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

packages/analytics/package.json

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

packages/api-gateway/CHANGELOG.md

@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.39.11](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.39.10...@standardnotes/api-gateway@1.39.11) (2022-12-07)
+
+**Note:** Version bump only for package @standardnotes/api-gateway
+
+## [1.39.10](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.39.9...@standardnotes/api-gateway@1.39.10) (2022-12-07)
+
+**Note:** Version bump only for package @standardnotes/api-gateway
+
 ## [1.39.9](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.39.8...@standardnotes/api-gateway@1.39.9) (2022-12-07)
 
 **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.9",
+  "version": "1.39.11",
   "engines": {
     "node": ">=18.0.0 <19.0.0"
   },

packages/auth/CHANGELOG.md

@@ -3,6 +3,20 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.64.1](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.64.0...@standardnotes/auth-server@1.64.1) (2022-12-07)
+
+**Note:** Version bump only for package @standardnotes/auth-server
+
+# [1.64.0](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.63.2...@standardnotes/auth-server@1.64.0) (2022-12-07)
+
+### Features
+
+* **auth:** replace user signed in events with email requested ([e48cca6](https://github.com/standardnotes/server/commit/e48cca6b45b02876f2d82b726c1d2f124d90b587))
+
+## [1.63.2](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.63.1...@standardnotes/auth-server@1.63.2) (2022-12-07)
+
+**Note:** Version bump only for package @standardnotes/auth-server
+
 ## [1.63.1](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.63.0...@standardnotes/auth-server@1.63.1) (2022-12-07)
 
 ### Bug Fixes

packages/auth/bin/email.ts

@@ -1,136 +0,0 @@
-import 'reflect-metadata'
-
-import 'newrelic'
-
-import { Stream } from 'stream'
-
-import { Logger } from 'winston'
-import * as dayjs from 'dayjs'
-import * as utc from 'dayjs/plugin/utc'
-
-import { UserRepositoryInterface } from '../src/Domain/User/UserRepositoryInterface'
-import { ContainerConfigLoader } from '../src/Bootstrap/Container'
-import TYPES from '../src/Bootstrap/Types'
-import { Env } from '../src/Bootstrap/Env'
-import { SettingServiceInterface } from '../src/Domain/Setting/SettingServiceInterface'
-import { DomainEventFactoryInterface } from '../src/Domain/Event/DomainEventFactoryInterface'
-import { UserSubscriptionRepositoryInterface } from '../src/Domain/Subscription/UserSubscriptionRepositoryInterface'
-import { DomainEventPublisherInterface } from '@standardnotes/domain-events'
-import { MuteMarketingEmailsOption, SettingName } from '@standardnotes/settings'
-import { EmailMessageIdentifier } from '@standardnotes/common'
-import { TimerInterface } from '@standardnotes/time'
-
-const inputArgs = process.argv.slice(2)
-const emailMessageIdentifier = inputArgs[0]
-
-const sendEmailCampaign = async (
-  userRepository: UserRepositoryInterface,
-  settingService: SettingServiceInterface,
-  userSubscriptionRepository: UserSubscriptionRepositoryInterface,
-  timer: TimerInterface,
-  domainEventFactory: DomainEventFactoryInterface,
-  domainEventPublisher: DomainEventPublisherInterface,
-  logger: Logger,
-): Promise<void> => {
-  const stream = await userRepository.streamAll()
-
-  return new Promise((resolve, reject) => {
-    stream
-      .pipe(
-        new Stream.Transform({
-          objectMode: true,
-          transform: async (rawUserData, _encoding, callback) => {
-            try {
-              const emailsMutedSetting = await settingService.findSettingWithDecryptedValue({
-                userUuid: rawUserData.user_uuid,
-                settingName: SettingName.MuteMarketingEmails,
-              })
-
-              if (emailsMutedSetting === null || emailsMutedSetting.value === MuteMarketingEmailsOption.Muted) {
-                callback()
-
-                return
-              }
-
-              let activeSubscription = false
-              let subscriptionPlanName = null
-
-              const userSubscription = await userSubscriptionRepository.findOneByUserUuid(rawUserData.user_uuid)
-              if (userSubscription !== null) {
-                activeSubscription =
-                  !userSubscription.cancelled && userSubscription.endsAt > timer.getTimestampInMicroseconds()
-                subscriptionPlanName = userSubscription.planName
-              }
-
-              await domainEventPublisher.publish(
-                domainEventFactory.createEmailMessageRequestedEvent({
-                  userEmail: rawUserData.user_email,
-                  messageIdentifier: emailMessageIdentifier as EmailMessageIdentifier,
-                  context: {
-                    activeSubscription,
-                    subscriptionPlanName,
-                    muteEmailsSettingUuid: emailsMutedSetting.uuid,
-                  },
-                }),
-              )
-            } catch (error) {
-              logger.error(`Could not process user ${rawUserData.user_uuid}: ${(error as Error).message}`)
-            }
-
-            callback()
-          },
-        }),
-      )
-      .on('finish', resolve)
-      .on('error', reject)
-  })
-}
-
-const container = new ContainerConfigLoader()
-void container.load().then((container) => {
-  dayjs.extend(utc)
-
-  const env: Env = new Env()
-  env.load()
-
-  const logger: Logger = container.get(TYPES.Logger)
-
-  logger.info(`Starting email campaign for email ${emailMessageIdentifier} ...`)
-
-  if (!emailMessageIdentifier) {
-    logger.error('No email message identifier passed as argument. Skipped sending.')
-
-    process.exit(1)
-  }
-
-  const userRepository: UserRepositoryInterface = container.get(TYPES.UserRepository)
-  const settingService: SettingServiceInterface = container.get(TYPES.SettingService)
-  const userSubscriptionRepository: UserSubscriptionRepositoryInterface = container.get(
-    TYPES.UserSubscriptionRepository,
-  )
-  const timer: TimerInterface = container.get(TYPES.Timer)
-  const domainEventFactory: DomainEventFactoryInterface = container.get(TYPES.DomainEventFactory)
-  const domainEventPublisher: DomainEventPublisherInterface = container.get(TYPES.DomainEventPublisher)
-
-  Promise.resolve(
-    sendEmailCampaign(
-      userRepository,
-      settingService,
-      userSubscriptionRepository,
-      timer,
-      domainEventFactory,
-      domainEventPublisher,
-      logger,
-    ),
-  )
-    .then(() => {
-      logger.info(`${emailMessageIdentifier} email campaign complete.`)
-
-      process.exit(0)
-    })
-    .catch((error) => {
-      logger.error(`Could not finish ${emailMessageIdentifier} email campaign: ${error.message}`)
-
-      process.exit(1)
-    })
-})

packages/auth/docker/entrypoint.sh

@@ -50,12 +50,6 @@ case "$COMMAND" in
     yarn workspace @standardnotes/auth-server daily-backup:one_drive
     ;;
 
-  'email-campaign' )
-    echo "[Docker] Starting Email Campaign Sending..."
-    MESSAGE_IDENTIFIER=$1 && shift 1
-    yarn workspace @standardnotes/auth-server email-campaign $MESSAGE_IDENTIFIER
-    ;;
-
   'content-recalculation' )
     echo "[Docker] Starting Content Size Recalculation..."
     yarn workspace @standardnotes/auth-server content-recalculation

packages/auth/jest.config.js

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

packages/auth/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/auth-server",
-  "version": "1.63.1",
+  "version": "1.64.1",
   "engines": {
     "node": ">=18.0.0 <19.0.0"
   },
@@ -26,7 +26,6 @@
     "daily-backup:one_drive": "yarn node dist/bin/backup.js one_drive daily",
     "weekly-backup:email": "yarn node dist/bin/backup.js email weekly",
     "content-recalculation": "yarn node dist/bin/content.js",
-    "email-campaign": "yarn node dist/bin/email.js",
     "typeorm": "typeorm-ts-node-commonjs",
     "upgrade:snjs": "yarn ncu -u '@standardnotes/*'"
   },

packages/auth/src/Domain/Email/UserSignedIn.ts

@@ -0,0 +1,15 @@
+import { html } from './user-signed-in.html'
+
+export function getSubject(email: string): string {
+  return `New sign-in for ${email}`
+}
+
+export function getBody(email: string, device: string, browser: string, date: Date): string {
+  const body = html
+
+  return body
+    .replace('%%EMAIL%%', email)
+    .replace('%%DEVICE%%', device)
+    .replace('%%BROWSER%%', browser)
+    .replace('%%TIME_AND_DATE%%', date.toLocaleString())
+}

packages/auth/src/Domain/Email/user-signed-in.html.ts

@@ -0,0 +1,25 @@
+export const html = `
+<div>
+<p>Hello,</p>
+<p>We've detected a new sign-in to your account %%EMAIL%%.</p>
+<p>
+  <b>Device type</b>: %%DEVICE%%
+</p>
+<p>
+  <b>Browser type</b>: %%BROWSER%%
+</p>
+<p>
+  <strong>Time and date</strong>: <span>%%TIME_AND_DATE%%</span>
+</p>
+<p>
+  If this was you, please disregard this email. If it wasn't you, we recommend signing into your account and
+  changing your password immediately, then enabling 2FA.
+</p>
+<p>
+  Thanks,
+  <br />
+  SN
+</p>
+<a href="https://app.standardnotes.com/?settings=account">Mute these emails</a>
+</div>
+`

packages/auth/src/Domain/Event/DomainEventFactory.ts

@@ -1,6 +1,6 @@
 /* istanbul ignore file */
 
-import { EmailMessageIdentifier, JSONString, ProtocolVersion, RoleName, Uuid } from '@standardnotes/common'
+import { JSONString, ProtocolVersion, RoleName, Uuid } from '@standardnotes/common'
 import {
   AccountDeletionRequestedEvent,
   UserEmailChangedEvent,
@@ -10,17 +10,16 @@ import {
   EmailBackupRequestedEvent,
   CloudBackupRequestedEvent,
   ListedAccountRequestedEvent,
-  UserSignedInEvent,
   UserDisabledSessionUserAgentLoggingEvent,
   SharedSubscriptionInvitationCreatedEvent,
   SharedSubscriptionInvitationCanceledEvent,
   PredicateVerifiedEvent,
   DomainEventService,
-  EmailMessageRequestedEvent,
   WebSocketMessageRequestedEvent,
   ExitDiscountApplyRequestedEvent,
   UserContentSizeRecalculationRequestedEvent,
   MuteEmailsSettingChangedEvent,
+  EmailRequestedEvent,
 } from '@standardnotes/domain-events'
 import { Predicate, PredicateVerificationResult } from '@standardnotes/predicates'
 import { TimerInterface } from '@standardnotes/time'
@@ -102,13 +101,15 @@ export class DomainEventFactory implements DomainEventFactoryInterface {
     }
   }
 
-  createEmailMessageRequestedEvent(dto: {
+  createEmailRequestedEvent(dto: {
     userEmail: string
-    messageIdentifier: EmailMessageIdentifier
+    messageIdentifier: string
-    context: Record<string, unknown>
+    level: string
-  }): EmailMessageRequestedEvent {
+    body: string
+    subject: string
+  }): EmailRequestedEvent {
     return {
-      type: 'EMAIL_MESSAGE_REQUESTED',
+      type: 'EMAIL_REQUESTED',
       createdAt: this.timer.getUTCDate(),
       meta: {
         correlation: {
@@ -202,28 +203,6 @@ export class DomainEventFactory implements DomainEventFactoryInterface {
     }
   }
 
-  createUserSignedInEvent(dto: {
-    userUuid: string
-    userEmail: string
-    device: string
-    browser: string
-    signInAlertEnabled: boolean
-    muteSignInEmailsSettingUuid: Uuid
-  }): UserSignedInEvent {
-    return {
-      type: 'USER_SIGNED_IN',
-      createdAt: this.timer.getUTCDate(),
-      meta: {
-        correlation: {
-          userIdentifier: dto.userUuid,
-          userIdentifierType: 'uuid',
-        },
-        origin: DomainEventService.Auth,
-      },
-      payload: dto,
-    }
-  }
-
   createListedAccountRequestedEvent(userUuid: string, userEmail: string): ListedAccountRequestedEvent {
     return {
       type: 'LISTED_ACCOUNT_REQUESTED',

packages/auth/src/Domain/Event/DomainEventFactoryInterface.ts

@@ -1,4 +1,4 @@
-import { Uuid, RoleName, EmailMessageIdentifier, ProtocolVersion, JSONString } from '@standardnotes/common'
+import { Uuid, RoleName, ProtocolVersion, JSONString } from '@standardnotes/common'
 import { Predicate, PredicateVerificationResult } from '@standardnotes/predicates'
 import {
   AccountDeletionRequestedEvent,
@@ -9,35 +9,28 @@ import {
   OfflineSubscriptionTokenCreatedEvent,
   EmailBackupRequestedEvent,
   ListedAccountRequestedEvent,
-  UserSignedInEvent,
   UserDisabledSessionUserAgentLoggingEvent,
   SharedSubscriptionInvitationCreatedEvent,
   SharedSubscriptionInvitationCanceledEvent,
   PredicateVerifiedEvent,
-  EmailMessageRequestedEvent,
   WebSocketMessageRequestedEvent,
   ExitDiscountApplyRequestedEvent,
   UserContentSizeRecalculationRequestedEvent,
   MuteEmailsSettingChangedEvent,
+  EmailRequestedEvent,
 } from '@standardnotes/domain-events'
 import { InviteeIdentifierType } from '../SharedSubscription/InviteeIdentifierType'
 
 export interface DomainEventFactoryInterface {
   createUserContentSizeRecalculationRequestedEvent(userUuid: string): UserContentSizeRecalculationRequestedEvent
   createWebSocketMessageRequestedEvent(dto: { userUuid: Uuid; message: JSONString }): WebSocketMessageRequestedEvent
-  createEmailMessageRequestedEvent(dto: {
+  createEmailRequestedEvent(dto: {
     userEmail: string
-    messageIdentifier: EmailMessageIdentifier
+    messageIdentifier: string
-    context: Record<string, unknown>
+    level: string
-  }): EmailMessageRequestedEvent
+    body: string
-  createUserSignedInEvent(dto: {
+    subject: string
-    userUuid: string
+  }): EmailRequestedEvent
-    userEmail: string
-    device: string
-    browser: string
-    signInAlertEnabled: boolean
-    muteSignInEmailsSettingUuid: Uuid
-  }): UserSignedInEvent
   createListedAccountRequestedEvent(userUuid: string, userEmail: string): ListedAccountRequestedEvent
   createUserRegisteredEvent(dto: {
     userUuid: string

packages/auth/src/Domain/UseCase/SignIn.spec.ts

@@ -1,6 +1,6 @@
 import 'reflect-metadata'
 
-import { DomainEventPublisherInterface, UserSignedInEvent } from '@standardnotes/domain-events'
+import { DomainEventPublisherInterface, EmailRequestedEvent } from '@standardnotes/domain-events'
 import { Logger } from 'winston'
 
 import { AuthResponseFactoryInterface } from '../Auth/AuthResponseFactoryInterface'
@@ -10,10 +10,6 @@ import { SessionServiceInterface } from '../Session/SessionServiceInterface'
 import { User } from '../User/User'
 import { UserRepositoryInterface } from '../User/UserRepositoryInterface'
 import { SignIn } from './SignIn'
-import { RoleServiceInterface } from '../Role/RoleServiceInterface'
-import { SettingServiceInterface } from '../Setting/SettingServiceInterface'
-import { Setting } from '../Setting/Setting'
-import { MuteSignInEmailsOption } from '@standardnotes/settings'
 import { PKCERepositoryInterface } from '../User/PKCERepositoryInterface'
 import { CrypterInterface } from '../Encryption/CrypterInterface'
 import { ProtocolVersion } from '@standardnotes/common'
@@ -26,10 +22,7 @@ describe('SignIn', () => {
   let domainEventPublisher: DomainEventPublisherInterface
   let domainEventFactory: DomainEventFactoryInterface
   let sessionService: SessionServiceInterface
-  let roleService: RoleServiceInterface
   let logger: Logger
-  let settingService: SettingServiceInterface
-  let setting: Setting
   let pkceRepository: PKCERepositoryInterface
   let crypter: CrypterInterface
 
@@ -40,8 +33,6 @@ describe('SignIn', () => {
       domainEventPublisher,
       domainEventFactory,
       sessionService,
-      roleService,
-      settingService,
       pkceRepository,
       crypter,
       logger,
@@ -68,27 +59,12 @@ describe('SignIn', () => {
     domainEventPublisher.publish = jest.fn()
 
     domainEventFactory = {} as jest.Mocked<DomainEventFactoryInterface>
-    domainEventFactory.createUserSignedInEvent = jest.fn().mockReturnValue({} as jest.Mocked<UserSignedInEvent>)
+    domainEventFactory.createEmailRequestedEvent = jest.fn().mockReturnValue({} as jest.Mocked<EmailRequestedEvent>)
 
     sessionService = {} as jest.Mocked<SessionServiceInterface>
     sessionService.getOperatingSystemInfoFromUserAgent = jest.fn().mockReturnValue('iOS 1')
     sessionService.getBrowserInfoFromUserAgent = jest.fn().mockReturnValue('Firefox 1')
 
-    roleService = {} as jest.Mocked<RoleServiceInterface>
-    roleService.userHasPermission = jest.fn().mockReturnValue(true)
-
-    setting = {
-      uuid: '3-4-5',
-      value: MuteSignInEmailsOption.NotMuted,
-    } as jest.Mocked<Setting>
-
-    settingService = {} as jest.Mocked<SettingServiceInterface>
-    settingService.findSettingWithDecryptedValue = jest.fn().mockReturnValue(setting)
-    settingService.createOrReplace = jest.fn().mockReturnValue({
-      status: 'created',
-      setting,
-    })
-
     pkceRepository = {} as jest.Mocked<PKCERepositoryInterface>
     pkceRepository.removeCodeChallenge = jest.fn().mockReturnValue(true)
 
@@ -118,18 +94,33 @@ describe('SignIn', () => {
       authResponse: { foo: 'bar' },
     })
 
-    expect(domainEventFactory.createUserSignedInEvent).toHaveBeenCalledWith({
+    expect(domainEventFactory.createEmailRequestedEvent).toHaveBeenCalled()
-      browser: 'Firefox 1',
-      device: 'iOS 1',
-      userEmail: 'test@test.com',
-      userUuid: '1-2-3',
-      signInAlertEnabled: true,
-      muteSignInEmailsSettingUuid: '3-4-5',
-    })
     expect(domainEventPublisher.publish).toHaveBeenCalled()
   })
 
-  it('should not sign in a user without code verifier', async () => {
+  it('should not sign in 004 user without code verifier', async () => {
+    expect(
+      await createUseCase().execute({
+        email: 'test@test.te',
+        password: 'qweqwe123123',
+        userAgent: 'Google Chrome',
+        apiVersion: '20190520',
+        ephemeralSession: false,
+      }),
+    ).toEqual({
+      success: false,
+      errorCode: 410,
+      errorMessage: 'Please update your client application.',
+    })
+  })
+
+  it('should not sign in 005 user without code verifier', async () => {
+    user = {
+      uuid: '1-2-3',
+      email: 'test@test.com',
+      version: '005',
+    } as jest.Mocked<User>
+
     expect(
       await createUseCase().execute({
         email: 'test@test.te',
@@ -160,92 +151,10 @@ describe('SignIn', () => {
       authResponse: { foo: 'bar' },
     })
 
-    expect(domainEventFactory.createUserSignedInEvent).toHaveBeenCalledWith({
+    expect(domainEventFactory.createEmailRequestedEvent).toHaveBeenCalled()
-      browser: 'Firefox 1',
-      device: 'iOS 1',
-      userEmail: 'test@test.com',
-      userUuid: '1-2-3',
-      signInAlertEnabled: true,
-      muteSignInEmailsSettingUuid: '3-4-5',
-    })
     expect(domainEventPublisher.publish).toHaveBeenCalled()
   })
 
-  it('should sign in a user and disable sign in alert if setting is configured', async () => {
-    setting = {
-      uuid: '3-4-5',
-      value: MuteSignInEmailsOption.Muted,
-    } as jest.Mocked<Setting>
-
-    settingService.findSettingWithDecryptedValue = jest.fn().mockReturnValue(setting)
-
-    expect(
-      await createUseCase().execute({
-        email: 'test@test.te',
-        password: 'qweqwe123123',
-        userAgent: 'Google Chrome',
-        apiVersion: '20190520',
-        ephemeralSession: false,
-        codeVerifier: 'test',
-      }),
-    ).toEqual({
-      success: true,
-      authResponse: { foo: 'bar' },
-    })
-
-    expect(domainEventFactory.createUserSignedInEvent).toHaveBeenCalledWith({
-      browser: 'Firefox 1',
-      device: 'iOS 1',
-      userEmail: 'test@test.com',
-      userUuid: '1-2-3',
-      signInAlertEnabled: false,
-      muteSignInEmailsSettingUuid: '3-4-5',
-    })
-    expect(domainEventPublisher.publish).toHaveBeenCalled()
-  })
-
-  it('should sign in a user and create mute sign in email setting if it does not exist', async () => {
-    settingService.findSettingWithDecryptedValue = jest.fn().mockReturnValue(null)
-
-    expect(
-      await createUseCase().execute({
-        email: 'test@test.te',
-        password: 'qweqwe123123',
-        userAgent: 'Google Chrome',
-        apiVersion: '20190520',
-        ephemeralSession: false,
-        codeVerifier: 'test',
-      }),
-    ).toEqual({
-      success: true,
-      authResponse: { foo: 'bar' },
-    })
-
-    expect(domainEventFactory.createUserSignedInEvent).toHaveBeenCalledWith({
-      browser: 'Firefox 1',
-      device: 'iOS 1',
-      userEmail: 'test@test.com',
-      userUuid: '1-2-3',
-      signInAlertEnabled: true,
-      muteSignInEmailsSettingUuid: '3-4-5',
-    })
-    expect(domainEventPublisher.publish).toHaveBeenCalled()
-    expect(settingService.createOrReplace).toHaveBeenCalledWith({
-      props: {
-        name: 'MUTE_SIGN_IN_EMAILS',
-        sensitive: false,
-        serverEncryptionVersion: 0,
-        unencryptedValue: 'not_muted',
-      },
-      user: {
-        email: 'test@test.com',
-        encryptedPassword: '$2a$11$K3g6XoTau8VmLJcai1bB0eD9/YvBSBRtBhMprJOaVZ0U3SgasZH3a',
-        uuid: '1-2-3',
-        version: '004',
-      },
-    })
-  })
-
   it('should sign in a user even if publishing a sign in event fails', async () => {
     domainEventPublisher.publish = jest.fn().mockImplementation(() => {
       throw new Error('Oops')

packages/auth/src/Domain/UseCase/SignIn.ts

@@ -1,18 +1,12 @@
 import * as bcrypt from 'bcryptjs'
 import { DomainEventPublisherInterface } from '@standardnotes/domain-events'
-import { PermissionName } from '@standardnotes/features'
-import { MuteSignInEmailsOption, SettingName } from '@standardnotes/settings'
 
 import { inject, injectable } from 'inversify'
 import { Logger } from 'winston'
 import TYPES from '../../Bootstrap/Types'
 import { AuthResponseFactoryResolverInterface } from '../Auth/AuthResponseFactoryResolverInterface'
-import { EncryptionVersion } from '../Encryption/EncryptionVersion'
 import { DomainEventFactoryInterface } from '../Event/DomainEventFactoryInterface'
-import { RoleServiceInterface } from '../Role/RoleServiceInterface'
 import { SessionServiceInterface } from '../Session/SessionServiceInterface'
-import { Setting } from '../Setting/Setting'
-import { SettingServiceInterface } from '../Setting/SettingServiceInterface'
 import { User } from '../User/User'
 import { UserRepositoryInterface } from '../User/UserRepositoryInterface'
 import { SignInDTO } from './SignInDTO'
@@ -21,8 +15,10 @@ import { UseCaseInterface } from './UseCaseInterface'
 import { PKCERepositoryInterface } from '../User/PKCERepositoryInterface'
 import { CrypterInterface } from '../Encryption/CrypterInterface'
 import { SignInDTOV2Challenged } from './SignInDTOV2Challenged'
-import { ProtocolVersion } from '@standardnotes/common'
+import { leftVersionGreaterThanOrEqualToRight, ProtocolVersion } from '@standardnotes/common'
 import { HttpStatusCode } from '@standardnotes/api'
+import { EmailLevel } from '@standardnotes/domain-core'
+import { getBody, getSubject } from '../Email/UserSignedIn'
 
 @injectable()
 export class SignIn implements UseCaseInterface {
@@ -33,8 +29,6 @@ export class SignIn implements UseCaseInterface {
     @inject(TYPES.DomainEventPublisher) private domainEventPublisher: DomainEventPublisherInterface,
     @inject(TYPES.DomainEventFactory) private domainEventFactory: DomainEventFactoryInterface,
     @inject(TYPES.SessionService) private sessionService: SessionServiceInterface,
-    @inject(TYPES.RoleService) private roleService: RoleServiceInterface,
-    @inject(TYPES.SettingService) private settingService: SettingServiceInterface,
     @inject(TYPES.PKCERepository) private pkceRepository: PKCERepositoryInterface,
     @inject(TYPES.Crypter) private crypter: CrypterInterface,
     @inject(TYPES.Logger) private logger: Logger,
@@ -65,7 +59,12 @@ export class SignIn implements UseCaseInterface {
       }
     }
 
-    if (user.version === ProtocolVersion.V004 && !performingCodeChallengedSignIn) {
+    const userVersionIs004OrGreater = leftVersionGreaterThanOrEqualToRight(
+      user.version as ProtocolVersion,
+      ProtocolVersion.V004,
+    )
+
+    if (userVersionIs004OrGreater && !performingCodeChallengedSignIn) {
       return {
         success: false,
         errorMessage: 'Please update your client application.',
@@ -109,18 +108,18 @@ export class SignIn implements UseCaseInterface {
 
   private async sendSignInEmailNotification(user: User, userAgent: string): Promise<void> {
     try {
-      const muteSignInEmailsSetting = await this.findOrCreateMuteSignInEmailsSetting(user)
-
       await this.domainEventPublisher.publish(
-        this.domainEventFactory.createUserSignedInEvent({
+        this.domainEventFactory.createEmailRequestedEvent({
-          userUuid: user.uuid,
           userEmail: user.email,
-          device: this.sessionService.getOperatingSystemInfoFromUserAgent(userAgent),
+          level: EmailLevel.LEVELS.SignIn,
-          browser: this.sessionService.getBrowserInfoFromUserAgent(userAgent),
+          body: getBody(
-          signInAlertEnabled:
+            user.email,
-            (await this.roleService.userHasPermission(user.uuid, PermissionName.SignInAlerts)) &&
+            this.sessionService.getOperatingSystemInfoFromUserAgent(userAgent),
-            muteSignInEmailsSetting.value === MuteSignInEmailsOption.NotMuted,
+            this.sessionService.getBrowserInfoFromUserAgent(userAgent),
-          muteSignInEmailsSettingUuid: muteSignInEmailsSetting.uuid,
+            new Date(),
+          ),
+          messageIdentifier: 'SIGN_IN',
+          subject: getSubject(user.email),
         }),
       )
     } catch (error) {
@@ -128,29 +127,6 @@ export class SignIn implements UseCaseInterface {
     }
   }
 
-  private async findOrCreateMuteSignInEmailsSetting(user: User): Promise<Setting> {
-    const existingMuteSignInEmailsSetting = await this.settingService.findSettingWithDecryptedValue({
-      userUuid: user.uuid,
-      settingName: SettingName.MuteSignInEmails,
-    })
-
-    if (existingMuteSignInEmailsSetting !== null) {
-      return existingMuteSignInEmailsSetting
-    }
-
-    const createSettingResult = await this.settingService.createOrReplace({
-      user,
-      props: {
-        name: SettingName.MuteSignInEmails,
-        sensitive: false,
-        unencryptedValue: MuteSignInEmailsOption.NotMuted,
-        serverEncryptionVersion: EncryptionVersion.Unencrypted,
-      },
-    })
-
-    return createSettingResult.setting
-  }
-
   private isCodeChallengedVersion(dto: SignInDTO): dto is SignInDTOV2Challenged {
     return (dto as SignInDTOV2Challenged).codeVerifier !== undefined
   }

packages/domain-events-infra/CHANGELOG.md

@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.9.41](https://github.com/standardnotes/server/compare/@standardnotes/domain-events-infra@1.9.40...@standardnotes/domain-events-infra@1.9.41) (2022-12-07)
+
+**Note:** Version bump only for package @standardnotes/domain-events-infra
+
+## [1.9.40](https://github.com/standardnotes/server/compare/@standardnotes/domain-events-infra@1.9.39...@standardnotes/domain-events-infra@1.9.40) (2022-12-07)
+
+**Note:** Version bump only for package @standardnotes/domain-events-infra
+
 ## [1.9.39](https://github.com/standardnotes/server/compare/@standardnotes/domain-events-infra@1.9.38...@standardnotes/domain-events-infra@1.9.39) (2022-12-07)
 
 **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.39",
+  "version": "1.9.41",
   "engines": {
     "node": ">=18.0.0 <19.0.0"
   },

packages/domain-events/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.
 
+# [2.96.0](https://github.com/standardnotes/server/compare/@standardnotes/domain-events@2.95.0...@standardnotes/domain-events@2.96.0) (2022-12-07)
+
+### Features
+
+* **auth:** replace user signed in events with email requested ([e48cca6](https://github.com/standardnotes/server/commit/e48cca6b45b02876f2d82b726c1d2f124d90b587))
+
+# [2.95.0](https://github.com/standardnotes/server/compare/@standardnotes/domain-events@2.94.1...@standardnotes/domain-events@2.95.0) (2022-12-07)
+
+### Features
+
+* **domain-events:** add email requested event ([fa75aa4](https://github.com/standardnotes/server/commit/fa75aa40f036dc3b9b4ed1364bffdbba6dec4da4))
+
 ## [2.94.1](https://github.com/standardnotes/server/compare/@standardnotes/domain-events@2.94.0...@standardnotes/domain-events@2.94.1) (2022-12-07)
 
 ### Bug Fixes

packages/domain-events/package.json

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

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

@@ -1,7 +0,0 @@
-import { DomainEventInterface } from './DomainEventInterface'
-import { EmailMessageRequestedEventPayload } from './EmailMessageRequestedEventPayload'
-
-export interface EmailMessageRequestedEvent extends DomainEventInterface {
-  type: 'EMAIL_MESSAGE_REQUESTED'
-  payload: EmailMessageRequestedEventPayload
-}

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

@@ -1,5 +0,0 @@
-export interface EmailMessageRequestedEventPayload {
-  userEmail: string
-  messageIdentifier: string
-  context: Record<string, unknown>
-}

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

@@ -0,0 +1,7 @@
+import { DomainEventInterface } from './DomainEventInterface'
+import { EmailRequestedEventPayload } from './EmailRequestedEventPayload'
+
+export interface EmailRequestedEvent extends DomainEventInterface {
+  type: 'EMAIL_REQUESTED'
+  payload: EmailRequestedEventPayload
+}

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

@@ -0,0 +1,7 @@
+export interface EmailRequestedEventPayload {
+  userEmail: string
+  messageIdentifier: string
+  level: string
+  subject: string
+  body: string
+}

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

@@ -1,7 +0,0 @@
-import { DomainEventInterface } from './DomainEventInterface'
-import { UserSignedInEventPayload } from './UserSignedInEventPayload'
-
-export interface UserSignedInEvent extends DomainEventInterface {
-  type: 'USER_SIGNED_IN'
-  payload: UserSignedInEventPayload
-}

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

@@ -1,10 +0,0 @@
-import { Uuid } from '@standardnotes/common'
-
-export interface UserSignedInEventPayload {
-  userUuid: string
-  userEmail: string
-  signInAlertEnabled: boolean
-  muteSignInEmailsSettingUuid: Uuid
-  device: string
-  browser?: string
-}

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

@@ -28,8 +28,8 @@ export * from './Event/EmailBackupAttachmentCreatedEvent'
 export * from './Event/EmailBackupAttachmentCreatedEventPayload'
 export * from './Event/EmailBackupRequestedEvent'
 export * from './Event/EmailBackupRequestedEventPayload'
-export * from './Event/EmailMessageRequestedEvent'
+export * from './Event/EmailRequestedEvent'
-export * from './Event/EmailMessageRequestedEventPayload'
+export * from './Event/EmailRequestedEventPayload'
 export * from './Event/ExitDiscountAppliedEvent'
 export * from './Event/ExitDiscountAppliedEventPayload'
 export * from './Event/ExitDiscountApplyRequestedEvent'
@@ -118,8 +118,6 @@ export * from './Event/UserRegisteredEvent'
 export * from './Event/UserRegisteredEventPayload'
 export * from './Event/UserRolesChangedEvent'
 export * from './Event/UserRolesChangedEventPayload'
-export * from './Event/UserSignedInEvent'
-export * from './Event/UserSignedInEventPayload'
 export * from './Event/WebSocketMessageRequestedEvent'
 export * from './Event/WebSocketMessageRequestedEventPayload'
 export * from './Event/WorkspaceInviteAcceptedEvent'

packages/event-store/CHANGELOG.md

@@ -3,6 +3,21 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.6.38](https://github.com/standardnotes/server/compare/@standardnotes/event-store@1.6.37...@standardnotes/event-store@1.6.38) (2022-12-07)
+
+### Bug Fixes
+
+* **event-store:** add email requested subscription ([eff0945](https://github.com/standardnotes/server/commit/eff09454c3a28b0124b74c2850fed19313b9e2b2))
+* **event-store:** reduce handlers ([473feba](https://github.com/standardnotes/server/commit/473feba6a8f008c9d73238be82e1d197082464c0))
+
+## [1.6.37](https://github.com/standardnotes/server/compare/@standardnotes/event-store@1.6.36...@standardnotes/event-store@1.6.37) (2022-12-07)
+
+**Note:** Version bump only for package @standardnotes/event-store
+
+## [1.6.36](https://github.com/standardnotes/server/compare/@standardnotes/event-store@1.6.35...@standardnotes/event-store@1.6.36) (2022-12-07)
+
+**Note:** Version bump only for package @standardnotes/event-store
+
 ## [1.6.35](https://github.com/standardnotes/server/compare/@standardnotes/event-store@1.6.34...@standardnotes/event-store@1.6.35) (2022-12-07)
 
 **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.35",
+  "version": "1.6.38",
   "description": "Event Store Service",
   "private": true,
   "main": "dist/src/index.js",

packages/event-store/src/Bootstrap/Container.ts

@@ -78,7 +78,7 @@ export class ContainerConfigLoader {
       ['LISTED_ACCOUNT_REQUESTED', container.get(TYPES.EventHandler)],
       ['LISTED_ACCOUNT_CREATED', container.get(TYPES.EventHandler)],
       ['LISTED_ACCOUNT_DELETED', container.get(TYPES.EventHandler)],
-      ['USER_SIGNED_IN', container.get(TYPES.EventHandler)],
+      ['EMAIL_REQUESTED', container.get(TYPES.EventHandler)],
       ['SHARED_SUBSCRIPTION_INVITATION_CREATED', container.get(TYPES.EventHandler)],
       ['EMAIL_BACKUP_ATTACHMENT_CREATED', container.get(TYPES.EventHandler)],
       ['EMAIL_BACKUP_REQUESTED', container.get(TYPES.EventHandler)],

packages/files/CHANGELOG.md

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

packages/files/package.json

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

packages/revisions/CHANGELOG.md

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

packages/revisions/package.json

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

packages/scheduler/CHANGELOG.md

@@ -3,6 +3,26 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.14.2](https://github.com/standardnotes/server/compare/@standardnotes/scheduler-server@1.14.1...@standardnotes/scheduler-server@1.14.2) (2022-12-07)
+
+**Note:** Version bump only for package @standardnotes/scheduler-server
+
+## [1.14.1](https://github.com/standardnotes/server/compare/@standardnotes/scheduler-server@1.14.0...@standardnotes/scheduler-server@1.14.1) (2022-12-07)
+
+### Bug Fixes
+
+* **scheduler:** importing email contents ([c52bb93](https://github.com/standardnotes/server/commit/c52bb93d794447f04d3ea173f0aac9f26e4eba20))
+
+# [1.14.0](https://github.com/standardnotes/server/compare/@standardnotes/scheduler-server@1.13.37...@standardnotes/scheduler-server@1.14.0) (2022-12-07)
+
+### Features
+
+* **scheduler:** add scheduled emails contents ([6e0855f](https://github.com/standardnotes/server/commit/6e0855f9b32c230c9ad5594fb6af6dd460300fc1))
+
+## [1.13.37](https://github.com/standardnotes/server/compare/@standardnotes/scheduler-server@1.13.36...@standardnotes/scheduler-server@1.13.37) (2022-12-07)
+
+**Note:** Version bump only for package @standardnotes/scheduler-server
+
 ## [1.13.36](https://github.com/standardnotes/server/compare/@standardnotes/scheduler-server@1.13.35...@standardnotes/scheduler-server@1.13.36) (2022-12-07)
 
 **Note:** Version bump only for package @standardnotes/scheduler-server

packages/scheduler/jest.config.js

@@ -7,4 +7,5 @@ module.exports = {
   transform: {
     ...tsjPreset.transform,
   },
+  coveragePathIgnorePatterns: ['/Bootstrap/', '/Infra/', '/Domain/Email/', '/Domain/Event/'],
 }

packages/scheduler/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/scheduler-server",
-  "version": "1.13.36",
+  "version": "1.14.2",
   "engines": {
     "node": ">=18.0.0 <19.0.0"
   },
@@ -27,6 +27,7 @@
     "@newrelic/winston-enricher": "^4.0.0",
     "@sentry/node": "^7.19.0",
     "@standardnotes/common": "workspace:*",
+    "@standardnotes/domain-core": "workspace:^",
     "@standardnotes/domain-events": "workspace:*",
     "@standardnotes/domain-events-infra": "workspace:*",
     "@standardnotes/predicates": "workspace:*",

packages/scheduler/src/Domain/Email/EncourageEmailBackups.ts

@@ -0,0 +1,9 @@
+import { html } from './encourage-email-backups.html'
+
+export function getSubject(): string {
+  return 'Enable email backups for your account'
+}
+
+export function getBody(): string {
+  return html
+}

packages/scheduler/src/Domain/Email/EncourageSubscriptionPurchasing.ts

@@ -0,0 +1,11 @@
+import { html } from './encourage-subscription-purchasing.html'
+
+export function getSubject(): string {
+  return 'Checking in after one month with Standard Notes'
+}
+
+export function getBody(registrationDate: string): string {
+  const body = html
+
+  return body.replace('%%REGISTRATION_DATE%%', registrationDate)
+}

packages/scheduler/src/Domain/Email/ExitInterview.ts

@@ -0,0 +1,9 @@
+import { html } from './exit-interview.html'
+
+export function getSubject(): string {
+  return 'Can we ask why you canceled?'
+}
+
+export function getBody(): string {
+  return html
+}

packages/scheduler/src/Domain/Email/encourage-email-backups.html.ts

@@ -0,0 +1,18 @@
+export const html = `<div>
+  <p>
+    Did you know you can enable daily email backups for your account? This <strong>free</strong> feature sends an
+    email to your inbox with an encrypted backup file including all your notes and tags.
+  </p>
+  <p>
+    Email backups are an important feature that help protect you against worst-case scenarios. Your backups can be
+    used to restore your account to a previous state, or to import old versions of notes into your present
+    account.
+  </p>
+  <p>
+    To enable free email backups, use the Standard Notes web or desktop app, and open Preferences > Backups > Email Backups.
+  </p>
+
+  <a href="https://standardnotes.com/help/28/how-do-i-enable-daily-email-backups">
+    Learn more about daily email backups →
+  </a>
+</div>`

packages/scheduler/src/Domain/Email/encourage-subscription-purchasing.html.ts

@@ -0,0 +1,84 @@
+export const html = `<div>
+  <p>Hi there,</p>
+  <p>
+    We hope you've been finding great use out of Standard Notes. We built Standard Notes to be a secure place for
+    your most sensitive notes and files.
+  </p>
+  <p>
+    As a reminder,
+    <strong>
+      <em>you signed up for the Standard Notes free plan on %%REGISTRATION_DATE%%</em>
+    </strong>
+    Your free account comes with standard features like end-to-end encryption, multiple-device sync, and
+    two-factor authentication.
+  </p>
+  <p>
+    If you're ready to advance your usage of Standard Notes, we recommend upgrading to one of our more powerful
+    plans.
+  </p>
+  <ul>
+    <li>
+      <p>
+        <strong>Productivity</strong> <strong>($59/year)</strong> powers up your editing experience with unique
+        and special-built note-types for markdown, rich text, spreadsheets, todo, and more.
+      </p>
+    </li>
+    <li>
+      <p>
+        <strong>Professional</strong> <strong>($99/year)</strong> gives you all the power of Productivity plus
+        100GB of end-to-end encrypted file storage for your private photos, videos, and documents, plus family
+        subscription sharing with up to 5 people.
+      </p>
+    </li>
+  </ul>
+  <p>
+    Professional comes with a 90-day money back guarantee, so if you're not completely satisfied, we're happy to
+    refund your full purchase amount.
+  </p>
+  <p>
+    <strong>
+      <a href="https://standardnotes.com/plans">Upgrade your plan →</a>
+    </strong>
+  </p>
+  <p>
+    <strong>
+      <a href="https://standardnotes.com/features">Learn more about the features →</a>
+    </strong>
+  </p>
+  <p>
+    <strong>Questions & Answers</strong>
+  </p>
+  <p>
+    <em>How does Standard Notes compare with conventional note-taking apps?</em>
+  </p>
+  <p>
+    Data you store with Standard Notes is encrypted with end-to-end encryption using a key only you know. Because
+    of this, we can't read your notes, and neither can anyone else.
+  </p>
+  <p>
+    <em>What kind of notes should I store in Standard Notes?</em>
+  </p>
+  <p>
+    This question can be reframed as: "What shouldn't I store in non-private services?" This would include
+    sensitive/sensual data related to your health and wellness, secrets and keys, notes and documents with
+    personally identifiable information that, if leaked, would lead to the theft of your identity, and business,
+    financial, or legal information which cover non-public or confidential information.
+  </p>
+  <p>
+    <em>Where can I access my notes?</em>
+  </p>
+  <p>
+    Providing you with easy access to your notes and files on all your devices is a key focus for us. We provide
+    secure and well-designed applications for your web browser, desktop (macOS, Windows, Linux,) and mobile
+    (Android and iOS).
+  </p>
+  <p>
+    <em>I have more questions.</em>
+  </p>
+  <p>
+    We love questions. Head over to our Help page to see if your question is answered there. If not, reply
+    directly to this email or send an email to <a href="help@standardnotes.com">help@standardnotes.com</a> and
+    we'd be happy to help.
+  </p>
+</div>
+`

packages/scheduler/src/Domain/Email/exit-interview.html.ts

@@ -0,0 +1,29 @@
+export const html = `<div>
+  <p>
+    We're truly sad to see you leave. Our mission is simple: build the best, most private, and most secure
+    note-taking app available. It's clear we've fallen short of your expectations somewhere along the way.
+  </p>
+  <p>
+    We just want you to know—if price was the reason you canceled, we're not willing to lose you. That's no issue
+    for us and we're happy to work out something that fits better with your budget. If price is your primary
+    concern, please click the link below, and we'll get in touch with some options.
+  </p>
+  <a href="https://app.standardnotes.com/?user-request=exit-discount">Apply For A Limited Discount Offer →</a>
+  <p>
+    If you canceled for another reason, such as a missing feature, or a feature that wasn't behaving or working as
+    you expected, please let us know! We build this product for you, and feedback from customers like yourself who
+    are willing to pay for a product is most crucial for us as we continue to evolve and iterate on Standard
+    Notes.
+  </p>
+  <p>If you have a minute, please fill out this brief exit interview: </p>
+  <a href="https://standardnotes.typeform.com/to/dX5lzPtm">Short Exit Interview →</a>
+  <p>
+    Our team reads every single response, and your feedback will be shared with the relevant department within our
+    team.
+  </p>
+  <p>
+    If you have any other thoughts or questions, please feel free to reply directly to this email, and a member of
+    our support team will be in touch with you.
+  </p>
+</div>
+`

packages/scheduler/src/Domain/Event/DomainEventFactory.spec.ts

@@ -1,223 +0,0 @@
-import 'reflect-metadata'
-
-import { EmailMessageIdentifier } from '@standardnotes/common'
-import { TimerInterface } from '@standardnotes/time'
-
-import { DomainEventFactory } from './DomainEventFactory'
-import { PredicateAuthority, PredicateName } from '@standardnotes/predicates'
-import { Job } from '../Job/Job'
-import { Predicate } from '../Predicate/Predicate'
-
-describe('DomainEventFactory', () => {
-  let timer: TimerInterface
-
-  const createFactory = () => new DomainEventFactory(timer)
-
-  beforeEach(() => {
-    timer = {} as jest.Mocked<TimerInterface>
-    timer.getTimestampInMicroseconds = jest.fn().mockReturnValue(1)
-    timer.getUTCDate = jest.fn().mockReturnValue(new Date(1))
-  })
-
-  it('should create a DISCOUNT_APPLY_REQUESTED event', () => {
-    expect(
-      createFactory().createDiscountApplyRequestedEvent({
-        userEmail: 'test@test.te',
-        discountCode: 'off-10',
-      }),
-    ).toEqual({
-      createdAt: expect.any(Date),
-      meta: {
-        correlation: {
-          userIdentifier: 'test@test.te',
-          userIdentifierType: 'email',
-        },
-        origin: 'scheduler',
-      },
-      payload: {
-        userEmail: 'test@test.te',
-        discountCode: 'off-10',
-      },
-      type: 'DISCOUNT_APPLY_REQUESTED',
-    })
-  })
-
-  it('should create a DISCOUNT_WITHDRAW_REQUESTED event', () => {
-    expect(
-      createFactory().createDiscountWithdrawRequestedEvent({
-        userEmail: 'test@test.te',
-        discountCode: 'off-10',
-      }),
-    ).toEqual({
-      createdAt: expect.any(Date),
-      meta: {
-        correlation: {
-          userIdentifier: 'test@test.te',
-          userIdentifierType: 'email',
-        },
-        origin: 'scheduler',
-      },
-      payload: {
-        userEmail: 'test@test.te',
-        discountCode: 'off-10',
-      },
-      type: 'DISCOUNT_WITHDRAW_REQUESTED',
-    })
-  })
-
-  it('should create a EXIT_DISCOUNT_WITHDRAW_REQUESTED event', () => {
-    expect(
-      createFactory().createExitDiscountWithdrawRequestedEvent({
-        userEmail: 'test@test.te',
-        discountCode: 'exit-20',
-      }),
-    ).toEqual({
-      createdAt: expect.any(Date),
-      meta: {
-        correlation: {
-          userIdentifier: 'test@test.te',
-          userIdentifierType: 'email',
-        },
-        origin: 'scheduler',
-      },
-      payload: {
-        userEmail: 'test@test.te',
-        discountCode: 'exit-20',
-      },
-      type: 'EXIT_DISCOUNT_WITHDRAW_REQUESTED',
-    })
-  })
-
-  it('should create a EMAIL_MESSAGE_REQUESTED event', () => {
-    expect(
-      createFactory().createEmailMessageRequestedEvent({
-        userEmail: 'test@test.te',
-        messageIdentifier: EmailMessageIdentifier.ENCOURAGE_EMAIL_BACKUPS,
-        context: {
-          foo: 'bar',
-        },
-      }),
-    ).toEqual({
-      createdAt: expect.any(Date),
-      meta: {
-        correlation: {
-          userIdentifier: 'test@test.te',
-          userIdentifierType: 'email',
-        },
-        origin: 'scheduler',
-      },
-      payload: {
-        messageIdentifier: 'ENCOURAGE_EMAIL_BACKUPS',
-        userEmail: 'test@test.te',
-        context: {
-          foo: 'bar',
-        },
-      },
-      type: 'EMAIL_MESSAGE_REQUESTED',
-    })
-  })
-
-  it('should create a PREDICATE_VERIFICATION_REQUESTED event dedicated for auth', () => {
-    expect(
-      createFactory().createPredicateVerificationRequestedEvent(
-        {
-          uuid: '1-2-3',
-          userIdentifier: '2-3-4',
-          userIdentifierType: 'uuid',
-        } as jest.Mocked<Job>,
-        {
-          authority: PredicateAuthority.Auth,
-          name: PredicateName.EmailBackupsEnabled,
-          status: 'pending',
-        } as jest.Mocked<Predicate>,
-      ),
-    ).toEqual({
-      createdAt: expect.any(Date),
-      meta: {
-        correlation: {
-          userIdentifier: '2-3-4',
-          userIdentifierType: 'uuid',
-        },
-        origin: 'scheduler',
-        target: 'auth',
-      },
-      payload: {
-        predicate: {
-          authority: 'auth',
-          jobUuid: '1-2-3',
-          name: 'email-backups-enabled',
-        },
-      },
-      type: 'PREDICATE_VERIFICATION_REQUESTED',
-    })
-  })
-
-  it('should create a PREDICATE_VERIFICATION_REQUESTED event dedicated for syncing server', () => {
-    expect(
-      createFactory().createPredicateVerificationRequestedEvent(
-        {
-          uuid: '1-2-3',
-          userIdentifier: '2-3-4',
-          userIdentifierType: 'uuid',
-        } as jest.Mocked<Job>,
-        {
-          authority: PredicateAuthority.SyncingServer,
-          name: PredicateName.EmailBackupsEnabled,
-          status: 'pending',
-        } as jest.Mocked<Predicate>,
-      ),
-    ).toEqual({
-      createdAt: expect.any(Date),
-      meta: {
-        correlation: {
-          userIdentifier: '2-3-4',
-          userIdentifierType: 'uuid',
-        },
-        origin: 'scheduler',
-        target: 'syncing-server',
-      },
-      payload: {
-        predicate: {
-          authority: 'syncing-server',
-          jobUuid: '1-2-3',
-          name: 'email-backups-enabled',
-        },
-      },
-      type: 'PREDICATE_VERIFICATION_REQUESTED',
-    })
-  })
-
-  it('should create a PREDICATE_VERIFICATION_REQUESTED event dedicated for unknown target', () => {
-    expect(
-      createFactory().createPredicateVerificationRequestedEvent(
-        {
-          uuid: '1-2-3',
-          userIdentifier: '2-3-4',
-          userIdentifierType: 'uuid',
-        } as jest.Mocked<Job>,
-        {
-          authority: 'foobar' as PredicateAuthority,
-          name: PredicateName.EmailBackupsEnabled,
-          status: 'pending',
-        } as jest.Mocked<Predicate>,
-      ),
-    ).toEqual({
-      createdAt: expect.any(Date),
-      meta: {
-        correlation: {
-          userIdentifier: '2-3-4',
-          userIdentifierType: 'uuid',
-        },
-        origin: 'scheduler',
-      },
-      payload: {
-        predicate: {
-          authority: 'foobar',
-          jobUuid: '1-2-3',
-          name: 'email-backups-enabled',
-        },
-      },
-      type: 'PREDICATE_VERIFICATION_REQUESTED',
-    })
-  })
-})

packages/scheduler/src/Domain/Event/DomainEventFactory.ts

@@ -1,9 +1,8 @@
-import { EmailMessageIdentifier } from '@standardnotes/common'
 import {
   DiscountApplyRequestedEvent,
   DiscountWithdrawRequestedEvent,
   DomainEventService,
-  EmailMessageRequestedEvent,
+  EmailRequestedEvent,
   ExitDiscountWithdrawRequestedEvent,
   PredicateVerificationRequestedEvent,
 } from '@standardnotes/domain-events'
@@ -70,13 +69,15 @@ export class DomainEventFactory implements DomainEventFactoryInterface {
     }
   }
 
-  createEmailMessageRequestedEvent(dto: {
+  createEmailRequestedEvent(dto: {
     userEmail: string
-    messageIdentifier: EmailMessageIdentifier
+    messageIdentifier: string
-    context: Record<string, unknown>
+    level: string
-  }): EmailMessageRequestedEvent {
+    body: string
+    subject: string
+  }): EmailRequestedEvent {
     return {
-      type: 'EMAIL_MESSAGE_REQUESTED',
+      type: 'EMAIL_REQUESTED',
       createdAt: this.timer.getUTCDate(),
       meta: {
         correlation: {

packages/scheduler/src/Domain/Event/DomainEventFactoryInterface.ts

@@ -1,8 +1,7 @@
-import { EmailMessageIdentifier } from '@standardnotes/common'
 import {
   DiscountApplyRequestedEvent,
   DiscountWithdrawRequestedEvent,
-  EmailMessageRequestedEvent,
+  EmailRequestedEvent,
   ExitDiscountWithdrawRequestedEvent,
   PredicateVerificationRequestedEvent,
 } from '@standardnotes/domain-events'
@@ -12,11 +11,13 @@ import { Predicate } from '../Predicate/Predicate'
 
 export interface DomainEventFactoryInterface {
   createPredicateVerificationRequestedEvent(job: Job, predicate: Predicate): PredicateVerificationRequestedEvent
-  createEmailMessageRequestedEvent(dto: {
+  createEmailRequestedEvent(dto: {
     userEmail: string
-    messageIdentifier: EmailMessageIdentifier
+    messageIdentifier: string
-    context: Record<string, unknown>
+    level: string
-  }): EmailMessageRequestedEvent
+    body: string
+    subject: string
+  }): EmailRequestedEvent
   createDiscountApplyRequestedEvent(dto: { userEmail: string; discountCode: string }): DiscountApplyRequestedEvent
   createDiscountWithdrawRequestedEvent(dto: { userEmail: string; discountCode: string }): DiscountWithdrawRequestedEvent
   createExitDiscountWithdrawRequestedEvent(dto: {

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

@@ -6,6 +6,7 @@ import {
   ExitDiscountWithdrawRequestedEvent,
 } from '@standardnotes/domain-events'
 import { PredicateName } from '@standardnotes/predicates'
+import { TimerInterface } from '@standardnotes/time'
 import 'reflect-metadata'
 import { Logger } from 'winston'
 import { DomainEventFactoryInterface } from '../Event/DomainEventFactoryInterface'
@@ -26,13 +27,17 @@ describe('JobDoneInterpreter', () => {
   let domainEventPublisher: DomainEventPublisherInterface
   let job: Job
   let logger: Logger
+  let timer: TimerInterface
 
   const createInterpreter = () =>
-    new JobDoneInterpreter(jobRepository, predicateRepository, domainEventFactory, domainEventPublisher, logger)
+    new JobDoneInterpreter(jobRepository, predicateRepository, domainEventFactory, domainEventPublisher, timer, logger)
 
   beforeEach(() => {
     job = {} as jest.Mocked<Job>
 
+    timer = {} as jest.Mocked<TimerInterface>
+    timer.convertMicrosecondsToDate = jest.fn().mockReturnValue(new Date())
+
     jobRepository = {} as jest.Mocked<JobRepositoryInterface>
     jobRepository.findOneByUuid = jest.fn().mockReturnValue(job)
 
@@ -40,7 +45,7 @@ describe('JobDoneInterpreter', () => {
     predicateRepository.findByJobUuid = jest.fn().mockReturnValue([])
 
     domainEventFactory = {} as jest.Mocked<DomainEventFactoryInterface>
-    domainEventFactory.createEmailMessageRequestedEvent = jest
+    domainEventFactory.createEmailRequestedEvent = jest
       .fn()
       .mockReturnValue({} as jest.Mocked<EmailMessageRequestedEvent>)
     domainEventFactory.createDiscountApplyRequestedEvent = jest
@@ -89,11 +94,7 @@ describe('JobDoneInterpreter', () => {
 
     await createInterpreter().interpret('1-2-3')
 
-    expect(domainEventFactory.createEmailMessageRequestedEvent).toHaveBeenCalledWith({
+    expect(domainEventFactory.createEmailRequestedEvent).toHaveBeenCalled()
-      context: {},
-      messageIdentifier: 'ENCOURAGE_EMAIL_BACKUPS',
-      userEmail: 'test@test.te',
-    })
     expect(domainEventPublisher.publish).toHaveBeenCalled()
   })
 
@@ -111,7 +112,7 @@ describe('JobDoneInterpreter', () => {
 
     await createInterpreter().interpret('1-2-3')
 
-    expect(domainEventFactory.createEmailMessageRequestedEvent).not.toHaveBeenCalled()
+    expect(domainEventFactory.createEmailRequestedEvent).not.toHaveBeenCalled()
     expect(domainEventPublisher.publish).not.toHaveBeenCalled()
   })
 
@@ -124,7 +125,7 @@ describe('JobDoneInterpreter', () => {
 
     await createInterpreter().interpret('1-2-3')
 
-    expect(domainEventFactory.createEmailMessageRequestedEvent).not.toHaveBeenCalled()
+    expect(domainEventFactory.createEmailRequestedEvent).not.toHaveBeenCalled()
     expect(domainEventPublisher.publish).not.toHaveBeenCalled()
   })
 
@@ -143,11 +144,7 @@ describe('JobDoneInterpreter', () => {
 
     await createInterpreter().interpret('1-2-3')
 
-    expect(domainEventFactory.createEmailMessageRequestedEvent).toHaveBeenCalledWith({
+    expect(domainEventFactory.createEmailRequestedEvent).toHaveBeenCalled()
-      context: { userRegisteredAt: 123 },
-      messageIdentifier: 'ENCOURAGE_SUBSCRIPTION_PURCHASING',
-      userEmail: 'test@test.te',
-    })
     expect(domainEventPublisher.publish).toHaveBeenCalled()
   })
 
@@ -160,7 +157,7 @@ describe('JobDoneInterpreter', () => {
 
     await createInterpreter().interpret('1-2-3')
 
-    expect(domainEventFactory.createEmailMessageRequestedEvent).not.toHaveBeenCalled()
+    expect(domainEventFactory.createEmailRequestedEvent).not.toHaveBeenCalled()
     expect(domainEventPublisher.publish).not.toHaveBeenCalled()
   })
 
@@ -173,11 +170,7 @@ describe('JobDoneInterpreter', () => {
 
     await createInterpreter().interpret('1-2-3')
 
-    expect(domainEventFactory.createEmailMessageRequestedEvent).toHaveBeenCalledWith({
+    expect(domainEventFactory.createEmailRequestedEvent).toHaveBeenCalled()
-      context: {},
-      messageIdentifier: 'EXIT_INTERVIEW',
-      userEmail: 'test@test.te',
-    })
     expect(domainEventPublisher.publish).toHaveBeenCalled()
   })
 
@@ -190,7 +183,7 @@ describe('JobDoneInterpreter', () => {
 
     await createInterpreter().interpret('1-2-3')
 
-    expect(domainEventFactory.createEmailMessageRequestedEvent).not.toHaveBeenCalled()
+    expect(domainEventFactory.createEmailRequestedEvent).not.toHaveBeenCalled()
     expect(domainEventPublisher.publish).not.toHaveBeenCalled()
   })
 
@@ -295,7 +288,7 @@ describe('JobDoneInterpreter', () => {
 
     await createInterpreter().interpret('1-2-3')
 
-    expect(domainEventFactory.createEmailMessageRequestedEvent).not.toHaveBeenCalled()
+    expect(domainEventFactory.createEmailRequestedEvent).not.toHaveBeenCalled()
     expect(domainEventPublisher.publish).not.toHaveBeenCalled()
   })
 })

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

@@ -1,8 +1,9 @@
-import { EmailMessageIdentifier } from '@standardnotes/common'
 import { DomainEventPublisherInterface } from '@standardnotes/domain-events'
 import { PredicateName } from '@standardnotes/predicates'
 import { inject, injectable } from 'inversify'
 import { Logger } from 'winston'
+import { EmailLevel } from '@standardnotes/domain-core'
+import { TimerInterface } from '@standardnotes/time'
 
 import TYPES from '../../Bootstrap/Types'
 import { DomainEventFactoryInterface } from '../Event/DomainEventFactoryInterface'
@@ -13,6 +14,15 @@ import { Job } from './Job'
 import { JobDoneInterpreterInterface } from './JobDoneInterpreterInterface'
 import { JobName } from './JobName'
 import { JobRepositoryInterface } from './JobRepositoryInterface'
+import { getSubject as getExitInterviewSubject, getBody as getExitInterviewBody } from '../Email/ExitInterview'
+import {
+  getSubject as getEncourageEmailBackupsSubject,
+  getBody as getEncourageEmailBackupsBody,
+} from '../Email/EncourageEmailBackups'
+import {
+  getSubject as getEncourageSubscriptionPurchasingSubject,
+  getBody as getEncourageSubscriptionPurchasingBody,
+} from '../Email/EncourageSubscriptionPurchasing'
 
 @injectable()
 export class JobDoneInterpreter implements JobDoneInterpreterInterface {
@@ -21,6 +31,7 @@ export class JobDoneInterpreter implements JobDoneInterpreterInterface {
     @inject(TYPES.PredicateRepository) private predicateRepository: PredicateRepositoryInterface,
     @inject(TYPES.DomainEventFactory) private domainEventFactory: DomainEventFactoryInterface,
     @inject(TYPES.DomainEventPublisher) private domainEventPublisher: DomainEventPublisherInterface,
+    @inject(TYPES.Timer) private timer: TimerInterface,
     @inject(TYPES.Logger) private logger: Logger,
   ) {}
 
@@ -81,10 +92,12 @@ export class JobDoneInterpreter implements JobDoneInterpreterInterface {
     this.logger.debug(`[${job.uuid}]${job.name}: requesting email backup encouragement email.`)
 
     await this.domainEventPublisher.publish(
-      this.domainEventFactory.createEmailMessageRequestedEvent({
+      this.domainEventFactory.createEmailRequestedEvent({
         userEmail: job.userIdentifier,
-        messageIdentifier: EmailMessageIdentifier.ENCOURAGE_EMAIL_BACKUPS,
+        messageIdentifier: 'ENCOURAGE_EMAIL_BACKUPS',
-        context: {},
+        subject: getEncourageEmailBackupsSubject(),
+        body: getEncourageEmailBackupsBody(),
+        level: EmailLevel.LEVELS.System,
       }),
     )
   }
@@ -93,12 +106,14 @@ export class JobDoneInterpreter implements JobDoneInterpreterInterface {
     this.logger.debug(`[${job.uuid}]${job.name}: requesting subscription purchase encouragement email.`)
 
     await this.domainEventPublisher.publish(
-      this.domainEventFactory.createEmailMessageRequestedEvent({
+      this.domainEventFactory.createEmailRequestedEvent({
         userEmail: job.userIdentifier,
-        messageIdentifier: EmailMessageIdentifier.ENCOURAGE_SUBSCRIPTION_PURCHASING,
+        messageIdentifier: 'ENCOURAGE_SUBSCRIPTION_PURCHASING',
-        context: {
+        subject: getEncourageSubscriptionPurchasingSubject(),
-          userRegisteredAt: job.createdAt,
+        body: getEncourageSubscriptionPurchasingBody(
-        },
+          this.timer.convertMicrosecondsToDate(job.createdAt).toLocaleString(),
+        ),
+        level: EmailLevel.LEVELS.System,
       }),
     )
   }
@@ -107,10 +122,12 @@ export class JobDoneInterpreter implements JobDoneInterpreterInterface {
     this.logger.debug(`[${job.uuid}]${job.name}: requesting exit interview email.`)
 
     await this.domainEventPublisher.publish(
-      this.domainEventFactory.createEmailMessageRequestedEvent({
+      this.domainEventFactory.createEmailRequestedEvent({
         userEmail: job.userIdentifier,
-        messageIdentifier: EmailMessageIdentifier.EXIT_INTERVIEW,
+        messageIdentifier: 'EXIT_INTERVIEW',
-        context: {},
+        subject: getExitInterviewSubject(),
+        body: getExitInterviewBody(),
+        level: EmailLevel.LEVELS.System,
       }),
     )
   }

packages/syncing-server/CHANGELOG.md

@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.20.10](https://github.com/standardnotes/syncing-server-js/compare/@standardnotes/syncing-server@1.20.9...@standardnotes/syncing-server@1.20.10) (2022-12-07)
+
+**Note:** Version bump only for package @standardnotes/syncing-server
+
+## [1.20.9](https://github.com/standardnotes/syncing-server-js/compare/@standardnotes/syncing-server@1.20.8...@standardnotes/syncing-server@1.20.9) (2022-12-07)
+
+**Note:** Version bump only for package @standardnotes/syncing-server
+
 ## [1.20.8](https://github.com/standardnotes/syncing-server-js/compare/@standardnotes/syncing-server@1.20.7...@standardnotes/syncing-server@1.20.8) (2022-12-07)
 
 **Note:** Version bump only for package @standardnotes/syncing-server

packages/syncing-server/package.json

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

packages/websockets/CHANGELOG.md

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

packages/websockets/package.json

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

packages/workspace/CHANGELOG.md

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

packages/workspace/package.json

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

yarn.lock

@@ -2284,6 +2284,7 @@ __metadata:
     "@newrelic/winston-enricher": "npm:^4.0.0"
     "@sentry/node": "npm:^7.19.0"
     "@standardnotes/common": "workspace:*"
+    "@standardnotes/domain-core": "workspace:^"
     "@standardnotes/domain-events": "workspace:*"
     "@standardnotes/domain-events-infra": "workspace:*"
     "@standardnotes/predicates": "workspace:*"