chore(release): publish

- @standardnotes/[email protected]
 - @standardnotes/[email protected]
 - @standardnotes/[email protected]
 - @standardnotes/[email protected]
 - @standardnotes/[email protected].1
 - @standardnotes/[email protected]
 - @standardnotes/[email protected]
 - @standardnotes/[email protected]
 - @standardnotes/[email protected]
 - @standardnotes/[email protected]
 - @standardnotes/[email protected]
 - @standardnotes/[email protected]
 - @standardnotes/[email protected]
 - @standardnotes/[email protected]
 - @standardnotes/[email protected].2

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

@@ -199,6 +199,16 @@ jobs:
           draft: false
           files: packages/desktop/dist/*
 
+      - name: Publish Snap
+        continue-on-error: true
+        run: |
+          sudo snap install snapcraft --classic
+          snapcraft upload dist/standard-notes-${{ env.APP_VERSION }}-linux-amd64.snap --release stable,candidate,beta,edge
+
+  Notify:
+    runs-on: ubuntu-latest
+    needs: [Publish]
+    steps:
       - name: Notify Release Update
         uses: peter-evans/repository-dispatch@v2
         with:
@@ -206,8 +216,4 @@ jobs:
           repository: ${{ secrets.RELEASES_EVENT_RECEIVING_REPO }}
           event-type: releases-updated-event
 
-      - name: Publish Snap
-        continue-on-error: true
-        run: |
-          sudo snap install snapcraft --classic
-          snapcraft upload dist/standard-notes-${{ env.APP_VERSION }}-linux-amd64.snap --release stable,candidate,beta,edge
+

.github/workflows/publish.yml

@@ -5,7 +5,8 @@ on:
     branches: [ main ]
 
 jobs:
-  Build:
+  build:
+    name: Build & Test
     if: "${{ contains(github.event.head_commit.message, 'chore(release): publish') == false }}"
     runs-on: ubuntu-latest
     steps:
@@ -14,41 +15,43 @@ jobs:
         with:
           token: ${{ secrets.CI_PAT_TOKEN }}
           fetch-depth: 0
-
       - name: Set up Node
         uses: actions/setup-node@v3
         with:
           registry-url: 'https://registry.npmjs.org'
           node-version-file: '.nvmrc'
           cache: 'yarn'
-
-      - name: Setup git config
-        run: |
-          git config --global user.name "standardci"
-          git config --global user.email "[email protected]"
-      - 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
-
       - name: Install dependencies
         run: yarn install --immutable
-
       - name: Build
         run: yarn build:all
-
       - name: ESLint
         run: yarn lint
-
       - name: Build Android
         run: yarn android:bundle
-
       - name: Test
         run: yarn test
 
+  build-docker:
+    name: Build Docker Image
+    if: "${{ contains(github.event.head_commit.message, 'chore(release): publish') == false }}"
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+        with:
+          token: ${{ secrets.CI_PAT_TOKEN }}
+          fetch-depth: 0
+      - name: Set up Node
+        uses: actions/setup-node@v3
+        with:
+          registry-url: 'https://registry.npmjs.org'
+          node-version-file: '.nvmrc'
+          cache: 'yarn'
+      - name: Install dependencies
+        run: yarn install --immutable
+      - name: Build
+        run: yarn build:snjs
       - name: Login to Docker Hub
         if: "${{ contains(github.event.head_commit.message, 'skip e2e') == false }}"
         uses: docker/login-action@v2
@@ -62,7 +65,12 @@ jobs:
           yarn docker build @standardnotes/snjs -t standardnotes/snjs:${{ github.sha }}
           docker push standardnotes/snjs:${{ github.sha }}
 
-      - name: Run E2E test suite
+  e2e-base:
+    name: E2E Base Test Suite
+    needs: build-docker
+    runs-on: ubuntu-latest
+    steps:
+      - name: Run E2E base test suite
         if: "${{ contains(github.event.head_commit.message, 'skip e2e') == false }}"
         uses: convictional/trigger-workflow-and-wait@master
         with:
@@ -71,21 +79,82 @@ jobs:
           github_token: ${{ secrets.CI_PAT_TOKEN }}
           workflow_file_name: e2e-test-suite.yml
           wait_interval: 30
-          client_payload: '{"snjs_image_tag": "${{ github.sha }}"}'
+          client_payload: '{"snjs_image_tag": "${{ github.sha }}", "suite": "base", "author": "${{ github.actor }}", "ref_name": "app:${{ github.ref }}"}'
           propagate_failure: true
           trigger_workflow: true
           wait_workflow: true
 
+  # e2e-vaults:
+  #   name: E2E Vaults Test Suite
+  #   needs: build-docker
+  #   runs-on: ubuntu-latest
+  #   steps:
+  #     - name: Run E2E vaults test suite
+  #       if: "${{ contains(github.event.head_commit.message, 'skip e2e') == false }}"
+  #       uses: convictional/trigger-workflow-and-wait@master
+  #       with:
+  #         owner: standardnotes
+  #         repo: server
+  #         github_token: ${{ secrets.CI_PAT_TOKEN }}
+  #         workflow_file_name: e2e-test-suite.yml
+  #         wait_interval: 30
+  #         client_payload: '{"snjs_image_tag": "${{ github.sha }}", "suite": "vaults", "author": "${{ github.actor }}", "ref_name": "app:${{ github.ref }}"}'
+  #         propagate_failure: true
+  #         trigger_workflow: true
+  #         wait_workflow: true
+
+  publish:
+    name: Publish to NPM
+    needs: [e2e-base]
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+        with:
+          token: ${{ secrets.CI_PAT_TOKEN }}
+          fetch-depth: 0
+      - name: Set up Node
+        uses: actions/setup-node@v3
+        with:
+          registry-url: 'https://registry.npmjs.org'
+          node-version-file: '.nvmrc'
+          cache: 'yarn'
+      - name: Setup git config
+        run: |
+          git config --global user.name "standardci"
+          git config --global user.email "[email protected]"
+      - 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
+      - name: Install dependencies
+        run: yarn install --immutable
+      - name: Build
+        run: yarn build:all
       - name: Bump version
         run: yarn release:prod
-
       - name: Publish
         run: yarn publish:prod
         env:
           NODE_AUTH_TOKEN: ${{ secrets.CI_NPM_TOKEN }}
 
+  publish-docker:
+    name: Publish to Docker Hub
+    needs: [e2e-base]
+    runs-on: ubuntu-latest
+    steps:
+      - 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 as stable
         if: "${{ contains(github.event.head_commit.message, 'skip e2e') == false }}"
         run: |
+          docker pull standardnotes/snjs:${{ github.sha }}
           docker tag standardnotes/snjs:${{ github.sha }} standardnotes/snjs:latest
           docker push standardnotes/snjs:latest

.github/workflows/snjs.pr.yml

@@ -1,4 +1,4 @@
-name: SNJS PR — E2E Tests
+name: SNJS PR — E2E Tests
 
 on:
   pull_request:
@@ -25,6 +25,38 @@ jobs:
     steps:
       - name: Checkout code
         uses: actions/checkout@v3
+        with:
+          token: ${{ secrets.CI_PAT_TOKEN }}
+          fetch-depth: 0
+      - name: Set up Node
+        uses: actions/setup-node@v3
+        with:
+          registry-url: 'https://registry.npmjs.org'
+          node-version-file: '.nvmrc'
+          cache: 'yarn'
+      - name: Install dependencies
+        run: yarn install --immutable
+      - name: Build
+        run: yarn build:snjs
+      - name: ESLint
+        run: yarn lint
+      - name: Test
+        run: yarn test
+
+  build-docker:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+        with:
+          token: ${{ secrets.CI_PAT_TOKEN }}
+          fetch-depth: 0
+      - name: Set up Node
+        uses: actions/setup-node@v3
+        with:
+          registry-url: 'https://registry.npmjs.org'
+          node-version-file: '.nvmrc'
+          cache: 'yarn'
       - name: Install dependencies
         run: yarn install --immutable
       - name: Build
@@ -40,6 +72,12 @@ jobs:
           docker push standardnotes/snjs:${{ github.sha }}
           docker tag standardnotes/snjs:${{ github.sha }} standardnotes/snjs:test
           docker push standardnotes/snjs:test
+
+  e2e-base:
+    name: E2E Base Test Suite
+    needs: build-docker
+    runs-on: ubuntu-latest
+    steps:
       - name: Run E2E test suite
         uses: convictional/trigger-workflow-and-wait@master
         with:
@@ -48,7 +86,25 @@ jobs:
           github_token: ${{ secrets.CI_PAT_TOKEN }}
           workflow_file_name: e2e-test-suite.yml
           wait_interval: 30
-          client_payload: '{"snjs_image_tag": "${{ github.sha }}"}'
+          client_payload: '{"snjs_image_tag": "${{ github.sha }}", "suite": "base", "author": "${{ github.actor }}", "ref_name": "app:${{ github.ref }}"}'
           propagate_failure: true
           trigger_workflow: true
           wait_workflow: true
+
+  # e2e-vaults:
+  #   name: E2E Vaults Test Suite
+  #   needs: build-docker
+  #   runs-on: ubuntu-latest
+  #   steps:
+  #     - name: Run E2E vaults test suite
+  #       uses: convictional/trigger-workflow-and-wait@master
+  #       with:
+  #         owner: standardnotes
+  #         repo: server
+  #         github_token: ${{ secrets.CI_PAT_TOKEN }}
+  #         workflow_file_name: e2e-test-suite.yml
+  #         wait_interval: 30
+  #         client_payload: '{"snjs_image_tag": "${{ github.sha }}", "suite": "vaults", "author": "${{ github.actor }}", "ref_name": "app:${{ github.ref }}"}'
+  #         propagate_failure: true
+  #         trigger_workflow: true
+  #         wait_workflow: true

package.json

@@ -27,7 +27,7 @@
     "build:services": "yarn workspaces foreach -pt --topological-dev --verbose -R --from @standardnotes/services run build",
     "build:api": "yarn workspaces foreach -pt --topological-dev --verbose -R --from @standardnotes/api run build",
     "e2e": "lerna run start:test-server --scope=@standardnotes/snjs",
-    "e2e:test": "yarn dlx mocha-headless-chrome --timeout 1800000 -f http://localhost:9001/mocha/test.html",
+    "e2e:test": "yarn dlx mocha-headless-chrome --timeout 3600000 -f http://localhost:9001/mocha/test.html",
     "reset": "find . -type dir -name node_modules | xargs rm -rf && rm -rf yarn.lock && yarn install",
     "release:prod": "lerna version --conventional-commits --yes -m \"chore(release): publish\"",
     "publish:prod": "lerna publish from-git --yes --no-verify-access --loglevel verbose",

packages/api/CHANGELOG.md

@@ -3,6 +3,70 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.26.64](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-10-09)
+
+**Note:** Version bump only for package @standardnotes/api
+
+## [1.26.63](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-10-05)
+
+**Note:** Version bump only for package @standardnotes/api
+
+## [1.26.62](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-09-29)
+
+**Note:** Version bump only for package @standardnotes/api
+
+## [1.26.61](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-09-28)
+
+**Note:** Version bump only for package @standardnotes/api
+
+## [1.26.60](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-09-26)
+
+**Note:** Version bump only for package @standardnotes/api
+
+## [1.26.59](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-09-22)
+
+**Note:** Version bump only for package @standardnotes/api
+
+## [1.26.58](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-09-21)
+
+**Note:** Version bump only for package @standardnotes/api
+
+## [1.26.57](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-09-20)
+
+**Note:** Version bump only for package @standardnotes/api
+
+## [1.26.56](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-09-13)
+
+**Note:** Version bump only for package @standardnotes/api
+
+## [1.26.55](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-09-07)
+
+**Note:** Version bump only for package @standardnotes/api
+
+## [1.26.54](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-09-07)
+
+**Note:** Version bump only for package @standardnotes/api
+
+## [1.26.53](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-09-06)
+
+**Note:** Version bump only for package @standardnotes/api
+
+## [1.26.52](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-09-01)
+
+**Note:** Version bump only for package @standardnotes/api
+
+## [1.26.51](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-23)
+
+**Note:** Version bump only for package @standardnotes/api
+
+## [1.26.50](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-21)
+
+**Note:** Version bump only for package @standardnotes/api
+
+## [1.26.49](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-21)
+
+**Note:** Version bump only for package @standardnotes/api
+
 ## [1.26.48](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-12)
 
 **Note:** Version bump only for package @standardnotes/api

packages/api/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/api",
-  "version": "1.26.48",
+  "version": "1.26.64",
   "engines": {
     "node": ">=16.0.0 <17.0.0"
   },
@@ -36,7 +36,7 @@
   },
   "dependencies": {
     "@standardnotes/common": "^1.50.0",
-    "@standardnotes/domain-core": "^1.25.0",
+    "@standardnotes/domain-core": "^1.34.1",
     "@standardnotes/models": "workspace:*",
     "@standardnotes/responses": "workspace:*",
     "@standardnotes/utils": "workspace:*",

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

@@ -0,0 +1,4 @@
+export interface HttpRequestOptions {
+  authentication?: string
+  headers?: Record<string, string>[]
+}

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

@@ -16,6 +16,7 @@ import { Paths } from '../Server/Auth/Paths'
 import { SessionRefreshResponseBody } from '../Response/Auth/SessionRefreshResponseBody'
 import { FetchRequestHandler } from './FetchRequestHandler'
 import { RequestHandlerInterface } from './RequestHandlerInterface'
+import { HttpRequestOptions } from './HttpRequestOptions'
 
 export class HttpService implements HttpServiceInterface {
   private session?: Session | LegacySession
@@ -76,7 +77,7 @@ export class HttpService implements HttpServiceInterface {
     }
   }
 
-  async get<T>(path: string, params?: HttpRequestParams, authentication?: string): Promise<HttpResponse<T>> {
+  async get<T>(path: string, params?: HttpRequestParams, options?: HttpRequestOptions): Promise<HttpResponse<T>> {
     if (!this.host) {
       throw new Error('Attempting to make network request before host is set')
     }
@@ -85,7 +86,7 @@ export class HttpService implements HttpServiceInterface {
       url: joinPaths(this.host, path),
       params,
       verb: HttpVerb.Get,
-      authentication: authentication ?? this.getSessionAccessToken(),
+      authentication: options?.authentication ?? this.getSessionAccessToken(),
     })
   }
 
@@ -98,7 +99,7 @@ export class HttpService implements HttpServiceInterface {
     })
   }
 
-  async post<T>(path: string, params?: HttpRequestParams, authentication?: string): Promise<HttpResponse<T>> {
+  async post<T>(path: string, params?: HttpRequestParams, options?: HttpRequestOptions): Promise<HttpResponse<T>> {
     if (!this.host) {
       throw new Error('Attempting to make network request before host is set')
     }
@@ -107,34 +108,35 @@ export class HttpService implements HttpServiceInterface {
       url: joinPaths(this.host, path),
       params,
       verb: HttpVerb.Post,
-      authentication: authentication ?? this.getSessionAccessToken(),
+      authentication: options?.authentication ?? this.getSessionAccessToken(),
+      customHeaders: options?.headers,
     })
   }
 
-  async put<T>(path: string, params?: HttpRequestParams, authentication?: string): Promise<HttpResponse<T>> {
+  async put<T>(path: string, params?: HttpRequestParams, options?: HttpRequestOptions): Promise<HttpResponse<T>> {
     return this.runHttp({
       url: joinPaths(this.host, path),
       params,
       verb: HttpVerb.Put,
-      authentication: authentication ?? this.getSessionAccessToken(),
+      authentication: options?.authentication ?? this.getSessionAccessToken(),
     })
   }
 
-  async patch<T>(path: string, params: HttpRequestParams, authentication?: string): Promise<HttpResponse<T>> {
+  async patch<T>(path: string, params: HttpRequestParams, options?: HttpRequestOptions): Promise<HttpResponse<T>> {
     return this.runHttp({
       url: joinPaths(this.host, path),
       params,
       verb: HttpVerb.Patch,
-      authentication: authentication ?? this.getSessionAccessToken(),
+      authentication: options?.authentication ?? this.getSessionAccessToken(),
     })
   }
 
-  async delete<T>(path: string, params?: HttpRequestParams, authentication?: string): Promise<HttpResponse<T>> {
+  async delete<T>(path: string, params?: HttpRequestParams, options?: HttpRequestOptions): Promise<HttpResponse<T>> {
     return this.runHttp({
       url: joinPaths(this.host, path),
       params,
       verb: HttpVerb.Delete,
-      authentication: authentication ?? this.getSessionAccessToken(),
+      authentication: options?.authentication ?? this.getSessionAccessToken(),
     })
   }
 

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

@@ -1,16 +1,18 @@
 import { LegacySession, Session } from '@standardnotes/domain-core'
 import { HttpRequest, HttpRequestParams, HttpResponse, HttpResponseMeta } from '@standardnotes/responses'
 
+import { HttpRequestOptions } from './HttpRequestOptions'
+
 export interface HttpServiceInterface {
   setHost(host: string): void
   getHost(): string
 
-  get<T>(path: string, params?: HttpRequestParams, authentication?: string): Promise<HttpResponse<T>>
+  get<T>(path: string, params?: HttpRequestParams, options?: HttpRequestOptions): Promise<HttpResponse<T>>
   getExternal<T>(url: string, params?: HttpRequestParams): Promise<HttpResponse<T>>
-  post<T>(path: string, params?: HttpRequestParams, authentication?: string): Promise<HttpResponse<T>>
-  put<T>(path: string, params?: HttpRequestParams, authentication?: string): Promise<HttpResponse<T>>
-  patch<T>(path: string, params: HttpRequestParams, authentication?: string): Promise<HttpResponse<T>>
-  delete<T>(path: string, params?: HttpRequestParams, authentication?: string): Promise<HttpResponse<T>>
+  post<T>(path: string, params?: HttpRequestParams, options?: HttpRequestOptions): Promise<HttpResponse<T>>
+  put<T>(path: string, params?: HttpRequestParams, options?: HttpRequestOptions): Promise<HttpResponse<T>>
+  patch<T>(path: string, params: HttpRequestParams, options?: HttpRequestOptions): Promise<HttpResponse<T>>
+  delete<T>(path: string, params?: HttpRequestParams, options?: HttpRequestOptions): Promise<HttpResponse<T>>
   runHttp<T>(httpRequest: HttpRequest): Promise<HttpResponse<T>>
 
   setSession(session: Session | LegacySession): void

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

@@ -1,4 +1,5 @@
 export * from './HttpService'
 export * from './FetchRequestHandler'
+export * from './HttpRequestOptions'
 export * from './HttpServiceInterface'
 export * from './XMLHttpRequestState'

packages/api/src/Domain/Request/SharedVault/CreateSharedVaultValetTokenParams.ts

@@ -8,4 +8,5 @@ export type CreateSharedVaultValetTokenParams = {
   unencryptedFileSize?: number
   moveOperationType?: SharedVaultMoveType
   sharedVaultToSharedVaultMoveTargetUuid?: string
+  sharedVaultOwnerUuid?: string
 }

packages/api/src/Domain/Response/SharedVault/GetSharedVaultsResponse.ts

@@ -2,4 +2,8 @@ import { SharedVaultServerHash } from '@standardnotes/responses'
 
 export type GetSharedVaultsResponse = {
   sharedVaults: SharedVaultServerHash[]
+  designatedSurvivors: Array<{
+    userUuid: string
+    sharedVaultUuid: string
+  }>
 }

packages/api/src/Domain/Response/SharedVaultUsers/DesignateSurvivorResponse.ts

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