chore(release): publish new version

- @standardnotes/analytics@2.33.0 - @standardnotes/api-gateway@1.82.0 - @standardnotes/auth-server@1.168.0 - @standardnotes/domain-events-infra@1.21.0 - @standardnotes/domain-events@2.134.0 - @standardnotes/event-store@1.14.0 - @standardnotes/files-server@1.33.0 - @standardnotes/home-server@1.19.0 - @standardnotes/revisions-server@1.48.0 - @standardnotes/scheduler-server@1.27.0 - @standardnotes/syncing-server@1.121.0 - @standardnotes/websockets-server@1.18.0
feat: add graceful shutdown procedures upon SIGTERM (#923 )
2026-04-20 20:02:34 -04:00 · 2023-11-10 11:46:24 +00:00 · 2023-11-10 12:20:21 +01:00 · 2023-11-10 10:04:31 +00:00 · 2023-11-10 10:32:47 +01:00 · 2023-11-09 14:29:28 +00:00
587 changed files with 9265 additions and 15545 deletions
@@ -26,3 +26,5 @@ MYSQL_ROOT_PASSWORD=changeme123
 AUTH_JWT_SECRET=f95259c5e441f5a4646d76422cfb3df4c4488842901aa50b6c51b8be2e0040e9
 AUTH_SERVER_ENCRYPTION_SERVER_KEY=1087415dfde3093797f9a7ca93a49e7d7aa1861735eb0d32aae9c303b8c3d060
 VALET_TOKEN_SECRET=4b886819ebe1e908077c6cae96311b48a8416bd60cc91c03060e15bdf6b30d1f
+
+SYNCING_SERVER_CONTENT_SIZE_TRANSFER_LIMIT=1000000
@@ -55,7 +55,7 @@ jobs:
      run: yarn build

    - name: Login to Docker Hub
-      uses: docker/login-action@v2
+      uses: docker/login-action@v3
      with:
        username: ${{ secrets.DOCKER_USERNAME }}
        password: ${{ secrets.DOCKER_PASSWORD }}
@@ -69,7 +69,7 @@ jobs:

    - name: Login to Amazon ECR
      id: login-ecr
-      uses: aws-actions/amazon-ecr-login@v1
+      uses: aws-actions/amazon-ecr-login@v2

    - name: Set up QEMU
      uses: docker/setup-qemu-action@master
@@ -20,7 +20,7 @@ jobs:
    - uses: actions/checkout@v4

    - name: Login to Docker Hub
-      uses: docker/login-action@v2
+      uses: docker/login-action@v3
      with:
        username: ${{ secrets.DOCKER_USERNAME }}
        password: ${{ secrets.DOCKER_PASSWORD }}
@@ -70,6 +70,7 @@ jobs:
        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 "CONTENT_SIZE_TRANSFER_LIMIT=1000000" >> 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
@@ -103,10 +103,10 @@ jobs:
      snjs_image_tag: 'latest'
      suite: 'base'

-  # e2e-vaults:
-  #   needs: build
-  #   name: E2E Vaults Suite
-  #   uses: standardnotes/server/.github/workflows/common-e2e.yml@main
-  #   with:
-  #     snjs_image_tag: 'latest'
-  #     suite: 'vaults'
+  e2e-vaults:
+    needs: build
+    name: E2E Vaults Suite
+    uses: standardnotes/server/.github/workflows/common-e2e.yml@main
+    with:
+      snjs_image_tag: 'latest'
+      suite: 'vaults'
@@ -103,22 +103,22 @@ jobs:
      snjs_image_tag: 'latest'
      suite: 'base'

-  # e2e-vaults:
-  #   needs: build
-  #   name: E2E Vaults Suite
-  #   uses: standardnotes/server/.github/workflows/common-e2e.yml@main
-  #   with:
-  #     snjs_image_tag: 'latest'
-  #     suite: 'vaults'
+  e2e-vaults:
+    needs: build
+    name: E2E Vaults Suite
+    uses: standardnotes/server/.github/workflows/common-e2e.yml@main
+    with:
+      snjs_image_tag: 'latest'
+      suite: 'vaults'

  publish-self-hosting:
-    needs: [ test, lint, e2e-base ]
+    needs: [ test, lint, e2e-base, e2e-vaults ]
    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-base, e2e-vaults ]

    runs-on: ubuntu-latest

@@ -143,7 +143,7 @@ jobs:
          git config --global user.email "ci@standardnotes.com"

      - name: Import GPG key
-        uses: crazy-max/ghaction-import-gpg@v5
+        uses: crazy-max/ghaction-import-gpg@v6
        with:
          gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }}
          passphrase: ${{ secrets.PASSPHRASE }}
@@ -3,6 +3,8 @@ FROM node:20.6.1-alpine
 ENV NODE_ENV production

 RUN apk add --update --no-cache \
+  g++ \
+  make \
  openssl \
  curl \
  bash \
@@ -57,9 +57,6 @@ fi
 if [ -z "$CACHE_TYPE" ]; then
  export CACHE_TYPE="redis"
 fi
-if [ -z "$SECONDARY_DB_ENABLED" ]; then
-  export SECONDARY_DB_ENABLED=false
-fi
 export DB_MIGRATIONS_PATH="dist/migrations/*.js"

 #########
@@ -3,6 +3,34 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

