chore: autogenerated codeql file

- @standardnotes/api-gateway@1.3.1
 - @standardnotes/auth-server@1.3.4
 - @standardnotes/files-server@1.1.8
 - @standardnotes/scheduler-server@1.2.3
 - @standardnotes/syncing-server@1.1.8

.env.sample

@@ -0,0 +1,6 @@
+DB_PORT=3306
+DB_USERNAME=std_notes_user
+DB_PASSWORD=changeme123
+DB_DATABASE=standard_notes_db
+
+REDIS_PORT=6379

.github/workflows/codeql-analysis.yml

@@ -0,0 +1,72 @@
+# For most projects, this workflow file will not need changing; you simply need
+# to commit it to your repository.
+#
+# You may wish to alter this file to override the set of languages analyzed,
+# or to provide custom queries or build logic.
+#
+# ******** NOTE ********
+# We have attempted to detect the languages in your repository. Please check
+# the `language` matrix defined below to confirm you have the correct set of
+# supported CodeQL languages.
+#
+name: "CodeQL"
+
+on:
+  push:
+    branches: [ "main" ]
+  pull_request:
+    # The branches below must be a subset of the branches above
+    branches: [ "main" ]
+  schedule:
+    - cron: '44 8 * * 2'
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: ubuntu-latest
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
+
+    strategy:
+      fail-fast: false
+      matrix:
+        language: [ 'javascript' ]
+        # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
+        # Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v3
+
+    # Initializes the CodeQL tools for scanning.
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v2
+      with:
+        languages: ${{ matrix.language }}
+        # If you wish to specify custom queries, you can do so here or in a config file.
+        # By default, queries listed here will override any specified in a config file.
+        # Prefix the list here with "+" to use these queries and those in the config file.
+        
+        # Details on CodeQL's query packs refer to : https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
+        # queries: security-extended,security-and-quality
+
+        
+    # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
+    # If this step fails, then you should remove it and run the build manually (see below)
+    - name: Autobuild
+      uses: github/codeql-action/autobuild@v2
+
+    # ℹ️ Command-line programs to run using the OS shell.
+    # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
+
+    #   If the Autobuild fails above, remove it and uncomment the following three lines. 
+    #   modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance.
+
+    # - run: |
+    #   echo "Run, Build Application using script"
+    #   ./location_of_script_within_repo/buildscript.sh
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v2

.github/workflows/pr.yml

@@ -0,0 +1,21 @@
+name: Pull Request
+
+on:
+  pull_request:
+    branches:
+      - main
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+      - name: Install dependencies
+        run: yarn install --immutable
+      - name: ESLint
+        run: yarn lint
+      - name: Build
+        run: yarn build
+      - name: Test
+        run: yarn test

.github/workflows/scheduler.release.yml

@@ -88,7 +88,7 @@ jobs:
     - name: DEV - Download task definition
       run: |
         aws ecs describe-task-definition --task-definition scheduler-worker-dev --query taskDefinition > task-definition.json
-    - name: Fill in the new version in the Amazon ECS task definition
+    - name: DEV - Fill in the new version in the Amazon ECS task definition
       run: |
         jq '(.containerDefinitions[] | select(.name=="scheduler-worker-dev") | .environment[] | select(.name=="VERSION")).value = "${{ github.sha }}"' task-definition.json > tmp.json && mv tmp.json task-definition.json
     - name: DEV - Fill in the new image ID in the Amazon ECS task definition
@@ -108,7 +108,7 @@ jobs:
     - name: PROD - Download task definition
       run: |
         aws ecs describe-task-definition --task-definition scheduler-worker-prod --query taskDefinition > task-definition.json
-    - name: Fill in the new version in the Amazon ECS task definition
+    - name: PROD - Fill in the new version in the Amazon ECS task definition
       run: |
         jq '(.containerDefinitions[] | select(.name=="scheduler-worker-prod") | .environment[] | select(.name=="VERSION")).value = "${{ github.sha }}"' task-definition.json > tmp.json && mv tmp.json task-definition.json
     - name: PROD - Fill in the new image ID in the Amazon ECS task definition

.github/workflows/snjs.upgrade.event.yml

