chore(release): publish new version

- @standardnotes/analytics@2.34.2
 - @standardnotes/api-gateway@1.87.2
 - @standardnotes/auth-server@1.174.2
 - @standardnotes/domain-events-infra@1.22.2
 - @standardnotes/domain-events@2.138.0
 - @standardnotes/files-server@1.36.2
 - @standardnotes/home-server@1.22.2
 - @standardnotes/revisions-server@1.51.2
 - @standardnotes/scheduler-server@1.27.7
 - @standardnotes/syncing-server@1.127.0
 - @standardnotes/websockets-server@1.21.0

.github/workflows/publish.yml

@@ -4,6 +4,9 @@ on:
   push:
     branches: [ main ]
 
+permissions:
+  id-token: write
+
 jobs:
   build:
     if: contains(github.event.head_commit.message, 'chore(release)') == false

.pnp.cjs

@@ -7045,13 +7045,13 @@ const RAW_RUNTIME_STATE =
           ["@standardnotes/websockets-server", "workspace:packages/websockets"],\
           ["@aws-sdk/client-apigatewaymanagementapi", "npm:3.427.0"],\
           ["@aws-sdk/client-sqs", "npm:3.427.0"],\
-          ["@standardnotes/api", "npm:1.26.26"],\
           ["@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/responses", "npm:1.13.27"],\
           ["@standardnotes/security", "workspace:packages/security"],\
+          ["@standardnotes/time", "workspace:packages/time"],\
           ["@types/cors", "npm:2.8.13"],\
           ["@types/express", "npm:4.17.17"],\
           ["@types/ioredis", "npm:5.0.0"],\

packages/analytics/CHANGELOG.md

