From 0e43bc00427113f421b0c4b67c067f0de96caf52 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karol=20S=C3=B3jko?= Date: Thu, 26 Oct 2023 15:18:11 +0200 Subject: [PATCH] feat: extract setting name to domain-core package --- packages/auth/bin/backup.ts | 4 ++-- packages/auth/bin/user_email_backup.ts | 4 ++-- .../1627638504691-move_mfa_items_to_user_settings.ts | 3 +-- .../Domain/Handler/ExtensionKeyGrantedEventHandler.ts | 3 +-- .../Domain/Handler/ListedAccountCreatedEventHandler.ts | 4 ++-- .../Domain/Handler/ListedAccountDeletedEventHandler.ts | 4 ++-- .../Handler/SubscriptionReassignedEventHandler.ts | 3 +-- .../Handler/SubscriptionSyncRequestedEventHandler.ts | 3 +-- packages/auth/src/Domain/Session/SessionService.ts | 3 ++- .../auth/src/Domain/Setting/SettingCrypter.spec.ts | 3 +-- .../auth/src/Domain/Setting/SettingInterpreter.spec.ts | 9 ++------- packages/auth/src/Domain/Setting/SettingInterpreter.ts | 9 ++------- .../src/Domain/Setting/SettingRepositoryInterface.ts | 2 +- .../Domain/Setting/SettingsAssociationService.spec.ts | 2 +- .../src/Domain/Setting/SettingsAssociationService.ts | 3 ++- .../Setting/SettingsAssociationServiceInterface.ts | 2 +- .../SubscriptionSettingsAssociationService.spec.ts | 3 +-- .../Setting/SubscriptionSettingsAssociationService.ts | 2 +- .../ActivatePremiumFeatures/ActivatePremiumFeatures.ts | 3 +-- .../ApplyDefaultSubscriptionSettings.spec.ts | 3 +-- .../ApplyDefaultSubscriptionSettings.ts | 3 +-- .../CreateCrossServiceToken.spec.ts | 10 ++++++++-- .../CreateCrossServiceToken/CreateCrossServiceToken.ts | 3 +-- .../UseCase/CreateValetToken/CreateValetToken.spec.ts | 3 +-- .../UseCase/CreateValetToken/CreateValetToken.ts | 2 +- .../Domain/UseCase/DeleteSetting/DeleteSetting.spec.ts | 3 +-- .../DisableEmailSettingBasedOnEmailSubscription.ts | 3 +-- .../GenerateRecoveryCodes/GenerateRecoveryCodes.ts | 3 +-- .../src/Domain/UseCase/GetSetting/GetSetting.spec.ts | 3 +-- .../auth/src/Domain/UseCase/GetSetting/GetSetting.ts | 3 +-- .../src/Domain/UseCase/GetSettings/GetSettings.spec.ts | 3 +-- .../GetSubscriptionSetting.spec.ts | 3 +-- .../GetSubscriptionSetting/GetSubscriptionSetting.ts | 3 +-- .../GetUserKeyParamsRecovery.ts | 3 +-- .../UseCase/SetSettingValue/SetSettingValue.spec.ts | 3 +-- .../Domain/UseCase/SetSettingValue/SetSettingValue.ts | 3 +-- .../SetSubscriptionSettingValue.spec.ts | 3 +-- .../SetSubscriptionSettingValue.ts | 3 +-- .../SignInWithRecoveryCodes/SignInWithRecoveryCodes.ts | 3 +-- .../UpdateStorageQuotaUsedForUser.spec.ts | 3 +-- .../UpdateStorageQuotaUsedForUser.ts | 3 +-- packages/auth/src/Domain/UseCase/VerifyMFA.spec.ts | 3 +-- packages/auth/src/Domain/UseCase/VerifyMFA.ts | 3 +-- .../UseCase/VerifyPredicate/VerifyPredicate.spec.ts | 4 ++-- .../Domain/UseCase/VerifyPredicate/VerifyPredicate.ts | 3 ++- .../InversifyExpressUtils/Base/BaseAdminController.ts | 3 +-- .../Base/BaseSubscriptionTokensController.ts | 3 +-- .../auth/src/Infra/TypeORM/TypeORMSettingRepository.ts | 3 +-- .../src/Domain/Setting/SettingName.ts | 3 ++- .../src/Domain/Setting/SettingNameProps.ts | 0 packages/domain-core/src/Domain/index.ts | 3 +++ packages/settings/src/Domain/index.ts | 2 -- 52 files changed, 70 insertions(+), 101 deletions(-) rename packages/{settings => domain-core}/src/Domain/Setting/SettingName.ts (96%) rename packages/{settings => domain-core}/src/Domain/Setting/SettingNameProps.ts (100%) diff --git a/packages/auth/bin/backup.ts b/packages/auth/bin/backup.ts index f0cf9790f..542417d7d 100644 --- a/packages/auth/bin/backup.ts +++ b/packages/auth/bin/backup.ts @@ -1,7 +1,7 @@ import 'reflect-metadata' import { OpenTelemetrySDK, OpenTelemetryTracer } from '@standardnotes/domain-events-infra' -import { ServiceIdentifier } from '@standardnotes/domain-core' +import { ServiceIdentifier, SettingName } from '@standardnotes/domain-core' const sdk = new OpenTelemetrySDK({ serviceName: ServiceIdentifier.NAMES.AuthScheduledTask }) sdk.start() @@ -18,7 +18,7 @@ import { Env } from '../src/Bootstrap/Env' import { DomainEventPublisherInterface } from '@standardnotes/domain-events' import { DomainEventFactoryInterface } from '../src/Domain/Event/DomainEventFactoryInterface' import { SettingRepositoryInterface } from '../src/Domain/Setting/SettingRepositoryInterface' -import { MuteFailedBackupsEmailsOption, SettingName } from '@standardnotes/settings' +import { MuteFailedBackupsEmailsOption } from '@standardnotes/settings' import { RoleServiceInterface } from '../src/Domain/Role/RoleServiceInterface' import { PermissionName } from '@standardnotes/features' import { GetUserKeyParams } from '../src/Domain/UseCase/GetUserKeyParams/GetUserKeyParams' diff --git a/packages/auth/bin/user_email_backup.ts b/packages/auth/bin/user_email_backup.ts index 2e02a9c59..8ebe484f2 100644 --- a/packages/auth/bin/user_email_backup.ts +++ b/packages/auth/bin/user_email_backup.ts @@ -1,7 +1,7 @@ import 'reflect-metadata' import { OpenTelemetrySDK, OpenTelemetryTracer } from '@standardnotes/domain-events-infra' -import { Email, ServiceIdentifier } from '@standardnotes/domain-core' +import { Email, ServiceIdentifier, SettingName } from '@standardnotes/domain-core' const sdk = new OpenTelemetrySDK({ serviceName: ServiceIdentifier.NAMES.AuthScheduledTask }) sdk.start() @@ -16,7 +16,7 @@ import { Env } from '../src/Bootstrap/Env' import { DomainEventPublisherInterface } from '@standardnotes/domain-events' import { DomainEventFactoryInterface } from '../src/Domain/Event/DomainEventFactoryInterface' import { SettingRepositoryInterface } from '../src/Domain/Setting/SettingRepositoryInterface' -import { MuteFailedBackupsEmailsOption, SettingName } from '@standardnotes/settings' +import { MuteFailedBackupsEmailsOption } from '@standardnotes/settings' import { RoleServiceInterface } from '../src/Domain/Role/RoleServiceInterface' import { PermissionName } from '@standardnotes/features' import { UserRepositoryInterface } from '../src/Domain/User/UserRepositoryInterface' diff --git a/packages/auth/migrations/mysql/1627638504691-move_mfa_items_to_user_settings.ts b/packages/auth/migrations/mysql/1627638504691-move_mfa_items_to_user_settings.ts index eaa7183bf..a2f57d087 100644 --- a/packages/auth/migrations/mysql/1627638504691-move_mfa_items_to_user_settings.ts +++ b/packages/auth/migrations/mysql/1627638504691-move_mfa_items_to_user_settings.ts @@ -1,11 +1,10 @@ import Redis, { Cluster } from 'ioredis' -import { SettingName } from '@standardnotes/settings' import { MigrationInterface, QueryRunner } from 'typeorm' import { Setting } from '../../src/Domain/Setting/Setting' import { User } from '../../src/Domain/User/User' import { EncryptionVersion } from '../../src/Domain/Encryption/EncryptionVersion' -import { Timestamps, UniqueEntityId, Uuid } from '@standardnotes/domain-core' +import { SettingName, Timestamps, UniqueEntityId, Uuid } from '@standardnotes/domain-core' export class moveMfaItemsToUserSettings1627638504691 implements MigrationInterface { public async up(queryRunner: QueryRunner): Promise { diff --git a/packages/auth/src/Domain/Handler/ExtensionKeyGrantedEventHandler.ts b/packages/auth/src/Domain/Handler/ExtensionKeyGrantedEventHandler.ts index c8b671749..92a21b5c2 100644 --- a/packages/auth/src/Domain/Handler/ExtensionKeyGrantedEventHandler.ts +++ b/packages/auth/src/Domain/Handler/ExtensionKeyGrantedEventHandler.ts @@ -1,6 +1,5 @@ import { DomainEventHandlerInterface, ExtensionKeyGrantedEvent } from '@standardnotes/domain-events' -import { Username } from '@standardnotes/domain-core' -import { SettingName } from '@standardnotes/settings' +import { SettingName, Username } from '@standardnotes/domain-core' import { OfflineFeaturesTokenData } from '@standardnotes/security' import { ContentDecoderInterface } from '@standardnotes/common' import { Logger } from 'winston' diff --git a/packages/auth/src/Domain/Handler/ListedAccountCreatedEventHandler.ts b/packages/auth/src/Domain/Handler/ListedAccountCreatedEventHandler.ts index ac4147a25..cd1c0b9ae 100644 --- a/packages/auth/src/Domain/Handler/ListedAccountCreatedEventHandler.ts +++ b/packages/auth/src/Domain/Handler/ListedAccountCreatedEventHandler.ts @@ -1,6 +1,6 @@ -import { Username } from '@standardnotes/domain-core' +import { SettingName, Username } from '@standardnotes/domain-core' import { DomainEventHandlerInterface, ListedAccountCreatedEvent } from '@standardnotes/domain-events' -import { ListedAuthorSecretsData, SettingName } from '@standardnotes/settings' +import { ListedAuthorSecretsData } from '@standardnotes/settings' import { Logger } from 'winston' import { UserRepositoryInterface } from '../User/UserRepositoryInterface' diff --git a/packages/auth/src/Domain/Handler/ListedAccountDeletedEventHandler.ts b/packages/auth/src/Domain/Handler/ListedAccountDeletedEventHandler.ts index 482b4b07e..d5874c57d 100644 --- a/packages/auth/src/Domain/Handler/ListedAccountDeletedEventHandler.ts +++ b/packages/auth/src/Domain/Handler/ListedAccountDeletedEventHandler.ts @@ -1,6 +1,6 @@ -import { Username } from '@standardnotes/domain-core' +import { SettingName, Username } from '@standardnotes/domain-core' import { DomainEventHandlerInterface, ListedAccountDeletedEvent } from '@standardnotes/domain-events' -import { ListedAuthorSecretsData, SettingName } from '@standardnotes/settings' +import { ListedAuthorSecretsData } from '@standardnotes/settings' import { Logger } from 'winston' import { UserRepositoryInterface } from '../User/UserRepositoryInterface' diff --git a/packages/auth/src/Domain/Handler/SubscriptionReassignedEventHandler.ts b/packages/auth/src/Domain/Handler/SubscriptionReassignedEventHandler.ts index a644478c4..a5bf23b9c 100644 --- a/packages/auth/src/Domain/Handler/SubscriptionReassignedEventHandler.ts +++ b/packages/auth/src/Domain/Handler/SubscriptionReassignedEventHandler.ts @@ -6,9 +6,8 @@ import { User } from '../User/User' import { UserRepositoryInterface } from '../User/UserRepositoryInterface' import { UserSubscription } from '../Subscription/UserSubscription' import { UserSubscriptionRepositoryInterface } from '../Subscription/UserSubscriptionRepositoryInterface' -import { SettingName } from '@standardnotes/settings' import { UserSubscriptionType } from '../Subscription/UserSubscriptionType' -import { Username } from '@standardnotes/domain-core' +import { SettingName, Username } from '@standardnotes/domain-core' import { ApplyDefaultSubscriptionSettings } from '../UseCase/ApplyDefaultSubscriptionSettings/ApplyDefaultSubscriptionSettings' import { SetSettingValue } from '../UseCase/SetSettingValue/SetSettingValue' diff --git a/packages/auth/src/Domain/Handler/SubscriptionSyncRequestedEventHandler.ts b/packages/auth/src/Domain/Handler/SubscriptionSyncRequestedEventHandler.ts index fab59b1af..a571f5c25 100644 --- a/packages/auth/src/Domain/Handler/SubscriptionSyncRequestedEventHandler.ts +++ b/packages/auth/src/Domain/Handler/SubscriptionSyncRequestedEventHandler.ts @@ -1,6 +1,5 @@ import { OfflineFeaturesTokenData } from '@standardnotes/security' -import { SettingName } from '@standardnotes/settings' -import { Username } from '@standardnotes/domain-core' +import { SettingName, Username } from '@standardnotes/domain-core' import { ContentDecoderInterface } from '@standardnotes/common' import { DomainEventHandlerInterface, SubscriptionSyncRequestedEvent } from '@standardnotes/domain-events' import { Logger } from 'winston' diff --git a/packages/auth/src/Domain/Session/SessionService.ts b/packages/auth/src/Domain/Session/SessionService.ts index 73758e846..5c2c10a99 100644 --- a/packages/auth/src/Domain/Session/SessionService.ts +++ b/packages/auth/src/Domain/Session/SessionService.ts @@ -4,7 +4,8 @@ import { v4 as uuidv4 } from 'uuid' import { UAParserInstance } from 'ua-parser-js' import { TimerInterface } from '@standardnotes/time' import { Logger } from 'winston' -import { LogSessionUserAgentOption, SettingName } from '@standardnotes/settings' +import { SettingName } from '@standardnotes/domain-core' +import { LogSessionUserAgentOption } from '@standardnotes/settings' import { SessionBody } from '@standardnotes/responses' import { CryptoNode } from '@standardnotes/sncrypto-node' diff --git a/packages/auth/src/Domain/Setting/SettingCrypter.spec.ts b/packages/auth/src/Domain/Setting/SettingCrypter.spec.ts index 3e1b04281..7fb7d4451 100644 --- a/packages/auth/src/Domain/Setting/SettingCrypter.spec.ts +++ b/packages/auth/src/Domain/Setting/SettingCrypter.spec.ts @@ -7,8 +7,7 @@ import { Setting } from './Setting' import { SettingCrypter } from './SettingCrypter' import { SubscriptionSetting } from './SubscriptionSetting' -import { SettingName } from '@standardnotes/settings' -import { Timestamps, Uuid } from '@standardnotes/domain-core' +import { SettingName, Timestamps, Uuid } from '@standardnotes/domain-core' describe('SettingCrypter', () => { let userRepository: UserRepositoryInterface diff --git a/packages/auth/src/Domain/Setting/SettingInterpreter.spec.ts b/packages/auth/src/Domain/Setting/SettingInterpreter.spec.ts index b2ab7e24a..01e7c20c3 100644 --- a/packages/auth/src/Domain/Setting/SettingInterpreter.spec.ts +++ b/packages/auth/src/Domain/Setting/SettingInterpreter.spec.ts @@ -4,12 +4,7 @@ import { MuteEmailsSettingChangedEvent, UserDisabledSessionUserAgentLoggingEvent, } from '@standardnotes/domain-events' -import { - EmailBackupFrequency, - LogSessionUserAgentOption, - MuteMarketingEmailsOption, - SettingName, -} from '@standardnotes/settings' +import { EmailBackupFrequency, LogSessionUserAgentOption, MuteMarketingEmailsOption } from '@standardnotes/settings' import 'reflect-metadata' import { Logger } from 'winston' import { DomainEventFactoryInterface } from '../Event/DomainEventFactoryInterface' @@ -21,7 +16,7 @@ import { SettingInterpreter } from './SettingInterpreter' import { SettingRepositoryInterface } from './SettingRepositoryInterface' import { GetUserKeyParams } from '../UseCase/GetUserKeyParams/GetUserKeyParams' import { KeyParamsData } from '@standardnotes/responses' -import { Uuid, Timestamps, UniqueEntityId } from '@standardnotes/domain-core' +import { Uuid, Timestamps, UniqueEntityId, SettingName } from '@standardnotes/domain-core' describe('SettingInterpreter', () => { let user: User diff --git a/packages/auth/src/Domain/Setting/SettingInterpreter.ts b/packages/auth/src/Domain/Setting/SettingInterpreter.ts index 191431afb..d58456410 100644 --- a/packages/auth/src/Domain/Setting/SettingInterpreter.ts +++ b/packages/auth/src/Domain/Setting/SettingInterpreter.ts @@ -1,11 +1,6 @@ import { DomainEventPublisherInterface } from '@standardnotes/domain-events' -import { EmailLevel } from '@standardnotes/domain-core' -import { - EmailBackupFrequency, - LogSessionUserAgentOption, - MuteFailedBackupsEmailsOption, - SettingName, -} from '@standardnotes/settings' +import { EmailLevel, SettingName } from '@standardnotes/domain-core' +import { EmailBackupFrequency, LogSessionUserAgentOption, MuteFailedBackupsEmailsOption } from '@standardnotes/settings' import { DomainEventFactoryInterface } from '../Event/DomainEventFactoryInterface' import { User } from '../User/User' diff --git a/packages/auth/src/Domain/Setting/SettingRepositoryInterface.ts b/packages/auth/src/Domain/Setting/SettingRepositoryInterface.ts index 671d8f7e7..1de1a2700 100644 --- a/packages/auth/src/Domain/Setting/SettingRepositoryInterface.ts +++ b/packages/auth/src/Domain/Setting/SettingRepositoryInterface.ts @@ -1,6 +1,6 @@ import { ReadStream } from 'fs' +import { SettingName } from '@standardnotes/domain-core' -import { SettingName } from '@standardnotes/settings' import { DeleteSettingDto } from '../UseCase/DeleteSetting/DeleteSettingDto' import { Setting } from './Setting' diff --git a/packages/auth/src/Domain/Setting/SettingsAssociationService.spec.ts b/packages/auth/src/Domain/Setting/SettingsAssociationService.spec.ts index 3fa815673..3bf7decc5 100644 --- a/packages/auth/src/Domain/Setting/SettingsAssociationService.spec.ts +++ b/packages/auth/src/Domain/Setting/SettingsAssociationService.spec.ts @@ -1,11 +1,11 @@ import 'reflect-metadata' -import { SettingName } from '@standardnotes/settings' import { PermissionName } from '@standardnotes/features' import { SettingsAssociationService } from './SettingsAssociationService' import { EncryptionVersion } from '../Encryption/EncryptionVersion' import { SettingDescription } from './SettingDescription' +import { SettingName } from '@standardnotes/domain-core' describe('SettingsAssociationService', () => { const createService = () => new SettingsAssociationService() diff --git a/packages/auth/src/Domain/Setting/SettingsAssociationService.ts b/packages/auth/src/Domain/Setting/SettingsAssociationService.ts index 47c6f6932..c1215aa03 100644 --- a/packages/auth/src/Domain/Setting/SettingsAssociationService.ts +++ b/packages/auth/src/Domain/Setting/SettingsAssociationService.ts @@ -1,5 +1,6 @@ import { PermissionName } from '@standardnotes/features' -import { LogSessionUserAgentOption, MuteMarketingEmailsOption, SettingName } from '@standardnotes/settings' +import { SettingName } from '@standardnotes/domain-core' +import { LogSessionUserAgentOption, MuteMarketingEmailsOption } from '@standardnotes/settings' import { injectable } from 'inversify' import { EncryptionVersion } from '../Encryption/EncryptionVersion' diff --git a/packages/auth/src/Domain/Setting/SettingsAssociationServiceInterface.ts b/packages/auth/src/Domain/Setting/SettingsAssociationServiceInterface.ts index 73b5dbcb2..d0a53df04 100644 --- a/packages/auth/src/Domain/Setting/SettingsAssociationServiceInterface.ts +++ b/packages/auth/src/Domain/Setting/SettingsAssociationServiceInterface.ts @@ -1,5 +1,5 @@ import { PermissionName } from '@standardnotes/features' -import { SettingName } from '@standardnotes/settings' +import { SettingName } from '@standardnotes/domain-core' import { EncryptionVersion } from '../Encryption/EncryptionVersion' import { SettingDescription } from './SettingDescription' diff --git a/packages/auth/src/Domain/Setting/SubscriptionSettingsAssociationService.spec.ts b/packages/auth/src/Domain/Setting/SubscriptionSettingsAssociationService.spec.ts index ef077426a..0f66f6567 100644 --- a/packages/auth/src/Domain/Setting/SubscriptionSettingsAssociationService.spec.ts +++ b/packages/auth/src/Domain/Setting/SubscriptionSettingsAssociationService.spec.ts @@ -1,8 +1,7 @@ import 'reflect-metadata' import { SubscriptionName } from '@standardnotes/common' -import { RoleName } from '@standardnotes/domain-core' -import { SettingName } from '@standardnotes/settings' +import { RoleName, SettingName } from '@standardnotes/domain-core' import { PermissionName } from '@standardnotes/features' import { RoleRepositoryInterface } from '../Role/RoleRepositoryInterface' diff --git a/packages/auth/src/Domain/Setting/SubscriptionSettingsAssociationService.ts b/packages/auth/src/Domain/Setting/SubscriptionSettingsAssociationService.ts index 2b9ff0c5b..6afe8bcc2 100644 --- a/packages/auth/src/Domain/Setting/SubscriptionSettingsAssociationService.ts +++ b/packages/auth/src/Domain/Setting/SubscriptionSettingsAssociationService.ts @@ -1,6 +1,6 @@ import { SubscriptionName } from '@standardnotes/common' +import { SettingName } from '@standardnotes/domain-core' import { PermissionName } from '@standardnotes/features' -import { SettingName } from '@standardnotes/settings' import { inject, injectable } from 'inversify' import TYPES from '../../Bootstrap/Types' diff --git a/packages/auth/src/Domain/UseCase/ActivatePremiumFeatures/ActivatePremiumFeatures.ts b/packages/auth/src/Domain/UseCase/ActivatePremiumFeatures/ActivatePremiumFeatures.ts index 769a03522..f90c65d31 100644 --- a/packages/auth/src/Domain/UseCase/ActivatePremiumFeatures/ActivatePremiumFeatures.ts +++ b/packages/auth/src/Domain/UseCase/ActivatePremiumFeatures/ActivatePremiumFeatures.ts @@ -1,4 +1,4 @@ -import { Result, SubscriptionPlanName, UseCaseInterface, Username } from '@standardnotes/domain-core' +import { Result, SettingName, SubscriptionPlanName, UseCaseInterface, Username } from '@standardnotes/domain-core' import { TimerInterface } from '@standardnotes/time' import { RoleServiceInterface } from '../../Role/RoleServiceInterface' @@ -7,7 +7,6 @@ import { UserRepositoryInterface } from '../../User/UserRepositoryInterface' import { UserSubscription } from '../../Subscription/UserSubscription' import { UserSubscriptionType } from '../../Subscription/UserSubscriptionType' import { ActivatePremiumFeaturesDTO } from './ActivatePremiumFeaturesDTO' -import { SettingName } from '@standardnotes/settings' import { ApplyDefaultSubscriptionSettings } from '../ApplyDefaultSubscriptionSettings/ApplyDefaultSubscriptionSettings' export class ActivatePremiumFeatures implements UseCaseInterface { diff --git a/packages/auth/src/Domain/UseCase/ApplyDefaultSubscriptionSettings/ApplyDefaultSubscriptionSettings.spec.ts b/packages/auth/src/Domain/UseCase/ApplyDefaultSubscriptionSettings/ApplyDefaultSubscriptionSettings.spec.ts index 04061204f..3f228f181 100644 --- a/packages/auth/src/Domain/UseCase/ApplyDefaultSubscriptionSettings/ApplyDefaultSubscriptionSettings.spec.ts +++ b/packages/auth/src/Domain/UseCase/ApplyDefaultSubscriptionSettings/ApplyDefaultSubscriptionSettings.spec.ts @@ -1,4 +1,4 @@ -import { Result, SubscriptionPlanName, Timestamps, Uuid } from '@standardnotes/domain-core' +import { Result, SettingName, SubscriptionPlanName, Timestamps, Uuid } from '@standardnotes/domain-core' import { SubscriptionSetting } from '../../Setting/SubscriptionSetting' import { SubscriptionSettingsAssociationServiceInterface } from '../../Setting/SubscriptionSettingsAssociationServiceInterface' import { UserSubscription } from '../../Subscription/UserSubscription' @@ -6,7 +6,6 @@ import { UserSubscriptionRepositoryInterface } from '../../Subscription/UserSubs import { GetSubscriptionSetting } from '../GetSubscriptionSetting/GetSubscriptionSetting' import { SetSubscriptionSettingValue } from '../SetSubscriptionSettingValue/SetSubscriptionSettingValue' import { ApplyDefaultSubscriptionSettings } from './ApplyDefaultSubscriptionSettings' -import { SettingName } from '@standardnotes/settings' import { EncryptionVersion } from '../../Encryption/EncryptionVersion' describe('ApplyDefaultSubscriptionSettings', () => { diff --git a/packages/auth/src/Domain/UseCase/ApplyDefaultSubscriptionSettings/ApplyDefaultSubscriptionSettings.ts b/packages/auth/src/Domain/UseCase/ApplyDefaultSubscriptionSettings/ApplyDefaultSubscriptionSettings.ts index d560eb52d..dba73f4a5 100644 --- a/packages/auth/src/Domain/UseCase/ApplyDefaultSubscriptionSettings/ApplyDefaultSubscriptionSettings.ts +++ b/packages/auth/src/Domain/UseCase/ApplyDefaultSubscriptionSettings/ApplyDefaultSubscriptionSettings.ts @@ -1,5 +1,4 @@ -import { Result, SubscriptionPlanName, UseCaseInterface, Uuid } from '@standardnotes/domain-core' -import { SettingName } from '@standardnotes/settings' +import { Result, SettingName, SubscriptionPlanName, UseCaseInterface, Uuid } from '@standardnotes/domain-core' import { ApplyDefaultSubscriptionSettingsDTO } from './ApplyDefaultSubscriptionSettingsDTO' import { SubscriptionSettingsAssociationServiceInterface } from '../../Setting/SubscriptionSettingsAssociationServiceInterface' diff --git a/packages/auth/src/Domain/UseCase/CreateCrossServiceToken/CreateCrossServiceToken.spec.ts b/packages/auth/src/Domain/UseCase/CreateCrossServiceToken/CreateCrossServiceToken.spec.ts index 016b7928c..5e4404ca3 100644 --- a/packages/auth/src/Domain/UseCase/CreateCrossServiceToken/CreateCrossServiceToken.spec.ts +++ b/packages/auth/src/Domain/UseCase/CreateCrossServiceToken/CreateCrossServiceToken.spec.ts @@ -8,13 +8,19 @@ import { Role } from '../../Role/Role' import { UserRepositoryInterface } from '../../User/UserRepositoryInterface' import { CreateCrossServiceToken } from './CreateCrossServiceToken' -import { Result, SharedVaultUser, SharedVaultUserPermission, Timestamps, Uuid } from '@standardnotes/domain-core' +import { + Result, + SettingName, + SharedVaultUser, + SharedVaultUserPermission, + Timestamps, + Uuid, +} from '@standardnotes/domain-core' import { SharedVaultUserRepositoryInterface } from '../../SharedVault/SharedVaultUserRepositoryInterface' import { GetSubscriptionSetting } from '../GetSubscriptionSetting/GetSubscriptionSetting' import { GetRegularSubscriptionForUser } from '../GetRegularSubscriptionForUser/GetRegularSubscriptionForUser' import { UserSubscription } from '../../Subscription/UserSubscription' import { SubscriptionSetting } from '../../Setting/SubscriptionSetting' -import { SettingName } from '@standardnotes/settings' import { EncryptionVersion } from '../../Encryption/EncryptionVersion' describe('CreateCrossServiceToken', () => { diff --git a/packages/auth/src/Domain/UseCase/CreateCrossServiceToken/CreateCrossServiceToken.ts b/packages/auth/src/Domain/UseCase/CreateCrossServiceToken/CreateCrossServiceToken.ts index ad7625e4b..8e3c1873b 100644 --- a/packages/auth/src/Domain/UseCase/CreateCrossServiceToken/CreateCrossServiceToken.ts +++ b/packages/auth/src/Domain/UseCase/CreateCrossServiceToken/CreateCrossServiceToken.ts @@ -1,6 +1,5 @@ import { TokenEncoderInterface, CrossServiceTokenData } from '@standardnotes/security' -import { Result, UseCaseInterface, Uuid } from '@standardnotes/domain-core' -import { SettingName } from '@standardnotes/settings' +import { Result, SettingName, UseCaseInterface, Uuid } from '@standardnotes/domain-core' import { ProjectorInterface } from '../../../Projection/ProjectorInterface' import { Role } from '../../Role/Role' diff --git a/packages/auth/src/Domain/UseCase/CreateValetToken/CreateValetToken.spec.ts b/packages/auth/src/Domain/UseCase/CreateValetToken/CreateValetToken.spec.ts index 54c28c189..fb1af0705 100644 --- a/packages/auth/src/Domain/UseCase/CreateValetToken/CreateValetToken.spec.ts +++ b/packages/auth/src/Domain/UseCase/CreateValetToken/CreateValetToken.spec.ts @@ -11,8 +11,7 @@ import { SubscriptionSettingsAssociationServiceInterface } from '../../Setting/S import { GetRegularSubscriptionForUser } from '../GetRegularSubscriptionForUser/GetRegularSubscriptionForUser' import { GetSubscriptionSetting } from '../GetSubscriptionSetting/GetSubscriptionSetting' import { GetSharedSubscriptionForUser } from '../GetSharedSubscriptionForUser/GetSharedSubscriptionForUser' -import { Result, Timestamps, Uuid } from '@standardnotes/domain-core' -import { SettingName } from '@standardnotes/settings' +import { Result, SettingName, Timestamps, Uuid } from '@standardnotes/domain-core' import { EncryptionVersion } from '../../Encryption/EncryptionVersion' import { SubscriptionSetting } from '../../Setting/SubscriptionSetting' diff --git a/packages/auth/src/Domain/UseCase/CreateValetToken/CreateValetToken.ts b/packages/auth/src/Domain/UseCase/CreateValetToken/CreateValetToken.ts index adfcad288..dce4a3145 100644 --- a/packages/auth/src/Domain/UseCase/CreateValetToken/CreateValetToken.ts +++ b/packages/auth/src/Domain/UseCase/CreateValetToken/CreateValetToken.ts @@ -2,7 +2,6 @@ import { SubscriptionName } from '@standardnotes/common' import { TimerInterface } from '@standardnotes/time' import { TokenEncoderInterface, ValetTokenData } from '@standardnotes/security' import { CreateValetTokenResponseData } from '@standardnotes/responses' -import { SettingName } from '@standardnotes/settings' import { UseCaseInterface } from '../UseCaseInterface' @@ -12,6 +11,7 @@ import { CreateValetTokenPayload } from '../../ValetToken/CreateValetTokenPayloa import { GetRegularSubscriptionForUser } from '../GetRegularSubscriptionForUser/GetRegularSubscriptionForUser' import { GetSharedSubscriptionForUser } from '../GetSharedSubscriptionForUser/GetSharedSubscriptionForUser' import { GetSubscriptionSetting } from '../GetSubscriptionSetting/GetSubscriptionSetting' +import { SettingName } from '@standardnotes/domain-core' export class CreateValetToken implements UseCaseInterface { constructor( diff --git a/packages/auth/src/Domain/UseCase/DeleteSetting/DeleteSetting.spec.ts b/packages/auth/src/Domain/UseCase/DeleteSetting/DeleteSetting.spec.ts index 00b4626f6..5fb2cf0f8 100644 --- a/packages/auth/src/Domain/UseCase/DeleteSetting/DeleteSetting.spec.ts +++ b/packages/auth/src/Domain/UseCase/DeleteSetting/DeleteSetting.spec.ts @@ -6,8 +6,7 @@ import { Setting } from '../../Setting/Setting' import { SettingRepositoryInterface } from '../../Setting/SettingRepositoryInterface' import { DeleteSetting } from './DeleteSetting' -import { Timestamps, Uuid } from '@standardnotes/domain-core' -import { SettingName } from '@standardnotes/settings' +import { SettingName, Timestamps, Uuid } from '@standardnotes/domain-core' describe('DeleteSetting', () => { let setting: Setting diff --git a/packages/auth/src/Domain/UseCase/DisableEmailSettingBasedOnEmailSubscription/DisableEmailSettingBasedOnEmailSubscription.ts b/packages/auth/src/Domain/UseCase/DisableEmailSettingBasedOnEmailSubscription/DisableEmailSettingBasedOnEmailSubscription.ts index 87aec1919..08654fc07 100644 --- a/packages/auth/src/Domain/UseCase/DisableEmailSettingBasedOnEmailSubscription/DisableEmailSettingBasedOnEmailSubscription.ts +++ b/packages/auth/src/Domain/UseCase/DisableEmailSettingBasedOnEmailSubscription/DisableEmailSettingBasedOnEmailSubscription.ts @@ -1,5 +1,4 @@ -import { EmailLevel, Result, UseCaseInterface, Username } from '@standardnotes/domain-core' -import { SettingName } from '@standardnotes/settings' +import { EmailLevel, Result, SettingName, UseCaseInterface, Username } from '@standardnotes/domain-core' import { DisableEmailSettingBasedOnEmailSubscriptionDTO } from './DisableEmailSettingBasedOnEmailSubscriptionDTO' import { UserRepositoryInterface } from '../../User/UserRepositoryInterface' diff --git a/packages/auth/src/Domain/UseCase/GenerateRecoveryCodes/GenerateRecoveryCodes.ts b/packages/auth/src/Domain/UseCase/GenerateRecoveryCodes/GenerateRecoveryCodes.ts index a58c94998..c879ccd7e 100644 --- a/packages/auth/src/Domain/UseCase/GenerateRecoveryCodes/GenerateRecoveryCodes.ts +++ b/packages/auth/src/Domain/UseCase/GenerateRecoveryCodes/GenerateRecoveryCodes.ts @@ -1,5 +1,4 @@ -import { Result, UseCaseInterface, Uuid } from '@standardnotes/domain-core' -import { SettingName } from '@standardnotes/settings' +import { Result, SettingName, UseCaseInterface, Uuid } from '@standardnotes/domain-core' import { CryptoNode } from '@standardnotes/sncrypto-node' import { UserRepositoryInterface } from '../../User/UserRepositoryInterface' import { GenerateRecoveryCodesDTO } from './GenerateRecoveryCodesDTO' diff --git a/packages/auth/src/Domain/UseCase/GetSetting/GetSetting.spec.ts b/packages/auth/src/Domain/UseCase/GetSetting/GetSetting.spec.ts index 48c8bd781..5a7f13569 100644 --- a/packages/auth/src/Domain/UseCase/GetSetting/GetSetting.spec.ts +++ b/packages/auth/src/Domain/UseCase/GetSetting/GetSetting.spec.ts @@ -1,9 +1,8 @@ -import { SettingName } from '@standardnotes/settings' import { SettingCrypterInterface } from '../../Setting/SettingCrypterInterface' import { SettingRepositoryInterface } from '../../Setting/SettingRepositoryInterface' import { GetSetting } from './GetSetting' import { Setting } from '../../Setting/Setting' -import { Uuid, Timestamps } from '@standardnotes/domain-core' +import { Uuid, Timestamps, SettingName } from '@standardnotes/domain-core' describe('GetSetting', () => { let settingRepository: SettingRepositoryInterface diff --git a/packages/auth/src/Domain/UseCase/GetSetting/GetSetting.ts b/packages/auth/src/Domain/UseCase/GetSetting/GetSetting.ts index fc640990c..ac62badba 100644 --- a/packages/auth/src/Domain/UseCase/GetSetting/GetSetting.ts +++ b/packages/auth/src/Domain/UseCase/GetSetting/GetSetting.ts @@ -1,5 +1,4 @@ -import { SettingName } from '@standardnotes/settings' -import { Result, UseCaseInterface, Uuid } from '@standardnotes/domain-core' +import { Result, SettingName, UseCaseInterface, Uuid } from '@standardnotes/domain-core' import { GetSettingDto } from './GetSettingDto' import { SettingRepositoryInterface } from '../../Setting/SettingRepositoryInterface' diff --git a/packages/auth/src/Domain/UseCase/GetSettings/GetSettings.spec.ts b/packages/auth/src/Domain/UseCase/GetSettings/GetSettings.spec.ts index 1cde8cdff..bca87866b 100644 --- a/packages/auth/src/Domain/UseCase/GetSettings/GetSettings.spec.ts +++ b/packages/auth/src/Domain/UseCase/GetSettings/GetSettings.spec.ts @@ -1,5 +1,4 @@ -import { Uuid, Timestamps } from '@standardnotes/domain-core' -import { SettingName } from '@standardnotes/settings' +import { Uuid, Timestamps, SettingName } from '@standardnotes/domain-core' import { Setting } from '../../Setting/Setting' import { SettingCrypterInterface } from '../../Setting/SettingCrypterInterface' import { SettingRepositoryInterface } from '../../Setting/SettingRepositoryInterface' diff --git a/packages/auth/src/Domain/UseCase/GetSubscriptionSetting/GetSubscriptionSetting.spec.ts b/packages/auth/src/Domain/UseCase/GetSubscriptionSetting/GetSubscriptionSetting.spec.ts index bdc4f735f..db235beef 100644 --- a/packages/auth/src/Domain/UseCase/GetSubscriptionSetting/GetSubscriptionSetting.spec.ts +++ b/packages/auth/src/Domain/UseCase/GetSubscriptionSetting/GetSubscriptionSetting.spec.ts @@ -1,5 +1,4 @@ -import { Timestamps, Uuid } from '@standardnotes/domain-core' -import { SettingName } from '@standardnotes/settings' +import { SettingName, Timestamps, Uuid } from '@standardnotes/domain-core' import { EncryptionVersion } from '../../Encryption/EncryptionVersion' import { SettingCrypterInterface } from '../../Setting/SettingCrypterInterface' import { SubscriptionSetting } from '../../Setting/SubscriptionSetting' diff --git a/packages/auth/src/Domain/UseCase/GetSubscriptionSetting/GetSubscriptionSetting.ts b/packages/auth/src/Domain/UseCase/GetSubscriptionSetting/GetSubscriptionSetting.ts index a47c2adbd..ccc367baf 100644 --- a/packages/auth/src/Domain/UseCase/GetSubscriptionSetting/GetSubscriptionSetting.ts +++ b/packages/auth/src/Domain/UseCase/GetSubscriptionSetting/GetSubscriptionSetting.ts @@ -1,9 +1,8 @@ -import { Result, UseCaseInterface, Uuid } from '@standardnotes/domain-core' +import { Result, SettingName, UseCaseInterface, Uuid } from '@standardnotes/domain-core' import { SubscriptionSetting } from '../../Setting/SubscriptionSetting' import { SubscriptionSettingRepositoryInterface } from '../../Setting/SubscriptionSettingRepositoryInterface' import { GetSubscriptionSettingDTO } from './GetSubscriptionSettingDTO' -import { SettingName } from '@standardnotes/settings' import { SettingCrypterInterface } from '../../Setting/SettingCrypterInterface' export class GetSubscriptionSetting diff --git a/packages/auth/src/Domain/UseCase/GetUserKeyParamsRecovery/GetUserKeyParamsRecovery.ts b/packages/auth/src/Domain/UseCase/GetUserKeyParamsRecovery/GetUserKeyParamsRecovery.ts index 1276176b3..63467748b 100644 --- a/packages/auth/src/Domain/UseCase/GetUserKeyParamsRecovery/GetUserKeyParamsRecovery.ts +++ b/packages/auth/src/Domain/UseCase/GetUserKeyParamsRecovery/GetUserKeyParamsRecovery.ts @@ -1,6 +1,5 @@ import { KeyParamsData } from '@standardnotes/responses' -import { Result, UseCaseInterface, Username, Validator } from '@standardnotes/domain-core' -import { SettingName } from '@standardnotes/settings' +import { Result, SettingName, UseCaseInterface, Username, Validator } from '@standardnotes/domain-core' import { KeyParamsFactoryInterface } from '../../User/KeyParamsFactoryInterface' import { UserRepositoryInterface } from '../../User/UserRepositoryInterface' diff --git a/packages/auth/src/Domain/UseCase/SetSettingValue/SetSettingValue.spec.ts b/packages/auth/src/Domain/UseCase/SetSettingValue/SetSettingValue.spec.ts index d9beed51c..ec3c89c47 100644 --- a/packages/auth/src/Domain/UseCase/SetSettingValue/SetSettingValue.spec.ts +++ b/packages/auth/src/Domain/UseCase/SetSettingValue/SetSettingValue.spec.ts @@ -5,9 +5,8 @@ import { SetSettingValue } from './SetSettingValue' import { SettingsAssociationServiceInterface } from '../../Setting/SettingsAssociationServiceInterface' import { RoleServiceInterface } from '../../Role/RoleServiceInterface' import { SettingCrypterInterface } from '../../Setting/SettingCrypterInterface' -import { Result, Timestamps, Uuid } from '@standardnotes/domain-core' +import { Result, SettingName, Timestamps, Uuid } from '@standardnotes/domain-core' import { EncryptionVersion } from '../../Encryption/EncryptionVersion' -import { SettingName } from '@standardnotes/settings' import { PermissionName } from '@standardnotes/features' import { Setting } from '../../Setting/Setting' diff --git a/packages/auth/src/Domain/UseCase/SetSettingValue/SetSettingValue.ts b/packages/auth/src/Domain/UseCase/SetSettingValue/SetSettingValue.ts index 47eed0349..6a5b12900 100644 --- a/packages/auth/src/Domain/UseCase/SetSettingValue/SetSettingValue.ts +++ b/packages/auth/src/Domain/UseCase/SetSettingValue/SetSettingValue.ts @@ -1,5 +1,4 @@ -import { Result, Timestamps, UseCaseInterface, Uuid } from '@standardnotes/domain-core' -import { SettingName } from '@standardnotes/settings' +import { Result, SettingName, Timestamps, UseCaseInterface, Uuid } from '@standardnotes/domain-core' import { TimerInterface } from '@standardnotes/time' import { Setting } from '../../Setting/Setting' diff --git a/packages/auth/src/Domain/UseCase/SetSubscriptionSettingValue/SetSubscriptionSettingValue.spec.ts b/packages/auth/src/Domain/UseCase/SetSubscriptionSettingValue/SetSubscriptionSettingValue.spec.ts index 402bd317e..1ea8240c8 100644 --- a/packages/auth/src/Domain/UseCase/SetSubscriptionSettingValue/SetSubscriptionSettingValue.spec.ts +++ b/packages/auth/src/Domain/UseCase/SetSubscriptionSettingValue/SetSubscriptionSettingValue.spec.ts @@ -2,8 +2,7 @@ import { TimerInterface } from '@standardnotes/time' import { SubscriptionSettingRepositoryInterface } from '../../Setting/SubscriptionSettingRepositoryInterface' import { GetSubscriptionSetting } from '../GetSubscriptionSetting/GetSubscriptionSetting' import { SetSubscriptionSettingValue } from './SetSubscriptionSettingValue' -import { Result, Timestamps, Uuid } from '@standardnotes/domain-core' -import { SettingName } from '@standardnotes/settings' +import { Result, SettingName, Timestamps, Uuid } from '@standardnotes/domain-core' import { EncryptionVersion } from '../../Encryption/EncryptionVersion' import { SubscriptionSetting } from '../../Setting/SubscriptionSetting' diff --git a/packages/auth/src/Domain/UseCase/SetSubscriptionSettingValue/SetSubscriptionSettingValue.ts b/packages/auth/src/Domain/UseCase/SetSubscriptionSettingValue/SetSubscriptionSettingValue.ts index fa532f381..9336b4ffd 100644 --- a/packages/auth/src/Domain/UseCase/SetSubscriptionSettingValue/SetSubscriptionSettingValue.ts +++ b/packages/auth/src/Domain/UseCase/SetSubscriptionSettingValue/SetSubscriptionSettingValue.ts @@ -1,6 +1,5 @@ -import { Result, Timestamps, UseCaseInterface, Uuid } from '@standardnotes/domain-core' +import { Result, SettingName, Timestamps, UseCaseInterface, Uuid } from '@standardnotes/domain-core' import { TimerInterface } from '@standardnotes/time' -import { SettingName } from '@standardnotes/settings' import { SetSubscriptionSettingValueDTO } from './SetSubscriptionSettingValueDTO' import { SubscriptionSettingRepositoryInterface } from '../../Setting/SubscriptionSettingRepositoryInterface' diff --git a/packages/auth/src/Domain/UseCase/SignInWithRecoveryCodes/SignInWithRecoveryCodes.ts b/packages/auth/src/Domain/UseCase/SignInWithRecoveryCodes/SignInWithRecoveryCodes.ts index bc3978bbe..7e318c588 100644 --- a/packages/auth/src/Domain/UseCase/SignInWithRecoveryCodes/SignInWithRecoveryCodes.ts +++ b/packages/auth/src/Domain/UseCase/SignInWithRecoveryCodes/SignInWithRecoveryCodes.ts @@ -1,6 +1,5 @@ import * as bcrypt from 'bcryptjs' -import { Result, UseCaseInterface, Username, Uuid, Validator } from '@standardnotes/domain-core' -import { SettingName } from '@standardnotes/settings' +import { Result, SettingName, UseCaseInterface, Username, Uuid, Validator } from '@standardnotes/domain-core' import { AuthResponse20200115 } from '../../Auth/AuthResponse20200115' import { CrypterInterface } from '../../Encryption/CrypterInterface' diff --git a/packages/auth/src/Domain/UseCase/UpdateStorageQuotaUsedForUser/UpdateStorageQuotaUsedForUser.spec.ts b/packages/auth/src/Domain/UseCase/UpdateStorageQuotaUsedForUser/UpdateStorageQuotaUsedForUser.spec.ts index 9edb98c51..d1e0cd61d 100644 --- a/packages/auth/src/Domain/UseCase/UpdateStorageQuotaUsedForUser/UpdateStorageQuotaUsedForUser.spec.ts +++ b/packages/auth/src/Domain/UseCase/UpdateStorageQuotaUsedForUser/UpdateStorageQuotaUsedForUser.spec.ts @@ -9,9 +9,8 @@ import { GetRegularSubscriptionForUser } from '../GetRegularSubscriptionForUser/ import { GetSubscriptionSetting } from '../GetSubscriptionSetting/GetSubscriptionSetting' import { SetSubscriptionSettingValue } from '../SetSubscriptionSettingValue/SetSubscriptionSettingValue' import { Logger } from 'winston' -import { Result, Timestamps, Uuid } from '@standardnotes/domain-core' +import { Result, SettingName, Timestamps, Uuid } from '@standardnotes/domain-core' import { SubscriptionSetting } from '../../Setting/SubscriptionSetting' -import { SettingName } from '@standardnotes/settings' import { EncryptionVersion } from '../../Encryption/EncryptionVersion' describe('UpdateStorageQuotaUsedForUser', () => { diff --git a/packages/auth/src/Domain/UseCase/UpdateStorageQuotaUsedForUser/UpdateStorageQuotaUsedForUser.ts b/packages/auth/src/Domain/UseCase/UpdateStorageQuotaUsedForUser/UpdateStorageQuotaUsedForUser.ts index 99427c05e..9a6e8da5c 100644 --- a/packages/auth/src/Domain/UseCase/UpdateStorageQuotaUsedForUser/UpdateStorageQuotaUsedForUser.ts +++ b/packages/auth/src/Domain/UseCase/UpdateStorageQuotaUsedForUser/UpdateStorageQuotaUsedForUser.ts @@ -1,5 +1,4 @@ -import { Result, UseCaseInterface, Uuid } from '@standardnotes/domain-core' -import { SettingName } from '@standardnotes/settings' +import { Result, SettingName, UseCaseInterface, Uuid } from '@standardnotes/domain-core' import { UserSubscription } from '../../Subscription/UserSubscription' import { UserRepositoryInterface } from '../../User/UserRepositoryInterface' diff --git a/packages/auth/src/Domain/UseCase/VerifyMFA.spec.ts b/packages/auth/src/Domain/UseCase/VerifyMFA.spec.ts index 7b635035c..6d49022f2 100644 --- a/packages/auth/src/Domain/UseCase/VerifyMFA.spec.ts +++ b/packages/auth/src/Domain/UseCase/VerifyMFA.spec.ts @@ -1,8 +1,7 @@ import 'reflect-metadata' import { authenticator } from 'otplib' -import { SettingName } from '@standardnotes/settings' import { SelectorInterface } from '@standardnotes/security' -import { Result, Timestamps, Uuid } from '@standardnotes/domain-core' +import { Result, SettingName, Timestamps, Uuid } from '@standardnotes/domain-core' import { User } from '../User/User' import { UserRepositoryInterface } from '../User/UserRepositoryInterface' diff --git a/packages/auth/src/Domain/UseCase/VerifyMFA.ts b/packages/auth/src/Domain/UseCase/VerifyMFA.ts index 51e4a9eac..3afb076ba 100644 --- a/packages/auth/src/Domain/UseCase/VerifyMFA.ts +++ b/packages/auth/src/Domain/UseCase/VerifyMFA.ts @@ -1,11 +1,10 @@ import * as crypto from 'crypto' import { AuthenticationResponseJSON } from '@simplewebauthn/typescript-types' import { ErrorTag } from '@standardnotes/responses' -import { SettingName } from '@standardnotes/settings' import { v4 as uuidv4 } from 'uuid' import { authenticator } from 'otplib' import { SelectorInterface } from '@standardnotes/security' -import { Username, Uuid } from '@standardnotes/domain-core' +import { SettingName, Username, Uuid } from '@standardnotes/domain-core' import { MFAValidationError } from '../Error/MFAValidationError' import { UserRepositoryInterface } from '../User/UserRepositoryInterface' diff --git a/packages/auth/src/Domain/UseCase/VerifyPredicate/VerifyPredicate.spec.ts b/packages/auth/src/Domain/UseCase/VerifyPredicate/VerifyPredicate.spec.ts index 019ecf6a8..46c684a89 100644 --- a/packages/auth/src/Domain/UseCase/VerifyPredicate/VerifyPredicate.spec.ts +++ b/packages/auth/src/Domain/UseCase/VerifyPredicate/VerifyPredicate.spec.ts @@ -8,8 +8,8 @@ import { UserSubscription } from '../../Subscription/UserSubscription' import { UserSubscriptionRepositoryInterface } from '../../Subscription/UserSubscriptionRepositoryInterface' import { VerifyPredicate } from './VerifyPredicate' -import { EmailBackupFrequency, SettingName } from '@standardnotes/settings' -import { Uuid, Timestamps } from '@standardnotes/domain-core' +import { EmailBackupFrequency } from '@standardnotes/settings' +import { Uuid, Timestamps, SettingName } from '@standardnotes/domain-core' describe('VerifyPredicate', () => { let settingRepository: SettingRepositoryInterface diff --git a/packages/auth/src/Domain/UseCase/VerifyPredicate/VerifyPredicate.ts b/packages/auth/src/Domain/UseCase/VerifyPredicate/VerifyPredicate.ts index 4e28e0e4f..7e2265da8 100644 --- a/packages/auth/src/Domain/UseCase/VerifyPredicate/VerifyPredicate.ts +++ b/packages/auth/src/Domain/UseCase/VerifyPredicate/VerifyPredicate.ts @@ -1,5 +1,5 @@ import { PredicateName, PredicateVerificationResult } from '@standardnotes/predicates' -import { EmailBackupFrequency, SettingName } from '@standardnotes/settings' +import { EmailBackupFrequency } from '@standardnotes/settings' import { inject, injectable } from 'inversify' import TYPES from '../../../Bootstrap/Types' @@ -9,6 +9,7 @@ import { UseCaseInterface } from '../UseCaseInterface' import { VerifyPredicateDTO } from './VerifyPredicateDTO' import { VerifyPredicateResponse } from './VerifyPredicateResponse' +import { SettingName } from '@standardnotes/domain-core' @injectable() export class VerifyPredicate implements UseCaseInterface { diff --git a/packages/auth/src/Infra/InversifyExpressUtils/Base/BaseAdminController.ts b/packages/auth/src/Infra/InversifyExpressUtils/Base/BaseAdminController.ts index 811c715a7..a17f87826 100644 --- a/packages/auth/src/Infra/InversifyExpressUtils/Base/BaseAdminController.ts +++ b/packages/auth/src/Infra/InversifyExpressUtils/Base/BaseAdminController.ts @@ -1,6 +1,5 @@ -import { ControllerContainerInterface, Username } from '@standardnotes/domain-core' +import { ControllerContainerInterface, SettingName, Username } from '@standardnotes/domain-core' import { BaseHttpController, results } from 'inversify-express-utils' -import { SettingName } from '@standardnotes/settings' import { Request } from 'express' import { CreateOfflineSubscriptionToken } from '../../../Domain/UseCase/CreateOfflineSubscriptionToken/CreateOfflineSubscriptionToken' diff --git a/packages/auth/src/Infra/InversifyExpressUtils/Base/BaseSubscriptionTokensController.ts b/packages/auth/src/Infra/InversifyExpressUtils/Base/BaseSubscriptionTokensController.ts index cdcfc2180..1011562d8 100644 --- a/packages/auth/src/Infra/InversifyExpressUtils/Base/BaseSubscriptionTokensController.ts +++ b/packages/auth/src/Infra/InversifyExpressUtils/Base/BaseSubscriptionTokensController.ts @@ -1,4 +1,4 @@ -import { ControllerContainerInterface } from '@standardnotes/domain-core' +import { ControllerContainerInterface, SettingName } from '@standardnotes/domain-core' import { ErrorTag } from '@standardnotes/responses' import { Role, TokenEncoderInterface, CrossServiceTokenData } from '@standardnotes/security' import { BaseHttpController, results } from 'inversify-express-utils' @@ -7,7 +7,6 @@ import { Request, Response } from 'express' import { AuthenticateSubscriptionToken } from '../../../Domain/UseCase/AuthenticateSubscriptionToken/AuthenticateSubscriptionToken' import { CreateSubscriptionToken } from '../../../Domain/UseCase/CreateSubscriptionToken/CreateSubscriptionToken' import { ProjectorInterface } from '../../../Projection/ProjectorInterface' -import { SettingName } from '@standardnotes/settings' import { User } from '../../../Domain/User/User' import { GetSetting } from '../../../Domain/UseCase/GetSetting/GetSetting' diff --git a/packages/auth/src/Infra/TypeORM/TypeORMSettingRepository.ts b/packages/auth/src/Infra/TypeORM/TypeORMSettingRepository.ts index d5975788e..e71bc4293 100644 --- a/packages/auth/src/Infra/TypeORM/TypeORMSettingRepository.ts +++ b/packages/auth/src/Infra/TypeORM/TypeORMSettingRepository.ts @@ -1,4 +1,3 @@ -import { SettingName } from '@standardnotes/settings' import { ReadStream } from 'fs' import { Repository } from 'typeorm' @@ -6,7 +5,7 @@ import { Setting } from '../../Domain/Setting/Setting' import { SettingRepositoryInterface } from '../../Domain/Setting/SettingRepositoryInterface' import { DeleteSettingDto } from '../../Domain/UseCase/DeleteSetting/DeleteSettingDto' import { TypeORMSetting } from './TypeORMSetting' -import { MapperInterface } from '@standardnotes/domain-core' +import { MapperInterface, SettingName } from '@standardnotes/domain-core' export class TypeORMSettingRepository implements SettingRepositoryInterface { constructor( diff --git a/packages/settings/src/Domain/Setting/SettingName.ts b/packages/domain-core/src/Domain/Setting/SettingName.ts similarity index 96% rename from packages/settings/src/Domain/Setting/SettingName.ts rename to packages/domain-core/src/Domain/Setting/SettingName.ts index 0f36d6d7f..59b82c10e 100644 --- a/packages/settings/src/Domain/Setting/SettingName.ts +++ b/packages/domain-core/src/Domain/Setting/SettingName.ts @@ -1,4 +1,5 @@ -import { Result, ValueObject } from '@standardnotes/domain-core' +import { Result } from '../Core/Result' +import { ValueObject } from '../Core/ValueObject' import { SettingNameProps } from './SettingNameProps' diff --git a/packages/settings/src/Domain/Setting/SettingNameProps.ts b/packages/domain-core/src/Domain/Setting/SettingNameProps.ts similarity index 100% rename from packages/settings/src/Domain/Setting/SettingNameProps.ts rename to packages/domain-core/src/Domain/Setting/SettingNameProps.ts diff --git a/packages/domain-core/src/Domain/index.ts b/packages/domain-core/src/Domain/index.ts index 492b46311..1310d5993 100644 --- a/packages/domain-core/src/Domain/index.ts +++ b/packages/domain-core/src/Domain/index.ts @@ -61,6 +61,9 @@ export * from './Service/ServiceIdentifier' export * from './Service/ServiceIdentifierProps' export * from './Service/ServiceInterface' +export * from './Setting/SettingName' +export * from './Setting/SettingNameProps' + export * from './SharedVault/SharedVaultUser' export * from './SharedVault/SharedVaultUserPermission' export * from './SharedVault/SharedVaultUserPermissionProps' diff --git a/packages/settings/src/Domain/index.ts b/packages/settings/src/Domain/index.ts index 6ea43ffe0..0a29f80aa 100644 --- a/packages/settings/src/Domain/index.ts +++ b/packages/settings/src/Domain/index.ts @@ -4,5 +4,3 @@ export * from './LogSessionUserAgent/LogSessionUserAgentOption' export * from './MuteFailedBackupsEmails/MuteFailedBackupsEmailsOption' export * from './MuteMarketingEmails/MuteMarketingEmailsOption' export * from './MuteSignInEmails/MuteSignInEmailsOption' -export * from './Setting/SettingName' -export * from './Setting/SettingNameProps'