chore(release): publish

- @standardnotes/[email protected]
 - @standardnotes/[email protected]
 - @standardnotes/[email protected]
 - @standardnotes/[email protected].0
 - @standardnotes/[email protected].0
 - @standardnotes/[email protected].0
 - @standardnotes/[email protected].0
 - @standardnotes/[email protected].3
 - @standardnotes/[email protected].0
 - @standardnotes/[email protected]
 - @standardnotes/[email protected].0
 - @standardnotes/[email protected].0
 - @standardnotes/[email protected].0
 - @standardnotes/[email protected]
 - @standardnotes/[email protected]
 - @standardnotes/[email protected].1
 - @standardnotes/[email protected]

.dockerignore

@@ -1,15 +0,0 @@
-.git/
-.gitignore
-.eslintcache
-node_modules
-dist
-
-packages/web-server/public/assets
-packages/web-server/tmp
-packages/web-server/vendor/bundles
-
-packages/desktop
-!packages/desktop/package.json
-
-packages/mobile
-!packages/mobile/package.json

.github/dependabot.yml

@@ -9,190 +9,113 @@ updates:
     directory: "/"
     schedule:
       interval: "daily"
-    reviewers:
-      - "moughxyz"
-      - "karolsojko"
 
   - package-ecosystem: "npm"
     directory: "/packages/api"
     schedule:
       interval: "daily"
-    reviewers:
-      - "moughxyz"
-      - "karolsojko"
 
   - package-ecosystem: "npm"
     directory: "/packages/components"
     schedule:
       interval: "daily"
-    reviewers:
-      - "moughxyz"
-      - "karolsojko"
 
   - package-ecosystem: "npm"
     directory: "/packages/desktop"
     schedule:
       interval: "daily"
-    reviewers:
-      - "moughxyz"
-      - "karolsojko"
 
   - package-ecosystem: "npm"
     directory: "/packages/docs"
     schedule:
       interval: "daily"
-    reviewers:
-      - "moughxyz"
-      - "karolsojko"
 
   - package-ecosystem: "npm"
     directory: "/packages/encryption"
     schedule:
       interval: "daily"
-    reviewers:
-      - "moughxyz"
-      - "karolsojko"
 
   - package-ecosystem: "npm"
     directory: "/packages/features"
     schedule:
       interval: "daily"
-    reviewers:
-      - "moughxyz"
-      - "karolsojko"
 
   - package-ecosystem: "npm"
     directory: "/packages/filepicker"
     schedule:
       interval: "daily"
-    reviewers:
-      - "moughxyz"
-      - "karolsojko"
 
   - package-ecosystem: "npm"
     directory: "/packages/files"
     schedule:
       interval: "daily"
-    reviewers:
-      - "moughxyz"
-      - "karolsojko"
 
   - package-ecosystem: "npm"
     directory: "/packages/icons"
     schedule:
       interval: "daily"
-    reviewers:
-      - "moughxyz"
-      - "karolsojko"
 
   - package-ecosystem: "npm"
     directory: "/packages/mobile"
     schedule:
       interval: "daily"
-    reviewers:
-      - "moughxyz"
-      - "karolsojko"
 
   - package-ecosystem: "npm"
     directory: "/packages/models"
     schedule:
       interval: "daily"
-    reviewers:
-      - "moughxyz"
-      - "karolsojko"
 
   - package-ecosystem: "npm"
     directory: "/packages/releases"
     schedule:
       interval: "daily"
-    reviewers:
-      - "moughxyz"
-      - "karolsojko"
 
   - package-ecosystem: "npm"
     directory: "/packages/responses"
     schedule:
       interval: "daily"
-    reviewers:
-      - "moughxyz"
-      - "karolsojko"
 
   - package-ecosystem: "npm"
     directory: "/packages/services"
     schedule:
       interval: "daily"
-    reviewers:
-      - "moughxyz"
-      - "karolsojko"
 
   - package-ecosystem: "npm"
     directory: "/packages/sncrypto-common"
     schedule:
       interval: "daily"
-    reviewers:
-      - "moughxyz"
-      - "karolsojko"
 
   - package-ecosystem: "npm"
     directory: "/packages/sncrypto-web"
     schedule:
       interval: "daily"
-    reviewers:
-      - "moughxyz"
-      - "karolsojko"
 
   - package-ecosystem: "npm"
     directory: "/packages/snjs"
     schedule:
       interval: "daily"
-    reviewers:
-      - "moughxyz"
-      - "karolsojko"
 
   - package-ecosystem: "npm"
     directory: "/packages/styles"
     schedule:
       interval: "daily"
-    reviewers:
-      - "moughxyz"
-      - "karolsojko"
 
   - package-ecosystem: "npm"
     directory: "/packages/toast"
     schedule:
       interval: "daily"
-    reviewers:
-      - "moughxyz"
-      - "karolsojko"
 
   - package-ecosystem: "npm"
     directory: "/packages/utils"
     schedule:
       interval: "daily"
-    reviewers:
-      - "moughxyz"
-      - "karolsojko"
 
   - package-ecosystem: "npm"
     directory: "/packages/web"
     schedule:
       interval: "daily"
-    reviewers:
-      - "moughxyz"
-      - "karolsojko"
-
-  - package-ecosystem: "bundler"
-    directory: "/packages/web-server"
-    schedule:
-      interval: "daily"
-    reviewers:
-      - "moughxyz"
-      - "karolsojko"
 
   - package-ecosystem: "github-actions"
     directory: "/"
     schedule:
       interval: "weekly"
-    reviewers:
-      - "moughxyz"
-      - "karolsojko"

.github/workflows/codeql-analysis.yml

@@ -37,7 +37,7 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL

.github/workflows/desktop.release.reuse.yml

@@ -19,12 +19,13 @@ jobs:
       run:
         working-directory: packages/desktop
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - uses: actions/setup-node@v3
         with:
           registry-url: 'https://registry.npmjs.org'
           node-version-file: '.nvmrc'
-      - run: yarn install
+          cache: 'yarn'
+      - run: yarn install --immutable
       - run: yarn build:desktop
       - run: echo APP_VERSION=$(node -p "require('./package.json').version") >> $GITHUB_ENV
 
@@ -54,17 +55,18 @@ jobs:
       run:
         working-directory: packages/desktop
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - uses: actions/setup-node@v3
         with:
           registry-url: 'https://registry.npmjs.org'
           node-version-file: '.nvmrc'
+          cache: 'yarn'
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1
       - name: Install FPM
         run: sudo gem install fpm -f
 
-      - run: yarn install
+      - run: yarn install --immutable
       - run: yarn build:desktop
 
       - run: echo APP_VERSION=$(node -p "require('./package.json').version") >> $GITHUB_ENV
@@ -128,12 +130,13 @@ jobs:
       run:
         working-directory: packages/desktop
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - uses: actions/setup-node@v3
         with:
           registry-url: 'https://registry.npmjs.org'
           node-version-file: '.nvmrc'
-      - run: yarn install
+          cache: 'yarn'
+      - run: yarn install --immutable
       - run: yarn build:desktop
       - run: yarn run webpack --config desktop.webpack.prod.js
       - run: echo APP_VERSION=$(node -p "require('./package.json').version") >> $GITHUB_ENV
@@ -157,13 +160,14 @@ jobs:
       run:
         working-directory: packages/desktop
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - uses: actions/setup-node@v3
         with:
           registry-url: 'https://registry.npmjs.org'
           node-version-file: '.nvmrc'
+          cache: 'yarn'
 
-      - run: yarn install
+      - run: yarn install --immutable
 
       - uses: actions/download-artifact@v3
         with:

.github/workflows/desktop.windows.sign.yml

@@ -14,12 +14,13 @@ jobs:
       run:
         working-directory: packages/desktop
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - uses: actions/setup-node@v3
         with:
           registry-url: 'https://registry.npmjs.org'
           node-version-file: '.nvmrc'
-      - run: yarn install
+          cache: 'yarn'
+      - run: yarn install --immutable
       - run: yarn build:desktop
       - run: yarn run webpack --config desktop.webpack.prod.js
       - run: echo APP_VERSION=$(node -p "require('./package.json').version") >> $GITHUB_ENV
@@ -42,11 +43,12 @@ jobs:
       run:
         working-directory: packages/desktop
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - uses: actions/setup-node@v3
         with:
           registry-url: 'https://registry.npmjs.org'
           node-version-file: '.nvmrc'
+          cache: 'yarn'
       - uses: actions/download-artifact@v3
         with:
           name: assets

.github/workflows/docs.deploy.yml

@@ -18,7 +18,7 @@ jobs:
           cache: yarn
 
       - name: Install dependencies
-        run: yarn install
+        run: yarn install --immutable
 
       - name: Build
         run: yarn workspace @standardnotes/docs run build

.github/workflows/git-sync.yml

@@ -1,6 +1,7 @@
 name: Sync Repo
 
 on:
+  workflow_dispatch:
   push:
     branches:
       - '*'

.github/workflows/mobile.release.prod.yml

@@ -15,7 +15,7 @@ jobs:
     timeout-minutes: 45
     steps:
       - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       - name: Export version from package.json
         run:
           echo "PACKAGE_VERSION=$(grep '"version"' package.json | cut -d '"' -f 4 | cut -d "-" -f 1)" >> $GITHUB_ENV
@@ -26,7 +26,7 @@ jobs:
           echo "${{ secrets.ANDROID_KEYSTORE }}" > keystore.keystore.asc
           gpg -d --passphrase "${{ secrets.KEYSTORE_PASSPHRASE }}" --batch keystore.keystore.asc > android/app/keystore.keystore
       - name: Install dependencies
-        run: yarn install
+        run: yarn install --immutable
       - run: yarn build:mobile
       - name: Ruby Setup for Fastlane
         uses: ruby/setup-ruby@v1
@@ -77,12 +77,12 @@ jobs:
     timeout-minutes: 90
     steps:
       - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       - name: Export version from package.json
         run:
           echo "PACKAGE_VERSION=$(grep '"version"' package.json | cut -d '"' -f 4 | cut -d "-" -f 1)" >> $GITHUB_ENV
       - name: Install dependencies
