rmorawski/standardnotes-app-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

internal: incomplete vault systems behind feature flag (#2340)

Browse Source
This commit is contained in:
Mo
2023-06-30 09:01:56 -05:00
committed by GitHub
parent d16e401bb9
commit b032eb9c9b
638 changed files with 20321 additions and 4813 deletions
Download Patch File Download Diff File Expand all files Collapse all files

205
packages/snjs/lib/Application/Application.ts
View File

@@ -149,6 +149,7 @@ export class SNApplication implements ApplicationInterface, AppGroupManagedAppli
private declare subscriptionManager: SubscriptionClientInterface
private declare webSocketApiService: WebSocketApiServiceInterface
private declare webSocketServer: WebSocketServerInterface
private sessionManager!: InternalServices.SNSessionManager
private syncService!: InternalServices.SNSyncService
private challengeService!: InternalServices.ChallengeService
@@ -171,6 +172,13 @@ export class SNApplication implements ApplicationInterface, AppGroupManagedAppli
private integrityService!: ExternalServices.IntegrityService
private statusService!: ExternalServices.StatusService
private filesBackupService?: FilesBackupService
private vaultService!: ExternalServices.VaultServiceInterface
private contactService!: ExternalServices.ContactServiceInterface
private sharedVaultService!: ExternalServices.SharedVaultServiceInterface
private userEventService!: ExternalServices.UserEventService
private asymmetricMessageService!: ExternalServices.AsymmetricMessageService
private keySystemKeyManager!: ExternalServices.KeySystemKeyManager
private declare sessionStorageMapper: MapperInterface<Session, Record<string, unknown>>
private declare legacySessionStorageMapper: MapperInterface<LegacySession, Record<string, unknown>>
private declare authenticatorManager: AuthenticatorClientInterface
@@ -313,7 +321,7 @@ export class SNApplication implements ApplicationInterface, AppGroupManagedAppli
return this.featuresService
}
public get items(): ExternalServices.ItemsClientInterface {
public get items(): ExternalServices.ItemManagerInterface {
return this.itemManager
}
@@ -373,6 +381,18 @@ export class SNApplication implements ApplicationInterface, AppGroupManagedAppli
return this.challengeService
}
public get vaults(): ExternalServices.VaultServiceInterface {
return this.vaultService
}
public get contacts(): ExternalServices.ContactServiceInterface {
return this.contactService
}
public get sharedVaults(): ExternalServices.SharedVaultServiceInterface {
return this.sharedVaultService
}
public computePrivateUsername(username: string): Promise<string | undefined> {
return ComputePrivateUsername(this.options.crypto, username)
}
@@ -534,6 +554,11 @@ export class SNApplication implements ApplicationInterface, AppGroupManagedAppli
for (const service of this.services) {
await service.handleApplicationStage(stage)
}
this.internalEventBus.publish({
type: ApplicationEvent.ApplicationStageChanged,
payload: { stage } as ExternalServices.ApplicationStageChangedEventPayload,
})
}
/**
@@ -587,11 +612,13 @@ export class SNApplication implements ApplicationInterface, AppGroupManagedAppli
} else if (event === ApplicationEvent.Launched) {
this.onLaunch()
}
for (const observer of this.eventHandlers.slice()) {
if ((observer.singleEvent && observer.singleEvent === event) || !observer.singleEvent) {
await observer.callback(event, data || {})
}
}
void this.migrationService.handleApplicationEvent(event)
}
@@ -637,6 +664,9 @@ export class SNApplication implements ApplicationInterface, AppGroupManagedAppli
public async getAvailableSubscriptions(): Promise<
Responses.AvailableSubscriptions | Responses.ClientDisplayableError
> {
if (this.isThirdPartyHostUsed()) {
return ClientDisplayableError.FromString('Third party hosts do not support subscriptions.')
}
return this.sessionManager.getAvailableSubscriptions()
}
@@ -827,8 +857,8 @@ export class SNApplication implements ApplicationInterface, AppGroupManagedAppli
return this.diskStorageService.setValue(key, value, mode)
}
public getValue(key: string, mode?: ExternalServices.StorageValueModes): unknown {
return this.diskStorageService.getValue(key, mode)
public getValue<T>(key: string, mode?: ExternalServices.StorageValueModes): T {
return this.diskStorageService.getValue<T>(key, mode)
}
public async removeValue(key: string, mode?: ExternalServices.StorageValueModes): Promise<void> {
@@ -863,7 +893,7 @@ export class SNApplication implements ApplicationInterface, AppGroupManagedAppli
}
}
public addChallengeObserver(challenge: Challenge, observer: InternalServices.ChallengeObserver): () => void {
public addChallengeObserver(challenge: Challenge, observer: ExternalServices.ChallengeObserver): () => void {
return this.challengeService.addChallengeObserver(challenge, observer)
}
@@ -980,6 +1010,53 @@ export class SNApplication implements ApplicationInterface, AppGroupManagedAppli
})
}
public async changeAndSaveItem<M extends Models.DecryptedItemMutator = Models.DecryptedItemMutator>(
itemToLookupUuidFor: DecryptedItemInterface,
mutate: (mutator: M) => void,
updateTimestamps = true,
emitSource?: Models.PayloadEmitSource,
syncOptions?: ExternalServices.SyncOptions,
): Promise<DecryptedItemInterface | undefined> {
await this.mutator.changeItems(
[itemToLookupUuidFor],
mutate,
updateTimestamps ? Models.MutationType.UpdateUserTimestamps : Models.MutationType.NoUpdateUserTimestamps,
emitSource,
)
await this.syncService.sync(syncOptions)
return this.itemManager.findItem(itemToLookupUuidFor.uuid)
}
public async changeAndSaveItems<M extends Models.DecryptedItemMutator = Models.DecryptedItemMutator>(
itemsToLookupUuidsFor: DecryptedItemInterface[],
mutate: (mutator: M) => void,
updateTimestamps = true,
emitSource?: Models.PayloadEmitSource,
syncOptions?: ExternalServices.SyncOptions,
): Promise<void> {
await this.mutator.changeItems(
itemsToLookupUuidsFor,
mutate,
updateTimestamps ? Models.MutationType.UpdateUserTimestamps : Models.MutationType.NoUpdateUserTimestamps,
emitSource,
)
await this.syncService.sync(syncOptions)
}
public async importData(data: BackupFile, awaitSync = false): Promise<ExternalServices.ImportDataReturnType> {
const usecase = new ExternalServices.ImportDataUseCase(
this.itemManager,
this.syncService,
this.protectionService,
this.protocolService,
this.payloadManager,
this.challengeService,
this.historyManager,
)
return usecase.execute(data, awaitSync)
}
private async handleRevokedSession(): Promise<void> {
/**
* Because multiple API requests can come back at the same time
@@ -1148,9 +1225,16 @@ export class SNApplication implements ApplicationInterface, AppGroupManagedAppli
this.createMappers()
this.createPayloadManager()
this.createItemManager()
this.createMutatorService()
this.createDiskStorageManager()
this.createUserEventService()
this.createInMemoryStorageManager()
this.createKeySystemKeyManager()
this.createProtocolService()
this.diskStorageService.provideEncryptionProvider(this.protocolService)
this.createChallengeService()
this.createLegacyHttpManager()
@@ -1185,7 +1269,7 @@ export class SNApplication implements ApplicationInterface, AppGroupManagedAppli
this.createFileService()
this.createIntegrityService()
this.createMutatorService()
this.createListedService()
this.createActionsManager()
this.createAuthenticatorManager()
@@ -1193,6 +1277,10 @@ export class SNApplication implements ApplicationInterface, AppGroupManagedAppli
this.createRevisionManager()
this.createUseCases()
this.createContactService()
this.createVaultService()
this.createSharedVaultService()
this.createAsymmetricMessageService()
}
private clearServices() {
@@ -1249,6 +1337,12 @@ export class SNApplication implements ApplicationInterface, AppGroupManagedAppli
;(this._listRevisions as unknown) = undefined
;(this._getRevision as unknown) = undefined
;(this._deleteRevision as unknown) = undefined
;(this.vaultService as unknown) = undefined
;(this.contactService as unknown) = undefined
;(this.sharedVaultService as unknown) = undefined
;(this.userEventService as unknown) = undefined
;(this.asymmetricMessageService as unknown) = undefined
;(this.keySystemKeyManager as unknown) = undefined
this.services = []
}
@@ -1270,6 +1364,71 @@ export class SNApplication implements ApplicationInterface, AppGroupManagedAppli
;(this.internalEventBus as unknown) = undefined
}
private createUserEventService(): void {
this.userEventService = new ExternalServices.UserEventService(this.internalEventBus)
this.services.push(this.userEventService)
}
private createAsymmetricMessageService() {
this.asymmetricMessageService = new ExternalServices.AsymmetricMessageService(
this.httpService,
this.protocolService,
this.contacts,
this.itemManager,
this.mutator,
this.syncService,
this.internalEventBus,
)
this.services.push(this.asymmetricMessageService)
}
private createContactService(): void {
this.contactService = new ExternalServices.ContactService(
this.syncService,
this.itemManager,
this.mutator,
this.sessionManager,
this.options.crypto,
this.user,
this.protocolService,
this.singletonManager,
this.internalEventBus,
)
this.services.push(this.contactService)
}
private createSharedVaultService(): void {
this.sharedVaultService = new ExternalServices.SharedVaultService(
this.httpService,
this.syncService,
this.itemManager,
this.mutator,
this.protocolService,
this.sessions,
this.contactService,
this.files,
this.vaults,
this.storage,
this.internalEventBus,
)
this.services.push(this.sharedVaultService)
}
private createVaultService(): void {
this.vaultService = new ExternalServices.VaultService(
this.syncService,
this.itemManager,
this.mutator,
this.protocolService,
this.files,
this.alertService,
this.internalEventBus,
)
this.services.push(this.vaultService)
}
private createListedService(): void {
this.listedService = new InternalServices.ListedService(
this.apiService,
@@ -1278,6 +1437,7 @@ export class SNApplication implements ApplicationInterface, AppGroupManagedAppli
this.deprecatedHttpService,
this.protectionService,
this.mutator,
this.sync,
this.internalEventBus,
)
this.services.push(this.listedService)
@@ -1286,10 +1446,11 @@ export class SNApplication implements ApplicationInterface, AppGroupManagedAppli
private createFileService() {
this.fileService = new FileService(
this.apiService,
this.itemManager,
this.mutator,
this.syncService,
this.protocolService,
this.challengeService,
this.httpService,
this.alertService,
this.options.crypto,
this.internalEventBus,
@@ -1315,6 +1476,7 @@ export class SNApplication implements ApplicationInterface, AppGroupManagedAppli
this.diskStorageService,
this.apiService,
this.itemManager,
this.mutator,
this.webSocketsService,
this.settingsService,
this.userService,
@@ -1366,6 +1528,7 @@ export class SNApplication implements ApplicationInterface, AppGroupManagedAppli
sessionManager: this.sessionManager,
challengeService: this.challengeService,
itemManager: this.itemManager,
mutator: this.mutator,
singletonManager: this.singletonManager,
featuresService: this.featuresService,
environment: this.environment,
@@ -1453,6 +1616,7 @@ export class SNApplication implements ApplicationInterface, AppGroupManagedAppli
private createComponentManager() {
this.componentManagerService = new InternalServices.SNComponentManager(
this.itemManager,
this.mutator,
this.syncService,
this.featuresService,
this.preferencesService,
@@ -1508,6 +1672,7 @@ export class SNApplication implements ApplicationInterface, AppGroupManagedAppli
private createSingletonManager() {
this.singletonManager = new InternalServices.SNSingletonManager(
this.itemManager,
this.mutator,
this.payloadManager,
this.syncService,
this.internalEventBus,
@@ -1531,9 +1696,11 @@ export class SNApplication implements ApplicationInterface, AppGroupManagedAppli
private createProtocolService() {
this.protocolService = new EncryptionService(
this.itemManager,
this.mutator,
this.payloadManager,
this.deviceInterface,
this.diskStorageService,
this.keySystemKeyManager,
this.identifier,
this.options.crypto,
this.internalEventBus,
@@ -1548,6 +1715,17 @@ export class SNApplication implements ApplicationInterface, AppGroupManagedAppli
this.services.push(this.protocolService)
}
private createKeySystemKeyManager() {
this.keySystemKeyManager = new ExternalServices.KeySystemKeyManager(
this.itemManager,
this.mutator,
this.storage,
this.internalEventBus,
)
this.services.push(this.keySystemKeyManager)
}
private createKeyRecoveryService() {
this.keyRecoveryService = new InternalServices.SNKeyRecoveryService(
this.itemManager,
@@ -1582,7 +1760,7 @@ export class SNApplication implements ApplicationInterface, AppGroupManagedAppli
this.serviceObservers.push(
this.sessionManager.addEventObserver(async (event) => {
switch (event) {
case InternalServices.SessionEvent.Restored: {
case ExternalServices.SessionEvent.Restored: {
void (async () => {
await this.sync.sync({ sourceDescription: 'Session restored pre key creation' })
if (this.protocolService.needsNewRootKeyBasedItemsKey()) {
@@ -1593,10 +1771,12 @@ export class SNApplication implements ApplicationInterface, AppGroupManagedAppli
})()
break
}
case InternalServices.SessionEvent.Revoked: {
case ExternalServices.SessionEvent.Revoked: {
await this.handleRevokedSession()
break
}
case ExternalServices.SessionEvent.UserKeyPairChanged:
break
default: {
Utils.assertUnreachable(event)
}
@@ -1655,6 +1835,7 @@ export class SNApplication implements ApplicationInterface, AppGroupManagedAppli
private createProtectionService() {
this.protectionService = new InternalServices.SNProtectionService(
this.protocolService,
this.mutator,
this.challengeService,
this.diskStorageService,
this.internalEventBus,
@@ -1701,6 +1882,7 @@ export class SNApplication implements ApplicationInterface, AppGroupManagedAppli
this.preferencesService = new InternalServices.SNPreferencesService(
this.singletonManager,
this.itemManager,
this.mutator,
this.syncService,
this.internalEventBus,
)
@@ -1734,13 +1916,8 @@ export class SNApplication implements ApplicationInterface, AppGroupManagedAppli
private createMutatorService() {
this.mutatorService = new InternalServices.MutatorService(
this.itemManager,
this.syncService,
this.protectionService,
this.protocolService,
this.payloadManager,
this.challengeService,
this.componentManagerService,
this.historyManager,
this.alertService,
this.internalEventBus,
)
this.services.push(this.mutatorService)

4
packages/snjs/lib/Application/Event.ts
View File

@@ -5,7 +5,7 @@ export function applicationEventForSyncEvent(syncEvent: SyncEvent) {
return (
{
[SyncEvent.SyncCompletedWithAllItemsUploaded]: ApplicationEvent.CompletedFullSync,
[SyncEvent.SingleRoundTripSyncCompleted]: ApplicationEvent.CompletedIncrementalSync,
[SyncEvent.PaginatedSyncRequestCompleted]: ApplicationEvent.CompletedIncrementalSync,
[SyncEvent.SyncError]: ApplicationEvent.FailedSync,
[SyncEvent.SyncTakingTooLong]: ApplicationEvent.HighLatencySync,
[SyncEvent.EnterOutOfSync]: ApplicationEvent.EnteredOutOfSync,
@@ -14,7 +14,7 @@ export function applicationEventForSyncEvent(syncEvent: SyncEvent) {
[SyncEvent.MajorDataChange]: ApplicationEvent.MajorDataChange,
[SyncEvent.LocalDataIncrementalLoad]: ApplicationEvent.LocalDataIncrementalLoad,
[SyncEvent.StatusChanged]: ApplicationEvent.SyncStatusChanged,
[SyncEvent.SyncWillBegin]: ApplicationEvent.WillSync,
[SyncEvent.SyncDidBeginProcessing]: ApplicationEvent.WillSync,
[SyncEvent.InvalidSession]: ApplicationEvent.InvalidSyncSession,
[SyncEvent.DatabaseReadError]: ApplicationEvent.LocalDatabaseReadError,
[SyncEvent.DatabaseWriteError]: ApplicationEvent.LocalDatabaseWriteError,

4
packages/snjs/lib/Application/LiveItem.ts
View File

@@ -1,12 +1,12 @@
import { DecryptedItemInterface } from '@standardnotes/models'
import { SNApplication } from './Application'
import { ApplicationInterface } from '@standardnotes/services'
/** Keeps an item reference up to date with changes */
export class LiveItem<T extends DecryptedItemInterface> {
public item: T
private removeObserver: () => void
constructor(uuid: string, application: SNApplication, onChange?: (item: T) => void) {
constructor(uuid: string, application: ApplicationInterface, onChange?: (item: T) => void) {
this.item = application.items.findSureItem(uuid)
onChange && onChange(this.item)