chore(release): publish new version

- @standardnotes/syncing-server@1.26.2

.github/workflows/common-server-application.yml

@@ -187,7 +187,7 @@ jobs:
         tags: standardnotes/${{ inputs.service_name }}:${{ github.sha }}
 
     - name: Run E2E test suite
-      uses: convictional/trigger-workflow-and-wait@v1.6.3
+      uses: convictional/trigger-workflow-and-wait@master
       with:
         owner: standardnotes
         repo: e2e

.github/workflows/revisions.yml

@@ -0,0 +1,46 @@
+name: Revisions Server
+
+concurrency:
+  group: revisions_server
+  cancel-in-progress: true
+
+on:
+  push:
+    tags:
+      - '*standardnotes/revisions-server*'
+  workflow_dispatch:
+
+jobs:
+  call_server_application_workflow:
+    name: Server Application
+    uses: standardnotes/server/.github/workflows/common-server-application.yml@main
+    with:
+      service_name: revisions
+      workspace_name: "@standardnotes/revisions-server"
+      e2e_tag_parameter_name: revisions_image_tag
+      package_path: packages/revisions
+    secrets: inherit
+
+  newrelic:
+    needs: call_server_application_workflow
+
+    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_REVISIONS_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_REVISIONS_WORKER_PROD }}
+          revision: "${{ github.sha }}"
+          description: "Automated Deployment via Github Actions"
+          user: "${{ github.actor }}"

.pnp.cjs

@@ -53,6 +53,10 @@ const RAW_RUNTIME_STATE =
       "name": "@standardnotes/predicates",\
       "reference": "workspace:packages/predicates"\
     },\
