chore(release): publish new version

- @standardnotes/api-gateway@1.74.4
 - @standardnotes/auth-server@1.141.0
 - @standardnotes/home-server@1.15.33
 - @standardnotes/revisions-server@1.33.5

.github/ci.env

@@ -4,6 +4,7 @@ DB_USERNAME=std_notes_user
 DB_PASSWORD=changeme123
 DB_DATABASE=standard_notes_db
 DB_PORT=3306
+DB_DEBUG_LEVEL=all
 DB_SQLITE_DATABASE_PATH=standard_notes_db
 REDIS_PORT=6379
 REDIS_HOST=cache

.github/workflows/common-e2e.yml

@@ -21,7 +21,7 @@ jobs:
   e2e:
     name: (Self Hosting) E2E Test Suite
     strategy:
-      fail-fast: true
+      fail-fast: false
       matrix:
         secondary_db_enabled: [true, false]
         transition_mode_enabled: [true, false]
@@ -70,7 +70,7 @@ jobs:
   e2e-home-server:
     name: (Home Server) E2E Test Suite
     strategy:
-      fail-fast: true
+      fail-fast: false
       matrix:
         db_type: [mysql, sqlite]
         cache_type: [redis, memory]
@@ -141,6 +141,7 @@ jobs:
         echo "DB_USERNAME=standardnotes" >> packages/home-server/.env
         echo "DB_PASSWORD=standardnotes" >> packages/home-server/.env
         echo "DB_TYPE=${{ matrix.db_type }}" >> packages/home-server/.env
+        echo "DB_DEBUG_LEVEL=all" >> packages/home-server/.env
         echo "REDIS_URL=redis://localhost:6379" >> packages/home-server/.env
         echo "CACHE_TYPE=${{ matrix.cache_type }}" >> packages/home-server/.env
         echo "SECONDARY_DB_ENABLED=${{ matrix.secondary_db_enabled }}" >> packages/home-server/.env

.github/workflows/e2e-test-suite.yml

@@ -1,5 +1,7 @@
 name: E2E Test Suite On Self Hosted Server
 
+run-name: E2E Test Suite against ${{ inputs.ref_name }} by ${{ inputs.author }}
+
 on:
   schedule:
     - cron: '0 */12 * * *'
@@ -9,6 +11,14 @@ on:
         type: string
         default: latest
         description: The Docker image tag used for SNJS container
+      author:
+        type: string
+        default: unknown
+        description: The author that triggered the workflow
+      ref_name:
+        type: string
+        default: unknown
+        description: The ref name from which the workflow was triggered
 
 jobs:
   e2e:

packages/analytics/CHANGELOG.md

