chore(release): publish new version

- @standardnotes/analytics@2.26.24 - @standardnotes/api-gateway@1.75.4 - @standardnotes/auth-server@1.146.4 - @standardnotes/domain-core@1.33.2 - @standardnotes/event-store@1.11.52 - @standardnotes/files-server@1.23.2 - @standardnotes/home-server@1.16.6 - @standardnotes/revisions-server@1.37.3 - @standardnotes/scheduler-server@1.20.56 - @standardnotes/settings@1.21.39 - @standardnotes/syncing-server@1.108.2 - @standardnotes/websockets-server@1.10.53
fix(domain-core): notification paylod to string casting
2026-01-25 11:01:09 -05:00 · 2023-09-25 16:42:43 +00:00 · 2023-09-25 18:24:38 +02:00 · 2023-09-25 15:28:21 +00:00 · 2023-09-25 17:10:30 +02:00 · 2023-09-25 15:52:35 +02:00
56 changed files with 405 additions and 115 deletions
--- a/packages/analytics/CHANGELOG.md
+++ b/packages/analytics/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

+## [2.26.24](https://github.com/standardnotes/server/compare/@standardnotes/analytics@2.26.23...@standardnotes/analytics@2.26.24) (2023-09-25)
+
+**Note:** Version bump only for package @standardnotes/analytics
+
+## [2.26.23](https://github.com/standardnotes/server/compare/@standardnotes/analytics@2.26.22...@standardnotes/analytics@2.26.23) (2023-09-25)
+
+**Note:** Version bump only for package @standardnotes/analytics
+
 ## [2.26.22](https://github.com/standardnotes/server/compare/@standardnotes/analytics@2.26.21...@standardnotes/analytics@2.26.22) (2023-09-25)

 **Note:** Version bump only for package @standardnotes/analytics
--- a/packages/analytics/package.json
+++ b/packages/analytics/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@standardnotes/analytics",
-  "version": "2.26.22",
+  "version": "2.26.24",
  "engines": {
    "node": ">=18.0.0 <21.0.0"
  },
--- a/packages/api-gateway/CHANGELOG.md
+++ b/packages/api-gateway/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

+## [1.75.4](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.75.3...@standardnotes/api-gateway@1.75.4) (2023-09-25)
+
+**Note:** Version bump only for package @standardnotes/api-gateway
+
+## [1.75.3](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.75.2...@standardnotes/api-gateway@1.75.3) (2023-09-25)
+
+**Note:** Version bump only for package @standardnotes/api-gateway
+
 ## [1.75.2](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.75.1...@standardnotes/api-gateway@1.75.2) (2023-09-25)

 **Note:** Version bump only for package @standardnotes/api-gateway
--- a/packages/api-gateway/package.json
+++ b/packages/api-gateway/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@standardnotes/api-gateway",
-  "version": "1.75.2",
+  "version": "1.75.4",
  "engines": {
    "node": ">=18.0.0 <21.0.0"
  },
--- a/packages/auth/CHANGELOG.md
+++ b/packages/auth/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

+## [1.146.4](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.146.3...@standardnotes/auth-server@1.146.4) (2023-09-25)
+
+**Note:** Version bump only for package @standardnotes/auth-server
+
+## [1.146.3](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.146.2...@standardnotes/auth-server@1.146.3) (2023-09-25)
+
+**Note:** Version bump only for package @standardnotes/auth-server
+
 ## [1.146.2](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.146.1...@standardnotes/auth-server@1.146.2) (2023-09-25)

 **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.146.2",
+  "version": "1.146.4",
  "engines": {
    "node": ">=18.0.0 <21.0.0"
  },
