chore(release): publish new version

- @standardnotes/auth-server@1.39.0 - @standardnotes/workspace-server@1.1.0
feat: add workspace microservice
2026-02-02 08:01:14 -05:00 · 2022-10-06 09:56:05 +00:00 · 2022-10-06 11:54:22 +02:00 · 2022-10-05 12:28:08 +00:00 · 2022-10-05 14:26:36 +02:00 · 2022-10-05 12:16:16 +00:00
71 changed files with 1527 additions and 32 deletions
--- a/.github/workflows/workspace.release.yml
+++ b/.github/workflows/workspace.release.yml
@@ -0,0 +1,206 @@
+name: Workspace Server
+
+concurrency:
+  group: workspace
+  cancel-in-progress: true
+
+on:
+  push:
+    tags:
+      - '*standardnotes/workspace-server*'
+  workflow_dispatch:
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+
+    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: Build
+      run: yarn build
+
+    - name: Lint
+      run: yarn lint:workspace
+
+    - name: Test
+      run: yarn test:workspace
+
+    - name: Login to Docker Hub
+      uses: docker/login-action@v2
+      with:
+        username: ${{ secrets.DOCKER_USERNAME }}
+        password: ${{ secrets.DOCKER_PASSWORD }}
+
+    - name: Publish Docker image for E2E testing
+      run: |
+        yarn docker build @standardnotes/workspace-server -t standardnotes/workspace:${{ github.sha }}
+        docker push standardnotes/workspace:${{ github.sha }}
+
+    - name: Run E2E test suite
+      uses: convictional/trigger-workflow-and-wait@v1.6.3
+      with:
+        owner: standardnotes
+        repo: e2e
+        github_token: ${{ secrets.CI_PAT_TOKEN }}
+        workflow_file_name: testing-with-stable-client.yml
+        wait_interval: 30
+        client_payload: '{"workspace_image_tag": "${{ github.sha }}"}'
+        propagate_failure: true
+        trigger_workflow: true
+        wait_workflow: true
+
+  publish-aws-ecr:
+    needs: test
+
+    runs-on: ubuntu-latest
+
+    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: Build locally
+      run: yarn build
+    - name: Configure AWS credentials
+      uses: aws-actions/configure-aws-credentials@v1
+      with:
+        aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
+        aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+        aws-region: us-east-1
+    - name: Login to Amazon ECR
+      id: login-ecr
+      uses: aws-actions/amazon-ecr-login@v1
+    - name: Build, tag, and push image to Amazon ECR
+      id: build-image
+      env:
+        ECR_REGISTRY: ${{ steps.login-ecr.outputs.registry }}
+        ECR_REPOSITORY: workspace
+        IMAGE_TAG: ${{ github.sha }}
+      run: |
+        yarn docker build @standardnotes/workspace-server -t $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG
+        docker push $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG
+        docker tag $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG $ECR_REGISTRY/$ECR_REPOSITORY:latest
+        docker push $ECR_REGISTRY/$ECR_REPOSITORY:latest
+
+  publish-docker-hub:
+    needs: test
+
+    runs-on: ubuntu-latest
+
+    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: Build locally
+      run: yarn build
+    - name: Login to Docker Hub
+      uses: docker/login-action@v2
+      with:
+        username: ${{ secrets.DOCKER_USERNAME }}
+        password: ${{ secrets.DOCKER_PASSWORD }}
+    - name: Publish Docker image as stable
+      run: |
+        yarn docker build @standardnotes/workspace-server -t standardnotes/workspace:latest
+        docker push standardnotes/workspace:latest
+
+  deploy-web:
+    needs: publish-aws-ecr
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Configure AWS credentials
+      uses: aws-actions/configure-aws-credentials@v1
+      with:
+        aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
+        aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+        aws-region: us-east-1
+    - name: Download task definition
+      run: |
+        aws ecs describe-task-definition --task-definition workspace-prod --query taskDefinition > task-definition.json
+    - name: Fill in the new version in the Amazon ECS task definition
+      run: |
+        jq '(.containerDefinitions[] | select(.name=="workspace-prod") | .environment[] | select(.name=="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
+      with:
+        task-definition: task-definition.json
+        container-name: workspace-prod
+        image: ${{ secrets.AWS_ECR_REGISTRY }}/workspace:${{ github.sha }}
+    - name: Deploy Amazon ECS task definition
+      uses: aws-actions/amazon-ecs-deploy-task-definition@v1
+      with:
+        task-definition: ${{ steps.task-def-prod.outputs.task-definition }}
+        service: workspace-prod
+        cluster: prod
+        wait-for-service-stability: true
+
+  deploy-worker:
+    needs: publish-aws-ecr
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Configure AWS credentials
+      uses: aws-actions/configure-aws-credentials@v1
+      with:
+        aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
+        aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+        aws-region: us-east-1
+    - name: Download task definition
+      run: |
+        aws ecs describe-task-definition --task-definition workspace-worker-prod --query taskDefinition > task-definition.json
+    - name: Fill in the new version in the Amazon ECS task definition
+      run: |
+        jq '(.containerDefinitions[] | select(.name=="workspace-worker-prod") | .environment[] | select(.name=="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
+      with:
+        task-definition: task-definition.json
+        container-name: workspace-worker-prod
+        image: ${{ secrets.AWS_ECR_REGISTRY }}/workspace:${{ github.sha }}
+    - name: Deploy Amazon ECS task definition
+      uses: aws-actions/amazon-ecs-deploy-task-definition@v1
+      with:
+        task-definition: ${{ steps.task-def-prod.outputs.task-definition }}
+        service: workspace-worker-prod
+        cluster: prod
+        wait-for-service-stability: true
+
+  newrelic:
+    needs: [ deploy-web, deploy-worker ]
+
+    runs-on: ubuntu-latest
+    steps:
+      - name: Create New Relic deployment marker for Web
+        uses: newrelic/deployment-marker-action@v1
+        with:
+          accountId: ${{ secrets.NEW_RELIC_ACCOUNT_ID }}
+          apiKey: ${{ secrets.NEW_RELIC_API_KEY }}
+          applicationId: ${{ secrets.NEW_RELIC_APPLICATION_ID_WORKSPACE_WEB_PROD }}
+          revision: "${{ github.sha }}"
+          description: "Automated Deployment via Github Actions"
+          user: "${{ github.actor }}"
+      - name: Create New Relic deployment marker for Worker
+        uses: newrelic/deployment-marker-action@v1
+        with:
+          accountId: ${{ secrets.NEW_RELIC_ACCOUNT_ID }}
+          apiKey: ${{ secrets.NEW_RELIC_API_KEY }}
+          applicationId: ${{ secrets.NEW_RELIC_APPLICATION_ID_WORKSPACE_WORKER_PROD }}
+          revision: "${{ github.sha }}"
+          description: "Automated Deployment via Github Actions"
+          user: "${{ github.actor }}"
--- a/.pnp.cjs
+++ b/.pnp.cjs
@@ -79,6 +79,10 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
      {\
        "name": "@standardnotes/time",\
        "reference": "workspace:packages/time"\
+      },\
+      {\
+        "name": "@standardnotes/workspace-server",\
+        "reference": "workspace:packages/workspace"\
      }\
    ],\
    "enableTopLevelFallback": true,\
@@ -99,7 +103,8 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
      ["@standardnotes/settings", ["workspace:packages/settings"]],\
      ["@standardnotes/sncrypto-node", ["workspace:packages/sncrypto-node"]],\
      ["@standardnotes/syncing-server", ["workspace:packages/syncing-server"]],\
-      ["@standardnotes/time", ["workspace:packages/time"]]\
+      ["@standardnotes/time", ["workspace:packages/time"]],\
+      ["@standardnotes/workspace-server", ["workspace:packages/workspace"]]\
    ],\
    "fallbackPool": [\
    ],\
@@ -3099,6 +3104,43 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
          "linkType": "HARD"\
        }]\
      ]],\