@@ -3,6 +3,18 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.26.7](https://github.com/standardnotes/server/compare/@standardnotes/analytics@2.26.6...@standardnotes/analytics@2.26.7) (2023-09-08)
+
+**Note:** Version bump only for package @standardnotes/analytics
+
+## [2.26.6](https://github.com/standardnotes/server/compare/@standardnotes/analytics@2.26.5...@standardnotes/analytics@2.26.6) (2023-09-07)
+
+**Note:** Version bump only for package @standardnotes/analytics
+
+## [2.26.5](https://github.com/standardnotes/server/compare/@standardnotes/analytics@2.26.4...@standardnotes/analytics@2.26.5) (2023-09-07)
+
+**Note:** Version bump only for package @standardnotes/analytics
+
 ## [2.26.4](https://github.com/standardnotes/server/compare/@standardnotes/analytics@2.26.3...@standardnotes/analytics@2.26.4) (2023-09-06)
 
 **Note:** Version bump only for package @standardnotes/analytics

packages/analytics/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/analytics",
-  "version": "2.26.4",
+  "version": "2.26.7",
   "engines": {
     "node": ">=18.0.0 <21.0.0"
   },

packages/api-gateway/CHANGELOG.md

@@ -3,6 +3,24 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.74.4](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.74.3...@standardnotes/api-gateway@1.74.4) (2023-09-11)
+
+### Bug Fixes
+
+* **api-gateway:** awaiting for other services to start ([0ab4701](https://github.com/standardnotes/api-gateway/commit/0ab47013f210dca7aa404966798011947fb5c362))
+
+## [1.74.3](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.74.2...@standardnotes/api-gateway@1.74.3) (2023-09-08)
+
+**Note:** Version bump only for package @standardnotes/api-gateway
+
+## [1.74.2](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.74.1...@standardnotes/api-gateway@1.74.2) (2023-09-07)
+
+**Note:** Version bump only for package @standardnotes/api-gateway
+
+## [1.74.1](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.74.0...@standardnotes/api-gateway@1.74.1) (2023-09-07)
+
+**Note:** Version bump only for package @standardnotes/api-gateway
+
 # [1.74.0](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.73.7...@standardnotes/api-gateway@1.74.0) (2023-09-06)
 
 ### Features

packages/api-gateway/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/api-gateway",
-  "version": "1.74.0",
+  "version": "1.74.4",
   "engines": {
     "node": ">=18.0.0 <21.0.0"
   },

packages/api-gateway/supervisor/supervisor-server.sh

@@ -2,5 +2,8 @@
 
 set -euo pipefail
 
+sh supervisor/wait-for.sh localhost $AUTH_SERVER_PORT
+sh supervisor/wait-for.sh localhost $FILES_SERVER_PORT
+sh supervisor/wait-for.sh localhost $REVISIONS_SERVER_PORT
 sh supervisor/wait-for.sh localhost $SYNCING_SERVER_PORT
 node docker/entrypoint-server.js

packages/auth/CHANGELOG.md

@@ -3,6 +3,37 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [1.141.0](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.140.0...@standardnotes/auth-server@1.141.0) (2023-09-11)
+
+### Features
+
+* **auth:** add procedure to transition users created between dates ([#816](https://github.com/standardnotes/server/issues/816)) ([e95ba61](https://github.com/standardnotes/server/commit/e95ba61c7f769736698ebbc38179d6dc05a8cc5e))
+
+# [1.140.0](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.139.0...@standardnotes/auth-server@1.140.0) (2023-09-08)
+
+### Bug Fixes
+
+* **auth:** specs ([a164ba2](https://github.com/standardnotes/server/commit/a164ba291d4893b5a0bb4b39a8795d654212a1a6))
+* **auth:** transition users only when transition mode enabled ([610fba2](https://github.com/standardnotes/server/commit/610fba260150d0757020e01ac0c8967feeadd4d6))
+
+### Features
+
+* transition users after sign out ([398338c](https://github.com/standardnotes/server/commit/398338c8f81b12406c7ab3bf1654e60b94d7cfd0))
+
+# [1.139.0](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.138.2...@standardnotes/auth-server@1.139.0) (2023-09-08)
+
+### Features
+
+* **auth:** add vaults user role into database ([aef9e93](https://github.com/standardnotes/server/commit/aef9e936bdbd1f4ccc32658d3d892e7675ec0e0e))
+
+## [1.138.2](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.138.1...@standardnotes/auth-server@1.138.2) (2023-09-07)
+
+**Note:** Version bump only for package @standardnotes/auth-server
+
+## [1.138.1](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.138.0...@standardnotes/auth-server@1.138.1) (2023-09-07)
+
+**Note:** Version bump only for package @standardnotes/auth-server
+
 # [1.138.0](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.137.6...@standardnotes/auth-server@1.138.0) (2023-09-06)
 
 ### Features

packages/auth/bin/transition.ts

@@ -0,0 +1,66 @@
+import 'reflect-metadata'
+
+import { Logger } from 'winston'
+import * as dayjs from 'dayjs'
+import * as utc from 'dayjs/plugin/utc'
+
+import { ContainerConfigLoader } from '../src/Bootstrap/Container'
+import TYPES from '../src/Bootstrap/Types'
+import { Env } from '../src/Bootstrap/Env'
+import { DomainEventPublisherInterface } from '@standardnotes/domain-events'
+import { DomainEventFactoryInterface } from '../src/Domain/Event/DomainEventFactoryInterface'
+import { UserRepositoryInterface } from '../src/Domain/User/UserRepositoryInterface'
+
+const inputArgs = process.argv.slice(2)
+const startDateString = inputArgs[0]
+const endDateString = inputArgs[1]
+
+const requestTransition = async (
+  userRepository: UserRepositoryInterface,
+  logger: Logger,
+  domainEventFactory: DomainEventFactoryInterface,
+  domainEventPublisher: DomainEventPublisherInterface,
+): Promise<void> => {
+  const startDate = new Date(startDateString)
+  const endDate = new Date(endDateString)
+
+  const users = await userRepository.findAllCreatedBetween(startDate, endDate)
+
+  logger.info(`Found ${users.length} users created between ${startDateString} and ${endDateString}`)
+
+  for (const user of users) {
+    const transitionRequestedEvent = domainEventFactory.createTransitionRequestedEvent({ userUuid: user.uuid })
+
+    await domainEventPublisher.publish(transitionRequestedEvent)
+  }
+}
+
+const container = new ContainerConfigLoader()
+void container.load().then((container) => {
+  dayjs.extend(utc)
+
+  const env: Env = new Env()
+  env.load()
+
+  const logger: Logger = container.get(TYPES.Auth_Logger)
+
+  logger.info(`Starting transition request for users created between ${startDateString} and ${endDateString}`)
+
+  const userRepository: UserRepositoryInterface = container.get(TYPES.Auth_UserRepository)
+  const domainEventFactory: DomainEventFactoryInterface = container.get(TYPES.Auth_DomainEventFactory)
+  const domainEventPublisher: DomainEventPublisherInterface = container.get(TYPES.Auth_DomainEventPublisher)
+
+  Promise.resolve(requestTransition(userRepository, logger, domainEventFactory, domainEventPublisher))
+    .then(() => {
+      logger.info(`Finished transition request for users created between ${startDateString} and ${endDateString}`)
+
+      process.exit(0)
+    })
+    .catch((error) => {
+      logger.error(
+        `Error while requesting transition for users created between ${startDateString} and ${endDateString}: ${error}`,
+      )
+
+      process.exit(1)
+    })
+})

packages/auth/docker/entrypoint-transition.js

@@ -0,0 +1,11 @@
+'use strict'
+
+const path = require('path')
+
+const pnp = require(path.normalize(path.resolve(__dirname, '../../..', '.pnp.cjs'))).setup()
+
+const index = require(path.normalize(path.resolve(__dirname, '../dist/bin/transition.js')))
+
+Object.defineProperty(exports, '__esModule', { value: true })
+
+exports.default = index

packages/auth/docker/entrypoint.sh

@@ -55,6 +55,13 @@ case "$COMMAND" in
     node docker/entrypoint-backup.js one_drive daily
     ;;
 
+  'transition' )
+    START_DATE=$1 && shift 1
+    END_DATE=$1 && shift 1
+    echo "[Docker] Starting Transition..."
+    node docker/entrypoint-transition.js $START_DATE $END_DATE
+    ;;
+
    * )
     echo "[Docker] Unknown command"
     ;;

packages/auth/migrations/mysql/1694157482134-add_vaults_user.ts

@@ -0,0 +1,13 @@
+import { MigrationInterface, QueryRunner } from 'typeorm'
+
+export class AddVaultsUser1694157482134 implements MigrationInterface {
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      'INSERT INTO `roles` (uuid, name, version) VALUES ("35669f45-a2d8-4172-bdab-b7b3d42044ce", "VAULTS_USER", 1)',
+    )
+  }
+
+  public async down(): Promise<void> {
+    return
+  }
+}

packages/auth/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/auth-server",
-  "version": "1.138.0",
+  "version": "1.141.0",
   "engines": {
     "node": ">=18.0.0 <21.0.0"
   },

packages/auth/src/Bootstrap/Container.ts

@@ -981,6 +981,7 @@ export class ContainerConfigLoader {
           container.get(TYPES.Auth_GenerateRecoveryCodes),
           container.get(TYPES.Auth_Logger),
           container.get(TYPES.Auth_SessionService),
+          container.get(TYPES.Auth_TRANSITION_MODE_ENABLED),
         ),
       )
     container

packages/auth/src/Controller/AuthController.spec.ts

@@ -27,6 +27,7 @@ describe('AuthController', () => {
   let doGenerateRecoveryCodes: GenerateRecoveryCodes
   let logger: Logger
   let sessionService: SessionServiceInterface
+  let transitionModeEnabled: boolean
 
   const createController = () =>
     new AuthController(
@@ -39,6 +40,7 @@ describe('AuthController', () => {
       doGenerateRecoveryCodes,
       logger,
       sessionService,
+      transitionModeEnabled,
     )
 
   beforeEach(() => {
@@ -64,6 +66,8 @@ describe('AuthController', () => {
 
     sessionService = {} as jest.Mocked<SessionServiceInterface>
     sessionService.deleteSessionByToken = jest.fn().mockReturnValue('1-2-3')
+
+    transitionModeEnabled = false
   })
 
   it('should register a user', async () => {

packages/auth/src/Controller/AuthController.ts

@@ -37,6 +37,7 @@ export class AuthController implements UserServerInterface {
     private doGenerateRecoveryCodes: GenerateRecoveryCodes,
     private logger: Logger,
     private sessionService: SessionServiceInterface,
+    private transitionModeEnabled: boolean,
   ) {}
 
   async update(_params: UserUpdateRequestParams): Promise<HttpResponse<UserUpdateResponse>> {
@@ -226,6 +227,14 @@ export class AuthController implements UserServerInterface {
     let headers = undefined
     if (userUuid !== null) {
       headers = new Map([['x-invalidate-cache', userUuid]])
+
+      if (this.transitionModeEnabled) {
+        await this.domainEventPublisher.publish(
+          this.domainEventFactory.createTransitionRequestedEvent({
+            userUuid,
+          }),
+        )
+      }
     }
 
     return {

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

@@ -20,6 +20,7 @@ import {
   StatisticPersistenceRequestedEvent,
   SessionCreatedEvent,
   SessionRefreshedEvent,
+  TransitionRequestedEvent,
 } from '@standardnotes/domain-events'
 import { Predicate, PredicateVerificationResult } from '@standardnotes/predicates'
 import { TimerInterface } from '@standardnotes/time'
@@ -32,6 +33,21 @@ import { DomainEventFactoryInterface } from './DomainEventFactoryInterface'
 export class DomainEventFactory implements DomainEventFactoryInterface {
   constructor(@inject(TYPES.Auth_Timer) private timer: TimerInterface) {}
 
+  createTransitionRequestedEvent(dto: { userUuid: string }): TransitionRequestedEvent {
+    return {
+      type: 'TRANSITION_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,
+  TransitionRequestedEvent,
 } from '@standardnotes/domain-events'
 import { InviteeIdentifierType } from '../SharedSubscription/InviteeIdentifierType'
 
@@ -89,4 +90,5 @@ export interface DomainEventFactoryInterface {
   }): StatisticPersistenceRequestedEvent
   createSessionCreatedEvent(dto: { userUuid: string }): SessionCreatedEvent
   createSessionRefreshedEvent(dto: { userUuid: string }): SessionRefreshedEvent
+  createTransitionRequestedEvent(dto: { userUuid: string }): TransitionRequestedEvent
 }

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>
+  findAllCreatedBetween(start: Date, end: Date): Promise<User[]>
   save(user: User): Promise<User>
   remove(user: User): Promise<User>
 }

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

@@ -14,6 +14,13 @@ export class TypeORMUserRepository implements UserRepositoryInterface {
     private ormRepository: Repository<User>,
   ) {}
 
+  async findAllCreatedBetween(start: Date, end: Date): Promise<User[]> {
+    return this.ormRepository
+      .createQueryBuilder('user')
+      .where('user.created_at BETWEEN :start AND :end', { start, end })
+      .getMany()
+  }
+
   async save(user: User): Promise<User> {
     return this.ormRepository.save(user)
   }

packages/domain-core/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.28.0](https://github.com/standardnotes/server/compare/@standardnotes/domain-core@1.27.0...@standardnotes/domain-core@1.28.0) (2023-09-07)
+
+### Features
+
+* add VaultsUser role name ([#809](https://github.com/standardnotes/server/issues/809)) ([d4830de](https://github.com/standardnotes/server/commit/d4830dec018139ffaf93d0e91d6655c5dcc6be9c))
+
 # [1.27.0](https://github.com/standardnotes/server/compare/@standardnotes/domain-core@1.26.3...@standardnotes/domain-core@1.27.0) (2023-09-06)
 
 ### Features

packages/domain-core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/domain-core",
-  "version": "1.27.0",
+  "version": "1.28.0",
   "engines": {
     "node": ">=18.0.0 <21.0.0"
   },

packages/domain-core/src/Domain/Common/RoleName.ts

@@ -9,6 +9,7 @@ export class RoleName extends ValueObject<RoleNameProps> {
     ProUser: 'PRO_USER',
     InternalTeamUser: 'INTERNAL_TEAM_USER',
     TransitionUser: 'TRANSITION_USER',
+    VaultsUser: 'VAULTS_USER',
   }
 
   get value(): string {
@@ -32,6 +33,7 @@ export class RoleName extends ValueObject<RoleNameProps> {
         )
       case RoleName.NAMES.CoreUser:
       case RoleName.NAMES.TransitionUser:
+      case RoleName.NAMES.VaultsUser:
         return [RoleName.NAMES.CoreUser, RoleName.NAMES.TransitionUser].includes(roleName.value)
       /*istanbul ignore next*/
       default:

packages/domain-core/src/Domain/Common/RoleNameCollection.spec.ts

@@ -51,7 +51,7 @@ describe('RoleNameCollection', () => {
   })
 
   it('should tell if collection has a role with more or equal power to', () => {
-    let roles = [RoleName.NAMES.CoreUser]
+    let roles = [RoleName.NAMES.VaultsUser]
     let valueOrError = RoleNameCollection.create(roles)
     let roleNames = valueOrError.getValue()
 
@@ -63,6 +63,18 @@ describe('RoleNameCollection', () => {
       roleNames.hasARoleNameWithMoreOrEqualPowerTo(RoleName.create(RoleName.NAMES.CoreUser).getValue()),
     ).toBeTruthy()
 
+    roles = [RoleName.NAMES.CoreUser]
+    valueOrError = RoleNameCollection.create(roles)
+    roleNames = valueOrError.getValue()
+
+    expect(
+      roleNames.hasARoleNameWithMoreOrEqualPowerTo(RoleName.create(RoleName.NAMES.PlusUser).getValue()),
+    ).toBeFalsy()
+    expect(roleNames.hasARoleNameWithMoreOrEqualPowerTo(RoleName.create(RoleName.NAMES.ProUser).getValue())).toBeFalsy()
+    expect(
+      roleNames.hasARoleNameWithMoreOrEqualPowerTo(RoleName.create(RoleName.NAMES.CoreUser).getValue()),
+    ).toBeTruthy()
+
     roles = [RoleName.NAMES.CoreUser, RoleName.NAMES.PlusUser]
     valueOrError = RoleNameCollection.create(roles)
     roleNames = valueOrError.getValue()

packages/domain-events-infra/CHANGELOG.md

@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.12.24](https://github.com/standardnotes/server/compare/@standardnotes/domain-events-infra@1.12.23...@standardnotes/domain-events-infra@1.12.24) (2023-09-08)
+
+**Note:** Version bump only for package @standardnotes/domain-events-infra
+
+## [1.12.23](https://github.com/standardnotes/server/compare/@standardnotes/domain-events-infra@1.12.22...@standardnotes/domain-events-infra@1.12.23) (2023-09-07)
+
+**Note:** Version bump only for package @standardnotes/domain-events-infra
+
 ## [1.12.22](https://github.com/standardnotes/server/compare/@standardnotes/domain-events-infra@1.12.21...@standardnotes/domain-events-infra@1.12.22) (2023-09-06)
 
 **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.12.22",
+  "version": "1.12.24",
   "engines": {
     "node": ">=18.0.0 <21.0.0"
   },

packages/domain-events/CHANGELOG.md

@@ -3,6 +3,18 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [2.125.0](https://github.com/standardnotes/server/compare/@standardnotes/domain-events@2.124.0...@standardnotes/domain-events@2.125.0) (2023-09-08)
+
+### Features
+
+* transition users after sign out ([398338c](https://github.com/standardnotes/server/commit/398338c8f81b12406c7ab3bf1654e60b94d7cfd0))
+
+# [2.124.0](https://github.com/standardnotes/server/compare/@standardnotes/domain-events@2.123.0...@standardnotes/domain-events@2.124.0) (2023-09-07)
+
+### Features
+
+* add removing revisions from shared vaults ([#811](https://github.com/standardnotes/server/issues/811)) ([3bd63f7](https://github.com/standardnotes/server/commit/3bd63f767464baf9b9f1ffa52eea9eed4a4e11b5))
+
 # [2.123.0](https://github.com/standardnotes/server/compare/@standardnotes/domain-events@2.122.2...@standardnotes/domain-events@2.123.0) (2023-09-06)
 
 ### Features

packages/domain-events/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/domain-events",
-  "version": "2.123.0",
+  "version": "2.125.0",
   "engines": {
     "node": ">=18.0.0 <21.0.0"
   },

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

@@ -0,0 +1,7 @@
+import { DomainEventInterface } from './DomainEventInterface'
+import { ItemRemovedFromSharedVaultEventPayload } from './ItemRemovedFromSharedVaultEventPayload'
+
+export interface ItemRemovedFromSharedVaultEvent extends DomainEventInterface {
+  type: 'ITEM_REMOVED_FROM_SHARED_VAULT'
+  payload: ItemRemovedFromSharedVaultEventPayload
+}

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

@@ -0,0 +1,6 @@
+export interface ItemRemovedFromSharedVaultEventPayload {
+  userUuid: string
+  itemUuid: string
+  sharedVaultUuid: string
+  roleNames: string[]
+}

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

@@ -0,0 +1,8 @@
+import { DomainEventInterface } from './DomainEventInterface'
+
+import { TransitionRequestedEventPayload } from './TransitionRequestedEventPayload'
+
+export interface TransitionRequestedEvent extends DomainEventInterface {
+  type: 'TRANSITION_REQUESTED'
+  payload: TransitionRequestedEventPayload
+}

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

@@ -0,0 +1,3 @@
+export interface TransitionRequestedEventPayload {
+  userUuid: string
+}

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

@@ -32,6 +32,8 @@ export * from './Event/FileUploadedEvent'
 export * from './Event/FileUploadedEventPayload'
 export * from './Event/ItemDumpedEvent'
 export * from './Event/ItemDumpedEventPayload'
+export * from './Event/ItemRemovedFromSharedVaultEvent'
+export * from './Event/ItemRemovedFromSharedVaultEventPayload'
 export * from './Event/ItemRevisionCreationRequestedEvent'
 export * from './Event/ItemRevisionCreationRequestedEventPayload'
 export * from './Event/ListedAccountCreatedEvent'
@@ -94,6 +96,8 @@ export * from './Event/SubscriptionRevertRequestedEvent'
 export * from './Event/SubscriptionRevertRequestedEventPayload'
 export * from './Event/SubscriptionSyncRequestedEvent'
 export * from './Event/SubscriptionSyncRequestedEventPayload'
+export * from './Event/TransitionRequestedEvent'
+export * from './Event/TransitionRequestedEventPayload'
 export * from './Event/TransitionStatusUpdatedEvent'
 export * from './Event/TransitionStatusUpdatedEventPayload'
 export * from './Event/UserAddedToSharedVaultEvent'

packages/event-store/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.11.35](https://github.com/standardnotes/server/compare/@standardnotes/event-store@1.11.34...@standardnotes/event-store@1.11.35) (2023-09-08)
+
+**Note:** Version bump only for package @standardnotes/event-store
+
+## [1.11.34](https://github.com/standardnotes/server/compare/@standardnotes/event-store@1.11.33...@standardnotes/event-store@1.11.34) (2023-09-07)
+
+**Note:** Version bump only for package @standardnotes/event-store
+
+## [1.11.33](https://github.com/standardnotes/server/compare/@standardnotes/event-store@1.11.32...@standardnotes/event-store@1.11.33) (2023-09-07)
+
+**Note:** Version bump only for package @standardnotes/event-store
+
 ## [1.11.32](https://github.com/standardnotes/server/compare/@standardnotes/event-store@1.11.31...@standardnotes/event-store@1.11.32) (2023-09-06)
 
 **Note:** Version bump only for package @standardnotes/event-store

packages/event-store/package.json

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

packages/files/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.22.14](https://github.com/standardnotes/files/compare/@standardnotes/files-server@1.22.13...@standardnotes/files-server@1.22.14) (2023-09-08)
+
+**Note:** Version bump only for package @standardnotes/files-server
+
+## [1.22.13](https://github.com/standardnotes/files/compare/@standardnotes/files-server@1.22.12...@standardnotes/files-server@1.22.13) (2023-09-07)
+
+**Note:** Version bump only for package @standardnotes/files-server
+
+## [1.22.12](https://github.com/standardnotes/files/compare/@standardnotes/files-server@1.22.11...@standardnotes/files-server@1.22.12) (2023-09-07)
+
+**Note:** Version bump only for package @standardnotes/files-server
+
 ## [1.22.11](https://github.com/standardnotes/files/compare/@standardnotes/files-server@1.22.10...@standardnotes/files-server@1.22.11) (2023-09-06)
 
 **Note:** Version bump only for package @standardnotes/files-server

packages/files/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/files-server",
-  "version": "1.22.11",
+  "version": "1.22.14",
   "engines": {
     "node": ">=18.0.0 <21.0.0"
   },

packages/home-server/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.15.33](https://github.com/standardnotes/server/compare/@standardnotes/home-server@1.15.32...@standardnotes/home-server@1.15.33) (2023-09-11)
+
+**Note:** Version bump only for package @standardnotes/home-server
+
+## [1.15.32](https://github.com/standardnotes/server/compare/@standardnotes/home-server@1.15.31...@standardnotes/home-server@1.15.32) (2023-09-11)
+
+**Note:** Version bump only for package @standardnotes/home-server
+
+## [1.15.31](https://github.com/standardnotes/server/compare/@standardnotes/home-server@1.15.30...@standardnotes/home-server@1.15.31) (2023-09-08)
+
+**Note:** Version bump only for package @standardnotes/home-server
+
+## [1.15.30](https://github.com/standardnotes/server/compare/@standardnotes/home-server@1.15.29...@standardnotes/home-server@1.15.30) (2023-09-08)
+
+**Note:** Version bump only for package @standardnotes/home-server
+
+## [1.15.29](https://github.com/standardnotes/server/compare/@standardnotes/home-server@1.15.28...@standardnotes/home-server@1.15.29) (2023-09-08)
+
+**Note:** Version bump only for package @standardnotes/home-server
+
+## [1.15.28](https://github.com/standardnotes/server/compare/@standardnotes/home-server@1.15.27...@standardnotes/home-server@1.15.28) (2023-09-07)
+
+**Note:** Version bump only for package @standardnotes/home-server
+
+## [1.15.27](https://github.com/standardnotes/server/compare/@standardnotes/home-server@1.15.26...@standardnotes/home-server@1.15.27) (2023-09-07)
+
+**Note:** Version bump only for package @standardnotes/home-server
+
+## [1.15.26](https://github.com/standardnotes/server/compare/@standardnotes/home-server@1.15.25...@standardnotes/home-server@1.15.26) (2023-09-07)
+
+**Note:** Version bump only for package @standardnotes/home-server
+
 ## [1.15.25](https://github.com/standardnotes/server/compare/@standardnotes/home-server@1.15.24...@standardnotes/home-server@1.15.25) (2023-09-06)
 
 **Note:** Version bump only for package @standardnotes/home-server

packages/home-server/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/home-server",
-  "version": "1.15.25",
+  "version": "1.15.33",
   "engines": {
     "node": ">=18.0.0 <21.0.0"
   },

packages/revisions/CHANGELOG.md

@@ -3,6 +3,54 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.33.5](https://github.com/standardnotes/server/compare/@standardnotes/revisions-server@1.33.4...@standardnotes/revisions-server@1.33.5) (2023-09-11)
+
+### Bug Fixes
+
+* **revisions:** add item_uuid to revisions metadata http representation ([9676a25](https://github.com/standardnotes/server/commit/9676a2586cabc344f3c244a5a20d4e1d57ac4c35))
+* **revisions:** conflict with table naming ([ed671be](https://github.com/standardnotes/server/commit/ed671be9c56eb8d54b8dd52a69d5e30e07203aa4))
+* **revisions:** legacy table syncing and select for metadata ([b4bf11d](https://github.com/standardnotes/server/commit/b4bf11d9da44cc1d980b6922f532ff487fe582df))
+* **revisions:** removing queries ([117b7b4](https://github.com/standardnotes/server/commit/117b7b4b99e09aebfd081433646ec05c2ebf308f))
+* **revisions:** rename table only if exists ([836883b](https://github.com/standardnotes/server/commit/836883b82dd436d0e9b3ae3b70f734ceb508e227))
+
+## [1.33.4](https://github.com/standardnotes/server/compare/@standardnotes/revisions-server@1.33.3...@standardnotes/revisions-server@1.33.4) (2023-09-11)
+
+### Bug Fixes
+
+* **revisions:** add shared vault uuid to revision metadata http representation ([156fa7a](https://github.com/standardnotes/server/commit/156fa7a618b9f33a839580019d0398c1b838697d))
+
+## [1.33.3](https://github.com/standardnotes/server/compare/@standardnotes/revisions-server@1.33.2...@standardnotes/revisions-server@1.33.3) (2023-09-08)
+
+**Note:** Version bump only for package @standardnotes/revisions-server
+
+## [1.33.2](https://github.com/standardnotes/server/compare/@standardnotes/revisions-server@1.33.1...@standardnotes/revisions-server@1.33.2) (2023-09-08)
+
+### Bug Fixes
+
+* **revisions:** persistence mapper ([#814](https://github.com/standardnotes/server/issues/814)) ([76372fe](https://github.com/standardnotes/server/commit/76372fe3579a99bf44abfce9667fec134baafedf))
+
+## [1.33.1](https://github.com/standardnotes/server/compare/@standardnotes/revisions-server@1.33.0...@standardnotes/revisions-server@1.33.1) (2023-09-07)
+
+### Bug Fixes
+
+* **revisions:** waiting for syncing-server on self-hosted setup ([27ad8e6](https://github.com/standardnotes/server/commit/27ad8e6959aeb9c2f11ee0fecba37514bf91dda8))
+
+# [1.33.0](https://github.com/standardnotes/server/compare/@standardnotes/revisions-server@1.32.0...@standardnotes/revisions-server@1.33.0) (2023-09-07)
+
+### Features
+
+* add removing revisions from shared vaults ([#811](https://github.com/standardnotes/server/issues/811)) ([3bd63f7](https://github.com/standardnotes/server/commit/3bd63f767464baf9b9f1ffa52eea9eed4a4e11b5))
+
+# [1.32.0](https://github.com/standardnotes/server/compare/@standardnotes/revisions-server@1.31.0...@standardnotes/revisions-server@1.32.0) (2023-09-07)
+
+### Bug Fixes
+
+* **revisions:** query for shared vault revisions ([7e11821](https://github.com/standardnotes/server/commit/7e11821021a663fcf452ad8bb03eda33c03fe221))
+
+### Features
+
+* **revisions:** fetching single revision in shared vault ([#810](https://github.com/standardnotes/server/issues/810)) ([e100c52](https://github.com/standardnotes/server/commit/e100c52bbc07447188af3b9a04f3744401dac0ab))
+
 # [1.31.0](https://github.com/standardnotes/server/compare/@standardnotes/revisions-server@1.30.14...@standardnotes/revisions-server@1.31.0) (2023-09-06)
 
 ### Features

packages/revisions/migrations/mysql/1669113322388-init.ts

@@ -4,19 +4,19 @@ export class init1669113322388 implements MigrationInterface {
   name = 'init1669113322388'
 
   public async up(queryRunner: QueryRunner): Promise<void> {
-    await this.syncSchemaBetweenLegacyRevisions(queryRunner)
-
     await queryRunner.query(
-      'CREATE TABLE IF NOT EXISTS `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',
+      'CREATE TABLE `revisions_revisions` (`uuid` varchar(36) NOT NULL, `item_uuid` varchar(36) NOT NULL, `user_uuid` varchar(36) 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',
     )
+
+    await this.syncSchemaBetweenLegacyRevisions(queryRunner)
   }
 
   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`')
+    await queryRunner.query('DROP INDEX `created_at` ON `revisions_revisions`')
+    await queryRunner.query('DROP INDEX `creation_date` ON `revisions_revisions`')
+    await queryRunner.query('DROP INDEX `user_uuid` ON `revisions_revisions`')
+    await queryRunner.query('DROP INDEX `item_uuid` ON `revisions_revisions`')
+    await queryRunner.query('DROP TABLE `revisions_revisions`')
   }
 
   private async syncSchemaBetweenLegacyRevisions(queryRunner: QueryRunner): Promise<void> {
@@ -28,14 +28,10 @@ export class init1669113322388 implements MigrationInterface {
       return
     }
 
-    const revisionsTableHasUserUuidColumnQueryResult = await queryRunner.manager.query(
-      'SELECT COUNT(*) as count FROM information_schema.columns WHERE table_schema = DATABASE() AND table_name = "revisions" AND column_name = "user_uuid"',
+    await queryRunner.query(
+      'INSERT INTO `revisions_revisions`(`uuid`, `item_uuid`, `user_uuid`, `content`, `content_type`, `items_key_id`, `enc_item_key`, `auth_hash`, `creation_date`, `created_at`, `updated_at`) SELECT `uuid`, `item_uuid`, NULL, `content`, `content_type`, `items_key_id`, `enc_item_key`, `auth_hash`, `creation_date`, `created_at`, `updated_at` FROM `revisions`',
     )
-    const revisionsTableHasUserUuidColumn = revisionsTableHasUserUuidColumnQueryResult[0].count === 1
-    if (revisionsTableHasUserUuidColumn) {
-      return
-    }
 
-    await queryRunner.query('ALTER TABLE `revisions` ADD COLUMN `user_uuid` varchar(36) NULL')
+    await queryRunner.query('DROP TABLE `revisions`')
   }
 }

packages/revisions/migrations/mysql/1669636497932-remove-date-indexes.ts

@@ -5,24 +5,24 @@ export class removeDateIndexes1669636497932 implements MigrationInterface {
 
   public async up(queryRunner: QueryRunner): Promise<void> {
     const indexRevisionsOnCreatedAt = await queryRunner.manager.query(
-      'SHOW INDEX FROM `revisions` where `key_name` = "created_at"',
+      'SHOW INDEX FROM `revisions_revisions` where `key_name` = "created_at"',
     )
     const indexRevisionsOnCreatedAtExist = indexRevisionsOnCreatedAt && indexRevisionsOnCreatedAt.length > 0
     if (indexRevisionsOnCreatedAtExist) {
-      await queryRunner.query('DROP INDEX `created_at` ON `revisions`')
+      await queryRunner.query('DROP INDEX `created_at` ON `revisions_revisions`')
     }
 
     const indexRevisionsOnCreationDate = await queryRunner.manager.query(
-      'SHOW INDEX FROM `revisions` where `key_name` = "creation_date"',
+      'SHOW INDEX FROM `revisions_revisions` where `key_name` = "creation_date"',
     )
     const indexRevisionsOnCreationDateAtExist = indexRevisionsOnCreationDate && indexRevisionsOnCreationDate.length > 0
     if (indexRevisionsOnCreationDateAtExist) {
-      await queryRunner.query('DROP INDEX `creation_date` ON `revisions`')
+      await queryRunner.query('DROP INDEX `creation_date` ON `revisions_revisions`')
     }
   }
 
   public async down(queryRunner: QueryRunner): Promise<void> {
-    await queryRunner.query('CREATE INDEX `creation_date` ON `revisions` (`creation_date`)')
-    await queryRunner.query('CREATE INDEX `created_at` ON `revisions` (`created_at`)')
+    await queryRunner.query('CREATE INDEX `creation_date` ON `revisions_revisions` (`creation_date`)')
+    await queryRunner.query('CREATE INDEX `created_at` ON `revisions_revisions` (`created_at`)')
   }
 }

packages/revisions/migrations/mysql/1669735585016-make-user-uuid-nullable.ts

@@ -4,10 +4,10 @@ export class makeUserUuidNullable1669735585016 implements MigrationInterface {
   name = 'makeUserUuidNullable1669735585016'
 
   public async up(queryRunner: QueryRunner): Promise<void> {
-    await queryRunner.query('ALTER TABLE `revisions` CHANGE `user_uuid` `user_uuid` varchar(36) NULL')
+    await queryRunner.query('ALTER TABLE `revisions_revisions` CHANGE `user_uuid` `user_uuid` varchar(36) NULL')
   }
 
   public async down(queryRunner: QueryRunner): Promise<void> {
-    await queryRunner.query('ALTER TABLE `revisions` CHANGE `user_uuid` `user_uuid` varchar(36) NOT NULL')
+    await queryRunner.query('ALTER TABLE `revisions_revisions` CHANGE `user_uuid` `user_uuid` varchar(36) NOT NULL')
   }
 }

packages/revisions/migrations/mysql/1693915383950-add-shared-vault-information.ts

@@ -2,16 +2,18 @@ import { MigrationInterface, QueryRunner } from 'typeorm'
 
 export class AddSharedVaultInformation1693915383950 implements MigrationInterface {
   public async up(queryRunner: QueryRunner): Promise<void> {
-    await queryRunner.query('ALTER TABLE `revisions` ADD `edited_by` varchar(36) NULL')
-    await queryRunner.query('ALTER TABLE `revisions` ADD `shared_vault_uuid` varchar(36) NULL')
-    await queryRunner.query('ALTER TABLE `revisions` ADD `key_system_identifier` varchar(36) NULL')
-    await queryRunner.query('CREATE INDEX `index_revisions_on_shared_vault_uuid` ON `revisions` (`shared_vault_uuid`)')
+    await queryRunner.query('ALTER TABLE `revisions_revisions` ADD `edited_by` varchar(36) NULL')
+    await queryRunner.query('ALTER TABLE `revisions_revisions` ADD `shared_vault_uuid` varchar(36) NULL')
+    await queryRunner.query('ALTER TABLE `revisions_revisions` ADD `key_system_identifier` varchar(36) NULL')
+    await queryRunner.query(
+      'CREATE INDEX `index_revisions_on_shared_vault_uuid` ON `revisions_revisions` (`shared_vault_uuid`)',
+    )
   }
 
   public async down(queryRunner: QueryRunner): Promise<void> {
-    await queryRunner.query('DROP INDEX `index_revisions_on_shared_vault_uuid` ON `revisions`')
-    await queryRunner.query('ALTER TABLE `revisions` DROP COLUMN `key_system_identifier`')
-    await queryRunner.query('ALTER TABLE `revisions` DROP COLUMN `shared_vault_uuid`')
-    await queryRunner.query('ALTER TABLE `revisions` DROP COLUMN `last_edited_by`')
+    await queryRunner.query('DROP INDEX `index_revisions_on_shared_vault_uuid` ON `revisions_revisions`')
+    await queryRunner.query('ALTER TABLE `revisions_revisions` DROP COLUMN `key_system_identifier`')
+    await queryRunner.query('ALTER TABLE `revisions_revisions` DROP COLUMN `shared_vault_uuid`')
+    await queryRunner.query('ALTER TABLE `revisions_revisions` DROP COLUMN `last_edited_by`')
   }
 }

packages/revisions/migrations/mysql/1694425333972-rename_revisions_table.ts

@@ -0,0 +1,19 @@
+import { MigrationInterface, QueryRunner } from 'typeorm'
+
+export class RenameRevisionsTable1694425333972 implements MigrationInterface {
+  name = 'RenameRevisionsTable1694425333972'
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    const revisionsTableExistsQueryResult = await queryRunner.manager.query(
+      'SELECT COUNT(*) as count FROM information_schema.tables WHERE table_schema = DATABASE() AND table_name = "revisions"',
+    )
+    const revisionsTableExists = revisionsTableExistsQueryResult[0].count === 1
+    if (revisionsTableExists) {
+      await queryRunner.query('RENAME TABLE `revisions` TO `revisions_revisions`')
+    }
+  }
+
+  public async down(): Promise<void> {
+    return
+  }
+}

packages/revisions/migrations/sqlite/1682678053275-initial_boilerplate.ts

@@ -5,15 +5,15 @@ export class initialBoilerplate1682678053275 implements MigrationInterface {
 
   public async up(queryRunner: QueryRunner): Promise<void> {
     await queryRunner.query(
-      'CREATE TABLE "revisions" ("uuid" varchar PRIMARY KEY NOT NULL, "item_uuid" varchar(36) NOT NULL, "user_uuid" varchar(36), "content" text, "content_type" varchar(255), "items_key_id" varchar(255), "enc_item_key" text, "auth_hash" varchar(255), "creation_date" date, "created_at" datetime(6), "updated_at" datetime(6))',
+      'CREATE TABLE "revisions_revisions" ("uuid" varchar PRIMARY KEY NOT NULL, "item_uuid" varchar(36) NOT NULL, "user_uuid" varchar(36), "content" text, "content_type" varchar(255), "items_key_id" varchar(255), "enc_item_key" text, "auth_hash" varchar(255), "creation_date" date, "created_at" datetime(6), "updated_at" datetime(6))',
     )
-    await queryRunner.query('CREATE INDEX "item_uuid" ON "revisions" ("item_uuid") ')
-    await queryRunner.query('CREATE INDEX "user_uuid" ON "revisions" ("user_uuid") ')
+    await queryRunner.query('CREATE INDEX "item_uuid" ON "revisions_revisions" ("item_uuid") ')
+    await queryRunner.query('CREATE INDEX "user_uuid" ON "revisions_revisions" ("user_uuid") ')
   }
 
   public async down(queryRunner: QueryRunner): Promise<void> {
     await queryRunner.query('DROP INDEX "user_uuid"')
     await queryRunner.query('DROP INDEX "item_uuid"')
-    await queryRunner.query('DROP TABLE "revisions"')
+    await queryRunner.query('DROP TABLE "revisions_revisions"')
   }
 }

packages/revisions/migrations/sqlite/1693915775491-add-shared-vault-information.ts

@@ -10,28 +10,30 @@ export class AddSharedVaultInformation1693915775491 implements MigrationInterfac
       'CREATE TABLE "temporary_revisions" ("uuid" varchar PRIMARY KEY NOT NULL, "item_uuid" varchar(36) NOT NULL, "user_uuid" varchar(36), "content" text, "content_type" varchar(255), "items_key_id" varchar(255), "enc_item_key" text, "auth_hash" varchar(255), "creation_date" date, "created_at" datetime(6), "updated_at" datetime(6), "edited_by" varchar(36), "shared_vault_uuid" varchar(36), "key_system_identifier" varchar(36))',
     )
     await queryRunner.query(
-      'INSERT INTO "temporary_revisions"("uuid", "item_uuid", "user_uuid", "content", "content_type", "items_key_id", "enc_item_key", "auth_hash", "creation_date", "created_at", "updated_at") SELECT "uuid", "item_uuid", "user_uuid", "content", "content_type", "items_key_id", "enc_item_key", "auth_hash", "creation_date", "created_at", "updated_at" FROM "revisions"',
+      'INSERT INTO "temporary_revisions"("uuid", "item_uuid", "user_uuid", "content", "content_type", "items_key_id", "enc_item_key", "auth_hash", "creation_date", "created_at", "updated_at") SELECT "uuid", "item_uuid", "user_uuid", "content", "content_type", "items_key_id", "enc_item_key", "auth_hash", "creation_date", "created_at", "updated_at" FROM "revisions_revisions"',
+    )
+    await queryRunner.query('DROP TABLE "revisions_revisions"')
+    await queryRunner.query('ALTER TABLE "temporary_revisions" RENAME TO "revisions_revisions"')
+    await queryRunner.query('CREATE INDEX "user_uuid" ON "revisions_revisions" ("user_uuid") ')
+    await queryRunner.query('CREATE INDEX "item_uuid" ON "revisions_revisions" ("item_uuid") ')
+    await queryRunner.query(
+      'CREATE INDEX "index_revisions_on_shared_vault_uuid" ON "revisions_revisions" ("shared_vault_uuid") ',
     )
-    await queryRunner.query('DROP TABLE "revisions"')
-    await queryRunner.query('ALTER TABLE "temporary_revisions" RENAME TO "revisions"')
-    await queryRunner.query('CREATE INDEX "user_uuid" ON "revisions" ("user_uuid") ')
-    await queryRunner.query('CREATE INDEX "item_uuid" ON "revisions" ("item_uuid") ')
-    await queryRunner.query('CREATE INDEX "index_revisions_on_shared_vault_uuid" ON "revisions" ("shared_vault_uuid") ')
   }
 
   public async down(queryRunner: QueryRunner): Promise<void> {
     await queryRunner.query('DROP INDEX "index_revisions_on_shared_vault_uuid"')
     await queryRunner.query('DROP INDEX "item_uuid"')
     await queryRunner.query('DROP INDEX "user_uuid"')
-    await queryRunner.query('ALTER TABLE "revisions" RENAME TO "temporary_revisions"')
+    await queryRunner.query('ALTER TABLE "revisions_revisions" RENAME TO "temporary_revisions"')
     await queryRunner.query(
-      'CREATE TABLE "revisions" ("uuid" varchar PRIMARY KEY NOT NULL, "item_uuid" varchar(36) NOT NULL, "user_uuid" varchar(36), "content" text, "content_type" varchar(255), "items_key_id" varchar(255), "enc_item_key" text, "auth_hash" varchar(255), "creation_date" date, "created_at" datetime(6), "updated_at" datetime(6))',
+      'CREATE TABLE "revisions_revisions" ("uuid" varchar PRIMARY KEY NOT NULL, "item_uuid" varchar(36) NOT NULL, "user_uuid" varchar(36), "content" text, "content_type" varchar(255), "items_key_id" varchar(255), "enc_item_key" text, "auth_hash" varchar(255), "creation_date" date, "created_at" datetime(6), "updated_at" datetime(6))',
     )
     await queryRunner.query(
-      'INSERT INTO "revisions"("uuid", "item_uuid", "user_uuid", "content", "content_type", "items_key_id", "enc_item_key", "auth_hash", "creation_date", "created_at", "updated_at") SELECT "uuid", "item_uuid", "user_uuid", "content", "content_type", "items_key_id", "enc_item_key", "auth_hash", "creation_date", "created_at", "updated_at" FROM "temporary_revisions"',
+      'INSERT INTO "revisions_revisions"("uuid", "item_uuid", "user_uuid", "content", "content_type", "items_key_id", "enc_item_key", "auth_hash", "creation_date", "created_at", "updated_at") SELECT "uuid", "item_uuid", "user_uuid", "content", "content_type", "items_key_id", "enc_item_key", "auth_hash", "creation_date", "created_at", "updated_at" FROM "temporary_revisions"',
     )
     await queryRunner.query('DROP TABLE "temporary_revisions"')
-    await queryRunner.query('CREATE INDEX "item_uuid" ON "revisions" ("item_uuid") ')
-    await queryRunner.query('CREATE INDEX "user_uuid" ON "revisions" ("user_uuid") ')
+    await queryRunner.query('CREATE INDEX "item_uuid" ON "revisions_revisions" ("item_uuid") ')
+    await queryRunner.query('CREATE INDEX "user_uuid" ON "revisions_revisions" ("user_uuid") ')
   }
 }

packages/revisions/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/revisions-server",
-  "version": "1.31.0",
+  "version": "1.33.5",
   "engines": {
     "node": ">=18.0.0 <21.0.0"
   },

packages/revisions/src/Bootstrap/Container.ts

@@ -66,6 +66,8 @@ import { SQLRevision } from '../Infra/TypeORM/SQL/SQLRevision'
 import { SQLRevisionRepository } from '../Infra/TypeORM/SQL/SQLRevisionRepository'
 import { SQLRevisionMetadataPersistenceMapper } from '../Mapping/Persistence/SQL/SQLRevisionMetadataPersistenceMapper'
 import { SQLRevisionPersistenceMapper } from '../Mapping/Persistence/SQL/SQLRevisionPersistenceMapper'
+import { RemoveRevisionsFromSharedVault } from '../Domain/UseCase/RemoveRevisionsFromSharedVault/RemoveRevisionsFromSharedVault'
+import { ItemRemovedFromSharedVaultEventHandler } from '../Domain/Handler/ItemRemovedFromSharedVaultEventHandler'
 
 export class ContainerConfigLoader {
   async load(configuration?: {
@@ -358,6 +360,13 @@ export class ContainerConfigLoader {
           container.get<DomainEventFactoryInterface>(TYPES.Revisions_DomainEventFactory),
         ),
       )
+    container
+      .bind<RemoveRevisionsFromSharedVault>(TYPES.Revisions_RemoveRevisionsFromSharedVault)
+      .toConstantValue(
+        new RemoveRevisionsFromSharedVault(
+          container.get<RevisionRepositoryResolverInterface>(TYPES.Revisions_RevisionRepositoryResolver),
+        ),
+      )
 
     // env vars
     container.bind(TYPES.Revisions_AUTH_JWT_SECRET).toConstantValue(env.get('AUTH_JWT_SECRET'))
@@ -437,12 +446,21 @@ export class ContainerConfigLoader {
           container.get<winston.Logger>(TYPES.Revisions_Logger),
         ),
       )
+    container
+      .bind<ItemRemovedFromSharedVaultEventHandler>(TYPES.Revisions_ItemRemovedFromSharedVaultEventHandler)
+      .toConstantValue(
+        new ItemRemovedFromSharedVaultEventHandler(
+          container.get<RemoveRevisionsFromSharedVault>(TYPES.Revisions_RemoveRevisionsFromSharedVault),
+          container.get<winston.Logger>(TYPES.Revisions_Logger),
+        ),
+      )
 
     const eventHandlers: Map<string, DomainEventHandlerInterface> = new Map([
       ['ITEM_DUMPED', container.get(TYPES.Revisions_ItemDumpedEventHandler)],
       ['ACCOUNT_DELETION_REQUESTED', container.get(TYPES.Revisions_AccountDeletionRequestedEventHandler)],
       ['REVISIONS_COPY_REQUESTED', container.get(TYPES.Revisions_RevisionsCopyRequestedEventHandler)],
       ['TRANSITION_STATUS_UPDATED', container.get(TYPES.Revisions_TransitionStatusUpdatedEventHandler)],
+      ['ITEM_REMOVED_FROM_SHARED_VAULT', container.get(TYPES.Revisions_ItemRemovedFromSharedVaultEventHandler)],
     ])
 
     if (isConfiguredForHomeServer) {

packages/revisions/src/Bootstrap/Types.ts

@@ -49,6 +49,7 @@ const TYPES = {
   Revisions_TriggerTransitionFromPrimaryToSecondaryDatabaseForUser: Symbol.for(
     'Revisions_TriggerTransitionFromPrimaryToSecondaryDatabaseForUser',
   ),
+  Revisions_RemoveRevisionsFromSharedVault: Symbol.for('Revisions_RemoveRevisionsFromSharedVault'),
   // Controller
   Revisions_ControllerContainer: Symbol.for('Revisions_ControllerContainer'),
   Revisions_RevisionsController: Symbol.for('Revisions_RevisionsController'),
@@ -58,6 +59,7 @@ const TYPES = {
   Revisions_AccountDeletionRequestedEventHandler: Symbol.for('Revisions_AccountDeletionRequestedEventHandler'),
   Revisions_RevisionsCopyRequestedEventHandler: Symbol.for('Revisions_RevisionsCopyRequestedEventHandler'),
   Revisions_TransitionStatusUpdatedEventHandler: Symbol.for('Revisions_TransitionStatusUpdatedEventHandler'),
+  Revisions_ItemRemovedFromSharedVaultEventHandler: Symbol.for('Revisions_ItemRemovedFromSharedVaultEventHandler'),
   // Services
   Revisions_CrossServiceTokenDecoder: Symbol.for('Revisions_CrossServiceTokenDecoder'),
   Revisions_DomainEventSubscriberFactory: Symbol.for('Revisions_DomainEventSubscriberFactory'),

packages/revisions/src/Domain/Handler/ItemRemovedFromSharedVaultEventHandler.ts

@@ -0,0 +1,22 @@
+import { DomainEventHandlerInterface, ItemRemovedFromSharedVaultEvent } from '@standardnotes/domain-events'
+import { RemoveRevisionsFromSharedVault } from '../UseCase/RemoveRevisionsFromSharedVault/RemoveRevisionsFromSharedVault'
+import { Logger } from 'winston'
+
+export class ItemRemovedFromSharedVaultEventHandler implements DomainEventHandlerInterface {
+  constructor(
+    private removeRevisionsFromSharedVault: RemoveRevisionsFromSharedVault,
+    private logger: Logger,
+  ) {}
+
+  async handle(event: ItemRemovedFromSharedVaultEvent): Promise<void> {
+    const result = await this.removeRevisionsFromSharedVault.execute({
+      sharedVaultUuid: event.payload.sharedVaultUuid,
+      itemUuid: event.payload.itemUuid,
+      roleNames: event.payload.roleNames,
+    })
+
+    if (result.isFailed()) {
+      this.logger.error(`Failed to remove revisions from shared vault: ${result.getError()}`)
+    }
+  }
+}

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

@@ -1,6 +1,8 @@
-import { ContentType, Dates } from '@standardnotes/domain-core'
+import { ContentType, Dates, Uuid } from '@standardnotes/domain-core'
 
 export interface RevisionMetadataProps {
   contentType: ContentType
+  itemUuid: Uuid
+  sharedVaultUuid: Uuid | null
   dates: Dates
 }

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

@@ -7,10 +7,11 @@ export interface RevisionRepositoryInterface {
   countByUserUuid(userUuid: Uuid): Promise<number>
   removeByUserUuid(userUuid: Uuid): Promise<void>
   removeOneByUuid(revisionUuid: Uuid, userUuid: Uuid): Promise<void>
-  findOneByUuid(revisionUuid: Uuid, userUuid: Uuid): Promise<Revision | null>
+  findOneByUuid(revisionUuid: Uuid, userUuid: Uuid, sharedVaultUuids: Uuid[]): Promise<Revision | null>
   findByItemUuid(itemUuid: Uuid): Promise<Array<Revision>>
   findMetadataByItemId(itemUuid: Uuid, userUuid: Uuid, sharedVaultUuids: Uuid[]): Promise<Array<RevisionMetadata>>
   updateUserUuid(itemUuid: Uuid, userUuid: Uuid): Promise<void>
   findByUserUuid(dto: { userUuid: Uuid; offset?: number; limit?: number }): Promise<Array<Revision>>
   insert(revision: Revision): Promise<boolean>
+  clearSharedVaultAndKeySystemAssociations(itemUuid: Uuid, sharedVaultUuid: Uuid): Promise<void>
 }

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

@@ -22,17 +22,30 @@ describe('GetRevision', () => {
       revisionUuid: '84c0f8e8-544a-4c7e-9adf-26209303bc1d',
       userUuid: '84c0f8e8-544a-4c7e-9adf-26209303bc1d',
       roleNames: ['CORE_USER'],
+      sharedVaultUuids: ['84c0f8e8-544a-4c7e-9adf-26209303bc1d'],
     })
 
     expect(result.isFailed()).toBeFalsy()
     expect(result.getValue()).not.toBeNull()
   })
 
+  it('should do nothing if shared vault uuid is invalid', async () => {
+    const result = await createUseCase().execute({
+      revisionUuid: '84c0f8e8-544a-4c7e-9adf-26209303bc1d',
+      userUuid: '84c0f8e8-544a-4c7e-9adf-26209303bc1d',
+      roleNames: ['CORE_USER'],
+      sharedVaultUuids: ['INVALID_SHARED_VAULT_UUID'],
+    })
+
+    expect(result.isFailed()).toBeTruthy()
+  })
+
   it('should do nothing if role names are not valid', async () => {
     const result = await createUseCase().execute({
       revisionUuid: '84c0f8e8-544a-4c7e-9adf-26209303bc1d',
       userUuid: '84c0f8e8-544a-4c7e-9adf-26209303bc1d',
       roleNames: ['INVALID_ROLE_NAME'],
+      sharedVaultUuids: ['84c0f8e8-544a-4c7e-9adf-26209303bc1d'],
     })
 
     expect(result.isFailed()).toBeTruthy()
@@ -45,6 +58,7 @@ describe('GetRevision', () => {
       revisionUuid: '84c0f8e8-544a-4c7e-9adf-26209303bc1d',
       userUuid: '84c0f8e8-544a-4c7e-9adf-26209303bc1d',
       roleNames: ['CORE_USER'],
+      sharedVaultUuids: ['84c0f8e8-544a-4c7e-9adf-26209303bc1d'],
     })
 
     expect(result.isFailed()).toBeTruthy()
@@ -55,6 +69,7 @@ describe('GetRevision', () => {
       revisionUuid: '1-2-3',
       userUuid: '84c0f8e8-544a-4c7e-9adf-26209303bc1d',
       roleNames: ['CORE_USER'],
+      sharedVaultUuids: ['84c0f8e8-544a-4c7e-9adf-26209303bc1d'],
     })
 
     expect(result.isFailed()).toBeTruthy()
@@ -65,6 +80,7 @@ describe('GetRevision', () => {
       userUuid: '1-2-3',
       revisionUuid: '84c0f8e8-544a-4c7e-9adf-26209303bc1d',
       roleNames: ['CORE_USER'],
+      sharedVaultUuids: ['84c0f8e8-544a-4c7e-9adf-26209303bc1d'],
     })
 
     expect(result.isFailed()).toBeTruthy()

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

@@ -26,9 +26,18 @@ export class GetRevision implements UseCaseInterface<Revision> {
     }
     const roleNames = roleNamesOrError.getValue()
 
+    const sharedVaultUuids = []
+    for (const sharedVaultUuid of dto.sharedVaultUuids) {
+      const sharedVaultUuidOrError = Uuid.create(sharedVaultUuid)
+      if (sharedVaultUuidOrError.isFailed()) {
+        return Result.fail(`Could not get revision: ${sharedVaultUuidOrError.getError()}`)
+      }
+      sharedVaultUuids.push(sharedVaultUuidOrError.getValue())
+    }
+
     const revisionRepository = this.revisionRepositoryResolver.resolve(roleNames)
 
-    const revision = await revisionRepository.findOneByUuid(revisionUuid, userUuid)
+    const revision = await revisionRepository.findOneByUuid(revisionUuid, userUuid, sharedVaultUuids)
 
     if (revision === null) {
       return Result.fail<Revision>(`Could not find revision with uuid: ${revisionUuid.value}`)

packages/revisions/src/Domain/UseCase/GetRevision/GetRevisionDTO.ts

@@ -2,4 +2,5 @@ export interface GetRevisionDTO {
   userUuid: string
   revisionUuid: string
   roleNames: string[]
+  sharedVaultUuids: string[]
 }

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

@@ -0,0 +1,66 @@
+import { RevisionRepositoryInterface } from '../../Revision/RevisionRepositoryInterface'
+import { RevisionRepositoryResolverInterface } from '../../Revision/RevisionRepositoryResolverInterface'
+import { RemoveRevisionsFromSharedVault } from './RemoveRevisionsFromSharedVault'
+
+describe('RemoveRevisionsFromSharedVault', () => {
+  let revisionRepositoryResolver: RevisionRepositoryResolverInterface
+  let revisionRepository: RevisionRepositoryInterface
+
+  const createUseCase = () => new RemoveRevisionsFromSharedVault(revisionRepositoryResolver)
+
+  beforeEach(() => {
+    revisionRepository = {} as jest.Mocked<RevisionRepositoryInterface>
+    revisionRepository.clearSharedVaultAndKeySystemAssociations = jest.fn()
+
+    revisionRepositoryResolver = {} as jest.Mocked<RevisionRepositoryResolverInterface>
+    revisionRepositoryResolver.resolve = jest.fn().mockReturnValue(revisionRepository)
+  })
+
+  it('should clear shared vault and key system associations', async () => {
+    const useCase = createUseCase()
+
+    await useCase.execute({
+      itemUuid: '00000000-0000-0000-0000-000000000000',
+      sharedVaultUuid: '00000000-0000-0000-0000-000000000001',
+      roleNames: ['CORE_USER'],
+    })
+
+    expect(revisionRepository.clearSharedVaultAndKeySystemAssociations).toHaveBeenCalled()
+  })
+
+  it('should return error when shared vault uuid is invalid', async () => {
+    const useCase = createUseCase()
+
+    const result = await useCase.execute({
+      itemUuid: '00000000-0000-0000-0000-000000000000',
+      sharedVaultUuid: 'invalid',
+      roleNames: ['CORE_USER'],
+    })
+
+    expect(result.isFailed()).toBe(true)
+  })
+
+  it('should return error when item uuid is invalid', async () => {
+    const useCase = createUseCase()
+
+    const result = await useCase.execute({
+      itemUuid: 'invalid',
+      sharedVaultUuid: '00000000-0000-0000-0000-000000000001',
+      roleNames: ['CORE_USER'],
+    })
+
+    expect(result.isFailed()).toBe(true)
+  })
+
+  it('should return error when role names are invalid', async () => {
+    const useCase = createUseCase()
+
+    const result = await useCase.execute({
+      itemUuid: '00000000-0000-0000-0000-000000000000',
+      sharedVaultUuid: '00000000-0000-0000-0000-000000000001',
+      roleNames: ['invalid'],
+    })
+
+    expect(result.isFailed()).toBe(true)
+  })
+})

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

@@ -0,0 +1,33 @@
+import { Result, RoleNameCollection, UseCaseInterface, Uuid } from '@standardnotes/domain-core'
+import { RevisionRepositoryResolverInterface } from '../../Revision/RevisionRepositoryResolverInterface'
+import { RemoveRevisionsFromSharedVaultDTO } from './RemoveRevisionsFromSharedVaultDTO'
+
+export class RemoveRevisionsFromSharedVault implements UseCaseInterface<void> {
+  constructor(private revisionRepositoryResolver: RevisionRepositoryResolverInterface) {}
+
+  async execute(dto: RemoveRevisionsFromSharedVaultDTO): Promise<Result<void>> {
+    const sharedVaultUuidOrError = Uuid.create(dto.sharedVaultUuid)
+    if (sharedVaultUuidOrError.isFailed()) {
+      return Result.fail(sharedVaultUuidOrError.getError())
+    }
+    const sharedVaultUuid = sharedVaultUuidOrError.getValue()
+
+    const itemUuidOrError = Uuid.create(dto.itemUuid)
+    if (itemUuidOrError.isFailed()) {
+      return Result.fail(itemUuidOrError.getError())
+    }
+    const itemUuid = itemUuidOrError.getValue()
+
+    const roleNamesOrError = RoleNameCollection.create(dto.roleNames)
+    if (roleNamesOrError.isFailed()) {
+      return Result.fail(roleNamesOrError.getError())
+    }
+    const roleNames = roleNamesOrError.getValue()
+
+    const revisionRepository = this.revisionRepositoryResolver.resolve(roleNames)
+
+    await revisionRepository.clearSharedVaultAndKeySystemAssociations(itemUuid, sharedVaultUuid)
+
+    return Result.ok()
+  }
+}

packages/revisions/src/Domain/UseCase/RemoveRevisionsFromSharedVault/RemoveRevisionsFromSharedVaultDTO.ts

@@ -0,0 +1,5 @@
+export interface RemoveRevisionsFromSharedVaultDTO {
+  itemUuid: string
+  sharedVaultUuid: string
+  roleNames: string[]
+}

packages/revisions/src/Domain/UseCase/Transition/TransitionRevisionsFromPrimaryToSecondaryDatabaseForUser/TransitionRevisionsFromPrimaryToSecondaryDatabaseForUser.ts

@@ -174,7 +174,7 @@ export class TransitionRevisionsFromPrimaryToSecondaryDatabaseForUser implements
 
           const revisionInSecondary = await (
             this.secondRevisionsRepository as RevisionRepositoryInterface
-          ).findOneByUuid(revisionUuid, userUuid)
+          ).findOneByUuid(revisionUuid, userUuid, [])
           if (!revisionInSecondary) {
             return Result.fail(`Revision ${revision.id.toString()} not found in secondary database`)
           }

packages/revisions/src/Infra/InversifyExpress/Base/BaseRevisionsController.ts

@@ -65,13 +65,16 @@ export class BaseRevisionsController extends BaseHttpController {
       revisionUuid: request.params.uuid,
       userUuid: response.locals.user.uuid,
       roleNames: response.locals.roles.map((role: Role) => role.name),
+      sharedVaultUuids: response.locals.belongsToSharedVaults.map(
+        (association: { shared_vault_uuid: string; permission: string }) => association.shared_vault_uuid,
+      ),
     })
 
     if (revisionOrError.isFailed()) {
       return this.json(
         {
           error: {
-            message: 'Could not retrieve revision.',
+            message: revisionOrError.getError(),
           },
         },
         HttpStatusCode.BadRequest,

packages/revisions/src/Infra/TypeORM/MongoDB/MongoDBRevisionRepository.ts

@@ -16,6 +16,21 @@ export class MongoDBRevisionRepository implements RevisionRepositoryInterface {
     private logger: Logger,
   ) {}
 
+  async clearSharedVaultAndKeySystemAssociations(itemUuid: Uuid, sharedVaultUuid: Uuid): Promise<void> {
+    await this.mongoRepository.updateMany(
+      {
+        itemUuid: { $eq: itemUuid.value },
+        sharedVaultUuid: { $eq: sharedVaultUuid.value },
+      },
+      {
+        $set: {
+          sharedVaultUuid: null,
+          keySystemIdentifier: null,
+        },
+      },
+    )
+  }
+
   async countByUserUuid(userUuid: Uuid): Promise<number> {
     return this.mongoRepository.count({ userUuid: { $eq: userUuid.value } })
   }
@@ -49,15 +64,32 @@ export class MongoDBRevisionRepository implements RevisionRepositoryInterface {
     })
   }
 
-  async findOneByUuid(revisionUuid: Uuid, userUuid: Uuid): Promise<Revision | null> {
-    const persistence = await this.mongoRepository.findOne({
-      where: {
-        $and: [
-          { _id: { $eq: BSON.UUID.createFromHexString(revisionUuid.value) } },
-          { userUuid: { $eq: userUuid.value } },
-        ],
-      },
-    })
+  async findOneByUuid(revisionUuid: Uuid, userUuid: Uuid, sharedVaultUuids: Uuid[]): Promise<Revision | null> {
+    let persistence = null
+    if (sharedVaultUuids.length > 0) {
+      persistence = await this.mongoRepository.findOne({
+        where: {
+          $and: [
+            { _id: { $eq: BSON.UUID.createFromHexString(revisionUuid.value) } },
+            {
+              $or: [
+                { sharedVaultUuid: { $in: sharedVaultUuids.map((uuid) => uuid.value) } },
+                { userUuid: { $eq: userUuid.value } },
+              ],
+            },
+          ],
+        },
+      })
+    } else {
+      persistence = await this.mongoRepository.findOne({
+        where: {
+          $and: [
+            { _id: { $eq: BSON.UUID.createFromHexString(revisionUuid.value) } },
+            { userUuid: { $eq: userUuid.value } },
+          ],
+        },
+      })
+    }
 
     if (persistence === null) {
       return null
@@ -94,11 +126,16 @@ export class MongoDBRevisionRepository implements RevisionRepositoryInterface {
     let persistence = []
     if (sharedVaultUuids.length > 0) {
       persistence = await this.mongoRepository.find({
-        select: ['_id', 'contentType', 'createdAt', 'updatedAt'],
+        select: ['_id', 'contentType', 'createdAt', 'updatedAt', 'sharedVaultUuid', 'itemUuid'],
         where: {
           $and: [
             { itemUuid: { $eq: itemUuid.value } },
-            { sharedVaultUuid: { $in: sharedVaultUuids.map((uuid) => uuid.value) } },
+            {
+              $or: [
+                { sharedVaultUuid: { $in: sharedVaultUuids.map((uuid) => uuid.value) } },
+                { userUuid: { $eq: userUuid.value } },
+              ],
+            },
           ],
         },
         order: {
@@ -107,7 +144,7 @@ export class MongoDBRevisionRepository implements RevisionRepositoryInterface {
       })
     } else {
       persistence = await this.mongoRepository.find({
-        select: ['_id', 'contentType', 'createdAt', 'updatedAt'],
+        select: ['_id', 'contentType', 'createdAt', 'updatedAt', 'sharedVaultUuid', 'itemUuid'],
         where: {
           $and: [{ itemUuid: { $eq: itemUuid.value } }, { userUuid: { $eq: userUuid.value } }],
         },

packages/revisions/src/Infra/TypeORM/SQL/SQLLegacyRevisionRepository.ts

@@ -15,6 +15,10 @@ export class SQLLegacyRevisionRepository implements RevisionRepositoryInterface
     protected logger: Logger,
   ) {}
 
+  async clearSharedVaultAndKeySystemAssociations(_itemUuid: Uuid, _sharedVaultUuid: Uuid): Promise<void> {
+    this.logger.error('Method clearSharedVaultAndKeySystemAssociations not implemented.')
+  }
+
   async countByUserUuid(userUuid: Uuid): Promise<number> {
     return this.ormRepository
       .createQueryBuilder()
@@ -92,7 +96,7 @@ export class SQLLegacyRevisionRepository implements RevisionRepositoryInterface
       .execute()
   }
 
-  async findOneByUuid(revisionUuid: Uuid, userUuid: Uuid): Promise<Revision | null> {
+  async findOneByUuid(revisionUuid: Uuid, userUuid: Uuid, _sharedVaultUuids: Uuid[]): Promise<Revision | null> {
     const SQLLegacyRevision = await this.ormRepository
       .createQueryBuilder()
       .where('uuid = :revisionUuid', { revisionUuid: revisionUuid.value })
@@ -125,6 +129,7 @@ export class SQLLegacyRevisionRepository implements RevisionRepositoryInterface
       .addSelect('content_type', 'contentType')
       .addSelect('created_at', 'createdAt')
       .addSelect('updated_at', 'updatedAt')
+      .addSelect('item_uuid', 'itemUuid')
       .where('item_uuid = :itemUuid', { itemUuid: itemUuid.value })
       .andWhere('user_uuid = :userUuid', { userUuid: userUuid.value })
       .orderBy('created_at', 'DESC')

packages/revisions/src/Infra/TypeORM/SQL/SQLRevision.ts

@@ -2,7 +2,7 @@ import { Column, Entity, Index } from 'typeorm'
 
 import { SQLLegacyRevision } from './SQLLegacyRevision'
 
-@Entity({ name: 'revisions' })
+@Entity({ name: 'revisions_revisions' })
 export class SQLRevision extends SQLLegacyRevision {
   @Column({
     type: 'varchar',

packages/revisions/src/Infra/TypeORM/SQL/SQLRevisionRepository.ts

@@ -17,6 +17,70 @@ export class SQLRevisionRepository extends SQLLegacyRevisionRepository {
     super(ormRepository, revisionMetadataMapper, revisionMapper, logger)
   }
 
+  override async removeByUserUuid(userUuid: Uuid): Promise<void> {
+    await this.ormRepository
+      .createQueryBuilder()
+      .delete()
+      .from('revisions_revisions')
+      .where('user_uuid = :userUuid', { userUuid: userUuid.value })
+      .execute()
+  }
+
+  override async removeOneByUuid(revisionUuid: Uuid, userUuid: Uuid): Promise<void> {
+    await this.ormRepository
+      .createQueryBuilder()
+      .delete()
+      .from('revisions_revisions')
+      .where('uuid = :revisionUuid AND user_uuid = :userUuid', {
+        userUuid: userUuid.value,
+        revisionUuid: revisionUuid.value,
+      })
+      .execute()
+  }
+
+  override async findOneByUuid(revisionUuid: Uuid, userUuid: Uuid, sharedVaultUuids: Uuid[]): Promise<Revision | null> {
+    const queryBuilder = this.ormRepository.createQueryBuilder()
+
+    if (sharedVaultUuids.length > 0) {
+      queryBuilder.where(
+        'uuid = :revisionUuid AND (user_uuid = :userUuid OR shared_vault_uuid IN (:...sharedVaultUuids))',
+        {
+          revisionUuid: revisionUuid.value,
+          userUuid: userUuid.value,
+          sharedVaultUuids: sharedVaultUuids.map((uuid) => uuid.value),
+        },
+      )
+    } else {
+      queryBuilder.where('uuid = :revisionUuid AND user_uuid = :userUuid', {
+        revisionUuid: revisionUuid.value,
+        userUuid: userUuid.value,
+      })
+    }
+
+    const sqlRevision = await queryBuilder.getOne()
+
+    if (sqlRevision === null) {
+      return null
+    }
+
+    return this.revisionMapper.toDomain(sqlRevision)
+  }
+
+  override async clearSharedVaultAndKeySystemAssociations(itemUuid: Uuid, sharedVaultUuid: Uuid): Promise<void> {
+    await this.ormRepository
+      .createQueryBuilder()
+      .update()
+      .set({
+        sharedVaultUuid: null,
+        keySystemIdentifier: null,
+      })
+      .where('item_uuid = :itemUuid AND shared_vault_uuid = :sharedVaultUuid', {
+        itemUuid: itemUuid.value,
+        sharedVaultUuid: sharedVaultUuid.value,
+      })
+      .execute()
+  }
+
   override async findMetadataByItemId(
     itemUuid: Uuid,
     userUuid: Uuid,
@@ -28,13 +92,23 @@ export class SQLRevisionRepository extends SQLLegacyRevisionRepository {
       .addSelect('content_type', 'contentType')
       .addSelect('created_at', 'createdAt')
       .addSelect('updated_at', 'updatedAt')
-      .where('item_uuid = :itemUuid AND user_uuid = :userUuid', { itemUuid: itemUuid.value, userUuid: userUuid.value })
+      .addSelect('shared_vault_uuid', 'sharedVaultUuid')
+      .addSelect('item_uuid', 'itemUuid')
       .orderBy('created_at', 'DESC')
 
     if (sharedVaultUuids.length > 0) {
-      queryBuilder.orWhere('item_uuid = :itemUuid AND shared_vault_uuid IN (:...sharedVaultUuids)', {
+      queryBuilder.where(
+        'item_uuid = :itemUuid AND (user_uuid = :userUuid OR shared_vault_uuid IN (:...sharedVaultUuids))',
+        {
+          itemUuid: itemUuid.value,
+          userUuid: userUuid.value,
+          sharedVaultUuids: sharedVaultUuids.map((uuid) => uuid.value),
+        },
+      )
+    } else {
+      queryBuilder.where('item_uuid = :itemUuid AND user_uuid = :userUuid', {
         itemUuid: itemUuid.value,
-        sharedVaultUuids: sharedVaultUuids.map((uuid) => uuid.value),
+        userUuid: userUuid.value,
       })
     }
 

packages/revisions/src/Mapping/Http/RevisionHttpMapper.ts

@@ -19,6 +19,16 @@ export class RevisionHttpMapper implements MapperInterface<Revision, RevisionHtt
       auth_hash: domain.props.authHash,
       created_at: domain.props.dates.createdAt.toISOString(),
       updated_at: domain.props.dates.updatedAt.toISOString(),
+      key_system_identifier: domain.props.keySystemAssociation
+        ? domain.props.keySystemAssociation.props.keySystemIdentifier
+        : null,
+      shared_vault_uuid: domain.props.sharedVaultAssociation
+        ? domain.props.sharedVaultAssociation.props.sharedVaultUuid.value
+        : null,
+      last_edited_by_uuid: domain.props.sharedVaultAssociation
+        ? domain.props.sharedVaultAssociation.props.editedBy.value
+        : null,
+      user_uuid: domain.props.userUuid ? domain.props.userUuid.value : null,
     }
   }
 }

packages/revisions/src/Mapping/Http/RevisionHttpRepresentation.ts

@@ -8,4 +8,8 @@ export interface RevisionHttpRepresentation {
   auth_hash: string | null
   created_at: string
   updated_at: string
+  key_system_identifier: string | null
+  shared_vault_uuid: string | null
+  user_uuid: string | null
+  last_edited_by_uuid: string | null
 }

packages/revisions/src/Mapping/Http/RevisionMetadataHttpMapper.ts

@@ -15,10 +15,12 @@ export class RevisionMetadataHttpMapper
   toProjection(domain: RevisionMetadata): RevisionMetadataHttpRepresentation {
     return {
       uuid: domain.id.toString(),
+      item_uuid: domain.props.itemUuid.value,
       content_type: domain.props.contentType.value as string,
       created_at: domain.props.dates.createdAt.toISOString(),
       updated_at: domain.props.dates.updatedAt.toISOString(),
       required_role: this.getRequiredRoleToViewRevision.execute({ createdAt: domain.props.dates.createdAt }).getValue(),
+      shared_vault_uuid: domain.props.sharedVaultUuid ? domain.props.sharedVaultUuid.value : null,
     }
   }
 }

packages/revisions/src/Mapping/Http/RevisionMetadataHttpRepresentation.ts

@@ -1,7 +1,9 @@
 export interface RevisionMetadataHttpRepresentation {
   uuid: string
+  item_uuid: string
   content_type: string
   created_at: string
   updated_at: string
   required_role: string
+  shared_vault_uuid: string | null
 }

packages/revisions/src/Mapping/Persistence/MongoDB/MongoDBRevisionMetadataPersistenceMapper.ts

@@ -1,4 +1,4 @@
-import { MapperInterface, Dates, UniqueEntityId, ContentType } from '@standardnotes/domain-core'
+import { MapperInterface, Dates, UniqueEntityId, ContentType, Uuid } from '@standardnotes/domain-core'
 
 import { RevisionMetadata } from '../../../Domain/Revision/RevisionMetadata'
 import { MongoDBRevision } from '../../../Infra/TypeORM/MongoDB/MongoDBRevision'
@@ -20,10 +20,27 @@ export class MongoDBRevisionMetadataPersistenceMapper implements MapperInterface
     }
     const dates = datesOrError.getValue()
 
+    let sharedVaultUuid = null
+    if (projection.sharedVaultUuid) {
+      const sharedVaultUuidOrError = Uuid.create(projection.sharedVaultUuid)
+      if (sharedVaultUuidOrError.isFailed()) {
+        throw new Error(`Could not create shared vault uuid: ${sharedVaultUuidOrError.getError()}`)
+      }
+      sharedVaultUuid = sharedVaultUuidOrError.getValue()
+    }
+
+    const itemUuidOrError = Uuid.create(projection.itemUuid)
+    if (itemUuidOrError.isFailed()) {
+      throw new Error(`Could not create item uuid: ${itemUuidOrError.getError()}`)
+    }
+    const itemUuid = itemUuidOrError.getValue()
+
     const revisionMetadataOrError = RevisionMetadata.create(
       {
         contentType,
         dates,
+        sharedVaultUuid,
+        itemUuid,
       },
       new UniqueEntityId(projection._id.toHexString()),
     )

packages/revisions/src/Mapping/Persistence/MongoDB/MongoDBRevisionPersistenceMapper.ts

@@ -1,8 +1,10 @@
 import { MapperInterface, Dates, UniqueEntityId, Uuid, ContentType } from '@standardnotes/domain-core'
+import { BSON } from 'mongodb'
 
 import { MongoDBRevision } from '../../../Infra/TypeORM/MongoDB/MongoDBRevision'
 import { Revision } from '../../../Domain/Revision/Revision'
-import { BSON } from 'mongodb'
+import { SharedVaultAssociation } from '../../../Domain/SharedVault/SharedVaultAssociation'
+import { KeySystemAssociation } from '../../../Domain/KeySystem/KeySystemAssociation'
 
 export class MongoDBRevisionPersistenceMapper implements MapperInterface<Revision, MongoDBRevision> {
   toDomain(projection: MongoDBRevision): Revision {
@@ -33,6 +35,39 @@ export class MongoDBRevisionPersistenceMapper implements MapperInterface<Revisio
       userUuid = userUuidOrError.getValue()
     }
 
+    let sharedVaultAssociation: SharedVaultAssociation | undefined = undefined
+    if (projection.sharedVaultUuid && projection.editedBy) {
+      const sharedVaultUuidOrError = Uuid.create(projection.sharedVaultUuid)
+      if (sharedVaultUuidOrError.isFailed()) {
+        throw new Error(`Failed to create revision from projection: ${sharedVaultUuidOrError.getError()}`)
+      }
+      const sharedVaultUuid = sharedVaultUuidOrError.getValue()
+
+      const lastEditedByOrError = Uuid.create(projection.editedBy)
+      if (lastEditedByOrError.isFailed()) {
+        throw new Error(`Failed to create revision from projection: ${lastEditedByOrError.getError()}`)
+      }
+      const lastEditedBy = lastEditedByOrError.getValue()
+
+      const sharedVaultAssociationOrError = SharedVaultAssociation.create({
+        sharedVaultUuid,
+        editedBy: lastEditedBy,
+      })
+      if (sharedVaultAssociationOrError.isFailed()) {
+        throw new Error(`Failed to create revision from projection: ${sharedVaultAssociationOrError.getError()}`)
+      }
+      sharedVaultAssociation = sharedVaultAssociationOrError.getValue()
+    }
+
+    let keySystemAssociation: KeySystemAssociation | undefined = undefined
+    if (projection.keySystemIdentifier) {
+      const keySystemAssociationOrError = KeySystemAssociation.create(projection.keySystemIdentifier)
+      if (keySystemAssociationOrError.isFailed()) {
+        throw new Error(`Failed to create revision from projection: ${keySystemAssociationOrError.getError()}`)
+      }
+      keySystemAssociation = keySystemAssociationOrError.getValue()
+    }
+
     const revisionOrError = Revision.create(
       {
         authHash: projection.authHash,
@@ -44,6 +79,8 @@ export class MongoDBRevisionPersistenceMapper implements MapperInterface<Revisio
         itemUuid,
         userUuid,
         dates,
+        sharedVaultAssociation,
+        keySystemAssociation,
       },
       new UniqueEntityId(projection._id.toHexString()),
     )
@@ -67,6 +104,15 @@ export class MongoDBRevisionPersistenceMapper implements MapperInterface<Revisio
     mongoDBRevision.itemUuid = domain.props.itemUuid.value
     mongoDBRevision.itemsKeyId = domain.props.itemsKeyId
     mongoDBRevision.userUuid = domain.props.userUuid ? domain.props.userUuid.value : null
+    mongoDBRevision.sharedVaultUuid = domain.props.sharedVaultAssociation
+      ? domain.props.sharedVaultAssociation.props.sharedVaultUuid.value
+      : null
+    mongoDBRevision.editedBy = domain.props.sharedVaultAssociation
+      ? domain.props.sharedVaultAssociation.props.editedBy.value
+      : null
+    mongoDBRevision.keySystemIdentifier = domain.props.keySystemAssociation
+      ? domain.props.keySystemAssociation.props.keySystemIdentifier
+      : null
     mongoDBRevision._id = BSON.UUID.createFromHexString(domain.id.toString())
 
     return mongoDBRevision

packages/revisions/src/Mapping/Persistence/SQL/SQLLegacyRevisionMetadataPersistenceMapper.ts

@@ -1,4 +1,4 @@
-import { MapperInterface, Dates, UniqueEntityId, ContentType } from '@standardnotes/domain-core'
+import { MapperInterface, Dates, UniqueEntityId, ContentType, Uuid } from '@standardnotes/domain-core'
 
 import { RevisionMetadata } from '../../../Domain/Revision/RevisionMetadata'
 import { SQLLegacyRevision } from '../../../Infra/TypeORM/SQL/SQLLegacyRevision'
@@ -22,10 +22,18 @@ export class SQLLegacyRevisionMetadataPersistenceMapper
     }
     const dates = datesOrError.getValue()
 
+    const itemUuidOrError = Uuid.create(projection.itemUuid)
+    if (itemUuidOrError.isFailed()) {
+      throw new Error(`Could not create item uuid: ${itemUuidOrError.getError()}`)
+    }
+    const itemUuid = itemUuidOrError.getValue()
+
     const revisionMetadataOrError = RevisionMetadata.create(
       {
         contentType,
         dates,
+        sharedVaultUuid: null,
+        itemUuid,
       },
       new UniqueEntityId(projection.uuid),
     )

packages/revisions/src/Mapping/Persistence/SQL/SQLRevisionMetadataPersistenceMapper.ts

@@ -1,4 +1,4 @@
-import { MapperInterface, Dates, UniqueEntityId, ContentType } from '@standardnotes/domain-core'
+import { MapperInterface, Dates, UniqueEntityId, ContentType, Uuid } from '@standardnotes/domain-core'
 
 import { RevisionMetadata } from '../../../Domain/Revision/RevisionMetadata'
 import { SQLRevision } from '../../../Infra/TypeORM/SQL/SQLRevision'
@@ -20,10 +20,27 @@ export class SQLRevisionMetadataPersistenceMapper implements MapperInterface<Rev
     }
     const dates = datesOrError.getValue()
 
+    let sharedVaultUuid = null
+    if (projection.sharedVaultUuid) {
+      const sharedVaultUuidOrError = Uuid.create(projection.sharedVaultUuid)
+      if (sharedVaultUuidOrError.isFailed()) {
+        throw new Error(`Could not create shared vault uuid: ${sharedVaultUuidOrError.getError()}`)
+      }
+      sharedVaultUuid = sharedVaultUuidOrError.getValue()
+    }
+
+    const itemUuidOrError = Uuid.create(projection.itemUuid)
+    if (itemUuidOrError.isFailed()) {
+      throw new Error(`Could not create item uuid: ${itemUuidOrError.getError()}`)
+    }
+    const itemUuid = itemUuidOrError.getValue()
+
     const revisionMetadataOrError = RevisionMetadata.create(
       {
         contentType,
         dates,
+        sharedVaultUuid,
+        itemUuid,
       },
       new UniqueEntityId(projection.uuid),
     )

packages/revisions/supervisor/supervisor-server.sh

@@ -2,6 +2,5 @@
 
 set -euo pipefail
 
-sh supervisor/wait-for.sh $DB_HOST $DB_PORT
-sh supervisor/wait-for.sh $REDIS_HOST $REDIS_PORT
+sh supervisor/wait-for.sh localhost $SYNCING_SERVER_PORT
 node docker/entrypoint-server.js

packages/scheduler/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.20.39](https://github.com/standardnotes/server/compare/@standardnotes/scheduler-server@1.20.38...@standardnotes/scheduler-server@1.20.39) (2023-09-08)
+
+**Note:** Version bump only for package @standardnotes/scheduler-server
+
+## [1.20.38](https://github.com/standardnotes/server/compare/@standardnotes/scheduler-server@1.20.37...@standardnotes/scheduler-server@1.20.38) (2023-09-07)
+
+**Note:** Version bump only for package @standardnotes/scheduler-server
+
+## [1.20.37](https://github.com/standardnotes/server/compare/@standardnotes/scheduler-server@1.20.36...@standardnotes/scheduler-server@1.20.37) (2023-09-07)
+
+**Note:** Version bump only for package @standardnotes/scheduler-server
+
 ## [1.20.36](https://github.com/standardnotes/server/compare/@standardnotes/scheduler-server@1.20.35...@standardnotes/scheduler-server@1.20.36) (2023-09-06)
 
 **Note:** Version bump only for package @standardnotes/scheduler-server

packages/scheduler/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/scheduler-server",
-  "version": "1.20.36",
+  "version": "1.20.39",
   "engines": {
     "node": ">=18.0.0 <21.0.0"
   },

packages/settings/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.21.30](https://github.com/standardnotes/server/compare/@standardnotes/settings@1.21.29...@standardnotes/settings@1.21.30) (2023-09-07)
+
+**Note:** Version bump only for package @standardnotes/settings
+
 ## [1.21.29](https://github.com/standardnotes/server/compare/@standardnotes/settings@1.21.28...@standardnotes/settings@1.21.29) (2023-09-06)
 
 **Note:** Version bump only for package @standardnotes/settings

packages/settings/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/settings",
-  "version": "1.21.29",
+  "version": "1.21.30",
   "engines": {
     "node": ">=18.0.0 <21.0.0"
   },

packages/syncing-server/CHANGELOG.md

@@ -3,6 +3,34 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [1.95.0](https://github.com/standardnotes/syncing-server-js/compare/@standardnotes/syncing-server@1.94.0...@standardnotes/syncing-server@1.95.0) (2023-09-08)
+
+### Features
+
+* transition users after sign out ([398338c](https://github.com/standardnotes/syncing-server-js/commit/398338c8f81b12406c7ab3bf1654e60b94d7cfd0))
+
+# [1.94.0](https://github.com/standardnotes/syncing-server-js/compare/@standardnotes/syncing-server@1.93.1...@standardnotes/syncing-server@1.94.0) (2023-09-08)
+
+### Features
+
+* **syncing-server:** add procedure to trigger transition for specific user ([8cb92d9](https://github.com/standardnotes/syncing-server-js/commit/8cb92d9678cffe9188fa2b038f1b5a9e0247551e))
+
+## [1.93.1](https://github.com/standardnotes/syncing-server-js/compare/@standardnotes/syncing-server@1.93.0...@standardnotes/syncing-server@1.93.1) (2023-09-07)
+
+### Bug Fixes
+
+* **syncing-server:** invalidating cache for user removed from shared vault ([#812](https://github.com/standardnotes/syncing-server-js/issues/812)) ([c4a1502](https://github.com/standardnotes/syncing-server-js/commit/c4a1502f70e675da5c81c4005ee1eca578a7e3f4))
+
+# [1.93.0](https://github.com/standardnotes/syncing-server-js/compare/@standardnotes/syncing-server@1.92.1...@standardnotes/syncing-server@1.93.0) (2023-09-07)
+
+### Features
+
+* add removing revisions from shared vaults ([#811](https://github.com/standardnotes/syncing-server-js/issues/811)) ([3bd63f7](https://github.com/standardnotes/syncing-server-js/commit/3bd63f767464baf9b9f1ffa52eea9eed4a4e11b5))
+
+## [1.92.1](https://github.com/standardnotes/syncing-server-js/compare/@standardnotes/syncing-server@1.92.0...@standardnotes/syncing-server@1.92.1) (2023-09-07)
+
+**Note:** Version bump only for package @standardnotes/syncing-server
+
 # [1.92.0](https://github.com/standardnotes/syncing-server-js/compare/@standardnotes/syncing-server@1.91.3...@standardnotes/syncing-server@1.92.0) (2023-09-06)
 
 ### Features

packages/syncing-server/bin/transition.ts

@@ -0,0 +1,50 @@
+import 'reflect-metadata'
+
+import { Logger } from 'winston'
+
+import { ContainerConfigLoader } from '../src/Bootstrap/Container'
+import TYPES from '../src/Bootstrap/Types'
+import { Env } from '../src/Bootstrap/Env'
+import { TriggerTransitionFromPrimaryToSecondaryDatabaseForUser } from '../src/Domain/UseCase/Transition/TriggerTransitionFromPrimaryToSecondaryDatabaseForUser/TriggerTransitionFromPrimaryToSecondaryDatabaseForUser'
+
+const inputArgs = process.argv.slice(2)
+const userUuid = inputArgs[0]
+
+const requestTransition = async (
+  triggerTransitionFromPrimaryToSecondaryDatabaseForUser: TriggerTransitionFromPrimaryToSecondaryDatabaseForUser,
+  logger: Logger,
+): Promise<void> => {
+  const result = await triggerTransitionFromPrimaryToSecondaryDatabaseForUser.execute({
+    userUuid,
+  })
+  if (result.isFailed()) {
+    logger.error(`Could not trigger transition for user ${userUuid}: ${result.getError()}`)
+  }
+
+  return
+}
+
+const container = new ContainerConfigLoader()
+void container.load().then((container) => {
+  const env: Env = new Env()
+  env.load()
+
+  const logger: Logger = container.get(TYPES.Sync_Logger)
+
+  logger.info(`Starting transitiong for user ${userUuid} ...`)
+
+  const triggerTransitionFromPrimaryToSecondaryDatabaseForUser: TriggerTransitionFromPrimaryToSecondaryDatabaseForUser =
+    container.get(TYPES.Sync_TriggerTransitionFromPrimaryToSecondaryDatabaseForUser)
+
+  Promise.resolve(requestTransition(triggerTransitionFromPrimaryToSecondaryDatabaseForUser, logger))
+    .then(() => {
+      logger.info(`Transition triggered for user ${userUuid}`)
+
+      process.exit(0)
+    })
+    .catch((error) => {
+      logger.error(`Could not trigger transition for user ${userUuid}: ${error.message}`)
+
+      process.exit(1)
+    })
+})

packages/syncing-server/docker/entrypoint-transition.js

@@ -0,0 +1,11 @@
+'use strict'
+
+const path = require('path')
+
+const pnp = require(path.normalize(path.resolve(__dirname, '../../..', '.pnp.cjs'))).setup()
+
+const index = require(path.normalize(path.resolve(__dirname, '../dist/bin/transition.js')))
+
+Object.defineProperty(exports, '__esModule', { value: true })
+
+exports.default = index

packages/syncing-server/docker/entrypoint.sh

@@ -14,6 +14,12 @@ case "$COMMAND" in
     node docker/entrypoint-worker.js
     ;;
 
+  'transition' )
+    echo "[Docker] Starting transition Single User..."
+    USER_UUID=$1 && shift 1
+    node docker/entrypoint-transition.js $USER_UUID
+    ;;
+
    * )
     echo "[Docker] Unknown command"
     ;;

packages/syncing-server/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/syncing-server",
-  "version": "1.92.0",
+  "version": "1.95.0",
   "engines": {
     "node": ">=18.0.0 <21.0.0"
   },

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

@@ -166,6 +166,7 @@ import { SQLItem } from '../Infra/TypeORM/SQLItem'
 import { SQLItemPersistenceMapper } from '../Mapping/Persistence/SQLItemPersistenceMapper'
 import { SQLItemRepository } from '../Infra/TypeORM/SQLItemRepository'
 import { SendEventToClient } from '../Domain/UseCase/Syncing/SendEventToClient/SendEventToClient'
+import { TransitionRequestedEventHandler } from '../Domain/Handler/TransitionRequestedEventHandler'
 
 export class ContainerConfigLoader {
   private readonly DEFAULT_CONTENT_SIZE_TRANSFER_LIMIT = 10_000_000
@@ -955,6 +956,16 @@ export class ContainerConfigLoader {
           container.get<Logger>(TYPES.Sync_Logger),
         ),
       )
+    container
+      .bind<TransitionRequestedEventHandler>(TYPES.Sync_TransitionRequestedEventHandler)
+      .toConstantValue(
+        new TransitionRequestedEventHandler(
+          container.get<TriggerTransitionFromPrimaryToSecondaryDatabaseForUser>(
+            TYPES.Sync_TriggerTransitionFromPrimaryToSecondaryDatabaseForUser,
+          ),
+          container.get<Logger>(TYPES.Sync_Logger),
+        ),
+      )
 
     // Services
     container.bind<ContentDecoder>(TYPES.Sync_ContentDecoder).toDynamicValue(() => new ContentDecoder())
@@ -993,6 +1004,10 @@ export class ContainerConfigLoader {
         'TRANSITION_STATUS_UPDATED',
         container.get<TransitionStatusUpdatedEventHandler>(TYPES.Sync_TransitionStatusUpdatedEventHandler),
       ],
+      [
+        'TRANSITION_REQUESTED',
+        container.get<TransitionRequestedEventHandler>(TYPES.Sync_TransitionRequestedEventHandler),
+      ],
     ])
     if (!isConfiguredForHomeServer) {
       container.bind(TYPES.Sync_AUTH_SERVER_URL).toConstantValue(env.get('AUTH_SERVER_URL'))

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

@@ -97,6 +97,7 @@ const TYPES = {
   Sync_SharedVaultFileUploadedEventHandler: Symbol.for('Sync_SharedVaultFileUploadedEventHandler'),
   Sync_SharedVaultFileMovedEventHandler: Symbol.for('Sync_SharedVaultFileMovedEventHandler'),
   Sync_TransitionStatusUpdatedEventHandler: Symbol.for('Sync_TransitionStatusUpdatedEventHandler'),
+  Sync_TransitionRequestedEventHandler: Symbol.for('Sync_TransitionRequestedEventHandler'),
   // Services
   Sync_ContentDecoder: Symbol.for('Sync_ContentDecoder'),
   Sync_DomainEventPublisher: Symbol.for('Sync_DomainEventPublisher'),

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

@@ -4,6 +4,7 @@ import {
   DuplicateItemSyncedEvent,
   EmailRequestedEvent,
   ItemDumpedEvent,
+  ItemRemovedFromSharedVaultEvent,
   ItemRevisionCreationRequestedEvent,
   MessageSentToUserEvent,
   NotificationAddedForUserEvent,
@@ -20,6 +21,26 @@ import { DomainEventFactoryInterface } from './DomainEventFactoryInterface'
 export class DomainEventFactory implements DomainEventFactoryInterface {
   constructor(private timer: TimerInterface) {}
 
+  createItemRemovedFromSharedVaultEvent(dto: {
+    sharedVaultUuid: string
+    itemUuid: string
+    userUuid: string
+    roleNames: string[]
+  }): ItemRemovedFromSharedVaultEvent {
+    return {
+      type: 'ITEM_REMOVED_FROM_SHARED_VAULT',
+      createdAt: this.timer.getUTCDate(),
+      meta: {
+        correlation: {
+          userIdentifier: dto.userUuid,
+          userIdentifierType: 'uuid',
+        },
+        origin: DomainEventService.SyncingServer,
+      },
+      payload: dto,
+    }
+  }
+
   createUserRemovedFromSharedVaultEvent(dto: {
     sharedVaultUuid: string
     userUuid: string

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

@@ -2,6 +2,7 @@ import {
   DuplicateItemSyncedEvent,
   EmailRequestedEvent,
   ItemDumpedEvent,
+  ItemRemovedFromSharedVaultEvent,
   ItemRevisionCreationRequestedEvent,
   MessageSentToUserEvent,
   NotificationAddedForUserEvent,
@@ -93,4 +94,10 @@ export interface DomainEventFactoryInterface {
     sharedVaultUuid: string
     userUuid: string
   }): UserRemovedFromSharedVaultEvent
+  createItemRemovedFromSharedVaultEvent(dto: {
+    sharedVaultUuid: string
+    itemUuid: string
+    userUuid: string
+    roleNames: string[]
+  }): ItemRemovedFromSharedVaultEvent
 }

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

@@ -0,0 +1,23 @@
+import { DomainEventHandlerInterface, TransitionRequestedEvent } from '@standardnotes/domain-events'
+import { Logger } from 'winston'
+
+import { TriggerTransitionFromPrimaryToSecondaryDatabaseForUser } from '../UseCase/Transition/TriggerTransitionFromPrimaryToSecondaryDatabaseForUser/TriggerTransitionFromPrimaryToSecondaryDatabaseForUser'
+
+export class TransitionRequestedEventHandler implements DomainEventHandlerInterface {
+  constructor(
+    private triggerTransitionFromPrimaryToSecondaryDatabaseForUser: TriggerTransitionFromPrimaryToSecondaryDatabaseForUser,
+    private logger: Logger,
+  ) {}
+
+  async handle(event: TransitionRequestedEvent): Promise<void> {
+    this.logger.info(`Handling transition requested event for user ${event.payload.userUuid}`)
+
+    const result = await this.triggerTransitionFromPrimaryToSecondaryDatabaseForUser.execute({
+      userUuid: event.payload.userUuid,
+    })
+
+    if (result.isFailed()) {
+      this.logger.error(`Failed to trigger transition for user ${event.payload.userUuid}`)
+    }
+  }
+}

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

@@ -111,6 +111,9 @@ describe('UpdateExistingItem', () => {
     domainEventFactory.createItemRevisionCreationRequested = jest
       .fn()
       .mockReturnValue({} as jest.Mocked<DomainEventInterface>)
+    domainEventFactory.createItemRemovedFromSharedVaultEvent = jest
+      .fn()
+      .mockReturnValue({} as jest.Mocked<DomainEventInterface>)
 
     determineSharedVaultOperationOnItem = {} as jest.Mocked<DetermineSharedVaultOperationOnItem>
     determineSharedVaultOperationOnItem.execute = jest.fn().mockResolvedValue(
@@ -400,6 +403,47 @@ describe('UpdateExistingItem', () => {
       expect(item1.props.sharedVaultAssociation).not.toBeUndefined()
     })
 
+    it('should remove a shared vault association and publish an event that item has been removed from shared vault', async () => {
+      const useCase = createUseCase()
+
+      item1.props.sharedVaultAssociation = SharedVaultAssociation.create({
+        sharedVaultUuid: Uuid.create('00000000-0000-0000-0000-000000000000').getValue(),
+        lastEditedBy: Uuid.create('00000000-0000-0000-0000-000000000000').getValue(),
+      }).getValue()
+
+      const itemHash = ItemHash.create({
+        ...itemHash1.props,
+        shared_vault_uuid: null,
+      }).getValue()
+
+      determineSharedVaultOperationOnItem.execute = jest.fn().mockReturnValue(
+        Result.ok(
+          SharedVaultOperationOnItem.create({
+            existingItem: item1,
+            incomingItemHash: itemHash1,
+            sharedVaultUuid: Uuid.create('00000000-0000-0000-0000-000000000000').getValue(),
+            type: SharedVaultOperationOnItem.TYPES.RemoveFromSharedVault,
+            userUuid: Uuid.create('00000000-0000-0000-0000-000000000000').getValue(),
+          }).getValue(),
+        ),
+      )
+
+      const result = await useCase.execute({
+        existingItem: item1,
+        itemHash,
+        sessionUuid: '00000000-0000-0000-0000-000000000000',
+        performingUserUuid: '00000000-0000-0000-0000-000000000000',
+        roleNames: [RoleName.NAMES.CoreUser],
+      })
+
+      expect(result.isFailed()).toBeFalsy()
+
+      expect(item1.props.sharedVaultAssociation).toBeUndefined()
+
+      expect(domainEventFactory.createItemRemovedFromSharedVaultEvent).toHaveBeenCalled()
+      expect(domainEventPublisher.publish).toHaveBeenCalled()
+    })
+
     it('should return error if shared vault association could not be created', async () => {
       const useCase = createUseCase()
 

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

@@ -37,16 +37,6 @@ export class UpdateExistingItem implements UseCaseInterface<Item> {
   ) {}
 
   async execute(dto: UpdateExistingItemDTO): Promise<Result<Item>> {
-    let sessionUuid = null
-    if (dto.sessionUuid) {
-      const sessionUuidOrError = Uuid.create(dto.sessionUuid)
-      if (sessionUuidOrError.isFailed()) {
-        return Result.fail(sessionUuidOrError.getError())
-      }
-      sessionUuid = sessionUuidOrError.getValue()
-    }
-    dto.existingItem.props.updatedWithSession = sessionUuid
-
     const userUuidOrError = Uuid.create(dto.performingUserUuid)
     if (userUuidOrError.isFailed()) {
       return Result.fail(userUuidOrError.getError())
@@ -59,6 +49,29 @@ export class UpdateExistingItem implements UseCaseInterface<Item> {
     }
     const roleNames = roleNamesOrError.getValue()
 
+    let sharedVaultOperation: SharedVaultOperationOnItem | null = null
+    if (dto.itemHash.representsASharedVaultItem() || dto.existingItem.isAssociatedWithASharedVault()) {
+      const sharedVaultOperationOrError = await this.determineSharedVaultOperationOnItem.execute({
+        existingItem: dto.existingItem,
+        itemHash: dto.itemHash,
+        userUuid: userUuid.value,
+      })
+      if (sharedVaultOperationOrError.isFailed()) {
+        return Result.fail(sharedVaultOperationOrError.getError())
+      }
+      sharedVaultOperation = sharedVaultOperationOrError.getValue()
+    }
+
+    let sessionUuid = null
+    if (dto.sessionUuid) {
+      const sessionUuidOrError = Uuid.create(dto.sessionUuid)
+      if (sessionUuidOrError.isFailed()) {
+        return Result.fail(sessionUuidOrError.getError())
+      }
+      sessionUuid = sessionUuidOrError.getValue()
+    }
+    dto.existingItem.props.updatedWithSession = sessionUuid
+
     if (dto.itemHash.props.content) {
       dto.existingItem.props.content = dto.itemHash.props.content
     }
@@ -128,7 +141,6 @@ export class UpdateExistingItem implements UseCaseInterface<Item> {
 
     dto.existingItem.props.contentSize = Buffer.byteLength(JSON.stringify(dto.existingItem))
 
-    let sharedVaultOperation: SharedVaultOperationOnItem | null = null
     if (dto.itemHash.representsASharedVaultItem()) {
       const sharedVaultAssociationOrError = SharedVaultAssociation.create({
         lastEditedBy: userUuid,
@@ -140,16 +152,6 @@ export class UpdateExistingItem implements UseCaseInterface<Item> {
       }
 
       dto.existingItem.props.sharedVaultAssociation = sharedVaultAssociationOrError.getValue()
-
-      const sharedVaultOperationOrError = await this.determineSharedVaultOperationOnItem.execute({
-        existingItem: dto.existingItem,
-        itemHash: dto.itemHash,
-        userUuid: userUuid.value,
-      })
-      if (sharedVaultOperationOrError.isFailed()) {
-        return Result.fail(sharedVaultOperationOrError.getError())
-      }
-      sharedVaultOperation = sharedVaultOperationOrError.getValue()
     } else {
       dto.existingItem.props.sharedVaultAssociation = undefined
     }
@@ -209,7 +211,7 @@ export class UpdateExistingItem implements UseCaseInterface<Item> {
       )
     }
 
-    const notificationsResult = await this.addNotifications(dto.existingItem.uuid, userUuid, sharedVaultOperation)
+    const notificationsResult = await this.addNotificationsAndPublishEvents(userUuid, sharedVaultOperation, dto)
     if (notificationsResult.isFailed()) {
       return Result.fail(notificationsResult.getError())
     }
@@ -217,10 +219,10 @@ export class UpdateExistingItem implements UseCaseInterface<Item> {
     return Result.ok(dto.existingItem)
   }
 
-  private async addNotifications(
-    itemUuid: Uuid,
+  private async addNotificationsAndPublishEvents(
     userUuid: Uuid,
     sharedVaultOperation: SharedVaultOperationOnItem | null,
+    dto: UpdateExistingItemDTO,
   ): Promise<Result<void>> {
     if (
       sharedVaultOperation &&
@@ -229,7 +231,7 @@ export class UpdateExistingItem implements UseCaseInterface<Item> {
       const notificationPayloadOrError = NotificationPayload.create({
         sharedVaultUuid: sharedVaultOperation.props.sharedVaultUuid,
         type: NotificationType.create(NotificationType.TYPES.SharedVaultItemRemoved).getValue(),
-        itemUuid: itemUuid,
+        itemUuid: dto.existingItem.uuid,
         version: '1.0',
       })
       if (notificationPayloadOrError.isFailed()) {
@@ -246,6 +248,15 @@ export class UpdateExistingItem implements UseCaseInterface<Item> {
       if (result.isFailed()) {
         return Result.fail(result.getError())
       }
+
+      await this.domainEventPublisher.publish(
+        this.domainEventFactory.createItemRemovedFromSharedVaultEvent({
+          sharedVaultUuid: sharedVaultOperation.props.sharedVaultUuid.value,
+          itemUuid: dto.existingItem.uuid.value,
+          userUuid: userUuid.value,
+          roleNames: dto.roleNames,
+        }),
+      )
     }
 
     if (sharedVaultOperation && sharedVaultOperation.props.type === SharedVaultOperationOnItem.TYPES.AddToSharedVault) {

packages/syncing-server/src/Infra/InversifyExpressUtils/Base/BaseSharedVaultUsersController.ts

@@ -65,7 +65,7 @@ export class BaseSharedVaultUsersController extends BaseHttpController {
       )
     }
 
-    response.setHeader('x-invalidate-cache', response.locals.user.uuid)
+    response.setHeader('x-invalidate-cache', request.params.userUuid)
 
     return this.json({
       success: true,

packages/syncing-server/src/Infra/TypeORM/MongoDBItemRepository.ts

@@ -155,15 +155,23 @@ export class MongoDBItemRepository implements ItemRepositoryInterface {
 
   async markItemsAsDeleted(itemUuids: string[], updatedAtTimestamp: number): Promise<void> {
     await this.mongoRepository.updateMany(
-      { where: { _id: { $in: itemUuids.map((uuid) => BSON.UUID.createFromHexString(uuid)) } } },
-      { deleted: true, content: null, encItemKey: null, authHash: null, updatedAtTimestamp },
+      { _id: { $in: itemUuids.map((uuid) => BSON.UUID.createFromHexString(uuid)) } },
+      {
+        $set: {
+          deleted: true,
+          content: null,
+          encItemKey: null,
+          authHash: null,
+          updatedAtTimestamp,
+        },
+      },
     )
   }
 
   async updateContentSize(itemUuid: string, contentSize: number): Promise<void> {
     await this.mongoRepository.updateOne(
-      { where: { _id: { $eq: BSON.UUID.createFromHexString(itemUuid) } } },
-      { contentSize },
+      { _id: { $eq: BSON.UUID.createFromHexString(itemUuid) } },
+      { $set: { contentSize } },
     )
   }
 

packages/websockets/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.10.36](https://github.com/standardnotes/server/compare/@standardnotes/websockets-server@1.10.35...@standardnotes/websockets-server@1.10.36) (2023-09-08)
+
+**Note:** Version bump only for package @standardnotes/websockets-server
+
+## [1.10.35](https://github.com/standardnotes/server/compare/@standardnotes/websockets-server@1.10.34...@standardnotes/websockets-server@1.10.35) (2023-09-07)
+
+**Note:** Version bump only for package @standardnotes/websockets-server
+
+## [1.10.34](https://github.com/standardnotes/server/compare/@standardnotes/websockets-server@1.10.33...@standardnotes/websockets-server@1.10.34) (2023-09-07)
+
+**Note:** Version bump only for package @standardnotes/websockets-server
+
 ## [1.10.33](https://github.com/standardnotes/server/compare/@standardnotes/websockets-server@1.10.32...@standardnotes/websockets-server@1.10.33) (2023-09-06)
 
 **Note:** Version bump only for package @standardnotes/websockets-server

packages/websockets/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/websockets-server",
-  "version": "1.10.33",
+  "version": "1.10.36",
   "engines": {
     "node": ">=18.0.0 <21.0.0"
   },