feat: extract setting name to domain-core package

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'

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'

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<void> {

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'

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'

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'

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'
 

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'

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'
 

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

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

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'

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'
 

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()

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'

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'

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'

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'

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<string> {

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', () => {

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'

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', () => {

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'

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'
 

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(

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

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'

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'

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

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'

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'

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'

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

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'

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'
 

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'

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'
 

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'

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'

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', () => {

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'

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'

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'

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

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 {

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'

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'
 

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(

packages/settings/src/Domain/Setting/SettingName.ts → 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'
 

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'

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'