-        run: yarn install && yarn install:pods
+        run: yarn install --immutable && yarn install:pods
       - run: yarn build:mobile
       - name: Set ssh connection to Github
         uses: webfactory/[email protected]

.github/workflows/mobile.release.test.yml

@@ -15,7 +15,7 @@ jobs:
     timeout-minutes: 45
     steps:
       - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       - name: Export version from package.json
         run: |
           echo "PACKAGE_VERSION=$(grep '"version"' package.json | cut -d '"' -f 4 | cut -d "-" -f 1)" >> $GITHUB_ENV
@@ -28,7 +28,7 @@ jobs:
       - name: Ruby Setup for Fastlane
         uses: ruby/setup-ruby@v1
       - name: Install dependencies
-        run: yarn install
+        run: yarn install --immutable
       - run: yarn build:mobile
       - name: fastlane
         uses: maierj/[email protected]
@@ -66,14 +66,14 @@ jobs:
     timeout-minutes: 90
     steps:
       - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       - name: Export version from package.json
         run: |
           echo "PACKAGE_VERSION=$(grep '"version"' package.json | cut -d '"' -f 4 | cut -d "-" -f 1)" >> $GITHUB_ENV
       - name: Ruby Setup for Fastlane
         uses: ruby/setup-ruby@v1
       - name: Install dependencies
-        run: yarn install && yarn install:pods
+        run: yarn install --immutable && yarn install:pods
       - run: yarn build:mobile
       - name: Set ssh connection to Github
         uses: webfactory/[email protected]

.github/workflows/pr.components.yml

@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1
 

.github/workflows/pr.yml

@@ -13,9 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
-        uses: actions/checkout@v2
-      - name: Set up Ruby
-        uses: ruby/setup-ruby@v1
+        uses: actions/checkout@v3
       - name: Install dependencies
         run: yarn install --immutable
       - name: Build

.github/workflows/publish.yml

@@ -20,9 +20,7 @@ jobs:
         with:
           registry-url: 'https://registry.npmjs.org'
           node-version-file: '.nvmrc'
-
-      - name: Set up Ruby
-        uses: ruby/setup-ruby@v1
+          cache: 'yarn'
 
       - name: Setup git config
         run: |
@@ -52,17 +50,20 @@ jobs:
         run: yarn test
 
       - name: Login to Docker Hub
+        if: "${{ contains(github.event.head_commit.message, 'skip e2e') == false }}"
         uses: docker/login-action@v2
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
 
       - name: Publish SNJS Docker image for E2E testing
+        if: "${{ contains(github.event.head_commit.message, 'skip e2e') == false }}"
         run: |
           yarn docker build @standardnotes/snjs -t standardnotes/snjs:${{ github.sha }}
           docker push standardnotes/snjs:${{ github.sha }}
 
       - name: Run E2E test suite
+        if: "${{ contains(github.event.head_commit.message, 'skip e2e') == false }}"
         uses: convictional/[email protected]
         with:
           owner: standardnotes
@@ -84,6 +85,7 @@ jobs:
           NODE_AUTH_TOKEN: ${{ secrets.CI_NPM_TOKEN }}
 
       - name: Publish SNJS Docker image as stable
+        if: "${{ contains(github.event.head_commit.message, 'skip e2e') == false }}"
         run: |
           docker tag standardnotes/snjs:${{ github.sha }} standardnotes/snjs:latest
           docker push standardnotes/snjs:latest

.github/workflows/snjs.pr.yml

@@ -23,9 +23,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       - name: Install dependencies
         run: yarn install --immutable
+      - name: Build
+        run: yarn build:snjs
       - name: Login to Docker Hub
         uses: docker/login-action@v2
         with:

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

@@ -18,6 +18,7 @@ jobs:
         with:
           registry-url: 'https://registry.npmjs.org'
           node-version-file: '.nvmrc'
+          cache: 'yarn'
       - name: Setup git config
         run: |
           git config --global user.name "standardci"
@@ -44,4 +45,4 @@ jobs:
           commit-message: "${{ 'chore(deps): upgrade snjs' }}"
           delete-branch: true
           committer: standardci <[email protected]>
-          author: standardci <[email protected]>
+          author: standardci <[email protected]>

.github/workflows/web.release.prod.yml

@@ -1,4 +1,4 @@
-name: Web Server Deploy
+name: Web Deploy
 
 concurrency:
   group: prod_environment
@@ -7,72 +7,52 @@ concurrency:
 on:
   push:
     tags:
-      - '*standardnotes/*web-server*'
-      - '!*standardnotes/*web-server*beta*'
-      - '!*standardnotes/*web-server*alpha*'
+      - '*standardnotes/*web*'
+      - '!*standardnotes/*web*beta*'
+      - '!*standardnotes/*web*alpha*'
 
 jobs:
   test:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
-        uses: actions/checkout@v2
-      - name: Set up Ruby
-        uses: ruby/setup-ruby@v1
+        uses: actions/checkout@v3
       - name: Install dependencies
-        run: yarn install
+        run: yarn install --immutable
       - name: Build
-        run: yarn build:web-server
+        run: yarn build:web
       - name: ESLint
         run: yarn lint
       - name: Test
         run: yarn test
-
   deploy:
-    runs-on: ubuntu-latest
-
     needs: test
 
+    runs-on: ubuntu-latest
+
     steps:
-    - uses: actions/checkout@v2
-
-    - name: Copy robots.txt
-      run: cp packages/web-server/public/robots.txt.production packages/web-server/public/robots.txt
-
-    - name: Publish to Registry
-      uses: elgohr/Publish-Docker-Github-Action@master
-      with:
-        name: standardnotes/web
-        username: ${{ secrets.DOCKER_USERNAME }}
-        password: ${{ secrets.DOCKER_PASSWORD }}
-        tags: "stable,${{ github.sha }}"
-
-    - name: Configure AWS credentials
-      uses: aws-actions/configure-aws-credentials@v1
-      with:
-        aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
-        aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-        aws-region: us-east-1
-
-    - name: Download task definition
-      run: |
-        aws ecs describe-task-definition --task-definition app-prod --query taskDefinition > task-definition.json
-
-    - name: Fill in the new image ID in the Amazon ECS task definition
-      id: task-def
-      uses: aws-actions/amazon-ecs-render-task-definition@v1
-      with:
-        task-definition: task-definition.json
-        container-name: app-prod
-        image: "standardnotes/web:${{ github.sha }}"
-
-    - name: Deploy Amazon ECS task definition
-      uses: aws-actions/amazon-ecs-deploy-task-definition@v1
-      with:
-        task-definition: ${{ steps.task-def.outputs.task-definition }}
-        service: app-prod
-        cluster: prod
-        wait-for-service-stability: true
+      - name: Checkout code
+        uses: actions/checkout@v3
+      - name: Install dependencies
+        run: yarn install --immutable
+      - name: Build
+        run: yarn build:web
+      - name: Configure AWS credentials
+        uses: aws-actions/configure-aws-credentials@v1
+        with:
+          aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
+          aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+          aws-region: us-east-1
+      - name: Deploy static site to S3 bucket
+        run: aws s3 sync packages/web/dist/ s3://app.standardnotes.com --delete
+      - name: Invalidate CloudFront Cache
+        uses: chetan/invalidate-cloudfront-action@master
+        env:
+          DISTRIBUTION: ${{ secrets.WEBAPP_CLOUDFRONT_DISTRIBUTION_ID }}
+          PATHS: '/*'
+          AWS_REGION: 'us-east-1'
+          AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
+          AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
 
   notify_discord:
     needs: deploy

.github/workflows/web.release.test.yml

@@ -1,83 +0,0 @@
-name: Web Server TestFlight
-
-concurrency:
-  group: dev_environment
-  cancel-in-progress: true
-
-on:
-  workflow_dispatch:
-
-jobs:
-  test:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v2
-      - name: Set up Ruby
-        uses: ruby/setup-ruby@v1
-      - name: Install dependencies
-        run: yarn install
-      - name: Build
-        run: yarn build:web-server
-      - name: ESLint
-        run: yarn lint
-      - name: Test
-        run: yarn test
-
-
-  deploy:
-    runs-on: ubuntu-latest
-
-    needs: test
-
-    steps:
-    - uses: actions/checkout@v2
-
-    - name: Copy robots.txt
-      run: cp packages/web-server/public/robots.txt.development packages/web-server/public/robots.txt
-
-    - name: Publish to Registry
-      uses: elgohr/Publish-Docker-Github-Action@master
-      with:
-        name: standardnotes/web
-        username: ${{ secrets.DOCKER_USERNAME }}
-        password: ${{ secrets.DOCKER_PASSWORD }}
-        tags: "latest,${{ github.sha }}"
-
-    - name: Configure AWS credentials
-      uses: aws-actions/configure-aws-credentials@v1
-      with:
-        aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
-        aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-        aws-region: us-east-1
-
-    - name: Download task definition
-      run: |
-        aws ecs describe-task-definition --task-definition app-dev --query taskDefinition > task-definition.json
-
-    - name: Fill in the new image ID in the Amazon ECS task definition
-      id: task-def
-      uses: aws-actions/amazon-ecs-render-task-definition@v1
-      with:
-        task-definition: task-definition.json
-        container-name: app-dev
-        image: "standardnotes/web:${{ github.sha }}"
-
-    - name: Deploy Amazon ECS task definition
-      uses: aws-actions/amazon-ecs-deploy-task-definition@v1
-      with:
-        task-definition: ${{ steps.task-def.outputs.task-definition }}
-        service: app-dev
-        cluster: dev
-        wait-for-service-stability: true
-
-  notify_discord:
-    needs: deploy
-
-    runs-on: ubuntu-latest
-
-    steps:
-    - name: Run Discord Webhook
-      uses: johnnyhuy/actions-discord-git-webhook@main
-      with:
-        webhook_url: ${{ secrets.DISCORD_WEBHOOK_URL }}

.github/workflows/webserver.pr.yml