@@ -0,0 +1,46 @@
+name: Update SNJS Packages
+
+on:
+  workflow_dispatch:
+  repository_dispatch:
+    types: [snjs-updated-event]
+
+jobs:
+  SNJSUpdateEvent:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+        with:
+          ref: main
+          token: ${{ secrets.CI_PAT_TOKEN }}
+      - uses: actions/setup-node@v3
+        with:
+          registry-url: 'https://registry.npmjs.org'
+      - name: Setup git config
+        run: |
+          git config --global user.name "standardci"
+          git config --global user.email "ci@standardnotes.com"
+      - name: Import GPG key
+        uses: crazy-max/ghaction-import-gpg@v4
+        with:
+          gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }}
+          passphrase: ${{ secrets.PASSPHRASE }}
+          git_user_signingkey: true
+          git_commit_gpgsign: true
+
+      - run: yarn install
+      - run: |
+          yarn upgrade:snjs
+          yarn install --no-immutable
+
+      - name: Create Pull Request
+        uses: peter-evans/create-pull-request@v4
+        with:
+          token: ${{ secrets.CI_PAT_TOKEN }}
+          title: "${{ 'chore(deps): upgrade snjs' }}"
+          body: Updates all packages prefixed with "@standardnotes/"
+          commit-message: "${{ 'chore(deps): upgrade snjs' }}"
+          delete-branch: true
+          committer: standardci <ci@standardnotes.com>
+          author: standardci <ci@standardnotes.com>

.github/workflows/syncing-server.release.yml

@@ -89,7 +89,7 @@ jobs:
     - name: DEV - Download task definition
       run: |
         aws ecs describe-task-definition --task-definition syncing-server-js-dev --query taskDefinition > task-definition.json
-    - name: Fill in the new version in the Amazon ECS task definition
+    - name: DEV - Fill in the new version in the Amazon ECS task definition
       run: |
         jq '(.containerDefinitions[] | select(.name=="syncing-server-js-dev") | .environment[] | select(.name=="VERSION")).value = "${{ github.sha }}"' task-definition.json > tmp.json && mv tmp.json task-definition.json
     - name: DEV - Fill in the new image ID in the Amazon ECS task definition
@@ -109,7 +109,7 @@ jobs:
     - name: PROD - Download task definition
       run: |
         aws ecs describe-task-definition --task-definition syncing-server-js-prod --query taskDefinition > task-definition.json
-    - name: Fill in the new version in the Amazon ECS task definition
+    - name: PROD - Fill in the new version in the Amazon ECS task definition
       run: |
         jq '(.containerDefinitions[] | select(.name=="syncing-server-js-prod") | .environment[] | select(.name=="VERSION")).value = "${{ github.sha }}"' task-definition.json > tmp.json && mv tmp.json task-definition.json
     - name: PROD - Fill in the new image ID in the Amazon ECS task definition
@@ -142,7 +142,7 @@ jobs:
     - name: DEV - Download task definition
       run: |
         aws ecs describe-task-definition --task-definition syncing-server-js-worker-dev --query taskDefinition > task-definition.json
-    - name: Fill in the new version in the Amazon ECS task definition
+    - name: DEV - Fill in the new version in the Amazon ECS task definition
       run: |
         jq '(.containerDefinitions[] | select(.name=="syncing-server-js-worker-dev") | .environment[] | select(.name=="VERSION")).value = "${{ github.sha }}"' task-definition.json > tmp.json && mv tmp.json task-definition.json
     - name: DEV - Fill in the new image ID in the Amazon ECS task definition
@@ -162,7 +162,7 @@ jobs:
     - name: PROD - Download task definition
       run: |
         aws ecs describe-task-definition --task-definition syncing-server-js-worker-prod --query taskDefinition > task-definition.json
-    - name: Fill in the new version in the Amazon ECS task definition
+    - name: PROD - Fill in the new version in the Amazon ECS task definition
       run: |
         jq '(.containerDefinitions[] | select(.name=="syncing-server-js-worker-prod") | .environment[] | select(.name=="VERSION")).value = "${{ github.sha }}"' task-definition.json > tmp.json && mv tmp.json task-definition.json
     - name: PROD - Fill in the new image ID in the Amazon ECS task definition
