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-06-17 06:45:49 -04:00 · 2023-09-18 12:19:19 +00:00
330 changed files with 2496 additions and 7304 deletions
@@ -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
@@ -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
@@ -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

@@ -38,10 +38,6 @@ jobs:
      run: |
        jq '(.containerDefinitions[] | select(.name=="${{ inputs.service_name }}-prod") | .environment[] | select(.name=="VERSION")).value = "${{ github.sha }}"' task-definition.json > tmp.json && mv tmp.json task-definition.json

-    - name: Fill in the new package version in the Amazon ECS task definition
-      run: |
-        jq '(.containerDefinitions[] | select(.name=="${{ inputs.service_name }}-prod") | .environment[] | select(.name=="npm_package_version")).value = "${{ github.sha }}"' task-definition.json > tmp.json && mv tmp.json task-definition.json
-
    - name: Fill in the new image ID in the Amazon ECS task definition
      id: task-def-prod
      uses: aws-actions/amazon-ecs-render-task-definition@v1
@@ -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: .
@@ -7,10 +7,6 @@ on:
        type: string
        default: latest
        description: The Docker image tag used for SNJS container
-      suite:
-        type: string
-        default: all
-        description: The test suite to run
    secrets:
      DOCKER_USERNAME:
        required: true
@@ -22,16 +18,153 @@ on:
        required: true

 jobs:
-  e2e-self-hosted:
-    uses: standardnotes/server/.github/workflows/e2e-self-hosted.yml@main
-    with:
-      snjs_image_tag: ${{ inputs.snjs_image_tag }}
-      suite: ${{ inputs.suite }}
-    secrets: inherit
+  e2e:
+    name: (Self Hosting) E2E Test Suite
+    strategy:
+      fail-fast: false
+      matrix:
+        secondary_db_enabled: [true, false]
+        transition_mode_enabled: [true, false]
+    runs-on: ubuntu-latest
+
+    services:
+      snjs:
+        image: standardnotes/snjs:${{ inputs.snjs_image_tag }}
+        ports:
+        - 9001:9001
+
+    steps:
+    - uses: actions/checkout@v3
+
+    - name: Set up Node
+      uses: actions/setup-node@v3
+      with:
+        registry-url: 'https://registry.npmjs.org'
+        node-version-file: '.nvmrc'
+
+    - name: Install
+      run: yarn install --immutable
+
+    - name: Run Server
+      run: docker compose -f docker-compose.ci.yml up -d
+      env:
+        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
+
+    - name: Run E2E Test Suite
+      run: yarn dlx mocha-headless-chrome --timeout 3600000 -f http://localhost:9001/mocha/test.html
+
+    - name: Show logs on failure
+      if: ${{ failure() }}
+      run: |
+        echo "# Errors:"
+        tail -n 100 logs/*.err
+        echo "# Logs:"
+        tail -n 100 logs/*.log

  e2e-home-server:
-    uses: standardnotes/server/.github/workflows/e2e-home-server.yml@main
-    with:
-      snjs_image_tag: ${{ inputs.snjs_image_tag }}
-      suite: ${{ inputs.suite }}
-    secrets: inherit
+    name: (Home Server) E2E Test Suite
+    strategy:
+      fail-fast: false
+      matrix:
+        db_type: [mysql, sqlite]
+        cache_type: [redis, memory]
+        secondary_db_enabled: [true, false]
+        transition_mode_enabled: [true, false]
+
+    runs-on: ubuntu-latest
+
+    services:
+      snjs:
+        image: standardnotes/snjs:${{ inputs.snjs_image_tag }}
+        ports:
+        - 9001:9001
+      cache:
+        image: redis
+        ports:
+          - 6379:6379
+      db:
+        image: mysql
+        ports:
+          - 3306:3306
+        env:
+          MYSQL_ROOT_PASSWORD: root
+          MYSQL_DATABASE: standardnotes
+          MYSQL_USER: standardnotes
+          MYSQL_PASSWORD: standardnotes
+      secondary_db:
+        image: mongo:5.0
+        ports:
+          - 27017:27017
+        env:
+          MONGO_INITDB_ROOT_USERNAME: standardnotes
+          MONGO_INITDB_ROOT_PASSWORD: standardnotes
+          MONGO_INITDB_DATABASE: standardnotes
+
+    steps:
+    - uses: actions/checkout@v3
+
+    - name: Set up Node
+      uses: actions/setup-node@v3
+      with:
+        registry-url: 'https://registry.npmjs.org'
+        node-version-file: '.nvmrc'
+
+    - name: Install Dependencies
+      run: yarn install --immutable
+
+    - name: Build
+      run: yarn build
+
+    - name: Copy dotenv file
+      run: cp packages/home-server/.env.sample packages/home-server/.env
+
+    - name: Fill in env variables
+      run: |
+        sed -i "s/JWT_SECRET=/JWT_SECRET=$(openssl rand -hex 32)/g" packages/home-server/.env
+        sed -i "s/AUTH_JWT_SECRET=/AUTH_JWT_SECRET=$(openssl rand -hex 32)/g" packages/home-server/.env
+        sed -i "s/ENCRYPTION_SERVER_KEY=/ENCRYPTION_SERVER_KEY=$(openssl rand -hex 32)/g" packages/home-server/.env
+        sed -i "s/PSEUDO_KEY_PARAMS_KEY=/PSEUDO_KEY_PARAMS_KEY=$(openssl rand -hex 32)/g" packages/home-server/.env
+        sed -i "s/VALET_TOKEN_SECRET=/VALET_TOKEN_SECRET=$(openssl rand -hex 32)/g" packages/home-server/.env
+        echo "ACCESS_TOKEN_AGE=4" >> packages/home-server/.env
+        echo "REFRESH_TOKEN_AGE=10" >> packages/home-server/.env
+        echo "REVISIONS_FREQUENCY=2" >> packages/home-server/.env
+        echo "DB_HOST=localhost" >> packages/home-server/.env
+        echo "DB_PORT=3306" >> packages/home-server/.env
+        echo "DB_DATABASE=standardnotes" >> packages/home-server/.env
+        echo "DB_SQLITE_DATABASE_PATH=homeserver.db" >> packages/home-server/.env
+        echo "DB_USERNAME=standardnotes" >> packages/home-server/.env
+        echo "DB_PASSWORD=standardnotes" >> packages/home-server/.env
+        echo "DB_TYPE=${{ matrix.db_type }}" >> packages/home-server/.env
+        echo "DB_DEBUG_LEVEL=all" >> packages/home-server/.env
+        echo "REDIS_URL=redis://localhost:6379" >> packages/home-server/.env
+        echo "CACHE_TYPE=${{ matrix.cache_type }}" >> packages/home-server/.env
+        echo "SECONDARY_DB_ENABLED=${{ matrix.secondary_db_enabled }}" >> packages/home-server/.env
+        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
+        echo "MONGO_USERNAME=standardnotes" >> packages/home-server/.env
+        echo "MONGO_PASSWORD=standardnotes" >> packages/home-server/.env
+        echo "FILES_SERVER_URL=http://localhost:3123" >> packages/home-server/.env
+        echo "E2E_TESTING=true" >> packages/home-server/.env
+
+    - name: Run Server
+      run: nohup yarn workspace @standardnotes/home-server start > logs/output.log 2>&1 &
+      env:
+        PORT: 3123
+
+    - name: Wait for server to start
+      run: for i in {1..30}; do curl -s http://localhost:3123/healthcheck && break || sleep 1; done
+
+    - name: Run E2E Test Suite
+      run: yarn dlx mocha-headless-chrome --timeout 3600000 -f http://localhost:9001/mocha/test.html
+
+    - name: Show logs on failure
+      if: ${{ failure() }}
+      run: tail -n 500 logs/output.log
@@ -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: .
@@ -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:
@@ -1,128 +0,0 @@
-name: E2E Home Server Test Suite
-
-on:
-  workflow_call:
-    inputs:
-      snjs_image_tag:
-        type: string
-        default: latest
-        description: The Docker image tag used for SNJS container
-      suite:
-        type: string
-        default: all
-        description: The test suite to run
-    secrets:
-      DOCKER_USERNAME:
-        required: true
-      DOCKER_PASSWORD:
-        required: true
-      AWS_ACCESS_KEY_ID:
-        required: true
-      AWS_SECRET_ACCESS_KEY:
-        required: true
-
-jobs:
-  e2e-home-server:
-    name: (Home Server) E2E Test Suite
-    strategy:
-      fail-fast: false
-      matrix:
-        db_type: [mysql, sqlite]
-        cache_type: [redis, memory]
-        secondary_db_enabled: [true, false]
-
-    runs-on: ubuntu-latest
-
-    services:
-      snjs:
-        image: standardnotes/snjs:${{ inputs.snjs_image_tag }}
-        ports:
-        - 9001:9001
-      cache:
-        image: redis
-        ports:
-          - 6379:6379
-      db:
-        image: mysql
-        ports:
-          - 3306:3306
-        env:
-          MYSQL_ROOT_PASSWORD: root
-          MYSQL_DATABASE: standardnotes
-          MYSQL_USER: standardnotes
-          MYSQL_PASSWORD: standardnotes
-      secondary_db:
-        image: mongo:5.0
-        ports:
-          - 27017:27017
-        env:
-          MONGO_INITDB_ROOT_USERNAME: standardnotes
-          MONGO_INITDB_ROOT_PASSWORD: standardnotes
-          MONGO_INITDB_DATABASE: standardnotes
-
-    steps:
-    - uses: actions/checkout@v3
-
-    - name: Set up Node
-      uses: actions/setup-node@v3
-      with:
-        registry-url: 'https://registry.npmjs.org'
-        node-version-file: '.nvmrc'
-
-    - name: Install Dependencies
-      run: yarn install --immutable
-
-    - name: Build
-      run: yarn build
-
-    - name: Copy dotenv file
-      run: cp packages/home-server/.env.sample packages/home-server/.env
-
-    - name: Fill in env variables
-      run: |
-        sed -i "s/JWT_SECRET=/JWT_SECRET=$(openssl rand -hex 32)/g" packages/home-server/.env
-        sed -i "s/AUTH_JWT_SECRET=/AUTH_JWT_SECRET=$(openssl rand -hex 32)/g" packages/home-server/.env
-        sed -i "s/ENCRYPTION_SERVER_KEY=/ENCRYPTION_SERVER_KEY=$(openssl rand -hex 32)/g" packages/home-server/.env
-        sed -i "s/PSEUDO_KEY_PARAMS_KEY=/PSEUDO_KEY_PARAMS_KEY=$(openssl rand -hex 32)/g" packages/home-server/.env
-        sed -i "s/VALET_TOKEN_SECRET=/VALET_TOKEN_SECRET=$(openssl rand -hex 32)/g" packages/home-server/.env
-        echo "ACCESS_TOKEN_AGE=4" >> packages/home-server/.env
-        echo "REFRESH_TOKEN_AGE=10" >> packages/home-server/.env
-        echo "REVISIONS_FREQUENCY=2" >> packages/home-server/.env
-        echo "DB_HOST=localhost" >> packages/home-server/.env
-        echo "DB_PORT=3306" >> packages/home-server/.env
-        echo "DB_DATABASE=standardnotes" >> packages/home-server/.env
-        echo "DB_SQLITE_DATABASE_PATH=homeserver.db" >> packages/home-server/.env
-        echo "DB_USERNAME=standardnotes" >> packages/home-server/.env
-        echo "DB_PASSWORD=standardnotes" >> packages/home-server/.env
-        echo "DB_TYPE=${{ matrix.db_type }}" >> packages/home-server/.env
-        echo "DB_DEBUG_LEVEL=all" >> packages/home-server/.env
-        echo "REDIS_URL=redis://localhost:6379" >> packages/home-server/.env
-        echo "CACHE_TYPE=${{ matrix.cache_type }}" >> packages/home-server/.env
-        echo "SECONDARY_DB_ENABLED=${{ matrix.secondary_db_enabled }}" >> packages/home-server/.env
-        echo "MONGO_HOST=localhost" >> packages/home-server/.env
-        echo "MONGO_PORT=27017" >> packages/home-server/.env
-        echo "MONGO_DATABASE=standardnotes" >> packages/home-server/.env
-        echo "MONGO_USERNAME=standardnotes" >> packages/home-server/.env
-        echo "MONGO_PASSWORD=standardnotes" >> packages/home-server/.env
-        echo "FILES_SERVER_URL=http://localhost:3123" >> packages/home-server/.env
-        echo "E2E_TESTING=true" >> packages/home-server/.env
-
-    - name: Run Server
-      run: nohup yarn workspace @standardnotes/home-server start > logs/output.log 2>&1 &
-      env:
-        PORT: 3123
-
-    - name: Wait for server to start
-      run: for i in {1..30}; do curl -s http://localhost:3123/healthcheck && break || sleep 1; done
-
-    - name: Run E2E Test Suite
-      run: yarn dlx mocha-headless-chrome --timeout 3600000 -f http://localhost:9001/mocha/test.html?suite=${{ inputs.suite }}
-
-    - name: Archive failed run logs
-      if: ${{ failure() }}
-      uses: actions/upload-artifact@v3
-      with:
-        name: home-server-failure-logs-${{ inputs.suite }}-${{ matrix.db_type }}-${{ matrix.cache_type }}-${{ matrix.secondary_db_enabled }}
-        retention-days: 5
-        path: |
-          logs/output.log
@@ -1,72 +0,0 @@
-name: E2E Self Hosted Test Suite
-
-on:
-  workflow_call:
-    inputs:
-      snjs_image_tag:
-        type: string
-        default: latest
-        description: The Docker image tag used for SNJS container
-      suite:
-        type: string
-        default: all
-        description: The test suite to run
-    secrets:
-      DOCKER_USERNAME:
-        required: true
-      DOCKER_PASSWORD:
-        required: true
-      AWS_ACCESS_KEY_ID:
-        required: true
-      AWS_SECRET_ACCESS_KEY:
-        required: true
-
-jobs:
-  e2e:
-    name: (Self Hosting) E2E Test Suite
-    strategy:
-      fail-fast: false
-      matrix:
-        secondary_db_enabled: [true, false]
-    runs-on: ubuntu-latest
-
-    services:
-      snjs:
-        image: standardnotes/snjs:${{ inputs.snjs_image_tag }}
-        ports:
-        - 9001:9001
-
-    steps:
-    - uses: actions/checkout@v3
-
-    - name: Set up Node
-      uses: actions/setup-node@v3
-      with:
-        registry-url: 'https://registry.npmjs.org'
-        node-version-file: '.nvmrc'
-
-    - name: Install
-      run: yarn install --immutable
-
-    - name: Run Server
-      run: docker compose -f docker-compose.ci.yml up -d
-      env:
-        DB_TYPE: mysql
-        CACHE_TYPE: redis
-        SECONDARY_DB_ENABLED: ${{ matrix.secondary_db_enabled }}
-
-    - name: Wait for server to start
-      run: docker/is-available.sh http://localhost:3123 $(pwd)/logs
-
-    - name: Run E2E Test Suite
-      run: yarn dlx mocha-headless-chrome --timeout 3600000 -f http://localhost:9001/mocha/test.html?suite=${{ inputs.suite }}
-
-    - name: Archive failed run logs
-      if: ${{ failure() }}
-      uses: actions/upload-artifact@v3
-      with:
-        name: self-hosted-failure-logs-${{ inputs.suite }}-${{ matrix.secondary_db_enabled }}
-        retention-days: 5
-        path: |
-          logs/*.err
-          logs/*.log
@@ -1,6 +1,6 @@
-name: E2E Test Suite
+name: E2E Test Suite On Self Hosted Server

-run-name: E2E ${{ inputs.suite }} Test Suite against ${{ inputs.ref_name }} by ${{ inputs.author }}
+run-name: E2E Test Suite against ${{ inputs.ref_name }} by ${{ inputs.author }}

 on:
  schedule:
@@ -11,10 +11,6 @@ on:
        type: string
        default: latest
        description: The Docker image tag used for SNJS container
-      suite:
-        type: string
-        default: all
-        description: The test suite to run
      author:
        type: string
        default: unknown
@@ -30,5 +26,4 @@ jobs:
    uses: standardnotes/server/.github/workflows/common-e2e.yml@main
    with:
      snjs_image_tag: ${{ inputs.snjs_image_tag || 'latest' }}
-      suite: ${{ inputs.suite || 'all' }}
    secrets: inherit
@@ -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

@@ -95,20 +95,9 @@ jobs:
    - name: Test
      run: yarn test

-  e2e-base:
+  e2e:
    needs: build
-    name: E2E Base Suite
-    uses: standardnotes/server/.github/workflows/common-e2e.yml@main
-    with:
-      snjs_image_tag: 'latest'
-      suite: 'base'
-    secrets: inherit

-  # e2e-vaults:
-  #   needs: build
-  #   name: E2E Vaults Suite
-  #   uses: standardnotes/server/.github/workflows/common-e2e.yml@main
-  #   with:
-  #     snjs_image_tag: 'latest'
-  #     suite: 'vaults'
-  #   secrets: inherit
+    name: E2E
+    uses: standardnotes/server/.github/workflows/common-e2e.yml@main
+    secrets: inherit
@@ -95,32 +95,20 @@ jobs:
    - name: Test
      run: yarn test

-  e2e-base:
+  e2e:
    needs: build
-    name: E2E Base Suite
+    name: E2E
    uses: standardnotes/server/.github/workflows/common-e2e.yml@main
-    with:
-      snjs_image_tag: 'latest'
-      suite: 'base'
    secrets: inherit

-  # e2e-vaults:
-  #   needs: build
-  #   name: E2E Vaults Suite
-  #   uses: standardnotes/server/.github/workflows/common-e2e.yml@main
-  #   with:
-  #     snjs_image_tag: 'latest'
-  #     suite: 'vaults'
-  #   secrets: inherit
-
  publish-self-hosting:
-    needs: [ test, lint, e2e-base ]
+    needs: [ test, lint, e2e ]
    name: Publish Self Hosting Docker Image
    uses: standardnotes/server/.github/workflows/common-self-hosting.yml@main
    secrets: inherit

  publish-services:
-    needs: [ test, lint, e2e-base ]
+    needs: [ test, lint, e2e ]

    runs-on: ubuntu-latest

@@ -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

@@ -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
@@ -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

@@ -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

@@ -5945,7 +5945,7 @@ const RAW_RUNTIME_STATE =
          ["newrelic", "npm:11.0.0"],\
          ["prettier", "npm:3.0.3"],\
          ["reflect-metadata", "npm:0.1.13"],\
-          ["sqs-consumer", "virtual:685a6222c3349423674bb7f0684ba34e2ab20912010f352e04dcf707a156e13183fc382e2417cb37a60f3e7b52fd0178c53181674890e1773eb83e190dc13378#npm:7.3.0"],\
+          ["sqs-consumer", "virtual:685a6222c3349423674bb7f0684ba34e2ab20912010f352e04dcf707a156e13183fc382e2417cb37a60f3e7b52fd0178c53181674890e1773eb83e190dc13378#npm:6.2.1"],\
          ["ts-jest", "virtual:fd909b174d079e30b336c4ce72c38a88c1e447767b1a8dd7655e07719a1e31b97807f0931368724fc78897ff15e6a6d00b83316c0f76d11f85111f342e08bb79#npm:29.1.0"],\
          ["typescript", "patch:typescript@npm%3A5.0.4#optional!builtin<compat/typescript>::version=5.0.4&hash=b5f058"],\
          ["winston", "npm:3.9.0"]\
@@ -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"],\
@@ -15717,17 +15713,17 @@ const RAW_RUNTIME_STATE =
      }]\
    ]],\
    ["sqs-consumer", [\
-      ["npm:7.3.0", {\
-        "packageLocation": "./.yarn/cache/sqs-consumer-npm-7.3.0-a47c08ef71-367ea2a6f3.zip/node_modules/sqs-consumer/",\
+      ["npm:6.2.1", {\
+        "packageLocation": "./.yarn/cache/sqs-consumer-npm-6.2.1-857abd3d30-a903daa836.zip/node_modules/sqs-consumer/",\
        "packageDependencies": [\
-          ["sqs-consumer", "npm:7.3.0"]\
+          ["sqs-consumer", "npm:6.2.1"]\
        ],\
        "linkType": "SOFT"\
      }],\
-      ["virtual:685a6222c3349423674bb7f0684ba34e2ab20912010f352e04dcf707a156e13183fc382e2417cb37a60f3e7b52fd0178c53181674890e1773eb83e190dc13378#npm:7.3.0", {\
-        "packageLocation": "./.yarn/__virtual__/sqs-consumer-virtual-bf07118bf0/0/cache/sqs-consumer-npm-7.3.0-a47c08ef71-367ea2a6f3.zip/node_modules/sqs-consumer/",\
+      ["virtual:685a6222c3349423674bb7f0684ba34e2ab20912010f352e04dcf707a156e13183fc382e2417cb37a60f3e7b52fd0178c53181674890e1773eb83e190dc13378#npm:6.2.1", {\
+        "packageLocation": "./.yarn/__virtual__/sqs-consumer-virtual-603a7c5831/0/cache/sqs-consumer-npm-6.2.1-857abd3d30-a903daa836.zip/node_modules/sqs-consumer/",\
        "packageDependencies": [\
-          ["sqs-consumer", "virtual:685a6222c3349423674bb7f0684ba34e2ab20912010f352e04dcf707a156e13183fc382e2417cb37a60f3e7b52fd0178c53181674890e1773eb83e190dc13378#npm:7.3.0"],\
+          ["sqs-consumer", "virtual:685a6222c3349423674bb7f0684ba34e2ab20912010f352e04dcf707a156e13183fc382e2417cb37a60f3e7b52fd0178c53181674890e1773eb83e190dc13378#npm:6.2.1"],\
          ["@aws-sdk/client-sqs", "npm:3.342.0"],\
          ["@types/aws-sdk__client-sqs", null],\
          ["debug", "virtual:ac3d8e680759ce54399273724d44e041d6c9b73454d191d411a8c44bb27e22f02aaf6ed9d3ad0ac1c298eac4833cff369c9c7b84c573016112c4f84be2cd8543#npm:4.3.4"]\
@@ -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],\
@@ -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
@@ -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"

 #########
@@ -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"
@@ -20,7 +20,7 @@
    "release": "lerna version --conventional-graduate --conventional-commits --yes -m \"chore(release): publish new version\"",
    "publish": "lerna publish from-git --yes --no-verify-access --loglevel verbose",
    "postversion": "./scripts/push-tags-one-by-one.sh",
-    "e2e": "yarn build && PORT=3123 yarn workspace @standardnotes/home-server start",
+    "e2e": "yarn workspace @standardnotes/home-server run build && PORT=3123 yarn workspace @standardnotes/home-server start",
    "start": "yarn workspace @standardnotes/home-server run build && yarn workspace @standardnotes/home-server start"
  },
  "devDependencies": {
@@ -3,102 +3,6 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

-## [2.28.2](https://github.com/standardnotes/server/compare/@standardnotes/analytics@2.28.1...@standardnotes/analytics@2.28.2) (2023-10-09)
-
-### Bug Fixes
-
-* remove xray sdk in favor of opentelemetry ([b736dab](https://github.com/standardnotes/server/commit/b736dab3c1f76c9e03c4bc7bbf153dcb3309b7cb))
-
-## [2.28.1](https://github.com/standardnotes/server/compare/@standardnotes/analytics@2.28.0...@standardnotes/analytics@2.28.1) (2023-10-06)
-
-### Bug Fixes
-
-* add xray-sdk to background processors ([a45b5b6](https://github.com/standardnotes/server/commit/a45b5b69b5d68c2e696c30f0ba5ad22d313321e6))
-
-# [2.28.0](https://github.com/standardnotes/server/compare/@standardnotes/analytics@2.27.10...@standardnotes/analytics@2.28.0) (2023-10-06)
-
-### Features
-
-* add xray to analytics scheduler and websockets ([f0531d6](https://github.com/standardnotes/server/commit/f0531d68cb77036222f2a34602819f11e6a2697d))
-
-## [2.27.10](https://github.com/standardnotes/server/compare/@standardnotes/analytics@2.27.9...@standardnotes/analytics@2.27.10) (2023-10-05)
-
-**Note:** Version bump only for package @standardnotes/analytics
-
-## [2.27.9](https://github.com/standardnotes/server/compare/@standardnotes/analytics@2.27.8...@standardnotes/analytics@2.27.9) (2023-10-05)
-
-**Note:** Version bump only for package @standardnotes/analytics
-
-## [2.27.8](https://github.com/standardnotes/server/compare/@standardnotes/analytics@2.27.7...@standardnotes/analytics@2.27.8) (2023-10-04)
-
-**Note:** Version bump only for package @standardnotes/analytics
-
-## [2.27.7](https://github.com/standardnotes/server/compare/@standardnotes/analytics@2.27.6...@standardnotes/analytics@2.27.7) (2023-10-04)
-
-**Note:** Version bump only for package @standardnotes/analytics
-
-## [2.27.6](https://github.com/standardnotes/server/compare/@standardnotes/analytics@2.27.5...@standardnotes/analytics@2.27.6) (2023-10-04)
-
-**Note:** Version bump only for package @standardnotes/analytics
-
-## [2.27.5](https://github.com/standardnotes/server/compare/@standardnotes/analytics@2.27.4...@standardnotes/analytics@2.27.5) (2023-10-04)
-
-**Note:** Version bump only for package @standardnotes/analytics
-
-## [2.27.4](https://github.com/standardnotes/server/compare/@standardnotes/analytics@2.27.3...@standardnotes/analytics@2.27.4) (2023-10-03)
-
-**Note:** Version bump only for package @standardnotes/analytics
-
-## [2.27.3](https://github.com/standardnotes/server/compare/@standardnotes/analytics@2.27.2...@standardnotes/analytics@2.27.3) (2023-10-03)
-
-**Note:** Version bump only for package @standardnotes/analytics
-
-## [2.27.2](https://github.com/standardnotes/server/compare/@standardnotes/analytics@2.27.1...@standardnotes/analytics@2.27.2) (2023-09-28)
-
-**Note:** Version bump only for package @standardnotes/analytics
-
-## [2.27.1](https://github.com/standardnotes/server/compare/@standardnotes/analytics@2.27.0...@standardnotes/analytics@2.27.1) (2023-09-27)
-
-**Note:** Version bump only for package @standardnotes/analytics
-
-# [2.27.0](https://github.com/standardnotes/server/compare/@standardnotes/analytics@2.26.24...@standardnotes/analytics@2.27.0) (2023-09-26)
-
-### Features
-
-* refactor handling revision creation from dump ([#854](https://github.com/standardnotes/server/issues/854)) ([ca6dbc0](https://github.com/standardnotes/server/commit/ca6dbc00537bb20f508f9310b1a838421f53a643))
-
-## [2.26.24](https://github.com/standardnotes/server/compare/@standardnotes/analytics@2.26.23...@standardnotes/analytics@2.26.24) (2023-09-25)
-
-**Note:** Version bump only for package @standardnotes/analytics
-
-## [2.26.23](https://github.com/standardnotes/server/compare/@standardnotes/analytics@2.26.22...@standardnotes/analytics@2.26.23) (2023-09-25)
-
-**Note:** Version bump only for package @standardnotes/analytics
-
-## [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
@@ -1,6 +1,6 @@
 {
  "name": "@standardnotes/analytics",
-  "version": "2.28.2",
+  "version": "2.26.16",
  "engines": {
    "node": ">=18.0.0 <21.0.0"
  },
@@ -18,7 +18,7 @@
    "build": "tsc --build",
    "lint": "eslint . --ext .ts",
    "lint:fix": "eslint . --ext .ts --fix",
-    "test": "jest --coverage --no-cache --config=./jest.config.js --maxWorkers=50%",
+    "test": "jest --coverage --config=./jest.config.js --maxWorkers=50%",
    "worker": "yarn node dist/bin/worker.js",
    "report": "yarn node dist/bin/report.js",
    "setup:env": "cp .env.sample .env",
@@ -18,6 +18,7 @@ import {
  SNSDomainEventPublisher,
  SQSDomainEventSubscriberFactory,
  SQSEventMessageHandler,
+  SQSNewRelicEventMessageHandler,
 } from '@standardnotes/domain-events-infra'
 import { Timer, TimerInterface } from '@standardnotes/time'
 import { PeriodKeyGeneratorInterface } from '../Domain/Time/PeriodKeyGeneratorInterface'
@@ -243,7 +244,11 @@ export class ContainerConfigLoader {

    container
      .bind<DomainEventMessageHandlerInterface>(TYPES.DomainEventMessageHandler)
-      .toConstantValue(new SQSEventMessageHandler(eventHandlers, container.get(TYPES.Logger)))
+      .toConstantValue(
+        env.get('NEW_RELIC_ENABLED', true) === 'true'
+          ? new SQSNewRelicEventMessageHandler(eventHandlers, container.get(TYPES.Logger))
+          : new SQSEventMessageHandler(eventHandlers, container.get(TYPES.Logger)),
+      )
    container
      .bind<DomainEventSubscriberFactoryInterface>(TYPES.DomainEventSubscriberFactory)
      .toConstantValue(
@@ -3,106 +3,6 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

-## [1.77.2](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.77.1...@standardnotes/api-gateway@1.77.2) (2023-10-09)
-
-### Bug Fixes
-
-* remove xray sdk in favor of opentelemetry ([b736dab](https://github.com/standardnotes/api-gateway/commit/b736dab3c1f76c9e03c4bc7bbf153dcb3309b7cb))
-
-## [1.77.1](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.77.0...@standardnotes/api-gateway@1.77.1) (2023-10-06)
-
-**Note:** Version bump only for package @standardnotes/api-gateway
-
-# [1.77.0](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.76.2...@standardnotes/api-gateway@1.77.0) (2023-10-05)
-
-### Features
-
-* setting xray segment user on api-gateway level ([3ee4941](https://github.com/standardnotes/api-gateway/commit/3ee49416f8e19207540141d98baa7f68880929bd))
-
-## [1.76.2](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.76.1...@standardnotes/api-gateway@1.76.2) (2023-10-05)
-
-**Note:** Version bump only for package @standardnotes/api-gateway
-
-## [1.76.1](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.76.0...@standardnotes/api-gateway@1.76.1) (2023-10-05)
-
-**Note:** Version bump only for package @standardnotes/api-gateway
-
-# [1.76.0](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.75.13...@standardnotes/api-gateway@1.76.0) (2023-10-04)
-
-### Features
-
-* **api-gateaway:** configure aws-xray-sdk ([dc76113](https://github.com/standardnotes/api-gateway/commit/dc7611391515dd49a8e9b7ce8ac5e128cd7af0a8))
-
-## [1.75.13](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.75.12...@standardnotes/api-gateway@1.75.13) (2023-10-04)
-
-**Note:** Version bump only for package @standardnotes/api-gateway
-
-## [1.75.12](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.75.11...@standardnotes/api-gateway@1.75.12) (2023-10-04)
-
-**Note:** Version bump only for package @standardnotes/api-gateway
-
-## [1.75.11](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.75.10...@standardnotes/api-gateway@1.75.11) (2023-10-04)
-
-**Note:** Version bump only for package @standardnotes/api-gateway
-
-## [1.75.10](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.75.9...@standardnotes/api-gateway@1.75.10) (2023-10-04)
-
-**Note:** Version bump only for package @standardnotes/api-gateway
-
-## [1.75.9](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.75.8...@standardnotes/api-gateway@1.75.9) (2023-10-03)
-
-**Note:** Version bump only for package @standardnotes/api-gateway
-
-## [1.75.8](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.75.7...@standardnotes/api-gateway@1.75.8) (2023-10-03)
-
-**Note:** Version bump only for package @standardnotes/api-gateway
-
-## [1.75.7](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.75.6...@standardnotes/api-gateway@1.75.7) (2023-09-28)
-
-**Note:** Version bump only for package @standardnotes/api-gateway
-
-## [1.75.6](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.75.5...@standardnotes/api-gateway@1.75.6) (2023-09-27)
-
-**Note:** Version bump only for package @standardnotes/api-gateway
-
-## [1.75.5](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.75.4...@standardnotes/api-gateway@1.75.5) (2023-09-26)
-
-**Note:** Version bump only for package @standardnotes/api-gateway
-
-## [1.75.4](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.75.3...@standardnotes/api-gateway@1.75.4) (2023-09-25)
-
-**Note:** Version bump only for package @standardnotes/api-gateway
-
-## [1.75.3](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.75.2...@standardnotes/api-gateway@1.75.3) (2023-09-25)
-
-**Note:** Version bump only for package @standardnotes/api-gateway
-
-## [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
@@ -1,6 +1,6 @@
 {
  "name": "@standardnotes/api-gateway",
-  "version": "1.77.2",
+  "version": "1.74.14",
  "engines": {
    "node": ">=18.0.0 <21.0.0"
  },
@@ -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,
-    )
-  }
 }
@@ -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 {
@@ -3,201 +3,6 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

-## [1.152.2](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.152.1...@standardnotes/auth-server@1.152.2) (2023-10-09)
-
-### Bug Fixes
-
-* remove xray sdk in favor of opentelemetry ([b736dab](https://github.com/standardnotes/server/commit/b736dab3c1f76c9e03c4bc7bbf153dcb3309b7cb))
-
-## [1.152.1](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.152.0...@standardnotes/auth-server@1.152.1) (2023-10-06)
-
-### Bug Fixes
-
-* **auth:** checking for transition role when triggering transition ([79a44aa](https://github.com/standardnotes/server/commit/79a44aa51f15311fcaf76c39f93d1934ec1d135d))
-
-# [1.152.0](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.151.2...@standardnotes/auth-server@1.152.0) (2023-10-06)
-
-### Bug Fixes
-
-* **auth:** strip user from transition role after migration ([afe9967](https://github.com/standardnotes/server/commit/afe9967d26b5be02d1dc76a740df614d81a6984e))
-
-### Features
-
-* switch transition direction ([27bea44](https://github.com/standardnotes/server/commit/27bea444cce4964feda04bad64e5f12a07415e0c))
-
-## [1.151.2](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.151.1...@standardnotes/auth-server@1.151.2) (2023-10-06)
-
-### Bug Fixes
-
-* add xray-sdk to background processors ([a45b5b6](https://github.com/standardnotes/server/commit/a45b5b69b5d68c2e696c30f0ba5ad22d313321e6))
-
-## [1.151.1](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.151.0...@standardnotes/auth-server@1.151.1) (2023-10-06)
-
-**Note:** Version bump only for package @standardnotes/auth-server
-
-# [1.151.0](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.150.9...@standardnotes/auth-server@1.151.0) (2023-10-05)
-
-### Features
-
-* setting xray segment user on api-gateway level ([3ee4941](https://github.com/standardnotes/server/commit/3ee49416f8e19207540141d98baa7f68880929bd))
-
-## [1.150.9](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.150.8...@standardnotes/auth-server@1.150.9) (2023-10-05)
-
-**Note:** Version bump only for package @standardnotes/auth-server
-
-## [1.150.8](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.150.7...@standardnotes/auth-server@1.150.8) (2023-10-05)
-
-**Note:** Version bump only for package @standardnotes/auth-server
-
-## [1.150.7](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.150.6...@standardnotes/auth-server@1.150.7) (2023-10-04)
-
-### Bug Fixes
-
-* identifying services in workers ([eab78b3](https://github.com/standardnotes/server/commit/eab78b3a95ec82cb779d069d172169bfa92368c9))
-
-## [1.150.6](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.150.5...@standardnotes/auth-server@1.150.6) (2023-10-04)
-
-### Bug Fixes
-
-* **auth:** disable users from registering to MongoDB ([d4579ce](https://github.com/standardnotes/server/commit/d4579ce21ed34ba433deb1fe2ff25c073fbe9622))
-
-## [1.150.5](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.150.4...@standardnotes/auth-server@1.150.5) (2023-10-04)
-
-**Note:** Version bump only for package @standardnotes/auth-server
-
-## [1.150.4](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.150.3...@standardnotes/auth-server@1.150.4) (2023-10-04)
-
-**Note:** Version bump only for package @standardnotes/auth-server
-
-## [1.150.3](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.150.2...@standardnotes/auth-server@1.150.3) (2023-10-04)
-
-### Bug Fixes
-
-* **auth:** remove ec2 plugin from worker ([0281724](https://github.com/standardnotes/server/commit/02817241965db06cc02e9cca1d068446db0dee4e))
-
-## [1.150.2](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.150.1...@standardnotes/auth-server@1.150.2) (2023-10-04)
-
-### Bug Fixes
-
-* **auth:** remove ec2 plugin ([373cfad](https://github.com/standardnotes/server/commit/373cfad1f7c26d3a0ec2a69e720bbce535170359))
-
-## [1.150.1](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.150.0...@standardnotes/auth-server@1.150.1) (2023-10-03)
-
-**Note:** Version bump only for package @standardnotes/auth-server
-
-# [1.150.0](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.149.1...@standardnotes/auth-server@1.150.0) (2023-10-03)
-
-### Features
-
-* add xray segment tracing on auth-worker ([b1b244a](https://github.com/standardnotes/server/commit/b1b244a2cf1e17ddf67fc9b238b4b25a1bc5a190))
-
-## [1.149.1](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.149.0...@standardnotes/auth-server@1.149.1) (2023-10-02)
-
-### Bug Fixes
-
-* **auth:** enable xray only for server ([71e2a41](https://github.com/standardnotes/server/commit/71e2a4187e8f79b2a3055f502310ed0b6a6d82ea))
-
-# [1.149.0](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.148.2...@standardnotes/auth-server@1.149.0) (2023-10-02)
-
-### Bug Fixes
-
-* **auth:** add aws xray ecs and ec2 plugins ([3838358](https://github.com/standardnotes/server/commit/383835808165aba58d15e79f03b5ba4e1c899f4c))
-* **auth:** prevent from loop disabling of email settings ([#858](https://github.com/standardnotes/server/issues/858)) ([bd71422](https://github.com/standardnotes/server/commit/bd71422fabc4b5b47cca6dd071e3332943adc81d))
-
-### Features
-
-* **auth:** introduce AWS X-Ray SDK ([#859](https://github.com/standardnotes/server/issues/859)) ([1a388f0](https://github.com/standardnotes/server/commit/1a388f00c3897d1ebb1411793cfb23c3d305ac2e))
-
-## [1.148.2](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.148.1...@standardnotes/auth-server@1.148.2) (2023-09-29)
-
-### Bug Fixes
-
-* **auth:** increase ttl for in progress duration of transitions ([681e037](https://github.com/standardnotes/server/commit/681e0378ae6b97c838b0b34ccc630194b304b81a))
-
-## [1.148.1](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.148.0...@standardnotes/auth-server@1.148.1) (2023-09-29)
-
-### Bug Fixes
-
-* **auth:** disable transitions retriggering if they are in progress ([5ef6c5c](https://github.com/standardnotes/server/commit/5ef6c5c14a9f7a558de7ac9ff0ab99a5f831c127))
-
-# [1.148.0](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.147.1...@standardnotes/auth-server@1.148.0) (2023-09-28)
-
-### Features
-
-* block file operations during transition ([#856](https://github.com/standardnotes/server/issues/856)) ([676cf36](https://github.com/standardnotes/server/commit/676cf36f8d769aa433880b2800f0457d06fbbf14))
-
-## [1.147.1](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.147.0...@standardnotes/auth-server@1.147.1) (2023-09-27)
-
-**Note:** Version bump only for package @standardnotes/auth-server
-
-# [1.147.0](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.146.4...@standardnotes/auth-server@1.147.0) (2023-09-26)
-
-### Features
-
-* refactor handling revision creation from dump ([#854](https://github.com/standardnotes/server/issues/854)) ([ca6dbc0](https://github.com/standardnotes/server/commit/ca6dbc00537bb20f508f9310b1a838421f53a643))
-
-## [1.146.4](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.146.3...@standardnotes/auth-server@1.146.4) (2023-09-25)
-
-**Note:** Version bump only for package @standardnotes/auth-server
-
-## [1.146.3](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.146.2...@standardnotes/auth-server@1.146.3) (2023-09-25)
-
-**Note:** Version bump only for package @standardnotes/auth-server
-
-## [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
@@ -49,14 +49,11 @@ const requestTransition = async (
      itemsTransitionStatus?.value === TransitionStatus.STATUSES.Verified &&
      revisionsTransitionStatus?.value === TransitionStatus.STATUSES.Verified

-    if (!userHasTransitionRole && bothTransitionStatusesAreVerified) {
+    if (userHasTransitionRole && bothTransitionStatusesAreVerified) {
      continue
    }

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

      await domainEventPublisher.publish(
@@ -68,8 +65,7 @@ const requestTransition = async (
      )
    }

-    if (revisionsTransitionStatus === null || revisionsTransitionStatus.value === TransitionStatus.STATUSES.Failed) {
-      wasTransitionRequested = true
+    if (revisionsTransitionStatus?.value !== TransitionStatus.STATUSES.Verified) {
      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(
@@ -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`')
-  }
-}
@@ -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") ',
-    )
-  }
-}
@@ -1,6 +1,6 @@
 {
  "name": "@standardnotes/auth-server",
-  "version": "1.152.2",
+  "version": "1.143.3",
  "engines": {
    "node": ">=18.0.0 <21.0.0"
  },
@@ -19,7 +19,7 @@
    "lint": "eslint . --ext .ts",
    "lint:fix": "eslint . --fix --ext .ts",
    "pretest": "yarn lint && yarn build",
-    "test": "jest --coverage --no-cache --config=./jest.config.js --maxWorkers=50%",
+    "test": "jest --coverage --config=./jest.config.js --maxWorkers=50%",
    "start": "yarn node dist/bin/server.js",
    "worker": "yarn node dist/bin/worker.js",
    "cleanup": "yarn node dist/bin/cleanup.js",
@@ -92,6 +92,7 @@ import {
  SNSDomainEventPublisher,
  SQSDomainEventSubscriberFactory,
  SQSEventMessageHandler,
+  SQSNewRelicEventMessageHandler,
 } from '@standardnotes/domain-events-infra'
 import { GetUserSubscription } from '../Domain/UseCase/GetUserSubscription/GetUserSubscription'
 import { ChangeCredentials } from '../Domain/UseCase/ChangeCredentials/ChangeCredentials'
@@ -270,9 +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'
-import { DisableEmailSettingBasedOnEmailSubscription } from '../Domain/UseCase/DisableEmailSettingBasedOnEmailSubscription/DisableEmailSettingBasedOnEmailSubscription'

 export class ContainerConfigLoader {
  constructor(private mode: 'server' | 'worker' = 'server') {}
@@ -349,8 +347,7 @@ export class ContainerConfigLoader {
          secretAccessKey: env.get('SNS_SECRET_ACCESS_KEY', true),
        }
      }
-      const snsClient = new SNSClient(snsConfig)
-      container.bind<SNSClient>(TYPES.Auth_SNS).toConstantValue(snsClient)
+      container.bind<SNSClient>(TYPES.Auth_SNS).toConstantValue(new SNSClient(snsConfig))

      const sqsConfig: SQSClientConfig = {
        region: env.get('SQS_AWS_REGION', true),
@@ -364,14 +361,13 @@ export class ContainerConfigLoader {
          secretAccessKey: env.get('SQS_SECRET_ACCESS_KEY', true),
        }
      }
-      const sqsClient = new SQSClient(sqsConfig)
-      container.bind<SQSClient>(TYPES.Auth_SQS).toConstantValue(sqsClient)
+      container.bind<SQSClient>(TYPES.Auth_SQS).toConstantValue(new SQSClient(sqsConfig))
    }

    // Mapping
    container
      .bind<MapperInterface<SessionTrace, TypeORMSessionTrace>>(TYPES.Auth_SessionTracePersistenceMapper)
-      .toConstantValue(new SessionTracePersistenceMapper(container.get<TimerInterface>(TYPES.Auth_Timer)))
+      .toConstantValue(new SessionTracePersistenceMapper())
    container
      .bind<MapperInterface<Authenticator, TypeORMAuthenticator>>(TYPES.Auth_AuthenticatorPersistenceMapper)
      .toConstantValue(new AuthenticatorPersistenceMapper())
@@ -460,9 +456,8 @@ export class ContainerConfigLoader {
      .bind<SessionTraceRepositoryInterface>(TYPES.Auth_SessionTraceRepository)
      .toConstantValue(
        new TypeORMSessionTraceRepository(
-          container.get<Repository<TypeORMSessionTrace>>(TYPES.Auth_ORMSessionTraceRepository),
-          container.get<MapperInterface<SessionTrace, TypeORMSessionTrace>>(TYPES.Auth_SessionTracePersistenceMapper),
-          container.get<TimerInterface>(TYPES.Auth_Timer),
+          container.get(TYPES.Auth_ORMSessionTraceRepository),
+          container.get(TYPES.Auth_SessionTracePersistenceMapper),
        ),
      )
    container
@@ -500,6 +495,20 @@ export class ContainerConfigLoader {
        ),
      )

+    // Middleware
+    container.bind<SessionMiddleware>(TYPES.Auth_SessionMiddleware).to(SessionMiddleware)
+    container.bind<LockMiddleware>(TYPES.Auth_LockMiddleware).to(LockMiddleware)
+    container
+      .bind<RequiredCrossServiceTokenMiddleware>(TYPES.Auth_RequiredCrossServiceTokenMiddleware)
+      .to(RequiredCrossServiceTokenMiddleware)
+    container
+      .bind<OptionalCrossServiceTokenMiddleware>(TYPES.Auth_OptionalCrossServiceTokenMiddleware)
+      .to(OptionalCrossServiceTokenMiddleware)
+    container
+      .bind<ApiGatewayOfflineAuthMiddleware>(TYPES.Auth_ApiGatewayOfflineAuthMiddleware)
+      .to(ApiGatewayOfflineAuthMiddleware)
+    container.bind<OfflineUserAuthMiddleware>(TYPES.Auth_OfflineUserAuthMiddleware).to(OfflineUserAuthMiddleware)
+
    // Projectors
    container.bind<SessionProjector>(TYPES.Auth_SessionProjector).to(SessionProjector)
    container.bind<UserProjector>(TYPES.Auth_UserProjector).to(UserProjector)
@@ -584,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
@@ -728,30 +740,6 @@ export class ContainerConfigLoader {
          : new SNSDomainEventPublisher(container.get(TYPES.Auth_SNS), container.get(TYPES.Auth_SNS_TOPIC_ARN)),
      )

-    // Middleware
-    container.bind<SessionMiddleware>(TYPES.Auth_SessionMiddleware).to(SessionMiddleware)
-    container.bind<LockMiddleware>(TYPES.Auth_LockMiddleware).to(LockMiddleware)
-    container
-      .bind<RequiredCrossServiceTokenMiddleware>(TYPES.Auth_RequiredCrossServiceTokenMiddleware)
-      .toConstantValue(
-        new RequiredCrossServiceTokenMiddleware(
-          container.get<TokenDecoderInterface<CrossServiceTokenData>>(TYPES.Auth_CrossServiceTokenDecoder),
-          container.get<winston.Logger>(TYPES.Auth_Logger),
-        ),
-      )
-    container
-      .bind<OptionalCrossServiceTokenMiddleware>(TYPES.Auth_OptionalCrossServiceTokenMiddleware)
-      .toConstantValue(
-        new OptionalCrossServiceTokenMiddleware(
-          container.get<TokenDecoderInterface<CrossServiceTokenData>>(TYPES.Auth_CrossServiceTokenDecoder),
-          container.get<winston.Logger>(TYPES.Auth_Logger),
-        ),
-      )
-    container
-      .bind<ApiGatewayOfflineAuthMiddleware>(TYPES.Auth_ApiGatewayOfflineAuthMiddleware)
-      .to(ApiGatewayOfflineAuthMiddleware)
-    container.bind<OfflineUserAuthMiddleware>(TYPES.Auth_OfflineUserAuthMiddleware).to(OfflineUserAuthMiddleware)
-
    // use cases
    container
      .bind<TraceSession>(TYPES.Auth_TraceSession)
@@ -969,23 +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),
-        ),
-      )
-    container
-      .bind<DisableEmailSettingBasedOnEmailSubscription>(TYPES.Auth_DisableEmailSettingBasedOnEmailSubscription)
-      .toConstantValue(
-        new DisableEmailSettingBasedOnEmailSubscription(
-          container.get<UserRepositoryInterface>(TYPES.Auth_UserRepository),
-          container.get<SettingRepositoryInterface>(TYPES.Auth_SettingRepository),
-          container.get<SettingFactoryInterface>(TYPES.Auth_SettingFactory),
-        ),
-      )

    // Controller
    container
@@ -1027,15 +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<winston.Logger>(TYPES.Auth_Logger),
-        ),
-      )
+      .to(AccountDeletionRequestedEventHandler)
    container
      .bind<SubscriptionPurchasedEventHandler>(TYPES.Auth_SubscriptionPurchasedEventHandler)
      .to(SubscriptionPurchasedEventHandler)
@@ -1123,10 +1086,8 @@ export class ContainerConfigLoader {
      .bind<EmailSubscriptionUnsubscribedEventHandler>(TYPES.Auth_EmailSubscriptionUnsubscribedEventHandler)
      .toConstantValue(
        new EmailSubscriptionUnsubscribedEventHandler(
-          container.get<DisableEmailSettingBasedOnEmailSubscription>(
-            TYPES.Auth_DisableEmailSettingBasedOnEmailSubscription,
-          ),
-          container.get<winston.Logger>(TYPES.Auth_Logger),
+          container.get(TYPES.Auth_UserRepository),
+          container.get(TYPES.Auth_SettingService),
        ),
      )
    container
@@ -1161,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)],
@@ -1205,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) {
@@ -1223,7 +1170,11 @@ export class ContainerConfigLoader {
    } else {
      container
        .bind<DomainEventMessageHandlerInterface>(TYPES.Auth_DomainEventMessageHandler)
-        .toConstantValue(new SQSEventMessageHandler(eventHandlers, container.get(TYPES.Auth_Logger)))
+        .toConstantValue(
+          env.get('NEW_RELIC_ENABLED', true) === 'true'
+            ? new SQSNewRelicEventMessageHandler(eventHandlers, container.get(TYPES.Auth_Logger))
+            : new SQSEventMessageHandler(eventHandlers, container.get(TYPES.Auth_Logger)),
+        )

      container
        .bind<DomainEventSubscriberFactoryInterface>(TYPES.Auth_DomainEventSubscriberFactory)
@@ -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,8 +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'),
-  Auth_DisableEmailSettingBasedOnEmailSubscription: Symbol.for('Auth_DisableEmailSettingBasedOnEmailSubscription'),
  // Handlers
  Auth_UserRegisteredEventHandler: Symbol.for('Auth_UserRegisteredEventHandler'),
  Auth_AccountDeletionRequestedEventHandler: Symbol.for('Auth_AccountDeletionRequestedEventHandler'),
@@ -193,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'),
@@ -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')
+  })
+})
@@ -1,19 +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 { 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 logger: Logger,
+    @inject(TYPES.Auth_RevokedSessionRepository) private revokedSessionRepository: RevokedSessionRepositoryInterface,
+    @inject(TYPES.Auth_Logger) private logger: Logger,
  ) {}

  async handle(event: AccountDeletionRequestedEvent): Promise<void> {
@@ -0,0 +1,117 @@
+import { EmailLevel } from '@standardnotes/domain-core'
+import { EmailSubscriptionUnsubscribedEvent } from '@standardnotes/domain-events'
+
+import { SettingServiceInterface } from '../Setting/SettingServiceInterface'
+import { User } from '../User/User'
+import { UserRepositoryInterface } from '../User/UserRepositoryInterface'
+import { EmailSubscriptionUnsubscribedEventHandler } from './EmailSubscriptionUnsubscribedEventHandler'
+
+describe('EmailSubscriptionUnsubscribedEventHandler', () => {
+  let userRepository: UserRepositoryInterface
+  let settingsService: SettingServiceInterface
+  let event: EmailSubscriptionUnsubscribedEvent
+
+  const createHandler = () => new EmailSubscriptionUnsubscribedEventHandler(userRepository, settingsService)
+
+  beforeEach(() => {
+    userRepository = {} as jest.Mocked<UserRepositoryInterface>
+    userRepository.findOneByUsernameOrEmail = jest.fn().mockReturnValue({} as jest.Mocked<User>)
+
+    settingsService = {} as jest.Mocked<SettingServiceInterface>
+    settingsService.createOrReplace = jest.fn()
+
+    event = {
+      payload: {
+        userEmail: 'test@test.te',
+        level: EmailLevel.LEVELS.Marketing,
+      },
+    } as jest.Mocked<EmailSubscriptionUnsubscribedEvent>
+  })
+
+  it('should not do anything if username is invalid', async () => {
+    event.payload.userEmail = ''
+
+    await createHandler().handle(event)
+
+    expect(settingsService.createOrReplace).not.toHaveBeenCalled()
+  })
+
+  it('should not do anything if user is not found', async () => {
+    userRepository.findOneByUsernameOrEmail = jest.fn().mockReturnValue(null)
+
+    await createHandler().handle(event)
+
+    expect(settingsService.createOrReplace).not.toHaveBeenCalled()
+  })
+
+  it('should update user marketing email settings', async () => {
+    await createHandler().handle(event)
+
+    expect(settingsService.createOrReplace).toHaveBeenCalledWith({
+      user: {},
+      props: {
+        name: 'MUTE_MARKETING_EMAILS',
+        unencryptedValue: 'muted',
+        sensitive: false,
+      },
+    })
+  })
+
+  it('should update user sign in email settings', async () => {
+    event.payload.level = EmailLevel.LEVELS.SignIn
+
+    await createHandler().handle(event)
+
+    expect(settingsService.createOrReplace).toHaveBeenCalledWith({
+      user: {},
+      props: {
+        name: 'MUTE_SIGN_IN_EMAILS',
+        unencryptedValue: 'muted',
+        sensitive: false,
+      },
+    })
+  })
+
+  it('should update user email backup email settings', async () => {
+    event.payload.level = EmailLevel.LEVELS.FailedEmailBackup
+
+    await createHandler().handle(event)
+
+    expect(settingsService.createOrReplace).toHaveBeenCalledWith({
+      user: {},
+      props: {
+        name: 'MUTE_FAILED_BACKUPS_EMAILS',
+        unencryptedValue: 'muted',
+        sensitive: false,
+      },
+    })
+  })
+
+  it('should update user email backup email settings', async () => {
+    event.payload.level = EmailLevel.LEVELS.FailedCloudBackup
+
+    await createHandler().handle(event)
+
+    expect(settingsService.createOrReplace).toHaveBeenCalledWith({
+      user: {},
+      props: {
+        name: 'MUTE_FAILED_CLOUD_BACKUPS_EMAILS',
+        unencryptedValue: 'muted',
+        sensitive: false,
+      },
+    })
+  })
+
+  it('should throw error for unrecognized level', async () => {
+    event.payload.level = 'foobar'
+
+    let caughtError = null
+    try {
+      await createHandler().handle(event)
+    } catch (error) {
+      caughtError = error
+    }
+
+    expect(caughtError).not.toBeNull()
+  })
+})
@@ -1,21 +1,50 @@
+import { EmailLevel, Username } from '@standardnotes/domain-core'
 import { DomainEventHandlerInterface, EmailSubscriptionUnsubscribedEvent } from '@standardnotes/domain-events'
-import { Logger } from 'winston'
-import { DisableEmailSettingBasedOnEmailSubscription } from '../UseCase/DisableEmailSettingBasedOnEmailSubscription/DisableEmailSettingBasedOnEmailSubscription'
+import { SettingName } from '@standardnotes/settings'
+
+import { SettingServiceInterface } from '../Setting/SettingServiceInterface'
+import { UserRepositoryInterface } from '../User/UserRepositoryInterface'

 export class EmailSubscriptionUnsubscribedEventHandler implements DomainEventHandlerInterface {
  constructor(
-    private disableEmailSettingBasedOnEmailSubscription: DisableEmailSettingBasedOnEmailSubscription,
-    private logger: Logger,
+    private userRepository: UserRepositoryInterface,
+    private settingsService: SettingServiceInterface,
  ) {}

  async handle(event: EmailSubscriptionUnsubscribedEvent): Promise<void> {
-    const result = await this.disableEmailSettingBasedOnEmailSubscription.execute({
-      userEmail: event.payload.userEmail,
-      level: event.payload.level,
-    })
+    const usernameOrError = Username.create(event.payload.userEmail)
+    if (usernameOrError.isFailed()) {
+      return
+    }
+    const username = usernameOrError.getValue()

-    if (result.isFailed()) {
-      this.logger.error(`Failed to disable email setting for user ${event.payload.userEmail}: ${result.getError()}`)
+    const user = await this.userRepository.findOneByUsernameOrEmail(username)
+    if (user === null) {
+      return
+    }
+
+    await this.settingsService.createOrReplace({
+      user,
+      props: {
+        name: this.getSettingNameFromLevel(event.payload.level),
+        unencryptedValue: 'muted',
+        sensitive: false,
+      },
+    })
+  }
+
+  private getSettingNameFromLevel(level: string): string {
+    switch (level) {
+      case EmailLevel.LEVELS.FailedCloudBackup:
+        return SettingName.NAMES.MuteFailedCloudBackupsEmails
+      case EmailLevel.LEVELS.FailedEmailBackup:
+        return SettingName.NAMES.MuteFailedBackupsEmails
+      case EmailLevel.LEVELS.Marketing:
+        return SettingName.NAMES.MuteMarketingEmails
+      case EmailLevel.LEVELS.SignIn:
+        return SettingName.NAMES.MuteSignInEmails
+      default:
+        throw new Error(`Unknown level: ${level}`)
    }
  }
 }
@@ -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()}`,
-      )
-    }
-  }
-}
@@ -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,
@@ -118,40 +118,6 @@ describe('RoleService', () => {
    })
  })

-  describe('removing roles', () => {
-    beforeEach(() => {
-      user = {
-        uuid: '123',
-        email: 'test@test.com',
-        roles: Promise.resolve([basicRole]),
-      } as jest.Mocked<User>
-
-      userRepository.findOneByUuid = jest.fn().mockReturnValue(user)
-      userRepository.save = jest.fn().mockReturnValue(user)
-    })
-
-    it('should remove a role from a user', async () => {
-      await createService().removeRoleFromUser(
-        Uuid.create('00000000-0000-0000-0000-000000000000').getValue(),
-        RoleName.create(RoleName.NAMES.CoreUser).getValue(),
-      )
-
-      user.roles = Promise.resolve([])
-      expect(userRepository.save).toHaveBeenCalledWith(user)
-    })
-
-    it('should not remove a role from a user if the user could not be found', async () => {
-      userRepository.findOneByUuid = jest.fn().mockReturnValue(null)
-
-      await createService().removeRoleFromUser(
-        Uuid.create('00000000-0000-0000-0000-000000000000').getValue(),
-        RoleName.create(RoleName.NAMES.CoreUser).getValue(),
-      )
-
-      expect(userRepository.save).not.toHaveBeenCalled()
-    })
-  })
-
  describe('adding roles based on subscription', () => {
    beforeEach(() => {
      user = {
@@ -65,17 +65,6 @@ export class RoleService implements RoleServiceInterface {
    await this.addToExistingRoles(user, roleName.value)
  }

-  async removeRoleFromUser(userUuid: Uuid, roleName: RoleName): Promise<void> {
-    const user = await this.userRepository.findOneByUuid(userUuid)
-    if (user === null) {
-      this.logger.error(`Could not find user with uuid ${userUuid.value} to remove role ${roleName.value}`)
-
-      return
-    }
-
-    await this.removeUserRole(user, roleName.value)
-  }
-
  async addUserRoleBasedOnSubscription(user: User, subscriptionName: SubscriptionName): Promise<void> {
    const roleName = this.roleToSubscriptionMap.getRoleNameForSubscriptionName(subscriptionName)

@@ -119,15 +108,9 @@ export class RoleService implements RoleServiceInterface {
      return
    }

-    await this.removeUserRole(user, roleName)
-  }
-
-  private async removeUserRole(user: User, roleName: string): Promise<void> {
    const currentRoles = await user.roles
    user.roles = Promise.resolve(currentRoles.filter((role) => role.name !== roleName))
-
    await this.userRepository.save(user)
-
    await this.webSocketsClientService.sendUserRolesChangedEvent(user)
  }

@@ -5,7 +5,6 @@ import { User } from '../User/User'

 export interface RoleServiceInterface {
  addRoleToUser(userUuid: Uuid, roleName: RoleName): Promise<void>
-  removeRoleFromUser(userUuid: Uuid, roleName: RoleName): Promise<void>
  addUserRoleBasedOnSubscription(user: User, subscriptionName: string): Promise<void>
  setOfflineUserRole(offlineUserSubscription: OfflineUserSubscription): Promise<void>
  removeUserRoleBasedOnSubscription(user: User, subscriptionName: string): Promise<void>
@@ -3,7 +3,7 @@ import { SubscriptionPlanName, Uuid } from '@standardnotes/domain-core'
 import { SessionTrace } from './SessionTrace'

 export interface SessionTraceRepositoryInterface {
-  insert(sessionTrace: SessionTrace): Promise<void>
+  save(sessionTrace: SessionTrace): Promise<void>
  removeExpiredBefore(date: Date): Promise<void>
  findOneByUserUuidAndDate(userUuid: Uuid, date: Date): Promise<SessionTrace | null>
  countByDate(date: Date): Promise<number>
--- a/Show More
+++ b/Show More