@@ -3,6 +3,30 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.34.2](https://github.com/standardnotes/server/compare/@standardnotes/analytics@2.34.1...@standardnotes/analytics@2.34.2) (2023-11-28)
+
+**Note:** Version bump only for package @standardnotes/analytics
+
+## [2.34.1](https://github.com/standardnotes/server/compare/@standardnotes/analytics@2.34.0...@standardnotes/analytics@2.34.1) (2023-11-27)
+
+### Bug Fixes
+
+* repository config in package.json files ([ed1bf37](https://github.com/standardnotes/server/commit/ed1bf37287af23a25b8388ada95f0acdec8f71ea))
+
+# [2.34.0](https://github.com/standardnotes/server/compare/@standardnotes/analytics@2.33.4...@standardnotes/analytics@2.34.0) (2023-11-27)
+
+### Features
+
+* add npm provenance to published packages ([e836abd](https://github.com/standardnotes/server/commit/e836abdef73d246940d8fffd9e65e17c64cd35c8))
+
+## [2.33.4](https://github.com/standardnotes/server/compare/@standardnotes/analytics@2.33.3...@standardnotes/analytics@2.33.4) (2023-11-23)
+
+**Note:** Version bump only for package @standardnotes/analytics
+
+## [2.33.3](https://github.com/standardnotes/server/compare/@standardnotes/analytics@2.33.2...@standardnotes/analytics@2.33.3) (2023-11-22)
+
+**Note:** Version bump only for package @standardnotes/analytics
+
 ## [2.33.2](https://github.com/standardnotes/server/compare/@standardnotes/analytics@2.33.1...@standardnotes/analytics@2.33.2) (2023-11-13)
 
 **Note:** Version bump only for package @standardnotes/analytics

packages/analytics/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/analytics",
-  "version": "2.33.2",
+  "version": "2.34.2",
   "engines": {
     "node": ">=18.0.0 <21.0.0"
   },
@@ -10,7 +10,13 @@
   "author": "Standard Notes",
   "types": "dist/src/index.d.ts",
   "publishConfig": {
-    "access": "public"
+    "access": "public",
+    "provenance": true
+  },
+  "repository": {
+    "type": "git",
+    "url": "git@github.com:standardnotes/server.git",
+    "directory": "packages/analytics"
   },
   "license": "AGPL-3.0-or-later",
   "scripts": {

packages/api-gateway/CHANGELOG.md

@@ -3,6 +3,42 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.87.2](https://github.com/standardnotes/server/compare/@standardnotes/api-gateway@1.87.1...@standardnotes/api-gateway@1.87.2) (2023-11-28)
+
+**Note:** Version bump only for package @standardnotes/api-gateway
+
+## [1.87.1](https://github.com/standardnotes/server/compare/@standardnotes/api-gateway@1.87.0...@standardnotes/api-gateway@1.87.1) (2023-11-27)
+
+### Bug Fixes
+
+* repository config in package.json files ([ed1bf37](https://github.com/standardnotes/server/commit/ed1bf37287af23a25b8388ada95f0acdec8f71ea))
+
+# [1.87.0](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.86.6...@standardnotes/api-gateway@1.87.0) (2023-11-27)
+
+### Features
+
+* add npm provenance to published packages ([e836abd](https://github.com/standardnotes/api-gateway/commit/e836abdef73d246940d8fffd9e65e17c64cd35c8))
+
+## [1.86.6](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.86.5...@standardnotes/api-gateway@1.86.6) (2023-11-23)
+
+**Note:** Version bump only for package @standardnotes/api-gateway
+
+## [1.86.5](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.86.4...@standardnotes/api-gateway@1.86.5) (2023-11-22)
+
+### Bug Fixes
+
+* error handling on gRPC ([#937](https://github.com/standardnotes/api-gateway/issues/937)) ([8f23c8a](https://github.com/standardnotes/api-gateway/commit/8f23c8ab3f03e9c23adfb31a33c5805492bc2f5b))
+
+## [1.86.4](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.86.3...@standardnotes/api-gateway@1.86.4) (2023-11-22)
+
+**Note:** Version bump only for package @standardnotes/api-gateway
+
+## [1.86.3](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.86.2...@standardnotes/api-gateway@1.86.3) (2023-11-21)
+
+### Bug Fixes
+
+* **api-gateway:** add meta field to grpc sync calls ([#934](https://github.com/standardnotes/api-gateway/issues/934)) ([c5c24b3](https://github.com/standardnotes/api-gateway/commit/c5c24b3ac9dbd559d96adc56270d724a3156ebd4))
+
 ## [1.86.2](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.86.1...@standardnotes/api-gateway@1.86.2) (2023-11-20)
 
 ### Bug Fixes

packages/api-gateway/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/api-gateway",
-  "version": "1.86.2",
+  "version": "1.87.2",
   "engines": {
     "node": ">=18.0.0 <21.0.0"
   },
@@ -11,11 +11,16 @@
     "dist/src/**/*.js",
     "dist/src/**/*.d.ts"
   ],
-  "repository": "git@github.com:standardnotes/api-gateway.git",
+  "repository": {
+    "type": "git",
+    "url": "git@github.com:standardnotes/server.git",
+    "directory": "packages/api-gateway"
+  },
   "author": "Karol Sójko <karol@standardnotes.com>",
   "license": "AGPL-3.0-or-later",
   "publishConfig": {
-    "access": "public"
+    "access": "public",
+    "provenance": true
   },
   "scripts": {
     "clean": "rm -fr dist",

packages/api-gateway/src/Service/gRPC/GRPCServiceProxy.ts

@@ -88,10 +88,24 @@ export class GRPCServiceProxy implements ServiceProxyInterface {
     endpoint: string,
     payload?: Record<string, unknown> | string,
   ): Promise<void> {
-    if (endpoint === 'items/sync') {
+    const requestIsUsingLatestApiVersions =
+      payload !== undefined && typeof payload !== 'string' && 'api' in payload && payload.api === '20200115'
+
+    if (requestIsUsingLatestApiVersions && endpoint === 'items/sync') {
       const result = await this.gRPCSyncingServerServiceProxy.sync(request, response, payload)
 
-      response.status(result.status).send(result.data)
+      response.status(result.status).send({
+        meta: {
+          auth: {
+            userUuid: response.locals.user?.uuid,
+            roles: response.locals.roles,
+          },
+          server: {
+            filesServerUrl: this.filesServerUrl,
+          },
+        },
+        data: result.data,
+      })
 
       return
     }

packages/auth/CHANGELOG.md

@@ -3,6 +3,38 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.174.2](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.174.1...@standardnotes/auth-server@1.174.2) (2023-11-28)
+
+**Note:** Version bump only for package @standardnotes/auth-server
+
+## [1.174.1](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.174.0...@standardnotes/auth-server@1.174.1) (2023-11-27)
+
+### Bug Fixes
+
+* repository config in package.json files ([ed1bf37](https://github.com/standardnotes/server/commit/ed1bf37287af23a25b8388ada95f0acdec8f71ea))
+
+# [1.174.0](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.173.2...@standardnotes/auth-server@1.174.0) (2023-11-27)
+
+### Features
+
+* add npm provenance to published packages ([e836abd](https://github.com/standardnotes/server/commit/e836abdef73d246940d8fffd9e65e17c64cd35c8))
+
+## [1.173.2](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.173.1...@standardnotes/auth-server@1.173.2) (2023-11-23)
+
+**Note:** Version bump only for package @standardnotes/auth-server
+
+## [1.173.1](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.173.0...@standardnotes/auth-server@1.173.1) (2023-11-22)
+
+### Bug Fixes
+
+* error handling on gRPC ([#937](https://github.com/standardnotes/server/issues/937)) ([8f23c8a](https://github.com/standardnotes/server/commit/8f23c8ab3f03e9c23adfb31a33c5805492bc2f5b))
+
+# [1.173.0](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.172.2...@standardnotes/auth-server@1.173.0) (2023-11-22)
+
+### Features
+
+* add verifiying if user has no items before mass deleting spam accounts ([#936](https://github.com/standardnotes/server/issues/936)) ([c11abe1](https://github.com/standardnotes/server/commit/c11abe1bd36de7c0fb9850c20a8157c066fa9379))
+
 ## [1.172.2](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.172.1...@standardnotes/auth-server@1.172.2) (2023-11-20)
 
 ### Bug Fixes

packages/auth/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/auth-server",
-  "version": "1.172.2",
+  "version": "1.174.2",
   "engines": {
     "node": ">=18.0.0 <21.0.0"
   },
@@ -10,7 +10,13 @@
   "author": "Karol Sójko <karol@standardnotes.com>",
   "license": "AGPL-3.0-or-later",
   "publishConfig": {
-    "access": "public"
+    "access": "public",
+    "provenance": true
+  },
+  "repository": {
+    "type": "git",
+    "url": "git@github.com:standardnotes/server.git",
+    "directory": "packages/auth"
   },
   "scripts": {
     "clean": "rm -fr dist",

packages/auth/src/Bootstrap/Container.ts

@@ -280,6 +280,7 @@ import { TriggerEmailBackupForAllUsers } from '../Domain/UseCase/TriggerEmailBac
 import { CSVFileReaderInterface } from '../Domain/CSV/CSVFileReaderInterface'
 import { S3CsvFileReader } from '../Infra/S3/S3CsvFileReader'
 import { DeleteAccountsFromCSVFile } from '../Domain/UseCase/DeleteAccountsFromCSVFile/DeleteAccountsFromCSVFile'
+import { AccountDeletionVerificationPassedEventHandler } from '../Domain/Handler/AccountDeletionVerificationPassedEventHandler'
 
 export class ContainerConfigLoader {
   constructor(private mode: 'server' | 'worker' = 'server') {}
@@ -1274,7 +1275,9 @@ export class ContainerConfigLoader {
         .toConstantValue(
           new DeleteAccountsFromCSVFile(
             container.get<CSVFileReaderInterface>(TYPES.Auth_CSVFileReader),
-            container.get<DeleteAccount>(TYPES.Auth_DeleteAccount),
+            container.get<DomainEventPublisherInterface>(TYPES.Auth_DomainEventPublisher),
+            container.get<DomainEventFactoryInterface>(TYPES.Auth_DomainEventFactory),
+            container.get<UserRepositoryInterface>(TYPES.Auth_UserRepository),
             container.get<winston.Logger>(TYPES.Auth_Logger),
           ),
         )
@@ -1328,6 +1331,14 @@ export class ContainerConfigLoader {
           container.get<winston.Logger>(TYPES.Auth_Logger),
         ),
       )
+    container
+      .bind<AccountDeletionVerificationPassedEventHandler>(TYPES.Auth_AccountDeletionVerificationPassedEventHandler)
+      .toConstantValue(
+        new AccountDeletionVerificationPassedEventHandler(
+          container.get<DeleteAccount>(TYPES.Auth_DeleteAccount),
+          container.get<winston.Logger>(TYPES.Auth_Logger),
+        ),
+      )
     container
       .bind<SubscriptionPurchasedEventHandler>(TYPES.Auth_SubscriptionPurchasedEventHandler)
       .toConstantValue(
@@ -1516,6 +1527,7 @@ export class ContainerConfigLoader {
 
     const eventHandlers: Map<string, DomainEventHandlerInterface> = new Map([
       ['ACCOUNT_DELETION_REQUESTED', container.get(TYPES.Auth_AccountDeletionRequestedEventHandler)],
+      ['ACCOUNT_DELETION_VERIFICATION_PASSED', container.get(TYPES.Auth_AccountDeletionVerificationPassedEventHandler)],
       ['SUBSCRIPTION_PURCHASED', container.get(TYPES.Auth_SubscriptionPurchasedEventHandler)],
       ['SUBSCRIPTION_CANCELLED', container.get(TYPES.Auth_SubscriptionCancelledEventHandler)],
       ['SUBSCRIPTION_RENEWED', container.get(TYPES.Auth_SubscriptionRenewedEventHandler)],

packages/auth/src/Bootstrap/Types.ts

@@ -171,6 +171,7 @@ const TYPES = {
   Auth_DeleteAccountsFromCSVFile: Symbol.for('Auth_DeleteAccountsFromCSVFile'),
   // Handlers
   Auth_AccountDeletionRequestedEventHandler: Symbol.for('Auth_AccountDeletionRequestedEventHandler'),
+  Auth_AccountDeletionVerificationPassedEventHandler: Symbol.for('Auth_AccountDeletionVerificationPassedEventHandler'),
   Auth_SubscriptionPurchasedEventHandler: Symbol.for('Auth_SubscriptionPurchasedEventHandler'),
   Auth_SubscriptionCancelledEventHandler: Symbol.for('Auth_SubscriptionCancelledEventHandler'),
   Auth_SubscriptionReassignedEventHandler: Symbol.for('Auth_SubscriptionReassignedEventHandler'),

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

@@ -20,6 +20,7 @@ import {
   StatisticPersistenceRequestedEvent,
   SessionCreatedEvent,
   SessionRefreshedEvent,
+  AccountDeletionVerificationRequestedEvent,
 } from '@standardnotes/domain-events'
 import { Predicate, PredicateVerificationResult } from '@standardnotes/predicates'
 import { TimerInterface } from '@standardnotes/time'
@@ -33,6 +34,24 @@ import { KeyParamsData } from '@standardnotes/responses'
 export class DomainEventFactory implements DomainEventFactoryInterface {
   constructor(@inject(TYPES.Auth_Timer) private timer: TimerInterface) {}
 
+  createAccountDeletionVerificationRequestedEvent(dto: {
+    userUuid: string
+    email: string
+  }): AccountDeletionVerificationRequestedEvent {
+    return {
+      type: 'ACCOUNT_DELETION_VERIFICATION_REQUESTED',
+      createdAt: this.timer.getUTCDate(),
+      meta: {
+        correlation: {
+          userIdentifier: dto.userUuid,
+          userIdentifierType: 'uuid',
+        },
+        origin: DomainEventService.Auth,
+      },
+      payload: dto,
+    }
+  }
+
   createSessionCreatedEvent(dto: { userUuid: string }): SessionCreatedEvent {
     return {
       type: 'SESSION_CREATED',

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

@@ -18,6 +18,7 @@ import {
   StatisticPersistenceRequestedEvent,
   SessionCreatedEvent,
   SessionRefreshedEvent,
+  AccountDeletionVerificationRequestedEvent,
 } from '@standardnotes/domain-events'
 import { InviteeIdentifierType } from '../SharedSubscription/InviteeIdentifierType'
 import { KeyParamsData } from '@standardnotes/responses'
@@ -56,6 +57,10 @@ export interface DomainEventFactoryInterface {
       ownerUuid: string
     }
   }): AccountDeletionRequestedEvent
+  createAccountDeletionVerificationRequestedEvent(dto: {
+    userUuid: string
+    email: string
+  }): AccountDeletionVerificationRequestedEvent
   createUserRolesChangedEvent(userUuid: string, email: string, currentRoles: string[]): UserRolesChangedEvent
   createUserEmailChangedEvent(userUuid: string, fromEmail: string, toEmail: string): UserEmailChangedEvent
   createUserDisabledSessionUserAgentLoggingEvent(dto: {

packages/auth/src/Domain/Handler/AccountDeletionVerificationPassedEventHandler.ts

@@ -0,0 +1,21 @@
+import { AccountDeletionVerificationPassedEvent, DomainEventHandlerInterface } from '@standardnotes/domain-events'
+import { Logger } from 'winston'
+
+import { DeleteAccount } from '../UseCase/DeleteAccount/DeleteAccount'
+
+export class AccountDeletionVerificationPassedEventHandler implements DomainEventHandlerInterface {
+  constructor(
+    private deleteAccount: DeleteAccount,
+    private logger: Logger,
+  ) {}
+
+  async handle(event: AccountDeletionVerificationPassedEvent): Promise<void> {
+    const result = await this.deleteAccount.execute({
+      userUuid: event.payload.userUuid,
+    })
+
+    if (result.isFailed()) {
+      this.logger.error(`AccountDeletionVerificationPassedEventHandler failed: ${result.getError()}`)
+    }
+  }
+}

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

@@ -1,33 +1,51 @@
 import { Logger } from 'winston'
 import { Result } from '@standardnotes/domain-core'
+import { AccountDeletionVerificationRequestedEvent, DomainEventPublisherInterface } from '@standardnotes/domain-events'
 
 import { CSVFileReaderInterface } from '../../CSV/CSVFileReaderInterface'
-import { DeleteAccount } from '../DeleteAccount/DeleteAccount'
 import { DeleteAccountsFromCSVFile } from './DeleteAccountsFromCSVFile'
+import { UserRepositoryInterface } from '../../User/UserRepositoryInterface'
+import { DomainEventFactoryInterface } from '../../Event/DomainEventFactoryInterface'
+import { User } from '../../User/User'
 
 describe('DeleteAccountsFromCSVFile', () => {
   let csvFileReader: CSVFileReaderInterface
-  let deleteAccount: DeleteAccount
+  let userRepository: UserRepositoryInterface
+  let domainEventPublisher: DomainEventPublisherInterface
+  let domainEventFactory: DomainEventFactoryInterface
   let logger: Logger
 
-  const createUseCase = () => new DeleteAccountsFromCSVFile(csvFileReader, deleteAccount, logger)
+  const createUseCase = () =>
+    new DeleteAccountsFromCSVFile(csvFileReader, domainEventPublisher, domainEventFactory, userRepository, logger)
 
   beforeEach(() => {
+    const user = {} as jest.Mocked<User>
+
     csvFileReader = {} as jest.Mocked<CSVFileReaderInterface>
     csvFileReader.getValues = jest.fn().mockResolvedValue(Result.ok(['email1']))
 
-    deleteAccount = {} as jest.Mocked<DeleteAccount>
-    deleteAccount.execute = jest.fn().mockResolvedValue(Result.ok(''))
+    userRepository = {} as jest.Mocked<UserRepositoryInterface>
+    userRepository.findAllByUsernameOrEmail = jest.fn().mockResolvedValue([user])
+
+    domainEventPublisher = {} as jest.Mocked<DomainEventPublisherInterface>
+    domainEventPublisher.publish = jest.fn()
+
+    domainEventFactory = {} as jest.Mocked<DomainEventFactoryInterface>
+    domainEventFactory.createAccountDeletionVerificationRequestedEvent = jest
+      .fn()
+      .mockReturnValue({} as jest.Mocked<AccountDeletionVerificationRequestedEvent>)
 
     logger = {} as jest.Mocked<Logger>
     logger.info = jest.fn()
   })
 
-  it('should delete accounts', async () => {
+  it('should request account deletion verification', async () => {
     const useCase = createUseCase()
 
     const result = await useCase.execute({ fileName: 'test.csv', dryRun: false })
 
+    expect(domainEventPublisher.publish).toHaveBeenCalled()
+
     expect(result.isFailed()).toBeFalsy()
   })
 
@@ -56,12 +74,12 @@ describe('DeleteAccountsFromCSVFile', () => {
 
     const result = await useCase.execute({ fileName: 'test.csv', dryRun: true })
 
-    expect(deleteAccount.execute).not.toHaveBeenCalled()
+    expect(domainEventPublisher.publish).not.toHaveBeenCalled()
     expect(result.isFailed()).toBeFalsy()
   })
 
-  it('should return error if delete account fails', async () => {
-    deleteAccount.execute = jest.fn().mockResolvedValue(Result.fail('Oops'))
+  it('should return error username is invalid', async () => {
+    csvFileReader.getValues = jest.fn().mockResolvedValue(Result.ok(['']))
 
     const useCase = createUseCase()
 
@@ -69,4 +87,15 @@ describe('DeleteAccountsFromCSVFile', () => {
 
     expect(result.isFailed()).toBeTruthy()
   })
+
+  it('should do nothing if users could not be found', async () => {
+    userRepository.findAllByUsernameOrEmail = jest.fn().mockResolvedValue([])
+
+    const useCase = createUseCase()
+
+    const result = await useCase.execute({ fileName: 'test.csv', dryRun: false })
+
+    expect(domainEventPublisher.publish).not.toHaveBeenCalled()
+    expect(result.isFailed()).toBeFalsy()
+  })
 })

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

@@ -1,14 +1,18 @@
-import { Result, UseCaseInterface } from '@standardnotes/domain-core'
+import { Result, UseCaseInterface, Username } from '@standardnotes/domain-core'
+import { DomainEventPublisherInterface } from '@standardnotes/domain-events'
 import { Logger } from 'winston'
 
-import { DeleteAccount } from '../DeleteAccount/DeleteAccount'
 import { CSVFileReaderInterface } from '../../CSV/CSVFileReaderInterface'
 import { DeleteAccountsFromCSVFileDTO } from './DeleteAccountsFromCSVFileDTO'
+import { DomainEventFactoryInterface } from '../../Event/DomainEventFactoryInterface'
+import { UserRepositoryInterface } from '../../User/UserRepositoryInterface'
 
 export class DeleteAccountsFromCSVFile implements UseCaseInterface<void> {
   constructor(
     private csvFileReader: CSVFileReaderInterface,
-    private deleteAccount: DeleteAccount,
+    private domainEventPublisher: DomainEventPublisherInterface,
+    private domainEventFactory: DomainEventFactoryInterface,
+    private userRepository: UserRepositoryInterface,
     private logger: Logger,
   ) {}
 
@@ -33,12 +37,20 @@ export class DeleteAccountsFromCSVFile implements UseCaseInterface<void> {
     }
 
     for (const email of emails) {
-      const deleteAccountOrError = await this.deleteAccount.execute({
-        username: email,
-      })
+      const usernameOrError = Username.create(email)
+      if (usernameOrError.isFailed()) {
+        return Result.fail(usernameOrError.getError())
+      }
+      const username = usernameOrError.getValue()
 
-      if (deleteAccountOrError.isFailed()) {
-        return Result.fail(deleteAccountOrError.getError())
+      const users = await this.userRepository.findAllByUsernameOrEmail(username)
+      for (const user of users) {
+        await this.domainEventPublisher.publish(
+          this.domainEventFactory.createAccountDeletionVerificationRequestedEvent({
+            userUuid: user.uuid,
+            email: user.email,
+          }),
+        )
       }
     }
 

packages/auth/src/Domain/User/UserRepositoryInterface.ts

@@ -8,6 +8,7 @@ export interface UserRepositoryInterface {
   streamTeam(memberEmail?: Email): Promise<ReadStream>
   findOneByUuid(uuid: Uuid): Promise<User | null>
   findOneByUsernameOrEmail(usernameOrEmail: Email | Username): Promise<User | null>
+  findAllByUsernameOrEmail(usernameOrEmail: Email | Username): Promise<User[]>
   findAllCreatedBetween(dto: { start: Date; end: Date; offset: number; limit: number }): Promise<User[]>
   countAllCreatedBetween(start: Date, end: Date): Promise<number>
   save(user: User): Promise<User>

packages/auth/src/Infra/TypeORM/TypeORMUserRepository.ts

@@ -69,7 +69,13 @@ export class TypeORMUserRepository implements UserRepositoryInterface {
     return this.ormRepository
       .createQueryBuilder('user')
       .where('user.email = :email', { email: usernameOrEmail.value })
-      .cache(`user_email_${usernameOrEmail.value}`, 60000)
       .getOne()
   }
+
+  async findAllByUsernameOrEmail(usernameOrEmail: Email | Username): Promise<User[]> {
+    return this.ormRepository
+      .createQueryBuilder('user')
+      .where('user.email = :email', { email: usernameOrEmail.value })
+      .getMany()
+  }
 }

packages/auth/src/Infra/gRPC/SessionsServer.ts

@@ -19,62 +19,75 @@ export class SessionsServer implements ISessionsServer {
     call: grpc.ServerUnaryCall<AuthorizationHeader, SessionValidationResponse>,
     callback: grpc.sendUnaryData<SessionValidationResponse>,
   ): Promise<void> {
-    this.logger.debug('[SessionsServer] Validating session via gRPC')
+    try {
+      this.logger.debug('[SessionsServer] Validating session via gRPC')
 
-    const authenticateRequestResponse = await this.authenticateRequest.execute({
-      authorizationHeader: call.request.getBearerToken(),
-    })
+      const authenticateRequestResponse = await this.authenticateRequest.execute({
+        authorizationHeader: call.request.getBearerToken(),
+      })
 
-    if (!authenticateRequestResponse.success) {
-      const metadata = new grpc.Metadata()
-      metadata.set('x-auth-error-message', authenticateRequestResponse.errorMessage as string)
-      metadata.set('x-auth-error-tag', authenticateRequestResponse.errorTag as string)
-      metadata.set('x-auth-error-response-code', authenticateRequestResponse.responseCode.toString())
-      return callback(
+      if (!authenticateRequestResponse.success) {
+        const metadata = new grpc.Metadata()
+        metadata.set('x-auth-error-message', authenticateRequestResponse.errorMessage as string)
+        metadata.set('x-auth-error-tag', authenticateRequestResponse.errorTag as string)
+        metadata.set('x-auth-error-response-code', authenticateRequestResponse.responseCode.toString())
+        return callback(
+          {
+            code: Status.PERMISSION_DENIED,
+            message: authenticateRequestResponse.errorMessage,
+            name: authenticateRequestResponse.errorTag,
+            metadata,
+          },
+          null,
+        )
+      }
+
+      const user = authenticateRequestResponse.user as User
+
+      const sharedVaultOwnerMetadata = call.metadata.get('x-shared-vault-owner-context')
+      let sharedVaultOwnerContext = undefined
+      if (sharedVaultOwnerMetadata.length > 0 && sharedVaultOwnerMetadata[0].length > 0) {
+        sharedVaultOwnerContext = sharedVaultOwnerMetadata[0].toString()
+      }
+
+      const resultOrError = await this.createCrossServiceToken.execute({
+        user,
+        session: authenticateRequestResponse.session,
+        sharedVaultOwnerContext,
+      })
+      if (resultOrError.isFailed()) {
+        const metadata = new grpc.Metadata()
+        metadata.set('x-auth-error-message', resultOrError.getError())
+        metadata.set('x-auth-error-response-code', '400')
+
+        return callback(
+          {
+            code: Status.INVALID_ARGUMENT,
+            message: resultOrError.getError(),
+            name: 'INVALID_ARGUMENT',
+            metadata,
+          },
+          null,
+        )
+      }
+
+      const response = new SessionValidationResponse()
+      response.setCrossServiceToken(resultOrError.getValue())
+
+      this.logger.debug('[SessionsServer] Session validated via gRPC')
+
+      callback(null, response)
+    } catch (error) {
+      this.logger.error(`[SessionsServer] Error validating session via gRPC: ${(error as Error).message}`)
+
+      callback(
         {
-          code: Status.PERMISSION_DENIED,
-          message: authenticateRequestResponse.errorMessage,
-          name: authenticateRequestResponse.errorTag,
-          metadata,
+          code: Status.UNKNOWN,
+          message: 'An error occurred while validating session',
+          name: 'UNKNOWN',
         },
         null,
       )
     }
-
-    const user = authenticateRequestResponse.user as User
-
-    const sharedVaultOwnerMetadata = call.metadata.get('x-shared-vault-owner-context')
-    let sharedVaultOwnerContext = undefined
-    if (sharedVaultOwnerMetadata.length > 0 && sharedVaultOwnerMetadata[0].length > 0) {
-      sharedVaultOwnerContext = sharedVaultOwnerMetadata[0].toString()
-    }
-
-    const resultOrError = await this.createCrossServiceToken.execute({
-      user,
-      session: authenticateRequestResponse.session,
-      sharedVaultOwnerContext,
-    })
-    if (resultOrError.isFailed()) {
-      const metadata = new grpc.Metadata()
-      metadata.set('x-auth-error-message', resultOrError.getError())
-      metadata.set('x-auth-error-response-code', '400')
-
-      return callback(
-        {
-          code: Status.INVALID_ARGUMENT,
-          message: resultOrError.getError(),
-          name: 'INVALID_ARGUMENT',
-          metadata,
-        },
-        null,
-      )
-    }
-
-    const response = new SessionValidationResponse()
-    response.setCrossServiceToken(resultOrError.getValue())
-
-    this.logger.debug('[SessionsServer] Session validated via gRPC')
-
-    callback(null, response)
   }
 }

packages/common/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.52.1](https://github.com/standardnotes/server/compare/@standardnotes/common@1.52.0...@standardnotes/common@1.52.1) (2023-11-27)
+
+### Bug Fixes
+
+* repository config in package.json files ([ed1bf37](https://github.com/standardnotes/server/commit/ed1bf37287af23a25b8388ada95f0acdec8f71ea))
+
+# [1.52.0](https://github.com/standardnotes/server/compare/@standardnotes/common@1.51.0...@standardnotes/common@1.52.0) (2023-11-27)
+
+### Features
+
+* add npm provenance to published packages ([e836abd](https://github.com/standardnotes/server/commit/e836abdef73d246940d8fffd9e65e17c64cd35c8))
+
 # [1.51.0](https://github.com/standardnotes/server/compare/@standardnotes/common@1.50.4...@standardnotes/common@1.51.0) (2023-09-26)
 
 ### Features

packages/common/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/common",
-  "version": "1.51.0",
+  "version": "1.52.1",
   "engines": {
     "node": ">=18.0.0 <21.0.0"
   },
@@ -13,7 +13,13 @@
     "dist/src/**/*.d.ts"
   ],
   "publishConfig": {
-    "access": "public"
+    "access": "public",
+    "provenance": true
+  },
+  "repository": {
+    "type": "git",
+    "url": "git@github.com:standardnotes/server.git",
+    "directory": "packages/common"
   },
   "license": "AGPL-3.0-or-later",
   "scripts": {

packages/domain-core/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.41.1](https://github.com/standardnotes/server/compare/@standardnotes/domain-core@1.41.0...@standardnotes/domain-core@1.41.1) (2023-11-27)
+
+### Bug Fixes
+
+* repository config in package.json files ([ed1bf37](https://github.com/standardnotes/server/commit/ed1bf37287af23a25b8388ada95f0acdec8f71ea))
+
+# [1.41.0](https://github.com/standardnotes/server/compare/@standardnotes/domain-core@1.40.0...@standardnotes/domain-core@1.41.0) (2023-11-27)
+
+### Features
+
+* add npm provenance to published packages ([e836abd](https://github.com/standardnotes/server/commit/e836abdef73d246940d8fffd9e65e17c64cd35c8))
+
 # [1.40.0](https://github.com/standardnotes/server/compare/@standardnotes/domain-core@1.39.0...@standardnotes/domain-core@1.40.0) (2023-10-26)
 
 ### Features

packages/domain-core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/domain-core",
-  "version": "1.40.0",
+  "version": "1.41.1",
   "engines": {
     "node": ">=18.0.0 <21.0.0"
   },
@@ -12,7 +12,13 @@
     "dist/src/**/*.d.ts"
   ],
   "publishConfig": {
-    "access": "public"
+    "access": "public",
+    "provenance": true
+  },
+  "repository": {
+    "type": "git",
+    "url": "git@github.com:standardnotes/server.git",
+    "directory": "packages/domain-core"
   },
   "author": "Standard Notes",
   "license": "AGPL-3.0-or-later",

packages/domain-events-infra/CHANGELOG.md

@@ -3,6 +3,30 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.22.2](https://github.com/standardnotes/server/compare/@standardnotes/domain-events-infra@1.22.1...@standardnotes/domain-events-infra@1.22.2) (2023-11-28)
+
+**Note:** Version bump only for package @standardnotes/domain-events-infra
+
+## [1.22.1](https://github.com/standardnotes/server/compare/@standardnotes/domain-events-infra@1.22.0...@standardnotes/domain-events-infra@1.22.1) (2023-11-27)
+
+### Bug Fixes
+
+* repository config in package.json files ([ed1bf37](https://github.com/standardnotes/server/commit/ed1bf37287af23a25b8388ada95f0acdec8f71ea))
+
+# [1.22.0](https://github.com/standardnotes/server/compare/@standardnotes/domain-events-infra@1.21.4...@standardnotes/domain-events-infra@1.22.0) (2023-11-27)
+
+### Features
+
+* add npm provenance to published packages ([e836abd](https://github.com/standardnotes/server/commit/e836abdef73d246940d8fffd9e65e17c64cd35c8))
+
+## [1.21.4](https://github.com/standardnotes/server/compare/@standardnotes/domain-events-infra@1.21.3...@standardnotes/domain-events-infra@1.21.4) (2023-11-23)
+
+**Note:** Version bump only for package @standardnotes/domain-events-infra
+
+## [1.21.3](https://github.com/standardnotes/server/compare/@standardnotes/domain-events-infra@1.21.2...@standardnotes/domain-events-infra@1.21.3) (2023-11-22)
+
+**Note:** Version bump only for package @standardnotes/domain-events-infra
+
 ## [1.21.2](https://github.com/standardnotes/server/compare/@standardnotes/domain-events-infra@1.21.1...@standardnotes/domain-events-infra@1.21.2) (2023-11-13)
 
 **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.21.2",
+  "version": "1.22.2",
   "engines": {
     "node": ">=18.0.0 <21.0.0"
   },
@@ -12,7 +12,13 @@
     "dist/src/**/*.d.ts"
   ],
   "publishConfig": {
-    "access": "public"
+    "access": "public",
+    "provenance": true
+  },
+  "repository": {
+    "type": "git",
+    "url": "git@github.com:standardnotes/server.git",
+    "directory": "packages/domain-events-infra"
   },
   "author": "Standard Notes",
   "license": "AGPL-3.0-or-later",

packages/domain-events/CHANGELOG.md

@@ -3,6 +3,36 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [2.138.0](https://github.com/standardnotes/server/compare/@standardnotes/domain-events@2.137.1...@standardnotes/domain-events@2.138.0) (2023-11-28)
+
+### Features
+
+* send event to client upon items change on server ([#941](https://github.com/standardnotes/server/issues/941)) ([69b404f](https://github.com/standardnotes/server/commit/69b404f5d45f32530ebadbdbbec01d4e335dbbe9))
+
+## [2.137.1](https://github.com/standardnotes/server/compare/@standardnotes/domain-events@2.137.0...@standardnotes/domain-events@2.137.1) (2023-11-27)
+
+### Bug Fixes
+
+* repository config in package.json files ([ed1bf37](https://github.com/standardnotes/server/commit/ed1bf37287af23a25b8388ada95f0acdec8f71ea))
+
+# [2.137.0](https://github.com/standardnotes/server/compare/@standardnotes/domain-events@2.136.0...@standardnotes/domain-events@2.137.0) (2023-11-27)
+
+### Features
+
+* add npm provenance to published packages ([e836abd](https://github.com/standardnotes/server/commit/e836abdef73d246940d8fffd9e65e17c64cd35c8))
+
+# [2.136.0](https://github.com/standardnotes/server/compare/@standardnotes/domain-events@2.135.0...@standardnotes/domain-events@2.136.0) (2023-11-23)
+
+### Features
+
+* **domain-events:** add email campaign send out requested event ([45bd009](https://github.com/standardnotes/server/commit/45bd00919c0062ac4bddd3f858f3ab89166f4e69))
+
+# [2.135.0](https://github.com/standardnotes/server/compare/@standardnotes/domain-events@2.134.2...@standardnotes/domain-events@2.135.0) (2023-11-22)
+
+### Features
+
+* add verifiying if user has no items before mass deleting spam accounts ([#936](https://github.com/standardnotes/server/issues/936)) ([c11abe1](https://github.com/standardnotes/server/commit/c11abe1bd36de7c0fb9850c20a8157c066fa9379))
+
 ## [2.134.2](https://github.com/standardnotes/server/compare/@standardnotes/domain-events@2.134.1...@standardnotes/domain-events@2.134.2) (2023-11-13)
 
 ### Bug Fixes

packages/domain-events/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/domain-events",
-  "version": "2.134.2",
+  "version": "2.138.0",
   "engines": {
     "node": ">=18.0.0 <21.0.0"
   },
@@ -12,7 +12,13 @@
     "dist/src/**/*.d.ts"
   ],
   "publishConfig": {
-    "access": "public"
+    "access": "public",
+    "provenance": true
+  },
+  "repository": {
+    "type": "git",
+    "url": "git@github.com:standardnotes/server.git",
+    "directory": "packages/domain-events"
   },
   "author": "Standard Notes",
   "license": "AGPL-3.0-or-later",

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

@@ -0,0 +1,7 @@
+import { DomainEventInterface } from './DomainEventInterface'
+import { AccountDeletionVerificationPassedEventPayload } from './AccountDeletionVerificationPassedEventPayload'
+
+export interface AccountDeletionVerificationPassedEvent extends DomainEventInterface {
+  type: 'ACCOUNT_DELETION_VERIFICATION_PASSED'
+  payload: AccountDeletionVerificationPassedEventPayload
+}

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

@@ -0,0 +1,4 @@
+export interface AccountDeletionVerificationPassedEventPayload {
+  userUuid: string
+  email: string
+}

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

@@ -0,0 +1,7 @@
+import { DomainEventInterface } from './DomainEventInterface'
+import { AccountDeletionVerificationRequestedEventPayload } from './AccountDeletionVerificationRequestedEventPayload'
+
+export interface AccountDeletionVerificationRequestedEvent extends DomainEventInterface {
+  type: 'ACCOUNT_DELETION_VERIFICATION_REQUESTED'
+  payload: AccountDeletionVerificationRequestedEventPayload
+}

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

@@ -0,0 +1,4 @@
+export interface AccountDeletionVerificationRequestedEventPayload {
+  userUuid: string
+  email: string
+}

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

@@ -0,0 +1,7 @@
+import { DomainEventInterface } from './DomainEventInterface'
+import { EmailCampaignSendOutRequestedEventPayload } from './EmailCampaignSendOutRequestedEventPayload'
+
+export interface EmailCampaignSendOutRequestedEvent extends DomainEventInterface {
+  type: 'EMAIL_CAMPAIGN_SEND_OUT_REQUESTED'
+  payload: EmailCampaignSendOutRequestedEventPayload
+}

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

@@ -0,0 +1,5 @@
+export interface EmailCampaignSendOutRequestedEventPayload {
+  limit: number
+  page: number
+  campaignFileName: string
+}

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

@@ -0,0 +1,7 @@
+import { DomainEventInterface } from './DomainEventInterface'
+import { ItemsChangedOnServerEventPayload } from './ItemsChangedOnServerEventPayload'
+
+export interface ItemsChangedOnServerEvent extends DomainEventInterface {
+  type: 'ITEMS_CHANGED_ON_SERVER'
+  payload: ItemsChangedOnServerEventPayload
+}

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

@@ -0,0 +1,5 @@
+export interface ItemsChangedOnServerEventPayload {
+  userUuid: string
+  sessionUuid: string
+  timestamp: number
+}

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

@@ -1,4 +1,5 @@
 export interface WebSocketMessageRequestedEventPayload {
   userUuid: string
   message: string
+  originatingSessionUuid?: string
 }

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

@@ -1,5 +1,9 @@
 export * from './Event/AccountDeletionRequestedEvent'
 export * from './Event/AccountDeletionRequestedEventPayload'
+export * from './Event/AccountDeletionVerificationPassedEvent'
+export * from './Event/AccountDeletionVerificationPassedEventPayload'
+export * from './Event/AccountDeletionVerificationRequestedEvent'
+export * from './Event/AccountDeletionVerificationRequestedEventPayload'
 export * from './Event/DiscountApplyRequestedEvent'
 export * from './Event/DiscountApplyRequestedEventPayload'
 export * from './Event/DiscountWithdrawRequestedEvent'
@@ -12,6 +16,8 @@ export * from './Event/EmailBackupRequestedEvent'
 export * from './Event/EmailBackupRequestedEventPayload'
 export * from './Event/EmailBouncedEvent'
 export * from './Event/EmailBouncedEventPayload'
+export * from './Event/EmailCampaignSendOutRequestedEvent'
+export * from './Event/EmailCampaignSendOutRequestedEventPayload'
 export * from './Event/EmailRequestedEvent'
 export * from './Event/EmailRequestedEventPayload'
 export * from './Event/EmailSubscriptionUnsubscribedEvent'
@@ -34,6 +40,8 @@ export * from './Event/ItemRemovedFromSharedVaultEvent'
 export * from './Event/ItemRemovedFromSharedVaultEventPayload'
 export * from './Event/ItemRevisionCreationRequestedEvent'
 export * from './Event/ItemRevisionCreationRequestedEventPayload'
+export * from './Event/ItemsChangedOnServerEvent'
+export * from './Event/ItemsChangedOnServerEventPayload'
 export * from './Event/ListedAccountCreatedEvent'
 export * from './Event/ListedAccountCreatedEventPayload'
 export * from './Event/ListedAccountDeletedEvent'

packages/files/CHANGELOG.md

@@ -3,6 +3,30 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.36.2](https://github.com/standardnotes/server/compare/@standardnotes/files-server@1.36.1...@standardnotes/files-server@1.36.2) (2023-11-28)
+
+**Note:** Version bump only for package @standardnotes/files-server
+
+## [1.36.1](https://github.com/standardnotes/server/compare/@standardnotes/files-server@1.36.0...@standardnotes/files-server@1.36.1) (2023-11-27)
+
+### Bug Fixes
+
+* repository config in package.json files ([ed1bf37](https://github.com/standardnotes/server/commit/ed1bf37287af23a25b8388ada95f0acdec8f71ea))
+
+# [1.36.0](https://github.com/standardnotes/files/compare/@standardnotes/files-server@1.35.2...@standardnotes/files-server@1.36.0) (2023-11-27)
+
+### Features
+
+* add npm provenance to published packages ([e836abd](https://github.com/standardnotes/files/commit/e836abdef73d246940d8fffd9e65e17c64cd35c8))
+
+## [1.35.2](https://github.com/standardnotes/files/compare/@standardnotes/files-server@1.35.1...@standardnotes/files-server@1.35.2) (2023-11-23)
+
+**Note:** Version bump only for package @standardnotes/files-server
+
+## [1.35.1](https://github.com/standardnotes/files/compare/@standardnotes/files-server@1.35.0...@standardnotes/files-server@1.35.1) (2023-11-22)
+
+**Note:** Version bump only for package @standardnotes/files-server
+
 # [1.35.0](https://github.com/standardnotes/files/compare/@standardnotes/files-server@1.34.2...@standardnotes/files-server@1.35.0) (2023-11-16)
 
 ### Features

packages/files/package.json

@@ -1,19 +1,24 @@
 {
   "name": "@standardnotes/files-server",
-  "version": "1.35.0",
+  "version": "1.36.2",
   "engines": {
     "node": ">=18.0.0 <21.0.0"
   },
   "description": "Standard Notes Files Server",
   "main": "dist/src/index.js",
   "typings": "dist/src/index.d.ts",
-  "repository": "git@github.com:standardnotes/files.git",
+  "repository": {
+    "type": "git",
+    "url": "git@github.com:standardnotes/server.git",
+    "directory": "packages/files"
+  },
   "authors": [
     "Karol Sójko <karol@standardnotes.com>"
   ],
   "license": "AGPL-3.0-or-later",
   "publishConfig": {
-    "access": "public"
+    "access": "public",
+    "provenance": true
   },
   "scripts": {
     "clean": "rm -fr dist",

packages/grpc/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.3.1](https://github.com/standardnotes/server/compare/@standardnotes/grpc@1.3.0...@standardnotes/grpc@1.3.1) (2023-11-27)
+
+### Bug Fixes
+
+* repository config in package.json files ([ed1bf37](https://github.com/standardnotes/server/commit/ed1bf37287af23a25b8388ada95f0acdec8f71ea))
+
+# [1.3.0](https://github.com/standardnotes/server/compare/@standardnotes/grpc@1.2.0...@standardnotes/grpc@1.3.0) (2023-11-27)
+
+### Features
+
+* add npm provenance to published packages ([e836abd](https://github.com/standardnotes/server/commit/e836abdef73d246940d8fffd9e65e17c64cd35c8))
+
 # [1.2.0](https://github.com/standardnotes/server/compare/@standardnotes/grpc@1.1.0...@standardnotes/grpc@1.2.0) (2023-11-20)
 
 ### Features

packages/grpc/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/grpc",
-  "version": "1.2.0",
+  "version": "1.3.1",
   "engines": {
     "node": ">=18.0.0 <21.0.0"
   },
@@ -13,7 +13,13 @@
     "lib/**/*.d.ts"
   ],
   "publishConfig": {
-    "access": "public"
+    "access": "public",
+    "provenance": true
+  },
+  "repository": {
+    "type": "git",
+    "url": "git@github.com:standardnotes/server.git",
+    "directory": "packages/grpc"
   },
   "license": "AGPL-3.0-or-later",
   "scripts": {

packages/home-server/CHANGELOG.md

@@ -3,6 +3,42 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.22.2](https://github.com/standardnotes/server/compare/@standardnotes/home-server@1.22.1...@standardnotes/home-server@1.22.2) (2023-11-28)
+
+**Note:** Version bump only for package @standardnotes/home-server
+
+## [1.22.1](https://github.com/standardnotes/server/compare/@standardnotes/home-server@1.22.0...@standardnotes/home-server@1.22.1) (2023-11-27)
+
+### Bug Fixes
+
+* repository config in package.json files ([ed1bf37](https://github.com/standardnotes/server/commit/ed1bf37287af23a25b8388ada95f0acdec8f71ea))
+
+# [1.22.0](https://github.com/standardnotes/server/compare/@standardnotes/home-server@1.21.11...@standardnotes/home-server@1.22.0) (2023-11-27)
+
+### Features
+
+* add npm provenance to published packages ([e836abd](https://github.com/standardnotes/server/commit/e836abdef73d246940d8fffd9e65e17c64cd35c8))
+
+## [1.21.11](https://github.com/standardnotes/server/compare/@standardnotes/home-server@1.21.10...@standardnotes/home-server@1.21.11) (2023-11-23)
+
+**Note:** Version bump only for package @standardnotes/home-server
+
+## [1.21.10](https://github.com/standardnotes/server/compare/@standardnotes/home-server@1.21.9...@standardnotes/home-server@1.21.10) (2023-11-22)
+
+**Note:** Version bump only for package @standardnotes/home-server
+
+## [1.21.9](https://github.com/standardnotes/server/compare/@standardnotes/home-server@1.21.8...@standardnotes/home-server@1.21.9) (2023-11-22)
+
+**Note:** Version bump only for package @standardnotes/home-server
+
+## [1.21.8](https://github.com/standardnotes/server/compare/@standardnotes/home-server@1.21.7...@standardnotes/home-server@1.21.8) (2023-11-21)
+
+**Note:** Version bump only for package @standardnotes/home-server
+
+## [1.21.7](https://github.com/standardnotes/server/compare/@standardnotes/home-server@1.21.6...@standardnotes/home-server@1.21.7) (2023-11-21)
+
+**Note:** Version bump only for package @standardnotes/home-server
+
 ## [1.21.6](https://github.com/standardnotes/server/compare/@standardnotes/home-server@1.21.5...@standardnotes/home-server@1.21.6) (2023-11-20)
 
 **Note:** Version bump only for package @standardnotes/home-server

packages/home-server/package.json

@@ -1,16 +1,21 @@
 {
   "name": "@standardnotes/home-server",
-  "version": "1.21.6",
+  "version": "1.22.2",
   "engines": {
     "node": ">=18.0.0 <21.0.0"
   },
   "description": "Standard Notes Home Server",
   "main": "dist/src/index.js",
   "typings": "dist/src/index.d.ts",
-  "repository": "git@github.com:standardnotes/server.git",
+  "repository": {
+    "type": "git",
+    "url": "git@github.com:standardnotes/server.git",
+    "directory": "packages/home-server"
+  },
   "author": "Karol Sójko <karol@standardnotes.com>",
   "publishConfig": {
-    "access": "public"
+    "access": "public",
+    "provenance": true
   },
   "license": "AGPL-3.0-or-later",
   "scripts": {

packages/predicates/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.8.1](https://github.com/standardnotes/server/compare/@standardnotes/predicates@1.8.0...@standardnotes/predicates@1.8.1) (2023-11-27)
+
+### Bug Fixes
+
+* repository config in package.json files ([ed1bf37](https://github.com/standardnotes/server/commit/ed1bf37287af23a25b8388ada95f0acdec8f71ea))
+
+# [1.8.0](https://github.com/standardnotes/server/compare/@standardnotes/predicates@1.7.0...@standardnotes/predicates@1.8.0) (2023-11-27)
+
+### Features
+
+* add npm provenance to published packages ([e836abd](https://github.com/standardnotes/server/commit/e836abdef73d246940d8fffd9e65e17c64cd35c8))
+
 # [1.7.0](https://github.com/standardnotes/server/compare/@standardnotes/predicates@1.6.11...@standardnotes/predicates@1.7.0) (2023-09-26)
 
 ### Features

packages/predicates/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/predicates",
-  "version": "1.7.0",
+  "version": "1.8.1",
   "engines": {
     "node": ">=18.0.0 <21.0.0"
   },
@@ -13,7 +13,13 @@
     "dist/src/**/*.d.ts"
   ],
   "publishConfig": {
-    "access": "public"
+    "access": "public",
+    "provenance": true
+  },
+  "repository": {
+    "type": "git",
+    "url": "git@github.com:standardnotes/server.git",
+    "directory": "packages/predicates"
   },
   "license": "AGPL-3.0-or-later",
   "scripts": {

packages/revisions/CHANGELOG.md

@@ -3,6 +3,30 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.51.2](https://github.com/standardnotes/server/compare/@standardnotes/revisions-server@1.51.1...@standardnotes/revisions-server@1.51.2) (2023-11-28)
+
+**Note:** Version bump only for package @standardnotes/revisions-server
+
+## [1.51.1](https://github.com/standardnotes/server/compare/@standardnotes/revisions-server@1.51.0...@standardnotes/revisions-server@1.51.1) (2023-11-27)
+
+### Bug Fixes
+
+* repository config in package.json files ([ed1bf37](https://github.com/standardnotes/server/commit/ed1bf37287af23a25b8388ada95f0acdec8f71ea))
+
+# [1.51.0](https://github.com/standardnotes/server/compare/@standardnotes/revisions-server@1.50.2...@standardnotes/revisions-server@1.51.0) (2023-11-27)
+
+### Features
+
+* add npm provenance to published packages ([e836abd](https://github.com/standardnotes/server/commit/e836abdef73d246940d8fffd9e65e17c64cd35c8))
+
+## [1.50.2](https://github.com/standardnotes/server/compare/@standardnotes/revisions-server@1.50.1...@standardnotes/revisions-server@1.50.2) (2023-11-23)
+
+**Note:** Version bump only for package @standardnotes/revisions-server
+
+## [1.50.1](https://github.com/standardnotes/server/compare/@standardnotes/revisions-server@1.50.0...@standardnotes/revisions-server@1.50.1) (2023-11-22)
+
+**Note:** Version bump only for package @standardnotes/revisions-server
+
 # [1.50.0](https://github.com/standardnotes/server/compare/@standardnotes/revisions-server@1.49.2...@standardnotes/revisions-server@1.50.0) (2023-11-16)
 
 ### Features

packages/revisions/package.json

@@ -1,17 +1,22 @@
 {
   "name": "@standardnotes/revisions-server",
-  "version": "1.50.0",
+  "version": "1.51.2",
   "engines": {
     "node": ">=18.0.0 <21.0.0"
   },
   "description": "Revisions Server",
   "main": "dist/src/index.js",
   "typings": "dist/src/index.d.ts",
-  "repository": "git@github.com:standardnotes/server.git",
+  "repository": {
+    "type": "git",
+    "url": "git@github.com:standardnotes/server.git",
+    "directory": "packages/revisions"
+  },
   "author": "Karol Sójko <karol@standardnotes.com>",
   "license": "AGPL-3.0-or-later",
   "publishConfig": {
-    "access": "public"
+    "access": "public",
+    "provenance": true
   },
   "scripts": {
     "clean": "rm -fr dist",

packages/scheduler/CHANGELOG.md

@@ -3,6 +3,28 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.27.7](https://github.com/standardnotes/server/compare/@standardnotes/scheduler-server@1.27.6...@standardnotes/scheduler-server@1.27.7) (2023-11-28)
+
+**Note:** Version bump only for package @standardnotes/scheduler-server
+
+## [1.27.6](https://github.com/standardnotes/server/compare/@standardnotes/scheduler-server@1.27.5...@standardnotes/scheduler-server@1.27.6) (2023-11-27)
+
+### Bug Fixes
+
+* repository config in package.json files ([ed1bf37](https://github.com/standardnotes/server/commit/ed1bf37287af23a25b8388ada95f0acdec8f71ea))
+
+## [1.27.5](https://github.com/standardnotes/server/compare/@standardnotes/scheduler-server@1.27.4...@standardnotes/scheduler-server@1.27.5) (2023-11-27)
+
+**Note:** Version bump only for package @standardnotes/scheduler-server
+
+## [1.27.4](https://github.com/standardnotes/server/compare/@standardnotes/scheduler-server@1.27.3...@standardnotes/scheduler-server@1.27.4) (2023-11-23)
+
+**Note:** Version bump only for package @standardnotes/scheduler-server
+
+## [1.27.3](https://github.com/standardnotes/server/compare/@standardnotes/scheduler-server@1.27.2...@standardnotes/scheduler-server@1.27.3) (2023-11-22)
+
+**Note:** Version bump only for package @standardnotes/scheduler-server
+
 ## [1.27.2](https://github.com/standardnotes/server/compare/@standardnotes/scheduler-server@1.27.1...@standardnotes/scheduler-server@1.27.2) (2023-11-13)
 
 **Note:** Version bump only for package @standardnotes/scheduler-server

packages/scheduler/package.json

@@ -1,10 +1,15 @@
 {
   "name": "@standardnotes/scheduler-server",
-  "version": "1.27.2",
+  "version": "1.27.7",
   "engines": {
     "node": ">=18.0.0 <21.0.0"
   },
   "private": true,
+  "repository": {
+    "type": "git",
+    "url": "git@github.com:standardnotes/server.git",
+    "directory": "packages/scheduler"
+  },
   "description": "Scheduler Server",
   "main": "dist/src/index.js",
   "typings": "dist/src/index.d.ts",

packages/security/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.17.1](https://github.com/standardnotes/server/compare/@standardnotes/security@1.17.0...@standardnotes/security@1.17.1) (2023-11-27)
+
+### Bug Fixes
+
+* repository config in package.json files ([ed1bf37](https://github.com/standardnotes/server/commit/ed1bf37287af23a25b8388ada95f0acdec8f71ea))
+
+# [1.17.0](https://github.com/standardnotes/server/compare/@standardnotes/security@1.16.0...@standardnotes/security@1.17.0) (2023-11-27)
+
+### Features
+
+* add npm provenance to published packages ([e836abd](https://github.com/standardnotes/server/commit/e836abdef73d246940d8fffd9e65e17c64cd35c8))
+
 # [1.16.0](https://github.com/standardnotes/server/compare/@standardnotes/security@1.15.0...@standardnotes/security@1.16.0) (2023-10-19)
 
 ### Features

packages/security/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/security",
-  "version": "1.16.0",
+  "version": "1.17.1",
   "engines": {
     "node": ">=18.0.0 <21.0.0"
   },
@@ -13,7 +13,13 @@
     "dist/src/**/*.d.ts"
   ],
   "publishConfig": {
-    "access": "public"
+    "access": "public",
+    "provenance": true
+  },
+  "repository": {
+    "type": "git",
+    "url": "git@github.com:standardnotes/server.git",
+    "directory": "packages/security"
   },
   "license": "AGPL-3.0-or-later",
   "scripts": {

packages/settings/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.1](https://github.com/standardnotes/server/compare/@standardnotes/settings@1.23.0...@standardnotes/settings@1.23.1) (2023-11-27)
+
+### Bug Fixes
+
+* repository config in package.json files ([ed1bf37](https://github.com/standardnotes/server/commit/ed1bf37287af23a25b8388ada95f0acdec8f71ea))
+
+# [1.23.0](https://github.com/standardnotes/server/compare/@standardnotes/settings@1.22.0...@standardnotes/settings@1.23.0) (2023-11-27)
+
+### Features
+
+* add npm provenance to published packages ([e836abd](https://github.com/standardnotes/server/commit/e836abdef73d246940d8fffd9e65e17c64cd35c8))
+
 # [1.22.0](https://github.com/standardnotes/server/compare/@standardnotes/settings@1.21.47...@standardnotes/settings@1.22.0) (2023-10-26)
 
 ### Features

packages/settings/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/settings",
-  "version": "1.22.0",
+  "version": "1.23.1",
   "engines": {
     "node": ">=18.0.0 <21.0.0"
   },
@@ -13,7 +13,13 @@
     "dist/src/**/*.d.ts"
   ],
   "publishConfig": {
-    "access": "public"
+    "access": "public",
+    "provenance": true
+  },
+  "repository": {
+    "type": "git",
+    "url": "git@github.com:standardnotes/server.git",
+    "directory": "packages/settings"
   },
   "license": "AGPL-3.0-or-later",
   "scripts": {

packages/sncrypto-node/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.16.1](https://github.com/standardnotes/server/compare/@standardnotes/sncrypto-node@1.16.0...@standardnotes/sncrypto-node@1.16.1) (2023-11-27)
+
+### Bug Fixes
+
+* repository config in package.json files ([ed1bf37](https://github.com/standardnotes/server/commit/ed1bf37287af23a25b8388ada95f0acdec8f71ea))
+
+# [1.16.0](https://github.com/standardnotes/server/compare/@standardnotes/sncrypto-node@1.15.6...@standardnotes/sncrypto-node@1.16.0) (2023-11-27)
+
+### Features
+
+* add npm provenance to published packages ([e836abd](https://github.com/standardnotes/server/commit/e836abdef73d246940d8fffd9e65e17c64cd35c8))
+
 ## [1.15.6](https://github.com/standardnotes/server/compare/@standardnotes/sncrypto-node@1.15.5...@standardnotes/sncrypto-node@1.15.6) (2023-09-04)
 
 **Note:** Version bump only for package @standardnotes/sncrypto-node

packages/sncrypto-node/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/sncrypto-node",
-  "version": "1.15.6",
+  "version": "1.16.1",
   "engines": {
     "node": ">=18.0.0 <21.0.0"
   },
@@ -14,7 +14,13 @@
   ],
   "license": "AGPL-3.0-or-later",
   "publishConfig": {
-    "access": "public"
+    "access": "public",
+    "provenance": true
+  },
+  "repository": {
+    "type": "git",
+    "url": "git@github.com:standardnotes/server.git",
+    "directory": "packages/sncrypto-node"
   },
   "scripts": {
     "clean": "rm -fr dist",

packages/syncing-server/CHANGELOG.md

@@ -3,6 +3,46 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [1.127.0](https://github.com/standardnotes/server/compare/@standardnotes/syncing-server@1.126.1...@standardnotes/syncing-server@1.127.0) (2023-11-28)
+
+### Features
+
+* send event to client upon items change on server ([#941](https://github.com/standardnotes/server/issues/941)) ([69b404f](https://github.com/standardnotes/server/commit/69b404f5d45f32530ebadbdbbec01d4e335dbbe9))
+
+## [1.126.1](https://github.com/standardnotes/server/compare/@standardnotes/syncing-server@1.126.0...@standardnotes/syncing-server@1.126.1) (2023-11-27)
+
+### Bug Fixes
+
+* repository config in package.json files ([ed1bf37](https://github.com/standardnotes/server/commit/ed1bf37287af23a25b8388ada95f0acdec8f71ea))
+
+# [1.126.0](https://github.com/standardnotes/syncing-server-js/compare/@standardnotes/syncing-server@1.125.2...@standardnotes/syncing-server@1.126.0) (2023-11-27)
+
+### Features
+
+* add npm provenance to published packages ([e836abd](https://github.com/standardnotes/syncing-server-js/commit/e836abdef73d246940d8fffd9e65e17c64cd35c8))
+
+## [1.125.2](https://github.com/standardnotes/syncing-server-js/compare/@standardnotes/syncing-server@1.125.1...@standardnotes/syncing-server@1.125.2) (2023-11-23)
+
+**Note:** Version bump only for package @standardnotes/syncing-server
+
+## [1.125.1](https://github.com/standardnotes/syncing-server-js/compare/@standardnotes/syncing-server@1.125.0...@standardnotes/syncing-server@1.125.1) (2023-11-22)
+
+### Bug Fixes
+
+* error handling on gRPC ([#937](https://github.com/standardnotes/syncing-server-js/issues/937)) ([8f23c8a](https://github.com/standardnotes/syncing-server-js/commit/8f23c8ab3f03e9c23adfb31a33c5805492bc2f5b))
+
+# [1.125.0](https://github.com/standardnotes/syncing-server-js/compare/@standardnotes/syncing-server@1.124.3...@standardnotes/syncing-server@1.125.0) (2023-11-22)
+
+### Features
+
+* add verifiying if user has no items before mass deleting spam accounts ([#936](https://github.com/standardnotes/syncing-server-js/issues/936)) ([c11abe1](https://github.com/standardnotes/syncing-server-js/commit/c11abe1bd36de7c0fb9850c20a8157c066fa9379))
+
+## [1.124.3](https://github.com/standardnotes/syncing-server-js/compare/@standardnotes/syncing-server@1.124.2...@standardnotes/syncing-server@1.124.3) (2023-11-21)
+
+### Bug Fixes
+
+* **syncing-server:** front load themes and user prefs as high priority load items ([#935](https://github.com/standardnotes/syncing-server-js/issues/935)) ([2200dca](https://github.com/standardnotes/syncing-server-js/commit/2200dca69dc809f45463e3338ad7a6fdc66f07d9))
+
 ## [1.124.2](https://github.com/standardnotes/syncing-server-js/compare/@standardnotes/syncing-server@1.124.1...@standardnotes/syncing-server@1.124.2) (2023-11-20)
 
 ### Bug Fixes

packages/syncing-server/package.json

@@ -1,17 +1,22 @@
 {
   "name": "@standardnotes/syncing-server",
-  "version": "1.124.2",
+  "version": "1.127.0",
   "engines": {
     "node": ">=18.0.0 <21.0.0"
   },
   "description": "Syncing Server",
   "main": "dist/src/index.js",
   "typings": "dist/src/index.d.ts",
-  "repository": "git@github.com:standardnotes/syncing-server-js.git",
+  "repository": {
+    "type": "git",
+    "url": "git@github.com:standardnotes/server.git",
+    "directory": "packages/syncing-server"
+  },
   "author": "Karol Sójko <karol@standardnotes.com>",
   "license": "AGPL-3.0-or-later",
   "publishConfig": {
-    "access": "public"
+    "access": "public",
+    "provenance": true
   },
   "scripts": {
     "clean": "rm -fr dist",

packages/syncing-server/src/Bootstrap/Container.ts

@@ -114,7 +114,13 @@ import { GetSharedVaults } from '../Domain/UseCase/SharedVaults/GetSharedVaults/
 import { CreateSharedVault } from '../Domain/UseCase/SharedVaults/CreateSharedVault/CreateSharedVault'
 import { DeleteSharedVault } from '../Domain/UseCase/SharedVaults/DeleteSharedVault/DeleteSharedVault'
 import { CreateSharedVaultFileValetToken } from '../Domain/UseCase/SharedVaults/CreateSharedVaultFileValetToken/CreateSharedVaultFileValetToken'
-import { SharedVaultValetTokenData, TokenEncoder, TokenEncoderInterface } from '@standardnotes/security'
+import {
+  DeterministicSelector,
+  SelectorInterface,
+  SharedVaultValetTokenData,
+  TokenEncoder,
+  TokenEncoderInterface,
+} from '@standardnotes/security'
 import { SharedVaultHttpRepresentation } from '../Mapping/Http/SharedVaultHttpRepresentation'
 import { SharedVaultHttpMapper } from '../Mapping/Http/SharedVaultHttpMapper'
 import { SharedVaultInviteHttpRepresentation } from '../Mapping/Http/SharedVaultInviteHttpRepresentation'
@@ -160,6 +166,7 @@ import { DumpItem } from '../Domain/UseCase/Syncing/DumpItem/DumpItem'
 import { SyncResponse20200115 } from '../Domain/Item/SyncResponse/SyncResponse20200115'
 import { SyncResponse } from '@standardnotes/grpc'
 import { SyncResponseGRPCMapper } from '../Mapping/gRPC/SyncResponseGRPCMapper'
+import { AccountDeletionVerificationRequestedEventHandler } from '../Domain/Handler/AccountDeletionVerificationRequestedEventHandler'
 
 export class ContainerConfigLoader {
   private readonly DEFAULT_CONTENT_SIZE_TRANSFER_LIMIT = 10_000_000
@@ -199,6 +206,10 @@ export class ContainerConfigLoader {
     }
     container.bind<winston.Logger>(TYPES.Sync_Logger).toConstantValue(logger)
 
+    container
+      .bind<SelectorInterface<number>>(TYPES.Sync_NumberSelector)
+      .toConstantValue(new DeterministicSelector<number>())
+
     const appDataSource = new AppDataSource({ env, runMigrations: this.mode === 'server' })
     await appDataSource.initialize()
 
@@ -600,12 +611,15 @@ export class ContainerConfigLoader {
       .bind<SaveItems>(TYPES.Sync_SaveItems)
       .toConstantValue(
         new SaveItems(
-          container.get(TYPES.Sync_ItemSaveValidator),
-          container.get(TYPES.Sync_SQLItemRepository),
-          container.get(TYPES.Sync_Timer),
-          container.get(TYPES.Sync_SaveNewItem),
-          container.get(TYPES.Sync_UpdateExistingItem),
-          container.get(TYPES.Sync_Logger),
+          container.get<ItemSaveValidatorInterface>(TYPES.Sync_ItemSaveValidator),
+          container.get<ItemRepositoryInterface>(TYPES.Sync_SQLItemRepository),
+          container.get<TimerInterface>(TYPES.Sync_Timer),
+          container.get<SaveNewItem>(TYPES.Sync_SaveNewItem),
+          container.get<UpdateExistingItem>(TYPES.Sync_UpdateExistingItem),
+          container.get<SendEventToClient>(TYPES.Sync_SendEventToClient),
+          container.get<DomainEventFactoryInterface>(TYPES.Sync_DomainEventFactory),
+          container.get<SelectorInterface<number>>(TYPES.Sync_NumberSelector),
+          container.get<Logger>(TYPES.Sync_Logger),
         ),
       )
     container
@@ -907,6 +921,18 @@ export class ContainerConfigLoader {
           container.get<Logger>(TYPES.Sync_Logger),
         ),
       )
+    container
+      .bind<AccountDeletionVerificationRequestedEventHandler>(
+        TYPES.Sync_AccountDeletionVerificationRequestedEventHandler,
+      )
+      .toConstantValue(
+        new AccountDeletionVerificationRequestedEventHandler(
+          container.get<ItemRepositoryInterface>(TYPES.Sync_SQLItemRepository),
+          container.get<DomainEventPublisherInterface>(TYPES.Sync_DomainEventPublisher),
+          container.get<DomainEventFactoryInterface>(TYPES.Sync_DomainEventFactory),
+          container.get<Logger>(TYPES.Sync_Logger),
+        ),
+      )
     container
       .bind<ItemRevisionCreationRequestedEventHandler>(TYPES.Sync_ItemRevisionCreationRequestedEventHandler)
       .toConstantValue(
@@ -957,6 +983,10 @@ export class ContainerConfigLoader {
     const eventHandlers: Map<string, DomainEventHandlerInterface> = new Map([
       ['DUPLICATE_ITEM_SYNCED', container.get(TYPES.Sync_DuplicateItemSyncedEventHandler)],
       ['ACCOUNT_DELETION_REQUESTED', container.get(TYPES.Sync_AccountDeletionRequestedEventHandler)],
+      [
+        'ACCOUNT_DELETION_VERIFICATION_REQUESTED',
+        container.get(TYPES.Sync_AccountDeletionVerificationRequestedEventHandler),
+      ],
       ['ITEM_REVISION_CREATION_REQUESTED', container.get(TYPES.Sync_ItemRevisionCreationRequestedEventHandler)],
       [
         'SHARED_VAULT_FILE_UPLOADED',

packages/syncing-server/src/Bootstrap/Types.ts

@@ -6,6 +6,7 @@ const TYPES = {
   Sync_SQS: Symbol.for('Sync_SQS'),
   Sync_S3: Symbol.for('Sync_S3'),
   Sync_Env: Symbol.for('Sync_Env'),
+  Sync_NumberSelector: Symbol.for('Sync_NumberSelector'),
   // Repositories
   Sync_SQLItemRepository: Symbol.for('Sync_SQLItemRepository'),
   Sync_SharedVaultRepository: Symbol.for('Sync_SharedVaultRepository'),
@@ -85,6 +86,9 @@ const TYPES = {
   Sync_DumpItem: Symbol.for('Sync_DumpItem'),
   // Handlers
   Sync_AccountDeletionRequestedEventHandler: Symbol.for('Sync_AccountDeletionRequestedEventHandler'),
+  Sync_AccountDeletionVerificationRequestedEventHandler: Symbol.for(
+    'Sync_AccountDeletionVerificationRequestedEventHandler',
+  ),
   Sync_DuplicateItemSyncedEventHandler: Symbol.for('Sync_DuplicateItemSyncedEventHandler'),
   Sync_EmailBackupRequestedEventHandler: Symbol.for('Sync_EmailBackupRequestedEventHandler'),
   Sync_ItemRevisionCreationRequestedEventHandler: Symbol.for('Sync_ItemRevisionCreationRequestedEventHandler'),

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

@@ -1,11 +1,13 @@
 /* istanbul ignore file */
 import {
+  AccountDeletionVerificationPassedEvent,
   DomainEventService,
   DuplicateItemSyncedEvent,
   EmailRequestedEvent,
   ItemDumpedEvent,
   ItemRemovedFromSharedVaultEvent,
   ItemRevisionCreationRequestedEvent,
+  ItemsChangedOnServerEvent,
   MessageSentToUserEvent,
   NotificationAddedForUserEvent,
   RevisionsCopyRequestedEvent,
@@ -22,6 +24,43 @@ import { DomainEventFactoryInterface } from './DomainEventFactoryInterface'
 export class DomainEventFactory implements DomainEventFactoryInterface {
   constructor(private timer: TimerInterface) {}
 
+  createItemsChangedOnServerEvent(dto: {
+    userUuid: string
+    sessionUuid: string
+    timestamp: number
+  }): ItemsChangedOnServerEvent {
+    return {
+      type: 'ITEMS_CHANGED_ON_SERVER',
+      createdAt: this.timer.getUTCDate(),
+      meta: {
+        correlation: {
+          userIdentifier: dto.userUuid,
+          userIdentifierType: 'uuid',
+        },
+        origin: DomainEventService.SyncingServer,
+      },
+      payload: dto,
+    }
+  }
+
+  createAccountDeletionVerificationPassedEvent(dto: {
+    userUuid: string
+    email: string
+  }): AccountDeletionVerificationPassedEvent {
+    return {
+      type: 'ACCOUNT_DELETION_VERIFICATION_PASSED',
+      createdAt: this.timer.getUTCDate(),
+      meta: {
+        correlation: {
+          userIdentifier: dto.userUuid,
+          userIdentifierType: 'uuid',
+        },
+        origin: DomainEventService.SyncingServer,
+      },
+      payload: dto,
+    }
+  }
+
   createUserDesignatedAsSurvivorInSharedVaultEvent(dto: {
     sharedVaultUuid: string
     userUuid: string
@@ -188,7 +227,11 @@ export class DomainEventFactory implements DomainEventFactoryInterface {
     }
   }
 
-  createWebSocketMessageRequestedEvent(dto: { userUuid: string; message: string }): WebSocketMessageRequestedEvent {
+  createWebSocketMessageRequestedEvent(dto: {
+    userUuid: string
+    message: string
+    originatingSessionUuid?: string
+  }): WebSocketMessageRequestedEvent {
     return {
       type: 'WEB_SOCKET_MESSAGE_REQUESTED',
       createdAt: this.timer.getUTCDate(),

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

@@ -1,9 +1,11 @@
 import {
+  AccountDeletionVerificationPassedEvent,
   DuplicateItemSyncedEvent,
   EmailRequestedEvent,
   ItemDumpedEvent,
   ItemRemovedFromSharedVaultEvent,
   ItemRevisionCreationRequestedEvent,
+  ItemsChangedOnServerEvent,
   MessageSentToUserEvent,
   NotificationAddedForUserEvent,
   RevisionsCopyRequestedEvent,
@@ -16,7 +18,16 @@ import {
 } from '@standardnotes/domain-events'
 
 export interface DomainEventFactoryInterface {
-  createWebSocketMessageRequestedEvent(dto: { userUuid: string; message: string }): WebSocketMessageRequestedEvent
+  createWebSocketMessageRequestedEvent(dto: {
+    userUuid: string
+    message: string
+    originatingSessionUuid?: string
+  }): WebSocketMessageRequestedEvent
+  createItemsChangedOnServerEvent(dto: {
+    userUuid: string
+    sessionUuid: string
+    timestamp: number
+  }): ItemsChangedOnServerEvent
   createUserInvitedToSharedVaultEvent(dto: {
     invite: {
       uuid: string
@@ -93,4 +104,8 @@ export interface DomainEventFactoryInterface {
     userUuid: string
     timestamp: number
   }): UserDesignatedAsSurvivorInSharedVaultEvent
+  createAccountDeletionVerificationPassedEvent(dto: {
+    userUuid: string
+    email: string
+  }): AccountDeletionVerificationPassedEvent
 }

packages/syncing-server/src/Domain/Handler/AccountDeletionVerificationRequestedEventHandler.ts

@@ -0,0 +1,48 @@
+import {
+  AccountDeletionVerificationRequestedEvent,
+  DomainEventHandlerInterface,
+  DomainEventPublisherInterface,
+} from '@standardnotes/domain-events'
+import { Uuid } from '@standardnotes/domain-core'
+import { Logger } from 'winston'
+
+import { ItemRepositoryInterface } from '../Item/ItemRepositoryInterface'
+import { DomainEventFactoryInterface } from '../Event/DomainEventFactoryInterface'
+
+export class AccountDeletionVerificationRequestedEventHandler implements DomainEventHandlerInterface {
+  constructor(
+    private itemRepository: ItemRepositoryInterface,
+    private domainEventPublisher: DomainEventPublisherInterface,
+    private domainEventFactory: DomainEventFactoryInterface,
+    private logger: Logger,
+  ) {}
+
+  async handle(event: AccountDeletionVerificationRequestedEvent): Promise<void> {
+    const userUuidOrError = Uuid.create(event.payload.userUuid)
+    if (userUuidOrError.isFailed()) {
+      this.logger.error(`AccountDeletionVerificationRequestedEventHandler failed: ${userUuidOrError.getError()}`)
+
+      return
+    }
+    const userUuid = userUuidOrError.getValue()
+
+    const itemsCount = await this.itemRepository.countAll({
+      userUuid: userUuid.value,
+    })
+
+    if (itemsCount !== 0) {
+      this.logger.warn(
+        `AccountDeletionVerificationRequestedEventHandler: User ${userUuid.value} has ${itemsCount} items and cannot be deleted.`,
+      )
+
+      return
+    }
+
+    await this.domainEventPublisher.publish(
+      this.domainEventFactory.createAccountDeletionVerificationPassedEvent({
+        userUuid: userUuid.value,
+        email: event.payload.email,
+      }),
+    )
+  }
+}

packages/syncing-server/src/Domain/UseCase/Syncing/SaveItems/SaveItems.spec.ts

@@ -8,6 +8,10 @@ import { Logger } from 'winston'
 import { ContentType, Dates, Result, Timestamps, Uuid } from '@standardnotes/domain-core'
 import { ItemHash } from '../../../Item/ItemHash'
 import { Item } from '../../../Item/Item'
+import { SendEventToClient } from '../SendEventToClient/SendEventToClient'
+import { DomainEventFactoryInterface } from '../../../Event/DomainEventFactoryInterface'
+import { ItemsChangedOnServerEvent } from '@standardnotes/domain-events'
+import { SelectorInterface } from '@standardnotes/security'
 
 describe('SaveItems', () => {
   let itemSaveValidator: ItemSaveValidatorInterface
@@ -18,11 +22,35 @@ describe('SaveItems', () => {
   let logger: Logger
   let itemHash1: ItemHash
   let savedItem: Item
+  let sendEventToClient: SendEventToClient
+  let domainEventFactory: DomainEventFactoryInterface
+  let deterministicSelector: SelectorInterface<number>
 
   const createUseCase = () =>
-    new SaveItems(itemSaveValidator, itemRepository, timer, saveNewItem, updateExistingItem, logger)
+    new SaveItems(
+      itemSaveValidator,
+      itemRepository,
+      timer,
+      saveNewItem,
+      updateExistingItem,
+      sendEventToClient,
+      domainEventFactory,
+      deterministicSelector,
+      logger,
+    )
 
   beforeEach(() => {
+    deterministicSelector = {} as jest.Mocked<SelectorInterface<number>>
+    deterministicSelector.select = jest.fn().mockReturnValue(1)
+
+    sendEventToClient = {} as jest.Mocked<SendEventToClient>
+    sendEventToClient.execute = jest.fn().mockReturnValue(Result.ok())
+
+    domainEventFactory = {} as jest.Mocked<DomainEventFactoryInterface>
+    domainEventFactory.createItemsChangedOnServerEvent = jest
+      .fn()
+      .mockReturnValue({} as jest.Mocked<ItemsChangedOnServerEvent>)
+
     itemSaveValidator = {} as jest.Mocked<ItemSaveValidatorInterface>
     itemSaveValidator.validate = jest.fn().mockResolvedValue({ passed: true })
 
@@ -92,6 +120,7 @@ describe('SaveItems', () => {
       userUuid: 'user-uuid',
       sessionUuid: 'session-uuid',
     })
+    expect(sendEventToClient.execute).toHaveBeenCalled()
   })
 
   it('should mark items as conflicts if saving new item fails', async () => {
@@ -115,6 +144,7 @@ describe('SaveItems', () => {
         type: 'uuid_conflict',
       },
     ])
+    expect(sendEventToClient.execute).not.toHaveBeenCalled()
   })
 
   it('should mark items as conflicts if saving new item throws an error', async () => {
@@ -197,6 +227,8 @@ describe('SaveItems', () => {
   })
 
   it('should update existing items', async () => {
+    deterministicSelector.select = jest.fn().mockReturnValue(0)
+
     const useCase = createUseCase()
 
     itemRepository.findByUuid = jest.fn().mockResolvedValue(savedItem)
@@ -217,6 +249,7 @@ describe('SaveItems', () => {
       sessionUuid: 'session-uuid',
       performingUserUuid: '00000000-0000-0000-0000-000000000000',
     })
+    expect(sendEventToClient.execute).not.toHaveBeenCalled()
   })
 
   it('should mark items as conflicts if updating existing item fails', async () => {

packages/syncing-server/src/Domain/UseCase/Syncing/SaveItems/SaveItems.ts

@@ -11,6 +11,9 @@ import { ItemSaveValidatorInterface } from '../../../Item/SaveValidator/ItemSave
 import { SaveNewItem } from '../SaveNewItem/SaveNewItem'
 import { UpdateExistingItem } from '../UpdateExistingItem/UpdateExistingItem'
 import { ItemRepositoryInterface } from '../../../Item/ItemRepositoryInterface'
+import { SendEventToClient } from '../SendEventToClient/SendEventToClient'
+import { DomainEventFactoryInterface } from '../../../Event/DomainEventFactoryInterface'
+import { SelectorInterface } from '@standardnotes/security'
 
 export class SaveItems implements UseCaseInterface<SaveItemsResult> {
   private readonly SYNC_TOKEN_VERSION = 2
@@ -21,6 +24,9 @@ export class SaveItems implements UseCaseInterface<SaveItemsResult> {
     private timer: TimerInterface,
     private saveNewItem: SaveNewItem,
     private updateExistingItem: UpdateExistingItem,
+    private sendEventToClient: SendEventToClient,
+    private domainEventFactory: DomainEventFactoryInterface,
+    private deterministicSelector: SelectorInterface<number>,
     private logger: Logger,
   ) {}
 
@@ -133,6 +139,8 @@ export class SaveItems implements UseCaseInterface<SaveItemsResult> {
 
     const syncToken = this.calculateSyncToken(lastUpdatedTimestamp, savedItems)
 
+    await this.notifyOtherClientsOfTheUserThatItemsChanged(dto, savedItems, lastUpdatedTimestamp)
+
     return Result.ok({
       savedItems,
       conflicts,
@@ -140,6 +148,37 @@ export class SaveItems implements UseCaseInterface<SaveItemsResult> {
     })
   }
 
+  private async notifyOtherClientsOfTheUserThatItemsChanged(
+    dto: SaveItemsDTO,
+    savedItems: Item[],
+    lastUpdatedTimestamp: number,
+  ): Promise<void> {
+    if (savedItems.length === 0 || !dto.sessionUuid) {
+      return
+    }
+
+    const tenPercentSpreadArray = Array.from(Array(10).keys())
+    const diceRoll = this.deterministicSelector.select(dto.userUuid, tenPercentSpreadArray)
+    if (diceRoll !== 1) {
+      return
+    }
+
+    const itemsChangedEvent = this.domainEventFactory.createItemsChangedOnServerEvent({
+      userUuid: dto.userUuid,
+      sessionUuid: dto.sessionUuid,
+      timestamp: lastUpdatedTimestamp,
+    })
+    const result = await this.sendEventToClient.execute({
+      userUuid: dto.userUuid,
+      originatingSessionUuid: dto.sessionUuid,
+      event: itemsChangedEvent,
+    })
+    /* istanbul ignore next */
+    if (result.isFailed()) {
+      this.logger.error(`[${dto.userUuid}] Sending items changed event to client failed. Error: ${result.getError()}`)
+    }
+  }
+
   private calculateSyncToken(lastUpdatedTimestamp: number, savedItems: Array<Item>): string {
     if (savedItems.length) {
       const sortedItems = savedItems.sort((itemA: Item, itemB: Item) => {

packages/syncing-server/src/Domain/UseCase/Syncing/SendEventToClient/SendEventToClient.spec.ts

@@ -17,6 +17,8 @@ describe('SendEventToClient', () => {
   beforeEach(() => {
     logger = {} as jest.Mocked<Logger>
     logger.info = jest.fn()
+    logger.debug = jest.fn()
+    logger.error = jest.fn()
 
     domainEventFactory = {} as jest.Mocked<DomainEventFactoryInterface>
     domainEventFactory.createWebSocketMessageRequestedEvent = jest
@@ -58,4 +60,21 @@ describe('SendEventToClient', () => {
 
     expect(result.isFailed()).toBe(true)
   })
+
+  it('should return a failed result if error is thrown', async () => {
+    const useCase = createUseCase()
+
+    domainEventFactory.createWebSocketMessageRequestedEvent = jest.fn().mockImplementation(() => {
+      throw new Error('test')
+    })
+
+    const result = await useCase.execute({
+      userUuid: '00000000-0000-0000-0000-000000000000',
+      event: {
+        type: 'test',
+      } as jest.Mocked<DomainEventInterface>,
+    })
+
+    expect(result.isFailed()).toBe(true)
+  })
 })

packages/syncing-server/src/Domain/UseCase/Syncing/SendEventToClient/SendEventToClient.ts

@@ -13,21 +13,26 @@ export class SendEventToClient implements UseCaseInterface<void> {
   ) {}
 
   async execute(dto: SendEventToClientDTO): Promise<Result<void>> {
-    const userUuidOrError = Uuid.create(dto.userUuid)
-    if (userUuidOrError.isFailed()) {
-      return Result.fail(userUuidOrError.getError())
+    try {
+      const userUuidOrError = Uuid.create(dto.userUuid)
+      if (userUuidOrError.isFailed()) {
+        return Result.fail(userUuidOrError.getError())
+      }
+      const userUuid = userUuidOrError.getValue()
+
+      this.logger.debug(`[WebSockets] Requesting message ${dto.event.type} to user ${dto.userUuid}`)
+
+      const event = this.domainEventFactory.createWebSocketMessageRequestedEvent({
+        userUuid: userUuid.value,
+        message: JSON.stringify(dto.event),
+        originatingSessionUuid: dto.originatingSessionUuid,
+      })
+
+      await this.domainEventPublisher.publish(event)
+
+      return Result.ok()
+    } catch (error) {
+      return Result.fail(`Failed to send event to client: ${(error as Error).message}`)
     }
-    const userUuid = userUuidOrError.getValue()
-
-    this.logger.info(`[WebSockets] Requesting message ${dto.event.type} to user ${dto.userUuid}`)
-
-    const event = this.domainEventFactory.createWebSocketMessageRequestedEvent({
-      userUuid: userUuid.value,
-      message: JSON.stringify(dto.event),
-    })
-
-    await this.domainEventPublisher.publish(event)
-
-    return Result.ok()
   }
 }

packages/syncing-server/src/Domain/UseCase/Syncing/SendEventToClient/SendEventToClientDTO.ts

@@ -3,4 +3,5 @@ import { DomainEventInterface } from '@standardnotes/domain-events'
 export interface SendEventToClientDTO {
   userUuid: string
   event: DomainEventInterface
+  originatingSessionUuid?: string
 }

packages/syncing-server/src/Domain/UseCase/Syncing/SyncItems/SyncItems.ts

@@ -59,7 +59,7 @@ export class SyncItems implements UseCaseInterface<SyncItemsResponse> {
       )
       const isSharedVaultExclusiveSync = dto.sharedVaultUuids && dto.sharedVaultUuids.length > 0
       if (this.isFirstSync(dto) && !isSharedVaultExclusiveSync) {
-        retrievedItems = await this.frontLoadKeysItemsToTop(dto.userUuid, retrievedItems)
+        retrievedItems = await this.frontLoadHighLoadingPriorityItemsToTop(dto.userUuid, retrievedItems)
       }
 
       const sharedVaultsOrError = await this.getSharedVaultsUseCase.execute({
@@ -139,19 +139,22 @@ export class SyncItems implements UseCaseInterface<SyncItemsResponse> {
     return retrievedItems.filter((item: Item) => syncConflictIds.indexOf(item.id.toString()) === -1)
   }
 
-  private async frontLoadKeysItemsToTop(userUuid: string, retrievedItems: Array<Item>): Promise<Array<Item>> {
-    const itemsKeys = await this.itemRepository.findAll({
+  private async frontLoadHighLoadingPriorityItemsToTop(
+    userUuid: string,
+    retrievedItems: Array<Item>,
+  ): Promise<Array<Item>> {
+    const highPriorityItems = await this.itemRepository.findAll({
       userUuid,
-      contentType: ContentType.TYPES.ItemsKey,
+      contentType: [ContentType.TYPES.ItemsKey, ContentType.TYPES.UserPrefs, ContentType.TYPES.Theme],
       sortBy: 'updated_at_timestamp',
       sortOrder: 'ASC',
     })
 
     const retrievedItemsIds: Array<string> = retrievedItems.map((item: Item) => item.id.toString())
 
-    itemsKeys.forEach((itemKey: Item) => {
-      if (retrievedItemsIds.indexOf(itemKey.id.toString()) === -1) {
-        retrievedItems.unshift(itemKey)
+    highPriorityItems.forEach((highPriorityItem: Item) => {
+      if (retrievedItemsIds.indexOf(highPriorityItem.id.toString()) === -1) {
+        retrievedItems.unshift(highPriorityItem)
       }
     })
 

packages/syncing-server/src/Infra/gRPC/SyncingServer.ts

@@ -22,38 +22,82 @@ export class SyncingServer implements ISyncingServer {
     call: grpc.ServerUnaryCall<SyncRequest, SyncResponse>,
     callback: grpc.sendUnaryData<SyncResponse>,
   ): Promise<void> {
-    this.logger.debug('[SyncingServer] Syncing items via gRPC')
+    try {
+      this.logger.debug('[SyncingServer] Syncing items via gRPC')
 
-    const itemHashesRPC = call.request.getItemsList()
-    const itemHashes: ItemHash[] = []
-    for (const itemHash of itemHashesRPC) {
-      const itemHashOrError = ItemHash.create({
-        uuid: itemHash.getUuid(),
-        content: itemHash.hasContent() ? itemHash.getContent() : undefined,
-        content_type: itemHash.hasContentType() ? (itemHash.getContentType() as string) : null,
-        deleted: itemHash.hasDeleted() ? itemHash.getDeleted() : undefined,
-        duplicate_of: itemHash.hasDuplicateOf() ? itemHash.getDuplicateOf() : undefined,
-        auth_hash: itemHash.hasAuthHash() ? itemHash.getAuthHash() : undefined,
-        enc_item_key: itemHash.hasEncItemKey() ? itemHash.getEncItemKey() : undefined,
-        items_key_id: itemHash.hasItemsKeyId() ? itemHash.getItemsKeyId() : undefined,
-        created_at: itemHash.hasCreatedAt() ? itemHash.getCreatedAt() : undefined,
-        created_at_timestamp: itemHash.hasCreatedAtTimestamp() ? itemHash.getCreatedAtTimestamp() : undefined,
-        updated_at: itemHash.hasUpdatedAt() ? itemHash.getUpdatedAt() : undefined,
-        updated_at_timestamp: itemHash.hasUpdatedAtTimestamp() ? itemHash.getUpdatedAtTimestamp() : undefined,
-        user_uuid: call.metadata.get('userUuid').pop() as string,
-        key_system_identifier: itemHash.hasKeySystemIdentifier() ? (itemHash.getKeySystemIdentifier() as string) : null,
-        shared_vault_uuid: itemHash.hasSharedVaultUuid() ? (itemHash.getSharedVaultUuid() as string) : null,
+      const itemHashesRPC = call.request.getItemsList()
+      const itemHashes: ItemHash[] = []
+      for (const itemHash of itemHashesRPC) {
+        const itemHashOrError = ItemHash.create({
+          uuid: itemHash.getUuid(),
+          content: itemHash.hasContent() ? itemHash.getContent() : undefined,
+          content_type: itemHash.hasContentType() ? (itemHash.getContentType() as string) : null,
+          deleted: itemHash.hasDeleted() ? itemHash.getDeleted() : undefined,
+          duplicate_of: itemHash.hasDuplicateOf() ? itemHash.getDuplicateOf() : undefined,
+          auth_hash: itemHash.hasAuthHash() ? itemHash.getAuthHash() : undefined,
+          enc_item_key: itemHash.hasEncItemKey() ? itemHash.getEncItemKey() : undefined,
+          items_key_id: itemHash.hasItemsKeyId() ? itemHash.getItemsKeyId() : undefined,
+          created_at: itemHash.hasCreatedAt() ? itemHash.getCreatedAt() : undefined,
+          created_at_timestamp: itemHash.hasCreatedAtTimestamp() ? itemHash.getCreatedAtTimestamp() : undefined,
+          updated_at: itemHash.hasUpdatedAt() ? itemHash.getUpdatedAt() : undefined,
+          updated_at_timestamp: itemHash.hasUpdatedAtTimestamp() ? itemHash.getUpdatedAtTimestamp() : undefined,
+          user_uuid: call.metadata.get('userUuid').pop() as string,
+          key_system_identifier: itemHash.hasKeySystemIdentifier()
+            ? (itemHash.getKeySystemIdentifier() as string)
+            : null,
+          shared_vault_uuid: itemHash.hasSharedVaultUuid() ? (itemHash.getSharedVaultUuid() as string) : null,
+        })
+
+        if (itemHashOrError.isFailed()) {
+          const metadata = new grpc.Metadata()
+          metadata.set('x-sync-error-message', itemHashOrError.getError())
+          metadata.set('x-sync-error-response-code', '400')
+
+          return callback(
+            {
+              code: Status.INVALID_ARGUMENT,
+              message: itemHashOrError.getError(),
+              name: 'INVALID_ARGUMENT',
+              metadata,
+            },
+            null,
+          )
+        }
+
+        itemHashes.push(itemHashOrError.getValue())
+      }
+
+      let sharedVaultUuids: string[] | undefined = undefined
+      const sharedVaultUuidsList = call.request.getSharedVaultUuidsList()
+      if (sharedVaultUuidsList.length > 0) {
+        sharedVaultUuids = sharedVaultUuidsList
+      }
+
+      const apiVersion = call.request.hasApiVersion() ? (call.request.getApiVersion() as string) : ApiVersion.v20161215
+
+      const syncResult = await this.syncItemsUseCase.execute({
+        userUuid: call.metadata.get('x-user-uuid').pop() as string,
+        itemHashes,
+        computeIntegrityHash: call.request.hasComputeIntegrity() ? call.request.getComputeIntegrity() === true : false,
+        syncToken: call.request.hasSyncToken() ? call.request.getSyncToken() : undefined,
+        cursorToken: call.request.getCursorToken() ? call.request.getCursorToken() : undefined,
+        limit: call.request.hasLimit() ? call.request.getLimit() : undefined,
+        contentType: call.request.hasContentType() ? call.request.getContentType() : undefined,
+        apiVersion,
+        snjsVersion: call.metadata.get('x-snjs-version').pop() as string,
+        readOnlyAccess: call.metadata.get('x-read-only-access').pop() === 'true',
+        sessionUuid: call.metadata.get('x-session-uuid').pop() as string,
+        sharedVaultUuids,
       })
-
-      if (itemHashOrError.isFailed()) {
+      if (syncResult.isFailed()) {
         const metadata = new grpc.Metadata()
-        metadata.set('x-sync-error-message', itemHashOrError.getError())
+        metadata.set('x-sync-error-message', syncResult.getError())
         metadata.set('x-sync-error-response-code', '400')
 
         return callback(
           {
             code: Status.INVALID_ARGUMENT,
-            message: itemHashOrError.getError(),
+            message: syncResult.getError(),
             name: 'INVALID_ARGUMENT',
             metadata,
           },
@@ -61,53 +105,24 @@ export class SyncingServer implements ISyncingServer {
         )
       }
 
-      itemHashes.push(itemHashOrError.getValue())
-    }
+      const syncResponse = await this.syncResponseFactoryResolver
+        .resolveSyncResponseFactoryVersion(apiVersion)
+        .createResponse(syncResult.getValue())
 
-    let sharedVaultUuids: string[] | undefined = undefined
-    const sharedVaultUuidsList = call.request.getSharedVaultUuidsList()
-    if (sharedVaultUuidsList.length > 0) {
-      sharedVaultUuids = sharedVaultUuidsList
-    }
+      const projection = this.mapper.toProjection(syncResponse as SyncResponse20200115)
 
-    const apiVersion = call.request.hasApiVersion() ? (call.request.getApiVersion() as string) : ApiVersion.v20161215
-
-    const syncResult = await this.syncItemsUseCase.execute({
-      userUuid: call.metadata.get('x-user-uuid').pop() as string,
-      itemHashes,
-      computeIntegrityHash: call.request.hasComputeIntegrity() ? call.request.getComputeIntegrity() === true : false,
-      syncToken: call.request.hasSyncToken() ? call.request.getSyncToken() : undefined,
-      cursorToken: call.request.getCursorToken() ? call.request.getCursorToken() : undefined,
-      limit: call.request.hasLimit() ? call.request.getLimit() : undefined,
-      contentType: call.request.hasContentType() ? call.request.getContentType() : undefined,
-      apiVersion,
-      snjsVersion: call.metadata.get('x-snjs-version').pop() as string,
-      readOnlyAccess: call.metadata.get('x-read-only-access').pop() === 'true',
-      sessionUuid: call.metadata.get('x-session-uuid').pop() as string,
-      sharedVaultUuids,
-    })
-    if (syncResult.isFailed()) {
-      const metadata = new grpc.Metadata()
-      metadata.set('x-sync-error-message', syncResult.getError())
-      metadata.set('x-sync-error-response-code', '400')
+      callback(null, projection)
+    } catch (error) {
+      this.logger.error(`[SyncingServer] Error syncing items via gRPC: ${(error as Error).message}`)
 
       return callback(
         {
-          code: Status.INVALID_ARGUMENT,
-          message: syncResult.getError(),
-          name: 'INVALID_ARGUMENT',
-          metadata,
+          code: Status.UNKNOWN,
+          message: 'An error occurred while syncing items',
+          name: 'UNKNOWN',
         },
         null,
       )
     }
-
-    const syncResponse = await this.syncResponseFactoryResolver
-      .resolveSyncResponseFactoryVersion(apiVersion)
-      .createResponse(syncResult.getValue())
-
-    const projection = this.mapper.toProjection(syncResponse as SyncResponse20200115)
-
-    callback(null, projection)
   }
 }

packages/time/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.18.1](https://github.com/standardnotes/server/compare/@standardnotes/time@1.18.0...@standardnotes/time@1.18.1) (2023-11-27)
+
+### Bug Fixes
+
+* repository config in package.json files ([ed1bf37](https://github.com/standardnotes/server/commit/ed1bf37287af23a25b8388ada95f0acdec8f71ea))
+
+# [1.18.0](https://github.com/standardnotes/server/compare/@standardnotes/time@1.17.0...@standardnotes/time@1.18.0) (2023-11-27)
+
+### Features
+
+* add npm provenance to published packages ([e836abd](https://github.com/standardnotes/server/commit/e836abdef73d246940d8fffd9e65e17c64cd35c8))
+
 # [1.17.0](https://github.com/standardnotes/server/compare/@standardnotes/time@1.16.0...@standardnotes/time@1.17.0) (2023-09-28)
 
 ### Features

packages/time/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/time",
-  "version": "1.17.0",
+  "version": "1.18.1",
   "engines": {
     "node": ">=18.0.0 <21.0.0"
   },
@@ -12,7 +12,13 @@
     "dist/src/**/*.d.ts"
   ],
   "publishConfig": {
-    "access": "public"
+    "access": "public",
+    "provenance": true
+  },
+  "repository": {
+    "type": "git",
+    "url": "git@github.com:standardnotes/server.git",
+    "directory": "packages/time"
   },
   "author": "Standard Notes",
   "license": "AGPL-3.0-or-later",

packages/websockets/.env.sample

@@ -8,6 +8,15 @@ AUTH_JWT_SECRET=auth_jwt_secret
 
 REDIS_URL=redis://cache
 
+DB_HOST=127.0.0.1
+DB_REPLICA_HOST=127.0.0.1
+DB_PORT=3306
+DB_USERNAME=websockets
+DB_PASSWORD=changeme123
+DB_DATABASE=websockets
+DB_DEBUG_LEVEL=all # "all" | "query" | "schema" | "error" | "warn" | "info" | "log" | "migration"
+DB_TYPE=mysql
+
 SNS_TOPIC_ARN=
 SNS_AWS_REGION=
 SQS_QUEUE_URL=

packages/websockets/CHANGELOG.md

@@ -3,6 +3,30 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [1.21.0](https://github.com/standardnotes/server/compare/@standardnotes/websockets-server@1.20.4...@standardnotes/websockets-server@1.21.0) (2023-11-28)
+
+### Features
+
+* send event to client upon items change on server ([#941](https://github.com/standardnotes/server/issues/941)) ([69b404f](https://github.com/standardnotes/server/commit/69b404f5d45f32530ebadbdbbec01d4e335dbbe9))
+
+## [1.20.4](https://github.com/standardnotes/server/compare/@standardnotes/websockets-server@1.20.3...@standardnotes/websockets-server@1.20.4) (2023-11-27)
+
+### Bug Fixes
+
+* repository config in package.json files ([ed1bf37](https://github.com/standardnotes/server/commit/ed1bf37287af23a25b8388ada95f0acdec8f71ea))
+
+## [1.20.3](https://github.com/standardnotes/server/compare/@standardnotes/websockets-server@1.20.2...@standardnotes/websockets-server@1.20.3) (2023-11-27)
+
+**Note:** Version bump only for package @standardnotes/websockets-server
+
+## [1.20.2](https://github.com/standardnotes/server/compare/@standardnotes/websockets-server@1.20.1...@standardnotes/websockets-server@1.20.2) (2023-11-23)
+
+**Note:** Version bump only for package @standardnotes/websockets-server
+
+## [1.20.1](https://github.com/standardnotes/server/compare/@standardnotes/websockets-server@1.20.0...@standardnotes/websockets-server@1.20.1) (2023-11-22)
+
+**Note:** Version bump only for package @standardnotes/websockets-server
+
 # [1.20.0](https://github.com/standardnotes/server/compare/@standardnotes/websockets-server@1.19.2...@standardnotes/websockets-server@1.20.0) (2023-11-16)
 
 ### Features

packages/websockets/bin/server.ts

@@ -12,7 +12,7 @@ import { ContainerConfigLoader } from '../src/Bootstrap/Container'
 import TYPES from '../src/Bootstrap/Types'
 import { Env } from '../src/Bootstrap/Env'
 
-const container = new ContainerConfigLoader()
+const container = new ContainerConfigLoader('server')
 void container.load().then((container) => {
   const env: Env = new Env()
   env.load()

packages/websockets/bin/worker.ts

@@ -7,7 +7,7 @@ import TYPES from '../src/Bootstrap/Types'
 import { Env } from '../src/Bootstrap/Env'
 import { DomainEventSubscriberInterface } from '@standardnotes/domain-events'
 
-const container = new ContainerConfigLoader()
+const container = new ContainerConfigLoader('worker')
 void container.load().then((container) => {
   const env: Env = new Env()
   env.load()

packages/websockets/migrations/mysql/1701087671322-initial-database.ts

@@ -0,0 +1,17 @@
+import { MigrationInterface, QueryRunner } from 'typeorm'
+
+export class InitialDatabase1701087671322 implements MigrationInterface {
+  name = 'InitialDatabase1701087671322'
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      'CREATE TABLE `connections` (`uuid` varchar(36) NOT NULL, `user_uuid` varchar(36) NOT NULL, `session_uuid` varchar(36) NOT NULL, `connection_id` varchar(255) NOT NULL, `created_at_timestamp` bigint NOT NULL, `updated_at_timestamp` bigint NOT NULL, INDEX `index_connections_on_user_uuid` (`user_uuid`), UNIQUE INDEX `index_connections_on_connection_id` (`connection_id`), PRIMARY KEY (`uuid`)) ENGINE=InnoDB',
+    )
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query('DROP INDEX `index_connections_on_connection_id` ON `connections`')
+    await queryRunner.query('DROP INDEX `index_connections_on_user_uuid` ON `connections`')
+    await queryRunner.query('DROP TABLE `connections`')
+  }
+}

packages/websockets/package.json

@@ -1,10 +1,15 @@
 {
   "name": "@standardnotes/websockets-server",
-  "version": "1.20.0",
+  "version": "1.21.0",
   "engines": {
     "node": ">=18.0.0 <21.0.0"
   },
   "private": true,
+  "repository": {
+    "type": "git",
+    "url": "git@github.com:standardnotes/server.git",
+    "directory": "packages/websockets"
+  },
   "description": "Websockets Server",
   "main": "dist/src/index.js",
   "typings": "dist/src/index.d.ts",
@@ -24,13 +29,13 @@
   "dependencies": {
     "@aws-sdk/client-apigatewaymanagementapi": "^3.427.0",
     "@aws-sdk/client-sqs": "^3.427.0",
-    "@standardnotes/api": "^1.26.26",
     "@standardnotes/common": "workspace:^",
     "@standardnotes/domain-core": "workspace:^",
     "@standardnotes/domain-events": "workspace:^",
     "@standardnotes/domain-events-infra": "workspace:^",
     "@standardnotes/responses": "^1.13.27",
     "@standardnotes/security": "workspace:^",
+    "@standardnotes/time": "workspace:^",
     "cors": "2.8.5",
     "dotenv": "^16.0.1",
     "express": "^4.18.2",

packages/websockets/src/Bootstrap/Container.ts

@@ -1,5 +1,4 @@
 import * as winston from 'winston'
-import Redis from 'ioredis'
 import { SQSClient, SQSClientConfig } from '@aws-sdk/client-sqs'
 import { ApiGatewayManagementApiClient } from '@aws-sdk/client-apigatewaymanagementapi'
 import { Container } from 'inversify'
@@ -8,16 +7,14 @@ import {
   DomainEventMessageHandlerInterface,
   DomainEventSubscriberInterface,
 } from '@standardnotes/domain-events'
+import { TimerInterface, Timer } from '@standardnotes/time'
 import { Env } from './Env'
 import TYPES from './Types'
 import { WebSocketsConnectionRepositoryInterface } from '../Domain/WebSockets/WebSocketsConnectionRepositoryInterface'
-import { RedisWebSocketsConnectionRepository } from '../Infra/Redis/RedisWebSocketsConnectionRepository'
 import { AddWebSocketsConnection } from '../Domain/UseCase/AddWebSocketsConnection/AddWebSocketsConnection'
 import { RemoveWebSocketsConnection } from '../Domain/UseCase/RemoveWebSocketsConnection/RemoveWebSocketsConnection'
-import { WebSocketsClientMessenger } from '../Infra/WebSockets/WebSocketsClientMessenger'
 import { SQSDomainEventSubscriber, SQSEventMessageHandler } from '@standardnotes/domain-events-infra'
-import { ApiGatewayAuthMiddleware } from '../Controller/ApiGatewayAuthMiddleware'
-
+import { ApiGatewayAuthMiddleware } from '../Infra/InversifyExpressUtils/Middleware/ApiGatewayAuthMiddleware'
 import {
   CrossServiceTokenData,
   TokenDecoder,
@@ -27,29 +24,25 @@ import {
   WebSocketConnectionTokenData,
 } from '@standardnotes/security'
 import { CreateWebSocketConnectionToken } from '../Domain/UseCase/CreateWebSocketConnectionToken/CreateWebSocketConnectionToken'
-import { WebSocketsController } from '../Controller/WebSocketsController'
-import { WebSocketServerInterface } from '@standardnotes/api'
-import { ClientMessengerInterface } from '../Client/ClientMessengerInterface'
 import { WebSocketMessageRequestedEventHandler } from '../Domain/Handler/WebSocketMessageRequestedEventHandler'
+import { SQLConnectionRepository } from '../Infra/TypeORM/SQLConnectionRepository'
+import { Connection } from '../Domain/Connection/Connection'
+import { SQLConnection } from '../Infra/TypeORM/SQLConnection'
+import { MapperInterface } from '@standardnotes/domain-core'
+import { Repository } from 'typeorm'
+import { ConnectionPersistenceMapper } from '../Mapping/SQL/ConnectionPersistenceMapper'
+import { AppDataSource } from './DataSource'
+import { SendMessageToClient } from '../Domain/UseCase/SendMessageToClient/SendMessageToClient'
 
 export class ContainerConfigLoader {
+  constructor(private mode: 'server' | 'worker' = 'server') {}
+
   async load(): Promise<Container> {
     const env: Env = new Env()
     env.load()
 
     const container = new Container()
 
-    const redisUrl = env.get('REDIS_URL')
-    const isRedisInClusterMode = redisUrl.indexOf(',') > 0
-    let redis
-    if (isRedisInClusterMode) {
-      redis = new Redis.Cluster(redisUrl.split(','))
-    } else {
-      redis = new Redis(redisUrl)
-    }
-
-    container.bind(TYPES.Redis).toConstantValue(redis)
-
     const winstonFormatters = [winston.format.splat(), winston.format.json()]
 
     const logger = winston.createLogger({
@@ -59,6 +52,13 @@ export class ContainerConfigLoader {
     })
     container.bind<winston.Logger>(TYPES.Logger).toConstantValue(logger)
 
+    const appDataSource = new AppDataSource({ env, runMigrations: this.mode === 'server' })
+    await appDataSource.initialize()
+
+    logger.debug('Database initialized')
+
+    container.bind<TimerInterface>(TYPES.Timer).toConstantValue(new Timer())
+
     if (env.get('SQS_QUEUE_URL', true)) {
       const sqsConfig: SQSClientConfig = {
         region: env.get('SQS_AWS_REGION', true),
@@ -83,14 +83,26 @@ export class ContainerConfigLoader {
         region: env.get('API_GATEWAY_AWS_REGION', true) ?? 'us-east-1',
       }),
     )
+    // Mappers
+    container
+      .bind<MapperInterface<Connection, SQLConnection>>(TYPES.ConnectionPersistenceMapper)
+      .toConstantValue(new ConnectionPersistenceMapper())
 
-    // Controller
-    container.bind<WebSocketServerInterface>(TYPES.WebSocketsController).to(WebSocketsController)
+    // ORM
+    container
+      .bind<Repository<SQLConnection>>(TYPES.ORMConnectionRepository)
+      .toConstantValue(appDataSource.getRepository(SQLConnection))
 
     // Repositories
     container
       .bind<WebSocketsConnectionRepositoryInterface>(TYPES.WebSocketsConnectionRepository)
-      .to(RedisWebSocketsConnectionRepository)
+      .toConstantValue(
+        new SQLConnectionRepository(
+          container.get<Repository<SQLConnection>>(TYPES.ORMConnectionRepository),
+          container.get<MapperInterface<Connection, SQLConnection>>(TYPES.ConnectionPersistenceMapper),
+          container.get<winston.Logger>(TYPES.Logger),
+        ),
+      )
 
     // Middleware
     container.bind<ApiGatewayAuthMiddleware>(TYPES.ApiGatewayAuthMiddleware).to(ApiGatewayAuthMiddleware)
@@ -103,21 +115,42 @@ export class ContainerConfigLoader {
     container
       .bind(TYPES.WEB_SOCKET_CONNECTION_TOKEN_TTL)
       .toConstantValue(+env.get('WEB_SOCKET_CONNECTION_TOKEN_TTL', true))
-    container.bind(TYPES.REDIS_URL).toConstantValue(env.get('REDIS_URL'))
     container.bind(TYPES.SQS_QUEUE_URL).toConstantValue(env.get('SQS_QUEUE_URL'))
     container.bind(TYPES.VERSION).toConstantValue(env.get('VERSION'))
 
     // use cases
-    container.bind<AddWebSocketsConnection>(TYPES.AddWebSocketsConnection).to(AddWebSocketsConnection)
+    container
+      .bind<AddWebSocketsConnection>(TYPES.AddWebSocketsConnection)
+      .toConstantValue(
+        new AddWebSocketsConnection(
+          container.get<WebSocketsConnectionRepositoryInterface>(TYPES.WebSocketsConnectionRepository),
+          container.get<TimerInterface>(TYPES.Timer),
+          container.get<winston.Logger>(TYPES.Logger),
+        ),
+      )
     container.bind<RemoveWebSocketsConnection>(TYPES.RemoveWebSocketsConnection).to(RemoveWebSocketsConnection)
     container
       .bind<CreateWebSocketConnectionToken>(TYPES.CreateWebSocketConnectionToken)
       .to(CreateWebSocketConnectionToken)
+    container
+      .bind<SendMessageToClient>(TYPES.SendMessageToClient)
+      .toConstantValue(
+        new SendMessageToClient(
+          container.get<WebSocketsConnectionRepositoryInterface>(TYPES.WebSocketsConnectionRepository),
+          container.get<ApiGatewayManagementApiClient>(TYPES.WebSockets_ApiGatewayManagementApiClient),
+          container.get<winston.Logger>(TYPES.Logger),
+        ),
+      )
 
     // Handlers
     container
       .bind<WebSocketMessageRequestedEventHandler>(TYPES.WebSocketMessageRequestedEventHandler)
-      .to(WebSocketMessageRequestedEventHandler)
+      .toConstantValue(
+        new WebSocketMessageRequestedEventHandler(
+          container.get<SendMessageToClient>(TYPES.SendMessageToClient),
+          container.get<winston.Logger>(TYPES.Logger),
+        ),
+      )
 
     // Services
     container
@@ -128,7 +161,6 @@ export class ContainerConfigLoader {
       .toConstantValue(
         new TokenEncoder<WebSocketConnectionTokenData>(container.get(TYPES.WEB_SOCKET_CONNECTION_TOKEN_SECRET)),
       )
-    container.bind<ClientMessengerInterface>(TYPES.WebSocketsClientMessenger).to(WebSocketsClientMessenger)
 
     const eventHandlers: Map<string, DomainEventHandlerInterface> = new Map([
       ['WEB_SOCKET_MESSAGE_REQUESTED', container.get(TYPES.WebSocketMessageRequestedEventHandler)],

packages/websockets/src/Bootstrap/DataSource.ts

@@ -0,0 +1,84 @@
+import { DataSource, EntityTarget, LoggerOptions, ObjectLiteral, Repository } from 'typeorm'
+import { MysqlConnectionOptions } from 'typeorm/driver/mysql/MysqlConnectionOptions'
+import { Env } from './Env'
+import { SQLConnection } from '../Infra/TypeORM/SQLConnection'
+
+export class AppDataSource {
+  private _dataSource: DataSource | undefined
+
+  constructor(
+    private configuration: {
+      env: Env
+      runMigrations: boolean
+    },
+  ) {}
+
+  getRepository<Entity extends ObjectLiteral>(target: EntityTarget<Entity>): Repository<Entity> {
+    if (!this._dataSource) {
+      throw new Error('DataSource not initialized')
+    }
+
+    return this._dataSource.getRepository(target)
+  }
+
+  async initialize(): Promise<void> {
+    await this.dataSource.initialize()
+  }
+
+  get dataSource(): DataSource {
+    this.configuration.env.load()
+
+    const maxQueryExecutionTime = this.configuration.env.get('DB_MAX_QUERY_EXECUTION_TIME', true)
+      ? +this.configuration.env.get('DB_MAX_QUERY_EXECUTION_TIME', true)
+      : 45_000
+
+    const commonDataSourceOptions = {
+      maxQueryExecutionTime,
+      entities: [SQLConnection],
+      migrations: [`${__dirname}/../../migrations/mysql/*.js`],
+      migrationsRun: this.configuration.runMigrations,
+      logging: <LoggerOptions>this.configuration.env.get('DB_DEBUG_LEVEL', true) ?? 'info',
+    }
+
+    const inReplicaMode = this.configuration.env.get('DB_REPLICA_HOST', true) ? true : false
+
+    const replicationConfig = {
+      master: {
+        host: this.configuration.env.get('DB_HOST'),
+        port: parseInt(this.configuration.env.get('DB_PORT')),
+        username: this.configuration.env.get('DB_USERNAME'),
+        password: this.configuration.env.get('DB_PASSWORD'),
+        database: this.configuration.env.get('DB_DATABASE'),
+      },
+      slaves: [
+        {
+          host: this.configuration.env.get('DB_REPLICA_HOST', true),
+          port: parseInt(this.configuration.env.get('DB_PORT')),
+          username: this.configuration.env.get('DB_USERNAME'),
+          password: this.configuration.env.get('DB_PASSWORD'),
+          database: this.configuration.env.get('DB_DATABASE'),
+        },
+      ],
+      removeNodeErrorCount: 10,
+      restoreNodeTimeout: 5,
+    }
+
+    const mySQLDataSourceOptions: MysqlConnectionOptions = {
+      ...commonDataSourceOptions,
+      type: 'mysql',
+      charset: 'utf8mb4',
+      supportBigNumbers: true,
+      bigNumberStrings: false,
+      replication: inReplicaMode ? replicationConfig : undefined,
+      host: inReplicaMode ? undefined : this.configuration.env.get('DB_HOST'),
+      port: inReplicaMode ? undefined : parseInt(this.configuration.env.get('DB_PORT')),
+      username: inReplicaMode ? undefined : this.configuration.env.get('DB_USERNAME'),
+      password: inReplicaMode ? undefined : this.configuration.env.get('DB_PASSWORD'),
+      database: inReplicaMode ? undefined : this.configuration.env.get('DB_DATABASE'),
+    }
+
+    this._dataSource = new DataSource(mySQLDataSourceOptions)
+
+    return this._dataSource
+  }
+}

packages/websockets/src/Bootstrap/MigrationsDataSource.ts

@@ -0,0 +1,7 @@
+import { AppDataSource } from './DataSource'
+import { Env } from './Env'
+
+const env: Env = new Env()
+env.load()
+
+export const MigrationsDataSource = new AppDataSource({ env, runMigrations: true }).dataSource

packages/websockets/src/Bootstrap/Types.ts

@@ -1,10 +1,12 @@
 const TYPES = {
   Logger: Symbol.for('Logger'),
-  Redis: Symbol.for('Redis'),
+  Timer: Symbol.for('Timer'),
   SQS: Symbol.for('SQS'),
   WebSockets_ApiGatewayManagementApiClient: Symbol.for('WebSockets_ApiGatewayManagementApiClient'),
-  // Controller
-  WebSocketsController: Symbol.for('WebSocketsController'),
+  // Mappers
+  ConnectionPersistenceMapper: Symbol.for('ConnectionPersistenceMapper'),
+  // ORM
+  ORMConnectionRepository: Symbol.for('ORMConnectionRepository'),
   // Repositories
   WebSocketsConnectionRepository: Symbol.for('WebSocketsConnectionRepository'),
   // Middleware
@@ -22,6 +24,7 @@ const TYPES = {
   AddWebSocketsConnection: Symbol.for('AddWebSocketsConnection'),
   RemoveWebSocketsConnection: Symbol.for('RemoveWebSocketsConnection'),
   CreateWebSocketConnectionToken: Symbol.for('CreateWebSocketConnectionToken'),
+  SendMessageToClient: Symbol.for('SendMessageToClient'),
   // Handlers
   WebSocketMessageRequestedEventHandler: Symbol.for('WebSocketMessageRequestedEventHandler'),
   // Services

packages/websockets/src/Client/ClientMessengerInterface.ts

@@ -1,3 +0,0 @@
-export interface ClientMessengerInterface {
-  send(userUuid: string, message: string): Promise<void>
-}

packages/websockets/src/Controller/ApiGatewayAuthMiddleware.spec.ts

@@ -1,99 +0,0 @@
-import 'reflect-metadata'
-
-import { ApiGatewayAuthMiddleware } from './ApiGatewayAuthMiddleware'
-import { NextFunction, Request, Response } from 'express'
-import { Logger } from 'winston'
-import { CrossServiceTokenData, TokenDecoderInterface } from '@standardnotes/security'
-import { RoleName } from '@standardnotes/domain-core'
-
-describe('ApiGatewayAuthMiddleware', () => {
-  let tokenDecoder: TokenDecoderInterface<CrossServiceTokenData>
-  let request: Request
-  let response: Response
-  let next: NextFunction
-
-  const logger = {
-    debug: jest.fn(),
-  } as unknown as jest.Mocked<Logger>
-
-  const createMiddleware = () => new ApiGatewayAuthMiddleware(tokenDecoder, logger)
-
-  beforeEach(() => {
-    tokenDecoder = {} as jest.Mocked<TokenDecoderInterface<CrossServiceTokenData>>
-    tokenDecoder.decodeToken = jest.fn().mockReturnValue({
-      user: {
-        uuid: '1-2-3',
-        email: 'test@test.te',
-      },
-      roles: [
-        {
-          uuid: 'a-b-c',
-          name: RoleName.NAMES.CoreUser,
-        },
-      ],
-    })
-
-    request = {
-      headers: {},
-    } as jest.Mocked<Request>
-    response = {
-      locals: {},
-    } as jest.Mocked<Response>
-    response.status = jest.fn().mockReturnThis()
-    response.send = jest.fn()
-    next = jest.fn()
-  })
-
-  it('should authorize user', async () => {
-    request.headers['x-auth-token'] = 'auth-jwt-token'
-
-    await createMiddleware().handler(request, response, next)
-
-    expect(response.locals.user).toEqual({
-      uuid: '1-2-3',
-      email: 'test@test.te',
-    })
-    expect(response.locals.roles).toEqual([
-      {
-        uuid: 'a-b-c',
-        name: RoleName.NAMES.CoreUser,
-      },
-    ])
-
-    expect(next).toHaveBeenCalled()
-  })
-
-  it('should not authorize if request is missing auth jwt token in headers', async () => {
-    await createMiddleware().handler(request, response, next)
-
-    expect(response.status).toHaveBeenCalledWith(401)
-    expect(next).not.toHaveBeenCalled()
-  })
-
-  it('should not authorize if auth jwt token is malformed', async () => {
-    request.headers['x-auth-token'] = 'auth-jwt-token'
-
-    tokenDecoder.decodeToken = jest.fn().mockReturnValue(undefined)
-
-    await createMiddleware().handler(request, response, next)
-
-    expect(response.status).toHaveBeenCalledWith(401)
-    expect(next).not.toHaveBeenCalled()
-  })
-
-  it('should pass the error to next middleware if one occurres', async () => {
-    request.headers['x-auth-token'] = 'auth-jwt-token'
-
-    const error = new Error('Ooops')
-
-    tokenDecoder.decodeToken = jest.fn().mockImplementation(() => {
-      throw error
-    })
-
-    await createMiddleware().handler(request, response, next)
-
-    expect(response.status).not.toHaveBeenCalled()
-
-    expect(next).toHaveBeenCalledWith(error)
-  })
-})

packages/websockets/src/Controller/WebSocketsController.spec.ts

@@ -1,28 +0,0 @@
-import 'reflect-metadata'
-
-import { WebSocketsController } from './WebSocketsController'
-import { CreateWebSocketConnectionToken } from '../Domain/UseCase/CreateWebSocketConnectionToken/CreateWebSocketConnectionToken'
-
-describe('WebSocketsController', () => {
-  let createWebSocketConnectionToken: CreateWebSocketConnectionToken
-
-  const createController = () => new WebSocketsController(createWebSocketConnectionToken)
-
-  beforeEach(() => {
-    createWebSocketConnectionToken = {} as jest.Mocked<CreateWebSocketConnectionToken>
-    createWebSocketConnectionToken.execute = jest.fn().mockReturnValue({ token: 'foobar' })
-  })
-
-  it('should create a web sockets connection token', async () => {
-    const response = await createController().createConnectionToken({ userUuid: '1-2-3' })
-
-    expect(response).toEqual({
-      status: 200,
-      data: { token: 'foobar' },
-    })
-
-    expect(createWebSocketConnectionToken.execute).toHaveBeenCalledWith({
-      userUuid: '1-2-3',
-    })
-  })
-})

packages/websockets/src/Controller/WebSocketsController.ts

@@ -1,29 +0,0 @@
-import { HttpStatusCode, HttpResponse } from '@standardnotes/responses'
-import {
-  WebSocketConnectionTokenRequestParams,
-  WebSocketConnectionTokenResponseBody,
-  WebSocketServerInterface,
-} from '@standardnotes/api'
-import { inject, injectable } from 'inversify'
-
-import TYPES from '../Bootstrap/Types'
-import { CreateWebSocketConnectionToken } from '../Domain/UseCase/CreateWebSocketConnectionToken/CreateWebSocketConnectionToken'
-
-@injectable()
-export class WebSocketsController implements WebSocketServerInterface {
-  constructor(
-    @inject(TYPES.CreateWebSocketConnectionToken)
-    private createWebSocketConnectionToken: CreateWebSocketConnectionToken,
-  ) {}
-
-  async createConnectionToken(
-    params: WebSocketConnectionTokenRequestParams,
-  ): Promise<HttpResponse<WebSocketConnectionTokenResponseBody>> {
-    const result = await this.createWebSocketConnectionToken.execute({ userUuid: params.userUuid as string })
-
-    return {
-      status: HttpStatusCode.Success,
-      data: result,
-    }
-  }
-}

packages/websockets/src/Domain/Connection/Connection.ts

@@ -0,0 +1,13 @@
+import { Entity, Result, UniqueEntityId } from '@standardnotes/domain-core'
+
+import { ConnectionProps } from './ConnectionProps'
+
+export class Connection extends Entity<ConnectionProps> {
+  private constructor(props: ConnectionProps, id?: UniqueEntityId) {
+    super(props, id)
+  }
+
+  static create(props: ConnectionProps, id?: UniqueEntityId): Result<Connection> {
+    return Result.ok<Connection>(new Connection(props, id))
+  }
+}

packages/websockets/src/Domain/Connection/ConnectionProps.ts

@@ -0,0 +1,8 @@
+import { Timestamps, Uuid } from '@standardnotes/domain-core'
+
+export interface ConnectionProps {
+  userUuid: Uuid
+  sessionUuid: Uuid
+  connectionId: string
+  timestamps: Timestamps
+}

packages/websockets/src/Domain/Handler/WebSocketMessageRequestedEventHandler.ts

@@ -1,20 +1,22 @@
 import { DomainEventHandlerInterface, WebSocketMessageRequestedEvent } from '@standardnotes/domain-events'
-import { inject, injectable } from 'inversify'
 import { Logger } from 'winston'
+import { SendMessageToClient } from '../UseCase/SendMessageToClient/SendMessageToClient'
 
-import TYPES from '../../Bootstrap/Types'
-import { ClientMessengerInterface } from '../../Client/ClientMessengerInterface'
-
-@injectable()
 export class WebSocketMessageRequestedEventHandler implements DomainEventHandlerInterface {
   constructor(
-    @inject(TYPES.WebSocketsClientMessenger) private webSocketsClientMessenger: ClientMessengerInterface,
-    @inject(TYPES.Logger) private logger: Logger,
+    private sendMessageToClient: SendMessageToClient,
+    private logger: Logger,
   ) {}
 
   async handle(event: WebSocketMessageRequestedEvent): Promise<void> {
-    this.logger.debug(`Sending message to user ${event.payload.userUuid}`)
+    const result = await this.sendMessageToClient.execute({
+      userUuid: event.payload.userUuid,
+      message: event.payload.message,
+      originatingSessionUuid: event.payload.originatingSessionUuid,
+    })
 
-    await this.webSocketsClientMessenger.send(event.payload.userUuid, event.payload.message)
+    if (result.isFailed()) {
+      this.logger.error(`Could not send message to user ${event.payload.userUuid}. Error: ${result.getError()}`)
+    }
   }
 }

packages/websockets/src/Domain/UseCase/AddWebSocketsConnection/AddWebSocketsConnection.spec.ts

@@ -1,14 +1,15 @@
-import 'reflect-metadata'
 import { Logger } from 'winston'
+import { TimerInterface } from '@standardnotes/time'
 import { WebSocketsConnectionRepositoryInterface } from '../../WebSockets/WebSocketsConnectionRepositoryInterface'
 
 import { AddWebSocketsConnection } from './AddWebSocketsConnection'
 
 describe('AddWebSocketsConnection', () => {
   let webSocketsConnectionRepository: WebSocketsConnectionRepositoryInterface
+  let timer: TimerInterface
   let logger: Logger
 
-  const createUseCase = () => new AddWebSocketsConnection(webSocketsConnectionRepository, logger)
+  const createUseCase = () => new AddWebSocketsConnection(webSocketsConnectionRepository, timer, logger)
 
   beforeEach(() => {
     webSocketsConnectionRepository = {} as jest.Mocked<WebSocketsConnectionRepositoryInterface>
@@ -17,12 +18,18 @@ describe('AddWebSocketsConnection', () => {
     logger = {} as jest.Mocked<Logger>
     logger.debug = jest.fn()
     logger.error = jest.fn()
+
+    timer = {} as jest.Mocked<TimerInterface>
+    timer.getTimestampInMicroseconds = jest.fn().mockReturnValue(123)
   })
 
   it('should save a web sockets connection for a user for further communication', async () => {
-    const result = await createUseCase().execute({ userUuid: '1-2-3', connectionId: '2-3-4' })
+    const result = await createUseCase().execute({
+      userUuid: '00000000-0000-0000-0000-000000000000',
+      sessionUuid: '00000000-0000-0000-0000-000000000000',
+      connectionId: '2-3-4',
+    })
 
-    expect(webSocketsConnectionRepository.saveConnection).toHaveBeenCalledWith('1-2-3', '2-3-4')
     expect(result.isFailed()).toBe(false)
   })
 
@@ -31,7 +38,31 @@ describe('AddWebSocketsConnection', () => {
       .fn()
       .mockRejectedValueOnce(new Error('Could not save connection'))
 
-    const result = await createUseCase().execute({ userUuid: '1-2-3', connectionId: '2-3-4' })
+    const result = await createUseCase().execute({
+      userUuid: '00000000-0000-0000-0000-000000000000',
+      sessionUuid: '00000000-0000-0000-0000-000000000000',
+      connectionId: '2-3-4',
+    })
+
+    expect(result.isFailed()).toBe(true)
+  })
+
+  it('should return failure if the user uuid is invalid', async () => {
+    const result = await createUseCase().execute({
+      userUuid: 'invalid',
+      sessionUuid: '00000000-0000-0000-0000-000000000000',
+      connectionId: '2-3-4',
+    })
+
+    expect(result.isFailed()).toBe(true)
+  })
+
+  it('should return error if the session uuid is invalid', async () => {
+    const result = await createUseCase().execute({
+      userUuid: '00000000-0000-0000-0000-000000000000',
+      sessionUuid: 'invalid',
+      connectionId: '2-3-4',
+    })
 
     expect(result.isFailed()).toBe(true)
   })

packages/websockets/src/Domain/UseCase/AddWebSocketsConnection/AddWebSocketsConnection.ts

@@ -1,24 +1,50 @@
-import { inject, injectable } from 'inversify'
 import { Logger } from 'winston'
-import { Result, UseCaseInterface } from '@standardnotes/domain-core'
+import { Result, Timestamps, UseCaseInterface, Uuid } from '@standardnotes/domain-core'
+import { TimerInterface } from '@standardnotes/time'
 
-import TYPES from '../../../Bootstrap/Types'
 import { WebSocketsConnectionRepositoryInterface } from '../../WebSockets/WebSocketsConnectionRepositoryInterface'
 import { AddWebSocketsConnectionDTO } from './AddWebSocketsConnectionDTO'
+import { Connection } from '../../Connection/Connection'
 
-@injectable()
 export class AddWebSocketsConnection implements UseCaseInterface<void> {
   constructor(
-    @inject(TYPES.WebSocketsConnectionRepository)
     private webSocketsConnectionRepository: WebSocketsConnectionRepositoryInterface,
-    @inject(TYPES.Logger) private logger: Logger,
+    private timer: TimerInterface,
+    private logger: Logger,
   ) {}
 
   async execute(dto: AddWebSocketsConnectionDTO): Promise<Result<void>> {
     try {
       this.logger.debug(`Persisting connection ${dto.connectionId} for user ${dto.userUuid}`)
 
-      await this.webSocketsConnectionRepository.saveConnection(dto.userUuid, dto.connectionId)
+      const userUuidOrError = Uuid.create(dto.userUuid)
+      if (userUuidOrError.isFailed()) {
+        return Result.fail(userUuidOrError.getError())
+      }
+      const userUuid = userUuidOrError.getValue()
+
+      const sessionUuidOrError = Uuid.create(dto.sessionUuid)
+      if (sessionUuidOrError.isFailed()) {
+        return Result.fail(sessionUuidOrError.getError())
+      }
+      const sessionUuid = sessionUuidOrError.getValue()
+
+      const connectionOrError = Connection.create({
+        userUuid,
+        sessionUuid,
+        connectionId: dto.connectionId,
+        timestamps: Timestamps.create(
+          this.timer.getTimestampInMicroseconds(),
+          this.timer.getTimestampInMicroseconds(),
+        ).getValue(),
+      })
+      /* istanbul ignore next */
+      if (connectionOrError.isFailed()) {
+        return Result.fail(connectionOrError.getError())
+      }
+      const connection = connectionOrError.getValue()
+
+      await this.webSocketsConnectionRepository.saveConnection(connection)
 
       return Result.ok()
     } catch (error) {

packages/websockets/src/Domain/UseCase/AddWebSocketsConnection/AddWebSocketsConnectionDTO.ts

@@ -1,4 +1,5 @@
 export type AddWebSocketsConnectionDTO = {
   userUuid: string
+  sessionUuid: string
   connectionId: string
 }

packages/websockets/src/Domain/UseCase/SendMessageToClient/SendMessageToClient.spec.ts

@@ -0,0 +1,99 @@
+import { ApiGatewayManagementApiClient } from '@aws-sdk/client-apigatewaymanagementapi'
+import { WebSocketsConnectionRepositoryInterface } from '../../WebSockets/WebSocketsConnectionRepositoryInterface'
+import { SendMessageToClient } from './SendMessageToClient'
+import { Logger } from 'winston'
+import { Connection } from '../../Connection/Connection'
+import { Timestamps, Uuid } from '@standardnotes/domain-core'
+
+describe('SendMessageToClient', () => {
+  let webSocketsConnectionRepository: WebSocketsConnectionRepositoryInterface
+  let apiGatewayManagementClient: ApiGatewayManagementApiClient
+  let logger: Logger
+
+  const createUseCase = () =>
+    new SendMessageToClient(webSocketsConnectionRepository, apiGatewayManagementClient, logger)
+
+  beforeEach(() => {
+    const connection = Connection.create({
+      userUuid: Uuid.create('00000000-0000-0000-0000-000000000000').getValue(),
+      connectionId: 'connection-id',
+      sessionUuid: Uuid.create('00000000-0000-0000-0000-000000000000').getValue(),
+      timestamps: Timestamps.create(123, 123).getValue(),
+    }).getValue()
+
+    webSocketsConnectionRepository = {} as jest.Mocked<WebSocketsConnectionRepositoryInterface>
+    webSocketsConnectionRepository.findAllByUserUuid = jest.fn().mockResolvedValue([connection])
+
+    apiGatewayManagementClient = {} as jest.Mocked<ApiGatewayManagementApiClient>
+    apiGatewayManagementClient.send = jest.fn().mockResolvedValue({ $metadata: { httpStatusCode: 200 } })
+
+    logger = {} as jest.Mocked<Logger>
+    logger.debug = jest.fn()
+    logger.error = jest.fn()
+  })
+
+  it('sends message to all connections for a user', async () => {
+    const useCase = createUseCase()
+
+    const result = await useCase.execute({
+      userUuid: '00000000-0000-0000-0000-000000000000',
+      message: 'message',
+    })
+
+    expect(result.isFailed()).toBe(false)
+    expect(apiGatewayManagementClient.send).toHaveBeenCalledTimes(1)
+  })
+
+  it('does not send message to originating session', async () => {
+    const useCase = createUseCase()
+
+    const result = await useCase.execute({
+      userUuid: '00000000-0000-0000-0000-000000000000',
+      message: 'message',
+      originatingSessionUuid: '00000000-0000-0000-0000-000000000000',
+    })
+
+    expect(result.isFailed()).toBe(false)
+    expect(apiGatewayManagementClient.send).toHaveBeenCalledTimes(0)
+  })
+
+  it('returns error if sending message fails', async () => {
+    apiGatewayManagementClient.send = jest.fn().mockRejectedValue(new Error('error'))
+
+    const useCase = createUseCase()
+
+    const result = await useCase.execute({
+      userUuid: '00000000-0000-0000-0000-000000000000',
+      message: 'message',
+    })
+
+    expect(result.isFailed()).toBe(true)
+    expect(result.getError()).toBe(
+      'Could not send message to connection connection-id for user 00000000-0000-0000-0000-000000000000. Error: error',
+    )
+  })
+
+  it('returns error if the user uuid is invalid', async () => {
+    const useCase = createUseCase()
+
+    const result = await useCase.execute({
+      userUuid: 'invalid',
+      message: 'message',
+    })
+
+    expect(result.isFailed()).toBe(true)
+  })
+
+  it('return error if sending the message does not return a 200 status code', async () => {
+    apiGatewayManagementClient.send = jest.fn().mockResolvedValue({ $metadata: { httpStatusCode: 500 } })
+
+    const useCase = createUseCase()
+
+    const result = await useCase.execute({
+      userUuid: '00000000-0000-0000-0000-000000000000',
+      message: 'message',
+    })
+
+    expect(result.isFailed()).toBe(true)
+  })
+})

packages/websockets/src/Domain/UseCase/SendMessageToClient/SendMessageToClient.ts

@@ -0,0 +1,57 @@
+import { Result, UseCaseInterface, Uuid } from '@standardnotes/domain-core'
+import { ApiGatewayManagementApiClient, PostToConnectionCommand } from '@aws-sdk/client-apigatewaymanagementapi'
+import { Logger } from 'winston'
+
+import { SendMessageToClientDTO } from './SendMessageToClientDTO'
+import { WebSocketsConnectionRepositoryInterface } from '../../WebSockets/WebSocketsConnectionRepositoryInterface'
+
+export class SendMessageToClient implements UseCaseInterface<void> {
+  constructor(
+    private webSocketsConnectionRepository: WebSocketsConnectionRepositoryInterface,
+    private apiGatewayManagementClient: ApiGatewayManagementApiClient,
+    private logger: Logger,
+  ) {}
+
+  async execute(dto: SendMessageToClientDTO): Promise<Result<void>> {
+    const userUuidOrError = Uuid.create(dto.userUuid)
+    if (userUuidOrError.isFailed()) {
+      return Result.fail(userUuidOrError.getError())
+    }
+    const userUuid = userUuidOrError.getValue()
+
+    const userConnections = await this.webSocketsConnectionRepository.findAllByUserUuid(userUuid)
+
+    for (const connection of userConnections) {
+      if (dto.originatingSessionUuid && connection.props.sessionUuid.value === dto.originatingSessionUuid) {
+        continue
+      }
+
+      this.logger.debug(`Sending message to connection ${connection.props.connectionId} for user ${userUuid.value}`)
+
+      const requestParams = {
+        ConnectionId: connection.props.connectionId,
+        Data: dto.message,
+      }
+
+      const command = new PostToConnectionCommand(requestParams)
+
+      try {
+        const response = await this.apiGatewayManagementClient.send(command)
+
+        if (response.$metadata.httpStatusCode !== 200) {
+          return Result.fail(
+            `Could not send message to connection ${connection.props.connectionId} for user ${userUuid.value}. Response status code: ${response.$metadata.httpStatusCode}`,
+          )
+        }
+      } catch (error) {
+        return Result.fail(
+          `Could not send message to connection ${connection.props.connectionId} for user ${userUuid.value}. Error: ${
+            (error as Error).message
+          }`,
+        )
+      }
+    }
+
+    return Result.ok()
+  }
+}

packages/websockets/src/Domain/UseCase/SendMessageToClient/SendMessageToClientDTO.ts

@@ -0,0 +1,5 @@
+export interface SendMessageToClientDTO {
+  userUuid: string
+  message: string
+  originatingSessionUuid?: string
+}

packages/websockets/src/Domain/WebSockets/WebSocketsConnectionRepositoryInterface.ts

@@ -1,5 +1,8 @@
+import { Uuid } from '@standardnotes/domain-core'
+import { Connection } from '../Connection/Connection'
+
 export interface WebSocketsConnectionRepositoryInterface {
-  findAllByUserUuid(userUuid: string): Promise<string[]>
-  saveConnection(userUuid: string, connectionId: string): Promise<void>
+  findAllByUserUuid(userUuid: Uuid): Promise<Connection[]>
+  saveConnection(connection: Connection): Promise<void>
   removeConnection(connectionId: string): Promise<void>
 }

packages/websockets/src/Infra/InversifyExpressUtils/AnnotatedWebSocketsController.ts

@@ -1,4 +1,3 @@
-import { WebSocketServerInterface } from '@standardnotes/api'
 import { Request, Response } from 'express'
 import { inject } from 'inversify'
 import {
@@ -12,24 +11,26 @@ import {
 import TYPES from '../../Bootstrap/Types'
 import { AddWebSocketsConnection } from '../../Domain/UseCase/AddWebSocketsConnection/AddWebSocketsConnection'
 import { RemoveWebSocketsConnection } from '../../Domain/UseCase/RemoveWebSocketsConnection/RemoveWebSocketsConnection'
+import { CreateWebSocketConnectionToken } from '../../Domain/UseCase/CreateWebSocketConnectionToken/CreateWebSocketConnectionToken'
 
 @controller('/sockets')
 export class AnnotatedWebSocketsController extends BaseHttpController {
   constructor(
     @inject(TYPES.AddWebSocketsConnection) private addWebSocketsConnection: AddWebSocketsConnection,
     @inject(TYPES.RemoveWebSocketsConnection) private removeWebSocketsConnection: RemoveWebSocketsConnection,
-    @inject(TYPES.WebSocketsController) private webSocketsController: WebSocketServerInterface,
+    @inject(TYPES.CreateWebSocketConnectionToken)
+    private createWebSocketConnectionToken: CreateWebSocketConnectionToken,
   ) {
     super()
   }
 
   @httpPost('/tokens', TYPES.ApiGatewayAuthMiddleware)
   async createConnectionToken(_request: Request, response: Response): Promise<results.JsonResult> {
-    const result = await this.webSocketsController.createConnectionToken({
+    const result = await this.createWebSocketConnectionToken.execute({
       userUuid: response.locals.user.uuid,
     })
 
-    return this.json(result.data, result.status)
+    return this.json(result)
   }
 
   @httpPost('/connections/:connectionId', TYPES.ApiGatewayAuthMiddleware)
@@ -39,6 +40,7 @@ export class AnnotatedWebSocketsController extends BaseHttpController {
   ): Promise<results.OkResult | results.BadRequestResult> {
     const result = await this.addWebSocketsConnection.execute({
       userUuid: response.locals.user.uuid,
+      sessionUuid: response.locals.session.uuid,
       connectionId: request.params.connectionId,
     })
 

packages/websockets/src/Infra/InversifyExpressUtils/Middleware/ApiGatewayAuthMiddleware.ts

@@ -3,7 +3,7 @@ import { NextFunction, Request, Response } from 'express'
 import { inject, injectable } from 'inversify'
 import { BaseMiddleware } from 'inversify-express-utils'
 import { Logger } from 'winston'
-import TYPES from '../Bootstrap/Types'
+import TYPES from '../../../Bootstrap/Types'
 
 @injectable()
 export class ApiGatewayAuthMiddleware extends BaseMiddleware {
@@ -33,7 +33,7 @@ export class ApiGatewayAuthMiddleware extends BaseMiddleware {
         request.headers['x-auth-token'] as string,
       )
 
-      if (token === undefined) {
+      if (token === undefined || token.session === undefined) {
         this.logger.debug('ApiGatewayAuthMiddleware authentication failure.')
 
         response.status(401).send({

packages/websockets/src/Infra/Redis/RedisWebSocketsConnectionRepository.spec.ts

@@ -1,44 +0,0 @@
-import 'reflect-metadata'
-
-import * as IORedis from 'ioredis'
-
-import { RedisWebSocketsConnectionRepository } from './RedisWebSocketsConnectionRepository'
-
-describe('RedisWebSocketsConnectionRepository', () => {
-  let redisClient: IORedis.Redis
-
-  const createRepository = () => new RedisWebSocketsConnectionRepository(redisClient)
-
-  beforeEach(() => {
-    redisClient = {} as jest.Mocked<IORedis.Redis>
-    redisClient.sadd = jest.fn()
-    redisClient.set = jest.fn()
-    redisClient.get = jest.fn()
-    redisClient.srem = jest.fn()
-    redisClient.del = jest.fn()
-    redisClient.smembers = jest.fn()
-  })
-
-  it('should save a connection to set of user connections', async () => {
-    await createRepository().saveConnection('1-2-3', '2-3-4')
-
-    expect(redisClient.sadd).toHaveBeenCalledWith('ws_user_connections:1-2-3', '2-3-4')
-    expect(redisClient.set).toHaveBeenCalledWith('ws_connection:2-3-4', '1-2-3')
-  })
-
-  it('should remove a connection from the set of user connections', async () => {
-    redisClient.get = jest.fn().mockReturnValue('1-2-3')
-
-    await createRepository().removeConnection('2-3-4')
-
-    expect(redisClient.srem).toHaveBeenCalledWith('ws_user_connections:1-2-3', '2-3-4')
-    expect(redisClient.del).toHaveBeenCalledWith('ws_connection:2-3-4')
-  })
-
-  it('should return all connections for a user uuid', async () => {
-    const userUuid = '1-2-3'
-
-    await createRepository().findAllByUserUuid(userUuid)
-    expect(redisClient.smembers).toHaveBeenCalledWith(`ws_user_connections:${userUuid}`)
-  })
-})

packages/websockets/src/Infra/Redis/RedisWebSocketsConnectionRepository.ts

@@ -1,28 +0,0 @@
-import * as IORedis from 'ioredis'
-import { inject, injectable } from 'inversify'
-import TYPES from '../../Bootstrap/Types'
-import { WebSocketsConnectionRepositoryInterface } from '../../Domain/WebSockets/WebSocketsConnectionRepositoryInterface'
-
-@injectable()
-export class RedisWebSocketsConnectionRepository implements WebSocketsConnectionRepositoryInterface {
-  private readonly WEB_SOCKETS_USER_CONNECTIONS_PREFIX = 'ws_user_connections'
-  private readonly WEB_SOCKETS_CONNETION_PREFIX = 'ws_connection'
-
-  constructor(@inject(TYPES.Redis) private redisClient: IORedis.Redis) {}
-
-  async findAllByUserUuid(userUuid: string): Promise<string[]> {
-    return await this.redisClient.smembers(`${this.WEB_SOCKETS_USER_CONNECTIONS_PREFIX}:${userUuid}`)
-  }
-
-  async removeConnection(connectionId: string): Promise<void> {
-    const userUuid = await this.redisClient.get(`${this.WEB_SOCKETS_CONNETION_PREFIX}:${connectionId}`)
-
-    await this.redisClient.srem(`${this.WEB_SOCKETS_USER_CONNECTIONS_PREFIX}:${userUuid}`, connectionId)
-    await this.redisClient.del(`${this.WEB_SOCKETS_CONNETION_PREFIX}:${connectionId}`)
-  }
-
-  async saveConnection(userUuid: string, connectionId: string): Promise<void> {
-    await this.redisClient.set(`${this.WEB_SOCKETS_CONNETION_PREFIX}:${connectionId}`, userUuid)
-    await this.redisClient.sadd(`${this.WEB_SOCKETS_USER_CONNECTIONS_PREFIX}:${userUuid}`, connectionId)
-  }
-}

packages/websockets/src/Infra/TypeORM/SQLConnection.ts

@@ -0,0 +1,42 @@
+import { Column, Entity, Index, PrimaryGeneratedColumn } from 'typeorm'
+
+@Entity({ name: 'connections' })
+export class SQLConnection {
+  @PrimaryGeneratedColumn('uuid')
+  declare uuid: string
+
+  @Column({
+    name: 'user_uuid',
+    type: 'varchar',
+    length: 36,
+  })
+  @Index('index_connections_on_user_uuid')
+  declare userUuid: string
+
+  @Column({
+    name: 'session_uuid',
+    type: 'varchar',
+    length: 36,
+  })
+  declare sessionUuid: string
+
+  @Column({
+    name: 'connection_id',
+    type: 'varchar',
+    length: 255,
+  })
+  @Index('index_connections_on_connection_id', { unique: true })
+  declare connectionId: string
+
+  @Column({
+    name: 'created_at_timestamp',
+    type: 'bigint',
+  })
+  declare createdAtTimestamp: number
+
+  @Column({
+    name: 'updated_at_timestamp',
+    type: 'bigint',
+  })
+  declare updatedAtTimestamp: number
+}