chore(deps): bump docker/build-push-action from 4 to 5

Bumps [docker/build-push-action](https://github.com/docker/build-push-action) from 4 to 5. - [Release notes](https://github.com/docker/build-push-action/releases) - [Commits](https://github.com/docker/build-push-action/compare/v4...v5) --- updated-dependencies: - dependency-name: docker/build-push-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com>
2026-03-29 03:01:11 -04:00 · 2023-09-18 12:19:19 +00:00
181 changed files with 965 additions and 3465 deletions
--- a/.github/workflows/analytics.yml
+++ b/.github/workflows/analytics.yml
@@ -16,7 +16,6 @@ jobs:
    uses: standardnotes/server/.github/workflows/common-server-application.yml@main
    with:
      service_name: analytics
-      workspace_name: "@standardnotes/analytics"
      deploy_web: false
      package_path: packages/analytics
    secrets: inherit
--- a/.github/workflows/api-gateway.yml
+++ b/.github/workflows/api-gateway.yml
@@ -16,7 +16,6 @@ jobs:
    uses: standardnotes/server/.github/workflows/common-server-application.yml@main
    with:
      service_name: api-gateway
-      workspace_name: "@standardnotes/api-gateway"
      deploy_worker: false
      package_path: packages/api-gateway
    secrets: inherit
--- a/.github/workflows/auth.yml
+++ b/.github/workflows/auth.yml
@@ -16,7 +16,6 @@ jobs:
    uses: standardnotes/server/.github/workflows/common-server-application.yml@main
    with:
      service_name: auth
-      workspace_name: "@standardnotes/auth-server"
      package_path: packages/auth
    secrets: inherit

--- a/.github/workflows/common-docker-image.yml
+++ b/.github/workflows/common-docker-image.yml
@@ -9,9 +9,6 @@ on:
      package_path:
        required: true
        type: string
-      workspace_name:
-        required: true
-        type: string
    secrets:
      DOCKER_USERNAME:
        required: true
@@ -33,14 +30,6 @@ jobs:
      with:
        python-version: '3.11'

-    - name: Cache build
-      id: cache-build
-      uses: actions/cache@v3
-      with:
-        path: |
-          packages/**/dist
-        key: ${{ runner.os }}-${{ inputs.service_name }}-build-${{ github.sha }}
-
    - name: Set up Node
      uses: actions/setup-node@v3
      with:
@@ -50,10 +39,6 @@ jobs:
    - name: Install dependencies
      run: yarn install --immutable

-    - name: Build
-      if: steps.cache-build.outputs.cache-hit != 'true'
-      run: yarn build
-
    - name: Login to Docker Hub
      uses: docker/login-action@v2
      with:
@@ -81,7 +66,7 @@ jobs:
      uses: docker/setup-buildx-action@master

    - name: Publish Docker image
-      uses: docker/build-push-action@v4
+      uses: docker/build-push-action@v5
      with:
        builder: ${{ steps.buildx.outputs.name }}
        context: .
--- a/.github/workflows/common-e2e.yml
+++ b/.github/workflows/common-e2e.yml
@@ -24,6 +24,7 @@ jobs:
      fail-fast: false
      matrix:
        secondary_db_enabled: [true, false]
+        transition_mode_enabled: [true, false]
    runs-on: ubuntu-latest

    services:
@@ -50,6 +51,7 @@ jobs:
        DB_TYPE: mysql
        CACHE_TYPE: redis
        SECONDARY_DB_ENABLED: ${{ matrix.secondary_db_enabled }}
+        TRANSITION_MODE_ENABLED: ${{ matrix.transition_mode_enabled }}

    - name: Wait for server to start
      run: docker/is-available.sh http://localhost:3123 $(pwd)/logs
@@ -73,6 +75,7 @@ jobs:
        db_type: [mysql, sqlite]
        cache_type: [redis, memory]
        secondary_db_enabled: [true, false]
+        transition_mode_enabled: [true, false]

    runs-on: ubuntu-latest

@@ -142,6 +145,7 @@ jobs:
        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
+        echo "TRANSITION_MODE_ENABLED=${{ matrix.transition_mode_enabled }}" >> packages/home-server/.env
        echo "MONGO_HOST=localhost" >> packages/home-server/.env
        echo "MONGO_PORT=27017" >> packages/home-server/.env
        echo "MONGO_DATABASE=standardnotes" >> packages/home-server/.env
--- a/.github/workflows/common-self-hosting.yml
+++ b/.github/workflows/common-self-hosting.yml
@@ -35,7 +35,7 @@ jobs:
      uses: docker/setup-buildx-action@master

    - name: Publish Docker image
-      uses: docker/build-push-action@v4
+      uses: docker/build-push-action@v5
      with:
        builder: ${{ steps.buildx.outputs.name }}
        context: .
--- a/.github/workflows/common-server-application.yml
+++ b/.github/workflows/common-server-application.yml
@@ -6,9 +6,6 @@ on:
      service_name:
        required: true
        type: string
-      workspace_name:
-        required: true
-        type: string
      deploy_web:
        required: false
        default: true
@@ -39,7 +36,6 @@ jobs:
    with:
      service_name: ${{ inputs.service_name }}
      package_path: ${{ inputs.package_path }}
-      workspace_name: ${{ inputs.workspace_name }}
    secrets: inherit

  deploy-web:
--- a/.github/workflows/files.yml
+++ b/.github/workflows/files.yml
@@ -16,7 +16,6 @@ jobs:
    uses: standardnotes/server/.github/workflows/common-server-application.yml@main
    with:
      service_name: files
-      workspace_name: "@standardnotes/files-server"
      package_path: packages/files
    secrets: inherit

--- a/.github/workflows/revisions.yml
+++ b/.github/workflows/revisions.yml
@@ -16,7 +16,6 @@ jobs:
    uses: standardnotes/server/.github/workflows/common-server-application.yml@main
    with:
      service_name: revisions
-      workspace_name: "@standardnotes/revisions-server"
      package_path: packages/revisions
    secrets: inherit

--- a/.github/workflows/scheduler.yml
+++ b/.github/workflows/scheduler.yml
@@ -16,7 +16,6 @@ jobs:
    uses: standardnotes/server/.github/workflows/common-server-application.yml@main
    with:
      service_name: scheduler
-      workspace_name: "@standardnotes/scheduler-server"
      deploy_web: false
      package_path: packages/scheduler
    secrets: inherit
--- a/.github/workflows/syncing-server.yml
+++ b/.github/workflows/syncing-server.yml
@@ -16,7 +16,6 @@ jobs:
    uses: standardnotes/server/.github/workflows/common-server-application.yml@main
    with:
      service_name: syncing-server-js
-      workspace_name: "@standardnotes/syncing-server"
      package_path: packages/syncing-server
    secrets: inherit

--- a/.github/workflows/websockets.yml
+++ b/.github/workflows/websockets.yml
@@ -16,7 +16,6 @@ jobs:
    uses: standardnotes/server/.github/workflows/common-server-application.yml@main
    with:
      service_name: websockets
-      workspace_name: "@standardnotes/websockets-server"
      package_path: packages/websockets
    secrets: inherit

--- a/.pnp.cjs
+++ b/.pnp.cjs
@@ -6156,7 +6156,6 @@ const RAW_RUNTIME_STATE =
          ["@types/cors", "npm:2.8.13"],\
          ["@types/dotenv", "npm:8.2.0"],\
          ["@types/express", "npm:4.17.17"],\
-          ["@types/ioredis", "npm:5.0.0"],\
          ["@types/jest", "npm:29.5.2"],\
          ["@types/newrelic", "npm:9.14.0"],\
          ["@types/node", "npm:20.5.7"],\
@@ -6169,7 +6168,6 @@ const RAW_RUNTIME_STATE =
          ["express", "npm:4.18.2"],\
          ["inversify", "npm:6.0.1"],\
          ["inversify-express-utils", "npm:6.4.3"],\
-          ["ioredis", "npm:5.3.2"],\
          ["jest", "virtual:fd909b174d079e30b336c4ce72c38a88c1e447767b1a8dd7655e07719a1e31b97807f0931368724fc78897ff15e6a6d00b83316c0f76d11f85111f342e08bb79#npm:29.5.0"],\
          ["mongodb", "virtual:365b8c88cdf194291829ee28b79556e2328175d26a621363e703848100bea0042e9500db2a1206c9bbc3a4a76a1d169639ef774b2ea3a1a98584a9936b58c6be#npm:6.0.0"],\
          ["mysql2", "npm:3.3.3"],\
@@ -6342,7 +6340,6 @@ const RAW_RUNTIME_STATE =
          ["@types/cors", "npm:2.8.13"],\
          ["@types/dotenv", "npm:8.2.0"],\
          ["@types/express", "npm:4.17.17"],\
-          ["@types/ioredis", "npm:5.0.0"],\
          ["@types/jest", "npm:29.5.2"],\
          ["@types/jsonwebtoken", "npm:9.0.2"],\
          ["@types/newrelic", "npm:9.14.0"],\
@@ -6362,7 +6359,6 @@ const RAW_RUNTIME_STATE =
          ["helmet", "npm:7.0.0"],\
          ["inversify", "npm:6.0.1"],\
          ["inversify-express-utils", "npm:6.4.3"],\
-          ["ioredis", "npm:5.3.2"],\
          ["jest", "virtual:fd909b174d079e30b336c4ce72c38a88c1e447767b1a8dd7655e07719a1e31b97807f0931368724fc78897ff15e6a6d00b83316c0f76d11f85111f342e08bb79#npm:29.5.0"],\
          ["jsonwebtoken", "npm:9.0.0"],\
          ["mongodb", "virtual:365b8c88cdf194291829ee28b79556e2328175d26a621363e703848100bea0042e9500db2a1206c9bbc3a4a76a1d169639ef774b2ea3a1a98584a9936b58c6be#npm:6.0.0"],\
@@ -16776,7 +16772,7 @@ const RAW_RUNTIME_STATE =
          ["@types/better-sqlite3", null],\
          ["@types/google-cloud__spanner", null],\
          ["@types/hdb-pool", null],\
-          ["@types/ioredis", "npm:5.0.0"],\
+          ["@types/ioredis", null],\
          ["@types/mongodb", null],\
          ["@types/mssql", null],\
          ["@types/mysql2", null],\
@@ -16800,7 +16796,7 @@ const RAW_RUNTIME_STATE =
          ["dotenv", "npm:16.1.3"],\
          ["glob", "npm:8.1.0"],\
          ["hdb-pool", null],\
-          ["ioredis", "npm:5.3.2"],\
+          ["ioredis", null],\
          ["mkdirp", "npm:2.1.6"],\
          ["mongodb", "virtual:365b8c88cdf194291829ee28b79556e2328175d26a621363e703848100bea0042e9500db2a1206c9bbc3a4a76a1d169639ef774b2ea3a1a98584a9936b58c6be#npm:6.0.0"],\
          ["mssql", null],\
--- a/docker-compose.ci.yml
+++ b/docker-compose.ci.yml
@@ -24,6 +24,7 @@ services:
      DB_TYPE: "${DB_TYPE}"
      CACHE_TYPE: "${CACHE_TYPE}"
      SECONDARY_DB_ENABLED: "${SECONDARY_DB_ENABLED}"
+      TRANSITION_MODE_ENABLED: "${TRANSITION_MODE_ENABLED}"
    container_name: server-ci
    ports:
      - 3123:3000
--- a/docker/docker-entrypoint.sh
+++ b/docker/docker-entrypoint.sh
@@ -68,6 +68,9 @@ fi
 if [ -z "$SECONDARY_DB_ENABLED" ]; then
  export SECONDARY_DB_ENABLED=false
 fi
+if [ -z "$TRANSITION_MODE_ENABLED" ]; then
+  export TRANSITION_MODE_ENABLED=false
+fi
 export DB_MIGRATIONS_PATH="dist/migrations/*.js"

 #########
--- a/docker/localstack_bootstrap.sh
+++ b/docker/localstack_bootstrap.sh
@@ -139,11 +139,6 @@ LINKING_RESULT=$(link_queue_and_topic $AUTH_TOPIC_ARN $FILES_QUEUE_ARN)
 echo "linking done:"
 echo "$LINKING_RESULT"

-echo "linking topic $SYNCING_SERVER_TOPIC_ARN to queue $FILES_QUEUE_ARN"
-LINKING_RESULT=$(link_queue_and_topic $SYNCING_SERVER_TOPIC_ARN $FILES_QUEUE_ARN)
-echo "linking done:"
-echo "$LINKING_RESULT"
-
 QUEUE_NAME="syncing-server-local-queue"

 echo "creating queue $QUEUE_NAME"
--- a/packages/analytics/CHANGELOG.md
+++ b/packages/analytics/CHANGELOG.md
@@ -3,30 +3,6 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

-## [2.26.22](https://github.com/standardnotes/server/compare/@standardnotes/analytics@2.26.21...@standardnotes/analytics@2.26.22) (2023-09-25)
-
-**Note:** Version bump only for package @standardnotes/analytics
-
-## [2.26.21](https://github.com/standardnotes/server/compare/@standardnotes/analytics@2.26.20...@standardnotes/analytics@2.26.21) (2023-09-25)
-
-**Note:** Version bump only for package @standardnotes/analytics
-
-## [2.26.20](https://github.com/standardnotes/server/compare/@standardnotes/analytics@2.26.19...@standardnotes/analytics@2.26.20) (2023-09-21)
-
-**Note:** Version bump only for package @standardnotes/analytics
-
-## [2.26.19](https://github.com/standardnotes/server/compare/@standardnotes/analytics@2.26.18...@standardnotes/analytics@2.26.19) (2023-09-20)
-
-**Note:** Version bump only for package @standardnotes/analytics
-
-## [2.26.18](https://github.com/standardnotes/server/compare/@standardnotes/analytics@2.26.17...@standardnotes/analytics@2.26.18) (2023-09-20)
-
-**Note:** Version bump only for package @standardnotes/analytics
-
-## [2.26.17](https://github.com/standardnotes/server/compare/@standardnotes/analytics@2.26.16...@standardnotes/analytics@2.26.17) (2023-09-19)
-
-**Note:** Version bump only for package @standardnotes/analytics
-
 ## [2.26.16](https://github.com/standardnotes/server/compare/@standardnotes/analytics@2.26.15...@standardnotes/analytics@2.26.16) (2023-09-18)

 **Note:** Version bump only for package @standardnotes/analytics
--- a/packages/analytics/package.json
+++ b/packages/analytics/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@standardnotes/analytics",
-  "version": "2.26.22",
+  "version": "2.26.16",
  "engines": {
    "node": ">=18.0.0 <21.0.0"
  },
--- a/packages/api-gateway/CHANGELOG.md
+++ b/packages/api-gateway/CHANGELOG.md
@@ -3,32 +3,6 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

-## [1.75.2](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.75.1...@standardnotes/api-gateway@1.75.2) (2023-09-25)
-
-**Note:** Version bump only for package @standardnotes/api-gateway
-
-## [1.75.1](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.75.0...@standardnotes/api-gateway@1.75.1) (2023-09-25)
-
-**Note:** Version bump only for package @standardnotes/api-gateway
-
-# [1.75.0](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.74.17...@standardnotes/api-gateway@1.75.0) (2023-09-21)
-
-### Features
-
-* add designating a survivor in shared vault ([#841](https://github.com/standardnotes/api-gateway/issues/841)) ([230c96d](https://github.com/standardnotes/api-gateway/commit/230c96dcf1d8faed9ce8fe288549226da70317e6))
-
-## [1.74.17](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.74.16...@standardnotes/api-gateway@1.74.17) (2023-09-20)
-
-**Note:** Version bump only for package @standardnotes/api-gateway
-
-## [1.74.16](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.74.15...@standardnotes/api-gateway@1.74.16) (2023-09-20)
-
-**Note:** Version bump only for package @standardnotes/api-gateway
-
-## [1.74.15](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.74.14...@standardnotes/api-gateway@1.74.15) (2023-09-19)
-
-**Note:** Version bump only for package @standardnotes/api-gateway
-
 ## [1.74.14](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.74.13...@standardnotes/api-gateway@1.74.14) (2023-09-18)

 **Note:** Version bump only for package @standardnotes/api-gateway
--- a/packages/api-gateway/package.json
+++ b/packages/api-gateway/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@standardnotes/api-gateway",
-  "version": "1.75.2",
+  "version": "1.74.14",
  "engines": {
    "node": ">=18.0.0 <21.0.0"
  },
--- a/packages/api-gateway/src/Controller/v1/SharedVaultUsersController.ts
+++ b/packages/api-gateway/src/Controller/v1/SharedVaultUsersController.ts
@@ -1,6 +1,6 @@
 import { Request, Response } from 'express'
 import { inject } from 'inversify'
-import { BaseHttpController, controller, httpDelete, httpGet, httpPost } from 'inversify-express-utils'
+import { BaseHttpController, controller, httpDelete, httpGet } from 'inversify-express-utils'
 import { TYPES } from '../../Bootstrap/Types'
 import { ServiceProxyInterface } from '../../Service/Http/ServiceProxyInterface'
 import { EndpointResolverInterface } from '../../Service/Resolver/EndpointResolverInterface'
@@ -42,19 +42,4 @@ export class SharedVaultUsersController extends BaseHttpController {
      request.body,
    )
  }
-
-  @httpPost('/:userUuid/designate-survivor')
-  async designateSurvivor(request: Request, response: Response): Promise<void> {
-    await this.httpService.callSyncingServer(
-      request,
-      response,
-      this.endpointResolver.resolveEndpointOrMethodIdentifier(
-        'POST',
-        'shared-vaults/:sharedVaultUuid/users/:userUuid/designate-survivor',
-        request.params.sharedVaultUuid,
-        request.params.userUuid,
-      ),
-      request.body,
-    )
-  }
 }
--- a/packages/api-gateway/src/Service/Resolver/EndpointResolver.ts
+++ b/packages/api-gateway/src/Service/Resolver/EndpointResolver.ts
@@ -89,10 +89,6 @@ export class EndpointResolver implements EndpointResolverInterface {
    // Shared Vault Users Controller
    ['[GET]:shared-vaults/:sharedVaultUuid/users', 'sync.shared-vault-users.get-users'],
    ['[DELETE]:shared-vaults/:sharedVaultUuid/users/:userUuid', 'sync.shared-vault-users.remove-user'],
-    [
-      '[POST]:shared-vaults/:sharedVaultUuid/users/:userUuid/designate-survivor',
-      'sync.shared-vault-users.designate-survivor',
-    ],
  ])

  resolveEndpointOrMethodIdentifier(method: string, endpoint: string, ...params: string[]): string {
--- a/packages/auth/CHANGELOG.md
+++ b/packages/auth/CHANGELOG.md
@@ -3,60 +3,6 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

-## [1.146.2](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.146.1...@standardnotes/auth-server@1.146.2) (2023-09-25)
-
-**Note:** Version bump only for package @standardnotes/auth-server
-
-## [1.146.1](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.146.0...@standardnotes/auth-server@1.146.1) (2023-09-25)
-
-**Note:** Version bump only for package @standardnotes/auth-server
-
-# [1.146.0](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.145.0...@standardnotes/auth-server@1.146.0) (2023-09-22)
-
-### Bug Fixes
-
-* **auth:** register specs ([f9b1f40](https://github.com/standardnotes/server/commit/f9b1f40ddf2d733d106ea64b9a7c4b38c5ec43ce))
-
-### Features
-
-* remove transition mode from code ([5001496](https://github.com/standardnotes/server/commit/5001496c7bc1df9e20c2d88ebf52ed77f868110c))
-
-# [1.145.0](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.144.0...@standardnotes/auth-server@1.145.0) (2023-09-22)
-
-### Features
-
-* remove user from all shared vaults upon account deletion ([#843](https://github.com/standardnotes/server/issues/843)) ([dc77ff3](https://github.com/standardnotes/server/commit/dc77ff3e45983d231bc9c132802428e77b4be431))
-
-# [1.144.0](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.143.9...@standardnotes/auth-server@1.144.0) (2023-09-21)
-
-### Features
-
-* add designating a survivor in shared vault ([#841](https://github.com/standardnotes/server/issues/841)) ([230c96d](https://github.com/standardnotes/server/commit/230c96dcf1d8faed9ce8fe288549226da70317e6))
-
-## [1.143.9](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.143.8...@standardnotes/auth-server@1.143.9) (2023-09-20)
-
-**Note:** Version bump only for package @standardnotes/auth-server
-
-## [1.143.8](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.143.7...@standardnotes/auth-server@1.143.8) (2023-09-20)
-
-**Note:** Version bump only for package @standardnotes/auth-server
-
-## [1.143.7](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.143.6...@standardnotes/auth-server@1.143.7) (2023-09-19)
-
-**Note:** Version bump only for package @standardnotes/auth-server
-
-## [1.143.6](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.143.4...@standardnotes/auth-server@1.143.6) (2023-09-19)
-
-### Bug Fixes
-
-* **auth:** bump version ([b91cd7e](https://github.com/standardnotes/server/commit/b91cd7e2329d68026665f61d9bd17ba918c57563))
-
-## [1.143.4](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.143.3...@standardnotes/auth-server@1.143.4) (2023-09-19)
-
-### Bug Fixes
-
-* **auth:** add debug logs to transition ([bf855bb](https://github.com/standardnotes/server/commit/bf855bb26e8a3618113bd2f5801c260782566815))
-
 ## [1.143.3](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.143.2...@standardnotes/auth-server@1.143.3) (2023-09-18)

 **Note:** Version bump only for package @standardnotes/auth-server
--- a/packages/auth/bin/transition.ts
+++ b/packages/auth/bin/transition.ts
@@ -53,10 +53,7 @@ const requestTransition = async (
      continue
    }

-    let wasTransitionRequested = false
-
    if (itemsTransitionStatus?.value !== TransitionStatus.STATUSES.Verified) {
-      wasTransitionRequested = true
      await transitionStatusRepository.remove(user.uuid, 'items')

      await domainEventPublisher.publish(
@@ -69,7 +66,6 @@ const requestTransition = async (
    }

    if (revisionsTransitionStatus?.value !== TransitionStatus.STATUSES.Verified) {
-      wasTransitionRequested = true
      await transitionStatusRepository.remove(user.uuid, 'revisions')

      await domainEventPublisher.publish(
@@ -82,12 +78,6 @@ const requestTransition = async (
    }

    usersTriggered += 1
-
-    if (wasTransitionRequested) {
-      logger.info(
-        `[TRANSITION ${timestamp}] Transition requested for user ${user.uuid} - items status: ${itemsTransitionStatus?.value}, revisions status: ${revisionsTransitionStatus?.value}, has transition role: ${userHasTransitionRole}`,
-      )
-    }
  }

  logger.info(
--- a/packages/auth/database.sqlite
+++ b/packages/auth/database.sqlite
--- a/packages/auth/migrations/mysql/1695283870612-add-designated-survivor.ts
+++ b/packages/auth/migrations/mysql/1695283870612-add-designated-survivor.ts
@@ -1,15 +0,0 @@
-import { MigrationInterface, QueryRunner } from 'typeorm'
-
-export class AddDesignatedSurvivor1695283870612 implements MigrationInterface {
-  name = 'AddDesignatedSurvivor1695283870612'
-
-  public async up(queryRunner: QueryRunner): Promise<void> {
-    await queryRunner.query(
-      'ALTER TABLE `auth_shared_vault_users` ADD `is_designated_survivor` tinyint NOT NULL DEFAULT 0',
-    )
-  }
-
-  public async down(queryRunner: QueryRunner): Promise<void> {
-    await queryRunner.query('ALTER TABLE `auth_shared_vault_users` DROP COLUMN `is_designated_survivor`')
-  }
-}
--- a/packages/auth/migrations/sqlite/1695283961201-add-designated-survivor.ts
+++ b/packages/auth/migrations/sqlite/1695283961201-add-designated-survivor.ts
@@ -1,43 +0,0 @@
-import { MigrationInterface, QueryRunner } from 'typeorm'
-
-export class AddDesignatedSurvivor1695283961201 implements MigrationInterface {
-  name = 'AddDesignatedSurvivor1695283961201'
-
-  public async up(queryRunner: QueryRunner): Promise<void> {
-    await queryRunner.query('DROP INDEX "user_uuid_on_auth_shared_vault_users"')
-    await queryRunner.query('DROP INDEX "shared_vault_uuid_on_auth_shared_vault_users"')
-    await queryRunner.query(
-      'CREATE TABLE "temporary_auth_shared_vault_users" ("uuid" varchar PRIMARY KEY NOT NULL, "shared_vault_uuid" varchar(36) NOT NULL, "user_uuid" varchar(36) NOT NULL, "permission" varchar(24) NOT NULL, "created_at_timestamp" bigint NOT NULL, "updated_at_timestamp" bigint NOT NULL, "is_designated_survivor" boolean NOT NULL DEFAULT (0))',
-    )
-    await queryRunner.query(
-      'INSERT INTO "temporary_auth_shared_vault_users"("uuid", "shared_vault_uuid", "user_uuid", "permission", "created_at_timestamp", "updated_at_timestamp") SELECT "uuid", "shared_vault_uuid", "user_uuid", "permission", "created_at_timestamp", "updated_at_timestamp" FROM "auth_shared_vault_users"',
-    )
-    await queryRunner.query('DROP TABLE "auth_shared_vault_users"')
-    await queryRunner.query('ALTER TABLE "temporary_auth_shared_vault_users" RENAME TO "auth_shared_vault_users"')
-    await queryRunner.query(
-      'CREATE INDEX "user_uuid_on_auth_shared_vault_users" ON "auth_shared_vault_users" ("user_uuid") ',
-    )
-    await queryRunner.query(
-      'CREATE INDEX "shared_vault_uuid_on_auth_shared_vault_users" ON "auth_shared_vault_users" ("shared_vault_uuid") ',
-    )
-  }
-
-  public async down(queryRunner: QueryRunner): Promise<void> {
-    await queryRunner.query('DROP INDEX "shared_vault_uuid_on_auth_shared_vault_users"')
-    await queryRunner.query('DROP INDEX "user_uuid_on_auth_shared_vault_users"')
-    await queryRunner.query('ALTER TABLE "auth_shared_vault_users" RENAME TO "temporary_auth_shared_vault_users"')
-    await queryRunner.query(
-      'CREATE TABLE "auth_shared_vault_users" ("uuid" varchar PRIMARY KEY NOT NULL, "shared_vault_uuid" varchar(36) NOT NULL, "user_uuid" varchar(36) NOT NULL, "permission" varchar(24) NOT NULL, "created_at_timestamp" bigint NOT NULL, "updated_at_timestamp" bigint NOT NULL)',
-    )
-    await queryRunner.query(
-      'INSERT INTO "auth_shared_vault_users"("uuid", "shared_vault_uuid", "user_uuid", "permission", "created_at_timestamp", "updated_at_timestamp") SELECT "uuid", "shared_vault_uuid", "user_uuid", "permission", "created_at_timestamp", "updated_at_timestamp" FROM "temporary_auth_shared_vault_users"',
-    )
-    await queryRunner.query('DROP TABLE "temporary_auth_shared_vault_users"')
-    await queryRunner.query(
-      'CREATE INDEX "shared_vault_uuid_on_auth_shared_vault_users" ON "auth_shared_vault_users" ("shared_vault_uuid") ',
-    )
-    await queryRunner.query(
-      'CREATE INDEX "user_uuid_on_auth_shared_vault_users" ON "auth_shared_vault_users" ("user_uuid") ',
-    )
-  }
-}
--- a/packages/auth/package.json
+++ b/packages/auth/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@standardnotes/auth-server",
-  "version": "1.146.2",
+  "version": "1.143.3",
  "engines": {
    "node": ">=18.0.0 <21.0.0"
  },
--- a/packages/auth/src/Bootstrap/Container.ts
+++ b/packages/auth/src/Bootstrap/Container.ts
@@ -271,8 +271,6 @@ import { AddSharedVaultUser } from '../Domain/UseCase/AddSharedVaultUser/AddShar
 import { RemoveSharedVaultUser } from '../Domain/UseCase/RemoveSharedVaultUser/RemoveSharedVaultUser'
 import { UserAddedToSharedVaultEventHandler } from '../Domain/Handler/UserAddedToSharedVaultEventHandler'
 import { UserRemovedFromSharedVaultEventHandler } from '../Domain/Handler/UserRemovedFromSharedVaultEventHandler'
-import { DesignateSurvivor } from '../Domain/UseCase/DesignateSurvivor/DesignateSurvivor'
-import { UserDesignatedAsSurvivorInSharedVaultEventHandler } from '../Domain/Handler/UserDesignatedAsSurvivorInSharedVaultEventHandler'

 export class ContainerConfigLoader {
  constructor(private mode: 'server' | 'worker' = 'server') {}
@@ -595,6 +593,9 @@ export class ContainerConfigLoader {
    container
      .bind(TYPES.Auth_READONLY_USERS)
      .toConstantValue(env.get('READONLY_USERS', true) ? env.get('READONLY_USERS', true).split(',') : [])
+    container
+      .bind(TYPES.Auth_TRANSITION_MODE_ENABLED)
+      .toConstantValue(env.get('TRANSITION_MODE_ENABLED', true) === 'true')

    if (isConfiguredForInMemoryCache) {
      container
@@ -956,14 +957,6 @@ export class ContainerConfigLoader {
          container.get<SharedVaultUserRepositoryInterface>(TYPES.Auth_SharedVaultUserRepository),
        ),
      )
-    container
-      .bind<DesignateSurvivor>(TYPES.Auth_DesignateSurvivor)
-      .toConstantValue(
-        new DesignateSurvivor(
-          container.get<SharedVaultUserRepositoryInterface>(TYPES.Auth_SharedVaultUserRepository),
-          container.get<TimerInterface>(TYPES.Auth_Timer),
-        ),
-      )

    // Controller
    container
@@ -1005,16 +998,7 @@ export class ContainerConfigLoader {
    container.bind<UserRegisteredEventHandler>(TYPES.Auth_UserRegisteredEventHandler).to(UserRegisteredEventHandler)
    container
      .bind<AccountDeletionRequestedEventHandler>(TYPES.Auth_AccountDeletionRequestedEventHandler)
-      .toConstantValue(
-        new AccountDeletionRequestedEventHandler(
-          container.get<UserRepositoryInterface>(TYPES.Auth_UserRepository),
-          container.get<SessionRepositoryInterface>(TYPES.Auth_SessionRepository),
-          container.get<EphemeralSessionRepositoryInterface>(TYPES.Auth_EphemeralSessionRepository),
-          container.get<RevokedSessionRepositoryInterface>(TYPES.Auth_RevokedSessionRepository),
-          container.get<RemoveSharedVaultUser>(TYPES.Auth_RemoveSharedVaultUser),
-          container.get<winston.Logger>(TYPES.Auth_Logger),
-        ),
-      )
+      .to(AccountDeletionRequestedEventHandler)
    container
      .bind<SubscriptionPurchasedEventHandler>(TYPES.Auth_SubscriptionPurchasedEventHandler)
      .to(SubscriptionPurchasedEventHandler)
@@ -1138,16 +1122,6 @@ export class ContainerConfigLoader {
          container.get<winston.Logger>(TYPES.Auth_Logger),
        ),
      )
-    container
-      .bind<UserDesignatedAsSurvivorInSharedVaultEventHandler>(
-        TYPES.Auth_UserDesignatedAsSurvivorInSharedVaultEventHandler,
-      )
-      .toConstantValue(
-        new UserDesignatedAsSurvivorInSharedVaultEventHandler(
-          container.get<DesignateSurvivor>(TYPES.Auth_DesignateSurvivor),
-          container.get<winston.Logger>(TYPES.Auth_Logger),
-        ),
-      )

    const eventHandlers: Map<string, DomainEventHandlerInterface> = new Map([
      ['USER_REGISTERED', container.get(TYPES.Auth_UserRegisteredEventHandler)],
@@ -1182,10 +1156,6 @@ export class ContainerConfigLoader {
      ['TRANSITION_STATUS_UPDATED', container.get(TYPES.Auth_TransitionStatusUpdatedEventHandler)],
      ['USER_ADDED_TO_SHARED_VAULT', container.get(TYPES.Auth_UserAddedToSharedVaultEventHandler)],
      ['USER_REMOVED_FROM_SHARED_VAULT', container.get(TYPES.Auth_UserRemovedFromSharedVaultEventHandler)],
-      [
-        'USER_DESIGNATED_AS_SURVIVOR_IN_SHARED_VAULT',
-        container.get(TYPES.Auth_UserDesignatedAsSurvivorInSharedVaultEventHandler),
-      ],
    ])

    if (isConfiguredForHomeServer) {
--- a/packages/auth/src/Bootstrap/Types.ts
+++ b/packages/auth/src/Bootstrap/Types.ts
@@ -105,6 +105,7 @@ const TYPES = {
  Auth_U2F_EXPECTED_ORIGIN: Symbol.for('Auth_U2F_EXPECTED_ORIGIN'),
  Auth_U2F_REQUIRE_USER_VERIFICATION: Symbol.for('Auth_U2F_REQUIRE_USER_VERIFICATION'),
  Auth_READONLY_USERS: Symbol.for('Auth_READONLY_USERS'),
+  Auth_TRANSITION_MODE_ENABLED: Symbol.for('Auth_TRANSITION_MODE_ENABLED'),
  // use cases
  Auth_AuthenticateUser: Symbol.for('Auth_AuthenticateUser'),
  Auth_AuthenticateRequest: Symbol.for('Auth_AuthenticateRequest'),
@@ -160,7 +161,6 @@ const TYPES = {
  Auth_UpdateTransitionStatus: Symbol.for('Auth_UpdateTransitionStatus'),
  Auth_AddSharedVaultUser: Symbol.for('Auth_AddSharedVaultUser'),
  Auth_RemoveSharedVaultUser: Symbol.for('Auth_RemoveSharedVaultUser'),
-  Auth_DesignateSurvivor: Symbol.for('Auth_DesignateSurvivor'),
  // Handlers
  Auth_UserRegisteredEventHandler: Symbol.for('Auth_UserRegisteredEventHandler'),
  Auth_AccountDeletionRequestedEventHandler: Symbol.for('Auth_AccountDeletionRequestedEventHandler'),
@@ -192,9 +192,6 @@ const TYPES = {
  Auth_TransitionStatusUpdatedEventHandler: Symbol.for('Auth_TransitionStatusUpdatedEventHandler'),
  Auth_UserAddedToSharedVaultEventHandler: Symbol.for('Auth_UserAddedToSharedVaultEventHandler'),
  Auth_UserRemovedFromSharedVaultEventHandler: Symbol.for('Auth_UserRemovedFromSharedVaultEventHandler'),
-  Auth_UserDesignatedAsSurvivorInSharedVaultEventHandler: Symbol.for(
-    'Auth_UserDesignatedAsSurvivorInSharedVaultEventHandler',
-  ),
  // Services
  Auth_DeviceDetector: Symbol.for('Auth_DeviceDetector'),
  Auth_SessionService: Symbol.for('Auth_SessionService'),
--- a/packages/auth/src/Domain/Handler/AccountDeletionRequestedEventHandler.spec.ts
+++ b/packages/auth/src/Domain/Handler/AccountDeletionRequestedEventHandler.spec.ts
@@ -0,0 +1,114 @@
+import 'reflect-metadata'
+
+import { AccountDeletionRequestedEvent } from '@standardnotes/domain-events'
+import { Logger } from 'winston'
+import { EphemeralSession } from '../Session/EphemeralSession'
+import { EphemeralSessionRepositoryInterface } from '../Session/EphemeralSessionRepositoryInterface'
+import { RevokedSession } from '../Session/RevokedSession'
+import { RevokedSessionRepositoryInterface } from '../Session/RevokedSessionRepositoryInterface'
+import { Session } from '../Session/Session'
+import { SessionRepositoryInterface } from '../Session/SessionRepositoryInterface'
+import { User } from '../User/User'
+import { UserRepositoryInterface } from '../User/UserRepositoryInterface'
+import { AccountDeletionRequestedEventHandler } from './AccountDeletionRequestedEventHandler'
+
+describe('AccountDeletionRequestedEventHandler', () => {
+  let userRepository: UserRepositoryInterface
+  let sessionRepository: SessionRepositoryInterface
+  let ephemeralSessionRepository: EphemeralSessionRepositoryInterface
+  let revokedSessionRepository: RevokedSessionRepositoryInterface
+  let logger: Logger
+  let session: Session
+  let ephemeralSession: EphemeralSession
+  let revokedSession: RevokedSession
+  let user: User
+  let event: AccountDeletionRequestedEvent
+
+  const createHandler = () =>
+    new AccountDeletionRequestedEventHandler(
+      userRepository,
+      sessionRepository,
+      ephemeralSessionRepository,
+      revokedSessionRepository,
+      logger,
+    )
+
+  beforeEach(() => {
+    user = {} as jest.Mocked<User>
+
+    userRepository = {} as jest.Mocked<UserRepositoryInterface>
+    userRepository.findOneByUuid = jest.fn().mockReturnValue(user)
+    userRepository.remove = jest.fn()
+
+    session = {
+      uuid: '1-2-3',
+    } as jest.Mocked<Session>
+
+    sessionRepository = {} as jest.Mocked<SessionRepositoryInterface>
+    sessionRepository.findAllByUserUuid = jest.fn().mockReturnValue([session])
+    sessionRepository.remove = jest.fn()
+
+    ephemeralSession = {
+      uuid: '2-3-4',
+      userUuid: '00000000-0000-0000-0000-000000000000',
+    } as jest.Mocked<EphemeralSession>
+
+    ephemeralSessionRepository = {} as jest.Mocked<EphemeralSessionRepositoryInterface>
+    ephemeralSessionRepository.findAllByUserUuid = jest.fn().mockReturnValue([ephemeralSession])
+    ephemeralSessionRepository.deleteOne = jest.fn()
+
+    revokedSession = {
+      uuid: '3-4-5',
+    } as jest.Mocked<RevokedSession>
+
+    revokedSessionRepository = {} as jest.Mocked<RevokedSessionRepositoryInterface>
+    revokedSessionRepository.findAllByUserUuid = jest.fn().mockReturnValue([revokedSession])
+    revokedSessionRepository.remove = jest.fn()
+
+    event = {} as jest.Mocked<AccountDeletionRequestedEvent>
+    event.createdAt = new Date(1)
+    event.payload = {
+      userUuid: '00000000-0000-0000-0000-000000000000',
+      userCreatedAtTimestamp: 1,
+      regularSubscriptionUuid: '2-3-4',
+      roleNames: ['CORE_USER'],
+    }
+
+    logger = {} as jest.Mocked<Logger>
+    logger.info = jest.fn()
+    logger.warn = jest.fn()
+  })
+
+  it('should remove a user', async () => {
+    await createHandler().handle(event)
+
+    expect(userRepository.remove).toHaveBeenCalledWith(user)
+  })
+
+  it('should not remove a user with invalid uuid', async () => {
+    event.payload.userUuid = 'invalid'
+
+    await createHandler().handle(event)
+
+    expect(userRepository.remove).not.toHaveBeenCalled()
+  })
+
+  it('should not remove a user if one does not exist', async () => {
+    userRepository.findOneByUuid = jest.fn().mockReturnValue(null)
+
+    await createHandler().handle(event)
+
+    expect(userRepository.remove).not.toHaveBeenCalled()
+    expect(sessionRepository.remove).not.toHaveBeenCalled()
+    expect(revokedSessionRepository.remove).not.toHaveBeenCalled()
+    expect(ephemeralSessionRepository.deleteOne).not.toHaveBeenCalled()
+  })
+
+  it('should remove all user sessions', async () => {
+    await createHandler().handle(event)
+
+    expect(sessionRepository.remove).toHaveBeenCalledWith(session)
+    expect(revokedSessionRepository.remove).toHaveBeenCalledWith(revokedSession)
+    expect(ephemeralSessionRepository.deleteOne).toHaveBeenCalledWith('2-3-4', '00000000-0000-0000-0000-000000000000')
+  })
+})
--- a/packages/auth/src/Domain/Handler/AccountDeletionRequestedEventHandler.ts
+++ b/packages/auth/src/Domain/Handler/AccountDeletionRequestedEventHandler.ts
@@ -1,21 +1,22 @@
 import { AccountDeletionRequestedEvent, DomainEventHandlerInterface } from '@standardnotes/domain-events'
-import { Uuid } from '@standardnotes/domain-core'
+import { inject, injectable } from 'inversify'
 import { Logger } from 'winston'
-
+import TYPES from '../../Bootstrap/Types'
 import { EphemeralSessionRepositoryInterface } from '../Session/EphemeralSessionRepositoryInterface'
 import { RevokedSessionRepositoryInterface } from '../Session/RevokedSessionRepositoryInterface'
 import { SessionRepositoryInterface } from '../Session/SessionRepositoryInterface'
 import { UserRepositoryInterface } from '../User/UserRepositoryInterface'
-import { RemoveSharedVaultUser } from '../UseCase/RemoveSharedVaultUser/RemoveSharedVaultUser'
+import { Uuid } from '@standardnotes/domain-core'

+@injectable()
 export class AccountDeletionRequestedEventHandler implements DomainEventHandlerInterface {
  constructor(
-    private userRepository: UserRepositoryInterface,
-    private sessionRepository: SessionRepositoryInterface,
+    @inject(TYPES.Auth_UserRepository) private userRepository: UserRepositoryInterface,
+    @inject(TYPES.Auth_SessionRepository) private sessionRepository: SessionRepositoryInterface,
+    @inject(TYPES.Auth_EphemeralSessionRepository)
    private ephemeralSessionRepository: EphemeralSessionRepositoryInterface,
-    private revokedSessionRepository: RevokedSessionRepositoryInterface,
-    private removeSharedVaultUser: RemoveSharedVaultUser,
-    private logger: Logger,
+    @inject(TYPES.Auth_RevokedSessionRepository) private revokedSessionRepository: RevokedSessionRepositoryInterface,
+    @inject(TYPES.Auth_Logger) private logger: Logger,
  ) {}

  async handle(event: AccountDeletionRequestedEvent): Promise<void> {
@@ -37,13 +38,6 @@ export class AccountDeletionRequestedEventHandler implements DomainEventHandlerI

    await this.removeSessions(userUuid.value)

-    const result = await this.removeSharedVaultUser.execute({
-      userUuid: userUuid.value,
-    })
-    if (result.isFailed()) {
-      this.logger.error(`Could not remove shared vault user: ${result.getError()}`)
-    }
-
    await this.userRepository.remove(user)

    this.logger.info(`Finished account cleanup for user: ${userUuid.value}`)
--- a/packages/auth/src/Domain/Handler/UserDesignatedAsSurvivorInSharedVaultEventHandler.ts
+++ b/packages/auth/src/Domain/Handler/UserDesignatedAsSurvivorInSharedVaultEventHandler.ts
@@ -1,26 +0,0 @@
-import { DomainEventHandlerInterface, UserDesignatedAsSurvivorInSharedVaultEvent } from '@standardnotes/domain-events'
-import { Logger } from 'winston'
-import { DesignateSurvivor } from '../UseCase/DesignateSurvivor/DesignateSurvivor'
-
-export class UserDesignatedAsSurvivorInSharedVaultEventHandler implements DomainEventHandlerInterface {
-  constructor(
-    private designateSurvivorUseCase: DesignateSurvivor,
-    private logger: Logger,
-  ) {}
-
-  async handle(event: UserDesignatedAsSurvivorInSharedVaultEvent): Promise<void> {
-    const result = await this.designateSurvivorUseCase.execute({
-      sharedVaultUuid: event.payload.sharedVaultUuid,
-      userUuid: event.payload.userUuid,
-      timestamp: event.payload.timestamp,
-    })
-
-    if (result.isFailed()) {
-      this.logger.error(
-        `Failed designate survivor for user ${event.payload.userUuid} and shared vault ${
-          event.payload.sharedVaultUuid
-        }: ${result.getError()}`,
-      )
-    }
-  }
-}
--- a/packages/auth/src/Domain/Handler/UserRemovedFromSharedVaultEventHandler.ts
+++ b/packages/auth/src/Domain/Handler/UserRemovedFromSharedVaultEventHandler.ts
@@ -10,12 +10,6 @@ export class UserRemovedFromSharedVaultEventHandler implements DomainEventHandle
  ) {}

  async handle(event: UserRemovedFromSharedVaultEvent): Promise<void> {
-    if (!event.payload.sharedVaultUuid) {
-      this.logger.error(`Shared vault uuid is missing from event: ${JSON.stringify(event)}`)
-
-      return
-    }
-
    const result = await this.removeSharedVaultUser.execute({
      userUuid: event.payload.userUuid,
      sharedVaultUuid: event.payload.sharedVaultUuid,
--- a/packages/auth/src/Domain/SharedVault/SharedVaultUserRepositoryInterface.ts
+++ b/packages/auth/src/Domain/SharedVault/SharedVaultUserRepositoryInterface.ts
@@ -3,7 +3,6 @@ import { SharedVaultUser, Uuid } from '@standardnotes/domain-core'
 export interface SharedVaultUserRepositoryInterface {
  findByUserUuidAndSharedVaultUuid(dto: { userUuid: Uuid; sharedVaultUuid: Uuid }): Promise<SharedVaultUser | null>
  findByUserUuid(userUuid: Uuid): Promise<SharedVaultUser[]>
-  findDesignatedSurvivorBySharedVaultUuid(sharedVaultUuid: Uuid): Promise<SharedVaultUser | null>
  save(sharedVaultUser: SharedVaultUser): Promise<void>
  remove(sharedVault: SharedVaultUser): Promise<void>
 }
--- a/packages/auth/src/Domain/UseCase/AddSharedVaultUser/AddSharedVaultUser.ts
+++ b/packages/auth/src/Domain/UseCase/AddSharedVaultUser/AddSharedVaultUser.ts
@@ -43,7 +43,6 @@ export class AddSharedVaultUser implements UseCaseInterface<void> {
      sharedVaultUuid,
      permission,
      timestamps,
-      isDesignatedSurvivor: false,
    })
    if (sharedVaultUserOrError.isFailed()) {
      return Result.fail(sharedVaultUserOrError.getError())
--- a/packages/auth/src/Domain/UseCase/CreateCrossServiceToken/CreateCrossServiceToken.spec.ts
+++ b/packages/auth/src/Domain/UseCase/CreateCrossServiceToken/CreateCrossServiceToken.spec.ts
@@ -90,7 +90,6 @@ describe('CreateCrossServiceToken', () => {
        sharedVaultUuid: Uuid.create('00000000-0000-0000-0000-000000000000').getValue(),
        timestamps: Timestamps.create(123456789, 123456789).getValue(),
        userUuid: Uuid.create('00000000-0000-0000-0000-000000000000').getValue(),
-        isDesignatedSurvivor: false,
      }).getValue(),
    ])
  })
--- a/packages/auth/src/Domain/UseCase/DesignateSurvivor/DesignateSurvivor.spec.ts
+++ b/packages/auth/src/Domain/UseCase/DesignateSurvivor/DesignateSurvivor.spec.ts
@@ -1,156 +0,0 @@
-import { SharedVaultUser, SharedVaultUserPermission, Timestamps, Uuid } from '@standardnotes/domain-core'
-
-import { DesignateSurvivor } from './DesignateSurvivor'
-import { TimerInterface } from '@standardnotes/time'
-import { SharedVaultUserRepositoryInterface } from '../../SharedVault/SharedVaultUserRepositoryInterface'
-
-describe('DesignateSurvivor', () => {
-  let sharedVaultUserRepository: SharedVaultUserRepositoryInterface
-  let sharedVaultUser: SharedVaultUser
-  let timer: TimerInterface
-
-  const createUseCase = () => new DesignateSurvivor(sharedVaultUserRepository, timer)
-
-  beforeEach(() => {
-    timer = {} as jest.Mocked<TimerInterface>
-    timer.getTimestampInMicroseconds = jest.fn().mockReturnValue(123)
-
-    sharedVaultUser = SharedVaultUser.create({
-      permission: SharedVaultUserPermission.create(SharedVaultUserPermission.PERMISSIONS.Write).getValue(),
-      sharedVaultUuid: Uuid.create('00000000-0000-0000-0000-000000000000').getValue(),
-      userUuid: Uuid.create('00000000-0000-0000-0000-000000000000').getValue(),
-      timestamps: Timestamps.create(123, 123).getValue(),
-      isDesignatedSurvivor: false,
-    }).getValue()
-
-    sharedVaultUserRepository = {} as jest.Mocked<SharedVaultUserRepositoryInterface>
-    sharedVaultUserRepository.findDesignatedSurvivorBySharedVaultUuid = jest.fn().mockReturnValue(null)
-    sharedVaultUserRepository.findByUserUuidAndSharedVaultUuid = jest.fn().mockReturnValue(sharedVaultUser)
-    sharedVaultUserRepository.save = jest.fn()
-  })
-
-  it('should fail if shared vault uuid is invalid', async () => {
-    const useCase = createUseCase()
-
-    const result = await useCase.execute({
-      sharedVaultUuid: 'invalid',
-      userUuid: '00000000-0000-0000-0000-000000000000',
-      timestamp: 123,
-    })
-
-    expect(result.isFailed()).toBe(true)
-  })
-
-  it('should fail if user uuid is invalid', async () => {
-    const useCase = createUseCase()
-
-    const result = await useCase.execute({
-      sharedVaultUuid: '00000000-0000-0000-0000-000000000000',
-      userUuid: 'invalid',
-      timestamp: 123,
-    })
-
-    expect(result.isFailed()).toBe(true)
-  })
-
-  it('should fail if shared vault user is not found', async () => {
-    sharedVaultUserRepository.findByUserUuidAndSharedVaultUuid = jest.fn().mockReturnValue(null)
-
-    const useCase = createUseCase()
-
-    const result = await useCase.execute({
-      sharedVaultUuid: '00000000-0000-0000-0000-000000000000',
-      userUuid: '00000000-0000-0000-0000-000000000000',
-      timestamp: 123,
-    })
-
-    expect(result.isFailed()).toBe(true)
-  })
-
-  it('should designate a survivor if the user is a member', async () => {
-    sharedVaultUserRepository.findByUserUuidAndSharedVaultUuid = jest.fn().mockReturnValue(sharedVaultUser)
-
-    const useCase = createUseCase()
-
-    const result = await useCase.execute({
-      sharedVaultUuid: '00000000-0000-0000-0000-000000000000',
-      userUuid: '00000000-0000-0000-0000-000000000000',
-      timestamp: 123,
-    })
-
-    expect(result.isFailed()).toBe(false)
-    expect(sharedVaultUser.props.isDesignatedSurvivor).toBe(true)
-    expect(sharedVaultUserRepository.save).toBeCalledTimes(1)
-  })
-
-  it('should designate a survivor if the user is a member and there is already a survivor', async () => {
-    sharedVaultUserRepository.findDesignatedSurvivorBySharedVaultUuid = jest.fn().mockReturnValue(
-      SharedVaultUser.create({
-        permission: SharedVaultUserPermission.create(SharedVaultUserPermission.PERMISSIONS.Write).getValue(),
-        sharedVaultUuid: Uuid.create('00000000-0000-0000-0000-000000000000').getValue(),
-        userUuid: Uuid.create('00000000-0000-0000-0000-000000000001').getValue(),
-        timestamps: Timestamps.create(123, 123).getValue(),
-        isDesignatedSurvivor: true,
-      }).getValue(),
-    )
-    sharedVaultUserRepository.findByUserUuidAndSharedVaultUuid = jest.fn().mockReturnValue(sharedVaultUser)
-
-    const useCase = createUseCase()
-
-    const result = await useCase.execute({
-      sharedVaultUuid: '00000000-0000-0000-0000-000000000000',
-      userUuid: '00000000-0000-0000-0000-000000000000',
-      timestamp: 123,
-    })
-
-    expect(result.isFailed()).toBe(false)
-    expect(sharedVaultUser.props.isDesignatedSurvivor).toBe(true)
-    expect(sharedVaultUserRepository.save).toBeCalledTimes(2)
-  })
-
-  it('should fail if the timestamp is older than the existing survivor', async () => {
-    sharedVaultUserRepository.findDesignatedSurvivorBySharedVaultUuid = jest.fn().mockReturnValue(
-      SharedVaultUser.create({
-        permission: SharedVaultUserPermission.create(SharedVaultUserPermission.PERMISSIONS.Write).getValue(),
-        sharedVaultUuid: Uuid.create('00000000-0000-0000-0000-000000000000').getValue(),
-        userUuid: Uuid.create('00000000-0000-0000-0000-000000000001').getValue(),
-        timestamps: Timestamps.create(123, 123).getValue(),
-        isDesignatedSurvivor: true,
-      }).getValue(),
-    )
-    sharedVaultUserRepository.findByUserUuidAndSharedVaultUuid = jest.fn().mockReturnValue(sharedVaultUser)
-
-    const useCase = createUseCase()
-
-    const result = await useCase.execute({
-      sharedVaultUuid: '00000000-0000-0000-0000-000000000000',
-      userUuid: '00000000-0000-0000-0000-000000000000',
-      timestamp: 122,
-    })
-
-    expect(result.isFailed()).toBe(true)
-  })
-
-  it('should do nothing if the user is already a survivor', async () => {
-    sharedVaultUserRepository.findDesignatedSurvivorBySharedVaultUuid = jest.fn().mockReturnValue(
-      SharedVaultUser.create({
-        permission: SharedVaultUserPermission.create(SharedVaultUserPermission.PERMISSIONS.Write).getValue(),
-        sharedVaultUuid: Uuid.create('00000000-0000-0000-0000-000000000000').getValue(),
-        userUuid: Uuid.create('00000000-0000-0000-0000-000000000000').getValue(),
-        timestamps: Timestamps.create(123, 123).getValue(),
-        isDesignatedSurvivor: true,
-      }).getValue(),
-    )
-    sharedVaultUserRepository.findByUserUuidAndSharedVaultUuid = jest.fn().mockReturnValue(sharedVaultUser)
-
-    const useCase = createUseCase()
-
-    const result = await useCase.execute({
-      sharedVaultUuid: '00000000-0000-0000-0000-000000000000',
-      userUuid: '00000000-0000-0000-0000-000000000000',
-      timestamp: 200,
-    })
-
-    expect(result.isFailed()).toBe(false)
-  })
-})
--- a/packages/auth/src/Domain/UseCase/DesignateSurvivor/DesignateSurvivor.ts
+++ b/packages/auth/src/Domain/UseCase/DesignateSurvivor/DesignateSurvivor.ts
@@ -1,66 +0,0 @@
-import { TimerInterface } from '@standardnotes/time'
-import { Result, Timestamps, UseCaseInterface, Uuid } from '@standardnotes/domain-core'
-
-import { DesignateSurvivorDTO } from './DesignateSurvivorDTO'
-import { SharedVaultUserRepositoryInterface } from '../../SharedVault/SharedVaultUserRepositoryInterface'
-
-export class DesignateSurvivor implements UseCaseInterface<void> {
-  constructor(
-    private sharedVaultUserRepository: SharedVaultUserRepositoryInterface,
-    private timer: TimerInterface,
-  ) {}
-
-  async execute(dto: DesignateSurvivorDTO): Promise<Result<void>> {
-    const sharedVaultUuidOrError = Uuid.create(dto.sharedVaultUuid)
-    if (sharedVaultUuidOrError.isFailed()) {
-      return Result.fail(sharedVaultUuidOrError.getError())
-    }
-    const sharedVaultUuid = sharedVaultUuidOrError.getValue()
-
-    const userUuidOrError = Uuid.create(dto.userUuid)
-    if (userUuidOrError.isFailed()) {
-      return Result.fail(userUuidOrError.getError())
-    }
-    const userUuid = userUuidOrError.getValue()
-
-    const existingSurvivor =
-      await this.sharedVaultUserRepository.findDesignatedSurvivorBySharedVaultUuid(sharedVaultUuid)
-
-    if (existingSurvivor) {
-      if (existingSurvivor.props.timestamps.updatedAt > dto.timestamp) {
-        return Result.fail(
-          'Cannot designate survivor to a previous version of the shared vault. Most probably a race condition.',
-        )
-      }
-      if (existingSurvivor.props.userUuid.value === userUuid.value) {
-        return Result.ok()
-      }
-
-      existingSurvivor.props.isDesignatedSurvivor = false
-      existingSurvivor.props.timestamps = Timestamps.create(
-        existingSurvivor.props.timestamps.createdAt,
-        this.timer.getTimestampInMicroseconds(),
-      ).getValue()
-
-      await this.sharedVaultUserRepository.save(existingSurvivor)
-    }
-
-    const toBeDesignatedAsASurvivor = await this.sharedVaultUserRepository.findByUserUuidAndSharedVaultUuid({
-      userUuid,
-      sharedVaultUuid,
-    })
-    if (!toBeDesignatedAsASurvivor) {
-      return Result.fail('User is not a member of the shared vault')
-    }
-
-    toBeDesignatedAsASurvivor.props.isDesignatedSurvivor = true
-    toBeDesignatedAsASurvivor.props.timestamps = Timestamps.create(
-      toBeDesignatedAsASurvivor.props.timestamps.createdAt,
-      this.timer.getTimestampInMicroseconds(),
-    ).getValue()
-
-    await this.sharedVaultUserRepository.save(toBeDesignatedAsASurvivor)
-
-    return Result.ok()
-  }
-}
--- a/packages/auth/src/Domain/UseCase/DesignateSurvivor/DesignateSurvivorDTO.ts
+++ b/packages/auth/src/Domain/UseCase/DesignateSurvivor/DesignateSurvivorDTO.ts
@@ -1,5 +0,0 @@
-export interface DesignateSurvivorDTO {
-  sharedVaultUuid: string
-  userUuid: string
-  timestamp: number
-}
--- a/packages/auth/src/Domain/UseCase/Register.spec.ts
+++ b/packages/auth/src/Domain/UseCase/Register.spec.ts
@@ -21,9 +21,19 @@ describe('Register', () => {
  let user: User
  let crypter: CrypterInterface
  let timer: TimerInterface
+  let transitionModeEnabled = false

  const createUseCase = () =>
-    new Register(userRepository, roleRepository, authResponseFactory, crypter, false, settingService, timer)
+    new Register(
+      userRepository,
+      roleRepository,
+      authResponseFactory,
+      crypter,
+      false,
+      settingService,
+      timer,
+      transitionModeEnabled,
+    )

  beforeEach(() => {
    userRepository = {} as jest.Mocked<UserRepositoryInterface>
@@ -84,7 +94,45 @@ describe('Register', () => {
    expect(settingService.applyDefaultSettingsUponRegistration).toHaveBeenCalled()
  })

+  it('should register a new user with default role', async () => {
+    const role = new Role()
+    role.name = 'role1'
+    roleRepository.findOneByName = jest.fn().mockReturnValue(role)
+
+    expect(
+      await createUseCase().execute({
+        email: 'test@test.te',
+        password: 'asdzxc',
+        updatedWithUserAgent: 'Mozilla',
+        apiVersion: '20200115',
+        ephemeralSession: false,
+        version: '004',
+        pwCost: 11,
+        pwSalt: 'qweqwe',
+        pwNonce: undefined,
+      }),
+    ).toEqual({ success: true, authResponse: { foo: 'bar' } })
+
+    expect(userRepository.save).toHaveBeenCalledWith({
+      email: 'test@test.te',
+      encryptedPassword: expect.any(String),
+      encryptedServerKey: 'test',
+      serverEncryptionVersion: 1,
+      pwCost: 11,
+      pwNonce: undefined,
+      pwSalt: 'qweqwe',
+      updatedWithUserAgent: 'Mozilla',
+      uuid: expect.any(String),
+      version: '004',
+      createdAt: new Date(1),
+      updatedAt: new Date(1),
+      roles: Promise.resolve([role]),
+    })
+  })
+
  it('should register a new user with default role and transition role', async () => {
+    transitionModeEnabled = true
+
    const role = new Role()
    role.name = RoleName.NAMES.CoreUser

@@ -201,6 +249,7 @@ describe('Register', () => {
        true,
        settingService,
        timer,
+        transitionModeEnabled,
      ).execute({
        email: 'test@test.te',
        password: 'asdzxc',
--- a/packages/auth/src/Domain/UseCase/Register.ts
+++ b/packages/auth/src/Domain/UseCase/Register.ts
@@ -27,6 +27,7 @@ export class Register implements UseCaseInterface {
    @inject(TYPES.Auth_DISABLE_USER_REGISTRATION) private disableUserRegistration: boolean,
    @inject(TYPES.Auth_SettingService) private settingService: SettingServiceInterface,
    @inject(TYPES.Auth_Timer) private timer: TimerInterface,
+    @inject(TYPES.Auth_TRANSITION_MODE_ENABLED) private transitionModeEnabled: boolean,
  ) {}

  async execute(dto: RegisterDTO): Promise<RegisterResponse> {
@@ -77,9 +78,11 @@ export class Register implements UseCaseInterface {
    if (defaultRole) {
      roles.push(defaultRole)
    }
-    const transitionRole = await this.roleRepository.findOneByName(RoleName.NAMES.TransitionUser)
-    if (transitionRole) {
-      roles.push(transitionRole)
+    if (this.transitionModeEnabled) {
+      const transitionRole = await this.roleRepository.findOneByName(RoleName.NAMES.TransitionUser)
+      if (transitionRole) {
+        roles.push(transitionRole)
+      }
    }
    user.roles = Promise.resolve(roles)

--- a/packages/auth/src/Domain/UseCase/RemoveSharedVaultUser/RemoveSharedVaultUser.spec.ts
+++ b/packages/auth/src/Domain/UseCase/RemoveSharedVaultUser/RemoveSharedVaultUser.spec.ts
@@ -13,7 +13,6 @@ describe('RemoveSharedVaultUser', () => {
    sharedVaultUserRepository.findByUserUuidAndSharedVaultUuid = jest
      .fn()
      .mockReturnValue({} as jest.Mocked<SharedVaultUser>)
-    sharedVaultUserRepository.findByUserUuid = jest.fn().mockReturnValue([{} as jest.Mocked<SharedVaultUser>])
    sharedVaultUserRepository.remove = jest.fn()
  })

@@ -29,17 +28,6 @@ describe('RemoveSharedVaultUser', () => {
    expect(sharedVaultUserRepository.remove).toHaveBeenCalled()
  })

-  it('should remove all shared vault users', async () => {
-    const useCase = createUseCase()
-
-    const result = await useCase.execute({
-      userUuid: '00000000-0000-0000-0000-000000000000',
-    })
-
-    expect(result.isFailed()).toBeFalsy()
-    expect(sharedVaultUserRepository.remove).toHaveBeenCalled()
-  })
-
  it('should fail when user uuid is invalid', async () => {
    const useCase = createUseCase()

--- a/packages/auth/src/Domain/UseCase/RemoveSharedVaultUser/RemoveSharedVaultUser.ts
+++ b/packages/auth/src/Domain/UseCase/RemoveSharedVaultUser/RemoveSharedVaultUser.ts
@@ -13,31 +13,21 @@ export class RemoveSharedVaultUser implements UseCaseInterface<void> {
    }
    const userUuid = userUuidOrError.getValue()

-    let sharedVaultUuid: Uuid | undefined
-    if (dto.sharedVaultUuid !== undefined) {
-      const sharedVaultUuidOrError = Uuid.create(dto.sharedVaultUuid)
-      if (sharedVaultUuidOrError.isFailed()) {
-        return Result.fail(sharedVaultUuidOrError.getError())
-      }
-      sharedVaultUuid = sharedVaultUuidOrError.getValue()
+    const sharedVaultUuidOrError = Uuid.create(dto.sharedVaultUuid)
+    if (sharedVaultUuidOrError.isFailed()) {
+      return Result.fail(sharedVaultUuidOrError.getError())
+    }
+    const sharedVaultUuid = sharedVaultUuidOrError.getValue()
+
+    const sharedVaultUser = await this.sharedVaultUserRepository.findByUserUuidAndSharedVaultUuid({
+      userUuid,
+      sharedVaultUuid,
+    })
+    if (!sharedVaultUser) {
+      return Result.fail('Shared vault user not found')
    }

-    if (sharedVaultUuid) {
-      const sharedVaultUser = await this.sharedVaultUserRepository.findByUserUuidAndSharedVaultUuid({
-        userUuid,
-        sharedVaultUuid,
-      })
-      if (!sharedVaultUser) {
-        return Result.fail('Shared vault user not found')
-      }
-
-      await this.sharedVaultUserRepository.remove(sharedVaultUser)
-    } else {
-      const sharedVaultUsers = await this.sharedVaultUserRepository.findByUserUuid(userUuid)
-      for (const sharedVaultUser of sharedVaultUsers) {
-        await this.sharedVaultUserRepository.remove(sharedVaultUser)
-      }
-    }
+    await this.sharedVaultUserRepository.remove(sharedVaultUser)

    return Result.ok()
  }
--- a/packages/auth/src/Domain/UseCase/RemoveSharedVaultUser/RemoveSharedVaultUserDTO.ts
+++ b/packages/auth/src/Domain/UseCase/RemoveSharedVaultUser/RemoveSharedVaultUserDTO.ts
@@ -1,4 +1,4 @@
 export interface RemoveSharedVaultUserDTO {
-  sharedVaultUuid?: string
+  sharedVaultUuid: string
  userUuid: string
 }
--- a/packages/auth/src/Infra/TypeORM/TypeORMSharedVaultUser.ts
+++ b/packages/auth/src/Infra/TypeORM/TypeORMSharedVaultUser.ts
@@ -26,13 +26,6 @@ export class TypeORMSharedVaultUser {
  })
  declare permission: string

-  @Column({
-    name: 'is_designated_survivor',
-    type: 'boolean',
-    default: false,
-  })
-  declare isDesignatedSurvivor: boolean
-
  @Column({
    name: 'created_at_timestamp',
    type: 'bigint',
--- a/packages/auth/src/Infra/TypeORM/TypeORMSharedVaultUserRepository.ts
+++ b/packages/auth/src/Infra/TypeORM/TypeORMSharedVaultUserRepository.ts
@@ -10,24 +10,6 @@ export class TypeORMSharedVaultUserRepository implements SharedVaultUserReposito
    private mapper: MapperInterface<SharedVaultUser, TypeORMSharedVaultUser>,
  ) {}

-  async findDesignatedSurvivorBySharedVaultUuid(sharedVaultUuid: Uuid): Promise<SharedVaultUser | null> {
-    const persistence = await this.ormRepository
-      .createQueryBuilder('shared_vault_user')
-      .where('shared_vault_user.shared_vault_uuid = :sharedVaultUuid', {
-        sharedVaultUuid: sharedVaultUuid.value,
-      })
-      .andWhere('shared_vault_user.is_designated_survivor = :isDesignatedSurvivor', {
-        isDesignatedSurvivor: true,
-      })
-      .getOne()
-
-    if (persistence === null) {
-      return null
-    }
-
-    return this.mapper.toDomain(persistence)
-  }
-
  async findByUserUuid(userUuid: Uuid): Promise<SharedVaultUser[]> {
    const persistence = await this.ormRepository
      .createQueryBuilder('shared_vault_user')
--- a/packages/auth/src/Mapping/SharedVaultUserPersistenceMapper.ts
+++ b/packages/auth/src/Mapping/SharedVaultUserPersistenceMapper.ts
@@ -41,7 +41,6 @@ export class SharedVaultUserPersistenceMapper implements MapperInterface<SharedV
        sharedVaultUuid,
        permission,
        timestamps,
-        isDesignatedSurvivor: !!projection.isDesignatedSurvivor,
      },
      new UniqueEntityId(projection.uuid),
    )
@@ -62,7 +61,6 @@ export class SharedVaultUserPersistenceMapper implements MapperInterface<SharedV
    typeorm.permission = domain.props.permission.value
    typeorm.createdAtTimestamp = domain.props.timestamps.createdAt
    typeorm.updatedAtTimestamp = domain.props.timestamps.updatedAt
-    typeorm.isDesignatedSurvivor = !!domain.props.isDesignatedSurvivor

    return typeorm
  }
--- a/packages/domain-core/CHANGELOG.md
+++ b/packages/domain-core/CHANGELOG.md
@@ -3,30 +3,6 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

-# [1.33.0](https://github.com/standardnotes/server/compare/@standardnotes/domain-core@1.32.0...@standardnotes/domain-core@1.33.0) (2023-09-21)
-
-### Features
-
-* add designating a survivor in shared vault ([#841](https://github.com/standardnotes/server/issues/841)) ([230c96d](https://github.com/standardnotes/server/commit/230c96dcf1d8faed9ce8fe288549226da70317e6))
-
-# [1.32.0](https://github.com/standardnotes/server/compare/@standardnotes/domain-core@1.31.0...@standardnotes/domain-core@1.32.0) (2023-09-20)
-
-### Features
-
-* **syncing-server:** distinct notifications upon user removal from shared vault ([#840](https://github.com/standardnotes/server/issues/840)) ([41e2136](https://github.com/standardnotes/server/commit/41e2136bc07312974701a70652528d304105e0f9))
-
-# [1.31.0](https://github.com/standardnotes/server/compare/@standardnotes/domain-core@1.30.1...@standardnotes/domain-core@1.31.0) (2023-09-20)
-
-### Features
-
-* **syncing-server:** add notification for user upon declined shared vault invitation ([#837](https://github.com/standardnotes/server/issues/837)) ([31e7aaf](https://github.com/standardnotes/server/commit/31e7aaf253029a951d8b943d6cffd655cd5ca765))
-
-## [1.30.1](https://github.com/standardnotes/server/compare/@standardnotes/domain-core@1.30.0...@standardnotes/domain-core@1.30.1) (2023-09-19)
-
-### Bug Fixes
-
-* **domain-core:** allow any version and variant of the UUID format ([de081fe](https://github.com/standardnotes/server/commit/de081fe78658bdd36c8c5d86b70a16a2880aa3d1))
-
 # [1.30.0](https://github.com/standardnotes/server/compare/@standardnotes/domain-core@1.29.0...@standardnotes/domain-core@1.30.0) (2023-09-18)

 ### Features
--- a/packages/domain-core/package.json
+++ b/packages/domain-core/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@standardnotes/domain-core",
-  "version": "1.33.0",
+  "version": "1.30.0",
  "engines": {
    "node": ">=18.0.0 <21.0.0"
  },
--- a/packages/domain-core/src/Domain/Core/Validator.spec.ts
+++ b/packages/domain-core/src/Domain/Core/Validator.spec.ts
@@ -5,7 +5,6 @@ describe('Validator', () => {
    '2221101c-1da9-4d2b-9b32-b8be2a8d1c82',
    'c08f2f29-a74b-42b4-aefd-98af9832391c',
    'b453fa64-1493-443b-b5bb-bca7b9c696c7',
-    'fa7350b3-77cf-8c0c-40b2-6046b13254fe',
  ]

  const invalidUuids = [
--- a/packages/domain-core/src/Domain/Core/Validator.ts
+++ b/packages/domain-core/src/Domain/Core/Validator.ts
@@ -1,13 +1,12 @@
 import { Result } from './Result'

 export class Validator {
-  private static readonly UUID_ANY_VERSION_AND_VARIANT_REGEX =
-    /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i
+  private static readonly UUID_REGEX = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-5][0-9a-f]{3}-[089ab][0-9a-f]{3}-[0-9a-f]{12}$/i
  private static readonly EMAIL_REGEX =
    /^(([^<>()[\]\\.,;:\s@"]+(\.[^<>()[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/

  static isValidUuid(value: string): Result<string> {
-    const matchesUuidRegex = String(value).toLowerCase().match(Validator.UUID_ANY_VERSION_AND_VARIANT_REGEX) !== null
+    const matchesUuidRegex = String(value).toLowerCase().match(Validator.UUID_REGEX) !== null
    if (matchesUuidRegex) {
      return Result.ok()
    }
--- a/packages/domain-core/src/Domain/Notification/NotificationType.ts
+++ b/packages/domain-core/src/Domain/Notification/NotificationType.ts
@@ -5,10 +5,8 @@ import { NotificationTypeProps } from './NotificationTypeProps'
 export class NotificationType extends ValueObject<NotificationTypeProps> {
  static readonly TYPES = {
    SharedVaultItemRemoved: 'shared_vault_item_removed',
-    SelfRemovedFromSharedVault: 'self_removed_from_shared_vault',
-    UserRemovedFromSharedVault: 'user_removed_from_shared_vault',
+    RemovedFromSharedVault: 'removed_from_shared_vault',
    UserAddedToSharedVault: 'user_added_to_shared_vault',
-    SharedVaultInviteDeclined: 'shared_vault_invite_declined',
    SharedVaultFileUploaded: 'shared_vault_file_uploaded',
    SharedVaultFileRemoved: 'shared_vault_file_removed',
  }
--- a/packages/domain-core/src/Domain/SharedVault/SharedVaultUser.spec.ts
+++ b/packages/domain-core/src/Domain/SharedVault/SharedVaultUser.spec.ts
@@ -10,7 +10,6 @@ describe('SharedVaultUser', () => {
      sharedVaultUuid: Uuid.create('00000000-0000-0000-0000-000000000000').getValue(),
      timestamps: Timestamps.create(123456789, 123456789).getValue(),
      userUuid: Uuid.create('00000000-0000-0000-0000-000000000000').getValue(),
-      isDesignatedSurvivor: false,
    })

    expect(entityOrError.isFailed()).toBeFalsy()
--- a/packages/domain-core/src/Domain/SharedVault/SharedVaultUserProps.ts
+++ b/packages/domain-core/src/Domain/SharedVault/SharedVaultUserProps.ts
@@ -6,6 +6,5 @@ export interface SharedVaultUserProps {
  sharedVaultUuid: Uuid
  userUuid: Uuid
  permission: SharedVaultUserPermission
-  isDesignatedSurvivor: boolean
  timestamps: Timestamps
 }
--- a/packages/domain-events-infra/CHANGELOG.md
+++ b/packages/domain-events-infra/CHANGELOG.md
@@ -3,22 +3,6 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

-## [1.12.34](https://github.com/standardnotes/server/compare/@standardnotes/domain-events-infra@1.12.33...@standardnotes/domain-events-infra@1.12.34) (2023-09-25)
-
-**Note:** Version bump only for package @standardnotes/domain-events-infra
-
-## [1.12.33](https://github.com/standardnotes/server/compare/@standardnotes/domain-events-infra@1.12.32...@standardnotes/domain-events-infra@1.12.33) (2023-09-25)
-
-**Note:** Version bump only for package @standardnotes/domain-events-infra
-
-## [1.12.32](https://github.com/standardnotes/server/compare/@standardnotes/domain-events-infra@1.12.31...@standardnotes/domain-events-infra@1.12.32) (2023-09-21)
-
-**Note:** Version bump only for package @standardnotes/domain-events-infra
-
-## [1.12.31](https://github.com/standardnotes/server/compare/@standardnotes/domain-events-infra@1.12.30...@standardnotes/domain-events-infra@1.12.31) (2023-09-20)
-
-**Note:** Version bump only for package @standardnotes/domain-events-infra
-
 ## [1.12.30](https://github.com/standardnotes/server/compare/@standardnotes/domain-events-infra@1.12.29...@standardnotes/domain-events-infra@1.12.30) (2023-09-15)

 **Note:** Version bump only for package @standardnotes/domain-events-infra
--- a/packages/domain-events-infra/package.json
+++ b/packages/domain-events-infra/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@standardnotes/domain-events-infra",
-  "version": "1.12.34",
+  "version": "1.12.30",
  "engines": {
    "node": ">=18.0.0 <21.0.0"
  },
--- a/packages/domain-events/CHANGELOG.md
+++ b/packages/domain-events/CHANGELOG.md
@@ -3,30 +3,6 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

-# [2.130.0](https://github.com/standardnotes/server/compare/@standardnotes/domain-events@2.129.1...@standardnotes/domain-events@2.130.0) (2023-09-25)
-
-### Features
-
-* remove shared vault files upon shared vault removal ([#852](https://github.com/standardnotes/server/issues/852)) ([7b1eec2](https://github.com/standardnotes/server/commit/7b1eec21e54330bebbeebb80cec3ba4284112aab))
-
-## [2.129.1](https://github.com/standardnotes/server/compare/@standardnotes/domain-events@2.129.0...@standardnotes/domain-events@2.129.1) (2023-09-25)
-
-### Bug Fixes
-
-* remember paging progress on transitioning ([1d73e4f](https://github.com/standardnotes/server/commit/1d73e4f0720d41029af4d4b2b7a10d101add6c82))
-
-# [2.129.0](https://github.com/standardnotes/server/compare/@standardnotes/domain-events@2.128.0...@standardnotes/domain-events@2.129.0) (2023-09-21)
-
-### Features
-
-* add designating a survivor in shared vault ([#841](https://github.com/standardnotes/server/issues/841)) ([230c96d](https://github.com/standardnotes/server/commit/230c96dcf1d8faed9ce8fe288549226da70317e6))
-
-# [2.128.0](https://github.com/standardnotes/server/compare/@standardnotes/domain-events@2.127.0...@standardnotes/domain-events@2.128.0) (2023-09-20)
-
-### Features
-
-* add unassigning items and revisions upon shared vault removal ([#839](https://github.com/standardnotes/server/issues/839)) ([378eced](https://github.com/standardnotes/server/commit/378ecedfcc4fb23475c2329fb37479edb3b48a39))
-
 # [2.127.0](https://github.com/standardnotes/server/compare/@standardnotes/domain-events@2.126.0...@standardnotes/domain-events@2.127.0) (2023-09-15)

 ### Features
--- a/packages/domain-events/package.json
+++ b/packages/domain-events/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@standardnotes/domain-events",
-  "version": "2.130.0",
+  "version": "2.127.0",
  "engines": {
    "node": ">=18.0.0 <21.0.0"
  },
--- a/packages/domain-events/src/Domain/Event/ItemRemovedFromSharedVaultEventPayload.ts
+++ b/packages/domain-events/src/Domain/Event/ItemRemovedFromSharedVaultEventPayload.ts
@@ -2,4 +2,5 @@ export interface ItemRemovedFromSharedVaultEventPayload {
  userUuid: string
  itemUuid: string
  sharedVaultUuid: string
+  roleNames: string[]
 }
--- a/packages/domain-events/src/Domain/Event/SharedVaultRemovedEvent.ts
+++ b/packages/domain-events/src/Domain/Event/SharedVaultRemovedEvent.ts
@@ -1,7 +0,0 @@
-import { DomainEventInterface } from './DomainEventInterface'
-import { SharedVaultRemovedEventPayload } from './SharedVaultRemovedEventPayload'
-
-export interface SharedVaultRemovedEvent extends DomainEventInterface {
-  type: 'SHARED_VAULT_REMOVED'
-  payload: SharedVaultRemovedEventPayload
-}
--- a/packages/domain-events/src/Domain/Event/SharedVaultRemovedEventPayload.ts
+++ b/packages/domain-events/src/Domain/Event/SharedVaultRemovedEventPayload.ts
@@ -1,4 +0,0 @@
-export interface SharedVaultRemovedEventPayload {
-  sharedVaultUuid: string
-  vaultOwnerUuid: string
-}
--- a/packages/domain-events/src/Domain/Event/TransitionStatusUpdatedEventPayload.ts
+++ b/packages/domain-events/src/Domain/Event/TransitionStatusUpdatedEventPayload.ts
@@ -3,5 +3,4 @@ export interface TransitionStatusUpdatedEventPayload {
  transitionType: 'items' | 'revisions'
  transitionTimestamp: number
  status: string
-  page?: number
 }
--- a/packages/domain-events/src/Domain/Event/UserDesignatedAsSurvivorInSharedVaultEvent.ts
+++ b/packages/domain-events/src/Domain/Event/UserDesignatedAsSurvivorInSharedVaultEvent.ts
@@ -1,7 +0,0 @@
-import { DomainEventInterface } from './DomainEventInterface'
-import { UserDesignatedAsSurvivorInSharedVaultEventPayload } from './UserDesignatedAsSurvivorInSharedVaultEventPayload'
-
-export interface UserDesignatedAsSurvivorInSharedVaultEvent extends DomainEventInterface {
-  type: 'USER_DESIGNATED_AS_SURVIVOR_IN_SHARED_VAULT'
-  payload: UserDesignatedAsSurvivorInSharedVaultEventPayload
-}
--- a/packages/domain-events/src/Domain/Event/UserDesignatedAsSurvivorInSharedVaultEventPayload.ts
+++ b/packages/domain-events/src/Domain/Event/UserDesignatedAsSurvivorInSharedVaultEventPayload.ts
@@ -1,5 +0,0 @@
-export interface UserDesignatedAsSurvivorInSharedVaultEventPayload {
-  userUuid: string
-  sharedVaultUuid: string
-  timestamp: number
-}
--- a/packages/domain-events/src/Domain/index.ts
+++ b/packages/domain-events/src/Domain/index.ts
@@ -76,8 +76,6 @@ export * from './Event/SharedVaultFileRemovedEvent'
 export * from './Event/SharedVaultFileRemovedEventPayload'
 export * from './Event/SharedVaultFileUploadedEvent'
 export * from './Event/SharedVaultFileUploadedEventPayload'
-export * from './Event/SharedVaultRemovedEvent'
-export * from './Event/SharedVaultRemovedEventPayload'
 export * from './Event/StatisticPersistenceRequestedEvent'
 export * from './Event/StatisticPersistenceRequestedEventPayload'
 export * from './Event/SubscriptionCancelledEvent'
@@ -104,8 +102,6 @@ export * from './Event/TransitionStatusUpdatedEvent'
 export * from './Event/TransitionStatusUpdatedEventPayload'
 export * from './Event/UserAddedToSharedVaultEvent'
 export * from './Event/UserAddedToSharedVaultEventPayload'
-export * from './Event/UserDesignatedAsSurvivorInSharedVaultEvent'
-export * from './Event/UserDesignatedAsSurvivorInSharedVaultEventPayload'
 export * from './Event/UserDisabledSessionUserAgentLoggingEvent'
 export * from './Event/UserDisabledSessionUserAgentLoggingEventPayload'
 export * from './Event/UserEmailChangedEvent'
--- a/packages/event-store/CHANGELOG.md
+++ b/packages/event-store/CHANGELOG.md
@@ -3,30 +3,6 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

-## [1.11.50](https://github.com/standardnotes/server/compare/@standardnotes/event-store@1.11.49...@standardnotes/event-store@1.11.50) (2023-09-25)
-
-**Note:** Version bump only for package @standardnotes/event-store
-
-## [1.11.49](https://github.com/standardnotes/server/compare/@standardnotes/event-store@1.11.48...@standardnotes/event-store@1.11.49) (2023-09-25)
-
-**Note:** Version bump only for package @standardnotes/event-store
-
-## [1.11.48](https://github.com/standardnotes/server/compare/@standardnotes/event-store@1.11.47...@standardnotes/event-store@1.11.48) (2023-09-21)
-
-**Note:** Version bump only for package @standardnotes/event-store
-
-## [1.11.47](https://github.com/standardnotes/server/compare/@standardnotes/event-store@1.11.46...@standardnotes/event-store@1.11.47) (2023-09-20)
-
-**Note:** Version bump only for package @standardnotes/event-store
-
-## [1.11.46](https://github.com/standardnotes/server/compare/@standardnotes/event-store@1.11.45...@standardnotes/event-store@1.11.46) (2023-09-20)
-
-**Note:** Version bump only for package @standardnotes/event-store
-
-## [1.11.45](https://github.com/standardnotes/server/compare/@standardnotes/event-store@1.11.44...@standardnotes/event-store@1.11.45) (2023-09-19)
-
-**Note:** Version bump only for package @standardnotes/event-store
-
 ## [1.11.44](https://github.com/standardnotes/server/compare/@standardnotes/event-store@1.11.43...@standardnotes/event-store@1.11.44) (2023-09-18)

 **Note:** Version bump only for package @standardnotes/event-store
--- a/packages/event-store/package.json
+++ b/packages/event-store/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@standardnotes/event-store",
-  "version": "1.11.50",
+  "version": "1.11.44",
  "description": "Event Store Service",
  "private": true,
  "main": "dist/src/index.js",
--- a/packages/files/CHANGELOG.md
+++ b/packages/files/CHANGELOG.md
@@ -3,32 +3,6 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

-# [1.23.0](https://github.com/standardnotes/files/compare/@standardnotes/files-server@1.22.28...@standardnotes/files-server@1.23.0) (2023-09-25)
-
-### Features
-
-* remove shared vault files upon shared vault removal ([#852](https://github.com/standardnotes/files/issues/852)) ([7b1eec2](https://github.com/standardnotes/files/commit/7b1eec21e54330bebbeebb80cec3ba4284112aab))
-
-## [1.22.28](https://github.com/standardnotes/files/compare/@standardnotes/files-server@1.22.27...@standardnotes/files-server@1.22.28) (2023-09-25)
-
-**Note:** Version bump only for package @standardnotes/files-server
-
-## [1.22.27](https://github.com/standardnotes/files/compare/@standardnotes/files-server@1.22.26...@standardnotes/files-server@1.22.27) (2023-09-21)
-
-**Note:** Version bump only for package @standardnotes/files-server
-
-## [1.22.26](https://github.com/standardnotes/files/compare/@standardnotes/files-server@1.22.25...@standardnotes/files-server@1.22.26) (2023-09-20)
-
-**Note:** Version bump only for package @standardnotes/files-server
-
-## [1.22.25](https://github.com/standardnotes/files/compare/@standardnotes/files-server@1.22.24...@standardnotes/files-server@1.22.25) (2023-09-20)
-
-**Note:** Version bump only for package @standardnotes/files-server
-
-## [1.22.24](https://github.com/standardnotes/files/compare/@standardnotes/files-server@1.22.23...@standardnotes/files-server@1.22.24) (2023-09-19)
-
-**Note:** Version bump only for package @standardnotes/files-server
-
 ## [1.22.23](https://github.com/standardnotes/files/compare/@standardnotes/files-server@1.22.22...@standardnotes/files-server@1.22.23) (2023-09-18)

 **Note:** Version bump only for package @standardnotes/files-server
--- a/packages/files/package.json
+++ b/packages/files/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@standardnotes/files-server",
-  "version": "1.23.0",
+  "version": "1.22.23",
  "engines": {
    "node": ">=18.0.0 <21.0.0"
  },
--- a/packages/files/src/Domain/Handler/AccountDeletionRequestedEventHandler.spec.ts
+++ b/packages/files/src/Domain/Handler/AccountDeletionRequestedEventHandler.spec.ts
@@ -0,0 +1,73 @@
+import 'reflect-metadata'
+
+import {
+  AccountDeletionRequestedEvent,
+  AccountDeletionRequestedEventPayload,
+  DomainEventPublisherInterface,
+  FileRemovedEvent,
+} from '@standardnotes/domain-events'
+import { MarkFilesToBeRemoved } from '../UseCase/MarkFilesToBeRemoved/MarkFilesToBeRemoved'
+
+import { AccountDeletionRequestedEventHandler } from './AccountDeletionRequestedEventHandler'
+import { DomainEventFactoryInterface } from '../Event/DomainEventFactoryInterface'
+import { RemovedFileDescription } from '../File/RemovedFileDescription'
+
+describe('AccountDeletionRequestedEventHandler', () => {
+  let markFilesToBeRemoved: MarkFilesToBeRemoved
+  let event: AccountDeletionRequestedEvent
+  let domainEventPublisher: DomainEventPublisherInterface
+  let domainEventFactory: DomainEventFactoryInterface
+
+  const createHandler = () =>
+    new AccountDeletionRequestedEventHandler(markFilesToBeRemoved, domainEventPublisher, domainEventFactory)
+
+  beforeEach(() => {
+    markFilesToBeRemoved = {} as jest.Mocked<MarkFilesToBeRemoved>
+    markFilesToBeRemoved.execute = jest.fn().mockReturnValue({
+      success: true,
+      filesRemoved: [{} as jest.Mocked<RemovedFileDescription>],
+    })
+
+    event = {} as jest.Mocked<AccountDeletionRequestedEvent>
+    event.payload = {
+      userUuid: '1-2-3',
+      regularSubscriptionUuid: '1-2-3',
+    } as jest.Mocked<AccountDeletionRequestedEventPayload>
+
+    domainEventPublisher = {} as jest.Mocked<DomainEventPublisherInterface>
+    domainEventPublisher.publish = jest.fn()
+
+    domainEventFactory = {} as jest.Mocked<DomainEventFactoryInterface>
+    domainEventFactory.createFileRemovedEvent = jest.fn().mockReturnValue({} as jest.Mocked<FileRemovedEvent>)
+  })
+
+  it('should mark files to be remove for user', async () => {
+    await createHandler().handle(event)
+
+    expect(markFilesToBeRemoved.execute).toHaveBeenCalledWith({ ownerUuid: '1-2-3' })
+
+    expect(domainEventPublisher.publish).toHaveBeenCalled()
+  })
+
+  it('should not mark files to be remove for user if user has no regular subscription', async () => {
+    event.payload.regularSubscriptionUuid = undefined
+
+    await createHandler().handle(event)
+
+    expect(markFilesToBeRemoved.execute).not.toHaveBeenCalled()
+
+    expect(domainEventPublisher.publish).not.toHaveBeenCalled()
+  })
+
+  it('should not publish events if failed to mark files to be removed', async () => {
+    markFilesToBeRemoved.execute = jest.fn().mockReturnValue({
+      success: false,
+    })
+
+    await createHandler().handle(event)
+
+    expect(markFilesToBeRemoved.execute).toHaveBeenCalledWith({ ownerUuid: '1-2-3' })
+
+    expect(domainEventPublisher.publish).not.toHaveBeenCalled()
+  })
+})
--- a/packages/files/src/Domain/Handler/AccountDeletionRequestedEventHandler.ts
+++ b/packages/files/src/Domain/Handler/AccountDeletionRequestedEventHandler.ts
@@ -22,17 +22,15 @@ export class AccountDeletionRequestedEventHandler implements DomainEventHandlerI
      return
    }

-    const result = await this.markFilesToBeRemoved.execute({
+    const response = await this.markFilesToBeRemoved.execute({
      ownerUuid: event.payload.userUuid,
    })

-    if (result.isFailed()) {
+    if (!response.success) {
      return
    }

-    const filesRemoved = result.getValue()
-
-    for (const fileRemoved of filesRemoved) {
+    for (const fileRemoved of response.filesRemoved) {
      await this.domainEventPublisher.publish(
        this.domainEventFactory.createFileRemovedEvent({
          regularSubscriptionUuid: event.payload.regularSubscriptionUuid,
--- a/packages/files/src/Domain/Handler/SharedSubscriptionInvitationCanceledEventHandler.spec.ts
+++ b/packages/files/src/Domain/Handler/SharedSubscriptionInvitationCanceledEventHandler.spec.ts
@@ -0,0 +1,73 @@
+import 'reflect-metadata'
+
+import {
+  SharedSubscriptionInvitationCanceledEvent,
+  SharedSubscriptionInvitationCanceledEventPayload,
+  DomainEventPublisherInterface,
+  FileRemovedEvent,
+} from '@standardnotes/domain-events'
+import { MarkFilesToBeRemoved } from '../UseCase/MarkFilesToBeRemoved/MarkFilesToBeRemoved'
+
+import { SharedSubscriptionInvitationCanceledEventHandler } from './SharedSubscriptionInvitationCanceledEventHandler'
+import { DomainEventFactoryInterface } from '../Event/DomainEventFactoryInterface'
+import { RemovedFileDescription } from '../File/RemovedFileDescription'
+
+describe('SharedSubscriptionInvitationCanceledEventHandler', () => {
+  let markFilesToBeRemoved: MarkFilesToBeRemoved
+  let event: SharedSubscriptionInvitationCanceledEvent
+  let domainEventPublisher: DomainEventPublisherInterface
+  let domainEventFactory: DomainEventFactoryInterface
+
+  const createHandler = () =>
+    new SharedSubscriptionInvitationCanceledEventHandler(markFilesToBeRemoved, domainEventPublisher, domainEventFactory)
+
+  beforeEach(() => {
+    markFilesToBeRemoved = {} as jest.Mocked<MarkFilesToBeRemoved>
+    markFilesToBeRemoved.execute = jest.fn().mockReturnValue({
+      success: true,
+      filesRemoved: [{} as jest.Mocked<RemovedFileDescription>],
+    })
+
+    event = {} as jest.Mocked<SharedSubscriptionInvitationCanceledEvent>
+    event.payload = {
+      inviteeIdentifier: '1-2-3',
+      inviteeIdentifierType: 'uuid',
+    } as jest.Mocked<SharedSubscriptionInvitationCanceledEventPayload>
+
+    domainEventPublisher = {} as jest.Mocked<DomainEventPublisherInterface>
+    domainEventPublisher.publish = jest.fn()
+
+    domainEventFactory = {} as jest.Mocked<DomainEventFactoryInterface>
+    domainEventFactory.createFileRemovedEvent = jest.fn().mockReturnValue({} as jest.Mocked<FileRemovedEvent>)
+  })
+
+  it('should mark files to be remove for user', async () => {
+    await createHandler().handle(event)
+
+    expect(markFilesToBeRemoved.execute).toHaveBeenCalledWith({ ownerUuid: '1-2-3' })
+
+    expect(domainEventPublisher.publish).toHaveBeenCalled()
+  })
+
+  it('should not mark files to be remove for user if identifier is not of uuid type', async () => {
+    event.payload.inviteeIdentifierType = 'email'
+
+    await createHandler().handle(event)
+
+    expect(markFilesToBeRemoved.execute).not.toHaveBeenCalled()
+
+    expect(domainEventPublisher.publish).not.toHaveBeenCalled()
+  })
+
+  it('should not publish events if failed to mark files to be removed', async () => {
+    markFilesToBeRemoved.execute = jest.fn().mockReturnValue({
+      success: false,
+    })
+
+    await createHandler().handle(event)
+
+    expect(markFilesToBeRemoved.execute).toHaveBeenCalledWith({ ownerUuid: '1-2-3' })
+
+    expect(domainEventPublisher.publish).not.toHaveBeenCalled()
+  })
+})
--- a/packages/files/src/Domain/Handler/SharedSubscriptionInvitationCanceledEventHandler.ts
+++ b/packages/files/src/Domain/Handler/SharedSubscriptionInvitationCanceledEventHandler.ts
@@ -22,17 +22,15 @@ export class SharedSubscriptionInvitationCanceledEventHandler implements DomainE
      return
    }

-    const result = await this.markFilesToBeRemoved.execute({
+    const response = await this.markFilesToBeRemoved.execute({
      ownerUuid: event.payload.inviteeIdentifier,
    })

-    if (result.isFailed()) {
+    if (!response.success) {
      return
    }

-    const filesRemoved = result.getValue()
-
-    for (const fileRemoved of filesRemoved) {
+    for (const fileRemoved of response.filesRemoved) {
      await this.domainEventPublisher.publish(
        this.domainEventFactory.createFileRemovedEvent({
          regularSubscriptionUuid: event.payload.inviterSubscriptionUuid,
--- a/packages/files/src/Domain/Handler/SharedVaultRemovedEventHandler.ts
+++ b/packages/files/src/Domain/Handler/SharedVaultRemovedEventHandler.ts
@@ -1,44 +0,0 @@
-import {
-  DomainEventHandlerInterface,
-  DomainEventPublisherInterface,
-  SharedVaultRemovedEvent,
-} from '@standardnotes/domain-events'
-import { Logger } from 'winston'
-
-import { MarkFilesToBeRemoved } from '../UseCase/MarkFilesToBeRemoved/MarkFilesToBeRemoved'
-import { DomainEventFactoryInterface } from '../Event/DomainEventFactoryInterface'
-
-export class SharedVaultRemovedEventHandler implements DomainEventHandlerInterface {
-  constructor(
-    private markFilesToBeRemoved: MarkFilesToBeRemoved,
-    private domainEventPublisher: DomainEventPublisherInterface,
-    private domainEventFactory: DomainEventFactoryInterface,
-    private logger: Logger,
-  ) {}
-
-  async handle(event: SharedVaultRemovedEvent): Promise<void> {
-    const result = await this.markFilesToBeRemoved.execute({
-      ownerUuid: event.payload.sharedVaultUuid,
-    })
-
-    if (result.isFailed()) {
-      this.logger.error(
-        `Could not mark files to be removed for shared vault: ${event.payload.sharedVaultUuid}: ${result.getError()}`,
-      )
-    }
-
-    const filesRemoved = result.getValue()
-
-    for (const fileRemoved of filesRemoved) {
-      await this.domainEventPublisher.publish(
-        this.domainEventFactory.createSharedVaultFileRemovedEvent({
-          fileByteSize: fileRemoved.fileByteSize,
-          fileName: fileRemoved.fileName,
-          filePath: fileRemoved.filePath,
-          sharedVaultUuid: event.payload.sharedVaultUuid,
-          vaultOwnerUuid: event.payload.vaultOwnerUuid,
-        }),
-      )
-    }
-  }
-}
--- a/packages/files/src/Domain/UseCase/MarkFilesToBeRemoved/MarkFilesToBeRemoved.spec.ts
+++ b/packages/files/src/Domain/UseCase/MarkFilesToBeRemoved/MarkFilesToBeRemoved.spec.ts
@@ -21,9 +21,7 @@ describe('MarkFilesToBeRemoved', () => {
  })

  it('should mark files for being removed', async () => {
-    const result = await createUseCase().execute({ ownerUuid: '1-2-3' })
-
-    expect(result.isFailed()).toEqual(false)
+    expect(await createUseCase().execute({ ownerUuid: '1-2-3' })).toEqual({ success: true })

    expect(fileRemover.markFilesToBeRemoved).toHaveBeenCalledWith('1-2-3')
  })
@@ -33,7 +31,9 @@ describe('MarkFilesToBeRemoved', () => {
      throw new Error('Oops')
    })

-    const result = await createUseCase().execute({ ownerUuid: '1-2-3' })
-    expect(result.isFailed()).toEqual(true)
+    expect(await createUseCase().execute({ ownerUuid: '1-2-3' })).toEqual({
+      success: false,
+      message: 'Could not mark resources for removal',
+    })
  })
 })
--- a/packages/files/src/Domain/UseCase/MarkFilesToBeRemoved/MarkFilesToBeRemoved.ts
+++ b/packages/files/src/Domain/UseCase/MarkFilesToBeRemoved/MarkFilesToBeRemoved.ts
@@ -1,30 +1,36 @@
 import { inject, injectable } from 'inversify'
 import { Logger } from 'winston'
-import { Result, UseCaseInterface } from '@standardnotes/domain-core'

 import TYPES from '../../../Bootstrap/Types'
 import { FileRemoverInterface } from '../../Services/FileRemoverInterface'
+import { UseCaseInterface } from '../UseCaseInterface'
 import { MarkFilesToBeRemovedDTO } from './MarkFilesToBeRemovedDTO'
-import { RemovedFileDescription } from '../../File/RemovedFileDescription'
+import { MarkFilesToBeRemovedResponse } from './MarkFilesToBeRemovedResponse'

@injectable()
-export class MarkFilesToBeRemoved implements UseCaseInterface<RemovedFileDescription[]> {
+export class MarkFilesToBeRemoved implements UseCaseInterface {
  constructor(
    @inject(TYPES.Files_FileRemover) private fileRemover: FileRemoverInterface,
    @inject(TYPES.Files_Logger) private logger: Logger,
  ) {}

-  async execute(dto: MarkFilesToBeRemovedDTO): Promise<Result<RemovedFileDescription[]>> {
+  async execute(dto: MarkFilesToBeRemovedDTO): Promise<MarkFilesToBeRemovedResponse> {
    try {
      this.logger.debug(`Marking files for later removal for user: ${dto.ownerUuid}`)

      const filesRemoved = await this.fileRemover.markFilesToBeRemoved(dto.ownerUuid)

-      return Result.ok(filesRemoved)
+      return {
+        success: true,
+        filesRemoved,
+      }
    } catch (error) {
      this.logger.error(`Could not mark resources for removal: ${dto.ownerUuid} - ${(error as Error).message}`)

-      return Result.fail('Could not mark resources for removal')
+      return {
+        success: false,
+        message: 'Could not mark resources for removal',
+      }
    }
  }
 }
--- a/packages/home-server/.env.sample
+++ b/packages/home-server/.env.sample
@@ -16,3 +16,5 @@ MONGO_PORT=27017
 MONGO_USERNAME=standardnotes
 MONGO_PASSWORD=standardnotes
 MONGO_DATABASE=standardnotes
+
+TRANSITION_MODE_ENABLED=false
--- a/packages/home-server/CHANGELOG.md
+++ b/packages/home-server/CHANGELOG.md
@@ -3,104 +3,6 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

-## [1.16.4](https://github.com/standardnotes/server/compare/@standardnotes/home-server@1.16.3...@standardnotes/home-server@1.16.4) (2023-09-25)
-
-**Note:** Version bump only for package @standardnotes/home-server
-
-## [1.16.3](https://github.com/standardnotes/server/compare/@standardnotes/home-server@1.16.2...@standardnotes/home-server@1.16.3) (2023-09-25)
-
-**Note:** Version bump only for package @standardnotes/home-server
-
-## [1.16.2](https://github.com/standardnotes/server/compare/@standardnotes/home-server@1.16.1...@standardnotes/home-server@1.16.2) (2023-09-25)
-
-**Note:** Version bump only for package @standardnotes/home-server
-
-## [1.16.1](https://github.com/standardnotes/server/compare/@standardnotes/home-server@1.16.0...@standardnotes/home-server@1.16.1) (2023-09-25)
-
-**Note:** Version bump only for package @standardnotes/home-server
-
-# [1.16.0](https://github.com/standardnotes/server/compare/@standardnotes/home-server@1.15.80...@standardnotes/home-server@1.16.0) (2023-09-22)
-
-### Features
-
-* remove transition mode from code ([5001496](https://github.com/standardnotes/server/commit/5001496c7bc1df9e20c2d88ebf52ed77f868110c))
-
-## [1.15.80](https://github.com/standardnotes/server/compare/@standardnotes/home-server@1.15.79...@standardnotes/home-server@1.15.80) (2023-09-22)
-
-**Note:** Version bump only for package @standardnotes/home-server
-
-## [1.15.79](https://github.com/standardnotes/server/compare/@standardnotes/home-server@1.15.78...@standardnotes/home-server@1.15.79) (2023-09-22)
-
-**Note:** Version bump only for package @standardnotes/home-server
-
-## [1.15.78](https://github.com/standardnotes/server/compare/@standardnotes/home-server@1.15.77...@standardnotes/home-server@1.15.78) (2023-09-22)
-
-**Note:** Version bump only for package @standardnotes/home-server
-
-## [1.15.77](https://github.com/standardnotes/server/compare/@standardnotes/home-server@1.15.76...@standardnotes/home-server@1.15.77) (2023-09-22)
-
-**Note:** Version bump only for package @standardnotes/home-server
-
-## [1.15.76](https://github.com/standardnotes/server/compare/@standardnotes/home-server@1.15.75...@standardnotes/home-server@1.15.76) (2023-09-21)
-
-**Note:** Version bump only for package @standardnotes/home-server
-
-## [1.15.75](https://github.com/standardnotes/server/compare/@standardnotes/home-server@1.15.74...@standardnotes/home-server@1.15.75) (2023-09-21)
-
-**Note:** Version bump only for package @standardnotes/home-server
-
-## [1.15.74](https://github.com/standardnotes/server/compare/@standardnotes/home-server@1.15.73...@standardnotes/home-server@1.15.74) (2023-09-21)
-
-**Note:** Version bump only for package @standardnotes/home-server
-
-## [1.15.73](https://github.com/standardnotes/server/compare/@standardnotes/home-server@1.15.72...@standardnotes/home-server@1.15.73) (2023-09-21)
-
-**Note:** Version bump only for package @standardnotes/home-server
-
-## [1.15.72](https://github.com/standardnotes/server/compare/@standardnotes/home-server@1.15.71...@standardnotes/home-server@1.15.72) (2023-09-21)
-
-**Note:** Version bump only for package @standardnotes/home-server
-
-## [1.15.71](https://github.com/standardnotes/server/compare/@standardnotes/home-server@1.15.70...@standardnotes/home-server@1.15.71) (2023-09-20)
-
-**Note:** Version bump only for package @standardnotes/home-server
-
-## [1.15.70](https://github.com/standardnotes/server/compare/@standardnotes/home-server@1.15.69...@standardnotes/home-server@1.15.70) (2023-09-20)
-
-**Note:** Version bump only for package @standardnotes/home-server
-
-## [1.15.69](https://github.com/standardnotes/server/compare/@standardnotes/home-server@1.15.68...@standardnotes/home-server@1.15.69) (2023-09-20)
-
-**Note:** Version bump only for package @standardnotes/home-server
-
-## [1.15.68](https://github.com/standardnotes/server/compare/@standardnotes/home-server@1.15.67...@standardnotes/home-server@1.15.68) (2023-09-19)
-
-**Note:** Version bump only for package @standardnotes/home-server
-
-## [1.15.67](https://github.com/standardnotes/server/compare/@standardnotes/home-server@1.15.66...@standardnotes/home-server@1.15.67) (2023-09-19)
-
-**Note:** Version bump only for package @standardnotes/home-server
-
-## [1.15.66](https://github.com/standardnotes/server/compare/@standardnotes/home-server@1.15.65...@standardnotes/home-server@1.15.66) (2023-09-19)
-
-**Note:** Version bump only for package @standardnotes/home-server
-
-## [1.15.65](https://github.com/standardnotes/server/compare/@standardnotes/home-server@1.15.64...@standardnotes/home-server@1.15.65) (2023-09-19)
-
-**Note:** Version bump only for package @standardnotes/home-server
-
-## [1.15.64](https://github.com/standardnotes/server/compare/@standardnotes/home-server@1.15.63...@standardnotes/home-server@1.15.64) (2023-09-19)
-
-**Note:** Version bump only for package @standardnotes/home-server
-
-## [1.15.63](https://github.com/standardnotes/server/compare/@standardnotes/home-server@1.15.62...@standardnotes/home-server@1.15.63) (2023-09-19)
-
-**Note:** Version bump only for package @standardnotes/home-server
-
-## [1.15.62](https://github.com/standardnotes/server/compare/@standardnotes/home-server@1.15.61...@standardnotes/home-server@1.15.62) (2023-09-19)
-
-**Note:** Version bump only for package @standardnotes/home-server
-
 ## [1.15.61](https://github.com/standardnotes/server/compare/@standardnotes/home-server@1.15.60...@standardnotes/home-server@1.15.61) (2023-09-18)

 **Note:** Version bump only for package @standardnotes/home-server
--- a/packages/home-server/package.json
+++ b/packages/home-server/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@standardnotes/home-server",
-  "version": "1.16.4",
+  "version": "1.15.61",
  "engines": {
    "node": ">=18.0.0 <21.0.0"
  },
--- a/packages/revisions/CHANGELOG.md
+++ b/packages/revisions/CHANGELOG.md
@@ -3,101 +3,6 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

-## [1.37.1](https://github.com/standardnotes/server/compare/@standardnotes/revisions-server@1.37.0...@standardnotes/revisions-server@1.37.1) (2023-09-25)
-
-**Note:** Version bump only for package @standardnotes/revisions-server
-
-# [1.37.0](https://github.com/standardnotes/server/compare/@standardnotes/revisions-server@1.36.7...@standardnotes/revisions-server@1.37.0) (2023-09-25)
-
-### Features
-
-* add storing paging progress in redis ([9759814](https://github.com/standardnotes/server/commit/9759814f637b8ae25b325e35bc7f5159747980b6))
-
-## [1.36.7](https://github.com/standardnotes/server/compare/@standardnotes/revisions-server@1.36.6...@standardnotes/revisions-server@1.36.7) (2023-09-25)
-
-### Bug Fixes
-
-* remember paging progress on transitioning ([1d73e4f](https://github.com/standardnotes/server/commit/1d73e4f0720d41029af4d4b2b7a10d101add6c82))
-
-## [1.36.6](https://github.com/standardnotes/server/compare/@standardnotes/revisions-server@1.36.5...@standardnotes/revisions-server@1.36.6) (2023-09-22)
-
-### Bug Fixes
-
-* add more logs to transition process ([0562b0a](https://github.com/standardnotes/server/commit/0562b0a621eb878026fbdc0346b6170e815b64bf))
-* remove excessive logs ([15ed1fd](https://github.com/standardnotes/server/commit/15ed1fd789aba306cbec6a23e88d5c1f837dabc0))
-
-## [1.36.5](https://github.com/standardnotes/server/compare/@standardnotes/revisions-server@1.36.4...@standardnotes/revisions-server@1.36.5) (2023-09-22)
-
-### Bug Fixes
-
-* disable cleaning secondary database on transition ([4f4443a](https://github.com/standardnotes/server/commit/4f4443a882f69c2e76ef831ef36347c9c54f31cd))
-* integrity check during transition ([921c30f](https://github.com/standardnotes/server/commit/921c30f6415ef122a7d1af83ffa3f6840a42edba))
-* processing migration optimization ([22540ee](https://github.com/standardnotes/server/commit/22540ee83436b986949127a6923285a702162706))
-
-## [1.36.4](https://github.com/standardnotes/server/compare/@standardnotes/revisions-server@1.36.3...@standardnotes/revisions-server@1.36.4) (2023-09-21)
-
-### Bug Fixes
-
-* **revisions:** add log info about skipping already existing revision ([d0dba1b](https://github.com/standardnotes/server/commit/d0dba1b66df0fb4ab64ede8f0d4e1c4e2a23ad3c))
-
-## [1.36.3](https://github.com/standardnotes/server/compare/@standardnotes/revisions-server@1.36.2...@standardnotes/revisions-server@1.36.3) (2023-09-21)
-
-**Note:** Version bump only for package @standardnotes/revisions-server
-
-## [1.36.2](https://github.com/standardnotes/server/compare/@standardnotes/revisions-server@1.36.1...@standardnotes/revisions-server@1.36.2) (2023-09-21)
-
-### Bug Fixes
-
-* **revisions:** rename revisions table to all users stuck mid-migration process - fixes [#836](https://github.com/standardnotes/server/issues/836) ([#842](https://github.com/standardnotes/server/issues/842)) ([a621cf1](https://github.com/standardnotes/server/commit/a621cf1e3b891c450272e9762e4a71a199ea2932))
-
-## [1.36.1](https://github.com/standardnotes/server/compare/@standardnotes/revisions-server@1.36.0...@standardnotes/revisions-server@1.36.1) (2023-09-21)
-
-### Bug Fixes
-
-* secondary database catch up time ([880db10](https://github.com/standardnotes/server/commit/880db1038a39d4610a2593489a18e207487347a2))
-
-# [1.36.0](https://github.com/standardnotes/server/compare/@standardnotes/revisions-server@1.35.8...@standardnotes/revisions-server@1.36.0) (2023-09-20)
-
-### Features
-
-* add unassigning items and revisions upon shared vault removal ([#839](https://github.com/standardnotes/server/issues/839)) ([378eced](https://github.com/standardnotes/server/commit/378ecedfcc4fb23475c2329fb37479edb3b48a39))
-
-## [1.35.8](https://github.com/standardnotes/server/compare/@standardnotes/revisions-server@1.35.7...@standardnotes/revisions-server@1.35.8) (2023-09-20)
-
-**Note:** Version bump only for package @standardnotes/revisions-server
-
-## [1.35.7](https://github.com/standardnotes/server/compare/@standardnotes/revisions-server@1.35.6...@standardnotes/revisions-server@1.35.7) (2023-09-19)
-
-### Bug Fixes
-
-* skip removing already existing content in secondary to pick up where the transition left of ([857c6af](https://github.com/standardnotes/server/commit/857c6af9468ec829ff4dce9a96ba7bf9c14d55a5))
-
-## [1.35.6](https://github.com/standardnotes/server/compare/@standardnotes/revisions-server@1.35.5...@standardnotes/revisions-server@1.35.6) (2023-09-19)
-
-### Bug Fixes
-
-* increase timeout for secondary database to catch up for indexes to be rebuilt ([b265a39](https://github.com/standardnotes/server/commit/b265a39b635373c36ee8c3d8e09f0631159b3574))
-* logs verbosity during transitions ([e589029](https://github.com/standardnotes/server/commit/e589029722ab9f4debc8aa6cc78913f877eda2e3))
-
-## [1.35.5](https://github.com/standardnotes/server/compare/@standardnotes/revisions-server@1.35.4...@standardnotes/revisions-server@1.35.5) (2023-09-19)
-
-### Bug Fixes
-
-* add checking for secondary items logs ([a1a3e9f](https://github.com/standardnotes/server/commit/a1a3e9f586358b943b1b490a1382e42f081f7d06))
-* logs for removing already existing content and paging through diff of the content ([a40b17b](https://github.com/standardnotes/server/commit/a40b17b141f1d5954e1a45b969d5a941386c68d0))
-
-## [1.35.4](https://github.com/standardnotes/server/compare/@standardnotes/revisions-server@1.35.3...@standardnotes/revisions-server@1.35.4) (2023-09-19)
-
-### Bug Fixes
-
-* logs formatting during transition for better readability ([0ae028d](https://github.com/standardnotes/server/commit/0ae028db739decec8c50321b18b0af515e00bd23))
-
-## [1.35.3](https://github.com/standardnotes/server/compare/@standardnotes/revisions-server@1.35.2...@standardnotes/revisions-server@1.35.3) (2023-09-19)
-
-### Bug Fixes
-
-* **syncing-server:** paging through already existing items ([e4fcd73](https://github.com/standardnotes/server/commit/e4fcd738c35a4dc96e57db6ca08383a5647d61ad))
-
 ## [1.35.2](https://github.com/standardnotes/server/compare/@standardnotes/revisions-server@1.35.1...@standardnotes/revisions-server@1.35.2) (2023-09-18)

 **Note:** Version bump only for package @standardnotes/revisions-server
--- a/packages/revisions/migrations/mysql/1669636497932-remove-date-indexes.ts
+++ b/packages/revisions/migrations/mysql/1669636497932-remove-date-indexes.ts
@@ -4,8 +4,6 @@ export class removeDateIndexes1669636497932 implements MigrationInterface {
  name = 'removeDateIndexes1669636497932'

  public async up(queryRunner: QueryRunner): Promise<void> {
-    await this.renameRevisionsTable(queryRunner)
-
    const indexRevisionsOnCreatedAt = await queryRunner.manager.query(
      'SHOW INDEX FROM `revisions_revisions` where `key_name` = "created_at"',
    )
@@ -27,14 +25,4 @@ export class removeDateIndexes1669636497932 implements MigrationInterface {
    await queryRunner.query('CREATE INDEX `creation_date` ON `revisions_revisions` (`creation_date`)')
    await queryRunner.query('CREATE INDEX `created_at` ON `revisions_revisions` (`created_at`)')
  }
-
-  private async renameRevisionsTable(queryRunner: QueryRunner) {
-    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`')
-    }
-  }
 }
--- a/packages/revisions/migrations/mysql/1669735585016-make-user-uuid-nullable.ts
+++ b/packages/revisions/migrations/mysql/1669735585016-make-user-uuid-nullable.ts
@@ -4,22 +4,10 @@ export class makeUserUuidNullable1669735585016 implements MigrationInterface {
  name = 'makeUserUuidNullable1669735585016'

  public async up(queryRunner: QueryRunner): Promise<void> {
-    await this.renameRevisionsTable(queryRunner)
-
    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_revisions` CHANGE `user_uuid` `user_uuid` varchar(36) NOT NULL')
  }
-
-  private async renameRevisionsTable(queryRunner: QueryRunner) {
-    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`')
-    }
-  }
 }
--- a/packages/revisions/migrations/mysql/1693915383950-add-shared-vault-information.ts
+++ b/packages/revisions/migrations/mysql/1693915383950-add-shared-vault-information.ts
@@ -2,8 +2,6 @@ import { MigrationInterface, QueryRunner } from 'typeorm'

 export class AddSharedVaultInformation1693915383950 implements MigrationInterface {
  public async up(queryRunner: QueryRunner): Promise<void> {
-    await this.renameRevisionsTable(queryRunner)
-
    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')
@@ -18,14 +16,4 @@ export class AddSharedVaultInformation1693915383950 implements MigrationInterfac
    await queryRunner.query('ALTER TABLE `revisions_revisions` DROP COLUMN `shared_vault_uuid`')
    await queryRunner.query('ALTER TABLE `revisions_revisions` DROP COLUMN `last_edited_by`')
  }
-
-  private async renameRevisionsTable(queryRunner: QueryRunner) {
-    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`')
-    }
-  }
 }
--- a/packages/revisions/package.json
+++ b/packages/revisions/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@standardnotes/revisions-server",
-  "version": "1.37.1",
+  "version": "1.35.2",
  "engines": {
    "node": ">=18.0.0 <21.0.0"
  },
@@ -41,7 +41,6 @@
    "express": "^4.18.2",
    "inversify": "^6.0.1",
    "inversify-express-utils": "^6.4.3",
-    "ioredis": "^5.3.2",
    "mongodb": "^6.0.0",
    "mysql2": "^3.0.1",
    "reflect-metadata": "0.1.13",
@@ -53,7 +52,6 @@
    "@types/cors": "^2.8.9",
    "@types/dotenv": "^8.2.0",
    "@types/express": "^4.17.14",
-    "@types/ioredis": "^5.0.0",
    "@types/jest": "^29.5.1",
    "@types/node": "^20.5.7",
    "@typescript-eslint/eslint-plugin": "^6.5.0",
--- a/packages/revisions/src/Bootstrap/Container.ts
+++ b/packages/revisions/src/Bootstrap/Container.ts
@@ -1,5 +1,4 @@
 import { ControllerContainer, ControllerContainerInterface, MapperInterface } from '@standardnotes/domain-core'
-import Redis from 'ioredis'
 import { Container, interfaces } from 'inversify'
 import { MongoRepository, Repository } from 'typeorm'
 import * as winston from 'winston'
@@ -68,9 +67,6 @@ import { SQLRevisionPersistenceMapper } from '../Mapping/Persistence/SQL/SQLRevi
 import { RemoveRevisionsFromSharedVault } from '../Domain/UseCase/RemoveRevisionsFromSharedVault/RemoveRevisionsFromSharedVault'
 import { ItemRemovedFromSharedVaultEventHandler } from '../Domain/Handler/ItemRemovedFromSharedVaultEventHandler'
 import { TransitionRequestedEventHandler } from '../Domain/Handler/TransitionRequestedEventHandler'
-import { SharedVaultRemovedEventHandler } from '../Domain/Handler/SharedVaultRemovedEventHandler'
-import { TransitionRepositoryInterface } from '../Domain/Transition/TransitionRepositoryInterface'
-import { RedisTransitionRepository } from '../Infra/Redis/RedisTransitionRepository'

 export class ContainerConfigLoader {
  constructor(private mode: 'server' | 'worker' = 'server') {}
@@ -91,28 +87,11 @@ export class ContainerConfigLoader {
    const isConfiguredForSelfHosting = env.get('MODE', true) === 'self-hosted'
    const isConfiguredForHomeServerOrSelfHosting = isConfiguredForHomeServer || isConfiguredForSelfHosting
    const isSecondaryDatabaseEnabled = env.get('SECONDARY_DB_ENABLED', true) === 'true'
-    const isConfiguredForInMemoryCache = env.get('CACHE_TYPE', true) === 'memory'

    const container = new Container({
      defaultScope: 'Singleton',
    })

-    if (!isConfiguredForInMemoryCache) {
-      const redisUrl = env.get('REDIS_URL')
-      const isRedisInClusterMode = redisUrl.indexOf(',') > 0
-      let redis
-      if (isRedisInClusterMode) {
-        redis = new Redis.Cluster(redisUrl.split(','))
-      } else {
-        redis = new Redis(redisUrl)
-      }
-
-      container.bind(TYPES.Revisions_Redis).toConstantValue(redis)
-      container
-        .bind<TransitionRepositoryInterface>(TYPES.Revisions_TransitionStatusRepository)
-        .toConstantValue(new RedisTransitionRepository(container.get<Redis>(TYPES.Revisions_Redis)))
-    }
-
    let logger: winston.Logger
    if (configuration?.logger) {
      logger = configuration.logger as winston.Logger
@@ -368,9 +347,6 @@ export class ContainerConfigLoader {
          isSecondaryDatabaseEnabled
            ? container.get<RevisionRepositoryInterface>(TYPES.Revisions_MongoDBRevisionRepository)
            : null,
-          isConfiguredForInMemoryCache
-            ? null
-            : container.get<TransitionRepositoryInterface>(TYPES.Revisions_TransitionStatusRepository),
          container.get<TimerInterface>(TYPES.Revisions_Timer),
          container.get<winston.Logger>(TYPES.Revisions_Logger),
          env.get('MIGRATION_BATCH_SIZE', true) ? +env.get('MIGRATION_BATCH_SIZE', true) : 100,
@@ -380,9 +356,7 @@ export class ContainerConfigLoader {
      .bind<RemoveRevisionsFromSharedVault>(TYPES.Revisions_RemoveRevisionsFromSharedVault)
      .toConstantValue(
        new RemoveRevisionsFromSharedVault(
-          isSecondaryDatabaseEnabled
-            ? container.get<RevisionRepositoryInterface>(TYPES.Revisions_MongoDBRevisionRepository)
-            : container.get<RevisionRepositoryInterface>(TYPES.Revisions_SQLRevisionRepository),
+          container.get<RevisionRepositoryResolverInterface>(TYPES.Revisions_RevisionRepositoryResolver),
        ),
      )

@@ -474,14 +448,6 @@ export class ContainerConfigLoader {
          container.get<winston.Logger>(TYPES.Revisions_Logger),
        ),
      )
-    container
-      .bind<SharedVaultRemovedEventHandler>(TYPES.Revisions_SharedVaultRemovedEventHandler)
-      .toConstantValue(
-        new SharedVaultRemovedEventHandler(
-          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)],
@@ -489,7 +455,6 @@ export class ContainerConfigLoader {
      ['REVISIONS_COPY_REQUESTED', container.get(TYPES.Revisions_RevisionsCopyRequestedEventHandler)],
      ['ITEM_REMOVED_FROM_SHARED_VAULT', container.get(TYPES.Revisions_ItemRemovedFromSharedVaultEventHandler)],
      ['TRANSITION_REQUESTED', container.get(TYPES.Revisions_TransitionRequestedEventHandler)],
-      ['SHARED_VAULT_REMOVED', container.get(TYPES.Revisions_SharedVaultRemovedEventHandler)],
    ])

    if (isConfiguredForHomeServer) {
--- a/packages/revisions/src/Bootstrap/Types.ts
+++ b/packages/revisions/src/Bootstrap/Types.ts
@@ -1,7 +1,6 @@
 const TYPES = {
  Revisions_DBConnection: Symbol.for('Revisions_DBConnection'),
  Revisions_Logger: Symbol.for('Revisions_Logger'),
-  Revisions_Redis: Symbol.for('Revisions_Redis'),
  Revisions_SQS: Symbol.for('Revisions_SQS'),
  Revisions_SNS: Symbol.for('Revisions_SNS'),
  Revisions_S3: Symbol.for('Revisions_S3'),
@@ -28,7 +27,6 @@ const TYPES = {
  Revisions_MongoDBRevisionRepository: Symbol.for('Revisions_MongoDBRevisionRepository'),
  Revisions_DumpRepository: Symbol.for('Revisions_DumpRepository'),
  Revisions_RevisionRepositoryResolver: Symbol.for('Revisions_RevisionRepositoryResolver'),
-  Revisions_TransitionStatusRepository: Symbol.for('Revisions_TransitionStatusRepository'),
  // env vars
  Revisions_AUTH_JWT_SECRET: Symbol.for('Revisions_AUTH_JWT_SECRET'),
  Revisions_SQS_QUEUE_URL: Symbol.for('Revisions_SQS_QUEUE_URL'),
@@ -59,7 +57,6 @@ const TYPES = {
  Revisions_RevisionsCopyRequestedEventHandler: Symbol.for('Revisions_RevisionsCopyRequestedEventHandler'),
  Revisions_ItemRemovedFromSharedVaultEventHandler: Symbol.for('Revisions_ItemRemovedFromSharedVaultEventHandler'),
  Revisions_TransitionRequestedEventHandler: Symbol.for('Revisions_TransitionRequestedEventHandler'),
-  Revisions_SharedVaultRemovedEventHandler: Symbol.for('Revisions_SharedVaultRemovedEventHandler'),
  // Services
  Revisions_CrossServiceTokenDecoder: Symbol.for('Revisions_CrossServiceTokenDecoder'),
  Revisions_DomainEventSubscriberFactory: Symbol.for('Revisions_DomainEventSubscriberFactory'),
--- a/packages/revisions/src/Domain/Handler/ItemRemovedFromSharedVaultEventHandler.ts
+++ b/packages/revisions/src/Domain/Handler/ItemRemovedFromSharedVaultEventHandler.ts
@@ -9,15 +9,10 @@ export class ItemRemovedFromSharedVaultEventHandler implements DomainEventHandle
  ) {}

  async handle(event: ItemRemovedFromSharedVaultEvent): Promise<void> {
-    if (!event.payload.itemUuid) {
-      this.logger.error('ItemRemovedFromSharedVaultEvent is missing itemUuid')
-
-      return
-    }
-
    const result = await this.removeRevisionsFromSharedVault.execute({
      sharedVaultUuid: event.payload.sharedVaultUuid,
      itemUuid: event.payload.itemUuid,
+      roleNames: event.payload.roleNames,
    })

    if (result.isFailed()) {
--- a/packages/revisions/src/Domain/Handler/SharedVaultRemovedEventHandler.ts
+++ b/packages/revisions/src/Domain/Handler/SharedVaultRemovedEventHandler.ts
@@ -1,21 +0,0 @@
-import { DomainEventHandlerInterface, SharedVaultRemovedEvent } from '@standardnotes/domain-events'
-import { Logger } from 'winston'
-
-import { RemoveRevisionsFromSharedVault } from '../UseCase/RemoveRevisionsFromSharedVault/RemoveRevisionsFromSharedVault'
-
-export class SharedVaultRemovedEventHandler implements DomainEventHandlerInterface {
-  constructor(
-    private removeRevisionsFromSharedVault: RemoveRevisionsFromSharedVault,
-    private logger: Logger,
-  ) {}
-
-  async handle(event: SharedVaultRemovedEvent): Promise<void> {
-    const result = await this.removeRevisionsFromSharedVault.execute({
-      sharedVaultUuid: event.payload.sharedVaultUuid,
-    })
-
-    if (result.isFailed()) {
-      this.logger.error(`Failed to remove revisions from shared vault: ${result.getError()}`)
-    }
-  }
-}
--- a/packages/revisions/src/Domain/Handler/TransitionRequestedEventHandler.ts
+++ b/packages/revisions/src/Domain/Handler/TransitionRequestedEventHandler.ts
@@ -29,7 +29,7 @@ export class TransitionRequestedEventHandler implements DomainEventHandlerInterf
    }

    if (await this.isAlreadyMigrated(userUuid)) {
-      this.logger.info(`[${event.payload.userUuid}] User already migrated.`)
+      this.logger.info(`User ${event.payload.userUuid} already migrated.`)

      await this.domainEventPublisher.publish(
        this.domainEventFactory.createTransitionStatusUpdatedEvent({
@@ -43,7 +43,7 @@ export class TransitionRequestedEventHandler implements DomainEventHandlerInterf
      return
    }

-    this.logger.info(`[${event.payload.userUuid}] Handling transition requested event`)
+    this.logger.info(`Handling transition requested event for user ${event.payload.userUuid}`)

    await this.domainEventPublisher.publish(
      this.domainEventFactory.createTransitionStatusUpdatedEvent({
@@ -59,7 +59,7 @@ export class TransitionRequestedEventHandler implements DomainEventHandlerInterf
    })

    if (result.isFailed()) {
-      this.logger.error(`[${event.payload.userUuid}] Failed to transition: ${result.getError()}`)
+      this.logger.error(`Failed to transition for user ${event.payload.userUuid}`)

      await this.domainEventPublisher.publish(
        this.domainEventFactory.createTransitionStatusUpdatedEvent({
@@ -88,7 +88,7 @@ export class TransitionRequestedEventHandler implements DomainEventHandlerInterf

    if (totalRevisionsCountForUserInPrimary > 0) {
      this.logger.info(
-        `[${userUuid.value}] User has ${totalRevisionsCountForUserInPrimary} revisions in primary database.`,
+        `User ${userUuid.value} has ${totalRevisionsCountForUserInPrimary} revisions in primary database.`,
      )
    }

@@ -98,7 +98,9 @@ export class TransitionRequestedEventHandler implements DomainEventHandlerInterf
  private async getUserUuidFromEvent(event: TransitionRequestedEvent): Promise<Uuid | null> {
    const userUuidOrError = Uuid.create(event.payload.userUuid)
    if (userUuidOrError.isFailed()) {
-      this.logger.error(`[${event.payload.userUuid}] Failed to transition revisions: ${userUuidOrError.getError()}`)
+      this.logger.error(
+        `Failed to transition revisions for user ${event.payload.userUuid}: ${userUuidOrError.getError()}`,
+      )
      await this.domainEventPublisher.publish(
        this.domainEventFactory.createTransitionStatusUpdatedEvent({
          userUuid: event.payload.userUuid,
--- a/packages/revisions/src/Domain/Revision/RevisionRepositoryInterface.ts
+++ b/packages/revisions/src/Domain/Revision/RevisionRepositoryInterface.ts
@@ -13,5 +13,5 @@ export interface RevisionRepositoryInterface {
  updateUserUuid(itemUuid: Uuid, userUuid: Uuid): Promise<void>
  findByUserUuid(dto: { userUuid: Uuid; offset?: number; limit?: number }): Promise<Array<Revision>>
  insert(revision: Revision): Promise<boolean>
-  clearSharedVaultAndKeySystemAssociations(dto: { itemUuid?: Uuid; sharedVaultUuid: Uuid }): Promise<void>
+  clearSharedVaultAndKeySystemAssociations(itemUuid: Uuid, sharedVaultUuid: Uuid): Promise<void>
 }
--- a/packages/revisions/src/Domain/Transition/TransitionRepositoryInterface.ts
+++ b/packages/revisions/src/Domain/Transition/TransitionRepositoryInterface.ts
@@ -1,4 +0,0 @@
-export interface TransitionRepositoryInterface {
-  getPagingProgress(userUuid: string): Promise<number>
-  setPagingProgress(userUuid: string, progress: number): Promise<void>
-}
--- a/packages/revisions/src/Domain/UseCase/RemoveRevisionsFromSharedVault/RemoveRevisionsFromSharedVault.spec.ts
+++ b/packages/revisions/src/Domain/UseCase/RemoveRevisionsFromSharedVault/RemoveRevisionsFromSharedVault.spec.ts
@@ -1,14 +1,19 @@
 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(revisionRepository)
+  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 () => {
@@ -17,16 +22,7 @@ describe('RemoveRevisionsFromSharedVault', () => {
    await useCase.execute({
      itemUuid: '00000000-0000-0000-0000-000000000000',
      sharedVaultUuid: '00000000-0000-0000-0000-000000000001',
-    })
-
-    expect(revisionRepository.clearSharedVaultAndKeySystemAssociations).toHaveBeenCalled()
-  })
-
-  it('should clear shared vault and key system associations for all items in a vault when item uuid is not provided', async () => {
-    const useCase = createUseCase()
-
-    await useCase.execute({
-      sharedVaultUuid: '00000000-0000-0000-0000-000000000001',
+      roleNames: ['CORE_USER'],
    })

    expect(revisionRepository.clearSharedVaultAndKeySystemAssociations).toHaveBeenCalled()
@@ -38,6 +34,7 @@ describe('RemoveRevisionsFromSharedVault', () => {
    const result = await useCase.execute({
      itemUuid: '00000000-0000-0000-0000-000000000000',
      sharedVaultUuid: 'invalid',
+      roleNames: ['CORE_USER'],
    })

    expect(result.isFailed()).toBe(true)
@@ -49,6 +46,19 @@ describe('RemoveRevisionsFromSharedVault', () => {
    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)
--- a/packages/revisions/src/Domain/UseCase/RemoveRevisionsFromSharedVault/RemoveRevisionsFromSharedVault.ts
+++ b/packages/revisions/src/Domain/UseCase/RemoveRevisionsFromSharedVault/RemoveRevisionsFromSharedVault.ts
@@ -1,10 +1,9 @@
-import { Result, UseCaseInterface, Uuid } from '@standardnotes/domain-core'
-
+import { Result, RoleNameCollection, UseCaseInterface, Uuid } from '@standardnotes/domain-core'
+import { RevisionRepositoryResolverInterface } from '../../Revision/RevisionRepositoryResolverInterface'
 import { RemoveRevisionsFromSharedVaultDTO } from './RemoveRevisionsFromSharedVaultDTO'
-import { RevisionRepositoryInterface } from '../../Revision/RevisionRepositoryInterface'

 export class RemoveRevisionsFromSharedVault implements UseCaseInterface<void> {
-  constructor(private revisionRepository: RevisionRepositoryInterface) {}
+  constructor(private revisionRepositoryResolver: RevisionRepositoryResolverInterface) {}

  async execute(dto: RemoveRevisionsFromSharedVaultDTO): Promise<Result<void>> {
    const sharedVaultUuidOrError = Uuid.create(dto.sharedVaultUuid)
@@ -13,19 +12,21 @@ export class RemoveRevisionsFromSharedVault implements UseCaseInterface<void> {
    }
    const sharedVaultUuid = sharedVaultUuidOrError.getValue()

-    let itemUuid: Uuid | undefined
-    if (dto.itemUuid !== undefined) {
-      const itemUuidOrError = Uuid.create(dto.itemUuid)
-      if (itemUuidOrError.isFailed()) {
-        return Result.fail(itemUuidOrError.getError())
-      }
-      itemUuid = itemUuidOrError.getValue()
+    const itemUuidOrError = Uuid.create(dto.itemUuid)
+    if (itemUuidOrError.isFailed()) {
+      return Result.fail(itemUuidOrError.getError())
    }
+    const itemUuid = itemUuidOrError.getValue()

-    await this.revisionRepository.clearSharedVaultAndKeySystemAssociations({
-      itemUuid,
-      sharedVaultUuid,
-    })
+    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()
  }
--- a/packages/revisions/src/Domain/UseCase/RemoveRevisionsFromSharedVault/RemoveRevisionsFromSharedVaultDTO.ts
+++ b/packages/revisions/src/Domain/UseCase/RemoveRevisionsFromSharedVault/RemoveRevisionsFromSharedVaultDTO.ts
@@ -1,4 +1,5 @@
 export interface RemoveRevisionsFromSharedVaultDTO {
-  itemUuid?: string
+  itemUuid: string
  sharedVaultUuid: string
+  roleNames: string[]
 }
--- a/packages/revisions/src/Domain/UseCase/Transition/TransitionRevisionsFromPrimaryToSecondaryDatabaseForUser/TransitionRevisionsFromPrimaryToSecondaryDatabaseForUser.ts
+++ b/packages/revisions/src/Domain/UseCase/Transition/TransitionRevisionsFromPrimaryToSecondaryDatabaseForUser/TransitionRevisionsFromPrimaryToSecondaryDatabaseForUser.ts
@@ -5,62 +5,108 @@ import { Logger } from 'winston'

 import { TransitionRevisionsFromPrimaryToSecondaryDatabaseForUserDTO } from './TransitionRevisionsFromPrimaryToSecondaryDatabaseForUserDTO'
 import { RevisionRepositoryInterface } from '../../../Revision/RevisionRepositoryInterface'
-import { TransitionRepositoryInterface } from '../../../Transition/TransitionRepositoryInterface'
+import { Revision } from '../../../Revision/Revision'

 export class TransitionRevisionsFromPrimaryToSecondaryDatabaseForUser implements UseCaseInterface<void> {
  constructor(
    private primaryRevisionsRepository: RevisionRepositoryInterface,
    private secondRevisionsRepository: RevisionRepositoryInterface | null,
-    private transitionStatusRepository: TransitionRepositoryInterface | null,
    private timer: TimerInterface,
    private logger: Logger,
    private pageSize: number,
  ) {}

  async execute(dto: TransitionRevisionsFromPrimaryToSecondaryDatabaseForUserDTO): Promise<Result<void>> {
-    this.logger.info(`[${dto.userUuid}] Transitioning revisions for user`)
+    this.logger.info(`Transitioning revisions for user ${dto.userUuid}`)

    if (this.secondRevisionsRepository === null) {
      return Result.fail('Secondary revision repository is not set')
    }

-    if (this.transitionStatusRepository === null) {
-      return Result.fail('Transition status repository is not set')
-    }
-
    const userUuidOrError = Uuid.create(dto.userUuid)
    if (userUuidOrError.isFailed()) {
      return Result.fail(userUuidOrError.getError())
    }
    const userUuid = userUuidOrError.getValue()

-    const migrationTimeStart = this.timer.getTimestampInMicroseconds()
+    let newRevisionsInSecondaryCount = 0
+    let updatedRevisionsInSecondary: Revision[] = []
+    if (await this.hasAlreadyDataInSecondaryDatabase(userUuid)) {
+      const { alreadyExistingInPrimary, newRevisionsInSecondary, updatedInSecondary } =
+        await this.getNewRevisionsCreatedInSecondaryDatabase(userUuid)

-    this.logger.info(`[${dto.userUuid}] Migrating revisions`)
+      for (const existingRevision of alreadyExistingInPrimary) {
+        this.logger.info(`Removing revision ${existingRevision.id.toString()} from secondary database`)
+        await (this.secondRevisionsRepository as RevisionRepositoryInterface).removeOneByUuid(
+          Uuid.create(existingRevision.id.toString()).getValue(),
+          userUuid,
+        )
+      }

-    const migrationResult = await this.migrateRevisionsForUser(userUuid)
-    if (migrationResult.isFailed()) {
-      return Result.fail(migrationResult.getError())
+      if (newRevisionsInSecondary.length > 0) {
+        this.logger.info(
+          `Found ${newRevisionsInSecondary.length} new revisions in secondary database for user ${userUuid.value}`,
+        )
+      }
+
+      newRevisionsInSecondaryCount = newRevisionsInSecondary.length
+
+      if (updatedInSecondary.length > 0) {
+        this.logger.info(
+          `Found ${updatedInSecondary.length} updated revisions in secondary database for user ${userUuid.value}`,
+        )
+      }
+
+      updatedRevisionsInSecondary = updatedInSecondary
    }
-    const revisionsToSkipInIntegrityCheck = migrationResult.getValue()

-    this.logger.info(`[${dto.userUuid}] Revisions migrated`)
+    const updatedRevisionsInSecondaryCount = updatedRevisionsInSecondary.length

    await this.allowForSecondaryDatabaseToCatchUp()

-    this.logger.info(`[${dto.userUuid}] Checking integrity between primary and secondary database`)
+    const migrationTimeStart = this.timer.getTimestampInMicroseconds()
+
+    this.logger.debug(`Transitioning revisions for user ${userUuid.value}`)
+
+    const migrationResult = await this.migrateRevisionsForUser(userUuid, updatedRevisionsInSecondary)
+    if (migrationResult.isFailed()) {
+      if (newRevisionsInSecondaryCount === 0 && updatedRevisionsInSecondaryCount === 0) {
+        const cleanupResult = await this.deleteRevisionsForUser(userUuid, this.secondRevisionsRepository)
+        if (cleanupResult.isFailed()) {
+          this.logger.error(
+            `Failed to clean up secondary database revisions for user ${userUuid.value}: ${cleanupResult.getError()}`,
+          )
+        }
+      }
+
+      return Result.fail(migrationResult.getError())
+    }
+
+    await this.allowForSecondaryDatabaseToCatchUp()

    const integrityCheckResult = await this.checkIntegrityBetweenPrimaryAndSecondaryDatabase(
      userUuid,
-      revisionsToSkipInIntegrityCheck,
+      newRevisionsInSecondaryCount,
+      updatedRevisionsInSecondary,
    )
    if (integrityCheckResult.isFailed()) {
+      if (newRevisionsInSecondaryCount === 0 && updatedRevisionsInSecondaryCount === 0) {
+        const cleanupResult = await this.deleteRevisionsForUser(userUuid, this.secondRevisionsRepository)
+        if (cleanupResult.isFailed()) {
+          this.logger.error(
+            `Failed to clean up secondary database revisions for user ${userUuid.value}: ${cleanupResult.getError()}`,
+          )
+        }
+      }
+
      return Result.fail(integrityCheckResult.getError())
    }

    const cleanupResult = await this.deleteRevisionsForUser(userUuid, this.primaryRevisionsRepository)
    if (cleanupResult.isFailed()) {
-      this.logger.error(`[${dto.userUuid}] Failed to clean up primary database revisions: ${cleanupResult.getError()}`)
+      this.logger.error(
+        `Failed to clean up primary database revisions for user ${userUuid.value}: ${cleanupResult.getError()}`,
+      )
    }

    const migrationTimeEnd = this.timer.getTimestampInMicroseconds()
@@ -69,29 +115,21 @@ export class TransitionRevisionsFromPrimaryToSecondaryDatabaseForUser implements
    const migrationDurationTimeStructure = this.timer.convertMicrosecondsToTimeStructure(migrationDuration)

    this.logger.info(
-      `[${dto.userUuid}] Transitioned revisions in ${migrationDurationTimeStructure.hours}h ${migrationDurationTimeStructure.minutes}m ${migrationDurationTimeStructure.seconds}s ${migrationDurationTimeStructure.milliseconds}ms`,
+      `Transitioned revisions for user ${userUuid.value} in ${migrationDurationTimeStructure.hours}h ${migrationDurationTimeStructure.minutes}m ${migrationDurationTimeStructure.seconds}s ${migrationDurationTimeStructure.milliseconds}ms`,
    )

    return Result.ok()
  }

-  private async migrateRevisionsForUser(userUuid: Uuid): Promise<Result<string[]>> {
+  private async migrateRevisionsForUser(
+    userUuid: Uuid,
+    updatedRevisionsInSecondary: Revision[],
+  ): Promise<Result<void>> {
    try {
-      const initialPage = await (this.transitionStatusRepository as TransitionRepositoryInterface).getPagingProgress(
-        userUuid.value,
-      )
-
-      this.logger.info(`[${userUuid.value}] Migrating from page ${initialPage}`)
-
      const totalRevisionsCountForUser = await this.primaryRevisionsRepository.countByUserUuid(userUuid)
+      let totalRevisionsCountTransitionedToSecondary = 0
      const totalPages = Math.ceil(totalRevisionsCountForUser / this.pageSize)
-      const revisionsToSkipInIntegrityCheck = []
-      for (let currentPage = initialPage; currentPage <= totalPages; currentPage++) {
-        await (this.transitionStatusRepository as TransitionRepositoryInterface).setPagingProgress(
-          userUuid.value,
-          currentPage,
-        )
-
+      for (let currentPage = 1; currentPage <= totalPages; currentPage++) {
        const query = {
          userUuid: userUuid,
          offset: (currentPage - 1) * this.pageSize,
@@ -99,44 +137,34 @@ export class TransitionRevisionsFromPrimaryToSecondaryDatabaseForUser implements
        }

        const revisions = await this.primaryRevisionsRepository.findByUserUuid(query)
+
        for (const revision of revisions) {
          try {
-            const revisionInSecondary = await (
-              this.secondRevisionsRepository as RevisionRepositoryInterface
-            ).findOneByUuid(Uuid.create(revision.id.toString()).getValue(), revision.props.userUuid as Uuid, [])
-
-            if (revisionInSecondary !== null) {
-              if (revisionInSecondary.isIdenticalTo(revision)) {
-                continue
-              }
-              if (revisionInSecondary.props.dates.updatedAt > revision.props.dates.updatedAt) {
-                this.logger.info(
-                  `[${userUuid.value}] Revision ${revision.id.toString()} is older than revision in secondary database`,
-                )
-                revisionsToSkipInIntegrityCheck.push(revision.id.toString())
-
-                continue
-              }
-
+            if (
+              updatedRevisionsInSecondary.find(
+                (updatedRevision) => updatedRevision.id.toString() === revision.id.toString(),
+              )
+            ) {
              this.logger.info(
-                `[${
-                  userUuid.value
-                }] Removing revision ${revision.id.toString()} in secondary database as it is not identical to revision in primary database`,
+                `Skipping saving revision ${revision.id.toString()} as it was updated in secondary database`,
              )

-              await (this.secondRevisionsRepository as RevisionRepositoryInterface).removeOneByUuid(
-                Uuid.create(revisionInSecondary.id.toString()).getValue(),
-                revisionInSecondary.props.userUuid as Uuid,
-              )
-              await this.allowForSecondaryDatabaseToCatchUp()
+              continue
            }

+            this.logger.debug(
+              `Transitioning revision #${
+                totalRevisionsCountTransitionedToSecondary + 1
+              }: ${revision.id.toString()} to secondary database`,
+            )
+
            const didSave = await (this.secondRevisionsRepository as RevisionRepositoryInterface).insert(revision)
            if (!didSave) {
-              this.logger.error(`Failed to save revision ${revision.id.toString()} to secondary database`)
+              return Result.fail(`Failed to save revision ${revision.id.toString()} to secondary database`)
            }
+            totalRevisionsCountTransitionedToSecondary++
          } catch (error) {
-            this.logger.error(
+            return Result.fail(
              `Errored when saving revision ${revision.id.toString()} to secondary database: ${
                (error as Error).message
              }`,
@@ -145,7 +173,9 @@ export class TransitionRevisionsFromPrimaryToSecondaryDatabaseForUser implements
        }
      }

-      return Result.ok(revisionsToSkipInIntegrityCheck)
+      this.logger.debug(`Transitioned ${totalRevisionsCountTransitionedToSecondary} revisions to secondary database`)
+
+      return Result.ok()
    } catch (error) {
      return Result.fail(`Errored when migrating revisions for user ${userUuid.value}: ${(error as Error).message}`)
    }
@@ -156,8 +186,6 @@ export class TransitionRevisionsFromPrimaryToSecondaryDatabaseForUser implements
    revisionRepository: RevisionRepositoryInterface,
  ): Promise<Result<void>> {
    try {
-      this.logger.info(`[${userUuid.value}] Deleting all revisions from primary database`)
-
      await revisionRepository.removeByUserUuid(userUuid)

      return Result.ok()
@@ -171,21 +199,101 @@ export class TransitionRevisionsFromPrimaryToSecondaryDatabaseForUser implements
    await this.timer.sleep(twoSecondsInMilliseconds)
  }

+  private async hasAlreadyDataInSecondaryDatabase(userUuid: Uuid): Promise<boolean> {
+    const totalRevisionsCountForUserInSecondary = await (
+      this.secondRevisionsRepository as RevisionRepositoryInterface
+    ).countByUserUuid(userUuid)
+
+    const hasAlreadyDataInSecondaryDatabase = totalRevisionsCountForUserInSecondary > 0
+    if (hasAlreadyDataInSecondaryDatabase) {
+      this.logger.info(
+        `User ${userUuid.value} has already ${totalRevisionsCountForUserInSecondary} revisions in secondary database`,
+      )
+    }
+
+    return hasAlreadyDataInSecondaryDatabase
+  }
+
+  private async getNewRevisionsCreatedInSecondaryDatabase(userUuid: Uuid): Promise<{
+    alreadyExistingInPrimary: Revision[]
+    newRevisionsInSecondary: Revision[]
+    updatedInSecondary: Revision[]
+  }> {
+    const revisions = await (this.secondRevisionsRepository as RevisionRepositoryInterface).findByUserUuid({
+      userUuid: userUuid,
+    })
+
+    const alreadyExistingInPrimary: Revision[] = []
+    const newRevisionsInSecondary: Revision[] = []
+    const updatedInSecondary: Revision[] = []
+
+    for (const revision of revisions) {
+      const { revisionInPrimary, newerRevisionInSecondary } =
+        await this.checkIfRevisionExistsInPrimaryDatabase(revision)
+      if (revisionInPrimary !== null) {
+        alreadyExistingInPrimary.push(revision)
+        continue
+      }
+      if (newerRevisionInSecondary !== null) {
+        updatedInSecondary.push(newerRevisionInSecondary)
+        continue
+      }
+      if (revisionInPrimary === null && newerRevisionInSecondary === null) {
+        newRevisionsInSecondary.push(revision)
+        continue
+      }
+    }
+
+    return {
+      alreadyExistingInPrimary: alreadyExistingInPrimary,
+      newRevisionsInSecondary: newRevisionsInSecondary,
+      updatedInSecondary: updatedInSecondary,
+    }
+  }
+
+  private async checkIfRevisionExistsInPrimaryDatabase(
+    revision: Revision,
+  ): Promise<{ revisionInPrimary: Revision | null; newerRevisionInSecondary: Revision | null }> {
+    const revisionInPrimary = await this.primaryRevisionsRepository.findOneByUuid(
+      Uuid.create(revision.id.toString()).getValue(),
+      revision.props.userUuid as Uuid,
+      [],
+    )
+
+    if (revisionInPrimary === null) {
+      return {
+        revisionInPrimary: null,
+        newerRevisionInSecondary: null,
+      }
+    }
+
+    if (!revision.isIdenticalTo(revisionInPrimary)) {
+      this.logger.error(
+        `Revision ${revision.id.toString()} is not identical in primary and secondary database. Revision in secondary database: ${JSON.stringify(
+          revision,
+        )}, revision in primary database: ${JSON.stringify(revisionInPrimary)}`,
+      )
+
+      return {
+        revisionInPrimary: null,
+        newerRevisionInSecondary:
+          revision.props.dates.updatedAt > revisionInPrimary.props.dates.updatedAt ? revision : null,
+      }
+    }
+
+    return {
+      revisionInPrimary: revisionInPrimary,
+      newerRevisionInSecondary: null,
+    }
+  }
+
  private async checkIntegrityBetweenPrimaryAndSecondaryDatabase(
    userUuid: Uuid,
-    revisionsToSkipInIntegrityCheck: string[],
+    newRevisionsInSecondaryCount: number,
+    updatedRevisionsInSecondary: Revision[],
  ): Promise<Result<boolean>> {
    try {
      const totalRevisionsCountForUserInPrimary = await this.primaryRevisionsRepository.countByUserUuid(userUuid)
-      const totalRevisionsCountForUserInSecondary = await (
-        this.secondRevisionsRepository as RevisionRepositoryInterface
-      ).countByUserUuid(userUuid)
-
-      if (totalRevisionsCountForUserInPrimary > totalRevisionsCountForUserInSecondary) {
-        return Result.fail(
-          `Total revisions count for user ${userUuid.value} in primary database (${totalRevisionsCountForUserInPrimary}) does not match total revisions count in secondary database (${totalRevisionsCountForUserInSecondary})`,
-        )
-      }

      const totalPages = Math.ceil(totalRevisionsCountForUserInPrimary / this.pageSize)
      for (let currentPage = 1; currentPage <= totalPages; currentPage++) {
@@ -212,7 +320,14 @@ export class TransitionRevisionsFromPrimaryToSecondaryDatabaseForUser implements
            return Result.fail(`Revision ${revision.id.toString()} not found in secondary database`)
          }

-          if (revisionsToSkipInIntegrityCheck.includes(revision.id.toString())) {
+          if (
+            updatedRevisionsInSecondary.find(
+              (updatedRevision) => updatedRevision.id.toString() === revision.id.toString(),
+            )
+          ) {
+            this.logger.info(
+              `Skipping integrity check for revision ${revision.id.toString()} as it was updated in secondary database`,
+            )
            continue
          }

@@ -226,6 +341,19 @@ export class TransitionRevisionsFromPrimaryToSecondaryDatabaseForUser implements
        }
      }

+      const totalRevisionsCountForUserInSecondary = await (
+        this.secondRevisionsRepository as RevisionRepositoryInterface
+      ).countByUserUuid(userUuid)
+
+      if (
+        totalRevisionsCountForUserInPrimary + newRevisionsInSecondaryCount !==
+        totalRevisionsCountForUserInSecondary
+      ) {
+        return Result.fail(
+          `Total revisions count for user ${userUuid.value} in primary database (${totalRevisionsCountForUserInPrimary} + ${newRevisionsInSecondaryCount}) does not match total revisions count in secondary database (${totalRevisionsCountForUserInSecondary})`,
+        )
+      }
+
      return Result.ok()
    } catch (error) {
      return Result.fail(
--- a/packages/revisions/src/Infra/Redis/RedisTransitionRepository.ts
+++ b/packages/revisions/src/Infra/Redis/RedisTransitionRepository.ts
@@ -1,23 +0,0 @@
-import * as IORedis from 'ioredis'
-
-import { TransitionRepositoryInterface } from '../../Domain/Transition/TransitionRepositoryInterface'
-
-export class RedisTransitionRepository implements TransitionRepositoryInterface {
-  private readonly PREFIX = 'transition-revisions-paging-progress'
-
-  constructor(private redisClient: IORedis.Redis) {}
-
-  async getPagingProgress(userUuid: string): Promise<number> {
-    const progress = await this.redisClient.get(`${this.PREFIX}:${userUuid}`)
-
-    if (progress === null) {
-      return 1
-    }
-
-    return parseInt(progress)
-  }
-
-  async setPagingProgress(userUuid: string, progress: number): Promise<void> {
-    await this.redisClient.setex(`${this.PREFIX}:${userUuid}`, 172_800, progress.toString())
-  }
-}
--- a/packages/revisions/src/Infra/TypeORM/MongoDB/MongoDBRevisionRepository.ts
+++ b/packages/revisions/src/Infra/TypeORM/MongoDB/MongoDBRevisionRepository.ts
@@ -1,5 +1,5 @@
 import { MapperInterface, Uuid } from '@standardnotes/domain-core'
-import { MongoRepository, ObjectLiteral } from 'typeorm'
+import { MongoRepository } from 'typeorm'
 import { BSON } from 'mongodb'
 import { Logger } from 'winston'

@@ -16,25 +16,19 @@ export class MongoDBRevisionRepository implements RevisionRepositoryInterface {
    private logger: Logger,
  ) {}

-  async clearSharedVaultAndKeySystemAssociations(dto: { itemUuid?: Uuid; sharedVaultUuid: Uuid }): Promise<void> {
-    let query: ObjectLiteral
-    if (dto.itemUuid !== undefined) {
-      query = {
-        itemUuid: { $eq: dto.itemUuid.value },
-        sharedVaultUuid: { $eq: dto.sharedVaultUuid.value },
-      }
-    } else {
-      query = {
-        sharedVaultUuid: { $eq: dto.sharedVaultUuid.value },
-      }
-    }
-
-    await this.mongoRepository.updateMany(query, {
-      $set: {
-        sharedVaultUuid: null,
-        keySystemIdentifier: null,
+  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> {
--- a/packages/revisions/src/Infra/TypeORM/SQL/SQLLegacyRevisionRepository.ts
+++ b/packages/revisions/src/Infra/TypeORM/SQL/SQLLegacyRevisionRepository.ts
@@ -15,7 +15,7 @@ export class SQLLegacyRevisionRepository implements RevisionRepositoryInterface
    protected logger: Logger,
  ) {}

-  async clearSharedVaultAndKeySystemAssociations(_dto: { itemUuid?: Uuid; sharedVaultUuid: Uuid }): Promise<void> {
+  async clearSharedVaultAndKeySystemAssociations(_itemUuid: Uuid, _sharedVaultUuid: Uuid): Promise<void> {
    this.logger.error('Method clearSharedVaultAndKeySystemAssociations not implemented.')
  }

--- a/packages/revisions/src/Infra/TypeORM/SQL/SQLRevisionRepository.ts
+++ b/packages/revisions/src/Infra/TypeORM/SQL/SQLRevisionRepository.ts
@@ -66,27 +66,19 @@ export class SQLRevisionRepository extends SQLLegacyRevisionRepository {
    return this.revisionMapper.toDomain(sqlRevision)
  }

-  override async clearSharedVaultAndKeySystemAssociations(dto: {
-    itemUuid?: Uuid
-    sharedVaultUuid: Uuid
-  }): Promise<void> {
-    const queryBuilder = this.ormRepository.createQueryBuilder().update().set({
-      sharedVaultUuid: null,
-      keySystemIdentifier: null,
-    })
-
-    if (dto.itemUuid !== undefined) {
-      queryBuilder.where('item_uuid = :itemUuid AND shared_vault_uuid = :sharedVaultUuid', {
-        itemUuid: dto.itemUuid.value,
-        sharedVaultUuid: dto.sharedVaultUuid.value,
+  override async clearSharedVaultAndKeySystemAssociations(itemUuid: Uuid, sharedVaultUuid: Uuid): Promise<void> {
+    await this.ormRepository
+      .createQueryBuilder()
+      .update()
+      .set({
+        sharedVaultUuid: null,
+        keySystemIdentifier: null,
      })
-    } else {
-      queryBuilder.where('shared_vault_uuid = :sharedVaultUuid', {
-        sharedVaultUuid: dto.sharedVaultUuid.value,
+      .where('item_uuid = :itemUuid AND shared_vault_uuid = :sharedVaultUuid', {
+        itemUuid: itemUuid.value,
+        sharedVaultUuid: sharedVaultUuid.value,
      })
-    }
-
-    await queryBuilder.execute()
+      .execute()
  }

  override async findMetadataByItemId(
--- a/Show More
+++ b/Show More