@@ -1,20 +0,0 @@
-name: Web Server PR
-
-on:
-  pull_request:
-    branches:
-      - main
-    paths:
-      - 'packages/web-server/**'
-
-jobs:
-  TestDockerBuild:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - name: Set up Ruby
-        uses: ruby/setup-ruby@v1
-      - name: Copy default configuration
-        run: yarn workspace @standardnotes/web-server run sample:env
-      - name: Test build of the image
-        run: docker build -t standardnotes/web:test-build .

.yarn/versions/eee2d91d.yml

@@ -4,7 +4,6 @@ undecided:
   - "@standardnotes/mobile"
   - "@standardnotes/styles"
   - "@standardnotes/toast"
-  - "@standardnotes/web-server"
   - "@standardnotes/advanced-checklist"
   - "@standardnotes/markdown-visual"
   - "@standardnotes/autobiography-theme"

Dockerfile

@@ -1,35 +0,0 @@
-FROM ruby:2.7.4-alpine3.14
-
-ARG USERNAME=snjs
-ARG UID=1001
-ARG GID=$UID
-
-RUN apk add --update --no-cache \
-    alpine-sdk \
-    nodejs-current \
-    python3 \
-    git \
-    yarn \
-    tzdata
-
-RUN addgroup -S $USERNAME -g $GID && adduser -D -S $USERNAME -G $USERNAME -u $UID
-
-WORKDIR /app
-
-RUN chown -R $UID:$GID .
-
-USER $USERNAME
-
-COPY --chown=$UID:$GID . .
-
-RUN yarn install
-
-RUN gem install bundler
-
-RUN yarn build:web-server
-
-EXPOSE 3000
-
-ENTRYPOINT [ "./docker/entrypoint.sh" ]
-
-CMD [ "start" ]

README.md

@@ -71,18 +71,3 @@ You can configure the `DEFAULT_SYNC_SERVER` environment variable to set the defa
 ```
 DEFAULT_SYNC_SERVER=https://sync.myserver
 ```
-
-## Running E2E tests
-
-In order to run a stable server environment for E2E tests that will is up to date with what we have on production please checkout locally the [e2e repository](https://github.com/standardnotes/e2e).
-
-To start the server type in the e2e repository:
-```
-yarn install --immutable
-yarn test:stable-server
-```
-
-Then once the whole server infra is up and ready for your tests you can run the e2e suite in the local browser by typing (make sure you have built all the packages beforehand):
-```
-yarn start:server:e2e
-```

docker-compose.yml

@@ -1,22 +0,0 @@
-version: '3.8'
-services:
-  app:
-    build: .
-    command: start-local
-    env_file: .env
-    restart: unless-stopped
-    ports:
-      - ${PORT}:3001
-    volumes:
-      - .:/app
-    networks:
-      standardnotes_proxy:
-        aliases:
-          - web
-      web: {}
-
-networks:
-  web:
-    name: web
-  standardnotes_proxy:
-    name: standardnotes

docker/entrypoint.sh

@@ -1,32 +0,0 @@
-#!/bin/sh
-set -e
-
-COMMAND=$1 && shift 1
-
-case "$COMMAND" in
-  'start' )
-    echo "Prestart Step 1/1 - Removing server lock"
-    rm -f /app/packages/web-server/tmp/pids/server.pid
-    echo "Starting Server..."
-    yarn start:server:web
-    ;;
-
-  'start-local' )
-    echo "Prestart Step 1/4 - Removing server lock"
-    rm -f /app/packages/web-server/tmp/pids/server.pid
-    echo "Prestart Step 2/4 - Cleaning assets"
-    yarn clean
-    echo "Prestart Step 3/4 - Installing dependencies"
-    yarn install
-    echo "Prestart Step 4/4 - Building"
-    yarn build
-    echo "Starting Server..."
-    yarn start:server:web
-    ;;
-
-   * )
-    echo "Unknown command"
-    ;;
-esac
-
-exec "$@"

package.json