+    {\
+      "name": "@standardnotes/revisions-server",\
+      "reference": "workspace:packages/revisions"\
+    },\
     {\
       "name": "@standardnotes/scheduler-server",\
       "reference": "workspace:packages/scheduler"\
@@ -99,6 +103,7 @@ const RAW_RUNTIME_STATE =
     ["@standardnotes/event-store", ["workspace:packages/event-store"]],\
     ["@standardnotes/files-server", ["workspace:packages/files"]],\
     ["@standardnotes/predicates", ["workspace:packages/predicates"]],\
+    ["@standardnotes/revisions-server", ["workspace:packages/revisions"]],\
     ["@standardnotes/scheduler-server", ["workspace:packages/scheduler"]],\
     ["@standardnotes/security", ["workspace:packages/security"]],\
     ["@standardnotes/server-monorepo", ["workspace:."]],\
@@ -121,7 +126,6 @@ const RAW_RUNTIME_STATE =
           ["@lerna-lite/cli", "npm:1.6.0"],\
           ["@lerna-lite/list", "npm:1.6.0"],\
           ["@lerna-lite/run", "npm:1.6.0"],\
-          ["@newrelic/native-metrics", "npm:9.0.0"],\
           ["@sentry/node", "npm:7.19.0"],\
           ["@types/jest", "npm:29.1.1"],\
           ["@types/newrelic", "npm:7.0.4"],\
@@ -2533,7 +2537,6 @@ const RAW_RUNTIME_STATE =
         "packageLocation": "./packages/analytics/",\
         "packageDependencies": [\
           ["@standardnotes/analytics", "workspace:packages/analytics"],\
-          ["@newrelic/native-metrics", "npm:9.0.0"],\
           ["@newrelic/winston-enricher", "virtual:c66bf20e88479ada0172094776519a9f51acc4731d22079b60a295bcec7ea42d5545cbce58a77a50d932bf953298799135e99707486e343da6d99ba1d167bdbd#npm:4.0.0"],\
           ["@sentry/node", "npm:7.19.0"],\
           ["@standardnotes/common", "workspace:packages/common"],\
@@ -2546,7 +2549,7 @@ const RAW_RUNTIME_STATE =
           ["@types/newrelic", "npm:7.0.4"],\
           ["@types/node", "npm:18.11.9"],\
           ["@typescript-eslint/eslint-plugin", "virtual:c66bf20e88479ada0172094776519a9f51acc4731d22079b60a295bcec7ea42d5545cbce58a77a50d932bf953298799135e99707486e343da6d99ba1d167bdbd#npm:5.30.5"],\
-          ["aws-sdk", "npm:2.1253.0"],\
+          ["aws-sdk", "npm:2.1260.0"],\
           ["dayjs", "npm:1.11.6"],\
           ["dotenv", "npm:16.0.1"],\
           ["eslint", "npm:8.25.0"],\
@@ -2586,7 +2589,6 @@ const RAW_RUNTIME_STATE =
         "packageLocation": "./packages/api-gateway/",\
         "packageDependencies": [\
           ["@standardnotes/api-gateway", "workspace:packages/api-gateway"],\
-          ["@newrelic/native-metrics", "npm:9.0.0"],\
           ["@newrelic/winston-enricher", "virtual:c66bf20e88479ada0172094776519a9f51acc4731d22079b60a295bcec7ea42d5545cbce58a77a50d932bf953298799135e99707486e343da6d99ba1d167bdbd#npm:4.0.0"],\
           ["@sentry/node", "npm:7.19.0"],\
           ["@standardnotes/common", "workspace:packages/common"],\
@@ -2602,7 +2604,7 @@ const RAW_RUNTIME_STATE =
           ["@types/newrelic", "npm:7.0.4"],\
           ["@types/prettyjson", "npm:0.0.30"],\
           ["@typescript-eslint/eslint-plugin", "virtual:04783e12400851b8a3d76e71495851cc94959db6e62f04cb0a31190080629440b182d8c8eb4d7f2b04e281912f2783a5fd4d2c3c6ab68d38b7097246c93f4c19#npm:5.40.1"],\
-          ["aws-sdk", "npm:2.1253.0"],\
+          ["aws-sdk", "npm:2.1260.0"],\
           ["axios", "npm:1.1.3"],\
           ["cors", "npm:2.8.5"],\
           ["dotenv", "npm:16.0.1"],\
@@ -2643,11 +2645,11 @@ const RAW_RUNTIME_STATE =
         "packageLocation": "./packages/auth/",\
         "packageDependencies": [\
           ["@standardnotes/auth-server", "workspace:packages/auth"],\
-          ["@newrelic/native-metrics", "npm:9.0.0"],\
           ["@newrelic/winston-enricher", "virtual:c66bf20e88479ada0172094776519a9f51acc4731d22079b60a295bcec7ea42d5545cbce58a77a50d932bf953298799135e99707486e343da6d99ba1d167bdbd#npm:4.0.0"],\
           ["@sentry/node", "npm:7.19.0"],\
           ["@standardnotes/api", "npm:1.19.0"],\
           ["@standardnotes/common", "workspace:packages/common"],\
+          ["@standardnotes/domain-core", "workspace:packages/domain-core"],\
           ["@standardnotes/domain-events", "workspace:packages/domain-events"],\
           ["@standardnotes/domain-events-infra", "workspace:packages/domain-events-infra"],\
           ["@standardnotes/features", "npm:1.53.1"],\
@@ -2669,7 +2671,7 @@ const RAW_RUNTIME_STATE =
           ["@types/ua-parser-js", "npm:0.7.36"],\
           ["@types/uuid", "npm:8.3.4"],\
           ["@typescript-eslint/eslint-plugin", "virtual:04783e12400851b8a3d76e71495851cc94959db6e62f04cb0a31190080629440b182d8c8eb4d7f2b04e281912f2783a5fd4d2c3c6ab68d38b7097246c93f4c19#npm:5.40.1"],\
-          ["aws-sdk", "npm:2.1253.0"],\
+          ["aws-sdk", "npm:2.1260.0"],\
           ["axios", "npm:1.1.3"],\
           ["bcryptjs", "npm:2.4.3"],\
           ["cors", "npm:2.8.5"],\
@@ -2778,13 +2780,12 @@ const RAW_RUNTIME_STATE =
         "packageLocation": "./packages/domain-events-infra/",\
         "packageDependencies": [\
           ["@standardnotes/domain-events-infra", "workspace:packages/domain-events-infra"],\
-          ["@newrelic/native-metrics", "npm:9.0.0"],\
           ["@standardnotes/domain-events", "workspace:packages/domain-events"],\
           ["@types/ioredis", "npm:5.0.0"],\
           ["@types/jest", "npm:29.1.1"],\
           ["@types/newrelic", "npm:7.0.4"],\
           ["@typescript-eslint/eslint-plugin", "virtual:fd909b174d079e30b336c4ce72c38a88c1e447767b1a8dd7655e07719a1e31b97807f0931368724fc78897ff15e6a6d00b83316c0f76d11f85111f342e08bb79#npm:5.30.5"],\
-          ["aws-sdk", "npm:2.1253.0"],\
+          ["aws-sdk", "npm:2.1260.0"],\
           ["eslint-plugin-prettier", "virtual:fd909b174d079e30b336c4ce72c38a88c1e447767b1a8dd7655e07719a1e31b97807f0931368724fc78897ff15e6a6d00b83316c0f76d11f85111f342e08bb79#npm:4.2.1"],\
           ["ioredis", "npm:5.2.4"],\
           ["jest", "virtual:fd909b174d079e30b336c4ce72c38a88c1e447767b1a8dd7655e07719a1e31b97807f0931368724fc78897ff15e6a6d00b83316c0f76d11f85111f342e08bb79#npm:29.1.2"],\
@@ -2818,7 +2819,6 @@ const RAW_RUNTIME_STATE =
         "packageLocation": "./packages/event-store/",\
         "packageDependencies": [\
           ["@standardnotes/event-store", "workspace:packages/event-store"],\
-          ["@newrelic/native-metrics", "npm:9.0.0"],\
           ["@standardnotes/domain-events", "workspace:packages/domain-events"],\
           ["@standardnotes/domain-events-infra", "workspace:packages/domain-events-infra"],\
           ["@standardnotes/time", "workspace:packages/time"],\
@@ -2827,7 +2827,7 @@ const RAW_RUNTIME_STATE =
           ["@types/newrelic", "npm:7.0.4"],\
           ["@types/nodemailer", "npm:6.4.6"],\
           ["@typescript-eslint/eslint-plugin", "virtual:04783e12400851b8a3d76e71495851cc94959db6e62f04cb0a31190080629440b182d8c8eb4d7f2b04e281912f2783a5fd4d2c3c6ab68d38b7097246c93f4c19#npm:5.40.1"],\
-          ["aws-sdk", "npm:2.1253.0"],\
+          ["aws-sdk", "npm:2.1260.0"],\
           ["dotenv", "npm:16.0.1"],\
           ["eslint", "npm:8.25.0"],\
           ["eslint-plugin-prettier", "virtual:c66bf20e88479ada0172094776519a9f51acc4731d22079b60a295bcec7ea42d5545cbce58a77a50d932bf953298799135e99707486e343da6d99ba1d167bdbd#npm:4.2.1"],\
@@ -2874,7 +2874,6 @@ const RAW_RUNTIME_STATE =
         "packageLocation": "./packages/files/",\
         "packageDependencies": [\
           ["@standardnotes/files-server", "workspace:packages/files"],\
-          ["@newrelic/native-metrics", "npm:9.0.0"],\
           ["@sentry/node", "npm:7.19.0"],\
           ["@standardnotes/common", "workspace:packages/common"],\
           ["@standardnotes/config", "npm:2.4.3"],\
@@ -2894,7 +2893,7 @@ const RAW_RUNTIME_STATE =
           ["@types/prettyjson", "npm:0.0.30"],\
           ["@types/uuid", "npm:8.3.4"],\
           ["@typescript-eslint/eslint-plugin", "virtual:04783e12400851b8a3d76e71495851cc94959db6e62f04cb0a31190080629440b182d8c8eb4d7f2b04e281912f2783a5fd4d2c3c6ab68d38b7097246c93f4c19#npm:5.40.1"],\
-          ["aws-sdk", "npm:2.1253.0"],\
+          ["aws-sdk", "npm:2.1260.0"],\
           ["connect-busboy", "npm:1.0.0"],\
           ["cors", "npm:2.8.5"],\
           ["dayjs", "npm:1.11.6"],\
@@ -3004,15 +3003,60 @@ const RAW_RUNTIME_STATE =
         "linkType": "HARD"\
       }]\
     ]],\
+    ["@standardnotes/revisions-server", [\
+      ["workspace:packages/revisions", {\
+        "packageLocation": "./packages/revisions/",\
+        "packageDependencies": [\
+          ["@standardnotes/revisions-server", "workspace:packages/revisions"],\
+          ["@newrelic/winston-enricher", "virtual:c66bf20e88479ada0172094776519a9f51acc4731d22079b60a295bcec7ea42d5545cbce58a77a50d932bf953298799135e99707486e343da6d99ba1d167bdbd#npm:4.0.0"],\
+          ["@sentry/node", "npm:7.19.0"],\
+          ["@standardnotes/api", "npm:1.19.0"],\
+          ["@standardnotes/common", "workspace:packages/common"],\
+          ["@standardnotes/domain-core", "workspace:packages/domain-core"],\
+          ["@standardnotes/domain-events", "workspace:packages/domain-events"],\
+          ["@standardnotes/domain-events-infra", "workspace:packages/domain-events-infra"],\
+          ["@standardnotes/security", "workspace:packages/security"],\
+          ["@standardnotes/time", "workspace:packages/time"],\
+          ["@types/cors", "npm:2.8.12"],\
+          ["@types/dotenv", "npm:8.2.0"],\
+          ["@types/express", "npm:4.17.14"],\
+          ["@types/inversify-express-utils", "npm:2.0.0"],\
+          ["@types/ioredis", "npm:5.0.0"],\
+          ["@types/jest", "npm:29.1.1"],\
+          ["@types/newrelic", "npm:7.0.4"],\
+          ["@typescript-eslint/eslint-plugin", "virtual:04783e12400851b8a3d76e71495851cc94959db6e62f04cb0a31190080629440b182d8c8eb4d7f2b04e281912f2783a5fd4d2c3c6ab68d38b7097246c93f4c19#npm:5.40.1"],\
+          ["aws-sdk", "npm:2.1260.0"],\
+          ["cors", "npm:2.8.5"],\
+          ["dotenv", "npm:16.0.1"],\
+          ["eslint", "npm:8.25.0"],\
+          ["eslint-plugin-prettier", "virtual:c66bf20e88479ada0172094776519a9f51acc4731d22079b60a295bcec7ea42d5545cbce58a77a50d932bf953298799135e99707486e343da6d99ba1d167bdbd#npm:4.2.1"],\
+          ["express", "npm:4.18.2"],\
+          ["helmet", "npm:6.0.0"],\
+          ["inversify", "npm:6.0.1"],\
+          ["inversify-express-utils", "npm:6.4.3"],\
+          ["ioredis", "npm:5.2.4"],\
+          ["jest", "virtual:fd909b174d079e30b336c4ce72c38a88c1e447767b1a8dd7655e07719a1e31b97807f0931368724fc78897ff15e6a6d00b83316c0f76d11f85111f342e08bb79#npm:29.1.2"],\
+          ["mysql2", "npm:2.3.3"],\
+          ["newrelic", "npm:9.6.0"],\
+          ["npm-check-updates", "npm:16.0.1"],\
+          ["reflect-metadata", "npm:0.1.13"],\
+          ["ts-jest", "virtual:fd909b174d079e30b336c4ce72c38a88c1e447767b1a8dd7655e07719a1e31b97807f0931368724fc78897ff15e6a6d00b83316c0f76d11f85111f342e08bb79#npm:29.0.3"],\
+          ["typeorm", "virtual:c66bf20e88479ada0172094776519a9f51acc4731d22079b60a295bcec7ea42d5545cbce58a77a50d932bf953298799135e99707486e343da6d99ba1d167bdbd#npm:0.3.10"],\
+          ["typescript", "patch:typescript@npm%3A4.8.4#optional!builtin<compat/typescript>::version=4.8.4&hash=701156"],\
+          ["winston", "npm:3.8.2"]\
+        ],\
+        "linkType": "SOFT"\
+      }]\
+    ]],\
     ["@standardnotes/scheduler-server", [\
       ["workspace:packages/scheduler", {\
         "packageLocation": "./packages/scheduler/",\
         "packageDependencies": [\
           ["@standardnotes/scheduler-server", "workspace:packages/scheduler"],\
-          ["@newrelic/native-metrics", "npm:9.0.0"],\
           ["@newrelic/winston-enricher", "virtual:c66bf20e88479ada0172094776519a9f51acc4731d22079b60a295bcec7ea42d5545cbce58a77a50d932bf953298799135e99707486e343da6d99ba1d167bdbd#npm:4.0.0"],\
           ["@sentry/node", "npm:7.19.0"],\
           ["@standardnotes/common", "workspace:packages/common"],\
+          ["@standardnotes/domain-core", "workspace:packages/domain-core"],\
           ["@standardnotes/domain-events", "workspace:packages/domain-events"],\
           ["@standardnotes/domain-events-infra", "workspace:packages/domain-events-infra"],\
           ["@standardnotes/predicates", "workspace:packages/predicates"],\
@@ -3022,7 +3066,7 @@ const RAW_RUNTIME_STATE =
           ["@types/newrelic", "npm:7.0.4"],\
           ["@types/node", "npm:18.11.9"],\
           ["@typescript-eslint/eslint-plugin", "virtual:04783e12400851b8a3d76e71495851cc94959db6e62f04cb0a31190080629440b182d8c8eb4d7f2b04e281912f2783a5fd4d2c3c6ab68d38b7097246c93f4c19#npm:5.40.1"],\
-          ["aws-sdk", "npm:2.1253.0"],\
+          ["aws-sdk", "npm:2.1260.0"],\
           ["dayjs", "npm:1.11.6"],\
           ["dotenv", "npm:16.0.1"],\
           ["eslint", "npm:8.25.0"],\
@@ -3071,7 +3115,6 @@ const RAW_RUNTIME_STATE =
           ["@lerna-lite/cli", "npm:1.6.0"],\
           ["@lerna-lite/list", "npm:1.6.0"],\
           ["@lerna-lite/run", "npm:1.6.0"],\
-          ["@newrelic/native-metrics", "npm:9.0.0"],\
           ["@sentry/node", "npm:7.19.0"],\
           ["@types/jest", "npm:29.1.1"],\
           ["@types/newrelic", "npm:7.0.4"],\
@@ -3094,7 +3137,6 @@ const RAW_RUNTIME_STATE =
         "packageLocation": "./packages/settings/",\
         "packageDependencies": [\
           ["@standardnotes/settings", "workspace:packages/settings"],\
-          ["@newrelic/native-metrics", "npm:9.0.0"],\
           ["@typescript-eslint/eslint-plugin", "virtual:fd909b174d079e30b336c4ce72c38a88c1e447767b1a8dd7655e07719a1e31b97807f0931368724fc78897ff15e6a6d00b83316c0f76d11f85111f342e08bb79#npm:5.30.5"],\
           ["eslint-plugin-prettier", "virtual:fd909b174d079e30b336c4ce72c38a88c1e447767b1a8dd7655e07719a1e31b97807f0931368724fc78897ff15e6a6d00b83316c0f76d11f85111f342e08bb79#npm:4.2.1"],\
           ["reflect-metadata", "npm:0.1.13"],\
@@ -3138,7 +3180,6 @@ const RAW_RUNTIME_STATE =
         "packageLocation": "./packages/syncing-server/",\
         "packageDependencies": [\
           ["@standardnotes/syncing-server", "workspace:packages/syncing-server"],\
-          ["@newrelic/native-metrics", "npm:9.0.0"],\
           ["@newrelic/winston-enricher", "virtual:c66bf20e88479ada0172094776519a9f51acc4731d22079b60a295bcec7ea42d5545cbce58a77a50d932bf953298799135e99707486e343da6d99ba1d167bdbd#npm:4.0.0"],\
           ["@sentry/node", "npm:7.19.0"],\
           ["@standardnotes/common", "workspace:packages/common"],\
@@ -3162,7 +3203,7 @@ const RAW_RUNTIME_STATE =
           ["@types/ua-parser-js", "npm:0.7.36"],\
           ["@types/uuid", "npm:8.3.4"],\
           ["@typescript-eslint/eslint-plugin", "virtual:04783e12400851b8a3d76e71495851cc94959db6e62f04cb0a31190080629440b182d8c8eb4d7f2b04e281912f2783a5fd4d2c3c6ab68d38b7097246c93f4c19#npm:5.40.1"],\
-          ["aws-sdk", "npm:2.1253.0"],\
+          ["aws-sdk", "npm:2.1260.0"],\
           ["axios", "npm:1.1.3"],\
           ["cors", "npm:2.8.5"],\
           ["dotenv", "npm:16.0.1"],\
@@ -3239,7 +3280,6 @@ const RAW_RUNTIME_STATE =
         "packageLocation": "./packages/websockets/",\
         "packageDependencies": [\
           ["@standardnotes/websockets-server", "workspace:packages/websockets"],\
-          ["@newrelic/native-metrics", "npm:9.0.0"],\
           ["@newrelic/winston-enricher", "virtual:c66bf20e88479ada0172094776519a9f51acc4731d22079b60a295bcec7ea42d5545cbce58a77a50d932bf953298799135e99707486e343da6d99ba1d167bdbd#npm:4.0.0"],\
           ["@sentry/node", "npm:7.19.0"],\
           ["@standardnotes/api", "npm:1.19.0"],\
@@ -3253,7 +3293,7 @@ const RAW_RUNTIME_STATE =
           ["@types/jest", "npm:29.1.1"],\
           ["@types/newrelic", "npm:7.0.4"],\
           ["@typescript-eslint/eslint-plugin", "virtual:04783e12400851b8a3d76e71495851cc94959db6e62f04cb0a31190080629440b182d8c8eb4d7f2b04e281912f2783a5fd4d2c3c6ab68d38b7097246c93f4c19#npm:5.40.1"],\
-          ["aws-sdk", "npm:2.1253.0"],\
+          ["aws-sdk", "npm:2.1260.0"],\
           ["axios", "npm:1.1.3"],\
           ["cors", "npm:2.8.5"],\
           ["dotenv", "npm:16.0.1"],\
@@ -3280,11 +3320,11 @@ const RAW_RUNTIME_STATE =
         "packageLocation": "./packages/workspace/",\
         "packageDependencies": [\
           ["@standardnotes/workspace-server", "workspace:packages/workspace"],\
-          ["@newrelic/native-metrics", "npm:9.0.0"],\
           ["@newrelic/winston-enricher", "virtual:c66bf20e88479ada0172094776519a9f51acc4731d22079b60a295bcec7ea42d5545cbce58a77a50d932bf953298799135e99707486e343da6d99ba1d167bdbd#npm:4.0.0"],\
           ["@sentry/node", "npm:7.19.0"],\
           ["@standardnotes/api", "npm:1.19.0"],\
           ["@standardnotes/common", "workspace:packages/common"],\
+          ["@standardnotes/domain-core", "workspace:packages/domain-core"],\
           ["@standardnotes/domain-events", "workspace:packages/domain-events"],\
           ["@standardnotes/domain-events-infra", "workspace:packages/domain-events-infra"],\
           ["@standardnotes/models", "npm:1.28.0"],\
@@ -3296,7 +3336,7 @@ const RAW_RUNTIME_STATE =
           ["@types/jest", "npm:29.1.1"],\
           ["@types/newrelic", "npm:7.0.4"],\
           ["@typescript-eslint/eslint-plugin", "virtual:04783e12400851b8a3d76e71495851cc94959db6e62f04cb0a31190080629440b182d8c8eb4d7f2b04e281912f2783a5fd4d2c3c6ab68d38b7097246c93f4c19#npm:5.40.1"],\
-          ["aws-sdk", "npm:2.1253.0"],\
+          ["aws-sdk", "npm:2.1260.0"],\
           ["cors", "npm:2.8.5"],\
           ["dotenv", "npm:16.0.1"],\
           ["eslint", "npm:8.25.0"],\
@@ -4763,10 +4803,10 @@ const RAW_RUNTIME_STATE =
       }]\
     ]],\
     ["aws-sdk", [\
-      ["npm:2.1253.0", {\
-        "packageLocation": "./.yarn/cache/aws-sdk-npm-2.1253.0-2cf60975ab-faa4af2949.zip/node_modules/aws-sdk/",\
+      ["npm:2.1260.0", {\
+        "packageLocation": "./.yarn/cache/aws-sdk-npm-2.1260.0-0145998ab1-9a1b2e4cb5.zip/node_modules/aws-sdk/",\
         "packageDependencies": [\
-          ["aws-sdk", "npm:2.1253.0"],\
+          ["aws-sdk", "npm:2.1260.0"],\
           ["buffer", "npm:4.9.2"],\
           ["events", "npm:1.1.1"],\
           ["ieee754", "npm:1.1.13"],\
@@ -12533,7 +12573,7 @@ const RAW_RUNTIME_STATE =
         "packageDependencies": [\
           ["sqs-consumer", "virtual:685a6222c3349423674bb7f0684ba34e2ab20912010f352e04dcf707a156e13183fc382e2417cb37a60f3e7b52fd0178c53181674890e1773eb83e190dc13378#npm:5.7.0"],\
           ["@types/aws-sdk", null],\
-          ["aws-sdk", "npm:2.1253.0"],\
+          ["aws-sdk", "npm:2.1260.0"],\
           ["debug", "virtual:b86a9fb34323a98c6519528ed55faa0d9b44ca8879307c0b29aa384bde47ff59a7d0c9051b31246f14521dfb71ba3c5d6d0b35c29fffc17bf875aa6ad977d9e8#npm:4.3.4"]\
         ],\
         "packagePeers": [\

.prettierrc

@@ -0,0 +1,6 @@
+{
+  "singleQuote": true,
+  "trailingComma": "all",
+  "printWidth": 120,
+  "semi": false
+}

package.json

@@ -21,6 +21,7 @@
     "lint:websockets": "yarn workspace @standardnotes/websockets-server lint",
     "lint:workspace": "yarn workspace @standardnotes/workspace-server lint",
     "lint:analytics": "yarn workspace @standardnotes/analytics lint",
+    "lint:revisions": "yarn workspace @standardnotes/revisions-server lint",
     "clean": "yarn workspaces foreach -p --verbose run clean",
     "setup:env": "cp .env.sample .env && yarn workspaces foreach -p --verbose run setup:env",
     "start:auth": "yarn workspace @standardnotes/auth-server start",
@@ -34,6 +35,7 @@
     "start:websockets": "yarn workspace @standardnotes/websockets-server start",
     "start:workspace": "yarn workspace @standardnotes/workspace-server start",
     "start:analytics": "yarn workspace @standardnotes/analytics worker",
+    "start:revisions": "yarn workspace @standardnotes/revisions-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",
@@ -59,7 +61,6 @@
   },
   "packageManager": "yarn@4.0.0-rc.25",
   "dependencies": {
-    "@newrelic/native-metrics": "^9.0.0",
     "@sentry/node": "^7.19.0",
     "newrelic": "^9.6.0"
   }

packages/analytics/CHANGELOG.md

@@ -3,6 +3,204 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.12.25](https://github.com/standardnotes/server/compare/@standardnotes/analytics@2.12.24...@standardnotes/analytics@2.12.25) (2022-12-12)
+
+**Note:** Version bump only for package @standardnotes/analytics
+
+## [2.12.24](https://github.com/standardnotes/server/compare/@standardnotes/analytics@2.12.23...@standardnotes/analytics@2.12.24) (2022-12-12)
+
+### Bug Fixes
+
+* **analytics:** daily analytics report template ([41906ec](https://github.com/standardnotes/server/commit/41906ec2f9fd4d605b1c002826173e14fb534e00))
+
+## [2.12.23](https://github.com/standardnotes/server/compare/@standardnotes/analytics@2.12.22...@standardnotes/analytics@2.12.23) (2022-12-12)
+
+**Note:** Version bump only for package @standardnotes/analytics
+
+## [2.12.22](https://github.com/standardnotes/server/compare/@standardnotes/analytics@2.12.21...@standardnotes/analytics@2.12.22) (2022-12-12)
+
+### Bug Fixes
+
+* **analytics:** report event publishing ([a605660](https://github.com/standardnotes/server/commit/a6056600eb96bf175189ad6d62870c9d736f331b))
+
+## [2.12.21](https://github.com/standardnotes/server/compare/@standardnotes/analytics@2.12.20...@standardnotes/analytics@2.12.21) (2022-12-12)
+
+### Bug Fixes
+
+* **analytics:** add debug logs for report ([48c0cb5](https://github.com/standardnotes/server/commit/48c0cb5e62dc8af930de191deaa1eb3ff6c5a29f))
+
+## [2.12.20](https://github.com/standardnotes/server/compare/@standardnotes/analytics@2.12.19...@standardnotes/analytics@2.12.20) (2022-12-09)
+
+**Note:** Version bump only for package @standardnotes/analytics
+
+## [2.12.19](https://github.com/standardnotes/server/compare/@standardnotes/analytics@2.12.18...@standardnotes/analytics@2.12.19) (2022-12-09)
+
+**Note:** Version bump only for package @standardnotes/analytics
+
+## [2.12.18](https://github.com/standardnotes/server/compare/@standardnotes/analytics@2.12.17...@standardnotes/analytics@2.12.18) (2022-12-09)
+
+**Note:** Version bump only for package @standardnotes/analytics
+
+## [2.12.17](https://github.com/standardnotes/server/compare/@standardnotes/analytics@2.12.16...@standardnotes/analytics@2.12.17) (2022-12-09)
+
+**Note:** Version bump only for package @standardnotes/analytics
+
+## [2.12.16](https://github.com/standardnotes/server/compare/@standardnotes/analytics@2.12.15...@standardnotes/analytics@2.12.16) (2022-12-09)
+
+**Note:** Version bump only for package @standardnotes/analytics
+
+## [2.12.15](https://github.com/standardnotes/server/compare/@standardnotes/analytics@2.12.14...@standardnotes/analytics@2.12.15) (2022-12-09)
+
+**Note:** Version bump only for package @standardnotes/analytics
+
+## [2.12.14](https://github.com/standardnotes/server/compare/@standardnotes/analytics@2.12.13...@standardnotes/analytics@2.12.14) (2022-12-09)
+
+**Note:** Version bump only for package @standardnotes/analytics
+
+## [2.12.13](https://github.com/standardnotes/server/compare/@standardnotes/analytics@2.12.12...@standardnotes/analytics@2.12.13) (2022-12-09)
+
+**Note:** Version bump only for package @standardnotes/analytics
+
+## [2.12.12](https://github.com/standardnotes/server/compare/@standardnotes/analytics@2.12.11...@standardnotes/analytics@2.12.12) (2022-12-08)
+
+**Note:** Version bump only for package @standardnotes/analytics
+
+## [2.12.11](https://github.com/standardnotes/server/compare/@standardnotes/analytics@2.12.10...@standardnotes/analytics@2.12.11) (2022-12-08)
+
+**Note:** Version bump only for package @standardnotes/analytics
+
+## [2.12.10](https://github.com/standardnotes/server/compare/@standardnotes/analytics@2.12.9...@standardnotes/analytics@2.12.10) (2022-12-08)
+
+**Note:** Version bump only for package @standardnotes/analytics
+
+## [2.12.9](https://github.com/standardnotes/server/compare/@standardnotes/analytics@2.12.8...@standardnotes/analytics@2.12.9) (2022-12-08)
+
+**Note:** Version bump only for package @standardnotes/analytics
+
+## [2.12.8](https://github.com/standardnotes/server/compare/@standardnotes/analytics@2.12.7...@standardnotes/analytics@2.12.8) (2022-12-08)
+
+**Note:** Version bump only for package @standardnotes/analytics
+
+## [2.12.7](https://github.com/standardnotes/server/compare/@standardnotes/analytics@2.12.6...@standardnotes/analytics@2.12.7) (2022-12-07)
+
+**Note:** Version bump only for package @standardnotes/analytics
+
+## [2.12.6](https://github.com/standardnotes/server/compare/@standardnotes/analytics@2.12.5...@standardnotes/analytics@2.12.6) (2022-12-07)
+
+**Note:** Version bump only for package @standardnotes/analytics
+
+## [2.12.5](https://github.com/standardnotes/server/compare/@standardnotes/analytics@2.12.4...@standardnotes/analytics@2.12.5) (2022-12-07)
+
+**Note:** Version bump only for package @standardnotes/analytics
+
+## [2.12.4](https://github.com/standardnotes/server/compare/@standardnotes/analytics@2.12.3...@standardnotes/analytics@2.12.4) (2022-12-07)
+
+**Note:** Version bump only for package @standardnotes/analytics
+
+## [2.12.3](https://github.com/standardnotes/server/compare/@standardnotes/analytics@2.12.2...@standardnotes/analytics@2.12.3) (2022-12-06)
+
+**Note:** Version bump only for package @standardnotes/analytics
+
+## [2.12.2](https://github.com/standardnotes/server/compare/@standardnotes/analytics@2.12.1...@standardnotes/analytics@2.12.2) (2022-12-05)
+
+**Note:** Version bump only for package @standardnotes/analytics
+
+## [2.12.1](https://github.com/standardnotes/server/compare/@standardnotes/analytics@2.12.0...@standardnotes/analytics@2.12.1) (2022-12-05)
+
+**Note:** Version bump only for package @standardnotes/analytics
+
+# [2.12.0](https://github.com/standardnotes/server/compare/@standardnotes/analytics@2.11.17...@standardnotes/analytics@2.12.0) (2022-12-05)
+
+### Features
+
+* **domain-core:** distinguish between username and email ([06fd404](https://github.com/standardnotes/server/commit/06fd404d44b44a53733f889aabd4da63f21e2f36))
+
+## [2.11.17](https://github.com/standardnotes/server/compare/@standardnotes/analytics@2.11.16...@standardnotes/analytics@2.11.17) (2022-12-02)
+
+**Note:** Version bump only for package @standardnotes/analytics
+
+## [2.11.16](https://github.com/standardnotes/server/compare/@standardnotes/analytics@2.11.15...@standardnotes/analytics@2.11.16) (2022-12-02)
+
+**Note:** Version bump only for package @standardnotes/analytics
+
+## [2.11.15](https://github.com/standardnotes/server/compare/@standardnotes/analytics@2.11.14...@standardnotes/analytics@2.11.15) (2022-11-30)
+
+**Note:** Version bump only for package @standardnotes/analytics
+
+## [2.11.14](https://github.com/standardnotes/server/compare/@standardnotes/analytics@2.11.13...@standardnotes/analytics@2.11.14) (2022-11-28)
+
+**Note:** Version bump only for package @standardnotes/analytics
+
+## [2.11.13](https://github.com/standardnotes/server/compare/@standardnotes/analytics@2.11.12...@standardnotes/analytics@2.11.13) (2022-11-25)
+
+**Note:** Version bump only for package @standardnotes/analytics
+
+## [2.11.12](https://github.com/standardnotes/server/compare/@standardnotes/analytics@2.11.11...@standardnotes/analytics@2.11.12) (2022-11-24)
+
+**Note:** Version bump only for package @standardnotes/analytics
+
+## [2.11.11](https://github.com/standardnotes/server/compare/@standardnotes/analytics@2.11.10...@standardnotes/analytics@2.11.11) (2022-11-24)
+
+**Note:** Version bump only for package @standardnotes/analytics
+
+## [2.11.10](https://github.com/standardnotes/server/compare/@standardnotes/analytics@2.11.9...@standardnotes/analytics@2.11.10) (2022-11-24)
+
+**Note:** Version bump only for package @standardnotes/analytics
+
+## [2.11.9](https://github.com/standardnotes/server/compare/@standardnotes/analytics@2.11.8...@standardnotes/analytics@2.11.9) (2022-11-24)
+
+**Note:** Version bump only for package @standardnotes/analytics
+
+## [2.11.8](https://github.com/standardnotes/server/compare/@standardnotes/analytics@2.11.7...@standardnotes/analytics@2.11.8) (2022-11-23)
+
+**Note:** Version bump only for package @standardnotes/analytics
+
+## [2.11.7](https://github.com/standardnotes/server/compare/@standardnotes/analytics@2.11.6...@standardnotes/analytics@2.11.7) (2022-11-23)
+
+### Bug Fixes
+
+* binding of sns and sqs with additional config ([74bc791](https://github.com/standardnotes/server/commit/74bc79116bc50d9a5af1a558db1b7108dcda6d0e))
+
+## [2.11.6](https://github.com/standardnotes/server/compare/@standardnotes/analytics@2.11.5...@standardnotes/analytics@2.11.6) (2022-11-22)
+
+**Note:** Version bump only for package @standardnotes/analytics
+
+## [2.11.5](https://github.com/standardnotes/server/compare/@standardnotes/analytics@2.11.4...@standardnotes/analytics@2.11.5) (2022-11-21)
+
+**Note:** Version bump only for package @standardnotes/analytics
+
+## [2.11.4](https://github.com/standardnotes/server/compare/@standardnotes/analytics@2.11.3...@standardnotes/analytics@2.11.4) (2022-11-21)
+
+**Note:** Version bump only for package @standardnotes/analytics
+
+## [2.11.3](https://github.com/standardnotes/server/compare/@standardnotes/analytics@2.11.2...@standardnotes/analytics@2.11.3) (2022-11-18)
+
+**Note:** Version bump only for package @standardnotes/analytics
+
+## [2.11.2](https://github.com/standardnotes/server/compare/@standardnotes/analytics@2.11.1...@standardnotes/analytics@2.11.2) (2022-11-18)
+
+### Bug Fixes
+
+* **analytics:** specs ([507d43b](https://github.com/standardnotes/server/commit/507d43b3289d1e178644df6d3e15d1d55e56c7bb))
+
+## [2.11.1](https://github.com/standardnotes/server/compare/@standardnotes/analytics@2.11.0...@standardnotes/analytics@2.11.1) (2022-11-18)
+
+### Bug Fixes
+
+* mapper interface imports ([1ec0723](https://github.com/standardnotes/server/commit/1ec072373d640c4e2f24b9bb12fec0c678b48032))
+
+# [2.11.0](https://github.com/standardnotes/server/compare/@standardnotes/analytics@2.10.3...@standardnotes/analytics@2.11.0) (2022-11-16)
+
+### Features
+
+* **analytics:** add publishing churn calculation values in the report ([6c43a33](https://github.com/standardnotes/server/commit/6c43a331d09c2dcf1300742509da6a1d8ef2f5b7))
+
+## [2.10.3](https://github.com/standardnotes/server/compare/@standardnotes/analytics@2.10.2...@standardnotes/analytics@2.10.3) (2022-11-16)
+
+### Bug Fixes
+
+* **analytics:** exclude five year plans from mrr stats ([fe1b2a0](https://github.com/standardnotes/server/commit/fe1b2a0e0744417e592f3f61f42610765b416ce6))
+
 ## [2.10.2](https://github.com/standardnotes/server/compare/@standardnotes/analytics@2.10.1...@standardnotes/analytics@2.10.2) (2022-11-14)
 
 ### Bug Fixes

packages/analytics/bin/report.ts

@@ -4,6 +4,7 @@ import 'newrelic'
 
 import { Logger } from 'winston'
 
+import { EmailLevel } from '@standardnotes/domain-core'
 import { DomainEventPublisherInterface } from '@standardnotes/domain-events'
 import { AnalyticsActivity } from '../src/Domain/Analytics/AnalyticsActivity'
 import { Period } from '../src/Domain/Time/Period'
@@ -16,6 +17,8 @@ import TYPES from '../src/Bootstrap/Types'
 import { Env } from '../src/Bootstrap/Env'
 import { DomainEventFactoryInterface } from '../src/Domain/Event/DomainEventFactoryInterface'
 import { CalculateMonthlyRecurringRevenue } from '../src/Domain/UseCase/CalculateMonthlyRecurringRevenue/CalculateMonthlyRecurringRevenue'
+import { getBody, getSubject } from '../src/Domain/Email/DailyAnalyticsReport'
+import { TimerInterface } from '@standardnotes/time'
 
 const requestReport = async (
   analyticsStore: AnalyticsStoreInterface,
@@ -24,6 +27,8 @@ const requestReport = async (
   domainEventPublisher: DomainEventPublisherInterface,
   periodKeyGenerator: PeriodKeyGeneratorInterface,
   calculateMonthlyRecurringRevenue: CalculateMonthlyRecurringRevenue,
+  timer: TimerInterface,
+  adminEmails: string[],
 ): Promise<void> => {
   await calculateMonthlyRecurringRevenue.execute({})
 
@@ -175,6 +180,9 @@ const requestReport = async (
   const churnRates: Array<{
     rate: number
     periodKey: string
+    averageCustomersCount: number
+    existingCustomersChurn: number
+    newCustomersChurn: number
   }> = []
   for (const monthPeriodKey of monthlyPeriodKeys) {
     const monthPeriod = periodKeyGenerator.convertPeriodKeyToPeriod(monthPeriodKey)
@@ -204,21 +212,35 @@ const requestReport = async (
     churnRates.push({
       periodKey: monthPeriodKey,
       rate: averageCustomersCount ? (totalChurn / averageCustomersCount) * 100 : 0,
+      averageCustomersCount,
+      existingCustomersChurn,
+      newCustomersChurn,
     })
   }
 
-  const event = domainEventFactory.createDailyAnalyticsReportGeneratedEvent({
-    activityStatistics: yesterdayActivityStatistics,
-    activityStatisticsOverTime: analyticsOverTime,
-    statisticsOverTime,
-    statisticMeasures,
-    churn: {
-      periodKeys: monthlyPeriodKeys,
-      values: churnRates,
-    },
-  })
-
-  await domainEventPublisher.publish(event)
+  for (const adminEmail of adminEmails) {
+    await domainEventPublisher.publish(
+      domainEventFactory.createEmailRequestedEvent({
+        messageIdentifier: 'VERSION_ADOPTION_REPORT',
+        subject: getSubject(),
+        body: getBody(
+          {
+            activityStatistics: yesterdayActivityStatistics,
+            activityStatisticsOverTime: analyticsOverTime,
+            statisticsOverTime,
+            statisticMeasures,
+            churn: {
+              periodKeys: monthlyPeriodKeys,
+              values: churnRates,
+            },
+          },
+          timer,
+        ),
+        level: EmailLevel.LEVELS.System,
+        userEmail: adminEmail,
+      }),
+    )
+  }
 }
 
 const container = new ContainerConfigLoader()
@@ -235,9 +257,13 @@ void container.load().then((container) => {
   const domainEventFactory: DomainEventFactoryInterface = container.get(TYPES.DomainEventFactory)
   const domainEventPublisher: DomainEventPublisherInterface = container.get(TYPES.DomainEventPublisher)
   const periodKeyGenerator: PeriodKeyGeneratorInterface = container.get(TYPES.PeriodKeyGenerator)
+  const timer: TimerInterface = container.get(TYPES.Timer)
   const calculateMonthlyRecurringRevenue: CalculateMonthlyRecurringRevenue = container.get(
     TYPES.CalculateMonthlyRecurringRevenue,
   )
+  const adminEmails = container.get(TYPES.ADMIN_EMAILS) as string[]
+
+  logger.info(`Sending report to following admins: ${adminEmails}`)
 
   Promise.resolve(
     requestReport(
@@ -247,6 +273,8 @@ void container.load().then((container) => {
       domainEventPublisher,
       periodKeyGenerator,
       calculateMonthlyRecurringRevenue,
+      timer,
+      adminEmails,
     ),
   )
     .then(() => {

packages/analytics/docker/entrypoint.sh

@@ -5,17 +5,17 @@ COMMAND=$1 && shift 1
 
 case "$COMMAND" in
   'start-worker' )
-    echo "Starting Worker..."
+    echo "[Docker] Starting Worker..."
     yarn workspace @standardnotes/analytics worker
     ;;
 
   'report' )
-    echo "Starting Usage Report Generation..."
+    echo "[Docker] Starting Usage Report Generation..."
     yarn workspace @standardnotes/analytics report
     ;;
 
    * )
-    echo "Unknown command"
+    echo "[Docker] Unknown command"
     ;;
 esac
 

packages/analytics/jest.config.js

@@ -7,5 +7,5 @@ module.exports = {
   transform: {
     ...tsjPreset.transform,
   },
-  coveragePathIgnorePatterns: ['/Infra/'],
+  coveragePathIgnorePatterns: ['/Infra/', '/Domain/Email/'],
 }

packages/analytics/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/analytics",
-  "version": "2.10.2",
+  "version": "2.12.25",
   "engines": {
     "node": ">=18.0.0 <19.0.0"
   },
@@ -37,15 +37,14 @@
     "typescript": "^4.8.4"
   },
   "dependencies": {
-    "@newrelic/native-metrics": "^9.0.0",
     "@newrelic/winston-enricher": "^4.0.0",
     "@sentry/node": "^7.19.0",
     "@standardnotes/common": "workspace:*",
-    "@standardnotes/domain-core": "workspace:*",
+    "@standardnotes/domain-core": "workspace:^",
     "@standardnotes/domain-events": "workspace:*",
     "@standardnotes/domain-events-infra": "workspace:*",
     "@standardnotes/time": "workspace:*",
-    "aws-sdk": "^2.1253.0",
+    "aws-sdk": "^2.1260.0",
     "dayjs": "^1.11.6",
     "dotenv": "^16.0.1",
     "inversify": "^6.0.1",

packages/analytics/src/Bootstrap/Container.ts

@@ -7,7 +7,7 @@ import {
   DomainEventMessageHandlerInterface,
   DomainEventSubscriberFactoryInterface,
 } from '@standardnotes/domain-events'
-import { MapInterface } from '@standardnotes/domain-core'
+import { MapperInterface } from '@standardnotes/domain-core'
 
 import { Env } from './Env'
 import TYPES from './Types'
@@ -89,13 +89,24 @@ export class ContainerConfigLoader {
     })
     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('SNS_TOPIC_ARN', true)) {
+      const snsConfig: AWS.SNS.Types.ClientConfiguration = {
+        apiVersion: 'latest',
+        region: env.get('SNS_AWS_REGION', true),
+      }
+      if (env.get('SNS_ENDPOINT', true)) {
+        snsConfig.endpoint = env.get('SNS_ENDPOINT', true)
+      }
+      if (env.get('SNS_DISABLE_SSL', true) === 'true') {
+        snsConfig.sslEnabled = false
+      }
+      if (env.get('SNS_ACCESS_KEY_ID', true) && env.get('SNS_SECRET_ACCESS_KEY', true)) {
+        snsConfig.credentials = {
+          accessKeyId: env.get('SNS_ACCESS_KEY_ID', true),
+          secretAccessKey: env.get('SNS_SECRET_ACCESS_KEY', true),
+        }
+      }
+      container.bind<AWS.SNS>(TYPES.SNS).toConstantValue(new AWS.SNS(snsConfig))
     }
 
     if (env.get('SQS_QUEUE_URL', true)) {
@@ -119,6 +130,7 @@ export class ContainerConfigLoader {
     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.ADMIN_EMAILS).toConstantValue(env.get('ADMIN_EMAILS').split(','))
 
     // Repositories
     container
@@ -172,7 +184,7 @@ export class ContainerConfigLoader {
 
     // Maps
     container
-      .bind<MapInterface<RevenueModification, TypeORMRevenueModification>>(TYPES.RevenueModificationMap)
+      .bind<MapperInterface<RevenueModification, TypeORMRevenueModification>>(TYPES.RevenueModificationMap)
       .to(RevenueModificationMap)
 
     // Services

packages/analytics/src/Bootstrap/Types.ts

@@ -11,6 +11,7 @@ const TYPES = {
   SQS_AWS_REGION: Symbol.for('SQS_AWS_REGION'),
   REDIS_EVENTS_CHANNEL: Symbol.for('REDIS_EVENTS_CHANNEL'),
   NEW_RELIC_ENABLED: Symbol.for('NEW_RELIC_ENABLED'),
+  ADMIN_EMAILS: Symbol.for('ADMIN_EMAILS'),
   // Repositories
   AnalyticsEntityRepository: Symbol.for('AnalyticsEntityRepository'),
   RevenueModificationRepository: Symbol.for('RevenueModificationRepository'),

packages/analytics/src/Domain/Email/DailyAnalyticsReport.ts

@@ -0,0 +1,11 @@
+import { TimerInterface } from '@standardnotes/time'
+
+import { html } from './daily-analytics-report.html'
+
+export function getSubject(): string {
+  return `Daily analytics report ${new Date().toLocaleDateString('en-US')}`
+}
+
+export function getBody(data: unknown, timer: TimerInterface): string {
+  return html(data, timer)
+}

packages/analytics/src/Domain/Email/daily-analytics-report.html.ts

@@ -0,0 +1,966 @@
+/* eslint-disable @typescript-eslint/no-explicit-any */
+import { TimerInterface } from '@standardnotes/time'
+
+import { AnalyticsActivity } from '../Analytics/AnalyticsActivity'
+import { StatisticsMeasure } from '../Statistics/StatisticsMeasure'
+import { Period } from '../Time/Period'
+
+const getChartUrls = (
+  data: any,
+): {
+  subscriptions: string
+  users: string
+  quarterlyPerformance: string
+  churn: string
+  mrr: string
+  mrrMonthly: string
+} => {
+  const subscriptionPurchasingOverTime = data.activityStatisticsOverTime.find(
+    (a: { name: AnalyticsActivity; period: Period }) =>
+      a.name === AnalyticsActivity.SubscriptionPurchased && a.period === Period.Last30Days,
+  )
+  const subscriptionRenewingOverTime = data.activityStatisticsOverTime.find(
+    (a: { name: AnalyticsActivity; period: Period }) =>
+      a.name === AnalyticsActivity.SubscriptionRenewed && a.period === Period.Last30Days,
+  )
+  const subscriptionRefundingOverTime = data.activityStatisticsOverTime.find(
+    (a: { name: AnalyticsActivity; period: Period }) =>
+      a.name === AnalyticsActivity.SubscriptionRefunded && a.period === Period.Last30Days,
+  )
+  const subscriptionCancelledOverTime = data.activityStatisticsOverTime.find(
+    (a: { name: AnalyticsActivity; period: Period }) =>
+      a.name === AnalyticsActivity.SubscriptionCancelled && a.period === Period.Last30Days,
+  )
+  const subscriptionReactivatedOverTime = data.activityStatisticsOverTime.find(
+    (a: { name: AnalyticsActivity; period: Period }) =>
+      a.name === AnalyticsActivity.SubscriptionReactivated && a.period === Period.Last30Days,
+  )
+
+  const subscriptionsLinerOverTimeConfig = {
+    type: 'line',
+    data: {
+      labels: subscriptionPurchasingOverTime?.counts.map((count: { periodKey: any }) => count.periodKey),
+      datasets: [
+        {
+          label: 'Subscription Purchases',
+          backgroundColor: 'rgb(25, 255, 140)',
+          borderColor: 'rgb(25, 255, 140)',
+          data: subscriptionPurchasingOverTime?.counts.map((count: { totalCount: any }) => count.totalCount),
+          fill: false,
+          pointRadius: 2,
+        },
+        {
+          label: 'Subscription Renewals',
+          backgroundColor: 'rgb(54, 162, 235)',
+          borderColor: 'rgb(54, 162, 235)',
+          data: subscriptionRenewingOverTime?.counts.map((count: { totalCount: any }) => count.totalCount),
+          fill: false,
+          pointRadius: 2,
+        },
+        {
+          label: 'Subscription Refunds',
+          backgroundColor: 'rgb(255, 221, 51)',
+          borderColor: 'rgb(255, 221, 51)',
+          data: subscriptionRefundingOverTime?.counts.map((count: { totalCount: any }) => count.totalCount),
+          fill: false,
+          pointRadius: 2,
+        },
+        {
+          label: 'Subscription Cancels',
+          backgroundColor: 'rgb(255, 99, 132)',
+          borderColor: 'rgb(255, 99, 132)',
+          data: subscriptionCancelledOverTime?.counts.map((count: { totalCount: any }) => count.totalCount),
+          fill: false,
+          pointRadius: 2,
+        },
+        {
+          label: 'Subscription Reactivations',
+          backgroundColor: 'rgb(221, 51, 255)',
+          borderColor: 'rgb(221, 51, 255)',
+          data: subscriptionReactivatedOverTime?.counts.map((count: { totalCount: any }) => count.totalCount),
+          fill: false,
+          pointRadius: 2,
+        },
+      ],
+    },
+  }
+
+  const userRegistrationOverTime = data.activityStatisticsOverTime.find(
+    (a: { name: AnalyticsActivity; period: Period }) =>
+      a.name === AnalyticsActivity.Register && a.period === Period.Last30Days,
+  )
+  const userDeletionOverTime = data.activityStatisticsOverTime.find(
+    (a: { name: AnalyticsActivity; period: Period }) =>
+      a.name === AnalyticsActivity.DeleteAccount && a.period === Period.Last30Days,
+  )
+
+  const usersLinerOverTimeConfig = {
+    type: 'line',
+    data: {
+      labels: userRegistrationOverTime?.counts.map((count: { periodKey: any }) => count.periodKey),
+      datasets: [
+        {
+          label: 'User Registrations',
+          backgroundColor: 'rgb(25, 255, 140)',
+          borderColor: 'rgb(25, 255, 140)',
+          data: userRegistrationOverTime?.counts.map((count: { totalCount: any }) => count.totalCount),
+          fill: false,
+          pointRadius: 2,
+        },
+        {
+          label: 'Account Deletions',
+          backgroundColor: 'rgb(255, 99, 132)',
+          borderColor: 'rgb(255, 99, 132)',
+          data: userDeletionOverTime?.counts.map((count: { totalCount: any }) => count.totalCount),
+          fill: false,
+          pointRadius: 2,
+        },
+      ],
+    },
+  }
+
+  const quarters = [Period.Q1ThisYear, Period.Q2ThisYear, Period.Q3ThisYear, Period.Q4ThisYear]
+  const quarterlyUserRegistrations = []
+  const quarterlySubscriptionPurchases = []
+  const quarterlySubscriptionRenewals = []
+  for (const quarter of quarters) {
+    const registrations =
+      data.activityStatisticsOverTime.find(
+        (a: { name: AnalyticsActivity; period: Period }) =>
+          a.name === AnalyticsActivity.Register && a.period === quarter,
+      )?.totalCount ?? 0
+    const purchases =
+      data.activityStatisticsOverTime.find(
+        (a: { name: AnalyticsActivity; period: Period }) =>
+          a.name === AnalyticsActivity.SubscriptionPurchased && a.period === quarter,
+      )?.totalCount ?? 0
+    const renewals =
+      data.activityStatisticsOverTime.find(
+        (a: { name: AnalyticsActivity; period: Period }) =>
+          a.name === AnalyticsActivity.SubscriptionRenewed && a.period === quarter,
+      )?.totalCount ?? 0
+    quarterlyUserRegistrations.push(registrations)
+    quarterlySubscriptionPurchases.push(purchases)
+    quarterlySubscriptionRenewals.push(renewals)
+  }
+
+  const quarterlyConfig = {
+    type: 'bar',
+    data: {
+      labels: ['Q1', 'Q2', 'Q3', 'Q4'],
+      datasets: [
+        {
+          label: 'User Registrations',
+          backgroundColor: 'rgba(255, 99, 132, 0.5)',
+          borderColor: 'rgb(255, 99, 132)',
+          borderWidth: 1,
+          data: quarterlyUserRegistrations,
+        },
+        {
+          label: 'Subscription Purchases',
+          backgroundColor: 'rgba(54, 162, 235, 0.5)',
+          borderColor: 'rgb(54, 162, 235)',
+          borderWidth: 1,
+          data: quarterlySubscriptionPurchases,
+        },
+        {
+          label: 'Subscription Renewals',
+          backgroundColor: 'rgb(25, 255, 140, 0.5)',
+          borderColor: 'rgb(25, 255, 140)',
+          borderWidth: 1,
+          data: quarterlySubscriptionRenewals,
+        },
+      ],
+    },
+    options: {
+      title: {
+        display: true,
+        text: 'Quarterly Performance',
+      },
+      plugins: {
+        datalabels: {
+          anchor: 'center',
+          align: 'center',
+          color: '#666',
+          font: {
+            weight: 'normal',
+          },
+        },
+      },
+    },
+  }
+
+  const monthlyChurnRates = data.churn.values.map((value: { rate: number }) => +value.rate.toFixed(2))
+
+  const churnConfig = {
+    type: 'bar',
+    data: {
+      labels: [
+        'January',
+        'February',
+        'March',
+        'April',
+        'May',
+        'June',
+        'July',
+        'August',
+        'September',
+        'October',
+        'November',
+        'December',
+      ],
+      datasets: [
+        {
+          label: 'Churn Percent',
+          backgroundColor: 'rgba(255, 99, 132, 0.5)',
+          borderColor: 'rgb(255, 99, 132)',
+          borderWidth: 1,
+          data: monthlyChurnRates,
+        },
+      ],
+    },
+    options: {
+      title: {
+        display: true,
+        text: 'Monthly Churn Rate',
+      },
+      plugins: {
+        datalabels: {
+          anchor: 'center',
+          align: 'center',
+          color: '#666',
+          font: {
+            weight: 'normal',
+          },
+        },
+      },
+    },
+  }
+
+  const mrrOverTime = data.statisticsOverTime.find(
+    (a: { name: string; period: number }) => a.name === 'mrr' && a.period === 27,
+  )
+  const monthlyPlansMrrOverTime = data.statisticsOverTime.find(
+    (a: { name: string; period: number }) => a.name === 'monthly-plans-mrr' && a.period === 27,
+  )
+  const annualPlansMrrOverTime = data.statisticsOverTime.find(
+    (a: { name: string; period: number }) => a.name === 'annual-plans-mrr' && a.period === 27,
+  )
+  const fiveYearPlansMrrOverTime = data.statisticsOverTime.find(
+    (a: { name: string; period: number }) => a.name === 'five-year-plans-mrr' && a.period === 27,
+  )
+  const proPlansMrrOverTime = data.statisticsOverTime.find(
+    (a: { name: string; period: number }) => a.name === 'pro-plans-mrr' && a.period === 27,
+  )
+  const plusPlansMrrOverTime = data.statisticsOverTime.find(
+    (a: { name: string; period: number }) => a.name === 'plus-plans-mrr' && a.period === 27,
+  )
+
+  const mrrOverTimeConfig = {
+    type: 'line',
+    data: {
+      labels: mrrOverTime?.counts.map((count: { periodKey: any }) => count.periodKey),
+      datasets: [
+        {
+          label: 'MRR',
+          backgroundColor: 'rgb(25, 255, 140)',
+          borderColor: 'rgb(25, 255, 140)',
+          data: mrrOverTime?.counts.map((count: { totalCount: any }) => count.totalCount),
+          fill: false,
+          pointRadius: 2,
+        },
+        {
+          label: 'MRR - Monthly Plans',
+          backgroundColor: 'rgb(54, 162, 235)',
+          borderColor: 'rgb(54, 162, 235)',
+          data: monthlyPlansMrrOverTime?.counts.map((count: { totalCount: any }) => count.totalCount),
+          fill: false,
+          pointRadius: 2,
+        },
+        {
+          label: 'MRR - Annual Plans',
+          backgroundColor: 'rgb(255, 221, 51)',
+          borderColor: 'rgb(255, 221, 51)',
+          data: annualPlansMrrOverTime?.counts.map((count: { totalCount: any }) => count.totalCount),
+          fill: false,
+          pointRadius: 2,
+        },
+        {
+          label: 'MRR - Five Year Plans',
+          backgroundColor: 'rgb(255, 120, 120)',
+          borderColor: 'rgb(255, 120, 120)',
+          data: fiveYearPlansMrrOverTime?.counts.map((count: { totalCount: any }) => count.totalCount),
+          fill: false,
+          pointRadius: 2,
+        },
+        {
+          label: 'MRR - PRO Plans',
+          backgroundColor: 'rgb(255, 99, 132)',
+          borderColor: 'rgb(255, 99, 132)',
+          data: proPlansMrrOverTime?.counts.map((count: { totalCount: any }) => count.totalCount),
+          fill: false,
+          pointRadius: 2,
+        },
+        {
+          label: 'MRR - PLUS Plans',
+          backgroundColor: 'rgb(221, 51, 255)',
+          borderColor: 'rgb(221, 51, 255)',
+          data: plusPlansMrrOverTime?.counts.map((count: { totalCount: any }) => count.totalCount),
+          fill: false,
+          pointRadius: 2,
+        },
+      ],
+    },
+  }
+
+  const mrrMonthlyOverTime = data.statisticsOverTime
+    .find((a: { name: string; period: Period }) => a.name === 'mrr' && a.period === Period.ThisYear)
+    ?.counts.map((count: { totalCount: number }) => +count.totalCount.toFixed(2))
+
+  const mrrMonthlyConfig = {
+    type: 'bar',
+    data: {
+      labels: [
+        'January',
+        'February',
+        'March',
+        'April',
+        'May',
+        'June',
+        'July',
+        'August',
+        'September',
+        'October',
+        'November',
+        'December',
+      ],
+      datasets: [
+        {
+          label: 'MRR',
+          backgroundColor: 'rgba(25, 255, 140, 0.5)',
+          borderColor: 'rgb(25, 255, 140)',
+          borderWidth: 1,
+          data: mrrMonthlyOverTime,
+        },
+      ],
+    },
+    options: {
+      title: {
+        display: true,
+        text: 'Monthly MRR',
+      },
+      plugins: {
+        datalabels: {
+          anchor: 'center',
+          align: 'center',
+          color: '#666',
+          font: {
+            weight: 'normal',
+          },
+        },
+      },
+    },
+  }
+
+  return {
+    subscriptions: `https://quickchart.io/chart?width=800&c=${encodeURIComponent(
+      JSON.stringify(subscriptionsLinerOverTimeConfig),
+    )}`,
+    users: `https://quickchart.io/chart?width=800&c=${encodeURIComponent(JSON.stringify(usersLinerOverTimeConfig))}`,
+    quarterlyPerformance: `https://quickchart.io/chart?width=800&c=${encodeURIComponent(
+      JSON.stringify(quarterlyConfig),
+    )}`,
+    churn: `https://quickchart.io/chart?width=800&c=${encodeURIComponent(JSON.stringify(churnConfig))}`,
+    mrr: `https://quickchart.io/chart?width=800&c=${encodeURIComponent(JSON.stringify(mrrOverTimeConfig))}`,
+    mrrMonthly: `https://quickchart.io/chart?width=800&c=${encodeURIComponent(JSON.stringify(mrrMonthlyConfig))}`,
+  }
+}
+
+export const html = (data: any, timer: TimerInterface) => {
+  const chartUrls = getChartUrls(data)
+
+  const successfullPaymentsActivity = data.activityStatistics.find(
+    (a: { name: AnalyticsActivity }) => a.name === AnalyticsActivity.PaymentSuccess && Period.Yesterday,
+  )
+  const failedPaymentsActivity = data.activityStatistics.find(
+    (a: { name: AnalyticsActivity }) => a.name === AnalyticsActivity.PaymentFailed && Period.Yesterday,
+  )
+  const limitedDiscountPurchasedActivity = data.activityStatistics.find(
+    (a: { name: AnalyticsActivity }) => a.name === AnalyticsActivity.LimitedDiscountOfferPurchased && Period.Yesterday,
+  )
+  const subscriptionPurchasingOverTime = data.activityStatisticsOverTime.find(
+    (a: { name: AnalyticsActivity; period: Period }) =>
+      a.name === AnalyticsActivity.SubscriptionPurchased && a.period === Period.Last30Days,
+  )
+  const subscriptionRenewingOverTime = data.activityStatisticsOverTime.find(
+    (a: { name: AnalyticsActivity; period: Period }) =>
+      a.name === AnalyticsActivity.SubscriptionRenewed && a.period === Period.Last30Days,
+  )
+  const subscriptionRefundingOverTime = data.activityStatisticsOverTime.find(
+    (a: { name: AnalyticsActivity; period: Period }) =>
+      a.name === AnalyticsActivity.SubscriptionRefunded && a.period === Period.Last30Days,
+  )
+  const subscriptionCancelledOverTime = data.activityStatisticsOverTime.find(
+    (a: { name: AnalyticsActivity; period: Period }) =>
+      a.name === AnalyticsActivity.SubscriptionCancelled && a.period === Period.Last30Days,
+  )
+  const subscriptionReactivatedOverTime = data.activityStatisticsOverTime.find(
+    (a: { name: AnalyticsActivity; period: Period }) =>
+      a.name === AnalyticsActivity.SubscriptionReactivated && a.period === Period.Last30Days,
+  )
+  const userRegistrationOverTime = data.activityStatisticsOverTime.find(
+    (a: { name: AnalyticsActivity; period: Period }) =>
+      a.name === AnalyticsActivity.Register && a.period === Period.Last30Days,
+  )
+  const userDeletionOverTime = data.activityStatisticsOverTime.find(
+    (a: { name: AnalyticsActivity; period: Period }) =>
+      a.name === AnalyticsActivity.DeleteAccount && a.period === Period.Last30Days,
+  )
+  const incomeMeasureYesterday = data.statisticMeasures.find(
+    (a: { name: StatisticsMeasure; period: Period }) =>
+      a.name === StatisticsMeasure.Income && a.period === Period.Yesterday,
+  )
+  const refundMeasureYesterday = data.statisticMeasures.find(
+    (a: { name: StatisticsMeasure; period: Period }) =>
+      a.name === StatisticsMeasure.Refunds && a.period === Period.Yesterday,
+  )
+  const incomeYesterday = incomeMeasureYesterday?.totalValue ?? 0
+  const refundsYesterday = refundMeasureYesterday?.totalValue ?? 0
+  const revenueYesterday = incomeYesterday - refundsYesterday
+
+  const subscriptionLengthMeasureYesterday = data.statisticMeasures.find(
+    (a: { name: StatisticsMeasure; period: Period }) =>
+      a.name === StatisticsMeasure.SubscriptionLength && a.period === Period.Yesterday,
+  )
+  const subscriptionLengthDurationYesterday = timer.convertMicrosecondsToTimeStructure(
+    Math.floor(subscriptionLengthMeasureYesterday?.average ?? 0),
+  )
+
+  const subscriptionRemainingTimePercentageMeasureYesterday = data.statisticMeasures.find(
+    (a: { name: StatisticsMeasure; period: Period }) =>
+      a.name === StatisticsMeasure.RemainingSubscriptionTimePercentage && a.period === Period.Yesterday,
+  )
+  const subscriptionRemainingTimePercentageYesterday = Math.floor(
+    subscriptionRemainingTimePercentageMeasureYesterday?.average ?? 0,
+  )
+
+  const registrationLengthMeasureYesterday = data.statisticMeasures.find(
+    (a: { name: StatisticsMeasure; period: Period }) =>
+      a.name === StatisticsMeasure.RegistrationLength && a.period === Period.Yesterday,
+  )
+  const registrationLengthDurationYesterday = timer.convertMicrosecondsToTimeStructure(
+    Math.floor(registrationLengthMeasureYesterday?.average ?? 0),
+  )
+
+  const registrationToSubscriptionMeasureYesterday = data.statisticMeasures.find(
+    (a: { name: StatisticsMeasure; period: Period }) =>
+      a.name === StatisticsMeasure.RegistrationToSubscriptionTime && a.period === Period.Yesterday,
+  )
+  const registrationToSubscriptionDurationYesterday = timer.convertMicrosecondsToTimeStructure(
+    Math.floor(registrationToSubscriptionMeasureYesterday?.average ?? 0),
+  )
+
+  const incomeMeasureThisMonth = data.statisticMeasures.find(
+    (a: { name: StatisticsMeasure; period: Period }) =>
+      a.name === StatisticsMeasure.Income && a.period === Period.ThisMonth,
+  )
+  const refundMeasureThisMonth = data.statisticMeasures.find(
+    (a: { name: StatisticsMeasure; period: Period }) =>
+      a.name === StatisticsMeasure.Refunds && a.period === Period.ThisMonth,
+  )
+  const incomeThisMonth = incomeMeasureThisMonth?.totalValue ?? 0
+  const refundsThisMonth = refundMeasureThisMonth?.totalValue ?? 0
+  const revenueThisMonth = incomeThisMonth - refundsThisMonth
+
+  const subscriptionLengthMeasureThisMonth = data.statisticMeasures.find(
+    (a: { name: StatisticsMeasure; period: Period }) =>
+      a.name === StatisticsMeasure.SubscriptionLength && a.period === Period.ThisMonth,
+  )
+  const subscriptionLengthDurationThisMonth = timer.convertMicrosecondsToTimeStructure(
+    Math.floor(subscriptionLengthMeasureThisMonth?.average ?? 0),
+  )
+
+  const subscriptionRemainingTimePercentageMeasureThisMonth = data.statisticMeasures.find(
+    (a: { name: StatisticsMeasure; period: Period }) =>
+      a.name === StatisticsMeasure.RemainingSubscriptionTimePercentage && a.period === Period.ThisMonth,
+  )
+  const subscriptionRemainingTimePercentageThisMonth = Math.floor(
+    subscriptionRemainingTimePercentageMeasureThisMonth?.average ?? 0,
+  )
+
+  const registrationLengthMeasureThisMonth = data.statisticMeasures.find(
+    (a: { name: StatisticsMeasure; period: Period }) =>
+      a.name === StatisticsMeasure.RegistrationLength && a.period === Period.ThisMonth,
+  )
+  const registrationLengthDurationThisMonth = timer.convertMicrosecondsToTimeStructure(
+    Math.floor(registrationLengthMeasureThisMonth?.average ?? 0),
+  )
+
+  const registrationToSubscriptionMeasureThisMonth = data.statisticMeasures.find(
+    (a: { name: StatisticsMeasure; period: Period }) =>
+      a.name === StatisticsMeasure.RegistrationToSubscriptionTime && a.period === Period.ThisMonth,
+  )
+  const registrationToSubscriptionDurationThisMonth = timer.convertMicrosecondsToTimeStructure(
+    Math.floor(registrationToSubscriptionMeasureThisMonth?.average ?? 0),
+  )
+
+  const plusSubscriptionsInitialAnnualPaymentsYesterday = data.statisticMeasures.find(
+    (a: { name: StatisticsMeasure; period: Period }) =>
+      a.name === StatisticsMeasure.PlusSubscriptionInitialAnnualPaymentsIncome && a.period === Period.Yesterday,
+  )
+  const plusSubscriptionsInitialMonthlyPaymentsYesterday = data.statisticMeasures.find(
+    (a: { name: StatisticsMeasure; period: Period }) =>
+      a.name === StatisticsMeasure.PlusSubscriptionInitialMonthlyPaymentsIncome && a.period === Period.Yesterday,
+  )
+  const plusSubscriptionsRenewingAnnualPaymentsYesterday = data.statisticMeasures.find(
+    (a: { name: StatisticsMeasure; period: Period }) =>
+      a.name === StatisticsMeasure.PlusSubscriptionRenewingAnnualPaymentsIncome && a.period === Period.Yesterday,
+  )
+  const plusSubscriptionsRenewingMonthlyPaymentsYesterday = data.statisticMeasures.find(
+    (a: { name: StatisticsMeasure; period: Period }) =>
+      a.name === StatisticsMeasure.PlusSubscriptionRenewingMonthlyPaymentsIncome && a.period === Period.Yesterday,
+  )
+  const proSubscriptionsInitialAnnualPaymentsYesterday = data.statisticMeasures.find(
+    (a: { name: StatisticsMeasure; period: Period }) =>
+      a.name === StatisticsMeasure.ProSubscriptionInitialAnnualPaymentsIncome && a.period === Period.Yesterday,
+  )
+  const proSubscriptionsInitialMonthlyPaymentsYesterday = data.statisticMeasures.find(
+    (a: { name: StatisticsMeasure; period: Period }) =>
+      a.name === StatisticsMeasure.ProSubscriptionInitialMonthlyPaymentsIncome && a.period === Period.Yesterday,
+  )
+  const proSubscriptionsRenewingAnnualPaymentsYesterday = data.statisticMeasures.find(
+    (a: { name: StatisticsMeasure; period: Period }) =>
+      a.name === StatisticsMeasure.ProSubscriptionRenewingAnnualPaymentsIncome && a.period === Period.Yesterday,
+  )
+  const proSubscriptionsRenewingMonthlyPaymentsYesterday = data.statisticMeasures.find(
+    (a: { name: StatisticsMeasure; period: Period }) =>
+      a.name === StatisticsMeasure.ProSubscriptionRenewingMonthlyPaymentsIncome && a.period === Period.Yesterday,
+  )
+  const plusSubscriptionsInitialAnnualPaymentsThisMonth = data.statisticMeasures.find(
+    (a: { name: StatisticsMeasure; period: Period }) =>
+      a.name === StatisticsMeasure.PlusSubscriptionInitialAnnualPaymentsIncome && a.period === Period.ThisMonth,
+  )
+  const plusSubscriptionsInitialMonthlyPaymentsThisMonth = data.statisticMeasures.find(
+    (a: { name: StatisticsMeasure; period: Period }) =>
+      a.name === StatisticsMeasure.PlusSubscriptionInitialMonthlyPaymentsIncome && a.period === Period.ThisMonth,
+  )
+  const plusSubscriptionsRenewingAnnualPaymentsThisMonth = data.statisticMeasures.find(
+    (a: { name: StatisticsMeasure; period: Period }) =>
+      a.name === StatisticsMeasure.PlusSubscriptionRenewingAnnualPaymentsIncome && a.period === Period.ThisMonth,
+  )
+  const plusSubscriptionsRenewingMonthlyPaymentsThisMonth = data.statisticMeasures.find(
+    (a: { name: StatisticsMeasure; period: Period }) =>
+      a.name === StatisticsMeasure.PlusSubscriptionRenewingMonthlyPaymentsIncome && a.period === Period.ThisMonth,
+  )
+  const proSubscriptionsInitialAnnualPaymentsThisMonth = data.statisticMeasures.find(
+    (a: { name: StatisticsMeasure; period: Period }) =>
+      a.name === StatisticsMeasure.ProSubscriptionInitialAnnualPaymentsIncome && a.period === Period.ThisMonth,
+  )
+  const proSubscriptionsInitialMonthlyPaymentsThisMonth = data.statisticMeasures.find(
+    (a: { name: StatisticsMeasure; period: Period }) =>
+      a.name === StatisticsMeasure.ProSubscriptionInitialMonthlyPaymentsIncome && a.period === Period.ThisMonth,
+  )
+  const proSubscriptionsRenewingAnnualPaymentsThisMonth = data.statisticMeasures.find(
+    (a: { name: StatisticsMeasure; period: Period }) =>
+      a.name === StatisticsMeasure.ProSubscriptionRenewingAnnualPaymentsIncome && a.period === Period.ThisMonth,
+  )
+  const proSubscriptionsRenewingMonthlyPaymentsThisMonth = data.statisticMeasures.find(
+    (a: { name: StatisticsMeasure; period: Period }) =>
+      a.name === StatisticsMeasure.ProSubscriptionRenewingMonthlyPaymentsIncome && a.period === Period.ThisMonth,
+  )
+
+  const mrrOverTime = data.statisticsOverTime.find(
+    (a: { name: string; period: number }) => a.name === 'mrr' && a.period === 27,
+  )
+  const monthlyPlansMrrOverTime = data.statisticsOverTime.find(
+    (a: { name: string; period: number }) => a.name === 'monthly-plans-mrr' && a.period === 27,
+  )
+  const annualPlansMrrOverTime = data.statisticsOverTime.find(
+    (a: { name: string; period: number }) => a.name === 'annual-plans-mrr' && a.period === 27,
+  )
+  const fiveYearPlansMrrOverTime = data.statisticsOverTime.find(
+    (a: { name: string; period: number }) => a.name === 'five-year-plans-mrr' && a.period === 27,
+  )
+  const proPlansMrrOverTime = data.statisticsOverTime.find(
+    (a: { name: string; period: number }) => a.name === 'pro-plans-mrr' && a.period === 27,
+  )
+  const plusPlansMrrOverTime = data.statisticsOverTime.find(
+    (a: { name: string; period: number }) => a.name === 'plus-plans-mrr' && a.period === 27,
+  )
+
+  const today = new Date()
+  const thisMonthPeriodKey = `${today.getFullYear().toString()}-${(today.getMonth() + 1).toString()}`
+  const thisMonthChurn = data.churn.values.find(
+    (value: { periodKey: string }) => value.periodKey === thisMonthPeriodKey,
+  )
+
+  return `      <div>
+<p>Hello,</p>
+<p>
+  <strong>Here are some statistics from yesterday:</strong>
+</p>
+<ul>
+  <li>
+    <b>Payments</b>
+    <ul>
+      <li>
+        Revenue: <b>$${revenueYesterday.toLocaleString('en-US')}</b> (Income: $
+        ${incomeYesterday.toLocaleString('en-US')}, Refunds: $${refundsYesterday.toLocaleString('en-US')})
+      </li>
+      <li>
+        Successfull payments: <b>${successfullPaymentsActivity?.totalCount.toLocaleString('en-US')}</b>
+      </li>
+      <li>
+        Failed payments: <b>${failedPaymentsActivity?.totalCount.toLocaleString('en-US')}</b>
+      </li>
+    </ul>
+  </li>
+  <li>
+    <b>MRR Breakdown</b>
+    <ul>
+      <li>
+        <b>Total:</b> $${mrrOverTime?.counts[mrrOverTime?.counts.length - 1].totalCount.toLocaleString('en-US')}
+      </li>
+      <li>
+        <b>By Subscription Type:</b>
+        <ul>
+          <li>
+            <b>PLUS:</b> $
+            ${plusPlansMrrOverTime?.counts[plusPlansMrrOverTime?.counts.length - 1].totalCount.toLocaleString('en-US')}
+          </li>
+          <li>
+            <b>PRO:</b> $
+            ${proPlansMrrOverTime?.counts[proPlansMrrOverTime?.counts.length - 1].totalCount.toLocaleString('en-US')}
+          </li>
+        </ul>
+      </li>
+      <li>
+        <b>By Billing Frequency:</b>
+        <ul>
+          <li>
+            <b>Monthly:</b> $
+            ${monthlyPlansMrrOverTime?.counts[monthlyPlansMrrOverTime?.counts.length - 1].totalCount.toLocaleString(
+              'en-US',
+            )}
+          </li>
+          <li>
+            <b>Annual:</b> $
+            ${annualPlansMrrOverTime?.counts[annualPlansMrrOverTime?.counts.length - 1].totalCount.toLocaleString(
+              'en-US',
+            )}
+          </li>
+          <li>
+            <b>5-year:</b> $
+            ${fiveYearPlansMrrOverTime?.counts[fiveYearPlansMrrOverTime?.counts.length - 1].totalCount.toLocaleString(
+              'en-US',
+            )}
+          </li>
+        </ul>
+      </li>
+    </ul>
+  </li>
+  <li>
+    <b>Income Breakdown</b>
+    <ul>
+      <li>
+        <b>Plus Subscription:</b>
+        <ul>
+          <li>
+            <b>${plusSubscriptionsInitialMonthlyPaymentsYesterday?.increments.toLocaleString('en-US')}</b>${' '}
+            <i>initial</i> payments on <u>monhtly</u> plan, totaling${' '}
+            <b>$${plusSubscriptionsInitialMonthlyPaymentsYesterday?.totalValue.toLocaleString('en-US')}</b>
+          </li>
+          <li>
+            <b>${plusSubscriptionsInitialAnnualPaymentsYesterday?.increments.toLocaleString('en-US')}</b>${' '}
+            <i>initial</i> payments on <u>annual</u> plan, totaling${' '}
+            <b>$${plusSubscriptionsInitialAnnualPaymentsYesterday?.totalValue.toLocaleString('en-US')}</b>
+          </li>
+          <li>
+            <b>${plusSubscriptionsRenewingMonthlyPaymentsYesterday?.increments.toLocaleString('en-US')}</b>${' '}
+            <i>renewing</i> payments on <u>monthly</u> plan, totaling${' '}
+            <b>$${plusSubscriptionsRenewingMonthlyPaymentsYesterday?.totalValue.toLocaleString('en-US')}</b>
+          </li>
+          <li>
+            <b>${plusSubscriptionsRenewingAnnualPaymentsYesterday?.increments.toLocaleString('en-US')}</b>${' '}
+            <i>renewing</i> payments on <u>annual</u> plan, totaling${' '}
+            <b>$${plusSubscriptionsRenewingAnnualPaymentsYesterday?.totalValue.toLocaleString('en-US')}</b>
+          </li>
+        </ul>
+      </li>
+      <li>
+        <b>Pro Subscription:</b>
+        <ul>
+          <li>
+            <b>${proSubscriptionsInitialMonthlyPaymentsYesterday?.increments.toLocaleString('en-US')}</b>${' '}
+            <i>initial</i> payments on <u>monhtly</u> plan, totaling${' '}
+            <b>$${proSubscriptionsInitialMonthlyPaymentsYesterday?.totalValue.toLocaleString('en-US')}</b>
+          </li>
+          <li>
+            <b>${proSubscriptionsInitialAnnualPaymentsYesterday?.increments.toLocaleString('en-US')}</b>${' '}
+            <i>initial</i> payments on <u>annual</u> plan, totaling${' '}
+            <b>$${proSubscriptionsInitialAnnualPaymentsYesterday?.totalValue.toLocaleString('en-US')}</b>
+          </li>
+          <li>
+            <b>${proSubscriptionsRenewingMonthlyPaymentsYesterday?.increments.toLocaleString('en-US')}</b>${' '}
+            <i>renewing</i> payments on <u>monthly</u> plan, totaling${' '}
+            <b>$${proSubscriptionsRenewingMonthlyPaymentsYesterday?.totalValue.toLocaleString('en-US')}</b>
+          </li>
+          <li>
+            <b>${proSubscriptionsRenewingAnnualPaymentsYesterday?.increments.toLocaleString('en-US')}</b>${' '}
+            <i>renewing</i> payments on <u>annual</u> plan, totaling${' '}
+            <b>$${proSubscriptionsRenewingAnnualPaymentsYesterday?.totalValue.toLocaleString('en-US')}</b>
+          </li>
+        </ul>
+      </li>
+    </ul>
+  </li>
+  <li>
+    <b>Users</b>
+    <ul>
+      <li>
+        Number of users registered:${' '}
+        <b>
+          ${userRegistrationOverTime?.counts[userRegistrationOverTime?.counts.length - 1]?.totalCount.toLocaleString(
+            'en-US',
+          )}
+        </b>
+      </li>
+      <li>
+        Number of users unregistered:${' '}
+        <b>
+          ${userDeletionOverTime?.counts[userDeletionOverTime?.counts.length - 1]?.totalCount.toLocaleString('en-US')}
+        </b>${' '}
+        (average account duration: ${registrationLengthDurationYesterday.days} days${' '}
+        ${registrationLengthDurationYesterday.hours} hours ${registrationLengthDurationYesterday.minutes} minutes)
+      </li>
+    </ul>
+  </li>
+  <li>
+    <b>Subscriptions</b>
+    <ul>
+      <li>
+        Number of subscriptions purchased:${' '}
+        <b>
+          ${subscriptionPurchasingOverTime?.counts[
+            subscriptionPurchasingOverTime?.counts.length - 1
+          ]?.totalCount.toLocaleString('en-US')}
+        </b>${' '}
+        (includes <b>${limitedDiscountPurchasedActivity?.totalCount.toLocaleString('en-US')}</b> limited time
+        offer purchases)
+      </li>
+      <li>
+        Number of subscriptions renewed:${' '}
+        <b>
+          ${subscriptionRenewingOverTime?.counts[
+            subscriptionRenewingOverTime?.counts.length - 1
+          ]?.totalCount.toLocaleString('en-US')}
+        </b>
+      </li>
+      <li>
+        Number of subscriptions refunded:${' '}
+        <b>
+          ${subscriptionRefundingOverTime?.counts[
+            subscriptionRefundingOverTime?.counts.length - 1
+          ]?.totalCount.toLocaleString('en-US')}
+        </b>
+      </li>
+      <li>
+        Number of subscriptions cancelled:${' '}
+        <b>
+          ${subscriptionCancelledOverTime?.counts[
+            subscriptionCancelledOverTime?.counts.length - 1
+          ]?.totalCount.toLocaleString('en-US')}
+        </b>${' '}
+        (average subscription duration: ${subscriptionLengthDurationYesterday.days} days${' '}
+        ${subscriptionLengthDurationYesterday.hours} hours ${subscriptionLengthDurationYesterday.minutes} minutes,
+        average remaining subscription percentage: ${subscriptionRemainingTimePercentageYesterday}%)
+      </li>
+      <li>
+        Number of subscriptions reactivated:${' '}
+        <b>
+          ${subscriptionReactivatedOverTime?.counts[
+            subscriptionReactivatedOverTime?.counts.length - 1
+          ]?.totalCount.toLocaleString('en-US')}
+        </b>
+      </li>
+      <li>
+        Average time from registration to subscription purchase:${' '}
+        <b>
+          ${registrationToSubscriptionDurationYesterday.days} days${' '}
+          ${registrationToSubscriptionDurationYesterday.hours} hours${' '}
+          ${registrationToSubscriptionDurationYesterday.minutes} minutes
+        </b>
+      </li>
+    </ul>
+  </li>
+</ul>
+<p>
+  <strong>Here are some statistics from last 30 days:</strong>
+</p>
+<ul>
+  <li>
+    <b>Payments (This Month)</b>
+    <ul>
+      <li>
+        Revenue: <b>$${revenueThisMonth.toLocaleString('en-US')}</b>
+      </li>
+      <li>
+        Income: <b>$${incomeThisMonth.toLocaleString('en-US')}</b>
+      </li>
+      <li>
+        Refunds: <b>$${refundsThisMonth.toLocaleString('en-US')}</b>
+      </li>
+    </ul>
+  </li>
+  <li>
+    <b>Income Breakdown (This Month)</b>
+    <ul>
+      <li>
+        <b>Plus Subscription:</b>
+        <ul>
+          <li>
+            <b>${plusSubscriptionsInitialMonthlyPaymentsThisMonth?.increments.toLocaleString('en-US')}</b>${' '}
+            <i>initial</i> payments on <u>monhtly</u> plan, totaling${' '}
+            <b>$${plusSubscriptionsInitialMonthlyPaymentsThisMonth?.totalValue.toLocaleString('en-US')}</b>
+          </li>
+          <li>
+            <b>${plusSubscriptionsInitialAnnualPaymentsThisMonth?.increments.toLocaleString('en-US')}</b>${' '}
+            <i>initial</i> payments on <u>annual</u> plan, totaling${' '}
+            <b>$${plusSubscriptionsInitialAnnualPaymentsThisMonth?.totalValue.toLocaleString('en-US')}</b>
+          </li>
+          <li>
+            <b>${plusSubscriptionsRenewingMonthlyPaymentsThisMonth?.increments.toLocaleString('en-US')}</b>${' '}
+            <i>renewing</i> payments on <u>monthly</u> plan, totaling${' '}
+            <b>$${plusSubscriptionsRenewingMonthlyPaymentsThisMonth?.totalValue.toLocaleString('en-US')}</b>
+          </li>
+          <li>
+            <b>${plusSubscriptionsRenewingAnnualPaymentsThisMonth?.increments.toLocaleString('en-US')}</b>${' '}
+            <i>renewing</i> payments on <u>annual</u> plan, totaling${' '}
+            <b>$${plusSubscriptionsRenewingAnnualPaymentsThisMonth?.totalValue.toLocaleString('en-US')}</b>
+          </li>
+        </ul>
+      </li>
+      <li>
+        <b>Pro Subscription:</b>
+        <ul>
+          <li>
+            <b>${proSubscriptionsInitialMonthlyPaymentsThisMonth?.increments.toLocaleString('en-US')}</b>${' '}
+            <i>initial</i> payments on <u>monhtly</u> plan, totaling${' '}
+            <b>$${proSubscriptionsInitialMonthlyPaymentsThisMonth?.totalValue.toLocaleString('en-US')}</b>
+          </li>
+          <li>
+            <b>${proSubscriptionsInitialAnnualPaymentsThisMonth?.increments.toLocaleString('en-US')}</b>${' '}
+            <i>initial</i> payments on <u>annual</u> plan, totaling${' '}
+            <b>$${proSubscriptionsInitialAnnualPaymentsThisMonth?.totalValue.toLocaleString('en-US')}</b>
+          </li>
+          <li>
+            <b>${proSubscriptionsRenewingMonthlyPaymentsThisMonth?.increments.toLocaleString('en-US')}</b>${' '}
+            <i>renewing</i> payments on <u>monthly</u> plan, totaling${' '}
+            <b>$${proSubscriptionsRenewingMonthlyPaymentsThisMonth?.totalValue.toLocaleString('en-US')}</b>
+          </li>
+          <li>
+            <b>${proSubscriptionsRenewingAnnualPaymentsThisMonth?.increments.toLocaleString('en-US')}</b>${' '}
+            <i>renewing</i> payments on <u>annual</u> plan, totaling${' '}
+            <b>$${proSubscriptionsRenewingAnnualPaymentsThisMonth?.totalValue.toLocaleString('en-US')}</b>
+          </li>
+        </ul>
+      </li>
+    </ul>
+  </li>
+  <li>
+    <b>Users</b>
+    <ul>
+      <li>
+        Number of users registered: <b>${userRegistrationOverTime?.totalCount.toLocaleString('en-US')}</b>
+      </li>
+      <li>
+        Number of users unregistered: <b>${userDeletionOverTime?.totalCount.toLocaleString('en-US')}</b>
+      </li>
+      <li>
+        Average account duration this month:${' '}
+        <b>
+          ${registrationLengthDurationThisMonth.days} days ${registrationLengthDurationThisMonth.hours} hours${' '}
+          ${registrationLengthDurationThisMonth.minutes} minutes
+        </b>
+      </li>
+    </ul>
+  </li>
+  <li>
+    <b>Subscriptions</b>
+    <ul>
+      <li>
+        Number of subscriptions purchased:${' '}
+        <b>${subscriptionPurchasingOverTime?.totalCount.toLocaleString('en-US')}</b>
+      </li>
+      <li>
+        Number of subscriptions renewed:${' '}
+        <b>${subscriptionRenewingOverTime?.totalCount.toLocaleString('en-US')}</b>
+      </li>
+      <li>
+        Number of subscriptions refunded:${' '}
+        <b>${subscriptionRefundingOverTime?.totalCount.toLocaleString('en-US')}</b>
+      </li>
+      <li>
+        Number of subscriptions cancelled:${' '}
+        <b>${subscriptionCancelledOverTime?.totalCount.toLocaleString('en-US')}</b>
+      </li>
+      <li>
+        Number of subscriptions reactivated:${' '}
+        <b>${subscriptionReactivatedOverTime?.totalCount.toLocaleString('en-US')}</b>
+      </li>
+      <li>
+        Average subscription duration this month:${' '}
+        <b>
+          ${subscriptionLengthDurationThisMonth.days} days ${subscriptionLengthDurationThisMonth.hours} hours${' '}
+          ${subscriptionLengthDurationThisMonth.minutes} minutes
+        </b>
+      </li>
+      <li>
+        Average subscription remaining percentage this month:${' '}
+        <b>${subscriptionRemainingTimePercentageThisMonth}%</b>
+      </li>
+      <li>
+        Average time from registration to subscription purchase this month:${' '}
+        <b>
+          ${registrationToSubscriptionDurationThisMonth.days} days${' '}
+          ${registrationToSubscriptionDurationThisMonth.hours} hours${' '}
+          ${registrationToSubscriptionDurationThisMonth.minutes} minutes
+        </b>
+      </li>
+    </ul>
+  </li>
+</ul>
+<p>
+  <strong>Here is the MRR chart over 30 days:</strong>
+</p>
+<img src=${chartUrls.mrr}></img>
+<p>
+  <strong>Here is the MRR Monthly chart this year:</strong>
+</p>
+<img src=${chartUrls.mrrMonthly}></img>
+<p>
+  <strong>Here is the subscription chart over 30 days:</strong>
+</p>
+<img src=${chartUrls.subscriptions}></img>
+<p>
+  <strong>Here is the users chart over 30 days:</strong>
+</p>
+<img src=${chartUrls.users}></img>
+<p>
+  <strong>Here is the monthly churn rate percentage:</strong>
+</p>
+<p>✅ GREAT! Up to 7% 🔶 OKAY: 8-10% 🩸 BAD: 11 -15 % 🚨 TERRIBLE! 16-20%</p>
+<p>Churn is calculated by the following formula:</p>
+<p>
+  ( Existing Customers Churn [${thisMonthChurn?.existingCustomersChurn}] + New Customers Churn [
+  ${thisMonthChurn?.newCustomersChurn}] ) * 100 / Average Customers Count This Month [
+  ${thisMonthChurn?.averageCustomersCount}]
+</p>
+<img src=${chartUrls.churn}></img>
+<p>
+  <strong>Here is quarterly performance chart:</strong>
+</p>
+<img src=${chartUrls.quarterlyPerformance}></img>
+<p>Thanks,SN</p>
+</div>`
+}

packages/analytics/src/Domain/Entity/AnalyticsEntity.ts

@@ -18,5 +18,5 @@ export class AnalyticsEntity {
     nullable: true,
   })
   @Index('email')
-  declare userEmail: string
+  declare username: string
 }

packages/analytics/src/Domain/Event/DomainEventFactory.spec.ts

@@ -1,140 +0,0 @@
-import 'reflect-metadata'
-
-import { TimerInterface } from '@standardnotes/time'
-
-import { AnalyticsActivity } from '../Analytics/AnalyticsActivity'
-import { StatisticsMeasure } from '../Statistics/StatisticsMeasure'
-import { Period } from '../Time/Period'
-
-import { DomainEventFactory } from './DomainEventFactory'
-
-describe('DomainEventFactory', () => {
-  let timer: TimerInterface
-
-  const createFactory = () => new DomainEventFactory(timer)
-
-  beforeEach(() => {
-    timer = {} as jest.Mocked<TimerInterface>
-    timer.getTimestampInMicroseconds = jest.fn().mockReturnValue(1)
-    timer.getUTCDate = jest.fn().mockReturnValue(new Date(1))
-  })
-
-  it('should create a DAILY_ANALYTICS_REPORT_GENERATED event', () => {
-    expect(
-      createFactory().createDailyAnalyticsReportGeneratedEvent({
-        activityStatistics: [
-          {
-            name: AnalyticsActivity.Register,
-            retention: 24,
-            totalCount: 45,
-          },
-        ],
-        statisticMeasures: [
-          {
-            name: StatisticsMeasure.Income,
-            totalValue: 43,
-            average: 23,
-            increments: 5,
-            period: Period.Today,
-          },
-        ],
-        activityStatisticsOverTime: [
-          {
-            name: AnalyticsActivity.Register,
-            period: Period.Last30Days,
-            counts: [
-              {
-                periodKey: '2022-10-9',
-                totalCount: 3,
-              },
-            ],
-            totalCount: 123,
-          },
-        ],
-        statisticsOverTime: [
-          {
-            name: StatisticsMeasure.MRR,
-            period: Period.Last30Days,
-            counts: [
-              {
-                periodKey: '2022-10-9',
-                totalCount: 3,
-              },
-            ],
-          },
-        ],
-        churn: {
-          periodKeys: ['2022-10-9'],
-          values: [
-            {
-              rate: 12,
-              periodKey: '2022-10-9',
-            },
-          ],
-        },
-      }),
-    ).toEqual({
-      createdAt: expect.any(Date),
-      meta: {
-        correlation: {
-          userIdentifier: '',
-          userIdentifierType: 'uuid',
-        },
-        origin: 'analytics',
-      },
-      payload: {
-        activityStatistics: [
-          {
-            name: 'register',
-            retention: 24,
-            totalCount: 45,
-          },
-        ],
-        activityStatisticsOverTime: [
-          {
-            counts: [
-              {
-                periodKey: '2022-10-9',
-                totalCount: 3,
-              },
-            ],
-            name: 'register',
-            period: 9,
-            totalCount: 123,
-          },
-        ],
-        statisticsOverTime: [
-          {
-            counts: [
-              {
-                periodKey: '2022-10-9',
-                totalCount: 3,
-              },
-            ],
-            name: 'mrr',
-            period: 9,
-          },
-        ],
-        churn: {
-          periodKeys: ['2022-10-9'],
-          values: [
-            {
-              periodKey: '2022-10-9',
-              rate: 12,
-            },
-          ],
-        },
-        statisticMeasures: [
-          {
-            average: 23,
-            increments: 5,
-            name: 'income',
-            period: 0,
-            totalValue: 43,
-          },
-        ],
-      },
-      type: 'DAILY_ANALYTICS_REPORT_GENERATED',
-    })
-  })
-})

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

@@ -1,4 +1,6 @@
-import { DomainEventService, DailyAnalyticsReportGeneratedEvent } from '@standardnotes/domain-events'
+/* istanbul ignore file */
+
+import { DomainEventService, EmailRequestedEvent } from '@standardnotes/domain-events'
 import { TimerInterface } from '@standardnotes/time'
 import { inject, injectable } from 'inversify'
 import TYPES from '../../Bootstrap/Types'
@@ -7,52 +9,20 @@ import { DomainEventFactoryInterface } from './DomainEventFactoryInterface'
 @injectable()
 export class DomainEventFactory implements DomainEventFactoryInterface {
   constructor(@inject(TYPES.Timer) private timer: TimerInterface) {}
-
-  createDailyAnalyticsReportGeneratedEvent(dto: {
-    activityStatistics: Array<{
-      name: string
-      retention: number
-      totalCount: number
-    }>
-    statisticMeasures: Array<{
-      name: string
-      totalValue: number
-      average: number
-      increments: number
-      period: number
-    }>
-    activityStatisticsOverTime: Array<{
-      name: string
-      period: number
-      counts: Array<{
-        periodKey: string
-        totalCount: number
-      }>
-      totalCount: number
-    }>
-    statisticsOverTime: Array<{
-      name: string
-      period: number
-      counts: Array<{
-        periodKey: string
-        totalCount: number
-      }>
-    }>
-    churn: {
-      periodKeys: Array<string>
-      values: Array<{
-        rate: number
-        periodKey: string
-      }>
-    }
-  }): DailyAnalyticsReportGeneratedEvent {
+  createEmailRequestedEvent(dto: {
+    userEmail: string
+    messageIdentifier: string
+    level: string
+    body: string
+    subject: string
+  }): EmailRequestedEvent {
     return {
-      type: 'DAILY_ANALYTICS_REPORT_GENERATED',
+      type: 'EMAIL_REQUESTED',
       createdAt: this.timer.getUTCDate(),
       meta: {
         correlation: {
-          userIdentifier: '',
-          userIdentifierType: 'uuid',
+          userIdentifier: dto.userEmail,
+          userIdentifierType: 'email',
         },
         origin: DomainEventService.Analytics,
       },

packages/analytics/src/Domain/Event/DomainEventFactoryInterface.ts

@@ -1,42 +1,11 @@
-import { DailyAnalyticsReportGeneratedEvent } from '@standardnotes/domain-events'
+import { EmailRequestedEvent } from '@standardnotes/domain-events'
 
 export interface DomainEventFactoryInterface {
-  createDailyAnalyticsReportGeneratedEvent(dto: {
-    activityStatistics: Array<{
-      name: string
-      retention: number
-      totalCount: number
-    }>
-    statisticMeasures: Array<{
-      name: string
-      totalValue: number
-      average: number
-      increments: number
-      period: number
-    }>
-    activityStatisticsOverTime: Array<{
-      name: string
-      period: number
-      counts: Array<{
-        periodKey: string
-        totalCount: number
-      }>
-      totalCount: number
-    }>
-    statisticsOverTime: Array<{
-      name: string
-      period: number
-      counts: Array<{
-        periodKey: string
-        totalCount: number
-      }>
-    }>
-    churn: {
-      periodKeys: Array<string>
-      values: Array<{
-        rate: number
-        periodKey: string
-      }>
-    }
-  }): DailyAnalyticsReportGeneratedEvent
+  createEmailRequestedEvent(dto: {
+    userEmail: string
+    messageIdentifier: string
+    level: string
+    body: string
+    subject: string
+  }): EmailRequestedEvent
 }

packages/analytics/src/Domain/Handler/SubscriptionCancelledEventHandler.ts

@@ -1,7 +1,7 @@
 import { DomainEventHandlerInterface, SubscriptionCancelledEvent } from '@standardnotes/domain-events'
 import { inject, injectable } from 'inversify'
 import { Logger } from 'winston'
-import { Email } from '@standardnotes/domain-core'
+import { Username } from '@standardnotes/domain-core'
 
 import TYPES from '../../Bootstrap/Types'
 import { AnalyticsActivity } from '../Analytics/AnalyticsActivity'
@@ -41,7 +41,7 @@ export class SubscriptionCancelledEventHandler implements DomainEventHandlerInte
       payedAmount: event.payload.payAmount,
       planName: SubscriptionPlanName.create(event.payload.subscriptionName).getValue(),
       subscriptionId: event.payload.subscriptionId,
-      userEmail: Email.create(event.payload.userEmail).getValue(),
+      username: Username.create(event.payload.userEmail).getValue(),
       userUuid,
     })
 

packages/analytics/src/Domain/Handler/SubscriptionExpiredEventHandler.ts

@@ -1,7 +1,7 @@
+import { Username } from '@standardnotes/domain-core'
 import { DomainEventHandlerInterface, SubscriptionExpiredEvent } from '@standardnotes/domain-events'
 import { inject, injectable } from 'inversify'
 import { Logger } from 'winston'
-import { Email } from '@standardnotes/domain-core'
 
 import TYPES from '../../Bootstrap/Types'
 import { AnalyticsActivity } from '../Analytics/AnalyticsActivity'
@@ -45,7 +45,7 @@ export class SubscriptionExpiredEventHandler implements DomainEventHandlerInterf
       payedAmount: event.payload.payAmount,
       planName: SubscriptionPlanName.create(event.payload.subscriptionName).getValue(),
       subscriptionId: event.payload.subscriptionId,
-      userEmail: Email.create(event.payload.userEmail).getValue(),
+      username: Username.create(event.payload.userEmail).getValue(),
       userUuid,
     })
 

packages/analytics/src/Domain/Handler/SubscriptionPurchasedEventHandler.ts

@@ -1,7 +1,7 @@
+import { Username } from '@standardnotes/domain-core'
 import { DomainEventHandlerInterface, SubscriptionPurchasedEvent } from '@standardnotes/domain-events'
 import { inject, injectable } from 'inversify'
 import { Logger } from 'winston'
-import { Email } from '@standardnotes/domain-core'
 
 import TYPES from '../../Bootstrap/Types'
 import { AnalyticsActivity } from '../Analytics/AnalyticsActivity'
@@ -69,7 +69,7 @@ export class SubscriptionPurchasedEventHandler implements DomainEventHandlerInte
       payedAmount: event.payload.payAmount,
       planName: SubscriptionPlanName.create(event.payload.subscriptionName).getValue(),
       subscriptionId: event.payload.subscriptionId,
-      userEmail: Email.create(event.payload.userEmail).getValue(),
+      username: Username.create(event.payload.userEmail).getValue(),
       userUuid,
     })
 

packages/analytics/src/Domain/Handler/SubscriptionRefundedEventHandler.ts

@@ -1,7 +1,7 @@
+import { Username } from '@standardnotes/domain-core'
 import { DomainEventHandlerInterface, SubscriptionRefundedEvent } from '@standardnotes/domain-events'
 import { inject, injectable } from 'inversify'
 import { Logger } from 'winston'
-import { Email } from '@standardnotes/domain-core'
 
 import TYPES from '../../Bootstrap/Types'
 import { AnalyticsActivity } from '../Analytics/AnalyticsActivity'
@@ -41,7 +41,7 @@ export class SubscriptionRefundedEventHandler implements DomainEventHandlerInter
       payedAmount: event.payload.payAmount,
       planName: SubscriptionPlanName.create(event.payload.subscriptionName).getValue(),
       subscriptionId: event.payload.subscriptionId,
-      userEmail: Email.create(event.payload.userEmail).getValue(),
+      username: Username.create(event.payload.userEmail).getValue(),
       userUuid,
     })
 

packages/analytics/src/Domain/Handler/SubscriptionRenewedEventHandler.ts

@@ -1,6 +1,6 @@
 import { DomainEventHandlerInterface, SubscriptionRenewedEvent } from '@standardnotes/domain-events'
 import { inject, injectable } from 'inversify'
-import { Email } from '@standardnotes/domain-core'
+import { Username } from '@standardnotes/domain-core'
 
 import TYPES from '../../Bootstrap/Types'
 import { GetUserAnalyticsId } from '../UseCase/GetUserAnalyticsId/GetUserAnalyticsId'
@@ -41,7 +41,7 @@ export class SubscriptionRenewedEventHandler implements DomainEventHandlerInterf
       payedAmount: event.payload.payAmount,
       planName: SubscriptionPlanName.create(event.payload.subscriptionName).getValue(),
       subscriptionId: event.payload.subscriptionId,
-      userEmail: Email.create(event.payload.userEmail).getValue(),
+      username: Username.create(event.payload.userEmail).getValue(),
       userUuid,
     })
 

packages/analytics/src/Domain/Handler/UserRegisteredEventHandler.ts

@@ -18,7 +18,7 @@ export class UserRegisteredEventHandler implements DomainEventHandlerInterface {
   async handle(event: UserRegisteredEvent): Promise<void> {
     let analyticsEntity = new AnalyticsEntity()
     analyticsEntity.userUuid = event.payload.userUuid
-    analyticsEntity.userEmail = event.payload.email
+    analyticsEntity.username = event.payload.email
     analyticsEntity = await this.analyticsEntityRepository.save(analyticsEntity)
 
     await this.analyticsStore.markActivity([AnalyticsActivity.Register], analyticsEntity.id, [

packages/analytics/src/Domain/Map/RevenueModificationMap.ts

@@ -1,5 +1,5 @@
 import { injectable } from 'inversify'
-import { Email, MapInterface, UniqueEntityId } from '@standardnotes/domain-core'
+import { MapperInterface, UniqueEntityId, Username } from '@standardnotes/domain-core'
 
 import { TypeORMRevenueModification } from '../../Infra/TypeORM/TypeORMRevenueModification'
 import { MonthlyRevenue } from '../Revenue/MonthlyRevenue'
@@ -10,11 +10,11 @@ import { SubscriptionPlanName } from '../Subscription/SubscriptionPlanName'
 import { SubscriptionEventType } from '../Subscription/SubscriptionEventType'
 
 @injectable()
-export class RevenueModificationMap implements MapInterface<RevenueModification, TypeORMRevenueModification> {
+export class RevenueModificationMap implements MapperInterface<RevenueModification, TypeORMRevenueModification> {
   toDomain(persistence: TypeORMRevenueModification): RevenueModification {
     const userOrError = User.create(
       {
-        email: Email.create(persistence.userEmail).getValue(),
+        username: Username.create(persistence.username).getValue(),
       },
       new UniqueEntityId(persistence.userUuid),
     )
@@ -70,7 +70,7 @@ export class RevenueModificationMap implements MapInterface<RevenueModification,
     persistence.previousMonthlyRevenue = domain.props.previousMonthlyRevenue.value
     persistence.subscriptionId = subscription.id.toValue() as number
     persistence.subscriptionPlan = subscription.props.planName.value
-    persistence.userEmail = user.props.email.value
+    persistence.username = user.props.username.value
     persistence.userUuid = user.id.toString()
     persistence.createdAt = domain.props.createdAt
 

packages/analytics/src/Domain/Revenue/RevenueModification.spec.ts

@@ -1,4 +1,4 @@
-import { Email } from '@standardnotes/domain-core'
+import { Username } from '@standardnotes/domain-core'
 
 import { Subscription } from '../Subscription/Subscription'
 import { SubscriptionEventType } from '../Subscription/SubscriptionEventType'
@@ -19,7 +19,7 @@ describe('RevenueModification', () => {
       planName: SubscriptionPlanName.create('PRO_PLAN').getValue(),
     }).getValue()
     user = User.create({
-      email: Email.create('test@test.te').getValue(),
+      username: Username.create('test@test.te').getValue(),
     }).getValue()
   })
 

packages/analytics/src/Domain/Revenue/RevenueModificationRepositoryInterface.ts

@@ -4,6 +4,6 @@ import { RevenueModification } from './RevenueModification'
 
 export interface RevenueModificationRepositoryInterface {
   findLastByUserUuid(userUuid: Uuid): Promise<RevenueModification | null>
-  sumMRRDiff(dto: { planName?: string; billingFrequency?: number }): Promise<number>
+  sumMRRDiff(dto: { billingFrequencies: number[]; planNames?: string[] }): Promise<number>
   save(revenueModification: RevenueModification): Promise<RevenueModification>
 }

packages/analytics/src/Domain/UseCase/CalculateMonthlyRecurringRevenue/CalculateMonthlyRecurringRevenue.ts

@@ -20,7 +20,9 @@ export class CalculateMonthlyRecurringRevenue implements DomainUseCaseInterface<
   ) {}
 
   async execute(_dto: CalculateMonthlyRecurringRevenueDTO): Promise<Result<MonthlyRevenue>> {
-    const mrrDiff = await this.revenueModificationRepository.sumMRRDiff({})
+    const mrrDiff = await this.revenueModificationRepository.sumMRRDiff({
+      billingFrequencies: [SubscriptionBillingFrequency.Annual, SubscriptionBillingFrequency.Monthly],
+    })
 
     await this.statisticsStore.setMeasure(StatisticsMeasure.MRR, mrrDiff, [
       Period.Today,
@@ -29,7 +31,7 @@ export class CalculateMonthlyRecurringRevenue implements DomainUseCaseInterface<
     ])
 
     const monthlyPlansMrrDiff = await this.revenueModificationRepository.sumMRRDiff({
-      billingFrequency: SubscriptionBillingFrequency.Monthly,
+      billingFrequencies: [SubscriptionBillingFrequency.Monthly],
     })
 
     await this.statisticsStore.setMeasure(StatisticsMeasure.MonthlyPlansMRR, monthlyPlansMrrDiff, [
@@ -39,7 +41,7 @@ export class CalculateMonthlyRecurringRevenue implements DomainUseCaseInterface<
     ])
 
     const annualPlansMrrDiff = await this.revenueModificationRepository.sumMRRDiff({
-      billingFrequency: SubscriptionBillingFrequency.Annual,
+      billingFrequencies: [SubscriptionBillingFrequency.Annual],
     })
 
     await this.statisticsStore.setMeasure(StatisticsMeasure.AnnualPlansMRR, annualPlansMrrDiff, [
@@ -49,7 +51,7 @@ export class CalculateMonthlyRecurringRevenue implements DomainUseCaseInterface<
     ])
 
     const fiveYearPlansMrrDiff = await this.revenueModificationRepository.sumMRRDiff({
-      billingFrequency: SubscriptionBillingFrequency.FiveYear,
+      billingFrequencies: [SubscriptionBillingFrequency.FiveYear],
     })
 
     await this.statisticsStore.setMeasure(StatisticsMeasure.FiveYearPlansMRR, fiveYearPlansMrrDiff, [
@@ -59,7 +61,8 @@ export class CalculateMonthlyRecurringRevenue implements DomainUseCaseInterface<
     ])
 
     const proPlansMrrDiff = await this.revenueModificationRepository.sumMRRDiff({
-      planName: SubscriptionName.ProPlan,
+      planNames: [SubscriptionName.ProPlan],
+      billingFrequencies: [SubscriptionBillingFrequency.Annual, SubscriptionBillingFrequency.Monthly],
     })
 
     await this.statisticsStore.setMeasure(StatisticsMeasure.ProPlansMRR, proPlansMrrDiff, [
@@ -69,7 +72,8 @@ export class CalculateMonthlyRecurringRevenue implements DomainUseCaseInterface<
     ])
 
     const plusPlansMrrDiff = await this.revenueModificationRepository.sumMRRDiff({
-      planName: SubscriptionName.PlusPlan,
+      planNames: [SubscriptionName.PlusPlan],
+      billingFrequencies: [SubscriptionBillingFrequency.Annual, SubscriptionBillingFrequency.Monthly],
     })
 
     await this.statisticsStore.setMeasure(StatisticsMeasure.PlusPlansMRR, plusPlansMrrDiff, [

packages/analytics/src/Domain/UseCase/GetUserAnalyticsId/GetUserAnalyticsId.spec.ts

@@ -14,8 +14,8 @@ describe('GetUserAnalyticsId', () => {
   beforeEach(() => {
     analyticsEntity = {
       id: 123,
-      userUuid: '1-2-3',
-      userEmail: 'test@test.te',
+      userUuid: '84c0f8e8-544a-4c7e-9adf-26209303bc1d',
+      username: 'test@test.te',
     } as jest.Mocked<AnalyticsEntity>
 
     analyticsEntityRepository = {} as jest.Mocked<AnalyticsEntityRepositoryInterface>
@@ -24,11 +24,11 @@ describe('GetUserAnalyticsId', () => {
   })
 
   it('should return analytics id for a user by uuid', async () => {
-    expect(await (await createUseCase().execute({ userUuid: '1-2-3' })).analyticsId).toEqual(123)
+    expect((await createUseCase().execute({ userUuid: '1-2-3' })).analyticsId).toEqual(123)
   })
 
   it('should return analytics id for a user by email', async () => {
-    expect(await (await createUseCase().execute({ userEmail: 'test@test.te' })).analyticsId).toEqual(123)
+    expect((await createUseCase().execute({ userEmail: 'test@test.te' })).analyticsId).toEqual(123)
   })
 
   it('should throw error if user is missing analytics entity', async () => {

packages/analytics/src/Domain/UseCase/GetUserAnalyticsId/GetUserAnalyticsId.ts

@@ -1,5 +1,5 @@
 import { inject, injectable } from 'inversify'
-import { Email, Uuid } from '@standardnotes/domain-core'
+import { Username, Uuid } from '@standardnotes/domain-core'
 
 import TYPES from '../../../Bootstrap/Types'
 import { AnalyticsEntityRepositoryInterface } from '../../Entity/AnalyticsEntityRepositoryInterface'
@@ -28,7 +28,7 @@ export class GetUserAnalyticsId implements UseCaseInterface {
     return {
       analyticsId: analyticsEntity.id,
       userUuid: Uuid.create(analyticsEntity.userUuid).getValue(),
-      userEmail: Email.create(analyticsEntity.userEmail).getValue(),
+      username: Username.create(analyticsEntity.username).getValue(),
     }
   }
 }

packages/analytics/src/Domain/UseCase/GetUserAnalyticsId/GetUserAnalyticsIdResponse.ts

@@ -1,7 +1,7 @@
-import { Email, Uuid } from '@standardnotes/domain-core'
+import { Username, Uuid } from '@standardnotes/domain-core'
 
 export type GetUserAnalyticsIdResponse = {
   analyticsId: number
-  userEmail: Email
+  username: Username
   userUuid: Uuid
 }

packages/analytics/src/Domain/UseCase/SaveRevenueModification/SaveRevenueModification.spec.ts

@@ -1,7 +1,7 @@
 import 'reflect-metadata'
 
 import { TimerInterface } from '@standardnotes/time'
-import { Email, Result, Uuid } from '@standardnotes/domain-core'
+import { Result, Username, Uuid } from '@standardnotes/domain-core'
 
 import { MonthlyRevenue } from '../../Revenue/MonthlyRevenue'
 
@@ -45,8 +45,8 @@ describe('SaveRevenueModification', () => {
       payedAmount: 12.99,
       planName: SubscriptionPlanName.create('PRO_PLAN').getValue(),
       subscriptionId: 1234,
-      userEmail: Email.create('test@test.te').getValue(),
-      userUuid: Uuid.create('1-2-3').getValue(),
+      username: Username.create('test@test.te').getValue(),
+      userUuid: Uuid.create('84c0f8e8-544a-4c7e-9adf-26209303bc1d').getValue(),
     })
 
     expect(revenueOrError.isFailed()).toBeFalsy()
@@ -63,8 +63,8 @@ describe('SaveRevenueModification', () => {
       payedAmount: 12.99,
       planName: SubscriptionPlanName.create('PRO_PLAN').getValue(),
       subscriptionId: 1234,
-      userEmail: Email.create('test@test.te').getValue(),
-      userUuid: Uuid.create('1-2-3').getValue(),
+      username: Username.create('test@test.te').getValue(),
+      userUuid: Uuid.create('84c0f8e8-544a-4c7e-9adf-26209303bc1d').getValue(),
     })
 
     expect(revenueOrError.isFailed()).toBeFalsy()
@@ -81,8 +81,8 @@ describe('SaveRevenueModification', () => {
       payedAmount: 2,
       planName: SubscriptionPlanName.create('PRO_PLAN').getValue(),
       subscriptionId: 1234,
-      userEmail: Email.create('test@test.te').getValue(),
-      userUuid: Uuid.create('1-2-3').getValue(),
+      username: Username.create('test@test.te').getValue(),
+      userUuid: Uuid.create('84c0f8e8-544a-4c7e-9adf-26209303bc1d').getValue(),
     })
 
     expect(revenueOrError.isFailed()).toBeFalsy()
@@ -101,8 +101,8 @@ describe('SaveRevenueModification', () => {
       payedAmount: 12.99,
       planName: SubscriptionPlanName.create('PRO_PLAN').getValue(),
       subscriptionId: 1234,
-      userEmail: Email.create('test@test.te').getValue(),
-      userUuid: Uuid.create('1-2-3').getValue(),
+      username: Username.create('test@test.te').getValue(),
+      userUuid: Uuid.create('84c0f8e8-544a-4c7e-9adf-26209303bc1d').getValue(),
     })
 
     expect(revenueOrError.isFailed()).toBeFalsy()
@@ -122,8 +122,8 @@ describe('SaveRevenueModification', () => {
       payedAmount: 12.99,
       planName: SubscriptionPlanName.create('PRO_PLAN').getValue(),
       subscriptionId: 1234,
-      userEmail: Email.create('test@test.te').getValue(),
-      userUuid: Uuid.create('1-2-3').getValue(),
+      username: Username.create('test@test.te').getValue(),
+      userUuid: Uuid.create('84c0f8e8-544a-4c7e-9adf-26209303bc1d').getValue(),
     })
 
     expect(revenueOrError.isFailed()).toBeTruthy()
@@ -142,8 +142,8 @@ describe('SaveRevenueModification', () => {
       payedAmount: 12.99,
       planName: SubscriptionPlanName.create('PRO_PLAN').getValue(),
       subscriptionId: 1234,
-      userEmail: Email.create('test@test.te').getValue(),
-      userUuid: Uuid.create('1-2-3').getValue(),
+      username: Username.create('test@test.te').getValue(),
+      userUuid: Uuid.create('84c0f8e8-544a-4c7e-9adf-26209303bc1d').getValue(),
     })
 
     expect(revenueOrError.isFailed()).toBeTruthy()
@@ -162,8 +162,8 @@ describe('SaveRevenueModification', () => {
       payedAmount: 12.99,
       planName: SubscriptionPlanName.create('PRO_PLAN').getValue(),
       subscriptionId: 1234,
-      userEmail: Email.create('test@test.te').getValue(),
-      userUuid: Uuid.create('1-2-3').getValue(),
+      username: Username.create('test@test.te').getValue(),
+      userUuid: Uuid.create('84c0f8e8-544a-4c7e-9adf-26209303bc1d').getValue(),
     })
 
     expect(revenueOrError.isFailed()).toBeTruthy()
@@ -182,8 +182,8 @@ describe('SaveRevenueModification', () => {
       payedAmount: 12.99,
       planName: SubscriptionPlanName.create('PRO_PLAN').getValue(),
       subscriptionId: 1234,
-      userEmail: Email.create('test@test.te').getValue(),
-      userUuid: Uuid.create('1-2-3').getValue(),
+      username: Username.create('test@test.te').getValue(),
+      userUuid: Uuid.create('84c0f8e8-544a-4c7e-9adf-26209303bc1d').getValue(),
     })
 
     expect(revenueOrError.isFailed()).toBeTruthy()
@@ -202,8 +202,8 @@ describe('SaveRevenueModification', () => {
       payedAmount: 12.99,
       planName: SubscriptionPlanName.create('PRO_PLAN').getValue(),
       subscriptionId: 1234,
-      userEmail: Email.create('test@test.te').getValue(),
-      userUuid: Uuid.create('1-2-3').getValue(),
+      username: Username.create('test@test.te').getValue(),
+      userUuid: Uuid.create('84c0f8e8-544a-4c7e-9adf-26209303bc1d').getValue(),
     })
 
     expect(revenueOrError.isFailed()).toBeTruthy()

packages/analytics/src/Domain/UseCase/SaveRevenueModification/SaveRevenueModification.ts

@@ -23,7 +23,7 @@ export class SaveRevenueModification implements DomainUseCaseInterface<RevenueMo
   async execute(dto: SaveRevenueModificationDTO): Promise<Result<RevenueModification>> {
     const userOrError = User.create(
       {
-        email: dto.userEmail,
+        username: dto.username,
       },
       new UniqueEntityId(dto.userUuid.value),
     )

packages/analytics/src/Domain/UseCase/SaveRevenueModification/SaveRevenueModificationDTO.ts

@@ -1,4 +1,4 @@
-import { Email, Uuid } from '@standardnotes/domain-core'
+import { Username, Uuid } from '@standardnotes/domain-core'
 
 import { SubscriptionEventType } from '../../Subscription/SubscriptionEventType'
 import { SubscriptionPlanName } from '../../Subscription/SubscriptionPlanName'
@@ -9,7 +9,7 @@ export interface SaveRevenueModificationDTO {
   planName: SubscriptionPlanName
   newSubscriber: boolean
   userUuid: Uuid
-  userEmail: Email
+  username: Username
   subscriptionId: number
   billingFrequency: number
 }

packages/analytics/src/Domain/User/User.spec.ts

@@ -1,11 +1,11 @@
-import { Email } from '@standardnotes/domain-core'
+import { Username } from '@standardnotes/domain-core'
 
 import { User } from './User'
 
 describe('User', () => {
   it('should create an entity', () => {
     const user = User.create({
-      email: Email.create('test@test.te').getValue(),
+      username: Username.create('test@test.te').getValue(),
     }).getValue()
 
     expect(user.id.toString()).toHaveLength(36)

packages/analytics/src/Domain/User/UserProps.ts

@@ -1,5 +1,5 @@
-import { Email } from '@standardnotes/domain-core'
+import { Username } from '@standardnotes/domain-core'
 
 export interface UserProps {
-  email: Email
+  username: Username
 }

packages/analytics/src/Infra/MySQL/MySQLRevenueModificationRepository.ts

@@ -1,6 +1,6 @@
 import { inject, injectable } from 'inversify'
 import { Repository } from 'typeorm'
-import { MapInterface, Uuid } from '@standardnotes/domain-core'
+import { MapperInterface, Uuid } from '@standardnotes/domain-core'
 
 import TYPES from '../../Bootstrap/Types'
 import { RevenueModification } from '../../Domain/Revenue/RevenueModification'
@@ -13,17 +13,17 @@ export class MySQLRevenueModificationRepository implements RevenueModificationRe
     @inject(TYPES.ORMRevenueModificationRepository)
     private ormRepository: Repository<TypeORMRevenueModification>,
     @inject(TYPES.RevenueModificationMap)
-    private revenueModificationMap: MapInterface<RevenueModification, TypeORMRevenueModification>,
+    private revenueModificationMap: MapperInterface<RevenueModification, TypeORMRevenueModification>,
   ) {}
 
-  async sumMRRDiff(dto: { planName?: string; billingFrequency?: number }): Promise<number> {
+  async sumMRRDiff(dto: { billingFrequencies: number[]; planNames?: string[] }): Promise<number> {
     const query = this.ormRepository.createQueryBuilder().select('sum(new_mrr - previous_mrr)', 'mrrDiff')
 
-    if (dto.planName !== undefined) {
-      query.where('subscription_plan = :planName', { planName: dto.planName })
+    if (dto.billingFrequencies.length > 0) {
+      query.where('billing_frequency IN (:...billingFrequencies)', { billingFrequencies: dto.billingFrequencies })
     }
-    if (dto.billingFrequency !== undefined) {
-      query.where('billing_frequency = :billingFrequency', { billingFrequency: dto.billingFrequency })
+    if (dto.planNames && dto.planNames.length > 0) {
+      query.andWhere('subscription_plan IN (:...planNames)', { planNames: dto.planNames })
     }
 
     const result = await query.getRawOne()

packages/analytics/src/Infra/TypeORM/TypeORMRevenueModification.ts

@@ -18,7 +18,7 @@ export class TypeORMRevenueModification {
     length: 255,
   })
   @Index('email')
-  declare userEmail: string
+  declare username: string
 
   @Column({
     name: 'user_uuid',

packages/api-gateway/.env.sample

@@ -10,6 +10,8 @@ WORKSPACE_SERVER_URL=http://workspace:3000
 WEB_SOCKET_SERVER_URL=http://websockets:3000
 PAYMENTS_SERVER_URL=http://payments:3000
 FILES_SERVER_URL=http://files:3000
+REVISIONS_SERVER_URL=http://revisions:3000
+EMAIL_SERVER_URL=http://email:3000
 
 HTTP_CALL_TIMEOUT=60000
 

packages/api-gateway/CHANGELOG.md

@@ -3,6 +3,140 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.40.2](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.40.1...@standardnotes/api-gateway@1.40.2) (2022-12-12)
+
+**Note:** Version bump only for package @standardnotes/api-gateway
+
+## [1.40.1](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.40.0...@standardnotes/api-gateway@1.40.1) (2022-12-12)
+
+**Note:** Version bump only for package @standardnotes/api-gateway
+
+# [1.40.0](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.39.24...@standardnotes/api-gateway@1.40.0) (2022-12-12)
+
+### Features
+
+* **api-gateway:** add unsubscribe from emails endpoint ([22d6a02](https://github.com/standardnotes/api-gateway/commit/22d6a02d049ba3bde890c7def91e19f013ba3e22))
+
+## [1.39.24](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.39.23...@standardnotes/api-gateway@1.39.24) (2022-12-09)
+
+**Note:** Version bump only for package @standardnotes/api-gateway
+
+## [1.39.23](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.39.22...@standardnotes/api-gateway@1.39.23) (2022-12-09)
+
+**Note:** Version bump only for package @standardnotes/api-gateway
+
+## [1.39.22](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.39.21...@standardnotes/api-gateway@1.39.22) (2022-12-09)
+
+**Note:** Version bump only for package @standardnotes/api-gateway
+
+## [1.39.21](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.39.20...@standardnotes/api-gateway@1.39.21) (2022-12-09)
+
+**Note:** Version bump only for package @standardnotes/api-gateway
+
+## [1.39.20](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.39.19...@standardnotes/api-gateway@1.39.20) (2022-12-09)
+
+**Note:** Version bump only for package @standardnotes/api-gateway
+
+## [1.39.19](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.39.18...@standardnotes/api-gateway@1.39.19) (2022-12-09)
+
+**Note:** Version bump only for package @standardnotes/api-gateway
+
+## [1.39.18](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.39.17...@standardnotes/api-gateway@1.39.18) (2022-12-09)
+
+**Note:** Version bump only for package @standardnotes/api-gateway
+
+## [1.39.17](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.39.16...@standardnotes/api-gateway@1.39.17) (2022-12-09)
+
+**Note:** Version bump only for package @standardnotes/api-gateway
+
+## [1.39.16](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.39.15...@standardnotes/api-gateway@1.39.16) (2022-12-08)
+
+**Note:** Version bump only for package @standardnotes/api-gateway
+
+## [1.39.15](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.39.14...@standardnotes/api-gateway@1.39.15) (2022-12-08)
+
+**Note:** Version bump only for package @standardnotes/api-gateway
+
+## [1.39.14](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.39.13...@standardnotes/api-gateway@1.39.14) (2022-12-08)
+
+**Note:** Version bump only for package @standardnotes/api-gateway
+
+## [1.39.13](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.39.12...@standardnotes/api-gateway@1.39.13) (2022-12-08)
+
+**Note:** Version bump only for package @standardnotes/api-gateway
+
+## [1.39.12](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.39.11...@standardnotes/api-gateway@1.39.12) (2022-12-08)
+
+**Note:** Version bump only for package @standardnotes/api-gateway
+
+## [1.39.11](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.39.10...@standardnotes/api-gateway@1.39.11) (2022-12-07)
+
+**Note:** Version bump only for package @standardnotes/api-gateway
+
+## [1.39.10](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.39.9...@standardnotes/api-gateway@1.39.10) (2022-12-07)
+
+**Note:** Version bump only for package @standardnotes/api-gateway
+
+## [1.39.9](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.39.8...@standardnotes/api-gateway@1.39.9) (2022-12-07)
+
+**Note:** Version bump only for package @standardnotes/api-gateway
+
+## [1.39.8](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.39.7...@standardnotes/api-gateway@1.39.8) (2022-12-06)
+
+**Note:** Version bump only for package @standardnotes/api-gateway
+
+## [1.39.7](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.39.6...@standardnotes/api-gateway@1.39.7) (2022-12-05)
+
+**Note:** Version bump only for package @standardnotes/api-gateway
+
+## [1.39.6](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.39.5...@standardnotes/api-gateway@1.39.6) (2022-11-30)
+
+**Note:** Version bump only for package @standardnotes/api-gateway
+
+## [1.39.5](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.39.4...@standardnotes/api-gateway@1.39.5) (2022-11-28)
+
+**Note:** Version bump only for package @standardnotes/api-gateway
+
+## [1.39.4](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.39.3...@standardnotes/api-gateway@1.39.4) (2022-11-25)
+
+### Bug Fixes
+
+* **api-gateway:** make revisions and workspace server urls optional ([8907879](https://github.com/standardnotes/api-gateway/commit/8907879a194d2d8328fbd3ca8ec9d0b608c2da50))
+
+## [1.39.3](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.39.2...@standardnotes/api-gateway@1.39.3) (2022-11-25)
+
+**Note:** Version bump only for package @standardnotes/api-gateway
+
+## [1.39.2](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.39.1...@standardnotes/api-gateway@1.39.2) (2022-11-24)
+
+**Note:** Version bump only for package @standardnotes/api-gateway
+
+## [1.39.1](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.39.0...@standardnotes/api-gateway@1.39.1) (2022-11-23)
+
+**Note:** Version bump only for package @standardnotes/api-gateway
+
+# [1.39.0](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.38.9...@standardnotes/api-gateway@1.39.0) (2022-11-22)
+
+### Features
+
+* **api-gateway:** add v2 revisions controller ([92ba759](https://github.com/standardnotes/api-gateway/commit/92ba759b1c3719e773f989707ddd6d7a9ec57d1c))
+
+## [1.38.9](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.38.8...@standardnotes/api-gateway@1.38.9) (2022-11-22)
+
+**Note:** Version bump only for package @standardnotes/api-gateway
+
+## [1.38.8](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.38.7...@standardnotes/api-gateway@1.38.8) (2022-11-21)
+
+**Note:** Version bump only for package @standardnotes/api-gateway
+
+## [1.38.7](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.38.6...@standardnotes/api-gateway@1.38.7) (2022-11-18)
+
+**Note:** Version bump only for package @standardnotes/api-gateway
+
+## [1.38.6](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.38.5...@standardnotes/api-gateway@1.38.6) (2022-11-16)
+
+**Note:** Version bump only for package @standardnotes/api-gateway
+
 ## [1.38.5](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.38.4...@standardnotes/api-gateway@1.38.5) (2022-11-14)
 
 **Note:** Version bump only for package @standardnotes/api-gateway

packages/api-gateway/bin/server.ts

@@ -24,6 +24,7 @@ import '../src/Controller/v1/InvitesController'
 
 import '../src/Controller/v2/PaymentsControllerV2'
 import '../src/Controller/v2/ActionsControllerV2'
+import '../src/Controller/v2/RevisionsControllerV2'
 
 import helmet from 'helmet'
 import * as cors from 'cors'

packages/api-gateway/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/api-gateway",
-  "version": "1.38.5",
+  "version": "1.40.2",
   "engines": {
     "node": ">=18.0.0 <19.0.0"
   },
@@ -20,7 +20,6 @@
     "upgrade:snjs": "yarn ncu -u '@standardnotes/*'"
   },
   "dependencies": {
-    "@newrelic/native-metrics": "^9.0.0",
     "@newrelic/winston-enricher": "^4.0.0",
     "@sentry/node": "^7.19.0",
     "@standardnotes/common": "workspace:^",
@@ -28,7 +27,7 @@
     "@standardnotes/domain-events-infra": "workspace:*",
     "@standardnotes/security": "workspace:*",
     "@standardnotes/time": "workspace:*",
-    "aws-sdk": "^2.1253.0",
+    "aws-sdk": "^2.1260.0",
     "axios": "^1.1.3",
     "cors": "2.8.5",
     "dotenv": "^16.0.1",

packages/api-gateway/src/Bootstrap/Container.ts

@@ -54,10 +54,12 @@ export class ContainerConfigLoader {
     // env vars
     container.bind(TYPES.SYNCING_SERVER_JS_URL).toConstantValue(env.get('SYNCING_SERVER_JS_URL'))
     container.bind(TYPES.AUTH_SERVER_URL).toConstantValue(env.get('AUTH_SERVER_URL'))
+    container.bind(TYPES.REVISIONS_SERVER_URL).toConstantValue(env.get('REVISIONS_SERVER_URL', true))
+    container.bind(TYPES.EMAIL_SERVER_URL).toConstantValue(env.get('EMAIL_SERVER_URL', true))
     container.bind(TYPES.PAYMENTS_SERVER_URL).toConstantValue(env.get('PAYMENTS_SERVER_URL', true))
     container.bind(TYPES.FILES_SERVER_URL).toConstantValue(env.get('FILES_SERVER_URL', true))
     container.bind(TYPES.AUTH_JWT_SECRET).toConstantValue(env.get('AUTH_JWT_SECRET'))
-    container.bind(TYPES.WORKSPACE_SERVER_URL).toConstantValue(env.get('WORKSPACE_SERVER_URL'))
+    container.bind(TYPES.WORKSPACE_SERVER_URL).toConstantValue(env.get('WORKSPACE_SERVER_URL', true))
     container.bind(TYPES.WEB_SOCKET_SERVER_URL).toConstantValue(env.get('WEB_SOCKET_SERVER_URL', true))
     container
       .bind(TYPES.HTTP_CALL_TIMEOUT)

packages/api-gateway/src/Bootstrap/Types.ts

@@ -7,6 +7,8 @@ const TYPES = {
   AUTH_SERVER_URL: Symbol.for('AUTH_SERVER_URL'),
   PAYMENTS_SERVER_URL: Symbol.for('PAYMENTS_SERVER_URL'),
   FILES_SERVER_URL: Symbol.for('FILES_SERVER_URL'),
+  REVISIONS_SERVER_URL: Symbol.for('REVISIONS_SERVER_URL'),
+  EMAIL_SERVER_URL: Symbol.for('EMAIL_SERVER_URL'),
   WORKSPACE_SERVER_URL: Symbol.for('WORKSPACE_SERVER_URL'),
   WEB_SOCKET_SERVER_URL: Symbol.for('WEB_SOCKET_SERVER_URL'),
   AUTH_JWT_SECRET: Symbol.for('AUTH_JWT_SECRET'),

packages/api-gateway/src/Controller/v1/ActionsController.ts

@@ -29,4 +29,14 @@ export class ActionsController extends BaseHttpController {
   async methods(request: Request, response: Response): Promise<void> {
     await this.httpService.callAuthServer(request, response, 'auth/methods', request.body)
   }
+
+  @httpGet('/unsubscribe/:token')
+  async emailUnsubscribe(request: Request, response: Response): Promise<void> {
+    await this.httpService.callEmailServer(
+      request,
+      response,
+      `subscriptions/actions/unsubscribe/${request.params.token}`,
+      request.body,
+    )
+  }
 }

packages/api-gateway/src/Controller/v2/RevisionsControllerV2.ts

@@ -0,0 +1,17 @@
+import { Request, Response } from 'express'
+import { inject } from 'inversify'
+import { BaseHttpController, controller, httpGet } from 'inversify-express-utils'
+import TYPES from '../../Bootstrap/Types'
+import { HttpServiceInterface } from '../../Service/Http/HttpServiceInterface'
+
+@controller('/v2/items/:item_id/revisions', TYPES.AuthMiddleware)
+export class RevisionsControllerV2 extends BaseHttpController {
+  constructor(@inject(TYPES.HTTPService) private httpService: HttpServiceInterface) {
+    super()
+  }
+
+  @httpGet('/')
+  async getRevisions(request: Request, response: Response): Promise<void> {
+    await this.httpService.callRevisionsServer(request, response, `items/${request.params.item_id}/revisions`)
+  }
+}

packages/api-gateway/src/Service/Http/HttpService.ts

@@ -18,6 +18,8 @@ export class HttpService implements HttpServiceInterface {
     @inject(TYPES.FILES_SERVER_URL) private filesServerUrl: string,
     @inject(TYPES.WORKSPACE_SERVER_URL) private workspaceServerUrl: string,
     @inject(TYPES.WEB_SOCKET_SERVER_URL) private webSocketServerUrl: string,
+    @inject(TYPES.REVISIONS_SERVER_URL) private revisionsServerUrl: string,
+    @inject(TYPES.EMAIL_SERVER_URL) private emailServerUrl: string,
     @inject(TYPES.HTTP_CALL_TIMEOUT) private httpCallTimeout: number,
     @inject(TYPES.CrossServiceTokenCache) private crossServiceTokenCache: CrossServiceTokenCacheInterface,
     @inject(TYPES.Logger) private logger: Logger,
@@ -32,6 +34,20 @@ export class HttpService implements HttpServiceInterface {
     await this.callServer(this.syncingServerJsUrl, request, response, endpoint, payload)
   }
 
+  async callRevisionsServer(
+    request: Request,
+    response: Response,
+    endpoint: string,
+    payload?: Record<string, unknown> | string,
+  ): Promise<void> {
+    if (!this.revisionsServerUrl) {
+      response.status(400).send({ message: 'Revisions Server not configured' })
+
+      return
+    }
+    await this.callServer(this.revisionsServerUrl, request, response, endpoint, payload)
+  }
+
   async callLegacySyncingServer(
     request: Request,
     response: Response,
@@ -50,12 +66,33 @@ export class HttpService implements HttpServiceInterface {
     await this.callServer(this.authServerUrl, request, response, endpoint, payload)
   }
 
+  async callEmailServer(
+    request: Request,
+    response: Response,
+    endpoint: string,
+    payload?: Record<string, unknown> | string,
+  ): Promise<void> {
+    if (!this.emailServerUrl) {
+      response.status(400).send({ message: 'Email Server not configured' })
+
+      return
+    }
+
+    await this.callServer(this.emailServerUrl, request, response, endpoint, payload)
+  }
+
   async callWorkspaceServer(
     request: Request,
     response: Response,
     endpoint: string,
     payload?: Record<string, unknown> | string,
   ): Promise<void> {
+    if (!this.workspaceServerUrl) {
+      response.status(400).send({ message: 'Workspace Server not configured' })
+
+      return
+    }
+
     await this.callServer(this.workspaceServerUrl, request, response, endpoint, payload)
   }
 

packages/api-gateway/src/Service/Http/HttpServiceInterface.ts

@@ -1,6 +1,12 @@
 import { Request, Response } from 'express'
 
 export interface HttpServiceInterface {
+  callEmailServer(
+    request: Request,
+    response: Response,
+    endpoint: string,
+    payload?: Record<string, unknown> | string,
+  ): Promise<void>
   callAuthServer(
     request: Request,
     response: Response,
@@ -13,6 +19,12 @@ export interface HttpServiceInterface {
     endpoint: string,
     payload?: Record<string, unknown> | string,
   ): Promise<void>
+  callRevisionsServer(
+    request: Request,
+    response: Response,
+    endpoint: string,
+    payload?: Record<string, unknown> | string,
+  ): Promise<void>
   callSyncingServer(
     request: Request,
     response: Response,

packages/auth/CHANGELOG.md

@@ -3,6 +3,216 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.67.1](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.67.0...@standardnotes/auth-server@1.67.1) (2022-12-12)
+
+### Bug Fixes
+
+* user signed in email template ([c15e2e2](https://github.com/standardnotes/server/commit/c15e2e2c8f3a6c177e227d25440501fa38dd3d0e))
+
+# [1.67.0](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.66.9...@standardnotes/auth-server@1.67.0) (2022-12-12)
+
+### Features
+
+* **auth:** add email subscription unsubscribed event handler ([10e2a26](https://github.com/standardnotes/server/commit/10e2a263522dfa33c06940f29cb77f783f66b20c))
+
+## [1.66.9](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.66.8...@standardnotes/auth-server@1.66.9) (2022-12-12)
+
+**Note:** Version bump only for package @standardnotes/auth-server
+
+## [1.66.8](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.66.7...@standardnotes/auth-server@1.66.8) (2022-12-12)
+
+**Note:** Version bump only for package @standardnotes/auth-server
+
+## [1.66.7](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.66.6...@standardnotes/auth-server@1.66.7) (2022-12-09)
+
+### Bug Fixes
+
+* **auth:** linter issue ([104313c](https://github.com/standardnotes/server/commit/104313c15df79f6308d23e21f65111e5bd3d9c72))
+
+## [1.66.6](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.66.5...@standardnotes/auth-server@1.66.6) (2022-12-09)
+
+**Note:** Version bump only for package @standardnotes/auth-server
+
+## [1.66.5](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.66.4...@standardnotes/auth-server@1.66.5) (2022-12-09)
+
+**Note:** Version bump only for package @standardnotes/auth-server
+
+## [1.66.4](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.66.3...@standardnotes/auth-server@1.66.4) (2022-12-09)
+
+**Note:** Version bump only for package @standardnotes/auth-server
+
+## [1.66.3](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.66.2...@standardnotes/auth-server@1.66.3) (2022-12-09)
+
+**Note:** Version bump only for package @standardnotes/auth-server
+
+## [1.66.2](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.66.1...@standardnotes/auth-server@1.66.2) (2022-12-09)
+
+**Note:** Version bump only for package @standardnotes/auth-server
+
+## [1.66.1](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.66.0...@standardnotes/auth-server@1.66.1) (2022-12-09)
+
+**Note:** Version bump only for package @standardnotes/auth-server
+
+# [1.66.0](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.65.0...@standardnotes/auth-server@1.66.0) (2022-12-09)
+
+### Features
+
+* **email:** replace offline subscription token created event in favour of email requested ([b595264](https://github.com/standardnotes/server/commit/b595264e313ac5ae5404f6a4a05b90b8c11f7f02))
+
+# [1.65.0](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.64.7...@standardnotes/auth-server@1.65.0) (2022-12-09)
+
+### Features
+
+* **auth:** remove offline subscription token created event in favour of email requested ([fd58992](https://github.com/standardnotes/server/commit/fd589922bba29595a0dfd154a42fe158024fad28))
+
+## [1.64.7](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.64.6...@standardnotes/auth-server@1.64.7) (2022-12-09)
+
+**Note:** Version bump only for package @standardnotes/auth-server
+
+## [1.64.6](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.64.5...@standardnotes/auth-server@1.64.6) (2022-12-08)
+
+**Note:** Version bump only for package @standardnotes/auth-server
+
+## [1.64.5](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.64.4...@standardnotes/auth-server@1.64.5) (2022-12-08)
+
+**Note:** Version bump only for package @standardnotes/auth-server
+
+## [1.64.4](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.64.3...@standardnotes/auth-server@1.64.4) (2022-12-08)
+
+**Note:** Version bump only for package @standardnotes/auth-server
+
+## [1.64.3](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.64.2...@standardnotes/auth-server@1.64.3) (2022-12-08)
+
+**Note:** Version bump only for package @standardnotes/auth-server
+
+## [1.64.2](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.64.1...@standardnotes/auth-server@1.64.2) (2022-12-08)
+
+**Note:** Version bump only for package @standardnotes/auth-server
+
+## [1.64.1](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.64.0...@standardnotes/auth-server@1.64.1) (2022-12-07)
+
+**Note:** Version bump only for package @standardnotes/auth-server
+
+# [1.64.0](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.63.2...@standardnotes/auth-server@1.64.0) (2022-12-07)
+
+### Features
+
+* **auth:** replace user signed in events with email requested ([e48cca6](https://github.com/standardnotes/server/commit/e48cca6b45b02876f2d82b726c1d2f124d90b587))
+
+## [1.63.2](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.63.1...@standardnotes/auth-server@1.63.2) (2022-12-07)
+
+**Note:** Version bump only for package @standardnotes/auth-server
+
+## [1.63.1](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.63.0...@standardnotes/auth-server@1.63.1) (2022-12-07)
+
+### Bug Fixes
+
+* **auth:** remove not needed event from factory ([2542cf6](https://github.com/standardnotes/server/commit/2542cf6f9a40c3a5eb4e11ead3cbbc25afefae48))
+
+# [1.63.0](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.62.1...@standardnotes/auth-server@1.63.0) (2022-12-07)
+
+### Features
+
+* **domain-core:** rename email subscription rejection level to email level ([c87561f](https://github.com/standardnotes/server/commit/c87561fca782883b84f58b4f0b9f85ecc279ca50))
+
+## [1.62.1](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.62.0...@standardnotes/auth-server@1.62.1) (2022-12-06)
+
+### Bug Fixes
+
+* **auth:** remove redundant specs and fix stream query ([fb81d2b](https://github.com/standardnotes/server/commit/fb81d2b9260cf7bee3e3e6911d5a6e8eb1d650e3))
+
+# [1.62.0](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.61.0...@standardnotes/auth-server@1.62.0) (2022-12-06)
+
+### Features
+
+* **auth:** add procedure for email subscriptions sync ([7848dc0](https://github.com/standardnotes/server/commit/7848dc06d4f4fe8c380ed45c32e23ac0e62014fa))
+
+# [1.61.0](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.60.17...@standardnotes/auth-server@1.61.0) (2022-12-06)
+
+### Features
+
+* **auth:** add publishing mute emails setting changed event ([6928988](https://github.com/standardnotes/server/commit/6928988f7855c939f2365e35cb6cb0ff18e5c37a))
+
+## [1.60.17](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.60.16...@standardnotes/auth-server@1.60.17) (2022-12-06)
+
+**Note:** Version bump only for package @standardnotes/auth-server
+
+## [1.60.16](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.60.15...@standardnotes/auth-server@1.60.16) (2022-12-05)
+
+**Note:** Version bump only for package @standardnotes/auth-server
+
+## [1.60.15](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.60.14...@standardnotes/auth-server@1.60.15) (2022-11-30)
+
+**Note:** Version bump only for package @standardnotes/auth-server
+
+## [1.60.14](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.60.13...@standardnotes/auth-server@1.60.14) (2022-11-28)
+
+**Note:** Version bump only for package @standardnotes/auth-server
+
+## [1.60.13](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.60.12...@standardnotes/auth-server@1.60.13) (2022-11-25)
+
+### Bug Fixes
+
+* **auth:** bring back streaming all users in an email campaign send out ([8407c3b](https://github.com/standardnotes/server/commit/8407c3b64910c87591a97b856f5b0c0aebc98e51))
+
+## [1.60.12](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.60.11...@standardnotes/auth-server@1.60.12) (2022-11-25)
+
+### Bug Fixes
+
+* **auth:** tmp test email campaign black friday 2022 reminder on team only ([25a6796](https://github.com/standardnotes/server/commit/25a6796e636bc30de99001bd16a2a1084b608b6a))
+
+## [1.60.11](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.60.10...@standardnotes/auth-server@1.60.11) (2022-11-25)
+
+**Note:** Version bump only for package @standardnotes/auth-server
+
+## [1.60.10](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.60.9...@standardnotes/auth-server@1.60.10) (2022-11-24)
+
+**Note:** Version bump only for package @standardnotes/auth-server
+
+## [1.60.9](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.60.8...@standardnotes/auth-server@1.60.9) (2022-11-23)
+
+**Note:** Version bump only for package @standardnotes/auth-server
+
+## [1.60.8](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.60.7...@standardnotes/auth-server@1.60.8) (2022-11-23)
+
+### Bug Fixes
+
+* binding of sns and sqs with additional config ([74bc791](https://github.com/standardnotes/server/commit/74bc79116bc50d9a5af1a558db1b7108dcda6d0e))
+
+## [1.60.7](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.60.6...@standardnotes/auth-server@1.60.7) (2022-11-22)
+
+### Bug Fixes
+
+* **auth:** remove temporary email campaign check for team member ([5f2be44](https://github.com/standardnotes/server/commit/5f2be44b853e83abb6c4e758efd477e899381e07))
+
+## [1.60.6](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.60.5...@standardnotes/auth-server@1.60.6) (2022-11-22)
+
+### Bug Fixes
+
+* sns binding ([3686a26](https://github.com/standardnotes/server/commit/3686a260192468c00b52087590dd2edf76ada939))
+
+## [1.60.5](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.60.4...@standardnotes/auth-server@1.60.5) (2022-11-22)
+
+### Bug Fixes
+
+* **auth:** tmp send email campaign only to team ([94359f1](https://github.com/standardnotes/server/commit/94359f1299a2bb009099af163d3929c4adc7e274))
+
+## [1.60.4](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.60.3...@standardnotes/auth-server@1.60.4) (2022-11-22)
+
+**Note:** Version bump only for package @standardnotes/auth-server
+
+## [1.60.3](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.60.2...@standardnotes/auth-server@1.60.3) (2022-11-21)
+
+**Note:** Version bump only for package @standardnotes/auth-server
+
+## [1.60.2](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.60.1...@standardnotes/auth-server@1.60.2) (2022-11-18)
+
+**Note:** Version bump only for package @standardnotes/auth-server
+
+## [1.60.1](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.60.0...@standardnotes/auth-server@1.60.1) (2022-11-16)
+
+**Note:** Version bump only for package @standardnotes/auth-server
+
 # [1.60.0](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.59.11...@standardnotes/auth-server@1.60.0) (2022-11-14)
 
 ### Features

packages/auth/bin/email.ts

@@ -1,136 +0,0 @@
-import 'reflect-metadata'
-
-import 'newrelic'
-
-import { Stream } from 'stream'
-
-import { Logger } from 'winston'
-import * as dayjs from 'dayjs'
-import * as utc from 'dayjs/plugin/utc'
-
-import { UserRepositoryInterface } from '../src/Domain/User/UserRepositoryInterface'
-import { ContainerConfigLoader } from '../src/Bootstrap/Container'
-import TYPES from '../src/Bootstrap/Types'
-import { Env } from '../src/Bootstrap/Env'
-import { SettingServiceInterface } from '../src/Domain/Setting/SettingServiceInterface'
-import { DomainEventFactoryInterface } from '../src/Domain/Event/DomainEventFactoryInterface'
-import { UserSubscriptionRepositoryInterface } from '../src/Domain/Subscription/UserSubscriptionRepositoryInterface'
-import { DomainEventPublisherInterface } from '@standardnotes/domain-events'
-import { MuteMarketingEmailsOption, SettingName } from '@standardnotes/settings'
-import { EmailMessageIdentifier } from '@standardnotes/common'
-import { TimerInterface } from '@standardnotes/time'
-
-const inputArgs = process.argv.slice(2)
-const emailMessageIdentifier = inputArgs[0]
-
-const sendEmailCampaign = async (
-  userRepository: UserRepositoryInterface,
-  settingService: SettingServiceInterface,
-  userSubscriptionRepository: UserSubscriptionRepositoryInterface,
-  timer: TimerInterface,
-  domainEventFactory: DomainEventFactoryInterface,
-  domainEventPublisher: DomainEventPublisherInterface,
-  logger: Logger,
-): Promise<void> => {
-  const stream = await userRepository.streamAll()
-
-  return new Promise((resolve, reject) => {
-    stream
-      .pipe(
-        new Stream.Transform({
-          objectMode: true,
-          transform: async (rawUserData, _encoding, callback) => {
-            try {
-              const emailsMutedSetting = await settingService.findSettingWithDecryptedValue({
-                userUuid: rawUserData.user_uuid,
-                settingName: SettingName.MuteMarketingEmails,
-              })
-
-              if (emailsMutedSetting === null || emailsMutedSetting.value === MuteMarketingEmailsOption.Muted) {
-                callback()
-
-                return
-              }
-
-              let activeSubscription = false
-              let subscriptionPlanName = null
-
-              const userSubscription = await userSubscriptionRepository.findOneByUserUuid(rawUserData.user_uuid)
-              if (userSubscription !== null) {
-                activeSubscription =
-                  !userSubscription.cancelled && userSubscription.endsAt > timer.getTimestampInMicroseconds()
-                subscriptionPlanName = userSubscription.planName
-              }
-
-              await domainEventPublisher.publish(
-                domainEventFactory.createEmailMessageRequestedEvent({
-                  userEmail: rawUserData.user_email,
-                  messageIdentifier: emailMessageIdentifier as EmailMessageIdentifier,
-                  context: {
-                    activeSubscription,
-                    subscriptionPlanName,
-                    muteEmailsSettingUuid: emailsMutedSetting.uuid,
-                  },
-                }),
-              )
-            } catch (error) {
-              logger.error(`Could not process user ${rawUserData.user_uuid}: ${(error as Error).message}`)
-            }
-
-            callback()
-          },
-        }),
-      )
-      .on('finish', resolve)
-      .on('error', reject)
-  })
-}
-
-const container = new ContainerConfigLoader()
-void container.load().then((container) => {
-  dayjs.extend(utc)
-
-  const env: Env = new Env()
-  env.load()
-
-  const logger: Logger = container.get(TYPES.Logger)
-
-  logger.info(`Starting email campaign for email ${emailMessageIdentifier} ...`)
-
-  if (!emailMessageIdentifier) {
-    logger.error('No email message identifier passed as argument. Skipped sending.')
-
-    process.exit(1)
-  }
-
-  const userRepository: UserRepositoryInterface = container.get(TYPES.UserRepository)
-  const settingService: SettingServiceInterface = container.get(TYPES.SettingService)
-  const userSubscriptionRepository: UserSubscriptionRepositoryInterface = container.get(
-    TYPES.UserSubscriptionRepository,
-  )
-  const timer: TimerInterface = container.get(TYPES.Timer)
-  const domainEventFactory: DomainEventFactoryInterface = container.get(TYPES.DomainEventFactory)
-  const domainEventPublisher: DomainEventPublisherInterface = container.get(TYPES.DomainEventPublisher)
-
-  Promise.resolve(
-    sendEmailCampaign(
-      userRepository,
-      settingService,
-      userSubscriptionRepository,
-      timer,
-      domainEventFactory,
-      domainEventPublisher,
-      logger,
-    ),
-  )
-    .then(() => {
-      logger.info(`${emailMessageIdentifier} email campaign complete.`)
-
-      process.exit(0)
-    })
-    .catch((error) => {
-      logger.error(`Could not finish ${emailMessageIdentifier} email campaign: ${error.message}`)
-
-      process.exit(1)
-    })
-})

packages/auth/docker/entrypoint.sh

@@ -5,64 +5,58 @@ COMMAND=$1 && shift 1
 
 case "$COMMAND" in
   'start-local' )
-    echo "Starting Web..."
+    echo "[Docker] Starting Web..."
     yarn workspace @standardnotes/auth-server start:local
     ;;
 
   'start-web' )
-    echo "Starting Web..."
+    echo "[Docker] Starting Web..."
     yarn workspace @standardnotes/auth-server start
     ;;
 
   'start-worker' )
-    echo "Starting Worker..."
+    echo "[Docker] Starting Worker..."
     yarn workspace @standardnotes/auth-server worker
     ;;
 
   'email-daily-backup' )
-    echo "Starting Email Daily Backup..."
+    echo "[Docker] Starting Email Daily Backup..."
     yarn workspace @standardnotes/auth-server daily-backup:email
     ;;
 
   'email-weekly-backup' )
-    echo "Starting Email Weekly Backup..."
+    echo "[Docker] Starting Email Weekly Backup..."
     yarn workspace @standardnotes/auth-server weekly-backup:email
     ;;
 
   'email-backup' )
-    echo "Starting Email Backup For Single User..."
+    echo "[Docker] Starting Email Backup For Single User..."
     EMAIL=$1 && shift 1
     yarn workspace @standardnotes/auth-server user-email-backup $EMAIL
     ;;
 
   'dropbox-daily-backup' )
-    echo "Starting Dropbox Daily Backup..."
+    echo "[Docker] Starting Dropbox Daily Backup..."
     yarn workspace @standardnotes/auth-server daily-backup:dropbox
     ;;
 
   'google-drive-daily-backup' )
-    echo "Starting Google Drive Daily Backup..."
+    echo "[Docker] Starting Google Drive Daily Backup..."
     yarn workspace @standardnotes/auth-server daily-backup:google_drive
     ;;
 
   'one-drive-daily-backup' )
-    echo "Starting One Drive Daily Backup..."
+    echo "[Docker] Starting One Drive Daily Backup..."
     yarn workspace @standardnotes/auth-server daily-backup:one_drive
     ;;
 
-  'email-campaign' )
-    echo "Starting Email Campaign Sending..."
-    MESSAGE_IDENTIFIER=$1 && shift 1
-    yarn workspace @standardnotes/auth-server email-campaign $MESSAGE_IDENTIFIER
-    ;;
-
   'content-recalculation' )
-    echo "Starting Content Size Recalculation..."
+    echo "[Docker] Starting Content Size Recalculation..."
     yarn workspace @standardnotes/auth-server content-recalculation
     ;;
 
    * )
-    echo "Unknown command"
+    echo "[Docker] Unknown command"
     ;;
 esac
 

packages/auth/jest.config.js

@@ -7,6 +7,6 @@ module.exports = {
   transform: {
     ...tsjPreset.transform,
   },
-  coveragePathIgnorePatterns: ['/Bootstrap/', '/InversifyExpressUtils/', 'HealthCheckController'],
+  coveragePathIgnorePatterns: ['/Bootstrap/', '/InversifyExpressUtils/', '/Infra/', '/Projection/', '/Domain/Email/'],
   setupFilesAfterEnv: ['./test-setup.ts'],
 }

packages/auth/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/auth-server",
-  "version": "1.60.0",
+  "version": "1.67.1",
   "engines": {
     "node": ">=18.0.0 <19.0.0"
   },
@@ -26,16 +26,15 @@
     "daily-backup:one_drive": "yarn node dist/bin/backup.js one_drive daily",
     "weekly-backup:email": "yarn node dist/bin/backup.js email weekly",
     "content-recalculation": "yarn node dist/bin/content.js",
-    "email-campaign": "yarn node dist/bin/email.js",
     "typeorm": "typeorm-ts-node-commonjs",
     "upgrade:snjs": "yarn ncu -u '@standardnotes/*'"
   },
   "dependencies": {
-    "@newrelic/native-metrics": "^9.0.0",
     "@newrelic/winston-enricher": "^4.0.0",
     "@sentry/node": "^7.19.0",
     "@standardnotes/api": "^1.19.0",
     "@standardnotes/common": "workspace:*",
+    "@standardnotes/domain-core": "workspace:^",
     "@standardnotes/domain-events": "workspace:*",
     "@standardnotes/domain-events-infra": "workspace:*",
     "@standardnotes/features": "^1.52.1",
@@ -46,7 +45,7 @@
     "@standardnotes/sncrypto-common": "^1.9.0",
     "@standardnotes/sncrypto-node": "workspace:*",
     "@standardnotes/time": "workspace:*",
-    "aws-sdk": "^2.1253.0",
+    "aws-sdk": "^2.1260.0",
     "axios": "^1.1.3",
     "bcryptjs": "2.4.3",
     "cors": "2.8.5",

packages/auth/src/Bootstrap/Container.ts

@@ -193,6 +193,7 @@ import { SubscriptionInvitesController } from '../Controller/SubscriptionInvites
 import { CreateCrossServiceToken } from '../Domain/UseCase/CreateCrossServiceToken/CreateCrossServiceToken'
 import { ProcessUserRequest } from '../Domain/UseCase/ProcessUserRequest/ProcessUserRequest'
 import { UserRequestsController } from '../Controller/UserRequestsController'
+import { EmailSubscriptionUnsubscribedEventHandler } from '../Domain/Handler/EmailSubscriptionUnsubscribedEventHandler'
 
 // eslint-disable-next-line @typescript-eslint/no-var-requires
 const newrelicFormatter = require('@newrelic/winston-enricher')
@@ -230,13 +231,24 @@ export class ContainerConfigLoader {
     })
     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('SNS_TOPIC_ARN', true)) {
+      const snsConfig: AWS.SNS.Types.ClientConfiguration = {
+        apiVersion: 'latest',
+        region: env.get('SNS_AWS_REGION', true),
+      }
+      if (env.get('SNS_ENDPOINT', true)) {
+        snsConfig.endpoint = env.get('SNS_ENDPOINT', true)
+      }
+      if (env.get('SNS_DISABLE_SSL', true) === 'true') {
+        snsConfig.sslEnabled = false
+      }
+      if (env.get('SNS_ACCESS_KEY_ID', true) && env.get('SNS_SECRET_ACCESS_KEY', true)) {
+        snsConfig.credentials = {
+          accessKeyId: env.get('SNS_ACCESS_KEY_ID', true),
+          secretAccessKey: env.get('SNS_SECRET_ACCESS_KEY', true),
+        }
+      }
+      container.bind<AWS.SNS>(TYPES.SNS).toConstantValue(new AWS.SNS(snsConfig))
     }
 
     if (env.get('SQS_QUEUE_URL', true)) {
@@ -549,6 +561,15 @@ export class ContainerConfigLoader {
         )
     }
 
+    container
+      .bind<EmailSubscriptionUnsubscribedEventHandler>(TYPES.EmailSubscriptionUnsubscribedEventHandler)
+      .toConstantValue(
+        new EmailSubscriptionUnsubscribedEventHandler(
+          container.get(TYPES.UserRepository),
+          container.get(TYPES.SettingService),
+        ),
+      )
+
     const eventHandlers: Map<string, DomainEventHandlerInterface> = new Map([
       ['USER_REGISTERED', container.get(TYPES.UserRegisteredEventHandler)],
       ['ACCOUNT_DELETION_REQUESTED', container.get(TYPES.AccountDeletionRequestedEventHandler)],
@@ -571,6 +592,7 @@ export class ContainerConfigLoader {
       ],
       ['SHARED_SUBSCRIPTION_INVITATION_CREATED', container.get(TYPES.SharedSubscriptionInvitationCreatedEventHandler)],
       ['PREDICATE_VERIFICATION_REQUESTED', container.get(TYPES.PredicateVerificationRequestedEventHandler)],
+      ['EMAIL_SUBSCRIPTION_UNSUBSCRIBED', container.get(TYPES.EmailSubscriptionUnsubscribedEventHandler)],
     ])
 
     if (env.get('SQS_QUEUE_URL', true)) {

packages/auth/src/Bootstrap/Types.ts

@@ -138,6 +138,7 @@ const TYPES = {
   UserDisabledSessionUserAgentLoggingEventHandler: Symbol.for('UserDisabledSessionUserAgentLoggingEventHandler'),
   SharedSubscriptionInvitationCreatedEventHandler: Symbol.for('SharedSubscriptionInvitationCreatedEventHandler'),
   PredicateVerificationRequestedEventHandler: Symbol.for('PredicateVerificationRequestedEventHandler'),
+  EmailSubscriptionUnsubscribedEventHandler: Symbol.for('EmailSubscriptionUnsubscribedEventHandler'),
   // Services
   DeviceDetector: Symbol.for('DeviceDetector'),
   SessionService: Symbol.for('SessionService'),

packages/auth/src/Domain/Email/OfflineSubscriptionTokenCreated.ts

@@ -0,0 +1,9 @@
+import { html } from './offline-subscription-token-created.html'
+
+export function getSubject(): string {
+  return 'Access to your Standard Notes Subscription Dashboard'
+}
+
+export function getBody(email: string, offlineSubscriptionDashboardUrl: string): string {
+  return html(email, offlineSubscriptionDashboardUrl)
+}

packages/auth/src/Domain/Email/SharedSubscriptionInvitationCreated.ts

@@ -0,0 +1,9 @@
+import { html } from './shared-subscription-invitation-created.html'
+
+export function getSubject(): string {
+  return 'You have been invited to a Standard Notes subscription'
+}
+
+export function getBody(inviterIdentifier: string, inviteUuid: string): string {
+  return html(inviterIdentifier, inviteUuid)
+}

packages/auth/src/Domain/Email/UserSignedIn.ts

@@ -0,0 +1,9 @@
+import { html } from './user-signed-in.html'
+
+export function getSubject(email: string): string {
+  return `New sign-in for ${email}`
+}
+
+export function getBody(email: string, device: string, browser: string, date: Date): string {
+  return html(email, device, browser, date.toLocaleString())
+}

packages/auth/src/Domain/Email/offline-subscription-token-created.html.ts

@@ -0,0 +1,24 @@
+export const html = (userEmail: string, offlineSubscriptionDashboardUrl: string) => `<div class="sn-component">
+<div class="sk-panel static">
+  <div class="sk-panel-content">
+    <div class="sk-panel-section">
+      <h1 class="h1 title sk-panel-row">
+        <div class="sk-panel-column">
+          Access your Standard Notes Subscription Dashboard,
+        </div>
+      </h1>
+      <div class="faded sk-panel-row small">Registered as ${userEmail}</div>
+    </div>
+    <div class="sk-panel-section">
+      <div class="title">Link to your subscription dashboard: <a
+          href="${offlineSubscriptionDashboardUrl}">${offlineSubscriptionDashboardUrl}</a></div>
+    </div>
+    <div class="sk-panel-section">
+      <p>
+        Get help any time by visiting our <a href="https://standardnotes.com/help">Help page</a>
+        or by replying directly to this email.
+      </p>
+    </div>
+  </div>
+</div>
+</div>`

packages/auth/src/Domain/Email/shared-subscription-invitation-created.html.ts

@@ -0,0 +1,5 @@
+export const html = (inviterIdentifier: string, inviteUuid: string) => `<p>Hello,</p>
+<p>You've been invited to join a Standard Notes premium subscription at no cost. ${inviterIdentifier} has invited you to share the benefits of their subscription plan.</p>
+<p>
+  <a href='https://app.standardnotes.com/?accept-subscription-invite=${inviteUuid}'>Accept Invite</a>
+</p>`

packages/auth/src/Domain/Email/user-signed-in.html.ts

@@ -0,0 +1,24 @@
+export const html = (email: string, device: string, browser: string, timeAndDate: string) => `
+<div>
+<p>Hello,</p>
+<p>We've detected a new sign-in to your account ${email}</p>
+<p>
+  <b>Device type</b>: ${device}
+</p>
+<p>
+  <b>Browser type</b>: ${browser}
+</p>
+<p>
+  <strong>Time and date</strong>: <span>${timeAndDate}</span>
+</p>
+<p>
+  If this was you, please disregard this email. If it wasn't you, we recommend signing into your account and
+  changing your password immediately, then enabling 2FA.
+</p>
+<p>
+  Thanks,
+  <br />
+  SN
+</p>
+</div>
+`

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

@@ -1,25 +1,24 @@
 /* istanbul ignore file */
 
-import { EmailMessageIdentifier, JSONString, ProtocolVersion, RoleName, Uuid } from '@standardnotes/common'
+import { JSONString, ProtocolVersion, RoleName, Uuid } from '@standardnotes/common'
 import {
   AccountDeletionRequestedEvent,
   UserEmailChangedEvent,
   UserRegisteredEvent,
   UserRolesChangedEvent,
-  OfflineSubscriptionTokenCreatedEvent,
   EmailBackupRequestedEvent,
   CloudBackupRequestedEvent,
   ListedAccountRequestedEvent,
-  UserSignedInEvent,
   UserDisabledSessionUserAgentLoggingEvent,
   SharedSubscriptionInvitationCreatedEvent,
   SharedSubscriptionInvitationCanceledEvent,
   PredicateVerifiedEvent,
   DomainEventService,
-  EmailMessageRequestedEvent,
   WebSocketMessageRequestedEvent,
   ExitDiscountApplyRequestedEvent,
   UserContentSizeRecalculationRequestedEvent,
+  MuteEmailsSettingChangedEvent,
+  EmailRequestedEvent,
 } from '@standardnotes/domain-events'
 import { Predicate, PredicateVerificationResult } from '@standardnotes/predicates'
 import { TimerInterface } from '@standardnotes/time'
@@ -32,6 +31,25 @@ import { DomainEventFactoryInterface } from './DomainEventFactoryInterface'
 export class DomainEventFactory implements DomainEventFactoryInterface {
   constructor(@inject(TYPES.Timer) private timer: TimerInterface) {}
 
+  createMuteEmailsSettingChangedEvent(dto: {
+    username: string
+    mute: boolean
+    emailSubscriptionRejectionLevel: string
+  }): MuteEmailsSettingChangedEvent {
+    return {
+      type: 'MUTE_EMAILS_SETTING_CHANGED',
+      createdAt: this.timer.getUTCDate(),
+      meta: {
+        correlation: {
+          userIdentifier: dto.username,
+          userIdentifierType: 'email',
+        },
+        origin: DomainEventService.Auth,
+      },
+      payload: dto,
+    }
+  }
+
   createUserContentSizeRecalculationRequestedEvent(userUuid: string): UserContentSizeRecalculationRequestedEvent {
     return {
       type: 'USER_CONTENT_SIZE_RECALCULATION_REQUESTED',
@@ -82,13 +100,15 @@ export class DomainEventFactory implements DomainEventFactoryInterface {
     }
   }
 
-  createEmailMessageRequestedEvent(dto: {
+  createEmailRequestedEvent(dto: {
     userEmail: string
-    messageIdentifier: EmailMessageIdentifier
-    context: Record<string, unknown>
-  }): EmailMessageRequestedEvent {
+    messageIdentifier: string
+    level: string
+    body: string
+    subject: string
+  }): EmailRequestedEvent {
     return {
-      type: 'EMAIL_MESSAGE_REQUESTED',
+      type: 'EMAIL_REQUESTED',
       createdAt: this.timer.getUTCDate(),
       meta: {
         correlation: {
@@ -182,28 +202,6 @@ export class DomainEventFactory implements DomainEventFactoryInterface {
     }
   }
 
-  createUserSignedInEvent(dto: {
-    userUuid: string
-    userEmail: string
-    device: string
-    browser: string
-    signInAlertEnabled: boolean
-    muteSignInEmailsSettingUuid: Uuid
-  }): UserSignedInEvent {
-    return {
-      type: 'USER_SIGNED_IN',
-      createdAt: this.timer.getUTCDate(),
-      meta: {
-        correlation: {
-          userIdentifier: dto.userUuid,
-          userIdentifierType: 'uuid',
-        },
-        origin: DomainEventService.Auth,
-      },
-      payload: dto,
-    }
-  }
-
   createListedAccountRequestedEvent(userUuid: string, userEmail: string): ListedAccountRequestedEvent {
     return {
       type: 'LISTED_ACCOUNT_REQUESTED',
@@ -291,24 +289,6 @@ export class DomainEventFactory implements DomainEventFactoryInterface {
     }
   }
 
-  createOfflineSubscriptionTokenCreatedEvent(token: string, email: string): OfflineSubscriptionTokenCreatedEvent {
-    return {
-      type: 'OFFLINE_SUBSCRIPTION_TOKEN_CREATED',
-      createdAt: this.timer.getUTCDate(),
-      meta: {
-        correlation: {
-          userIdentifier: email,
-          userIdentifierType: 'email',
-        },
-        origin: DomainEventService.Auth,
-      },
-      payload: {
-        token,
-        email,
-      },
-    }
-  }
-
   createUserRegisteredEvent(dto: {
     userUuid: string
     email: string

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

@@ -1,4 +1,4 @@
-import { Uuid, RoleName, EmailMessageIdentifier, ProtocolVersion, JSONString } from '@standardnotes/common'
+import { Uuid, RoleName, ProtocolVersion, JSONString } from '@standardnotes/common'
 import { Predicate, PredicateVerificationResult } from '@standardnotes/predicates'
 import {
   AccountDeletionRequestedEvent,
@@ -6,37 +6,30 @@ import {
   UserRegisteredEvent,
   UserRolesChangedEvent,
   UserEmailChangedEvent,
-  OfflineSubscriptionTokenCreatedEvent,
   EmailBackupRequestedEvent,
   ListedAccountRequestedEvent,
-  UserSignedInEvent,
   UserDisabledSessionUserAgentLoggingEvent,
   SharedSubscriptionInvitationCreatedEvent,
   SharedSubscriptionInvitationCanceledEvent,
   PredicateVerifiedEvent,
-  EmailMessageRequestedEvent,
   WebSocketMessageRequestedEvent,
   ExitDiscountApplyRequestedEvent,
   UserContentSizeRecalculationRequestedEvent,
+  MuteEmailsSettingChangedEvent,
+  EmailRequestedEvent,
 } from '@standardnotes/domain-events'
 import { InviteeIdentifierType } from '../SharedSubscription/InviteeIdentifierType'
 
 export interface DomainEventFactoryInterface {
   createUserContentSizeRecalculationRequestedEvent(userUuid: string): UserContentSizeRecalculationRequestedEvent
   createWebSocketMessageRequestedEvent(dto: { userUuid: Uuid; message: JSONString }): WebSocketMessageRequestedEvent
-  createEmailMessageRequestedEvent(dto: {
+  createEmailRequestedEvent(dto: {
     userEmail: string
-    messageIdentifier: EmailMessageIdentifier
-    context: Record<string, unknown>
-  }): EmailMessageRequestedEvent
-  createUserSignedInEvent(dto: {
-    userUuid: string
-    userEmail: string
-    device: string
-    browser: string
-    signInAlertEnabled: boolean
-    muteSignInEmailsSettingUuid: Uuid
-  }): UserSignedInEvent
+    messageIdentifier: string
+    level: string
+    body: string
+    subject: string
+  }): EmailRequestedEvent
   createListedAccountRequestedEvent(userUuid: string, userEmail: string): ListedAccountRequestedEvent
   createUserRegisteredEvent(dto: {
     userUuid: string
@@ -62,7 +55,6 @@ export interface DomainEventFactoryInterface {
   }): AccountDeletionRequestedEvent
   createUserRolesChangedEvent(userUuid: string, email: string, currentRoles: RoleName[]): UserRolesChangedEvent
   createUserEmailChangedEvent(userUuid: string, fromEmail: string, toEmail: string): UserEmailChangedEvent
-  createOfflineSubscriptionTokenCreatedEvent(token: string, email: string): OfflineSubscriptionTokenCreatedEvent
   createUserDisabledSessionUserAgentLoggingEvent(dto: {
     userUuid: Uuid
     email: string
@@ -91,4 +83,9 @@ export interface DomainEventFactoryInterface {
     userEmail: string
     discountCode: string
   }): ExitDiscountApplyRequestedEvent
+  createMuteEmailsSettingChangedEvent(dto: {
+    username: string
+    mute: boolean
+    emailSubscriptionRejectionLevel: string
+  }): MuteEmailsSettingChangedEvent
 }

packages/auth/src/Domain/Handler/EmailSubscriptionUnsubscribedEventHandler.spec.ts

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

packages/auth/src/Domain/Handler/EmailSubscriptionUnsubscribedEventHandler.ts

@@ -0,0 +1,41 @@
+import { EmailLevel } from '@standardnotes/domain-core'
+import { DomainEventHandlerInterface, EmailSubscriptionUnsubscribedEvent } from '@standardnotes/domain-events'
+import { SettingName } from '@standardnotes/settings'
+
+import { SettingServiceInterface } from '../Setting/SettingServiceInterface'
+import { UserRepositoryInterface } from '../User/UserRepositoryInterface'
+
+export class EmailSubscriptionUnsubscribedEventHandler implements DomainEventHandlerInterface {
+  constructor(private userRepository: UserRepositoryInterface, private settingsService: SettingServiceInterface) {}
+
+  async handle(event: EmailSubscriptionUnsubscribedEvent): Promise<void> {
+    const user = await this.userRepository.findOneByEmail(event.payload.userEmail)
+    if (user === null) {
+      return
+    }
+
+    await this.settingsService.createOrReplace({
+      user,
+      props: {
+        name: this.getSettingNameFromLevel(event.payload.level),
+        unencryptedValue: 'muted',
+        sensitive: false,
+      },
+    })
+  }
+
+  private getSettingNameFromLevel(level: string): string {
+    switch (level) {
+      case EmailLevel.LEVELS.FailedCloudBackup:
+        return SettingName.MuteFailedCloudBackupsEmails
+      case EmailLevel.LEVELS.FailedEmailBackup:
+        return SettingName.MuteFailedBackupsEmails
+      case EmailLevel.LEVELS.Marketing:
+        return SettingName.MuteMarketingEmails
+      case EmailLevel.LEVELS.SignIn:
+        return SettingName.MuteSignInEmails
+      default:
+        throw new Error(`Unknown level: ${level}`)
+    }
+  }
+}

packages/auth/src/Domain/Setting/SettingInterpreter.spec.ts

@@ -2,11 +2,13 @@ import {
   CloudBackupRequestedEvent,
   DomainEventPublisherInterface,
   EmailBackupRequestedEvent,
+  MuteEmailsSettingChangedEvent,
   UserDisabledSessionUserAgentLoggingEvent,
 } from '@standardnotes/domain-events'
 import {
   EmailBackupFrequency,
   LogSessionUserAgentOption,
+  MuteMarketingEmailsOption,
   OneDriveBackupFrequency,
   SettingName,
 } from '@standardnotes/settings'
@@ -57,6 +59,9 @@ describe('SettingInterpreter', () => {
     domainEventFactory.createUserDisabledSessionUserAgentLoggingEvent = jest
       .fn()
       .mockReturnValue({} as jest.Mocked<UserDisabledSessionUserAgentLoggingEvent>)
+    domainEventFactory.createMuteEmailsSettingChangedEvent = jest
+      .fn()
+      .mockReturnValue({} as jest.Mocked<MuteEmailsSettingChangedEvent>)
 
     logger = {} as jest.Mocked<Logger>
     logger.debug = jest.fn()
@@ -201,6 +206,23 @@ describe('SettingInterpreter', () => {
     )
   })
 
+  it('should trigger mute subscription emails rejection if mute setting changed', async () => {
+    const setting = {
+      name: SettingName.MuteMarketingEmails,
+      value: MuteMarketingEmailsOption.Muted,
+    } as jest.Mocked<Setting>
+    settingRepository.findOneByNameAndUserUuid = jest.fn().mockReturnValue(null)
+
+    await createInterpreter().interpretSettingUpdated(setting, user, MuteMarketingEmailsOption.Muted)
+
+    expect(domainEventPublisher.publish).toHaveBeenCalled()
+    expect(domainEventFactory.createMuteEmailsSettingChangedEvent).toHaveBeenCalledWith({
+      emailSubscriptionRejectionLevel: 'MARKETING',
+      mute: true,
+      username: 'test@test.te',
+    })
+  })
+
   it('should trigger cloud backup if backup frequency setting is updated and a backup token setting is present', async () => {
     settingRepository.findLastByNameAndUserUuid = jest.fn().mockReturnValueOnce({
       name: SettingName.OneDriveBackupToken,

packages/auth/src/Domain/Setting/SettingInterpreter.ts

@@ -1,4 +1,5 @@
 import { DomainEventPublisherInterface } from '@standardnotes/domain-events'
+import { EmailLevel } from '@standardnotes/domain-core'
 import {
   DropboxBackupFrequency,
   EmailBackupFrequency,
@@ -39,6 +40,13 @@ export class SettingInterpreter implements SettingInterpreterInterface {
     OneDriveBackupFrequency.Disabled,
   ]
 
+  private readonly emailSettingToSubscriptionRejectionLevelMap: Map<SettingName, string> = new Map([
+    [SettingName.MuteFailedBackupsEmails, EmailLevel.LEVELS.FailedEmailBackup],
+    [SettingName.MuteFailedCloudBackupsEmails, EmailLevel.LEVELS.FailedCloudBackup],
+    [SettingName.MuteMarketingEmails, EmailLevel.LEVELS.Marketing],
+    [SettingName.MuteSignInEmails, EmailLevel.LEVELS.SignIn],
+  ])
+
   constructor(
     @inject(TYPES.DomainEventPublisher) private domainEventPublisher: DomainEventPublisherInterface,
     @inject(TYPES.DomainEventFactory) private domainEventFactory: DomainEventFactoryInterface,
@@ -48,6 +56,10 @@ export class SettingInterpreter implements SettingInterpreterInterface {
   ) {}
 
   async interpretSettingUpdated(updatedSetting: Setting, user: User, unencryptedValue: string | null): Promise<void> {
+    if (this.isChangingMuteEmailsSetting(updatedSetting)) {
+      await this.triggerEmailSubscriptionChange(user, updatedSetting.name as SettingName, unencryptedValue)
+    }
+
     if (this.isEnablingEmailBackupSetting(updatedSetting)) {
       await this.triggerEmailBackup(user.uuid)
     }
@@ -78,6 +90,15 @@ export class SettingInterpreter implements SettingInterpreterInterface {
     )
   }
 
+  private isChangingMuteEmailsSetting(setting: Setting): boolean {
+    return [
+      SettingName.MuteFailedBackupsEmails,
+      SettingName.MuteFailedCloudBackupsEmails,
+      SettingName.MuteMarketingEmails,
+      SettingName.MuteSignInEmails,
+    ].includes(setting.name as SettingName)
+  }
+
   private isEnablingEmailBackupSetting(setting: Setting): boolean {
     return setting.name === SettingName.EmailBackupFrequency && setting.value !== EmailBackupFrequency.Disabled
   }
@@ -96,6 +117,20 @@ export class SettingInterpreter implements SettingInterpreterInterface {
     return SettingName.LogSessionUserAgent === setting.name && LogSessionUserAgentOption.Disabled === setting.value
   }
 
+  private async triggerEmailSubscriptionChange(
+    user: User,
+    settingName: SettingName,
+    unencryptedValue: string | null,
+  ): Promise<void> {
+    await this.domainEventPublisher.publish(
+      this.domainEventFactory.createMuteEmailsSettingChangedEvent({
+        username: user.email,
+        mute: unencryptedValue === 'muted',
+        emailSubscriptionRejectionLevel: this.emailSettingToSubscriptionRejectionLevelMap.get(settingName) as string,
+      }),
+    )
+  }
+
   private async triggerSessionUserAgentCleanup(user: User) {
     await this.domainEventPublisher.publish(
       this.domainEventFactory.createUserDisabledSessionUserAgentLoggingEvent({

packages/auth/src/Domain/UseCase/CreateOfflineSubscriptionToken/CreateOfflineSubscriptionToken.spec.ts

@@ -5,7 +5,7 @@ import { TimerInterface } from '@standardnotes/time'
 import { OfflineSubscriptionTokenRepositoryInterface } from '../../Auth/OfflineSubscriptionTokenRepositoryInterface'
 
 import { CreateOfflineSubscriptionToken } from './CreateOfflineSubscriptionToken'
-import { DomainEventPublisherInterface, OfflineSubscriptionTokenCreatedEvent } from '@standardnotes/domain-events'
+import { DomainEventPublisherInterface, EmailRequestedEvent } from '@standardnotes/domain-events'
 import { DomainEventFactoryInterface } from '../../Event/DomainEventFactoryInterface'
 import { OfflineUserSubscriptionRepositoryInterface } from '../../Subscription/OfflineUserSubscriptionRepositoryInterface'
 import { OfflineUserSubscription } from '../../Subscription/OfflineUserSubscription'
@@ -47,9 +47,7 @@ describe('CreateOfflineSubscriptionToken', () => {
     domainEventPublisher.publish = jest.fn()
 
     domainEventFactory = {} as jest.Mocked<DomainEventFactoryInterface>
-    domainEventFactory.createOfflineSubscriptionTokenCreatedEvent = jest
-      .fn()
-      .mockReturnValue({} as jest.Mocked<OfflineSubscriptionTokenCreatedEvent>)
+    domainEventFactory.createEmailRequestedEvent = jest.fn().mockReturnValue({} as jest.Mocked<EmailRequestedEvent>)
 
     timer = {} as jest.Mocked<TimerInterface>
     timer.convertStringDateToMicroseconds = jest.fn().mockReturnValue(1)
@@ -71,10 +69,7 @@ describe('CreateOfflineSubscriptionToken', () => {
       expiresAt: 1,
     })
 
-    expect(domainEventFactory.createOfflineSubscriptionTokenCreatedEvent).toHaveBeenCalledWith(
-      'random-string',
-      'test@test.com',
-    )
+    expect(domainEventFactory.createEmailRequestedEvent).toHaveBeenCalled()
     expect(domainEventPublisher.publish).toHaveBeenCalled()
   })
 
@@ -91,7 +86,7 @@ describe('CreateOfflineSubscriptionToken', () => {
     })
 
     expect(offlineSubscriptionTokenRepository.save).not.toHaveBeenCalled()
-    expect(domainEventFactory.createOfflineSubscriptionTokenCreatedEvent).not.toHaveBeenCalled()
+    expect(domainEventFactory.createEmailRequestedEvent).not.toHaveBeenCalled()
     expect(domainEventPublisher.publish).not.toHaveBeenCalled()
   })
 
@@ -110,7 +105,7 @@ describe('CreateOfflineSubscriptionToken', () => {
     })
 
     expect(offlineSubscriptionTokenRepository.save).not.toHaveBeenCalled()
-    expect(domainEventFactory.createOfflineSubscriptionTokenCreatedEvent).not.toHaveBeenCalled()
+    expect(domainEventFactory.createEmailRequestedEvent).not.toHaveBeenCalled()
     expect(domainEventPublisher.publish).not.toHaveBeenCalled()
   })
 
@@ -129,7 +124,7 @@ describe('CreateOfflineSubscriptionToken', () => {
     })
 
     expect(offlineSubscriptionTokenRepository.save).not.toHaveBeenCalled()
-    expect(domainEventFactory.createOfflineSubscriptionTokenCreatedEvent).not.toHaveBeenCalled()
+    expect(domainEventFactory.createEmailRequestedEvent).not.toHaveBeenCalled()
     expect(domainEventPublisher.publish).not.toHaveBeenCalled()
   })
 })

packages/auth/src/Domain/UseCase/CreateOfflineSubscriptionToken/CreateOfflineSubscriptionToken.ts

@@ -1,4 +1,5 @@
 import { DomainEventPublisherInterface } from '@standardnotes/domain-events'
+import { EmailLevel } from '@standardnotes/domain-core'
 import { CryptoNode } from '@standardnotes/sncrypto-node'
 import { TimerInterface } from '@standardnotes/time'
 import { inject, injectable } from 'inversify'
@@ -6,6 +7,7 @@ import { Logger } from 'winston'
 
 import TYPES from '../../../Bootstrap/Types'
 import { OfflineSubscriptionTokenRepositoryInterface } from '../../Auth/OfflineSubscriptionTokenRepositoryInterface'
+import { getBody, getSubject } from '../../Email/OfflineSubscriptionTokenCreated'
 import { DomainEventFactoryInterface } from '../../Event/DomainEventFactoryInterface'
 import { OfflineUserSubscriptionRepositoryInterface } from '../../Subscription/OfflineUserSubscriptionRepositoryInterface'
 import { UseCaseInterface } from '../UseCaseInterface'
@@ -62,7 +64,13 @@ export class CreateOfflineSubscriptionToken implements UseCaseInterface {
     await this.offlineSubscriptionTokenRepository.save(offlineSubscriptionToken)
 
     await this.domainEventPublisher.publish(
-      this.domainEventFactory.createOfflineSubscriptionTokenCreatedEvent(token, dto.userEmail),
+      this.domainEventFactory.createEmailRequestedEvent({
+        body: getBody(dto.userEmail, `https://standardnotes.com/dashboard/offline?subscription_token=${token}`),
+        level: EmailLevel.LEVELS.System,
+        subject: getSubject(),
+        messageIdentifier: 'OFFLINE_SUBSCRIPTION_ACCESS',
+        userEmail: dto.userEmail,
+      }),
     )
 
     return {

packages/auth/src/Domain/UseCase/InviteToSharedSubscription/InviteToSharedSubscription.spec.ts

@@ -1,6 +1,10 @@
 import 'reflect-metadata'
 
-import { DomainEventPublisherInterface, SharedSubscriptionInvitationCreatedEvent } from '@standardnotes/domain-events'
+import {
+  DomainEventPublisherInterface,
+  SharedSubscriptionInvitationCreatedEvent,
+  EmailRequestedEvent,
+} from '@standardnotes/domain-events'
 import { TimerInterface } from '@standardnotes/time'
 import { DomainEventFactoryInterface } from '../../Event/DomainEventFactoryInterface'
 import { SharedSubscriptionInvitationRepositoryInterface } from '../../SharedSubscription/SharedSubscriptionInvitationRepositoryInterface'
@@ -51,6 +55,7 @@ describe('InviteToSharedSubscription', () => {
     domainEventFactory.createSharedSubscriptionInvitationCreatedEvent = jest
       .fn()
       .mockReturnValue({} as jest.Mocked<SharedSubscriptionInvitationCreatedEvent>)
+    domainEventFactory.createEmailRequestedEvent = jest.fn().mockReturnValue({} as jest.Mocked<EmailRequestedEvent>)
   })
 
   it('should not create an inivitation for sharing the subscription if inviter has no subscription', async () => {

packages/auth/src/Domain/UseCase/InviteToSharedSubscription/InviteToSharedSubscription.ts

@@ -1,9 +1,11 @@
 import { RoleName } from '@standardnotes/common'
 import { DomainEventPublisherInterface } from '@standardnotes/domain-events'
+import { EmailLevel } from '@standardnotes/domain-core'
 import { TimerInterface } from '@standardnotes/time'
 import { inject, injectable } from 'inversify'
 
 import TYPES from '../../../Bootstrap/Types'
+import { getBody, getSubject } from '../../Email/SharedSubscriptionInvitationCreated'
 import { DomainEventFactoryInterface } from '../../Event/DomainEventFactoryInterface'
 import { InvitationStatus } from '../../SharedSubscription/InvitationStatus'
 import { InviteeIdentifierType } from '../../SharedSubscription/InviteeIdentifierType'
@@ -89,6 +91,16 @@ export class InviteToSharedSubscription implements UseCaseInterface {
       }),
     )
 
+    await this.domainEventPublisher.publish(
+      this.domainEventFactory.createEmailRequestedEvent({
+        userEmail: dto.inviteeIdentifier,
+        level: EmailLevel.LEVELS.System,
+        body: getBody(dto.inviterEmail, savedInvitation.uuid),
+        messageIdentifier: 'SHARED_SUBSCRIPTION_INVITATION',
+        subject: getSubject(),
+      }),
+    )
+
     return {
       success: true,
       sharedSubscriptionInvitationUuid: savedInvitation.uuid,

packages/auth/src/Domain/UseCase/SignIn.spec.ts

@@ -1,6 +1,6 @@
 import 'reflect-metadata'
 
-import { DomainEventPublisherInterface, UserSignedInEvent } from '@standardnotes/domain-events'
+import { DomainEventPublisherInterface, EmailRequestedEvent } from '@standardnotes/domain-events'
 import { Logger } from 'winston'
 
 import { AuthResponseFactoryInterface } from '../Auth/AuthResponseFactoryInterface'
@@ -10,10 +10,6 @@ import { SessionServiceInterface } from '../Session/SessionServiceInterface'
 import { User } from '../User/User'
 import { UserRepositoryInterface } from '../User/UserRepositoryInterface'
 import { SignIn } from './SignIn'
-import { RoleServiceInterface } from '../Role/RoleServiceInterface'
-import { SettingServiceInterface } from '../Setting/SettingServiceInterface'
-import { Setting } from '../Setting/Setting'
-import { MuteSignInEmailsOption } from '@standardnotes/settings'
 import { PKCERepositoryInterface } from '../User/PKCERepositoryInterface'
 import { CrypterInterface } from '../Encryption/CrypterInterface'
 import { ProtocolVersion } from '@standardnotes/common'
@@ -26,10 +22,7 @@ describe('SignIn', () => {
   let domainEventPublisher: DomainEventPublisherInterface
   let domainEventFactory: DomainEventFactoryInterface
   let sessionService: SessionServiceInterface
-  let roleService: RoleServiceInterface
   let logger: Logger
-  let settingService: SettingServiceInterface
-  let setting: Setting
   let pkceRepository: PKCERepositoryInterface
   let crypter: CrypterInterface
 
@@ -40,8 +33,6 @@ describe('SignIn', () => {
       domainEventPublisher,
       domainEventFactory,
       sessionService,
-      roleService,
-      settingService,
       pkceRepository,
       crypter,
       logger,
@@ -68,27 +59,12 @@ describe('SignIn', () => {
     domainEventPublisher.publish = jest.fn()
 
     domainEventFactory = {} as jest.Mocked<DomainEventFactoryInterface>
-    domainEventFactory.createUserSignedInEvent = jest.fn().mockReturnValue({} as jest.Mocked<UserSignedInEvent>)
+    domainEventFactory.createEmailRequestedEvent = jest.fn().mockReturnValue({} as jest.Mocked<EmailRequestedEvent>)
 
     sessionService = {} as jest.Mocked<SessionServiceInterface>
     sessionService.getOperatingSystemInfoFromUserAgent = jest.fn().mockReturnValue('iOS 1')
     sessionService.getBrowserInfoFromUserAgent = jest.fn().mockReturnValue('Firefox 1')
 
-    roleService = {} as jest.Mocked<RoleServiceInterface>
-    roleService.userHasPermission = jest.fn().mockReturnValue(true)
-
-    setting = {
-      uuid: '3-4-5',
-      value: MuteSignInEmailsOption.NotMuted,
-    } as jest.Mocked<Setting>
-
-    settingService = {} as jest.Mocked<SettingServiceInterface>
-    settingService.findSettingWithDecryptedValue = jest.fn().mockReturnValue(setting)
-    settingService.createOrReplace = jest.fn().mockReturnValue({
-      status: 'created',
-      setting,
-    })
-
     pkceRepository = {} as jest.Mocked<PKCERepositoryInterface>
     pkceRepository.removeCodeChallenge = jest.fn().mockReturnValue(true)
 
@@ -118,18 +94,33 @@ describe('SignIn', () => {
       authResponse: { foo: 'bar' },
     })
 
-    expect(domainEventFactory.createUserSignedInEvent).toHaveBeenCalledWith({
-      browser: 'Firefox 1',
-      device: 'iOS 1',
-      userEmail: 'test@test.com',
-      userUuid: '1-2-3',
-      signInAlertEnabled: true,
-      muteSignInEmailsSettingUuid: '3-4-5',
-    })
+    expect(domainEventFactory.createEmailRequestedEvent).toHaveBeenCalled()
     expect(domainEventPublisher.publish).toHaveBeenCalled()
   })
 
-  it('should not sign in a user without code verifier', async () => {
+  it('should not sign in 004 user without code verifier', async () => {
+    expect(
+      await createUseCase().execute({
+        email: 'test@test.te',
+        password: 'qweqwe123123',
+        userAgent: 'Google Chrome',
+        apiVersion: '20190520',
+        ephemeralSession: false,
+      }),
+    ).toEqual({
+      success: false,
+      errorCode: 410,
+      errorMessage: 'Please update your client application.',
+    })
+  })
+
+  it('should not sign in 005 user without code verifier', async () => {
+    user = {
+      uuid: '1-2-3',
+      email: 'test@test.com',
+      version: '005',
+    } as jest.Mocked<User>
+
     expect(
       await createUseCase().execute({
         email: 'test@test.te',
@@ -160,92 +151,10 @@ describe('SignIn', () => {
       authResponse: { foo: 'bar' },
     })
 
-    expect(domainEventFactory.createUserSignedInEvent).toHaveBeenCalledWith({
-      browser: 'Firefox 1',
-      device: 'iOS 1',
-      userEmail: 'test@test.com',
-      userUuid: '1-2-3',
-      signInAlertEnabled: true,
-      muteSignInEmailsSettingUuid: '3-4-5',
-    })
+    expect(domainEventFactory.createEmailRequestedEvent).toHaveBeenCalled()
     expect(domainEventPublisher.publish).toHaveBeenCalled()
   })
 
-  it('should sign in a user and disable sign in alert if setting is configured', async () => {
-    setting = {
-      uuid: '3-4-5',
-      value: MuteSignInEmailsOption.Muted,
-    } as jest.Mocked<Setting>
-
-    settingService.findSettingWithDecryptedValue = jest.fn().mockReturnValue(setting)
-
-    expect(
-      await createUseCase().execute({
-        email: 'test@test.te',
-        password: 'qweqwe123123',
-        userAgent: 'Google Chrome',
-        apiVersion: '20190520',
-        ephemeralSession: false,
-        codeVerifier: 'test',
-      }),
-    ).toEqual({
-      success: true,
-      authResponse: { foo: 'bar' },
-    })
-
-    expect(domainEventFactory.createUserSignedInEvent).toHaveBeenCalledWith({
-      browser: 'Firefox 1',
-      device: 'iOS 1',
-      userEmail: 'test@test.com',
-      userUuid: '1-2-3',
-      signInAlertEnabled: false,
-      muteSignInEmailsSettingUuid: '3-4-5',
-    })
-    expect(domainEventPublisher.publish).toHaveBeenCalled()
-  })
-
-  it('should sign in a user and create mute sign in email setting if it does not exist', async () => {
-    settingService.findSettingWithDecryptedValue = jest.fn().mockReturnValue(null)
-
-    expect(
-      await createUseCase().execute({
-        email: 'test@test.te',
-        password: 'qweqwe123123',
-        userAgent: 'Google Chrome',
-        apiVersion: '20190520',
-        ephemeralSession: false,
-        codeVerifier: 'test',
-      }),
-    ).toEqual({
-      success: true,
-      authResponse: { foo: 'bar' },
-    })
-
-    expect(domainEventFactory.createUserSignedInEvent).toHaveBeenCalledWith({
-      browser: 'Firefox 1',
-      device: 'iOS 1',
-      userEmail: 'test@test.com',
-      userUuid: '1-2-3',
-      signInAlertEnabled: true,
-      muteSignInEmailsSettingUuid: '3-4-5',
-    })
-    expect(domainEventPublisher.publish).toHaveBeenCalled()
-    expect(settingService.createOrReplace).toHaveBeenCalledWith({
-      props: {
-        name: 'MUTE_SIGN_IN_EMAILS',
-        sensitive: false,
-        serverEncryptionVersion: 0,
-        unencryptedValue: 'not_muted',
-      },
-      user: {
-        email: 'test@test.com',
-        encryptedPassword: '$2a$11$K3g6XoTau8VmLJcai1bB0eD9/YvBSBRtBhMprJOaVZ0U3SgasZH3a',
-        uuid: '1-2-3',
-        version: '004',
-      },
-    })
-  })
-
   it('should sign in a user even if publishing a sign in event fails', async () => {
     domainEventPublisher.publish = jest.fn().mockImplementation(() => {
       throw new Error('Oops')

packages/auth/src/Domain/UseCase/SignIn.ts

@@ -1,18 +1,12 @@
 import * as bcrypt from 'bcryptjs'
 import { DomainEventPublisherInterface } from '@standardnotes/domain-events'
-import { PermissionName } from '@standardnotes/features'
-import { MuteSignInEmailsOption, SettingName } from '@standardnotes/settings'
 
 import { inject, injectable } from 'inversify'
 import { Logger } from 'winston'
 import TYPES from '../../Bootstrap/Types'
 import { AuthResponseFactoryResolverInterface } from '../Auth/AuthResponseFactoryResolverInterface'
-import { EncryptionVersion } from '../Encryption/EncryptionVersion'
 import { DomainEventFactoryInterface } from '../Event/DomainEventFactoryInterface'
-import { RoleServiceInterface } from '../Role/RoleServiceInterface'
 import { SessionServiceInterface } from '../Session/SessionServiceInterface'
-import { Setting } from '../Setting/Setting'
-import { SettingServiceInterface } from '../Setting/SettingServiceInterface'
 import { User } from '../User/User'
 import { UserRepositoryInterface } from '../User/UserRepositoryInterface'
 import { SignInDTO } from './SignInDTO'
@@ -21,8 +15,10 @@ import { UseCaseInterface } from './UseCaseInterface'
 import { PKCERepositoryInterface } from '../User/PKCERepositoryInterface'
 import { CrypterInterface } from '../Encryption/CrypterInterface'
 import { SignInDTOV2Challenged } from './SignInDTOV2Challenged'
-import { ProtocolVersion } from '@standardnotes/common'
+import { leftVersionGreaterThanOrEqualToRight, ProtocolVersion } from '@standardnotes/common'
 import { HttpStatusCode } from '@standardnotes/api'
+import { EmailLevel } from '@standardnotes/domain-core'
+import { getBody, getSubject } from '../Email/UserSignedIn'
 
 @injectable()
 export class SignIn implements UseCaseInterface {
@@ -33,8 +29,6 @@ export class SignIn implements UseCaseInterface {
     @inject(TYPES.DomainEventPublisher) private domainEventPublisher: DomainEventPublisherInterface,
     @inject(TYPES.DomainEventFactory) private domainEventFactory: DomainEventFactoryInterface,
     @inject(TYPES.SessionService) private sessionService: SessionServiceInterface,
-    @inject(TYPES.RoleService) private roleService: RoleServiceInterface,
-    @inject(TYPES.SettingService) private settingService: SettingServiceInterface,
     @inject(TYPES.PKCERepository) private pkceRepository: PKCERepositoryInterface,
     @inject(TYPES.Crypter) private crypter: CrypterInterface,
     @inject(TYPES.Logger) private logger: Logger,
@@ -65,7 +59,12 @@ export class SignIn implements UseCaseInterface {
       }
     }
 
-    if (user.version === ProtocolVersion.V004 && !performingCodeChallengedSignIn) {
+    const userVersionIs004OrGreater = leftVersionGreaterThanOrEqualToRight(
+      user.version as ProtocolVersion,
+      ProtocolVersion.V004,
+    )
+
+    if (userVersionIs004OrGreater && !performingCodeChallengedSignIn) {
       return {
         success: false,
         errorMessage: 'Please update your client application.',
@@ -109,18 +108,18 @@ export class SignIn implements UseCaseInterface {
 
   private async sendSignInEmailNotification(user: User, userAgent: string): Promise<void> {
     try {
-      const muteSignInEmailsSetting = await this.findOrCreateMuteSignInEmailsSetting(user)
-
       await this.domainEventPublisher.publish(
-        this.domainEventFactory.createUserSignedInEvent({
-          userUuid: user.uuid,
+        this.domainEventFactory.createEmailRequestedEvent({
           userEmail: user.email,
-          device: this.sessionService.getOperatingSystemInfoFromUserAgent(userAgent),
-          browser: this.sessionService.getBrowserInfoFromUserAgent(userAgent),
-          signInAlertEnabled:
-            (await this.roleService.userHasPermission(user.uuid, PermissionName.SignInAlerts)) &&
-            muteSignInEmailsSetting.value === MuteSignInEmailsOption.NotMuted,
-          muteSignInEmailsSettingUuid: muteSignInEmailsSetting.uuid,
+          level: EmailLevel.LEVELS.SignIn,
+          body: getBody(
+            user.email,
+            this.sessionService.getOperatingSystemInfoFromUserAgent(userAgent),
+            this.sessionService.getBrowserInfoFromUserAgent(userAgent),
+            new Date(),
+          ),
+          messageIdentifier: 'SIGN_IN',
+          subject: getSubject(user.email),
         }),
       )
     } catch (error) {
@@ -128,29 +127,6 @@ export class SignIn implements UseCaseInterface {
     }
   }
 
-  private async findOrCreateMuteSignInEmailsSetting(user: User): Promise<Setting> {
-    const existingMuteSignInEmailsSetting = await this.settingService.findSettingWithDecryptedValue({
-      userUuid: user.uuid,
-      settingName: SettingName.MuteSignInEmails,
-    })
-
-    if (existingMuteSignInEmailsSetting !== null) {
-      return existingMuteSignInEmailsSetting
-    }
-
-    const createSettingResult = await this.settingService.createOrReplace({
-      user,
-      props: {
-        name: SettingName.MuteSignInEmails,
-        sensitive: false,
-        unencryptedValue: MuteSignInEmailsOption.NotMuted,
-        serverEncryptionVersion: EncryptionVersion.Unencrypted,
-      },
-    })
-
-    return createSettingResult.setting
-  }
-
   private isCodeChallengedVersion(dto: SignInDTO): dto is SignInDTOV2Challenged {
     return (dto as SignInDTOV2Challenged).codeVerifier !== undefined
   }

packages/auth/src/Domain/User/UserRepositoryInterface.ts

@@ -3,6 +3,7 @@ import { User } from './User'
 
 export interface UserRepositoryInterface {
   streamAll(): Promise<ReadStream>
+  streamTeam(memberEmail?: string): Promise<ReadStream>
   findOneByUuid(uuid: string): Promise<User | null>
   findOneByEmail(email: string): Promise<User | null>
   save(user: User): Promise<User>

packages/auth/src/Infra/MySQL/MySQLOfflineSettingRepository.spec.ts

@@ -1,57 +0,0 @@
-import 'reflect-metadata'
-
-import { Repository, SelectQueryBuilder } from 'typeorm'
-import { OfflineSetting } from '../../Domain/Setting/OfflineSetting'
-import { OfflineSettingName } from '../../Domain/Setting/OfflineSettingName'
-
-import { MySQLOfflineSettingRepository } from './MySQLOfflineSettingRepository'
-
-describe('MySQLOfflineSettingRepository', () => {
-  let queryBuilder: SelectQueryBuilder<OfflineSetting>
-  let offlineSetting: OfflineSetting
-  let ormRepository: Repository<OfflineSetting>
-
-  const createRepository = () => new MySQLOfflineSettingRepository(ormRepository)
-
-  beforeEach(() => {
-    queryBuilder = {} as jest.Mocked<SelectQueryBuilder<OfflineSetting>>
-
-    offlineSetting = {} as jest.Mocked<OfflineSetting>
-
-    ormRepository = {} as jest.Mocked<Repository<OfflineSetting>>
-    ormRepository.createQueryBuilder = jest.fn().mockImplementation(() => queryBuilder)
-    ormRepository.save = jest.fn()
-  })
-
-  it('should save', async () => {
-    await createRepository().save(offlineSetting)
-
-    expect(ormRepository.save).toHaveBeenCalledWith(offlineSetting)
-  })
-
-  it('should find one setting by name and user email', async () => {
-    queryBuilder.where = jest.fn().mockReturnThis()
-    queryBuilder.getOne = jest.fn().mockReturnValue(offlineSetting)
-
-    const result = await createRepository().findOneByNameAndEmail(OfflineSettingName.FeaturesToken, 'test@test.com')
-
-    expect(queryBuilder.where).toHaveBeenCalledWith('offline_setting.name = :name AND offline_setting.email = :email', {
-      name: 'FEATURES_TOKEN',
-      email: 'test@test.com',
-    })
-    expect(result).toEqual(offlineSetting)
-  })
-
-  it('should find one setting by name and value', async () => {
-    queryBuilder.where = jest.fn().mockReturnThis()
-    queryBuilder.getOne = jest.fn().mockReturnValue(offlineSetting)
-
-    const result = await createRepository().findOneByNameAndValue(OfflineSettingName.FeaturesToken, 'features-token')
-
-    expect(queryBuilder.where).toHaveBeenCalledWith('offline_setting.name = :name AND offline_setting.value = :value', {
-      name: 'FEATURES_TOKEN',
-      value: 'features-token',
-    })
-    expect(result).toEqual(offlineSetting)
-  })
-})

packages/auth/src/Infra/MySQL/MySQLOfflineUserSubscriptionRepository.spec.ts

@@ -1,189 +0,0 @@
-import 'reflect-metadata'
-
-import { SubscriptionName } from '@standardnotes/common'
-
-import { Repository, SelectQueryBuilder, UpdateQueryBuilder } from 'typeorm'
-
-import { MySQLOfflineUserSubscriptionRepository } from './MySQLOfflineUserSubscriptionRepository'
-import { OfflineUserSubscription } from '../../Domain/Subscription/OfflineUserSubscription'
-
-describe('MySQLOfflineUserSubscriptionRepository', () => {
-  let selectQueryBuilder: SelectQueryBuilder<OfflineUserSubscription>
-  let updateQueryBuilder: UpdateQueryBuilder<OfflineUserSubscription>
-  let offlineSubscription: OfflineUserSubscription
-  let ormRepository: Repository<OfflineUserSubscription>
-
-  const createRepository = () => new MySQLOfflineUserSubscriptionRepository(ormRepository)
-
-  beforeEach(() => {
-    selectQueryBuilder = {} as jest.Mocked<SelectQueryBuilder<OfflineUserSubscription>>
-    updateQueryBuilder = {} as jest.Mocked<UpdateQueryBuilder<OfflineUserSubscription>>
-
-    offlineSubscription = {
-      planName: SubscriptionName.ProPlan,
-      cancelled: false,
-      email: 'test@test.com',
-    } as jest.Mocked<OfflineUserSubscription>
-
-    ormRepository = {} as jest.Mocked<Repository<OfflineUserSubscription>>
-    ormRepository.createQueryBuilder = jest.fn().mockImplementation(() => selectQueryBuilder)
-    ormRepository.save = jest.fn()
-  })
-
-  it('should save', async () => {
-    await createRepository().save(offlineSubscription)
-
-    expect(ormRepository.save).toHaveBeenCalledWith(offlineSubscription)
-  })
-
-  it('should find one longest lasting uncanceled subscription by user email if there are canceled ones', async () => {
-    const canceledSubscription = {
-      planName: SubscriptionName.ProPlan,
-      cancelled: true,
-      email: 'test@test.com',
-    } as jest.Mocked<OfflineUserSubscription>
-
-    ormRepository.createQueryBuilder = jest.fn().mockImplementation(() => selectQueryBuilder)
-
-    selectQueryBuilder.where = jest.fn().mockReturnThis()
-    selectQueryBuilder.orderBy = jest.fn().mockReturnThis()
-    selectQueryBuilder.getMany = jest.fn().mockReturnValue([canceledSubscription, offlineSubscription])
-
-    const result = await createRepository().findOneByEmail('test@test.com')
-
-    expect(selectQueryBuilder.where).toHaveBeenCalledWith('email = :email', {
-      email: 'test@test.com',
-    })
-    expect(selectQueryBuilder.orderBy).toHaveBeenCalledWith('ends_at', 'DESC')
-    expect(selectQueryBuilder.getMany).toHaveBeenCalled()
-    expect(result).toEqual(offlineSubscription)
-  })
-
-  it('should find one, longest lasting subscription by user email if there are no canceled ones', async () => {
-    ormRepository.createQueryBuilder = jest.fn().mockImplementation(() => selectQueryBuilder)
-
-    selectQueryBuilder.where = jest.fn().mockReturnThis()
-    selectQueryBuilder.orderBy = jest.fn().mockReturnThis()
-    selectQueryBuilder.getMany = jest.fn().mockReturnValue([offlineSubscription])
-
-    const result = await createRepository().findOneByEmail('test@test.com')
-
-    expect(selectQueryBuilder.where).toHaveBeenCalledWith('email = :email', {
-      email: 'test@test.com',
-    })
-    expect(selectQueryBuilder.orderBy).toHaveBeenCalledWith('ends_at', 'DESC')
-    expect(selectQueryBuilder.getMany).toHaveBeenCalled()
-    expect(result).toEqual(offlineSubscription)
-  })
-
-  it('should find one, longest lasting subscription by user email if there are no ucanceled ones', async () => {
-    offlineSubscription.cancelled = true
-
-    ormRepository.createQueryBuilder = jest.fn().mockImplementation(() => selectQueryBuilder)
-
-    selectQueryBuilder.where = jest.fn().mockReturnThis()
-    selectQueryBuilder.orderBy = jest.fn().mockReturnThis()
-    selectQueryBuilder.getMany = jest.fn().mockReturnValue([offlineSubscription])
-
-    const result = await createRepository().findOneByEmail('test@test.com')
-
-    expect(selectQueryBuilder.where).toHaveBeenCalledWith('email = :email', {
-      email: 'test@test.com',
-    })
-    expect(selectQueryBuilder.orderBy).toHaveBeenCalledWith('ends_at', 'DESC')
-    expect(selectQueryBuilder.getMany).toHaveBeenCalled()
-    expect(result).toEqual(offlineSubscription)
-  })
-
-  it('should find none if there are no subscriptions for the user', async () => {
-    ormRepository.createQueryBuilder = jest.fn().mockImplementation(() => selectQueryBuilder)
-
-    selectQueryBuilder.where = jest.fn().mockReturnThis()
-    selectQueryBuilder.orderBy = jest.fn().mockReturnThis()
-    selectQueryBuilder.getMany = jest.fn().mockReturnValue([])
-
-    const result = await createRepository().findOneByEmail('test@test.com')
-
-    expect(selectQueryBuilder.where).toHaveBeenCalledWith('email = :email', {
-      email: 'test@test.com',
-    })
-    expect(selectQueryBuilder.orderBy).toHaveBeenCalledWith('ends_at', 'DESC')
-    expect(selectQueryBuilder.getMany).toHaveBeenCalled()
-    expect(result).toBeNull()
-  })
-
-  it('should find multiple by user email active after', async () => {
-    ormRepository.createQueryBuilder = jest.fn().mockImplementation(() => selectQueryBuilder)
-
-    selectQueryBuilder.where = jest.fn().mockReturnThis()
-    selectQueryBuilder.orderBy = jest.fn().mockReturnThis()
-    selectQueryBuilder.getMany = jest.fn().mockReturnValue([offlineSubscription])
-
-    const result = await createRepository().findByEmail('test@test.com', 123)
-
-    expect(selectQueryBuilder.where).toHaveBeenCalledWith('email = :email AND ends_at > :endsAt', {
-      email: 'test@test.com',
-      endsAt: 123,
-    })
-    expect(selectQueryBuilder.orderBy).toHaveBeenCalledWith('ends_at', 'DESC')
-    expect(selectQueryBuilder.getMany).toHaveBeenCalled()
-    expect(result).toEqual([offlineSubscription])
-  })
-
-  it('should update cancelled by subscription id', async () => {
-    ormRepository.createQueryBuilder = jest.fn().mockImplementation(() => updateQueryBuilder)
-
-    updateQueryBuilder.update = jest.fn().mockReturnThis()
-    updateQueryBuilder.set = jest.fn().mockReturnThis()
-    updateQueryBuilder.where = jest.fn().mockReturnThis()
-    updateQueryBuilder.execute = jest.fn()
-
-    await createRepository().updateCancelled(1, true, 1000)
-
-    expect(updateQueryBuilder.update).toHaveBeenCalled()
-    expect(updateQueryBuilder.set).toHaveBeenCalledWith({
-      updatedAt: expect.any(Number),
-      cancelled: true,
-    })
-    expect(updateQueryBuilder.where).toHaveBeenCalledWith('subscription_id = :subscriptionId', {
-      subscriptionId: 1,
-    })
-    expect(updateQueryBuilder.execute).toHaveBeenCalled()
-  })
-
-  it('should update ends at by subscription id', async () => {
-    ormRepository.createQueryBuilder = jest.fn().mockImplementation(() => updateQueryBuilder)
-
-    updateQueryBuilder.update = jest.fn().mockReturnThis()
-    updateQueryBuilder.set = jest.fn().mockReturnThis()
-    updateQueryBuilder.where = jest.fn().mockReturnThis()
-    updateQueryBuilder.execute = jest.fn()
-
-    await createRepository().updateEndsAt(1, 1000, 1000)
-
-    expect(updateQueryBuilder.update).toHaveBeenCalled()
-    expect(updateQueryBuilder.set).toHaveBeenCalledWith({
-      updatedAt: expect.any(Number),
-      endsAt: 1000,
-    })
-    expect(updateQueryBuilder.where).toHaveBeenCalledWith('subscription_id = :subscriptionId', {
-      subscriptionId: 1,
-    })
-    expect(updateQueryBuilder.execute).toHaveBeenCalled()
-  })
-
-  it('should find one offline user subscription by user subscription id', async () => {
-    ormRepository.createQueryBuilder = jest.fn().mockImplementation(() => selectQueryBuilder)
-
-    selectQueryBuilder.where = jest.fn().mockReturnThis()
-    selectQueryBuilder.getOne = jest.fn().mockReturnValue(offlineSubscription)
-
-    const result = await createRepository().findOneBySubscriptionId(123)
-
-    expect(selectQueryBuilder.where).toHaveBeenCalledWith('subscription_id = :subscriptionId', {
-      subscriptionId: 123,
-    })
-    expect(selectQueryBuilder.getOne).toHaveBeenCalled()
-    expect(result).toEqual(offlineSubscription)
-  })
-})

packages/auth/src/Infra/MySQL/MySQLRevokedSessionRepository.spec.ts

@@ -1,78 +0,0 @@
-import 'reflect-metadata'
-
-import { Repository, SelectQueryBuilder, UpdateQueryBuilder } from 'typeorm'
-
-import { RevokedSession } from '../../Domain/Session/RevokedSession'
-
-import { MySQLRevokedSessionRepository } from './MySQLRevokedSessionRepository'
-
-describe('MySQLRevokedSessionRepository', () => {
-  let ormRepository: Repository<RevokedSession>
-  let queryBuilder: SelectQueryBuilder<RevokedSession>
-  let updateQueryBuilder: UpdateQueryBuilder<RevokedSession>
-  let session: RevokedSession
-
-  const createRepository = () => new MySQLRevokedSessionRepository(ormRepository)
-
-  beforeEach(() => {
-    queryBuilder = {} as jest.Mocked<SelectQueryBuilder<RevokedSession>>
-    updateQueryBuilder = {} as jest.Mocked<UpdateQueryBuilder<RevokedSession>>
-
-    session = {} as jest.Mocked<RevokedSession>
-
-    ormRepository = {} as jest.Mocked<Repository<RevokedSession>>
-    ormRepository.createQueryBuilder = jest.fn().mockImplementation(() => queryBuilder)
-    ormRepository.save = jest.fn()
-    ormRepository.remove = jest.fn()
-  })
-
-  it('should save', async () => {
-    await createRepository().save(session)
-
-    expect(ormRepository.save).toHaveBeenCalledWith(session)
-  })
-
-  it('should remove', async () => {
-    await createRepository().remove(session)
-
-    expect(ormRepository.remove).toHaveBeenCalledWith(session)
-  })
-
-  it('should clear user agent data on all user sessions', async () => {
-    ormRepository.createQueryBuilder = jest.fn().mockImplementation(() => updateQueryBuilder)
-
-    updateQueryBuilder.update = jest.fn().mockReturnThis()
-    updateQueryBuilder.set = jest.fn().mockReturnThis()
-    updateQueryBuilder.where = jest.fn().mockReturnThis()
-    updateQueryBuilder.execute = jest.fn()
-
-    await createRepository().clearUserAgentByUserUuid('1-2-3')
-
-    expect(updateQueryBuilder.update).toHaveBeenCalled()
-    expect(updateQueryBuilder.set).toHaveBeenCalledWith({
-      userAgent: null,
-    })
-    expect(updateQueryBuilder.where).toHaveBeenCalledWith('user_uuid = :userUuid', { userUuid: '1-2-3' })
-    expect(updateQueryBuilder.execute).toHaveBeenCalled()
-  })
-
-  it('should find one session by id', async () => {
-    queryBuilder.where = jest.fn().mockReturnThis()
-    queryBuilder.getOne = jest.fn().mockReturnValue(session)
-
-    const result = await createRepository().findOneByUuid('123')
-
-    expect(queryBuilder.where).toHaveBeenCalledWith('revoked_session.uuid = :uuid', { uuid: '123' })
-    expect(result).toEqual(session)
-  })
-
-  it('should find all revoked sessions by user id', async () => {
-    queryBuilder.where = jest.fn().mockReturnThis()
-    queryBuilder.getMany = jest.fn().mockReturnValue([session])
-
-    const result = await createRepository().findAllByUserUuid('123')
-
-    expect(queryBuilder.where).toHaveBeenCalledWith('revoked_session.user_uuid = :user_uuid', { user_uuid: '123' })
-    expect(result).toEqual([session])
-  })
-})

packages/auth/src/Infra/MySQL/MySQLRoleRepository.spec.ts

@@ -1,49 +0,0 @@
-import 'reflect-metadata'
-
-import { Repository, SelectQueryBuilder } from 'typeorm'
-import { Role } from '../../Domain/Role/Role'
-
-import { MySQLRoleRepository } from './MySQLRoleRepository'
-
-describe('MySQLRoleRepository', () => {
-  let ormRepository: Repository<Role>
-  let queryBuilder: SelectQueryBuilder<Role>
-  let role: Role
-
-  const createRepository = () => new MySQLRoleRepository(ormRepository)
-
-  beforeEach(() => {
-    queryBuilder = {} as jest.Mocked<SelectQueryBuilder<Role>>
-    queryBuilder.cache = jest.fn().mockReturnThis()
-
-    role = {} as jest.Mocked<Role>
-
-    ormRepository = {} as jest.Mocked<Repository<Role>>
-    ormRepository.createQueryBuilder = jest.fn().mockImplementation(() => queryBuilder)
-  })
-
-  it('should find latest version of a role by name', async () => {
-    queryBuilder.where = jest.fn().mockReturnThis()
-    queryBuilder.take = jest.fn().mockReturnThis()
-    queryBuilder.orderBy = jest.fn().mockReturnThis()
-    queryBuilder.getMany = jest.fn().mockReturnValue([role])
-
-    const result = await createRepository().findOneByName('test')
-
-    expect(queryBuilder.where).toHaveBeenCalledWith('role.name = :name', { name: 'test' })
-    expect(queryBuilder.take).toHaveBeenCalledWith(1)
-    expect(queryBuilder.orderBy).toHaveBeenCalledWith('version', 'DESC')
-    expect(result).toEqual(role)
-  })
-
-  it('should return null if not found the latest version of a role by name', async () => {
-    queryBuilder.where = jest.fn().mockReturnThis()
-    queryBuilder.take = jest.fn().mockReturnThis()
-    queryBuilder.orderBy = jest.fn().mockReturnThis()
-    queryBuilder.getMany = jest.fn().mockReturnValue([])
-
-    const result = await createRepository().findOneByName('test')
-
-    expect(result).toBeNull()
-  })
-})

packages/auth/src/Infra/MySQL/MySQLSessionRepository.spec.ts

@@ -1,174 +0,0 @@
-import 'reflect-metadata'
-
-import * as dayjs from 'dayjs'
-
-import { Repository, SelectQueryBuilder, UpdateQueryBuilder } from 'typeorm'
-import { Session } from '../../Domain/Session/Session'
-
-import { MySQLSessionRepository } from './MySQLSessionRepository'
-
-describe('MySQLSessionRepository', () => {
-  let ormRepository: Repository<Session>
-  let queryBuilder: SelectQueryBuilder<Session>
-  let updateQueryBuilder: UpdateQueryBuilder<Session>
-  let session: Session
-
-  const createRepository = () => new MySQLSessionRepository(ormRepository)
-
-  beforeEach(() => {
-    queryBuilder = {} as jest.Mocked<SelectQueryBuilder<Session>>
-    updateQueryBuilder = {} as jest.Mocked<UpdateQueryBuilder<Session>>
-
-    session = {} as jest.Mocked<Session>
-
-    ormRepository = {} as jest.Mocked<Repository<Session>>
-    ormRepository.createQueryBuilder = jest.fn().mockImplementation(() => queryBuilder)
-    ormRepository.save = jest.fn()
-    ormRepository.remove = jest.fn()
-  })
-
-  it('should save', async () => {
-    await createRepository().save(session)
-
-    expect(ormRepository.save).toHaveBeenCalledWith(session)
-  })
-
-  it('should remove', async () => {
-    await createRepository().remove(session)
-
-    expect(ormRepository.remove).toHaveBeenCalledWith(session)
-  })
-
-  it('should clear user agent data on all user sessions', async () => {
-    ormRepository.createQueryBuilder = jest.fn().mockImplementation(() => updateQueryBuilder)
-
-    updateQueryBuilder.update = jest.fn().mockReturnThis()
-    updateQueryBuilder.set = jest.fn().mockReturnThis()
-    updateQueryBuilder.where = jest.fn().mockReturnThis()
-    updateQueryBuilder.execute = jest.fn()
-
-    await createRepository().clearUserAgentByUserUuid('1-2-3')
-
-    expect(updateQueryBuilder.update).toHaveBeenCalled()
-    expect(updateQueryBuilder.set).toHaveBeenCalledWith({
-      userAgent: null,
-    })
-    expect(updateQueryBuilder.where).toHaveBeenCalledWith('user_uuid = :userUuid', { userUuid: '1-2-3' })
-    expect(updateQueryBuilder.execute).toHaveBeenCalled()
-  })
-
-  it('should update hashed tokens on a session', async () => {
-    ormRepository.createQueryBuilder = jest.fn().mockImplementation(() => updateQueryBuilder)
-
-    updateQueryBuilder.update = jest.fn().mockReturnThis()
-    updateQueryBuilder.set = jest.fn().mockReturnThis()
-    updateQueryBuilder.where = jest.fn().mockReturnThis()
-    updateQueryBuilder.execute = jest.fn()
-
-    await createRepository().updateHashedTokens('123', '234', '345')
-
-    expect(updateQueryBuilder.update).toHaveBeenCalled()
-    expect(updateQueryBuilder.set).toHaveBeenCalledWith({
-      hashedAccessToken: '234',
-      hashedRefreshToken: '345',
-    })
-    expect(updateQueryBuilder.where).toHaveBeenCalledWith('uuid = :uuid', { uuid: '123' })
-    expect(updateQueryBuilder.execute).toHaveBeenCalled()
-  })
-
-  it('should update token expiration dates on a session', async () => {
-    ormRepository.createQueryBuilder = jest.fn().mockImplementation(() => updateQueryBuilder)
-
-    updateQueryBuilder.update = jest.fn().mockReturnThis()
-    updateQueryBuilder.set = jest.fn().mockReturnThis()
-    updateQueryBuilder.where = jest.fn().mockReturnThis()
-    updateQueryBuilder.execute = jest.fn()
-
-    await createRepository().updatedTokenExpirationDates(
-      '123',
-      dayjs.utc('2020-11-26 13:34').toDate(),
-      dayjs.utc('2020-11-26 14:34').toDate(),
-    )
-
-    expect(updateQueryBuilder.update).toHaveBeenCalled()
-    expect(updateQueryBuilder.set).toHaveBeenCalledWith({
-      accessExpiration: dayjs.utc('2020-11-26T13:34:00.000Z').toDate(),
-      refreshExpiration: dayjs.utc('2020-11-26T14:34:00.000Z').toDate(),
-    })
-    expect(updateQueryBuilder.where).toHaveBeenCalledWith('uuid = :uuid', { uuid: '123' })
-    expect(updateQueryBuilder.execute).toHaveBeenCalled()
-  })
-
-  it('should find active sessions by user id', async () => {
-    queryBuilder.where = jest.fn().mockReturnThis()
-    queryBuilder.getMany = jest.fn().mockReturnValue([session])
-
-    const result = await createRepository().findAllByRefreshExpirationAndUserUuid('123')
-
-    expect(queryBuilder.where).toHaveBeenCalledWith(
-      'session.refresh_expiration > :refresh_expiration AND session.user_uuid = :user_uuid',
-      { refresh_expiration: expect.any(Date), user_uuid: '123' },
-    )
-    expect(result).toEqual([session])
-  })
-
-  it('should find all sessions by user id', async () => {
-    queryBuilder.where = jest.fn().mockReturnThis()
-    queryBuilder.getMany = jest.fn().mockReturnValue([session])
-
-    const result = await createRepository().findAllByUserUuid('123')
-
-    expect(queryBuilder.where).toHaveBeenCalledWith('session.user_uuid = :user_uuid', { user_uuid: '123' })
-    expect(result).toEqual([session])
-  })
-
-  it('should find one session by id', async () => {
-    queryBuilder.where = jest.fn().mockReturnThis()
-    queryBuilder.getOne = jest.fn().mockReturnValue(session)
-
-    const result = await createRepository().findOneByUuid('123')
-
-    expect(queryBuilder.where).toHaveBeenCalledWith('session.uuid = :uuid', { uuid: '123' })
-    expect(result).toEqual(session)
-  })
-
-  it('should find one session by id and user id', async () => {
-    queryBuilder.where = jest.fn().mockReturnThis()
-    queryBuilder.getOne = jest.fn().mockReturnValue(session)
-
-    const result = await createRepository().findOneByUuidAndUserUuid('123', '234')
-
-    expect(queryBuilder.where).toHaveBeenCalledWith('session.uuid = :uuid AND session.user_uuid = :user_uuid', {
-      uuid: '123',
-      user_uuid: '234',
-    })
-    expect(result).toEqual(session)
-  })
-
-  it('should delete all session for a user except the current one', async () => {
-    queryBuilder.where = jest.fn().mockReturnThis()
-    queryBuilder.delete = jest.fn().mockReturnThis()
-    queryBuilder.execute = jest.fn()
-
-    await createRepository().deleteAllByUserUuid('123', '234')
-
-    expect(queryBuilder.delete).toHaveBeenCalled()
-    expect(queryBuilder.where).toHaveBeenCalledWith('user_uuid = :user_uuid AND uuid != :current_session_uuid', {
-      user_uuid: '123',
-      current_session_uuid: '234',
-    })
-    expect(queryBuilder.execute).toHaveBeenCalled()
-  })
-
-  it('should delete one session by id', async () => {
-    queryBuilder.where = jest.fn().mockReturnThis()
-    queryBuilder.delete = jest.fn().mockReturnThis()
-    queryBuilder.execute = jest.fn()
-
-    await createRepository().deleteOneByUuid('123')
-
-    expect(queryBuilder.delete).toHaveBeenCalled()
-    expect(queryBuilder.where).toHaveBeenCalledWith('uuid = :uuid', { uuid: '123' })
-    expect(queryBuilder.execute).toHaveBeenCalled()
-  })
-})

packages/auth/src/Infra/MySQL/MySQLSettingRepository.spec.ts

@@ -1,140 +0,0 @@
-import 'reflect-metadata'
-
-import { ReadStream } from 'fs'
-import { Repository, SelectQueryBuilder } from 'typeorm'
-import { Setting } from '../../Domain/Setting/Setting'
-
-import { MySQLSettingRepository } from './MySQLSettingRepository'
-import { EmailBackupFrequency, SettingName } from '@standardnotes/settings'
-
-describe('MySQLSettingRepository', () => {
-  let ormRepository: Repository<Setting>
-  let queryBuilder: SelectQueryBuilder<Setting>
-  let setting: Setting
-
-  const createRepository = () => new MySQLSettingRepository(ormRepository)
-
-  beforeEach(() => {
-    queryBuilder = {} as jest.Mocked<SelectQueryBuilder<Setting>>
-
-    setting = {} as jest.Mocked<Setting>
-
-    ormRepository = {} as jest.Mocked<Repository<Setting>>
-    ormRepository.createQueryBuilder = jest.fn().mockImplementation(() => queryBuilder)
-    ormRepository.save = jest.fn()
-  })
-
-  it('should save', async () => {
-    await createRepository().save(setting)
-
-    expect(ormRepository.save).toHaveBeenCalledWith(setting)
-  })
-
-  it('should stream all settings by name and value', async () => {
-    const stream = {} as jest.Mocked<ReadStream>
-    queryBuilder.where = jest.fn().mockReturnThis()
-    queryBuilder.orderBy = jest.fn().mockReturnThis()
-    queryBuilder.stream = jest.fn().mockReturnValue(stream)
-
-    const result = await createRepository().streamAllByNameAndValue(
-      SettingName.EmailBackupFrequency,
-      EmailBackupFrequency.Daily,
-    )
-
-    expect(result).toEqual(stream)
-  })
-
-  it('should find one setting by uuid', async () => {
-    queryBuilder.where = jest.fn().mockReturnThis()
-    queryBuilder.getOne = jest.fn().mockReturnValue(setting)
-
-    const result = await createRepository().findOneByUuid('1-2-3')
-
-    expect(queryBuilder.where).toHaveBeenCalledWith('setting.uuid = :uuid', { uuid: '1-2-3' })
-    expect(result).toEqual(setting)
-  })
-
-  it('should find one setting by name and user uuid', async () => {
-    queryBuilder.where = jest.fn().mockReturnThis()
-    queryBuilder.getOne = jest.fn().mockReturnValue(setting)
-
-    const result = await createRepository().findOneByNameAndUserUuid('test', '1-2-3')
-
-    expect(queryBuilder.where).toHaveBeenCalledWith('setting.name = :name AND setting.user_uuid = :user_uuid', {
-      name: 'test',
-      user_uuid: '1-2-3',
-    })
-    expect(result).toEqual(setting)
-  })
-
-  it('should find one setting by name and uuid', async () => {
-    queryBuilder.where = jest.fn().mockReturnThis()
-    queryBuilder.getOne = jest.fn().mockReturnValue(setting)
-
-    const result = await createRepository().findOneByUuidAndNames('1-2-3', ['test' as SettingName])
-
-    expect(queryBuilder.where).toHaveBeenCalledWith('setting.uuid = :uuid AND setting.name IN (:...names)', {
-      names: ['test'],
-      uuid: '1-2-3',
-    })
-    expect(result).toEqual(setting)
-  })
-
-  it('should find last setting by name and user uuid', async () => {
-    queryBuilder.where = jest.fn().mockReturnThis()
-    queryBuilder.orderBy = jest.fn().mockReturnThis()
-    queryBuilder.limit = jest.fn().mockReturnThis()
-    queryBuilder.getMany = jest.fn().mockReturnValue([setting])
-
-    const result = await createRepository().findLastByNameAndUserUuid('test', '1-2-3')
-
-    expect(queryBuilder.where).toHaveBeenCalledWith('setting.name = :name AND setting.user_uuid = :user_uuid', {
-      name: 'test',
-      user_uuid: '1-2-3',
-    })
-    expect(queryBuilder.orderBy).toHaveBeenCalledWith('updated_at', 'DESC')
-    expect(queryBuilder.limit).toHaveBeenCalledWith(1)
-    expect(result).toEqual(setting)
-  })
-
-  it('should return null if not found last setting by name and user uuid', async () => {
-    queryBuilder.where = jest.fn().mockReturnThis()
-    queryBuilder.orderBy = jest.fn().mockReturnThis()
-    queryBuilder.limit = jest.fn().mockReturnThis()
-    queryBuilder.getMany = jest.fn().mockReturnValue([])
-
-    const result = await createRepository().findLastByNameAndUserUuid('test', '1-2-3')
-
-    expect(result).toBeNull()
-  })
-
-  it('should find all by user uuid', async () => {
-    queryBuilder.where = jest.fn().mockReturnThis()
-
-    const settings = [setting]
-    queryBuilder.getMany = jest.fn().mockReturnValue(settings)
-
-    const userUuid = '123'
-    const result = await createRepository().findAllByUserUuid(userUuid)
-
-    expect(queryBuilder.where).toHaveBeenCalledWith('setting.user_uuid = :user_uuid', { user_uuid: userUuid })
-    expect(result).toEqual(settings)
-  })
-
-  it('should delete setting if it does exist', async () => {
-    const queryBuilder = {
-      delete: () => queryBuilder,
-      where: () => queryBuilder,
-      execute: () => undefined,
-    }
-
-    ormRepository.createQueryBuilder = jest.fn().mockImplementation(() => queryBuilder)
-
-    const result = await createRepository().deleteByUserUuid({
-      userUuid: 'userUuid',
-      settingName: 'settingName',
-    })
-
-    expect(result).toEqual(undefined)
-  })
-})

packages/auth/src/Infra/MySQL/MySQLSharedSubscriptionInvitationRepository.spec.ts

@@ -1,100 +0,0 @@
-import 'reflect-metadata'
-
-import { Repository, SelectQueryBuilder } from 'typeorm'
-
-import { MySQLSharedSubscriptionInvitationRepository } from './MySQLSharedSubscriptionInvitationRepository'
-import { SharedSubscriptionInvitation } from '../../Domain/SharedSubscription/SharedSubscriptionInvitation'
-import { InvitationStatus } from '../../Domain/SharedSubscription/InvitationStatus'
-
-describe('MySQLSharedSubscriptionInvitationRepository', () => {
-  let ormRepository: Repository<SharedSubscriptionInvitation>
-  let queryBuilder: SelectQueryBuilder<SharedSubscriptionInvitation>
-  let invitation: SharedSubscriptionInvitation
-
-  const createRepository = () => new MySQLSharedSubscriptionInvitationRepository(ormRepository)
-
-  beforeEach(() => {
-    queryBuilder = {} as jest.Mocked<SelectQueryBuilder<SharedSubscriptionInvitation>>
-
-    invitation = {} as jest.Mocked<SharedSubscriptionInvitation>
-
-    ormRepository = {} as jest.Mocked<Repository<SharedSubscriptionInvitation>>
-    ormRepository.createQueryBuilder = jest.fn().mockImplementation(() => queryBuilder)
-    ormRepository.save = jest.fn()
-  })
-
-  it('should save', async () => {
-    await createRepository().save(invitation)
-
-    expect(ormRepository.save).toHaveBeenCalledWith(invitation)
-  })
-
-  it('should get invitations by inviter email', async () => {
-    queryBuilder.where = jest.fn().mockReturnThis()
-    queryBuilder.getMany = jest.fn().mockReturnValue([])
-
-    const result = await createRepository().findByInviterEmail('test@test.te')
-
-    expect(queryBuilder.where).toHaveBeenCalledWith('invitation.inviter_identifier = :inviterEmail', {
-      inviterEmail: 'test@test.te',
-    })
-
-    expect(result).toEqual([])
-  })
-
-  it('should count invitations by inviter email and statuses', async () => {
-    queryBuilder.where = jest.fn().mockReturnThis()
-    queryBuilder.getCount = jest.fn().mockReturnValue(3)
-
-    const result = await createRepository().countByInviterEmailAndStatus('test@test.te', [InvitationStatus.Sent])
-
-    expect(queryBuilder.where).toHaveBeenCalledWith(
-      'invitation.inviter_identifier = :inviterEmail AND invitation.status IN (:...statuses)',
-      { inviterEmail: 'test@test.te', statuses: ['sent'] },
-    )
-
-    expect(result).toEqual(3)
-  })
-
-  it('should find one invitation by name and uuid', async () => {
-    queryBuilder.where = jest.fn().mockReturnThis()
-    queryBuilder.getOne = jest.fn().mockReturnValue(invitation)
-
-    const result = await createRepository().findOneByUuidAndStatus('1-2-3', InvitationStatus.Sent)
-
-    expect(queryBuilder.where).toHaveBeenCalledWith('invitation.uuid = :uuid AND invitation.status = :status', {
-      uuid: '1-2-3',
-      status: 'sent',
-    })
-
-    expect(result).toEqual(invitation)
-  })
-
-  it('should find one invitation by invitee and inviter email', async () => {
-    queryBuilder.where = jest.fn().mockReturnThis()
-    queryBuilder.getOne = jest.fn().mockReturnValue(invitation)
-
-    const result = await createRepository().findOneByInviteeAndInviterEmail('invitee@test.te', 'inviter@test.te')
-
-    expect(queryBuilder.where).toHaveBeenCalledWith(
-      'invitation.inviter_identifier = :inviterEmail AND invitation.invitee_identifier = :inviteeEmail',
-      {
-        inviterEmail: 'inviter@test.te',
-        inviteeEmail: 'invitee@test.te',
-      },
-    )
-
-    expect(result).toEqual(invitation)
-  })
-
-  it('should find one invitation by uuid', async () => {
-    queryBuilder.where = jest.fn().mockReturnThis()
-    queryBuilder.getOne = jest.fn().mockReturnValue(invitation)
-
-    const result = await createRepository().findOneByUuid('1-2-3')
-
-    expect(queryBuilder.where).toHaveBeenCalledWith('invitation.uuid = :uuid', { uuid: '1-2-3' })
-
-    expect(result).toEqual(invitation)
-  })
-})

packages/auth/src/Infra/MySQL/MySQLSubscriptionSettingRepository.spec.ts

@@ -1,68 +0,0 @@
-import 'reflect-metadata'
-
-import { Repository, SelectQueryBuilder } from 'typeorm'
-import { SubscriptionSetting } from '../../Domain/Setting/SubscriptionSetting'
-
-import { MySQLSubscriptionSettingRepository } from './MySQLSubscriptionSettingRepository'
-
-describe('MySQLSubscriptionSettingRepository', () => {
-  let ormRepository: Repository<SubscriptionSetting>
-  let queryBuilder: SelectQueryBuilder<SubscriptionSetting>
-  let setting: SubscriptionSetting
-
-  const createRepository = () => new MySQLSubscriptionSettingRepository(ormRepository)
-
-  beforeEach(() => {
-    queryBuilder = {} as jest.Mocked<SelectQueryBuilder<SubscriptionSetting>>
-
-    setting = {} as jest.Mocked<SubscriptionSetting>
-
-    ormRepository = {} as jest.Mocked<Repository<SubscriptionSetting>>
-    ormRepository.createQueryBuilder = jest.fn().mockImplementation(() => queryBuilder)
-    ormRepository.save = jest.fn()
-  })
-
-  it('should save', async () => {
-    await createRepository().save(setting)
-
-    expect(ormRepository.save).toHaveBeenCalledWith(setting)
-  })
-
-  it('should find one setting by uuid', async () => {
-    queryBuilder.where = jest.fn().mockReturnThis()
-    queryBuilder.getOne = jest.fn().mockReturnValue(setting)
-
-    const result = await createRepository().findOneByUuid('1-2-3')
-
-    expect(queryBuilder.where).toHaveBeenCalledWith('setting.uuid = :uuid', { uuid: '1-2-3' })
-    expect(result).toEqual(setting)
-  })
-
-  it('should find last setting by name and user uuid', async () => {
-    queryBuilder.where = jest.fn().mockReturnThis()
-    queryBuilder.orderBy = jest.fn().mockReturnThis()
-    queryBuilder.limit = jest.fn().mockReturnThis()
-    queryBuilder.getMany = jest.fn().mockReturnValue([setting])
-
-    const result = await createRepository().findLastByNameAndUserSubscriptionUuid('test', '1-2-3')
-
-    expect(queryBuilder.where).toHaveBeenCalledWith(
-      'setting.name = :name AND setting.user_subscription_uuid = :userSubscriptionUuid',
-      { name: 'test', userSubscriptionUuid: '1-2-3' },
-    )
-    expect(queryBuilder.orderBy).toHaveBeenCalledWith('updated_at', 'DESC')
-    expect(queryBuilder.limit).toHaveBeenCalledWith(1)
-    expect(result).toEqual(setting)
-  })
-
-  it('should return null if not found last setting by name and user uuid', async () => {
-    queryBuilder.where = jest.fn().mockReturnThis()
-    queryBuilder.orderBy = jest.fn().mockReturnThis()
-    queryBuilder.limit = jest.fn().mockReturnThis()
-    queryBuilder.getMany = jest.fn().mockReturnValue([])
-
-    const result = await createRepository().findLastByNameAndUserSubscriptionUuid('test', '1-2-3')
-
-    expect(result).toBeNull()
-  })
-})

packages/auth/src/Infra/MySQL/MySQLUserRepository.spec.ts

@@ -1,69 +0,0 @@
-import 'reflect-metadata'
-
-import { ReadStream } from 'fs'
-
-import { Repository, SelectQueryBuilder } from 'typeorm'
-import { User } from '../../Domain/User/User'
-
-import { MySQLUserRepository } from './MySQLUserRepository'
-
-describe('MySQLUserRepository', () => {
-  let ormRepository: Repository<User>
-  let queryBuilder: SelectQueryBuilder<User>
-  let user: User
-
-  const createRepository = () => new MySQLUserRepository(ormRepository)
-
-  beforeEach(() => {
-    queryBuilder = {} as jest.Mocked<SelectQueryBuilder<User>>
-    queryBuilder.cache = jest.fn().mockReturnThis()
-
-    user = {} as jest.Mocked<User>
-
-    ormRepository = {} as jest.Mocked<Repository<User>>
-    ormRepository.createQueryBuilder = jest.fn().mockImplementation(() => queryBuilder)
-    ormRepository.save = jest.fn()
-    ormRepository.remove = jest.fn()
-  })
-
-  it('should save', async () => {
-    await createRepository().save(user)
-
-    expect(ormRepository.save).toHaveBeenCalledWith(user)
-  })
-
-  it('should remove', async () => {
-    await createRepository().remove(user)
-
-    expect(ormRepository.remove).toHaveBeenCalledWith(user)
-  })
-
-  it('should find one user by id', async () => {
-    queryBuilder.where = jest.fn().mockReturnThis()
-    queryBuilder.getOne = jest.fn().mockReturnValue(user)
-
-    const result = await createRepository().findOneByUuid('123')
-
-    expect(queryBuilder.where).toHaveBeenCalledWith('user.uuid = :uuid', { uuid: '123' })
-    expect(result).toEqual(user)
-  })
-
-  it('should stream all users', async () => {
-    const stream = {} as jest.Mocked<ReadStream>
-    queryBuilder.stream = jest.fn().mockReturnValue(stream)
-
-    const result = await createRepository().streamAll()
-
-    expect(result).toEqual(stream)
-  })
-
-  it('should find one user by email', async () => {
-    queryBuilder.where = jest.fn().mockReturnThis()
-    queryBuilder.getOne = jest.fn().mockReturnValue(user)
-
-    const result = await createRepository().findOneByEmail('test@test.te')
-
-    expect(queryBuilder.where).toHaveBeenCalledWith('user.email = :email', { email: 'test@test.te' })
-    expect(result).toEqual(user)
-  })
-})

packages/auth/src/Infra/MySQL/MySQLUserRepository.ts

@@ -22,7 +22,21 @@ export class MySQLUserRepository implements UserRepositoryInterface {
   }
 
   async streamAll(): Promise<ReadStream> {
-    return this.ormRepository.createQueryBuilder('user').stream()
+    return this.ormRepository
+      .createQueryBuilder('user')
+      .where('created_at < :createdAt', { createdAt: new Date().toISOString() })
+      .stream()
+  }
+
+  async streamTeam(memberEmail?: string): Promise<ReadStream> {
+    const queryBuilder = this.ormRepository.createQueryBuilder()
+    if (memberEmail !== undefined) {
+      queryBuilder.where('email = :email', { email: memberEmail })
+    } else {
+      queryBuilder.where('email LIKE :email', { email: '%@standardnotes.com' })
+    }
+
+    return queryBuilder.stream()
   }
 
   async findOneByUuid(uuid: string): Promise<User | null> {

packages/auth/src/Infra/MySQL/MySQLUserSubscriptionRepository.spec.ts

@@ -1,287 +0,0 @@
-import 'reflect-metadata'
-
-import { SubscriptionName } from '@standardnotes/common'
-
-import { Repository, SelectQueryBuilder, UpdateQueryBuilder } from 'typeorm'
-import { UserSubscription } from '../../Domain/Subscription/UserSubscription'
-
-import { MySQLUserSubscriptionRepository } from './MySQLUserSubscriptionRepository'
-import { UserSubscriptionType } from '../../Domain/Subscription/UserSubscriptionType'
-import { TimerInterface } from '@standardnotes/time'
-
-describe('MySQLUserSubscriptionRepository', () => {
-  let ormRepository: Repository<UserSubscription>
-  let selectQueryBuilder: SelectQueryBuilder<UserSubscription>
-  let updateQueryBuilder: UpdateQueryBuilder<UserSubscription>
-  let subscription: UserSubscription
-  let timer: TimerInterface
-
-  const createRepository = () => new MySQLUserSubscriptionRepository(ormRepository, timer)
-
-  beforeEach(() => {
-    selectQueryBuilder = {} as jest.Mocked<SelectQueryBuilder<UserSubscription>>
-    updateQueryBuilder = {} as jest.Mocked<UpdateQueryBuilder<UserSubscription>>
-
-    subscription = {
-      planName: SubscriptionName.ProPlan,
-      cancelled: false,
-    } as jest.Mocked<UserSubscription>
-
-    ormRepository = {} as jest.Mocked<Repository<UserSubscription>>
-    ormRepository.createQueryBuilder = jest.fn().mockImplementation(() => selectQueryBuilder)
-    ormRepository.save = jest.fn()
-
-    timer = {} as jest.Mocked<TimerInterface>
-    timer.getTimestampInMicroseconds = jest.fn().mockReturnValue(123)
-  })
-
-  it('should save', async () => {
-    await createRepository().save(subscription)
-
-    expect(ormRepository.save).toHaveBeenCalledWith(subscription)
-  })
-
-  it('should find all subscriptions by user uuid', async () => {
-    const canceledSubscription = {
-      planName: SubscriptionName.ProPlan,
-      cancelled: true,
-    } as jest.Mocked<UserSubscription>
-
-    ormRepository.createQueryBuilder = jest.fn().mockImplementation(() => selectQueryBuilder)
-
-    selectQueryBuilder.where = jest.fn().mockReturnThis()
-    selectQueryBuilder.orderBy = jest.fn().mockReturnThis()
-    selectQueryBuilder.getMany = jest.fn().mockReturnValue([canceledSubscription, subscription])
-
-    const result = await createRepository().findByUserUuid('123')
-
-    expect(selectQueryBuilder.where).toHaveBeenCalledWith('user_uuid = :user_uuid', {
-      user_uuid: '123',
-    })
-    expect(selectQueryBuilder.orderBy).toHaveBeenCalledWith('ends_at', 'DESC')
-    expect(selectQueryBuilder.getMany).toHaveBeenCalled()
-    expect(result).toEqual([canceledSubscription, subscription])
-  })
-
-  it('should count all active subscriptions', async () => {
-    ormRepository.createQueryBuilder = jest.fn().mockImplementation(() => selectQueryBuilder)
-
-    selectQueryBuilder.groupBy = jest.fn().mockReturnThis()
-    selectQueryBuilder.where = jest.fn().mockReturnThis()
-    selectQueryBuilder.getCount = jest.fn().mockReturnValue(2)
-
-    const result = await createRepository().countActiveSubscriptions()
-
-    expect(selectQueryBuilder.where).toHaveBeenCalledWith('ends_at > :timestamp', {
-      timestamp: 123,
-    })
-    expect(selectQueryBuilder.groupBy).toHaveBeenCalledWith('user_uuid')
-    expect(selectQueryBuilder.getCount).toHaveBeenCalled()
-    expect(result).toEqual(2)
-  })
-
-  it('should find one longest lasting uncanceled subscription by user uuid if there are canceled ones', async () => {
-    const canceledSubscription = {
-      planName: SubscriptionName.ProPlan,
-      cancelled: true,
-    } as jest.Mocked<UserSubscription>
-
-    ormRepository.createQueryBuilder = jest.fn().mockImplementation(() => selectQueryBuilder)
-
-    selectQueryBuilder.where = jest.fn().mockReturnThis()
-    selectQueryBuilder.orderBy = jest.fn().mockReturnThis()
-    selectQueryBuilder.getMany = jest.fn().mockReturnValue([canceledSubscription, subscription])
-
-    const result = await createRepository().findOneByUserUuid('123')
-
-    expect(selectQueryBuilder.where).toHaveBeenCalledWith('user_uuid = :user_uuid', {
-      user_uuid: '123',
-    })
-    expect(selectQueryBuilder.orderBy).toHaveBeenCalledWith('ends_at', 'DESC')
-    expect(selectQueryBuilder.getMany).toHaveBeenCalled()
-    expect(result).toEqual(subscription)
-  })
-
-  it('should find one, longest lasting subscription by user uuid if there are no canceled ones', async () => {
-    ormRepository.createQueryBuilder = jest.fn().mockImplementation(() => selectQueryBuilder)
-
-    selectQueryBuilder.where = jest.fn().mockReturnThis()
-    selectQueryBuilder.orderBy = jest.fn().mockReturnThis()
-    selectQueryBuilder.getMany = jest.fn().mockReturnValue([subscription])
-
-    const result = await createRepository().findOneByUserUuid('123')
-
-    expect(selectQueryBuilder.where).toHaveBeenCalledWith('user_uuid = :user_uuid', {
-      user_uuid: '123',
-    })
-    expect(selectQueryBuilder.orderBy).toHaveBeenCalledWith('ends_at', 'DESC')
-    expect(selectQueryBuilder.getMany).toHaveBeenCalled()
-    expect(result).toEqual(subscription)
-  })
-
-  it('should count by user uuid', async () => {
-    ormRepository.createQueryBuilder = jest.fn().mockImplementation(() => selectQueryBuilder)
-
-    selectQueryBuilder.where = jest.fn().mockReturnThis()
-    selectQueryBuilder.getCount = jest.fn().mockReturnValue(2)
-
-    const result = await createRepository().countByUserUuid('123')
-
-    expect(selectQueryBuilder.where).toHaveBeenCalledWith('user_uuid = :user_uuid', {
-      user_uuid: '123',
-    })
-    expect(selectQueryBuilder.getCount).toHaveBeenCalled()
-    expect(result).toEqual(2)
-  })
-
-  it('should find one, longest lasting subscription by user uuid if there are no ucanceled ones', async () => {
-    subscription.cancelled = true
-
-    ormRepository.createQueryBuilder = jest.fn().mockImplementation(() => selectQueryBuilder)
-
-    selectQueryBuilder.where = jest.fn().mockReturnThis()
-    selectQueryBuilder.orderBy = jest.fn().mockReturnThis()
-    selectQueryBuilder.getMany = jest.fn().mockReturnValue([subscription])
-
-    const result = await createRepository().findOneByUserUuid('123')
-
-    expect(selectQueryBuilder.where).toHaveBeenCalledWith('user_uuid = :user_uuid', {
-      user_uuid: '123',
-    })
-    expect(selectQueryBuilder.orderBy).toHaveBeenCalledWith('ends_at', 'DESC')
-    expect(selectQueryBuilder.getMany).toHaveBeenCalled()
-    expect(result).toEqual(subscription)
-  })
-
-  it('should find none if there are no subscriptions for the user', async () => {
-    ormRepository.createQueryBuilder = jest.fn().mockImplementation(() => selectQueryBuilder)
-
-    selectQueryBuilder.where = jest.fn().mockReturnThis()
-    selectQueryBuilder.orderBy = jest.fn().mockReturnThis()
-    selectQueryBuilder.getMany = jest.fn().mockReturnValue([])
-
-    const result = await createRepository().findOneByUserUuid('123')
-
-    expect(selectQueryBuilder.where).toHaveBeenCalledWith('user_uuid = :user_uuid', {
-      user_uuid: '123',
-    })
-    expect(selectQueryBuilder.orderBy).toHaveBeenCalledWith('ends_at', 'DESC')
-    expect(selectQueryBuilder.getMany).toHaveBeenCalled()
-    expect(result).toBeNull()
-  })
-
-  it('should update ends at by subscription id', async () => {
-    ormRepository.createQueryBuilder = jest.fn().mockImplementation(() => updateQueryBuilder)
-
-    updateQueryBuilder.update = jest.fn().mockReturnThis()
-    updateQueryBuilder.set = jest.fn().mockReturnThis()
-    updateQueryBuilder.where = jest.fn().mockReturnThis()
-    updateQueryBuilder.execute = jest.fn()
-
-    await createRepository().updateEndsAt(1, 1000, 1000)
-
-    expect(updateQueryBuilder.update).toHaveBeenCalled()
-    expect(updateQueryBuilder.set).toHaveBeenCalledWith({
-      updatedAt: 1000,
-      renewedAt: 1000,
-      endsAt: 1000,
-    })
-    expect(updateQueryBuilder.where).toHaveBeenCalledWith('subscription_id = :subscriptionId', {
-      subscriptionId: 1,
-    })
-    expect(updateQueryBuilder.execute).toHaveBeenCalled()
-  })
-
-  it('should update cancelled by subscription id', async () => {
-    ormRepository.createQueryBuilder = jest.fn().mockImplementation(() => updateQueryBuilder)
-
-    updateQueryBuilder.update = jest.fn().mockReturnThis()
-    updateQueryBuilder.set = jest.fn().mockReturnThis()
-    updateQueryBuilder.where = jest.fn().mockReturnThis()
-    updateQueryBuilder.execute = jest.fn()
-
-    await createRepository().updateCancelled(1, true, 1000)
-
-    expect(updateQueryBuilder.update).toHaveBeenCalled()
-    expect(updateQueryBuilder.set).toHaveBeenCalledWith({
-      updatedAt: expect.any(Number),
-      cancelled: true,
-    })
-    expect(updateQueryBuilder.where).toHaveBeenCalledWith('subscription_id = :subscriptionId', {
-      subscriptionId: 1,
-    })
-    expect(updateQueryBuilder.execute).toHaveBeenCalled()
-  })
-
-  it('should find subscriptions by id', async () => {
-    ormRepository.createQueryBuilder = jest.fn().mockImplementation(() => selectQueryBuilder)
-
-    selectQueryBuilder.where = jest.fn().mockReturnThis()
-    selectQueryBuilder.orderBy = jest.fn().mockReturnThis()
-    selectQueryBuilder.getMany = jest.fn().mockReturnValue([subscription])
-
-    const result = await createRepository().findBySubscriptionId(123)
-
-    expect(selectQueryBuilder.where).toHaveBeenCalledWith('subscription_id = :subscriptionId', {
-      subscriptionId: 123,
-    })
-    expect(selectQueryBuilder.orderBy).toHaveBeenCalledWith('created_at', 'DESC')
-    expect(selectQueryBuilder.getMany).toHaveBeenCalled()
-    expect(result).toEqual([subscription])
-  })
-
-  it('should find subscriptions by id and type', async () => {
-    ormRepository.createQueryBuilder = jest.fn().mockImplementation(() => selectQueryBuilder)
-
-    selectQueryBuilder.where = jest.fn().mockReturnThis()
-    selectQueryBuilder.orderBy = jest.fn().mockReturnThis()
-    selectQueryBuilder.getMany = jest.fn().mockReturnValue([subscription])
-
-    const result = await createRepository().findBySubscriptionIdAndType(123, UserSubscriptionType.Regular)
-
-    expect(selectQueryBuilder.where).toHaveBeenCalledWith(
-      'subscription_id = :subscriptionId AND subscription_type = :type',
-      {
-        subscriptionId: 123,
-        type: 'regular',
-      },
-    )
-    expect(selectQueryBuilder.orderBy).toHaveBeenCalledWith('created_at', 'DESC')
-    expect(selectQueryBuilder.getMany).toHaveBeenCalled()
-    expect(result).toEqual([subscription])
-  })
-
-  it('should find one subscription by id and user uuid', async () => {
-    ormRepository.createQueryBuilder = jest.fn().mockImplementation(() => selectQueryBuilder)
-
-    selectQueryBuilder.where = jest.fn().mockReturnThis()
-    selectQueryBuilder.getOne = jest.fn().mockReturnValue(subscription)
-
-    const result = await createRepository().findOneByUserUuidAndSubscriptionId('1-2-3', 5)
-
-    expect(selectQueryBuilder.where).toHaveBeenCalledWith(
-      'user_uuid = :userUuid AND subscription_id = :subscriptionId',
-      {
-        subscriptionId: 5,
-        userUuid: '1-2-3',
-      },
-    )
-    expect(selectQueryBuilder.getOne).toHaveBeenCalled()
-    expect(result).toEqual(subscription)
-  })
-
-  it('should find one subscription by uuid', async () => {
-    ormRepository.createQueryBuilder = jest.fn().mockImplementation(() => selectQueryBuilder)
-
-    selectQueryBuilder.where = jest.fn().mockReturnThis()
-    selectQueryBuilder.getOne = jest.fn().mockReturnValue(subscription)
-
-    const result = await createRepository().findOneByUuid('1-2-3')
-
-    expect(selectQueryBuilder.where).toHaveBeenCalledWith('uuid = :uuid', {
-      uuid: '1-2-3',
-    })
-    expect(selectQueryBuilder.getOne).toHaveBeenCalled()
-    expect(result).toEqual(subscription)
-  })
-})

packages/auth/src/Infra/Redis/LockRepository.spec.ts

@@ -1,92 +0,0 @@
-import 'reflect-metadata'
-
-import * as IORedis from 'ioredis'
-import { LockRepository } from './LockRepository'
-
-describe('LockRepository', () => {
-  let redisClient: IORedis.Redis
-  const maxLoginAttempts = 3
-  const failedLoginLockout = 120
-
-  const createRepository = () => new LockRepository(redisClient, maxLoginAttempts, failedLoginLockout)
-
-  beforeEach(() => {
-    redisClient = {} as jest.Mocked<IORedis.Redis>
-    redisClient.expire = jest.fn()
-    redisClient.del = jest.fn()
-    redisClient.get = jest.fn()
-    redisClient.setex = jest.fn()
-  })
-
-  it('should lock a successfully used OTP for the lockout period', async () => {
-    await createRepository().lockSuccessfullOTP('test@test.te', '123456')
-
-    expect(redisClient.setex).toHaveBeenCalledWith('otp-lock:test@test.te', 60, '123456')
-  })
-
-  it('should indicate if an OTP was already used in the lockout period', async () => {
-    redisClient.get = jest.fn().mockReturnValue('123456')
-
-    expect(await createRepository().isOTPLocked('test@test.te', '123456')).toEqual(true)
-  })
-
-  it('should indicate if an OTP was not already used in the lockout period', async () => {
-    redisClient.get = jest.fn().mockReturnValue('654321')
-
-    expect(await createRepository().isOTPLocked('test@test.te', '123456')).toEqual(false)
-  })
-
-  it('should lock a user for the lockout period', async () => {
-    await createRepository().lockUser('123')
-
-    expect(redisClient.expire).toHaveBeenCalledWith('lock:123', 120)
-  })
-
-  it('should tell a user is locked if his counter is above threshold', async () => {
-    redisClient.get = jest.fn().mockReturnValue('4')
-
-    expect(await createRepository().isUserLocked('123')).toBeTruthy()
-  })
-
-  it('should tell a user is locked if his counter is at the threshold', async () => {
-    redisClient.get = jest.fn().mockReturnValue('3')
-
-    expect(await createRepository().isUserLocked('123')).toBeTruthy()
-  })
-
-  it('should tell a user is not locked if his counter is below threshold', async () => {
-    redisClient.get = jest.fn().mockReturnValue('2')
-
-    expect(await createRepository().isUserLocked('123')).toBeFalsy()
-  })
-
-  it('should tell a user is not locked if he has no counter', async () => {
-    redisClient.get = jest.fn().mockReturnValue(null)
-
-    expect(await createRepository().isUserLocked('123')).toBeFalsy()
-  })
-
-  it('should tell what the user lock counter is', async () => {
-    redisClient.get = jest.fn().mockReturnValue('3')
-
-    expect(await createRepository().getLockCounter('123')).toStrictEqual(3)
-  })
-
-  it('should tell that the user lock counter is 0 when there is no counter', async () => {
-    redisClient.get = jest.fn().mockReturnValue(null)
-
-    expect(await createRepository().getLockCounter('123')).toStrictEqual(0)
-  })
-
-  it('should reset a lock counter', async () => {
-    await createRepository().resetLockCounter('123')
-
-    expect(redisClient.del).toHaveBeenCalledWith('lock:123')
-  })
-
-  it('should update a lock counter', async () => {
-    await createRepository().updateLockCounter('123', 3)
-
-    expect(redisClient.setex).toHaveBeenCalledWith('lock:123', 120, 3)
-  })
-})

packages/auth/src/Infra/Redis/RedisEphemeralSessionRepository.spec.ts

@@ -1,152 +0,0 @@
-import 'reflect-metadata'
-
-import * as IORedis from 'ioredis'
-
-import { RedisEphemeralSessionRepository } from './RedisEphemeralSessionRepository'
-import { EphemeralSession } from '../../Domain/Session/EphemeralSession'
-
-describe('RedisEphemeralSessionRepository', () => {
-  let redisClient: IORedis.Redis
-  let pipeline: IORedis.Pipeline
-
-  const createRepository = () => new RedisEphemeralSessionRepository(redisClient, 3600)
-
-  beforeEach(() => {
-    redisClient = {} as jest.Mocked<IORedis.Redis>
-
-    redisClient.get = jest.fn()
-    redisClient.smembers = jest.fn()
-
-    pipeline = {} as jest.Mocked<IORedis.Pipeline>
-    pipeline.setex = jest.fn()
-    pipeline.expire = jest.fn()
-    pipeline.sadd = jest.fn()
-    pipeline.del = jest.fn()
-    pipeline.srem = jest.fn()
-    pipeline.exec = jest.fn()
-
-    redisClient.pipeline = jest.fn().mockReturnValue(pipeline)
-  })
-
-  it('should delete an ephemeral', async () => {
-    await createRepository().deleteOne('1-2-3', '2-3-4')
-
-    expect(pipeline.del).toHaveBeenCalledWith('session:1-2-3:2-3-4')
-    expect(pipeline.del).toHaveBeenCalledWith('session:1-2-3')
-    expect(pipeline.srem).toHaveBeenCalledWith('user-sessions:2-3-4', '1-2-3')
-  })
-
-  it('should save an ephemeral session', async () => {
-    const ephemeralSession = new EphemeralSession()
-    ephemeralSession.uuid = '1-2-3'
-    ephemeralSession.userUuid = '2-3-4'
-    ephemeralSession.userAgent = 'Mozilla Firefox'
-    ephemeralSession.createdAt = new Date(1)
-    ephemeralSession.updatedAt = new Date(2)
-
-    await createRepository().save(ephemeralSession)
-
-    expect(pipeline.setex).toHaveBeenCalledWith(
-      'session:1-2-3:2-3-4',
-      3600,
-      '{"uuid":"1-2-3","userUuid":"2-3-4","userAgent":"Mozilla Firefox","createdAt":"1970-01-01T00:00:00.001Z","updatedAt":"1970-01-01T00:00:00.002Z"}',
-    )
-    expect(pipeline.sadd).toHaveBeenCalledWith('user-sessions:2-3-4', '1-2-3')
-    expect(pipeline.expire).toHaveBeenCalledWith('user-sessions:2-3-4', 3600)
-  })
-
-  it('should find all ephemeral sessions by user uuid', async () => {
-    redisClient.smembers = jest.fn().mockReturnValue(['1-2-3', '2-3-4', '3-4-5'])
-
-    redisClient.get = jest
-      .fn()
-      .mockReturnValueOnce(
-        '{"uuid":"1-2-3","userUuid":"2-3-4","userAgent":"Mozilla Firefox","createdAt":"1970-01-01T00:00:00.001Z","updatedAt":"1970-01-01T00:00:00.002Z"}',
-      )
-      .mockReturnValueOnce(
-        '{"uuid":"2-3-4","userUuid":"2-3-4","userAgent":"Google Chrome","createdAt":"1970-01-01T00:00:00.001Z","updatedAt":"1970-01-01T00:00:00.002Z"}',
-      )
-      .mockReturnValueOnce(null)
-
-    const ephemeralSessions = await createRepository().findAllByUserUuid('2-3-4')
-
-    expect(ephemeralSessions.length).toEqual(2)
-    expect(ephemeralSessions[1].userAgent).toEqual('Google Chrome')
-  })
-
-  it('should find an ephemeral session by uuid', async () => {
-    redisClient.get = jest
-      .fn()
-      .mockReturnValue(
-        '{"uuid":"1-2-3","userUuid":"2-3-4","userAgent":"Mozilla Firefox","createdAt":"1970-01-01T00:00:00.001Z","updatedAt":"1970-01-01T00:00:00.002Z"}',
-      )
-
-    const ephemeralSession = <EphemeralSession>await createRepository().findOneByUuid('1-2-3')
-
-    expect(ephemeralSession).not.toBeUndefined()
-    expect(ephemeralSession.userAgent).toEqual('Mozilla Firefox')
-  })
-
-  it('should find an ephemeral session by uuid and user uuid', async () => {
-    redisClient.get = jest
-      .fn()
-      .mockReturnValue(
-        '{"uuid":"1-2-3","userUuid":"2-3-4","userAgent":"Mozilla Firefox","createdAt":"1970-01-01T00:00:00.001Z","updatedAt":"1970-01-01T00:00:00.002Z"}',
-      )
-
-    const ephemeralSession = <EphemeralSession>await createRepository().findOneByUuidAndUserUuid('1-2-3', '2-3-4')
-
-    expect(ephemeralSession).not.toBeUndefined()
-    expect(ephemeralSession.userAgent).toEqual('Mozilla Firefox')
-  })
-
-  it('should return undefined if session is not found', async () => {
-    redisClient.get = jest.fn().mockReturnValue(null)
-
-    const ephemeralSession = <EphemeralSession>await createRepository().findOneByUuid('1-2-3')
-
-    expect(ephemeralSession).toBeNull()
-  })
-
-  it('should return undefined if ephemeral session is not found', async () => {
-    redisClient.get = jest.fn().mockReturnValue(null)
-
-    const ephemeralSession = <EphemeralSession>await createRepository().findOneByUuidAndUserUuid('1-2-3', '2-3-4')
-
-    expect(ephemeralSession).toBeNull()
-  })
-
-  it('should update tokens and expirations dates', async () => {
-    redisClient.get = jest
-      .fn()
-      .mockReturnValue(
-        '{"uuid":"1-2-3","userUuid":"2-3-4","userAgent":"Mozilla Firefox","createdAt":"1970-01-01T00:00:00.001Z","updatedAt":"1970-01-01T00:00:00.002Z"}',
-      )
-
-    await createRepository().updateTokensAndExpirationDates(
-      '1-2-3',
-      'dummy_access_token',
-      'dummy_refresh_token',
-      new Date(3),
-      new Date(4),
-    )
-
-    expect(pipeline.setex).toHaveBeenCalledWith(
-      'session:1-2-3:2-3-4',
-      3600,
-      '{"uuid":"1-2-3","userUuid":"2-3-4","userAgent":"Mozilla Firefox","createdAt":"1970-01-01T00:00:00.001Z","updatedAt":"1970-01-01T00:00:00.002Z","hashedAccessToken":"dummy_access_token","hashedRefreshToken":"dummy_refresh_token","accessExpiration":"1970-01-01T00:00:00.003Z","refreshExpiration":"1970-01-01T00:00:00.004Z"}',
-    )
-  })
-
-  it('should not update tokens and expirations dates if the ephemeral session does not exist', async () => {
-    await createRepository().updateTokensAndExpirationDates(
-      '1-2-3',
-      'dummy_access_token',
-      'dummy_refresh_token',
-      new Date(3),
-      new Date(4),
-    )
-
-    expect(pipeline.setex).not.toHaveBeenCalled()
-  })
-})

packages/auth/src/Infra/Redis/RedisOfflineSubscriptionTokenRepository.spec.ts

@@ -1,59 +0,0 @@
-import 'reflect-metadata'
-
-import * as IORedis from 'ioredis'
-import { TimerInterface } from '@standardnotes/time'
-
-import { RedisOfflineSubscriptionTokenRepository } from './RedisOfflineSubscriptionTokenRepository'
-import { OfflineSubscriptionToken } from '../../Domain/Auth/OfflineSubscriptionToken'
-import { Logger } from 'winston'
-
-describe('RedisOfflineSubscriptionTokenRepository', () => {
-  let redisClient: IORedis.Redis
-  let timer: TimerInterface
-  let logger: Logger
-
-  const createRepository = () => new RedisOfflineSubscriptionTokenRepository(redisClient, timer, logger)
-
-  beforeEach(() => {
-    redisClient = {} as jest.Mocked<IORedis.Redis>
-    redisClient.set = jest.fn()
-    redisClient.get = jest.fn()
-    redisClient.expireat = jest.fn()
-
-    timer = {} as jest.Mocked<TimerInterface>
-    timer.convertMicrosecondsToSeconds = jest.fn().mockReturnValue(1)
-
-    logger = {} as jest.Mocked<Logger>
-    logger.debug = jest.fn()
-  })
-
-  it('should get a user uuid in exchange for an dashboard token', async () => {
-    redisClient.get = jest.fn().mockReturnValue('test@test.com')
-
-    expect(await createRepository().getUserEmailByToken('random-string')).toEqual('test@test.com')
-
-    expect(redisClient.get).toHaveBeenCalledWith('offline-subscription-token:random-string')
-  })
-
-  it('should return undefined if a user uuid is not exchanged for an dashboard token', async () => {
-    redisClient.get = jest.fn().mockReturnValue(null)
-
-    expect(await createRepository().getUserEmailByToken('random-string')).toBeUndefined()
-
-    expect(redisClient.get).toHaveBeenCalledWith('offline-subscription-token:random-string')
-  })
-
-  it('should save an dashboard token', async () => {
-    const offlineSubscriptionToken: OfflineSubscriptionToken = {
-      userEmail: 'test@test.com',
-      token: 'random-string',
-      expiresAt: 123,
-    }
-
-    await createRepository().save(offlineSubscriptionToken)
-
-    expect(redisClient.set).toHaveBeenCalledWith('offline-subscription-token:random-string', 'test@test.com')
-
-    expect(redisClient.expireat).toHaveBeenCalledWith('offline-subscription-token:random-string', 1)
-  })
-})

packages/auth/src/Infra/Redis/RedisPKCERepository.spec.ts

@@ -1,34 +0,0 @@
-import 'reflect-metadata'
-
-import * as IORedis from 'ioredis'
-import { Logger } from 'winston'
-
-import { RedisPKCERepository } from './RedisPKCERepository'
-
-describe('RedisPKCERepository', () => {
-  let redisClient: IORedis.Redis
-  let logger: Logger
-
-  const createRepository = () => new RedisPKCERepository(redisClient, logger)
-
-  beforeEach(() => {
-    redisClient = {} as jest.Mocked<IORedis.Redis>
-    redisClient.setex = jest.fn()
-    redisClient.del = jest.fn().mockReturnValue(1)
-
-    logger = {} as jest.Mocked<Logger>
-    logger.debug = jest.fn()
-  })
-
-  it('should store a code challenge', async () => {
-    await createRepository().storeCodeChallenge('test')
-
-    expect(redisClient.setex).toHaveBeenCalledWith('pkce:test', 3600, 'test')
-  })
-
-  it('should remove a code challenge and notify of success', async () => {
-    expect(await createRepository().removeCodeChallenge('test')).toBeTruthy()
-
-    expect(redisClient.del).toHaveBeenCalledWith('pkce:test')
-  })
-})

packages/auth/src/Infra/Redis/RedisSubscriptionTokenRepository.spec.ts

@@ -1,70 +0,0 @@
-import 'reflect-metadata'
-
-import * as IORedis from 'ioredis'
-import { TimerInterface } from '@standardnotes/time'
-
-import { RedisSubscriptionTokenRepository } from './RedisSubscriptionTokenRepository'
-import { SubscriptionToken } from '../../Domain/Subscription/SubscriptionToken'
-
-describe('RedisSubscriptionTokenRepository', () => {
-  let redisClient: IORedis.Redis
-  let timer: TimerInterface
-
-  const createRepository = () => new RedisSubscriptionTokenRepository(redisClient, timer)
-
-  beforeEach(() => {
-    redisClient = {} as jest.Mocked<IORedis.Redis>
-    redisClient.set = jest.fn().mockReturnValue('OK')
-    redisClient.get = jest.fn()
-    redisClient.expireat = jest.fn().mockReturnValue(1)
-
-    timer = {} as jest.Mocked<TimerInterface>
-    timer.convertMicrosecondsToSeconds = jest.fn().mockReturnValue(1)
-  })
-
-  it('should get a user uuid in exchange for an subscription token', async () => {
-    redisClient.get = jest.fn().mockReturnValue('1-2-3')
-
-    expect(await createRepository().getUserUuidByToken('random-string')).toEqual('1-2-3')
-
-    expect(redisClient.get).toHaveBeenCalledWith('subscription-token:random-string')
-  })
-
-  it('should return undefined if a user uuid is not exchanged for an subscription token', async () => {
-    redisClient.get = jest.fn().mockReturnValue(null)
-
-    expect(await createRepository().getUserUuidByToken('random-string')).toBeUndefined()
-
-    expect(redisClient.get).toHaveBeenCalledWith('subscription-token:random-string')
-  })
-
-  it('should save an subscription token', async () => {
-    const subscriptionToken: SubscriptionToken = {
-      userUuid: '1-2-3',
-      token: 'random-string',
-      expiresAt: 123,
-    }
-
-    expect(await createRepository().save(subscriptionToken)).toBeTruthy()
-
-    expect(redisClient.set).toHaveBeenCalledWith('subscription-token:random-string', '1-2-3')
-
-    expect(redisClient.expireat).toHaveBeenCalledWith('subscription-token:random-string', 1)
-  })
-
-  it('should indicate subscription token was not saved', async () => {
-    redisClient.set = jest.fn().mockReturnValue(null)
-
-    const subscriptionToken: SubscriptionToken = {
-      userUuid: '1-2-3',
-      token: 'random-string',
-      expiresAt: 123,
-    }
-
-    expect(await createRepository().save(subscriptionToken)).toBeFalsy()
-
-    expect(redisClient.set).toHaveBeenCalledWith('subscription-token:random-string', '1-2-3')
-
-    expect(redisClient.expireat).toHaveBeenCalledWith('subscription-token:random-string', 1)
-  })
-})

packages/auth/src/Infra/WebSockets/WebSocketsClientService.spec.ts

@@ -1,53 +0,0 @@
-import 'reflect-metadata'
-
-import {
-  DomainEventPublisherInterface,
-  UserRolesChangedEvent,
-  WebSocketMessageRequestedEvent,
-} from '@standardnotes/domain-events'
-import { RoleName } from '@standardnotes/common'
-
-import { User } from '../../Domain/User/User'
-import { WebSocketsClientService } from './WebSocketsClientService'
-import { DomainEventFactoryInterface } from '../../Domain/Event/DomainEventFactoryInterface'
-
-describe('WebSocketsClientService', () => {
-  let user: User
-  let event: UserRolesChangedEvent
-  let domainEventFactory: DomainEventFactoryInterface
-  let domainEventPublisher: DomainEventPublisherInterface
-
-  const createService = () => new WebSocketsClientService(domainEventFactory, domainEventPublisher)
-
-  beforeEach(() => {
-    user = {
-      uuid: '123',
-      email: 'test@test.com',
-      roles: Promise.resolve([
-        {
-          name: RoleName.ProUser,
-        },
-      ]),
-    } as jest.Mocked<User>
-
-    event = {} as jest.Mocked<UserRolesChangedEvent>
-
-    domainEventFactory = {} as jest.Mocked<DomainEventFactoryInterface>
-    domainEventFactory.createUserRolesChangedEvent = jest.fn().mockReturnValue(event)
-    domainEventFactory.createWebSocketMessageRequestedEvent = jest
-      .fn()
-      .mockReturnValue({} as jest.Mocked<WebSocketMessageRequestedEvent>)
-
-    domainEventPublisher = {} as jest.Mocked<DomainEventPublisherInterface>
-    domainEventPublisher.publish = jest.fn()
-  })
-
-  it('should request a message about a user role changed', async () => {
-    await createService().sendUserRolesChangedEvent(user)
-
-    expect(domainEventFactory.createUserRolesChangedEvent).toHaveBeenCalledWith('123', 'test@test.com', [
-      RoleName.ProUser,
-    ])
-    expect(domainEventPublisher.publish).toHaveBeenCalled()
-  })
-})

packages/auth/src/Projection/PermissionProjector.spec.ts

@@ -1,47 +0,0 @@
-import 'reflect-metadata'
-
-import { Permission } from '../Domain/Permission/Permission'
-
-import { PermissionProjector } from './PermissionProjector'
-
-describe('PermissionProjector', () => {
-  let permission: Permission
-
-  const createProjector = () => new PermissionProjector()
-
-  beforeEach(() => {
-    permission = new Permission()
-    permission.uuid = '123'
-    permission.name = 'permission1'
-    permission.createdAt = new Date(1)
-    permission.updatedAt = new Date(2)
-  })
-
-  it('should create a simple projection', () => {
-    const projection = createProjector().projectSimple(permission)
-    expect(projection).toMatchObject({
-      uuid: '123',
-      name: 'permission1',
-    })
-  })
-
-  it('should throw error on custom projection', () => {
-    let error = null
-    try {
-      createProjector().projectCustom('test', permission)
-    } catch (e) {
-      error = e
-    }
-    expect(error).not.toBeNull()
-  })
-
-  it('should throw error on not implemetned full projection', () => {
-    let error = null
-    try {
-      createProjector().projectFull(permission)
-    } catch (e) {
-      error = e
-    }
-    expect(error).not.toBeNull()
-  })
-})

packages/auth/src/Projection/RoleProjector.spec.ts

@@ -1,47 +0,0 @@
-import 'reflect-metadata'
-
-import { Role } from '../Domain/Role/Role'
-
-import { RoleProjector } from './RoleProjector'
-
-describe('RoleProjector', () => {
-  let role: Role
-
-  const createProjector = () => new RoleProjector()
-
-  beforeEach(() => {
-    role = new Role()
-    role.uuid = '123'
-    role.name = 'role1'
-    role.createdAt = new Date(1)
-    role.updatedAt = new Date(2)
-  })
-
-  it('should create a simple projection', () => {
-    const projection = createProjector().projectSimple(role)
-    expect(projection).toMatchObject({
-      uuid: '123',
-      name: 'role1',
-    })
-  })
-
-  it('should throw error on custom projection', () => {
-    let error = null
-    try {
-      createProjector().projectCustom('test', role)
-    } catch (e) {
-      error = e
-    }
-    expect(error).not.toBeNull()
-  })
-
-  it('should throw error on not implemetned full projection', () => {
-    let error = null
-    try {
-      createProjector().projectFull(role)
-    } catch (e) {
-      error = e
-    }
-    expect(error).not.toBeNull()
-  })
-})

packages/auth/src/Projection/SessionProjector.spec.ts

@@ -1,109 +0,0 @@
-import 'reflect-metadata'
-
-import { SessionServiceInterface } from '../Domain/Session/SessionServiceInterface'
-import { SessionProjector } from './SessionProjector'
-import { Session } from '../Domain/Session/Session'
-import { TimerInterface } from '@standardnotes/time'
-
-describe('SessionProjector', () => {
-  let session: Session
-  let currentSession: Session
-  let sessionService: SessionServiceInterface
-  let timer: TimerInterface
-
-  const createProjector = () => new SessionProjector(sessionService, timer)
-
-  beforeEach(() => {
-    session = new Session()
-    session.uuid = '123'
-    session.hashedAccessToken = 'hashed access token'
-    session.userUuid = '234'
-    session.apiVersion = '004'
-    session.createdAt = new Date(1)
-    session.updatedAt = new Date(1)
-    session.accessExpiration = new Date(1)
-    session.refreshExpiration = new Date(1)
-    session.readonlyAccess = false
-
-    currentSession = new Session()
-    currentSession.uuid = '234'
-
-    sessionService = {} as jest.Mocked<SessionServiceInterface>
-    sessionService.getDeviceInfo = jest.fn().mockReturnValue('Some Device Info')
-
-    timer = {} as jest.Mocked<TimerInterface>
-    timer.convertDateToISOString = jest.fn().mockReturnValue('2020-11-26T13:34:00.000Z')
-  })
-
-  it('should create a simple projection of a session', () => {
-    const projection = createProjector().projectSimple(session)
-    expect(projection).toMatchObject({
-      uuid: '123',
-      api_version: '004',
-      created_at: '2020-11-26T13:34:00.000Z',
-      updated_at: '2020-11-26T13:34:00.000Z',
-      device_info: 'Some Device Info',
-      readonly_access: false,
-      access_expiration: '2020-11-26T13:34:00.000Z',
-      refresh_expiration: '2020-11-26T13:34:00.000Z',
-    })
-  })
-
-  it('should create a custom projection of a session', () => {
-    const projection = createProjector().projectCustom(
-      SessionProjector.CURRENT_SESSION_PROJECTION.toString(),
-      session,
-      currentSession,
-    )
-
-    expect(projection).toMatchObject({
-      uuid: '123',
-      api_version: '004',
-      created_at: '2020-11-26T13:34:00.000Z',
-      updated_at: '2020-11-26T13:34:00.000Z',
-      device_info: 'Some Device Info',
-      current: false,
-      readonly_access: false,
-    })
-  })
-
-  it('should create a custom projection of a current session', () => {
-    currentSession.uuid = '123'
-
-    const projection = createProjector().projectCustom(
-      SessionProjector.CURRENT_SESSION_PROJECTION.toString(),
-      session,
-      currentSession,
-    )
-
-    expect(projection).toMatchObject({
-      uuid: '123',
-      api_version: '004',
-      created_at: '2020-11-26T13:34:00.000Z',
-      updated_at: '2020-11-26T13:34:00.000Z',
-      device_info: 'Some Device Info',
-      current: true,
-      readonly_access: false,
-    })
-  })
-
-  it('should throw error on unknown custom projection', () => {
-    let error = null
-    try {
-      createProjector().projectCustom('test', session, currentSession)
-    } catch (e) {
-      error = e
-    }
-    expect((error as Error).message).toEqual('Not supported projection type: test')
-  })
-
-  it('should throw error on not implemetned full projection', () => {
-    let error = null
-    try {
-      createProjector().projectFull(session)
-    } catch (e) {
-      error = e
-    }
-    expect((error as Error).message).toEqual('not implemented')
-  })
-})

packages/auth/src/Projection/SettingProjector.spec.ts

@@ -1,48 +0,0 @@
-import 'reflect-metadata'
-
-import { Setting } from '../Domain/Setting/Setting'
-
-import { SettingProjector } from './SettingProjector'
-
-describe('SettingProjector', () => {
-  let setting: Setting
-
-  const createProjector = () => new SettingProjector()
-
-  beforeEach(() => {
-    setting = {
-      uuid: 'setting-uuid',
-      name: 'setting-name',
-      value: 'setting-value',
-      serverEncryptionVersion: 1,
-      createdAt: 1,
-      updatedAt: 2,
-      sensitive: false,
-    } as jest.Mocked<Setting>
-  })
-
-  it('should create a simple projection of a setting', async () => {
-    const projection = await createProjector().projectSimple(setting)
-    expect(projection).toStrictEqual({
-      uuid: 'setting-uuid',
-      name: 'setting-name',
-      value: 'setting-value',
-      createdAt: 1,
-      updatedAt: 2,
-      sensitive: false,
-    })
-  })
-  it('should create a simple projection of list of settings', async () => {
-    const projection = await createProjector().projectManySimple([setting])
-    expect(projection).toStrictEqual([
-      {
-        uuid: 'setting-uuid',
-        name: 'setting-name',
-        value: 'setting-value',
-        createdAt: 1,
-        updatedAt: 2,
-        sensitive: false,
-      },
-    ])
-  })
-})

packages/auth/src/Projection/SubscriptionSettingProjector.spec.ts

@@ -1,48 +0,0 @@
-import 'reflect-metadata'
-
-import { SubscriptionSetting } from '../Domain/Setting/SubscriptionSetting'
-
-import { SubscriptionSettingProjector } from './SubscriptionSettingProjector'
-
-describe('SubscriptionSettingProjector', () => {
-  let setting: SubscriptionSetting
-
-  const createProjector = () => new SubscriptionSettingProjector()
-
-  beforeEach(() => {
-    setting = {
-      uuid: 'setting-uuid',
-      name: 'setting-name',
-      value: 'setting-value',
-      serverEncryptionVersion: 1,
-      createdAt: 1,
-      updatedAt: 2,
-      sensitive: false,
-    } as jest.Mocked<SubscriptionSetting>
-  })
-
-  it('should create a simple projection of a setting', async () => {
-    const projection = await createProjector().projectSimple(setting)
-    expect(projection).toStrictEqual({
-      uuid: 'setting-uuid',
-      name: 'setting-name',
-      value: 'setting-value',
-      createdAt: 1,
-      updatedAt: 2,
-      sensitive: false,
-    })
-  })
-  it('should create a simple projection of list of settings', async () => {
-    const projection = await createProjector().projectManySimple([setting])
-    expect(projection).toStrictEqual([
-      {
-        uuid: 'setting-uuid',
-        name: 'setting-name',
-        value: 'setting-value',
-        createdAt: 1,
-        updatedAt: 2,
-        sensitive: false,
-      },
-    ])
-  })
-})

packages/auth/src/Projection/UserProjector.spec.ts

@@ -1,45 +0,0 @@
-import 'reflect-metadata'
-
-import { UserProjector } from './UserProjector'
-import { User } from '../Domain/User/User'
-
-describe('UserProjector', () => {
-  let user: User
-
-  const createProjector = () => new UserProjector()
-
-  beforeEach(() => {
-    user = new User()
-    user.uuid = '123'
-    user.email = 'test@test.te'
-    user.encryptedPassword = '123qwe345'
-  })
-
-  it('should create a simple projection of a user', () => {
-    const projection = createProjector().projectSimple(user)
-    expect(projection).toMatchObject({
-      uuid: '123',
-      email: 'test@test.te',
-    })
-  })
-
-  it('should throw error on custom projection', () => {
-    let error = null
-    try {
-      createProjector().projectCustom('test', user)
-    } catch (e) {
-      error = e
-    }
-    expect(error).not.toBeNull()
-  })
-
-  it('should throw error on not implemetned full projection', () => {
-    let error = null
-    try {
-      createProjector().projectFull(user)
-    } catch (e) {
-      error = e
-    }
-    expect(error).not.toBeNull()
-  })
-})

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.46.1](https://github.com/standardnotes/server/compare/@standardnotes/common@1.46.0...@standardnotes/common@1.46.1) (2022-11-25)
+
+### Bug Fixes
+
+* **common:** add black friday 2022 reminder message identifier ([91b76ed](https://github.com/standardnotes/server/commit/91b76edce1c1abfa4e860932d98ce8cd369017c0))
+
+# [1.46.0](https://github.com/standardnotes/server/compare/@standardnotes/common@1.45.0...@standardnotes/common@1.46.0) (2022-11-22)
+
+### Features
+
+* **common:** add marketing campaign for black friday 2022 email message identifier ([d77eb7f](https://github.com/standardnotes/server/commit/d77eb7f5f11bcc7cd5c6fa6d20e891b466af7b45))
+
 # [1.45.0](https://github.com/standardnotes/server/compare/@standardnotes/common@1.44.4...@standardnotes/common@1.45.0) (2022-11-14)
 
 ### Features

packages/common/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/common",
-  "version": "1.45.0",
+  "version": "1.46.1",
   "engines": {
     "node": ">=18.0.0 <19.0.0"
   },