chore(release): publish new version

- @standardnotes/auth-server@1.25.12
fix(auth): allow canceling shared subscription invitation before it was accepted
2026-01-26 14:01:08 -05:00 · 2022-09-12 12:26:19 +00:00 · 2022-09-12 14:24:52 +02:00 · 2022-09-09 12:04:24 +00:00 · 2022-09-09 14:02:25 +02:00 · 2022-09-09 10:13:14 +00:00
38 changed files with 225 additions and 49 deletions
--- a/.pnp.cjs
+++ b/.pnp.cjs
@@ -2506,6 +2506,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
            ["@newrelic/winston-enricher", "virtual:04783e12400851b8a3d76e71495851cc94959db6e62f04cb0a31190080629440b182d8c8eb4d7f2b04e281912f2783a5fd4d2c3c6ab68d38b7097246c93f4c19#npm:4.0.0"],\
            ["@sentry/node", "npm:7.5.0"],\
            ["@standardnotes/analytics", "workspace:packages/analytics"],\
+            ["@standardnotes/common", "workspace:packages/common"],\
            ["@standardnotes/domain-events", "workspace:packages/domain-events"],\
            ["@standardnotes/domain-events-infra", "workspace:packages/domain-events-infra"],\
            ["@standardnotes/security", "workspace:packages/security"],\
--- a/packages/analytics/CHANGELOG.md
+++ b/packages/analytics/CHANGELOG.md
@@ -3,6 +3,18 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