@@ -19,18 +19,18 @@
     "node": ">=12.19.0 <17.0.0"
   },
   "scripts": {
-    "lint": "yarn workspaces foreach -pt --parallel --jobs 10 --verbose --exclude @standardnotes/components-meta run lint",
-    "test": "yarn workspaces foreach -pt --parallel --jobs 10 --verbose --exclude @standardnotes/components-meta run test",
+    "lint": "yarn workspaces foreach -t --verbose --exclude @standardnotes/components-meta run lint",
+    "test": "yarn workspaces foreach -pt --jobs 10 --verbose --exclude @standardnotes/components-meta run test",
     "clean": "lerna run clean",
-    "build:all": "yarn workspaces foreach -pt --verbose --exclude '{@standardnotes/components-meta,@standardnotes/docs}' run build",
+    "build:all": "yarn workspaces foreach -pt --verbose --exclude '{@standardnotes/docs}' run build",
     "build:components": "yarn workspaces foreach -pt --verbose --interlaced -R --from @standardnotes/components-meta run build",
     "build:web": "yarn workspaces foreach -pt --verbose -R --from @standardnotes/web --exclude @standardnotes/components-meta run build",
     "build:desktop": "yarn workspaces foreach -pt --verbose -R --from @standardnotes/desktop --exclude @standardnotes/components-meta run build",
     "build:mobile": "yarn workspaces foreach -pt --verbose -R --from @standardnotes/mobile --exclude @standardnotes/components-meta run build",
-    "build:web-server": "yarn workspaces foreach -pt --verbose -R --from @standardnotes/web-server --exclude @standardnotes/components-meta run build",
     "build:snjs": "yarn workspaces foreach -pt --verbose -R --from @standardnotes/snjs --exclude @standardnotes/components-meta run build",
-    "start:server:web": "lerna run start --scope=@standardnotes/web-server",
-    "start:server:web:localhost": "lerna run start:no-binding --scope=@standardnotes/web-server",
+    "build:services": "yarn workspaces foreach -pt --verbose -R --from @standardnotes/services --exclude @standardnotes/components-meta run build",
+    "build:api": "yarn workspaces foreach -pt --verbose -R --from @standardnotes/api --exclude @standardnotes/components-meta run build",
+    "start:server:web": "lerna run start --scope=@standardnotes/web",
     "start:server:e2e": "lerna run start:test-server --scope=@standardnotes/snjs",
     "prepare": "husky install",
     "reset": "find . -type dir -name node_modules | xargs rm -rf && rm -rf yarn.lock && yarn install",

packages/api/CHANGELOG.md

@@ -3,6 +3,44 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [1.7.0](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-09-13)
+
+### Features
+
+* add subscription manager to handle subscription sharing ([#1517](https://github.com/standardnotes/app/issues/1517)) ([55b1409](https://github.com/standardnotes/app/commit/55b1409a805c21ada70bf482a02cfe718a4c6576))
+
+## [1.6.2](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-09-09)
+
+**Note:** Version bump only for package @standardnotes/api
+
+## [1.6.1](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-09-01)
+
+**Note:** Version bump only for package @standardnotes/api
+
+# [1.6.0](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-31)
+
+### Features
+
+* **api:** add client methods for listing and canceling subscription invites ([#1471](https://github.com/standardnotes/app/issues/1471)) ([91f5694](https://github.com/standardnotes/app/commit/91f5694a025a26e9b7878fc4c78a22c7f2f1dcef))
+
+# [1.5.0](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-31)
+
+### Features
+
+* **api:** add subscription server and client services and interfaces ([#1470](https://github.com/standardnotes/app/issues/1470)) ([089d3a2](https://github.com/standardnotes/app/commit/089d3a2e669f5a24bb4a38fc7582b423980d2d22))
+
+## [1.4.9](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-23)
+
+**Note:** Version bump only for package @standardnotes/api
+
+## [1.4.8](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-23)
+
+**Note:** Version bump only for package @standardnotes/api
+
+## [1.4.7](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-05)
+
+**Note:** Version bump only for package @standardnotes/api
+
 ## [1.4.6](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-07-13)
 
 ### Bug Fixes

packages/api/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/api",
-  "version": "1.4.6",
+  "version": "1.7.0",
   "engines": {
     "node": ">=16.0.0 <17.0.0"
   },
@@ -22,23 +22,24 @@
     "prebuild": "yarn clean",
     "build": "tsc -p tsconfig.json",
     "lint": "eslint . --ext .ts",
-    "test:unit": "jest spec --coverage"
+    "lint:fix": "eslint . --ext .ts --fix",
+    "test": "jest spec --coverage"
   },
   "devDependencies": {
     "@types/jest": "^28.1.5",
     "@types/lodash": "^4.14.182",
     "@typescript-eslint/eslint-plugin": "^5.30.0",
+    "eslint": "^8.23.0",
     "eslint-plugin-prettier": "*",
     "jest": "^28.1.2",
     "ts-jest": "^28.0.5"
   },
   "dependencies": {
-    "@standardnotes/common": "^1.23.1",
+    "@standardnotes/common": "^1.32.0",
     "@standardnotes/encryption": "workspace:*",
     "@standardnotes/models": "workspace:*",
     "@standardnotes/responses": "workspace:*",
     "@standardnotes/security": "^1.1.0",
-    "@standardnotes/services": "workspace:*",
     "@standardnotes/utils": "workspace:*",
     "reflect-metadata": "^0.1.13"
   }

packages/api/src/Domain/Client/Subscription/SubscriptionApiOperations.ts

@@ -0,0 +1,5 @@
+export enum SubscriptionApiOperations {
+  Inviting,
+  CancelingInvite,
+  ListingInvites,
+}

packages/api/src/Domain/Client/Subscription/SubscriptionApiService.spec.ts

@@ -0,0 +1,163 @@
+import { Invitation } from '@standardnotes/models'
+
+import { SubscriptionInviteCancelResponse } from '../../Response/Subscription/SubscriptionInviteCancelResponse'
+import { SubscriptionInviteListResponse } from '../../Response/Subscription/SubscriptionInviteListResponse'
+import { SubscriptionInviteResponse } from '../../Response/Subscription/SubscriptionInviteResponse'
+import { SubscriptionServerInterface } from '../../Server/Subscription/SubscriptionServerInterface'
+
+import { SubscriptionApiOperations } from './SubscriptionApiOperations'
+import { SubscriptionApiService } from './SubscriptionApiService'
+
+describe('SubscriptionApiService', () => {
+  let subscriptionServer: SubscriptionServerInterface
+
+  const createService = () => new SubscriptionApiService(subscriptionServer)
+
+  beforeEach(() => {
+    subscriptionServer = {} as jest.Mocked<SubscriptionServerInterface>
+    subscriptionServer.invite = jest.fn().mockReturnValue({
+      data: { success: true, sharedSubscriptionInvitationUuid: '1-2-3' },
+    } as jest.Mocked<SubscriptionInviteResponse>)
+    subscriptionServer.cancelInvite = jest.fn().mockReturnValue({
+      data: { success: true },
+    } as jest.Mocked<SubscriptionInviteCancelResponse>)
+    subscriptionServer.listInvites = jest.fn().mockReturnValue({
+      data: { invitations: [{} as jest.Mocked<Invitation>] },
+    } as jest.Mocked<SubscriptionInviteListResponse>)
+  })
+
+  it('should invite a user', async () => {
+    const response = await createService().invite('[email protected]')
+
+    expect(response).toEqual({
+      data: {
+        success: true,
+        sharedSubscriptionInvitationUuid: '1-2-3',
+      },
+    })
+    expect(subscriptionServer.invite).toHaveBeenCalledWith({
+      api: '20200115',
+      identifier: '[email protected]',
+    })
+  })
+
+  it('should not invite a user if it is already inviting', async () => {
+    const service = createService()
+    Object.defineProperty(service, 'operationsInProgress', {
+      get: () => new Map([[SubscriptionApiOperations.Inviting, true]]),
+    })
+
+    let error = null
+    try {
+      await service.invite('[email protected]')
+    } catch (caughtError) {
+      error = caughtError
+    }
+
+    expect(error).not.toBeNull()
+  })
+
+  it('should not invite a user if the server fails', async () => {
+    subscriptionServer.invite = jest.fn().mockImplementation(() => {
+      throw new Error('Oops')
+    })
+
+    let error = null
+    try {
+      await createService().invite('[email protected]')
+    } catch (caughtError) {
+      error = caughtError
+    }
+
+    expect(error).not.toBeNull()
+  })
+
+  it('should cancel an invite', async () => {
+    const response = await createService().cancelInvite('1-2-3')
+
+    expect(response).toEqual({
+      data: {
+        success: true,
+      },
+    })
+    expect(subscriptionServer.cancelInvite).toHaveBeenCalledWith({
+      api: '20200115',
+      inviteUuid: '1-2-3',
+    })
+  })
+
+  it('should not cancel an invite if it is already canceling', async () => {
+    const service = createService()
+    Object.defineProperty(service, 'operationsInProgress', {
+      get: () => new Map([[SubscriptionApiOperations.CancelingInvite, true]]),
+    })
+
+    let error = null
+    try {
+      await service.cancelInvite('1-2-3')
+    } catch (caughtError) {
+      error = caughtError
+    }
+
+    expect(error).not.toBeNull()
+  })
+
+  it('should not cancel an invite if the server fails', async () => {
+    subscriptionServer.cancelInvite = jest.fn().mockImplementation(() => {
+      throw new Error('Oops')
+    })
+
+    let error = null
+    try {
+      await createService().cancelInvite('1-2-3')
+    } catch (caughtError) {
+      error = caughtError
+    }
+
+    expect(error).not.toBeNull()
+  })
+
+  it('should list invites', async () => {
+    const response = await createService().listInvites()
+
+    expect(response).toEqual({
+      data: {
+        invitations: [{} as jest.Mocked<Invitation>],
+      },
+    })
+    expect(subscriptionServer.listInvites).toHaveBeenCalledWith({
+      api: '20200115',
+    })
+  })
+
+  it('should not list invitations if it is already listing', async () => {
+    const service = createService()
+    Object.defineProperty(service, 'operationsInProgress', {
+      get: () => new Map([[SubscriptionApiOperations.ListingInvites, true]]),
+    })
+
+    let error = null
+    try {
+      await service.listInvites()
+    } catch (caughtError) {
+      error = caughtError
+    }
+
+    expect(error).not.toBeNull()
+  })
+
+  it('should not list invites if the server fails', async () => {
+    subscriptionServer.listInvites = jest.fn().mockImplementation(() => {
+      throw new Error('Oops')
+    })
+
+    let error = null
+    try {
+      await createService().listInvites()
+    } catch (caughtError) {
+      error = caughtError
+    }
+
+    expect(error).not.toBeNull()
+  })
+})

packages/api/src/Domain/Client/Subscription/SubscriptionApiService.ts

@@ -0,0 +1,81 @@
+import { ErrorMessage } from '../../Error/ErrorMessage'
+import { ApiCallError } from '../../Error/ApiCallError'
+import { ApiVersion } from '../../Api/ApiVersion'
+import { ApiEndpointParam } from '../../Request/ApiEndpointParam'
+import { SubscriptionServerInterface } from '../../Server/Subscription/SubscriptionServerInterface'
+import { SubscriptionInviteResponse } from '../../Response/Subscription/SubscriptionInviteResponse'
+import { SubscriptionInviteListResponse } from '../../Response/Subscription/SubscriptionInviteListResponse'
+import { SubscriptionInviteCancelResponse } from '../../Response/Subscription/SubscriptionInviteCancelResponse'
+
+import { SubscriptionApiServiceInterface } from './SubscriptionApiServiceInterface'
+import { SubscriptionApiOperations } from './SubscriptionApiOperations'
+
+export class SubscriptionApiService implements SubscriptionApiServiceInterface {
+  private operationsInProgress: Map<SubscriptionApiOperations, boolean>
+
+  constructor(private subscriptionServer: SubscriptionServerInterface) {
+    this.operationsInProgress = new Map()
+  }
+
+  async listInvites(): Promise<SubscriptionInviteListResponse> {
+    if (this.operationsInProgress.get(SubscriptionApiOperations.ListingInvites)) {
+      throw new ApiCallError(ErrorMessage.GenericInProgress)
+    }
+
+    this.operationsInProgress.set(SubscriptionApiOperations.ListingInvites, true)
+
+    try {
+      const response = await this.subscriptionServer.listInvites({
+        [ApiEndpointParam.ApiVersion]: ApiVersion.v0,
+      })
+
+      this.operationsInProgress.set(SubscriptionApiOperations.ListingInvites, false)
+
+      return response
+    } catch (error) {
+      throw new ApiCallError(ErrorMessage.GenericFail)
+    }
+  }
+
+  async cancelInvite(inviteUuid: string): Promise<SubscriptionInviteCancelResponse> {
+    if (this.operationsInProgress.get(SubscriptionApiOperations.CancelingInvite)) {
+      throw new ApiCallError(ErrorMessage.GenericInProgress)
+    }
+
+    this.operationsInProgress.set(SubscriptionApiOperations.CancelingInvite, true)
+
+    try {
+      const response = await this.subscriptionServer.cancelInvite({
+        [ApiEndpointParam.ApiVersion]: ApiVersion.v0,
+        inviteUuid,
+      })
+
+      this.operationsInProgress.set(SubscriptionApiOperations.CancelingInvite, false)
+
+      return response
+    } catch (error) {
+      throw new ApiCallError(ErrorMessage.GenericFail)
+    }
+  }
+
+  async invite(inviteeEmail: string): Promise<SubscriptionInviteResponse> {
+    if (this.operationsInProgress.get(SubscriptionApiOperations.Inviting)) {
+      throw new ApiCallError(ErrorMessage.GenericInProgress)
+    }
+
+    this.operationsInProgress.set(SubscriptionApiOperations.Inviting, true)
+
+    try {
+      const response = await this.subscriptionServer.invite({
+        [ApiEndpointParam.ApiVersion]: ApiVersion.v0,
+        identifier: inviteeEmail,
+      })
+
+      this.operationsInProgress.set(SubscriptionApiOperations.Inviting, false)
+
+      return response
+    } catch (error) {
+      throw new ApiCallError(ErrorMessage.GenericFail)
+    }
+  }
+}

packages/api/src/Domain/Client/Subscription/SubscriptionApiServiceInterface.ts

@@ -0,0 +1,11 @@
+import { Uuid } from '@standardnotes/common'
+
+import { SubscriptionInviteCancelResponse } from '../../Response/Subscription/SubscriptionInviteCancelResponse'
+import { SubscriptionInviteListResponse } from '../../Response/Subscription/SubscriptionInviteListResponse'
+import { SubscriptionInviteResponse } from '../../Response/Subscription/SubscriptionInviteResponse'
+
+export interface SubscriptionApiServiceInterface {
+  invite(inviteeEmail: string): Promise<SubscriptionInviteResponse>
+  listInvites(): Promise<SubscriptionInviteListResponse>
+  cancelInvite(inviteUuid: Uuid): Promise<SubscriptionInviteCancelResponse>
+}

packages/api/src/Domain/Client/index.ts

@@ -1,2 +1,5 @@
+export * from './Subscription/SubscriptionApiOperations'
+export * from './Subscription/SubscriptionApiService'
+export * from './Subscription/SubscriptionApiServiceInterface'
 export * from './User/UserApiService'
 export * from './User/UserApiServiceInterface'

packages/api/src/Domain/Error/ErrorMessage.ts

@@ -4,4 +4,6 @@ export enum ErrorMessage {
   RateLimited = 'Too many successive server requests. Please wait a few minutes and try again.',
   InsufficientPasswordMessage = 'Your password must be at least %LENGTH% characters in length. For your security, please choose a longer password or, ideally, a passphrase, and try again.',
   PasscodeRequired = 'Your passcode is required in order to register for an account.',
+  GenericInProgress = 'An existing request is already in progress.',
+  GenericFail = 'A server error occurred. Please try again.',
 }

packages/api/src/Domain/Http/HttpService.spec.ts

@@ -1,4 +1,5 @@
-import { Environment } from '@standardnotes/services'
+import { Environment } from '@standardnotes/models'
+
 import { HttpResponseMeta } from './HttpResponseMeta'
 import { HttpService } from './HttpService'
 
@@ -24,4 +25,14 @@ describe('HttpService', () => {
 
     expect(service['host']).toEqual('http://foo')
   })
+
+  it('should set and use the authorization token', () => {
+    const service = createService()
+
+    expect(service['authorizationToken']).toBeUndefined()
+
+    service.setAuthorizationToken('foo-bar')
+
+    expect(service['authorizationToken']).toEqual('foo-bar')
+  })
 })

packages/api/src/Domain/Http/HttpService.ts

@@ -1,5 +1,5 @@
 import { isString, joinPaths } from '@standardnotes/utils'
-import { Environment } from '@standardnotes/services'
+import { Environment } from '@standardnotes/models'
 import { HttpRequestParams } from './HttpRequestParams'
 import { HttpVerb } from './HttpVerb'
 import { HttpRequest } from './HttpRequest'
@@ -12,6 +12,8 @@ import { HttpResponseMeta } from './HttpResponseMeta'
 import { HttpErrorResponseBody } from './HttpErrorResponseBody'
 
 export class HttpService implements HttpServiceInterface {
+  private authorizationToken?: string
+
   constructor(
     private environment: Environment,
     private appVersion: string,
@@ -20,28 +22,57 @@ export class HttpService implements HttpServiceInterface {
     private updateMetaCallback: (meta: HttpResponseMeta) => void,
   ) {}
 
+  setAuthorizationToken(authorizationToken: string): void {
+    this.authorizationToken = authorizationToken
+  }
+
   setHost(host: string): void {
     this.host = host
   }
 
   async get(path: string, params?: HttpRequestParams, authentication?: string): Promise<HttpResponse> {
-    return this.runHttp({ url: joinPaths(this.host, path), params, verb: HttpVerb.Get, authentication })
+    return this.runHttp({
+      url: joinPaths(this.host, path),
+      params,
+      verb: HttpVerb.Get,
+      authentication: authentication ?? this.authorizationToken,
+    })
   }
 
   async post(path: string, params?: HttpRequestParams, authentication?: string): Promise<HttpResponse> {
-    return this.runHttp({ url: joinPaths(this.host, path), params, verb: HttpVerb.Post, authentication })
+    return this.runHttp({
+      url: joinPaths(this.host, path),
+      params,
+      verb: HttpVerb.Post,
+      authentication: authentication ?? this.authorizationToken,
+    })
   }
 
   async put(path: string, params?: HttpRequestParams, authentication?: string): Promise<HttpResponse> {
-    return this.runHttp({ url: joinPaths(this.host, path), params, verb: HttpVerb.Put, authentication })
+    return this.runHttp({
+      url: joinPaths(this.host, path),
+      params,
+      verb: HttpVerb.Put,
+      authentication: authentication ?? this.authorizationToken,
+    })
   }
 
   async patch(path: string, params: HttpRequestParams, authentication?: string): Promise<HttpResponse> {
-    return this.runHttp({ url: joinPaths(this.host, path), params, verb: HttpVerb.Patch, authentication })
+    return this.runHttp({
+      url: joinPaths(this.host, path),
+      params,
+      verb: HttpVerb.Patch,
+      authentication: authentication ?? this.authorizationToken,
+    })
   }
 
   async delete(path: string, params?: HttpRequestParams, authentication?: string): Promise<HttpResponse> {
-    return this.runHttp({ url: joinPaths(this.host, path), params, verb: HttpVerb.Delete, authentication })
+    return this.runHttp({
+      url: joinPaths(this.host, path),
+      params,
+      verb: HttpVerb.Delete,
+      authentication: authentication ?? this.authorizationToken,
+    })
   }
 
   private async runHttp(httpRequest: HttpRequest): Promise<HttpResponse> {

packages/api/src/Domain/Http/HttpServiceInterface.ts

@@ -3,6 +3,7 @@ import { HttpResponse } from './HttpResponse'
 
 export interface HttpServiceInterface {
   setHost(host: string): void
+  setAuthorizationToken(authorizationToken: string): void
   get(path: string, params?: HttpRequestParams, authentication?: string): Promise<HttpResponse>
   post(path: string, params?: HttpRequestParams, authentication?: string): Promise<HttpResponse>
   put(path: string, params?: HttpRequestParams, authentication?: string): Promise<HttpResponse>

packages/api/src/Domain/Request/Subscription/SubscriptionInviteAcceptRequestParams.ts

@@ -0,0 +1,10 @@
+import { Uuid } from '@standardnotes/common'
+
+import { ApiEndpointParam } from '../ApiEndpointParam'
+import { ApiVersion } from '../../Api/ApiVersion'
+
+export type SubscriptionInviteAcceptRequestParams = {
+  [ApiEndpointParam.ApiVersion]: ApiVersion.v0
+  inviteUuid: Uuid
+  [additionalParam: string]: unknown
+}

packages/api/src/Domain/Request/Subscription/SubscriptionInviteCancelRequestParams.ts

@@ -0,0 +1,10 @@
+import { Uuid } from '@standardnotes/common'
+
+import { ApiEndpointParam } from '../ApiEndpointParam'
+import { ApiVersion } from '../../Api/ApiVersion'
+
+export type SubscriptionInviteCancelRequestParams = {
+  [ApiEndpointParam.ApiVersion]: ApiVersion.v0
+  inviteUuid: Uuid
+  [additionalParam: string]: unknown
+}

packages/api/src/Domain/Request/Subscription/SubscriptionInviteDeclineRequestParams.ts

@@ -0,0 +1,10 @@
+import { Uuid } from '@standardnotes/common'
+
+import { ApiEndpointParam } from '../ApiEndpointParam'
+import { ApiVersion } from '../../Api/ApiVersion'
+
+export type SubscriptionInviteDeclineRequestParams = {
+  [ApiEndpointParam.ApiVersion]: ApiVersion.v0
+  inviteUuid: Uuid
+  [additionalParam: string]: unknown
+}

packages/api/src/Domain/Request/Subscription/SubscriptionInviteListRequestParams.ts

@@ -0,0 +1,7 @@
+import { ApiEndpointParam } from '../ApiEndpointParam'
+import { ApiVersion } from '../../Api/ApiVersion'
+
+export type SubscriptionInviteListRequestParams = {
+  [ApiEndpointParam.ApiVersion]: ApiVersion.v0
+  [additionalParam: string]: unknown
+}

packages/api/src/Domain/Request/Subscription/SubscriptionInviteRequestParams.ts

@@ -0,0 +1,8 @@
+import { ApiEndpointParam } from '../ApiEndpointParam'
+import { ApiVersion } from '../../Api/ApiVersion'
+
+export type SubscriptionInviteRequestParams = {
+  [ApiEndpointParam.ApiVersion]: ApiVersion.v0
+  identifier: string
+  [additionalParam: string]: unknown
+}

packages/api/src/Domain/Request/index.ts

@@ -1,2 +1,7 @@
 export * from './ApiEndpointParam'
+export * from './Subscription/SubscriptionInviteAcceptRequestParams'
+export * from './Subscription/SubscriptionInviteCancelRequestParams'
+export * from './Subscription/SubscriptionInviteDeclineRequestParams'
+export * from './Subscription/SubscriptionInviteListRequestParams'
+export * from './Subscription/SubscriptionInviteRequestParams'
 export * from './User/UserRegistrationRequestParams'

packages/api/src/Domain/Response/Subscription/SubscriptionInviteAcceptResponse.ts

@@ -0,0 +1,9 @@
+import { Either } from '@standardnotes/common'
+
+import { HttpErrorResponseBody } from '../../Http/HttpErrorResponseBody'
+import { HttpResponse } from '../../Http/HttpResponse'
+import { SubscriptionInviteAcceptResponseBody } from './SubscriptionInviteAcceptResponseBody'
+
+export interface SubscriptionInviteAcceptResponse extends HttpResponse {
+  data: Either<SubscriptionInviteAcceptResponseBody, HttpErrorResponseBody>
+}

packages/api/src/Domain/Response/Subscription/SubscriptionInviteAcceptResponseBody.ts

@@ -0,0 +1,3 @@
+export type SubscriptionInviteAcceptResponseBody = {
+  success: boolean
+}

packages/api/src/Domain/Response/Subscription/SubscriptionInviteCancelResponse.ts

@@ -0,0 +1,9 @@
+import { Either } from '@standardnotes/common'
+
+import { HttpErrorResponseBody } from '../../Http/HttpErrorResponseBody'
+import { HttpResponse } from '../../Http/HttpResponse'
+import { SubscriptionInviteCancelResponseBody } from './SubscriptionInviteCancelResponseBody'
+
+export interface SubscriptionInviteCancelResponse extends HttpResponse {
+  data: Either<SubscriptionInviteCancelResponseBody, HttpErrorResponseBody>
+}

packages/api/src/Domain/Response/Subscription/SubscriptionInviteCancelResponseBody.ts

@@ -0,0 +1,3 @@
+export type SubscriptionInviteCancelResponseBody = {
+  success: boolean
+}

packages/api/src/Domain/Response/Subscription/SubscriptionInviteDeclineResponse.ts

@@ -0,0 +1,9 @@
+import { Either } from '@standardnotes/common'
+
+import { HttpErrorResponseBody } from '../../Http/HttpErrorResponseBody'
+import { HttpResponse } from '../../Http/HttpResponse'
+import { SubscriptionInviteDeclineResponseBody } from './SubscriptionInviteDeclineResponseBody'
+
+export interface SubscriptionInviteDeclineResponse extends HttpResponse {
+  data: Either<SubscriptionInviteDeclineResponseBody, HttpErrorResponseBody>
+}

packages/api/src/Domain/Response/Subscription/SubscriptionInviteDeclineResponseBody.ts

@@ -0,0 +1,3 @@
+export type SubscriptionInviteDeclineResponseBody = {
+  success: boolean
+}

packages/api/src/Domain/Response/Subscription/SubscriptionInviteListResponse.ts

@@ -0,0 +1,9 @@
+import { Either } from '@standardnotes/common'
+
+import { HttpErrorResponseBody } from '../../Http/HttpErrorResponseBody'
+import { HttpResponse } from '../../Http/HttpResponse'
+import { SubscriptionInviteListResponseBody } from './SubscriptionInviteListResponseBody'
+
+export interface SubscriptionInviteListResponse extends HttpResponse {
+  data: Either<SubscriptionInviteListResponseBody, HttpErrorResponseBody>
+}

packages/api/src/Domain/Response/Subscription/SubscriptionInviteListResponseBody.ts

@@ -0,0 +1,5 @@
+import { Invitation } from '@standardnotes/models'
+
+export type SubscriptionInviteListResponseBody = {
+  invitations: Array<Invitation>
+}

packages/api/src/Domain/Response/Subscription/SubscriptionInviteResponse.ts

@@ -0,0 +1,9 @@
+import { Either } from '@standardnotes/common'
+
+import { HttpErrorResponseBody } from '../../Http/HttpErrorResponseBody'
+import { HttpResponse } from '../../Http/HttpResponse'
+import { SubscriptionInviteResponseBody } from './SubscriptionInviteResponseBody'
+
+export interface SubscriptionInviteResponse extends HttpResponse {
+  data: Either<SubscriptionInviteResponseBody, HttpErrorResponseBody>
+}

packages/api/src/Domain/Response/Subscription/SubscriptionInviteResponseBody.ts

@@ -0,0 +1,10 @@
+import { Uuid } from '@standardnotes/common'
+
+export type SubscriptionInviteResponseBody =
+  | {
+      success: true
+      sharedSubscriptionInvitationUuid: Uuid
+    }
+  | {
+      success: false
+    }

packages/api/src/Domain/Response/index.ts

@@ -1,2 +1,12 @@
+export * from './Subscription/SubscriptionInviteAcceptResponse'
+export * from './Subscription/SubscriptionInviteAcceptResponseBody'
+export * from './Subscription/SubscriptionInviteCancelResponse'
+export * from './Subscription/SubscriptionInviteCancelResponseBody'
+export * from './Subscription/SubscriptionInviteDeclineResponse'
+export * from './Subscription/SubscriptionInviteDeclineResponseBody'
+export * from './Subscription/SubscriptionInviteListResponse'
+export * from './Subscription/SubscriptionInviteListResponseBody'
+export * from './Subscription/SubscriptionInviteResponse'
+export * from './Subscription/SubscriptionInviteResponseBody'
 export * from './User/UserRegistrationResponse'
 export * from './User/UserRegistrationResponseBody'

packages/api/src/Domain/Server/Subscription/Paths.ts

@@ -0,0 +1,15 @@
+import { Uuid } from '@standardnotes/common'
+
+const SharingPaths = {
+  invite: '/v1/subscription-invites',
+  acceptInvite: (inviteUuid: Uuid) => `/v1/subscription-invites/${inviteUuid}/accept`,
+  declineInvite: (inviteUuid: Uuid) => `/v1/subscription-invites/${inviteUuid}/decline`,
+  cancelInvite: (inviteUuid: Uuid) => `/v1/subscription-invites/${inviteUuid}`,
+  listInvites: '/v1/subscription-invites',
+}
+
+export const Paths = {
+  v1: {
+    ...SharingPaths,
+  },
+}

packages/api/src/Domain/Server/Subscription/SubscriptionServer.spec.ts

@@ -0,0 +1,106 @@
+import { Invitation } from '@standardnotes/models'
+
+import { ApiVersion } from '../../Api'
+import { HttpServiceInterface } from '../../Http'
+import { SubscriptionInviteResponse } from '../../Response'
+import { SubscriptionInviteAcceptResponse } from '../../Response/Subscription/SubscriptionInviteAcceptResponse'
+import { SubscriptionInviteCancelResponse } from '../../Response/Subscription/SubscriptionInviteCancelResponse'
+import { SubscriptionInviteDeclineResponse } from '../../Response/Subscription/SubscriptionInviteDeclineResponse'
+import { SubscriptionInviteListResponse } from '../../Response/Subscription/SubscriptionInviteListResponse'
+
+import { SubscriptionServer } from './SubscriptionServer'
+
+describe('SubscriptionServer', () => {
+  let httpService: HttpServiceInterface
+
+  const createServer = () => new SubscriptionServer(httpService)
+
+  beforeEach(() => {
+    httpService = {} as jest.Mocked<HttpServiceInterface>
+  })
+
+  it('should invite a user to a shared subscription', async () => {
+    httpService.post = jest.fn().mockReturnValue({
+      data: { success: true, sharedSubscriptionInvitationUuid: '1-2-3' },
+    } as jest.Mocked<SubscriptionInviteResponse>)
+
+    const response = await createServer().invite({
+      api: ApiVersion.v0,
+      identifier: '[email protected]',
+    })
+
+    expect(response).toEqual({
+      data: {
+        success: true,
+        sharedSubscriptionInvitationUuid: '1-2-3',
+      },
+    })
+  })
+
+  it('should accept an invite to a shared subscription', async () => {
+    httpService.get = jest.fn().mockReturnValue({
+      data: { success: true },
+    } as jest.Mocked<SubscriptionInviteAcceptResponse>)
+
+    const response = await createServer().acceptInvite({
+      api: ApiVersion.v0,
+      inviteUuid: '1-2-3',
+    })
+
+    expect(response).toEqual({
+      data: {
+        success: true,
+      },
+    })
+  })
+
+  it('should decline an invite to a shared subscription', async () => {
+    httpService.get = jest.fn().mockReturnValue({
+      data: { success: true },
+    } as jest.Mocked<SubscriptionInviteDeclineResponse>)
+
+    const response = await createServer().declineInvite({
+      api: ApiVersion.v0,
+      inviteUuid: '1-2-3',
+    })
+
+    expect(response).toEqual({
+      data: {
+        success: true,
+      },
+    })
+  })
+
+  it('should cancel an invite to a shared subscription', async () => {
+    httpService.delete = jest.fn().mockReturnValue({
+      data: { success: true },
+    } as jest.Mocked<SubscriptionInviteCancelResponse>)
+
+    const response = await createServer().cancelInvite({
+      api: ApiVersion.v0,
+      inviteUuid: '1-2-3',
+    })
+
+    expect(response).toEqual({
+      data: {
+        success: true,
+      },
+    })
+  })
+
+  it('should list invitations to a shared subscription', async () => {
+    httpService.get = jest.fn().mockReturnValue({
+      data: { invitations: [{} as jest.Mocked<Invitation>] },
+    } as jest.Mocked<SubscriptionInviteListResponse>)
+
+    const response = await createServer().listInvites({
+      api: ApiVersion.v0,
+    })
+
+    expect(response).toEqual({
+      data: {
+        invitations: [{} as jest.Mocked<Invitation>],
+      },
+    })
+  })
+})

packages/api/src/Domain/Server/Subscription/SubscriptionServer.ts

@@ -0,0 +1,48 @@
+import { HttpServiceInterface } from '../../Http/HttpServiceInterface'
+import { SubscriptionInviteAcceptRequestParams } from '../../Request/Subscription/SubscriptionInviteAcceptRequestParams'
+import { SubscriptionInviteCancelRequestParams } from '../../Request/Subscription/SubscriptionInviteCancelRequestParams'
+import { SubscriptionInviteDeclineRequestParams } from '../../Request/Subscription/SubscriptionInviteDeclineRequestParams'
+import { SubscriptionInviteListRequestParams } from '../../Request/Subscription/SubscriptionInviteListRequestParams'
+import { SubscriptionInviteRequestParams } from '../../Request/Subscription/SubscriptionInviteRequestParams'
+import { SubscriptionInviteAcceptResponse } from '../../Response/Subscription/SubscriptionInviteAcceptResponse'
+import { SubscriptionInviteCancelResponse } from '../../Response/Subscription/SubscriptionInviteCancelResponse'
+import { SubscriptionInviteDeclineResponse } from '../../Response/Subscription/SubscriptionInviteDeclineResponse'
+import { SubscriptionInviteListResponse } from '../../Response/Subscription/SubscriptionInviteListResponse'
+import { SubscriptionInviteResponse } from '../../Response/Subscription/SubscriptionInviteResponse'
+
+import { Paths } from './Paths'
+import { SubscriptionServerInterface } from './SubscriptionServerInterface'
+
+export class SubscriptionServer implements SubscriptionServerInterface {
+  constructor(private httpService: HttpServiceInterface) {}
+
+  async acceptInvite(params: SubscriptionInviteAcceptRequestParams): Promise<SubscriptionInviteAcceptResponse> {
+    const response = await this.httpService.get(Paths.v1.acceptInvite(params.inviteUuid), params)
+
+    return response as SubscriptionInviteAcceptResponse
+  }
+
+  async declineInvite(params: SubscriptionInviteDeclineRequestParams): Promise<SubscriptionInviteDeclineResponse> {
+    const response = await this.httpService.get(Paths.v1.declineInvite(params.inviteUuid), params)
+
+    return response as SubscriptionInviteDeclineResponse
+  }
+
+  async cancelInvite(params: SubscriptionInviteCancelRequestParams): Promise<SubscriptionInviteCancelResponse> {
+    const response = await this.httpService.delete(Paths.v1.cancelInvite(params.inviteUuid), params)
+
+    return response as SubscriptionInviteCancelResponse
+  }
+
+  async listInvites(params: SubscriptionInviteListRequestParams): Promise<SubscriptionInviteListResponse> {
+    const response = await this.httpService.get(Paths.v1.listInvites, params)
+
+    return response as SubscriptionInviteListResponse
+  }
+
+  async invite(params: SubscriptionInviteRequestParams): Promise<SubscriptionInviteResponse> {
+    const response = await this.httpService.post(Paths.v1.invite, params)
+
+    return response as SubscriptionInviteResponse
+  }
+}

packages/api/src/Domain/Server/Subscription/SubscriptionServerInterface.ts

@@ -0,0 +1,18 @@
+import { SubscriptionInviteAcceptRequestParams } from '../../Request/Subscription/SubscriptionInviteAcceptRequestParams'
+import { SubscriptionInviteCancelRequestParams } from '../../Request/Subscription/SubscriptionInviteCancelRequestParams'
+import { SubscriptionInviteDeclineRequestParams } from '../../Request/Subscription/SubscriptionInviteDeclineRequestParams'
+import { SubscriptionInviteListRequestParams } from '../../Request/Subscription/SubscriptionInviteListRequestParams'
+import { SubscriptionInviteRequestParams } from '../../Request/Subscription/SubscriptionInviteRequestParams'
+import { SubscriptionInviteAcceptResponse } from '../../Response/Subscription/SubscriptionInviteAcceptResponse'
+import { SubscriptionInviteCancelResponse } from '../../Response/Subscription/SubscriptionInviteCancelResponse'
+import { SubscriptionInviteDeclineResponse } from '../../Response/Subscription/SubscriptionInviteDeclineResponse'
+import { SubscriptionInviteListResponse } from '../../Response/Subscription/SubscriptionInviteListResponse'
+import { SubscriptionInviteResponse } from '../../Response/Subscription/SubscriptionInviteResponse'
+
+export interface SubscriptionServerInterface {
+  invite(params: SubscriptionInviteRequestParams): Promise<SubscriptionInviteResponse>
+  acceptInvite(params: SubscriptionInviteAcceptRequestParams): Promise<SubscriptionInviteAcceptResponse>
+  declineInvite(params: SubscriptionInviteDeclineRequestParams): Promise<SubscriptionInviteDeclineResponse>
+  cancelInvite(params: SubscriptionInviteCancelRequestParams): Promise<SubscriptionInviteCancelResponse>
+  listInvites(params: SubscriptionInviteListRequestParams): Promise<SubscriptionInviteListResponse>
+}

packages/api/src/Domain/Server/index.ts

@@ -1,3 +1,4 @@
-export * from './User/Paths'
+export * from './Subscription/SubscriptionServer'
+export * from './Subscription/SubscriptionServerInterface'
 export * from './User/UserServer'
 export * from './User/UserServerInterface'

packages/components/CHANGELOG.md

@@ -3,6 +3,32 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.7.11](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-09-13)
+
+**Note:** Version bump only for package @standardnotes/components-meta
+
+## [2.7.10](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-09-07)
+
+### Bug Fixes
+
+* add min-height to task textarea ([#1490](https://github.com/standardnotes/app/issues/1490)) ([0e86b13](https://github.com/standardnotes/app/commit/0e86b13a8f3b11ed99cdc49b3a44665396bfca98))
+
+## [2.7.9](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-23)
+
+**Note:** Version bump only for package @standardnotes/components-meta
+
+## [2.7.8](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-22)
+
+### Bug Fixes
+
+* trigger the `onChange` event of qr code uploading input when clicking on the button ([#1421](https://github.com/standardnotes/app/issues/1421)) ([2a976a0](https://github.com/standardnotes/app/commit/2a976a0de499ba33186a52a6bd2c10a709b86fee))
+
+## [2.7.7](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-07-14)
+
+### Bug Fixes
+
+* **ste:** revert border radius change ([b174493](https://github.com/standardnotes/app/commit/b174493b4ea3ca164cf5754ab791022b17b612ac))
+
 ## [2.7.6](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-07-13)
 
 **Note:** Version bump only for package @standardnotes/components-meta

packages/components/dist/zips/checksums.json

@@ -75,14 +75,14 @@
     "binary": "c4479f8768f5f6cda41850212a8e03927990adfa33ebd36e29ee6de2335e8e46"
   },
   "org.standardnotes.simple-task-editor": {
-    "version": "1.4.2",
-    "base64": "1eff91ed0151905431a49b40089b957578c60492718bd0a6aad00d2e02fc5c02",
-    "binary": "dae94bf60e464b58733ad1396e8e4adb78d01cd67c1e56fdc62e44334c0d6a0e"
+    "version": "1.4.4",
+    "base64": "4beb1432ffbe1ad40ba7446953cc3b97493a044e6cf095897f6381b6fbfe6f94",
+    "binary": "9df983a144b9686f4f58b03bf78bf1f84f53aea60251621a75586722bf576475"
   },
   "org.standardnotes.token-vault": {
-    "version": "2.2.3",
-    "base64": "bf5c3a2aae3f119043ee744ab5535de4705eeed67d5ecf9e1d7b95817f92bc19",
-    "binary": "8ef8a1eaf19d22b0ac279ad0c4d27b29c057b0f9b0d5c5f4cd6183eb506feaa3"
+    "version": "2.2.4",
+    "base64": "fb004e8cae73b351fdb225ef910102a1b7c9b616b92de52f99d2c82d7b4dd5a1",
+    "binary": "9b00f950c868e20e059a5fe7dbd0dd14eac5d94b31817b8bf3c58c88ab5ce236"
   },
   "org.standardnotes.standard-sheets": {
     "version": "1.5.1",
@@ -90,9 +90,9 @@
     "binary": "54a01414a21e46c67fa59c69189a3d34a6548de7539699f2cf0248f9c5059d37"
   },
   "org.standardnotes.advanced-checklist": {
-    "version": "0.2.3",
-    "base64": "2a2ce988902c9fdb7fe507c826bff13592adfe4fbe1c36e8468155730f507573",
-    "binary": "ae614e38946c480256157554d9af542deb0c9741630ad3242becce391991b994"
+    "version": "0.2.5",
+    "base64": "077a56ef75958105bc9dc16376bcea2e89aee57b512b43f9e1b33e1d32ea8358",
+    "binary": "e903a5c592bd03ca28d205d09dcbc7e4329c7cd57fb74b4e0e5fa724c2321a61"
   },
   "org.standardnotes.file-safe": {
     "version": "2.0.16",

packages/components/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/components-meta",
-  "version": "2.7.6",
+  "version": "2.7.11",
   "private": true,
   "author": "Standard Notes.",
   "main": "dist",

packages/components/src/Packages/Editors/org.standardnotes.advanced-checklist/CHANGELOG.md

@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [0.2.5](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-09-13)
+
+**Note:** Version bump only for package @standardnotes/advanced-checklist
+
+## [0.2.4](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-23)
+
+**Note:** Version bump only for package @standardnotes/advanced-checklist
+
 ## [0.2.3](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-07-13)
 
 ### Bug Fixes

packages/components/src/Packages/Editors/org.standardnotes.advanced-checklist/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/advanced-checklist",
-  "version": "0.2.3",
+  "version": "0.2.5",
   "description": "A task editor with grouping functionality.",
   "author": "Standard Notes.",
   "keywords": [

packages/components/src/Packages/Editors/org.standardnotes.simple-task-editor/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.4.4](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-09-07)
+
+### Bug Fixes
+
+* add min-height to task textarea ([#1490](https://github.com/standardnotes/app/issues/1490)) ([0e86b13](https://github.com/standardnotes/app/commit/0e86b13a8f3b11ed99cdc49b3a44665396bfca98))
+
+## [1.4.3](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-07-14)
+
+### Bug Fixes
+
+* **ste:** revert border radius change ([b174493](https://github.com/standardnotes/app/commit/b174493b4ea3ca164cf5754ab791022b17b612ac))
+
 ## [1.4.2](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-07-13)
 
 **Note:** Version bump only for package @standardnotes/simple-task-editor

packages/components/src/Packages/Editors/org.standardnotes.simple-task-editor/app/stylesheets/main.scss

@@ -85,7 +85,7 @@ body {
    left: 0;
    height: 10px;
    width: 10px;
-   border-radius: 10px;
+   border-radius: 1px;
    background-color: var(--sn-stylekit-contrast-background-color);;
    border: 1px solid var(--sn-stylekit-contrast-border-color);
 
@@ -116,6 +116,7 @@ body {
    resize: none;
    overflow: hidden;
    background-color: transparent;
+   min-height: 22px;
  }
 }
 

packages/components/src/Packages/Editors/org.standardnotes.simple-task-editor/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@standardnotes/simple-task-editor",
   "private": true,
-  "version": "1.4.2",
+  "version": "1.4.4",
   "main": "dist/dist.js",
   "scripts": {
     "components:compile": "webpack --config webpack.prod.js",

packages/components/src/Packages/Editors/org.standardnotes.token-vault/CHANGELOG.md

@@ -3,6 +3,12 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.2.4](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-22)
+
+### Bug Fixes
+
+* trigger the `onChange` event of qr code uploading input when clicking on the button ([#1421](https://github.com/standardnotes/app/issues/1421)) ([2a976a0](https://github.com/standardnotes/app/commit/2a976a0de499ba33186a52a6bd2c10a709b86fee))
+
 ## [2.2.3](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-07-13)
 
 **Note:** Version bump only for package @standardnotes/authenticator

packages/components/src/Packages/Editors/org.standardnotes.token-vault/app/components/QRCodeReader.jsx

@@ -28,6 +28,12 @@ const convertToGrayScale = (imageData) => {
 }
 
 export default class QRCodeReader extends React.Component {
+  constructor() {
+    super()
+
+    this.fileInputRef = React.createRef(null)
+  }
+
   onImageSelected = (evt) => {
     const file = evt.target.files[0]
     const url = URL.createObjectURL(file)
@@ -70,9 +76,9 @@ export default class QRCodeReader extends React.Component {
   render() {
     return (
       <div className="qr-code-reader-container">
-        <div className="sk-button info">
+        <div className="sk-button info" onClick={() => this.fileInputRef.current.click()}>
           <div className="sk-label">Upload QR Code</div>
-          <input type="file" style={{ display: 'none' }} onChange={this.onImageSelected} />
+          <input type="file" style={{ display: 'none' }} ref={this.fileInputRef} onChange={this.onImageSelected} />
         </div>
       </div>
     )

packages/components/src/Packages/Editors/org.standardnotes.token-vault/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/authenticator",
-  "version": "2.2.3",
+  "version": "2.2.4",
   "main": "dist/dist.js",
   "author": "Standard Notes",
   "private": true,

packages/desktop/CHANGELOG.md

@@ -3,6 +3,176 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [3.23.116](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-09-13)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.23.115](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-09-12)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.23.114](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-09-12)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.23.113](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-09-09)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.23.112](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-09-09)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.23.111](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-09-08)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.23.110](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-09-08)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.23.109](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-09-07)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.23.108](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-09-07)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.23.107](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-09-01)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.23.106](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-31)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.23.105](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-31)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.23.104](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-29)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.23.103](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-25)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.23.102](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-24)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.23.101](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-23)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.23.100](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-23)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.23.99](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-22)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.23.98](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-18)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.23.97](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-17)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.23.96](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-17)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.23.95](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-17)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.23.94](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-16)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.23.93](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-15)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.23.92](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-11)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.23.91](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-10)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.23.90](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-09)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.23.89](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-08)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.23.88](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-08)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.23.87](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-06)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.23.86](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-05)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.23.85](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-03)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.23.84](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-03)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.23.83](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-01)
+
+### Bug Fixes
+
+* popover header getting hidden on desktop by titlebar ([#1359](https://github.com/standardnotes/app/issues/1359)) ([5b3cfdd](https://github.com/standardnotes/app/commit/5b3cfddc50aabb4d03761e7e46c3ab1d1bb2c952))
+
+## [3.23.82](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-07-27)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.23.81](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-07-26)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.23.80](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-07-25)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.23.79](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-07-20)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.23.78](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-07-18)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.23.77](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-07-14)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.23.76](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-07-14)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.23.75](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-07-14)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
 ## [3.23.74](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-07-13)
 
 **Note:** Version bump only for package @standardnotes/desktop

packages/desktop/app/javascripts/Renderer/Renderer.ts

@@ -122,6 +122,10 @@ async function configureWindow(remoteBridge: CrossProcessBridge) {
     /* Use custom title bar. Take the sn-titlebar-height off of
     the app content height so its not overflowing */
     sheet.insertRule('body { padding-top: var(--sn-desktop-titlebar-height); }', sheet.cssRules.length)
+    sheet.insertRule(
+      '[data-popover] { padding-top: calc(var(--sn-desktop-titlebar-height) + 0.5rem); }',
+      sheet.cssRules.length,
+    )
     sheet.insertRule(
       `.main-ui-view { height: calc(100vh - var(--sn-desktop-titlebar-height)) !important;
         min-height: calc(100vh - var(--sn-desktop-titlebar-height)) !important; }`,

packages/desktop/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@standardnotes/desktop",
   "main": "./app/dist/index.js",
-  "version": "3.23.74",
+  "version": "3.23.116",
   "license": "AGPL-3.0-or-later",
   "author": "Standard Notes.",
   "private": true,

packages/docs/CHANGELOG.md

@@ -3,6 +3,12 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [0.2.0](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-17)
+
+### Features
+
+* **docs:** remove matomo in favour of plausible ([6d7bcd7](https://github.com/standardnotes/app/commit/6d7bcd7a8d2dfffb6dc69899406af57e41c071df))
+
 # [0.1.0](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-07-11)
 
 ### Features

packages/docs/README.md

@@ -44,7 +44,6 @@ docs
 │   ├── katex
 │   ├── .nojekyll
 │   ├── CNAME
-│   └── matomo.js
 ├── .gitignore
 ├── .prettierrc
 ├── docusaurus.config.js

packages/docs/docusaurus.config.js

@@ -156,8 +156,8 @@ module.exports = {
   ],
   scripts: [
     {
-      src: `/matomo.js`,
-      async: true,
+      src: 'https://plausible.standardnotes.com/js/plausible.js',
+      "data-domain": 'docs.standardnotes.com',
       defer: true,
     },
   ],

packages/docs/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/docs",
-  "version": "0.1.0",
+  "version": "0.2.0",
   "license": "AGPL-3.0-or-later",
   "author": "Standard Notes.",
   "private": true,

packages/docs/static/matomo.js

@@ -1,11 +0,0 @@
-var _paq = window._paq || [];
-/* tracker methods like "setCustomDimension" should be called before "trackPageView" */
-_paq.push(['trackPageView']);
-_paq.push(['enableLinkTracking']);
-(function() {
-  var u="//matomo.standardnotes.org/";
-  _paq.push(['setTrackerUrl', u+'matomo.php']);
-  _paq.push(['setSiteId', '7']);
-  var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
-  g.type='text/javascript'; g.async=true; g.defer=true; g.src=u+'matomo.js'; s.parentNode.insertBefore(g,s);
-})();

packages/encryption/CHANGELOG.md

@@ -3,6 +3,41 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [1.15.0](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-09-13)
+
+### Features
+
+* add subscription manager to handle subscription sharing ([#1517](https://github.com/standardnotes/app/issues/1517)) ([55b1409](https://github.com/standardnotes/app/commit/55b1409a805c21ada70bf482a02cfe718a4c6576))
+
+## [1.14.4](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-09-01)
+
+### Bug Fixes
+
+* **encryption:** make package public for resolution on @standardnotes/api package ([8792771](https://github.com/standardnotes/app/commit/8792771d27ba926b83bc7b89749c4b1982871c1b))
+
+## [1.14.3](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-31)
+
+**Note:** Version bump only for package @standardnotes/encryption
+
+## [1.14.2](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-23)
+
+**Note:** Version bump only for package @standardnotes/encryption
+
+## [1.14.1](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-23)
+
+**Note:** Version bump only for package @standardnotes/encryption
+
+# [1.14.0](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-05)
+
+### Bug Fixes
+
+* **encryption:** remove compiled encrypted paramters from source ([73e3b38](https://github.com/standardnotes/app/commit/73e3b3813f21f3fe06e5af2cfa2953210bb1de76))
+
+### Features
+
+* **encryption:** refactor circular dependencies on services ([ffb2193](https://github.com/standardnotes/app/commit/ffb21939246eb81eba3230ff8c0d68e7a6cb2bcb))
+* **web:** extract ui-services package ([7e25126](https://github.com/standardnotes/app/commit/7e251262d770cfc9d791115b9c18b862c49e4e03))
+
 ## [1.13.5](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-07-13)
 
 ### Bug Fixes

packages/encryption/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/encryption",
-  "version": "1.13.5",
+  "version": "1.15.0",
   "engines": {
     "node": ">=16.0.0 <17.0.0"
   },
@@ -11,7 +11,6 @@
   "files": [
     "dist"
   ],
-  "private": true,
   "license": "AGPL-3.0-or-later",
   "scripts": {
     "clean": "rm -fr dist",
@@ -36,10 +35,9 @@
     "typescript": "*"
   },
   "dependencies": {
-    "@standardnotes/common": "^1.23.1",
+    "@standardnotes/common": "^1.32.0",
     "@standardnotes/models": "workspace:*",
     "@standardnotes/responses": "workspace:*",
-    "@standardnotes/services": "workspace:*",
     "@standardnotes/sncrypto-common": "workspace:*",
     "@standardnotes/utils": "workspace:*",
     "reflect-metadata": "^0.1.13"

packages/encryption/src/Domain/Backups/BackupFile.ts

@@ -1,9 +0,0 @@
-import { AnyKeyParamsContent, ProtocolVersion } from '@standardnotes/common'
-import { BackupFileDecryptedContextualPayload, BackupFileEncryptedContextualPayload } from '@standardnotes/models'
-
-export type BackupFile = {
-  version?: ProtocolVersion
-  keyParams?: AnyKeyParamsContent
-  auth_params?: AnyKeyParamsContent
-  items: (BackupFileDecryptedContextualPayload | BackupFileEncryptedContextualPayload)[]
-}

packages/encryption/src/Domain/Operator/OperatorWrapper.ts

@@ -1,4 +1,10 @@
-import * as Models from '@standardnotes/models'
+import {
+  DecryptedPayloadInterface,
+  ItemsKeyInterface,
+  RootKeyInterface,
+  ItemContent,
+  EncryptedPayloadInterface,
+} from '@standardnotes/models'
 import {
   DecryptedParameters,
   EncryptedParameters,
@@ -9,8 +15,8 @@ import { isAsyncOperator } from './Functions'
 import { OperatorManager } from './OperatorManager'
 
 export async function encryptPayload(
-  payload: Models.DecryptedPayloadInterface,
-  key: Models.ItemsKeyInterface | Models.RootKeyInterface,
+  payload: DecryptedPayloadInterface,
+  key: ItemsKeyInterface | RootKeyInterface,
   operatorManager: OperatorManager,
 ): Promise<EncryptedParameters> {
   const operator = operatorManager.operatorForVersion(key.keyVersion)
@@ -29,9 +35,9 @@ export async function encryptPayload(
   return encryptionParameters
 }
 
-export async function decryptPayload<C extends Models.ItemContent = Models.ItemContent>(
-  payload: Models.EncryptedPayloadInterface,
-  key: Models.ItemsKeyInterface | Models.RootKeyInterface,
+export async function decryptPayload<C extends ItemContent = ItemContent>(
+  payload: EncryptedPayloadInterface,
+  key: ItemsKeyInterface | RootKeyInterface,
   operatorManager: OperatorManager,
 ): Promise<DecryptedParameters<C> | ErrorDecryptingParameters> {
   const operator = operatorManager.operatorForVersion(payload.version)

packages/encryption/src/Domain/Service/Encryption/EncryptionProvider.ts

@@ -1,12 +1,12 @@
 import { ProtocolVersion } from '@standardnotes/common'
 import {
+  BackupFile,
   DecryptedPayloadInterface,
   EncryptedPayloadInterface,
   ItemContent,
   RootKeyInterface,
 } from '@standardnotes/models'
 import { ClientDisplayableError } from '@standardnotes/responses'
-import { BackupFile } from '../../Backups/BackupFile'
 import { SNRootKeyParams } from '../../Keys/RootKey/RootKeyParams'
 import { KeyedDecryptionSplit } from '../../Split/KeyedDecryptionSplit'
 import { KeyedEncryptionSplit } from '../../Split/KeyedEncryptionSplit'

packages/encryption/src/Domain/Service/RootKey/RootKeyServiceEvent.ts

@@ -0,0 +1,3 @@
+export enum RootKeyServiceEvent {
+  RootKeyStatusChanged = 'RootKeyStatusChanged',
+}