+# [2.33.0](https://github.com/standardnotes/server/compare/@standardnotes/analytics@2.32.6...@standardnotes/analytics@2.33.0) (2023-11-10)
+
+### Features
+
+* add graceful shutdown procedures upon SIGTERM ([#923](https://github.com/standardnotes/server/issues/923)) ([c24353c](https://github.com/standardnotes/server/commit/c24353cc24ebf4b40ff9a2cec8e37cfdef109e37))
+
+## [2.32.6](https://github.com/standardnotes/server/compare/@standardnotes/analytics@2.32.5...@standardnotes/analytics@2.32.6) (2023-11-07)
+
+**Note:** Version bump only for package @standardnotes/analytics
+
+## [2.32.5](https://github.com/standardnotes/server/compare/@standardnotes/analytics@2.32.4...@standardnotes/analytics@2.32.5) (2023-11-07)
+
+### Bug Fixes
+
+* remove open telemetry from code ([#903](https://github.com/standardnotes/server/issues/903)) ([751f3b2](https://github.com/standardnotes/server/commit/751f3b25476c5be3d663ad8540c43266acd39493))
+
+## [2.32.4](https://github.com/standardnotes/server/compare/@standardnotes/analytics@2.32.3...@standardnotes/analytics@2.32.4) (2023-10-26)
+
+**Note:** Version bump only for package @standardnotes/analytics
+
+## [2.32.3](https://github.com/standardnotes/server/compare/@standardnotes/analytics@2.32.2...@standardnotes/analytics@2.32.3) (2023-10-26)
+
+**Note:** Version bump only for package @standardnotes/analytics
+
+## [2.32.2](https://github.com/standardnotes/server/compare/@standardnotes/analytics@2.32.1...@standardnotes/analytics@2.32.2) (2023-10-19)
+
+**Note:** Version bump only for package @standardnotes/analytics
+
 ## [2.32.1](https://github.com/standardnotes/server/compare/@standardnotes/analytics@2.32.0...@standardnotes/analytics@2.32.1) (2023-10-18)

 **Note:** Version bump only for package @standardnotes/analytics
@@ -1,11 +1,5 @@
 import 'reflect-metadata'

-import { OpenTelemetrySDK, OpenTelemetryTracer } from '@standardnotes/domain-events-infra'
-import { EmailLevel, ServiceIdentifier } from '@standardnotes/domain-core'
-
-const sdk = new OpenTelemetrySDK({ serviceName: ServiceIdentifier.NAMES.AnalyticsScheduledTask })
-sdk.start()
-
 import { Logger } from 'winston'

 import { DomainEventPublisherInterface } from '@standardnotes/domain-events'
@@ -22,6 +16,7 @@ import { CalculateMonthlyRecurringRevenue } from '../src/Domain/UseCase/Calculat
 import { getBody, getSubject } from '../src/Domain/Email/DailyAnalyticsReport'
 import { TimerInterface } from '@standardnotes/time'
 import { StatisticMeasureName } from '../src/Domain/Statistics/StatisticMeasureName'
+import { EmailLevel } from '@standardnotes/domain-core'

 const requestReport = async (
  analyticsStore: AnalyticsStoreInterface,
@@ -275,9 +270,6 @@ void container.load().then((container) => {

  logger.info(`Sending report to following admins: ${adminEmails}`)

-  const tracer = new OpenTelemetryTracer()
-  tracer.startSpan(ServiceIdentifier.NAMES.AnalyticsScheduledTask, 'report')
-
  Promise.resolve(
    requestReport(
      analyticsStore,
@@ -293,15 +285,11 @@ void container.load().then((container) => {
    .then(() => {
      logger.info('Usage report generation complete')

-      tracer.stopSpan()
-
      process.exit(0)
    })
    .catch((error) => {
      logger.error(`Could not finish usage report generation: ${error.message}`)

-      tracer.stopSpanWithError(error)
-
      process.exit(1)
    })
 })
@@ -1,11 +1,5 @@
 import 'reflect-metadata'

-import { OpenTelemetrySDK } from '@standardnotes/domain-events-infra'
-import { ServiceIdentifier } from '@standardnotes/domain-core'
-
-const sdk = new OpenTelemetrySDK({ serviceName: ServiceIdentifier.NAMES.AnalyticsWorker })
-sdk.start()
-
 import { Logger } from 'winston'
 import { DomainEventSubscriberInterface } from '@standardnotes/domain-events'
 import * as dayjs from 'dayjs'
@@ -28,5 +22,11 @@ void container.load().then((container) => {

  const subscriber = container.get<DomainEventSubscriberInterface>(TYPES.DomainEventSubscriber)

+  process.on('SIGTERM', () => {
+    logger.info('SIGTERM received. Stopping worker...')
+    subscriber.stop()
+    logger.info('Worker stopped.')
+  })
+
  subscriber.start()
 })
@@ -6,12 +6,12 @@ COMMAND=$1 && shift 1
 case "$COMMAND" in
  'start-worker' )
    echo "[Docker] Starting Worker..."
-    node docker/entrypoint-worker.js
+    exec node docker/entrypoint-worker.js
    ;;

  'report' )
    echo "[Docker] Starting Usage Report Generation..."
-    node docker/entrypoint-report.js
+    exec node docker/entrypoint-report.js
    ;;

   * )
@@ -1,6 +1,6 @@
 {
  "name": "@standardnotes/analytics",
-  "version": "2.32.1",
+  "version": "2.33.0",
  "engines": {
    "node": ">=18.0.0 <21.0.0"
  },
@@ -7,7 +7,7 @@ import {
  DomainEventPublisherInterface,
  DomainEventSubscriberInterface,
 } from '@standardnotes/domain-events'
-import { MapperInterface, ServiceIdentifier } from '@standardnotes/domain-core'
+import { MapperInterface } from '@standardnotes/domain-core'
 // eslint-disable-next-line @typescript-eslint/no-var-requires
 const Mixpanel = require('mixpanel')

@@ -16,9 +16,9 @@ import TYPES from './Types'
 import { AppDataSource } from './DataSource'
 import { DomainEventFactory } from '../Domain/Event/DomainEventFactory'
 import {
-  SNSOpenTelemetryDomainEventPublisher,
+  SNSDomainEventPublisher,
+  SQSDomainEventSubscriber,
  SQSEventMessageHandler,
-  SQSOpenTelemetryDomainEventSubscriber,
 } from '@standardnotes/domain-events-infra'
 import { Timer, TimerInterface } from '@standardnotes/time'
 import { PeriodKeyGeneratorInterface } from '../Domain/Time/PeriodKeyGeneratorInterface'
@@ -139,9 +139,7 @@ export class ContainerConfigLoader {

    container
      .bind<DomainEventPublisherInterface>(TYPES.DomainEventPublisher)
-      .toConstantValue(
-        new SNSOpenTelemetryDomainEventPublisher(container.get(TYPES.SNS), container.get(TYPES.SNS_TOPIC_ARN)),
-      )
+      .toConstantValue(new SNSDomainEventPublisher(container.get(TYPES.SNS), container.get(TYPES.SNS_TOPIC_ARN)))
    if (env.get('MIXPANEL_TOKEN', true)) {
      container.bind<Mixpanel>(TYPES.MixpanelClient).toConstantValue(Mixpanel.init(env.get('MIXPANEL_TOKEN', true)))
    }
@@ -242,8 +240,7 @@ export class ContainerConfigLoader {
    container
      .bind<DomainEventSubscriberInterface>(TYPES.DomainEventSubscriber)
      .toConstantValue(
-        new SQSOpenTelemetryDomainEventSubscriber(
-          ServiceIdentifier.NAMES.AnalyticsWorker,
+        new SQSDomainEventSubscriber(
          container.get<SQSClient>(TYPES.SQS),
          container.get<string>(TYPES.SQS_QUEUE_URL),
          container.get<DomainEventMessageHandlerInterface>(TYPES.DomainEventMessageHandler),
@@ -3,6 +3,108 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

+# [1.82.0](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.81.14...@standardnotes/api-gateway@1.82.0) (2023-11-10)
+
+### Features
+
+* add graceful shutdown procedures upon SIGTERM ([#923](https://github.com/standardnotes/api-gateway/issues/923)) ([c24353c](https://github.com/standardnotes/api-gateway/commit/c24353cc24ebf4b40ff9a2cec8e37cfdef109e37))
+
+## [1.81.14](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.81.13...@standardnotes/api-gateway@1.81.14) (2023-11-10)
+
+### Bug Fixes
+
+* **api-gateway:** add logs about calling web sockets with minimal format ([5d3fb9a](https://github.com/standardnotes/api-gateway/commit/5d3fb9a537f6971cfe8ae3c5ea449806cc4de8a0))
+
+## [1.81.13](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.81.12...@standardnotes/api-gateway@1.81.13) (2023-11-09)
+
+### Bug Fixes
+
+* **api-gateway:** add possibility to configure keep-alive timeout ([#920](https://github.com/standardnotes/api-gateway/issues/920)) ([16f92bd](https://github.com/standardnotes/api-gateway/commit/16f92bdc990ded5c3f1fe5af1e6e4a113a9954de))
+
+## [1.81.12](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.81.11...@standardnotes/api-gateway@1.81.12) (2023-11-09)
+
+### Bug Fixes
+
+* reduce websockets api communication data ([#919](https://github.com/standardnotes/api-gateway/issues/919)) ([c4ae12d](https://github.com/standardnotes/api-gateway/commit/c4ae12d53fc166879f90a4c5dbad1ab1cb4797e2))
+
+## [1.81.11](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.81.10...@standardnotes/api-gateway@1.81.11) (2023-11-07)
+
+### Bug Fixes
+
+* **api-gateway:** remove calling both auth and payments on account deletion request ([6b554c2](https://github.com/standardnotes/api-gateway/commit/6b554c28b731a9080d7ad2942d3fa05c01dcabf2))
+
+## [1.81.10](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.81.9...@standardnotes/api-gateway@1.81.10) (2023-11-07)
+
+**Note:** Version bump only for package @standardnotes/api-gateway
+
+## [1.81.9](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.81.8...@standardnotes/api-gateway@1.81.9) (2023-11-07)
+
+### Bug Fixes
+
+* remove open telemetry from code ([#903](https://github.com/standardnotes/api-gateway/issues/903)) ([751f3b2](https://github.com/standardnotes/api-gateway/commit/751f3b25476c5be3d663ad8540c43266acd39493))
+
+## [1.81.8](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.81.7...@standardnotes/api-gateway@1.81.8) (2023-11-03)
+
+### Bug Fixes
+
+* retry attempts on session validation and more verbose logs ([#898](https://github.com/standardnotes/api-gateway/issues/898)) ([3e376c4](https://github.com/standardnotes/api-gateway/commit/3e376c44e3a6c336dcff3d8ef5eb3ab040d9a561))
+
+## [1.81.7](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.81.6...@standardnotes/api-gateway@1.81.7) (2023-10-31)
+
+### Bug Fixes
+
+* add fallback methods for 404 requests ([#893](https://github.com/standardnotes/api-gateway/issues/893)) ([16a6815](https://github.com/standardnotes/api-gateway/commit/16a6815b69e344573ae07682f3bac1d44d715d79))
+
+## [1.81.6](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.81.5...@standardnotes/api-gateway@1.81.6) (2023-10-27)
+
+### Bug Fixes
+
+* **api-gateway:** logs for errors reaching service ([14bcf7b](https://github.com/standardnotes/api-gateway/commit/14bcf7b6c9403c3413e7579f58ea17168d14dce7))
+
+## [1.81.5](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.81.4...@standardnotes/api-gateway@1.81.5) (2023-10-26)
+
+**Note:** Version bump only for package @standardnotes/api-gateway
+
+## [1.81.4](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.81.3...@standardnotes/api-gateway@1.81.4) (2023-10-26)
+
+### Bug Fixes
+
+* **api-gateway:** retry attempts and logs ([654663d](https://github.com/standardnotes/api-gateway/commit/654663d17f6eee15f7bf2bc7f40e6c37a3d8e53c))
+
+## [1.81.3](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.81.2...@standardnotes/api-gateway@1.81.3) (2023-10-26)
+
+**Note:** Version bump only for package @standardnotes/api-gateway
+
+## [1.81.2](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.81.1...@standardnotes/api-gateway@1.81.2) (2023-10-20)
+
+### Bug Fixes
+
+* **api-gateway:** add session validation retry attempts on timedout requests ([6aee51b](https://github.com/standardnotes/api-gateway/commit/6aee51bd45c25e85d01075a9c8d2854b32dd6e3c))
+
+## [1.81.1](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.81.0...@standardnotes/api-gateway@1.81.1) (2023-10-20)
+
+### Bug Fixes
+
+* **api-gateway:** logs severity on retry attempts ([1c3d19c](https://github.com/standardnotes/api-gateway/commit/1c3d19cca43a7a3eba2b0d05c820de5112edf89e))
+
+# [1.81.0](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.80.1...@standardnotes/api-gateway@1.81.0) (2023-10-20)
+
+### Features
+
+* **api-gateway:** add retry attempts on timedout requests ([#885](https://github.com/standardnotes/api-gateway/issues/885)) ([ce35767](https://github.com/standardnotes/api-gateway/commit/ce357679e9bc704ab562e9d6ca192f49a794a664))
+
+## [1.80.1](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.80.0...@standardnotes/api-gateway@1.80.1) (2023-10-19)
+
+### Bug Fixes
+
+* **api-gateway:** stringify error in service proxy ([e385926](https://github.com/standardnotes/api-gateway/commit/e38592604644e0f52df0865ffae5b7e79d1d3d07))
+
+# [1.80.0](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.79.14...@standardnotes/api-gateway@1.80.0) (2023-10-19)
+
+### Features
+
+* remove transition state ([#882](https://github.com/standardnotes/api-gateway/issues/882)) ([a2c1ebe](https://github.com/standardnotes/api-gateway/commit/a2c1ebe675cd5678c923715056a6966f465a15d6))
+
 ## [1.79.14](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.79.13...@standardnotes/api-gateway@1.79.14) (2023-10-18)

 **Note:** Version bump only for package @standardnotes/api-gateway
@@ -1,11 +1,5 @@
 import 'reflect-metadata'

-import { OpenTelemetrySDK } from '@standardnotes/domain-events-infra'
-import { ServiceIdentifier } from '@standardnotes/domain-core'
-
-const sdk = new OpenTelemetrySDK({ serviceName: ServiceIdentifier.NAMES.ApiGateway })
-sdk.start()
-
 import '../src/Controller/LegacyController'
 import '../src/Controller/HealthCheckController'

@@ -108,9 +102,18 @@ void container.load().then((container) => {
    })
  })

-  const serverInstance = server.build()
+  const serverInstance = server.build().listen(env.get('PORT'))

-  serverInstance.listen(env.get('PORT'))
+  const keepAliveTimeout = env.get('KEEP_ALIVE_TIMEOUT', true) ? +env.get('KEEP_ALIVE_TIMEOUT', true) : 5000
+
+  serverInstance.keepAliveTimeout = keepAliveTimeout
+
+  process.on('SIGTERM', () => {
+    logger.info('SIGTERM signal received: closing HTTP server')
+    serverInstance.close(() => {
+      logger.info('HTTP server closed')
+    })
+  })

  logger.info(`Server started on port ${process.env.PORT}`)
 })
@@ -6,7 +6,7 @@ COMMAND=$1 && shift 1
 case "$COMMAND" in
  'start-web' )
    echo "Starting Web..."
-    node docker/entrypoint-server.js
+    exec node docker/entrypoint-server.js
    ;;

   * )
@@ -1,6 +1,6 @@
 {
  "name": "@standardnotes/api-gateway",
-  "version": "1.79.14",
+  "version": "1.82.0",
  "engines": {
    "node": ">=18.0.0 <21.0.0"
  },
@@ -103,6 +103,8 @@ export class ContainerConfigLoader {
      .to(SubscriptionTokenAuthMiddleware)

    // Services
+    container.bind<TimerInterface>(TYPES.ApiGateway_Timer).toConstantValue(new Timer())
+
    if (isConfiguredForHomeServer) {
      if (!configuration?.serviceContainer) {
        throw new Error('Service container is required when configured for home server')
@@ -115,7 +117,6 @@ export class ContainerConfigLoader {
    } else {
      container.bind<ServiceProxyInterface>(TYPES.ApiGateway_ServiceProxy).to(HttpServiceProxy)
    }
-    container.bind<TimerInterface>(TYPES.ApiGateway_Timer).toConstantValue(new Timer())

    if (isConfiguredForHomeServer) {
      container
@@ -39,7 +39,7 @@ export abstract class AuthMiddleware extends BaseMiddleware {
        crossServiceToken = await this.crossServiceTokenCache.get(cacheKey)
      }

-      if (this.crossServiceTokenIsEmptyOrRequiresRevalidation(crossServiceToken)) {
+      if (crossServiceToken === null) {
        const authResponse = await this.serviceProxy.validateSession({
          authorization: authHeaderValue,
          sharedVaultOwnerContext: sharedVaultOwnerContextHeaderValue,
@@ -74,13 +74,16 @@ export abstract class AuthMiddleware extends BaseMiddleware {
      response.locals.sharedVaultOwnerContext = decodedToken.shared_vault_owner_context
      response.locals.belongsToSharedVaults = decodedToken.belongs_to_shared_vaults ?? []
    } catch (error) {
-      const errorMessage = (error as AxiosError).isAxiosError
-        ? JSON.stringify((error as AxiosError).response?.data)
-        : (error as Error).message
+      let detailedErrorMessage = (error as Error).message
+      if (error instanceof AxiosError) {
+        detailedErrorMessage = `Status: ${error.status}, code: ${error.code}, message: ${error.message}`
+      }

-      this.logger.error(`Could not pass the request to sessions/validate on underlying service: ${errorMessage}`)
+      this.logger.error(
+        `Could not pass the request to sessions/validate on underlying service: ${detailedErrorMessage}`,
+      )

-      this.logger.debug('Response error: %O', (error as AxiosError).response ?? error)
+      this.logger.debug(`Response error: ${JSON.stringify(error)}`)

      if ((error as AxiosError).response?.headers['content-type']) {
        response.setHeader('content-type', (error as AxiosError).response?.headers['content-type'] as string)
@@ -91,7 +94,14 @@ export abstract class AuthMiddleware extends BaseMiddleware {
          ? +((error as AxiosError).code as string)
          : 500

-      response.status(errorCode).send(errorMessage)
+      const responseErrorMessage = (error as AxiosError).response?.data
+
+      response
+        .status(errorCode)
+        .send(
+          responseErrorMessage ??
+            "Unfortunately, we couldn't handle your request. Please try again or contact our support if the error persists.",
+        )

      return
    }
@@ -129,14 +139,4 @@ export abstract class AuthMiddleware extends BaseMiddleware {

    return Math.min(crossServiceTokenDefaultCacheExpiration, sessionAccessExpiration, sessionRefreshExpiration)
  }
-
-  private crossServiceTokenIsEmptyOrRequiresRevalidation(crossServiceToken: string | null) {
-    if (crossServiceToken === null) {
-      return true
-    }
-
-    const decodedToken = <CrossServiceTokenData>verify(crossServiceToken, this.jwtSecret, { algorithms: ['HS256'] })
-
-    return decodedToken.ongoing_transition === true
-  }
 }
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
standardci	e6d8e5c5f2	chore(release): publish new version - @standardnotes/analytics@2.33.0 - @standardnotes/api-gateway@1.82.0 - @standardnotes/auth-server@1.168.0 - @standardnotes/domain-events-infra@1.21.0 - @standardnotes/domain-events@2.134.0 - @standardnotes/event-store@1.14.0 - @standardnotes/files-server@1.33.0 - @standardnotes/home-server@1.19.0 - @standardnotes/revisions-server@1.48.0 - @standardnotes/scheduler-server@1.27.0 - @standardnotes/syncing-server@1.121.0 - @standardnotes/websockets-server@1.18.0	2023-11-10 11:46:24 +00:00
Karol Sójko	c24353cc24	feat: add graceful shutdown procedures upon SIGTERM (#923 )	2023-11-10 12:20:21 +01:00
standardci	4855e1d5f5	chore(release): publish new version - @standardnotes/api-gateway@1.81.14 - @standardnotes/home-server@1.18.32	2023-11-10 10:04:31 +00:00
Karol Sójko	5d3fb9a537	fix(api-gateway): add logs about calling web sockets with minimal format	2023-11-10 10:32:47 +01:00
standardci	b55d80a7cd	chore(release): publish new version - @standardnotes/api-gateway@1.81.13 - @standardnotes/home-server@1.18.31	2023-11-09 14:29:28 +00:00
Karol Sójko	16f92bdc99	fix(api-gateway): add possibility to configure keep-alive timeout (#920 )	2023-11-09 15:02:32 +01:00
standardci	4c5738416a	chore(release): publish new version - @standardnotes/home-server@1.18.30 - @standardnotes/syncing-server@1.120.5 - @standardnotes/websockets-server@1.17.8	2023-11-09 13:26:30 +00:00
Karol Sójko	45d4920e0f	fix: remove unused axios dep in subservices	2023-11-09 14:03:44 +01:00
standardci	94e738532a	chore(release): publish new version - @standardnotes/api-gateway@1.81.12 - @standardnotes/home-server@1.18.29 - @standardnotes/websockets-server@1.17.7	2023-11-09 11:18:35 +00:00
Karol Sójko	c4ae12d53f	fix: reduce websockets api communication data (#919 )	2023-11-09 11:44:31 +01:00
standardci	4ff78452f9	chore(release): publish new version - @standardnotes/auth-server@1.167.2 - @standardnotes/home-server@1.18.28 - @standardnotes/syncing-server@1.120.4	2023-11-08 15:38:47 +00:00
Karol Sójko	9465f2ecd8	fix: add logs about sending websocket events to clients	2023-11-08 16:10:44 +01:00
standardci	93c2f1f12f	chore(release): publish new version - @standardnotes/auth-server@1.167.1 - @standardnotes/home-server@1.18.27	2023-11-08 12:15:35 +00:00
Karol Sójko	ca8a3fc77d	fix(auth): path to delete accounts script	2023-11-08 12:30:12 +01:00
standardci	00936e06bc	chore(release): publish new version - @standardnotes/auth-server@1.167.0 - @standardnotes/home-server@1.18.26	2023-11-08 10:48:51 +00:00
Karol Sójko	a6dea50d74	feat: script to mass delete accounts from CSV source (#913 )	2023-11-08 11:21:00 +01:00
standardci	28b04e6a4a	chore(release): publish new version - @standardnotes/auth-server@1.166.0 - @standardnotes/home-server@1.18.25	2023-11-07 14:49:54 +00:00
Karol Sójko	d228a86f48	feat(auth): add triggering post setting update actions (#905 ) * feat(auth): add triggering post setting update actions * feat(auth): refactor email backups * fix: add extra logs for backups * fix: specs	2023-11-07 15:14:51 +01:00
standardci	0cb234aa47	chore(release): publish new version - @standardnotes/api-gateway@1.81.11 - @standardnotes/home-server@1.18.24	2023-11-07 11:28:36 +00:00
Karol Sójko	6b554c28b7	fix(api-gateway): remove calling both auth and payments on account deletion request	2023-11-07 12:02:40 +01:00
standardci	8a0accd8ea	chore(release): publish new version - @standardnotes/analytics@2.32.6 - @standardnotes/api-gateway@1.81.10 - @standardnotes/auth-server@1.165.4 - @standardnotes/domain-events-infra@1.20.4 - @standardnotes/domain-events@2.133.1 - @standardnotes/event-store@1.13.19 - @standardnotes/files-server@1.32.5 - @standardnotes/home-server@1.18.23 - @standardnotes/revisions-server@1.47.5 - @standardnotes/scheduler-server@1.26.6 - @standardnotes/syncing-server@1.120.3 - @standardnotes/websockets-server@1.17.6	2023-11-07 11:00:09 +00:00
Karol Sójko	d66ae62cf4	fix: account deletion event (#904 ) * fix: account deletion event * fix: feature service binding	2023-11-07 11:34:10 +01:00
standardci	b01d1c659d	chore(release): publish new version - @standardnotes/analytics@2.32.5 - @standardnotes/api-gateway@1.81.9 - @standardnotes/auth-server@1.165.3 - @standardnotes/domain-events-infra@1.20.3 - @standardnotes/event-store@1.13.18 - @standardnotes/files-server@1.32.4 - @standardnotes/home-server@1.18.22 - @standardnotes/revisions-server@1.47.4 - @standardnotes/scheduler-server@1.26.5 - @standardnotes/syncing-server@1.120.2 - @standardnotes/websockets-server@1.17.5	2023-11-07 08:52:34 +00:00
Karol Sójko	751f3b2547	fix: remove open telemetry from code (#903 )	2023-11-07 09:15:31 +01:00
standardci	11514e3836	chore(release): publish new version - @standardnotes/home-server@1.18.21 - @standardnotes/syncing-server@1.120.1	2023-11-06 15:00:46 +00:00
Karol Sójko	71689c1497	fix(syncing-server): return cursor token upon transfer limit breached (#902 ) * fix(syncing-server): return cursor token upon transfer limit breached * fix e2e env vars	2023-11-06 15:38:28 +01:00
standardci	2742075edc	chore(release): publish new version - @standardnotes/auth-server@1.165.2 - @standardnotes/home-server@1.18.20	2023-11-03 17:04:35 +00:00
Karol Sójko	7f16232f8b	fix(auth): change log severity on user authentication	2023-11-03 17:36:29 +01:00
standardci	0b0703e6d1	chore(release): publish new version - @standardnotes/api-gateway@1.81.8 - @standardnotes/auth-server@1.165.1 - @standardnotes/home-server@1.18.19	2023-11-03 16:27:17 +00:00
Karol Sójko	3e376c44e3	fix: retry attempts on session validation and more verbose logs (#898 )	2023-11-03 11:23:02 +01:00
standardci	bfe2d4bb4a	chore(release): publish new version - @standardnotes/auth-server@1.165.0 - @standardnotes/home-server@1.18.18 - @standardnotes/syncing-server@1.120.0	2023-11-02 12:01:26 +00:00
Karol Sójko	7253a0a1d9	feat: add shared vault invitation email notifications (#897 )	2023-11-02 12:35:01 +01:00
standardci	f2c5810023	chore(release): publish new version - @standardnotes/home-server@1.18.17	2023-11-02 07:13:07 +00:00
Karol Sójko	2e5b9105b8	fix(home-server): remove unused dep	2023-11-02 07:42:10 +01:00
Karol Sójko	d14411d72e	chore: upgrade deps	2023-11-02 07:40:27 +01:00
standardci	5226513b26	chore(release): publish new version - @standardnotes/auth-server@1.164.2 - @standardnotes/home-server@1.18.16	2023-11-01 14:18:52 +00:00
Mo	334449f8aa	chore: update change email copy	2023-11-01 08:50:37 -05:00
dependabot[bot]	7f43d0c69d	chore(deps): bump docker/login-action from 2 to 3 (#832 ) Bumps [docker/login-action](https://github.com/docker/login-action) from 2 to 3. - [Release notes](https://github.com/docker/login-action/releases) - [Commits](https://github.com/docker/login-action/compare/v2...v3) --- updated-dependencies: - dependency-name: docker/login-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2023-11-01 13:33:03 +01:00
dependabot[bot]	6f18276e7a	chore(deps): bump crazy-max/ghaction-import-gpg from 5 to 6 (#818 ) Bumps [crazy-max/ghaction-import-gpg](https://github.com/crazy-max/ghaction-import-gpg) from 5 to 6. - [Release notes](https://github.com/crazy-max/ghaction-import-gpg/releases) - [Commits](https://github.com/crazy-max/ghaction-import-gpg/compare/v5...v6) --- updated-dependencies: - dependency-name: crazy-max/ghaction-import-gpg dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2023-11-01 13:32:41 +01:00
dependabot[bot]	9ff18a18a5	chore(deps): bump aws-actions/amazon-ecr-login from 1 to 2 (#873 ) Bumps [aws-actions/amazon-ecr-login](https://github.com/aws-actions/amazon-ecr-login) from 1 to 2. - [Release notes](https://github.com/aws-actions/amazon-ecr-login/releases) - [Changelog](https://github.com/aws-actions/amazon-ecr-login/blob/main/CHANGELOG.md) - [Commits](https://github.com/aws-actions/amazon-ecr-login/compare/v1...v2) --- updated-dependencies: - dependency-name: aws-actions/amazon-ecr-login dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2023-11-01 13:31:49 +01:00
dependabot[bot]	999e72fb1f	chore(deps): bump ua-parser-js from 1.0.35 to 1.0.37 (#891 ) Bumps [ua-parser-js](https://github.com/faisalman/ua-parser-js) from 1.0.35 to 1.0.37. - [Release notes](https://github.com/faisalman/ua-parser-js/releases) - [Changelog](https://github.com/faisalman/ua-parser-js/blob/1.0.37/changelog.md) - [Commits](https://github.com/faisalman/ua-parser-js/compare/1.0.35...1.0.37) --- updated-dependencies: - dependency-name: ua-parser-js dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2023-11-01 13:31:11 +01:00
standardci	4733e663a3	chore(release): publish new version - @standardnotes/auth-server@1.164.1 - @standardnotes/home-server@1.18.15	2023-11-01 11:51:38 +00:00
Karol Sójko	b48eeb16c3	fix(auth): creating valet tokens for shared subscription users (#895 ) * fix(auth): creating valet tokens for shared subscription users * fix(auth): updating storage quota	2023-11-01 12:18:44 +01:00
standardci	0aa2584e82	chore(release): publish new version - @standardnotes/auth-server@1.164.0 - @standardnotes/home-server@1.18.14	2023-11-01 08:55:15 +00:00
Karol Sójko	eb8c704d84	feat(auth): add sending email to old email address when the address is changed (#894 )	2023-11-01 09:28:00 +01:00
standardci	e93fa14703	chore(release): publish new version - @standardnotes/api-gateway@1.81.7 - @standardnotes/files-server@1.32.3 - @standardnotes/home-server@1.18.13 - @standardnotes/syncing-server@1.119.4	2023-10-31 14:16:00 +00:00
Karol Sójko	16a6815b69	fix: add fallback methods for 404 requests (#893 ) * fix: add fallback methods for 404 requests * fix: remove fallback controllers exports * fix: have only one fallback controller expored	2023-10-31 14:44:33 +01:00
standardci	b08e9731b8	chore(release): publish new version - @standardnotes/auth-server@1.163.2 - @standardnotes/home-server@1.18.12	2023-10-30 12:23:43 +00:00
Karol Sójko	9bd4fb2d79	fix(auth): checking permissions to update setting only when directly performed by user (#892 )	2023-10-30 12:51:31 +01:00
standardci	647aeda1de	chore(release): publish new version - @standardnotes/auth-server@1.163.1 - @standardnotes/home-server@1.18.11	2023-10-30 11:20:27 +00:00
Karol Sójko	78ff748d91	fix(auth): add more information on the listed creation error	2023-10-30 11:52:26 +01:00
standardci	31f8cf1169	chore(release): publish new version - @standardnotes/api-gateway@1.81.6 - @standardnotes/home-server@1.18.10	2023-10-27 10:03:28 +00:00
Karol Sójko	14bcf7b6c9	fix(api-gateway): logs for errors reaching service	2023-10-27 11:36:52 +02:00
standardci	74adddd1e7	chore(release): publish new version - @standardnotes/analytics@2.32.4 - @standardnotes/api-gateway@1.81.5 - @standardnotes/auth-server@1.163.0 - @standardnotes/domain-core@1.40.0 - @standardnotes/event-store@1.13.17 - @standardnotes/files-server@1.32.2 - @standardnotes/home-server@1.18.9 - @standardnotes/revisions-server@1.47.3 - @standardnotes/scheduler-server@1.26.4 - @standardnotes/settings@1.22.0 - @standardnotes/syncing-server@1.119.3 - @standardnotes/websockets-server@1.17.4	2023-10-26 13:52:56 +00:00
Karol Sójko	0e43bc0042	feat: extract setting name to domain-core package	2023-10-26 15:18:11 +02:00
standardci	b40d539611	chore(release): publish new version - @standardnotes/api-gateway@1.81.4 - @standardnotes/home-server@1.18.8	2023-10-26 11:53:47 +00:00
Karol Sójko	654663d17f	fix(api-gateway): retry attempts and logs	2023-10-26 13:27:27 +02:00
standardci	75830c3a98	chore(release): publish new version - @standardnotes/analytics@2.32.3 - @standardnotes/api-gateway@1.81.3 - @standardnotes/auth-server@1.162.0 - @standardnotes/domain-core@1.39.0 - @standardnotes/event-store@1.13.16 - @standardnotes/files-server@1.32.1 - @standardnotes/home-server@1.18.7 - @standardnotes/revisions-server@1.47.2 - @standardnotes/scheduler-server@1.26.3 - @standardnotes/settings@1.21.47 - @standardnotes/syncing-server@1.119.2 - @standardnotes/websockets-server@1.17.3	2023-10-26 11:13:35 +00:00
Karol Sójko	1b5078eb96	feat: refactor settings (#890 ) * feat: refactor settings * fix verify mfa specs and data source metadata * fix: compound index field names * fix metadata binding for typeorm repository * fix responses to preserve e2e * fixes for e2e * fix recovery codes e2e * add missing specs	2023-10-26 12:42:30 +02:00
standardci	a5e019e290	chore(release): publish new version - @standardnotes/auth-server@1.161.0 - @standardnotes/home-server@1.18.6	2023-10-23 12:29:33 +00:00
Karol Sójko	a812f3400a	feat(auth): remove axios http calls to payments server (#889 ) * feat(auth): remove axios http calls to payments server * fix: remove unused variable * fix: remove another unused variable	2023-10-23 14:01:22 +02:00
Karol Sójko	15af5635f0	fix: allow to cancel previous subscription when activating premium features in e2e tests	2023-10-23 11:44:35 +02:00
standardci	cee6d62791	chore(release): publish new version - @standardnotes/api-gateway@1.81.2 - @standardnotes/home-server@1.18.5	2023-10-20 10:13:15 +00:00
Karol Sójko	6aee51bd45	fix(api-gateway): add session validation retry attempts on timedout requests	2023-10-20 11:46:29 +02:00
standardci	599a84e634	chore(release): publish new version - @standardnotes/api-gateway@1.81.1 - @standardnotes/home-server@1.18.4	2023-10-20 08:52:56 +00:00
Karol Sójko	1c3d19cca4	fix(api-gateway): logs severity on retry attempts	2023-10-20 10:21:10 +02:00
standardci	9986e8e7ce	chore(release): publish new version - @standardnotes/home-server@1.18.3 - @standardnotes/revisions-server@1.47.1 - @standardnotes/syncing-server@1.119.1	2023-10-20 08:12:46 +00:00
Karol Sójko	e19f7a7b7f	fix: merge mysql and mysql-legacy together (#883 )	2023-10-20 09:42:10 +02:00
Karol Sójko	d570146378	fix: publishing workflow	2023-10-20 09:40:54 +02:00
standardci	8a9e4370e5	chore(release): publish new version - @standardnotes/api-gateway@1.81.0 - @standardnotes/home-server@1.18.2	2023-10-20 07:40:07 +00:00
Karol Sójko	ce357679e9	feat(api-gateway): add retry attempts on timedout requests (#885 )	2023-10-20 09:24:01 +02:00
standardci	acab402747	chore(release): publish new version - @standardnotes/api-gateway@1.80.1 - @standardnotes/home-server@1.18.1	2023-10-19 18:17:41 +00:00
Karol Sójko	e385926046	fix(api-gateway): stringify error in service proxy	2023-10-19 20:01:18 +02:00
standardci	e9b8d0ceb7	chore(release): publish new version - @standardnotes/analytics@2.32.2 - @standardnotes/api-gateway@1.80.0 - @standardnotes/auth-server@1.160.0 - @standardnotes/domain-core@1.38.0 - @standardnotes/domain-events-infra@1.20.2 - @standardnotes/domain-events@2.133.0 - @standardnotes/event-store@1.13.15 - @standardnotes/files-server@1.32.0 - @standardnotes/home-server@1.18.0 - @standardnotes/revisions-server@1.47.0 - @standardnotes/scheduler-server@1.26.2 - @standardnotes/security@1.16.0 - @standardnotes/settings@1.21.46 - @standardnotes/syncing-server@1.119.0 - @standardnotes/websockets-server@1.17.2	2023-10-19 09:56:55 +00:00
Karol Sójko	a2c1ebe675	feat: remove transition state (#882 ) * fix: Dockerfile build deps * feat: remove transition state	2023-10-19 11:38:16 +02:00
Karol Sójko	3ef8e9ea24	fix: re-enable vault tests (#875 )	2023-10-18 11:14:24 +02:00