chore(release): publish

- @standardnotes/[email protected]
 - @standardnotes/[email protected]
 - @standardnotes/[email protected].4
 - @standardnotes/[email protected].4
 - @standardnotes/[email protected]
 - @standardnotes/[email protected]
 - @standardnotes/[email protected]
 - @standardnotes/[email protected].4
 - @standardnotes/[email protected].6
 - @standardnotes/[email protected]
 - @standardnotes/[email protected]

.github/dependabot.yml

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

.github/workflows/snjs.pr.yml

@@ -26,6 +26,8 @@ jobs:
         uses: actions/checkout@v3
       - name: Install dependencies
         run: yarn install --immutable
+      - name: Build
+        run: yarn build:snjs
       - name: Login to Docker Hub
         uses: docker/login-action@v2
         with:

packages/api/CHANGELOG.md

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

packages/api/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/api",
-  "version": "1.4.7",
+  "version": "1.6.1",
   "engines": {
     "node": ">=16.0.0 <17.0.0"
   },
@@ -22,12 +22,14 @@
     "prebuild": "yarn clean",
     "build": "tsc -p tsconfig.json",
     "lint": "eslint . --ext .ts",
-    "test:unit": "jest spec --coverage"
+    "lint:fix": "eslint . --ext .ts --fix",
+    "test": "jest spec --coverage"
   },
   "devDependencies": {
     "@types/jest": "^28.1.5",
     "@types/lodash": "^4.14.182",
     "@typescript-eslint/eslint-plugin": "^5.30.0",
+    "eslint": "^8.23.0",
     "eslint-plugin-prettier": "*",
     "jest": "^28.1.2",
     "ts-jest": "^28.0.5"

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -0,0 +1,7 @@
+import { HttpErrorResponseBody } from '../../Http/HttpErrorResponseBody'
+import { HttpResponse } from '../../Http/HttpResponse'
+import { SubscriptionInviteAcceptResponseBody } from './SubscriptionInviteAcceptResponseBody'
+
+export interface SubscriptionInviteAcceptResponse extends HttpResponse {
+  data: SubscriptionInviteAcceptResponseBody | HttpErrorResponseBody
+}

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

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

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

@@ -0,0 +1,7 @@
+import { HttpErrorResponseBody } from '../../Http/HttpErrorResponseBody'
+import { HttpResponse } from '../../Http/HttpResponse'
+import { SubscriptionInviteCancelResponseBody } from './SubscriptionInviteCancelResponseBody'
+
+export interface SubscriptionInviteCancelResponse extends HttpResponse {
+  data: SubscriptionInviteCancelResponseBody | HttpErrorResponseBody
+}

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

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

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

@@ -0,0 +1,7 @@
+import { HttpErrorResponseBody } from '../../Http/HttpErrorResponseBody'
+import { HttpResponse } from '../../Http/HttpResponse'
+import { SubscriptionInviteDeclineResponseBody } from './SubscriptionInviteDeclineResponseBody'
+
+export interface SubscriptionInviteDeclineResponse extends HttpResponse {
+  data: SubscriptionInviteDeclineResponseBody | HttpErrorResponseBody
+}

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

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

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

@@ -0,0 +1,7 @@
+import { HttpErrorResponseBody } from '../../Http/HttpErrorResponseBody'
+import { HttpResponse } from '../../Http/HttpResponse'
+import { SubscriptionInviteListResponseBody } from './SubscriptionInviteListResponseBody'
+
+export interface SubscriptionInviteListResponse extends HttpResponse {
+  data: SubscriptionInviteListResponseBody | HttpErrorResponseBody
+}

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

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

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

@@ -0,0 +1,7 @@
+import { HttpErrorResponseBody } from '../../Http/HttpErrorResponseBody'
+import { HttpResponse } from '../../Http/HttpResponse'
+import { SubscriptionInviteResponseBody } from './SubscriptionInviteResponseBody'
+
+export interface SubscriptionInviteResponse extends HttpResponse {
+  data: SubscriptionInviteResponseBody | HttpErrorResponseBody
+}

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

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

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

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

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

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

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

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

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

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

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

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

packages/components/CHANGELOG.md

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

packages/components/dist/zips/checksums.json

@@ -80,9 +80,9 @@
     "binary": "7c6f499b8107f80ec5fd84e591c2c33291d1fc6db85f098df4f8308a0cda901d"
   },
   "org.standardnotes.token-vault": {
-    "version": "2.2.3",
-    "base64": "bf5c3a2aae3f119043ee744ab5535de4705eeed67d5ecf9e1d7b95817f92bc19",
-    "binary": "8ef8a1eaf19d22b0ac279ad0c4d27b29c057b0f9b0d5c5f4cd6183eb506feaa3"
+    "version": "2.2.4",
+    "base64": "fb004e8cae73b351fdb225ef910102a1b7c9b616b92de52f99d2c82d7b4dd5a1",
+    "binary": "9b00f950c868e20e059a5fe7dbd0dd14eac5d94b31817b8bf3c58c88ab5ce236"
   },
   "org.standardnotes.standard-sheets": {
     "version": "1.5.1",
@@ -90,9 +90,9 @@
     "binary": "54a01414a21e46c67fa59c69189a3d34a6548de7539699f2cf0248f9c5059d37"
   },
   "org.standardnotes.advanced-checklist": {
-    "version": "0.2.3",
-    "base64": "2a2ce988902c9fdb7fe507c826bff13592adfe4fbe1c36e8468155730f507573",
-    "binary": "ae614e38946c480256157554d9af542deb0c9741630ad3242becce391991b994"
+    "version": "0.2.4",
+    "base64": "eaa8225677b18448cf6e8191cbf8a23c012590054d60434730cad20fd5b056f0",
+    "binary": "22db0aba7937234f8e0617a508a46de6a517c3e34be7deee87bc80533065f36c"
   },
   "org.standardnotes.file-safe": {
     "version": "2.0.16",

packages/components/package.json

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

packages/components/src/Packages/Editors/org.standardnotes.advanced-checklist/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.
 
+## [0.2.4](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-23)
+
+**Note:** Version bump only for package @standardnotes/advanced-checklist
+
 ## [0.2.3](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-07-13)
 
 ### Bug Fixes

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

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

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

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

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

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

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

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

packages/desktop/CHANGELOG.md

@@ -3,6 +3,90 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [3.23.107](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-09-01)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.23.106](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-31)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.23.105](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-31)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.23.104](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-29)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.23.103](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-25)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.23.102](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-24)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.23.101](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-23)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.23.100](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-23)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.23.99](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-22)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.23.98](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-18)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.23.97](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-17)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.23.96](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-17)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.23.95](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-17)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.23.94](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-16)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.23.93](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-15)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.23.92](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-11)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.23.91](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-10)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.23.90](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-09)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.23.89](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-08)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.23.88](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-08)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.23.87](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-06)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
 ## [3.23.86](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-05)
 
 **Note:** Version bump only for package @standardnotes/desktop