--- a/packages/domain-core/CHANGELOG.md
+++ b/packages/domain-core/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.33.2](https://github.com/standardnotes/server/compare/@standardnotes/domain-core@1.33.1...@standardnotes/domain-core@1.33.2) (2023-09-25)
+
+### Bug Fixes
+
+* **domain-core:** notification paylod to string casting ([a02a287](https://github.com/standardnotes/server/commit/a02a28774b6d500200043faefb9ebac3719e7661))
+
+## [1.33.1](https://github.com/standardnotes/server/compare/@standardnotes/domain-core@1.33.0...@standardnotes/domain-core@1.33.1) (2023-09-25)
+
+### Bug Fixes
+
+* refactor the structure of notifications ([#853](https://github.com/standardnotes/server/issues/853)) ([cebab59](https://github.com/standardnotes/server/commit/cebab59a026c6868886e0945787a8ddb0442fbc3))
+
 # [1.33.0](https://github.com/standardnotes/server/compare/@standardnotes/domain-core@1.32.0...@standardnotes/domain-core@1.33.0) (2023-09-21)

 ### Features
--- a/packages/domain-core/package.json
+++ b/packages/domain-core/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@standardnotes/domain-core",
-  "version": "1.33.0",
+  "version": "1.33.2",
  "engines": {
    "node": ">=18.0.0 <21.0.0"
  },
--- a/packages/domain-core/src/Domain/Notification/NotificationPayload.ts
+++ b/packages/domain-core/src/Domain/Notification/NotificationPayload.ts
@@ -4,6 +4,7 @@ import { Result } from '../Core/Result'
 import { NotificationPayloadProps } from './NotificationPayloadProps'
 import { NotificationType } from './NotificationType'
 import { Uuid } from '../Common/Uuid'
+import { NotificationPayloadIdentifierType } from './NotificationPayloadIdentifierType'

 export class NotificationPayload extends ValueObject<NotificationPayloadProps> {
  private constructor(props: NotificationPayloadProps) {
@@ -14,8 +15,10 @@ export class NotificationPayload extends ValueObject<NotificationPayloadProps> {
    return JSON.stringify({
      version: this.props.version,
      type: this.props.type.value,
-      sharedVaultUuid: this.props.sharedVaultUuid.value,
-      itemUuid: this.props.itemUuid ? this.props.itemUuid.value : undefined,
+      primaryIdentifier: this.props.primaryIdentifier.value,
+      primaryIndentifierType: this.props.primaryIndentifierType.value,
+      secondaryIdentifier: this.props.secondaryIdentifier?.value,
+      secondaryIdentifierType: this.props.secondaryIdentifierType?.value,
    })
  }

@@ -29,26 +32,43 @@ export class NotificationPayload extends ValueObject<NotificationPayloadProps> {
      }
      const type = typeOrError.getValue()

-      const sharedVaultUuidOrError = Uuid.create(props.sharedVaultUuid)
-      if (sharedVaultUuidOrError.isFailed()) {
-        return Result.fail<NotificationPayload>(sharedVaultUuidOrError.getError())
+      const primaryIdentifierOrError = Uuid.create(props.primaryIdentifier)
+      if (primaryIdentifierOrError.isFailed()) {
+        return Result.fail<NotificationPayload>(primaryIdentifierOrError.getError())
      }
-      const sharedVaultUuid = sharedVaultUuidOrError.getValue()
+      const primaryIdentifier = primaryIdentifierOrError.getValue()

-      let itemUuid: Uuid | undefined = undefined
-      if (props.itemUuid) {
-        const itemUuidOrError = Uuid.create(props.itemUuid)
-        if (itemUuidOrError.isFailed()) {
-          return Result.fail<NotificationPayload>(itemUuidOrError.getError())
+      const primaryIndentifierTypeOrError = NotificationPayloadIdentifierType.create(props.primaryIndentifierType)
+      if (primaryIndentifierTypeOrError.isFailed()) {
+        return Result.fail<NotificationPayload>(primaryIndentifierTypeOrError.getError())
+      }
+      const primaryIndentifierType = primaryIndentifierTypeOrError.getValue()
+
+      let secondaryIdentifier: Uuid | undefined
+      if (props.secondaryIdentifier) {
+        const secondaryIdentifierOrError = Uuid.create(props.secondaryIdentifier)
+        if (secondaryIdentifierOrError.isFailed()) {
+          return Result.fail<NotificationPayload>(secondaryIdentifierOrError.getError())
        }
-        itemUuid = itemUuidOrError.getValue()
+        secondaryIdentifier = secondaryIdentifierOrError.getValue()
+      }
+
+      let secondaryIdentifierType: NotificationPayloadIdentifierType | undefined
+      if (props.secondaryIdentifierType) {
+        const secondaryIdentifierTypeOrError = NotificationPayloadIdentifierType.create(props.secondaryIdentifierType)
+        if (secondaryIdentifierTypeOrError.isFailed()) {
+          return Result.fail<NotificationPayload>(secondaryIdentifierTypeOrError.getError())
+        }
+        secondaryIdentifierType = secondaryIdentifierTypeOrError.getValue()
      }

      return NotificationPayload.create({
        version: props.version,
        type,
-        sharedVaultUuid,
-        itemUuid,
+        primaryIdentifier,
+        primaryIndentifierType,
+        secondaryIdentifier,
+        secondaryIdentifierType,
      })
    } catch (error) {
      return Result.fail<NotificationPayload>((error as Error).message)
@@ -57,7 +77,7 @@ export class NotificationPayload extends ValueObject<NotificationPayloadProps> {

  static create(props: NotificationPayloadProps): Result<NotificationPayload> {
    if (
-      props.itemUuid === undefined &&
+      props.secondaryIdentifier === undefined &&
      props.type.equals(NotificationType.create(NotificationType.TYPES.SharedVaultItemRemoved).getValue())
    ) {
      return Result.fail<NotificationPayload>(
--- a/packages/domain-core/src/Domain/Notification/NotificationPayloadIdentifierType.ts
+++ b/packages/domain-core/src/Domain/Notification/NotificationPayloadIdentifierType.ts
@@ -0,0 +1,27 @@
+import { Result } from '../Core/Result'
+import { ValueObject } from '../Core/ValueObject'
+import { NotificationPayloadIdentifierTypeProps } from './NotificationPayloadIdentifierTypeProps'
+
+export class NotificationPayloadIdentifierType extends ValueObject<NotificationPayloadIdentifierTypeProps> {
+  static readonly TYPES = {
+    SharedVaultUuid: 'shared_vault_uuid',
+    SharedVaultInviteUuid: 'shared_vault_invite_uuid',
+    ItemUuid: 'item_uuid',
+  }
+
+  private constructor(props: NotificationPayloadIdentifierTypeProps) {
+    super(props)
+  }
+
+  get value(): string {
+    return this.props.value
+  }
+
+  static create(type: string): Result<NotificationPayloadIdentifierType> {
+    if (!Object.values(this.TYPES).includes(type)) {
+      return Result.fail<NotificationPayloadIdentifierType>(`Invalid notification payload identifier type: ${type}`)
+    }
+
+    return Result.ok<NotificationPayloadIdentifierType>(new NotificationPayloadIdentifierType({ value: type }))
+  }
+}
--- a/packages/domain-core/src/Domain/Notification/NotificationPayloadIdentifierTypeProps.ts
+++ b/packages/domain-core/src/Domain/Notification/NotificationPayloadIdentifierTypeProps.ts
@@ -0,0 +1,3 @@
+export interface NotificationPayloadIdentifierTypeProps {
+  value: string
+}
--- a/packages/domain-core/src/Domain/Notification/NotificationPayloadProps.ts
+++ b/packages/domain-core/src/Domain/Notification/NotificationPayloadProps.ts
@@ -1,9 +1,12 @@
 import { Uuid } from '../Common/Uuid'
+import { NotificationPayloadIdentifierType } from './NotificationPayloadIdentifierType'
 import { NotificationType } from './NotificationType'

 export interface NotificationPayloadProps {
  type: NotificationType
-  sharedVaultUuid: Uuid
+  primaryIdentifier: Uuid
+  primaryIndentifierType: NotificationPayloadIdentifierType
+  secondaryIdentifier?: Uuid
+  secondaryIdentifierType?: NotificationPayloadIdentifierType
  version: string
-  itemUuid?: Uuid
 }
--- a/packages/domain-core/src/Domain/Notification/NotificationType.ts
+++ b/packages/domain-core/src/Domain/Notification/NotificationType.ts
@@ -8,7 +8,7 @@ export class NotificationType extends ValueObject<NotificationTypeProps> {
    SelfRemovedFromSharedVault: 'self_removed_from_shared_vault',
    UserRemovedFromSharedVault: 'user_removed_from_shared_vault',
    UserAddedToSharedVault: 'user_added_to_shared_vault',
-    SharedVaultInviteDeclined: 'shared_vault_invite_declined',
+    SharedVaultInviteCanceled: 'shared_vault_invite_canceled',
    SharedVaultFileUploaded: 'shared_vault_file_uploaded',
    SharedVaultFileRemoved: 'shared_vault_file_removed',
  }
--- a/packages/domain-core/src/Domain/index.ts
+++ b/packages/domain-core/src/Domain/index.ts
@@ -48,6 +48,8 @@ export * from './Env/AbstractEnv'
 export * from './Mapping/MapperInterface'

 export * from './Notification/NotificationPayload'
+export * from './Notification/NotificationPayloadIdentifierType'
+export * from './Notification/NotificationPayloadIdentifierTypeProps'
 export * from './Notification/NotificationPayloadProps'
 export * from './Notification/NotificationType'
 export * from './Notification/NotificationTypeProps'
--- a/packages/event-store/CHANGELOG.md
+++ b/packages/event-store/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

+## [1.11.52](https://github.com/standardnotes/server/compare/@standardnotes/event-store@1.11.51...@standardnotes/event-store@1.11.52) (2023-09-25)
+
+**Note:** Version bump only for package @standardnotes/event-store
+
+## [1.11.51](https://github.com/standardnotes/server/compare/@standardnotes/event-store@1.11.50...@standardnotes/event-store@1.11.51) (2023-09-25)
+
+**Note:** Version bump only for package @standardnotes/event-store
+
 ## [1.11.50](https://github.com/standardnotes/server/compare/@standardnotes/event-store@1.11.49...@standardnotes/event-store@1.11.50) (2023-09-25)

 **Note:** Version bump only for package @standardnotes/event-store
--- a/packages/event-store/package.json
+++ b/packages/event-store/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@standardnotes/event-store",
-  "version": "1.11.50",
+  "version": "1.11.52",
  "description": "Event Store Service",
  "private": true,
  "main": "dist/src/index.js",
--- a/packages/files/CHANGELOG.md
+++ b/packages/files/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

+## [1.23.2](https://github.com/standardnotes/files/compare/@standardnotes/files-server@1.23.1...@standardnotes/files-server@1.23.2) (2023-09-25)
+
+**Note:** Version bump only for package @standardnotes/files-server
+
+## [1.23.1](https://github.com/standardnotes/files/compare/@standardnotes/files-server@1.23.0...@standardnotes/files-server@1.23.1) (2023-09-25)
+
+**Note:** Version bump only for package @standardnotes/files-server
+
 # [1.23.0](https://github.com/standardnotes/files/compare/@standardnotes/files-server@1.22.28...@standardnotes/files-server@1.23.0) (2023-09-25)

 ### Features
--- a/packages/files/package.json
+++ b/packages/files/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@standardnotes/files-server",
-  "version": "1.23.0",
+  "version": "1.23.2",
  "engines": {
    "node": ">=18.0.0 <21.0.0"
  },
--- a/packages/home-server/CHANGELOG.md
+++ b/packages/home-server/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

+## [1.16.6](https://github.com/standardnotes/server/compare/@standardnotes/home-server@1.16.5...@standardnotes/home-server@1.16.6) (2023-09-25)
+
+**Note:** Version bump only for package @standardnotes/home-server
+
+## [1.16.5](https://github.com/standardnotes/server/compare/@standardnotes/home-server@1.16.4...@standardnotes/home-server@1.16.5) (2023-09-25)
+
+**Note:** Version bump only for package @standardnotes/home-server
+
 ## [1.16.4](https://github.com/standardnotes/server/compare/@standardnotes/home-server@1.16.3...@standardnotes/home-server@1.16.4) (2023-09-25)

 **Note:** Version bump only for package @standardnotes/home-server
--- a/packages/home-server/package.json
+++ b/packages/home-server/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@standardnotes/home-server",
-  "version": "1.16.4",
+  "version": "1.16.6",
  "engines": {
    "node": ">=18.0.0 <21.0.0"
  },
--- a/packages/revisions/CHANGELOG.md
+++ b/packages/revisions/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

+## [1.37.3](https://github.com/standardnotes/server/compare/@standardnotes/revisions-server@1.37.2...@standardnotes/revisions-server@1.37.3) (2023-09-25)
+
+**Note:** Version bump only for package @standardnotes/revisions-server
+
+## [1.37.2](https://github.com/standardnotes/server/compare/@standardnotes/revisions-server@1.37.1...@standardnotes/revisions-server@1.37.2) (2023-09-25)
+
+**Note:** Version bump only for package @standardnotes/revisions-server
+
 ## [1.37.1](https://github.com/standardnotes/server/compare/@standardnotes/revisions-server@1.37.0...@standardnotes/revisions-server@1.37.1) (2023-09-25)

 **Note:** Version bump only for package @standardnotes/revisions-server
--- a/packages/revisions/package.json
+++ b/packages/revisions/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@standardnotes/revisions-server",
-  "version": "1.37.1",
+  "version": "1.37.3",
  "engines": {
    "node": ">=18.0.0 <21.0.0"
  },
--- a/packages/scheduler/CHANGELOG.md
+++ b/packages/scheduler/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

+## [1.20.56](https://github.com/standardnotes/server/compare/@standardnotes/scheduler-server@1.20.55...@standardnotes/scheduler-server@1.20.56) (2023-09-25)
+
+**Note:** Version bump only for package @standardnotes/scheduler-server
+
+## [1.20.55](https://github.com/standardnotes/server/compare/@standardnotes/scheduler-server@1.20.54...@standardnotes/scheduler-server@1.20.55) (2023-09-25)
+
+**Note:** Version bump only for package @standardnotes/scheduler-server
+
 ## [1.20.54](https://github.com/standardnotes/server/compare/@standardnotes/scheduler-server@1.20.53...@standardnotes/scheduler-server@1.20.54) (2023-09-25)

 **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.20.54",
+  "version": "1.20.56",
  "engines": {
    "node": ">=18.0.0 <21.0.0"
  },
--- a/packages/settings/CHANGELOG.md
+++ b/packages/settings/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

+## [1.21.39](https://github.com/standardnotes/server/compare/@standardnotes/settings@1.21.38...@standardnotes/settings@1.21.39) (2023-09-25)
+
+**Note:** Version bump only for package @standardnotes/settings
+
+## [1.21.38](https://github.com/standardnotes/server/compare/@standardnotes/settings@1.21.37...@standardnotes/settings@1.21.38) (2023-09-25)
+
+**Note:** Version bump only for package @standardnotes/settings
+
 ## [1.21.37](https://github.com/standardnotes/server/compare/@standardnotes/settings@1.21.36...@standardnotes/settings@1.21.37) (2023-09-21)

 **Note:** Version bump only for package @standardnotes/settings
--- a/packages/settings/package.json
+++ b/packages/settings/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@standardnotes/settings",
-  "version": "1.21.37",
+  "version": "1.21.39",
  "engines": {
    "node": ">=18.0.0 <21.0.0"
  },
--- a/packages/syncing-server/CHANGELOG.md
+++ b/packages/syncing-server/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.108.2](https://github.com/standardnotes/syncing-server-js/compare/@standardnotes/syncing-server@1.108.1...@standardnotes/syncing-server@1.108.2) (2023-09-25)
+
+**Note:** Version bump only for package @standardnotes/syncing-server
+
+## [1.108.1](https://github.com/standardnotes/syncing-server-js/compare/@standardnotes/syncing-server@1.108.0...@standardnotes/syncing-server@1.108.1) (2023-09-25)
+
+### Bug Fixes
+
+* refactor the structure of notifications ([#853](https://github.com/standardnotes/syncing-server-js/issues/853)) ([cebab59](https://github.com/standardnotes/syncing-server-js/commit/cebab59a026c6868886e0945787a8ddb0442fbc3))
+* **syncing-server:** another spec ([3d5e747](https://github.com/standardnotes/syncing-server-js/commit/3d5e7475901c5eb7741f461a35febdb996bcfd1d))
+* **syncing-server:** specs ([9446774](https://github.com/standardnotes/syncing-server-js/commit/94467747acca83b954129702111f903c3d1ceab8))
+
 # [1.108.0](https://github.com/standardnotes/syncing-server-js/compare/@standardnotes/syncing-server@1.107.0...@standardnotes/syncing-server@1.108.0) (2023-09-25)

 ### Features
--- a/packages/syncing-server/migrations/mysql-legacy/1695643525793-remove_notifications.ts
+++ b/packages/syncing-server/migrations/mysql-legacy/1695643525793-remove_notifications.ts
@@ -0,0 +1,11 @@
+import { MigrationInterface, QueryRunner } from 'typeorm'
+
+export class RemoveNotifications1695643525793 implements MigrationInterface {
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query('DELETE FROM `notifications`')
+  }
+
+  public async down(): Promise<void> {
+    return
+  }
+}
--- a/packages/syncing-server/migrations/mysql/1695643525793-remove_notifications.ts
+++ b/packages/syncing-server/migrations/mysql/1695643525793-remove_notifications.ts
@@ -0,0 +1,11 @@
+import { MigrationInterface, QueryRunner } from 'typeorm'
+
+export class RemoveNotifications1695643525793 implements MigrationInterface {
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query('DELETE FROM `notifications`')
+  }
+
+  public async down(): Promise<void> {
+    return
+  }
+}
--- a/packages/syncing-server/migrations/sqlite/1695643525793-remove_notifications.ts
+++ b/packages/syncing-server/migrations/sqlite/1695643525793-remove_notifications.ts
@@ -0,0 +1,11 @@
+import { MigrationInterface, QueryRunner } from 'typeorm'
+
+export class RemoveNotifications1695643525793 implements MigrationInterface {
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query('DELETE FROM `notifications`')
+  }
+
+  public async down(): Promise<void> {
+    return
+  }
+}
--- a/packages/syncing-server/package.json
+++ b/packages/syncing-server/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@standardnotes/syncing-server",
-  "version": "1.108.0",
+  "version": "1.108.2",
  "engines": {
    "node": ">=18.0.0 <21.0.0"
  },
--- a/packages/syncing-server/src/Bootstrap/Container.ts
+++ b/packages/syncing-server/src/Bootstrap/Container.ts
@@ -103,7 +103,7 @@ import { TypeORMSharedVaultInviteRepository } from '../Infra/TypeORM/TypeORMShar
 import { UpdateSharedVaultInvite } from '../Domain/UseCase/SharedVaults/UpdateSharedVaultInvite/UpdateSharedVaultInvite'
 import { AcceptInviteToSharedVault } from '../Domain/UseCase/SharedVaults/AcceptInviteToSharedVault/AcceptInviteToSharedVault'
 import { AddUserToSharedVault } from '../Domain/UseCase/SharedVaults/AddUserToSharedVault/AddUserToSharedVault'
-import { DeclineInviteToSharedVault } from '../Domain/UseCase/SharedVaults/DeclineInviteToSharedVault/DeclineInviteToSharedVault'
+import { CancelInviteToSharedVault } from '../Domain/UseCase/SharedVaults/CancelInviteToSharedVault/CancelInviteToSharedVault'
 import { DeleteSharedVaultInvitesToUser } from '../Domain/UseCase/SharedVaults/DeleteSharedVaultInvitesToUser/DeleteSharedVaultInvitesToUser'
 import { DeleteSharedVaultInvitesSentByUser } from '../Domain/UseCase/SharedVaults/DeleteSharedVaultInvitesSentByUser/DeleteSharedVaultInvitesSentByUser'
 import { GetSharedVaultInvitesSentByUser } from '../Domain/UseCase/SharedVaults/GetSharedVaultInvitesSentByUser/GetSharedVaultInvitesSentByUser'
@@ -749,9 +749,9 @@ export class ContainerConfigLoader {
        ),
      )
    container
-      .bind<DeclineInviteToSharedVault>(TYPES.Sync_DeclineInviteToSharedVault)
+      .bind<CancelInviteToSharedVault>(TYPES.Sync_DeclineInviteToSharedVault)
      .toConstantValue(
-        new DeclineInviteToSharedVault(
+        new CancelInviteToSharedVault(
          container.get<SharedVaultInviteRepositoryInterface>(TYPES.Sync_SharedVaultInviteRepository),
          container.get<AddNotificationForUser>(TYPES.Sync_AddNotificationForUser),
        ),
@@ -918,7 +918,7 @@ export class ContainerConfigLoader {
          container.get<SharedVaultUserRepositoryInterface>(TYPES.Sync_SharedVaultUserRepository),
          container.get<SharedVaultInviteRepositoryInterface>(TYPES.Sync_SharedVaultInviteRepository),
          container.get<RemoveUserFromSharedVault>(TYPES.Sync_RemoveSharedVaultUser),
-          container.get<DeclineInviteToSharedVault>(TYPES.Sync_DeclineInviteToSharedVault),
+          container.get<CancelInviteToSharedVault>(TYPES.Sync_DeclineInviteToSharedVault),
          container.get<DomainEventFactoryInterface>(TYPES.Sync_DomainEventFactory),
          container.get<DomainEventPublisherInterface>(TYPES.Sync_DomainEventPublisher),
          container.get<TransferSharedVault>(TYPES.Sync_TransferSharedVault),
--- a/packages/syncing-server/src/Domain/Handler/SharedVaultFileMovedEventHandler.ts
+++ b/packages/syncing-server/src/Domain/Handler/SharedVaultFileMovedEventHandler.ts
@@ -1,5 +1,10 @@
 import { DomainEventHandlerInterface, SharedVaultFileMovedEvent } from '@standardnotes/domain-events'
-import { NotificationPayload, NotificationType, Uuid } from '@standardnotes/domain-core'
+import {
+  NotificationPayload,
+  NotificationPayloadIdentifierType,
+  NotificationType,
+  Uuid,
+} from '@standardnotes/domain-core'
 import { Logger } from 'winston'

 import { UpdateStorageQuotaUsedInSharedVault } from '../UseCase/SharedVaults/UpdateStorageQuotaUsedInSharedVault/UpdateStorageQuotaUsedInSharedVault'
@@ -34,7 +39,10 @@ export class SharedVaultFileMovedEventHandler implements DomainEventHandlerInter
      }

      const notificationPayload = NotificationPayload.create({
-        sharedVaultUuid: sharedVaultUuid,
+        primaryIdentifier: sharedVaultUuid,
+        primaryIndentifierType: NotificationPayloadIdentifierType.create(
+          NotificationPayloadIdentifierType.TYPES.SharedVaultUuid,
+        ).getValue(),
        type: NotificationType.create(NotificationType.TYPES.SharedVaultFileRemoved).getValue(),
        version: '1.0',
      }).getValue()
@@ -71,7 +79,10 @@ export class SharedVaultFileMovedEventHandler implements DomainEventHandlerInter
      }

      const notificationPayload = NotificationPayload.create({
-        sharedVaultUuid: sharedVaultUuid,
+        primaryIdentifier: sharedVaultUuid,
+        primaryIndentifierType: NotificationPayloadIdentifierType.create(
+          NotificationPayloadIdentifierType.TYPES.SharedVaultUuid,
+        ).getValue(),
        type: NotificationType.create(NotificationType.TYPES.SharedVaultFileUploaded).getValue(),
        version: '1.0',
      }).getValue()
--- a/packages/syncing-server/src/Domain/Handler/SharedVaultFileRemovedEventHandler.ts
+++ b/packages/syncing-server/src/Domain/Handler/SharedVaultFileRemovedEventHandler.ts
@@ -1,5 +1,10 @@
 import { DomainEventHandlerInterface, SharedVaultFileRemovedEvent } from '@standardnotes/domain-events'
-import { NotificationPayload, NotificationType, Uuid } from '@standardnotes/domain-core'
+import {
+  NotificationPayload,
+  NotificationPayloadIdentifierType,
+  NotificationType,
+  Uuid,
+} from '@standardnotes/domain-core'
 import { Logger } from 'winston'

 import { UpdateStorageQuotaUsedInSharedVault } from '../UseCase/SharedVaults/UpdateStorageQuotaUsedInSharedVault/UpdateStorageQuotaUsedInSharedVault'
@@ -33,7 +38,10 @@ export class SharedVaultFileRemovedEventHandler implements DomainEventHandlerInt
    }

    const notificationPayload = NotificationPayload.create({
-      sharedVaultUuid,
+      primaryIdentifier: sharedVaultUuid,
+      primaryIndentifierType: NotificationPayloadIdentifierType.create(
+        NotificationPayloadIdentifierType.TYPES.SharedVaultUuid,
+      ).getValue(),
      type: NotificationType.create(NotificationType.TYPES.SharedVaultFileRemoved).getValue(),
      version: '1.0',
    }).getValue()
--- a/packages/syncing-server/src/Domain/Handler/SharedVaultFileUploadedEventHandler.ts
+++ b/packages/syncing-server/src/Domain/Handler/SharedVaultFileUploadedEventHandler.ts
@@ -1,5 +1,10 @@
 import { DomainEventHandlerInterface, SharedVaultFileUploadedEvent } from '@standardnotes/domain-events'
-import { NotificationPayload, NotificationType, Uuid } from '@standardnotes/domain-core'
+import {
+  NotificationPayload,
+  NotificationPayloadIdentifierType,
+  NotificationType,
+  Uuid,
+} from '@standardnotes/domain-core'
 import { Logger } from 'winston'

 import { UpdateStorageQuotaUsedInSharedVault } from '../UseCase/SharedVaults/UpdateStorageQuotaUsedInSharedVault/UpdateStorageQuotaUsedInSharedVault'
@@ -33,7 +38,10 @@ export class SharedVaultFileUploadedEventHandler implements DomainEventHandlerIn
    }

    const notificationPayload = NotificationPayload.create({
-      sharedVaultUuid,
+      primaryIdentifier: sharedVaultUuid,
+      primaryIndentifierType: NotificationPayloadIdentifierType.create(
+        NotificationPayloadIdentifierType.TYPES.SharedVaultUuid,
+      ).getValue(),
      type: NotificationType.create(NotificationType.TYPES.SharedVaultFileUploaded).getValue(),
      version: '1.0',
    }).getValue()
--- a/packages/syncing-server/src/Domain/Notifications/Notification.spec.ts
+++ b/packages/syncing-server/src/Domain/Notifications/Notification.spec.ts
@@ -1,11 +1,20 @@
-import { NotificationPayload, NotificationType, Timestamps, Uuid } from '@standardnotes/domain-core'
+import {
+  NotificationPayload,
+  NotificationPayloadIdentifierType,
+  NotificationType,
+  Timestamps,
+  Uuid,
+} from '@standardnotes/domain-core'

 import { Notification } from './Notification'

 describe('Notification', () => {
  it('should create an entity', () => {
    const payload = NotificationPayload.create({
-      sharedVaultUuid: Uuid.create('0e8c3c7e-3f1a-4f7a-9b5a-5b2b0a7d4b1e').getValue(),
+      primaryIdentifier: Uuid.create('0e8c3c7e-3f1a-4f7a-9b5a-5b2b0a7d4b1e').getValue(),
+      primaryIndentifierType: NotificationPayloadIdentifierType.create(
+        NotificationPayloadIdentifierType.TYPES.SharedVaultUuid,
+      ).getValue(),
      type: NotificationType.create(NotificationType.TYPES.SelfRemovedFromSharedVault).getValue(),
      version: '1.0',
    }).getValue()
--- a/packages/syncing-server/src/Domain/UseCase/Messaging/AddNotificationForUser/AddNotificationForUser.spec.ts
+++ b/packages/syncing-server/src/Domain/UseCase/Messaging/AddNotificationForUser/AddNotificationForUser.spec.ts
@@ -1,5 +1,11 @@
 import { TimerInterface } from '@standardnotes/time'
-import { NotificationPayload, NotificationType, Result, Uuid } from '@standardnotes/domain-core'
+import {
+  NotificationPayload,
+  NotificationPayloadIdentifierType,
+  NotificationType,
+  Result,
+  Uuid,
+} from '@standardnotes/domain-core'

 import { NotificationRepositoryInterface } from '../../../Notifications/NotificationRepositoryInterface'
 import { Notification } from '../../../Notifications/Notification'
@@ -28,7 +34,10 @@ describe('AddNotificationForUser', () => {
    timer.getTimestampInMicroseconds = jest.fn().mockReturnValue(123456789)

    payload = NotificationPayload.create({
-      sharedVaultUuid: Uuid.create('0e8c3c7e-3f1a-4f7a-9b5a-5b2b0a7d4b1e').getValue(),
+      primaryIdentifier: Uuid.create('0e8c3c7e-3f1a-4f7a-9b5a-5b2b0a7d4b1e').getValue(),
+      primaryIndentifierType: NotificationPayloadIdentifierType.create(
+        NotificationPayloadIdentifierType.TYPES.SharedVaultUuid,
+      ).getValue(),
      type: NotificationType.create(NotificationType.TYPES.SelfRemovedFromSharedVault).getValue(),
      version: '1.0',
    }).getValue()
--- a/packages/syncing-server/src/Domain/UseCase/Messaging/AddNotificationsForUsers/AddNotificationsForUsers.spec.ts
+++ b/packages/syncing-server/src/Domain/UseCase/Messaging/AddNotificationsForUsers/AddNotificationsForUsers.spec.ts
@@ -6,6 +6,7 @@ import {
  NotificationPayload,
  NotificationType,
  SharedVaultUser,
+  NotificationPayloadIdentifierType,
 } from '@standardnotes/domain-core'
 import { SharedVaultUserRepositoryInterface } from '../../../SharedVault/User/SharedVaultUserRepositoryInterface'
 import { AddNotificationForUser } from '../AddNotificationForUser/AddNotificationForUser'
@@ -35,7 +36,10 @@ describe('AddNotificationsForUsers', () => {
    addNotificationForUser.execute = jest.fn().mockResolvedValue(Result.ok())

    payload = NotificationPayload.create({
-      sharedVaultUuid: Uuid.create('0e8c3c7e-3f1a-4f7a-9b5a-5b2b0a7d4b1e').getValue(),
+      primaryIdentifier: Uuid.create('0e8c3c7e-3f1a-4f7a-9b5a-5b2b0a7d4b1e').getValue(),
+      primaryIndentifierType: NotificationPayloadIdentifierType.create(
+        NotificationPayloadIdentifierType.TYPES.SharedVaultUuid,
+      ).getValue(),
      type: NotificationType.create(NotificationType.TYPES.SharedVaultFileUploaded).getValue(),
      version: '1.0',
    }).getValue()
--- a/packages/syncing-server/src/Domain/UseCase/Messaging/RemoveNotificationsForUser/RemoveNotificationsForUser.spec.ts
+++ b/packages/syncing-server/src/Domain/UseCase/Messaging/RemoveNotificationsForUser/RemoveNotificationsForUser.spec.ts
@@ -1,4 +1,10 @@
-import { NotificationPayload, NotificationType, Timestamps, Uuid } from '@standardnotes/domain-core'
+import {
+  NotificationPayload,
+  NotificationPayloadIdentifierType,
+  NotificationType,
+  Timestamps,
+  Uuid,
+} from '@standardnotes/domain-core'

 import { NotificationRepositoryInterface } from '../../../Notifications/NotificationRepositoryInterface'
 import { RemoveNotificationsForUser } from './RemoveNotificationsForUser'
@@ -15,8 +21,14 @@ describe('RemoveNotificationsForUser', () => {
      userUuid: Uuid.create('00000000-0000-0000-0000-000000000000').getValue(),
      type: NotificationType.create(NotificationType.TYPES.SharedVaultItemRemoved).getValue(),
      payload: NotificationPayload.create({
-        itemUuid: Uuid.create('00000000-0000-0000-0000-000000000000').getValue(),
-        sharedVaultUuid: Uuid.create('00000000-0000-0000-0000-000000000000').getValue(),
+        primaryIdentifier: Uuid.create('00000000-0000-0000-0000-000000000000').getValue(),
+        primaryIndentifierType: NotificationPayloadIdentifierType.create(
+          NotificationPayloadIdentifierType.TYPES.SharedVaultUuid,
+        ).getValue(),
+        secondaryIdentifier: Uuid.create('00000000-0000-0000-0000-000000000000').getValue(),
+        secondaryIdentifierType: NotificationPayloadIdentifierType.create(
+          NotificationPayloadIdentifierType.TYPES.ItemUuid,
+        ).getValue(),
        type: NotificationType.create(NotificationType.TYPES.SharedVaultItemRemoved).getValue(),
        version: '1.0',
      }).getValue(),
--- a/packages/syncing-server/src/Domain/UseCase/SharedVaults/AddUserToSharedVault/AddUserToSharedVault.ts
+++ b/packages/syncing-server/src/Domain/UseCase/SharedVaults/AddUserToSharedVault/AddUserToSharedVault.ts
@@ -1,5 +1,6 @@
 import {
  NotificationPayload,
+  NotificationPayloadIdentifierType,
  NotificationType,
  Result,
  SharedVaultUser,
@@ -73,7 +74,10 @@ export class AddUserToSharedVault implements UseCaseInterface<SharedVaultUser> {
    await this.sharedVaultUserRepository.save(sharedVaultUser)

    const notificationPayloadOrError = NotificationPayload.create({
-      sharedVaultUuid: sharedVaultUuid,
+      primaryIdentifier: sharedVaultUuid,
+      primaryIndentifierType: NotificationPayloadIdentifierType.create(
+        NotificationPayloadIdentifierType.TYPES.SharedVaultUuid,
+      ).getValue(),
      type: NotificationType.create(NotificationType.TYPES.UserAddedToSharedVault).getValue(),
      version: '1.0',
    })
--- a/packages/syncing-server/src/Domain/UseCase/SharedVaults/DeclineInviteToSharedVault/DeclineInviteToSharedVault.spec.ts
+++ b/packages/syncing-server/src/Domain/UseCase/SharedVaults/DeclineInviteToSharedVault/DeclineInviteToSharedVault.spec.ts
@@ -1,15 +1,15 @@
 import { NotificationPayload, Result, SharedVaultUserPermission, Timestamps, Uuid } from '@standardnotes/domain-core'
 import { SharedVaultInviteRepositoryInterface } from '../../../SharedVault/User/Invite/SharedVaultInviteRepositoryInterface'
-import { DeclineInviteToSharedVault } from './DeclineInviteToSharedVault'
+import { CancelInviteToSharedVault } from './CancelInviteToSharedVault'
 import { SharedVaultInvite } from '../../../SharedVault/User/Invite/SharedVaultInvite'
 import { AddNotificationForUser } from '../../Messaging/AddNotificationForUser/AddNotificationForUser'

-describe('DeclineInviteToSharedVault', () => {
+describe('CancelInviteToSharedVault', () => {
  let sharedVaultInviteRepository: SharedVaultInviteRepositoryInterface
  let invite: SharedVaultInvite
  let addNotificationForUser: AddNotificationForUser

-  const createUseCase = () => new DeclineInviteToSharedVault(sharedVaultInviteRepository, addNotificationForUser)
+  const createUseCase = () => new CancelInviteToSharedVault(sharedVaultInviteRepository, addNotificationForUser)

  beforeEach(() => {
    invite = SharedVaultInvite.create({
--- a/packages/syncing-server/src/Domain/UseCase/SharedVaults/DeclineInviteToSharedVault/DeclineInviteToSharedVault.ts
+++ b/packages/syncing-server/src/Domain/UseCase/SharedVaults/DeclineInviteToSharedVault/DeclineInviteToSharedVault.ts
@@ -1,16 +1,23 @@
-import { NotificationPayload, NotificationType, Result, UseCaseInterface, Uuid } from '@standardnotes/domain-core'
+import {
+  NotificationPayload,
+  NotificationPayloadIdentifierType,
+  NotificationType,
+  Result,
+  UseCaseInterface,
+  Uuid,
+} from '@standardnotes/domain-core'

-import { DeclineInviteToSharedVaultDTO } from './DeclineInviteToSharedVaultDTO'
+import { CancelInviteToSharedVaultDTO } from './CancelInviteToSharedVaultDTO'
 import { SharedVaultInviteRepositoryInterface } from '../../../SharedVault/User/Invite/SharedVaultInviteRepositoryInterface'
 import { AddNotificationForUser } from '../../Messaging/AddNotificationForUser/AddNotificationForUser'

-export class DeclineInviteToSharedVault implements UseCaseInterface<void> {
+export class CancelInviteToSharedVault implements UseCaseInterface<void> {
  constructor(
    private sharedVaultInviteRepository: SharedVaultInviteRepositoryInterface,
    private addNotificationForUser: AddNotificationForUser,
  ) {}

-  async execute(dto: DeclineInviteToSharedVaultDTO): Promise<Result<void>> {
+  async execute(dto: CancelInviteToSharedVaultDTO): Promise<Result<void>> {
    const inviteUuidOrError = Uuid.create(dto.inviteUuid)
    if (inviteUuidOrError.isFailed()) {
      return Result.fail(inviteUuidOrError.getError())
@@ -35,8 +42,15 @@ export class DeclineInviteToSharedVault implements UseCaseInterface<void> {
    await this.sharedVaultInviteRepository.remove(invite)

    const notificationPayloadOrError = NotificationPayload.create({
-      sharedVaultUuid: invite.props.sharedVaultUuid,
-      type: NotificationType.create(NotificationType.TYPES.SharedVaultInviteDeclined).getValue(),
+      primaryIdentifier: Uuid.create(invite.id.toString()).getValue(),
+      primaryIndentifierType: NotificationPayloadIdentifierType.create(
+        NotificationPayloadIdentifierType.TYPES.SharedVaultInviteUuid,
+      ).getValue(),
+      secondaryIdentifier: invite.props.sharedVaultUuid,
+      secondaryIdentifierType: NotificationPayloadIdentifierType.create(
+        NotificationPayloadIdentifierType.TYPES.SharedVaultUuid,
+      ).getValue(),
+      type: NotificationType.create(NotificationType.TYPES.SharedVaultInviteCanceled).getValue(),
      version: '1.0',
    })
    if (notificationPayloadOrError.isFailed()) {
@@ -46,7 +60,7 @@ export class DeclineInviteToSharedVault implements UseCaseInterface<void> {

    const result = await this.addNotificationForUser.execute({
      userUuid: invite.props.userUuid.value,
-      type: NotificationType.TYPES.SharedVaultInviteDeclined,
+      type: NotificationType.TYPES.SharedVaultInviteCanceled,
      payload: notificationPayload,
      version: '1.0',
    })
--- a/packages/syncing-server/src/Domain/UseCase/SharedVaults/CancelInviteToSharedVault/CancelInviteToSharedVaultDTO.ts
+++ b/packages/syncing-server/src/Domain/UseCase/SharedVaults/CancelInviteToSharedVault/CancelInviteToSharedVaultDTO.ts
@@ -0,0 +1,4 @@
+export interface CancelInviteToSharedVaultDTO {
+  inviteUuid: string
+  userUuid: string
+}
--- a/packages/syncing-server/src/Domain/UseCase/SharedVaults/DeclineInviteToSharedVault/DeclineInviteToSharedVaultDTO.ts
+++ b/packages/syncing-server/src/Domain/UseCase/SharedVaults/DeclineInviteToSharedVault/DeclineInviteToSharedVaultDTO.ts
@@ -1,4 +0,0 @@
-export interface DeclineInviteToSharedVaultDTO {
-  inviteUuid: string
-  userUuid: string
-}
--- a/packages/syncing-server/src/Domain/UseCase/SharedVaults/DeleteSharedVault/DeleteSharedVault.spec.ts
+++ b/packages/syncing-server/src/Domain/UseCase/SharedVaults/DeleteSharedVault/DeleteSharedVault.spec.ts
@@ -7,7 +7,7 @@ import { SharedVaultUserRepositoryInterface } from '../../../SharedVault/User/Sh
 import { DeleteSharedVault } from './DeleteSharedVault'
 import { SharedVault } from '../../../SharedVault/SharedVault'
 import { RemoveUserFromSharedVault } from '../RemoveUserFromSharedVault/RemoveUserFromSharedVault'
-import { DeclineInviteToSharedVault } from '../DeclineInviteToSharedVault/DeclineInviteToSharedVault'
+import { CancelInviteToSharedVault } from '../CancelInviteToSharedVault/CancelInviteToSharedVault'
 import { SharedVaultInvite } from '../../../SharedVault/User/Invite/SharedVaultInvite'
 import { DomainEventFactoryInterface } from '../../../Event/DomainEventFactoryInterface'
 import { TransferSharedVault } from '../TransferSharedVault/TransferSharedVault'
@@ -17,7 +17,7 @@ describe('DeleteSharedVault', () => {
  let sharedVaultUserRepository: SharedVaultUserRepositoryInterface
  let sharedVaultInviteRepository: SharedVaultInviteRepositoryInterface
  let removeUserFromSharedVault: RemoveUserFromSharedVault
-  let declineInviteToSharedVault: DeclineInviteToSharedVault
+  let cancelInviteToSharedVault: CancelInviteToSharedVault
  let sharedVault: SharedVault
  let sharedVaultUser: SharedVaultUser
  let sharedVaultInvite: SharedVaultInvite
@@ -31,7 +31,7 @@ describe('DeleteSharedVault', () => {
      sharedVaultUserRepository,
      sharedVaultInviteRepository,
      removeUserFromSharedVault,
-      declineInviteToSharedVault,
+      cancelInviteToSharedVault,
      domainEventFactory,
      domainEventPublisher,
      transferSharedVault,
@@ -72,8 +72,8 @@ describe('DeleteSharedVault', () => {
    sharedVaultInviteRepository = {} as jest.Mocked<SharedVaultInviteRepositoryInterface>
    sharedVaultInviteRepository.findBySharedVaultUuid = jest.fn().mockReturnValue([sharedVaultInvite])

-    declineInviteToSharedVault = {} as jest.Mocked<DeclineInviteToSharedVault>
-    declineInviteToSharedVault.execute = jest.fn().mockReturnValue(Result.ok())
+    cancelInviteToSharedVault = {} as jest.Mocked<CancelInviteToSharedVault>
+    cancelInviteToSharedVault.execute = jest.fn().mockReturnValue(Result.ok())

    removeUserFromSharedVault = {} as jest.Mocked<RemoveUserFromSharedVault>
    removeUserFromSharedVault.execute = jest.fn().mockReturnValue(Result.ok())
@@ -100,7 +100,7 @@ describe('DeleteSharedVault', () => {

    expect(result.isFailed()).toBeFalsy()
    expect(sharedVaultRepository.remove).toHaveBeenCalled()
-    expect(declineInviteToSharedVault.execute).toHaveBeenCalled()
+    expect(cancelInviteToSharedVault.execute).toHaveBeenCalled()
    expect(removeUserFromSharedVault.execute).toHaveBeenCalled()
  })

@@ -115,7 +115,7 @@ describe('DeleteSharedVault', () => {

    expect(result.isFailed()).toBeTruthy()
    expect(sharedVaultRepository.remove).not.toHaveBeenCalled()
-    expect(declineInviteToSharedVault.execute).not.toHaveBeenCalled()
+    expect(cancelInviteToSharedVault.execute).not.toHaveBeenCalled()
    expect(removeUserFromSharedVault.execute).not.toHaveBeenCalled()
  })

@@ -129,7 +129,7 @@ describe('DeleteSharedVault', () => {

    expect(result.isFailed()).toBeTruthy()
    expect(sharedVaultRepository.remove).not.toHaveBeenCalled()
-    expect(declineInviteToSharedVault.execute).not.toHaveBeenCalled()
+    expect(cancelInviteToSharedVault.execute).not.toHaveBeenCalled()
    expect(removeUserFromSharedVault.execute).not.toHaveBeenCalled()
  })

@@ -143,7 +143,7 @@ describe('DeleteSharedVault', () => {

    expect(result.isFailed()).toBeTruthy()
    expect(sharedVaultRepository.remove).not.toHaveBeenCalled()
-    expect(declineInviteToSharedVault.execute).not.toHaveBeenCalled()
+    expect(cancelInviteToSharedVault.execute).not.toHaveBeenCalled()
    expect(removeUserFromSharedVault.execute).not.toHaveBeenCalled()
  })

@@ -163,7 +163,7 @@ describe('DeleteSharedVault', () => {

    expect(result.isFailed()).toBeTruthy()
    expect(sharedVaultRepository.remove).not.toHaveBeenCalled()
-    expect(declineInviteToSharedVault.execute).not.toHaveBeenCalled()
+    expect(cancelInviteToSharedVault.execute).not.toHaveBeenCalled()
    expect(removeUserFromSharedVault.execute).not.toHaveBeenCalled()
  })

@@ -182,7 +182,7 @@ describe('DeleteSharedVault', () => {
  })

  it('should return error if declining invite to shared vault fails', async () => {
-    declineInviteToSharedVault.execute = jest.fn().mockReturnValue(Result.fail('failed'))
+    cancelInviteToSharedVault.execute = jest.fn().mockReturnValue(Result.fail('failed'))
    const useCase = createUseCase()

    const result = await useCase.execute({
@@ -192,7 +192,7 @@ describe('DeleteSharedVault', () => {

    expect(result.isFailed()).toBeTruthy()
    expect(sharedVaultRepository.remove).not.toHaveBeenCalled()
-    expect(declineInviteToSharedVault.execute).toHaveBeenCalled()
+    expect(cancelInviteToSharedVault.execute).toHaveBeenCalled()
    expect(removeUserFromSharedVault.execute).not.toHaveBeenCalled()
  })

@@ -211,7 +211,7 @@ describe('DeleteSharedVault', () => {

      expect(result.isFailed()).toBeFalsy()
      expect(sharedVaultRepository.remove).not.toHaveBeenCalled()
-      expect(declineInviteToSharedVault.execute).toHaveBeenCalled()
+      expect(cancelInviteToSharedVault.execute).toHaveBeenCalled()
      expect(removeUserFromSharedVault.execute).toHaveBeenCalled()
      expect(transferSharedVault.execute).toHaveBeenCalled()
    })
@@ -227,7 +227,7 @@ describe('DeleteSharedVault', () => {

      expect(result.isFailed()).toBeTruthy()
      expect(sharedVaultRepository.remove).not.toHaveBeenCalled()
-      expect(declineInviteToSharedVault.execute).toHaveBeenCalled()
+      expect(cancelInviteToSharedVault.execute).toHaveBeenCalled()
      expect(removeUserFromSharedVault.execute).not.toHaveBeenCalled()
      expect(transferSharedVault.execute).toHaveBeenCalled()
    })
@@ -243,7 +243,7 @@ describe('DeleteSharedVault', () => {

      expect(result.isFailed()).toBeTruthy()
      expect(sharedVaultRepository.remove).not.toHaveBeenCalled()
-      expect(declineInviteToSharedVault.execute).toHaveBeenCalled()
+      expect(cancelInviteToSharedVault.execute).toHaveBeenCalled()
      expect(removeUserFromSharedVault.execute).toHaveBeenCalled()
      expect(transferSharedVault.execute).toHaveBeenCalled()
    })
--- a/packages/syncing-server/src/Domain/UseCase/SharedVaults/DeleteSharedVault/DeleteSharedVault.ts
+++ b/packages/syncing-server/src/Domain/UseCase/SharedVaults/DeleteSharedVault/DeleteSharedVault.ts
@@ -6,7 +6,7 @@ import { SharedVaultRepositoryInterface } from '../../../SharedVault/SharedVault
 import { SharedVaultUserRepositoryInterface } from '../../../SharedVault/User/SharedVaultUserRepositoryInterface'
 import { SharedVaultInviteRepositoryInterface } from '../../../SharedVault/User/Invite/SharedVaultInviteRepositoryInterface'
 import { RemoveUserFromSharedVault } from '../RemoveUserFromSharedVault/RemoveUserFromSharedVault'
-import { DeclineInviteToSharedVault } from '../DeclineInviteToSharedVault/DeclineInviteToSharedVault'
+import { CancelInviteToSharedVault } from '../CancelInviteToSharedVault/CancelInviteToSharedVault'
 import { DomainEventFactoryInterface } from '../../../Event/DomainEventFactoryInterface'
 import { TransferSharedVault } from '../TransferSharedVault/TransferSharedVault'

@@ -16,7 +16,7 @@ export class DeleteSharedVault implements UseCaseInterface<void> {
    private sharedVaultUserRepository: SharedVaultUserRepositoryInterface,
    private sharedVaultInviteRepository: SharedVaultInviteRepositoryInterface,
    private removeUserFromSharedVault: RemoveUserFromSharedVault,
-    private declineInviteToSharedVault: DeclineInviteToSharedVault,
+    private cancelInviteToSharedVault: CancelInviteToSharedVault,
    private domainEventFactory: DomainEventFactoryInterface,
    private domainEventPublisher: DomainEventPublisherInterface,
    private transferSharedVault: TransferSharedVault,
@@ -46,7 +46,7 @@ export class DeleteSharedVault implements UseCaseInterface<void> {

    const sharedVaultInvites = await this.sharedVaultInviteRepository.findBySharedVaultUuid(sharedVaultUuid)
    for (const sharedVaultInvite of sharedVaultInvites) {
-      const result = await this.declineInviteToSharedVault.execute({
+      const result = await this.cancelInviteToSharedVault.execute({
        inviteUuid: sharedVaultInvite.id.toString(),
        userUuid: sharedVaultInvite.props.userUuid.value,
      })
--- a/packages/syncing-server/src/Domain/UseCase/SharedVaults/DeleteSharedVaultInvitesSentByUser/DeleteSharedVaultInvitesSentByUser.spec.ts
+++ b/packages/syncing-server/src/Domain/UseCase/SharedVaults/DeleteSharedVaultInvitesSentByUser/DeleteSharedVaultInvitesSentByUser.spec.ts
@@ -1,16 +1,16 @@
 import { Result, SharedVaultUserPermission, Timestamps, Uuid } from '@standardnotes/domain-core'
 import { SharedVaultInviteRepositoryInterface } from '../../../SharedVault/User/Invite/SharedVaultInviteRepositoryInterface'
-import { DeclineInviteToSharedVault } from '../DeclineInviteToSharedVault/DeclineInviteToSharedVault'
+import { CancelInviteToSharedVault } from '../CancelInviteToSharedVault/CancelInviteToSharedVault'
 import { DeleteSharedVaultInvitesSentByUser } from './DeleteSharedVaultInvitesSentByUser'
 import { SharedVaultInvite } from '../../../SharedVault/User/Invite/SharedVaultInvite'

 describe('DeleteSharedVaultInvitesSentByUser', () => {
  let sharedVaultInviteRepository: SharedVaultInviteRepositoryInterface
-  let declineInviteToSharedVault: DeclineInviteToSharedVault
+  let cancelInviteToSharedVault: CancelInviteToSharedVault
  let sharedVaultInvite: SharedVaultInvite

  const createUseCase = () =>
-    new DeleteSharedVaultInvitesSentByUser(sharedVaultInviteRepository, declineInviteToSharedVault)
+    new DeleteSharedVaultInvitesSentByUser(sharedVaultInviteRepository, cancelInviteToSharedVault)

  beforeEach(() => {
    sharedVaultInvite = SharedVaultInvite.create({
@@ -26,8 +26,8 @@ describe('DeleteSharedVaultInvitesSentByUser', () => {
    sharedVaultInviteRepository.findBySenderUuidAndSharedVaultUuid = jest.fn().mockReturnValue([sharedVaultInvite])
    sharedVaultInviteRepository.findBySenderUuid = jest.fn().mockReturnValue([sharedVaultInvite])

-    declineInviteToSharedVault = {} as jest.Mocked<DeclineInviteToSharedVault>
-    declineInviteToSharedVault.execute = jest.fn().mockReturnValue(Result.ok())
+    cancelInviteToSharedVault = {} as jest.Mocked<CancelInviteToSharedVault>
+    cancelInviteToSharedVault.execute = jest.fn().mockReturnValue(Result.ok())
  })

  it('should decline all invites by user', async () => {
@@ -39,7 +39,7 @@ describe('DeleteSharedVaultInvitesSentByUser', () => {
    })

    expect(result.isFailed()).toBeFalsy()
-    expect(declineInviteToSharedVault.execute).toHaveBeenCalled()
+    expect(cancelInviteToSharedVault.execute).toHaveBeenCalled()
  })

  it('should return error when user uuid is invalid', async () => {
@@ -64,8 +64,8 @@ describe('DeleteSharedVaultInvitesSentByUser', () => {
    expect(result.isFailed()).toBeTruthy()
  })

-  it('should return error when declineInviteToSharedVault fails', async () => {
-    declineInviteToSharedVault.execute = jest.fn().mockReturnValue(Result.fail('error'))
+  it('should return error when cancelInviteToSharedVault fails', async () => {
+    cancelInviteToSharedVault.execute = jest.fn().mockReturnValue(Result.fail('error'))

    const useCase = createUseCase()

@@ -85,6 +85,6 @@ describe('DeleteSharedVaultInvitesSentByUser', () => {
    })

    expect(result.isFailed()).toBeFalsy()
-    expect(declineInviteToSharedVault.execute).toHaveBeenCalled()
+    expect(cancelInviteToSharedVault.execute).toHaveBeenCalled()
  })
 })
--- a/packages/syncing-server/src/Domain/UseCase/SharedVaults/DeleteSharedVaultInvitesSentByUser/DeleteSharedVaultInvitesSentByUser.ts
+++ b/packages/syncing-server/src/Domain/UseCase/SharedVaults/DeleteSharedVaultInvitesSentByUser/DeleteSharedVaultInvitesSentByUser.ts
@@ -1,12 +1,12 @@
 import { Result, UseCaseInterface, Uuid } from '@standardnotes/domain-core'
 import { DeleteSharedVaultInvitesSentByUserDTO } from './DeleteSharedVaultInvitesSentByUserDTO'
-import { DeclineInviteToSharedVault } from '../DeclineInviteToSharedVault/DeclineInviteToSharedVault'
+import { CancelInviteToSharedVault } from '../CancelInviteToSharedVault/CancelInviteToSharedVault'
 import { SharedVaultInviteRepositoryInterface } from '../../../SharedVault/User/Invite/SharedVaultInviteRepositoryInterface'

 export class DeleteSharedVaultInvitesSentByUser implements UseCaseInterface<void> {
  constructor(
    private sharedVaultInviteRepository: SharedVaultInviteRepositoryInterface,
-    private declineInviteToSharedVault: DeclineInviteToSharedVault,
+    private cancelInviteToSharedVault: CancelInviteToSharedVault,
  ) {}

  async execute(dto: DeleteSharedVaultInvitesSentByUserDTO): Promise<Result<void>> {
@@ -33,7 +33,7 @@ export class DeleteSharedVaultInvitesSentByUser implements UseCaseInterface<void
    }

    for (const invite of inboundInvites) {
-      const result = await this.declineInviteToSharedVault.execute({
+      const result = await this.cancelInviteToSharedVault.execute({
        inviteUuid: invite.id.toString(),
        userUuid: userUuid.value,
      })
--- a/packages/syncing-server/src/Domain/UseCase/SharedVaults/DeleteSharedVaultInvitesToUser/DeleteSharedVaultInvitesToUser.spec.ts
+++ b/packages/syncing-server/src/Domain/UseCase/SharedVaults/DeleteSharedVaultInvitesToUser/DeleteSharedVaultInvitesToUser.spec.ts
@@ -1,16 +1,15 @@
 import { Result, SharedVaultUserPermission, Timestamps, Uuid } from '@standardnotes/domain-core'
 import { SharedVaultInviteRepositoryInterface } from '../../../SharedVault/User/Invite/SharedVaultInviteRepositoryInterface'
-import { DeclineInviteToSharedVault } from '../DeclineInviteToSharedVault/DeclineInviteToSharedVault'
+import { CancelInviteToSharedVault } from '../CancelInviteToSharedVault/CancelInviteToSharedVault'
 import { DeleteSharedVaultInvitesToUser } from './DeleteSharedVaultInvitesToUser'
 import { SharedVaultInvite } from '../../../SharedVault/User/Invite/SharedVaultInvite'

 describe('DeleteSharedVaultInvitesToUser', () => {
  let sharedVaultInviteRepository: SharedVaultInviteRepositoryInterface
-  let declineInviteToSharedVault: DeclineInviteToSharedVault
+  let cancelInviteToSharedVault: CancelInviteToSharedVault
  let sharedVaultInvite: SharedVaultInvite

-  const createUseCase = () =>
-    new DeleteSharedVaultInvitesToUser(sharedVaultInviteRepository, declineInviteToSharedVault)
+  const createUseCase = () => new DeleteSharedVaultInvitesToUser(sharedVaultInviteRepository, cancelInviteToSharedVault)

  beforeEach(() => {
    sharedVaultInvite = SharedVaultInvite.create({
@@ -25,8 +24,8 @@ describe('DeleteSharedVaultInvitesToUser', () => {
    sharedVaultInviteRepository = {} as jest.Mocked<SharedVaultInviteRepositoryInterface>
    sharedVaultInviteRepository.findByUserUuid = jest.fn().mockReturnValue([sharedVaultInvite])

-    declineInviteToSharedVault = {} as jest.Mocked<DeclineInviteToSharedVault>
-    declineInviteToSharedVault.execute = jest.fn().mockReturnValue(Result.ok())
+    cancelInviteToSharedVault = {} as jest.Mocked<CancelInviteToSharedVault>
+    cancelInviteToSharedVault.execute = jest.fn().mockReturnValue(Result.ok())
  })

  it('should decline all invites to user', async () => {
@@ -37,7 +36,7 @@ describe('DeleteSharedVaultInvitesToUser', () => {
    })

    expect(result.isFailed()).toBeFalsy()
-    expect(declineInviteToSharedVault.execute).toHaveBeenCalled()
+    expect(cancelInviteToSharedVault.execute).toHaveBeenCalled()
  })

  it('should return error when user uuid is invalid', async () => {
@@ -50,8 +49,8 @@ describe('DeleteSharedVaultInvitesToUser', () => {
    expect(result.isFailed()).toBeTruthy()
  })

-  it('should return error when declineInviteToSharedVault fails', async () => {
-    declineInviteToSharedVault.execute = jest.fn().mockReturnValue(Result.fail('error'))
+  it('should return error when cancelInviteToSharedVault fails', async () => {
+    cancelInviteToSharedVault.execute = jest.fn().mockReturnValue(Result.fail('error'))

    const useCase = createUseCase()

--- a/packages/syncing-server/src/Domain/UseCase/SharedVaults/DeleteSharedVaultInvitesToUser/DeleteSharedVaultInvitesToUser.ts
+++ b/packages/syncing-server/src/Domain/UseCase/SharedVaults/DeleteSharedVaultInvitesToUser/DeleteSharedVaultInvitesToUser.ts
@@ -1,12 +1,12 @@
 import { Result, UseCaseInterface, Uuid } from '@standardnotes/domain-core'
 import { DeleteSharedVaultInvitesToUserDTO } from './DeleteSharedVaultInvitesToUserDTO'
-import { DeclineInviteToSharedVault } from '../DeclineInviteToSharedVault/DeclineInviteToSharedVault'
+import { CancelInviteToSharedVault } from '../CancelInviteToSharedVault/CancelInviteToSharedVault'
 import { SharedVaultInviteRepositoryInterface } from '../../../SharedVault/User/Invite/SharedVaultInviteRepositoryInterface'

 export class DeleteSharedVaultInvitesToUser implements UseCaseInterface<void> {
  constructor(
    private sharedVaultInviteRepository: SharedVaultInviteRepositoryInterface,
-    private declineInviteToSharedVault: DeclineInviteToSharedVault,
+    private cancelInviteToSharedVault: CancelInviteToSharedVault,
  ) {}

  async execute(dto: DeleteSharedVaultInvitesToUserDTO): Promise<Result<void>> {
@@ -18,7 +18,7 @@ export class DeleteSharedVaultInvitesToUser implements UseCaseInterface<void> {

    const inboundInvites = await this.sharedVaultInviteRepository.findByUserUuid(userUuid)
    for (const invite of inboundInvites) {
-      const result = await this.declineInviteToSharedVault.execute({
+      const result = await this.cancelInviteToSharedVault.execute({
        inviteUuid: invite.id.toString(),
        userUuid: userUuid.value,
      })
--- a/packages/syncing-server/src/Domain/UseCase/SharedVaults/RemoveUserFromSharedVault/RemoveUserFromSharedVault.ts
+++ b/packages/syncing-server/src/Domain/UseCase/SharedVaults/RemoveUserFromSharedVault/RemoveUserFromSharedVault.ts
@@ -1,4 +1,11 @@
-import { NotificationPayload, NotificationType, Result, UseCaseInterface, Uuid } from '@standardnotes/domain-core'
+import {
+  NotificationPayload,
+  NotificationPayloadIdentifierType,
+  NotificationType,
+  Result,
+  UseCaseInterface,
+  Uuid,
+} from '@standardnotes/domain-core'
 import { DomainEventPublisherInterface } from '@standardnotes/domain-events'

 import { RemoveUserFromSharedVaultDTO } from './RemoveUserFromSharedVaultDTO'
@@ -64,7 +71,10 @@ export class RemoveUserFromSharedVault implements UseCaseInterface<void> {
    await this.sharedVaultUsersRepository.remove(sharedVaultUser)

    const notificationPayloadOrError = NotificationPayload.create({
-      sharedVaultUuid: sharedVault.uuid,
+      primaryIdentifier: sharedVault.uuid,
+      primaryIndentifierType: NotificationPayloadIdentifierType.create(
+        NotificationPayloadIdentifierType.TYPES.SharedVaultUuid,
+      ).getValue(),
      type: NotificationType.create(NotificationType.TYPES.UserRemovedFromSharedVault).getValue(),
      version: '1.0',
    })
@@ -85,7 +95,10 @@ export class RemoveUserFromSharedVault implements UseCaseInterface<void> {
    }

    const selfNotificationPayloadOrError = NotificationPayload.create({
-      sharedVaultUuid: sharedVault.uuid,
+      primaryIdentifier: sharedVault.uuid,
+      primaryIndentifierType: NotificationPayloadIdentifierType.create(
+        NotificationPayloadIdentifierType.TYPES.SharedVaultUuid,
+      ).getValue(),
      type: NotificationType.create(NotificationType.TYPES.SelfRemovedFromSharedVault).getValue(),
      version: '1.0',
    })
--- a/packages/syncing-server/src/Domain/UseCase/Syncing/UpdateExistingItem/UpdateExistingItem.ts
+++ b/packages/syncing-server/src/Domain/UseCase/Syncing/UpdateExistingItem/UpdateExistingItem.ts
@@ -2,6 +2,7 @@ import {
  ContentType,
  Dates,
  NotificationPayload,
+  NotificationPayloadIdentifierType,
  NotificationType,
  Result,
  RoleNameCollection,
@@ -245,9 +246,15 @@ export class UpdateExistingItem implements UseCaseInterface<Item> {
      sharedVaultOperation.props.type === SharedVaultOperationOnItem.TYPES.RemoveFromSharedVault
    ) {
      const notificationPayloadOrError = NotificationPayload.create({
-        sharedVaultUuid: sharedVaultOperation.props.sharedVaultUuid,
+        primaryIdentifier: sharedVaultOperation.props.sharedVaultUuid,
+        primaryIndentifierType: NotificationPayloadIdentifierType.create(
+          NotificationPayloadIdentifierType.TYPES.SharedVaultUuid,
+        ).getValue(),
        type: NotificationType.create(NotificationType.TYPES.SharedVaultItemRemoved).getValue(),
-        itemUuid: dto.existingItem.uuid,
+        secondaryIdentifier: dto.existingItem.uuid,
+        secondaryIdentifierType: NotificationPayloadIdentifierType.create(
+          NotificationPayloadIdentifierType.TYPES.ItemUuid,
+        ).getValue(),
        version: '1.0',
      })
      if (notificationPayloadOrError.isFailed()) {
--- a/packages/syncing-server/src/Infra/InversifyExpressUtils/AnnotatedSharedVaultInvitesController.ts
+++ b/packages/syncing-server/src/Infra/InversifyExpressUtils/AnnotatedSharedVaultInvitesController.ts
@@ -5,7 +5,7 @@ import { Request, Response } from 'express'
 import TYPES from '../../Bootstrap/Types'
 import { SharedVaultInvite } from '../../Domain/SharedVault/User/Invite/SharedVaultInvite'
 import { AcceptInviteToSharedVault } from '../../Domain/UseCase/SharedVaults/AcceptInviteToSharedVault/AcceptInviteToSharedVault'
-import { DeclineInviteToSharedVault } from '../../Domain/UseCase/SharedVaults/DeclineInviteToSharedVault/DeclineInviteToSharedVault'
+import { CancelInviteToSharedVault } from '../../Domain/UseCase/SharedVaults/CancelInviteToSharedVault/CancelInviteToSharedVault'
 import { DeleteSharedVaultInvitesSentByUser } from '../../Domain/UseCase/SharedVaults/DeleteSharedVaultInvitesSentByUser/DeleteSharedVaultInvitesSentByUser'
 import { DeleteSharedVaultInvitesToUser } from '../../Domain/UseCase/SharedVaults/DeleteSharedVaultInvitesToUser/DeleteSharedVaultInvitesToUser'
 import { GetSharedVaultInvitesSentByUser } from '../../Domain/UseCase/SharedVaults/GetSharedVaultInvitesSentByUser/GetSharedVaultInvitesSentByUser'
@@ -22,7 +22,7 @@ export class AnnotatedSharedVaultInvitesController extends BaseSharedVaultInvite
    @inject(TYPES.Sync_InviteUserToSharedVault) override inviteUserToSharedVaultUseCase: InviteUserToSharedVault,
    @inject(TYPES.Sync_UpdateSharedVaultInvite) override updateSharedVaultInviteUseCase: UpdateSharedVaultInvite,
    @inject(TYPES.Sync_AcceptInviteToSharedVault) override acceptSharedVaultInviteUseCase: AcceptInviteToSharedVault,
-    @inject(TYPES.Sync_DeclineInviteToSharedVault) override declineSharedVaultInviteUseCase: DeclineInviteToSharedVault,
+    @inject(TYPES.Sync_DeclineInviteToSharedVault) override declineSharedVaultInviteUseCase: CancelInviteToSharedVault,
    @inject(TYPES.Sync_DeleteSharedVaultInvitesToUser)
    override deleteSharedVaultInvitesToUserUseCase: DeleteSharedVaultInvitesToUser,
    @inject(TYPES.Sync_DeleteSharedVaultInvitesSentByUser)
--- a/packages/syncing-server/src/Infra/InversifyExpressUtils/Base/BaseSharedVaultInvitesController.ts
+++ b/packages/syncing-server/src/Infra/InversifyExpressUtils/Base/BaseSharedVaultInvitesController.ts
@@ -8,7 +8,7 @@ import { SharedVaultInvite } from '../../../Domain/SharedVault/User/Invite/Share
 import { SharedVaultInviteHttpRepresentation } from '../../../Mapping/Http/SharedVaultInviteHttpRepresentation'
 import { UpdateSharedVaultInvite } from '../../../Domain/UseCase/SharedVaults/UpdateSharedVaultInvite/UpdateSharedVaultInvite'
 import { AcceptInviteToSharedVault } from '../../../Domain/UseCase/SharedVaults/AcceptInviteToSharedVault/AcceptInviteToSharedVault'
-import { DeclineInviteToSharedVault } from '../../../Domain/UseCase/SharedVaults/DeclineInviteToSharedVault/DeclineInviteToSharedVault'
+import { CancelInviteToSharedVault } from '../../../Domain/UseCase/SharedVaults/CancelInviteToSharedVault/CancelInviteToSharedVault'
 import { DeleteSharedVaultInvitesToUser } from '../../../Domain/UseCase/SharedVaults/DeleteSharedVaultInvitesToUser/DeleteSharedVaultInvitesToUser'
 import { GetSharedVaultInvitesSentByUser } from '../../../Domain/UseCase/SharedVaults/GetSharedVaultInvitesSentByUser/GetSharedVaultInvitesSentByUser'
 import { DeleteSharedVaultInvitesSentByUser } from '../../../Domain/UseCase/SharedVaults/DeleteSharedVaultInvitesSentByUser/DeleteSharedVaultInvitesSentByUser'
@@ -19,7 +19,7 @@ export class BaseSharedVaultInvitesController extends BaseHttpController {
    protected inviteUserToSharedVaultUseCase: InviteUserToSharedVault,
    protected updateSharedVaultInviteUseCase: UpdateSharedVaultInvite,
    protected acceptSharedVaultInviteUseCase: AcceptInviteToSharedVault,
-    protected declineSharedVaultInviteUseCase: DeclineInviteToSharedVault,
+    protected declineSharedVaultInviteUseCase: CancelInviteToSharedVault,
    protected deleteSharedVaultInvitesToUserUseCase: DeleteSharedVaultInvitesToUser,
    protected deleteSharedVaultInvitesSentByUserUseCase: DeleteSharedVaultInvitesSentByUser,
    protected getSharedVaultInvitesSentByUserUseCase: GetSharedVaultInvitesSentByUser,
--- a/packages/websockets/CHANGELOG.md
+++ b/packages/websockets/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

+## [1.10.53](https://github.com/standardnotes/server/compare/@standardnotes/websockets-server@1.10.52...@standardnotes/websockets-server@1.10.53) (2023-09-25)
+
+**Note:** Version bump only for package @standardnotes/websockets-server
+
+## [1.10.52](https://github.com/standardnotes/server/compare/@standardnotes/websockets-server@1.10.51...@standardnotes/websockets-server@1.10.52) (2023-09-25)
+
+**Note:** Version bump only for package @standardnotes/websockets-server
+
 ## [1.10.51](https://github.com/standardnotes/server/compare/@standardnotes/websockets-server@1.10.50...@standardnotes/websockets-server@1.10.51) (2023-09-25)

 **Note:** Version bump only for package @standardnotes/websockets-server
--- a/packages/websockets/package.json
+++ b/packages/websockets/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@standardnotes/websockets-server",
-  "version": "1.10.51",
+  "version": "1.10.53",
  "engines": {
    "node": ">=18.0.0 <21.0.0"
  },
Author	SHA1	Message	Date
standardci	1bb5980b45	chore(release): publish new version - @standardnotes/analytics@2.26.24 - @standardnotes/api-gateway@1.75.4 - @standardnotes/auth-server@1.146.4 - @standardnotes/domain-core@1.33.2 - @standardnotes/event-store@1.11.52 - @standardnotes/files-server@1.23.2 - @standardnotes/home-server@1.16.6 - @standardnotes/revisions-server@1.37.3 - @standardnotes/scheduler-server@1.20.56 - @standardnotes/settings@1.21.39 - @standardnotes/syncing-server@1.108.2 - @standardnotes/websockets-server@1.10.53	2023-09-25 16:42:43 +00:00
Karol Sójko	a02a28774b	fix(domain-core): notification paylod to string casting	2023-09-25 18:24:38 +02:00
standardci	2d9b3578b6	chore(release): publish new version - @standardnotes/analytics@2.26.23 - @standardnotes/api-gateway@1.75.3 - @standardnotes/auth-server@1.146.3 - @standardnotes/domain-core@1.33.1 - @standardnotes/event-store@1.11.51 - @standardnotes/files-server@1.23.1 - @standardnotes/home-server@1.16.5 - @standardnotes/revisions-server@1.37.2 - @standardnotes/scheduler-server@1.20.55 - @standardnotes/settings@1.21.38 - @standardnotes/syncing-server@1.108.1 - @standardnotes/websockets-server@1.10.52	2023-09-25 15:28:21 +00:00
Karol Sójko	3d5e747590	fix(syncing-server): another spec	2023-09-25 17:10:30 +02:00
Karol Sójko	94467747ac	fix(syncing-server): specs	2023-09-25 15:52:35 +02:00
Karol Sójko	cebab59a02	fix: refactor the structure of notifications (#853 )	2023-09-25 15:40:51 +02:00