+      ["@standardnotes/workspace-server", [\
+        ["workspace:packages/workspace", {\
+          "packageLocation": "./packages/workspace/",\
+          "packageDependencies": [\
+            ["@standardnotes/workspace-server", "workspace:packages/workspace"],\
+            ["@newrelic/winston-enricher", "virtual:04783e12400851b8a3d76e71495851cc94959db6e62f04cb0a31190080629440b182d8c8eb4d7f2b04e281912f2783a5fd4d2c3c6ab68d38b7097246c93f4c19#npm:4.0.0"],\
+            ["@sentry/node", "npm:7.5.0"],\
+            ["@standardnotes/common", "workspace:packages/common"],\
+            ["@standardnotes/domain-events", "workspace:packages/domain-events"],\
+            ["@standardnotes/domain-events-infra", "workspace:packages/domain-events-infra"],\
+            ["@standardnotes/security", "workspace:packages/security"],\
+            ["@types/cors", "npm:2.8.12"],\
+            ["@types/express", "npm:4.17.13"],\
+            ["@types/ioredis", "npm:4.28.10"],\
+            ["@types/jest", "npm:28.1.4"],\
+            ["@types/newrelic", "npm:7.0.3"],\
+            ["@typescript-eslint/eslint-plugin", "virtual:04783e12400851b8a3d76e71495851cc94959db6e62f04cb0a31190080629440b182d8c8eb4d7f2b04e281912f2783a5fd4d2c3c6ab68d38b7097246c93f4c19#npm:5.30.5"],\
+            ["aws-sdk", "npm:2.1168.0"],\
+            ["cors", "npm:2.8.5"],\
+            ["dotenv", "npm:16.0.1"],\
+            ["eslint", "npm:8.19.0"],\
+            ["eslint-plugin-prettier", "virtual:04783e12400851b8a3d76e71495851cc94959db6e62f04cb0a31190080629440b182d8c8eb4d7f2b04e281912f2783a5fd4d2c3c6ab68d38b7097246c93f4c19#npm:4.2.1"],\
+            ["express", "npm:4.18.1"],\
+            ["inversify", "npm:6.0.1"],\
+            ["inversify-express-utils", "npm:6.4.3"],\
+            ["ioredis", "npm:5.2.0"],\
+            ["jest", "virtual:c66bf20e88479ada0172094776519a9f51acc4731d22079b60a295bcec7ea42d5545cbce58a77a50d932bf953298799135e99707486e343da6d99ba1d167bdbd#npm:28.1.2"],\
+            ["mysql2", "npm:2.3.3"],\
+            ["newrelic", "npm:9.0.0"],\
+            ["reflect-metadata", "npm:0.1.13"],\
+            ["ts-jest", "virtual:c66bf20e88479ada0172094776519a9f51acc4731d22079b60a295bcec7ea42d5545cbce58a77a50d932bf953298799135e99707486e343da6d99ba1d167bdbd#npm:28.0.5"],\
+            ["typeorm", "virtual:31b5a94a105c89c9294c3d524a7f8929fe63ee5a2efadf21951ca4c0cfd2ecf02e8f4ef5a066bbda091f1e3a56e57c6749069a080618c96b22e51131a330fc4a#npm:0.3.7"],\
+            ["winston", "npm:3.8.1"]\
+          ],\
+          "linkType": "SOFT"\
+        }]\
+      ]],\
      ["@szmarczak/http-timer", [\
        ["npm:5.0.1", {\
          "packageLocation": "./.yarn/cache/@szmarczak-http-timer-npm-5.0.1-52261e5986-fc9cb993e8.zip/node_modules/@szmarczak/http-timer/",\
--- a/package.json
+++ b/package.json
@@ -18,12 +18,14 @@
    "lint:files": "yarn workspace @standardnotes/files-server lint",
    "lint:api-gateway": "yarn workspace @standardnotes/api-gateway lint",
    "lint:event-store": "yarn workspace @standardnotes/event-store lint",
+    "lint:workspace": "yarn workspace @standardnotes/workspace-server lint",
    "test": "yarn workspaces foreach -p -j 10 --verbose run test",
    "test:auth": "yarn workspace @standardnotes/auth-server test",
    "test:scheduler": "yarn workspace @standardnotes/scheduler-server test",
    "test:syncing-server": "yarn workspace @standardnotes/syncing-server test",
    "test:files": "yarn workspace @standardnotes/files-server test",
    "test:event-store": "yarn workspace @standardnotes/event-store test",
+    "test:workspace": "yarn workspace @standardnotes/workspace-server test",
    "clean": "yarn workspaces foreach -p --verbose run clean",
    "setup:env": "cp .env.sample .env && yarn workspaces foreach -p --verbose run setup:env",
    "build": "yarn workspaces foreach -pt -j 10 --verbose run build",
@@ -32,6 +34,7 @@
    "build:syncing-server": "yarn workspace @standardnotes/syncing-server build",
    "build:files": "yarn workspace @standardnotes/files-server build",
    "build:api-gateway": "yarn workspace @standardnotes/api-gateway build",
+    "build:workspace": "yarn workspace @standardnotes/workspace-server build",
    "start:auth": "yarn workspace @standardnotes/auth-server start",
    "start:auth-worker": "yarn workspace @standardnotes/auth-server worker",
    "start:scheduler": "yarn workspace @standardnotes/scheduler-server worker",
@@ -40,6 +43,7 @@
    "start:files": "yarn workspace @standardnotes/files-server start",
    "start:files-worker": "yarn workspace @standardnotes/files-server worker",
    "start:api-gateway": "yarn workspace @standardnotes/api-gateway start",
+    "start:workspace": "yarn workspace @standardnotes/workspace-server start",
    "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",
--- a/packages/analytics/CHANGELOG.md
+++ b/packages/analytics/CHANGELOG.md
@@ -3,6 +3,18 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

+# [1.35.0](https://github.com/standardnotes/server/compare/@standardnotes/analytics@1.34.0...@standardnotes/analytics@1.35.0) (2022-10-05)
+
+### Features
+
+* **api-gateway:** include increments count in statistics measures report ([84e8a5c](https://github.com/standardnotes/server/commit/84e8a5cc6e6ba216f1c0737a7a93aba581eced0f))
+
+# [1.34.0](https://github.com/standardnotes/server/compare/@standardnotes/analytics@1.33.0...@standardnotes/analytics@1.34.0) (2022-10-04)
+
+### Features
+
+* **analytics:** add new statistics measures for income ([19455ba](https://github.com/standardnotes/server/commit/19455ba6a7d84a389830c728c3dfea550b156985))
+
 # [1.33.0](https://github.com/standardnotes/server/compare/@standardnotes/analytics@1.32.0...@standardnotes/analytics@1.33.0) (2022-10-03)

 ### Features
--- a/packages/analytics/package.json
+++ b/packages/analytics/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@standardnotes/analytics",
-  "version": "1.33.0",
+  "version": "1.35.0",
  "engines": {
    "node": ">=14.0.0 <17.0.0"
  },
--- a/packages/analytics/src/Domain/Statistics/StatisticsMeasure.ts
+++ b/packages/analytics/src/Domain/Statistics/StatisticsMeasure.ts
@@ -1,5 +1,13 @@
 export enum StatisticsMeasure {
  Income = 'income',
+  PlusSubscriptionInitialMonthlyPaymentsIncome = 'plus-subscription-initial-monthly-payments-income',
+  ProSubscriptionInitialMonthlyPaymentsIncome = 'pro-subscription-initial-monthly-payments-income',
+  PlusSubscriptionInitialAnnualPaymentsIncome = 'plus-subscription-initial-annual-payments-income',
+  ProSubscriptionInitialAnnualPaymentsIncome = 'pro-subscription-initial-annual-payments-income',
+  PlusSubscriptionRenewingMonthlyPaymentsIncome = 'plus-subscription-renewing-monthly-payments-income',
+  ProSubscriptionRenewingMonthlyPaymentsIncome = 'pro-subscription-renewing-monthly-payments-income',
+  PlusSubscriptionRenewingAnnualPaymentsIncome = 'plus-subscription-renewing-annual-payments-income',
+  ProSubscriptionRenewingAnnualPaymentsIncome = 'pro-subscription-renewing-annual-payments-income',
  SubscriptionLength = 'subscription-length',
  RegistrationLength = 'registration-length',
  RegistrationToSubscriptionTime = 'registration-to-subscription-time',
--- a/packages/analytics/src/Domain/Statistics/StatisticsStoreInterface.ts
+++ b/packages/analytics/src/Domain/Statistics/StatisticsStoreInterface.ts
@@ -12,4 +12,5 @@ export interface StatisticsStoreInterface {
  setMeasure(measure: StatisticsMeasure, value: number, periods: Period[]): Promise<void>
  getMeasureAverage(measure: StatisticsMeasure, period: Period): Promise<number>
  getMeasureTotal(measure: StatisticsMeasure, periodOrPeriodKey: Period | string): Promise<number>
+  getMeasureIncrementCounts(measure: StatisticsMeasure, period: Period): Promise<number>
 }
--- a/packages/analytics/src/Infra/Redis/RedisStatisticsStore.ts
+++ b/packages/analytics/src/Infra/Redis/RedisStatisticsStore.ts
@@ -8,6 +8,17 @@ import { StatisticsStoreInterface } from '../../Domain/Statistics/StatisticsStor
 export class RedisStatisticsStore implements StatisticsStoreInterface {
  constructor(private periodKeyGenerator: PeriodKeyGeneratorInterface, private redisClient: IORedis.Redis) {}

+  async getMeasureIncrementCounts(measure: StatisticsMeasure, period: Period): Promise<number> {
+    const increments = await this.redisClient.get(
+      `count:increments:${measure}:timespan:${this.periodKeyGenerator.getPeriodKey(period)}`,
+    )
+    if (increments === null) {
+      return 0
+    }
+
+    return +increments
+  }
+
  async setMeasure(measure: StatisticsMeasure, value: number, periods: Period[]): Promise<void> {
    const pipeline = this.redisClient.pipeline()

@@ -45,16 +56,15 @@ export class RedisStatisticsStore implements StatisticsStoreInterface {
  }

  async getMeasureAverage(measure: StatisticsMeasure, period: Period): Promise<number> {
-    const increments = await this.redisClient.get(
-      `count:increments:${measure}:timespan:${this.periodKeyGenerator.getPeriodKey(period)}`,
-    )
-    if (increments === null) {
+    const increments = await this.getMeasureIncrementCounts(measure, period)
+
+    if (increments === 0) {
      return 0
    }

    const totalValue = await this.getMeasureTotal(measure, period)

-    return totalValue / +increments
+    return totalValue / increments
  }

  async getYesterdayOutOfSyncIncidents(): Promise<number> {
--- a/packages/api-gateway/CHANGELOG.md
+++ b/packages/api-gateway/CHANGELOG.md
@@ -3,6 +3,42 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

+# [1.26.0](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.25.0...@standardnotes/api-gateway@1.26.0) (2022-10-05)
+
+### Features
+
+* **api-gateway:** include increments count in statistics measures report ([84e8a5c](https://github.com/standardnotes/api-gateway/commit/84e8a5cc6e6ba216f1c0737a7a93aba581eced0f))
+
+# [1.25.0](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.24.5...@standardnotes/api-gateway@1.25.0) (2022-10-05)
+
+### Features
+
+* **api-gateway:** add detailed payments statistics to report ([7429f5c](https://github.com/standardnotes/api-gateway/commit/7429f5c8e9dafdba557cdbfb3d9020513fc7a9ee))
+
+## [1.24.5](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.24.4...@standardnotes/api-gateway@1.24.5) (2022-10-04)
+
+**Note:** Version bump only for package @standardnotes/api-gateway
+
+## [1.24.4](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.24.3...@standardnotes/api-gateway@1.24.4) (2022-10-04)
+
+**Note:** Version bump only for package @standardnotes/api-gateway
+
+## [1.24.3](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.24.2...@standardnotes/api-gateway@1.24.3) (2022-10-04)
+
+**Note:** Version bump only for package @standardnotes/api-gateway
+
+## [1.24.2](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.24.1...@standardnotes/api-gateway@1.24.2) (2022-10-03)
+
+### Bug Fixes
+
+* **api-gateway:** report churn values for empty months ([f43fbf1](https://github.com/standardnotes/api-gateway/commit/f43fbf15844be05add905134dfb3e8ca90f78458))
+
+## [1.24.1](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.24.0...@standardnotes/api-gateway@1.24.1) (2022-10-03)
+
+### Bug Fixes
+
+* add debug logs for churn calculation ([2236cc3](https://github.com/standardnotes/api-gateway/commit/2236cc3828167e4b94defbde2691bba38458bd1c))
+
 # [1.24.0](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.23.0...@standardnotes/api-gateway@1.24.0) (2022-10-03)

 ### Features
--- a/packages/api-gateway/bin/report.ts
+++ b/packages/api-gateway/bin/report.ts
@@ -94,6 +94,14 @@ const requestReport = async (

  const statisticMeasureNames = [
    StatisticsMeasure.Income,
+    StatisticsMeasure.PlusSubscriptionInitialAnnualPaymentsIncome,
+    StatisticsMeasure.PlusSubscriptionInitialMonthlyPaymentsIncome,
+    StatisticsMeasure.PlusSubscriptionRenewingAnnualPaymentsIncome,
+    StatisticsMeasure.PlusSubscriptionRenewingMonthlyPaymentsIncome,
+    StatisticsMeasure.ProSubscriptionInitialAnnualPaymentsIncome,
+    StatisticsMeasure.ProSubscriptionInitialMonthlyPaymentsIncome,
+    StatisticsMeasure.ProSubscriptionRenewingAnnualPaymentsIncome,
+    StatisticsMeasure.ProSubscriptionRenewingMonthlyPaymentsIncome,
    StatisticsMeasure.Refunds,
    StatisticsMeasure.RegistrationLength,
    StatisticsMeasure.SubscriptionLength,
@@ -113,6 +121,7 @@ const requestReport = async (
        period,
        totalValue: await statisticsStore.getMeasureTotal(statisticMeasureName, period),
        average: await statisticsStore.getMeasureAverage(statisticMeasureName, period),
+        increments: await statisticsStore.getMeasureIncrementCounts(statisticMeasureName, period),
      })
    }
  }
@@ -144,11 +153,13 @@ const requestReport = async (

    const totalCustomerCounts: Array<number> = []
    for (const dailyPeriodKey of dailyPeriodKeys) {
-      totalCustomerCounts.push(await statisticsStore.getMeasureTotal(StatisticsMeasure.TotalCustomers, dailyPeriodKey))
+      const customersCount = await statisticsStore.getMeasureTotal(StatisticsMeasure.TotalCustomers, dailyPeriodKey)
+      totalCustomerCounts.push(customersCount)
    }
    const filteredTotalCustomerCounts = totalCustomerCounts.filter((count) => !!count)
-    const averageCustomersCount =
-      filteredTotalCustomerCounts.reduce((total, current) => total + current, 0) / filteredTotalCustomerCounts.length
+    const averageCustomersCount = filteredTotalCustomerCounts.length
+      ? filteredTotalCustomerCounts.reduce((total, current) => total + current, 0) / filteredTotalCustomerCounts.length
+      : 0

    const existingCustomersChurn = await analyticsStore.calculateActivityTotalCount(
      AnalyticsActivity.ExistingCustomersChurn,
@@ -163,7 +174,7 @@ const requestReport = async (

    churnRates.push({
      periodKey: monthPeriodKey,
-      rate: totalChurn / averageCustomersCount,
+      rate: averageCustomersCount ? (totalChurn / averageCustomersCount) * 100 : 0,
    })
  }

--- a/packages/api-gateway/package.json
+++ b/packages/api-gateway/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@standardnotes/api-gateway",
-  "version": "1.24.0",
+  "version": "1.26.0",
  "engines": {
    "node": ">=16.0.0 <17.0.0"
  },
--- a/packages/auth/CHANGELOG.md
+++ b/packages/auth/CHANGELOG.md
@@ -3,6 +3,44 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

+# [1.39.0](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.38.1...@standardnotes/auth-server@1.39.0) (2022-10-06)
+
+### Features
+
+* add workspace microservice ([44a9ade](https://github.com/standardnotes/server/commit/44a9ade3fc0935d24733327c6b2de05b52496b1c))
+
+## [1.38.1](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.38.0...@standardnotes/auth-server@1.38.1) (2022-10-05)
+
+### Bug Fixes
+
+* **auth:** group typeorm annotations ([a02a26e](https://github.com/standardnotes/server/commit/a02a26ebdcc1decda84b265cd75b4932b7131c76))
+
+# [1.38.0](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.37.1...@standardnotes/auth-server@1.38.0) (2022-10-05)
+
+### Features
+
+* **auth:** add groups model and database structure ([3091177](https://github.com/standardnotes/server/commit/309117770007b8f2d67dcf86fa2c4b9b436e0aef))
+
+## [1.37.1](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.37.0...@standardnotes/auth-server@1.37.1) (2022-10-05)
+
+**Note:** Version bump only for package @standardnotes/auth-server
+
+# [1.37.0](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.36.4...@standardnotes/auth-server@1.37.0) (2022-10-04)
+
+### Features
+
+* **auth:** add detailed income stats ([8668fec](https://github.com/standardnotes/server/commit/8668fec33dac1598bdc4d6ca869c296ed6eaa617))
+
+## [1.36.4](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.36.3...@standardnotes/auth-server@1.36.4) (2022-10-04)
+
+**Note:** Version bump only for package @standardnotes/auth-server
+
+## [1.36.3](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.36.2...@standardnotes/auth-server@1.36.3) (2022-10-04)
+
+### Bug Fixes
+
+* **auth:** turn down severity of logs for predicate verification ([09b3f9a](https://github.com/standardnotes/server/commit/09b3f9a0d787d2a329f84e2d625ec8a63b4bd847))
+
 ## [1.36.2](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.36.1...@standardnotes/auth-server@1.36.2) (2022-10-03)

 **Note:** Version bump only for package @standardnotes/auth-server
--- a/packages/auth/migrations/1664971834974-groups.ts
+++ b/packages/auth/migrations/1664971834974-groups.ts
@@ -0,0 +1,28 @@
+import { MigrationInterface, QueryRunner } from 'typeorm'
+
+export class groups1664971834974 implements MigrationInterface {
+  name = 'groups1664971834974'
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      'CREATE TABLE `groups` (`uuid` varchar(36) NOT NULL, `type` varchar(64) NOT NULL, PRIMARY KEY (`uuid`)) ENGINE=InnoDB',
+    )
+    await queryRunner.query(
+      'CREATE TABLE `group_users` (`uuid` varchar(36) NOT NULL, `access_level` varchar(64) NOT NULL, `user_uuid` varchar(36) NOT NULL, `group_uuid` varchar(36) NOT NULL, `encrypted_group_key` varchar(255) NOT NULL, UNIQUE INDEX `index_group_users_on_group_and_user` (`user_uuid`, `group_uuid`), PRIMARY KEY (`uuid`)) ENGINE=InnoDB',
+    )
+    await queryRunner.query(
+      'ALTER TABLE `group_users` ADD CONSTRAINT `FK_b97989611efde2c54b074127920` FOREIGN KEY (`user_uuid`) REFERENCES `users`(`uuid`) ON DELETE CASCADE ON UPDATE NO ACTION',
+    )
+    await queryRunner.query(
+      'ALTER TABLE `group_users` ADD CONSTRAINT `FK_9d1bcb8c649eb05d7a2eb62114e` FOREIGN KEY (`group_uuid`) REFERENCES `groups`(`uuid`) ON DELETE CASCADE ON UPDATE NO ACTION',
+    )
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query('ALTER TABLE `group_users` DROP FOREIGN KEY `FK_9d1bcb8c649eb05d7a2eb62114e`')
+    await queryRunner.query('ALTER TABLE `group_users` DROP FOREIGN KEY `FK_b97989611efde2c54b074127920`')
+    await queryRunner.query('DROP INDEX `index_group_users_on_group_and_user` ON `group_users`')
+    await queryRunner.query('DROP TABLE `group_users`')
+    await queryRunner.query('DROP TABLE `groups`')
+  }
+}
--- a/packages/auth/migrations/1665047863774-remove-groups.ts
+++ b/packages/auth/migrations/1665047863774-remove-groups.ts
@@ -0,0 +1,17 @@
+import { MigrationInterface, QueryRunner } from 'typeorm'
+
+export class removeGroups1665047863774 implements MigrationInterface {
+  name = 'removeGroups1665047863774'
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query('ALTER TABLE `group_users` DROP FOREIGN KEY `FK_9d1bcb8c649eb05d7a2eb62114e`')
+    await queryRunner.query('ALTER TABLE `group_users` DROP FOREIGN KEY `FK_b97989611efde2c54b074127920`')
+    await queryRunner.query('DROP INDEX `index_group_users_on_group_and_user` ON `group_users`')
+    await queryRunner.query('DROP TABLE `group_users`')
+    await queryRunner.query('DROP TABLE `groups`')
+  }
+
+  public async down(): Promise<void> {
+    return
+  }
+}
--- a/packages/auth/package.json
+++ b/packages/auth/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@standardnotes/auth-server",
-  "version": "1.36.2",
+  "version": "1.39.0",
  "engines": {
    "node": ">=16.0.0 <17.0.0"
  },
--- a/packages/auth/src/Domain/Handler/PaymentSuccessEventHandler.spec.ts
+++ b/packages/auth/src/Domain/Handler/PaymentSuccessEventHandler.spec.ts
@@ -1,7 +1,7 @@
 import 'reflect-metadata'

 import { PaymentSuccessEvent } from '@standardnotes/domain-events'
-import { AnalyticsStoreInterface, StatisticsStoreInterface } from '@standardnotes/analytics'
+import { AnalyticsStoreInterface, Period, StatisticsStoreInterface } from '@standardnotes/analytics'

 import { PaymentSuccessEventHandler } from './PaymentSuccessEventHandler'
 import { UserRepositoryInterface } from '../User/UserRepositoryInterface'
@@ -38,14 +38,41 @@ describe('PaymentSuccessEventHandler', () => {
    event.payload = {
      userEmail: 'test@test.com',
      amount: 12.45,
+      billingFrequency: 12,
+      paymentType: 'initial',
+      subscriptionName: 'PRO_PLAN',
    }
  })

-  it('should mark payment failed for analytics', async () => {
+  it('should mark payment success for analytics', async () => {
    await createHandler().handle(event)

    expect(analyticsStore.markActivity).toHaveBeenCalled()
-    expect(statisticsStore.incrementMeasure).toHaveBeenCalled()
+    expect(statisticsStore.incrementMeasure).toHaveBeenNthCalledWith(
+      2,
+      'pro-subscription-initial-annual-payments-income',
+      12.45,
+      [Period.Today, Period.ThisWeek, Period.ThisMonth],
+    )
+  })
+
+  it('should mark non-detailed payment success statistics for analytics', async () => {
+    event.payload = {
+      userEmail: 'test@test.com',
+      amount: 12.45,
+      billingFrequency: 13,
+      paymentType: 'initial',
+      subscriptionName: 'PRO_PLAN',
+    }
+
+    await createHandler().handle(event)
+
+    expect(statisticsStore.incrementMeasure).toBeCalledTimes(1)
+    expect(statisticsStore.incrementMeasure).toHaveBeenNthCalledWith(1, 'income', 12.45, [
+      Period.Today,
+      Period.ThisWeek,
+      Period.ThisMonth,
+    ])
  })

  it('should not mark payment failed for analytics if user is not found', async () => {
--- a/packages/auth/src/Domain/Handler/PaymentSuccessEventHandler.ts
+++ b/packages/auth/src/Domain/Handler/PaymentSuccessEventHandler.ts
@@ -5,6 +5,7 @@ import {
  StatisticsMeasure,
  StatisticsStoreInterface,
 } from '@standardnotes/analytics'
+import { PaymentType, SubscriptionBillingFrequency, SubscriptionName } from '@standardnotes/common'
 import { DomainEventHandlerInterface, PaymentSuccessEvent } from '@standardnotes/domain-events'
 import { inject, injectable } from 'inversify'

@@ -14,6 +15,47 @@ import { UserRepositoryInterface } from '../User/UserRepositoryInterface'

@injectable()
 export class PaymentSuccessEventHandler implements DomainEventHandlerInterface {
+  private readonly DETAILED_MEASURES = new Map([
+    [
+      SubscriptionName.PlusPlan,
+      new Map([
+        [
+          PaymentType.Initial,
+          new Map([
+            [SubscriptionBillingFrequency.Monthly, StatisticsMeasure.PlusSubscriptionInitialMonthlyPaymentsIncome],
+            [SubscriptionBillingFrequency.Annual, StatisticsMeasure.PlusSubscriptionInitialAnnualPaymentsIncome],
+          ]),
+        ],
+        [
+          PaymentType.Renewal,
+          new Map([
+            [SubscriptionBillingFrequency.Monthly, StatisticsMeasure.PlusSubscriptionRenewingMonthlyPaymentsIncome],
+            [SubscriptionBillingFrequency.Annual, StatisticsMeasure.PlusSubscriptionRenewingAnnualPaymentsIncome],
+          ]),
+        ],
+      ]),
+    ],
+    [
+      SubscriptionName.ProPlan,
+      new Map([
+        [
+          PaymentType.Initial,
+          new Map([
+            [SubscriptionBillingFrequency.Monthly, StatisticsMeasure.ProSubscriptionInitialMonthlyPaymentsIncome],
+            [SubscriptionBillingFrequency.Annual, StatisticsMeasure.ProSubscriptionInitialAnnualPaymentsIncome],
+          ]),
+        ],
+        [
+          PaymentType.Renewal,
+          new Map([
+            [SubscriptionBillingFrequency.Monthly, StatisticsMeasure.ProSubscriptionRenewingMonthlyPaymentsIncome],
+            [SubscriptionBillingFrequency.Annual, StatisticsMeasure.ProSubscriptionRenewingAnnualPaymentsIncome],
+          ]),
+        ],
+      ]),
+    ],
+  ])
+
  constructor(
    @inject(TYPES.UserRepository) private userRepository: UserRepositoryInterface,
    @inject(TYPES.GetUserAnalyticsId) private getUserAnalyticsId: GetUserAnalyticsId,
@@ -34,10 +76,21 @@ export class PaymentSuccessEventHandler implements DomainEventHandlerInterface {
      Period.ThisMonth,
    ])

-    await this.statisticsStore.incrementMeasure(StatisticsMeasure.Income, event.payload.amount, [
-      Period.Today,
-      Period.ThisWeek,
-      Period.ThisMonth,
-    ])
+    const statisticMeasures = [StatisticsMeasure.Income]
+
+    const detailedMeasure = this.DETAILED_MEASURES.get(event.payload.subscriptionName as SubscriptionName)
+      ?.get(event.payload.paymentType as PaymentType)
+      ?.get(event.payload.billingFrequency as SubscriptionBillingFrequency)
+    if (detailedMeasure !== undefined) {
+      statisticMeasures.push(detailedMeasure)
+    }
+
+    for (const measure of statisticMeasures) {
+      await this.statisticsStore.incrementMeasure(measure, event.payload.amount, [
+        Period.Today,
+        Period.ThisWeek,
+        Period.ThisMonth,
+      ])
+    }
  }
 }
--- a/packages/auth/src/Domain/Handler/PredicateVerificationRequestedEventHandler.spec.ts
+++ b/packages/auth/src/Domain/Handler/PredicateVerificationRequestedEventHandler.spec.ts
@@ -54,6 +54,7 @@ describe('PredicateVerificationRequestedEventHandler', () => {
    logger = {} as jest.Mocked<Logger>
    logger.warn = jest.fn()
    logger.info = jest.fn()
+    logger.debug = jest.fn()

    event = {} as jest.Mocked<PredicateVerificationRequestedEvent>
    event.meta = {
--- a/packages/auth/src/Domain/Handler/PredicateVerificationRequestedEventHandler.ts
+++ b/packages/auth/src/Domain/Handler/PredicateVerificationRequestedEventHandler.ts
@@ -23,7 +23,7 @@ export class PredicateVerificationRequestedEventHandler implements DomainEventHa
  ) {}

  async handle(event: PredicateVerificationRequestedEvent): Promise<void> {
-    this.logger.info(`Received verification request of predicate: ${event.payload.predicate.name}`)
+    this.logger.debug(`Received verification request of predicate: ${event.payload.predicate.name}`)

    let userUuid = event.meta.correlation.userIdentifier
    if (event.meta.correlation.userIdentifierType === 'email') {
@@ -55,7 +55,7 @@ export class PredicateVerificationRequestedEventHandler implements DomainEventHa
      }),
    )

-    this.logger.info(
+    this.logger.debug(
      `Published predicate verification (${predicateVerificationResult}) result for: ${event.payload.predicate.name}`,
    )
  }
--- a/packages/common/CHANGELOG.md
+++ b/packages/common/CHANGELOG.md
@@ -3,6 +3,18 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

+# [1.35.0](https://github.com/standardnotes/server/compare/@standardnotes/common@1.34.0...@standardnotes/common@1.35.0) (2022-10-04)
+
+### Features
+
+* **auth:** add detailed income stats ([8668fec](https://github.com/standardnotes/server/commit/8668fec33dac1598bdc4d6ca869c296ed6eaa617))
+
+# [1.34.0](https://github.com/standardnotes/server/compare/@standardnotes/common@1.33.0...@standardnotes/common@1.34.0) (2022-10-04)
+
+### Features
+
+* **common:** add subscription billing frequency ([3c40ee4](https://github.com/standardnotes/server/commit/3c40ee4b4a33dffc35da148a0fa1582c08619733))
+
 # [1.33.0](https://github.com/standardnotes/server/compare/@standardnotes/common@1.32.0...@standardnotes/common@1.33.0) (2022-09-19)

 ### Features
--- a/packages/common/package.json
+++ b/packages/common/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@standardnotes/common",
-  "version": "1.33.0",
+  "version": "1.35.0",
  "engines": {
    "node": ">=16.0.0 <17.0.0"
  },
--- a/packages/common/src/Domain/Payment/PaymentType.ts
+++ b/packages/common/src/Domain/Payment/PaymentType.ts
@@ -0,0 +1,5 @@
+/* istanbul ignore file */
+export enum PaymentType {
+  Initial = 'initial',
+  Renewal = 'renewal',
+}
--- a/packages/common/src/Domain/Subscription/SubscriptionBillingFrequency.ts
+++ b/packages/common/src/Domain/Subscription/SubscriptionBillingFrequency.ts
@@ -0,0 +1,5 @@
+/* istanbul ignore file */
+export enum SubscriptionBillingFrequency {
+  Monthly = 1,
+  Annual = 12,
+}
--- a/packages/common/src/Domain/index.ts
+++ b/packages/common/src/Domain/index.ts
@@ -14,9 +14,11 @@ export * from './KeyParams/KeyParamsContent002'
 export * from './KeyParams/KeyParamsContent003'
 export * from './KeyParams/KeyParamsContent004'
 export * from './KeyParams/KeyParamsOrigination'
+export * from './Payment/PaymentType'
 export * from './Protocol/ProtocolVersion'
 export * from './Role/PaidRoles'
 export * from './Role/RoleName'
+export * from './Subscription/SubscriptionBillingFrequency'
 export * from './Subscription/SubscriptionName'
 export * from './Type/Either'
 export * from './Type/Only'
--- a/packages/domain-events-infra/CHANGELOG.md
+++ b/packages/domain-events-infra/CHANGELOG.md
@@ -3,6 +3,18 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

+## [1.8.17](https://github.com/standardnotes/server/compare/@standardnotes/domain-events-infra@1.8.16...@standardnotes/domain-events-infra@1.8.17) (2022-10-05)
+
+**Note:** Version bump only for package @standardnotes/domain-events-infra
+
+## [1.8.16](https://github.com/standardnotes/server/compare/@standardnotes/domain-events-infra@1.8.15...@standardnotes/domain-events-infra@1.8.16) (2022-10-04)
+
+**Note:** Version bump only for package @standardnotes/domain-events-infra
+
+## [1.8.15](https://github.com/standardnotes/server/compare/@standardnotes/domain-events-infra@1.8.14...@standardnotes/domain-events-infra@1.8.15) (2022-10-04)
+
+**Note:** Version bump only for package @standardnotes/domain-events-infra
+
 ## [1.8.14](https://github.com/standardnotes/server/compare/@standardnotes/domain-events-infra@1.8.13...@standardnotes/domain-events-infra@1.8.14) (2022-10-03)

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

+# [2.63.0](https://github.com/standardnotes/server/compare/@standardnotes/domain-events@2.62.0...@standardnotes/domain-events@2.63.0) (2022-10-05)
+
+### Features
+
+* **api-gateway:** include increments count in statistics measures report ([84e8a5c](https://github.com/standardnotes/server/commit/84e8a5cc6e6ba216f1c0737a7a93aba581eced0f))
+
+# [2.62.0](https://github.com/standardnotes/server/compare/@standardnotes/domain-events@2.61.1...@standardnotes/domain-events@2.62.0) (2022-10-04)
+
+### Features
+
+* **auth:** add detailed income stats ([8668fec](https://github.com/standardnotes/server/commit/8668fec33dac1598bdc4d6ca869c296ed6eaa617))
+
+## [2.61.1](https://github.com/standardnotes/server/compare/@standardnotes/domain-events@2.61.0...@standardnotes/domain-events@2.61.1) (2022-10-04)
+
+**Note:** Version bump only for package @standardnotes/domain-events
+
 # [2.61.0](https://github.com/standardnotes/server/compare/@standardnotes/domain-events@2.60.7...@standardnotes/domain-events@2.61.0) (2022-10-03)

 ### Features
--- a/packages/domain-events/package.json
+++ b/packages/domain-events/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@standardnotes/domain-events",
-  "version": "2.61.0",
+  "version": "2.63.0",
  "engines": {
    "node": ">=16.0.0 <17.0.0"
  },
--- a/packages/domain-events/src/Domain/Event/DailyAnalyticsReportGeneratedEventPayload.ts
+++ b/packages/domain-events/src/Domain/Event/DailyAnalyticsReportGeneratedEventPayload.ts
@@ -16,6 +16,7 @@ export interface DailyAnalyticsReportGeneratedEventPayload {
    name: string
    totalValue: number
    average: number
+    increments: number
    period: number
  }>
  activityStatisticsOverTime: Array<{
--- a/packages/domain-events/src/Domain/Event/PaymentSuccessEventPayload.ts
+++ b/packages/domain-events/src/Domain/Event/PaymentSuccessEventPayload.ts
@@ -1,4 +1,7 @@
 export interface PaymentSuccessEventPayload {
  userEmail: string
  amount: number
+  billingFrequency: number
+  paymentType: string
+  subscriptionName: string
 }
--- a/packages/event-store/CHANGELOG.md
+++ b/packages/event-store/CHANGELOG.md
@@ -3,6 +3,18 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

+## [1.3.22](https://github.com/standardnotes/server/compare/@standardnotes/event-store@1.3.21...@standardnotes/event-store@1.3.22) (2022-10-05)
+
+**Note:** Version bump only for package @standardnotes/event-store
+
+## [1.3.21](https://github.com/standardnotes/server/compare/@standardnotes/event-store@1.3.20...@standardnotes/event-store@1.3.21) (2022-10-04)
+
+**Note:** Version bump only for package @standardnotes/event-store
+
+## [1.3.20](https://github.com/standardnotes/server/compare/@standardnotes/event-store@1.3.19...@standardnotes/event-store@1.3.20) (2022-10-04)
+
+**Note:** Version bump only for package @standardnotes/event-store
+
 ## [1.3.19](https://github.com/standardnotes/server/compare/@standardnotes/event-store@1.3.18...@standardnotes/event-store@1.3.19) (2022-10-03)

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

+## [1.6.8](https://github.com/standardnotes/files/compare/@standardnotes/files-server@1.6.7...@standardnotes/files-server@1.6.8) (2022-10-05)
+
+**Note:** Version bump only for package @standardnotes/files-server
+
+## [1.6.7](https://github.com/standardnotes/files/compare/@standardnotes/files-server@1.6.6...@standardnotes/files-server@1.6.7) (2022-10-04)
+
+**Note:** Version bump only for package @standardnotes/files-server
+
+## [1.6.6](https://github.com/standardnotes/files/compare/@standardnotes/files-server@1.6.5...@standardnotes/files-server@1.6.6) (2022-10-04)
+
+**Note:** Version bump only for package @standardnotes/files-server
+
 ## [1.6.5](https://github.com/standardnotes/files/compare/@standardnotes/files-server@1.6.4...@standardnotes/files-server@1.6.5) (2022-10-03)

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

+## [1.4.4](https://github.com/standardnotes/server/compare/@standardnotes/predicates@1.4.3...@standardnotes/predicates@1.4.4) (2022-10-04)
+
+**Note:** Version bump only for package @standardnotes/predicates
+
+## [1.4.3](https://github.com/standardnotes/server/compare/@standardnotes/predicates@1.4.2...@standardnotes/predicates@1.4.3) (2022-10-04)
+
+**Note:** Version bump only for package @standardnotes/predicates
+
 ## [1.4.2](https://github.com/standardnotes/server/compare/@standardnotes/predicates@1.4.1...@standardnotes/predicates@1.4.2) (2022-09-19)

 **Note:** Version bump only for package @standardnotes/predicates
--- a/packages/predicates/package.json
+++ b/packages/predicates/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@standardnotes/predicates",
-  "version": "1.4.2",
+  "version": "1.4.4",
  "engines": {
    "node": ">=16.0.0 <17.0.0"
  },
--- a/packages/scheduler/CHANGELOG.md
+++ b/packages/scheduler/CHANGELOG.md
@@ -3,6 +3,18 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

+## [1.10.36](https://github.com/standardnotes/server/compare/@standardnotes/scheduler-server@1.10.35...@standardnotes/scheduler-server@1.10.36) (2022-10-05)
+
+**Note:** Version bump only for package @standardnotes/scheduler-server
+
+## [1.10.35](https://github.com/standardnotes/server/compare/@standardnotes/scheduler-server@1.10.34...@standardnotes/scheduler-server@1.10.35) (2022-10-04)
+
+**Note:** Version bump only for package @standardnotes/scheduler-server
+
+## [1.10.34](https://github.com/standardnotes/server/compare/@standardnotes/scheduler-server@1.10.33...@standardnotes/scheduler-server@1.10.34) (2022-10-04)
+
+**Note:** Version bump only for package @standardnotes/scheduler-server
+
 ## [1.10.33](https://github.com/standardnotes/server/compare/@standardnotes/scheduler-server@1.10.32...@standardnotes/scheduler-server@1.10.33) (2022-10-03)

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

+## [1.4.2](https://github.com/standardnotes/server/compare/@standardnotes/security@1.4.1...@standardnotes/security@1.4.2) (2022-10-04)
+
+**Note:** Version bump only for package @standardnotes/security
+
+## [1.4.1](https://github.com/standardnotes/server/compare/@standardnotes/security@1.4.0...@standardnotes/security@1.4.1) (2022-10-04)
+
+**Note:** Version bump only for package @standardnotes/security
+
 # [1.4.0](https://github.com/standardnotes/server/compare/@standardnotes/security@1.3.3...@standardnotes/security@1.4.0) (2022-09-21)

 ### Features
--- a/packages/security/package.json
+++ b/packages/security/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@standardnotes/security",
-  "version": "1.4.0",
+  "version": "1.4.2",
  "engines": {
    "node": ">=16.0.0 <17.0.0"
  },
--- a/packages/syncing-server/CHANGELOG.md
+++ b/packages/syncing-server/CHANGELOG.md
@@ -3,6 +3,22 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

+## [1.8.20](https://github.com/standardnotes/syncing-server-js/compare/@standardnotes/syncing-server@1.8.19...@standardnotes/syncing-server@1.8.20) (2022-10-05)
+
+**Note:** Version bump only for package @standardnotes/syncing-server
+
+## [1.8.19](https://github.com/standardnotes/syncing-server-js/compare/@standardnotes/syncing-server@1.8.18...@standardnotes/syncing-server@1.8.19) (2022-10-04)
+
+**Note:** Version bump only for package @standardnotes/syncing-server
+
+## [1.8.18](https://github.com/standardnotes/syncing-server-js/compare/@standardnotes/syncing-server@1.8.17...@standardnotes/syncing-server@1.8.18) (2022-10-04)
+
+**Note:** Version bump only for package @standardnotes/syncing-server
+
+## [1.8.17](https://github.com/standardnotes/syncing-server-js/compare/@standardnotes/syncing-server@1.8.16...@standardnotes/syncing-server@1.8.17) (2022-10-04)
+
+**Note:** Version bump only for package @standardnotes/syncing-server
+
 ## [1.8.16](https://github.com/standardnotes/syncing-server-js/compare/@standardnotes/syncing-server@1.8.15...@standardnotes/syncing-server@1.8.16) (2022-10-03)

 **Note:** Version bump only for package @standardnotes/syncing-server
--- a/packages/syncing-server/package.json
+++ b/packages/syncing-server/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@standardnotes/syncing-server",
-  "version": "1.8.16",
+  "version": "1.8.20",
  "engines": {
    "node": ">=16.0.0 <17.0.0"
  },
--- a/packages/workspace/.env.sample
+++ b/packages/workspace/.env.sample
@@ -0,0 +1,34 @@
+LOG_LEVEL=debug
+NODE_ENV=development
+VERSION=development
+
+AUTH_JWT_SECRET=auth_jwt_secret
+
+PORT=3000
+
+DB_HOST=127.0.0.1
+DB_REPLICA_HOST=127.0.0.1
+DB_PORT=3306
+DB_USERNAME=workspace
+DB_PASSWORD=changeme123
+DB_DATABASE=workspace
+DB_DEBUG_LEVEL=all # "all" | "query" | "schema" | "error" | "warn" | "info" | "log" | "migration"
+DB_MIGRATIONS_PATH=dist/migrations/*.js
+
+REDIS_URL=redis://cache
+
+SNS_TOPIC_ARN=
+SNS_AWS_REGION=
+SQS_QUEUE_URL=
+SQS_AWS_REGION=
+
+REDIS_EVENTS_CHANNEL=events
+
+# (Optional) New Relic Setup
+NEW_RELIC_ENABLED=false
+NEW_RELIC_APP_NAME=Workspace
+NEW_RELIC_LICENSE_KEY=
+NEW_RELIC_NO_CONFIG_FILE=true
+NEW_RELIC_DISTRIBUTED_TRACING_ENABLED=false
+NEW_RELIC_LOG_ENABLED=false
+NEW_RELIC_LOG_LEVEL=info
--- a/packages/workspace/.eslintignore
+++ b/packages/workspace/.eslintignore
@@ -0,0 +1,3 @@
+dist
+test-setup.ts
+data
--- a/packages/workspace/.eslintrc
+++ b/packages/workspace/.eslintrc
@@ -0,0 +1,6 @@
+{
+  "extends": "../../.eslintrc",
+  "parserOptions": {
+    "project": "./linter.tsconfig.json"
+  }
+}
--- a/packages/workspace/CHANGELOG.md
+++ b/packages/workspace/CHANGELOG.md
@@ -0,0 +1,10 @@
+# Change Log
+
+All notable changes to this project will be documented in this file.
+See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
+
+# 1.1.0 (2022-10-06)
+
+### Features
+
+* add workspace microservice ([44a9ade](https://github.com/standardnotes/server/commit/44a9ade3fc0935d24733327c6b2de05b52496b1c))
--- a/packages/workspace/Dockerfile
+++ b/packages/workspace/Dockerfile
@@ -0,0 +1,27 @@
+FROM node:16.15.1-alpine AS builder
+
+# Install dependencies for building native libraries
+RUN apk add --update git openssh-client python3 alpine-sdk
+
+WORKDIR /workspace
+
+# docker-build plugin copies everything needed for `yarn install` to `manifests` folder.
+COPY manifests ./
+
+RUN yarn install --immutable
+
+FROM node:16.15.1-alpine
+
+RUN apk add --update curl
+
+WORKDIR /workspace
+
+# Copy the installed dependencies from the previous stage.
+COPY --from=builder /workspace ./
+
+# docker-build plugin runs `yarn pack` in all workspace dependencies and copies them to `packs` folder.
+COPY packs ./
+
+ENTRYPOINT [ "/workspace/packages/workspace/docker/entrypoint.sh" ]
+
+CMD [ "start-web" ]
--- a/packages/workspace/bin/server.ts
+++ b/packages/workspace/bin/server.ts
@@ -0,0 +1,69 @@
+import 'reflect-metadata'
+
+import 'newrelic'
+
+import * as Sentry from '@sentry/node'
+
+import '../src/Infra/InversifyExpressUtils/InversifyExpressHealthCheckController'
+
+import * as cors from 'cors'
+import { urlencoded, json, Request, Response, NextFunction, RequestHandler, ErrorRequestHandler } from 'express'
+import * as winston from 'winston'
+
+import { InversifyExpressServer } from 'inversify-express-utils'
+import { ContainerConfigLoader } from '../src/Bootstrap/Container'
+import TYPES from '../src/Bootstrap/Types'
+import { Env } from '../src/Bootstrap/Env'
+
+const container = new ContainerConfigLoader()
+void container.load().then((container) => {
+  const env: Env = new Env()
+  env.load()
+
+  const server = new InversifyExpressServer(container)
+
+  server.setConfig((app) => {
+    app.use((_request: Request, response: Response, next: NextFunction) => {
+      response.setHeader('X-Auth-Version', container.get(TYPES.VERSION))
+      next()
+    })
+    app.use(json())
+    app.use(urlencoded({ extended: true }))
+    app.use(cors())
+
+    if (env.get('SENTRY_DSN', true)) {
+      Sentry.init({
+        dsn: env.get('SENTRY_DSN'),
+        integrations: [new Sentry.Integrations.Http({ tracing: false, breadcrumbs: true })],
+        tracesSampleRate: 0,
+      })
+
+      app.use(Sentry.Handlers.requestHandler() as RequestHandler)
+    }
+  })
+
+  const logger: winston.Logger = container.get(TYPES.Logger)
+
+  server.setErrorConfig((app) => {
+    if (env.get('SENTRY_DSN', true)) {
+      app.use(Sentry.Handlers.errorHandler() as ErrorRequestHandler)
+    }
+
+    app.use((error: Record<string, unknown>, _request: Request, response: Response, _next: NextFunction) => {
+      logger.error(error.stack)
+
+      response.status(500).send({
+        error: {
+          message:
+            "Unfortunately, we couldn't handle your request. Please try again or contact our support if the error persists.",
+        },
+      })
+    })
+  })
+
+  const serverInstance = server.build()
+
+  serverInstance.listen(env.get('PORT'))
+
+  logger.info(`Server started on port ${process.env.PORT}`)
+})
--- a/packages/workspace/bin/worker.ts
+++ b/packages/workspace/bin/worker.ts
@@ -0,0 +1,25 @@
+import 'reflect-metadata'
+
+import 'newrelic'
+
+import { Logger } from 'winston'
+
+import { ContainerConfigLoader } from '../src/Bootstrap/Container'
+import TYPES from '../src/Bootstrap/Types'
+import { Env } from '../src/Bootstrap/Env'
+import { DomainEventSubscriberFactoryInterface } from '@standardnotes/domain-events'
+
+const container = new ContainerConfigLoader()
+void container.load().then((container) => {
+  const env: Env = new Env()
+  env.load()
+
+  const logger: Logger = container.get(TYPES.Logger)
+
+  logger.info('Starting worker...')
+
+  const subscriberFactory: DomainEventSubscriberFactoryInterface = container.get(TYPES.DomainEventSubscriberFactory)
+  subscriberFactory.create().start()
+
+  setInterval(() => logger.info('Alive and kicking!'), 20 * 60 * 1000)
+})
--- a/packages/workspace/docker/entrypoint.sh
+++ b/packages/workspace/docker/entrypoint.sh
@@ -0,0 +1,22 @@
+#!/bin/sh
+set -e
+
+COMMAND=$1 && shift 1
+
+case "$COMMAND" in
+  'start-web' )
+    echo "Starting Web..."
+    yarn workspace @standardnotes/workspace-server start
+    ;;
+
+  'start-worker' )
+    echo "Starting Worker..."
+    yarn workspace @standardnotes/workspace-server worker
+    ;;
+
+   * )
+    echo "Unknown command"
+    ;;
+esac
+
+exec "$@"
--- a/packages/workspace/jest.config.js
+++ b/packages/workspace/jest.config.js
@@ -0,0 +1,13 @@
+// eslint-disable-next-line @typescript-eslint/no-var-requires
+const base = require('../../jest.config')
+
+module.exports = {
+  ...base,
+  globals: {
+    'ts-jest': {
+      tsconfig: 'tsconfig.json',
+    },
+  },
+  coveragePathIgnorePatterns: ['/Bootstrap/', '/InversifyExpressUtils/'],
+  setupFilesAfterEnv: ['./test-setup.ts'],
+}
--- a/packages/workspace/linter.tsconfig.json
+++ b/packages/workspace/linter.tsconfig.json
@@ -0,0 +1,4 @@
+{
+  "extends": "./tsconfig.json",
+  "exclude": ["dist", "test-setup.ts"]
+}
--- a/packages/workspace/migrations/1665049971623-initial.ts
+++ b/packages/workspace/migrations/1665049971623-initial.ts
@@ -0,0 +1,20 @@
+import { MigrationInterface, QueryRunner } from 'typeorm'
+
+export class initial1665049971623 implements MigrationInterface {
+  name = 'initial1665049971623'
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      'CREATE TABLE `workspaces` (`uuid` varchar(36) NOT NULL, `type` varchar(64) NOT NULL, `name` varchar(255) NULL, `key_rotation_index` int NOT NULL DEFAULT 0, PRIMARY KEY (`uuid`)) ENGINE=InnoDB',
+    )
+    await queryRunner.query(
+      'CREATE TABLE `workspace_users` (`uuid` varchar(36) NOT NULL, `access_level` varchar(64) NOT NULL, `user_uuid` varchar(36) NOT NULL, `workspace_uuid` varchar(36) NOT NULL, `encrypted_workspace_key` varchar(255) NULL, `public_key` varchar(255) NOT NULL, `private_key` varchar(255) NOT NULL, `status` varchar(64) NOT NULL, `key_rotation_index` int NOT NULL DEFAULT 0, UNIQUE INDEX `index_workspace_users_on_workspace_and_user` (`user_uuid`, `workspace_uuid`), PRIMARY KEY (`uuid`)) ENGINE=InnoDB',
+    )
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query('DROP INDEX `index_workspace_users_on_workspace_and_user` ON `workspace_users`')
+    await queryRunner.query('DROP TABLE `workspace_users`')
+    await queryRunner.query('DROP TABLE `workspaces`')
+  }
+}
--- a/packages/workspace/package.json
+++ b/packages/workspace/package.json
@@ -0,0 +1,57 @@
+{
+  "name": "@standardnotes/workspace-server",
+  "version": "1.1.0",
+  "engines": {
+    "node": ">=16.0.0 <17.0.0"
+  },
+  "private": true,
+  "description": "Workspace Server",
+  "main": "dist/src/index.js",
+  "typings": "dist/src/index.d.ts",
+  "author": "Karol Sójko <karol@standardnotes.com>",
+  "license": "AGPL-3.0-or-later",
+  "scripts": {
+    "clean": "rm -fr dist",
+    "setup:env": "cp .env.sample .env",
+    "prebuild": "yarn clean",
+    "build": "tsc --rootDir ./",
+    "lint": "eslint . --ext .ts",
+    "pretest": "yarn lint && yarn build",
+    "test": "jest --coverage --config=./jest.config.js --maxWorkers=50%",
+    "start": "yarn node dist/bin/server.js",
+    "worker": "yarn node dist/bin/worker.js",
+    "typeorm": "typeorm-ts-node-commonjs"
+  },
+  "dependencies": {
+    "@newrelic/winston-enricher": "^4.0.0",
+    "@sentry/node": "^7.3.0",
+    "@standardnotes/common": "workspace:*",
+    "@standardnotes/domain-events": "workspace:*",
+    "@standardnotes/domain-events-infra": "workspace:*",
+    "@standardnotes/security": "workspace:*",
+    "aws-sdk": "^2.1159.0",
+    "cors": "2.8.5",
+    "dotenv": "^16.0.1",
+    "express": "^4.18.1",
+    "inversify": "^6.0.1",
+    "inversify-express-utils": "^6.4.3",
+    "ioredis": "^5.2.0",
+    "mysql2": "^2.3.3",
+    "newrelic": "^9.0.0",
+    "reflect-metadata": "0.1.13",
+    "typeorm": "^0.3.6",
+    "winston": "^3.8.1"
+  },
+  "devDependencies": {
+    "@types/cors": "^2.8.9",
+    "@types/express": "^4.17.11",
+    "@types/ioredis": "^4.28.10",
+    "@types/jest": "^28.1.4",
+    "@types/newrelic": "^7.0.3",
+    "@typescript-eslint/eslint-plugin": "^5.29.0",
+    "eslint": "^8.14.0",
+    "eslint-plugin-prettier": "^4.0.0",
+    "jest": "^28.1.2",
+    "ts-jest": "^28.0.5"
+  }
+}
--- a/packages/workspace/src/Bootstrap/Container.ts
+++ b/packages/workspace/src/Bootstrap/Container.ts
@@ -0,0 +1,154 @@
+import * as winston from 'winston'
+import Redis from 'ioredis'
+import * as AWS from 'aws-sdk'
+import { Container } from 'inversify'
+import {
+  DomainEventHandlerInterface,
+  DomainEventMessageHandlerInterface,
+  DomainEventSubscriberFactoryInterface,
+} from '@standardnotes/domain-events'
+import { Env } from './Env'
+import TYPES from './Types'
+import { AppDataSource } from './DataSource'
+import {
+  RedisDomainEventPublisher,
+  RedisDomainEventSubscriberFactory,
+  RedisEventMessageHandler,
+  SNSDomainEventPublisher,
+  SQSDomainEventSubscriberFactory,
+  SQSEventMessageHandler,
+  SQSNewRelicEventMessageHandler,
+} from '@standardnotes/domain-events-infra'
+import { ApiGatewayAuthMiddleware } from '../Controller/ApiGatewayAuthMiddleware'
+import { CrossServiceTokenData, TokenDecoder, TokenDecoderInterface } from '@standardnotes/security'
+
+// eslint-disable-next-line @typescript-eslint/no-var-requires
+const newrelicFormatter = require('@newrelic/winston-enricher')
+
+export class ContainerConfigLoader {
+  async load(): Promise<Container> {
+    const env: Env = new Env()
+    env.load()
+
+    const container = new Container()
+
+    await AppDataSource.initialize()
+
+    const redisUrl = env.get('REDIS_URL')
+    const isRedisInClusterMode = redisUrl.indexOf(',') > 0
+    let redis
+    if (isRedisInClusterMode) {
+      redis = new Redis.Cluster(redisUrl.split(','))
+    } else {
+      redis = new Redis(redisUrl)
+    }
+
+    container.bind(TYPES.Redis).toConstantValue(redis)
+
+    const newrelicWinstonFormatter = newrelicFormatter(winston)
+    const winstonFormatters = [winston.format.splat(), winston.format.json()]
+    if (env.get('NEW_RELIC_ENABLED', true) === 'true') {
+      winstonFormatters.push(newrelicWinstonFormatter())
+    }
+
+    const logger = winston.createLogger({
+      level: env.get('LOG_LEVEL') || 'info',
+      format: winston.format.combine(...winstonFormatters),
+      transports: [new winston.transports.Console({ level: env.get('LOG_LEVEL') || 'info' })],
+    })
+    container.bind<winston.Logger>(TYPES.Logger).toConstantValue(logger)
+
+    if (env.get('SNS_AWS_REGION', true)) {
+      container.bind<AWS.SNS>(TYPES.SNS).toConstantValue(
+        new AWS.SNS({
+          apiVersion: 'latest',
+          region: env.get('SNS_AWS_REGION', true),
+        }),
+      )
+    }
+
+    if (env.get('SQS_QUEUE_URL', true)) {
+      const sqsConfig: AWS.SQS.Types.ClientConfiguration = {
+        apiVersion: 'latest',
+        region: env.get('SQS_AWS_REGION', true),
+      }
+      if (env.get('SQS_ACCESS_KEY_ID', true) && env.get('SQS_SECRET_ACCESS_KEY', true)) {
+        sqsConfig.credentials = {
+          accessKeyId: env.get('SQS_ACCESS_KEY_ID', true),
+          secretAccessKey: env.get('SQS_SECRET_ACCESS_KEY', true),
+        }
+      }
+      container.bind<AWS.SQS>(TYPES.SQS).toConstantValue(new AWS.SQS(sqsConfig))
+    }
+
+    // Controller
+    // Repositories
+    // ORM
+    // Middleware
+    container.bind<ApiGatewayAuthMiddleware>(TYPES.ApiGatewayAuthMiddleware).to(ApiGatewayAuthMiddleware)
+    // env vars
+    container.bind(TYPES.AUTH_JWT_SECRET).toConstantValue(env.get('AUTH_JWT_SECRET'))
+    container.bind(TYPES.REDIS_URL).toConstantValue(env.get('REDIS_URL'))
+    container.bind(TYPES.SNS_TOPIC_ARN).toConstantValue(env.get('SNS_TOPIC_ARN', true))
+    container.bind(TYPES.SNS_AWS_REGION).toConstantValue(env.get('SNS_AWS_REGION', true))
+    container.bind(TYPES.SQS_QUEUE_URL).toConstantValue(env.get('SQS_QUEUE_URL', true))
+    container.bind(TYPES.REDIS_EVENTS_CHANNEL).toConstantValue(env.get('REDIS_EVENTS_CHANNEL'))
+    container.bind(TYPES.NEW_RELIC_ENABLED).toConstantValue(env.get('NEW_RELIC_ENABLED', true))
+    container.bind(TYPES.VERSION).toConstantValue(env.get('VERSION'))
+
+    // use cases
+    // Handlers
+    // Services
+    container
+      .bind<TokenDecoderInterface<CrossServiceTokenData>>(TYPES.CrossServiceTokenDecoder)
+      .toConstantValue(new TokenDecoder<CrossServiceTokenData>(container.get(TYPES.AUTH_JWT_SECRET)))
+
+    if (env.get('SNS_TOPIC_ARN', true)) {
+      container
+        .bind<SNSDomainEventPublisher>(TYPES.DomainEventPublisher)
+        .toConstantValue(new SNSDomainEventPublisher(container.get(TYPES.SNS), container.get(TYPES.SNS_TOPIC_ARN)))
+    } else {
+      container
+        .bind<RedisDomainEventPublisher>(TYPES.DomainEventPublisher)
+        .toConstantValue(
+          new RedisDomainEventPublisher(container.get(TYPES.Redis), container.get(TYPES.REDIS_EVENTS_CHANNEL)),
+        )
+    }
+
+    const eventHandlers: Map<string, DomainEventHandlerInterface> = new Map([])
+
+    if (env.get('SQS_QUEUE_URL', true)) {
+      container
+        .bind<DomainEventMessageHandlerInterface>(TYPES.DomainEventMessageHandler)
+        .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(
+          new SQSDomainEventSubscriberFactory(
+            container.get(TYPES.SQS),
+            container.get(TYPES.SQS_QUEUE_URL),
+            container.get(TYPES.DomainEventMessageHandler),
+          ),
+        )
+    } else {
+      container
+        .bind<DomainEventMessageHandlerInterface>(TYPES.DomainEventMessageHandler)
+        .toConstantValue(new RedisEventMessageHandler(eventHandlers, container.get(TYPES.Logger)))
+      container
+        .bind<DomainEventSubscriberFactoryInterface>(TYPES.DomainEventSubscriberFactory)
+        .toConstantValue(
+          new RedisDomainEventSubscriberFactory(
+            container.get(TYPES.Redis),
+            container.get(TYPES.DomainEventMessageHandler),
+            container.get(TYPES.REDIS_EVENTS_CHANNEL),
+          ),
+        )
+    }
+
+    return container
+  }
+}
--- a/packages/workspace/src/Bootstrap/DataSource.ts
+++ b/packages/workspace/src/Bootstrap/DataSource.ts
@@ -0,0 +1,41 @@
+import { DataSource, LoggerOptions } from 'typeorm'
+import { Workspace } from '../Domain/Workspace/Workspace'
+import { WorkspaceUser } from '../Domain/Workspace/WorkspaceUser'
+import { Env } from './Env'
+
+const env: Env = new Env()
+env.load()
+
+const maxQueryExecutionTime = env.get('DB_MAX_QUERY_EXECUTION_TIME', true)
+  ? +env.get('DB_MAX_QUERY_EXECUTION_TIME', true)
+  : 45_000
+
+export const AppDataSource = new DataSource({
+  type: 'mysql',
+  supportBigNumbers: true,
+  bigNumberStrings: false,
+  maxQueryExecutionTime,
+  replication: {
+    master: {
+      host: env.get('DB_HOST'),
+      port: parseInt(env.get('DB_PORT')),
+      username: env.get('DB_USERNAME'),
+      password: env.get('DB_PASSWORD'),
+      database: env.get('DB_DATABASE'),
+    },
+    slaves: [
+      {
+        host: env.get('DB_REPLICA_HOST'),
+        port: parseInt(env.get('DB_PORT')),
+        username: env.get('DB_USERNAME'),
+        password: env.get('DB_PASSWORD'),
+        database: env.get('DB_DATABASE'),
+      },
+    ],
+    removeNodeErrorCount: 10,
+  },
+  entities: [Workspace, WorkspaceUser],
+  migrations: [env.get('DB_MIGRATIONS_PATH', true) ?? 'dist/migrations/*.js'],
+  migrationsRun: true,
+  logging: <LoggerOptions>env.get('DB_DEBUG_LEVEL'),
+})
--- a/packages/workspace/src/Bootstrap/Env.ts
+++ b/packages/workspace/src/Bootstrap/Env.ts
@@ -0,0 +1,24 @@
+import { config, DotenvParseOutput } from 'dotenv'
+import { injectable } from 'inversify'
+
+@injectable()
+export class Env {
+  private env?: DotenvParseOutput
+
+  public load(): void {
+    const output = config()
+    this.env = <DotenvParseOutput>output.parsed
+  }
+
+  public get(key: string, optional = false): string {
+    if (!this.env) {
+      this.load()
+    }
+
+    if (!process.env[key] && !optional) {
+      throw new Error(`Environment variable ${key} not set`)
+    }
+
+    return <string>process.env[key]
+  }
+}
--- a/packages/workspace/src/Bootstrap/Types.ts
+++ b/packages/workspace/src/Bootstrap/Types.ts
@@ -0,0 +1,30 @@
+const TYPES = {
+  Logger: Symbol.for('Logger'),
+  Redis: Symbol.for('Redis'),
+  SNS: Symbol.for('SNS'),
+  SQS: Symbol.for('SQS'),
+  // Controller
+  // Repositories
+  // ORM
+  // Middleware
+  ApiGatewayAuthMiddleware: Symbol.for('ApiGatewayAuthMiddleware'),
+  // env vars
+  AUTH_JWT_SECRET: Symbol.for('AUTH_JWT_SECRET'),
+  REDIS_URL: Symbol.for('REDIS_URL'),
+  SNS_TOPIC_ARN: Symbol.for('SNS_TOPIC_ARN'),
+  SNS_AWS_REGION: Symbol.for('SNS_AWS_REGION'),
+  SQS_QUEUE_URL: Symbol.for('SQS_QUEUE_URL'),
+  SQS_AWS_REGION: Symbol.for('SQS_AWS_REGION'),
+  REDIS_EVENTS_CHANNEL: Symbol.for('REDIS_EVENTS_CHANNEL'),
+  NEW_RELIC_ENABLED: Symbol.for('NEW_RELIC_ENABLED'),
+  VERSION: Symbol.for('VERSION'),
+  // use cases
+  // Handlers
+  // Services
+  CrossServiceTokenDecoder: Symbol.for('CrossServiceTokenDecoder'),
+  DomainEventPublisher: Symbol.for('DomainEventPublisher'),
+  DomainEventSubscriberFactory: Symbol.for('DomainEventSubscriberFactory'),
+  DomainEventMessageHandler: Symbol.for('DomainEventMessageHandler'),
+}
+
+export default TYPES
--- a/packages/workspace/src/Controller/ApiGatewayAuthMiddleware.spec.ts
+++ b/packages/workspace/src/Controller/ApiGatewayAuthMiddleware.spec.ts
@@ -0,0 +1,99 @@
+import 'reflect-metadata'
+
+import { ApiGatewayAuthMiddleware } from './ApiGatewayAuthMiddleware'
+import { NextFunction, Request, Response } from 'express'
+import { Logger } from 'winston'
+import { CrossServiceTokenData, TokenDecoderInterface } from '@standardnotes/security'
+import { RoleName } from '@standardnotes/common'
+
+describe('ApiGatewayAuthMiddleware', () => {
+  let tokenDecoder: TokenDecoderInterface<CrossServiceTokenData>
+  let request: Request
+  let response: Response
+  let next: NextFunction
+
+  const logger = {
+    debug: jest.fn(),
+  } as unknown as jest.Mocked<Logger>
+
+  const createMiddleware = () => new ApiGatewayAuthMiddleware(tokenDecoder, logger)
+
+  beforeEach(() => {
+    tokenDecoder = {} as jest.Mocked<TokenDecoderInterface<CrossServiceTokenData>>
+    tokenDecoder.decodeToken = jest.fn().mockReturnValue({
+      user: {
+        uuid: '1-2-3',
+        email: 'test@test.te',
+      },
+      roles: [
+        {
+          uuid: 'a-b-c',
+          name: RoleName.CoreUser,
+        },
+      ],
+    })
+
+    request = {
+      headers: {},
+    } as jest.Mocked<Request>
+    response = {
+      locals: {},
+    } as jest.Mocked<Response>
+    response.status = jest.fn().mockReturnThis()
+    response.send = jest.fn()
+    next = jest.fn()
+  })
+
+  it('should authorize user', async () => {
+    request.headers['x-auth-token'] = 'auth-jwt-token'
+
+    await createMiddleware().handler(request, response, next)
+
+    expect(response.locals.user).toEqual({
+      uuid: '1-2-3',
+      email: 'test@test.te',
+    })
+    expect(response.locals.roles).toEqual([
+      {
+        uuid: 'a-b-c',
+        name: RoleName.CoreUser,
+      },
+    ])
+
+    expect(next).toHaveBeenCalled()
+  })
+
+  it('should not authorize if request is missing auth jwt token in headers', async () => {
+    await createMiddleware().handler(request, response, next)
+
+    expect(response.status).toHaveBeenCalledWith(401)
+    expect(next).not.toHaveBeenCalled()
+  })
+
+  it('should not authorize if auth jwt token is malformed', async () => {
+    request.headers['x-auth-token'] = 'auth-jwt-token'
+
+    tokenDecoder.decodeToken = jest.fn().mockReturnValue(undefined)
+
+    await createMiddleware().handler(request, response, next)
+
+    expect(response.status).toHaveBeenCalledWith(401)
+    expect(next).not.toHaveBeenCalled()
+  })
+
+  it('should pass the error to next middleware if one occurres', async () => {
+    request.headers['x-auth-token'] = 'auth-jwt-token'
+
+    const error = new Error('Ooops')
+
+    tokenDecoder.decodeToken = jest.fn().mockImplementation(() => {
+      throw error
+    })
+
+    await createMiddleware().handler(request, response, next)
+
+    expect(response.status).not.toHaveBeenCalled()
+
+    expect(next).toHaveBeenCalledWith(error)
+  })
+})
--- a/packages/workspace/src/Controller/ApiGatewayAuthMiddleware.ts
+++ b/packages/workspace/src/Controller/ApiGatewayAuthMiddleware.ts
@@ -0,0 +1,59 @@
+import { CrossServiceTokenData, TokenDecoderInterface } from '@standardnotes/security'
+import { NextFunction, Request, Response } from 'express'
+import { inject, injectable } from 'inversify'
+import { BaseMiddleware } from 'inversify-express-utils'
+import { Logger } from 'winston'
+import TYPES from '../Bootstrap/Types'
+
+@injectable()
+export class ApiGatewayAuthMiddleware extends BaseMiddleware {
+  constructor(
+    @inject(TYPES.CrossServiceTokenDecoder) private tokenDecoder: TokenDecoderInterface<CrossServiceTokenData>,
+    @inject(TYPES.Logger) private logger: Logger,
+  ) {
+    super()
+  }
+
+  async handler(request: Request, response: Response, next: NextFunction): Promise<void> {
+    try {
+      if (!request.headers['x-auth-token']) {
+        this.logger.debug('ApiGatewayAuthMiddleware missing x-auth-token header.')
+
+        response.status(401).send({
+          error: {
+            tag: 'invalid-auth',
+            message: 'Invalid login credentials.',
+          },
+        })
+
+        return
+      }
+
+      const token: CrossServiceTokenData | undefined = this.tokenDecoder.decodeToken(
+        request.headers['x-auth-token'] as string,
+      )
+
+      if (token === undefined) {
+        this.logger.debug('ApiGatewayAuthMiddleware authentication failure.')
+
+        response.status(401).send({
+          error: {
+            tag: 'invalid-auth',
+            message: 'Invalid login credentials.',
+          },
+        })
+
+        return
+      }
+
+      response.locals.user = token.user
+      response.locals.roles = token.roles
+      response.locals.session = token.session
+      response.locals.readOnlyAccess = token.session?.readonly_access ?? false
+
+      return next()
+    } catch (error) {
+      return next(error)
+    }
+  }
+}
--- a/packages/workspace/src/Domain/Workspace/Workspace.ts
+++ b/packages/workspace/src/Domain/Workspace/Workspace.ts
@@ -0,0 +1,26 @@
+import { Column, Entity, PrimaryGeneratedColumn } from 'typeorm'
+import { WorkspaceType } from './WorkspaceType'
+
+@Entity({ name: 'workspaces' })
+export class Workspace {
+  @PrimaryGeneratedColumn('uuid')
+  declare uuid: string
+
+  @Column({
+    length: 64,
+  })
+  declare type: WorkspaceType
+
+  @Column({
+    length: 255,
+    nullable: true,
+    type: 'varchar',
+  })
+  declare name: string | null
+
+  @Column({
+    name: 'key_rotation_index',
+    default: 0,
+  })
+  declare keyRotationIndex: number
+}
--- a/packages/workspace/src/Domain/Workspace/WorkspaceAccessLevel.ts
+++ b/packages/workspace/src/Domain/Workspace/WorkspaceAccessLevel.ts
@@ -0,0 +1,6 @@
+export enum WorkspaceAccessLevel {
+  Owner = 'owner',
+  Admin = 'admin',
+  ReadOnly = 'read-only',
+  WriteAndRead = 'write-and-read',
+}
--- a/packages/workspace/src/Domain/Workspace/WorkspaceType.ts
+++ b/packages/workspace/src/Domain/Workspace/WorkspaceType.ts
@@ -0,0 +1,5 @@
+export enum WorkspaceType {
+  Root = 'root',
+  Team = 'team',
+  Private = 'private',
+}
--- a/packages/workspace/src/Domain/Workspace/WorkspaceUser.ts
+++ b/packages/workspace/src/Domain/Workspace/WorkspaceUser.ts
@@ -0,0 +1,62 @@
+import { Column, Entity, Index, PrimaryGeneratedColumn } from 'typeorm'
+import { WorkspaceAccessLevel } from './WorkspaceAccessLevel'
+import { WorkspaceUserStatus } from './WorkspaceUserStatus'
+
+@Entity({ name: 'workspace_users' })
+@Index('index_workspace_users_on_workspace_and_user', ['userUuid', 'workspaceUuid'], { unique: true })
+export class WorkspaceUser {
+  @PrimaryGeneratedColumn('uuid')
+  declare uuid: string
+
+  @Column({
+    name: 'access_level',
+    length: 64,
+  })
+  declare accessLevel: WorkspaceAccessLevel
+
+  @Column({
+    name: 'user_uuid',
+    length: 36,
+  })
+  declare userUuid: string
+
+  @Column({
+    name: 'workspace_uuid',
+    length: 36,
+  })
+  declare workspaceUuid: string
+
+  @Column({
+    name: 'encrypted_workspace_key',
+    length: 255,
+    type: 'varchar',
+    nullable: true,
+  })
+  declare encryptedWorkspaceKey: string | null
+
+  @Column({
+    name: 'public_key',
+    length: 255,
+    type: 'varchar',
+  })
+  declare publicKey: string
+
+  @Column({
+    name: 'private_key',
+    length: 255,
+    type: 'varchar',
+  })
+  declare privateKey: string
+
+  @Column({
+    name: 'status',
+    length: 64,
+  })
+  declare status: WorkspaceUserStatus
+
+  @Column({
+    name: 'key_rotation_index',
+    default: 0,
+  })
+  declare keyRotationIndex: number
+}
--- a/packages/workspace/src/Domain/Workspace/WorkspaceUserStatus.ts
+++ b/packages/workspace/src/Domain/Workspace/WorkspaceUserStatus.ts
@@ -0,0 +1,4 @@
+export enum WorkspaceUserStatus {
+  Active = 'active',
+  PendingKeyshare = 'pending-keyshare',
+}
--- a/packages/workspace/src/Infra/InversifyExpressUtils/InversifyExpressHealthCheckController.ts
+++ b/packages/workspace/src/Infra/InversifyExpressUtils/InversifyExpressHealthCheckController.ts
@@ -0,0 +1,9 @@
+import { controller, httpGet } from 'inversify-express-utils'
+
+@controller('/healthcheck')
+export class InversifyExpressHealthCheckController {
+  @httpGet('/')
+  public async get(): Promise<string> {
+    return 'OK'
+  }
+}
--- a/packages/workspace/test-setup.ts
+++ b/packages/workspace/test-setup.ts
--- a/packages/workspace/tsconfig.json
+++ b/packages/workspace/tsconfig.json
@@ -0,0 +1,13 @@
+{
+  "extends": "../../tsconfig.json",
+  "compilerOptions": {
+    "composite": true,
+    "outDir": "./dist",
+  },
+  "include": [
+    "src/**/*",
+    "bin/**/*",
+    "migrations/**/*",
+  ],
+  "references": []
+}
--- a/packages/workspace/wait-for.sh
+++ b/packages/workspace/wait-for.sh
@@ -0,0 +1,17 @@
+#!/bin/sh
+
+set -e
+
+host="$1"
+shift
+port="$1"
+shift
+cmd="$@"
+
+while ! nc -vz $host $port; do
+  >&2 echo "$host:$port is unavailable yet - waiting for it to start"
+  sleep 10
+done
+
+>&2 echo "$host:$port is up - executing command"
+exec $cmd
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -63,6 +63,9 @@
    },
    {
      "path": "./packages/time"
+    },
+    {
+      "path": "./packages/workspace"
    }
  ]
 }
--- a/yarn.lock
+++ b/yarn.lock
@@ -2339,6 +2339,41 @@ __metadata:
  languageName: node
  linkType: hard

+"@standardnotes/workspace-server@workspace:packages/workspace":
+  version: 0.0.0-use.local
+  resolution: "@standardnotes/workspace-server@workspace:packages/workspace"
+  dependencies:
+    "@newrelic/winston-enricher": ^4.0.0
+    "@sentry/node": ^7.3.0
+    "@standardnotes/common": "workspace:*"
+    "@standardnotes/domain-events": "workspace:*"
+    "@standardnotes/domain-events-infra": "workspace:*"
+    "@standardnotes/security": "workspace:*"
+    "@types/cors": ^2.8.9
+    "@types/express": ^4.17.11
+    "@types/ioredis": ^4.28.10
+    "@types/jest": ^28.1.4
+    "@types/newrelic": ^7.0.3
+    "@typescript-eslint/eslint-plugin": ^5.29.0
+    aws-sdk: ^2.1159.0
+    cors: 2.8.5
+    dotenv: ^16.0.1
+    eslint: ^8.14.0
+    eslint-plugin-prettier: ^4.0.0
+    express: ^4.18.1
+    inversify: ^6.0.1
+    inversify-express-utils: ^6.4.3
+    ioredis: ^5.2.0
+    jest: ^28.1.2
+    mysql2: ^2.3.3
+    newrelic: ^9.0.0
+    reflect-metadata: 0.1.13
+    ts-jest: ^28.0.5
+    typeorm: ^0.3.6
+    winston: ^3.8.1
+  languageName: unknown
+  linkType: soft
+
 "@szmarczak/http-timer@npm:^5.0.1":
  version: 5.0.1
  resolution: "@szmarczak/http-timer@npm:5.0.1"
Author	SHA1	Message	Date
standardci	9cf746f6af	chore(release): publish new version - @standardnotes/auth-server@1.39.0 - @standardnotes/workspace-server@1.1.0	2022-10-06 09:56:05 +00:00
Karol Sójko	44a9ade3fc	feat: add workspace microservice	2022-10-06 11:54:22 +02:00
standardci	7064bd4c4c	chore(release): publish new version - @standardnotes/auth-server@1.38.1	2022-10-05 12:28:08 +00:00
Karol Sójko	a02a26ebdc	fix(auth): group typeorm annotations	2022-10-05 14:26:36 +02:00
standardci	b92af6cec6	chore(release): publish new version - @standardnotes/auth-server@1.38.0	2022-10-05 12:16:16 +00:00
Karol Sójko	3091177700	feat(auth): add groups model and database structure	2022-10-05 14:14:22 +02:00
standardci	be8838d338	chore(release): publish new version - @standardnotes/analytics@1.35.0 - @standardnotes/api-gateway@1.26.0 - @standardnotes/auth-server@1.37.1 - @standardnotes/domain-events-infra@1.8.17 - @standardnotes/domain-events@2.63.0 - @standardnotes/event-store@1.3.22 - @standardnotes/files-server@1.6.8 - @standardnotes/scheduler-server@1.10.36 - @standardnotes/syncing-server@1.8.20	2022-10-05 08:04:23 +00:00
Karol Sójko	84e8a5cc6e	feat(api-gateway): include increments count in statistics measures report	2022-10-05 10:02:55 +02:00
standardci	d5db578bfd	chore(release): publish new version - @standardnotes/api-gateway@1.25.0	2022-10-05 07:55:03 +00:00
Karol Sójko	7429f5c8e9	feat(api-gateway): add detailed payments statistics to report	2022-10-05 09:53:25 +02:00
standardci	8c6cf9651d	chore(release): publish new version - @standardnotes/api-gateway@1.24.5 - @standardnotes/auth-server@1.37.0 - @standardnotes/common@1.35.0 - @standardnotes/domain-events-infra@1.8.16 - @standardnotes/domain-events@2.62.0 - @standardnotes/event-store@1.3.21 - @standardnotes/files-server@1.6.7 - @standardnotes/predicates@1.4.4 - @standardnotes/scheduler-server@1.10.35 - @standardnotes/security@1.4.2 - @standardnotes/syncing-server@1.8.19	2022-10-04 13:17:02 +00:00
Karol Sójko	8668fec33d	feat(auth): add detailed income stats	2022-10-04 15:15:32 +02:00
standardci	76e34131fb	chore(release): publish new version - @standardnotes/api-gateway@1.24.4 - @standardnotes/auth-server@1.36.4 - @standardnotes/common@1.34.0 - @standardnotes/domain-events-infra@1.8.15 - @standardnotes/domain-events@2.61.1 - @standardnotes/event-store@1.3.20 - @standardnotes/files-server@1.6.6 - @standardnotes/predicates@1.4.3 - @standardnotes/scheduler-server@1.10.34 - @standardnotes/security@1.4.1 - @standardnotes/syncing-server@1.8.18	2022-10-04 12:17:15 +00:00
Karol Sójko	3c40ee4b4a	feat(common): add subscription billing frequency	2022-10-04 14:15:45 +02:00
standardci	5abd7ae32c	chore(release): publish new version - @standardnotes/analytics@1.34.0 - @standardnotes/api-gateway@1.24.3 - @standardnotes/auth-server@1.36.3 - @standardnotes/syncing-server@1.8.17	2022-10-04 11:26:29 +00:00
Karol Sójko	09b3f9a0d7	fix(auth): turn down severity of logs for predicate verification	2022-10-04 13:24:58 +02:00
Karol Sójko	19455ba6a7	feat(analytics): add new statistics measures for income	2022-10-04 13:24:58 +02:00
standardci	7d042689f0	chore(release): publish new version - @standardnotes/api-gateway@1.24.2	2022-10-03 12:49:37 +00:00
Karol Sójko	f43fbf1584	fix(api-gateway): report churn values for empty months	2022-10-03 14:47:45 +02:00
standardci	24c0cb8366	chore(release): publish new version - @standardnotes/api-gateway@1.24.1	2022-10-03 12:15:56 +00:00
Karol Sójko	2236cc3828	fix: add debug logs for churn calculation	2022-10-03 14:14:27 +02:00