packages/desktop/package.json

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

packages/docs/CHANGELOG.md

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

packages/docs/README.md

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

packages/docs/docusaurus.config.js

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

packages/docs/package.json

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

packages/docs/static/matomo.js

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

packages/encryption/CHANGELOG.md

@@ -3,6 +3,24 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.14.4](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-09-01)
+
+### Bug Fixes
+
+* **encryption:** make package public for resolution on @standardnotes/api package ([8792771](https://github.com/standardnotes/app/commit/8792771d27ba926b83bc7b89749c4b1982871c1b))
+
+## [1.14.3](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-31)
+
+**Note:** Version bump only for package @standardnotes/encryption
+
+## [1.14.2](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-23)
+
+**Note:** Version bump only for package @standardnotes/encryption
+
+## [1.14.1](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-23)
+
+**Note:** Version bump only for package @standardnotes/encryption
+
 # [1.14.0](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-05)
 
 ### Bug Fixes

packages/encryption/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/encryption",
-  "version": "1.14.0",
+  "version": "1.14.4",
   "engines": {
     "node": ">=16.0.0 <17.0.0"
   },
@@ -11,7 +11,6 @@
   "files": [
     "dist"
   ],
-  "private": true,
   "license": "AGPL-3.0-or-later",
   "scripts": {
     "clean": "rm -fr dist",

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.50.5](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-23)
+
+**Note:** Version bump only for package @standardnotes/features
+
 ## [1.50.4](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-07-13)
 
 **Note:** Version bump only for package @standardnotes/features

packages/features/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/features",
-  "version": "1.50.4",
+  "version": "1.50.5",
   "engines": {
     "node": ">=16.0.0 <17.0.0"
   },
@@ -22,7 +22,7 @@
     "prebuild": "yarn clean",
     "build": "tsc -p tsconfig.json",
     "lint": "eslint . --ext .ts",
-    "test:unit": "jest"
+    "test": "jest"
   },
   "dependencies": {
     "@standardnotes/auth": "^3.19.4",

packages/filepicker/CHANGELOG.md

@@ -3,6 +3,22 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.22.4](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-09-01)
+
+**Note:** Version bump only for package @standardnotes/filepicker
+
+## [1.22.3](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-31)
+
+**Note:** Version bump only for package @standardnotes/filepicker
+
+## [1.22.2](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-23)
+
+**Note:** Version bump only for package @standardnotes/filepicker
+
+## [1.22.1](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-23)
+
+**Note:** Version bump only for package @standardnotes/filepicker
+
 # [1.22.0](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-05)
 
 ### Bug Fixes

packages/filepicker/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/filepicker",
-  "version": "1.22.0",
+  "version": "1.22.4",
   "engines": {
     "node": ">=16.0.0 <17.0.0"
   },
@@ -20,7 +20,7 @@
     "prebuild": "yarn clean",
     "build": "tsc -p tsconfig.json",
     "lint": "eslint . --ext .ts",
-    "test:unit": "jest"
+    "test": "jest"
   },
   "devDependencies": {
     "@types/jest": "^28.1.5",

packages/files/CHANGELOG.md

@@ -3,6 +3,22 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.9.4](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-09-01)
+
+**Note:** Version bump only for package @standardnotes/files
+
+## [1.9.3](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-31)
+
+**Note:** Version bump only for package @standardnotes/files
+
+## [1.9.2](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-23)
+
+**Note:** Version bump only for package @standardnotes/files
+
+## [1.9.1](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-23)
+
+**Note:** Version bump only for package @standardnotes/files
+
 # [1.9.0](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-05)
 
 ### Bug Fixes