+# [1.28.0](https://github.com/standardnotes/server/compare/@standardnotes/analytics@1.27.0...@standardnotes/analytics@1.28.0) (2022-09-09)
+
+### Features
+
+* **syncing-server:** add tracking files count in stats ([52cc646](https://github.com/standardnotes/server/commit/52cc6462a66dae3bd6c05f551d4ba661c8a9b8c8))
+
+# [1.27.0](https://github.com/standardnotes/server/compare/@standardnotes/analytics@1.26.0...@standardnotes/analytics@1.27.0) (2022-09-09)
+
+### Features
+
+* **api-gateway:** add tracking general activity for free and paid users breakdown ([0afd3de](https://github.com/standardnotes/server/commit/0afd3de9779e2abe10deede24626a3cbe6b15e6c))
+
 # [1.26.0](https://github.com/standardnotes/server/compare/@standardnotes/analytics@1.25.0...@standardnotes/analytics@1.26.0) (2022-09-09)

 ### Features
--- a/packages/analytics/package.json
+++ b/packages/analytics/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@standardnotes/analytics",
-  "version": "1.26.0",
+  "version": "1.28.0",
  "engines": {
    "node": ">=14.0.0 <17.0.0"
  },
--- a/packages/analytics/src/Domain/Analytics/AnalyticsActivity.ts
+++ b/packages/analytics/src/Domain/Analytics/AnalyticsActivity.ts
@@ -1,5 +1,7 @@
 export enum AnalyticsActivity {
  GeneralActivity = 'general-activity',
+  GeneralActivityFreeUsers = 'general-activity-free-users',
+  GeneralActivityPaidUsers = 'general-activity-paid-users',
  EditingItems = 'editing-items',
  CheckingIntegrity = 'checking-integrity',
  Login = 'login',
--- a/packages/analytics/src/Domain/Statistics/StatisticsMeasure.ts
+++ b/packages/analytics/src/Domain/Statistics/StatisticsMeasure.ts
@@ -6,4 +6,5 @@ export enum StatisticsMeasure {
  Refunds = 'refunds',
  NotesCountFreeUsers = 'notes-count-free-users',
  NotesCountPaidUsers = 'notes-count-paid-users',
+  FilesCount = 'files-count',
 }
--- a/packages/api-gateway/CHANGELOG.md
+++ b/packages/api-gateway/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.

+## [1.19.1](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.19.0...@standardnotes/api-gateway@1.19.1) (2022-09-09)
+
+**Note:** Version bump only for package @standardnotes/api-gateway
+
+# [1.19.0](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.18.0...@standardnotes/api-gateway@1.19.0) (2022-09-09)
+
+### Features
+
+* **syncing-server:** add tracking files count in stats ([52cc646](https://github.com/standardnotes/api-gateway/commit/52cc6462a66dae3bd6c05f551d4ba661c8a9b8c8))
+
+# [1.18.0](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.17.4...@standardnotes/api-gateway@1.18.0) (2022-09-09)
+
+### Bug Fixes
+
+* **api-gateway:** add general activity breakdown to yesterdays report stats ([339c86f](https://github.com/standardnotes/api-gateway/commit/339c86fca073b02054260417b7519c08874e1e4e))
+
+### Features
+
+* **api-gateway:** add tracking general activity for free and paid users breakdown ([0afd3de](https://github.com/standardnotes/api-gateway/commit/0afd3de9779e2abe10deede24626a3cbe6b15e6c))
+
+## [1.17.4](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.17.3...@standardnotes/api-gateway@1.17.4) (2022-09-09)
+
+### Bug Fixes
+
+* **api-gateway:** add notes count statistics to report ([ced852d](https://github.com/standardnotes/api-gateway/commit/ced852d9dbf8cab4c235b94a834968a5fc5e7d36))
+
 ## [1.17.3](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.17.2...@standardnotes/api-gateway@1.17.3) (2022-09-09)

 **Note:** Version bump only for package @standardnotes/api-gateway
--- a/packages/api-gateway/bin/report.ts
+++ b/packages/api-gateway/bin/report.ts
@@ -70,6 +70,8 @@ const requestReport = async (
  const yesterdayActivityNames = [
    AnalyticsActivity.LimitedDiscountOfferPurchased,
    AnalyticsActivity.GeneralActivity,
+    AnalyticsActivity.GeneralActivityFreeUsers,
+    AnalyticsActivity.GeneralActivityPaidUsers,
    AnalyticsActivity.PaymentFailed,
    AnalyticsActivity.PaymentSuccess,
  ]
@@ -92,6 +94,9 @@ const requestReport = async (
    StatisticsMeasure.RegistrationLength,
    StatisticsMeasure.SubscriptionLength,
    StatisticsMeasure.RegistrationToSubscriptionTime,
+    StatisticsMeasure.NotesCountFreeUsers,
+    StatisticsMeasure.NotesCountPaidUsers,
+    StatisticsMeasure.FilesCount,
  ]
  const statisticMeasures = []
  for (const statisticMeasureName of statisticMeasureNames) {
--- a/packages/api-gateway/package.json
+++ b/packages/api-gateway/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@standardnotes/api-gateway",
-  "version": "1.17.3",
+  "version": "1.19.1",
  "engines": {
    "node": ">=16.0.0 <17.0.0"
  },
@@ -25,6 +25,7 @@
    "@newrelic/winston-enricher": "^4.0.0",
    "@sentry/node": "^7.3.0",
    "@standardnotes/analytics": "workspace:*",
+    "@standardnotes/common": "workspace:^",
    "@standardnotes/domain-events": "workspace:*",
    "@standardnotes/domain-events-infra": "workspace:*",
    "@standardnotes/security": "workspace:*",
--- a/packages/api-gateway/src/Controller/AuthMiddleware.ts
+++ b/packages/api-gateway/src/Controller/AuthMiddleware.ts
@@ -1,4 +1,5 @@
 import { CrossServiceTokenData } from '@standardnotes/security'
+import { RoleName } from '@standardnotes/common'
 import { AnalyticsActivity, AnalyticsStoreInterface, Period } from '@standardnotes/analytics'
 import { TimerInterface } from '@standardnotes/time'
 import { NextFunction, Request, Response } from 'express'
@@ -75,9 +76,20 @@ export class AuthMiddleware extends BaseMiddleware {

      const decodedToken = <CrossServiceTokenData>verify(crossServiceToken, this.jwtSecret, { algorithms: ['HS256'] })

-      await this.analyticsStore.markActivity([AnalyticsActivity.GeneralActivity], decodedToken.analyticsId as number, [
-        Period.Today,
-      ])
+      response.locals.freeUser =
+        decodedToken.roles.length === 1 &&
+        decodedToken.roles.find((role) => role.name === RoleName.CoreUser) !== undefined
+
+      await this.analyticsStore.markActivity(
+        [
+          AnalyticsActivity.GeneralActivity,
+          response.locals.freeUser
+            ? AnalyticsActivity.GeneralActivityFreeUsers
+            : AnalyticsActivity.GeneralActivityPaidUsers,
+        ],
+        decodedToken.analyticsId as number,
+        [Period.Today],
+      )

      if (this.crossServiceTokenCacheTTL && !crossServiceTokenFetchedFromCache) {
        await this.crossServiceTokenCache.set({
--- a/packages/auth/CHANGELOG.md
+++ b/packages/auth/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.25.12](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.25.11...@standardnotes/auth-server@1.25.12) (2022-09-12)
+
+### Bug Fixes
+
+* **auth:** allow canceling shared subscription invitation before it was accepted ([0dab31f](https://github.com/standardnotes/server/commit/0dab31f9936bfd5081a87eef9701a268b8dec88c))
+
+## [1.25.11](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.25.10...@standardnotes/auth-server@1.25.11) (2022-09-09)
+
+**Note:** Version bump only for package @standardnotes/auth-server
+
+## [1.25.10](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.25.9...@standardnotes/auth-server@1.25.10) (2022-09-09)
+
+**Note:** Version bump only for package @standardnotes/auth-server
+
+## [1.25.9](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.25.8...@standardnotes/auth-server@1.25.9) (2022-09-09)
+
+**Note:** Version bump only for package @standardnotes/auth-server
+
 ## [1.25.8](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.25.7...@standardnotes/auth-server@1.25.8) (2022-09-09)

 **Note:** Version bump only for package @standardnotes/auth-server
--- a/packages/auth/package.json
+++ b/packages/auth/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@standardnotes/auth-server",
-  "version": "1.25.8",
+  "version": "1.25.12",
  "engines": {
    "node": ">=16.0.0 <17.0.0"
  },
--- a/packages/auth/src/Domain/UseCase/CancelSharedSubscriptionInvitation/CancelSharedSubscriptionInvitation.spec.ts
+++ b/packages/auth/src/Domain/UseCase/CancelSharedSubscriptionInvitation/CancelSharedSubscriptionInvitation.spec.ts
@@ -126,7 +126,7 @@ describe('CancelSharedSubscriptionInvitation', () => {
    })
  })

-  it('should cancel a shared subscription invitation without subscription removal is subscription is not found', async () => {
+  it('should cancel a shared subscription invitation without subscription removal if subscription is not found', async () => {
    userSubscriptionRepository.findOneByUserUuidAndSubscriptionId = jest.fn().mockReturnValue(null)

    expect(
@@ -175,7 +175,7 @@ describe('CancelSharedSubscriptionInvitation', () => {
    })
  })

-  it('should not cancel a shared subscription invitation if invitee is not found', async () => {
+  it('should cancel a shared subscription invitation without subscription removal if invitee is not found', async () => {
    userRepository.findOneByEmail = jest.fn().mockReturnValue(null)
    expect(
      await createUseCase().execute({
@@ -183,20 +183,21 @@ describe('CancelSharedSubscriptionInvitation', () => {
        inviterEmail: 'test@test.te',
      }),
    ).toEqual({
-      success: false,
+      success: true,
    })
-  })

-  it('should not cancel a shared subscription invitation if invitee is not found', async () => {
-    userRepository.findOneByEmail = jest.fn().mockReturnValue(null)
-    expect(
-      await createUseCase().execute({
-        sharedSubscriptionInvitationUuid: '1-2-3',
-        inviterEmail: 'test@test.te',
-      }),
-    ).toEqual({
-      success: false,
+    expect(sharedSubscriptionInvitationRepository.save).toHaveBeenCalledWith({
+      status: 'canceled',
+      subscriptionId: 3,
+      updatedAt: 1,
+      inviterIdentifier: 'test@test.te',
+      uuid: '1-2-3',
+      inviterIdentifierType: 'email',
+      inviteeIdentifier: 'invitee@test.te',
+      inviteeIdentifierType: 'email',
    })
+    expect(userSubscriptionRepository.save).not.toHaveBeenCalled()
+    expect(roleService.removeUserRole).not.toHaveBeenCalled()
  })

  it('should not cancel a shared subscription invitation if inviter subscription is not found', async () => {
--- a/packages/auth/src/Domain/UseCase/CancelSharedSubscriptionInvitation/CancelSharedSubscriptionInvitation.ts
+++ b/packages/auth/src/Domain/UseCase/CancelSharedSubscriptionInvitation/CancelSharedSubscriptionInvitation.ts
@@ -48,11 +48,6 @@ export class CancelSharedSubscriptionInvitation implements UseCaseInterface {
    }

    const invitee = await this.userRepository.findOneByEmail(sharedSubscriptionInvitation.inviteeIdentifier)
-    if (invitee === null) {
-      return {
-        success: false,
-      }
-    }

    const inviterUserSubscriptions = await this.userSubscriptionRepository.findBySubscriptionIdAndType(
      sharedSubscriptionInvitation.subscriptionId,
@@ -70,20 +65,22 @@ export class CancelSharedSubscriptionInvitation implements UseCaseInterface {

    await this.sharedSubscriptionInvitationRepository.save(sharedSubscriptionInvitation)

-    await this.removeSharedSubscription(sharedSubscriptionInvitation.subscriptionId, invitee)
+    if (invitee !== null) {
+      await this.removeSharedSubscription(sharedSubscriptionInvitation.subscriptionId, invitee)

-    await this.roleService.removeUserRole(invitee, inviterUserSubscription.planName as SubscriptionName)
+      await this.roleService.removeUserRole(invitee, inviterUserSubscription.planName as SubscriptionName)

-    await this.domainEventPublisher.publish(
-      this.domainEventFactory.createSharedSubscriptionInvitationCanceledEvent({
-        inviteeIdentifier: invitee.uuid,
-        inviteeIdentifierType: InviteeIdentifierType.Uuid,
-        inviterEmail: sharedSubscriptionInvitation.inviterIdentifier,
-        inviterSubscriptionId: sharedSubscriptionInvitation.subscriptionId,
-        inviterSubscriptionUuid: inviterUserSubscription.uuid,
-        sharedSubscriptionInvitationUuid: sharedSubscriptionInvitation.uuid,
-      }),
-    )
+      await this.domainEventPublisher.publish(
+        this.domainEventFactory.createSharedSubscriptionInvitationCanceledEvent({
+          inviteeIdentifier: invitee.uuid,
+          inviteeIdentifierType: InviteeIdentifierType.Uuid,
+          inviterEmail: sharedSubscriptionInvitation.inviterIdentifier,
+          inviterSubscriptionId: sharedSubscriptionInvitation.subscriptionId,
+          inviterSubscriptionUuid: inviterUserSubscription.uuid,
+          sharedSubscriptionInvitationUuid: sharedSubscriptionInvitation.uuid,
+        }),
+      )
+    }

    return {
      success: true,
--- a/packages/common/CHANGELOG.md
+++ b/packages/common/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.32.0](https://github.com/standardnotes/server/compare/@standardnotes/common@1.31.0...@standardnotes/common@1.32.0) (2022-09-09)
+
+### Features
+
+* **common:** add either and only types ([c3ebb32](https://github.com/standardnotes/server/commit/c3ebb321cfacd20769ebfd99413e283859b6e260))
+
 # [1.31.0](https://github.com/standardnotes/server/compare/@standardnotes/common@1.30.0...@standardnotes/common@1.31.0) (2022-09-05)

 ### Features
--- a/packages/common/package.json
+++ b/packages/common/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@standardnotes/common",
-  "version": "1.31.0",
+  "version": "1.32.0",
  "engines": {
    "node": ">=16.0.0 <17.0.0"
  },
--- a/packages/common/src/Domain/Type/Either.ts
+++ b/packages/common/src/Domain/Type/Either.ts
@@ -0,0 +1,3 @@
+import { Only } from './Only'
+
+export type Either<T, U> = Only<T, U> | Only<U, T>
--- a/packages/common/src/Domain/Type/Only.ts
+++ b/packages/common/src/Domain/Type/Only.ts
@@ -0,0 +1,5 @@
+export type Only<T, U> = {
+  [P in keyof T]: T[P]
+} & {
+  [P in keyof U]?: never
+}
--- a/packages/common/src/Domain/index.ts
+++ b/packages/common/src/Domain/index.ts
@@ -18,3 +18,5 @@ export * from './Protocol/ProtocolVersion'
 export * from './Role/PaidRoles'
 export * from './Role/RoleName'
 export * from './Subscription/SubscriptionName'
+export * from './Type/Either'
+export * from './Type/Only'
--- a/packages/domain-events-infra/CHANGELOG.md
+++ b/packages/domain-events-infra/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.8.9](https://github.com/standardnotes/server/compare/@standardnotes/domain-events-infra@1.8.8...@standardnotes/domain-events-infra@1.8.9) (2022-09-09)
+
+**Note:** Version bump only for package @standardnotes/domain-events-infra
+
 ## [1.8.8](https://github.com/standardnotes/server/compare/@standardnotes/domain-events-infra@1.8.7...@standardnotes/domain-events-infra@1.8.8) (2022-09-08)

 **Note:** Version bump only for package @standardnotes/domain-events-infra
--- a/packages/domain-events-infra/package.json
+++ b/packages/domain-events-infra/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@standardnotes/domain-events-infra",
-  "version": "1.8.8",
+  "version": "1.8.9",
  "engines": {
    "node": ">=16.0.0 <17.0.0"
  },
--- a/packages/domain-events/CHANGELOG.md
+++ b/packages/domain-events/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.

+## [2.60.3](https://github.com/standardnotes/server/compare/@standardnotes/domain-events@2.60.2...@standardnotes/domain-events@2.60.3) (2022-09-09)
+
+**Note:** Version bump only for package @standardnotes/domain-events
+
 ## [2.60.2](https://github.com/standardnotes/server/compare/@standardnotes/domain-events@2.60.1...@standardnotes/domain-events@2.60.2) (2022-09-08)

 ### Bug Fixes
--- a/packages/domain-events/package.json
+++ b/packages/domain-events/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@standardnotes/domain-events",
-  "version": "2.60.2",
+  "version": "2.60.3",
  "engines": {
    "node": ">=16.0.0 <17.0.0"
  },
--- a/packages/event-store/CHANGELOG.md
+++ b/packages/event-store/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.

+## [1.3.14](https://github.com/standardnotes/server/compare/@standardnotes/event-store@1.3.13...@standardnotes/event-store@1.3.14) (2022-09-09)
+
+**Note:** Version bump only for package @standardnotes/event-store
+
+## [1.3.13](https://github.com/standardnotes/server/compare/@standardnotes/event-store@1.3.12...@standardnotes/event-store@1.3.13) (2022-09-09)
+
+### Bug Fixes
+
+* **event-store:** add missing event subscriptions ([432d071](https://github.com/standardnotes/server/commit/432d071ec88a49f90513be6c55a06005a471b174))
+
 ## [1.3.12](https://github.com/standardnotes/server/compare/@standardnotes/event-store@1.3.11...@standardnotes/event-store@1.3.12) (2022-09-08)

 ### Bug Fixes
--- a/packages/event-store/package.json
+++ b/packages/event-store/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@standardnotes/event-store",
-  "version": "1.3.12",
+  "version": "1.3.14",
  "description": "Event Store Service",
  "private": true,
  "main": "dist/src/index.js",
--- a/packages/event-store/src/Bootstrap/Container.ts
+++ b/packages/event-store/src/Bootstrap/Container.ts
@@ -81,6 +81,11 @@ export class ContainerConfigLoader {
      ['ACCOUNT_CLAIM_REQUESTED', container.get(TYPES.EventHandler)],
      ['SUBSCRIPTION_REVERT_REQUESTED', container.get(TYPES.EventHandler)],
      ['REFUND_PROCESSED', container.get(TYPES.EventHandler)],
+      ['ACCOUNT_RESET_REQUESTED', container.get(TYPES.EventHandler)],
+      ['DISCOUNT_APPLIED', container.get(TYPES.EventHandler)],
+      ['SUBSCRIPTION_RATE_ADJUSTED', container.get(TYPES.EventHandler)],
+      ['REFUND_REQUESTED', container.get(TYPES.EventHandler)],
+      ['INVOICE_GENERATED', container.get(TYPES.EventHandler)],
    ])

    container
--- a/packages/files/CHANGELOG.md
+++ b/packages/files/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.5.51](https://github.com/standardnotes/files/compare/@standardnotes/files-server@1.5.50...@standardnotes/files-server@1.5.51) (2022-09-09)
+
+**Note:** Version bump only for package @standardnotes/files-server
+
 ## [1.5.50](https://github.com/standardnotes/files/compare/@standardnotes/files-server@1.5.49...@standardnotes/files-server@1.5.50) (2022-09-08)

 **Note:** Version bump only for package @standardnotes/files-server
--- a/packages/files/package.json
+++ b/packages/files/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@standardnotes/files-server",
-  "version": "1.5.50",
+  "version": "1.5.51",
  "engines": {
    "node": ">=16.0.0 <17.0.0"
  },
--- a/packages/predicates/CHANGELOG.md
+++ b/packages/predicates/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.4.1](https://github.com/standardnotes/server/compare/@standardnotes/predicates@1.4.0...@standardnotes/predicates@1.4.1) (2022-09-09)
+
+**Note:** Version bump only for package @standardnotes/predicates
+
 # [1.4.0](https://github.com/standardnotes/server/compare/@standardnotes/predicates@1.3.0...@standardnotes/predicates@1.4.0) (2022-09-05)

 ### Features
--- a/packages/predicates/package.json
+++ b/packages/predicates/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@standardnotes/predicates",
-  "version": "1.4.0",
+  "version": "1.4.1",
  "engines": {
    "node": ">=16.0.0 <17.0.0"
  },
--- a/packages/scheduler/CHANGELOG.md
+++ b/packages/scheduler/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.10.28](https://github.com/standardnotes/server/compare/@standardnotes/scheduler-server@1.10.27...@standardnotes/scheduler-server@1.10.28) (2022-09-09)
+
+**Note:** Version bump only for package @standardnotes/scheduler-server
+
 ## [1.10.27](https://github.com/standardnotes/server/compare/@standardnotes/scheduler-server@1.10.26...@standardnotes/scheduler-server@1.10.27) (2022-09-08)

 **Note:** Version bump only for package @standardnotes/scheduler-server
--- a/packages/scheduler/package.json
+++ b/packages/scheduler/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@standardnotes/scheduler-server",
-  "version": "1.10.27",
+  "version": "1.10.28",
  "engines": {
    "node": ">=16.0.0 <17.0.0"
  },
--- a/packages/security/CHANGELOG.md
+++ b/packages/security/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.3.1](https://github.com/standardnotes/server/compare/@standardnotes/security@1.3.0...@standardnotes/security@1.3.1) (2022-09-09)
+
+**Note:** Version bump only for package @standardnotes/security
+
 # [1.3.0](https://github.com/standardnotes/server/compare/@standardnotes/security@1.2.6...@standardnotes/security@1.3.0) (2022-09-05)

 ### Features
--- a/packages/security/package.json
+++ b/packages/security/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@standardnotes/security",
-  "version": "1.3.0",
+  "version": "1.3.1",
  "engines": {
    "node": ">=16.0.0 <17.0.0"
  },
--- a/packages/syncing-server/CHANGELOG.md
+++ b/packages/syncing-server/CHANGELOG.md
@@ -3,6 +3,20 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

+## [1.8.1](https://github.com/standardnotes/syncing-server-js/compare/@standardnotes/syncing-server@1.8.0...@standardnotes/syncing-server@1.8.1) (2022-09-09)
+
+**Note:** Version bump only for package @standardnotes/syncing-server
+
+# [1.8.0](https://github.com/standardnotes/syncing-server-js/compare/@standardnotes/syncing-server@1.7.1...@standardnotes/syncing-server@1.8.0) (2022-09-09)
+
+### Features
+
+* **syncing-server:** add tracking files count in stats ([52cc646](https://github.com/standardnotes/syncing-server-js/commit/52cc6462a66dae3bd6c05f551d4ba661c8a9b8c8))
+
+## [1.7.1](https://github.com/standardnotes/syncing-server-js/compare/@standardnotes/syncing-server@1.7.0...@standardnotes/syncing-server@1.7.1) (2022-09-09)
+
+**Note:** Version bump only for package @standardnotes/syncing-server
+
 # [1.7.0](https://github.com/standardnotes/syncing-server-js/compare/@standardnotes/syncing-server@1.6.70...@standardnotes/syncing-server@1.7.0) (2022-09-09)

 ### Features
--- a/packages/syncing-server/package.json
+++ b/packages/syncing-server/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@standardnotes/syncing-server",
-  "version": "1.7.0",
+  "version": "1.8.1",
  "engines": {
    "node": ">=16.0.0 <17.0.0"
  },
--- a/packages/syncing-server/src/Domain/UseCase/CheckIntegrity/CheckIntegrity.spec.ts
+++ b/packages/syncing-server/src/Domain/UseCase/CheckIntegrity/CheckIntegrity.spec.ts
@@ -37,6 +37,11 @@ describe('CheckIntegrity', () => {
        updated_at_timestamp: 4,
        content_type: ContentType.ItemsKey,
      },
+      {
+        uuid: '5-6-7',
+        updated_at_timestamp: 5,
+        content_type: ContentType.File,
+      },
    ])

    statisticsStore = {} as jest.Mocked<StatisticsStoreInterface>
@@ -67,6 +72,10 @@ describe('CheckIntegrity', () => {
            uuid: '3-4-5',
            updated_at_timestamp: 3,
          },
+          {
+            uuid: '5-6-7',
+            updated_at_timestamp: 5,
+          },
        ],
      }),
    ).toEqual({
@@ -93,6 +102,10 @@ describe('CheckIntegrity', () => {
            uuid: '3-4-5',
            updated_at_timestamp: 3,
          },
+          {
+            uuid: '5-6-7',
+            updated_at_timestamp: 5,
+          },
        ],
      }),
    ).toEqual({
@@ -122,6 +135,10 @@ describe('CheckIntegrity', () => {
            uuid: '2-3-4',
            updated_at_timestamp: 2,
          },
+          {
+            uuid: '5-6-7',
+            updated_at_timestamp: 5,
+          },
        ],
      }),
    ).toEqual({
--- a/packages/syncing-server/src/Domain/UseCase/CheckIntegrity/CheckIntegrity.ts
+++ b/packages/syncing-server/src/Domain/UseCase/CheckIntegrity/CheckIntegrity.ts
@@ -28,15 +28,19 @@ export class CheckIntegrity implements UseCaseInterface {
    const serverItemIntegrityPayloads = await this.itemRepository.findItemsForComputingIntegrityPayloads(dto.userUuid)

    let notesCount = 0
+    let filesCount = 0
    const serverItemIntegrityPayloadsMap = new Map<string, ExtendedIntegrityPayload>()
    for (const serverItemIntegrityPayload of serverItemIntegrityPayloads) {
      serverItemIntegrityPayloadsMap.set(serverItemIntegrityPayload.uuid, serverItemIntegrityPayload)
      if (serverItemIntegrityPayload.content_type === ContentType.Note) {
        notesCount++
      }
+      if (serverItemIntegrityPayload.content_type === ContentType.File) {
+        filesCount++
+      }
    }

-    await this.saveNotesCountStatistics(dto.freeUser, dto.analyticsId, notesCount)
+    await this.saveNotesCountStatistics(dto.freeUser, dto.analyticsId, { notes: notesCount, files: filesCount })

    const clientItemIntegrityPayloadsMap = new Map<string, number>()
    for (const clientItemIntegrityPayload of dto.integrityPayloads) {
@@ -88,7 +92,11 @@ export class CheckIntegrity implements UseCaseInterface {
    }
  }

-  private async saveNotesCountStatistics(freeUser: boolean, analyticsId: number, notesCount: number) {
+  private async saveNotesCountStatistics(
+    freeUser: boolean,
+    analyticsId: number,
+    counts: { notes: number; files: number },
+  ) {
    const integrityWasCheckedToday = await this.analyticsStore.wasActivityDone(
      AnalyticsActivity.CheckingIntegrity,
      analyticsId,
@@ -100,9 +108,14 @@ export class CheckIntegrity implements UseCaseInterface {

      await this.statisticsStore.incrementMeasure(
        freeUser ? StatisticsMeasure.NotesCountFreeUsers : StatisticsMeasure.NotesCountPaidUsers,
-        notesCount,
+        counts.notes,
        [Period.Today, Period.ThisMonth],
      )
+
+      await this.statisticsStore.incrementMeasure(StatisticsMeasure.FilesCount, counts.files, [
+        Period.Today,
+        Period.ThisMonth,
+      ])
    }
  }
 }
--- a/yarn.lock
+++ b/yarn.lock
@@ -1767,6 +1767,7 @@ __metadata:
    "@newrelic/winston-enricher": ^4.0.0
    "@sentry/node": ^7.3.0
    "@standardnotes/analytics": "workspace:*"
+    "@standardnotes/common": "workspace:^"
    "@standardnotes/domain-events": "workspace:*"
    "@standardnotes/domain-events-infra": "workspace:*"
    "@standardnotes/security": "workspace:*"
@@ -1884,7 +1885,7 @@ __metadata:
  languageName: node
  linkType: hard

-"@standardnotes/common@^1.19.1, @standardnotes/common@^1.23.1, @standardnotes/common@workspace:*, @standardnotes/common@workspace:packages/common":
+"@standardnotes/common@^1.19.1, @standardnotes/common@^1.23.1, @standardnotes/common@workspace:*, @standardnotes/common@workspace:^, @standardnotes/common@workspace:packages/common":
  version: 0.0.0-use.local
  resolution: "@standardnotes/common@workspace:packages/common"
  dependencies:
Author	SHA1	Message	Date
standardci	1405c6f260	chore(release): publish new version - @standardnotes/auth-server@1.25.12	2022-09-12 12:26:19 +00:00
Karol Sójko	0dab31f993	fix(auth): allow canceling shared subscription invitation before it was accepted	2022-09-12 14:24:52 +02:00
standardci	8070c70152	chore(release): publish new version - @standardnotes/api-gateway@1.19.1 - @standardnotes/auth-server@1.25.11 - @standardnotes/common@1.32.0 - @standardnotes/domain-events-infra@1.8.9 - @standardnotes/domain-events@2.60.3 - @standardnotes/event-store@1.3.14 - @standardnotes/files-server@1.5.51 - @standardnotes/predicates@1.4.1 - @standardnotes/scheduler-server@1.10.28 - @standardnotes/security@1.3.1 - @standardnotes/syncing-server@1.8.1	2022-09-09 12:04:24 +00:00
Karol Sójko	c3ebb321cf	feat(common): add either and only types	2022-09-09 14:02:25 +02:00
standardci	e54deb594a	chore(release): publish new version - @standardnotes/event-store@1.3.13	2022-09-09 10:13:14 +00:00
Karol Sójko	432d071ec8	fix(event-store): add missing event subscriptions	2022-09-09 12:11:45 +02:00
standardci	b9c06f1f5d	chore(release): publish new version - @standardnotes/analytics@1.28.0 - @standardnotes/api-gateway@1.19.0 - @standardnotes/auth-server@1.25.10 - @standardnotes/syncing-server@1.8.0	2022-09-09 09:46:00 +00:00
Karol Sójko	52cc6462a6	feat(syncing-server): add tracking files count in stats	2022-09-09 11:44:02 +02:00
standardci	35c2afef67	chore(release): publish new version - @standardnotes/analytics@1.27.0 - @standardnotes/api-gateway@1.18.0 - @standardnotes/auth-server@1.25.9 - @standardnotes/syncing-server@1.7.1	2022-09-09 09:02:40 +00:00
Karol Sójko	339c86fca0	fix(api-gateway): add general activity breakdown to yesterdays report stats	2022-09-09 11:01:06 +02:00
Karol Sójko	0afd3de977	feat(api-gateway): add tracking general activity for free and paid users breakdown	2022-09-09 10:59:46 +02:00
standardci	e699569d46	chore(release): publish new version - @standardnotes/api-gateway@1.17.4	2022-09-09 08:51:10 +00:00
Karol Sójko	ced852d9db	fix(api-gateway): add notes count statistics to report	2022-09-09 10:49:15 +02:00