@@ -185,25 +185,7 @@ jobs:
 
     runs-on: ubuntu-latest
     steps:
-      - name: DEV - 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_SYNCING_SERVER_WEB_DEV }}
-          revision: "${{ github.sha }}"
-          description: "Automated Deployment via Github Actions"
-          user: "${{ github.actor }}"
-      - name: DEV - 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_SYNCING_SERVER_WORKER_DEV }}
-          revision: "${{ github.sha }}"
-          description: "Automated Deployment via Github Actions"
-          user: "${{ github.actor }}"
-      - name: PROD - Create New Relic deployment marker for Web
+      - name: Create New Relic deployment marker for Web
         uses: newrelic/deployment-marker-action@v1
         with:
           accountId: ${{ secrets.NEW_RELIC_ACCOUNT_ID }}
@@ -212,7 +194,7 @@ jobs:
           revision: "${{ github.sha }}"
           description: "Automated Deployment via Github Actions"
           user: "${{ github.actor }}"
-      - name: PROD - Create New Relic deployment marker for Worker
+      - name: Create New Relic deployment marker for Worker
         uses: newrelic/deployment-marker-action@v1
         with:
           accountId: ${{ secrets.NEW_RELIC_ACCOUNT_ID }}

.gitignore

@@ -18,3 +18,6 @@ newrelic_agent.log
 
 packages/files/uploads/*
 !packages/files/uploads/.gitkeep
+
+data/*
+!data/.gitkeep

docker-compose.yml

@@ -0,0 +1,24 @@
+version: '3.8'
+services:
+  db:
+    image: mysql:5.6
+    environment:
+      MYSQL_DATABASE: '${DB_DATABASE}'
+      MYSQL_USER: '${DB_USERNAME}'
+      MYSQL_PASSWORD: '${DB_PASSWORD}'
+      MYSQL_ROOT_PASSWORD: '${DB_PASSWORD}'
+    expose:
+      - ${DB_PORT}:3306
+    restart: unless-stopped
+    command: --default-authentication-plugin=mysql_native_password --character-set-server=utf8 --collation-server=utf8_general_ci
+    volumes:
+      - ./data/mysql:/var/lib/mysql
+      - ./data/import:/docker-entrypoint-initdb.d
+
+  cache:
+    image: redis:6.0-alpine
+    volumes:
+      - ./data/redis/:/data
+    expose:
+      - ${REDIS_PORT}:6379
+    restart: unless-stopped

package.json

@@ -23,7 +23,7 @@
     "test:syncing-server": "yarn workspace @standardnotes/syncing-server test",
     "test:files": "yarn workspace @standardnotes/files-server test",
     "clean": "yarn workspaces foreach -p --verbose run clean",
-    "setup:env": "yarn workspaces foreach -p --verbose run setup:env",
+    "setup:env": "cp .env.sample .env && yarn workspaces foreach -p --verbose run setup:env",
     "build": "yarn workspaces foreach -pt -j 10 --verbose run build",
     "build:auth": "yarn workspace @standardnotes/auth-server build",
     "build:scheduler": "yarn workspace @standardnotes/scheduler-server build",
@@ -38,7 +38,9 @@
     "start:files": "yarn workspace @standardnotes/files-server start",
     "start:files-worker": "yarn workspace @standardnotes/files-server worker",
     "start:api-gateway": "yarn workspace @standardnotes/api-gateway start",
-    "release:prod": "lerna version --conventional-graduate --conventional-commits --yes -m \"chore(release): publish new version\""
+    "release:prod": "lerna version --conventional-graduate --conventional-commits --yes -m \"chore(release): publish new version\"",
+    "postversion": "./scripts/push-tags-one-by-one.sh",
+    "upgrade:snjs": "yarn workspaces foreach --verbose run upgrade:snjs"
   },
   "devDependencies": {
     "@commitlint/cli": "^17.0.2",
@@ -47,13 +49,20 @@
     "@lerna-lite/list": "^1.5.1",
     "@lerna-lite/run": "^1.5.1",
     "@types/jest": "^28.1.3",
+    "@types/newrelic": "^7.0.3",
     "@types/node": "^18.0.0",
     "@typescript-eslint/parser": "^5.29.0",
     "eslint": "^8.17.0",
     "eslint-config-prettier": "^8.5.0",
+    "ini": "^3.0.0",
+    "npm-check-updates": "^14.1.1",
     "prettier": "^2.7.1",
     "ts-node": "^10.8.1",
     "typescript": "^4.7.4"
   },
-  "packageManager": "yarn@3.2.1"
+  "packageManager": "yarn@3.2.1",
+  "dependencies": {
+    "@sentry/node": "^7.3.0",
+    "newrelic": "^8.14.1"
+  }
 }

packages/api-gateway/CHANGELOG.md

@@ -3,6 +3,60 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.3.1](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.3.0...@standardnotes/api-gateway@1.3.1) (2022-06-28)
+
+### Bug Fixes
+
+* add origin meta property to daily analytics event ([376a59c](https://github.com/standardnotes/api-gateway/commit/376a59c1827411164a536157fc591a15e0a5b0b2))
+
+# [1.3.0](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.2.2...@standardnotes/api-gateway@1.3.0) (2022-06-28)
+
+### Features
+
+* remove api metadata decorating html responses ([3035cbc](https://github.com/standardnotes/api-gateway/commit/3035cbc5ded1408bc4b8646563c4992ba5f27c75))
+
+## [1.2.2](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.2.1...@standardnotes/api-gateway@1.2.2) (2022-06-27)
+
+**Note:** Version bump only for package @standardnotes/api-gateway
+
+## [1.2.1](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.2.0...@standardnotes/api-gateway@1.2.1) (2022-06-27)
+
+### Bug Fixes
+
+* issue with NaN error code responses ([2cb470b](https://github.com/standardnotes/api-gateway/commit/2cb470b99edc2fac8d5c38e4eb16201e55fe8753))
+
+# [1.2.0](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.1.6...@standardnotes/api-gateway@1.2.0) (2022-06-27)
+
+### Features
+
+* add endpoint to mute marketing emails ([fa2a8da](https://github.com/standardnotes/api-gateway/commit/fa2a8da17bc6588021172adbbc4ecae5bd35f33a))
+
+## [1.1.6](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.1.5...@standardnotes/api-gateway@1.1.6) (2022-06-27)
+
+**Note:** Version bump only for package @standardnotes/api-gateway
+
+## [1.1.5](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.1.4...@standardnotes/api-gateway@1.1.5) (2022-06-27)
+
+### Bug Fixes
+
+* upgrade sentry node sdk ([b6db194](https://github.com/standardnotes/api-gateway/commit/b6db194a22ff1d0afe96c291d545b408c0a5c373))
+
+## [1.1.4](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.1.3...@standardnotes/api-gateway@1.1.4) (2022-06-24)
+
+### Bug Fixes
+
+* newrelic deps and setup db and cache for local development purposes ([ff09ae0](https://github.com/standardnotes/api-gateway/commit/ff09ae0a47747eaf7977ce5d3937ad385101eaeb))
+
+## [1.1.3](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.1.2...@standardnotes/api-gateway@1.1.3) (2022-06-23)
+
+### Bug Fixes
+
+* curl in the final image ([0d67c55](https://github.com/standardnotes/api-gateway/commit/0d67c55e124eed08bca16824750152b895fceca7))
+
+## [1.1.2](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.1.1...@standardnotes/api-gateway@1.1.2) (2022-06-23)
+
+**Note:** Version bump only for package @standardnotes/api-gateway
+
 ## [1.1.1](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.1.0...@standardnotes/api-gateway@1.1.1) (2022-06-23)
 
 **Note:** Version bump only for package @standardnotes/api-gateway

packages/api-gateway/Dockerfile

@@ -1,7 +1,7 @@
 FROM node:16.15.1-alpine AS builder
 
 # Install dependencies for building native libraries
-RUN apk add --update git openssh-client curl python3 alpine-sdk
+RUN apk add --update git openssh-client python3 alpine-sdk
 
 WORKDIR /workspace
 
@@ -12,6 +12,8 @@ RUN yarn install --immutable
 
 FROM node:16.15.1-alpine
 
+RUN apk add --update curl
+
 WORKDIR /workspace
 
 # Copy the installed dependencies from the previous stage.

packages/api-gateway/bin/report.ts

@@ -7,7 +7,11 @@ import { Logger } from 'winston'
 import { ContainerConfigLoader } from '../src/Bootstrap/Container'
 import TYPES from '../src/Bootstrap/Types'
 import { Env } from '../src/Bootstrap/Env'
-import { DomainEventPublisherInterface, DailyAnalyticsReportGeneratedEvent } from '@standardnotes/domain-events'
+import {
+  DomainEventPublisherInterface,
+  DailyAnalyticsReportGeneratedEvent,
+  DomainEventService,
+} from '@standardnotes/domain-events'
 import { AnalyticsActivity, AnalyticsStoreInterface, Period, StatisticsStoreInterface } from '@standardnotes/analytics'
 
 const requestReport = async (
@@ -23,6 +27,7 @@ const requestReport = async (
         userIdentifier: '',
         userIdentifierType: 'uuid',
       },
+      origin: DomainEventService.ApiGateway,
     },
     payload: {
       applicationStatistics: await statisticsStore.getYesterdayApplicationUsage(),

packages/api-gateway/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/api-gateway",
-  "version": "1.1.1",
+  "version": "1.3.1",
   "engines": {
     "node": ">=16.0.0 <17.0.0"
   },
@@ -15,18 +15,19 @@
     "prebuild": "yarn clean",
     "build": "tsc --rootDir ./",
     "lint": "eslint . --ext .ts",
+    "setup:env": "cp .env.sample .env",
     "start": "yarn node dist/bin/server.js",
-    "report": "yarn node dist/bin/report.js"
+    "report": "yarn node dist/bin/report.js",
+    "upgrade:snjs": "yarn ncu -u '@standardnotes/*'"
   },
   "dependencies": {
-    "@newrelic/native-metrics": "7.0.2",
     "@newrelic/winston-enricher": "^2.1.0",
-    "@sentry/node": "^6.16.1",
-    "@standardnotes/analytics": "^1.4.0",
-    "@standardnotes/auth": "3.19.2",
-    "@standardnotes/domain-events": "2.29.0",
-    "@standardnotes/domain-events-infra": "1.4.127",
-    "@standardnotes/time": "^1.7.0",
+    "@sentry/node": "^7.3.0",
+    "@standardnotes/analytics": "^1.6.0",
+    "@standardnotes/auth": "3.19.4",
+    "@standardnotes/domain-events": "2.32.5",
+    "@standardnotes/domain-events-infra": "1.5.5",
+    "@standardnotes/time": "^1.7.1",
     "aws-sdk": "^2.1160.0",
     "axios": "0.24.0",
     "cors": "2.8.5",
@@ -37,7 +38,7 @@
     "inversify-express-utils": "^6.4.3",
     "ioredis": "^5.0.6",
     "jsonwebtoken": "8.5.1",
-    "newrelic": "8.6.0",
+    "newrelic": "^8.14.1",
     "prettyjson": "1.2.1",
     "reflect-metadata": "0.1.13",
     "winston": "3.3.3"
@@ -48,13 +49,14 @@
     "@types/ioredis": "^4.28.10",
     "@types/jest": "^28.1.3",
     "@types/jsonwebtoken": "^8.5.0",
-    "@types/newrelic": "^7.0.1",
+    "@types/newrelic": "^7.0.3",
     "@types/prettyjson": "^0.0.29",
     "@typescript-eslint/eslint-plugin": "^5.29.0",
     "eslint": "^8.14.0",
     "eslint-plugin-prettier": "^4.0.0",
     "jest": "^28.1.1",
     "nodemon": "^2.0.16",
+    "npm-check-updates": "^14.1.1",
     "ts-jest": "^28.0.1"
   }
 }

packages/api-gateway/src/Controller/AuthMiddleware.ts

@@ -99,7 +99,10 @@ export class AuthMiddleware extends BaseMiddleware {
         response.setHeader('content-type', (error as AxiosError).response?.headers['content-type'] as string)
       }
 
-      const errorCode = (error as AxiosError).isAxiosError ? +((error as AxiosError).code as string) : 500
+      const errorCode =
+        (error as AxiosError).isAxiosError && !isNaN(+((error as AxiosError).code as string))
+          ? +((error as AxiosError).code as string)
+          : 500
 
       response.status(errorCode).send(errorMessage)
 

packages/api-gateway/src/Controller/SubscriptionTokenAuthMiddleware.ts

@@ -88,7 +88,10 @@ export class SubscriptionTokenAuthMiddleware extends BaseMiddleware {
         response.setHeader('content-type', (error as AxiosError).response?.headers['content-type'] as string)
       }
 
-      const errorCode = (error as AxiosError).isAxiosError ? +((error as AxiosError).code as string) : 500
+      const errorCode =
+        (error as AxiosError).isAxiosError && !isNaN(+((error as AxiosError).code as string))
+          ? +((error as AxiosError).code as string)
+          : 500
 
       response.status(errorCode).send(errorMessage)
 

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

@@ -49,4 +49,14 @@ export class ActionsController extends BaseHttpController {
       request.body,
     )
   }
+
+  @httpGet('/marketing-emails/mute/:settingUuid')
+  async muteMarketingEmails(request: Request, response: Response): Promise<void> {
+    await this.httpService.callAuthServer(
+      request,
+      response,
+      `internal/settings/marketing-emails/${request.params.settingUuid}/mute`,
+      request.body,
+    )
+  }
 }

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

@@ -133,7 +133,10 @@ export class HttpService implements HttpServiceInterface {
         response.setHeader('content-type', (error as AxiosError).response?.headers['content-type'] as string)
       }
 
-      const errorCode = (error as AxiosError).isAxiosError ? +((error as AxiosError).code as string) : 500
+      const errorCode =
+        (error as AxiosError).isAxiosError && !isNaN(+((error as AxiosError).code as string))
+          ? +((error as AxiosError).code as string)
+          : 500
 
       response.status(errorCode).send(errorMessage)
     }
@@ -159,6 +162,12 @@ export class HttpService implements HttpServiceInterface {
 
     this.applyResponseHeaders(serviceResponse, response)
 
+    if (this.responseShouldNotBeDecorated(serviceResponse)) {
+      response.status(serviceResponse.status).send(serviceResponse.data)
+
+      return
+    }
+
     response.status(serviceResponse.status).send({
       meta: {
         auth: {
@@ -210,6 +219,10 @@ export class HttpService implements HttpServiceInterface {
     return payload
   }
 
+  private responseShouldNotBeDecorated(serviceResponse: AxiosResponse): boolean {
+    return serviceResponse.headers['content-type'].toLowerCase().includes('text/html')
+  }
+
   private applyResponseHeaders(serviceResponse: AxiosResponse, response: Response): void {
     const returnedHeadersFromUnderlyingService = [
       'access-control-allow-methods',

packages/auth/CHANGELOG.md

@@ -3,6 +3,74 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.3.4](https://github.com/standardnotes/auth/compare/@standardnotes/auth-server@1.3.3...@standardnotes/auth-server@1.3.4) (2022-06-28)
+
+**Note:** Version bump only for package @standardnotes/auth-server
+
+## [1.3.3](https://github.com/standardnotes/auth/compare/@standardnotes/auth-server@1.3.2...@standardnotes/auth-server@1.3.3) (2022-06-28)
+
+### Bug Fixes
+
+* change response type to html for muting marketing emails ([ba373eb](https://github.com/standardnotes/auth/commit/ba373ebc6b3038f7de2fab40f0429a655dbe2499))
+
+## [1.3.2](https://github.com/standardnotes/auth/compare/@standardnotes/auth-server@1.3.1...@standardnotes/auth-server@1.3.2) (2022-06-27)
+
+**Note:** Version bump only for package @standardnotes/auth-server
+
+## [1.3.1](https://github.com/standardnotes/auth/compare/@standardnotes/auth-server@1.3.0...@standardnotes/auth-server@1.3.1) (2022-06-27)
+
+**Note:** Version bump only for package @standardnotes/auth-server
+
+# [1.3.0](https://github.com/standardnotes/auth/compare/@standardnotes/auth-server@1.2.1...@standardnotes/auth-server@1.3.0) (2022-06-27)
+
+### Features
+
+* add endpoint for muting marketing emails ([6d7de4a](https://github.com/standardnotes/auth/commit/6d7de4a8daaf7569b8f2e031854e8baaff64a469))
+
+## [1.2.1](https://github.com/standardnotes/auth/compare/@standardnotes/auth-server@1.2.0...@standardnotes/auth-server@1.2.1) (2022-06-27)
+
+### Bug Fixes
+
+* add setting uuid to email requests ([214684e](https://github.com/standardnotes/auth/commit/214684eae733675b7cefa522202e53d9556e5279))
+
+# [1.2.0](https://github.com/standardnotes/auth/compare/@standardnotes/auth-server@1.1.7...@standardnotes/auth-server@1.2.0) (2022-06-27)
+
+### Features
+
+* add docker commands to start sending emails ([210a314](https://github.com/standardnotes/auth/commit/210a314c8199e47e5b6a113bd60401c16bb95291))
+
+## [1.1.7](https://github.com/standardnotes/auth/compare/@standardnotes/auth-server@1.1.6...@standardnotes/auth-server@1.1.7) (2022-06-27)
+
+### Bug Fixes
+
+* add sending out email campaigns ([bf14ec0](https://github.com/standardnotes/auth/commit/bf14ec05f92d893e7c74a4f29ef7e426bee9d768))
+
+## [1.1.6](https://github.com/standardnotes/auth/compare/@standardnotes/auth-server@1.1.5...@standardnotes/auth-server@1.1.6) (2022-06-27)
+
+**Note:** Version bump only for package @standardnotes/auth-server
+
+## [1.1.5](https://github.com/standardnotes/auth/compare/@standardnotes/auth-server@1.1.4...@standardnotes/auth-server@1.1.5) (2022-06-27)
+
+### Bug Fixes
+
+* upgrade sentry node sdk ([b6db194](https://github.com/standardnotes/auth/commit/b6db194a22ff1d0afe96c291d545b408c0a5c373))
+
+## [1.1.4](https://github.com/standardnotes/auth/compare/@standardnotes/auth-server@1.1.3...@standardnotes/auth-server@1.1.4) (2022-06-24)
+
+### Bug Fixes
+
+* newrelic deps and setup db and cache for local development purposes ([ff09ae0](https://github.com/standardnotes/auth/commit/ff09ae0a47747eaf7977ce5d3937ad385101eaeb))
+
+## [1.1.3](https://github.com/standardnotes/auth/compare/@standardnotes/auth-server@1.1.2...@standardnotes/auth-server@1.1.3) (2022-06-23)
+
+### Bug Fixes
+
+* curl in the final image ([0d67c55](https://github.com/standardnotes/auth/commit/0d67c55e124eed08bca16824750152b895fceca7))
+
+## [1.1.2](https://github.com/standardnotes/auth/compare/@standardnotes/auth-server@1.1.1...@standardnotes/auth-server@1.1.2) (2022-06-23)
+
+**Note:** Version bump only for package @standardnotes/auth-server
+
 ## [1.1.1](https://github.com/standardnotes/auth/compare/@standardnotes/auth-server@1.1.0...@standardnotes/auth-server@1.1.1) (2022-06-23)
 
 **Note:** Version bump only for package @standardnotes/auth-server

packages/auth/Dockerfile

@@ -1,7 +1,7 @@
 FROM node:16.15.1-alpine AS builder
 
 # Install dependencies for building native libraries
-RUN apk add --update git openssh-client curl python3 alpine-sdk
+RUN apk add --update git openssh-client python3 alpine-sdk
 
 WORKDIR /workspace
 
@@ -12,6 +12,8 @@ RUN yarn install --immutable
 
 FROM node:16.15.1-alpine
 
+RUN apk add --update curl
+
 WORKDIR /workspace
 
 # Copy the installed dependencies from the previous stage.