chore(release): publish new version

- @standardnotes/auth-server@1.60.6
 - @standardnotes/syncing-server@1.18.4

packages/analytics/CHANGELOG.md

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

packages/analytics/package.json

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

packages/api-gateway/.env.sample

@@ -10,6 +10,7 @@ WORKSPACE_SERVER_URL=http://workspace:3000
 WEB_SOCKET_SERVER_URL=http://websockets:3000
 PAYMENTS_SERVER_URL=http://payments:3000
 FILES_SERVER_URL=http://files:3000
+REVISIONS_SERVER_URL=http://revisions:3000
 
 HTTP_CALL_TIMEOUT=60000
 

packages/api-gateway/CHANGELOG.md

@@ -3,6 +3,16 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [1.39.0](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.38.9...@standardnotes/api-gateway@1.39.0) (2022-11-22)
+
+### Features
+
+* **api-gateway:** add v2 revisions controller ([92ba759](https://github.com/standardnotes/api-gateway/commit/92ba759b1c3719e773f989707ddd6d7a9ec57d1c))
+
+## [1.38.9](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.38.8...@standardnotes/api-gateway@1.38.9) (2022-11-22)
+
+**Note:** Version bump only for package @standardnotes/api-gateway
+
 ## [1.38.8](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.38.7...@standardnotes/api-gateway@1.38.8) (2022-11-21)
 
 **Note:** Version bump only for package @standardnotes/api-gateway

packages/api-gateway/bin/server.ts

@@ -24,6 +24,7 @@ import '../src/Controller/v1/InvitesController'
 
 import '../src/Controller/v2/PaymentsControllerV2'
 import '../src/Controller/v2/ActionsControllerV2'
+import '../src/Controller/v2/RevisionsControllerV2'
 
 import helmet from 'helmet'
 import * as cors from 'cors'

packages/api-gateway/package.json

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

packages/api-gateway/src/Bootstrap/Container.ts

@@ -54,6 +54,7 @@ export class ContainerConfigLoader {
     // env vars
     container.bind(TYPES.SYNCING_SERVER_JS_URL).toConstantValue(env.get('SYNCING_SERVER_JS_URL'))
     container.bind(TYPES.AUTH_SERVER_URL).toConstantValue(env.get('AUTH_SERVER_URL'))
+    container.bind(TYPES.REVISIONS_SERVER_URL).toConstantValue(env.get('REVISIONS_SERVER_URL'))
     container.bind(TYPES.PAYMENTS_SERVER_URL).toConstantValue(env.get('PAYMENTS_SERVER_URL', true))
     container.bind(TYPES.FILES_SERVER_URL).toConstantValue(env.get('FILES_SERVER_URL', true))
     container.bind(TYPES.AUTH_JWT_SECRET).toConstantValue(env.get('AUTH_JWT_SECRET'))

packages/api-gateway/src/Bootstrap/Types.ts

@@ -7,6 +7,7 @@ const TYPES = {
   AUTH_SERVER_URL: Symbol.for('AUTH_SERVER_URL'),
   PAYMENTS_SERVER_URL: Symbol.for('PAYMENTS_SERVER_URL'),
   FILES_SERVER_URL: Symbol.for('FILES_SERVER_URL'),
+  REVISIONS_SERVER_URL: Symbol.for('REVISIONS_SERVER_URL'),
   WORKSPACE_SERVER_URL: Symbol.for('WORKSPACE_SERVER_URL'),
   WEB_SOCKET_SERVER_URL: Symbol.for('WEB_SOCKET_SERVER_URL'),
   AUTH_JWT_SECRET: Symbol.for('AUTH_JWT_SECRET'),

packages/api-gateway/src/Controller/v2/RevisionsControllerV2.ts

@@ -0,0 +1,17 @@
+import { Request, Response } from 'express'
+import { inject } from 'inversify'
+import { BaseHttpController, controller, httpGet } from 'inversify-express-utils'
+import TYPES from '../../Bootstrap/Types'
+import { HttpServiceInterface } from '../../Service/Http/HttpServiceInterface'
+
+@controller('/v2/items/:item_id/revisions', TYPES.AuthMiddleware)
+export class RevisionsControllerV2 extends BaseHttpController {
+  constructor(@inject(TYPES.HTTPService) private httpService: HttpServiceInterface) {
+    super()
+  }
+
+  @httpGet('/')
+  async getRevisions(request: Request, response: Response): Promise<void> {
+    await this.httpService.callRevisionsServer(request, response, `items/${request.params.item_id}/revisions`)
+  }
+}

packages/api-gateway/src/Service/Http/HttpService.ts

@@ -18,6 +18,7 @@ export class HttpService implements HttpServiceInterface {
     @inject(TYPES.FILES_SERVER_URL) private filesServerUrl: string,
     @inject(TYPES.WORKSPACE_SERVER_URL) private workspaceServerUrl: string,
     @inject(TYPES.WEB_SOCKET_SERVER_URL) private webSocketServerUrl: string,
+    @inject(TYPES.REVISIONS_SERVER_URL) private revisionsServerUrl: string,
     @inject(TYPES.HTTP_CALL_TIMEOUT) private httpCallTimeout: number,
     @inject(TYPES.CrossServiceTokenCache) private crossServiceTokenCache: CrossServiceTokenCacheInterface,
     @inject(TYPES.Logger) private logger: Logger,
@@ -32,6 +33,15 @@ export class HttpService implements HttpServiceInterface {
     await this.callServer(this.syncingServerJsUrl, request, response, endpoint, payload)
   }
 
+  async callRevisionsServer(
+    request: Request,
+    response: Response,
+    endpoint: string,
+    payload?: Record<string, unknown> | string,
+  ): Promise<void> {
+    await this.callServer(this.revisionsServerUrl, request, response, endpoint, payload)
+  }
+
   async callLegacySyncingServer(
     request: Request,
     response: Response,

packages/api-gateway/src/Service/Http/HttpServiceInterface.ts

@@ -13,6 +13,12 @@ export interface HttpServiceInterface {
     endpoint: string,
     payload?: Record<string, unknown> | string,
   ): Promise<void>
+  callRevisionsServer(
+    request: Request,
+    response: Response,
+    endpoint: string,
+    payload?: Record<string, unknown> | string,
+  ): Promise<void>
   callSyncingServer(
     request: Request,
     response: Response,

packages/auth/CHANGELOG.md

@@ -3,6 +3,22 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.60.6](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.60.5...@standardnotes/auth-server@1.60.6) (2022-11-22)
+
+### Bug Fixes
+
+* sns binding ([3686a26](https://github.com/standardnotes/server/commit/3686a260192468c00b52087590dd2edf76ada939))
+
+## [1.60.5](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.60.4...@standardnotes/auth-server@1.60.5) (2022-11-22)
+
+### Bug Fixes
+
+* **auth:** tmp send email campaign only to team ([94359f1](https://github.com/standardnotes/server/commit/94359f1299a2bb009099af163d3929c4adc7e274))
+
+## [1.60.4](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.60.3...@standardnotes/auth-server@1.60.4) (2022-11-22)
+
+**Note:** Version bump only for package @standardnotes/auth-server
+
 ## [1.60.3](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.60.2...@standardnotes/auth-server@1.60.3) (2022-11-21)
 
 **Note:** Version bump only for package @standardnotes/auth-server

packages/auth/bin/email.ts

@@ -41,6 +41,12 @@ const sendEmailCampaign = async (
           objectMode: true,
           transform: async (rawUserData, _encoding, callback) => {
             try {
+              if (!(rawUserData.user_email as string).includes('@standardnotes.com')) {
+                callback()
+
+                return
+              }
+
               const emailsMutedSetting = await settingService.findSettingWithDecryptedValue({
                 userUuid: rawUserData.user_uuid,
                 settingName: SettingName.MuteMarketingEmails,

packages/auth/package.json

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

packages/auth/src/Bootstrap/Container.ts

@@ -230,13 +230,18 @@ export class ContainerConfigLoader {
     })
     container.bind<winston.Logger>(TYPES.Logger).toConstantValue(logger)
 
-    if (env.get('SNS_AWS_REGION', true)) {
-      container.bind<AWS.SNS>(TYPES.SNS).toConstantValue(
-        new AWS.SNS({
-          apiVersion: 'latest',
-          region: env.get('SNS_AWS_REGION', true),
-        }),
-      )
+    if (env.get('SNS_TOPIC_ARN', true)) {
+      const snsConfig: AWS.SNS.Types.ClientConfiguration = {
+        apiVersion: 'latest',
+        region: env.get('SNS_AWS_REGION', true),
+      }
+      if (env.get('SNS_ACCESS_KEY_ID', true) && env.get('SNS_SECRET_ACCESS_KEY', true)) {
+        snsConfig.credentials = {
+          accessKeyId: env.get('SNS_ACCESS_KEY_ID', true),
+          secretAccessKey: env.get('SNS_SECRET_ACCESS_KEY', true),
+        }
+      }
+      container.bind<AWS.SNS>(TYPES.SNS).toConstantValue(new AWS.SNS(snsConfig))
     }
 
     if (env.get('SQS_QUEUE_URL', true)) {

packages/common/CHANGELOG.md

@@ -3,6 +3,12 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [1.46.0](https://github.com/standardnotes/server/compare/@standardnotes/common@1.45.0...@standardnotes/common@1.46.0) (2022-11-22)
+
+### Features
+
+* **common:** add marketing campaign for black friday 2022 email message identifier ([d77eb7f](https://github.com/standardnotes/server/commit/d77eb7f5f11bcc7cd5c6fa6d20e891b466af7b45))
+
 # [1.45.0](https://github.com/standardnotes/server/compare/@standardnotes/common@1.44.4...@standardnotes/common@1.45.0) (2022-11-14)
 
 ### Features

packages/common/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/common",
-  "version": "1.45.0",
+  "version": "1.46.0",
   "engines": {
     "node": ">=18.0.0 <19.0.0"
   },

packages/common/src/Domain/Email/EmailMessageIdentifier.ts

@@ -18,6 +18,7 @@ export enum EmailMessageIdentifier {
   STUDENT_DISCOUNT_REQUESTED = 'STUDENT_DISCOUNT_REQUESTED',
   STUDENT_DISCOUNT_APPROVED = 'STUDENT_DISCOUNT_APPROVED',
   MARKETING_CAMPAIGN_FILES = 'MARKETING_CAMPAIGN_FILES',
+  MARKETING_BLACK_FRIDAY_2022 = 'MARKETING_BLACK_FRIDAY_2022',
   PAYMENT_FAILED = 'PAYMENT_FAILED',
   SEND_INVOICE = 'SEND_INVOICE',
   DISCOUNT_NOTICE = 'DISCOUNT_NOTICE',

packages/domain-core/CHANGELOG.md

@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.2.2](https://github.com/standardnotes/server/compare/@standardnotes/domain-core@1.2.1...@standardnotes/domain-core@1.2.2) (2022-11-22)
+
+**Note:** Version bump only for package @standardnotes/domain-core
+
 ## [1.2.1](https://github.com/standardnotes/server/compare/@standardnotes/domain-core@1.2.0...@standardnotes/domain-core@1.2.1) (2022-11-21)
 
 ### Bug Fixes

packages/domain-core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/domain-core",
-  "version": "1.2.1",
+  "version": "1.2.2",
   "engines": {
     "node": ">=18.0.0 <19.0.0"
   },

packages/domain-events-infra/CHANGELOG.md

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

packages/domain-events-infra/package.json

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

packages/domain-events/CHANGELOG.md

@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.90.1](https://github.com/standardnotes/server/compare/@standardnotes/domain-events@2.90.0...@standardnotes/domain-events@2.90.1) (2022-11-22)
+
+**Note:** Version bump only for package @standardnotes/domain-events
+
 # [2.90.0](https://github.com/standardnotes/server/compare/@standardnotes/domain-events@2.89.0...@standardnotes/domain-events@2.90.0) (2022-11-21)
 
 ### Features

packages/domain-events/package.json

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

packages/event-store/CHANGELOG.md

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

packages/event-store/package.json

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

packages/files/CHANGELOG.md

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

packages/files/package.json

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

packages/predicates/CHANGELOG.md

@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.6.1](https://github.com/standardnotes/server/compare/@standardnotes/predicates@1.6.0...@standardnotes/predicates@1.6.1) (2022-11-22)
+
+**Note:** Version bump only for package @standardnotes/predicates
+
 # [1.6.0](https://github.com/standardnotes/server/compare/@standardnotes/predicates@1.5.7...@standardnotes/predicates@1.6.0) (2022-11-14)
 
 ### Features

packages/predicates/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/predicates",
-  "version": "1.6.0",
+  "version": "1.6.1",
   "engines": {
     "node": ">=18.0.0 <19.0.0"
   },

packages/revisions/.env.sample

@@ -6,12 +6,12 @@ AUTH_JWT_SECRET=auth_jwt_secret
 
 PORT=3000
 
-DB_HOST=db
-DB_REPLICA_HOST=db
+DB_HOST=127.0.0.1
+DB_REPLICA_HOST=127.0.0.1
 DB_PORT=3306
-DB_USERNAME=std_notes_user
-DB_PASSWORD=changeme123
-DB_DATABASE=standard_notes_db
+DB_USERNAME=revisions
+DB_PASSWORD=revisionspassword
+DB_DATABASE=revisions
 DB_DEBUG_LEVEL=all # "all" | "query" | "schema" | "error" | "warn" | "info" | "log" | "migration"
 DB_MIGRATIONS_PATH=dist/migrations/*.js
 

packages/revisions/CHANGELOG.md

@@ -3,6 +3,40 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.4.2](https://github.com/standardnotes/server/compare/@standardnotes/revisions-server@1.4.1...@standardnotes/revisions-server@1.4.2) (2022-11-22)
+
+### Bug Fixes
+
+* sqs binding ([806a732](https://github.com/standardnotes/server/commit/806a732cbc92cd89deb9d9d2aa95565922ce6b72))
+
+## [1.4.1](https://github.com/standardnotes/server/compare/@standardnotes/revisions-server@1.4.0...@standardnotes/revisions-server@1.4.1) (2022-11-22)
+
+### Bug Fixes
+
+* **revisions:** add more verbose error messages ([daa7a9f](https://github.com/standardnotes/server/commit/daa7a9ff61d389e573960b443faff77e0abe01dc))
+
+# [1.4.0](https://github.com/standardnotes/server/compare/@standardnotes/revisions-server@1.3.0...@standardnotes/revisions-server@1.4.0) (2022-11-22)
+
+### Features
+
+* **revisions:** add database ([e553222](https://github.com/standardnotes/server/commit/e553222b4b0f185bea5146d440834483b140339d))
+
+# [1.3.0](https://github.com/standardnotes/server/compare/@standardnotes/revisions-server@1.2.2...@standardnotes/revisions-server@1.3.0) (2022-11-22)
+
+### Features
+
+* **revisions:** add filesystem dump repository ([14ab1ca](https://github.com/standardnotes/server/commit/14ab1cae6981b7c12e797dd316da1b3bdb37c75f))
+
+## [1.2.2](https://github.com/standardnotes/server/compare/@standardnotes/revisions-server@1.2.1...@standardnotes/revisions-server@1.2.2) (2022-11-22)
+
+**Note:** Version bump only for package @standardnotes/revisions-server
+
+## [1.2.1](https://github.com/standardnotes/server/compare/@standardnotes/revisions-server@1.2.0...@standardnotes/revisions-server@1.2.1) (2022-11-21)
+
+### Bug Fixes
+
+* **revisions:** add missing worker process ([a363039](https://github.com/standardnotes/server/commit/a363039fa1f1c75842d1eaba2a476257eba385f7))
+
 # [1.2.0](https://github.com/standardnotes/server/compare/@standardnotes/revisions-server@1.1.3...@standardnotes/revisions-server@1.2.0) (2022-11-21)
 
 ### Features

packages/revisions/bin/worker.ts

@@ -0,0 +1,25 @@
+import 'reflect-metadata'
+
+import 'newrelic'
+
+import { Logger } from 'winston'
+
+import { ContainerConfigLoader } from '../src/Bootstrap/Container'
+import TYPES from '../src/Bootstrap/Types'
+import { Env } from '../src/Bootstrap/Env'
+import { DomainEventSubscriberFactoryInterface } from '@standardnotes/domain-events'
+
+const container = new ContainerConfigLoader()
+void container.load().then((container) => {
+  const env: Env = new Env()
+  env.load()
+
+  const logger: Logger = container.get(TYPES.Logger)
+
+  logger.info('Starting worker...')
+
+  const subscriberFactory: DomainEventSubscriberFactoryInterface = container.get(TYPES.DomainEventSubscriberFactory)
+  subscriberFactory.create().start()
+
+  setInterval(() => logger.info('Alive and kicking!'), 20 * 60 * 1000)
+})

packages/revisions/migrations/1669113322388-init.ts

@@ -0,0 +1,19 @@
+import { MigrationInterface, QueryRunner } from 'typeorm'
+
+export class init1669113322388 implements MigrationInterface {
+  name = 'init1669113322388'
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      'CREATE TABLE `revisions` (`uuid` varchar(36) NOT NULL, `item_uuid` varchar(36) NOT NULL, `user_uuid` varchar(36) NOT NULL, `content` mediumtext NULL, `content_type` varchar(255) NULL, `items_key_id` varchar(255) NULL, `enc_item_key` text NULL, `auth_hash` varchar(255) NULL, `creation_date` date NULL, `created_at` datetime(6) NULL, `updated_at` datetime(6) NULL, INDEX `item_uuid` (`item_uuid`), INDEX `user_uuid` (`user_uuid`), INDEX `creation_date` (`creation_date`), INDEX `created_at` (`created_at`), PRIMARY KEY (`uuid`)) ENGINE=InnoDB',
+    )
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query('DROP INDEX `created_at` ON `revisions`')
+    await queryRunner.query('DROP INDEX `creation_date` ON `revisions`')
+    await queryRunner.query('DROP INDEX `user_uuid` ON `revisions`')
+    await queryRunner.query('DROP INDEX `item_uuid` ON `revisions`')
+    await queryRunner.query('DROP TABLE `revisions`')
+  }
+}

packages/revisions/package.json

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

packages/revisions/src/Bootstrap/Container.ts

@@ -35,6 +35,7 @@ import { RevisionPersistenceMapper } from '../Mapping/RevisionPersistenceMapper'
 import { ItemDumpedEventHandler } from '../Domain/Handler/ItemDumpedEventHandler'
 import { DumpRepositoryInterface } from '../Domain/Dump/DumpRepositoryInterface'
 import { S3DumpRepository } from '../Infra/S3/S3ItemDumpRepository'
+import { FSDumpRepository } from '../Infra/FS/FSDumpRepository'
 
 // eslint-disable-next-line @typescript-eslint/no-var-requires
 const newrelicFormatter = require('@newrelic/winston-enricher')
@@ -72,13 +73,18 @@ export class ContainerConfigLoader {
     })
     container.bind<winston.Logger>(TYPES.Logger).toConstantValue(logger)
 
-    if (env.get('SQS_AWS_REGION', true)) {
-      container.bind<AWS.SQS>(TYPES.SQS).toConstantValue(
-        new AWS.SQS({
-          apiVersion: 'latest',
-          region: env.get('SQS_AWS_REGION', true),
-        }),
-      )
+    if (env.get('SQS_QUEUE_URL', true)) {
+      const sqsConfig: AWS.SQS.Types.ClientConfiguration = {
+        apiVersion: 'latest',
+        region: env.get('SQS_AWS_REGION', true),
+      }
+      if (env.get('SQS_ACCESS_KEY_ID', true) && env.get('SQS_SECRET_ACCESS_KEY', true)) {
+        sqsConfig.credentials = {
+          accessKeyId: env.get('SQS_ACCESS_KEY_ID', true),
+          secretAccessKey: env.get('SQS_SECRET_ACCESS_KEY', true),
+        }
+      }
+      container.bind<AWS.SQS>(TYPES.SQS).toConstantValue(new AWS.SQS(sqsConfig))
     }
 
     let s3Client = undefined
@@ -126,15 +132,21 @@ export class ContainerConfigLoader {
           container.get(TYPES.RevisionPersistenceMapper),
         ),
       )
-    container
-      .bind<DumpRepositoryInterface>(TYPES.DumpRepository)
-      .toConstantValue(
-        new S3DumpRepository(
-          container.get(TYPES.S3_BACKUP_BUCKET_NAME),
-          container.get(TYPES.S3),
-          container.get(TYPES.RevisionItemStringMapper),
-        ),
-      )
+    if (env.get('S3_AWS_REGION', true)) {
+      container
+        .bind<DumpRepositoryInterface>(TYPES.DumpRepository)
+        .toConstantValue(
+          new S3DumpRepository(
+            container.get(TYPES.S3_BACKUP_BUCKET_NAME),
+            container.get(TYPES.S3),
+            container.get(TYPES.RevisionItemStringMapper),
+          ),
+        )
+    } else {
+      container
+        .bind<DumpRepositoryInterface>(TYPES.DumpRepository)
+        .toConstantValue(new FSDumpRepository(container.get(TYPES.RevisionItemStringMapper)))
+    }
 
     // use cases
     container

packages/revisions/src/Controller/RevisionsController.spec.ts

@@ -20,14 +20,14 @@ describe('RevisionsController', () => {
   })
 
   it('should get revisions list', async () => {
-    const response = await createController().getRevisions({ itemUuid: '1-2-3' })
+    const response = await createController().getRevisions({ itemUuid: '1-2-3', userUuid: '1-2-3' })
 
     expect(response.status).toEqual(200)
   })
 
   it('should indicate failure to get revisions list', async () => {
     getRevisionsMetadata.execute = jest.fn().mockReturnValue(Result.fail('Oops'))
-    const response = await createController().getRevisions({ itemUuid: '1-2-3' })
+    const response = await createController().getRevisions({ itemUuid: '1-2-3', userUuid: '1-2-3' })
 
     expect(response.status).toEqual(400)
   })

packages/revisions/src/Controller/RevisionsController.ts

@@ -8,7 +8,10 @@ export class RevisionsController {
   constructor(private getRevisionsMetadata: GetRevisionsMetada, private logger: Logger) {}
 
   async getRevisions(params: GetRevisionsMetadataRequestParams): Promise<HttpResponse> {
-    const revisionMetadataOrError = await this.getRevisionsMetadata.execute({ itemUuid: params.itemUuid })
+    const revisionMetadataOrError = await this.getRevisionsMetadata.execute({
+      itemUuid: params.itemUuid,
+      userUuid: params.userUuid,
+    })
 
     if (revisionMetadataOrError.isFailed()) {
       this.logger.warn(revisionMetadataOrError.getError())

packages/revisions/src/Domain/Revision/RevisionProps.ts

@@ -4,6 +4,7 @@ import { ContentType } from './ContentType'
 
 export interface RevisionProps {
   itemUuid: Uuid
+  userUuid: Uuid
   content: string | null
   contentType: ContentType
   itemsKeyId: string | null

packages/revisions/src/Domain/Revision/RevisionRepositoryInterface.ts

@@ -4,6 +4,6 @@ import { Revision } from './Revision'
 import { RevisionMetadata } from './RevisionMetadata'
 
 export interface RevisionRepositoryInterface {
-  findMetadataByItemId(itemUuid: Uuid): Promise<Array<RevisionMetadata>>
+  findMetadataByItemId(itemUuid: Uuid, userUuid: Uuid): Promise<Array<RevisionMetadata>>
   save(revision: Revision): Promise<Revision>
 }

packages/revisions/src/Domain/UseCase/GetRevisionsMetada/GetRevisionsMetada.spec.ts

@@ -13,14 +13,29 @@ describe('GetRevisionsMetada', () => {
   })
 
   it('should return revisions metadata for a given item', async () => {
-    const result = await createUseCase().execute({ itemUuid: '84c0f8e8-544a-4c7e-9adf-26209303bc1d' })
+    const result = await createUseCase().execute({
+      itemUuid: '84c0f8e8-544a-4c7e-9adf-26209303bc1d',
+      userUuid: '84c0f8e8-544a-4c7e-9adf-26209303bc1d',
+    })
 
     expect(result.isFailed()).toBeFalsy()
     expect(result.getValue().length).toEqual(1)
   })
 
   it('should not return revisions metadata for a an invalid item uuid', async () => {
-    const result = await createUseCase().execute({ itemUuid: '1-2-3' })
+    const result = await createUseCase().execute({
+      itemUuid: '1-2-3',
+      userUuid: '84c0f8e8-544a-4c7e-9adf-26209303bc1d',
+    })
+
+    expect(result.isFailed()).toBeTruthy()
+  })
+
+  it('should not return revisions metadata for a an invalid user uuid', async () => {
+    const result = await createUseCase().execute({
+      userUuid: '1-2-3',
+      itemUuid: '84c0f8e8-544a-4c7e-9adf-26209303bc1d',
+    })
 
     expect(result.isFailed()).toBeTruthy()
   })

packages/revisions/src/Domain/UseCase/GetRevisionsMetada/GetRevisionsMetada.ts

@@ -14,7 +14,15 @@ export class GetRevisionsMetada implements UseCaseInterface<RevisionMetadata[]>
       return Result.fail<RevisionMetadata[]>(`Could not get revisions: ${itemUuidOrError.getError()}`)
     }
 
-    const revisionsMetdata = await this.revisionRepository.findMetadataByItemId(itemUuidOrError.getValue())
+    const userUuidOrError = Uuid.create(dto.userUuid)
+    if (userUuidOrError.isFailed()) {
+      return Result.fail<RevisionMetadata[]>(`Could not get revisions: ${userUuidOrError.getError()}`)
+    }
+
+    const revisionsMetdata = await this.revisionRepository.findMetadataByItemId(
+      itemUuidOrError.getValue(),
+      userUuidOrError.getValue(),
+    )
 
     return Result.ok<RevisionMetadata[]>(revisionsMetdata)
   }

packages/revisions/src/Domain/UseCase/GetRevisionsMetada/GetRevisionsMetadaDTO.ts

@@ -1,3 +1,4 @@
 export interface GetRevisionsMetadaDTO {
   itemUuid: string
+  userUuid: string
 }

packages/revisions/src/Infra/FS/FSDumpRepository.ts

@@ -0,0 +1,21 @@
+import { MapperInterface } from '@standardnotes/domain-core'
+import { promises } from 'fs'
+
+import { DumpRepositoryInterface } from '../../Domain/Dump/DumpRepositoryInterface'
+import { Revision } from '../../Domain/Revision/Revision'
+
+export class FSDumpRepository implements DumpRepositoryInterface {
+  constructor(private revisionStringItemMapper: MapperInterface<Revision, string>) {}
+
+  async getRevisionFromDumpPath(path: string): Promise<Revision | null> {
+    const contents = (await promises.readFile(path)).toString()
+
+    const revision = this.revisionStringItemMapper.toDomain(contents)
+
+    return revision
+  }
+
+  async removeDump(path: string): Promise<void> {
+    await promises.rm(path)
+  }
+}

packages/revisions/src/Infra/Http/GetRevisionsMetadataRequestParams.ts

@@ -1,3 +1,4 @@
 export interface GetRevisionsMetadataRequestParams {
   itemUuid: string
+  userUuid: string
 }

packages/revisions/src/Infra/InversifyExpress/InversifyExpressRevisionsController.ts

@@ -1,4 +1,4 @@
-import { Request } from 'express'
+import { Request, Response } from 'express'
 import { BaseHttpController, controller, httpGet, results } from 'inversify-express-utils'
 import { inject } from 'inversify'
 
@@ -12,9 +12,10 @@ export class InversifyExpressRevisionsController extends BaseHttpController {
   }
 
   @httpGet('/')
-  public async getRevisions(req: Request): Promise<results.JsonResult> {
+  public async getRevisions(req: Request, response: Response): Promise<results.JsonResult> {
     const result = await this.revisionsController.getRevisions({
       itemUuid: req.params.itemUuid,
+      userUuid: response.locals.user.uuid,
     })
 
     return this.json(result.data, result.status)

packages/revisions/src/Infra/MySQL/MySQLRevisionRepository.ts

@@ -21,16 +21,15 @@ export class MySQLRevisionRepository implements RevisionRepositoryInterface {
     return revision
   }
 
-  async findMetadataByItemId(itemUuid: Uuid): Promise<Array<RevisionMetadata>> {
+  async findMetadataByItemId(itemUuid: Uuid, userUuid: Uuid): Promise<Array<RevisionMetadata>> {
     const queryBuilder = this.ormRepository
       .createQueryBuilder()
       .select('uuid', 'uuid')
       .addSelect('content_type', 'contentType')
       .addSelect('created_at', 'createdAt')
       .addSelect('updated_at', 'updatedAt')
-      .where('item_uuid = :item_uuid', {
-        item_uuid: itemUuid,
-      })
+      .where('item_uuid = :itemUuid', { itemUuid })
+      .andWhere('user_uuid = :userUuid', { userUuid })
       .orderBy('created_at', 'DESC')
 
     const simplifiedRevisions = await queryBuilder.getMany()

packages/revisions/src/Infra/TypeORM/TypeORMRevision.ts

@@ -9,8 +9,16 @@ export class TypeORMRevision {
     name: 'item_uuid',
     length: 36,
   })
+  @Index('item_uuid')
   declare itemUuid: string
 
+  @Column({
+    name: 'user_uuid',
+    length: 36,
+  })
+  @Index('user_uuid')
+  declare userUuid: string
+
   @Column({
     type: 'mediumtext',
     nullable: true,
@@ -53,7 +61,7 @@ export class TypeORMRevision {
     type: 'date',
     nullable: true,
   })
-  @Index('index_revisions_on_creation_date')
+  @Index('creation_date')
   declare creationDate: Date
 
   @Column({
@@ -62,7 +70,7 @@ export class TypeORMRevision {
     precision: 6,
     nullable: true,
   })
-  @Index('index_revisions_on_created_at')
+  @Index('created_at')
   declare createdAt: Date
 
   @Column({

packages/revisions/src/Mapping/RevisionItemStringMapper.ts

@@ -5,22 +5,29 @@ import { Revision } from '../Domain/Revision/Revision'
 
 export class RevisionItemStringMapper implements MapperInterface<Revision, string> {
   toDomain(projection: string): Revision {
-    const item = JSON.parse(projection)
+    const item = JSON.parse(projection).item
 
     const contentTypeOrError = ContentType.create(item.content_type)
     if (contentTypeOrError.isFailed()) {
-      throw new Error(`Could not map item string to revision: ${contentTypeOrError.getError()}`)
+      throw new Error(`Could not map item string to revision [content type]: ${contentTypeOrError.getError()}`)
     }
     const contentType = contentTypeOrError.getValue()
 
     const itemUuidOrError = Uuid.create(item.uuid)
     if (itemUuidOrError.isFailed()) {
-      throw new Error(`Could not map item string to revision: ${itemUuidOrError.getError()}`)
+      throw new Error(`Could not map item string to revision [item uuid]: ${itemUuidOrError.getError()}`)
     }
     const itemUuid = itemUuidOrError.getValue()
 
+    const userUuidOrError = Uuid.create(item.user_uuid)
+    if (userUuidOrError.isFailed()) {
+      throw new Error(`Could not map item string to revision [user uuid]: ${userUuidOrError.getError()}`)
+    }
+    const userUuid = userUuidOrError.getValue()
+
     const revisionOrError = Revision.create({
       itemUuid,
+      userUuid,
       authHash: item.auth_hash,
       content: item.content,
       contentType,
@@ -31,7 +38,7 @@ export class RevisionItemStringMapper implements MapperInterface<Revision, strin
     })
 
     if (revisionOrError.isFailed()) {
-      throw new Error(`Could not map item string to revision: ${revisionOrError.getError()}`)
+      throw new Error(`Could not map item string to revision [revision]: ${revisionOrError.getError()}`)
     }
 
     return revisionOrError.getValue()

packages/revisions/src/Mapping/RevisionPersistenceMapper.ts

@@ -23,6 +23,12 @@ export class RevisionPersistenceMapper implements MapperInterface<Revision, Type
     }
     const itemUuid = itemUuidOrError.getValue()
 
+    const userUuidOrError = Uuid.create(projection.userUuid)
+    if (userUuidOrError.isFailed()) {
+      throw new Error(`Could not map typeorm revision to domain revision: ${userUuidOrError.getError()}`)
+    }
+    const userUuid = userUuidOrError.getValue()
+
     const revisionOrError = Revision.create(
       {
         authHash: projection.authHash,
@@ -32,6 +38,7 @@ export class RevisionPersistenceMapper implements MapperInterface<Revision, Type
         encItemKey: projection.encItemKey,
         itemsKeyId: projection.itemsKeyId,
         itemUuid,
+        userUuid,
         timestamps,
       },
       new UniqueEntityId(projection.uuid),
@@ -55,6 +62,7 @@ export class RevisionPersistenceMapper implements MapperInterface<Revision, Type
     typeormRevision.encItemKey = domain.props.encItemKey
     typeormRevision.itemUuid = domain.props.itemUuid.value
     typeormRevision.itemsKeyId = domain.props.itemsKeyId
+    typeormRevision.userUuid = domain.props.userUuid.value
     typeormRevision.uuid = domain.id.toString()
 
     return typeormRevision

packages/scheduler/CHANGELOG.md

@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.13.27](https://github.com/standardnotes/server/compare/@standardnotes/scheduler-server@1.13.26...@standardnotes/scheduler-server@1.13.27) (2022-11-22)
+
+**Note:** Version bump only for package @standardnotes/scheduler-server
+
 ## [1.13.26](https://github.com/standardnotes/server/compare/@standardnotes/scheduler-server@1.13.25...@standardnotes/scheduler-server@1.13.26) (2022-11-21)
 
 **Note:** Version bump only for package @standardnotes/scheduler-server

packages/scheduler/package.json

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

packages/security/CHANGELOG.md

@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.7.1](https://github.com/standardnotes/server/compare/@standardnotes/security@1.7.0...@standardnotes/security@1.7.1) (2022-11-22)
+
+**Note:** Version bump only for package @standardnotes/security
+
 # [1.7.0](https://github.com/standardnotes/server/compare/@standardnotes/security@1.6.4...@standardnotes/security@1.7.0) (2022-11-14)
 
 ### Features

packages/security/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/security",
-  "version": "1.7.0",
+  "version": "1.7.1",
   "engines": {
     "node": ">=18.0.0 <19.0.0"
   },

packages/syncing-server/.env.sample

@@ -42,3 +42,6 @@ NEW_RELIC_NO_CONFIG_FILE=true
 NEW_RELIC_DISTRIBUTED_TRACING_ENABLED=false
 NEW_RELIC_LOG_ENABLED=false
 NEW_RELIC_LOG_LEVEL=info
+
+# (Optional) Revision Dumps
+FILE_UPLOAD_PATH=

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.18.4](https://github.com/standardnotes/syncing-server-js/compare/@standardnotes/syncing-server@1.18.3...@standardnotes/syncing-server@1.18.4) (2022-11-22)
+
+### Bug Fixes
+
+* sns binding ([3686a26](https://github.com/standardnotes/syncing-server-js/commit/3686a260192468c00b52087590dd2edf76ada939))
+
+## [1.18.3](https://github.com/standardnotes/syncing-server-js/compare/@standardnotes/syncing-server@1.18.2...@standardnotes/syncing-server@1.18.3) (2022-11-22)
+
+### Bug Fixes
+
+* sqs binding ([806a732](https://github.com/standardnotes/syncing-server-js/commit/806a732cbc92cd89deb9d9d2aa95565922ce6b72))
+
+## [1.18.2](https://github.com/standardnotes/syncing-server-js/compare/@standardnotes/syncing-server@1.18.1...@standardnotes/syncing-server@1.18.2) (2022-11-22)
+
+### Bug Fixes
+
+* **syncing-server:** bring back creating revisions in syncing server for a transition period ([5f3bd51](https://github.com/standardnotes/syncing-server-js/commit/5f3bd5137f3a22330ea19fefff5f9310e9323044))
+
+## [1.18.1](https://github.com/standardnotes/syncing-server-js/compare/@standardnotes/syncing-server@1.18.0...@standardnotes/syncing-server@1.18.1) (2022-11-22)
+
+### Bug Fixes
+
+* **syncing-server:** specs ([f7e0b68](https://github.com/standardnotes/syncing-server-js/commit/f7e0b68643df4027d274ed1e575cada62c6dbc25))
+
+# [1.18.0](https://github.com/standardnotes/syncing-server-js/compare/@standardnotes/syncing-server@1.17.0...@standardnotes/syncing-server@1.18.0) (2022-11-22)
+
+### Features
+
+* **syncing-server:** add dump projection for revisions ([455f35e](https://github.com/standardnotes/syncing-server-js/commit/455f35e0c1ac811720b67592a9017a3470a7740c))
+
+# [1.17.0](https://github.com/standardnotes/syncing-server-js/compare/@standardnotes/syncing-server@1.16.1...@standardnotes/syncing-server@1.17.0) (2022-11-22)
+
+### Features
+
+* **syncing-server:** add dumping backup items to filesystem ([97b367d](https://github.com/standardnotes/syncing-server-js/commit/97b367d4eee1e8bc2fcfd4a477e6fb1d19507c14))
+
+## [1.16.1](https://github.com/standardnotes/syncing-server-js/compare/@standardnotes/syncing-server@1.16.0...@standardnotes/syncing-server@1.16.1) (2022-11-22)
+
+**Note:** Version bump only for package @standardnotes/syncing-server
+
 # [1.16.0](https://github.com/standardnotes/syncing-server-js/compare/@standardnotes/syncing-server@1.15.0...@standardnotes/syncing-server@1.16.0) (2022-11-21)
 
 ### Features

packages/syncing-server/package.json

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

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

@@ -85,6 +85,7 @@ import { MapperInterface } from '@standardnotes/domain-core'
 import { RevisionMetadata } from '../Domain/Revision/RevisionMetadata'
 import { SimpleRevisionProjection } from '../Projection/SimpleRevisionProjection'
 import { ItemRevisionCreationRequestedEventHandler } from '../Domain/Handler/ItemRevisionCreationRequestedEventHandler'
+import { FSItemBackupService } from '../Infra/FS/FSItemBackupService'
 
 // eslint-disable-next-line @typescript-eslint/no-var-requires
 const newrelicFormatter = require('@newrelic/winston-enricher')
@@ -92,6 +93,7 @@ const newrelicFormatter = require('@newrelic/winston-enricher')
 export class ContainerConfigLoader {
   private readonly DEFAULT_CONTENT_SIZE_TRANSFER_LIMIT = 10_000_000
   private readonly DEFAULT_MAX_ITEMS_LIMIT = 300
+  private readonly DEFAULT_FILE_UPLOAD_PATH = `${__dirname}/../../uploads`
 
   async load(): Promise<Container> {
     const env: Env = new Env()
@@ -125,22 +127,32 @@ export class ContainerConfigLoader {
     })
     container.bind<winston.Logger>(TYPES.Logger).toConstantValue(logger)
 
-    if (env.get('SNS_AWS_REGION', true)) {
-      container.bind<AWS.SNS>(TYPES.SNS).toConstantValue(
-        new AWS.SNS({
-          apiVersion: 'latest',
-          region: env.get('SNS_AWS_REGION', true),
-        }),
-      )
+    if (env.get('SNS_TOPIC_ARN', true)) {
+      const snsConfig: AWS.SNS.Types.ClientConfiguration = {
+        apiVersion: 'latest',
+        region: env.get('SNS_AWS_REGION', true),
+      }
+      if (env.get('SNS_ACCESS_KEY_ID', true) && env.get('SNS_SECRET_ACCESS_KEY', true)) {
+        snsConfig.credentials = {
+          accessKeyId: env.get('SNS_ACCESS_KEY_ID', true),
+          secretAccessKey: env.get('SNS_SECRET_ACCESS_KEY', true),
+        }
+      }
+      container.bind<AWS.SNS>(TYPES.SNS).toConstantValue(new AWS.SNS(snsConfig))
     }
 
-    if (env.get('SQS_AWS_REGION', true)) {
-      container.bind<AWS.SQS>(TYPES.SQS).toConstantValue(
-        new AWS.SQS({
-          apiVersion: 'latest',
-          region: env.get('SQS_AWS_REGION', true),
-        }),
-      )
+    if (env.get('SQS_QUEUE_URL', true)) {
+      const sqsConfig: AWS.SQS.Types.ClientConfiguration = {
+        apiVersion: 'latest',
+        region: env.get('SQS_AWS_REGION', true),
+      }
+      if (env.get('SQS_ACCESS_KEY_ID', true) && env.get('SQS_SECRET_ACCESS_KEY', true)) {
+        sqsConfig.credentials = {
+          accessKeyId: env.get('SQS_ACCESS_KEY_ID', true),
+          secretAccessKey: env.get('SQS_SECRET_ACCESS_KEY', true),
+        }
+      }
+      container.bind<AWS.SQS>(TYPES.SQS).toConstantValue(new AWS.SQS(sqsConfig))
     }
 
     let s3Client = undefined
@@ -203,6 +215,11 @@ export class ContainerConfigLoader {
       .toConstantValue(
         env.get('MAX_ITEMS_LIMIT', true) ? +env.get('MAX_ITEMS_LIMIT', true) : this.DEFAULT_MAX_ITEMS_LIMIT,
       )
+    container
+      .bind(TYPES.FILE_UPLOAD_PATH)
+      .toConstantValue(
+        env.get('FILE_UPLOAD_PATH', true) ? env.get('FILE_UPLOAD_PATH', true) : this.DEFAULT_FILE_UPLOAD_PATH,
+      )
 
     // use cases
     container.bind<SyncItems>(TYPES.SyncItems).to(SyncItems)
@@ -252,7 +269,11 @@ export class ContainerConfigLoader {
       .to(SyncResponseFactoryResolver)
     container.bind<AuthHttpServiceInterface>(TYPES.AuthHttpService).to(AuthHttpService)
     container.bind<ExtensionsHttpServiceInterface>(TYPES.ExtensionsHttpService).to(ExtensionsHttpService)
-    container.bind<ItemBackupServiceInterface>(TYPES.ItemBackupService).to(S3ItemBackupService)
+    if (env.get('S3_AWS_REGION', true)) {
+      container.bind<ItemBackupServiceInterface>(TYPES.ItemBackupService).to(S3ItemBackupService)
+    } else {
+      container.bind<ItemBackupServiceInterface>(TYPES.ItemBackupService).to(FSItemBackupService)
+    }
     container.bind<RevisionServiceInterface>(TYPES.RevisionService).to(RevisionService)
 
     if (env.get('SNS_TOPIC_ARN', true)) {

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

@@ -37,6 +37,7 @@ const TYPES = {
   VERSION: Symbol.for('VERSION'),
   CONTENT_SIZE_TRANSFER_LIMIT: Symbol.for('CONTENT_SIZE_TRANSFER_LIMIT'),
   MAX_ITEMS_LIMIT: Symbol.for('MAX_ITEMS_LIMIT'),
+  FILE_UPLOAD_PATH: Symbol.for('FILE_UPLOAD_PATH'),
   // use cases
   SyncItems: Symbol.for('SyncItems'),
   CheckIntegrity: Symbol.for('CheckIntegrity'),

packages/syncing-server/src/Domain/Item/ItemService.spec.ts

@@ -17,6 +17,7 @@ import { ItemConflict } from './ItemConflict'
 import { ItemTransferCalculatorInterface } from './ItemTransferCalculatorInterface'
 import { ProjectorInterface } from '../../Projection/ProjectorInterface'
 import { ItemProjection } from '../../Projection/ItemProjection'
+import { RevisionServiceInterface } from '../Revision/RevisionServiceInterface'
 
 describe('ItemService', () => {
   let itemRepository: ItemRepositoryInterface
@@ -38,6 +39,7 @@ describe('ItemService', () => {
   let timeHelper: Timer
   let itemTransferCalculator: ItemTransferCalculatorInterface
   let itemProjector: ProjectorInterface<Item, ItemProjection>
+  let revisionService: RevisionServiceInterface
   const maxItemsSyncLimit = 300
 
   const createService = () =>
@@ -45,6 +47,7 @@ describe('ItemService', () => {
       itemSaveValidator,
       itemFactory,
       itemRepository,
+      revisionService,
       domainEventPublisher,
       domainEventFactory,
       revisionFrequency,
@@ -122,6 +125,9 @@ describe('ItemService', () => {
     itemRepository.countAll = jest.fn().mockReturnValue(2)
     itemRepository.save = jest.fn().mockImplementation((item: Item) => item)
 
+    revisionService = {} as jest.Mocked<RevisionServiceInterface>
+    revisionService.createRevision = jest.fn()
+
     timer = {} as jest.Mocked<TimerInterface>
     timer.getTimestampInMicroseconds = jest.fn().mockReturnValue(1616164633241568)
     timer.getUTCDate = jest.fn().mockReturnValue(new Date())

packages/syncing-server/src/Domain/Item/ItemService.ts

@@ -22,6 +22,7 @@ import { ConflictType } from '@standardnotes/responses'
 import { ItemTransferCalculatorInterface } from './ItemTransferCalculatorInterface'
 import { ProjectorInterface } from '../../Projection/ProjectorInterface'
 import { ItemProjection } from '../../Projection/ItemProjection'
+import { RevisionServiceInterface } from '../Revision/RevisionServiceInterface'
 
 @injectable()
 export class ItemService implements ItemServiceInterface {
@@ -32,6 +33,7 @@ export class ItemService implements ItemServiceInterface {
     @inject(TYPES.ItemSaveValidator) private itemSaveValidator: ItemSaveValidatorInterface,
     @inject(TYPES.ItemFactory) private itemFactory: ItemFactoryInterface,
     @inject(TYPES.ItemRepository) private itemRepository: ItemRepositoryInterface,
+    @inject(TYPES.RevisionService) private revisionService: RevisionServiceInterface,
     @inject(TYPES.DomainEventPublisher) private domainEventPublisher: DomainEventPublisherInterface,
     @inject(TYPES.DomainEventFactory) private domainEventFactory: DomainEventFactoryInterface,
     @inject(TYPES.REVISIONS_FREQUENCY) private revisionFrequency: number,
@@ -251,6 +253,8 @@ export class ItemService implements ItemServiceInterface {
     const savedItem = await this.itemRepository.save(dto.existingItem)
 
     if (secondsFromLastUpdate >= this.revisionFrequency) {
+      await this.revisionService.createRevision(savedItem)
+
       await this.domainEventPublisher.publish(
         this.domainEventFactory.createItemRevisionCreationRequested(savedItem.uuid, savedItem.userUuid),
       )
@@ -270,6 +274,8 @@ export class ItemService implements ItemServiceInterface {
 
     const savedItem = await this.itemRepository.save(newItem)
 
+    await this.revisionService.createRevision(savedItem)
+
     await this.domainEventPublisher.publish(
       this.domainEventFactory.createItemRevisionCreationRequested(savedItem.uuid, savedItem.userUuid),
     )

packages/syncing-server/src/Infra/FS/FSItemBackupService.ts

@@ -0,0 +1,34 @@
+import { KeyParamsData } from '@standardnotes/responses'
+import { promises } from 'fs'
+import * as uuid from 'uuid'
+import { inject, injectable } from 'inversify'
+
+import TYPES from '../../Bootstrap/Types'
+import { Item } from '../../Domain/Item/Item'
+import { ItemBackupServiceInterface } from '../../Domain/Item/ItemBackupServiceInterface'
+import { ItemProjection } from '../../Projection/ItemProjection'
+import { ProjectorInterface } from '../../Projection/ProjectorInterface'
+
+@injectable()
+export class FSItemBackupService implements ItemBackupServiceInterface {
+  constructor(
+    @inject(TYPES.FILE_UPLOAD_PATH) private fileUploadPath: string,
+    @inject(TYPES.ItemProjector) private itemProjector: ProjectorInterface<Item, ItemProjection>,
+  ) {}
+
+  async backup(_items: Item[], _authParams: KeyParamsData): Promise<string> {
+    throw new Error('Method not implemented.')
+  }
+
+  async dump(item: Item): Promise<string> {
+    const contents = JSON.stringify({
+      item: await this.itemProjector.projectCustom('dump', item),
+    })
+
+    const path = `${this.fileUploadPath}/dumps/${uuid.v4()}`
+
+    await promises.writeFile(path, contents)
+
+    return path
+  }
+}

packages/syncing-server/src/Infra/S3/S3ItemBackupService.ts

@@ -31,7 +31,7 @@ export class S3ItemBackupService implements ItemBackupServiceInterface {
         Bucket: this.s3BackupBucketName,
         Key: uuid.v4(),
         Body: JSON.stringify({
-          item: await this.itemProjector.projectFull(item),
+          item: await this.itemProjector.projectCustom('dump', item),
         }),
       })
       .promise()

packages/syncing-server/src/Projection/ItemProjectionWithUser.ts

@@ -0,0 +1,5 @@
+import { ItemProjection } from './ItemProjection'
+
+export type ItemProjectionWithUser = ItemProjection & {
+  user_uuid: string
+}

packages/syncing-server/src/Projection/ItemProjector.spec.ts

@@ -27,6 +27,7 @@ describe('ItemProjector', () => {
     item.createdAtTimestamp = 123
     item.updatedAtTimestamp = 123
     item.updatedWithSession = '7-6-5'
+    item.userUuid = 'u1-2-3'
   })
 
   it('should create a full projection of an item', async () => {
@@ -45,14 +46,21 @@ describe('ItemProjector', () => {
     })
   })
 
-  it('should throw error on custom projection', async () => {
-    let error = null
-    try {
-      await createProjector().projectCustom('test', item)
-    } catch (e) {
-      error = e
-    }
-    expect((error as Error).message).toEqual('not implemented')
+  it('should create a custom projection of an item', async () => {
+    expect(await createProjector().projectCustom('dump', item)).toMatchObject({
+      uuid: '1-2-3',
+      items_key_id: '2-3-4',
+      duplicate_of: null,
+      enc_item_key: '3-4-5',
+      content: 'test',
+      content_type: 'Note',
+      auth_hash: 'asd',
+      deleted: false,
+      created_at: '2021-04-15T08:00:00.123456Z',
+      updated_at: '2021-04-15T08:00:00.123456Z',
+      updated_with_session: '7-6-5',
+      user_uuid: 'u1-2-3',
+    })
   })
 
   it('should throw error on simple projection', async () => {

packages/syncing-server/src/Projection/ItemProjector.ts

@@ -5,6 +5,7 @@ import { ProjectorInterface } from './ProjectorInterface'
 
 import { Item } from '../Domain/Item/Item'
 import { ItemProjection } from './ItemProjection'
+import { ItemProjectionWithUser } from './ItemProjectionWithUser'
 
 @injectable()
 export class ItemProjector implements ProjectorInterface<Item, ItemProjection> {
@@ -14,8 +15,13 @@ export class ItemProjector implements ProjectorInterface<Item, ItemProjection> {
     throw Error('not implemented')
   }
 
-  async projectCustom(_projectionType: string, _item: Item): Promise<ItemProjection> {
-    throw Error('not implemented')
+  async projectCustom(_projectionType: string, item: Item): Promise<ItemProjectionWithUser> {
+    const fullProjection = await this.projectFull(item)
+
+    return {
+      ...fullProjection,
+      user_uuid: item.userUuid,
+    }
   }
 
   async projectFull(item: Item): Promise<ItemProjection> {

packages/websockets/CHANGELOG.md

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

packages/websockets/package.json

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

packages/workspace/CHANGELOG.md

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

packages/workspace/package.json

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