packages/files/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/files",
-  "version": "1.9.0",
+  "version": "1.9.4",
   "engines": {
     "node": ">=16.0.0 <17.0.0"
   },
@@ -20,7 +20,7 @@
     "prebuild": "yarn clean",
     "build": "tsc -p tsconfig.json",
     "lint": "eslint . --ext .ts",
-    "test:unit": "jest"
+    "test": "jest"
   },
   "devDependencies": {
     "@types/jest": "^28.1.5",

packages/mobile/CHANGELOG.md

@@ -3,6 +3,90 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [3.31.23](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-09-01)
+
+**Note:** Version bump only for package @standardnotes/mobile
+
+## [3.31.22](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-31)
+
+**Note:** Version bump only for package @standardnotes/mobile
+
+## [3.31.21](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-31)
+
+**Note:** Version bump only for package @standardnotes/mobile
+
+## [3.31.20](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-29)
+
+**Note:** Version bump only for package @standardnotes/mobile
+
+## [3.31.19](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-25)
+
+**Note:** Version bump only for package @standardnotes/mobile
+
+## [3.31.18](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-24)
+
+**Note:** Version bump only for package @standardnotes/mobile
+
+## [3.31.17](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-23)
+
+**Note:** Version bump only for package @standardnotes/mobile
+
+## [3.31.16](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-23)
+
+**Note:** Version bump only for package @standardnotes/mobile
+
+## [3.31.15](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-22)
+
+**Note:** Version bump only for package @standardnotes/mobile
+
+## [3.31.14](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-18)
+
+**Note:** Version bump only for package @standardnotes/mobile
+
+## [3.31.13](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-17)
+
+**Note:** Version bump only for package @standardnotes/mobile
+
+## [3.31.12](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-17)
+
+**Note:** Version bump only for package @standardnotes/mobile
+
+## [3.31.11](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-17)
+
+**Note:** Version bump only for package @standardnotes/mobile
+
+## [3.31.10](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-16)
+
+**Note:** Version bump only for package @standardnotes/mobile
+
+## [3.31.9](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-15)
+
+**Note:** Version bump only for package @standardnotes/mobile
+
+## [3.31.8](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-11)
+
+**Note:** Version bump only for package @standardnotes/mobile
+
+## [3.31.7](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-10)
+
+**Note:** Version bump only for package @standardnotes/mobile
+
+## [3.31.6](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-09)
+
+**Note:** Version bump only for package @standardnotes/mobile
+
+## [3.31.5](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-08)
+
+**Note:** Version bump only for package @standardnotes/mobile
+
+## [3.31.4](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-08)
+
+**Note:** Version bump only for package @standardnotes/mobile
+
+## [3.31.3](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-06)
+
+**Note:** Version bump only for package @standardnotes/mobile
+
 ## [3.31.2](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-05)
 
 ### Bug Fixes

packages/mobile/package.json

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

packages/models/CHANGELOG.md

@@ -3,6 +3,22 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [1.17.0](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-31)
+
+### Features
+
+* **api:** add subscription server and client services and interfaces ([#1470](https://github.com/standardnotes/app/issues/1470)) ([089d3a2](https://github.com/standardnotes/app/commit/089d3a2e669f5a24bb4a38fc7582b423980d2d22))
+
+## [1.16.2](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-23)
+
+**Note:** Version bump only for package @standardnotes/models
+
+## [1.16.1](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-23)
+
+### Bug Fixes
+
+* **web:** archived and deleted counts on encryption panel ([#1423](https://github.com/standardnotes/app/issues/1423)) ([2bdd931](https://github.com/standardnotes/app/commit/2bdd931f6dcd876b1659c5d7d045effa26e18a20))
+
 # [1.16.0](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-05)
 
 ### Features

packages/models/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/models",
-  "version": "1.16.0",
+  "version": "1.17.0",
   "engines": {
     "node": ">=16.0.0 <17.0.0"
   },
@@ -20,7 +20,7 @@
     "prebuild": "yarn clean",
     "build": "tsc -p tsconfig.json",
     "lint": "eslint . --ext .ts",
-    "test:unit": "jest"
+    "test": "jest"
   },
   "devDependencies": {
     "@types/jest": "^28.1.5",

packages/models/src/Domain/Abstract/Item/Types/ItemCounts.ts

@@ -1,4 +1,4 @@
-export type StructuredItemsCount = {
+export type ItemCounts = {
   notes: number
   tags: number
   deleted: number

packages/models/src/Domain/Abstract/Item/index.ts

@@ -24,6 +24,7 @@ export * from './Mutator/TransactionalMutation'
 export * from './Types/AppDataField'
 export * from './Types/ConflictStrategy'
 export * from './Types/DefaultAppDomain'
+export * from './Types/ItemCounts'
 export * from './Types/ItemStream'
 export * from './Types/MutationType'
 export * from './Types/SingletonStrategy'

packages/models/src/Domain/Api/Subscription/Invitation.ts

@@ -0,0 +1,15 @@
+import { InvitationStatus } from './InvitationStatus'
+import { InviteeIdentifierType } from './InviteeIdentifierType'
+import { InviterIdentifierType } from './InviterIdentifierType'
+
+export type Invitation = {
+  uuid: string
+  inviterIdentifier: string
+  inviterIdentifierType: InviterIdentifierType
+  inviteeIdentifier: string
+  inviteeIdentifierType: InviteeIdentifierType
+  status: InvitationStatus
+  subscriptionId: number
+  createdAt: number
+  updatedAt: number
+}

packages/models/src/Domain/Api/Subscription/InvitationStatus.ts

@@ -0,0 +1,6 @@
+export enum InvitationStatus {
+  Sent = 'sent',
+  Canceled = 'canceled',
+  Accepted = 'accepted',
+  Declined = 'declined',
+}

packages/models/src/Domain/Api/Subscription/InviteeIdentifierType.ts

@@ -0,0 +1,5 @@
+export enum InviteeIdentifierType {
+  Email = 'email',
+  Hash = 'hash',
+  Uuid = 'uuid',
+}

packages/models/src/Domain/Api/Subscription/InviterIdentifierType.ts

@@ -0,0 +1,4 @@
+export enum InviterIdentifierType {
+  Email = 'email',
+  Uuid = 'uuid',
+}

packages/models/src/Domain/index.ts

@@ -24,6 +24,10 @@ export * from './Abstract/Contextual/SessionHistory'
 export * from './Abstract/Item'
 export * from './Abstract/Payload'
 export * from './Abstract/TransferPayload'
+export * from './Api/Subscription/Invitation'
+export * from './Api/Subscription/InvitationStatus'
+export * from './Api/Subscription/InviteeIdentifierType'
+export * from './Api/Subscription/InviterIdentifierType'
 export * from './Local/KeyParams/RootKeyParamsInterface'
 export * from './Local/RootKey/KeychainTypes'
 export * from './Local/RootKey/RootKeyContent'

packages/releases/CHANGELOG.md

@@ -3,6 +3,90 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.3.29](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-09-01)
+
+**Note:** Version bump only for package @standardnotes/releases
+
+## [1.3.28](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-31)
+
+**Note:** Version bump only for package @standardnotes/releases
+
+## [1.3.27](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-31)
+
+**Note:** Version bump only for package @standardnotes/releases
+
+## [1.3.26](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-29)
+
+**Note:** Version bump only for package @standardnotes/releases
+
+## [1.3.25](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-25)
+
+**Note:** Version bump only for package @standardnotes/releases
+
+## [1.3.24](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-24)
+
+**Note:** Version bump only for package @standardnotes/releases
+
+## [1.3.23](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-23)
+
+**Note:** Version bump only for package @standardnotes/releases
+
+## [1.3.22](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-23)
+
+**Note:** Version bump only for package @standardnotes/releases
+
+## [1.3.21](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-22)
+
+**Note:** Version bump only for package @standardnotes/releases
+
+## [1.3.20](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-18)
+
+**Note:** Version bump only for package @standardnotes/releases
+
+## [1.3.19](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-17)
+
+**Note:** Version bump only for package @standardnotes/releases
+
+## [1.3.18](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-17)
+
+**Note:** Version bump only for package @standardnotes/releases
+
+## [1.3.17](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-17)
+
+**Note:** Version bump only for package @standardnotes/releases
+
+## [1.3.16](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-16)
+
+**Note:** Version bump only for package @standardnotes/releases
+
+## [1.3.15](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-15)
+
+**Note:** Version bump only for package @standardnotes/releases
+
+## [1.3.14](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-11)
+
+**Note:** Version bump only for package @standardnotes/releases
+
+## [1.3.13](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-10)
+
+**Note:** Version bump only for package @standardnotes/releases
+
+## [1.3.12](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-09)
+
+**Note:** Version bump only for package @standardnotes/releases
+
+## [1.3.11](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-08)
+
+**Note:** Version bump only for package @standardnotes/releases
+
+## [1.3.10](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-08)
+
+**Note:** Version bump only for package @standardnotes/releases
+
+## [1.3.9](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-06)
+
+**Note:** Version bump only for package @standardnotes/releases
+
 ## [1.3.8](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-05)
 
 **Note:** Version bump only for package @standardnotes/releases

packages/releases/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/releases",
-  "version": "1.3.8",
+  "version": "1.3.29",
   "license": "AGPL-3.0-or-later",
   "main": "dist/releases.json",
   "types": "dist/index.d.ts",

packages/responses/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.9.4](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-23)
+
+**Note:** Version bump only for package @standardnotes/responses
+
 ## [1.9.3](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-07-13)
 
 ### Bug Fixes

packages/responses/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/responses",
-  "version": "1.9.3",
+  "version": "1.9.4",
   "engines": {
     "node": ">=16.0.0 <17.0.0"
   },
@@ -21,7 +21,7 @@
     "prebuild": "yarn clean",
     "build": "tsc -p tsconfig.json",
     "lint": "eslint . --ext .ts",
-    "test:unit": "jest spec --coverage --passWithNoTests"
+    "test": "jest spec --coverage --passWithNoTests"
   },
   "devDependencies": {
     "@types/jest": "^28.1.5",

packages/services/CHANGELOG.md

@@ -3,6 +3,26 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.17.4](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-09-01)
+
+**Note:** Version bump only for package @standardnotes/services
+
+## [1.17.3](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-31)
+
+**Note:** Version bump only for package @standardnotes/services
+
+## [1.17.2](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-23)
+
+### Bug Fixes
+
+* **services:** counting trashed and archived items ([7bff3de](https://github.com/standardnotes/app/commit/7bff3dee24d058be91cb278b09692b4ff4396106))
+
+## [1.17.1](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-23)
+
+### Bug Fixes
+
+* **web:** archived and deleted counts on encryption panel ([#1423](https://github.com/standardnotes/app/issues/1423)) ([2bdd931](https://github.com/standardnotes/app/commit/2bdd931f6dcd876b1659c5d7d045effa26e18a20))
+
 # [1.17.0](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-05)
 
 ### Features

packages/services/jest.config.js

@@ -7,5 +7,13 @@ module.exports = {
     'ts-jest': {
       tsconfig: 'tsconfig.json',
     },
+  },
+  coverageThreshold: {
+    global: {
+      branches: 9,
+      functions: 9,
+      lines: 16,
+      statements: 16
+    }
   }
 };

packages/services/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/services",
-  "version": "1.17.0",
+  "version": "1.17.4",
   "engines": {
     "node": ">=16.0.0 <17.0.0"
   },
@@ -20,7 +20,7 @@
     "prebuild": "yarn clean",
     "build": "tsc -p tsconfig.json",
     "lint": "eslint . --ext .ts",
-    "test:unit": "jest spec --coverage"
+    "test": "jest spec --coverage"
   },
   "dependencies": {
     "@standardnotes/auth": "^3.19.4",

packages/services/src/Domain/Files/FileService.spec.ts

@@ -1,16 +1,16 @@
-import {
-  InternalEventBusInterface,
-  SyncServiceInterface,
-  ItemManagerInterface,
-  AlertService,
-  ApiServiceInterface,
-  ChallengeServiceInterface,
-} from '@standardnotes/services'
-import { FileService } from './FileService'
 import { PureCryptoInterface, StreamEncryptor } from '@standardnotes/sncrypto-common'
 import { FileItem } from '@standardnotes/models'
 import { EncryptionProvider } from '@standardnotes/encryption'
 
+import { ItemManagerInterface } from '../Item/ItemManagerInterface'
+import { ChallengeServiceInterface } from '../Challenge'
+import { InternalEventBusInterface } from '..'
+import { AlertService } from '../Alert/AlertService'
+import { ApiServiceInterface } from '../Api/ApiServiceInterface'
+import { SyncServiceInterface } from '../Sync/SyncServiceInterface'
+
+import { FileService } from './FileService'
+
 describe('fileService', () => {
   let apiService: ApiServiceInterface
   let itemManager: ItemManagerInterface

packages/services/src/Domain/Item/ItemCounter.spec.ts

@@ -0,0 +1,35 @@
+import { ContentType } from '@standardnotes/common'
+import { SNNote, SNTag } from '@standardnotes/models'
+import { ItemCounter } from './ItemCounter'
+
+describe('ItemCounter', () => {
+  const createCounter = () => new ItemCounter()
+
+  it('should count distinct item counts', () => {
+    const items = [
+      {
+        archived: true,
+      } as jest.Mocked<SNNote>,
+      {
+        trashed: true,
+      } as jest.Mocked<SNNote>,
+      {
+        archived: true,
+        trashed: true,
+      } as jest.Mocked<SNNote>,
+      {
+        content_type: ContentType.Note,
+      } as jest.Mocked<SNNote>,
+      {
+        content_type: ContentType.Tag,
+      } as jest.Mocked<SNTag>,
+    ]
+
+    expect(createCounter().countNotesAndTags(items)).toEqual({
+      archived: 1,
+      deleted: 2,
+      notes: 1,
+      tags: 1,
+    })
+  })
+})

packages/services/src/Domain/Item/ItemCounter.ts

@@ -0,0 +1,40 @@
+import { ContentType } from '@standardnotes/common'
+import { SNNote, SNTag, ItemCounts } from '@standardnotes/models'
+
+import { ItemCounterInterface } from './ItemCounterInterface'
+
+export class ItemCounter implements ItemCounterInterface {
+  countNotesAndTags(items: Array<SNNote | SNTag>): ItemCounts {
+    const counts: ItemCounts = {
+      notes: 0,
+      archived: 0,
+      deleted: 0,
+      tags: 0,
+    }
+
+    for (const item of items) {
+      if (item.trashed) {
+        counts.deleted++
+
+        continue
+      }
+      if (item.archived) {
+        counts.archived++
+
+        continue
+      }
+      if (item.content_type === ContentType.Note) {
+        counts.notes++
+
+        continue
+      }
+      if (item.content_type === ContentType.Tag) {
+        counts.tags++
+
+        continue
+      }
+    }
+
+    return counts
+  }
+}

packages/services/src/Domain/Item/ItemCounterInterface.ts

@@ -0,0 +1,5 @@
+import { SNNote, SNTag, ItemCounts } from '@standardnotes/models'
+
+export interface ItemCounterInterface {
+  countNotesAndTags(items: Array<SNNote | SNTag>): ItemCounts
+}

packages/services/src/Domain/index.ts

@@ -50,6 +50,8 @@ export * from './Internal/InternalEventHandlerInterface'
 export * from './Internal/InternalEventInterface'
 export * from './Internal/InternalEventPublishStrategy'
 export * from './Internal/InternalEventType'
+export * from './Item/ItemCounter'
+export * from './Item/ItemCounterInterface'
 export * from './Item/ItemManagerInterface'
 export * from './Item/ItemsClientInterface'
 export * from './Item/ItemsServerInterface'

packages/sncrypto-common/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.11.1](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-23)
+
+**Note:** Version bump only for package @standardnotes/sncrypto-common
+
 # 1.11.0 (2022-07-06)
 
 ### Features

packages/sncrypto-common/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/sncrypto-common",
-  "version": "1.11.0",
+  "version": "1.11.1",
   "engines": {
     "node": ">=16.0.0 <17.0.0"
   },
@@ -21,7 +21,7 @@
     "build": "tsc -p tsconfig.json",
     "watch": "tsc -p tsconfig.json --watch",
     "lint": "eslint . --ext .ts",
-    "test:unit": "yarn lint"
+    "test": "yarn lint"
   },
   "devDependencies": {
     "@typescript-eslint/eslint-plugin": "^5.30.0",

packages/sncrypto-web/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.12.3](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-23)
+
+**Note:** Version bump only for package @standardnotes/sncrypto-web
+
 ## [1.12.2](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-07-06)
 
 **Note:** Version bump only for package @standardnotes/sncrypto-web

packages/sncrypto-web/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/sncrypto-web",
-  "version": "1.12.2",
+  "version": "1.12.3",
   "engines": {
     "node": ">=16.0.0 <17.0.0"
   },

packages/snjs/CHANGELOG.md

@@ -3,6 +3,32 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.125.6](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-09-01)
+
+**Note:** Version bump only for package @standardnotes/snjs
+
+## [2.125.5](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-31)
+
+**Note:** Version bump only for package @standardnotes/snjs
+
+## [2.125.4](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-31)
+
+**Note:** Version bump only for package @standardnotes/snjs
+
+## [2.125.3](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-24)
+
+### Bug Fixes
+
+* **snjs:** showing archived notes on trashed smart view ([#1426](https://github.com/standardnotes/app/issues/1426)) ([2c69a51](https://github.com/standardnotes/app/commit/2c69a514a8a2c3cfe713e118bb6997f21e41ebe8))
+
+## [2.125.2](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-23)
+
+**Note:** Version bump only for package @standardnotes/snjs
+
+## [2.125.1](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-23)
+
+**Note:** Version bump only for package @standardnotes/snjs
+
 # [2.125.0](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-05)
 
 ### Bug Fixes

packages/snjs/README.md

@@ -58,5 +58,5 @@ yarn start:server:e2e
 From the root of the repository, run:
 
 ```
-yarn run test:unit
+yarn run test
 ```

packages/snjs/jest.config.js

@@ -31,7 +31,7 @@ module.exports = {
       branches: 13,
       functions: 22,
       lines: 27,
-      statements: 28,
+      statements: 27,
     },
   },
 }

packages/snjs/lib/Services/Items/ItemManager.spec.ts

@@ -11,6 +11,8 @@ import {
   FillItemContent,
   PayloadTimestampDefaults,
   NoteContent,
+  SmartView,
+  SystemViewId,
 } from '@standardnotes/models'
 
 const setupRandomUuid = () => {
@@ -179,6 +181,39 @@ describe('itemManager', () => {
       const notes = itemManager.getDisplayableNotes()
       expect(notes).toHaveLength(1)
     })
+
+    it('viewing trashed notes smart view should include archived notes', async () => {
+      itemManager = createService()
+
+      const archivedNote = createNote('archived')
+      const trashedNote = createNote('trashed')
+      const archivedAndTrashedNote = createNote('archived&trashed')
+
+      await itemManager.insertItems([archivedNote, trashedNote, archivedAndTrashedNote])
+
+      await itemManager.changeItem<Models.NoteMutator>(archivedNote, (m) => {
+        m.archived = true
+      })
+      await itemManager.changeItem<Models.NoteMutator>(trashedNote, (m) => {
+        m.trashed = true
+      })
+      await itemManager.changeItem<Models.NoteMutator>(archivedAndTrashedNote, (m) => {
+        m.trashed = true
+        m.archived = true
+      })
+
+      itemManager.setPrimaryItemDisplayOptions({
+        sortBy: 'title',
+        sortDirection: 'asc',
+        includeArchived: false,
+        includeTrashed: false,
+        views: [{ uuid: SystemViewId.TrashedNotes } as jest.Mocked<SmartView>],
+      })
+
+      const notes = itemManager.getDisplayableNotes()
+
+      expect(notes).toHaveLength(2)
+    })
   })
 
   describe('tag relationships', () => {

packages/snjs/lib/Services/Items/ItemManager.ts

@@ -127,20 +127,20 @@ export class ItemManager
     const override: Models.FilterDisplayOptions = {}
 
     if (options.views && options.views.find((view) => view.uuid === Models.SystemViewId.AllNotes)) {
-      if (options.includeArchived == undefined) {
+      if (options.includeArchived === undefined) {
         override.includeArchived = false
       }
-      if (options.includeTrashed == undefined) {
+      if (options.includeTrashed === undefined) {
         override.includeTrashed = false
       }
     }
     if (options.views && options.views.find((view) => view.uuid === Models.SystemViewId.ArchivedNotes)) {
-      if (options.includeTrashed == undefined) {
+      if (options.includeTrashed === undefined) {
         override.includeTrashed = false
       }
     }
     if (options.views && options.views.find((view) => view.uuid === Models.SystemViewId.TrashedNotes)) {
-      if (options.includeArchived == undefined) {
+      if (!options.includeArchived) {
         override.includeArchived = true
       }
     }

packages/snjs/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/snjs",
-  "version": "2.125.0",
+  "version": "2.125.6",
   "engines": {
     "node": ">=16.0.0 <17.0.0"
   },
@@ -25,7 +25,7 @@
     "lint": "yarn lint:tsc && yarn lint:eslint",
     "lint:eslint": "eslint --ext .ts lib/",
     "lint:tsc": "tsc --noEmit --emitDeclarationOnly false --project lib/tsconfig.json",
-    "test:unit": "jest spec --coverage",
+    "test": "jest spec --coverage",
     "test:debug": "node --inspect-brk node_modules/.bin/jest --runInBand"
   },
   "devDependencies": {

packages/toast/CHANGELOG.md

@@ -3,6 +3,12 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.3.5](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-11)
+
+### Bug Fixes
+
+* optimize toasts for mobile ([#1392](https://github.com/standardnotes/app/issues/1392)) ([40d9392](https://github.com/standardnotes/app/commit/40d9392599e871225abcabcddd51de6cc99a0fe9))
+
 ## [1.3.4](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-07-14)
 
 **Note:** Version bump only for package @standardnotes/toast

packages/toast/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/toast",
-  "version": "1.3.4",
+  "version": "1.3.5",
   "private": true,
   "main": "./src/index.ts",
   "scripts": {

packages/toast/src/Toast.tsx

@@ -12,20 +12,20 @@ const prefersReducedMotion = () => {
 const colorForToastType = (type: ToastType) => {
   switch (type) {
     case ToastType.Success:
-      return 'text-success'
+      return 'bg-success text-info-contrast md:text-success'
     case ToastType.Error:
-      return 'text-danger'
+      return 'bg-danger text-info-contrast md:text-danger'
     default:
-      return 'text-info'
+      return 'bg-info text-info-contrast md:text-info'
   }
 }
 
 const iconForToastType = (type: ToastType) => {
   switch (type) {
     case ToastType.Success:
-      return <CheckCircleFilledIcon className={`h-5 w-5 ${colorForToastType(type)}`} />
+      return <CheckCircleFilledIcon className="text-success h-5 w-5" />
     case ToastType.Error:
-      return <ClearCircleFilledIcon className={`h-5 w-5 ${colorForToastType(type)}`} />
+      return <ClearCircleFilledIcon className="text-danger h-5 w-5" />
     case ToastType.Progress:
     case ToastType.Loading:
       return <div className="border-info h-4 w-4 animate-spin rounded-full border border-solid border-r-transparent" />
@@ -77,7 +77,7 @@ export const Toast = forwardRef(({ toast, index }: Props, ref: ForwardedRef<HTML
     <div
       data-index={index}
       role="status"
-      className={`bg-passive-5 animation-fill-forwards relative mt-3 flex min-w-max select-none flex-col rounded opacity-0 ${currentAnimation}`}
+      className={`bg-passive-5 animation-fill-forwards relative mt-3 flex min-w-full select-none flex-col rounded opacity-0 md:min-w-max ${currentAnimation}`}
       style={{
         boxShadow: '0px 4px 12px rgba(0, 0, 0, 0.16)',
         transition: shouldReduceMotion ? undefined : 'all 0.2s ease',
@@ -90,18 +90,18 @@ export const Toast = forwardRef(({ toast, index }: Props, ref: ForwardedRef<HTML
       }}
       ref={ref}
     >
-      <div className={`flex w-full items-center ${hasActions ? 'p-2 pl-3' : hasProgress ? 'px-3 py-2.5' : 'p-3'}`}>
-        {icon ? <div className="sn-icon mr-2 flex flex-shrink-0 items-center justify-center">{icon}</div> : null}
-        <div className="text-text text-sm">{toast.message}</div>
+      <div
+        className={`flex w-full flex-wrap items-center gap-2 ${
+          hasActions ? 'p-2 pl-3' : hasProgress ? 'px-3 py-2.5' : 'p-3'
+        }`}
+      >
+        {icon ? <div className="sn-icon flex flex-shrink-0 items-center justify-center">{icon}</div> : null}
+        <div className="text-text text-sm [word-wrap:anywhere]">{toast.message}</div>
         {hasActions && (
-          <div className="ml-4">
+          <>
             {toast.actions?.map((action, index) => (
               <button
-                style={{
-                  paddingLeft: '0.45rem',
-                  paddingRight: '0.45rem',
-                }}
-                className={`hover:bg-passive-3 cursor-pointer rounded border-0 bg-transparent py-1 text-sm font-semibold ${colorForToastType(
+                className={`hover:bg-passive-3 cursor-pointer rounded border-0 py-1 px-[0.45rem] text-sm font-semibold md:bg-transparent ${colorForToastType(
                   toast.type,
                 )} ${index !== 0 ? 'ml-2' : ''}`}
                 onClick={() => {
@@ -112,7 +112,7 @@ export const Toast = forwardRef(({ toast, index }: Props, ref: ForwardedRef<HTML
                 {action.label}
               </button>
             ))}
-          </div>
+          </>
         )}
       </div>
       {hasProgress && (

packages/toast/src/ToastContainer.tsx

@@ -11,7 +11,7 @@ export const ToastContainer: FunctionComponent = () => {
   }
 
   return (
-    <div className="z-toast fixed bottom-6 right-6 flex flex-col items-end">
+    <div className="z-toast fixed bottom-6 right-6 flex w-[calc(100%-3rem)] flex-col items-end md:w-auto">
       {toasts.map((toast, index) => (
         <ToastTimer toast={toast} index={index} key={toast.id} />
       ))}

packages/toast/src/ToastTimer.tsx

@@ -55,14 +55,6 @@ export const ToastTimer: FunctionComponent<Props> = ({ toast, index }) => {
     resumeTimer()
   }, [resumeTimer])
 
-  const handlePageVisibility = useCallback(() => {
-    if (document.visibilityState === 'hidden') {
-      pauseTimer()
-    } else {
-      resumeTimer()
-    }
-  }, [pauseTimer, resumeTimer])
-
   const handlePageFocus = useCallback(() => {
     resumeTimer()
   }, [resumeTimer])
@@ -83,7 +75,6 @@ export const ToastTimer: FunctionComponent<Props> = ({ toast, index }) => {
       toastElement.addEventListener('mouseenter', handleMouseEnter)
       toastElement.addEventListener('mouseleave', handleMouseLeave)
     }
-    document.addEventListener('visibilitychange', handlePageVisibility)
     window.addEventListener('focus', handlePageFocus)
     window.addEventListener('blur', handlePageBlur)
 
@@ -93,7 +84,6 @@ export const ToastTimer: FunctionComponent<Props> = ({ toast, index }) => {
         toastElement.removeEventListener('mouseenter', handleMouseEnter)
         toastElement.removeEventListener('mouseleave', handleMouseLeave)
       }
-      document.removeEventListener('visibilitychange', handlePageVisibility)
       window.removeEventListener('focus', handlePageFocus)
       window.removeEventListener('blur', handlePageBlur)
     }
@@ -105,7 +95,6 @@ export const ToastTimer: FunctionComponent<Props> = ({ toast, index }) => {
     handleMouseLeave,
     handlePageBlur,
     handlePageFocus,
-    handlePageVisibility,
     resumeTimer,
     shouldAutoClose,
     toast.id,

packages/ui-services/CHANGELOG.md

@@ -3,6 +3,26 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.1.5](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-09-01)
+
+**Note:** Version bump only for package @standardnotes/ui-services
+
+## [1.1.4](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-31)
+
+**Note:** Version bump only for package @standardnotes/ui-services
+
+## [1.1.3](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-23)
+
+**Note:** Version bump only for package @standardnotes/ui-services
+
+## [1.1.2](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-23)
+
+**Note:** Version bump only for package @standardnotes/ui-services
+
+## [1.1.1](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-08-11)
+
+**Note:** Version bump only for package @standardnotes/ui-services
+
 # 1.1.0 (2022-08-05)
 
 ### Bug Fixes