chore(release): publish

- @standardnotes/[email protected]
 - @standardnotes/[email protected]
 - @standardnotes/[email protected]
 - @standardnotes/[email protected]
 - @standardnotes/[email protected].3
 - @standardnotes/[email protected]
 - @standardnotes/[email protected].3
 - @standardnotes/[email protected].5

README.md

@@ -47,7 +47,7 @@ Questions? Find answers on our [Help page](https://standardnotes.com/help).
 
 ### Docker setup
 
-Docker is the quickest way to try out Standard Notes. We recommend using our official [Docker hub image](https://hub.docker.com/repository/docker/standardnotes/web).
+If you'd like to self-host the web application, we recommend using our official [Docker hub image](https://hub.docker.com/repository/docker/standardnotes/web).
 
 ```
 docker run -d -p 3001:3001 --env-file=.env.sample standardnotes/web:stable

package.json

@@ -27,6 +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",
     "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,60 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [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
+
+## [1.26.47](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-11)
+
+**Note:** Version bump only for package @standardnotes/api
+
+## [1.26.46](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-08)
+
+**Note:** Version bump only for package @standardnotes/api
+
+## [1.26.45](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-07)
+
+**Note:** Version bump only for package @standardnotes/api
+
+## [1.26.44](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-06)
+
+**Note:** Version bump only for package @standardnotes/api
+
+## [1.26.43](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-06)
+
+**Note:** Version bump only for package @standardnotes/api
+
+## [1.26.42](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-06)
+
+**Note:** Version bump only for package @standardnotes/api
+
+## [1.26.41](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-05)
+
+**Note:** Version bump only for package @standardnotes/api
+
+## [1.26.40](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-03)
+
+**Note:** Version bump only for package @standardnotes/api
+
+## [1.26.39](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-03)
+
+### Bug Fixes
+
+* exit interview discount link not working ([#2381](https://github.com/standardnotes/app/issues/2381)) ([027dd41](https://github.com/standardnotes/app/commit/027dd4114720d46cccf215a71c04b67f91315ddc))
+
+## [1.26.38](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-02)
+
+**Note:** Version bump only for package @standardnotes/api
+
 ## [1.26.37](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-01)
 
 **Note:** Version bump only for package @standardnotes/api

packages/api/package.json

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

packages/api/src/Domain/Client/User/UserApiService.ts

@@ -58,7 +58,7 @@ export class UserApiService implements UserApiServiceInterface {
 
       return response
     } catch (error) {
-      throw new ApiCallError(ErrorMessage.GenericRegistrationFail)
+      throw new ApiCallError(ErrorMessage.GenericFail)
     }
   }
 

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

@@ -4,12 +4,14 @@ import { FetchRequestHandler } from './FetchRequestHandler'
 import { HttpErrorResponseBody, HttpRequest } from '@standardnotes/responses'
 
 import { ErrorMessage } from '../Error'
+import { LoggerInterface } from '@standardnotes/utils'
 
 describe('FetchRequestHandler', () => {
   const snjsVersion = 'snjsVersion'
   const appVersion = 'appVersion'
   const environment = Environment.Web
-  const requestHandler = new FetchRequestHandler(snjsVersion, appVersion, environment)
+  const logger: LoggerInterface = {} as jest.Mocked<LoggerInterface>
+  const requestHandler = new FetchRequestHandler(snjsVersion, appVersion, environment, logger)
 
   it('should create a request', () => {
     const httpRequest: HttpRequest = {

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

@@ -11,12 +11,14 @@ import { RequestHandlerInterface } from './RequestHandlerInterface'
 import { Environment } from '@standardnotes/models'
 import { isString } from 'lodash'
 import { ErrorMessage } from '../Error'
+import { LoggerInterface } from '@standardnotes/utils'
 
 export class FetchRequestHandler implements RequestHandlerInterface {
   constructor(
     protected readonly snjsVersion: string,
     protected readonly appVersion: string,
     protected readonly environment: Environment,
+    private logger: LoggerInterface,
   ) {}
 
   async handleRequest<T>(httpRequest: HttpRequest): Promise<HttpResponse<T>> {
@@ -122,7 +124,7 @@ export class FetchRequestHandler implements RequestHandlerInterface {
         }
       }
     } catch (error) {
-      console.error(error)
+      this.logger.error(JSON.stringify(error))
     }
 
     if (httpStatus >= HttpStatusCode.Success && httpStatus < HttpStatusCode.InternalServerError) {

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

@@ -1,4 +1,4 @@
-import { joinPaths, sleep } from '@standardnotes/utils'
+import { LoggerInterface, joinPaths, sleep } from '@standardnotes/utils'
 import { Environment } from '@standardnotes/models'
 import { LegacySession, Session, SessionToken } from '@standardnotes/domain-core'
 import {
@@ -16,11 +16,13 @@ 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
   private __latencySimulatorMs?: number
   private declare host: string
+  loggingEnabled = false
 
   private inProgressRefreshSessionPromise?: Promise<boolean>
   private updateMetaCallback!: (meta: HttpResponseMeta) => void
@@ -32,8 +34,9 @@ export class HttpService implements HttpServiceInterface {
     private environment: Environment,
     private appVersion: string,
     private snjsVersion: string,
+    private logger: LoggerInterface,
   ) {
-    this.requestHandler = new FetchRequestHandler(this.snjsVersion, this.appVersion, this.environment)
+    this.requestHandler = new FetchRequestHandler(this.snjsVersion, this.appVersion, this.environment, this.logger)
   }
 
   setCallbacks(
@@ -74,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')
     }
@@ -83,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(),
     })
   }
 
@@ -96,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')
     }
@@ -105,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(),
     })
   }
 
@@ -150,6 +154,10 @@ export class HttpService implements HttpServiceInterface {
 
     const response = await this.requestHandler.handleRequest<T>(httpRequest)
 
+    if (this.loggingEnabled && isErrorResponse(response)) {
+      this.logger.error('Request failed', httpRequest, response)
+    }
+
     if (response.meta && !httpRequest.external) {
       this.updateMetaCallback?.(response.meta)
     }
@@ -175,7 +183,7 @@ export class HttpService implements HttpServiceInterface {
     return response
   }
 
-  private async refreshSession(): Promise<boolean> {
+  async refreshSession(): Promise<boolean> {
     if (!this.session) {
       return false
     }

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

@@ -1,19 +1,22 @@
 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
+  refreshSession(): Promise<boolean>
   setCallbacks(
     updateMetaCallback: (meta: HttpResponseMeta) => void,
     refreshSessionCallback: (session: Session) => void,

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

@@ -1,3 +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/Server/SharedVault/SharedVaultServer.ts

@@ -25,13 +25,23 @@ export class SharedVaultServer implements SharedVaultServerInterface {
   createSharedVaultFileValetToken(
     params: CreateSharedVaultValetTokenParams,
   ): Promise<HttpResponse<CreateSharedVaultValetTokenResponse>> {
-    return this.httpService.post(SharedVaultsPaths.createSharedVaultFileValetToken(params.sharedVaultUuid), {
-      file_uuid: params.fileUuid,
-      remote_identifier: params.remoteIdentifier,
-      operation: params.operation,
-      unencrypted_file_size: params.unencryptedFileSize,
-      move_operation_type: params.moveOperationType,
-      shared_vault_to_shared_vault_move_target_uuid: params.sharedVaultToSharedVaultMoveTargetUuid,
-    })
+    let headers = undefined
+    if (params.sharedVaultOwnerUuid) {
+      headers = [{ key: 'x-shared-vault-owner-context', value: params.sharedVaultOwnerUuid }]
+    }
+    return this.httpService.post(
+      SharedVaultsPaths.createSharedVaultFileValetToken(params.sharedVaultUuid),
+      {
+        file_uuid: params.fileUuid,
+        remote_identifier: params.remoteIdentifier,
+        operation: params.operation,
+        unencrypted_file_size: params.unencryptedFileSize,
+        move_operation_type: params.moveOperationType,
+        shared_vault_to_shared_vault_move_target_uuid: params.sharedVaultToSharedVaultMoveTargetUuid,
+      },
+      {
+        headers,
+      },
+    )
   }
 }

packages/clipper/CHANGELOG.md

@@ -3,6 +3,238 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.1.188](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-21)
+
+**Note:** Version bump only for package @standardnotes/clipper
+
+## [1.1.187](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-21)
+
+**Note:** Version bump only for package @standardnotes/clipper
+
+## [1.1.186](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-21)
+
+**Note:** Version bump only for package @standardnotes/clipper
+
+## [1.1.185](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-18)
+
+**Note:** Version bump only for package @standardnotes/clipper
+
+## [1.1.184](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-18)
+
+**Note:** Version bump only for package @standardnotes/clipper
+
+## [1.1.183](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-18)
+
+**Note:** Version bump only for package @standardnotes/clipper
+
+## [1.1.182](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-17)
+
+**Note:** Version bump only for package @standardnotes/clipper
+
+## [1.1.181](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-17)
+
+**Note:** Version bump only for package @standardnotes/clipper
+
+## [1.1.180](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-16)
+
+**Note:** Version bump only for package @standardnotes/clipper
+
+## [1.1.179](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-16)
+
+**Note:** Version bump only for package @standardnotes/clipper
+
+## [1.1.178](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-16)
+
+**Note:** Version bump only for package @standardnotes/clipper
+
+## [1.1.177](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-15)
+
+**Note:** Version bump only for package @standardnotes/clipper
+
+## [1.1.176](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-15)
+
+**Note:** Version bump only for package @standardnotes/clipper
+
+## [1.1.175](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-14)
+
+**Note:** Version bump only for package @standardnotes/clipper
+
+## [1.1.174](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-14)
+
+**Note:** Version bump only for package @standardnotes/clipper
+
+## [1.1.173](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-14)
+
+**Note:** Version bump only for package @standardnotes/clipper
+
+## [1.1.172](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-12)
+
+**Note:** Version bump only for package @standardnotes/clipper
+
+## [1.1.171](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-12)
+
+**Note:** Version bump only for package @standardnotes/clipper
+
+## [1.1.170](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-11)
+
+**Note:** Version bump only for package @standardnotes/clipper
+
+## [1.1.169](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-11)
+
+**Note:** Version bump only for package @standardnotes/clipper
+
+## [1.1.168](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-11)
+
+**Note:** Version bump only for package @standardnotes/clipper
+
+## [1.1.167](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-11)
+
+**Note:** Version bump only for package @standardnotes/clipper
+
+## [1.1.166](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-11)
+
+**Note:** Version bump only for package @standardnotes/clipper
+
+## [1.1.165](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-10)
+
+**Note:** Version bump only for package @standardnotes/clipper
+
+## [1.1.164](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-10)
+
+**Note:** Version bump only for package @standardnotes/clipper
+
+## [1.1.163](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-10)
+
+**Note:** Version bump only for package @standardnotes/clipper
+
+## [1.1.162](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-09)
+
+**Note:** Version bump only for package @standardnotes/clipper
+
+## [1.1.161](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-09)
+
+**Note:** Version bump only for package @standardnotes/clipper
+
+## [1.1.160](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-09)
+
+**Note:** Version bump only for package @standardnotes/clipper
+
+## [1.1.159](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-09)
+
+**Note:** Version bump only for package @standardnotes/clipper
+
+## [1.1.158](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-09)
+
+**Note:** Version bump only for package @standardnotes/clipper
+
+## [1.1.157](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-08)
+
+**Note:** Version bump only for package @standardnotes/clipper
+
+## [1.1.156](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-08)
+
+**Note:** Version bump only for package @standardnotes/clipper
+
+## [1.1.155](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-08)
+
+**Note:** Version bump only for package @standardnotes/clipper
+
+## [1.1.154](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-08)
+
+**Note:** Version bump only for package @standardnotes/clipper
+
+## [1.1.153](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-07)
+
+**Note:** Version bump only for package @standardnotes/clipper
+
+## [1.1.152](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-07)
+
+**Note:** Version bump only for package @standardnotes/clipper
+
+## [1.1.151](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-07)
+
+**Note:** Version bump only for package @standardnotes/clipper
+
+## [1.1.150](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-07)
+
+**Note:** Version bump only for package @standardnotes/clipper
+
+## [1.1.149](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-07)
+
+**Note:** Version bump only for package @standardnotes/clipper
+
+## [1.1.148](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-07)
+
+**Note:** Version bump only for package @standardnotes/clipper
+
+## [1.1.147](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-07)
+
+**Note:** Version bump only for package @standardnotes/clipper
+
+## [1.1.146](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-06)
+
+**Note:** Version bump only for package @standardnotes/clipper
+
+## [1.1.145](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-06)
+
+**Note:** Version bump only for package @standardnotes/clipper
+
+## [1.1.144](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-06)
+
+**Note:** Version bump only for package @standardnotes/clipper
+
+## [1.1.143](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-06)
+
+**Note:** Version bump only for package @standardnotes/clipper
+
+## [1.1.142](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-06)
+
+**Note:** Version bump only for package @standardnotes/clipper
+
+## [1.1.141](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-05)
+
+**Note:** Version bump only for package @standardnotes/clipper
+
+## [1.1.140](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-04)
+
+**Note:** Version bump only for package @standardnotes/clipper
+
+## [1.1.139](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-04)
+
+**Note:** Version bump only for package @standardnotes/clipper
+
+## [1.1.138](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-04)
+
+**Note:** Version bump only for package @standardnotes/clipper
+
+## [1.1.137](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-04)
+
+**Note:** Version bump only for package @standardnotes/clipper
+
+## [1.1.136](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-04)
+
+**Note:** Version bump only for package @standardnotes/clipper
+
+## [1.1.135](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-03)
+
+**Note:** Version bump only for package @standardnotes/clipper
+
+## [1.1.134](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-03)
+
+**Note:** Version bump only for package @standardnotes/clipper
+
+## [1.1.133](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-03)
+
+**Note:** Version bump only for package @standardnotes/clipper
+
+## [1.1.132](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-02)
+
+**Note:** Version bump only for package @standardnotes/clipper
+
+## [1.1.131](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-02)
+
+**Note:** Version bump only for package @standardnotes/clipper
+
 ## [1.1.130](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-01)
 
 **Note:** Version bump only for package @standardnotes/clipper

packages/clipper/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@standardnotes/clipper",
   "description": "Web clipper browser extension for Standard Notes",
-  "version": "1.1.130",
+  "version": "1.1.188",
   "private": true,
   "scripts": {
     "build-mv2": "yarn clean && webpack --config ./webpack.config.prod.js",

packages/clipper/src/background/background.ts

@@ -1,5 +1,7 @@
 import { runtime, action, browserAction, windows, storage, tabs } from 'webextension-polyfill'
 import { ClipPayload, RuntimeMessage, RuntimeMessageTypes } from '../types/message'
+import { Environment, FetchRequestHandler, Logger, SnjsVersion } from '@standardnotes/snjs'
+import packageInfo from '../../package.json'
 
 const isFirefox = navigator.userAgent.indexOf('Firefox/') !== -1
 
@@ -22,6 +24,9 @@ const openPopupAndClipSelection = async (payload: ClipPayload) => {
   void openPopup()
 }
 
+const logger = new Logger('clipper')
+const requestHandler = new FetchRequestHandler(SnjsVersion, packageInfo.version, Environment.Clipper, logger)
+
 runtime.onMessage.addListener(async (message: RuntimeMessage) => {
   if (message.type === RuntimeMessageTypes.OpenPopupWithSelection) {
     if (!message.payload) {
@@ -32,5 +37,7 @@ runtime.onMessage.addListener(async (message: RuntimeMessage) => {
     return await tabs.captureVisibleTab(undefined, {
       format: 'png',
     })
+  } else if (message.type === RuntimeMessageTypes.RunHttpRequest) {
+    requestHandler.handleRequest(message.payload).catch(console.error)
   }
 })

packages/clipper/src/types/message.ts

@@ -1,3 +1,5 @@
+import { HttpRequest } from '@standardnotes/snjs'
+
 export const RuntimeMessageTypes = {
   GetArticle: 'get-article',
   GetSelection: 'get-selection',
@@ -7,6 +9,7 @@ export const RuntimeMessageTypes = {
   StartNodeSelection: 'start-node-selection',
   ToggleScreenshotMode: 'toggle-screenshot-mode',
   CaptureVisibleTab: 'capture-visible-tab',
+  RunHttpRequest: 'run-http-request',
 } as const
 
 export type RuntimeMessageType = (typeof RuntimeMessageTypes)[keyof typeof RuntimeMessageTypes]
@@ -29,6 +32,7 @@ export type RuntimeMessageReturnTypes = {
   [RuntimeMessageTypes.OpenPopupWithSelection]: void
   [RuntimeMessageTypes.StartNodeSelection]: void
   [RuntimeMessageTypes.ToggleScreenshotMode]: void
+  [RuntimeMessageTypes.RunHttpRequest]: void
 }
 
 export type RuntimeMessage =
@@ -36,10 +40,19 @@ export type RuntimeMessage =
       type: MessagesWithClipPayload
       payload: ClipPayload
     }
+  | {
+      type: typeof RuntimeMessageTypes.RunHttpRequest
+      payload: HttpRequest
+    }
   | {
       type: typeof RuntimeMessageTypes.ToggleScreenshotMode
       enabled: boolean
     }
   | {
-      type: Exclude<RuntimeMessageType, MessagesWithClipPayload | typeof RuntimeMessageTypes.ToggleScreenshotMode>
+      type: Exclude<
+        RuntimeMessageType,
+        | MessagesWithClipPayload
+        | typeof RuntimeMessageTypes.ToggleScreenshotMode
+        | typeof RuntimeMessageTypes.RunHttpRequest
+      >
     }

packages/desktop/CHANGELOG.md

@@ -3,6 +3,244 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [3.108.120](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-21)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.108.119](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-21)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.108.118](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-21)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.108.117](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-18)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.108.116](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-18)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.108.115](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-18)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.108.114](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-17)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.108.113](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-17)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.108.112](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-16)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.108.111](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-16)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.108.110](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-16)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.108.109](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-15)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.108.108](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-15)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.108.107](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-14)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.108.106](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-14)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.108.105](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-14)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.108.104](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-12)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.108.103](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-12)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.108.102](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-11)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.108.101](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-11)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.108.100](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-11)
+
+### Bug Fixes
+
+* Fixed issue where app would not load when using snap ([c5c0bd6](https://github.com/standardnotes/app/commit/c5c0bd6871718980c854a925dae7fc29f2b239d7))
+
+## [3.108.99](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-11)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.108.98](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-11)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.108.97](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-10)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.108.96](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-10)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.108.95](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-10)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.108.94](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-09)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.108.93](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-09)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.108.92](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-09)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.108.91](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-09)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.108.90](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-09)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.108.89](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-08)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.108.88](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-08)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.108.87](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-08)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.108.86](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-08)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.108.85](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-07)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.108.84](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-07)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.108.83](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-07)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.108.82](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-07)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.108.81](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-07)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.108.80](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-07)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.108.79](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-07)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.108.78](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-07)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.108.77](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-06)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.108.76](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-06)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.108.75](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-06)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.108.74](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-06)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.108.73](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-06)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.108.72](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-05)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.108.71](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-04)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.108.70](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-04)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.108.69](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-04)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.108.68](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-04)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.108.67](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-04)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.108.66](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-03)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.108.65](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-03)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.108.64](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-03)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.108.63](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-02)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.108.62](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-02)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
 ## [3.108.61](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-01)
 
 **Note:** Version bump only for package @standardnotes/desktop

packages/desktop/app/index.ts

@@ -104,7 +104,11 @@ function migrateSnapStorage() {
 
     const snapUserData = process.env['SNAP_USER_DATA']
     const store = new Store(snapUserCommonDir)
-    if (snapUserData && store.data.backupsLocation.startsWith(path.resolve(snapUserData, '..'))) {
+    if (
+      snapUserData &&
+      store.data.backupsLocation &&
+      store.data.backupsLocation.startsWith(path.resolve(snapUserData, '..'))
+    ) {
       /**
        * Backups location has not been altered by the user. Move it to the
        * user documents directory

packages/desktop/app/javascripts/Main/ZoomManager.ts

@@ -6,7 +6,9 @@ export function initializeZoomManager(window: BrowserWindow, store: Store): void
   window.webContents.on('dom-ready', () => {
     const zoomFactor = store.get(StoreKeys.ZoomFactor)
     if (zoomFactor) {
-      window.webContents.zoomFactor = zoomFactor
+      window.once('ready-to-show', () => {
+        window.webContents.zoomFactor = zoomFactor
+      })
     }
   })
 

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

@@ -128,7 +128,7 @@ 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(
-      '[role="dialog"] { height: calc(100vh - var(--sn-desktop-titlebar-height)) !important; top: var(--sn-desktop-titlebar-height); }',
+      '[role="dialog"] { height: calc(100vh - var(--sn-desktop-titlebar-height)) !important; margin-top: var(--sn-desktop-titlebar-height); }',
       sheet.cssRules.length,
     )
     sheet.insertRule(

packages/desktop/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@standardnotes/desktop",
   "main": "./app/dist/index.js",
-  "version": "3.108.61",
+  "version": "3.108.120",
   "license": "CC BY-NC-SA 4.0",
   "author": "Standard Notes.",
   "private": true,
@@ -35,7 +35,7 @@
   },
   "dependencies": {
     "@electron/remote": "^2.0.9",
-    "@standardnotes/domain-core": "^1.24.0",
+    "@standardnotes/domain-core": "^1.25.0",
     "@standardnotes/electron-clear-data": "1.1.1",
     "@standardnotes/web": "workspace:*",
     "axios": "^1.1.3",

packages/encryption/CHANGELOG.md

@@ -3,6 +3,50 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.21.71](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-21)
+
+**Note:** Version bump only for package @standardnotes/encryption
+
+## [1.21.70](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-12)
+
+**Note:** Version bump only for package @standardnotes/encryption
+
+## [1.21.69](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-11)
+
+**Note:** Version bump only for package @standardnotes/encryption
+
+## [1.21.68](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-08)
+
+**Note:** Version bump only for package @standardnotes/encryption
+
+## [1.21.67](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-07)
+
+**Note:** Version bump only for package @standardnotes/encryption
+
+## [1.21.66](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-06)
+
+**Note:** Version bump only for package @standardnotes/encryption
+
+## [1.21.65](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-06)
+
+**Note:** Version bump only for package @standardnotes/encryption
+
+## [1.21.64](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-06)
+
+**Note:** Version bump only for package @standardnotes/encryption
+
+## [1.21.63](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-05)
+
+**Note:** Version bump only for package @standardnotes/encryption
+
+## [1.21.62](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-03)
+
+**Note:** Version bump only for package @standardnotes/encryption
+
+## [1.21.61](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-02)
+
+**Note:** Version bump only for package @standardnotes/encryption
+
 ## [1.21.60](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-01)
 
 **Note:** Version bump only for package @standardnotes/encryption

packages/encryption/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/encryption",
-  "version": "1.21.60",
+  "version": "1.21.71",
   "engines": {
     "node": ">=16.0.0 <17.0.0"
   },
@@ -29,7 +29,7 @@
   },
   "dependencies": {
     "@standardnotes/common": "^1.50.0",
-    "@standardnotes/domain-core": "^1.24.0",
+    "@standardnotes/domain-core": "^1.25.0",
     "@standardnotes/models": "workspace:*",
     "@standardnotes/responses": "workspace:*",
     "@standardnotes/sncrypto-common": "workspace:*",

packages/encryption/src/Domain/Keys/ItemsKey/ItemsKey.ts

@@ -1,4 +1,3 @@
-import { ProtocolVersion } from '@standardnotes/common'
 import { ContentType } from '@standardnotes/domain-core'
 import {
   ConflictStrategy,
@@ -8,6 +7,7 @@ import {
   HistoryEntryInterface,
   ItemsKeyContent,
   ItemsKeyInterface,
+  ProtocolVersion,
 } from '@standardnotes/models'
 
 export function isItemsKey(x: unknown): x is ItemsKeyInterface {

packages/encryption/src/Domain/Keys/KeySystemItemsKey/KeySystemItemsKey.ts

@@ -1,6 +1,6 @@
-import { ProtocolVersion } from '@standardnotes/common'
 import { ContentType } from '@standardnotes/domain-core'
 import {
+  ProtocolVersion,
   ConflictStrategy,
   DecryptedItem,
   DecryptedItemInterface,

packages/encryption/src/Domain/Keys/RootKey/Functions.ts

@@ -1,5 +1,5 @@
-import { ProtocolVersion } from '@standardnotes/common'
 import {
+  ProtocolVersion,
   DecryptedPayload,
   FillItemContentSpecialized,
   PayloadTimestampDefaults,

packages/encryption/src/Domain/Keys/RootKey/RootKey.ts

@@ -1,5 +1,5 @@
-import { ProtocolVersion } from '@standardnotes/common'
 import {
+  ProtocolVersion,
   DecryptedItem,
   DecryptedPayloadInterface,
   NamespacedRootKeyInKeychain,

packages/encryption/src/Domain/Operator/004/Operator004.spec.ts

@@ -1,5 +1,10 @@
-import { ProtocolVersion } from '@standardnotes/common'
-import { DecryptedPayload, ItemContent, ItemsKeyContent, PayloadTimestampDefaults } from '@standardnotes/models'
+import {
+  DecryptedPayload,
+  ItemContent,
+  ItemsKeyContent,
+  PayloadTimestampDefaults,
+  ProtocolVersion,
+} from '@standardnotes/models'
 import { SNItemsKey } from '../../Keys/ItemsKey/ItemsKey'
 import { SNProtocolOperator004 } from './Operator004'
 import { getMockedCrypto } from './MockedCrypto'

packages/encryption/src/Domain/Operator/004/UseCase/KeySystem/CreateKeySystemItemsKey.ts

@@ -7,10 +7,10 @@ import {
   KeySystemItemsKeyContentSpecialized,
   KeySystemItemsKeyInterface,
   PayloadTimestampDefaults,
+  ProtocolVersion,
 } from '@standardnotes/models'
 import { PureCryptoInterface } from '@standardnotes/sncrypto-common'
 import { V004Algorithm } from '../../../../Algorithm'
-import { ProtocolVersion } from '@standardnotes/common'
 import { ContentType } from '@standardnotes/domain-core'
 
 export class CreateKeySystemItemsKeyUseCase {

packages/encryption/src/Domain/Operator/004/UseCase/KeySystem/CreateRandomKeySystemRootKey.ts

@@ -4,8 +4,8 @@ import {
   KeySystemRootKeyInterface,
   KeySystemRootKeyParamsInterface,
   KeySystemPasswordType,
+  ProtocolVersion,
 } from '@standardnotes/models'
-import { ProtocolVersion } from '@standardnotes/common'
 import { DeriveKeySystemRootKeyUseCase } from './DeriveKeySystemRootKey'
 
 export class CreateRandomKeySystemRootKey {

packages/encryption/src/Domain/Operator/004/UseCase/KeySystem/CreateUserInputKeySystemRootKey.ts

@@ -5,8 +5,8 @@ import {
   KeySystemRootKeyInterface,
   KeySystemRootKeyParamsInterface,
   KeySystemPasswordType,
+  ProtocolVersion,
 } from '@standardnotes/models'
-import { ProtocolVersion } from '@standardnotes/common'
 import { DeriveKeySystemRootKeyUseCase } from './DeriveKeySystemRootKey'
 
 export class CreateUserInputKeySystemRootKey {

packages/encryption/src/Domain/Operator/004/UseCase/KeySystem/DeriveKeySystemRootKey.ts

@@ -11,8 +11,8 @@ import {
   KeySystemRootKeyInterface,
   PayloadTimestampDefaults,
   KeySystemRootKeyParamsInterface,
+  ProtocolVersion,
 } from '@standardnotes/models'
-import { ProtocolVersion } from '@standardnotes/common'
 import { ContentType } from '@standardnotes/domain-core'
 
 export class DeriveKeySystemRootKeyUseCase {

packages/encryption/src/Domain/Operator/004/UseCase/RootKey/DeriveRootKey.ts

@@ -2,10 +2,9 @@ import { PureCryptoInterface } from '@standardnotes/sncrypto-common'
 import { splitString, truncateHexString } from '@standardnotes/utils'
 import { V004PartitionCharacter } from '../../V004AlgorithmTypes'
 import { V004Algorithm } from '../../../../Algorithm'
-import { RootKeyInterface } from '@standardnotes/models'
+import { RootKeyInterface, ProtocolVersion } from '@standardnotes/models'
 import { SNRootKeyParams } from '../../../../Keys/RootKey/RootKeyParams'
 import { CreateNewRootKey } from '../../../../Keys/RootKey/Functions'
-import { ProtocolVersion } from '@standardnotes/common'
 
 export class DeriveRootKeyUseCase {
   constructor(private readonly crypto: PureCryptoInterface) {}

packages/encryption/src/Domain/Operator/004/UseCase/Symmetric/GenerateAuthenticatedData.ts

@@ -7,11 +7,11 @@ import {
   isKeySystemRootKey,
   ContentTypeUsesRootKeyEncryption,
   ContentTypeUsesKeySystemRootKeyEncryption,
+  ProtocolVersion,
 } from '@standardnotes/models'
 import { ItemAuthenticatedData } from '../../../../Types/ItemAuthenticatedData'
 import { RootKeyEncryptedAuthenticatedData } from '../../../../Types/RootKeyEncryptedAuthenticatedData'
 import { KeySystemItemsKeyAuthenticatedData } from '../../../../Types/KeySystemItemsKeyAuthenticatedData'
-import { ProtocolVersion } from '@standardnotes/common'
 import { isItemsKey } from '../../../../Keys/ItemsKey/ItemsKey'
 import { isKeySystemItemsKey } from '../../../../Keys/KeySystemItemsKey/KeySystemItemsKey'
 

packages/encryption/src/Domain/Operator/004/UseCase/Symmetric/GenerateEncryptedParameters.ts

@@ -1,4 +1,3 @@
-import { ProtocolVersion } from '@standardnotes/common'
 import { PkcKeyPair, PureCryptoInterface } from '@standardnotes/sncrypto-common'
 import {
   DecryptedPayloadInterface,
@@ -6,6 +5,7 @@ import {
   KeySystemItemsKeyInterface,
   KeySystemRootKeyInterface,
   RootKeyInterface,
+  ProtocolVersion,
 } from '@standardnotes/models'
 import { CreateConsistentBase64JsonPayloadUseCase } from '../Utils/CreateConsistentBase64JsonPayload'
 import { doesPayloadRequireSigning } from '../../V004AlgorithmHelpers'

packages/encryption/src/Domain/Operator/004/UseCase/Symmetric/GenerateEncryptedProtocolString.spec.ts

@@ -1,6 +1,5 @@
-import { ProtocolVersion } from '@standardnotes/common'
+import { ProtocolVersion } from '@standardnotes/models'
 import { PureCryptoInterface } from '@standardnotes/sncrypto-common'
-
 import { ItemAuthenticatedData } from './../../../../Types/ItemAuthenticatedData'
 import { GenerateEncryptedProtocolStringUseCase } from './GenerateEncryptedProtocolString'
 import { AdditionalData } from '../../../../Types/EncryptionAdditionalData'

packages/encryption/src/Domain/Operator/004/UseCase/Symmetric/GenerateEncryptedProtocolString.ts

@@ -1,6 +1,6 @@
 import { Base64String, HexString, PureCryptoInterface, Utf8String } from '@standardnotes/sncrypto-common'
 import { V004PartitionCharacter, V004StringComponents } from '../../V004AlgorithmTypes'
-import { ProtocolVersion } from '@standardnotes/common'
+import { ProtocolVersion } from '@standardnotes/models'
 import { V004Algorithm } from '../../../../Algorithm'
 
 export class GenerateEncryptedProtocolStringUseCase {

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

@@ -1,4 +1,4 @@
-import { ProtocolVersion } from '@standardnotes/common'
+import { ProtocolVersion } from '@standardnotes/models'
 import { AnyOperatorInterface } from './OperatorInterface/TypeCheck'
 
 export interface EncryptionOperatorsInterface {

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

@@ -1,4 +1,4 @@
-import { ProtocolVersion } from '@standardnotes/common'
+import { ProtocolVersion } from '@standardnotes/models'
 import { PureCryptoInterface } from '@standardnotes/sncrypto-common'
 import { SNProtocolOperator001 } from '../Operator/001/Operator001'
 import { SNProtocolOperator002 } from '../Operator/002/Operator002'

packages/encryption/src/Domain/Types/EncryptedParameters.ts

@@ -1,5 +1,9 @@
-import { ProtocolVersion } from '@standardnotes/common'
-import { EncryptedPayloadInterface, DecryptedPayloadInterface, PersistentSignatureData } from '@standardnotes/models'
+import {
+  EncryptedPayloadInterface,
+  DecryptedPayloadInterface,
+  PersistentSignatureData,
+  ProtocolVersion,
+} from '@standardnotes/models'
 import { DecryptedParameters } from './DecryptedParameters'
 
 export type EncryptedOutputParameters = {

packages/encryption/src/Domain/Types/ItemAuthenticatedData.ts

@@ -1,4 +1,4 @@
-import { ProtocolVersion } from '@standardnotes/common'
+import { ProtocolVersion } from '@standardnotes/models'
 
 type UserUuid = string
 type KeySystemIdentifier = string

packages/features/CHANGELOG.md

@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.59.15](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-11)
+
+**Note:** Version bump only for package @standardnotes/features
+
 ## [1.59.14](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-01)
 
 **Note:** Version bump only for package @standardnotes/features

packages/features/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/features",
-  "version": "1.59.14",
+  "version": "1.59.15",
   "engines": {
     "node": ">=16.0.0 <17.0.0"
   },
@@ -26,7 +26,7 @@
   },
   "dependencies": {
     "@standardnotes/common": "^1.50.0",
-    "@standardnotes/domain-core": "^1.24.0",
+    "@standardnotes/domain-core": "^1.25.0",
     "reflect-metadata": "^0.1.13"
   },
   "devDependencies": {

packages/filepicker/CHANGELOG.md

@@ -3,6 +3,54 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.28.82](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-21)
+
+**Note:** Version bump only for package @standardnotes/filepicker
+
+## [1.28.81](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-18)
+
+**Note:** Version bump only for package @standardnotes/filepicker
+
+## [1.28.80](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-12)
+
+**Note:** Version bump only for package @standardnotes/filepicker
+
+## [1.28.79](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-11)
+
+**Note:** Version bump only for package @standardnotes/filepicker
+
+## [1.28.78](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-08)
+
+**Note:** Version bump only for package @standardnotes/filepicker
+
+## [1.28.77](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-07)
+
+**Note:** Version bump only for package @standardnotes/filepicker
+
+## [1.28.76](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-06)
+
+**Note:** Version bump only for package @standardnotes/filepicker
+
+## [1.28.75](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-06)
+
+**Note:** Version bump only for package @standardnotes/filepicker
+
+## [1.28.74](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-06)
+
+**Note:** Version bump only for package @standardnotes/filepicker
+
+## [1.28.73](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-05)
+
+**Note:** Version bump only for package @standardnotes/filepicker
+
+## [1.28.72](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-03)
+
+**Note:** Version bump only for package @standardnotes/filepicker
+
+## [1.28.71](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-02)
+
+**Note:** Version bump only for package @standardnotes/filepicker
+
 ## [1.28.70](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-01)
 
 **Note:** Version bump only for package @standardnotes/filepicker

packages/filepicker/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/filepicker",
-  "version": "1.28.70",
+  "version": "1.28.82",
   "engines": {
     "node": ">=16.0.0 <17.0.0"
   },

packages/files/CHANGELOG.md

@@ -3,6 +3,56 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.17.1](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-21)
+
+**Note:** Version bump only for package @standardnotes/files
+
+# [1.17.0](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-18)
+
+### Features
+
+* Added Super & HTML import options in Import modal. Google Keep notes will now also be imported as Super notes, with attachments if importing from HTML ([#2433](https://github.com/standardnotes/app/issues/2433)) ([ca9895c](https://github.com/standardnotes/app/commit/ca9895cac117aad16cd2f89633d7613ed54b67bf))
+
+## [1.16.26](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-12)
+
+**Note:** Version bump only for package @standardnotes/files
+
+## [1.16.25](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-11)
+
+**Note:** Version bump only for package @standardnotes/files
+
+## [1.16.24](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-08)
+
+**Note:** Version bump only for package @standardnotes/files
+
+## [1.16.23](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-07)
+
+**Note:** Version bump only for package @standardnotes/files
+
+## [1.16.22](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-06)
+
+**Note:** Version bump only for package @standardnotes/files
+
+## [1.16.21](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-06)
+
+**Note:** Version bump only for package @standardnotes/files
+
+## [1.16.20](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-06)
+
+**Note:** Version bump only for package @standardnotes/files
+
+## [1.16.19](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-05)
+
+**Note:** Version bump only for package @standardnotes/files
+
+## [1.16.18](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-03)
+
+**Note:** Version bump only for package @standardnotes/files
+
+## [1.16.17](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-02)
+
+**Note:** Version bump only for package @standardnotes/files
+
 ## [1.16.16](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-01)
 
 **Note:** Version bump only for package @standardnotes/files

packages/files/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/files",
-  "version": "1.16.16",
+  "version": "1.17.1",
   "engines": {
     "node": ">=16.0.0 <17.0.0"
   },

packages/files/src/Domain/Service/SuperConverterServiceInterface.ts

@@ -1,3 +1,5 @@
 export interface SuperConverterServiceInterface {
-  convertString: (superString: string, toFormat: 'txt' | 'md' | 'html' | 'json') => string
+  isValidSuperString(superString: string): boolean
+  convertSuperStringToOtherFormat: (superString: string, toFormat: 'txt' | 'md' | 'html' | 'json') => string
+  convertOtherFormatToSuperString: (otherFormatString: string, fromFormat: 'txt' | 'md' | 'html' | 'json') => string
 }

packages/mobile/.mocharc.yml

@@ -1,5 +0,0 @@
-recursive: true
-timeout: 120000
-bail: true
-file:
-  - e2e/init.js

packages/mobile/CHANGELOG.md

@@ -3,6 +3,240 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [3.56.99](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-21)
+
+**Note:** Version bump only for package @standardnotes/mobile
+
+## [3.56.98](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-21)
+
+**Note:** Version bump only for package @standardnotes/mobile
+
+## [3.56.97](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-21)
+
+**Note:** Version bump only for package @standardnotes/mobile
+
+## [3.56.96](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-18)
+
+**Note:** Version bump only for package @standardnotes/mobile
+
+## [3.56.95](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-18)
+
+**Note:** Version bump only for package @standardnotes/mobile
+
+## [3.56.94](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-18)
+
+**Note:** Version bump only for package @standardnotes/mobile
+
+## [3.56.93](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-17)
+
+**Note:** Version bump only for package @standardnotes/mobile
+
+## [3.56.92](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-17)
+
+**Note:** Version bump only for package @standardnotes/mobile
+
+## [3.56.91](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-16)
+
+**Note:** Version bump only for package @standardnotes/mobile
+
+## [3.56.90](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-16)
+
+**Note:** Version bump only for package @standardnotes/mobile
+
+## [3.56.89](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-16)
+
+**Note:** Version bump only for package @standardnotes/mobile
+
+## [3.56.88](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-15)
+
+**Note:** Version bump only for package @standardnotes/mobile
+
+## [3.56.87](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-15)
+
+**Note:** Version bump only for package @standardnotes/mobile
+
+## [3.56.86](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-14)
+
+**Note:** Version bump only for package @standardnotes/mobile
+
+## [3.56.85](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-14)
+
+**Note:** Version bump only for package @standardnotes/mobile
+
+## [3.56.84](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-14)
+
+**Note:** Version bump only for package @standardnotes/mobile
+
+## [3.56.83](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-12)
+
+**Note:** Version bump only for package @standardnotes/mobile
+
+## [3.56.82](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-12)
+
+**Note:** Version bump only for package @standardnotes/mobile
+
+## [3.56.81](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-11)
+
+**Note:** Version bump only for package @standardnotes/mobile
+
+## [3.56.80](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-11)
+
+**Note:** Version bump only for package @standardnotes/mobile
+
+## [3.56.79](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-11)
+
+**Note:** Version bump only for package @standardnotes/mobile
+
+## [3.56.78](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-11)
+
+**Note:** Version bump only for package @standardnotes/mobile
+
+## [3.56.77](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-11)
+
+**Note:** Version bump only for package @standardnotes/mobile
+
+## [3.56.76](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-10)
+
+**Note:** Version bump only for package @standardnotes/mobile
+
+## [3.56.75](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-10)
+
+**Note:** Version bump only for package @standardnotes/mobile
+
+## [3.56.74](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-10)
+
+**Note:** Version bump only for package @standardnotes/mobile
+
+## [3.56.73](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-09)
+
+**Note:** Version bump only for package @standardnotes/mobile
+
+## [3.56.72](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-09)
+
+**Note:** Version bump only for package @standardnotes/mobile
+
+## [3.56.71](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-09)
+
+**Note:** Version bump only for package @standardnotes/mobile
+
+## [3.56.70](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-09)
+
+**Note:** Version bump only for package @standardnotes/mobile
+
+## [3.56.69](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-09)
+
+**Note:** Version bump only for package @standardnotes/mobile
+
+## [3.56.68](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-08)
+
+**Note:** Version bump only for package @standardnotes/mobile
+
+## [3.56.67](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-08)
+
+**Note:** Version bump only for package @standardnotes/mobile
+
+## [3.56.66](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-08)
+
+**Note:** Version bump only for package @standardnotes/mobile
+
+## [3.56.65](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-08)
+
+**Note:** Version bump only for package @standardnotes/mobile
+
+## [3.56.64](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-07)
+
+**Note:** Version bump only for package @standardnotes/mobile
+
+## [3.56.63](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-07)
+
+**Note:** Version bump only for package @standardnotes/mobile
+
+## [3.56.62](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-07)
+
+**Note:** Version bump only for package @standardnotes/mobile
+
+## [3.56.61](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-07)
+
+**Note:** Version bump only for package @standardnotes/mobile
+
+## [3.56.60](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-07)
+
+**Note:** Version bump only for package @standardnotes/mobile
+
+## [3.56.59](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-07)
+
+**Note:** Version bump only for package @standardnotes/mobile
+
+## [3.56.58](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-07)
+
+**Note:** Version bump only for package @standardnotes/mobile
+
+## [3.56.57](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-06)
+
+**Note:** Version bump only for package @standardnotes/mobile
+
+## [3.56.56](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-06)
+
+**Note:** Version bump only for package @standardnotes/mobile
+
+## [3.56.55](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-06)
+
+**Note:** Version bump only for package @standardnotes/mobile
+
+## [3.56.54](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-06)
+
+**Note:** Version bump only for package @standardnotes/mobile
+
+## [3.56.53](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-06)
+
+**Note:** Version bump only for package @standardnotes/mobile
+
+## [3.56.52](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-05)
+
+**Note:** Version bump only for package @standardnotes/mobile
+
+## [3.56.51](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-04)
+
+**Note:** Version bump only for package @standardnotes/mobile
+
+## [3.56.50](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-04)
+
+**Note:** Version bump only for package @standardnotes/mobile
+
+## [3.56.49](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-04)
+
+**Note:** Version bump only for package @standardnotes/mobile
+
+## [3.56.48](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-04)
+
+**Note:** Version bump only for package @standardnotes/mobile
+
+## [3.56.47](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-04)
+
+**Note:** Version bump only for package @standardnotes/mobile
+
+## [3.56.46](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-03)
+
+### Bug Fixes
+
+* Fixed issue where moving the floating keyboard on iPad would lead to blank space on screen ([f7a1c6e](https://github.com/standardnotes/app/commit/f7a1c6ea65201af80ca6859c0e83c5b49c94e11d))
+
+## [3.56.45](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-03)
+
+**Note:** Version bump only for package @standardnotes/mobile
+
+## [3.56.44](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-03)
+
+**Note:** Version bump only for package @standardnotes/mobile
+
+## [3.56.43](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-02)
+
+**Note:** Version bump only for package @standardnotes/mobile
+
+## [3.56.42](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-02)
+
+**Note:** Version bump only for package @standardnotes/mobile
+
 ## [3.56.41](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-01)
 
 **Note:** Version bump only for package @standardnotes/mobile

packages/mobile/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/mobile",
-  "version": "3.56.41",
+  "version": "3.56.99",
   "author": "Standard Notes.",
   "private": true,
   "license": "CC BY-NC-SA 4.0",

packages/mobile/src/MobileWebAppContainer.tsx

@@ -2,7 +2,7 @@
 
 import { ApplicationEvent, ReactNativeToWebEvent } from '@standardnotes/snjs'
 import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react'
-import { Button, Keyboard, Platform, Text, View } from 'react-native'
+import { Button, Dimensions, Keyboard, Platform, Text, View } from 'react-native'
 import VersionInfo from 'react-native-version-info'
 import { WebView, WebViewMessageEvent } from 'react-native-webview'
 import { OnShouldStartLoadWithRequest } from 'react-native-webview/lib/WebViewTypes'
@@ -84,7 +84,11 @@ const MobileWebAppContents = ({ destroyAndReload }: { destroyAndReload: () => vo
         JSON.stringify({
           reactNativeEvent: ReactNativeToWebEvent.KeyboardFrameWillChange,
           messageType: 'event',
-          messageData: { height: e.endCoordinates.height, contentHeight: e.endCoordinates.screenY },
+          messageData: {
+            height: e.endCoordinates.height,
+            contentHeight: e.endCoordinates.screenY,
+            isFloatingKeyboard: e.endCoordinates.width !== Dimensions.get('window').width,
+          },
         }),
       )
     })

packages/models/CHANGELOG.md

@@ -3,6 +3,52 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.47.8](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-21)
+
+**Note:** Version bump only for package @standardnotes/models
+
+## [1.47.7](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-12)
+
+**Note:** Version bump only for package @standardnotes/models
+
+## [1.47.6](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-11)
+
+**Note:** Version bump only for package @standardnotes/models
+
+## [1.47.5](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-08)
+
+**Note:** Version bump only for package @standardnotes/models
+
+## [1.47.4](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-07)
+
+**Note:** Version bump only for package @standardnotes/models
+
+## [1.47.3](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-06)
+
+**Note:** Version bump only for package @standardnotes/models
+
+## [1.47.2](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-06)
+
+**Note:** Version bump only for package @standardnotes/models
+
+## [1.47.1](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-06)
+
+**Note:** Version bump only for package @standardnotes/models
+
+# [1.47.0](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-05)
+
+### Features
+
+* Added translucency effect to menus, dialogs and alerts. Can be turned off from Preferences > Appeareance ([#2387](https://github.com/standardnotes/app/issues/2387)) [skip e2e] ([ec309d6](https://github.com/standardnotes/app/commit/ec309d6fb54c6cbb28414d1fe9d6119db5943d9c))
+
+## [1.46.21](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-03)
+
+**Note:** Version bump only for package @standardnotes/models
+
+## [1.46.20](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-02)
+
+**Note:** Version bump only for package @standardnotes/models
+
 ## [1.46.19](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-01)
 
 **Note:** Version bump only for package @standardnotes/models

packages/models/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/models",
-  "version": "1.46.19",
+  "version": "1.47.8",
   "engines": {
     "node": ">=16.0.0 <17.0.0"
   },
@@ -23,7 +23,7 @@
   },
   "dependencies": {
     "@standardnotes/common": "^1.50.0",
-    "@standardnotes/domain-core": "^1.24.0",
+    "@standardnotes/domain-core": "^1.25.0",
     "@standardnotes/features": "workspace:*",
     "@standardnotes/responses": "workspace:*",
     "@standardnotes/sncrypto-common": "workspace:^",

packages/models/src/Domain/Abstract/Contextual/FilteredServerItem.ts

@@ -12,14 +12,38 @@ function CreateFilteredServerItem(item: ServerItemResponse): FilteredServerItem
   }
 }
 
-export function FilterDisallowedRemotePayloadsAndMap(payloads: ServerItemResponse[]): FilteredServerItem[] {
-  return payloads.filter(isRemotePayloadAllowed).map(CreateFilteredServerItem)
-}
-
-export function isRemotePayloadAllowed(payload: ServerItemResponse): boolean {
-  if (isCorruptTransferPayload(payload)) {
-    return false
+export function FilterDisallowedRemotePayloadsAndMap(payloads: ServerItemResponse[]): {
+  filtered: FilteredServerItem[]
+  disallowed: ServerItemResponse[]
+} {
+  const filtered = []
+  const disallowed = []
+  for (const payload of payloads) {
+    const result = checkRemotePayloadAllowed(payload)
+    if (result.allowed === undefined) {
+      disallowed.push(payload)
+    } else {
+      filtered.push(CreateFilteredServerItem(result.allowed))
+    }
   }
 
-  return isEncryptedTransferPayload(payload) || payload.content == undefined
+  return {
+    filtered,
+    disallowed,
+  }
+}
+
+export function checkRemotePayloadAllowed(payload: ServerItemResponse): {
+  allowed?: ServerItemResponse
+  disallowed?: ServerItemResponse
+} {
+  if (isCorruptTransferPayload(payload)) {
+    return { disallowed: payload }
+  }
+
+  if (isEncryptedTransferPayload(payload) || payload.content == undefined) {
+    return { allowed: payload }
+  } else {
+    return { disallowed: payload }
+  }
 }

packages/models/src/Domain/Abstract/Item/Interfaces/EncryptedItem.ts

@@ -1,4 +1,4 @@
-import { ProtocolVersion } from '@standardnotes/common'
+import { ProtocolVersion } from '../../../Local/Protocol/ProtocolVersion'
 import { EncryptedPayloadInterface } from '../../Payload/Interfaces/EncryptedPayload'
 import { ItemInterface } from './ItemInterface'
 

packages/models/src/Domain/Abstract/Payload/Implementations/EncryptedPayload.ts

@@ -1,4 +1,5 @@
-import { ProtocolVersion, protocolVersionFromEncryptedString } from '@standardnotes/common'
+import { ProtocolVersion } from '../../../Local/Protocol/ProtocolVersion'
+import { ProtocolVersionFromEncryptedString } from '../../../Local/Protocol/ProtocolVersionFromEncryptedString'
 import { SyncResolvedParams, SyncResolvedPayload } from '../../../Runtime/Deltas/Utilities/SyncResolvedPayload'
 import { EncryptedTransferPayload } from '../../TransferPayload/Interfaces/EncryptedTransferPayload'
 import { EncryptedPayloadInterface } from '../Interfaces/EncryptedPayload'
@@ -18,13 +19,18 @@ export class EncryptedPayload extends PurePayload<EncryptedTransferPayload> impl
   constructor(rawPayload: EncryptedTransferPayload, source = PayloadSource.Constructor) {
     super(rawPayload, source)
 
+    const versionResult = ProtocolVersionFromEncryptedString(rawPayload.content)
+    if (versionResult.isFailed()) {
+      throw new Error('EncryptedPayload constructor versionResult is failed')
+    }
+
     this.auth_hash = rawPayload.auth_hash
     this.content = rawPayload.content
     this.deleted = false
     this.enc_item_key = rawPayload.enc_item_key
     this.errorDecrypting = rawPayload.errorDecrypting
     this.items_key_id = rawPayload.items_key_id
-    this.version = protocolVersionFromEncryptedString(this.content)
+    this.version = versionResult.getValue()
     this.waitingForKey = rawPayload.waitingForKey
   }
 

packages/models/src/Domain/Abstract/Payload/Interfaces/EncryptedPayload.ts

@@ -1,4 +1,4 @@
-import { ProtocolVersion } from '@standardnotes/common'
+import { ProtocolVersion } from '../../../Local/Protocol/ProtocolVersion'
 import { EncryptedTransferPayload } from '../../TransferPayload/Interfaces/EncryptedTransferPayload'
 import { PayloadInterface } from './PayloadInterface'
 

packages/models/src/Domain/Abstract/Payload/Types/EmitSource.ts

@@ -28,6 +28,7 @@ export enum PayloadEmitSource {
 
   RemoteRetrieved,
   RemoteSaved,
+  DesktopComponentSync,
 }
 
 /**

packages/models/src/Domain/Abstract/TransferPayload/Interfaces/TypeCheck.spec.ts

@@ -42,7 +42,7 @@ describe('type check', () => {
       expect(
         isCorruptTransferPayload({
           uuid: '123',
-          content_type: ContentType.TYPES.Unknown,
+          content_type: 'Unknown',
           content: '123',
           ...PayloadTimestampDefaults(),
         }),

packages/models/src/Domain/Abstract/TransferPayload/Interfaces/TypeCheck.ts

@@ -26,5 +26,7 @@ export function isDeletedTransferPayload(payload: TransferPayload): payload is D
 export function isCorruptTransferPayload(payload: TransferPayload): boolean {
   const invalidDeletedState = payload.deleted === true && payload.content != undefined
 
-  return payload.uuid == undefined || invalidDeletedState || payload.content_type === ContentType.TYPES.Unknown
+  const contenTypeOrError = ContentType.create(payload.content_type)
+
+  return payload.uuid == undefined || invalidDeletedState || contenTypeOrError.isFailed()
 }

packages/models/src/Domain/Device/Environment.ts

@@ -2,4 +2,5 @@ export enum Environment {
   Web = 1,
   Desktop = 2,
   Mobile = 3,
+  Clipper = 4,
 }

packages/models/src/Domain/Local/ApplicationIdentifier.ts

@@ -0,0 +1 @@
+export type ApplicationIdentifier = string

packages/models/src/Domain/Local/KeyParams/KeySystemRootKeyParamsInterface.ts

@@ -1,5 +1,5 @@
-import { ProtocolVersion } from '@standardnotes/common'
 import { KeySystemIdentifier } from '../../Syncable/KeySystemRootKey/KeySystemIdentifier'
+import { ProtocolVersion } from '../Protocol/ProtocolVersion'
 import { KeySystemPasswordType } from './KeySystemPasswordType'
 
 /**

packages/models/src/Domain/Local/Protocol/ProtocolVersion.ts

@@ -0,0 +1,47 @@
+export enum ProtocolVersion {
+  V001 = '001',
+  V002 = '002',
+  V003 = '003',
+  V004 = '004',
+}
+
+export const ProtocolVersionLatest = ProtocolVersion.V004
+
+/** The last protocol version to not use root-key based items keys */
+export const ProtocolVersionLastNonrootItemsKey = ProtocolVersion.V003
+
+export const ProtocolExpirationDates: Partial<Record<ProtocolVersion, number>> = Object.freeze({
+  [ProtocolVersion.V001]: Date.parse('2018-01-01'),
+  [ProtocolVersion.V002]: Date.parse('2020-01-01'),
+})
+
+export function isProtocolVersionExpired(version: ProtocolVersion) {
+  const expireDate = ProtocolExpirationDates[version]
+  if (!expireDate) {
+    return false
+  }
+
+  const expired = new Date().getTime() > expireDate
+  return expired
+}
+
+export const ProtocolVersionLength = 3
+
+/**
+ *  -1 if a < b
+ *  0 if a == b
+ *  1 if a > b
+ */
+export function compareVersions(a: ProtocolVersion, b: ProtocolVersion): number {
+  const aNum = Number(a)
+  const bNum = Number(b)
+  return aNum - bNum
+}
+
+export function leftVersionGreaterThanOrEqualToRight(a: ProtocolVersion, b: ProtocolVersion): boolean {
+  return compareVersions(a, b) >= 0
+}
+
+export function isVersionLessThanOrEqualTo(input: ProtocolVersion, compareTo: ProtocolVersion): boolean {
+  return compareVersions(input, compareTo) <= 0
+}

packages/models/src/Domain/Local/Protocol/ProtocolVersionFromEncryptedString.ts

@@ -0,0 +1,15 @@
+import { Result } from '@standardnotes/domain-core'
+import { ProtocolVersion, ProtocolVersionLength } from './ProtocolVersion'
+
+export function ProtocolVersionFromEncryptedString(string: string): Result<ProtocolVersion> {
+  try {
+    const version = string.substring(0, ProtocolVersionLength) as ProtocolVersion
+    if (Object.values(ProtocolVersion).includes(version)) {
+      return Result.ok(version)
+    }
+  } catch (error) {
+    return Result.fail(JSON.stringify(error))
+  }
+
+  return Result.fail(`Invalid encrypted string ${string}`)
+}

packages/models/src/Domain/Local/RootKey/RootKeyInterface.ts

@@ -1,9 +1,9 @@
 import { PkcKeyPair } from '@standardnotes/sncrypto-common'
-import { ProtocolVersion } from '@standardnotes/common'
 import { DecryptedItemInterface } from '../../Abstract/Item/Interfaces/DecryptedItem'
 import { RootKeyParamsInterface } from '../KeyParams/RootKeyParamsInterface'
 import { NamespacedRootKeyInKeychain, RootKeyContentInStorage } from './KeychainTypes'
 import { RootKeyContent } from './RootKeyContent'
+import { ProtocolVersion } from '../Protocol/ProtocolVersion'
 
 export interface RootKeyInterface extends DecryptedItemInterface<RootKeyContent> {
   readonly keyParams: RootKeyParamsInterface