chore: display shared vault file usage

packages/api/package.json

@@ -36,7 +36,7 @@
   },
   "dependencies": {
     "@standardnotes/common": "^1.50.0",
-    "@standardnotes/domain-core": "^1.24.0",
+    "@standardnotes/domain-core": "^1.25.0",
     "@standardnotes/models": "workspace:*",
     "@standardnotes/responses": "workspace:*",
     "@standardnotes/utils": "workspace:*",

packages/desktop/package.json

@@ -35,7 +35,7 @@
   },
   "dependencies": {
     "@electron/remote": "^2.0.9",
-    "@standardnotes/domain-core": "^1.24.0",
+    "@standardnotes/domain-core": "^1.25.0",
     "@standardnotes/electron-clear-data": "1.1.1",
     "@standardnotes/web": "workspace:*",
     "axios": "^1.1.3",

packages/encryption/package.json

@@ -29,7 +29,7 @@
   },
   "dependencies": {
     "@standardnotes/common": "^1.50.0",
-    "@standardnotes/domain-core": "^1.24.0",
+    "@standardnotes/domain-core": "^1.25.0",
     "@standardnotes/models": "workspace:*",
     "@standardnotes/responses": "workspace:*",
     "@standardnotes/sncrypto-common": "workspace:*",

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

packages/features/package.json

@@ -26,7 +26,7 @@
   },
   "dependencies": {
     "@standardnotes/common": "^1.50.0",
-    "@standardnotes/domain-core": "^1.24.0",
+    "@standardnotes/domain-core": "^1.25.0",
     "reflect-metadata": "^0.1.13"
   },
   "devDependencies": {

packages/models/package.json

@@ -23,7 +23,7 @@
   },
   "dependencies": {
     "@standardnotes/common": "^1.50.0",
-    "@standardnotes/domain-core": "^1.24.0",
+    "@standardnotes/domain-core": "^1.25.0",
     "@standardnotes/features": "workspace:*",
     "@standardnotes/responses": "workspace:*",
     "@standardnotes/sncrypto-common": "workspace:^",

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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