From e941f06bac63a2de6fae35d21c74cfde313014fa Mon Sep 17 00:00:00 2001 From: Oscar Hinton Date: Fri, 14 Oct 2022 18:25:50 +0200 Subject: [PATCH] [SM-288] Rename models to follow naming convention (#3795) --- .../src/background/contextMenus.background.ts | 2 +- .../browser/src/background/main.background.ts | 4 +- .../background/nativeMessaging.background.ts | 4 +- .../src/background/notification.background.ts | 6 +-- .../state-migration-service.factory.ts | 2 +- .../state-service.factory.ts | 2 +- .../src/listeners/onCommandListener.ts | 2 +- .../src/listeners/onInstallListener.ts | 2 +- .../models/browserGroupingsComponentState.ts | 6 +-- .../src/models/browserSendComponentState.ts | 2 +- .../components/action-buttons.component.ts | 2 +- .../popup/components/cipher-row.component.ts | 2 +- .../popup/components/send-list.component.ts | 2 +- .../popup/generator/generator.component.ts | 2 +- .../popup/send/send-groupings.component.ts | 2 +- .../src/popup/send/send-type.component.ts | 2 +- .../src/popup/settings/folders.component.ts | 2 +- .../src/popup/vault/add-edit.component.ts | 2 +- .../src/popup/vault/ciphers.component.ts | 8 ++-- .../src/popup/vault/current-tab.component.ts | 2 +- .../src/popup/vault/vault-filter.component.ts | 8 ++-- .../browser/src/popup/vault/view.component.ts | 2 +- .../abstractKeyGeneration.service.ts | 2 +- .../services/abstractions/autofill.service.ts | 2 +- .../services/abstractions/state.service.ts | 2 +- apps/browser/src/services/autofill.service.ts | 4 +- .../src/services/folders/folder.service.ts | 2 +- .../src/services/keyGeneration.service.ts | 2 +- .../localBackedSessionStorage.service.spec.ts | 4 +- .../localBackedSessionStorage.service.ts | 6 +-- .../src/services/state.service.spec.ts | 4 +- apps/browser/src/services/state.service.ts | 4 +- .../src/services/vaultFilter.service.ts | 2 +- apps/cli/src/bw.ts | 2 +- apps/cli/src/commands/create.command.ts | 6 +-- apps/cli/src/commands/download.command.ts | 4 +- apps/cli/src/commands/edit.command.ts | 6 +-- apps/cli/src/commands/get.command.ts | 26 ++++++------ apps/cli/src/commands/list.command.ts | 4 +- apps/cli/src/commands/send/get.command.ts | 2 +- apps/cli/src/commands/send/receive.command.ts | 6 +-- .../request/organizationCollectionRequest.ts | 2 +- .../src/models/response/attachmentResponse.ts | 2 +- .../cli/src/models/response/cipherResponse.ts | 4 +- .../src/models/response/collectionResponse.ts | 4 +- .../cli/src/models/response/folderResponse.ts | 4 +- apps/cli/src/models/response/loginResponse.ts | 4 +- .../organizationCollectionResponse.ts | 2 +- .../response/passwordHistoryResponse.ts | 2 +- .../src/models/response/sendAccessResponse.ts | 2 +- .../src/models/response/sendFileResponse.ts | 2 +- apps/cli/src/models/response/sendResponse.ts | 2 +- .../src/models/response/sendTextResponse.ts | 2 +- .../services/nodeEnvSecureStorage.service.ts | 4 +- apps/cli/src/utils.ts | 4 +- .../src/nativeMessageService.ts | 4 +- apps/desktop/src/app/send/send.component.ts | 2 +- .../src/app/services/services.module.ts | 2 +- .../src/app/vault/ciphers.component.ts | 2 +- apps/desktop/src/app/vault/vault.component.ts | 4 +- apps/desktop/src/app/vault/view.component.ts | 2 +- apps/desktop/src/main.ts | 2 +- .../nativeMessaging/encryptedMessage.ts | 2 +- .../encryptedMessageResponse.ts | 2 +- .../nativeMessaging/legacyMessageWrapper.ts | 2 +- .../encryptedMessageHandlerService.ts | 6 +-- .../services/nativeMessageHandler.service.ts | 4 +- .../src/services/nativeMessaging.service.ts | 4 +- apps/desktop/src/services/state.service.ts | 2 +- .../login/login-with-device.component.ts | 4 +- .../src/app/accounts/login/login.component.ts | 4 +- .../register-form/register-form.component.ts | 2 +- .../src/app/accounts/register.component.ts | 4 +- .../trial-initiation.component.spec.ts | 2 +- .../trial-initiation.component.ts | 4 +- .../src/app/common/base.events.component.ts | 2 +- .../app/components/premium-badge.stories.ts | 2 +- apps/web/src/app/core/html-storage.service.ts | 2 +- apps/web/src/app/core/state/global-state.ts | 2 +- apps/web/src/app/core/state/state.service.ts | 10 ++--- .../manage/collection-add-edit.component.ts | 4 +- .../manage/collections.component.ts | 4 +- .../manage/group-add-edit.component.ts | 4 +- .../manage/reset-password.component.ts | 6 +-- .../manage/user-add-edit.component.ts | 6 +-- .../settings/delete-organization.component.ts | 2 +- .../organization-subscription.component.ts | 2 +- .../exposed-passwords-report.component.ts | 2 +- .../inactive-two-factor-report.component.ts | 2 +- .../reused-passwords-report.component.ts | 2 +- .../unsecured-websites-report.component.ts | 2 +- .../tools/weak-passwords-report.component.ts | 2 +- .../organizations/vault/add-edit.component.ts | 2 +- .../vault/attachments.component.ts | 4 +- .../organizations/vault/ciphers.component.ts | 2 +- .../vault/collections.component.ts | 2 +- .../organizations/vault/vault.component.ts | 2 +- .../reports/pages/cipher-report.component.ts | 2 +- .../exposed-passwords-report.component.ts | 2 +- .../inactive-two-factor-report.component.ts | 2 +- .../reused-passwords-report.component.ts | 2 +- .../unsecured-websites-report.component.ts | 2 +- .../pages/weak-passwords-report.component.ts | 2 +- apps/web/src/app/send/access.component.ts | 8 ++-- apps/web/src/app/send/send.component.ts | 2 +- .../settings/billing-sync-key.component.ts | 2 +- .../app/settings/change-password.component.ts | 4 +- .../emergency-access-attachments.component.ts | 2 +- .../emergency-access-takeover.component.ts | 4 +- .../emergency-access-view.component.ts | 6 +-- .../settings/organization-plans.component.ts | 4 +- .../src/app/settings/update-key.component.ts | 2 +- apps/web/src/app/vault/add-edit.component.ts | 2 +- .../src/app/vault/attachments.component.ts | 2 +- apps/web/src/app/vault/bulk-move.component.ts | 2 +- .../web/src/app/vault/bulk-share.component.ts | 4 +- apps/web/src/app/vault/ciphers.component.ts | 2 +- .../src/app/vault/collections.component.ts | 2 +- apps/web/src/app/vault/share.component.ts | 2 +- .../shared/vault-filter.service.ts | 4 +- apps/web/src/app/vault/vault.component.ts | 2 +- .../organizations/manage/scim.component.ts | 2 +- .../app/organizations/manage/sso.component.ts | 4 +- .../manage/user-add-edit.component.ts | 2 +- .../add-edit-custom-fields.component.ts | 4 +- .../src/components/add-edit.component.ts | 16 ++++---- .../src/components/attachments.component.ts | 6 +-- .../src/components/callout.component.ts | 2 +- .../components/change-password.component.ts | 6 +-- .../src/components/ciphers.component.ts | 2 +- .../src/components/collections.component.ts | 4 +- .../components/folder-add-edit.component.ts | 2 +- .../src/components/generator.component.ts | 2 +- libs/angular/src/components/icon.component.ts | 2 +- libs/angular/src/components/lock.component.ts | 4 +- .../angular/src/components/login.component.ts | 4 +- .../password-generator-history.component.ts | 2 +- .../components/password-history.component.ts | 2 +- .../src/components/register.component.ts | 2 +- .../src/components/send/add-edit.component.ts | 8 ++-- .../src/components/send/send.component.ts | 2 +- .../src/components/set-password.component.ts | 4 +- .../angular/src/components/share.component.ts | 4 +- libs/angular/src/components/sso.component.ts | 4 +- .../src/components/two-factor.component.ts | 2 +- .../components/update-password.component.ts | 6 +-- .../update-temp-password.component.ts | 6 +-- .../view-custom-fields.component.ts | 4 +- libs/angular/src/components/view.component.ts | 8 ++-- libs/angular/src/pipes/search-ciphers.pipe.ts | 2 +- .../src/services/jslib-services.module.ts | 2 +- .../components/collection-filter.component.ts | 4 +- .../components/folder-filter.component.ts | 4 +- .../organization-filter.component.ts | 2 +- .../components/type-filter.component.ts | 2 +- .../components/vault-filter.component.ts | 6 +-- .../models/dynamic-tree-node.model.ts | 6 +-- .../models/top-level-tree-node.model.ts | 2 +- .../models/vault-filter.model.spec.ts | 2 +- .../vault-filter/models/vault-filter.model.ts | 2 +- .../services/vault-filter.service.ts | 6 +-- ...bitwardenPasswordProtectedImporter.spec.ts | 2 +- .../spec/importers/firefoxCsvImporter.spec.ts | 6 +-- .../importers/lastpassCsvImporter.spec.ts | 6 +-- .../spec/importers/mykiCsvImporter.spec.ts | 2 +- .../importers/nordpassCsvImporter.spec.ts | 4 +- .../importers/onepassword1PuxImporter.spec.ts | 2 +- .../onepasswordMacCsvImporter.spec.ts | 2 +- .../onepasswordWinCsvImporter.spec.ts | 4 +- .../spec/importers/safariCsvImporter.spec.ts | 6 +-- .../logInStrategies/apiLogIn.strategy.spec.ts | 2 +- .../logInStrategies/logIn.strategy.spec.ts | 6 +-- .../passwordLogIn.strategy.spec.ts | 4 +- .../logInStrategies/ssoLogIn.strategy.spec.ts | 2 +- .../spec/models/domain/attachment.spec.ts | 6 +-- libs/common/spec/models/domain/card.spec.ts | 4 +- libs/common/spec/models/domain/cipher.spec.ts | 12 +++--- .../spec/models/domain/collection.spec.ts | 2 +- .../spec/models/domain/encArrayBuffer.spec.ts | 2 +- .../spec/models/domain/encString.spec.ts | 4 +- libs/common/spec/models/domain/field.spec.ts | 4 +- libs/common/spec/models/domain/folder.spec.ts | 6 +-- .../spec/models/domain/identity.spec.ts | 4 +- libs/common/spec/models/domain/login.spec.ts | 8 ++-- .../spec/models/domain/loginUri.spec.ts | 6 +-- .../spec/models/domain/password.spec.ts | 4 +- .../spec/models/domain/secureNote.spec.ts | 4 +- libs/common/spec/models/domain/send.spec.ts | 6 +-- .../spec/models/domain/sendAccess.spec.ts | 4 +- .../spec/models/domain/sendFile.spec.ts | 4 +- .../spec/models/domain/sendText.spec.ts | 4 +- .../models/domain/symmetricCryptoKey.spec.ts | 2 +- .../spec/models/view/attachmentView.spec.ts | 6 +-- .../spec/models/view/cipherView.spec.ts | 24 +++++------ .../spec/models/view/folderView.spec.ts | 2 +- .../common/spec/models/view/loginView.spec.ts | 6 +-- .../models/view/passwordHistoryView.spec.ts | 2 +- .../spec/services/cipher.service.spec.ts | 6 +-- .../spec/services/encrypt.service.spec.ts | 6 +-- .../spec/services/export.service.spec.ts | 8 ++-- .../spec/services/folder.service.spec.ts | 6 +-- .../organization/organization.service.spec.ts | 2 +- .../spec/services/policy.service.spec.ts | 10 ++--- .../services/stateMigration.service.spec.ts | 2 +- libs/common/spec/utils.ts | 2 +- .../webCryptoFunction.service.spec.ts | 2 +- .../abstractions/abstractEncrypt.service.ts | 6 +-- libs/common/src/abstractions/api.service.ts | 2 +- libs/common/src/abstractions/auth.service.ts | 6 +-- .../common/src/abstractions/cipher.service.ts | 8 ++-- .../src/abstractions/collection.service.ts | 6 +-- .../common/src/abstractions/crypto.service.ts | 6 +-- .../abstractions/cryptoFunction.service.ts | 4 +- .../common/src/abstractions/export.service.ts | 2 +- .../src/abstractions/fileUpload.service.ts | 4 +- .../folder/folder.service.abstraction.ts | 6 +-- .../passwordGeneration.service.ts | 4 +- .../policy/policy-api.service.abstraction.ts | 2 +- .../policy/policy.service.abstraction.ts | 6 +-- .../src/abstractions/provider.service.ts | 2 +- .../common/src/abstractions/search.service.ts | 4 +- libs/common/src/abstractions/send.service.ts | 8 ++-- libs/common/src/abstractions/state.service.ts | 38 +++++++++--------- .../src/abstractions/storage.service.ts | 2 +- .../src/factories/globalStateFactory.ts | 2 +- libs/common/src/factories/stateFactory.ts | 2 +- .../src/importers/ascendoCsvImporter.ts | 2 +- libs/common/src/importers/avastCsvImporter.ts | 2 +- .../common/src/importers/avastJsonImporter.ts | 2 +- libs/common/src/importers/aviraCsvImporter.ts | 2 +- libs/common/src/importers/baseImporter.ts | 16 ++++---- .../src/importers/bitwardenCsvImporter.ts | 12 +++--- .../src/importers/bitwardenJsonImporter.ts | 10 ++--- .../bitwardenPasswordProtectedImporter.ts | 6 +-- .../src/importers/blackBerryCsvImporter.ts | 2 +- libs/common/src/importers/blurCsvImporter.ts | 2 +- .../src/importers/buttercupCsvImporter.ts | 2 +- .../common/src/importers/chromeCsvImporter.ts | 2 +- .../src/importers/clipperzHtmlImporter.ts | 2 +- .../src/importers/codebookCsvImporter.ts | 2 +- .../dashlaneImporters/dashlaneCsvImporter.ts | 10 ++--- .../dashlaneImporters/dashlaneJsonImporter.ts | 10 ++--- .../src/importers/encryptrCsvImporter.ts | 4 +- .../common/src/importers/enpassCsvImporter.ts | 6 +-- .../src/importers/enpassJsonImporter.ts | 8 ++-- .../src/importers/firefoxCsvImporter.ts | 2 +- .../src/importers/fsecureFskImporter.ts | 4 +- .../common/src/importers/gnomeJsonImporter.ts | 2 +- libs/common/src/importers/importer.ts | 2 +- .../src/importers/kasperskyTxtImporter.ts | 2 +- .../src/importers/keepass2XmlImporter.ts | 4 +- .../src/importers/keepassxCsvImporter.ts | 2 +- .../keeperImporters/keeperCsvImporter.ts | 2 +- .../keeperImporters/keeperJsonImporter.ts | 2 +- .../src/importers/lastpassCsvImporter.ts | 14 +++---- .../src/importers/logMeOnceCsvImporter.ts | 2 +- .../src/importers/meldiumCsvImporter.ts | 2 +- .../src/importers/msecureCsvImporter.ts | 4 +- libs/common/src/importers/mykiCsvImporter.ts | 10 ++--- .../src/importers/nordpassCsvImporter.ts | 6 +-- .../cipherImportContext.ts | 2 +- .../onepassword1PifImporter.ts | 12 +++--- .../onepassword1PuxImporter.ts | 14 +++---- .../onepasswordCsvImporter.ts | 4 +- .../onepasswordMacCsvImporter.ts | 6 +-- .../onepasswordWinCsvImporter.ts | 8 ++-- .../src/importers/padlockCsvImporter.ts | 4 +- .../src/importers/passkeepCsvImporter.ts | 2 +- .../src/importers/passmanJsonImporter.ts | 2 +- .../src/importers/passpackCsvImporter.ts | 4 +- .../src/importers/passwordAgentCsvImporter.ts | 2 +- .../src/importers/passwordBossJsonImporter.ts | 6 +-- .../importers/passwordDragonXmlImporter.ts | 2 +- .../src/importers/passwordSafeXmlImporter.ts | 2 +- .../importers/passwordWalletTxtImporter.ts | 2 +- .../src/importers/rememBearCsvImporter.ts | 4 +- .../src/importers/roboformCsvImporter.ts | 2 +- .../common/src/importers/safariCsvImporter.ts | 2 +- .../src/importers/safeInCloudXmlImporter.ts | 10 ++--- .../src/importers/saferpassCsvImport.ts | 2 +- .../src/importers/secureSafeCsvImporter.ts | 2 +- .../src/importers/splashIdCsvImporter.ts | 4 +- .../importers/stickyPasswordXmlImporter.ts | 2 +- .../src/importers/truekeyCsvImporter.ts | 6 +-- libs/common/src/importers/upmCsvImporter.ts | 2 +- libs/common/src/importers/yotiCsvImporter.ts | 2 +- .../src/importers/zohoVaultCsvImporter.ts | 4 +- .../src/misc/linkedFieldOption.decorator.ts | 2 +- .../misc/logInStrategies/apiLogin.strategy.ts | 2 +- .../misc/logInStrategies/logIn.strategy.ts | 4 +- .../logInStrategies/passwordLogin.strategy.ts | 6 +-- .../passwordlessLogin.strategy.ts | 6 +-- .../misc/logInStrategies/ssoLogin.strategy.ts | 2 +- libs/common/src/misc/serviceUtils.ts | 2 +- ...onfigApi.ts => billing-sync-config.api.ts} | 0 .../models/api/{cardApi.ts => card.api.ts} | 0 .../models/api/{fieldApi.ts => field.api.ts} | 0 .../api/{identityApi.ts => identity.api.ts} | 0 .../api/{loginUriApi.ts => login-uri.api.ts} | 0 .../models/api/{loginApi.ts => login.api.ts} | 2 +- .../{permissionsApi.ts => permissions.api.ts} | 0 .../{scimConfigApi.ts => scim-config.api.ts} | 0 .../{secureNoteApi.ts => secure-note.api.ts} | 0 .../api/{sendFileApi.ts => send-file.api.ts} | 0 .../api/{sendTextApi.ts => send-text.api.ts} | 0 .../{ssoConfigApi.ts => sso-config.api.ts} | 2 +- .../{attachmentData.ts => attachment.data.ts} | 0 .../models/data/{cardData.ts => card.data.ts} | 2 +- .../data/{cipherData.ts => cipher.data.ts} | 14 +++---- .../{collectionData.ts => collection.data.ts} | 0 ....ts => encrypted-organization-key.data.ts} | 0 .../data/{eventData.ts => event.data.ts} | 0 .../data/{fieldData.ts => field.data.ts} | 2 +- .../data/{folderData.ts => folder.data.ts} | 0 .../{identityData.ts => identity.data.ts} | 2 +- .../data/{localData.ts => local.data.ts} | 0 .../{loginUriData.ts => login-uri.data.ts} | 2 +- .../data/{loginData.ts => login.data.ts} | 4 +- ...ganizationData.ts => organization.data.ts} | 2 +- ...istoryData.ts => password-history.data.ts} | 0 .../data/{policyData.ts => policy.data.ts} | 0 .../{providerData.ts => provider.data.ts} | 0 ...{secureNoteData.ts => secure-note.data.ts} | 2 +- .../{sendFileData.ts => send-file.data.ts} | 2 +- .../{sendTextData.ts => send-text.data.ts} | 2 +- .../models/data/{sendData.ts => send.data.ts} | 4 +- .../src/models/domain/account-keys.spec.ts | 2 +- .../models/domain/account-settings.spec.ts | 2 +- libs/common/src/models/domain/account.ts | 32 +++++++-------- libs/common/src/models/domain/attachment.ts | 10 ++--- .../domain/{authResult.ts => auth-result.ts} | 0 libs/common/src/models/domain/card.ts | 10 ++--- libs/common/src/models/domain/cipher.ts | 14 +++---- libs/common/src/models/domain/collection.ts | 8 ++-- ...yptParameters.ts => decrypt-parameters.ts} | 0 .../domain/{domainBase.ts => domain-base.ts} | 4 +- ...{encArrayBuffer.ts => enc-array-buffer.ts} | 0 .../domain/{encString.ts => enc-string.ts} | 2 +- ...encryptedObject.ts => encrypted-object.ts} | 2 +- ...onKey.ts => encrypted-organization-key.ts} | 6 +-- ...environmentUrls.ts => environment-urls.ts} | 0 libs/common/src/models/domain/field.ts | 10 ++--- libs/common/src/models/domain/folder.ts | 8 ++-- ...story.ts => generated-password-history.ts} | 0 .../{globalState.ts => global-state.ts} | 4 +- libs/common/src/models/domain/identity.ts | 10 ++--- .../{importResult.ts => import-result.ts} | 6 +-- ...InCredentials.ts => log-in-credentials.ts} | 3 +- .../domain/{loginUri.ts => login-uri.ts} | 10 ++--- libs/common/src/models/domain/login.ts | 12 +++--- ...s.ts => master-password-policy-options.ts} | 2 +- libs/common/src/models/domain/organization.ts | 4 +- ...s => password-generator-policy-options.ts} | 2 +- libs/common/src/models/domain/password.ts | 10 ++--- libs/common/src/models/domain/policy.ts | 4 +- libs/common/src/models/domain/provider.ts | 2 +- ...ns.ts => reset-password-policy-options.ts} | 2 +- .../domain/{secureNote.ts => secure-note.ts} | 8 ++-- .../domain/{sendAccess.ts => send-access.ts} | 12 +++--- .../domain/{sendFile.ts => send-file.ts} | 10 ++--- .../domain/{sendText.ts => send-text.ts} | 10 ++--- libs/common/src/models/domain/send.ts | 12 +++--- ...iphersCache.ts => sorted-ciphers-cache.ts} | 2 +- libs/common/src/models/domain/state.ts | 2 +- .../{storageOptions.ts => storage-options.ts} | 0 ...icCryptoKey.ts => symmetric-crypto-key.ts} | 0 .../domain/{treeNode.ts => tree-node.ts} | 0 .../{windowState.ts => window-state.ts} | 0 .../export/{cardExport.ts => card.export.ts} | 4 +- ...IdsExport.ts => cipher-with-ids.export.ts} | 4 +- .../{cipherExport.ts => cipher.export.ts} | 14 +++---- ...Export.ts => collection-with-id.export.ts} | 4 +- ...llectionExport.ts => collection.export.ts} | 4 +- .../{eventExport.ts => event.export.ts} | 2 +- .../{fieldExport.ts => field.export.ts} | 4 +- ...thIdExport.ts => folder-with-id.export.ts} | 4 +- .../{folderExport.ts => folder.export.ts} | 4 +- .../{identityExport.ts => identity.export.ts} | 4 +- ...{loginUriExport.ts => login-uri.export.ts} | 6 +-- .../{loginExport.ts => login.export.ts} | 6 +-- ...ureNoteExport.ts => secure-note.export.ts} | 4 +- .../src/models/request/cipherRequest.ts | 12 +++--- .../organization/organizationSsoRequest.ts | 2 +- .../request/organizationUserInviteRequest.ts | 2 +- .../request/organizationUserUpdateRequest.ts | 2 +- libs/common/src/models/request/sendRequest.ts | 4 +- .../src/models/response/cipherResponse.ts | 10 ++--- .../organization/organizationSsoResponse.ts | 2 +- .../organizationConnectionResponse.ts | 4 +- .../response/organizationUserResponse.ts | 2 +- .../response/profileOrganizationResponse.ts | 2 +- .../response/profileProviderResponse.ts | 2 +- .../response/provider/providerUserResponse.ts | 2 +- .../src/models/response/sendAccessResponse.ts | 4 +- .../src/models/response/sendResponse.ts | 4 +- .../{attachmentView.ts => attachment.view.ts} | 2 +- .../models/view/{cardView.ts => card.view.ts} | 2 +- .../view/{cipherView.ts => cipher.view.ts} | 16 ++++---- .../{collectionView.ts => collection.view.ts} | 2 +- .../view/{eventView.ts => event.view.ts} | 0 .../view/{fieldView.ts => field.view.ts} | 0 .../view/{folderView.ts => folder.view.ts} | 2 +- .../{identityView.ts => identity.view.ts} | 2 +- .../models/view/{itemView.ts => item.view.ts} | 0 .../{loginUriView.ts => login-uri.view.ts} | 2 +- .../view/{loginView.ts => login.view.ts} | 4 +- ...istoryView.ts => password-history.view.ts} | 0 ...{secureNoteView.ts => secure-note.view.ts} | 4 +- ...{sendAccessView.ts => send-access.view.ts} | 6 +-- .../{sendFileView.ts => send-file.view.ts} | 2 +- .../{sendTextView.ts => send-text.view.ts} | 2 +- .../models/view/{sendView.ts => send.view.ts} | 6 +-- .../{ssoConfigView.ts => sso-config.view.ts} | 2 +- libs/common/src/services/api.service.ts | 2 +- libs/common/src/services/auth.service.ts | 6 +-- .../src/services/azureFileUpload.service.ts | 2 +- .../services/bitwardenFileUpload.service.ts | 2 +- libs/common/src/services/cipher.service.ts | 24 +++++------ .../common/src/services/collection.service.ts | 6 +-- libs/common/src/services/crypto.service.ts | 10 ++--- libs/common/src/services/encrypt.service.ts | 8 ++-- .../src/services/environment.service.ts | 2 +- libs/common/src/services/event.service.ts | 2 +- libs/common/src/services/export.service.ts | 20 +++++----- .../common/src/services/fileUpload.service.ts | 4 +- .../src/services/folder/folder-api.service.ts | 2 +- .../src/services/folder/folder.service.ts | 8 ++-- libs/common/src/services/import.service.ts | 4 +- .../src/services/keyConnector.service.ts | 2 +- .../organization/organization.service.ts | 2 +- .../services/passwordGeneration.service.ts | 6 +-- .../src/services/policy/policy-api.service.ts | 4 +- .../src/services/policy/policy.service.ts | 6 +-- libs/common/src/services/provider.service.ts | 2 +- libs/common/src/services/search.service.ts | 4 +- libs/common/src/services/send.service.ts | 14 +++---- libs/common/src/services/state.service.ts | 40 +++++++++---------- .../src/services/stateMigration.service.ts | 26 ++++++------ libs/common/src/services/sync/sync.service.ts | 12 +++--- .../src/services/webCryptoFunction.service.ts | 4 +- .../src/services/electronCrypto.service.ts | 2 +- .../electronRendererSecureStorage.service.ts | 2 +- .../nodeCryptoFunction.service.spec.ts | 2 +- libs/node/src/cli/commands/login.command.ts | 4 +- .../services/nodeCryptoFunction.service.ts | 4 +- 445 files changed, 939 insertions(+), 938 deletions(-) rename libs/common/src/models/api/{billingSyncConfigApi.ts => billing-sync-config.api.ts} (100%) rename libs/common/src/models/api/{cardApi.ts => card.api.ts} (100%) rename libs/common/src/models/api/{fieldApi.ts => field.api.ts} (100%) rename libs/common/src/models/api/{identityApi.ts => identity.api.ts} (100%) rename libs/common/src/models/api/{loginUriApi.ts => login-uri.api.ts} (100%) rename libs/common/src/models/api/{loginApi.ts => login.api.ts} (94%) rename libs/common/src/models/api/{permissionsApi.ts => permissions.api.ts} (100%) rename libs/common/src/models/api/{scimConfigApi.ts => scim-config.api.ts} (100%) rename libs/common/src/models/api/{secureNoteApi.ts => secure-note.api.ts} (100%) rename libs/common/src/models/api/{sendFileApi.ts => send-file.api.ts} (100%) rename libs/common/src/models/api/{sendTextApi.ts => send-text.api.ts} (100%) rename libs/common/src/models/api/{ssoConfigApi.ts => sso-config.api.ts} (99%) rename libs/common/src/models/data/{attachmentData.ts => attachment.data.ts} (100%) rename libs/common/src/models/data/{cardData.ts => card.data.ts} (90%) rename libs/common/src/models/data/{cipherData.ts => cipher.data.ts} (87%) rename libs/common/src/models/data/{collectionData.ts => collection.data.ts} (100%) rename libs/common/src/models/data/{encryptedOrganizationKeyData.ts => encrypted-organization-key.data.ts} (100%) rename libs/common/src/models/data/{eventData.ts => event.data.ts} (100%) rename libs/common/src/models/data/{fieldData.ts => field.data.ts} (90%) rename libs/common/src/models/data/{folderData.ts => folder.data.ts} (100%) rename libs/common/src/models/data/{identityData.ts => identity.data.ts} (95%) rename libs/common/src/models/data/{localData.ts => local.data.ts} (100%) rename libs/common/src/models/data/{loginUriData.ts => login-uri.data.ts} (83%) rename libs/common/src/models/data/{loginData.ts => login.data.ts} (85%) rename libs/common/src/models/data/{organizationData.ts => organization.data.ts} (98%) rename libs/common/src/models/data/{passwordHistoryData.ts => password-history.data.ts} (100%) rename libs/common/src/models/data/{policyData.ts => policy.data.ts} (100%) rename libs/common/src/models/data/{providerData.ts => provider.data.ts} (100%) rename libs/common/src/models/data/{secureNoteData.ts => secure-note.data.ts} (80%) rename libs/common/src/models/data/{sendFileData.ts => send-file.data.ts} (85%) rename libs/common/src/models/data/{sendTextData.ts => send-text.data.ts} (80%) rename libs/common/src/models/data/{sendData.ts => send.data.ts} (93%) rename libs/common/src/models/domain/{authResult.ts => auth-result.ts} (100%) rename libs/common/src/models/domain/{decryptParameters.ts => decrypt-parameters.ts} (100%) rename libs/common/src/models/domain/{domainBase.ts => domain-base.ts} (95%) rename libs/common/src/models/domain/{encArrayBuffer.ts => enc-array-buffer.ts} (100%) rename libs/common/src/models/domain/{encString.ts => enc-string.ts} (98%) rename libs/common/src/models/domain/{encryptedObject.ts => encrypted-object.ts} (66%) rename libs/common/src/models/domain/{encryptedOrganizationKey.ts => encrypted-organization-key.ts} (88%) rename libs/common/src/models/domain/{environmentUrls.ts => environment-urls.ts} (100%) rename libs/common/src/models/domain/{generatedPasswordHistory.ts => generated-password-history.ts} (100%) rename libs/common/src/models/domain/{globalState.ts => global-state.ts} (92%) rename libs/common/src/models/domain/{importResult.ts => import-result.ts} (65%) rename libs/common/src/models/domain/{logInCredentials.ts => log-in-credentials.ts} (93%) rename libs/common/src/models/domain/{loginUri.ts => login-uri.ts} (80%) rename libs/common/src/models/domain/{masterPasswordPolicyOptions.ts => master-password-policy-options.ts} (84%) rename libs/common/src/models/domain/{passwordGeneratorPolicyOptions.ts => password-generator-policy-options.ts} (94%) rename libs/common/src/models/domain/{resetPasswordPolicyOptions.ts => reset-password-policy-options.ts} (71%) rename libs/common/src/models/domain/{secureNote.ts => secure-note.ts} (76%) rename libs/common/src/models/domain/{sendAccess.ts => send-access.ts} (83%) rename libs/common/src/models/domain/{sendFile.ts => send-file.ts} (71%) rename libs/common/src/models/domain/{sendText.ts => send-text.ts} (66%) rename libs/common/src/models/domain/{sortedCiphersCache.ts => sorted-ciphers-cache.ts} (97%) rename libs/common/src/models/domain/{storageOptions.ts => storage-options.ts} (100%) rename libs/common/src/models/domain/{symmetricCryptoKey.ts => symmetric-crypto-key.ts} (100%) rename libs/common/src/models/domain/{treeNode.ts => tree-node.ts} (100%) rename libs/common/src/models/domain/{windowState.ts => window-state.ts} (100%) rename libs/common/src/models/export/{cardExport.ts => card.export.ts} (95%) rename libs/common/src/models/export/{cipherWithIdsExport.ts => cipher-with-ids.export.ts} (79%) rename libs/common/src/models/export/{cipherExport.ts => cipher.export.ts} (92%) rename libs/common/src/models/export/{collectionWithIdExport.ts => collection-with-id.export.ts} (75%) rename libs/common/src/models/export/{collectionExport.ts => collection.export.ts} (92%) rename libs/common/src/models/export/{eventExport.ts => event.export.ts} (93%) rename libs/common/src/models/export/{fieldExport.ts => field.export.ts} (92%) rename libs/common/src/models/export/{folderWithIdExport.ts => folder-with-id.export.ts} (76%) rename libs/common/src/models/export/{folderExport.ts => folder.export.ts} (88%) rename libs/common/src/models/export/{identityExport.ts => identity.export.ts} (97%) rename libs/common/src/models/export/{loginUriExport.ts => login-uri.export.ts} (83%) rename libs/common/src/models/export/{loginExport.ts => login.export.ts} (91%) rename libs/common/src/models/export/{secureNoteExport.ts => secure-note.export.ts} (91%) rename libs/common/src/models/view/{attachmentView.ts => attachment.view.ts} (92%) rename libs/common/src/models/view/{cardView.ts => card.view.ts} (98%) rename libs/common/src/models/view/{cipherView.ts => cipher.view.ts} (92%) rename libs/common/src/models/view/{collectionView.ts => collection.view.ts} (92%) rename libs/common/src/models/view/{eventView.ts => event.view.ts} (100%) rename libs/common/src/models/view/{fieldView.ts => field.view.ts} (100%) rename libs/common/src/models/view/{folderView.ts => folder.view.ts} (91%) rename libs/common/src/models/view/{identityView.ts => identity.view.ts} (98%) rename libs/common/src/models/view/{itemView.ts => item.view.ts} (100%) rename libs/common/src/models/view/{loginUriView.ts => login-uri.view.ts} (98%) rename libs/common/src/models/view/{loginView.ts => login.view.ts} (95%) rename libs/common/src/models/view/{passwordHistoryView.ts => password-history.view.ts} (100%) rename libs/common/src/models/view/{secureNoteView.ts => secure-note.view.ts} (83%) rename libs/common/src/models/view/{sendAccessView.ts => send-access.view.ts} (78%) rename libs/common/src/models/view/{sendFileView.ts => send-file.view.ts} (91%) rename libs/common/src/models/view/{sendTextView.ts => send-text.view.ts} (86%) rename libs/common/src/models/view/{sendView.ts => send.view.ts} (90%) rename libs/common/src/models/view/{ssoConfigView.ts => sso-config.view.ts} (98%) diff --git a/apps/browser/src/background/contextMenus.background.ts b/apps/browser/src/background/contextMenus.background.ts index 8af66db1f0..76fbfd78a9 100644 --- a/apps/browser/src/background/contextMenus.background.ts +++ b/apps/browser/src/background/contextMenus.background.ts @@ -7,7 +7,7 @@ import { TotpService } from "@bitwarden/common/abstractions/totp.service"; import { AuthenticationStatus } from "@bitwarden/common/enums/authenticationStatus"; import { CipherRepromptType } from "@bitwarden/common/enums/cipherRepromptType"; import { EventType } from "@bitwarden/common/enums/eventType"; -import { CipherView } from "@bitwarden/common/models/view/cipherView"; +import { CipherView } from "@bitwarden/common/models/view/cipher.view"; import { BrowserApi } from "../browser/browserApi"; diff --git a/apps/browser/src/background/main.background.ts b/apps/browser/src/background/main.background.ts index 56c81ec5ad..a580b474be 100644 --- a/apps/browser/src/background/main.background.ts +++ b/apps/browser/src/background/main.background.ts @@ -41,8 +41,8 @@ import { AuthenticationStatus } from "@bitwarden/common/enums/authenticationStat import { CipherRepromptType } from "@bitwarden/common/enums/cipherRepromptType"; import { CipherType } from "@bitwarden/common/enums/cipherType"; import { StateFactory } from "@bitwarden/common/factories/stateFactory"; -import { GlobalState } from "@bitwarden/common/models/domain/globalState"; -import { CipherView } from "@bitwarden/common/models/view/cipherView"; +import { GlobalState } from "@bitwarden/common/models/domain/global-state"; +import { CipherView } from "@bitwarden/common/models/view/cipher.view"; import { ApiService } from "@bitwarden/common/services/api.service"; import { AppIdService } from "@bitwarden/common/services/appId.service"; import { AuditService } from "@bitwarden/common/services/audit.service"; diff --git a/apps/browser/src/background/nativeMessaging.background.ts b/apps/browser/src/background/nativeMessaging.background.ts index 2e410b8e6c..77146633cf 100644 --- a/apps/browser/src/background/nativeMessaging.background.ts +++ b/apps/browser/src/background/nativeMessaging.background.ts @@ -9,8 +9,8 @@ import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUti import { StateService } from "@bitwarden/common/abstractions/state.service"; import { AuthenticationStatus } from "@bitwarden/common/enums/authenticationStatus"; import { Utils } from "@bitwarden/common/misc/utils"; -import { EncString } from "@bitwarden/common/models/domain/encString"; -import { SymmetricCryptoKey } from "@bitwarden/common/models/domain/symmetricCryptoKey"; +import { EncString } from "@bitwarden/common/models/domain/enc-string"; +import { SymmetricCryptoKey } from "@bitwarden/common/models/domain/symmetric-crypto-key"; import { BrowserApi } from "../browser/browserApi"; diff --git a/apps/browser/src/background/notification.background.ts b/apps/browser/src/background/notification.background.ts index 5eaec27325..569a77abe7 100644 --- a/apps/browser/src/background/notification.background.ts +++ b/apps/browser/src/background/notification.background.ts @@ -8,9 +8,9 @@ import { AuthenticationStatus } from "@bitwarden/common/enums/authenticationStat import { CipherType } from "@bitwarden/common/enums/cipherType"; import { PolicyType } from "@bitwarden/common/enums/policyType"; import { Utils } from "@bitwarden/common/misc/utils"; -import { CipherView } from "@bitwarden/common/models/view/cipherView"; -import { LoginUriView } from "@bitwarden/common/models/view/loginUriView"; -import { LoginView } from "@bitwarden/common/models/view/loginView"; +import { CipherView } from "@bitwarden/common/models/view/cipher.view"; +import { LoginUriView } from "@bitwarden/common/models/view/login-uri.view"; +import { LoginView } from "@bitwarden/common/models/view/login.view"; import { BrowserApi } from "../browser/browserApi"; import { AutofillService } from "../services/abstractions/autofill.service"; diff --git a/apps/browser/src/background/service_factories/state-migration-service.factory.ts b/apps/browser/src/background/service_factories/state-migration-service.factory.ts index ae21298b72..5c7fba3ed8 100644 --- a/apps/browser/src/background/service_factories/state-migration-service.factory.ts +++ b/apps/browser/src/background/service_factories/state-migration-service.factory.ts @@ -1,5 +1,5 @@ import { StateFactory } from "@bitwarden/common/factories/stateFactory"; -import { GlobalState } from "@bitwarden/common/models/domain/globalState"; +import { GlobalState } from "@bitwarden/common/models/domain/global-state"; import { StateMigrationService } from "@bitwarden/common/services/stateMigration.service"; import { Account } from "../../models/account"; diff --git a/apps/browser/src/background/service_factories/state-service.factory.ts b/apps/browser/src/background/service_factories/state-service.factory.ts index 202148cd74..1b81567ac5 100644 --- a/apps/browser/src/background/service_factories/state-service.factory.ts +++ b/apps/browser/src/background/service_factories/state-service.factory.ts @@ -1,5 +1,5 @@ import { StateFactory } from "@bitwarden/common/factories/stateFactory"; -import { GlobalState } from "@bitwarden/common/models/domain/globalState"; +import { GlobalState } from "@bitwarden/common/models/domain/global-state"; import { Account } from "../../models/account"; import { StateService } from "../../services/state.service"; diff --git a/apps/browser/src/listeners/onCommandListener.ts b/apps/browser/src/listeners/onCommandListener.ts index 294ea51a96..f0c492da89 100644 --- a/apps/browser/src/listeners/onCommandListener.ts +++ b/apps/browser/src/listeners/onCommandListener.ts @@ -1,7 +1,7 @@ import { SearchService } from "@bitwarden/common/abstractions/search.service"; import { AuthenticationStatus } from "@bitwarden/common/enums/authenticationStatus"; import { StateFactory } from "@bitwarden/common/factories/stateFactory"; -import { GlobalState } from "@bitwarden/common/models/domain/globalState"; +import { GlobalState } from "@bitwarden/common/models/domain/global-state"; import { authServiceFactory } from "../background/service_factories/auth-service.factory"; import { autofillServiceFactory } from "../background/service_factories/autofill-service.factory"; diff --git a/apps/browser/src/listeners/onInstallListener.ts b/apps/browser/src/listeners/onInstallListener.ts index 63414d633f..cc2d60594c 100644 --- a/apps/browser/src/listeners/onInstallListener.ts +++ b/apps/browser/src/listeners/onInstallListener.ts @@ -1,5 +1,5 @@ import { StateFactory } from "@bitwarden/common/factories/stateFactory"; -import { GlobalState } from "@bitwarden/common/models/domain/globalState"; +import { GlobalState } from "@bitwarden/common/models/domain/global-state"; import { environmentServiceFactory } from "../background/service_factories/environment-service.factory"; import { BrowserApi } from "../browser/browserApi"; diff --git a/apps/browser/src/models/browserGroupingsComponentState.ts b/apps/browser/src/models/browserGroupingsComponentState.ts index 3e244f9a52..63eb4aaa88 100644 --- a/apps/browser/src/models/browserGroupingsComponentState.ts +++ b/apps/browser/src/models/browserGroupingsComponentState.ts @@ -1,7 +1,7 @@ import { CipherType } from "@bitwarden/common/enums/cipherType"; -import { CipherView } from "@bitwarden/common/models/view/cipherView"; -import { CollectionView } from "@bitwarden/common/models/view/collectionView"; -import { FolderView } from "@bitwarden/common/models/view/folderView"; +import { CipherView } from "@bitwarden/common/models/view/cipher.view"; +import { CollectionView } from "@bitwarden/common/models/view/collection.view"; +import { FolderView } from "@bitwarden/common/models/view/folder.view"; import { BrowserComponentState } from "./browserComponentState"; diff --git a/apps/browser/src/models/browserSendComponentState.ts b/apps/browser/src/models/browserSendComponentState.ts index 8ba2407c5f..e2bf4eaa5d 100644 --- a/apps/browser/src/models/browserSendComponentState.ts +++ b/apps/browser/src/models/browserSendComponentState.ts @@ -1,5 +1,5 @@ import { SendType } from "@bitwarden/common/enums/sendType"; -import { SendView } from "@bitwarden/common/models/view/sendView"; +import { SendView } from "@bitwarden/common/models/view/send.view"; import { BrowserComponentState } from "./browserComponentState"; diff --git a/apps/browser/src/popup/components/action-buttons.component.ts b/apps/browser/src/popup/components/action-buttons.component.ts index 5fd76bb4be..3df8e0d4cd 100644 --- a/apps/browser/src/popup/components/action-buttons.component.ts +++ b/apps/browser/src/popup/components/action-buttons.component.ts @@ -9,7 +9,7 @@ import { TotpService } from "@bitwarden/common/abstractions/totp.service"; import { CipherRepromptType } from "@bitwarden/common/enums/cipherRepromptType"; import { CipherType } from "@bitwarden/common/enums/cipherType"; import { EventType } from "@bitwarden/common/enums/eventType"; -import { CipherView } from "@bitwarden/common/models/view/cipherView"; +import { CipherView } from "@bitwarden/common/models/view/cipher.view"; @Component({ selector: "app-action-buttons", diff --git a/apps/browser/src/popup/components/cipher-row.component.ts b/apps/browser/src/popup/components/cipher-row.component.ts index 41fe8e0786..bb99316dd2 100644 --- a/apps/browser/src/popup/components/cipher-row.component.ts +++ b/apps/browser/src/popup/components/cipher-row.component.ts @@ -1,6 +1,6 @@ import { Component, EventEmitter, Input, Output } from "@angular/core"; -import { CipherView } from "@bitwarden/common/models/view/cipherView"; +import { CipherView } from "@bitwarden/common/models/view/cipher.view"; @Component({ selector: "app-cipher-row", diff --git a/apps/browser/src/popup/components/send-list.component.ts b/apps/browser/src/popup/components/send-list.component.ts index f019510b36..05254729eb 100644 --- a/apps/browser/src/popup/components/send-list.component.ts +++ b/apps/browser/src/popup/components/send-list.component.ts @@ -1,7 +1,7 @@ import { Component, EventEmitter, Input, Output } from "@angular/core"; import { SendType } from "@bitwarden/common/enums/sendType"; -import { SendView } from "@bitwarden/common/models/view/sendView"; +import { SendView } from "@bitwarden/common/models/view/send.view"; @Component({ selector: "app-send-list", diff --git a/apps/browser/src/popup/generator/generator.component.ts b/apps/browser/src/popup/generator/generator.component.ts index 41a033b980..cff5e9e3c3 100644 --- a/apps/browser/src/popup/generator/generator.component.ts +++ b/apps/browser/src/popup/generator/generator.component.ts @@ -9,7 +9,7 @@ import { PasswordGenerationService } from "@bitwarden/common/abstractions/passwo import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; import { StateService } from "@bitwarden/common/abstractions/state.service"; import { UsernameGenerationService } from "@bitwarden/common/abstractions/usernameGeneration.service"; -import { CipherView } from "@bitwarden/common/models/view/cipherView"; +import { CipherView } from "@bitwarden/common/models/view/cipher.view"; @Component({ selector: "app-generator", diff --git a/apps/browser/src/popup/send/send-groupings.component.ts b/apps/browser/src/popup/send/send-groupings.component.ts index 0805742666..1af715ada0 100644 --- a/apps/browser/src/popup/send/send-groupings.component.ts +++ b/apps/browser/src/popup/send/send-groupings.component.ts @@ -12,7 +12,7 @@ import { SearchService } from "@bitwarden/common/abstractions/search.service"; import { SendService } from "@bitwarden/common/abstractions/send.service"; import { SyncService } from "@bitwarden/common/abstractions/sync/sync.service.abstraction"; import { SendType } from "@bitwarden/common/enums/sendType"; -import { SendView } from "@bitwarden/common/models/view/sendView"; +import { SendView } from "@bitwarden/common/models/view/send.view"; import { BrowserSendComponentState } from "../../models/browserSendComponentState"; import { StateService } from "../../services/abstractions/state.service"; diff --git a/apps/browser/src/popup/send/send-type.component.ts b/apps/browser/src/popup/send/send-type.component.ts index 3e4054bf72..afd3daeeda 100644 --- a/apps/browser/src/popup/send/send-type.component.ts +++ b/apps/browser/src/popup/send/send-type.component.ts @@ -13,7 +13,7 @@ import { PolicyService } from "@bitwarden/common/abstractions/policy/policy.serv import { SearchService } from "@bitwarden/common/abstractions/search.service"; import { SendService } from "@bitwarden/common/abstractions/send.service"; import { SendType } from "@bitwarden/common/enums/sendType"; -import { SendView } from "@bitwarden/common/models/view/sendView"; +import { SendView } from "@bitwarden/common/models/view/send.view"; import { BrowserComponentState } from "../../models/browserComponentState"; import { StateService } from "../../services/abstractions/state.service"; diff --git a/apps/browser/src/popup/settings/folders.component.ts b/apps/browser/src/popup/settings/folders.component.ts index f0fb2204d8..45f92d5221 100644 --- a/apps/browser/src/popup/settings/folders.component.ts +++ b/apps/browser/src/popup/settings/folders.component.ts @@ -3,7 +3,7 @@ import { Router } from "@angular/router"; import { map, Observable } from "rxjs"; import { FolderService } from "@bitwarden/common/abstractions/folder/folder.service.abstraction"; -import { FolderView } from "@bitwarden/common/models/view/folderView"; +import { FolderView } from "@bitwarden/common/models/view/folder.view"; @Component({ selector: "app-folders", diff --git a/apps/browser/src/popup/vault/add-edit.component.ts b/apps/browser/src/popup/vault/add-edit.component.ts index d220a24a0d..b890766f6b 100644 --- a/apps/browser/src/popup/vault/add-edit.component.ts +++ b/apps/browser/src/popup/vault/add-edit.component.ts @@ -18,7 +18,7 @@ import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUti import { PolicyService } from "@bitwarden/common/abstractions/policy/policy.service.abstraction"; import { StateService } from "@bitwarden/common/abstractions/state.service"; import { CipherType } from "@bitwarden/common/enums/cipherType"; -import { LoginUriView } from "@bitwarden/common/models/view/loginUriView"; +import { LoginUriView } from "@bitwarden/common/models/view/login-uri.view"; import { BrowserApi } from "../../browser/browserApi"; import { PopupUtilsService } from "../services/popup-utils.service"; diff --git a/apps/browser/src/popup/vault/ciphers.component.ts b/apps/browser/src/popup/vault/ciphers.component.ts index 34d567bbe4..2366a55d5b 100644 --- a/apps/browser/src/popup/vault/ciphers.component.ts +++ b/apps/browser/src/popup/vault/ciphers.component.ts @@ -14,10 +14,10 @@ import { OrganizationService } from "@bitwarden/common/abstractions/organization import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; import { SearchService } from "@bitwarden/common/abstractions/search.service"; import { CipherType } from "@bitwarden/common/enums/cipherType"; -import { TreeNode } from "@bitwarden/common/models/domain/treeNode"; -import { CipherView } from "@bitwarden/common/models/view/cipherView"; -import { CollectionView } from "@bitwarden/common/models/view/collectionView"; -import { FolderView } from "@bitwarden/common/models/view/folderView"; +import { TreeNode } from "@bitwarden/common/models/domain/tree-node"; +import { CipherView } from "@bitwarden/common/models/view/cipher.view"; +import { CollectionView } from "@bitwarden/common/models/view/collection.view"; +import { FolderView } from "@bitwarden/common/models/view/folder.view"; import { BrowserApi } from "../../browser/browserApi"; import { BrowserComponentState } from "../../models/browserComponentState"; diff --git a/apps/browser/src/popup/vault/current-tab.component.ts b/apps/browser/src/popup/vault/current-tab.component.ts index 82a2c73587..48b22a518f 100644 --- a/apps/browser/src/popup/vault/current-tab.component.ts +++ b/apps/browser/src/popup/vault/current-tab.component.ts @@ -15,7 +15,7 @@ import { SyncService } from "@bitwarden/common/abstractions/sync/sync.service.ab import { CipherRepromptType } from "@bitwarden/common/enums/cipherRepromptType"; import { CipherType } from "@bitwarden/common/enums/cipherType"; import { Utils } from "@bitwarden/common/misc/utils"; -import { CipherView } from "@bitwarden/common/models/view/cipherView"; +import { CipherView } from "@bitwarden/common/models/view/cipher.view"; import { BrowserApi } from "../../browser/browserApi"; import { AutofillService } from "../../services/abstractions/autofill.service"; diff --git a/apps/browser/src/popup/vault/vault-filter.component.ts b/apps/browser/src/popup/vault/vault-filter.component.ts index 0abc16e1ec..6ae6f9b88d 100644 --- a/apps/browser/src/popup/vault/vault-filter.component.ts +++ b/apps/browser/src/popup/vault/vault-filter.component.ts @@ -11,10 +11,10 @@ import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUti import { SearchService } from "@bitwarden/common/abstractions/search.service"; import { SyncService } from "@bitwarden/common/abstractions/sync/sync.service.abstraction"; import { CipherType } from "@bitwarden/common/enums/cipherType"; -import { TreeNode } from "@bitwarden/common/models/domain/treeNode"; -import { CipherView } from "@bitwarden/common/models/view/cipherView"; -import { CollectionView } from "@bitwarden/common/models/view/collectionView"; -import { FolderView } from "@bitwarden/common/models/view/folderView"; +import { TreeNode } from "@bitwarden/common/models/domain/tree-node"; +import { CipherView } from "@bitwarden/common/models/view/cipher.view"; +import { CollectionView } from "@bitwarden/common/models/view/collection.view"; +import { FolderView } from "@bitwarden/common/models/view/folder.view"; import { BrowserApi } from "../../browser/browserApi"; import { BrowserGroupingsComponentState } from "../../models/browserGroupingsComponentState"; diff --git a/apps/browser/src/popup/vault/view.component.ts b/apps/browser/src/popup/vault/view.component.ts index e43b86e6b8..449c100819 100644 --- a/apps/browser/src/popup/vault/view.component.ts +++ b/apps/browser/src/popup/vault/view.component.ts @@ -21,7 +21,7 @@ import { TokenService } from "@bitwarden/common/abstractions/token.service"; import { TotpService } from "@bitwarden/common/abstractions/totp.service"; import { CipherType } from "@bitwarden/common/enums/cipherType"; import { Cipher } from "@bitwarden/common/models/domain/cipher"; -import { LoginUriView } from "@bitwarden/common/models/view/loginUriView"; +import { LoginUriView } from "@bitwarden/common/models/view/login-uri.view"; import { BrowserApi } from "../../browser/browserApi"; import { AutofillService } from "../../services/abstractions/autofill.service"; diff --git a/apps/browser/src/services/abstractions/abstractKeyGeneration.service.ts b/apps/browser/src/services/abstractions/abstractKeyGeneration.service.ts index ec6c758d96..6a70718add 100644 --- a/apps/browser/src/services/abstractions/abstractKeyGeneration.service.ts +++ b/apps/browser/src/services/abstractions/abstractKeyGeneration.service.ts @@ -1,4 +1,4 @@ -import { SymmetricCryptoKey } from "@bitwarden/common/models/domain/symmetricCryptoKey"; +import { SymmetricCryptoKey } from "@bitwarden/common/models/domain/symmetric-crypto-key"; export interface AbstractKeyGenerationService { makeEphemeralKey(numBytes?: number): Promise; diff --git a/apps/browser/src/services/abstractions/autofill.service.ts b/apps/browser/src/services/abstractions/autofill.service.ts index ceab1d589f..c900875f5e 100644 --- a/apps/browser/src/services/abstractions/autofill.service.ts +++ b/apps/browser/src/services/abstractions/autofill.service.ts @@ -1,4 +1,4 @@ -import { CipherView } from "@bitwarden/common/models/view/cipherView"; +import { CipherView } from "@bitwarden/common/models/view/cipher.view"; import AutofillField from "../../models/autofillField"; import AutofillForm from "../../models/autofillForm"; diff --git a/apps/browser/src/services/abstractions/state.service.ts b/apps/browser/src/services/abstractions/state.service.ts index 0f552154d6..294bc814e6 100644 --- a/apps/browser/src/services/abstractions/state.service.ts +++ b/apps/browser/src/services/abstractions/state.service.ts @@ -1,7 +1,7 @@ import { Jsonify } from "type-fest"; import { StateService as BaseStateServiceAbstraction } from "@bitwarden/common/abstractions/state.service"; -import { StorageOptions } from "@bitwarden/common/models/domain/storageOptions"; +import { StorageOptions } from "@bitwarden/common/models/domain/storage-options"; import { Account } from "../../models/account"; import { BrowserComponentState } from "../../models/browserComponentState"; diff --git a/apps/browser/src/services/autofill.service.ts b/apps/browser/src/services/autofill.service.ts index b403a2a679..fe7837dd4b 100644 --- a/apps/browser/src/services/autofill.service.ts +++ b/apps/browser/src/services/autofill.service.ts @@ -6,8 +6,8 @@ import { CipherRepromptType } from "@bitwarden/common/enums/cipherRepromptType"; import { CipherType } from "@bitwarden/common/enums/cipherType"; import { EventType } from "@bitwarden/common/enums/eventType"; import { FieldType } from "@bitwarden/common/enums/fieldType"; -import { CipherView } from "@bitwarden/common/models/view/cipherView"; -import { FieldView } from "@bitwarden/common/models/view/fieldView"; +import { CipherView } from "@bitwarden/common/models/view/cipher.view"; +import { FieldView } from "@bitwarden/common/models/view/field.view"; import { BrowserApi } from "../browser/browserApi"; import AutofillField from "../models/autofillField"; diff --git a/apps/browser/src/services/folders/folder.service.ts b/apps/browser/src/services/folders/folder.service.ts index a3a6a4d8ba..e4fc19644d 100644 --- a/apps/browser/src/services/folders/folder.service.ts +++ b/apps/browser/src/services/folders/folder.service.ts @@ -1,7 +1,7 @@ import { BehaviorSubject } from "rxjs"; import { Folder } from "@bitwarden/common/models/domain/folder"; -import { FolderView } from "@bitwarden/common/models/view/folderView"; +import { FolderView } from "@bitwarden/common/models/view/folder.view"; import { FolderService as BaseFolderService } from "@bitwarden/common/services/folder/folder.service"; import { browserSession, sessionSync } from "../../decorators/session-sync-observable"; diff --git a/apps/browser/src/services/keyGeneration.service.ts b/apps/browser/src/services/keyGeneration.service.ts index f6e1160a14..0dbb1e8122 100644 --- a/apps/browser/src/services/keyGeneration.service.ts +++ b/apps/browser/src/services/keyGeneration.service.ts @@ -1,5 +1,5 @@ import { CryptoFunctionService } from "@bitwarden/common/abstractions/cryptoFunction.service"; -import { SymmetricCryptoKey } from "@bitwarden/common/models/domain/symmetricCryptoKey"; +import { SymmetricCryptoKey } from "@bitwarden/common/models/domain/symmetric-crypto-key"; import { AbstractKeyGenerationService } from "./abstractions/abstractKeyGeneration.service"; diff --git a/apps/browser/src/services/localBackedSessionStorage.service.spec.ts b/apps/browser/src/services/localBackedSessionStorage.service.spec.ts index 1d105ce3e4..8593733608 100644 --- a/apps/browser/src/services/localBackedSessionStorage.service.spec.ts +++ b/apps/browser/src/services/localBackedSessionStorage.service.spec.ts @@ -2,8 +2,8 @@ import { Arg, Substitute, SubstituteOf } from "@fluffy-spoon/substitute"; import { Utils } from "@bitwarden/common/misc/utils"; -import { EncString } from "@bitwarden/common/models/domain/encString"; -import { SymmetricCryptoKey } from "@bitwarden/common/models/domain/symmetricCryptoKey"; +import { EncString } from "@bitwarden/common/models/domain/enc-string"; +import { SymmetricCryptoKey } from "@bitwarden/common/models/domain/symmetric-crypto-key"; import { EncryptService } from "@bitwarden/common/src/services/encrypt.service"; import BrowserLocalStorageService from "./browserLocalStorage.service"; diff --git a/apps/browser/src/services/localBackedSessionStorage.service.ts b/apps/browser/src/services/localBackedSessionStorage.service.ts index dea2e75a5e..5c98f4e310 100644 --- a/apps/browser/src/services/localBackedSessionStorage.service.ts +++ b/apps/browser/src/services/localBackedSessionStorage.service.ts @@ -5,9 +5,9 @@ import { AbstractCachedStorageService, MemoryStorageServiceInterface, } from "@bitwarden/common/abstractions/storage.service"; -import { EncString } from "@bitwarden/common/models/domain/encString"; -import { MemoryStorageOptions } from "@bitwarden/common/models/domain/storageOptions"; -import { SymmetricCryptoKey } from "@bitwarden/common/models/domain/symmetricCryptoKey"; +import { EncString } from "@bitwarden/common/models/domain/enc-string"; +import { MemoryStorageOptions } from "@bitwarden/common/models/domain/storage-options"; +import { SymmetricCryptoKey } from "@bitwarden/common/models/domain/symmetric-crypto-key"; import { devFlag } from "../decorators/dev-flag.decorator"; import { devFlagEnabled } from "../flags"; diff --git a/apps/browser/src/services/state.service.spec.ts b/apps/browser/src/services/state.service.spec.ts index f9aa6fc643..e6bde9af5b 100644 --- a/apps/browser/src/services/state.service.spec.ts +++ b/apps/browser/src/services/state.service.spec.ts @@ -8,9 +8,9 @@ import { } from "@bitwarden/common/abstractions/storage.service"; import { SendType } from "@bitwarden/common/enums/sendType"; import { StateFactory } from "@bitwarden/common/factories/stateFactory"; -import { GlobalState } from "@bitwarden/common/models/domain/globalState"; +import { GlobalState } from "@bitwarden/common/models/domain/global-state"; import { State } from "@bitwarden/common/models/domain/state"; -import { SendView } from "@bitwarden/common/models/view/sendView"; +import { SendView } from "@bitwarden/common/models/view/send.view"; import { StateMigrationService } from "@bitwarden/common/services/stateMigration.service"; import { Account } from "../models/account"; diff --git a/apps/browser/src/services/state.service.ts b/apps/browser/src/services/state.service.ts index 78bc721031..1a627935ee 100644 --- a/apps/browser/src/services/state.service.ts +++ b/apps/browser/src/services/state.service.ts @@ -1,8 +1,8 @@ import { Jsonify } from "type-fest"; import { AbstractCachedStorageService } from "@bitwarden/common/abstractions/storage.service"; -import { GlobalState } from "@bitwarden/common/models/domain/globalState"; -import { StorageOptions } from "@bitwarden/common/models/domain/storageOptions"; +import { GlobalState } from "@bitwarden/common/models/domain/global-state"; +import { StorageOptions } from "@bitwarden/common/models/domain/storage-options"; import { StateService as BaseStateService, withPrototype, diff --git a/apps/browser/src/services/vaultFilter.service.ts b/apps/browser/src/services/vaultFilter.service.ts index 77016638d8..f8b2e37d0e 100644 --- a/apps/browser/src/services/vaultFilter.service.ts +++ b/apps/browser/src/services/vaultFilter.service.ts @@ -6,7 +6,7 @@ import { FolderService } from "@bitwarden/common/abstractions/folder/folder.serv import { OrganizationService } from "@bitwarden/common/abstractions/organization/organization.service.abstraction"; import { PolicyService } from "@bitwarden/common/abstractions/policy/policy.service.abstraction"; import { StateService } from "@bitwarden/common/abstractions/state.service"; -import { CipherView } from "@bitwarden/common/models/view/cipherView"; +import { CipherView } from "@bitwarden/common/models/view/cipher.view"; export class VaultFilterService extends BaseVaultFilterService { vaultFilter: VaultFilter = new VaultFilter(); diff --git a/apps/cli/src/bw.ts b/apps/cli/src/bw.ts index 489f92fac9..c14fcc229a 100644 --- a/apps/cli/src/bw.ts +++ b/apps/cli/src/bw.ts @@ -11,7 +11,7 @@ import { KeySuffixOptions } from "@bitwarden/common/enums/keySuffixOptions"; import { LogLevelType } from "@bitwarden/common/enums/logLevelType"; import { StateFactory } from "@bitwarden/common/factories/stateFactory"; import { Account } from "@bitwarden/common/models/domain/account"; -import { GlobalState } from "@bitwarden/common/models/domain/globalState"; +import { GlobalState } from "@bitwarden/common/models/domain/global-state"; import { AppIdService } from "@bitwarden/common/services/appId.service"; import { AuditService } from "@bitwarden/common/services/audit.service"; import { AuthService } from "@bitwarden/common/services/auth.service"; diff --git a/apps/cli/src/commands/create.command.ts b/apps/cli/src/commands/create.command.ts index ad69efe51e..c06c81eafc 100644 --- a/apps/cli/src/commands/create.command.ts +++ b/apps/cli/src/commands/create.command.ts @@ -8,9 +8,9 @@ import { FolderApiServiceAbstraction } from "@bitwarden/common/abstractions/fold import { FolderService } from "@bitwarden/common/abstractions/folder/folder.service.abstraction"; import { StateService } from "@bitwarden/common/abstractions/state.service"; import { Utils } from "@bitwarden/common/misc/utils"; -import { CipherExport } from "@bitwarden/common/models/export/cipherExport"; -import { CollectionExport } from "@bitwarden/common/models/export/collectionExport"; -import { FolderExport } from "@bitwarden/common/models/export/folderExport"; +import { CipherExport } from "@bitwarden/common/models/export/cipher.export"; +import { CollectionExport } from "@bitwarden/common/models/export/collection.export"; +import { FolderExport } from "@bitwarden/common/models/export/folder.export"; import { CollectionRequest } from "@bitwarden/common/models/request/collectionRequest"; import { SelectionReadOnlyRequest } from "@bitwarden/common/models/request/selectionReadOnlyRequest"; import { Response } from "@bitwarden/node/cli/models/response"; diff --git a/apps/cli/src/commands/download.command.ts b/apps/cli/src/commands/download.command.ts index bcd5a831f4..eb40cf5a2d 100644 --- a/apps/cli/src/commands/download.command.ts +++ b/apps/cli/src/commands/download.command.ts @@ -1,8 +1,8 @@ import * as fet from "node-fetch"; import { CryptoService } from "@bitwarden/common/abstractions/crypto.service"; -import { EncArrayBuffer } from "@bitwarden/common/models/domain/encArrayBuffer"; -import { SymmetricCryptoKey } from "@bitwarden/common/models/domain/symmetricCryptoKey"; +import { EncArrayBuffer } from "@bitwarden/common/models/domain/enc-array-buffer"; +import { SymmetricCryptoKey } from "@bitwarden/common/models/domain/symmetric-crypto-key"; import { Response } from "@bitwarden/node/cli/models/response"; import { FileResponse } from "@bitwarden/node/cli/models/response/fileResponse"; diff --git a/apps/cli/src/commands/edit.command.ts b/apps/cli/src/commands/edit.command.ts index 9c8f68c828..235d455ee0 100644 --- a/apps/cli/src/commands/edit.command.ts +++ b/apps/cli/src/commands/edit.command.ts @@ -4,9 +4,9 @@ import { CryptoService } from "@bitwarden/common/abstractions/crypto.service"; import { FolderApiServiceAbstraction } from "@bitwarden/common/abstractions/folder/folder-api.service.abstraction"; import { FolderService } from "@bitwarden/common/abstractions/folder/folder.service.abstraction"; import { Utils } from "@bitwarden/common/misc/utils"; -import { CipherExport } from "@bitwarden/common/models/export/cipherExport"; -import { CollectionExport } from "@bitwarden/common/models/export/collectionExport"; -import { FolderExport } from "@bitwarden/common/models/export/folderExport"; +import { CipherExport } from "@bitwarden/common/models/export/cipher.export"; +import { CollectionExport } from "@bitwarden/common/models/export/collection.export"; +import { FolderExport } from "@bitwarden/common/models/export/folder.export"; import { CollectionRequest } from "@bitwarden/common/models/request/collectionRequest"; import { SelectionReadOnlyRequest } from "@bitwarden/common/models/request/selectionReadOnlyRequest"; import { Response } from "@bitwarden/node/cli/models/response"; diff --git a/apps/cli/src/commands/get.command.ts b/apps/cli/src/commands/get.command.ts index 510cb10da3..ce5975a496 100644 --- a/apps/cli/src/commands/get.command.ts +++ b/apps/cli/src/commands/get.command.ts @@ -11,21 +11,21 @@ import { TotpService } from "@bitwarden/common/abstractions/totp.service"; import { CipherType } from "@bitwarden/common/enums/cipherType"; import { SendType } from "@bitwarden/common/enums/sendType"; import { Utils } from "@bitwarden/common/misc/utils"; -import { EncString } from "@bitwarden/common/models/domain/encString"; +import { EncString } from "@bitwarden/common/models/domain/enc-string"; import { Organization } from "@bitwarden/common/models/domain/organization"; -import { CardExport } from "@bitwarden/common/models/export/cardExport"; -import { CipherExport } from "@bitwarden/common/models/export/cipherExport"; -import { CollectionExport } from "@bitwarden/common/models/export/collectionExport"; -import { FieldExport } from "@bitwarden/common/models/export/fieldExport"; -import { FolderExport } from "@bitwarden/common/models/export/folderExport"; -import { IdentityExport } from "@bitwarden/common/models/export/identityExport"; -import { LoginExport } from "@bitwarden/common/models/export/loginExport"; -import { LoginUriExport } from "@bitwarden/common/models/export/loginUriExport"; -import { SecureNoteExport } from "@bitwarden/common/models/export/secureNoteExport"; +import { CardExport } from "@bitwarden/common/models/export/card.export"; +import { CipherExport } from "@bitwarden/common/models/export/cipher.export"; +import { CollectionExport } from "@bitwarden/common/models/export/collection.export"; +import { FieldExport } from "@bitwarden/common/models/export/field.export"; +import { FolderExport } from "@bitwarden/common/models/export/folder.export"; +import { IdentityExport } from "@bitwarden/common/models/export/identity.export"; +import { LoginUriExport } from "@bitwarden/common/models/export/login-uri.export"; +import { LoginExport } from "@bitwarden/common/models/export/login.export"; +import { SecureNoteExport } from "@bitwarden/common/models/export/secure-note.export"; import { ErrorResponse } from "@bitwarden/common/models/response/errorResponse"; -import { CipherView } from "@bitwarden/common/models/view/cipherView"; -import { CollectionView } from "@bitwarden/common/models/view/collectionView"; -import { FolderView } from "@bitwarden/common/models/view/folderView"; +import { CipherView } from "@bitwarden/common/models/view/cipher.view"; +import { CollectionView } from "@bitwarden/common/models/view/collection.view"; +import { FolderView } from "@bitwarden/common/models/view/folder.view"; import { Response } from "@bitwarden/node/cli/models/response"; import { StringResponse } from "@bitwarden/node/cli/models/response/stringResponse"; diff --git a/apps/cli/src/commands/list.command.ts b/apps/cli/src/commands/list.command.ts index dd779ec057..4246769778 100644 --- a/apps/cli/src/commands/list.command.ts +++ b/apps/cli/src/commands/list.command.ts @@ -5,14 +5,14 @@ import { FolderService } from "@bitwarden/common/abstractions/folder/folder.serv import { OrganizationService } from "@bitwarden/common/abstractions/organization/organization.service.abstraction"; import { SearchService } from "@bitwarden/common/abstractions/search.service"; import { Utils } from "@bitwarden/common/misc/utils"; -import { CollectionData } from "@bitwarden/common/models/data/collectionData"; +import { CollectionData } from "@bitwarden/common/models/data/collection.data"; import { Collection } from "@bitwarden/common/models/domain/collection"; import { CollectionDetailsResponse as ApiCollectionDetailsResponse, CollectionResponse as ApiCollectionResponse, } from "@bitwarden/common/models/response/collectionResponse"; import { ListResponse as ApiListResponse } from "@bitwarden/common/models/response/listResponse"; -import { CipherView } from "@bitwarden/common/models/view/cipherView"; +import { CipherView } from "@bitwarden/common/models/view/cipher.view"; import { Response } from "@bitwarden/node/cli/models/response"; import { ListResponse } from "@bitwarden/node/cli/models/response/listResponse"; diff --git a/apps/cli/src/commands/send/get.command.ts b/apps/cli/src/commands/send/get.command.ts index f47d8fbc5d..aeae1203a6 100644 --- a/apps/cli/src/commands/send/get.command.ts +++ b/apps/cli/src/commands/send/get.command.ts @@ -5,7 +5,7 @@ import { EnvironmentService } from "@bitwarden/common/abstractions/environment.s import { SearchService } from "@bitwarden/common/abstractions/search.service"; import { SendService } from "@bitwarden/common/abstractions/send.service"; import { Utils } from "@bitwarden/common/misc/utils"; -import { SendView } from "@bitwarden/common/models/view/sendView"; +import { SendView } from "@bitwarden/common/models/view/send.view"; import { Response } from "@bitwarden/node/cli/models/response"; import { SendResponse } from "../../models/response/sendResponse"; diff --git a/apps/cli/src/commands/send/receive.command.ts b/apps/cli/src/commands/send/receive.command.ts index 21ab10eba9..e67ff3de67 100644 --- a/apps/cli/src/commands/send/receive.command.ts +++ b/apps/cli/src/commands/send/receive.command.ts @@ -9,11 +9,11 @@ import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUti import { SendType } from "@bitwarden/common/enums/sendType"; import { NodeUtils } from "@bitwarden/common/misc/nodeUtils"; import { Utils } from "@bitwarden/common/misc/utils"; -import { SendAccess } from "@bitwarden/common/models/domain/sendAccess"; -import { SymmetricCryptoKey } from "@bitwarden/common/models/domain/symmetricCryptoKey"; +import { SendAccess } from "@bitwarden/common/models/domain/send-access"; +import { SymmetricCryptoKey } from "@bitwarden/common/models/domain/symmetric-crypto-key"; import { SendAccessRequest } from "@bitwarden/common/models/request/sendAccessRequest"; import { ErrorResponse } from "@bitwarden/common/models/response/errorResponse"; -import { SendAccessView } from "@bitwarden/common/models/view/sendAccessView"; +import { SendAccessView } from "@bitwarden/common/models/view/send-access.view"; import { Response } from "@bitwarden/node/cli/models/response"; import { SendAccessResponse } from "../../models/response/sendAccessResponse"; diff --git a/apps/cli/src/models/request/organizationCollectionRequest.ts b/apps/cli/src/models/request/organizationCollectionRequest.ts index 79e85847c6..7b9f184d85 100644 --- a/apps/cli/src/models/request/organizationCollectionRequest.ts +++ b/apps/cli/src/models/request/organizationCollectionRequest.ts @@ -1,4 +1,4 @@ -import { CollectionExport } from "@bitwarden/common/models/export/collectionExport"; +import { CollectionExport } from "@bitwarden/common/models/export/collection.export"; import { SelectionReadOnly } from "../selectionReadOnly"; diff --git a/apps/cli/src/models/response/attachmentResponse.ts b/apps/cli/src/models/response/attachmentResponse.ts index c8fcb875af..2c6cb66e45 100644 --- a/apps/cli/src/models/response/attachmentResponse.ts +++ b/apps/cli/src/models/response/attachmentResponse.ts @@ -1,4 +1,4 @@ -import { AttachmentView } from "@bitwarden/common/models/view/attachmentView"; +import { AttachmentView } from "@bitwarden/common/models/view/attachment.view"; export class AttachmentResponse { id: string; diff --git a/apps/cli/src/models/response/cipherResponse.ts b/apps/cli/src/models/response/cipherResponse.ts index 9f44fbb38a..f1e83ac30e 100644 --- a/apps/cli/src/models/response/cipherResponse.ts +++ b/apps/cli/src/models/response/cipherResponse.ts @@ -1,6 +1,6 @@ import { CipherType } from "@bitwarden/common/enums/cipherType"; -import { CipherWithIdExport } from "@bitwarden/common/models/export/cipherWithIdsExport"; -import { CipherView } from "@bitwarden/common/models/view/cipherView"; +import { CipherWithIdExport } from "@bitwarden/common/models/export/cipher-with-ids.export"; +import { CipherView } from "@bitwarden/common/models/view/cipher.view"; import { BaseResponse } from "@bitwarden/node/cli/models/response/baseResponse"; import { AttachmentResponse } from "./attachmentResponse"; diff --git a/apps/cli/src/models/response/collectionResponse.ts b/apps/cli/src/models/response/collectionResponse.ts index 866b5687dc..1818c946e3 100644 --- a/apps/cli/src/models/response/collectionResponse.ts +++ b/apps/cli/src/models/response/collectionResponse.ts @@ -1,5 +1,5 @@ -import { CollectionWithIdExport } from "@bitwarden/common/models/export/collectionWithIdExport"; -import { CollectionView } from "@bitwarden/common/models/view/collectionView"; +import { CollectionWithIdExport } from "@bitwarden/common/models/export/collection-with-id.export"; +import { CollectionView } from "@bitwarden/common/models/view/collection.view"; import { BaseResponse } from "@bitwarden/node/cli/models/response/baseResponse"; export class CollectionResponse extends CollectionWithIdExport implements BaseResponse { diff --git a/apps/cli/src/models/response/folderResponse.ts b/apps/cli/src/models/response/folderResponse.ts index 6baa0df759..196071fbab 100644 --- a/apps/cli/src/models/response/folderResponse.ts +++ b/apps/cli/src/models/response/folderResponse.ts @@ -1,5 +1,5 @@ -import { FolderWithIdExport } from "@bitwarden/common/models/export/folderWithIdExport"; -import { FolderView } from "@bitwarden/common/models/view/folderView"; +import { FolderWithIdExport } from "@bitwarden/common/models/export/folder-with-id.export"; +import { FolderView } from "@bitwarden/common/models/view/folder.view"; import { BaseResponse } from "@bitwarden/node/cli/models/response/baseResponse"; export class FolderResponse extends FolderWithIdExport implements BaseResponse { diff --git a/apps/cli/src/models/response/loginResponse.ts b/apps/cli/src/models/response/loginResponse.ts index 9ebebcae9f..7aa6e9184d 100644 --- a/apps/cli/src/models/response/loginResponse.ts +++ b/apps/cli/src/models/response/loginResponse.ts @@ -1,5 +1,5 @@ -import { LoginExport } from "@bitwarden/common/models/export/loginExport"; -import { LoginView } from "@bitwarden/common/models/view/loginView"; +import { LoginExport } from "@bitwarden/common/models/export/login.export"; +import { LoginView } from "@bitwarden/common/models/view/login.view"; export class LoginResponse extends LoginExport { passwordRevisionDate: Date; diff --git a/apps/cli/src/models/response/organizationCollectionResponse.ts b/apps/cli/src/models/response/organizationCollectionResponse.ts index 812cc5de92..811e4b2a57 100644 --- a/apps/cli/src/models/response/organizationCollectionResponse.ts +++ b/apps/cli/src/models/response/organizationCollectionResponse.ts @@ -1,4 +1,4 @@ -import { CollectionView } from "@bitwarden/common/models/view/collectionView"; +import { CollectionView } from "@bitwarden/common/models/view/collection.view"; import { SelectionReadOnly } from "../selectionReadOnly"; diff --git a/apps/cli/src/models/response/passwordHistoryResponse.ts b/apps/cli/src/models/response/passwordHistoryResponse.ts index 55a626309b..32f8878a38 100644 --- a/apps/cli/src/models/response/passwordHistoryResponse.ts +++ b/apps/cli/src/models/response/passwordHistoryResponse.ts @@ -1,4 +1,4 @@ -import { PasswordHistoryView } from "@bitwarden/common/models/view/passwordHistoryView"; +import { PasswordHistoryView } from "@bitwarden/common/models/view/password-history.view"; export class PasswordHistoryResponse { lastUsedDate: Date; diff --git a/apps/cli/src/models/response/sendAccessResponse.ts b/apps/cli/src/models/response/sendAccessResponse.ts index 4417b15a1e..a37fd479b7 100644 --- a/apps/cli/src/models/response/sendAccessResponse.ts +++ b/apps/cli/src/models/response/sendAccessResponse.ts @@ -1,5 +1,5 @@ import { SendType } from "@bitwarden/common/enums/sendType"; -import { SendAccessView } from "@bitwarden/common/models/view/sendAccessView"; +import { SendAccessView } from "@bitwarden/common/models/view/send-access.view"; import { BaseResponse } from "@bitwarden/node/cli/models/response/baseResponse"; import { SendFileResponse } from "./sendFileResponse"; diff --git a/apps/cli/src/models/response/sendFileResponse.ts b/apps/cli/src/models/response/sendFileResponse.ts index 6f80904ea9..b99fac379c 100644 --- a/apps/cli/src/models/response/sendFileResponse.ts +++ b/apps/cli/src/models/response/sendFileResponse.ts @@ -1,4 +1,4 @@ -import { SendFileView } from "@bitwarden/common/models/view/sendFileView"; +import { SendFileView } from "@bitwarden/common/models/view/send-file.view"; export class SendFileResponse { static template(fileName = "file attachment location"): SendFileResponse { diff --git a/apps/cli/src/models/response/sendResponse.ts b/apps/cli/src/models/response/sendResponse.ts index b2c715d8f7..c2e47fa740 100644 --- a/apps/cli/src/models/response/sendResponse.ts +++ b/apps/cli/src/models/response/sendResponse.ts @@ -1,6 +1,6 @@ import { SendType } from "@bitwarden/common/enums/sendType"; import { Utils } from "@bitwarden/common/misc/utils"; -import { SendView } from "@bitwarden/common/models/view/sendView"; +import { SendView } from "@bitwarden/common/models/view/send.view"; import { BaseResponse } from "@bitwarden/node/cli/models/response/baseResponse"; import { SendFileResponse } from "./sendFileResponse"; diff --git a/apps/cli/src/models/response/sendTextResponse.ts b/apps/cli/src/models/response/sendTextResponse.ts index 330f9d9460..e234ed6679 100644 --- a/apps/cli/src/models/response/sendTextResponse.ts +++ b/apps/cli/src/models/response/sendTextResponse.ts @@ -1,4 +1,4 @@ -import { SendTextView } from "@bitwarden/common/models/view/sendTextView"; +import { SendTextView } from "@bitwarden/common/models/view/send-text.view"; export class SendTextResponse { static template(text = "Text contained in the send.", hidden = false): SendTextResponse { diff --git a/apps/cli/src/services/nodeEnvSecureStorage.service.ts b/apps/cli/src/services/nodeEnvSecureStorage.service.ts index dcec777347..2d1a8663eb 100644 --- a/apps/cli/src/services/nodeEnvSecureStorage.service.ts +++ b/apps/cli/src/services/nodeEnvSecureStorage.service.ts @@ -2,8 +2,8 @@ import { CryptoService } from "@bitwarden/common/abstractions/crypto.service"; import { LogService } from "@bitwarden/common/abstractions/log.service"; import { AbstractStorageService } from "@bitwarden/common/abstractions/storage.service"; import { Utils } from "@bitwarden/common/misc/utils"; -import { EncArrayBuffer } from "@bitwarden/common/models/domain/encArrayBuffer"; -import { SymmetricCryptoKey } from "@bitwarden/common/models/domain/symmetricCryptoKey"; +import { EncArrayBuffer } from "@bitwarden/common/models/domain/enc-array-buffer"; +import { SymmetricCryptoKey } from "@bitwarden/common/models/domain/symmetric-crypto-key"; export class NodeEnvSecureStorageService implements AbstractStorageService { constructor( diff --git a/apps/cli/src/utils.ts b/apps/cli/src/utils.ts index 62f09c6a13..440d02c25d 100644 --- a/apps/cli/src/utils.ts +++ b/apps/cli/src/utils.ts @@ -8,8 +8,8 @@ import { LogService } from "@bitwarden/common/abstractions/log.service"; import { NodeUtils } from "@bitwarden/common/misc/nodeUtils"; import { Utils } from "@bitwarden/common/misc/utils"; import { Organization } from "@bitwarden/common/models/domain/organization"; -import { CollectionView } from "@bitwarden/common/models/view/collectionView"; -import { FolderView } from "@bitwarden/common/models/view/folderView"; +import { CollectionView } from "@bitwarden/common/models/view/collection.view"; +import { FolderView } from "@bitwarden/common/models/view/folder.view"; import { Response } from "@bitwarden/node/cli/models/response"; import { MessageResponse } from "@bitwarden/node/cli/models/response/messageResponse"; diff --git a/apps/desktop/native-messaging-test-runner/src/nativeMessageService.ts b/apps/desktop/native-messaging-test-runner/src/nativeMessageService.ts index ada09064e3..0a5f4323b5 100644 --- a/apps/desktop/native-messaging-test-runner/src/nativeMessageService.ts +++ b/apps/desktop/native-messaging-test-runner/src/nativeMessageService.ts @@ -3,8 +3,8 @@ import "module-alias/register"; import { v4 as uuidv4 } from "uuid"; import { Utils } from "@bitwarden/common/misc/utils"; -import { EncString } from "@bitwarden/common/models/domain/encString"; -import { SymmetricCryptoKey } from "@bitwarden/common/models/domain/symmetricCryptoKey"; +import { EncString } from "@bitwarden/common/models/domain/enc-string"; +import { SymmetricCryptoKey } from "@bitwarden/common/models/domain/symmetric-crypto-key"; import { ConsoleLogService } from "@bitwarden/common/services/consoleLog.service"; import { EncryptService } from "@bitwarden/common/services/encrypt.service"; import { NodeCryptoFunctionService } from "@bitwarden/node/services/nodeCryptoFunction.service"; diff --git a/apps/desktop/src/app/send/send.component.ts b/apps/desktop/src/app/send/send.component.ts index 0717734f37..95dfb83f36 100644 --- a/apps/desktop/src/app/send/send.component.ts +++ b/apps/desktop/src/app/send/send.component.ts @@ -9,7 +9,7 @@ import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUti import { PolicyService } from "@bitwarden/common/abstractions/policy/policy.service.abstraction"; import { SearchService } from "@bitwarden/common/abstractions/search.service"; import { SendService } from "@bitwarden/common/abstractions/send.service"; -import { SendView } from "@bitwarden/common/models/view/sendView"; +import { SendView } from "@bitwarden/common/models/view/send.view"; import { invokeMenu, RendererMenuItem } from "@bitwarden/electron/utils"; import { SearchBarService } from "../layout/search/search-bar.service"; diff --git a/apps/desktop/src/app/services/services.module.ts b/apps/desktop/src/app/services/services.module.ts index 44087b518a..35ce7604bf 100644 --- a/apps/desktop/src/app/services/services.module.ts +++ b/apps/desktop/src/app/services/services.module.ts @@ -34,7 +34,7 @@ import { AbstractStorageService } from "@bitwarden/common/abstractions/storage.s import { SystemService as SystemServiceAbstraction } from "@bitwarden/common/abstractions/system.service"; import { ClientType } from "@bitwarden/common/enums/clientType"; import { StateFactory } from "@bitwarden/common/factories/stateFactory"; -import { GlobalState } from "@bitwarden/common/models/domain/globalState"; +import { GlobalState } from "@bitwarden/common/models/domain/global-state"; import { MemoryStorageService } from "@bitwarden/common/services/memoryStorage.service"; import { SystemService } from "@bitwarden/common/services/system.service"; import { ElectronCryptoService } from "@bitwarden/electron/services/electronCrypto.service"; diff --git a/apps/desktop/src/app/vault/ciphers.component.ts b/apps/desktop/src/app/vault/ciphers.component.ts index 8039a93843..4e0c6016ca 100644 --- a/apps/desktop/src/app/vault/ciphers.component.ts +++ b/apps/desktop/src/app/vault/ciphers.component.ts @@ -2,7 +2,7 @@ import { Component } from "@angular/core"; import { CiphersComponent as BaseCiphersComponent } from "@bitwarden/angular/components/ciphers.component"; import { SearchService } from "@bitwarden/common/abstractions/search.service"; -import { CipherView } from "@bitwarden/common/models/view/cipherView"; +import { CipherView } from "@bitwarden/common/models/view/cipher.view"; import { SearchBarService } from "../layout/search/search-bar.service"; diff --git a/apps/desktop/src/app/vault/vault.component.ts b/apps/desktop/src/app/vault/vault.component.ts index c343706302..9ddf15d65e 100644 --- a/apps/desktop/src/app/vault/vault.component.ts +++ b/apps/desktop/src/app/vault/vault.component.ts @@ -25,8 +25,8 @@ import { TotpService } from "@bitwarden/common/abstractions/totp.service"; import { CipherRepromptType } from "@bitwarden/common/enums/cipherRepromptType"; import { CipherType } from "@bitwarden/common/enums/cipherType"; import { EventType } from "@bitwarden/common/enums/eventType"; -import { CipherView } from "@bitwarden/common/models/view/cipherView"; -import { FolderView } from "@bitwarden/common/models/view/folderView"; +import { CipherView } from "@bitwarden/common/models/view/cipher.view"; +import { FolderView } from "@bitwarden/common/models/view/folder.view"; import { invokeMenu, RendererMenuItem } from "@bitwarden/electron/utils"; import { SearchBarService } from "../layout/search/search-bar.service"; diff --git a/apps/desktop/src/app/vault/view.component.ts b/apps/desktop/src/app/vault/view.component.ts index a3125c02e7..8c14132c80 100644 --- a/apps/desktop/src/app/vault/view.component.ts +++ b/apps/desktop/src/app/vault/view.component.ts @@ -23,7 +23,7 @@ import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUti import { StateService } from "@bitwarden/common/abstractions/state.service"; import { TokenService } from "@bitwarden/common/abstractions/token.service"; import { TotpService } from "@bitwarden/common/abstractions/totp.service"; -import { CipherView } from "@bitwarden/common/models/view/cipherView"; +import { CipherView } from "@bitwarden/common/models/view/cipher.view"; const BroadcasterSubscriptionId = "ViewComponent"; diff --git a/apps/desktop/src/main.ts b/apps/desktop/src/main.ts index 071cbebc33..e47c3f47a1 100644 --- a/apps/desktop/src/main.ts +++ b/apps/desktop/src/main.ts @@ -3,7 +3,7 @@ import * as path from "path"; import { app } from "electron"; import { StateFactory } from "@bitwarden/common/factories/stateFactory"; -import { GlobalState } from "@bitwarden/common/models/domain/globalState"; +import { GlobalState } from "@bitwarden/common/models/domain/global-state"; import { MemoryStorageService } from "@bitwarden/common/services/memoryStorage.service"; import { StateService } from "@bitwarden/common/services/state.service"; import { ElectronLogService } from "@bitwarden/electron/services/electronLog.service"; diff --git a/apps/desktop/src/models/nativeMessaging/encryptedMessage.ts b/apps/desktop/src/models/nativeMessaging/encryptedMessage.ts index c7fd9913d1..bd0b5177a4 100644 --- a/apps/desktop/src/models/nativeMessaging/encryptedMessage.ts +++ b/apps/desktop/src/models/nativeMessaging/encryptedMessage.ts @@ -1,4 +1,4 @@ -import { EncString } from "@bitwarden/common/models/domain/encString"; +import { EncString } from "@bitwarden/common/models/domain/enc-string"; import { MessageCommon } from "./messageCommon"; diff --git a/apps/desktop/src/models/nativeMessaging/encryptedMessageResponse.ts b/apps/desktop/src/models/nativeMessaging/encryptedMessageResponse.ts index 1abb81ba8f..bed85b65e9 100644 --- a/apps/desktop/src/models/nativeMessaging/encryptedMessageResponse.ts +++ b/apps/desktop/src/models/nativeMessaging/encryptedMessageResponse.ts @@ -1,4 +1,4 @@ -import { EncString } from "@bitwarden/common/models/domain/encString"; +import { EncString } from "@bitwarden/common/models/domain/enc-string"; import { MessageCommon } from "./messageCommon"; diff --git a/apps/desktop/src/models/nativeMessaging/legacyMessageWrapper.ts b/apps/desktop/src/models/nativeMessaging/legacyMessageWrapper.ts index 65142540fa..5ef10e7328 100644 --- a/apps/desktop/src/models/nativeMessaging/legacyMessageWrapper.ts +++ b/apps/desktop/src/models/nativeMessaging/legacyMessageWrapper.ts @@ -1,4 +1,4 @@ -import { EncString } from "@bitwarden/common/models/domain/encString"; +import { EncString } from "@bitwarden/common/models/domain/enc-string"; import { LegacyMessage } from "./legacyMessage"; diff --git a/apps/desktop/src/services/encryptedMessageHandlerService.ts b/apps/desktop/src/services/encryptedMessageHandlerService.ts index 1dd6618595..a064e031c8 100644 --- a/apps/desktop/src/services/encryptedMessageHandlerService.ts +++ b/apps/desktop/src/services/encryptedMessageHandlerService.ts @@ -6,9 +6,9 @@ import { PolicyService } from "@bitwarden/common/abstractions/policy/policy.serv import { AuthenticationStatus } from "@bitwarden/common/enums/authenticationStatus"; import { CipherType } from "@bitwarden/common/enums/cipherType"; import { PolicyType } from "@bitwarden/common/enums/policyType"; -import { CipherView } from "@bitwarden/common/models/view/cipherView"; -import { LoginUriView } from "@bitwarden/common/models/view/loginUriView"; -import { LoginView } from "@bitwarden/common/models/view/loginView"; +import { CipherView } from "@bitwarden/common/models/view/cipher.view"; +import { LoginUriView } from "@bitwarden/common/models/view/login-uri.view"; +import { LoginView } from "@bitwarden/common/models/view/login.view"; import { DecryptedCommandData } from "../models/nativeMessaging/decryptedCommandData"; import { CredentialCreatePayload } from "../models/nativeMessaging/encryptedMessagePayloads/credentialCreatePayload"; diff --git a/apps/desktop/src/services/nativeMessageHandler.service.ts b/apps/desktop/src/services/nativeMessageHandler.service.ts index 5787e40734..8a578957bf 100644 --- a/apps/desktop/src/services/nativeMessageHandler.service.ts +++ b/apps/desktop/src/services/nativeMessageHandler.service.ts @@ -8,8 +8,8 @@ import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; import { MessagingService } from "@bitwarden/common/abstractions/messaging.service"; import { NativeMessagingVersion } from "@bitwarden/common/enums/nativeMessagingVersion"; import { Utils } from "@bitwarden/common/misc/utils"; -import { EncString } from "@bitwarden/common/models/domain/encString"; -import { SymmetricCryptoKey } from "@bitwarden/common/models/domain/symmetricCryptoKey"; +import { EncString } from "@bitwarden/common/models/domain/enc-string"; +import { SymmetricCryptoKey } from "@bitwarden/common/models/domain/symmetric-crypto-key"; import { StateService } from "@bitwarden/common/services/state.service"; import { DecryptedCommandData } from "../models/nativeMessaging/decryptedCommandData"; diff --git a/apps/desktop/src/services/nativeMessaging.service.ts b/apps/desktop/src/services/nativeMessaging.service.ts index 2ff014fb24..484522d7a5 100644 --- a/apps/desktop/src/services/nativeMessaging.service.ts +++ b/apps/desktop/src/services/nativeMessaging.service.ts @@ -11,8 +11,8 @@ import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUti import { StateService } from "@bitwarden/common/abstractions/state.service"; import { KeySuffixOptions } from "@bitwarden/common/enums/keySuffixOptions"; import { Utils } from "@bitwarden/common/misc/utils"; -import { EncString } from "@bitwarden/common/models/domain/encString"; -import { SymmetricCryptoKey } from "@bitwarden/common/models/domain/symmetricCryptoKey"; +import { EncString } from "@bitwarden/common/models/domain/enc-string"; +import { SymmetricCryptoKey } from "@bitwarden/common/models/domain/symmetric-crypto-key"; import { LegacyMessage } from "../models/nativeMessaging/legacyMessage"; import { LegacyMessageWrapper } from "../models/nativeMessaging/legacyMessageWrapper"; diff --git a/apps/desktop/src/services/state.service.ts b/apps/desktop/src/services/state.service.ts index 521868a886..4cbf030d38 100644 --- a/apps/desktop/src/services/state.service.ts +++ b/apps/desktop/src/services/state.service.ts @@ -1,5 +1,5 @@ import { StateService as StateServiceAbstraction } from "@bitwarden/common/abstractions/state.service"; -import { GlobalState } from "@bitwarden/common/models/domain/globalState"; +import { GlobalState } from "@bitwarden/common/models/domain/global-state"; import { StateService as BaseStateService } from "@bitwarden/common/services/state.service"; import { Account } from "../models/account"; diff --git a/apps/web/src/app/accounts/login/login-with-device.component.ts b/apps/web/src/app/accounts/login/login-with-device.component.ts index 32d350a1e0..8f4a61ad31 100644 --- a/apps/web/src/app/accounts/login/login-with-device.component.ts +++ b/apps/web/src/app/accounts/login/login-with-device.component.ts @@ -17,8 +17,8 @@ import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUti import { StateService } from "@bitwarden/common/abstractions/state.service"; import { AuthRequestType } from "@bitwarden/common/enums/authRequestType"; import { Utils } from "@bitwarden/common/misc/utils"; -import { PasswordlessLogInCredentials } from "@bitwarden/common/models/domain/logInCredentials"; -import { SymmetricCryptoKey } from "@bitwarden/common/models/domain/symmetricCryptoKey"; +import { PasswordlessLogInCredentials } from "@bitwarden/common/models/domain/log-in-credentials"; +import { SymmetricCryptoKey } from "@bitwarden/common/models/domain/symmetric-crypto-key"; import { PasswordlessCreateAuthRequest } from "@bitwarden/common/models/request/passwordlessCreateAuthRequest"; import { AuthRequestResponse } from "@bitwarden/common/models/response/authRequestResponse"; diff --git a/apps/web/src/app/accounts/login/login.component.ts b/apps/web/src/app/accounts/login/login.component.ts index 02bc781ee1..20e95e5b04 100644 --- a/apps/web/src/app/accounts/login/login.component.ts +++ b/apps/web/src/app/accounts/login/login.component.ts @@ -17,8 +17,8 @@ import { PasswordGenerationService } from "@bitwarden/common/abstractions/passwo import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; import { PolicyApiServiceAbstraction } from "@bitwarden/common/abstractions/policy/policy-api.service.abstraction"; import { InternalPolicyService } from "@bitwarden/common/abstractions/policy/policy.service.abstraction"; -import { PolicyData } from "@bitwarden/common/models/data/policyData"; -import { MasterPasswordPolicyOptions } from "@bitwarden/common/models/domain/masterPasswordPolicyOptions"; +import { PolicyData } from "@bitwarden/common/models/data/policy.data"; +import { MasterPasswordPolicyOptions } from "@bitwarden/common/models/domain/master-password-policy-options"; import { Policy } from "@bitwarden/common/models/domain/policy"; import { ListResponse } from "@bitwarden/common/models/response/listResponse"; import { PolicyResponse } from "@bitwarden/common/models/response/policyResponse"; diff --git a/apps/web/src/app/accounts/register-form/register-form.component.ts b/apps/web/src/app/accounts/register-form/register-form.component.ts index ad3341fb6c..43b67ae124 100644 --- a/apps/web/src/app/accounts/register-form/register-form.component.ts +++ b/apps/web/src/app/accounts/register-form/register-form.component.ts @@ -14,7 +14,7 @@ import { PasswordGenerationService } from "@bitwarden/common/abstractions/passwo import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; import { PolicyService } from "@bitwarden/common/abstractions/policy/policy.service.abstraction"; import { StateService } from "@bitwarden/common/abstractions/state.service"; -import { MasterPasswordPolicyOptions } from "@bitwarden/common/models/domain/masterPasswordPolicyOptions"; +import { MasterPasswordPolicyOptions } from "@bitwarden/common/models/domain/master-password-policy-options"; import { ReferenceEventRequest } from "@bitwarden/common/models/request/referenceEventRequest"; @Component({ diff --git a/apps/web/src/app/accounts/register.component.ts b/apps/web/src/app/accounts/register.component.ts index 2d1eb6d5e5..3283ddd5ce 100644 --- a/apps/web/src/app/accounts/register.component.ts +++ b/apps/web/src/app/accounts/register.component.ts @@ -17,8 +17,8 @@ import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUti import { PolicyApiServiceAbstraction } from "@bitwarden/common/abstractions/policy/policy-api.service.abstraction"; import { PolicyService } from "@bitwarden/common/abstractions/policy/policy.service.abstraction"; import { StateService } from "@bitwarden/common/abstractions/state.service"; -import { PolicyData } from "@bitwarden/common/models/data/policyData"; -import { MasterPasswordPolicyOptions } from "@bitwarden/common/models/domain/masterPasswordPolicyOptions"; +import { PolicyData } from "@bitwarden/common/models/data/policy.data"; +import { MasterPasswordPolicyOptions } from "@bitwarden/common/models/domain/master-password-policy-options"; import { Policy } from "@bitwarden/common/models/domain/policy"; import { ReferenceEventRequest } from "@bitwarden/common/models/request/referenceEventRequest"; diff --git a/apps/web/src/app/accounts/trial-initiation/trial-initiation.component.spec.ts b/apps/web/src/app/accounts/trial-initiation/trial-initiation.component.spec.ts index 8e186aac06..f4f8be64fb 100644 --- a/apps/web/src/app/accounts/trial-initiation/trial-initiation.component.spec.ts +++ b/apps/web/src/app/accounts/trial-initiation/trial-initiation.component.spec.ts @@ -15,7 +15,7 @@ import { PolicyApiServiceAbstraction } from "@bitwarden/common/abstractions/poli import { PolicyService } from "@bitwarden/common/abstractions/policy/policy.service.abstraction"; import { StateService } from "@bitwarden/common/abstractions/state.service"; import { PlanType } from "@bitwarden/common/enums/planType"; -import { MasterPasswordPolicyOptions } from "@bitwarden/common/models/domain/masterPasswordPolicyOptions"; +import { MasterPasswordPolicyOptions } from "@bitwarden/common/models/domain/master-password-policy-options"; import { ListResponse } from "@bitwarden/common/models/response/listResponse"; import { PolicyResponse } from "@bitwarden/common/models/response/policyResponse"; diff --git a/apps/web/src/app/accounts/trial-initiation/trial-initiation.component.ts b/apps/web/src/app/accounts/trial-initiation/trial-initiation.component.ts index d8b2fc0873..55550b0245 100644 --- a/apps/web/src/app/accounts/trial-initiation/trial-initiation.component.ts +++ b/apps/web/src/app/accounts/trial-initiation/trial-initiation.component.ts @@ -12,8 +12,8 @@ import { PolicyService } from "@bitwarden/common/abstractions/policy/policy.serv import { StateService } from "@bitwarden/common/abstractions/state.service"; import { PlanType } from "@bitwarden/common/enums/planType"; import { ProductType } from "@bitwarden/common/enums/productType"; -import { PolicyData } from "@bitwarden/common/models/data/policyData"; -import { MasterPasswordPolicyOptions } from "@bitwarden/common/models/domain/masterPasswordPolicyOptions"; +import { PolicyData } from "@bitwarden/common/models/data/policy.data"; +import { MasterPasswordPolicyOptions } from "@bitwarden/common/models/domain/master-password-policy-options"; import { Policy } from "@bitwarden/common/models/domain/policy"; import { ReferenceEventRequest } from "@bitwarden/common/models/request/referenceEventRequest"; diff --git a/apps/web/src/app/common/base.events.component.ts b/apps/web/src/app/common/base.events.component.ts index 31d44f6825..2e136ae211 100644 --- a/apps/web/src/app/common/base.events.component.ts +++ b/apps/web/src/app/common/base.events.component.ts @@ -7,7 +7,7 @@ import { LogService } from "@bitwarden/common/abstractions/log.service"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; import { EventResponse } from "@bitwarden/common/models/response/eventResponse"; import { ListResponse } from "@bitwarden/common/models/response/listResponse"; -import { EventView } from "@bitwarden/common/models/view/eventView"; +import { EventView } from "@bitwarden/common/models/view/event.view"; import { EventService } from "../core"; diff --git a/apps/web/src/app/components/premium-badge.stories.ts b/apps/web/src/app/components/premium-badge.stories.ts index fda398c839..a1fcfd471e 100644 --- a/apps/web/src/app/components/premium-badge.stories.ts +++ b/apps/web/src/app/components/premium-badge.stories.ts @@ -4,7 +4,7 @@ import { JslibModule } from "@bitwarden/angular/jslib.module"; import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; import { MessagingService } from "@bitwarden/common/abstractions/messaging.service"; import { StateService } from "@bitwarden/common/abstractions/state.service"; -import { StorageOptions } from "@bitwarden/common/models/domain/storageOptions"; +import { StorageOptions } from "@bitwarden/common/models/domain/storage-options"; import { BadgeModule, I18nMockService } from "@bitwarden/components"; import { PremiumBadgeComponent } from "./premium-badge.component"; diff --git a/apps/web/src/app/core/html-storage.service.ts b/apps/web/src/app/core/html-storage.service.ts index 680051aa85..5988f3f289 100644 --- a/apps/web/src/app/core/html-storage.service.ts +++ b/apps/web/src/app/core/html-storage.service.ts @@ -2,7 +2,7 @@ import { Injectable } from "@angular/core"; import { AbstractStorageService } from "@bitwarden/common/abstractions/storage.service"; import { HtmlStorageLocation } from "@bitwarden/common/enums/htmlStorageLocation"; -import { StorageOptions } from "@bitwarden/common/models/domain/storageOptions"; +import { StorageOptions } from "@bitwarden/common/models/domain/storage-options"; @Injectable() export class HtmlStorageService implements AbstractStorageService { diff --git a/apps/web/src/app/core/state/global-state.ts b/apps/web/src/app/core/state/global-state.ts index 15fc03876f..1bd80e20f1 100644 --- a/apps/web/src/app/core/state/global-state.ts +++ b/apps/web/src/app/core/state/global-state.ts @@ -1,5 +1,5 @@ import { ThemeType } from "@bitwarden/common/enums/themeType"; -import { GlobalState as BaseGlobalState } from "@bitwarden/common/models/domain/globalState"; +import { GlobalState as BaseGlobalState } from "@bitwarden/common/models/domain/global-state"; export class GlobalState extends BaseGlobalState { theme?: ThemeType = ThemeType.Light; diff --git a/apps/web/src/app/core/state/state.service.ts b/apps/web/src/app/core/state/state.service.ts index 7284ad87fe..7c1eefe270 100644 --- a/apps/web/src/app/core/state/state.service.ts +++ b/apps/web/src/app/core/state/state.service.ts @@ -10,11 +10,11 @@ import { LogService } from "@bitwarden/common/abstractions/log.service"; import { StateMigrationService } from "@bitwarden/common/abstractions/stateMigration.service"; import { AbstractStorageService } from "@bitwarden/common/abstractions/storage.service"; import { StateFactory } from "@bitwarden/common/factories/stateFactory"; -import { CipherData } from "@bitwarden/common/models/data/cipherData"; -import { CollectionData } from "@bitwarden/common/models/data/collectionData"; -import { FolderData } from "@bitwarden/common/models/data/folderData"; -import { SendData } from "@bitwarden/common/models/data/sendData"; -import { StorageOptions } from "@bitwarden/common/models/domain/storageOptions"; +import { CipherData } from "@bitwarden/common/models/data/cipher.data"; +import { CollectionData } from "@bitwarden/common/models/data/collection.data"; +import { FolderData } from "@bitwarden/common/models/data/folder.data"; +import { SendData } from "@bitwarden/common/models/data/send.data"; +import { StorageOptions } from "@bitwarden/common/models/domain/storage-options"; import { StateService as BaseStateService } from "@bitwarden/common/services/state.service"; import { Account } from "./account"; diff --git a/apps/web/src/app/organizations/manage/collection-add-edit.component.ts b/apps/web/src/app/organizations/manage/collection-add-edit.component.ts index 5c428abda4..d018ea32f3 100644 --- a/apps/web/src/app/organizations/manage/collection-add-edit.component.ts +++ b/apps/web/src/app/organizations/manage/collection-add-edit.component.ts @@ -7,8 +7,8 @@ import { LogService } from "@bitwarden/common/abstractions/log.service"; import { OrganizationService } from "@bitwarden/common/abstractions/organization/organization.service.abstraction"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; import { Utils } from "@bitwarden/common/misc/utils"; -import { EncString } from "@bitwarden/common/models/domain/encString"; -import { SymmetricCryptoKey } from "@bitwarden/common/models/domain/symmetricCryptoKey"; +import { EncString } from "@bitwarden/common/models/domain/enc-string"; +import { SymmetricCryptoKey } from "@bitwarden/common/models/domain/symmetric-crypto-key"; import { CollectionRequest } from "@bitwarden/common/models/request/collectionRequest"; import { SelectionReadOnlyRequest } from "@bitwarden/common/models/request/selectionReadOnlyRequest"; import { GroupResponse } from "@bitwarden/common/models/response/groupResponse"; diff --git a/apps/web/src/app/organizations/manage/collections.component.ts b/apps/web/src/app/organizations/manage/collections.component.ts index d9fe9bdb68..d2bdc5caf5 100644 --- a/apps/web/src/app/organizations/manage/collections.component.ts +++ b/apps/web/src/app/organizations/manage/collections.component.ts @@ -10,7 +10,7 @@ import { LogService } from "@bitwarden/common/abstractions/log.service"; import { OrganizationService } from "@bitwarden/common/abstractions/organization/organization.service.abstraction"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; import { SearchService } from "@bitwarden/common/abstractions/search.service"; -import { CollectionData } from "@bitwarden/common/models/data/collectionData"; +import { CollectionData } from "@bitwarden/common/models/data/collection.data"; import { Collection } from "@bitwarden/common/models/domain/collection"; import { Organization } from "@bitwarden/common/models/domain/organization"; import { @@ -18,7 +18,7 @@ import { CollectionResponse, } from "@bitwarden/common/models/response/collectionResponse"; import { ListResponse } from "@bitwarden/common/models/response/listResponse"; -import { CollectionView } from "@bitwarden/common/models/view/collectionView"; +import { CollectionView } from "@bitwarden/common/models/view/collection.view"; import { CollectionAddEditComponent } from "./collection-add-edit.component"; import { EntityUsersComponent } from "./entity-users.component"; diff --git a/apps/web/src/app/organizations/manage/group-add-edit.component.ts b/apps/web/src/app/organizations/manage/group-add-edit.component.ts index 0d5f654a50..9000f8318d 100644 --- a/apps/web/src/app/organizations/manage/group-add-edit.component.ts +++ b/apps/web/src/app/organizations/manage/group-add-edit.component.ts @@ -5,12 +5,12 @@ import { CollectionService } from "@bitwarden/common/abstractions/collection.ser import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; import { LogService } from "@bitwarden/common/abstractions/log.service"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; -import { CollectionData } from "@bitwarden/common/models/data/collectionData"; +import { CollectionData } from "@bitwarden/common/models/data/collection.data"; import { Collection } from "@bitwarden/common/models/domain/collection"; import { GroupRequest } from "@bitwarden/common/models/request/groupRequest"; import { SelectionReadOnlyRequest } from "@bitwarden/common/models/request/selectionReadOnlyRequest"; import { CollectionDetailsResponse } from "@bitwarden/common/models/response/collectionResponse"; -import { CollectionView } from "@bitwarden/common/models/view/collectionView"; +import { CollectionView } from "@bitwarden/common/models/view/collection.view"; @Component({ selector: "app-group-add-edit", diff --git a/apps/web/src/app/organizations/manage/reset-password.component.ts b/apps/web/src/app/organizations/manage/reset-password.component.ts index 97e9466e80..53150fbfec 100644 --- a/apps/web/src/app/organizations/manage/reset-password.component.ts +++ b/apps/web/src/app/organizations/manage/reset-password.component.ts @@ -18,9 +18,9 @@ import { LogService } from "@bitwarden/common/abstractions/log.service"; import { PasswordGenerationService } from "@bitwarden/common/abstractions/passwordGeneration.service"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; import { PolicyService } from "@bitwarden/common/abstractions/policy/policy.service.abstraction"; -import { EncString } from "@bitwarden/common/models/domain/encString"; -import { MasterPasswordPolicyOptions } from "@bitwarden/common/models/domain/masterPasswordPolicyOptions"; -import { SymmetricCryptoKey } from "@bitwarden/common/models/domain/symmetricCryptoKey"; +import { EncString } from "@bitwarden/common/models/domain/enc-string"; +import { MasterPasswordPolicyOptions } from "@bitwarden/common/models/domain/master-password-policy-options"; +import { SymmetricCryptoKey } from "@bitwarden/common/models/domain/symmetric-crypto-key"; import { OrganizationUserResetPasswordRequest } from "@bitwarden/common/models/request/organizationUserResetPasswordRequest"; @Component({ diff --git a/apps/web/src/app/organizations/manage/user-add-edit.component.ts b/apps/web/src/app/organizations/manage/user-add-edit.component.ts index 678053b869..2756f5c6a7 100644 --- a/apps/web/src/app/organizations/manage/user-add-edit.component.ts +++ b/apps/web/src/app/organizations/manage/user-add-edit.component.ts @@ -7,14 +7,14 @@ import { LogService } from "@bitwarden/common/abstractions/log.service"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; import { OrganizationUserStatusType } from "@bitwarden/common/enums/organizationUserStatusType"; import { OrganizationUserType } from "@bitwarden/common/enums/organizationUserType"; -import { PermissionsApi } from "@bitwarden/common/models/api/permissionsApi"; -import { CollectionData } from "@bitwarden/common/models/data/collectionData"; +import { PermissionsApi } from "@bitwarden/common/models/api/permissions.api"; +import { CollectionData } from "@bitwarden/common/models/data/collection.data"; import { Collection } from "@bitwarden/common/models/domain/collection"; import { OrganizationUserInviteRequest } from "@bitwarden/common/models/request/organizationUserInviteRequest"; import { OrganizationUserUpdateRequest } from "@bitwarden/common/models/request/organizationUserUpdateRequest"; import { SelectionReadOnlyRequest } from "@bitwarden/common/models/request/selectionReadOnlyRequest"; import { CollectionDetailsResponse } from "@bitwarden/common/models/response/collectionResponse"; -import { CollectionView } from "@bitwarden/common/models/view/collectionView"; +import { CollectionView } from "@bitwarden/common/models/view/collection.view"; @Component({ selector: "app-user-add-edit", diff --git a/apps/web/src/app/organizations/settings/delete-organization.component.ts b/apps/web/src/app/organizations/settings/delete-organization.component.ts index e67f667b9c..1857a94f4c 100644 --- a/apps/web/src/app/organizations/settings/delete-organization.component.ts +++ b/apps/web/src/app/organizations/settings/delete-organization.component.ts @@ -9,7 +9,7 @@ import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUti import { UserVerificationService } from "@bitwarden/common/abstractions/userVerification/userVerification.service.abstraction"; import { CipherType } from "@bitwarden/common/enums/cipherType"; import { Utils } from "@bitwarden/common/misc/utils"; -import { CipherView } from "@bitwarden/common/models/view/cipherView"; +import { CipherView } from "@bitwarden/common/models/view/cipher.view"; import { Verification } from "@bitwarden/common/types/verification"; class CountBasedLocalizationKey { diff --git a/apps/web/src/app/organizations/settings/organization-subscription.component.ts b/apps/web/src/app/organizations/settings/organization-subscription.component.ts index 7ee3a42da8..04a0c99443 100644 --- a/apps/web/src/app/organizations/settings/organization-subscription.component.ts +++ b/apps/web/src/app/organizations/settings/organization-subscription.component.ts @@ -13,7 +13,7 @@ import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUti import { OrganizationApiKeyType } from "@bitwarden/common/enums/organizationApiKeyType"; import { OrganizationConnectionType } from "@bitwarden/common/enums/organizationConnectionType"; import { PlanType } from "@bitwarden/common/enums/planType"; -import { BillingSyncConfigApi } from "@bitwarden/common/models/api/billingSyncConfigApi"; +import { BillingSyncConfigApi } from "@bitwarden/common/models/api/billing-sync-config.api"; import { Organization } from "@bitwarden/common/models/domain/organization"; import { OrganizationConnectionResponse } from "@bitwarden/common/models/response/organizationConnectionResponse"; import { OrganizationSubscriptionResponse } from "@bitwarden/common/models/response/organizationSubscriptionResponse"; diff --git a/apps/web/src/app/organizations/tools/exposed-passwords-report.component.ts b/apps/web/src/app/organizations/tools/exposed-passwords-report.component.ts index adb7ba6024..af4cc8b430 100644 --- a/apps/web/src/app/organizations/tools/exposed-passwords-report.component.ts +++ b/apps/web/src/app/organizations/tools/exposed-passwords-report.component.ts @@ -9,7 +9,7 @@ import { OrganizationService } from "@bitwarden/common/abstractions/organization import { PasswordRepromptService } from "@bitwarden/common/abstractions/passwordReprompt.service"; import { StateService } from "@bitwarden/common/abstractions/state.service"; import { Cipher } from "@bitwarden/common/models/domain/cipher"; -import { CipherView } from "@bitwarden/common/models/view/cipherView"; +import { CipherView } from "@bitwarden/common/models/view/cipher.view"; // eslint-disable-next-line no-restricted-imports import { ExposedPasswordsReportComponent as BaseExposedPasswordsReportComponent } from "../../reports/pages/exposed-passwords-report.component"; diff --git a/apps/web/src/app/organizations/tools/inactive-two-factor-report.component.ts b/apps/web/src/app/organizations/tools/inactive-two-factor-report.component.ts index 49ae82ab5f..4675c88dde 100644 --- a/apps/web/src/app/organizations/tools/inactive-two-factor-report.component.ts +++ b/apps/web/src/app/organizations/tools/inactive-two-factor-report.component.ts @@ -8,7 +8,7 @@ import { MessagingService } from "@bitwarden/common/abstractions/messaging.servi import { OrganizationService } from "@bitwarden/common/abstractions/organization/organization.service.abstraction"; import { PasswordRepromptService } from "@bitwarden/common/abstractions/passwordReprompt.service"; import { StateService } from "@bitwarden/common/abstractions/state.service"; -import { CipherView } from "@bitwarden/common/models/view/cipherView"; +import { CipherView } from "@bitwarden/common/models/view/cipher.view"; // eslint-disable-next-line no-restricted-imports import { InactiveTwoFactorReportComponent as BaseInactiveTwoFactorReportComponent } from "../../reports/pages/inactive-two-factor-report.component"; diff --git a/apps/web/src/app/organizations/tools/reused-passwords-report.component.ts b/apps/web/src/app/organizations/tools/reused-passwords-report.component.ts index 74e5ac91bb..1c43c7f748 100644 --- a/apps/web/src/app/organizations/tools/reused-passwords-report.component.ts +++ b/apps/web/src/app/organizations/tools/reused-passwords-report.component.ts @@ -8,7 +8,7 @@ import { OrganizationService } from "@bitwarden/common/abstractions/organization import { PasswordRepromptService } from "@bitwarden/common/abstractions/passwordReprompt.service"; import { StateService } from "@bitwarden/common/abstractions/state.service"; import { Cipher } from "@bitwarden/common/models/domain/cipher"; -import { CipherView } from "@bitwarden/common/models/view/cipherView"; +import { CipherView } from "@bitwarden/common/models/view/cipher.view"; // eslint-disable-next-line no-restricted-imports import { ReusedPasswordsReportComponent as BaseReusedPasswordsReportComponent } from "../../reports/pages/reused-passwords-report.component"; diff --git a/apps/web/src/app/organizations/tools/unsecured-websites-report.component.ts b/apps/web/src/app/organizations/tools/unsecured-websites-report.component.ts index dbb5e08be5..4323f82cb0 100644 --- a/apps/web/src/app/organizations/tools/unsecured-websites-report.component.ts +++ b/apps/web/src/app/organizations/tools/unsecured-websites-report.component.ts @@ -7,7 +7,7 @@ import { MessagingService } from "@bitwarden/common/abstractions/messaging.servi import { OrganizationService } from "@bitwarden/common/abstractions/organization/organization.service.abstraction"; import { PasswordRepromptService } from "@bitwarden/common/abstractions/passwordReprompt.service"; import { StateService } from "@bitwarden/common/abstractions/state.service"; -import { CipherView } from "@bitwarden/common/models/view/cipherView"; +import { CipherView } from "@bitwarden/common/models/view/cipher.view"; // eslint-disable-next-line no-restricted-imports import { UnsecuredWebsitesReportComponent as BaseUnsecuredWebsitesReportComponent } from "../../reports/pages/unsecured-websites-report.component"; diff --git a/apps/web/src/app/organizations/tools/weak-passwords-report.component.ts b/apps/web/src/app/organizations/tools/weak-passwords-report.component.ts index 3b8cc1490a..af2345918b 100644 --- a/apps/web/src/app/organizations/tools/weak-passwords-report.component.ts +++ b/apps/web/src/app/organizations/tools/weak-passwords-report.component.ts @@ -9,7 +9,7 @@ import { PasswordGenerationService } from "@bitwarden/common/abstractions/passwo import { PasswordRepromptService } from "@bitwarden/common/abstractions/passwordReprompt.service"; import { StateService } from "@bitwarden/common/abstractions/state.service"; import { Cipher } from "@bitwarden/common/models/domain/cipher"; -import { CipherView } from "@bitwarden/common/models/view/cipherView"; +import { CipherView } from "@bitwarden/common/models/view/cipher.view"; // eslint-disable-next-line no-restricted-imports import { WeakPasswordsReportComponent as BaseWeakPasswordsReportComponent } from "../../reports/pages/weak-passwords-report.component"; diff --git a/apps/web/src/app/organizations/vault/add-edit.component.ts b/apps/web/src/app/organizations/vault/add-edit.component.ts index e3943ef2a5..a10c42a07b 100644 --- a/apps/web/src/app/organizations/vault/add-edit.component.ts +++ b/apps/web/src/app/organizations/vault/add-edit.component.ts @@ -16,7 +16,7 @@ import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUti import { PolicyService } from "@bitwarden/common/abstractions/policy/policy.service.abstraction"; import { StateService } from "@bitwarden/common/abstractions/state.service"; import { TotpService } from "@bitwarden/common/abstractions/totp.service"; -import { CipherData } from "@bitwarden/common/models/data/cipherData"; +import { CipherData } from "@bitwarden/common/models/data/cipher.data"; import { Cipher } from "@bitwarden/common/models/domain/cipher"; import { Organization } from "@bitwarden/common/models/domain/organization"; import { CipherCreateRequest } from "@bitwarden/common/models/request/cipherCreateRequest"; diff --git a/apps/web/src/app/organizations/vault/attachments.component.ts b/apps/web/src/app/organizations/vault/attachments.component.ts index aac10c8d8e..79ed8e67b8 100644 --- a/apps/web/src/app/organizations/vault/attachments.component.ts +++ b/apps/web/src/app/organizations/vault/attachments.component.ts @@ -8,10 +8,10 @@ import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; import { LogService } from "@bitwarden/common/abstractions/log.service"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; import { StateService } from "@bitwarden/common/abstractions/state.service"; -import { CipherData } from "@bitwarden/common/models/data/cipherData"; +import { CipherData } from "@bitwarden/common/models/data/cipher.data"; import { Cipher } from "@bitwarden/common/models/domain/cipher"; import { Organization } from "@bitwarden/common/models/domain/organization"; -import { AttachmentView } from "@bitwarden/common/models/view/attachmentView"; +import { AttachmentView } from "@bitwarden/common/models/view/attachment.view"; import { AttachmentsComponent as BaseAttachmentsComponent } from "../../vault/attachments.component"; diff --git a/apps/web/src/app/organizations/vault/ciphers.component.ts b/apps/web/src/app/organizations/vault/ciphers.component.ts index 29b10d67a5..558c09d5e3 100644 --- a/apps/web/src/app/organizations/vault/ciphers.component.ts +++ b/apps/web/src/app/organizations/vault/ciphers.component.ts @@ -13,7 +13,7 @@ import { StateService } from "@bitwarden/common/abstractions/state.service"; import { TokenService } from "@bitwarden/common/abstractions/token.service"; import { TotpService } from "@bitwarden/common/abstractions/totp.service"; import { Organization } from "@bitwarden/common/models/domain/organization"; -import { CipherView } from "@bitwarden/common/models/view/cipherView"; +import { CipherView } from "@bitwarden/common/models/view/cipher.view"; import { CiphersComponent as BaseCiphersComponent } from "../../vault/ciphers.component"; diff --git a/apps/web/src/app/organizations/vault/collections.component.ts b/apps/web/src/app/organizations/vault/collections.component.ts index d724828e3b..1805827970 100644 --- a/apps/web/src/app/organizations/vault/collections.component.ts +++ b/apps/web/src/app/organizations/vault/collections.component.ts @@ -6,7 +6,7 @@ import { CollectionService } from "@bitwarden/common/abstractions/collection.ser import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; import { LogService } from "@bitwarden/common/abstractions/log.service"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; -import { CipherData } from "@bitwarden/common/models/data/cipherData"; +import { CipherData } from "@bitwarden/common/models/data/cipher.data"; import { Cipher } from "@bitwarden/common/models/domain/cipher"; import { Organization } from "@bitwarden/common/models/domain/organization"; import { CipherCollectionsRequest } from "@bitwarden/common/models/request/cipherCollectionsRequest"; diff --git a/apps/web/src/app/organizations/vault/vault.component.ts b/apps/web/src/app/organizations/vault/vault.component.ts index 1566d2e153..7de36e6531 100644 --- a/apps/web/src/app/organizations/vault/vault.component.ts +++ b/apps/web/src/app/organizations/vault/vault.component.ts @@ -22,7 +22,7 @@ import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUti import { SyncService } from "@bitwarden/common/abstractions/sync/sync.service.abstraction"; import { CipherType } from "@bitwarden/common/enums/cipherType"; import { Organization } from "@bitwarden/common/models/domain/organization"; -import { CipherView } from "@bitwarden/common/models/view/cipherView"; +import { CipherView } from "@bitwarden/common/models/view/cipher.view"; import { VaultService } from "../../vault/shared/vault.service"; import { EntityEventsComponent } from "../manage/entity-events.component"; diff --git a/apps/web/src/app/reports/pages/cipher-report.component.ts b/apps/web/src/app/reports/pages/cipher-report.component.ts index 44d7cae619..baf2ceb563 100644 --- a/apps/web/src/app/reports/pages/cipher-report.component.ts +++ b/apps/web/src/app/reports/pages/cipher-report.component.ts @@ -6,7 +6,7 @@ import { PasswordRepromptService } from "@bitwarden/common/abstractions/password import { StateService } from "@bitwarden/common/abstractions/state.service"; import { CipherRepromptType } from "@bitwarden/common/enums/cipherRepromptType"; import { Organization } from "@bitwarden/common/models/domain/organization"; -import { CipherView } from "@bitwarden/common/models/view/cipherView"; +import { CipherView } from "@bitwarden/common/models/view/cipher.view"; import { AddEditComponent as OrgAddEditComponent } from "../../organizations/vault/add-edit.component"; import { AddEditComponent } from "../../vault/add-edit.component"; diff --git a/apps/web/src/app/reports/pages/exposed-passwords-report.component.ts b/apps/web/src/app/reports/pages/exposed-passwords-report.component.ts index 443f03453c..99a707da5d 100644 --- a/apps/web/src/app/reports/pages/exposed-passwords-report.component.ts +++ b/apps/web/src/app/reports/pages/exposed-passwords-report.component.ts @@ -7,7 +7,7 @@ import { MessagingService } from "@bitwarden/common/abstractions/messaging.servi import { PasswordRepromptService } from "@bitwarden/common/abstractions/passwordReprompt.service"; import { StateService } from "@bitwarden/common/abstractions/state.service"; import { CipherType } from "@bitwarden/common/enums/cipherType"; -import { CipherView } from "@bitwarden/common/models/view/cipherView"; +import { CipherView } from "@bitwarden/common/models/view/cipher.view"; import { CipherReportComponent } from "./cipher-report.component"; diff --git a/apps/web/src/app/reports/pages/inactive-two-factor-report.component.ts b/apps/web/src/app/reports/pages/inactive-two-factor-report.component.ts index 03047f36cd..f84050b900 100644 --- a/apps/web/src/app/reports/pages/inactive-two-factor-report.component.ts +++ b/apps/web/src/app/reports/pages/inactive-two-factor-report.component.ts @@ -8,7 +8,7 @@ import { PasswordRepromptService } from "@bitwarden/common/abstractions/password import { StateService } from "@bitwarden/common/abstractions/state.service"; import { CipherType } from "@bitwarden/common/enums/cipherType"; import { Utils } from "@bitwarden/common/misc/utils"; -import { CipherView } from "@bitwarden/common/models/view/cipherView"; +import { CipherView } from "@bitwarden/common/models/view/cipher.view"; import { CipherReportComponent } from "./cipher-report.component"; diff --git a/apps/web/src/app/reports/pages/reused-passwords-report.component.ts b/apps/web/src/app/reports/pages/reused-passwords-report.component.ts index d2330bfcff..83e9229341 100644 --- a/apps/web/src/app/reports/pages/reused-passwords-report.component.ts +++ b/apps/web/src/app/reports/pages/reused-passwords-report.component.ts @@ -6,7 +6,7 @@ import { MessagingService } from "@bitwarden/common/abstractions/messaging.servi import { PasswordRepromptService } from "@bitwarden/common/abstractions/passwordReprompt.service"; import { StateService } from "@bitwarden/common/abstractions/state.service"; import { CipherType } from "@bitwarden/common/enums/cipherType"; -import { CipherView } from "@bitwarden/common/models/view/cipherView"; +import { CipherView } from "@bitwarden/common/models/view/cipher.view"; import { CipherReportComponent } from "./cipher-report.component"; diff --git a/apps/web/src/app/reports/pages/unsecured-websites-report.component.ts b/apps/web/src/app/reports/pages/unsecured-websites-report.component.ts index ed8eb68df2..22e2c1dded 100644 --- a/apps/web/src/app/reports/pages/unsecured-websites-report.component.ts +++ b/apps/web/src/app/reports/pages/unsecured-websites-report.component.ts @@ -6,7 +6,7 @@ import { MessagingService } from "@bitwarden/common/abstractions/messaging.servi import { PasswordRepromptService } from "@bitwarden/common/abstractions/passwordReprompt.service"; import { StateService } from "@bitwarden/common/abstractions/state.service"; import { CipherType } from "@bitwarden/common/enums/cipherType"; -import { CipherView } from "@bitwarden/common/models/view/cipherView"; +import { CipherView } from "@bitwarden/common/models/view/cipher.view"; import { CipherReportComponent } from "./cipher-report.component"; diff --git a/apps/web/src/app/reports/pages/weak-passwords-report.component.ts b/apps/web/src/app/reports/pages/weak-passwords-report.component.ts index f18cff53bb..dabb835d72 100644 --- a/apps/web/src/app/reports/pages/weak-passwords-report.component.ts +++ b/apps/web/src/app/reports/pages/weak-passwords-report.component.ts @@ -7,7 +7,7 @@ import { PasswordGenerationService } from "@bitwarden/common/abstractions/passwo import { PasswordRepromptService } from "@bitwarden/common/abstractions/passwordReprompt.service"; import { StateService } from "@bitwarden/common/abstractions/state.service"; import { CipherType } from "@bitwarden/common/enums/cipherType"; -import { CipherView } from "@bitwarden/common/models/view/cipherView"; +import { CipherView } from "@bitwarden/common/models/view/cipher.view"; import { CipherReportComponent } from "./cipher-report.component"; diff --git a/apps/web/src/app/send/access.component.ts b/apps/web/src/app/send/access.component.ts index 7f4c6bbab8..f850ad76af 100644 --- a/apps/web/src/app/send/access.component.ts +++ b/apps/web/src/app/send/access.component.ts @@ -10,13 +10,13 @@ import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUti import { SEND_KDF_ITERATIONS } from "@bitwarden/common/enums/kdfType"; import { SendType } from "@bitwarden/common/enums/sendType"; import { Utils } from "@bitwarden/common/misc/utils"; -import { EncArrayBuffer } from "@bitwarden/common/models/domain/encArrayBuffer"; -import { SendAccess } from "@bitwarden/common/models/domain/sendAccess"; -import { SymmetricCryptoKey } from "@bitwarden/common/models/domain/symmetricCryptoKey"; +import { EncArrayBuffer } from "@bitwarden/common/models/domain/enc-array-buffer"; +import { SendAccess } from "@bitwarden/common/models/domain/send-access"; +import { SymmetricCryptoKey } from "@bitwarden/common/models/domain/symmetric-crypto-key"; import { SendAccessRequest } from "@bitwarden/common/models/request/sendAccessRequest"; import { ErrorResponse } from "@bitwarden/common/models/response/errorResponse"; import { SendAccessResponse } from "@bitwarden/common/models/response/sendAccessResponse"; -import { SendAccessView } from "@bitwarden/common/models/view/sendAccessView"; +import { SendAccessView } from "@bitwarden/common/models/view/send-access.view"; @Component({ selector: "app-send-access", diff --git a/apps/web/src/app/send/send.component.ts b/apps/web/src/app/send/send.component.ts index 2719d90456..c5022ad5ea 100644 --- a/apps/web/src/app/send/send.component.ts +++ b/apps/web/src/app/send/send.component.ts @@ -10,7 +10,7 @@ import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUti import { PolicyService } from "@bitwarden/common/abstractions/policy/policy.service.abstraction"; import { SearchService } from "@bitwarden/common/abstractions/search.service"; import { SendService } from "@bitwarden/common/abstractions/send.service"; -import { SendView } from "@bitwarden/common/models/view/sendView"; +import { SendView } from "@bitwarden/common/models/view/send.view"; import { AddEditComponent } from "./add-edit.component"; diff --git a/apps/web/src/app/settings/billing-sync-key.component.ts b/apps/web/src/app/settings/billing-sync-key.component.ts index fb992abd66..ba194f4a93 100644 --- a/apps/web/src/app/settings/billing-sync-key.component.ts +++ b/apps/web/src/app/settings/billing-sync-key.component.ts @@ -3,7 +3,7 @@ import { Component } from "@angular/core"; import { ApiService } from "@bitwarden/common/abstractions/api.service"; import { LogService } from "@bitwarden/common/abstractions/log.service"; import { OrganizationConnectionType } from "@bitwarden/common/enums/organizationConnectionType"; -import { BillingSyncConfigApi } from "@bitwarden/common/models/api/billingSyncConfigApi"; +import { BillingSyncConfigApi } from "@bitwarden/common/models/api/billing-sync-config.api"; import { BillingSyncConfigRequest } from "@bitwarden/common/models/request/billingSyncConfigRequest"; import { OrganizationConnectionRequest } from "@bitwarden/common/models/request/organizationConnectionRequest"; import { OrganizationConnectionResponse } from "@bitwarden/common/models/response/organizationConnectionResponse"; diff --git a/apps/web/src/app/settings/change-password.component.ts b/apps/web/src/app/settings/change-password.component.ts index 45672940f1..40b4b21305 100644 --- a/apps/web/src/app/settings/change-password.component.ts +++ b/apps/web/src/app/settings/change-password.component.ts @@ -20,8 +20,8 @@ import { StateService } from "@bitwarden/common/abstractions/state.service"; import { SyncService } from "@bitwarden/common/abstractions/sync/sync.service.abstraction"; import { EmergencyAccessStatusType } from "@bitwarden/common/enums/emergencyAccessStatusType"; import { Utils } from "@bitwarden/common/misc/utils"; -import { EncString } from "@bitwarden/common/models/domain/encString"; -import { SymmetricCryptoKey } from "@bitwarden/common/models/domain/symmetricCryptoKey"; +import { EncString } from "@bitwarden/common/models/domain/enc-string"; +import { SymmetricCryptoKey } from "@bitwarden/common/models/domain/symmetric-crypto-key"; import { CipherWithIdRequest } from "@bitwarden/common/models/request/cipherWithIdRequest"; import { EmergencyAccessUpdateRequest } from "@bitwarden/common/models/request/emergencyAccessUpdateRequest"; import { FolderWithIdRequest } from "@bitwarden/common/models/request/folderWithIdRequest"; diff --git a/apps/web/src/app/settings/emergency-access-attachments.component.ts b/apps/web/src/app/settings/emergency-access-attachments.component.ts index 525a332f14..383078e336 100644 --- a/apps/web/src/app/settings/emergency-access-attachments.component.ts +++ b/apps/web/src/app/settings/emergency-access-attachments.component.ts @@ -9,7 +9,7 @@ import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; import { LogService } from "@bitwarden/common/abstractions/log.service"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; import { StateService } from "@bitwarden/common/abstractions/state.service"; -import { AttachmentView } from "@bitwarden/common/models/view/attachmentView"; +import { AttachmentView } from "@bitwarden/common/models/view/attachment.view"; @Component({ selector: "emergency-access-attachments", diff --git a/apps/web/src/app/settings/emergency-access-takeover.component.ts b/apps/web/src/app/settings/emergency-access-takeover.component.ts index 27a9484f4d..3951178912 100644 --- a/apps/web/src/app/settings/emergency-access-takeover.component.ts +++ b/apps/web/src/app/settings/emergency-access-takeover.component.ts @@ -12,9 +12,9 @@ import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUti import { PolicyService } from "@bitwarden/common/abstractions/policy/policy.service.abstraction"; import { StateService } from "@bitwarden/common/abstractions/state.service"; import { KdfType } from "@bitwarden/common/enums/kdfType"; -import { PolicyData } from "@bitwarden/common/models/data/policyData"; +import { PolicyData } from "@bitwarden/common/models/data/policy.data"; import { Policy } from "@bitwarden/common/models/domain/policy"; -import { SymmetricCryptoKey } from "@bitwarden/common/models/domain/symmetricCryptoKey"; +import { SymmetricCryptoKey } from "@bitwarden/common/models/domain/symmetric-crypto-key"; import { EmergencyAccessPasswordRequest } from "@bitwarden/common/models/request/emergencyAccessPasswordRequest"; import { PolicyResponse } from "@bitwarden/common/models/response/policyResponse"; diff --git a/apps/web/src/app/settings/emergency-access-view.component.ts b/apps/web/src/app/settings/emergency-access-view.component.ts index f40113a5ad..a9eede29f7 100644 --- a/apps/web/src/app/settings/emergency-access-view.component.ts +++ b/apps/web/src/app/settings/emergency-access-view.component.ts @@ -5,11 +5,11 @@ import { ModalService } from "@bitwarden/angular/services/modal.service"; import { ApiService } from "@bitwarden/common/abstractions/api.service"; import { CipherService } from "@bitwarden/common/abstractions/cipher.service"; import { CryptoService } from "@bitwarden/common/abstractions/crypto.service"; -import { CipherData } from "@bitwarden/common/models/data/cipherData"; +import { CipherData } from "@bitwarden/common/models/data/cipher.data"; import { Cipher } from "@bitwarden/common/models/domain/cipher"; -import { SymmetricCryptoKey } from "@bitwarden/common/models/domain/symmetricCryptoKey"; +import { SymmetricCryptoKey } from "@bitwarden/common/models/domain/symmetric-crypto-key"; import { EmergencyAccessViewResponse } from "@bitwarden/common/models/response/emergencyAccessResponse"; -import { CipherView } from "@bitwarden/common/models/view/cipherView"; +import { CipherView } from "@bitwarden/common/models/view/cipher.view"; import { EmergencyAccessAttachmentsComponent } from "./emergency-access-attachments.component"; import { EmergencyAddEditComponent } from "./emergency-add-edit.component"; diff --git a/apps/web/src/app/settings/organization-plans.component.ts b/apps/web/src/app/settings/organization-plans.component.ts index 934803b3fb..7089b1d696 100644 --- a/apps/web/src/app/settings/organization-plans.component.ts +++ b/apps/web/src/app/settings/organization-plans.component.ts @@ -25,8 +25,8 @@ import { PaymentMethodType } from "@bitwarden/common/enums/paymentMethodType"; import { PlanType } from "@bitwarden/common/enums/planType"; import { PolicyType } from "@bitwarden/common/enums/policyType"; import { ProductType } from "@bitwarden/common/enums/productType"; -import { EncString } from "@bitwarden/common/models/domain/encString"; -import { SymmetricCryptoKey } from "@bitwarden/common/models/domain/symmetricCryptoKey"; +import { EncString } from "@bitwarden/common/models/domain/enc-string"; +import { SymmetricCryptoKey } from "@bitwarden/common/models/domain/symmetric-crypto-key"; import { OrganizationCreateRequest } from "@bitwarden/common/models/request/organizationCreateRequest"; import { OrganizationKeysRequest } from "@bitwarden/common/models/request/organizationKeysRequest"; import { OrganizationUpgradeRequest } from "@bitwarden/common/models/request/organizationUpgradeRequest"; diff --git a/apps/web/src/app/settings/update-key.component.ts b/apps/web/src/app/settings/update-key.component.ts index 52a22d13e9..c12e7cae57 100644 --- a/apps/web/src/app/settings/update-key.component.ts +++ b/apps/web/src/app/settings/update-key.component.ts @@ -10,7 +10,7 @@ import { LogService } from "@bitwarden/common/abstractions/log.service"; import { MessagingService } from "@bitwarden/common/abstractions/messaging.service"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; import { SyncService } from "@bitwarden/common/abstractions/sync/sync.service.abstraction"; -import { EncString } from "@bitwarden/common/models/domain/encString"; +import { EncString } from "@bitwarden/common/models/domain/enc-string"; import { CipherWithIdRequest } from "@bitwarden/common/models/request/cipherWithIdRequest"; import { FolderWithIdRequest } from "@bitwarden/common/models/request/folderWithIdRequest"; import { UpdateKeyRequest } from "@bitwarden/common/models/request/updateKeyRequest"; diff --git a/apps/web/src/app/vault/add-edit.component.ts b/apps/web/src/app/vault/add-edit.component.ts index adbdebefef..af75e4e99a 100644 --- a/apps/web/src/app/vault/add-edit.component.ts +++ b/apps/web/src/app/vault/add-edit.component.ts @@ -18,7 +18,7 @@ import { StateService } from "@bitwarden/common/abstractions/state.service"; import { TotpService } from "@bitwarden/common/abstractions/totp.service"; import { CipherType } from "@bitwarden/common/enums/cipherType"; import { EventType } from "@bitwarden/common/enums/eventType"; -import { LoginUriView } from "@bitwarden/common/models/view/loginUriView"; +import { LoginUriView } from "@bitwarden/common/models/view/login-uri.view"; @Component({ selector: "app-vault-add-edit", diff --git a/apps/web/src/app/vault/attachments.component.ts b/apps/web/src/app/vault/attachments.component.ts index 080c06e37e..a2f361dd01 100644 --- a/apps/web/src/app/vault/attachments.component.ts +++ b/apps/web/src/app/vault/attachments.component.ts @@ -9,7 +9,7 @@ import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; import { LogService } from "@bitwarden/common/abstractions/log.service"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; import { StateService } from "@bitwarden/common/abstractions/state.service"; -import { AttachmentView } from "@bitwarden/common/models/view/attachmentView"; +import { AttachmentView } from "@bitwarden/common/models/view/attachment.view"; @Component({ selector: "app-vault-attachments", diff --git a/apps/web/src/app/vault/bulk-move.component.ts b/apps/web/src/app/vault/bulk-move.component.ts index 29e017b935..b3f56f65e8 100644 --- a/apps/web/src/app/vault/bulk-move.component.ts +++ b/apps/web/src/app/vault/bulk-move.component.ts @@ -5,7 +5,7 @@ import { CipherService } from "@bitwarden/common/abstractions/cipher.service"; import { FolderService } from "@bitwarden/common/abstractions/folder/folder.service.abstraction"; import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; -import { FolderView } from "@bitwarden/common/models/view/folderView"; +import { FolderView } from "@bitwarden/common/models/view/folder.view"; @Component({ selector: "app-vault-bulk-move", diff --git a/apps/web/src/app/vault/bulk-share.component.ts b/apps/web/src/app/vault/bulk-share.component.ts index abf17fba9b..74fa1a3043 100644 --- a/apps/web/src/app/vault/bulk-share.component.ts +++ b/apps/web/src/app/vault/bulk-share.component.ts @@ -7,8 +7,8 @@ import { LogService } from "@bitwarden/common/abstractions/log.service"; import { OrganizationService } from "@bitwarden/common/abstractions/organization/organization.service.abstraction"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; import { Organization } from "@bitwarden/common/models/domain/organization"; -import { CipherView } from "@bitwarden/common/models/view/cipherView"; -import { CollectionView } from "@bitwarden/common/models/view/collectionView"; +import { CipherView } from "@bitwarden/common/models/view/cipher.view"; +import { CollectionView } from "@bitwarden/common/models/view/collection.view"; import { Checkable, isChecked } from "@bitwarden/common/types/checkable"; @Component({ diff --git a/apps/web/src/app/vault/ciphers.component.ts b/apps/web/src/app/vault/ciphers.component.ts index 624ea1e65e..0d7559ec78 100644 --- a/apps/web/src/app/vault/ciphers.component.ts +++ b/apps/web/src/app/vault/ciphers.component.ts @@ -16,7 +16,7 @@ import { CipherRepromptType } from "@bitwarden/common/enums/cipherRepromptType"; import { CipherType } from "@bitwarden/common/enums/cipherType"; import { EventType } from "@bitwarden/common/enums/eventType"; import { Organization } from "@bitwarden/common/models/domain/organization"; -import { CipherView } from "@bitwarden/common/models/view/cipherView"; +import { CipherView } from "@bitwarden/common/models/view/cipher.view"; const MaxCheckedCount = 500; diff --git a/apps/web/src/app/vault/collections.component.ts b/apps/web/src/app/vault/collections.component.ts index 3dc712c09e..d169bb7b33 100644 --- a/apps/web/src/app/vault/collections.component.ts +++ b/apps/web/src/app/vault/collections.component.ts @@ -6,7 +6,7 @@ import { CollectionService } from "@bitwarden/common/abstractions/collection.ser import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; import { LogService } from "@bitwarden/common/abstractions/log.service"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; -import { CollectionView } from "@bitwarden/common/models/view/collectionView"; +import { CollectionView } from "@bitwarden/common/models/view/collection.view"; @Component({ selector: "app-vault-collections", diff --git a/apps/web/src/app/vault/share.component.ts b/apps/web/src/app/vault/share.component.ts index 6d22c0fe50..2fd64268a8 100644 --- a/apps/web/src/app/vault/share.component.ts +++ b/apps/web/src/app/vault/share.component.ts @@ -7,7 +7,7 @@ import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; import { LogService } from "@bitwarden/common/abstractions/log.service"; import { OrganizationService } from "@bitwarden/common/abstractions/organization/organization.service.abstraction"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; -import { CollectionView } from "@bitwarden/common/models/view/collectionView"; +import { CollectionView } from "@bitwarden/common/models/view/collection.view"; @Component({ selector: "app-vault-share", diff --git a/apps/web/src/app/vault/vault-filter/shared/vault-filter.service.ts b/apps/web/src/app/vault/vault-filter/shared/vault-filter.service.ts index d8bb48ce66..0df0187ed6 100644 --- a/apps/web/src/app/vault/vault-filter/shared/vault-filter.service.ts +++ b/apps/web/src/app/vault/vault-filter/shared/vault-filter.service.ts @@ -11,10 +11,10 @@ import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; import { OrganizationService } from "@bitwarden/common/abstractions/organization/organization.service.abstraction"; import { PolicyService } from "@bitwarden/common/abstractions/policy/policy.service.abstraction"; import { StateService } from "@bitwarden/common/abstractions/state.service"; -import { CollectionData } from "@bitwarden/common/models/data/collectionData"; +import { CollectionData } from "@bitwarden/common/models/data/collection.data"; import { Collection } from "@bitwarden/common/models/domain/collection"; import { CollectionDetailsResponse } from "@bitwarden/common/models/response/collectionResponse"; -import { CollectionView } from "@bitwarden/common/models/view/collectionView"; +import { CollectionView } from "@bitwarden/common/models/view/collection.view"; @Injectable() export class VaultFilterService extends BaseVaultFilterService { diff --git a/apps/web/src/app/vault/vault.component.ts b/apps/web/src/app/vault/vault.component.ts index 892a4fac8d..a511d44e36 100644 --- a/apps/web/src/app/vault/vault.component.ts +++ b/apps/web/src/app/vault/vault.component.ts @@ -23,7 +23,7 @@ import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUti import { StateService } from "@bitwarden/common/abstractions/state.service"; import { SyncService } from "@bitwarden/common/abstractions/sync/sync.service.abstraction"; import { TokenService } from "@bitwarden/common/abstractions/token.service"; -import { CipherView } from "@bitwarden/common/models/view/cipherView"; +import { CipherView } from "@bitwarden/common/models/view/cipher.view"; import { UpdateKeyComponent } from "../settings/update-key.component"; diff --git a/bitwarden_license/bit-web/src/app/organizations/manage/scim.component.ts b/bitwarden_license/bit-web/src/app/organizations/manage/scim.component.ts index fcd3046696..015fb770e9 100644 --- a/bitwarden_license/bit-web/src/app/organizations/manage/scim.component.ts +++ b/bitwarden_license/bit-web/src/app/organizations/manage/scim.component.ts @@ -9,7 +9,7 @@ import { OrganizationApiServiceAbstraction } from "@bitwarden/common/abstraction import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; import { OrganizationApiKeyType } from "@bitwarden/common/enums/organizationApiKeyType"; import { OrganizationConnectionType } from "@bitwarden/common/enums/organizationConnectionType"; -import { ScimConfigApi } from "@bitwarden/common/models/api/scimConfigApi"; +import { ScimConfigApi } from "@bitwarden/common/models/api/scim-config.api"; import { OrganizationApiKeyRequest } from "@bitwarden/common/models/request/organizationApiKeyRequest"; import { OrganizationConnectionRequest } from "@bitwarden/common/models/request/organizationConnectionRequest"; import { ScimConfigRequest } from "@bitwarden/common/models/request/scimConfigRequest"; diff --git a/bitwarden_license/bit-web/src/app/organizations/manage/sso.component.ts b/bitwarden_license/bit-web/src/app/organizations/manage/sso.component.ts index e871486eff..0752858204 100644 --- a/bitwarden_license/bit-web/src/app/organizations/manage/sso.component.ts +++ b/bitwarden_license/bit-web/src/app/organizations/manage/sso.component.ts @@ -17,11 +17,11 @@ import { SsoType, } from "@bitwarden/common/enums/ssoEnums"; import { Utils } from "@bitwarden/common/misc/utils"; -import { SsoConfigApi } from "@bitwarden/common/models/api/ssoConfigApi"; +import { SsoConfigApi } from "@bitwarden/common/models/api/sso-config.api"; import { Organization } from "@bitwarden/common/models/domain/organization"; import { OrganizationSsoRequest } from "@bitwarden/common/models/request/organization/organizationSsoRequest"; import { OrganizationSsoResponse } from "@bitwarden/common/models/response/organization/organizationSsoResponse"; -import { SsoConfigView } from "@bitwarden/common/models/view/ssoConfigView"; +import { SsoConfigView } from "@bitwarden/common/models/view/sso-config.view"; const defaultSigningAlgorithm = "http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"; diff --git a/bitwarden_license/bit-web/src/app/providers/manage/user-add-edit.component.ts b/bitwarden_license/bit-web/src/app/providers/manage/user-add-edit.component.ts index c48d674237..99f2a1301c 100644 --- a/bitwarden_license/bit-web/src/app/providers/manage/user-add-edit.component.ts +++ b/bitwarden_license/bit-web/src/app/providers/manage/user-add-edit.component.ts @@ -5,7 +5,7 @@ import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; import { LogService } from "@bitwarden/common/abstractions/log.service"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; import { ProviderUserType } from "@bitwarden/common/enums/providerUserType"; -import { PermissionsApi } from "@bitwarden/common/models/api/permissionsApi"; +import { PermissionsApi } from "@bitwarden/common/models/api/permissions.api"; import { ProviderUserInviteRequest } from "@bitwarden/common/models/request/provider/providerUserInviteRequest"; import { ProviderUserUpdateRequest } from "@bitwarden/common/models/request/provider/providerUserUpdateRequest"; diff --git a/libs/angular/src/components/add-edit-custom-fields.component.ts b/libs/angular/src/components/add-edit-custom-fields.component.ts index 23615ed342..fdea9b0596 100644 --- a/libs/angular/src/components/add-edit-custom-fields.component.ts +++ b/libs/angular/src/components/add-edit-custom-fields.component.ts @@ -7,8 +7,8 @@ import { CipherType } from "@bitwarden/common/enums/cipherType"; import { EventType } from "@bitwarden/common/enums/eventType"; import { FieldType } from "@bitwarden/common/enums/fieldType"; import { Utils } from "@bitwarden/common/misc/utils"; -import { CipherView } from "@bitwarden/common/models/view/cipherView"; -import { FieldView } from "@bitwarden/common/models/view/fieldView"; +import { CipherView } from "@bitwarden/common/models/view/cipher.view"; +import { FieldView } from "@bitwarden/common/models/view/field.view"; @Directive() export class AddEditCustomFieldsComponent implements OnChanges { diff --git a/libs/angular/src/components/add-edit.component.ts b/libs/angular/src/components/add-edit.component.ts index c57b78e665..f70cdd999a 100644 --- a/libs/angular/src/components/add-edit.component.ts +++ b/libs/angular/src/components/add-edit.component.ts @@ -23,14 +23,14 @@ import { SecureNoteType } from "@bitwarden/common/enums/secureNoteType"; import { UriMatchType } from "@bitwarden/common/enums/uriMatchType"; import { Utils } from "@bitwarden/common/misc/utils"; import { Cipher } from "@bitwarden/common/models/domain/cipher"; -import { CardView } from "@bitwarden/common/models/view/cardView"; -import { CipherView } from "@bitwarden/common/models/view/cipherView"; -import { CollectionView } from "@bitwarden/common/models/view/collectionView"; -import { FolderView } from "@bitwarden/common/models/view/folderView"; -import { IdentityView } from "@bitwarden/common/models/view/identityView"; -import { LoginUriView } from "@bitwarden/common/models/view/loginUriView"; -import { LoginView } from "@bitwarden/common/models/view/loginView"; -import { SecureNoteView } from "@bitwarden/common/models/view/secureNoteView"; +import { CardView } from "@bitwarden/common/models/view/card.view"; +import { CipherView } from "@bitwarden/common/models/view/cipher.view"; +import { CollectionView } from "@bitwarden/common/models/view/collection.view"; +import { FolderView } from "@bitwarden/common/models/view/folder.view"; +import { IdentityView } from "@bitwarden/common/models/view/identity.view"; +import { LoginUriView } from "@bitwarden/common/models/view/login-uri.view"; +import { LoginView } from "@bitwarden/common/models/view/login.view"; +import { SecureNoteView } from "@bitwarden/common/models/view/secure-note.view"; @Directive() export class AddEditComponent implements OnInit, OnDestroy { diff --git a/libs/angular/src/components/attachments.component.ts b/libs/angular/src/components/attachments.component.ts index b535faaa80..ea273e7412 100644 --- a/libs/angular/src/components/attachments.component.ts +++ b/libs/angular/src/components/attachments.component.ts @@ -9,10 +9,10 @@ import { LogService } from "@bitwarden/common/abstractions/log.service"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; import { StateService } from "@bitwarden/common/abstractions/state.service"; import { Cipher } from "@bitwarden/common/models/domain/cipher"; -import { EncArrayBuffer } from "@bitwarden/common/models/domain/encArrayBuffer"; +import { EncArrayBuffer } from "@bitwarden/common/models/domain/enc-array-buffer"; import { ErrorResponse } from "@bitwarden/common/models/response/errorResponse"; -import { AttachmentView } from "@bitwarden/common/models/view/attachmentView"; -import { CipherView } from "@bitwarden/common/models/view/cipherView"; +import { AttachmentView } from "@bitwarden/common/models/view/attachment.view"; +import { CipherView } from "@bitwarden/common/models/view/cipher.view"; @Directive() export class AttachmentsComponent implements OnInit { diff --git a/libs/angular/src/components/callout.component.ts b/libs/angular/src/components/callout.component.ts index 3f32828ed8..2ca5466f84 100644 --- a/libs/angular/src/components/callout.component.ts +++ b/libs/angular/src/components/callout.component.ts @@ -1,7 +1,7 @@ import { Component, Input, OnInit } from "@angular/core"; import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; -import { MasterPasswordPolicyOptions } from "@bitwarden/common/models/domain/masterPasswordPolicyOptions"; +import { MasterPasswordPolicyOptions } from "@bitwarden/common/models/domain/master-password-policy-options"; @Component({ selector: "app-callout", diff --git a/libs/angular/src/components/change-password.component.ts b/libs/angular/src/components/change-password.component.ts index 27952eec2e..77403fbe67 100644 --- a/libs/angular/src/components/change-password.component.ts +++ b/libs/angular/src/components/change-password.component.ts @@ -9,9 +9,9 @@ import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUti import { PolicyService } from "@bitwarden/common/abstractions/policy/policy.service.abstraction"; import { StateService } from "@bitwarden/common/abstractions/state.service"; import { KdfType } from "@bitwarden/common/enums/kdfType"; -import { EncString } from "@bitwarden/common/models/domain/encString"; -import { MasterPasswordPolicyOptions } from "@bitwarden/common/models/domain/masterPasswordPolicyOptions"; -import { SymmetricCryptoKey } from "@bitwarden/common/models/domain/symmetricCryptoKey"; +import { EncString } from "@bitwarden/common/models/domain/enc-string"; +import { MasterPasswordPolicyOptions } from "@bitwarden/common/models/domain/master-password-policy-options"; +import { SymmetricCryptoKey } from "@bitwarden/common/models/domain/symmetric-crypto-key"; import { PasswordColorText } from "../shared/components/password-strength/password-strength.component"; diff --git a/libs/angular/src/components/ciphers.component.ts b/libs/angular/src/components/ciphers.component.ts index 7391caacde..d6a484be43 100644 --- a/libs/angular/src/components/ciphers.component.ts +++ b/libs/angular/src/components/ciphers.component.ts @@ -1,7 +1,7 @@ import { Directive, EventEmitter, Input, Output } from "@angular/core"; import { SearchService } from "@bitwarden/common/abstractions/search.service"; -import { CipherView } from "@bitwarden/common/models/view/cipherView"; +import { CipherView } from "@bitwarden/common/models/view/cipher.view"; @Directive() export class CiphersComponent { diff --git a/libs/angular/src/components/collections.component.ts b/libs/angular/src/components/collections.component.ts index 3ad6714815..2265454ead 100644 --- a/libs/angular/src/components/collections.component.ts +++ b/libs/angular/src/components/collections.component.ts @@ -6,8 +6,8 @@ import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; import { LogService } from "@bitwarden/common/abstractions/log.service"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; import { Cipher } from "@bitwarden/common/models/domain/cipher"; -import { CipherView } from "@bitwarden/common/models/view/cipherView"; -import { CollectionView } from "@bitwarden/common/models/view/collectionView"; +import { CipherView } from "@bitwarden/common/models/view/cipher.view"; +import { CollectionView } from "@bitwarden/common/models/view/collection.view"; @Directive() export class CollectionsComponent implements OnInit { diff --git a/libs/angular/src/components/folder-add-edit.component.ts b/libs/angular/src/components/folder-add-edit.component.ts index 2558482c2d..c389d72dcd 100644 --- a/libs/angular/src/components/folder-add-edit.component.ts +++ b/libs/angular/src/components/folder-add-edit.component.ts @@ -5,7 +5,7 @@ import { FolderService } from "@bitwarden/common/abstractions/folder/folder.serv import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; import { LogService } from "@bitwarden/common/abstractions/log.service"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; -import { FolderView } from "@bitwarden/common/models/view/folderView"; +import { FolderView } from "@bitwarden/common/models/view/folder.view"; @Directive() export class FolderAddEditComponent implements OnInit { diff --git a/libs/angular/src/components/generator.component.ts b/libs/angular/src/components/generator.component.ts index 41bcb98ad1..2e7d0aaada 100644 --- a/libs/angular/src/components/generator.component.ts +++ b/libs/angular/src/components/generator.component.ts @@ -8,7 +8,7 @@ import { PasswordGenerationService } from "@bitwarden/common/abstractions/passwo import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; import { StateService } from "@bitwarden/common/abstractions/state.service"; import { UsernameGenerationService } from "@bitwarden/common/abstractions/usernameGeneration.service"; -import { PasswordGeneratorPolicyOptions } from "@bitwarden/common/models/domain/passwordGeneratorPolicyOptions"; +import { PasswordGeneratorPolicyOptions } from "@bitwarden/common/models/domain/password-generator-policy-options"; @Directive() export class GeneratorComponent implements OnInit { diff --git a/libs/angular/src/components/icon.component.ts b/libs/angular/src/components/icon.component.ts index 0696649e1f..1c9b5a8b55 100644 --- a/libs/angular/src/components/icon.component.ts +++ b/libs/angular/src/components/icon.component.ts @@ -4,7 +4,7 @@ import { EnvironmentService } from "@bitwarden/common/abstractions/environment.s import { StateService } from "@bitwarden/common/abstractions/state.service"; import { CipherType } from "@bitwarden/common/enums/cipherType"; import { Utils } from "@bitwarden/common/misc/utils"; -import { CipherView } from "@bitwarden/common/models/view/cipherView"; +import { CipherView } from "@bitwarden/common/models/view/cipher.view"; /** * Provides a mapping from supported card brands to diff --git a/libs/angular/src/components/lock.component.ts b/libs/angular/src/components/lock.component.ts index a488d87446..a92643b5c6 100644 --- a/libs/angular/src/components/lock.component.ts +++ b/libs/angular/src/components/lock.component.ts @@ -17,8 +17,8 @@ import { VaultTimeoutSettingsService } from "@bitwarden/common/abstractions/vaul import { HashPurpose } from "@bitwarden/common/enums/hashPurpose"; import { KeySuffixOptions } from "@bitwarden/common/enums/keySuffixOptions"; import { Utils } from "@bitwarden/common/misc/utils"; -import { EncString } from "@bitwarden/common/models/domain/encString"; -import { SymmetricCryptoKey } from "@bitwarden/common/models/domain/symmetricCryptoKey"; +import { EncString } from "@bitwarden/common/models/domain/enc-string"; +import { SymmetricCryptoKey } from "@bitwarden/common/models/domain/symmetric-crypto-key"; import { SecretVerificationRequest } from "@bitwarden/common/models/request/secretVerificationRequest"; @Directive() diff --git a/libs/angular/src/components/login.component.ts b/libs/angular/src/components/login.component.ts index 8e35a230aa..ab0e4df57e 100644 --- a/libs/angular/src/components/login.component.ts +++ b/libs/angular/src/components/login.component.ts @@ -16,8 +16,8 @@ import { PasswordGenerationService } from "@bitwarden/common/abstractions/passwo import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; import { StateService } from "@bitwarden/common/abstractions/state.service"; import { Utils } from "@bitwarden/common/misc/utils"; -import { AuthResult } from "@bitwarden/common/models/domain/authResult"; -import { PasswordLogInCredentials } from "@bitwarden/common/models/domain/logInCredentials"; +import { AuthResult } from "@bitwarden/common/models/domain/auth-result"; +import { PasswordLogInCredentials } from "@bitwarden/common/models/domain/log-in-credentials"; import { CaptchaProtectedComponent } from "./captchaProtected.component"; diff --git a/libs/angular/src/components/password-generator-history.component.ts b/libs/angular/src/components/password-generator-history.component.ts index fa2cfd09d2..38e493ee93 100644 --- a/libs/angular/src/components/password-generator-history.component.ts +++ b/libs/angular/src/components/password-generator-history.component.ts @@ -3,7 +3,7 @@ import { Directive, OnInit } from "@angular/core"; import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; import { PasswordGenerationService } from "@bitwarden/common/abstractions/passwordGeneration.service"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; -import { GeneratedPasswordHistory } from "@bitwarden/common/models/domain/generatedPasswordHistory"; +import { GeneratedPasswordHistory } from "@bitwarden/common/models/domain/generated-password-history"; @Directive() export class PasswordGeneratorHistoryComponent implements OnInit { diff --git a/libs/angular/src/components/password-history.component.ts b/libs/angular/src/components/password-history.component.ts index 8b1bf1cc14..4385966941 100644 --- a/libs/angular/src/components/password-history.component.ts +++ b/libs/angular/src/components/password-history.component.ts @@ -3,7 +3,7 @@ import { Directive, OnInit } from "@angular/core"; import { CipherService } from "@bitwarden/common/abstractions/cipher.service"; import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; -import { PasswordHistoryView } from "@bitwarden/common/models/view/passwordHistoryView"; +import { PasswordHistoryView } from "@bitwarden/common/models/view/password-history.view"; @Directive() export class PasswordHistoryComponent implements OnInit { diff --git a/libs/angular/src/components/register.component.ts b/libs/angular/src/components/register.component.ts index d873ae9955..b40031cf59 100644 --- a/libs/angular/src/components/register.component.ts +++ b/libs/angular/src/components/register.component.ts @@ -16,7 +16,7 @@ import { PasswordGenerationService } from "@bitwarden/common/abstractions/passwo import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; import { StateService } from "@bitwarden/common/abstractions/state.service"; import { DEFAULT_KDF_ITERATIONS, DEFAULT_KDF_TYPE } from "@bitwarden/common/enums/kdfType"; -import { PasswordLogInCredentials } from "@bitwarden/common/models/domain/logInCredentials"; +import { PasswordLogInCredentials } from "@bitwarden/common/models/domain/log-in-credentials"; import { KeysRequest } from "@bitwarden/common/models/request/keysRequest"; import { ReferenceEventRequest } from "@bitwarden/common/models/request/referenceEventRequest"; import { RegisterRequest } from "@bitwarden/common/models/request/registerRequest"; diff --git a/libs/angular/src/components/send/add-edit.component.ts b/libs/angular/src/components/send/add-edit.component.ts index 94d9ccaa89..dfa03e1942 100644 --- a/libs/angular/src/components/send/add-edit.component.ts +++ b/libs/angular/src/components/send/add-edit.component.ts @@ -12,11 +12,11 @@ import { SendService } from "@bitwarden/common/abstractions/send.service"; import { StateService } from "@bitwarden/common/abstractions/state.service"; import { PolicyType } from "@bitwarden/common/enums/policyType"; import { SendType } from "@bitwarden/common/enums/sendType"; -import { EncArrayBuffer } from "@bitwarden/common/models/domain/encArrayBuffer"; +import { EncArrayBuffer } from "@bitwarden/common/models/domain/enc-array-buffer"; import { Send } from "@bitwarden/common/models/domain/send"; -import { SendFileView } from "@bitwarden/common/models/view/sendFileView"; -import { SendTextView } from "@bitwarden/common/models/view/sendTextView"; -import { SendView } from "@bitwarden/common/models/view/sendView"; +import { SendFileView } from "@bitwarden/common/models/view/send-file.view"; +import { SendTextView } from "@bitwarden/common/models/view/send-text.view"; +import { SendView } from "@bitwarden/common/models/view/send.view"; @Directive() export class AddEditComponent implements OnInit, OnDestroy { diff --git a/libs/angular/src/components/send/send.component.ts b/libs/angular/src/components/send/send.component.ts index ac37299f62..9dd9e6ebbe 100644 --- a/libs/angular/src/components/send/send.component.ts +++ b/libs/angular/src/components/send/send.component.ts @@ -10,7 +10,7 @@ import { SearchService } from "@bitwarden/common/abstractions/search.service"; import { SendService } from "@bitwarden/common/abstractions/send.service"; import { PolicyType } from "@bitwarden/common/enums/policyType"; import { SendType } from "@bitwarden/common/enums/sendType"; -import { SendView } from "@bitwarden/common/models/view/sendView"; +import { SendView } from "@bitwarden/common/models/view/send.view"; @Directive() export class SendComponent implements OnInit, OnDestroy { diff --git a/libs/angular/src/components/set-password.component.ts b/libs/angular/src/components/set-password.component.ts index 373a1bab99..ac49803dbc 100644 --- a/libs/angular/src/components/set-password.component.ts +++ b/libs/angular/src/components/set-password.component.ts @@ -16,8 +16,8 @@ import { SyncService } from "@bitwarden/common/abstractions/sync/sync.service.ab import { HashPurpose } from "@bitwarden/common/enums/hashPurpose"; import { DEFAULT_KDF_ITERATIONS, DEFAULT_KDF_TYPE } from "@bitwarden/common/enums/kdfType"; import { Utils } from "@bitwarden/common/misc/utils"; -import { EncString } from "@bitwarden/common/models/domain/encString"; -import { SymmetricCryptoKey } from "@bitwarden/common/models/domain/symmetricCryptoKey"; +import { EncString } from "@bitwarden/common/models/domain/enc-string"; +import { SymmetricCryptoKey } from "@bitwarden/common/models/domain/symmetric-crypto-key"; import { KeysRequest } from "@bitwarden/common/models/request/keysRequest"; import { OrganizationUserResetPasswordEnrollmentRequest } from "@bitwarden/common/models/request/organizationUserResetPasswordEnrollmentRequest"; import { SetPasswordRequest } from "@bitwarden/common/models/request/setPasswordRequest"; diff --git a/libs/angular/src/components/share.component.ts b/libs/angular/src/components/share.component.ts index e9e6038b2f..c7520ed516 100644 --- a/libs/angular/src/components/share.component.ts +++ b/libs/angular/src/components/share.component.ts @@ -10,8 +10,8 @@ import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUti import { OrganizationUserStatusType } from "@bitwarden/common/enums/organizationUserStatusType"; import { Utils } from "@bitwarden/common/misc/utils"; import { Organization } from "@bitwarden/common/models/domain/organization"; -import { CipherView } from "@bitwarden/common/models/view/cipherView"; -import { CollectionView } from "@bitwarden/common/models/view/collectionView"; +import { CipherView } from "@bitwarden/common/models/view/cipher.view"; +import { CollectionView } from "@bitwarden/common/models/view/collection.view"; import { Checkable, isChecked } from "@bitwarden/common/types/checkable"; @Directive() diff --git a/libs/angular/src/components/sso.component.ts b/libs/angular/src/components/sso.component.ts index f0f63c279a..4a171935a3 100644 --- a/libs/angular/src/components/sso.component.ts +++ b/libs/angular/src/components/sso.component.ts @@ -12,8 +12,8 @@ import { PasswordGenerationService } from "@bitwarden/common/abstractions/passwo import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; import { StateService } from "@bitwarden/common/abstractions/state.service"; import { Utils } from "@bitwarden/common/misc/utils"; -import { AuthResult } from "@bitwarden/common/models/domain/authResult"; -import { SsoLogInCredentials } from "@bitwarden/common/models/domain/logInCredentials"; +import { AuthResult } from "@bitwarden/common/models/domain/auth-result"; +import { SsoLogInCredentials } from "@bitwarden/common/models/domain/log-in-credentials"; import { SsoPreValidateResponse } from "@bitwarden/common/models/response/ssoPreValidateResponse"; @Directive() diff --git a/libs/angular/src/components/two-factor.component.ts b/libs/angular/src/components/two-factor.component.ts index 068826ccc0..93f8161958 100644 --- a/libs/angular/src/components/two-factor.component.ts +++ b/libs/angular/src/components/two-factor.component.ts @@ -14,7 +14,7 @@ import { StateService } from "@bitwarden/common/abstractions/state.service"; import { TwoFactorService } from "@bitwarden/common/abstractions/twoFactor.service"; import { TwoFactorProviderType } from "@bitwarden/common/enums/twoFactorProviderType"; import { WebAuthnIFrame } from "@bitwarden/common/misc/webauthn_iframe"; -import { AuthResult } from "@bitwarden/common/models/domain/authResult"; +import { AuthResult } from "@bitwarden/common/models/domain/auth-result"; import { TokenRequestTwoFactor } from "@bitwarden/common/models/request/identityToken/tokenRequestTwoFactor"; import { TwoFactorEmailRequest } from "@bitwarden/common/models/request/twoFactorEmailRequest"; import { TwoFactorProviders } from "@bitwarden/common/services/twoFactor.service"; diff --git a/libs/angular/src/components/update-password.component.ts b/libs/angular/src/components/update-password.component.ts index 3fe9a6a766..0cf21bbd63 100644 --- a/libs/angular/src/components/update-password.component.ts +++ b/libs/angular/src/components/update-password.component.ts @@ -12,9 +12,9 @@ import { PolicyService } from "@bitwarden/common/abstractions/policy/policy.serv import { StateService } from "@bitwarden/common/abstractions/state.service"; import { UserVerificationService } from "@bitwarden/common/abstractions/userVerification/userVerification.service.abstraction"; import { VerificationType } from "@bitwarden/common/enums/verificationType"; -import { EncString } from "@bitwarden/common/models/domain/encString"; -import { MasterPasswordPolicyOptions } from "@bitwarden/common/models/domain/masterPasswordPolicyOptions"; -import { SymmetricCryptoKey } from "@bitwarden/common/models/domain/symmetricCryptoKey"; +import { EncString } from "@bitwarden/common/models/domain/enc-string"; +import { MasterPasswordPolicyOptions } from "@bitwarden/common/models/domain/master-password-policy-options"; +import { SymmetricCryptoKey } from "@bitwarden/common/models/domain/symmetric-crypto-key"; import { PasswordRequest } from "@bitwarden/common/models/request/passwordRequest"; import { Verification } from "@bitwarden/common/types/verification"; diff --git a/libs/angular/src/components/update-temp-password.component.ts b/libs/angular/src/components/update-temp-password.component.ts index 9c163b51fc..f761b79029 100644 --- a/libs/angular/src/components/update-temp-password.component.ts +++ b/libs/angular/src/components/update-temp-password.component.ts @@ -10,9 +10,9 @@ import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUti import { PolicyService } from "@bitwarden/common/abstractions/policy/policy.service.abstraction"; import { StateService } from "@bitwarden/common/abstractions/state.service"; import { SyncService } from "@bitwarden/common/abstractions/sync/sync.service.abstraction"; -import { EncString } from "@bitwarden/common/models/domain/encString"; -import { MasterPasswordPolicyOptions } from "@bitwarden/common/models/domain/masterPasswordPolicyOptions"; -import { SymmetricCryptoKey } from "@bitwarden/common/models/domain/symmetricCryptoKey"; +import { EncString } from "@bitwarden/common/models/domain/enc-string"; +import { MasterPasswordPolicyOptions } from "@bitwarden/common/models/domain/master-password-policy-options"; +import { SymmetricCryptoKey } from "@bitwarden/common/models/domain/symmetric-crypto-key"; import { UpdateTempPasswordRequest } from "@bitwarden/common/models/request/updateTempPasswordRequest"; import { ChangePasswordComponent as BaseChangePasswordComponent } from "./change-password.component"; diff --git a/libs/angular/src/components/view-custom-fields.component.ts b/libs/angular/src/components/view-custom-fields.component.ts index 10a072945a..b661e76a19 100644 --- a/libs/angular/src/components/view-custom-fields.component.ts +++ b/libs/angular/src/components/view-custom-fields.component.ts @@ -3,8 +3,8 @@ import { Directive, Input } from "@angular/core"; import { EventService } from "@bitwarden/common/abstractions/event.service"; import { EventType } from "@bitwarden/common/enums/eventType"; import { FieldType } from "@bitwarden/common/enums/fieldType"; -import { CipherView } from "@bitwarden/common/models/view/cipherView"; -import { FieldView } from "@bitwarden/common/models/view/fieldView"; +import { CipherView } from "@bitwarden/common/models/view/cipher.view"; +import { FieldView } from "@bitwarden/common/models/view/field.view"; @Directive() export class ViewCustomFieldsComponent { diff --git a/libs/angular/src/components/view.component.ts b/libs/angular/src/components/view.component.ts index cbd88383f5..115c6e18b0 100644 --- a/libs/angular/src/components/view.component.ts +++ b/libs/angular/src/components/view.component.ts @@ -27,11 +27,11 @@ import { CipherRepromptType } from "@bitwarden/common/enums/cipherRepromptType"; import { CipherType } from "@bitwarden/common/enums/cipherType"; import { EventType } from "@bitwarden/common/enums/eventType"; import { FieldType } from "@bitwarden/common/enums/fieldType"; -import { EncArrayBuffer } from "@bitwarden/common/models/domain/encArrayBuffer"; +import { EncArrayBuffer } from "@bitwarden/common/models/domain/enc-array-buffer"; import { ErrorResponse } from "@bitwarden/common/models/response/errorResponse"; -import { AttachmentView } from "@bitwarden/common/models/view/attachmentView"; -import { CipherView } from "@bitwarden/common/models/view/cipherView"; -import { LoginUriView } from "@bitwarden/common/models/view/loginUriView"; +import { AttachmentView } from "@bitwarden/common/models/view/attachment.view"; +import { CipherView } from "@bitwarden/common/models/view/cipher.view"; +import { LoginUriView } from "@bitwarden/common/models/view/login-uri.view"; const BroadcasterSubscriptionId = "ViewComponent"; diff --git a/libs/angular/src/pipes/search-ciphers.pipe.ts b/libs/angular/src/pipes/search-ciphers.pipe.ts index a2c667804e..4e98aee9e2 100644 --- a/libs/angular/src/pipes/search-ciphers.pipe.ts +++ b/libs/angular/src/pipes/search-ciphers.pipe.ts @@ -1,6 +1,6 @@ import { Pipe, PipeTransform } from "@angular/core"; -import { CipherView } from "@bitwarden/common/models/view/cipherView"; +import { CipherView } from "@bitwarden/common/models/view/cipher.view"; @Pipe({ name: "searchCiphers", diff --git a/libs/angular/src/services/jslib-services.module.ts b/libs/angular/src/services/jslib-services.module.ts index b1bbcc0a87..4243b1e81f 100644 --- a/libs/angular/src/services/jslib-services.module.ts +++ b/libs/angular/src/services/jslib-services.module.ts @@ -60,7 +60,7 @@ import { VaultTimeoutService as VaultTimeoutServiceAbstraction } from "@bitwarde import { VaultTimeoutSettingsService as VaultTimeoutSettingsServiceAbstraction } from "@bitwarden/common/abstractions/vaultTimeout/vaultTimeoutSettings.service"; import { StateFactory } from "@bitwarden/common/factories/stateFactory"; import { Account } from "@bitwarden/common/models/domain/account"; -import { GlobalState } from "@bitwarden/common/models/domain/globalState"; +import { GlobalState } from "@bitwarden/common/models/domain/global-state"; import { AccountApiService } from "@bitwarden/common/services/account/account-api.service"; import { AccountService } from "@bitwarden/common/services/account/account.service"; import { AnonymousHubService } from "@bitwarden/common/services/anonymousHub.service"; diff --git a/libs/angular/src/vault/vault-filter/components/collection-filter.component.ts b/libs/angular/src/vault/vault-filter/components/collection-filter.component.ts index 313db3f04c..0e5cd97870 100644 --- a/libs/angular/src/vault/vault-filter/components/collection-filter.component.ts +++ b/libs/angular/src/vault/vault-filter/components/collection-filter.component.ts @@ -1,7 +1,7 @@ import { Directive, EventEmitter, Input, Output } from "@angular/core"; -import { ITreeNodeObject } from "@bitwarden/common/models/domain/treeNode"; -import { CollectionView } from "@bitwarden/common/models/view/collectionView"; +import { ITreeNodeObject } from "@bitwarden/common/models/domain/tree-node"; +import { CollectionView } from "@bitwarden/common/models/view/collection.view"; import { DynamicTreeNode } from "../models/dynamic-tree-node.model"; import { TopLevelTreeNode } from "../models/top-level-tree-node.model"; diff --git a/libs/angular/src/vault/vault-filter/components/folder-filter.component.ts b/libs/angular/src/vault/vault-filter/components/folder-filter.component.ts index 9fd39a6cf0..68faaa3007 100644 --- a/libs/angular/src/vault/vault-filter/components/folder-filter.component.ts +++ b/libs/angular/src/vault/vault-filter/components/folder-filter.component.ts @@ -1,7 +1,7 @@ import { Directive, EventEmitter, Input, Output } from "@angular/core"; -import { ITreeNodeObject } from "@bitwarden/common/models/domain/treeNode"; -import { FolderView } from "@bitwarden/common/models/view/folderView"; +import { ITreeNodeObject } from "@bitwarden/common/models/domain/tree-node"; +import { FolderView } from "@bitwarden/common/models/view/folder.view"; import { DynamicTreeNode } from "../models/dynamic-tree-node.model"; import { TopLevelTreeNode } from "../models/top-level-tree-node.model"; diff --git a/libs/angular/src/vault/vault-filter/components/organization-filter.component.ts b/libs/angular/src/vault/vault-filter/components/organization-filter.component.ts index 9e2a493d7a..448627d9be 100644 --- a/libs/angular/src/vault/vault-filter/components/organization-filter.component.ts +++ b/libs/angular/src/vault/vault-filter/components/organization-filter.component.ts @@ -1,7 +1,7 @@ import { Directive, EventEmitter, Input, Output } from "@angular/core"; import { Organization } from "@bitwarden/common/models/domain/organization"; -import { ITreeNodeObject } from "@bitwarden/common/models/domain/treeNode"; +import { ITreeNodeObject } from "@bitwarden/common/models/domain/tree-node"; import { DisplayMode } from "../models/display-mode"; import { TopLevelTreeNode } from "../models/top-level-tree-node.model"; diff --git a/libs/angular/src/vault/vault-filter/components/type-filter.component.ts b/libs/angular/src/vault/vault-filter/components/type-filter.component.ts index 89336aebf8..6fca1e7777 100644 --- a/libs/angular/src/vault/vault-filter/components/type-filter.component.ts +++ b/libs/angular/src/vault/vault-filter/components/type-filter.component.ts @@ -1,7 +1,7 @@ import { Directive, EventEmitter, Input, Output } from "@angular/core"; import { CipherType } from "@bitwarden/common/enums/cipherType"; -import { ITreeNodeObject } from "@bitwarden/common/models/domain/treeNode"; +import { ITreeNodeObject } from "@bitwarden/common/models/domain/tree-node"; import { TopLevelTreeNode } from "../models/top-level-tree-node.model"; import { VaultFilter } from "../models/vault-filter.model"; diff --git a/libs/angular/src/vault/vault-filter/components/vault-filter.component.ts b/libs/angular/src/vault/vault-filter/components/vault-filter.component.ts index 136be97d6a..0c55bdbcee 100644 --- a/libs/angular/src/vault/vault-filter/components/vault-filter.component.ts +++ b/libs/angular/src/vault/vault-filter/components/vault-filter.component.ts @@ -2,9 +2,9 @@ import { Directive, EventEmitter, Input, OnInit, Output } from "@angular/core"; import { firstValueFrom, Observable } from "rxjs"; import { Organization } from "@bitwarden/common/models/domain/organization"; -import { ITreeNodeObject } from "@bitwarden/common/models/domain/treeNode"; -import { CollectionView } from "@bitwarden/common/models/view/collectionView"; -import { FolderView } from "@bitwarden/common/models/view/folderView"; +import { ITreeNodeObject } from "@bitwarden/common/models/domain/tree-node"; +import { CollectionView } from "@bitwarden/common/models/view/collection.view"; +import { FolderView } from "@bitwarden/common/models/view/folder.view"; import { DynamicTreeNode } from "../models/dynamic-tree-node.model"; import { VaultFilter } from "../models/vault-filter.model"; diff --git a/libs/angular/src/vault/vault-filter/models/dynamic-tree-node.model.ts b/libs/angular/src/vault/vault-filter/models/dynamic-tree-node.model.ts index 31ba21e481..35e85fa102 100644 --- a/libs/angular/src/vault/vault-filter/models/dynamic-tree-node.model.ts +++ b/libs/angular/src/vault/vault-filter/models/dynamic-tree-node.model.ts @@ -1,6 +1,6 @@ -import { TreeNode } from "@bitwarden/common/models/domain/treeNode"; -import { CollectionView } from "@bitwarden/common/models/view/collectionView"; -import { FolderView } from "@bitwarden/common/models/view/folderView"; +import { TreeNode } from "@bitwarden/common/models/domain/tree-node"; +import { CollectionView } from "@bitwarden/common/models/view/collection.view"; +import { FolderView } from "@bitwarden/common/models/view/folder.view"; export class DynamicTreeNode { fullList: T[]; diff --git a/libs/angular/src/vault/vault-filter/models/top-level-tree-node.model.ts b/libs/angular/src/vault/vault-filter/models/top-level-tree-node.model.ts index 9af3c7b50c..8930e05132 100644 --- a/libs/angular/src/vault/vault-filter/models/top-level-tree-node.model.ts +++ b/libs/angular/src/vault/vault-filter/models/top-level-tree-node.model.ts @@ -1,4 +1,4 @@ -import { ITreeNodeObject } from "@bitwarden/common/models/domain/treeNode"; +import { ITreeNodeObject } from "@bitwarden/common/models/domain/tree-node"; export type TopLevelTreeNodeId = "vaults" | "types" | "collections" | "folders"; export class TopLevelTreeNode implements ITreeNodeObject { diff --git a/libs/angular/src/vault/vault-filter/models/vault-filter.model.spec.ts b/libs/angular/src/vault/vault-filter/models/vault-filter.model.spec.ts index 1c63481ab7..12d458a127 100644 --- a/libs/angular/src/vault/vault-filter/models/vault-filter.model.spec.ts +++ b/libs/angular/src/vault/vault-filter/models/vault-filter.model.spec.ts @@ -1,5 +1,5 @@ import { CipherType } from "@bitwarden/common/enums/cipherType"; -import { CipherView } from "@bitwarden/common/models/view/cipherView"; +import { CipherView } from "@bitwarden/common/models/view/cipher.view"; import { VaultFilter } from "./vault-filter.model"; diff --git a/libs/angular/src/vault/vault-filter/models/vault-filter.model.ts b/libs/angular/src/vault/vault-filter/models/vault-filter.model.ts index 942704f128..0fd0fcc6d0 100644 --- a/libs/angular/src/vault/vault-filter/models/vault-filter.model.ts +++ b/libs/angular/src/vault/vault-filter/models/vault-filter.model.ts @@ -1,5 +1,5 @@ import { CipherType } from "@bitwarden/common/enums/cipherType"; -import { CipherView } from "@bitwarden/common/models/view/cipherView"; +import { CipherView } from "@bitwarden/common/models/view/cipher.view"; import { CipherStatus } from "./cipher-status.model"; diff --git a/libs/angular/src/vault/vault-filter/services/vault-filter.service.ts b/libs/angular/src/vault/vault-filter/services/vault-filter.service.ts index 6fa2c3b286..995ff1a12a 100644 --- a/libs/angular/src/vault/vault-filter/services/vault-filter.service.ts +++ b/libs/angular/src/vault/vault-filter/services/vault-filter.service.ts @@ -10,9 +10,9 @@ import { StateService } from "@bitwarden/common/abstractions/state.service"; import { PolicyType } from "@bitwarden/common/enums/policyType"; import { ServiceUtils } from "@bitwarden/common/misc/serviceUtils"; import { Organization } from "@bitwarden/common/models/domain/organization"; -import { TreeNode } from "@bitwarden/common/models/domain/treeNode"; -import { CollectionView } from "@bitwarden/common/models/view/collectionView"; -import { FolderView } from "@bitwarden/common/models/view/folderView"; +import { TreeNode } from "@bitwarden/common/models/domain/tree-node"; +import { CollectionView } from "@bitwarden/common/models/view/collection.view"; +import { FolderView } from "@bitwarden/common/models/view/folder.view"; import { DynamicTreeNode } from "../models/dynamic-tree-node.model"; diff --git a/libs/common/spec/importers/bitwardenPasswordProtectedImporter.spec.ts b/libs/common/spec/importers/bitwardenPasswordProtectedImporter.spec.ts index 98c2edef42..cddf325a4b 100644 --- a/libs/common/spec/importers/bitwardenPasswordProtectedImporter.spec.ts +++ b/libs/common/spec/importers/bitwardenPasswordProtectedImporter.spec.ts @@ -6,7 +6,7 @@ import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; import { KdfType } from "@bitwarden/common/enums/kdfType"; import { BitwardenPasswordProtectedImporter } from "@bitwarden/common/importers/bitwardenPasswordProtectedImporter"; import { Utils } from "@bitwarden/common/misc/utils"; -import { ImportResult } from "@bitwarden/common/models/domain/importResult"; +import { ImportResult } from "@bitwarden/common/models/domain/import-result"; import { data as emptyDecryptedData } from "./testData/bitwardenJson/empty.json"; diff --git a/libs/common/spec/importers/firefoxCsvImporter.spec.ts b/libs/common/spec/importers/firefoxCsvImporter.spec.ts index 06f5246d0c..7b3415df1a 100644 --- a/libs/common/spec/importers/firefoxCsvImporter.spec.ts +++ b/libs/common/spec/importers/firefoxCsvImporter.spec.ts @@ -1,7 +1,7 @@ import { FirefoxCsvImporter as Importer } from "@bitwarden/common/importers/firefoxCsvImporter"; -import { CipherView } from "@bitwarden/common/models/view/cipherView"; -import { LoginUriView } from "@bitwarden/common/models/view/loginUriView"; -import { LoginView } from "@bitwarden/common/models/view/loginView"; +import { CipherView } from "@bitwarden/common/models/view/cipher.view"; +import { LoginUriView } from "@bitwarden/common/models/view/login-uri.view"; +import { LoginView } from "@bitwarden/common/models/view/login.view"; import { data as firefoxAccountsData } from "./testData/firefoxCsv/firefoxAccountsData.csv"; import { data as simplePasswordData } from "./testData/firefoxCsv/simplePasswordData.csv"; diff --git a/libs/common/spec/importers/lastpassCsvImporter.spec.ts b/libs/common/spec/importers/lastpassCsvImporter.spec.ts index 21761ee311..a18192cf91 100644 --- a/libs/common/spec/importers/lastpassCsvImporter.spec.ts +++ b/libs/common/spec/importers/lastpassCsvImporter.spec.ts @@ -1,9 +1,9 @@ import { CipherType } from "@bitwarden/common/enums/cipherType"; import { FieldType } from "@bitwarden/common/enums/fieldType"; import { LastPassCsvImporter as Importer } from "@bitwarden/common/importers/lastpassCsvImporter"; -import { ImportResult } from "@bitwarden/common/models/domain/importResult"; -import { CipherView } from "@bitwarden/common/models/view/cipherView"; -import { FieldView } from "@bitwarden/common/models/view/fieldView"; +import { ImportResult } from "@bitwarden/common/models/domain/import-result"; +import { CipherView } from "@bitwarden/common/models/view/cipher.view"; +import { FieldView } from "@bitwarden/common/models/view/field.view"; function baseExcept(result: ImportResult) { expect(result).not.toBeNull(); diff --git a/libs/common/spec/importers/mykiCsvImporter.spec.ts b/libs/common/spec/importers/mykiCsvImporter.spec.ts index d7f9a91e27..a65bdc450a 100644 --- a/libs/common/spec/importers/mykiCsvImporter.spec.ts +++ b/libs/common/spec/importers/mykiCsvImporter.spec.ts @@ -1,6 +1,6 @@ import { CipherType } from "@bitwarden/common/enums/cipherType"; import { MykiCsvImporter as Importer } from "@bitwarden/common/importers/mykiCsvImporter"; -import { CipherView } from "@bitwarden/common/models/view/cipherView"; +import { CipherView } from "@bitwarden/common/models/view/cipher.view"; import { userAccountData } from "./testData/mykiCsv/UserAccount.csv"; import { userCreditCardData } from "./testData/mykiCsv/UserCreditCard.csv"; diff --git a/libs/common/spec/importers/nordpassCsvImporter.spec.ts b/libs/common/spec/importers/nordpassCsvImporter.spec.ts index 20fa57c6b7..ada087bca9 100644 --- a/libs/common/spec/importers/nordpassCsvImporter.spec.ts +++ b/libs/common/spec/importers/nordpassCsvImporter.spec.ts @@ -1,8 +1,8 @@ import { CipherType } from "@bitwarden/common/enums/cipherType"; import { SecureNoteType } from "@bitwarden/common/enums/secureNoteType"; import { NordPassCsvImporter as Importer } from "@bitwarden/common/importers/nordpassCsvImporter"; -import { CipherView } from "@bitwarden/common/models/view/cipherView"; -import { IdentityView } from "@bitwarden/common/models/view/identityView"; +import { CipherView } from "@bitwarden/common/models/view/cipher.view"; +import { IdentityView } from "@bitwarden/common/models/view/identity.view"; import { data as creditCardData } from "./testData/nordpassCsv/nordpass.card.csv"; import { data as identityData } from "./testData/nordpassCsv/nordpass.identity.csv"; diff --git a/libs/common/spec/importers/onepassword1PuxImporter.spec.ts b/libs/common/spec/importers/onepassword1PuxImporter.spec.ts index 47dce8f0e7..50d211da99 100644 --- a/libs/common/spec/importers/onepassword1PuxImporter.spec.ts +++ b/libs/common/spec/importers/onepassword1PuxImporter.spec.ts @@ -3,7 +3,7 @@ import { FieldType } from "@bitwarden/common/enums/fieldType"; import { SecureNoteType } from "@bitwarden/common/enums/secureNoteType"; import { OnePassword1PuxImporter as Importer } from "@bitwarden/common/importers/onepasswordImporters/onepassword1PuxImporter"; import { Utils } from "@bitwarden/common/misc/utils"; -import { FieldView } from "@bitwarden/common/models/view/fieldView"; +import { FieldView } from "@bitwarden/common/models/view/field.view"; import { APICredentialsData } from "./testData/onePassword1Pux/APICredentials"; import { BankAccountData } from "./testData/onePassword1Pux/BankAccount"; diff --git a/libs/common/spec/importers/onepasswordMacCsvImporter.spec.ts b/libs/common/spec/importers/onepasswordMacCsvImporter.spec.ts index ea2bf1c84f..0965a11d48 100644 --- a/libs/common/spec/importers/onepasswordMacCsvImporter.spec.ts +++ b/libs/common/spec/importers/onepasswordMacCsvImporter.spec.ts @@ -1,6 +1,6 @@ import { CipherType } from "@bitwarden/common/enums/cipherType"; import { OnePasswordMacCsvImporter as Importer } from "@bitwarden/common/importers/onepasswordImporters/onepasswordMacCsvImporter"; -import { CipherView } from "@bitwarden/common/models/view/cipherView"; +import { CipherView } from "@bitwarden/common/models/view/cipher.view"; import { data as creditCardData } from "./testData/onePasswordCsv/creditCard.mac.csv"; import { data as identityData } from "./testData/onePasswordCsv/identity.mac.csv"; diff --git a/libs/common/spec/importers/onepasswordWinCsvImporter.spec.ts b/libs/common/spec/importers/onepasswordWinCsvImporter.spec.ts index e7186ee292..666886c3f4 100644 --- a/libs/common/spec/importers/onepasswordWinCsvImporter.spec.ts +++ b/libs/common/spec/importers/onepasswordWinCsvImporter.spec.ts @@ -1,8 +1,8 @@ import { CipherType } from "@bitwarden/common/enums/cipherType"; import { FieldType } from "@bitwarden/common/enums/fieldType"; import { OnePasswordWinCsvImporter as Importer } from "@bitwarden/common/importers/onepasswordImporters/onepasswordWinCsvImporter"; -import { CipherView } from "@bitwarden/common/models/view/cipherView"; -import { FieldView } from "@bitwarden/common/models/view/fieldView"; +import { CipherView } from "@bitwarden/common/models/view/cipher.view"; +import { FieldView } from "@bitwarden/common/models/view/field.view"; import { data as creditCardData } from "./testData/onePasswordCsv/creditCard.windows.csv"; import { data as identityData } from "./testData/onePasswordCsv/identity.windows.csv"; diff --git a/libs/common/spec/importers/safariCsvImporter.spec.ts b/libs/common/spec/importers/safariCsvImporter.spec.ts index c24e39b502..36d1e076a2 100644 --- a/libs/common/spec/importers/safariCsvImporter.spec.ts +++ b/libs/common/spec/importers/safariCsvImporter.spec.ts @@ -1,7 +1,7 @@ import { SafariCsvImporter as Importer } from "@bitwarden/common/importers/safariCsvImporter"; -import { CipherView } from "@bitwarden/common/models/view/cipherView"; -import { LoginUriView } from "@bitwarden/common/models/view/loginUriView"; -import { LoginView } from "@bitwarden/common/models/view/loginView"; +import { CipherView } from "@bitwarden/common/models/view/cipher.view"; +import { LoginUriView } from "@bitwarden/common/models/view/login-uri.view"; +import { LoginView } from "@bitwarden/common/models/view/login.view"; import { data as oldSimplePasswordData } from "./testData/safariCsv/oldSimplePasswordData.csv"; import { data as simplePasswordData } from "./testData/safariCsv/simplePasswordData.csv"; diff --git a/libs/common/spec/misc/logInStrategies/apiLogIn.strategy.spec.ts b/libs/common/spec/misc/logInStrategies/apiLogIn.strategy.spec.ts index 496ecf9cdd..6e80ffa291 100644 --- a/libs/common/spec/misc/logInStrategies/apiLogIn.strategy.spec.ts +++ b/libs/common/spec/misc/logInStrategies/apiLogIn.strategy.spec.ts @@ -14,7 +14,7 @@ import { TokenService } from "@bitwarden/common/abstractions/token.service"; import { TwoFactorService } from "@bitwarden/common/abstractions/twoFactor.service"; import { ApiLogInStrategy } from "@bitwarden/common/misc/logInStrategies/apiLogin.strategy"; import { Utils } from "@bitwarden/common/misc/utils"; -import { ApiLogInCredentials } from "@bitwarden/common/models/domain/logInCredentials"; +import { ApiLogInCredentials } from "@bitwarden/common/models/domain/log-in-credentials"; import { identityTokenResponseFactory } from "./logIn.strategy.spec"; diff --git a/libs/common/spec/misc/logInStrategies/logIn.strategy.spec.ts b/libs/common/spec/misc/logInStrategies/logIn.strategy.spec.ts index a277496086..4c9d848b4a 100644 --- a/libs/common/spec/misc/logInStrategies/logIn.strategy.spec.ts +++ b/libs/common/spec/misc/logInStrategies/logIn.strategy.spec.ts @@ -15,9 +15,9 @@ import { TwoFactorProviderType } from "@bitwarden/common/enums/twoFactorProvider import { PasswordLogInStrategy } from "@bitwarden/common/misc/logInStrategies/passwordLogin.strategy"; import { Utils } from "@bitwarden/common/misc/utils"; import { Account, AccountProfile, AccountTokens } from "@bitwarden/common/models/domain/account"; -import { AuthResult } from "@bitwarden/common/models/domain/authResult"; -import { EncString } from "@bitwarden/common/models/domain/encString"; -import { PasswordLogInCredentials } from "@bitwarden/common/models/domain/logInCredentials"; +import { AuthResult } from "@bitwarden/common/models/domain/auth-result"; +import { EncString } from "@bitwarden/common/models/domain/enc-string"; +import { PasswordLogInCredentials } from "@bitwarden/common/models/domain/log-in-credentials"; import { PasswordTokenRequest } from "@bitwarden/common/models/request/identityToken/passwordTokenRequest"; import { TokenRequestTwoFactor } from "@bitwarden/common/models/request/identityToken/tokenRequestTwoFactor"; import { IdentityCaptchaResponse } from "@bitwarden/common/models/response/identityCaptchaResponse"; diff --git a/libs/common/spec/misc/logInStrategies/passwordLogIn.strategy.spec.ts b/libs/common/spec/misc/logInStrategies/passwordLogIn.strategy.spec.ts index bdae82cd53..d0791c8181 100644 --- a/libs/common/spec/misc/logInStrategies/passwordLogIn.strategy.spec.ts +++ b/libs/common/spec/misc/logInStrategies/passwordLogIn.strategy.spec.ts @@ -14,8 +14,8 @@ import { TwoFactorService } from "@bitwarden/common/abstractions/twoFactor.servi import { HashPurpose } from "@bitwarden/common/enums/hashPurpose"; import { PasswordLogInStrategy } from "@bitwarden/common/misc/logInStrategies/passwordLogin.strategy"; import { Utils } from "@bitwarden/common/misc/utils"; -import { PasswordLogInCredentials } from "@bitwarden/common/models/domain/logInCredentials"; -import { SymmetricCryptoKey } from "@bitwarden/common/models/domain/symmetricCryptoKey"; +import { PasswordLogInCredentials } from "@bitwarden/common/models/domain/log-in-credentials"; +import { SymmetricCryptoKey } from "@bitwarden/common/models/domain/symmetric-crypto-key"; import { identityTokenResponseFactory } from "./logIn.strategy.spec"; diff --git a/libs/common/spec/misc/logInStrategies/ssoLogIn.strategy.spec.ts b/libs/common/spec/misc/logInStrategies/ssoLogIn.strategy.spec.ts index 68e0eb2c54..0caa3e9441 100644 --- a/libs/common/spec/misc/logInStrategies/ssoLogIn.strategy.spec.ts +++ b/libs/common/spec/misc/logInStrategies/ssoLogIn.strategy.spec.ts @@ -13,7 +13,7 @@ import { TokenService } from "@bitwarden/common/abstractions/token.service"; import { TwoFactorService } from "@bitwarden/common/abstractions/twoFactor.service"; import { SsoLogInStrategy } from "@bitwarden/common/misc/logInStrategies/ssoLogin.strategy"; import { Utils } from "@bitwarden/common/misc/utils"; -import { SsoLogInCredentials } from "@bitwarden/common/models/domain/logInCredentials"; +import { SsoLogInCredentials } from "@bitwarden/common/models/domain/log-in-credentials"; import { identityTokenResponseFactory } from "./logIn.strategy.spec"; diff --git a/libs/common/spec/models/domain/attachment.spec.ts b/libs/common/spec/models/domain/attachment.spec.ts index 322061987a..3a418a7f6b 100644 --- a/libs/common/spec/models/domain/attachment.spec.ts +++ b/libs/common/spec/models/domain/attachment.spec.ts @@ -2,10 +2,10 @@ import { mock, MockProxy } from "jest-mock-extended"; import { AbstractEncryptService } from "@bitwarden/common/abstractions/abstractEncrypt.service"; import { CryptoService } from "@bitwarden/common/abstractions/crypto.service"; -import { AttachmentData } from "@bitwarden/common/models/data/attachmentData"; +import { AttachmentData } from "@bitwarden/common/models/data/attachment.data"; import { Attachment } from "@bitwarden/common/models/domain/attachment"; -import { EncString } from "@bitwarden/common/models/domain/encString"; -import { SymmetricCryptoKey } from "@bitwarden/common/models/domain/symmetricCryptoKey"; +import { EncString } from "@bitwarden/common/models/domain/enc-string"; +import { SymmetricCryptoKey } from "@bitwarden/common/models/domain/symmetric-crypto-key"; import { ContainerService } from "@bitwarden/common/services/container.service"; import { makeStaticByteArray, mockEnc, mockFromJson } from "../../utils"; diff --git a/libs/common/spec/models/domain/card.spec.ts b/libs/common/spec/models/domain/card.spec.ts index 3b7e32b91a..8a734e36d9 100644 --- a/libs/common/spec/models/domain/card.spec.ts +++ b/libs/common/spec/models/domain/card.spec.ts @@ -1,6 +1,6 @@ -import { CardData } from "@bitwarden/common/models/data/cardData"; +import { CardData } from "@bitwarden/common/models/data/card.data"; import { Card } from "@bitwarden/common/models/domain/card"; -import { EncString } from "@bitwarden/common/models/domain/encString"; +import { EncString } from "@bitwarden/common/models/domain/enc-string"; import { mockEnc, mockFromJson } from "../../utils"; diff --git a/libs/common/spec/models/domain/cipher.spec.ts b/libs/common/spec/models/domain/cipher.spec.ts index 316a20e98f..cd14962178 100644 --- a/libs/common/spec/models/domain/cipher.spec.ts +++ b/libs/common/spec/models/domain/cipher.spec.ts @@ -7,19 +7,19 @@ import { CipherType } from "@bitwarden/common/enums/cipherType"; import { FieldType } from "@bitwarden/common/enums/fieldType"; import { SecureNoteType } from "@bitwarden/common/enums/secureNoteType"; import { UriMatchType } from "@bitwarden/common/enums/uriMatchType"; -import { CipherData } from "@bitwarden/common/models/data/cipherData"; +import { CipherData } from "@bitwarden/common/models/data/cipher.data"; import { Attachment } from "@bitwarden/common/models/domain/attachment"; import { Card } from "@bitwarden/common/models/domain/card"; import { Cipher } from "@bitwarden/common/models/domain/cipher"; -import { EncString } from "@bitwarden/common/models/domain/encString"; +import { EncString } from "@bitwarden/common/models/domain/enc-string"; import { Field } from "@bitwarden/common/models/domain/field"; import { Identity } from "@bitwarden/common/models/domain/identity"; import { Login } from "@bitwarden/common/models/domain/login"; import { Password } from "@bitwarden/common/models/domain/password"; -import { SecureNote } from "@bitwarden/common/models/domain/secureNote"; -import { CardView } from "@bitwarden/common/models/view/cardView"; -import { IdentityView } from "@bitwarden/common/models/view/identityView"; -import { LoginView } from "@bitwarden/common/models/view/loginView"; +import { SecureNote } from "@bitwarden/common/models/domain/secure-note"; +import { CardView } from "@bitwarden/common/models/view/card.view"; +import { IdentityView } from "@bitwarden/common/models/view/identity.view"; +import { LoginView } from "@bitwarden/common/models/view/login.view"; import { mockEnc, mockFromJson } from "../../utils"; diff --git a/libs/common/spec/models/domain/collection.spec.ts b/libs/common/spec/models/domain/collection.spec.ts index 823bffad32..b36ac0ce60 100644 --- a/libs/common/spec/models/domain/collection.spec.ts +++ b/libs/common/spec/models/domain/collection.spec.ts @@ -1,4 +1,4 @@ -import { CollectionData } from "@bitwarden/common/models/data/collectionData"; +import { CollectionData } from "@bitwarden/common/models/data/collection.data"; import { Collection } from "@bitwarden/common/models/domain/collection"; import { mockEnc } from "../../utils"; diff --git a/libs/common/spec/models/domain/encArrayBuffer.spec.ts b/libs/common/spec/models/domain/encArrayBuffer.spec.ts index 609b2a16f7..51340dc9d8 100644 --- a/libs/common/spec/models/domain/encArrayBuffer.spec.ts +++ b/libs/common/spec/models/domain/encArrayBuffer.spec.ts @@ -1,5 +1,5 @@ import { EncryptionType } from "@bitwarden/common/enums/encryptionType"; -import { EncArrayBuffer } from "@bitwarden/common/models/domain/encArrayBuffer"; +import { EncArrayBuffer } from "@bitwarden/common/models/domain/enc-array-buffer"; import { makeStaticByteArray } from "../../utils"; diff --git a/libs/common/spec/models/domain/encString.spec.ts b/libs/common/spec/models/domain/encString.spec.ts index a230808001..cdc373c2a3 100644 --- a/libs/common/spec/models/domain/encString.spec.ts +++ b/libs/common/spec/models/domain/encString.spec.ts @@ -5,8 +5,8 @@ import { mock, MockProxy } from "jest-mock-extended"; import { AbstractEncryptService } from "@bitwarden/common/abstractions/abstractEncrypt.service"; import { CryptoService } from "@bitwarden/common/abstractions/crypto.service"; import { EncryptionType } from "@bitwarden/common/enums/encryptionType"; -import { EncString } from "@bitwarden/common/models/domain/encString"; -import { SymmetricCryptoKey } from "@bitwarden/common/models/domain/symmetricCryptoKey"; +import { EncString } from "@bitwarden/common/models/domain/enc-string"; +import { SymmetricCryptoKey } from "@bitwarden/common/models/domain/symmetric-crypto-key"; import { ContainerService } from "@bitwarden/common/services/container.service"; describe("EncString", () => { diff --git a/libs/common/spec/models/domain/field.spec.ts b/libs/common/spec/models/domain/field.spec.ts index de1f184dad..42f0addaf4 100644 --- a/libs/common/spec/models/domain/field.spec.ts +++ b/libs/common/spec/models/domain/field.spec.ts @@ -1,6 +1,6 @@ import { FieldType } from "@bitwarden/common/enums/fieldType"; -import { FieldData } from "@bitwarden/common/models/data/fieldData"; -import { EncString } from "@bitwarden/common/models/domain/encString"; +import { FieldData } from "@bitwarden/common/models/data/field.data"; +import { EncString } from "@bitwarden/common/models/domain/enc-string"; import { Field } from "@bitwarden/common/models/domain/field"; import { mockEnc, mockFromJson } from "../../utils"; diff --git a/libs/common/spec/models/domain/folder.spec.ts b/libs/common/spec/models/domain/folder.spec.ts index 83e935d82a..9a95a51f61 100644 --- a/libs/common/spec/models/domain/folder.spec.ts +++ b/libs/common/spec/models/domain/folder.spec.ts @@ -1,5 +1,5 @@ -import { FolderData } from "@bitwarden/common/models/data/folderData"; -import { EncString } from "@bitwarden/common/models/domain/encString"; +import { FolderData } from "@bitwarden/common/models/data/folder.data"; +import { EncString } from "@bitwarden/common/models/domain/enc-string"; import { Folder } from "@bitwarden/common/models/domain/folder"; import { mockEnc, mockFromJson } from "../../utils"; @@ -41,7 +41,7 @@ describe("Folder", () => { }); describe("fromJSON", () => { - jest.mock("@bitwarden/common/models/domain/encString"); + jest.mock("@bitwarden/common/models/domain/enc-string"); jest.spyOn(EncString, "fromJSON").mockImplementation(mockFromJson); it("initializes nested objects", () => { diff --git a/libs/common/spec/models/domain/identity.spec.ts b/libs/common/spec/models/domain/identity.spec.ts index 78eff0fc44..649da6aa88 100644 --- a/libs/common/spec/models/domain/identity.spec.ts +++ b/libs/common/spec/models/domain/identity.spec.ts @@ -1,5 +1,5 @@ -import { IdentityData } from "@bitwarden/common/models/data/identityData"; -import { EncString } from "@bitwarden/common/models/domain/encString"; +import { IdentityData } from "@bitwarden/common/models/data/identity.data"; +import { EncString } from "@bitwarden/common/models/domain/enc-string"; import { Identity } from "@bitwarden/common/models/domain/identity"; import { mockEnc, mockFromJson } from "../../utils"; diff --git a/libs/common/spec/models/domain/login.spec.ts b/libs/common/spec/models/domain/login.spec.ts index d22373ec7f..1e5950a947 100644 --- a/libs/common/spec/models/domain/login.spec.ts +++ b/libs/common/spec/models/domain/login.spec.ts @@ -2,11 +2,11 @@ import { Substitute, Arg } from "@fluffy-spoon/substitute"; import { UriMatchType } from "@bitwarden/common/enums/uriMatchType"; -import { LoginData } from "@bitwarden/common/models/data/loginData"; -import { EncString } from "@bitwarden/common/models/domain/encString"; +import { LoginData } from "@bitwarden/common/models/data/login.data"; +import { EncString } from "@bitwarden/common/models/domain/enc-string"; import { Login } from "@bitwarden/common/models/domain/login"; -import { LoginUri } from "@bitwarden/common/models/domain/loginUri"; -import { LoginUriView } from "@bitwarden/common/models/view/loginUriView"; +import { LoginUri } from "@bitwarden/common/models/domain/login-uri"; +import { LoginUriView } from "@bitwarden/common/models/view/login-uri.view"; import { mockEnc, mockFromJson } from "../../utils"; diff --git a/libs/common/spec/models/domain/loginUri.spec.ts b/libs/common/spec/models/domain/loginUri.spec.ts index 50a6859f98..1a9f13c893 100644 --- a/libs/common/spec/models/domain/loginUri.spec.ts +++ b/libs/common/spec/models/domain/loginUri.spec.ts @@ -1,9 +1,9 @@ import { Jsonify } from "type-fest"; import { UriMatchType } from "@bitwarden/common/enums/uriMatchType"; -import { LoginUriData } from "@bitwarden/common/models/data/loginUriData"; -import { EncString } from "@bitwarden/common/models/domain/encString"; -import { LoginUri } from "@bitwarden/common/models/domain/loginUri"; +import { LoginUriData } from "@bitwarden/common/models/data/login-uri.data"; +import { EncString } from "@bitwarden/common/models/domain/enc-string"; +import { LoginUri } from "@bitwarden/common/models/domain/login-uri"; import { mockEnc, mockFromJson } from "../../utils"; diff --git a/libs/common/spec/models/domain/password.spec.ts b/libs/common/spec/models/domain/password.spec.ts index bbe29c9a87..065bda4ad8 100644 --- a/libs/common/spec/models/domain/password.spec.ts +++ b/libs/common/spec/models/domain/password.spec.ts @@ -1,5 +1,5 @@ -import { PasswordHistoryData } from "@bitwarden/common/models/data/passwordHistoryData"; -import { EncString } from "@bitwarden/common/models/domain/encString"; +import { PasswordHistoryData } from "@bitwarden/common/models/data/password-history.data"; +import { EncString } from "@bitwarden/common/models/domain/enc-string"; import { Password } from "@bitwarden/common/models/domain/password"; import { mockEnc, mockFromJson } from "../../utils"; diff --git a/libs/common/spec/models/domain/secureNote.spec.ts b/libs/common/spec/models/domain/secureNote.spec.ts index 3117961102..52f1e5ddcd 100644 --- a/libs/common/spec/models/domain/secureNote.spec.ts +++ b/libs/common/spec/models/domain/secureNote.spec.ts @@ -1,6 +1,6 @@ import { SecureNoteType } from "@bitwarden/common/enums/secureNoteType"; -import { SecureNoteData } from "@bitwarden/common/models/data/secureNoteData"; -import { SecureNote } from "@bitwarden/common/models/domain/secureNote"; +import { SecureNoteData } from "@bitwarden/common/models/data/secure-note.data"; +import { SecureNote } from "@bitwarden/common/models/domain/secure-note"; describe("SecureNote", () => { let data: SecureNoteData; diff --git a/libs/common/spec/models/domain/send.spec.ts b/libs/common/spec/models/domain/send.spec.ts index 7c0795588c..70f19857ef 100644 --- a/libs/common/spec/models/domain/send.spec.ts +++ b/libs/common/spec/models/domain/send.spec.ts @@ -4,10 +4,10 @@ import { Substitute, Arg, SubstituteOf } from "@fluffy-spoon/substitute"; import { AbstractEncryptService } from "@bitwarden/common/abstractions/abstractEncrypt.service"; import { CryptoService } from "@bitwarden/common/abstractions/crypto.service"; import { SendType } from "@bitwarden/common/enums/sendType"; -import { SendData } from "@bitwarden/common/models/data/sendData"; -import { EncString } from "@bitwarden/common/models/domain/encString"; +import { SendData } from "@bitwarden/common/models/data/send.data"; +import { EncString } from "@bitwarden/common/models/domain/enc-string"; import { Send } from "@bitwarden/common/models/domain/send"; -import { SendText } from "@bitwarden/common/models/domain/sendText"; +import { SendText } from "@bitwarden/common/models/domain/send-text"; import { ContainerService } from "@bitwarden/common/services/container.service"; import { makeStaticByteArray, mockEnc } from "../../utils"; diff --git a/libs/common/spec/models/domain/sendAccess.spec.ts b/libs/common/spec/models/domain/sendAccess.spec.ts index 98f67a68c8..4dc6c40c1a 100644 --- a/libs/common/spec/models/domain/sendAccess.spec.ts +++ b/libs/common/spec/models/domain/sendAccess.spec.ts @@ -2,8 +2,8 @@ import { Substitute, Arg } from "@fluffy-spoon/substitute"; import { SendType } from "@bitwarden/common/enums/sendType"; -import { SendAccess } from "@bitwarden/common/models/domain/sendAccess"; -import { SendText } from "@bitwarden/common/models/domain/sendText"; +import { SendAccess } from "@bitwarden/common/models/domain/send-access"; +import { SendText } from "@bitwarden/common/models/domain/send-text"; import { SendAccessResponse } from "@bitwarden/common/models/response/sendAccessResponse"; import { mockEnc } from "../../utils"; diff --git a/libs/common/spec/models/domain/sendFile.spec.ts b/libs/common/spec/models/domain/sendFile.spec.ts index c24c1a48c9..5c648d7d06 100644 --- a/libs/common/spec/models/domain/sendFile.spec.ts +++ b/libs/common/spec/models/domain/sendFile.spec.ts @@ -1,5 +1,5 @@ -import { SendFileData } from "@bitwarden/common/models/data/sendFileData"; -import { SendFile } from "@bitwarden/common/models/domain/sendFile"; +import { SendFileData } from "@bitwarden/common/models/data/send-file.data"; +import { SendFile } from "@bitwarden/common/models/domain/send-file"; import { mockEnc } from "../../utils"; diff --git a/libs/common/spec/models/domain/sendText.spec.ts b/libs/common/spec/models/domain/sendText.spec.ts index 0fb7edc0a0..17ea76cc76 100644 --- a/libs/common/spec/models/domain/sendText.spec.ts +++ b/libs/common/spec/models/domain/sendText.spec.ts @@ -1,5 +1,5 @@ -import { SendTextData } from "@bitwarden/common/models/data/sendTextData"; -import { SendText } from "@bitwarden/common/models/domain/sendText"; +import { SendTextData } from "@bitwarden/common/models/data/send-text.data"; +import { SendText } from "@bitwarden/common/models/domain/send-text"; import { mockEnc } from "../../utils"; diff --git a/libs/common/spec/models/domain/symmetricCryptoKey.spec.ts b/libs/common/spec/models/domain/symmetricCryptoKey.spec.ts index 5670fe4699..746c8471e9 100644 --- a/libs/common/spec/models/domain/symmetricCryptoKey.spec.ts +++ b/libs/common/spec/models/domain/symmetricCryptoKey.spec.ts @@ -1,5 +1,5 @@ import { EncryptionType } from "@bitwarden/common/enums/encryptionType"; -import { SymmetricCryptoKey } from "@bitwarden/common/models/domain/symmetricCryptoKey"; +import { SymmetricCryptoKey } from "@bitwarden/common/models/domain/symmetric-crypto-key"; import { makeStaticByteArray } from "../../utils"; diff --git a/libs/common/spec/models/view/attachmentView.spec.ts b/libs/common/spec/models/view/attachmentView.spec.ts index 5784b4b4ff..de1b399d5d 100644 --- a/libs/common/spec/models/view/attachmentView.spec.ts +++ b/libs/common/spec/models/view/attachmentView.spec.ts @@ -1,9 +1,9 @@ -import { SymmetricCryptoKey } from "@bitwarden/common/models/domain/symmetricCryptoKey"; -import { AttachmentView } from "@bitwarden/common/models/view/attachmentView"; +import { SymmetricCryptoKey } from "@bitwarden/common/models/domain/symmetric-crypto-key"; +import { AttachmentView } from "@bitwarden/common/models/view/attachment.view"; import { mockFromJson } from "../../utils"; -jest.mock("@bitwarden/common/models/domain/symmetricCryptoKey"); +jest.mock("@bitwarden/common/models/domain/symmetric-crypto-key"); describe("AttachmentView", () => { it("fromJSON initializes nested objects", () => { diff --git a/libs/common/spec/models/view/cipherView.spec.ts b/libs/common/spec/models/view/cipherView.spec.ts index 1362babc3b..b58c82b156 100644 --- a/libs/common/spec/models/view/cipherView.spec.ts +++ b/libs/common/spec/models/view/cipherView.spec.ts @@ -1,19 +1,19 @@ import { CipherType } from "@bitwarden/common/enums/cipherType"; -import { AttachmentView } from "@bitwarden/common/models/view/attachmentView"; -import { CardView } from "@bitwarden/common/models/view/cardView"; -import { CipherView } from "@bitwarden/common/models/view/cipherView"; -import { FieldView } from "@bitwarden/common/models/view/fieldView"; -import { IdentityView } from "@bitwarden/common/models/view/identityView"; -import { LoginView } from "@bitwarden/common/models/view/loginView"; -import { PasswordHistoryView } from "@bitwarden/common/models/view/passwordHistoryView"; -import { SecureNoteView } from "@bitwarden/common/models/view/secureNoteView"; +import { AttachmentView } from "@bitwarden/common/models/view/attachment.view"; +import { CardView } from "@bitwarden/common/models/view/card.view"; +import { CipherView } from "@bitwarden/common/models/view/cipher.view"; +import { FieldView } from "@bitwarden/common/models/view/field.view"; +import { IdentityView } from "@bitwarden/common/models/view/identity.view"; +import { LoginView } from "@bitwarden/common/models/view/login.view"; +import { PasswordHistoryView } from "@bitwarden/common/models/view/password-history.view"; +import { SecureNoteView } from "@bitwarden/common/models/view/secure-note.view"; import { mockFromJson } from "../../utils"; -jest.mock("@bitwarden/common/models/view/loginView"); -jest.mock("@bitwarden/common/models/view/attachmentView"); -jest.mock("@bitwarden/common/models/view/fieldView"); -jest.mock("@bitwarden/common/models/view/passwordHistoryView"); +jest.mock("@bitwarden/common/models/view/login.view"); +jest.mock("@bitwarden/common/models/view/attachment.view"); +jest.mock("@bitwarden/common/models/view/field.view"); +jest.mock("@bitwarden/common/models/view/password-history.view"); describe("CipherView", () => { beforeEach(() => { diff --git a/libs/common/spec/models/view/folderView.spec.ts b/libs/common/spec/models/view/folderView.spec.ts index 50b8c2948d..15663166f3 100644 --- a/libs/common/spec/models/view/folderView.spec.ts +++ b/libs/common/spec/models/view/folderView.spec.ts @@ -1,4 +1,4 @@ -import { FolderView } from "@bitwarden/common/models/view/folderView"; +import { FolderView } from "@bitwarden/common/models/view/folder.view"; describe("FolderView", () => { describe("fromJSON", () => { diff --git a/libs/common/spec/models/view/loginView.spec.ts b/libs/common/spec/models/view/loginView.spec.ts index f50636b897..3f6f7da841 100644 --- a/libs/common/spec/models/view/loginView.spec.ts +++ b/libs/common/spec/models/view/loginView.spec.ts @@ -1,9 +1,9 @@ -import { LoginUriView } from "@bitwarden/common/models/view/loginUriView"; -import { LoginView } from "@bitwarden/common/models/view/loginView"; +import { LoginUriView } from "@bitwarden/common/models/view/login-uri.view"; +import { LoginView } from "@bitwarden/common/models/view/login.view"; import { mockFromJson } from "../../utils"; -jest.mock("@bitwarden/common/models/view/loginUriView"); +jest.mock("@bitwarden/common/models/view/login-uri.view"); describe("LoginView", () => { beforeEach(() => { diff --git a/libs/common/spec/models/view/passwordHistoryView.spec.ts b/libs/common/spec/models/view/passwordHistoryView.spec.ts index 99662c40c0..514bc32b51 100644 --- a/libs/common/spec/models/view/passwordHistoryView.spec.ts +++ b/libs/common/spec/models/view/passwordHistoryView.spec.ts @@ -1,4 +1,4 @@ -import { PasswordHistoryView } from "@bitwarden/common/models/view/passwordHistoryView"; +import { PasswordHistoryView } from "@bitwarden/common/models/view/password-history.view"; describe("PasswordHistoryView", () => { it("fromJSON initializes nested objects", () => { diff --git a/libs/common/spec/services/cipher.service.spec.ts b/libs/common/spec/services/cipher.service.spec.ts index ea7b082e14..c4e95e6217 100644 --- a/libs/common/spec/services/cipher.service.spec.ts +++ b/libs/common/spec/services/cipher.service.spec.ts @@ -10,9 +10,9 @@ import { SearchService } from "@bitwarden/common/abstractions/search.service"; import { SettingsService } from "@bitwarden/common/abstractions/settings.service"; import { StateService } from "@bitwarden/common/abstractions/state.service"; import { Cipher } from "@bitwarden/common/models/domain/cipher"; -import { EncArrayBuffer } from "@bitwarden/common/models/domain/encArrayBuffer"; -import { EncString } from "@bitwarden/common/models/domain/encString"; -import { SymmetricCryptoKey } from "@bitwarden/common/models/domain/symmetricCryptoKey"; +import { EncArrayBuffer } from "@bitwarden/common/models/domain/enc-array-buffer"; +import { EncString } from "@bitwarden/common/models/domain/enc-string"; +import { SymmetricCryptoKey } from "@bitwarden/common/models/domain/symmetric-crypto-key"; import { CipherService } from "@bitwarden/common/services/cipher.service"; const ENCRYPTED_TEXT = "This data has been encrypted"; diff --git a/libs/common/spec/services/encrypt.service.spec.ts b/libs/common/spec/services/encrypt.service.spec.ts index 9567d8fbb2..850731b371 100644 --- a/libs/common/spec/services/encrypt.service.spec.ts +++ b/libs/common/spec/services/encrypt.service.spec.ts @@ -3,9 +3,9 @@ import { mockReset, mock } from "jest-mock-extended"; import { CryptoFunctionService } from "@bitwarden/common/abstractions/cryptoFunction.service"; import { LogService } from "@bitwarden/common/abstractions/log.service"; import { EncryptionType } from "@bitwarden/common/enums/encryptionType"; -import { EncArrayBuffer } from "@bitwarden/common/models/domain/encArrayBuffer"; -import { EncString } from "@bitwarden/common/models/domain/encString"; -import { SymmetricCryptoKey } from "@bitwarden/common/models/domain/symmetricCryptoKey"; +import { EncArrayBuffer } from "@bitwarden/common/models/domain/enc-array-buffer"; +import { EncString } from "@bitwarden/common/models/domain/enc-string"; +import { SymmetricCryptoKey } from "@bitwarden/common/models/domain/symmetric-crypto-key"; import { EncryptService } from "@bitwarden/common/services/encrypt.service"; import { makeStaticByteArray } from "../utils"; diff --git a/libs/common/spec/services/export.service.spec.ts b/libs/common/spec/services/export.service.spec.ts index 4bc44d21e0..19177bc171 100644 --- a/libs/common/spec/services/export.service.spec.ts +++ b/libs/common/spec/services/export.service.spec.ts @@ -11,11 +11,11 @@ import { CipherType } from "@bitwarden/common/enums/cipherType"; import { KdfType } from "@bitwarden/common/enums/kdfType"; import { Utils } from "@bitwarden/common/misc/utils"; import { Cipher } from "@bitwarden/common/models/domain/cipher"; -import { EncString } from "@bitwarden/common/models/domain/encString"; +import { EncString } from "@bitwarden/common/models/domain/enc-string"; import { Login } from "@bitwarden/common/models/domain/login"; -import { CipherWithIdExport as CipherExport } from "@bitwarden/common/models/export/cipherWithIdsExport"; -import { CipherView } from "@bitwarden/common/models/view/cipherView"; -import { LoginView } from "@bitwarden/common/models/view/loginView"; +import { CipherWithIdExport as CipherExport } from "@bitwarden/common/models/export/cipher-with-ids.export"; +import { CipherView } from "@bitwarden/common/models/view/cipher.view"; +import { LoginView } from "@bitwarden/common/models/view/login.view"; import { ExportService } from "@bitwarden/common/services/export.service"; import { BuildTestObject, GetUniqueString } from "../utils"; diff --git a/libs/common/spec/services/folder.service.spec.ts b/libs/common/spec/services/folder.service.spec.ts index 0f78a57483..b5d0491bf6 100644 --- a/libs/common/spec/services/folder.service.spec.ts +++ b/libs/common/spec/services/folder.service.spec.ts @@ -6,9 +6,9 @@ import { AbstractEncryptService } from "@bitwarden/common/abstractions/abstractE import { CipherService } from "@bitwarden/common/abstractions/cipher.service"; import { CryptoService } from "@bitwarden/common/abstractions/crypto.service"; import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; -import { FolderData } from "@bitwarden/common/models/data/folderData"; -import { EncString } from "@bitwarden/common/models/domain/encString"; -import { FolderView } from "@bitwarden/common/models/view/folderView"; +import { FolderData } from "@bitwarden/common/models/data/folder.data"; +import { EncString } from "@bitwarden/common/models/domain/enc-string"; +import { FolderView } from "@bitwarden/common/models/view/folder.view"; import { ContainerService } from "@bitwarden/common/services/container.service"; import { FolderService } from "@bitwarden/common/services/folder/folder.service"; import { StateService } from "@bitwarden/common/services/state.service"; diff --git a/libs/common/spec/services/organization/organization.service.spec.ts b/libs/common/spec/services/organization/organization.service.spec.ts index c9b191bfe7..33b5b6c86a 100644 --- a/libs/common/spec/services/organization/organization.service.spec.ts +++ b/libs/common/spec/services/organization/organization.service.spec.ts @@ -3,7 +3,7 @@ import { BehaviorSubject, firstValueFrom, Subject } from "rxjs"; import { StateService } from "@bitwarden/common/abstractions/state.service"; import { SyncNotifierService } from "@bitwarden/common/abstractions/sync/syncNotifier.service.abstraction"; -import { OrganizationData } from "@bitwarden/common/models/data/organizationData"; +import { OrganizationData } from "@bitwarden/common/models/data/organization.data"; import { SyncResponse } from "@bitwarden/common/models/response/syncResponse"; import { OrganizationService } from "@bitwarden/common/services/organization/organization.service"; import { SyncEventArgs } from "@bitwarden/common/types/syncEventArgs"; diff --git a/libs/common/spec/services/policy.service.spec.ts b/libs/common/spec/services/policy.service.spec.ts index 0423448180..7f6821cec6 100644 --- a/libs/common/spec/services/policy.service.spec.ts +++ b/libs/common/spec/services/policy.service.spec.ts @@ -6,13 +6,13 @@ import { CryptoService } from "@bitwarden/common/abstractions/crypto.service"; import { OrganizationService } from "@bitwarden/common/abstractions/organization/organization.service.abstraction"; import { OrganizationUserStatusType } from "@bitwarden/common/enums/organizationUserStatusType"; import { PolicyType } from "@bitwarden/common/enums/policyType"; -import { PermissionsApi } from "@bitwarden/common/models/api/permissionsApi"; -import { OrganizationData } from "@bitwarden/common/models/data/organizationData"; -import { PolicyData } from "@bitwarden/common/models/data/policyData"; -import { MasterPasswordPolicyOptions } from "@bitwarden/common/models/domain/masterPasswordPolicyOptions"; +import { PermissionsApi } from "@bitwarden/common/models/api/permissions.api"; +import { OrganizationData } from "@bitwarden/common/models/data/organization.data"; +import { PolicyData } from "@bitwarden/common/models/data/policy.data"; +import { MasterPasswordPolicyOptions } from "@bitwarden/common/models/domain/master-password-policy-options"; import { Organization } from "@bitwarden/common/models/domain/organization"; import { Policy } from "@bitwarden/common/models/domain/policy"; -import { ResetPasswordPolicyOptions } from "@bitwarden/common/models/domain/resetPasswordPolicyOptions"; +import { ResetPasswordPolicyOptions } from "@bitwarden/common/models/domain/reset-password-policy-options"; import { ListResponse } from "@bitwarden/common/models/response/listResponse"; import { PolicyResponse } from "@bitwarden/common/models/response/policyResponse"; import { ContainerService } from "@bitwarden/common/services/container.service"; diff --git a/libs/common/spec/services/stateMigration.service.spec.ts b/libs/common/spec/services/stateMigration.service.spec.ts index 5512e49753..5144835555 100644 --- a/libs/common/spec/services/stateMigration.service.spec.ts +++ b/libs/common/spec/services/stateMigration.service.spec.ts @@ -5,7 +5,7 @@ import { AbstractStorageService } from "@bitwarden/common/abstractions/storage.s import { StateVersion } from "@bitwarden/common/enums/stateVersion"; import { StateFactory } from "@bitwarden/common/factories/stateFactory"; import { Account } from "@bitwarden/common/models/domain/account"; -import { GlobalState } from "@bitwarden/common/models/domain/globalState"; +import { GlobalState } from "@bitwarden/common/models/domain/global-state"; import { StateMigrationService } from "@bitwarden/common/services/stateMigration.service"; const userId = "USER_ID"; diff --git a/libs/common/spec/utils.ts b/libs/common/spec/utils.ts index 2c637f9adf..21b0f581e0 100644 --- a/libs/common/spec/utils.ts +++ b/libs/common/spec/utils.ts @@ -1,7 +1,7 @@ // eslint-disable-next-line no-restricted-imports import { Substitute, Arg } from "@fluffy-spoon/substitute"; -import { EncString } from "@bitwarden/common/models/domain/encString"; +import { EncString } from "@bitwarden/common/models/domain/enc-string"; function newGuid() { return "xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx".replace(/[xy]/g, (c) => { diff --git a/libs/common/spec/web/services/webCryptoFunction.service.spec.ts b/libs/common/spec/web/services/webCryptoFunction.service.spec.ts index 08deda8827..cc2dd95234 100644 --- a/libs/common/spec/web/services/webCryptoFunction.service.spec.ts +++ b/libs/common/spec/web/services/webCryptoFunction.service.spec.ts @@ -3,7 +3,7 @@ import { Substitute } from "@fluffy-spoon/substitute"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; import { Utils } from "@bitwarden/common/misc/utils"; -import { SymmetricCryptoKey } from "@bitwarden/common/models/domain/symmetricCryptoKey"; +import { SymmetricCryptoKey } from "@bitwarden/common/models/domain/symmetric-crypto-key"; import { WebCryptoFunctionService } from "@bitwarden/common/services/webCryptoFunction.service"; const RsaPublicKey = diff --git a/libs/common/src/abstractions/abstractEncrypt.service.ts b/libs/common/src/abstractions/abstractEncrypt.service.ts index 35760f9b75..63c6f041a3 100644 --- a/libs/common/src/abstractions/abstractEncrypt.service.ts +++ b/libs/common/src/abstractions/abstractEncrypt.service.ts @@ -1,7 +1,7 @@ import { IEncrypted } from "../interfaces/IEncrypted"; -import { EncArrayBuffer } from "../models/domain/encArrayBuffer"; -import { EncString } from "../models/domain/encString"; -import { SymmetricCryptoKey } from "../models/domain/symmetricCryptoKey"; +import { EncArrayBuffer } from "../models/domain/enc-array-buffer"; +import { EncString } from "../models/domain/enc-string"; +import { SymmetricCryptoKey } from "../models/domain/symmetric-crypto-key"; export abstract class AbstractEncryptService { abstract encrypt(plainValue: string | ArrayBuffer, key: SymmetricCryptoKey): Promise; diff --git a/libs/common/src/abstractions/api.service.ts b/libs/common/src/abstractions/api.service.ts index 06d3f5b4eb..5827c84282 100644 --- a/libs/common/src/abstractions/api.service.ts +++ b/libs/common/src/abstractions/api.service.ts @@ -160,7 +160,7 @@ import { } from "../models/response/twoFactorWebAuthnResponse"; import { TwoFactorYubiKeyResponse } from "../models/response/twoFactorYubiKeyResponse"; import { UserKeyResponse } from "../models/response/userKeyResponse"; -import { SendAccessView } from "../models/view/sendAccessView"; +import { SendAccessView } from "../models/view/send-access.view"; export abstract class ApiService { send: ( diff --git a/libs/common/src/abstractions/auth.service.ts b/libs/common/src/abstractions/auth.service.ts index bbe1c01bf2..959b5c8425 100644 --- a/libs/common/src/abstractions/auth.service.ts +++ b/libs/common/src/abstractions/auth.service.ts @@ -1,14 +1,14 @@ import { Observable } from "rxjs"; import { AuthenticationStatus } from "../enums/authenticationStatus"; -import { AuthResult } from "../models/domain/authResult"; +import { AuthResult } from "../models/domain/auth-result"; import { ApiLogInCredentials, PasswordLogInCredentials, SsoLogInCredentials, PasswordlessLogInCredentials, -} from "../models/domain/logInCredentials"; -import { SymmetricCryptoKey } from "../models/domain/symmetricCryptoKey"; +} from "../models/domain/log-in-credentials"; +import { SymmetricCryptoKey } from "../models/domain/symmetric-crypto-key"; import { TokenRequestTwoFactor } from "../models/request/identityToken/tokenRequestTwoFactor"; import { AuthRequestPushNotification } from "../models/response/notificationResponse"; diff --git a/libs/common/src/abstractions/cipher.service.ts b/libs/common/src/abstractions/cipher.service.ts index a87a6f0a1f..96f30c55fa 100644 --- a/libs/common/src/abstractions/cipher.service.ts +++ b/libs/common/src/abstractions/cipher.service.ts @@ -1,11 +1,11 @@ import { CipherType } from "../enums/cipherType"; import { UriMatchType } from "../enums/uriMatchType"; -import { CipherData } from "../models/data/cipherData"; +import { CipherData } from "../models/data/cipher.data"; import { Cipher } from "../models/domain/cipher"; import { Field } from "../models/domain/field"; -import { SymmetricCryptoKey } from "../models/domain/symmetricCryptoKey"; -import { CipherView } from "../models/view/cipherView"; -import { FieldView } from "../models/view/fieldView"; +import { SymmetricCryptoKey } from "../models/domain/symmetric-crypto-key"; +import { CipherView } from "../models/view/cipher.view"; +import { FieldView } from "../models/view/field.view"; export abstract class CipherService { clearCache: (userId?: string) => Promise; diff --git a/libs/common/src/abstractions/collection.service.ts b/libs/common/src/abstractions/collection.service.ts index 0673e9066b..316794a556 100644 --- a/libs/common/src/abstractions/collection.service.ts +++ b/libs/common/src/abstractions/collection.service.ts @@ -1,7 +1,7 @@ -import { CollectionData } from "../models/data/collectionData"; +import { CollectionData } from "../models/data/collection.data"; import { Collection } from "../models/domain/collection"; -import { TreeNode } from "../models/domain/treeNode"; -import { CollectionView } from "../models/view/collectionView"; +import { TreeNode } from "../models/domain/tree-node"; +import { CollectionView } from "../models/view/collection.view"; export abstract class CollectionService { clearCache: (userId?: string) => Promise; diff --git a/libs/common/src/abstractions/crypto.service.ts b/libs/common/src/abstractions/crypto.service.ts index 842d9e1a7c..72f67854fc 100644 --- a/libs/common/src/abstractions/crypto.service.ts +++ b/libs/common/src/abstractions/crypto.service.ts @@ -1,9 +1,9 @@ import { HashPurpose } from "../enums/hashPurpose"; import { KdfType } from "../enums/kdfType"; import { KeySuffixOptions } from "../enums/keySuffixOptions"; -import { EncArrayBuffer } from "../models/domain/encArrayBuffer"; -import { EncString } from "../models/domain/encString"; -import { SymmetricCryptoKey } from "../models/domain/symmetricCryptoKey"; +import { EncArrayBuffer } from "../models/domain/enc-array-buffer"; +import { EncString } from "../models/domain/enc-string"; +import { SymmetricCryptoKey } from "../models/domain/symmetric-crypto-key"; import { ProfileOrganizationResponse } from "../models/response/profileOrganizationResponse"; import { ProfileProviderOrganizationResponse } from "../models/response/profileProviderOrganizationResponse"; import { ProfileProviderResponse } from "../models/response/profileProviderResponse"; diff --git a/libs/common/src/abstractions/cryptoFunction.service.ts b/libs/common/src/abstractions/cryptoFunction.service.ts index 21ed33cbe8..4a1f37f568 100644 --- a/libs/common/src/abstractions/cryptoFunction.service.ts +++ b/libs/common/src/abstractions/cryptoFunction.service.ts @@ -1,5 +1,5 @@ -import { DecryptParameters } from "../models/domain/decryptParameters"; -import { SymmetricCryptoKey } from "../models/domain/symmetricCryptoKey"; +import { DecryptParameters } from "../models/domain/decrypt-parameters"; +import { SymmetricCryptoKey } from "../models/domain/symmetric-crypto-key"; export abstract class CryptoFunctionService { pbkdf2: ( diff --git a/libs/common/src/abstractions/export.service.ts b/libs/common/src/abstractions/export.service.ts index b0266530bd..8d158f747a 100644 --- a/libs/common/src/abstractions/export.service.ts +++ b/libs/common/src/abstractions/export.service.ts @@ -1,4 +1,4 @@ -import { EventView } from "../models/view/eventView"; +import { EventView } from "../models/view/event.view"; export type ExportFormat = "csv" | "json" | "encrypted_json"; diff --git a/libs/common/src/abstractions/fileUpload.service.ts b/libs/common/src/abstractions/fileUpload.service.ts index fcd3c22c72..bc597c5973 100644 --- a/libs/common/src/abstractions/fileUpload.service.ts +++ b/libs/common/src/abstractions/fileUpload.service.ts @@ -1,5 +1,5 @@ -import { EncArrayBuffer } from "../models/domain/encArrayBuffer"; -import { EncString } from "../models/domain/encString"; +import { EncArrayBuffer } from "../models/domain/enc-array-buffer"; +import { EncString } from "../models/domain/enc-string"; import { AttachmentUploadDataResponse } from "../models/response/attachmentUploadDataResponse"; import { SendFileUploadDataResponse } from "../models/response/sendFileUploadDataResponse"; diff --git a/libs/common/src/abstractions/folder/folder.service.abstraction.ts b/libs/common/src/abstractions/folder/folder.service.abstraction.ts index 42e0420f9b..f8df1f7db6 100644 --- a/libs/common/src/abstractions/folder/folder.service.abstraction.ts +++ b/libs/common/src/abstractions/folder/folder.service.abstraction.ts @@ -1,9 +1,9 @@ import { Observable } from "rxjs"; -import { FolderData } from "../../models/data/folderData"; +import { FolderData } from "../../models/data/folder.data"; import { Folder } from "../../models/domain/folder"; -import { SymmetricCryptoKey } from "../../models/domain/symmetricCryptoKey"; -import { FolderView } from "../../models/view/folderView"; +import { SymmetricCryptoKey } from "../../models/domain/symmetric-crypto-key"; +import { FolderView } from "../../models/view/folder.view"; export abstract class FolderService { folders$: Observable; diff --git a/libs/common/src/abstractions/passwordGeneration.service.ts b/libs/common/src/abstractions/passwordGeneration.service.ts index 82bc021fb7..20aee59876 100644 --- a/libs/common/src/abstractions/passwordGeneration.service.ts +++ b/libs/common/src/abstractions/passwordGeneration.service.ts @@ -1,7 +1,7 @@ import * as zxcvbn from "zxcvbn"; -import { GeneratedPasswordHistory } from "../models/domain/generatedPasswordHistory"; -import { PasswordGeneratorPolicyOptions } from "../models/domain/passwordGeneratorPolicyOptions"; +import { GeneratedPasswordHistory } from "../models/domain/generated-password-history"; +import { PasswordGeneratorPolicyOptions } from "../models/domain/password-generator-policy-options"; export abstract class PasswordGenerationService { generatePassword: (options: any) => Promise; diff --git a/libs/common/src/abstractions/policy/policy-api.service.abstraction.ts b/libs/common/src/abstractions/policy/policy-api.service.abstraction.ts index cdabd53075..e5a33e8edd 100644 --- a/libs/common/src/abstractions/policy/policy-api.service.abstraction.ts +++ b/libs/common/src/abstractions/policy/policy-api.service.abstraction.ts @@ -1,5 +1,5 @@ import { PolicyType } from "../../enums/policyType"; -import { MasterPasswordPolicyOptions } from "../../models/domain/masterPasswordPolicyOptions"; +import { MasterPasswordPolicyOptions } from "../../models/domain/master-password-policy-options"; import { PolicyRequest } from "../../models/request/policyRequest"; import { ListResponse } from "../../models/response/listResponse"; import { PolicyResponse } from "../../models/response/policyResponse"; diff --git a/libs/common/src/abstractions/policy/policy.service.abstraction.ts b/libs/common/src/abstractions/policy/policy.service.abstraction.ts index b1bf13300c..ccbde51238 100644 --- a/libs/common/src/abstractions/policy/policy.service.abstraction.ts +++ b/libs/common/src/abstractions/policy/policy.service.abstraction.ts @@ -1,10 +1,10 @@ import { Observable } from "rxjs"; import { PolicyType } from "../../enums/policyType"; -import { PolicyData } from "../../models/data/policyData"; -import { MasterPasswordPolicyOptions } from "../../models/domain/masterPasswordPolicyOptions"; +import { PolicyData } from "../../models/data/policy.data"; +import { MasterPasswordPolicyOptions } from "../../models/domain/master-password-policy-options"; import { Policy } from "../../models/domain/policy"; -import { ResetPasswordPolicyOptions } from "../../models/domain/resetPasswordPolicyOptions"; +import { ResetPasswordPolicyOptions } from "../../models/domain/reset-password-policy-options"; import { ListResponse } from "../../models/response/listResponse"; import { PolicyResponse } from "../../models/response/policyResponse"; diff --git a/libs/common/src/abstractions/provider.service.ts b/libs/common/src/abstractions/provider.service.ts index e474636924..d843154f3f 100644 --- a/libs/common/src/abstractions/provider.service.ts +++ b/libs/common/src/abstractions/provider.service.ts @@ -1,4 +1,4 @@ -import { ProviderData } from "../models/data/providerData"; +import { ProviderData } from "../models/data/provider.data"; import { Provider } from "../models/domain/provider"; export abstract class ProviderService { diff --git a/libs/common/src/abstractions/search.service.ts b/libs/common/src/abstractions/search.service.ts index 9c2b0eeb8e..02eba41c13 100644 --- a/libs/common/src/abstractions/search.service.ts +++ b/libs/common/src/abstractions/search.service.ts @@ -1,5 +1,5 @@ -import { CipherView } from "../models/view/cipherView"; -import { SendView } from "../models/view/sendView"; +import { CipherView } from "../models/view/cipher.view"; +import { SendView } from "../models/view/send.view"; export abstract class SearchService { indexedEntityId?: string = null; diff --git a/libs/common/src/abstractions/send.service.ts b/libs/common/src/abstractions/send.service.ts index 3331e41e2a..db212e33ce 100644 --- a/libs/common/src/abstractions/send.service.ts +++ b/libs/common/src/abstractions/send.service.ts @@ -1,8 +1,8 @@ -import { SendData } from "../models/data/sendData"; -import { EncArrayBuffer } from "../models/domain/encArrayBuffer"; +import { SendData } from "../models/data/send.data"; +import { EncArrayBuffer } from "../models/domain/enc-array-buffer"; import { Send } from "../models/domain/send"; -import { SymmetricCryptoKey } from "../models/domain/symmetricCryptoKey"; -import { SendView } from "../models/view/sendView"; +import { SymmetricCryptoKey } from "../models/domain/symmetric-crypto-key"; +import { SendView } from "../models/view/send.view"; export abstract class SendService { clearCache: () => Promise; diff --git a/libs/common/src/abstractions/state.service.ts b/libs/common/src/abstractions/state.service.ts index 69df767865..bcc744fba0 100644 --- a/libs/common/src/abstractions/state.service.ts +++ b/libs/common/src/abstractions/state.service.ts @@ -3,28 +3,28 @@ import { BehaviorSubject, Observable } from "rxjs"; import { KdfType } from "../enums/kdfType"; import { ThemeType } from "../enums/themeType"; import { UriMatchType } from "../enums/uriMatchType"; -import { CipherData } from "../models/data/cipherData"; -import { CollectionData } from "../models/data/collectionData"; -import { EncryptedOrganizationKeyData } from "../models/data/encryptedOrganizationKeyData"; -import { EventData } from "../models/data/eventData"; -import { FolderData } from "../models/data/folderData"; -import { LocalData } from "../models/data/localData"; -import { OrganizationData } from "../models/data/organizationData"; -import { PolicyData } from "../models/data/policyData"; -import { ProviderData } from "../models/data/providerData"; -import { SendData } from "../models/data/sendData"; +import { CipherData } from "../models/data/cipher.data"; +import { CollectionData } from "../models/data/collection.data"; +import { EncryptedOrganizationKeyData } from "../models/data/encrypted-organization-key.data"; +import { EventData } from "../models/data/event.data"; +import { FolderData } from "../models/data/folder.data"; +import { LocalData } from "../models/data/local.data"; +import { OrganizationData } from "../models/data/organization.data"; +import { PolicyData } from "../models/data/policy.data"; +import { ProviderData } from "../models/data/provider.data"; +import { SendData } from "../models/data/send.data"; import { ServerConfigData } from "../models/data/server-config.data"; import { Account, AccountSettingsSettings } from "../models/domain/account"; -import { EncString } from "../models/domain/encString"; -import { EnvironmentUrls } from "../models/domain/environmentUrls"; -import { GeneratedPasswordHistory } from "../models/domain/generatedPasswordHistory"; +import { EncString } from "../models/domain/enc-string"; +import { EnvironmentUrls } from "../models/domain/environment-urls"; +import { GeneratedPasswordHistory } from "../models/domain/generated-password-history"; import { Policy } from "../models/domain/policy"; -import { StorageOptions } from "../models/domain/storageOptions"; -import { SymmetricCryptoKey } from "../models/domain/symmetricCryptoKey"; -import { WindowState } from "../models/domain/windowState"; -import { CipherView } from "../models/view/cipherView"; -import { CollectionView } from "../models/view/collectionView"; -import { SendView } from "../models/view/sendView"; +import { StorageOptions } from "../models/domain/storage-options"; +import { SymmetricCryptoKey } from "../models/domain/symmetric-crypto-key"; +import { WindowState } from "../models/domain/window-state"; +import { CipherView } from "../models/view/cipher.view"; +import { CollectionView } from "../models/view/collection.view"; +import { SendView } from "../models/view/send.view"; export abstract class StateService { accounts: BehaviorSubject<{ [userId: string]: T }>; diff --git a/libs/common/src/abstractions/storage.service.ts b/libs/common/src/abstractions/storage.service.ts index 31506f4302..d405d52669 100644 --- a/libs/common/src/abstractions/storage.service.ts +++ b/libs/common/src/abstractions/storage.service.ts @@ -1,4 +1,4 @@ -import { MemoryStorageOptions, StorageOptions } from "../models/domain/storageOptions"; +import { MemoryStorageOptions, StorageOptions } from "../models/domain/storage-options"; export abstract class AbstractStorageService { abstract get(key: string, options?: StorageOptions): Promise; diff --git a/libs/common/src/factories/globalStateFactory.ts b/libs/common/src/factories/globalStateFactory.ts index a2c25c4661..3ce8e6469a 100644 --- a/libs/common/src/factories/globalStateFactory.ts +++ b/libs/common/src/factories/globalStateFactory.ts @@ -1,4 +1,4 @@ -import { GlobalState } from "../models/domain/globalState"; +import { GlobalState } from "../models/domain/global-state"; export class GlobalStateFactory { private globalStateConstructor: new (init: Partial) => T; diff --git a/libs/common/src/factories/stateFactory.ts b/libs/common/src/factories/stateFactory.ts index 203ae6722f..ea53d7765c 100644 --- a/libs/common/src/factories/stateFactory.ts +++ b/libs/common/src/factories/stateFactory.ts @@ -1,5 +1,5 @@ import { Account } from "../models/domain/account"; -import { GlobalState } from "../models/domain/globalState"; +import { GlobalState } from "../models/domain/global-state"; import { AccountFactory } from "./accountFactory"; import { GlobalStateFactory } from "./globalStateFactory"; diff --git a/libs/common/src/importers/ascendoCsvImporter.ts b/libs/common/src/importers/ascendoCsvImporter.ts index 75191a1cbc..68c3ae5db7 100644 --- a/libs/common/src/importers/ascendoCsvImporter.ts +++ b/libs/common/src/importers/ascendoCsvImporter.ts @@ -1,4 +1,4 @@ -import { ImportResult } from "../models/domain/importResult"; +import { ImportResult } from "../models/domain/import-result"; import { BaseImporter } from "./baseImporter"; import { Importer } from "./importer"; diff --git a/libs/common/src/importers/avastCsvImporter.ts b/libs/common/src/importers/avastCsvImporter.ts index 9bf1063954..14cfa722da 100644 --- a/libs/common/src/importers/avastCsvImporter.ts +++ b/libs/common/src/importers/avastCsvImporter.ts @@ -1,4 +1,4 @@ -import { ImportResult } from "../models/domain/importResult"; +import { ImportResult } from "../models/domain/import-result"; import { BaseImporter } from "./baseImporter"; import { Importer } from "./importer"; diff --git a/libs/common/src/importers/avastJsonImporter.ts b/libs/common/src/importers/avastJsonImporter.ts index 0d424a7186..178f0a47e3 100644 --- a/libs/common/src/importers/avastJsonImporter.ts +++ b/libs/common/src/importers/avastJsonImporter.ts @@ -1,6 +1,6 @@ import { CipherType } from "../enums/cipherType"; import { SecureNoteType } from "../enums/secureNoteType"; -import { ImportResult } from "../models/domain/importResult"; +import { ImportResult } from "../models/domain/import-result"; import { BaseImporter } from "./baseImporter"; import { Importer } from "./importer"; diff --git a/libs/common/src/importers/aviraCsvImporter.ts b/libs/common/src/importers/aviraCsvImporter.ts index f4c578b018..ceb4979aa1 100644 --- a/libs/common/src/importers/aviraCsvImporter.ts +++ b/libs/common/src/importers/aviraCsvImporter.ts @@ -1,4 +1,4 @@ -import { ImportResult } from "../models/domain/importResult"; +import { ImportResult } from "../models/domain/import-result"; import { BaseImporter } from "./baseImporter"; import { Importer } from "./importer"; diff --git a/libs/common/src/importers/baseImporter.ts b/libs/common/src/importers/baseImporter.ts index 0e1192a652..dec6e2e715 100644 --- a/libs/common/src/importers/baseImporter.ts +++ b/libs/common/src/importers/baseImporter.ts @@ -5,14 +5,14 @@ import { CipherType } from "../enums/cipherType"; import { FieldType } from "../enums/fieldType"; import { SecureNoteType } from "../enums/secureNoteType"; import { Utils } from "../misc/utils"; -import { ImportResult } from "../models/domain/importResult"; -import { CipherView } from "../models/view/cipherView"; -import { CollectionView } from "../models/view/collectionView"; -import { FieldView } from "../models/view/fieldView"; -import { FolderView } from "../models/view/folderView"; -import { LoginUriView } from "../models/view/loginUriView"; -import { LoginView } from "../models/view/loginView"; -import { SecureNoteView } from "../models/view/secureNoteView"; +import { ImportResult } from "../models/domain/import-result"; +import { CipherView } from "../models/view/cipher.view"; +import { CollectionView } from "../models/view/collection.view"; +import { FieldView } from "../models/view/field.view"; +import { FolderView } from "../models/view/folder.view"; +import { LoginUriView } from "../models/view/login-uri.view"; +import { LoginView } from "../models/view/login.view"; +import { SecureNoteView } from "../models/view/secure-note.view"; import { ConsoleLogService } from "../services/consoleLog.service"; export abstract class BaseImporter { diff --git a/libs/common/src/importers/bitwardenCsvImporter.ts b/libs/common/src/importers/bitwardenCsvImporter.ts index cc5419c303..01b87b8cbd 100644 --- a/libs/common/src/importers/bitwardenCsvImporter.ts +++ b/libs/common/src/importers/bitwardenCsvImporter.ts @@ -2,12 +2,12 @@ import { CipherRepromptType } from "../enums/cipherRepromptType"; import { CipherType } from "../enums/cipherType"; import { FieldType } from "../enums/fieldType"; import { SecureNoteType } from "../enums/secureNoteType"; -import { ImportResult } from "../models/domain/importResult"; -import { CipherView } from "../models/view/cipherView"; -import { CollectionView } from "../models/view/collectionView"; -import { FieldView } from "../models/view/fieldView"; -import { LoginView } from "../models/view/loginView"; -import { SecureNoteView } from "../models/view/secureNoteView"; +import { ImportResult } from "../models/domain/import-result"; +import { CipherView } from "../models/view/cipher.view"; +import { CollectionView } from "../models/view/collection.view"; +import { FieldView } from "../models/view/field.view"; +import { LoginView } from "../models/view/login.view"; +import { SecureNoteView } from "../models/view/secure-note.view"; import { BaseImporter } from "./baseImporter"; import { Importer } from "./importer"; diff --git a/libs/common/src/importers/bitwardenJsonImporter.ts b/libs/common/src/importers/bitwardenJsonImporter.ts index ed707a45d8..cf763c7904 100644 --- a/libs/common/src/importers/bitwardenJsonImporter.ts +++ b/libs/common/src/importers/bitwardenJsonImporter.ts @@ -1,10 +1,10 @@ import { CryptoService } from "../abstractions/crypto.service"; import { I18nService } from "../abstractions/i18n.service"; -import { EncString } from "../models/domain/encString"; -import { ImportResult } from "../models/domain/importResult"; -import { CipherWithIdExport } from "../models/export/cipherWithIdsExport"; -import { CollectionWithIdExport } from "../models/export/collectionWithIdExport"; -import { FolderWithIdExport } from "../models/export/folderWithIdExport"; +import { EncString } from "../models/domain/enc-string"; +import { ImportResult } from "../models/domain/import-result"; +import { CipherWithIdExport } from "../models/export/cipher-with-ids.export"; +import { CollectionWithIdExport } from "../models/export/collection-with-id.export"; +import { FolderWithIdExport } from "../models/export/folder-with-id.export"; import { BaseImporter } from "./baseImporter"; import { Importer } from "./importer"; diff --git a/libs/common/src/importers/bitwardenPasswordProtectedImporter.ts b/libs/common/src/importers/bitwardenPasswordProtectedImporter.ts index c13d6f3a4f..064c09fa8f 100644 --- a/libs/common/src/importers/bitwardenPasswordProtectedImporter.ts +++ b/libs/common/src/importers/bitwardenPasswordProtectedImporter.ts @@ -1,9 +1,9 @@ import { CryptoService } from "../abstractions/crypto.service"; import { I18nService } from "../abstractions/i18n.service"; import { KdfType } from "../enums/kdfType"; -import { EncString } from "../models/domain/encString"; -import { ImportResult } from "../models/domain/importResult"; -import { SymmetricCryptoKey } from "../models/domain/symmetricCryptoKey"; +import { EncString } from "../models/domain/enc-string"; +import { ImportResult } from "../models/domain/import-result"; +import { SymmetricCryptoKey } from "../models/domain/symmetric-crypto-key"; import { BitwardenJsonImporter } from "./bitwardenJsonImporter"; import { Importer } from "./importer"; diff --git a/libs/common/src/importers/blackBerryCsvImporter.ts b/libs/common/src/importers/blackBerryCsvImporter.ts index ea3d08ebcf..b458f341ba 100644 --- a/libs/common/src/importers/blackBerryCsvImporter.ts +++ b/libs/common/src/importers/blackBerryCsvImporter.ts @@ -1,4 +1,4 @@ -import { ImportResult } from "../models/domain/importResult"; +import { ImportResult } from "../models/domain/import-result"; import { BaseImporter } from "./baseImporter"; import { Importer } from "./importer"; diff --git a/libs/common/src/importers/blurCsvImporter.ts b/libs/common/src/importers/blurCsvImporter.ts index ca9ecd1cd8..fd058c31bb 100644 --- a/libs/common/src/importers/blurCsvImporter.ts +++ b/libs/common/src/importers/blurCsvImporter.ts @@ -1,4 +1,4 @@ -import { ImportResult } from "../models/domain/importResult"; +import { ImportResult } from "../models/domain/import-result"; import { BaseImporter } from "./baseImporter"; import { Importer } from "./importer"; diff --git a/libs/common/src/importers/buttercupCsvImporter.ts b/libs/common/src/importers/buttercupCsvImporter.ts index aa3dda2d43..b9e7302ddb 100644 --- a/libs/common/src/importers/buttercupCsvImporter.ts +++ b/libs/common/src/importers/buttercupCsvImporter.ts @@ -1,4 +1,4 @@ -import { ImportResult } from "../models/domain/importResult"; +import { ImportResult } from "../models/domain/import-result"; import { BaseImporter } from "./baseImporter"; import { Importer } from "./importer"; diff --git a/libs/common/src/importers/chromeCsvImporter.ts b/libs/common/src/importers/chromeCsvImporter.ts index 35c72ac342..085b8cd28a 100644 --- a/libs/common/src/importers/chromeCsvImporter.ts +++ b/libs/common/src/importers/chromeCsvImporter.ts @@ -1,4 +1,4 @@ -import { ImportResult } from "../models/domain/importResult"; +import { ImportResult } from "../models/domain/import-result"; import { BaseImporter } from "./baseImporter"; import { Importer } from "./importer"; diff --git a/libs/common/src/importers/clipperzHtmlImporter.ts b/libs/common/src/importers/clipperzHtmlImporter.ts index c4f0402c5b..b7e7abc0bd 100644 --- a/libs/common/src/importers/clipperzHtmlImporter.ts +++ b/libs/common/src/importers/clipperzHtmlImporter.ts @@ -1,4 +1,4 @@ -import { ImportResult } from "../models/domain/importResult"; +import { ImportResult } from "../models/domain/import-result"; import { BaseImporter } from "./baseImporter"; import { Importer } from "./importer"; diff --git a/libs/common/src/importers/codebookCsvImporter.ts b/libs/common/src/importers/codebookCsvImporter.ts index f842f21c09..ec9848c23a 100644 --- a/libs/common/src/importers/codebookCsvImporter.ts +++ b/libs/common/src/importers/codebookCsvImporter.ts @@ -1,4 +1,4 @@ -import { ImportResult } from "../models/domain/importResult"; +import { ImportResult } from "../models/domain/import-result"; import { BaseImporter } from "./baseImporter"; import { Importer } from "./importer"; diff --git a/libs/common/src/importers/dashlaneImporters/dashlaneCsvImporter.ts b/libs/common/src/importers/dashlaneImporters/dashlaneCsvImporter.ts index 2bb6ce14fe..8e7d5a682a 100644 --- a/libs/common/src/importers/dashlaneImporters/dashlaneCsvImporter.ts +++ b/libs/common/src/importers/dashlaneImporters/dashlaneCsvImporter.ts @@ -1,10 +1,10 @@ import { CipherType } from "../../enums/cipherType"; import { SecureNoteType } from "../../enums/secureNoteType"; -import { ImportResult } from "../../models/domain/importResult"; -import { CardView } from "../../models/view/cardView"; -import { CipherView } from "../../models/view/cipherView"; -import { IdentityView } from "../../models/view/identityView"; -import { LoginView } from "../../models/view/loginView"; +import { ImportResult } from "../../models/domain/import-result"; +import { CardView } from "../../models/view/card.view"; +import { CipherView } from "../../models/view/cipher.view"; +import { IdentityView } from "../../models/view/identity.view"; +import { LoginView } from "../../models/view/login.view"; import { BaseImporter } from "../baseImporter"; import { Importer } from "../importer"; diff --git a/libs/common/src/importers/dashlaneImporters/dashlaneJsonImporter.ts b/libs/common/src/importers/dashlaneImporters/dashlaneJsonImporter.ts index cb7db59dad..4c5afc175b 100644 --- a/libs/common/src/importers/dashlaneImporters/dashlaneJsonImporter.ts +++ b/libs/common/src/importers/dashlaneImporters/dashlaneJsonImporter.ts @@ -1,10 +1,10 @@ import { CipherType } from "../../enums/cipherType"; import { SecureNoteType } from "../../enums/secureNoteType"; -import { ImportResult } from "../../models/domain/importResult"; -import { CardView } from "../../models/view/cardView"; -import { CipherView } from "../../models/view/cipherView"; -import { IdentityView } from "../../models/view/identityView"; -import { SecureNoteView } from "../../models/view/secureNoteView"; +import { ImportResult } from "../../models/domain/import-result"; +import { CardView } from "../../models/view/card.view"; +import { CipherView } from "../../models/view/cipher.view"; +import { IdentityView } from "../../models/view/identity.view"; +import { SecureNoteView } from "../../models/view/secure-note.view"; import { BaseImporter } from "../baseImporter"; import { Importer } from "../importer"; diff --git a/libs/common/src/importers/encryptrCsvImporter.ts b/libs/common/src/importers/encryptrCsvImporter.ts index 8c3e9e08ac..fb5541b82e 100644 --- a/libs/common/src/importers/encryptrCsvImporter.ts +++ b/libs/common/src/importers/encryptrCsvImporter.ts @@ -1,6 +1,6 @@ import { CipherType } from "../enums/cipherType"; -import { ImportResult } from "../models/domain/importResult"; -import { CardView } from "../models/view/cardView"; +import { ImportResult } from "../models/domain/import-result"; +import { CardView } from "../models/view/card.view"; import { BaseImporter } from "./baseImporter"; import { Importer } from "./importer"; diff --git a/libs/common/src/importers/enpassCsvImporter.ts b/libs/common/src/importers/enpassCsvImporter.ts index b5eb0b6027..dada932ba2 100644 --- a/libs/common/src/importers/enpassCsvImporter.ts +++ b/libs/common/src/importers/enpassCsvImporter.ts @@ -1,8 +1,8 @@ import { CipherType } from "../enums/cipherType"; import { SecureNoteType } from "../enums/secureNoteType"; -import { ImportResult } from "../models/domain/importResult"; -import { CardView } from "../models/view/cardView"; -import { SecureNoteView } from "../models/view/secureNoteView"; +import { ImportResult } from "../models/domain/import-result"; +import { CardView } from "../models/view/card.view"; +import { SecureNoteView } from "../models/view/secure-note.view"; import { BaseImporter } from "./baseImporter"; import { Importer } from "./importer"; diff --git a/libs/common/src/importers/enpassJsonImporter.ts b/libs/common/src/importers/enpassJsonImporter.ts index 033c5995b0..29e46b73e3 100644 --- a/libs/common/src/importers/enpassJsonImporter.ts +++ b/libs/common/src/importers/enpassJsonImporter.ts @@ -1,9 +1,9 @@ import { CipherType } from "../enums/cipherType"; import { FieldType } from "../enums/fieldType"; -import { ImportResult } from "../models/domain/importResult"; -import { CardView } from "../models/view/cardView"; -import { CipherView } from "../models/view/cipherView"; -import { FolderView } from "../models/view/folderView"; +import { ImportResult } from "../models/domain/import-result"; +import { CardView } from "../models/view/card.view"; +import { CipherView } from "../models/view/cipher.view"; +import { FolderView } from "../models/view/folder.view"; import { BaseImporter } from "./baseImporter"; import { Importer } from "./importer"; diff --git a/libs/common/src/importers/firefoxCsvImporter.ts b/libs/common/src/importers/firefoxCsvImporter.ts index 1b71aac960..4b3dc597ec 100644 --- a/libs/common/src/importers/firefoxCsvImporter.ts +++ b/libs/common/src/importers/firefoxCsvImporter.ts @@ -1,4 +1,4 @@ -import { ImportResult } from "../models/domain/importResult"; +import { ImportResult } from "../models/domain/import-result"; import { BaseImporter } from "./baseImporter"; import { Importer } from "./importer"; diff --git a/libs/common/src/importers/fsecureFskImporter.ts b/libs/common/src/importers/fsecureFskImporter.ts index c81a0820f2..bf9ceb950d 100644 --- a/libs/common/src/importers/fsecureFskImporter.ts +++ b/libs/common/src/importers/fsecureFskImporter.ts @@ -1,6 +1,6 @@ import { CipherType } from "../enums/cipherType"; -import { ImportResult } from "../models/domain/importResult"; -import { CardView } from "../models/view/cardView"; +import { ImportResult } from "../models/domain/import-result"; +import { CardView } from "../models/view/card.view"; import { BaseImporter } from "./baseImporter"; import { Importer } from "./importer"; diff --git a/libs/common/src/importers/gnomeJsonImporter.ts b/libs/common/src/importers/gnomeJsonImporter.ts index 1dfac67545..1dd5f118dc 100644 --- a/libs/common/src/importers/gnomeJsonImporter.ts +++ b/libs/common/src/importers/gnomeJsonImporter.ts @@ -1,4 +1,4 @@ -import { ImportResult } from "../models/domain/importResult"; +import { ImportResult } from "../models/domain/import-result"; import { BaseImporter } from "./baseImporter"; import { Importer } from "./importer"; diff --git a/libs/common/src/importers/importer.ts b/libs/common/src/importers/importer.ts index a62cc6c139..0835f667eb 100644 --- a/libs/common/src/importers/importer.ts +++ b/libs/common/src/importers/importer.ts @@ -1,4 +1,4 @@ -import { ImportResult } from "../models/domain/importResult"; +import { ImportResult } from "../models/domain/import-result"; export interface Importer { organizationId: string; diff --git a/libs/common/src/importers/kasperskyTxtImporter.ts b/libs/common/src/importers/kasperskyTxtImporter.ts index b049f2bb1d..75322946e2 100644 --- a/libs/common/src/importers/kasperskyTxtImporter.ts +++ b/libs/common/src/importers/kasperskyTxtImporter.ts @@ -1,4 +1,4 @@ -import { ImportResult } from "../models/domain/importResult"; +import { ImportResult } from "../models/domain/import-result"; import { BaseImporter } from "./baseImporter"; import { Importer } from "./importer"; diff --git a/libs/common/src/importers/keepass2XmlImporter.ts b/libs/common/src/importers/keepass2XmlImporter.ts index 2ed5d0f96f..b2ca001460 100644 --- a/libs/common/src/importers/keepass2XmlImporter.ts +++ b/libs/common/src/importers/keepass2XmlImporter.ts @@ -1,6 +1,6 @@ import { FieldType } from "../enums/fieldType"; -import { ImportResult } from "../models/domain/importResult"; -import { FolderView } from "../models/view/folderView"; +import { ImportResult } from "../models/domain/import-result"; +import { FolderView } from "../models/view/folder.view"; import { BaseImporter } from "./baseImporter"; import { Importer } from "./importer"; diff --git a/libs/common/src/importers/keepassxCsvImporter.ts b/libs/common/src/importers/keepassxCsvImporter.ts index 58640d5aed..22d118b227 100644 --- a/libs/common/src/importers/keepassxCsvImporter.ts +++ b/libs/common/src/importers/keepassxCsvImporter.ts @@ -1,4 +1,4 @@ -import { ImportResult } from "../models/domain/importResult"; +import { ImportResult } from "../models/domain/import-result"; import { BaseImporter } from "./baseImporter"; import { Importer } from "./importer"; diff --git a/libs/common/src/importers/keeperImporters/keeperCsvImporter.ts b/libs/common/src/importers/keeperImporters/keeperCsvImporter.ts index e9c65d7153..c87925216f 100644 --- a/libs/common/src/importers/keeperImporters/keeperCsvImporter.ts +++ b/libs/common/src/importers/keeperImporters/keeperCsvImporter.ts @@ -1,4 +1,4 @@ -import { ImportResult } from "../../models/domain/importResult"; +import { ImportResult } from "../../models/domain/import-result"; import { BaseImporter } from "../baseImporter"; import { Importer } from "../importer"; diff --git a/libs/common/src/importers/keeperImporters/keeperJsonImporter.ts b/libs/common/src/importers/keeperImporters/keeperJsonImporter.ts index 7ee80b08e0..0aed14824f 100644 --- a/libs/common/src/importers/keeperImporters/keeperJsonImporter.ts +++ b/libs/common/src/importers/keeperImporters/keeperJsonImporter.ts @@ -1,4 +1,4 @@ -import { ImportResult } from "../../models/domain/importResult"; +import { ImportResult } from "../../models/domain/import-result"; import { BaseImporter } from "../baseImporter"; import { Importer } from "../importer"; diff --git a/libs/common/src/importers/lastpassCsvImporter.ts b/libs/common/src/importers/lastpassCsvImporter.ts index 5c0160280f..6212837198 100644 --- a/libs/common/src/importers/lastpassCsvImporter.ts +++ b/libs/common/src/importers/lastpassCsvImporter.ts @@ -1,12 +1,12 @@ import { CipherType } from "../enums/cipherType"; import { SecureNoteType } from "../enums/secureNoteType"; -import { ImportResult } from "../models/domain/importResult"; -import { CardView } from "../models/view/cardView"; -import { CipherView } from "../models/view/cipherView"; -import { FolderView } from "../models/view/folderView"; -import { IdentityView } from "../models/view/identityView"; -import { LoginView } from "../models/view/loginView"; -import { SecureNoteView } from "../models/view/secureNoteView"; +import { ImportResult } from "../models/domain/import-result"; +import { CardView } from "../models/view/card.view"; +import { CipherView } from "../models/view/cipher.view"; +import { FolderView } from "../models/view/folder.view"; +import { IdentityView } from "../models/view/identity.view"; +import { LoginView } from "../models/view/login.view"; +import { SecureNoteView } from "../models/view/secure-note.view"; import { BaseImporter } from "./baseImporter"; import { Importer } from "./importer"; diff --git a/libs/common/src/importers/logMeOnceCsvImporter.ts b/libs/common/src/importers/logMeOnceCsvImporter.ts index 698ebc8020..5fdc0a388b 100644 --- a/libs/common/src/importers/logMeOnceCsvImporter.ts +++ b/libs/common/src/importers/logMeOnceCsvImporter.ts @@ -1,4 +1,4 @@ -import { ImportResult } from "../models/domain/importResult"; +import { ImportResult } from "../models/domain/import-result"; import { BaseImporter } from "./baseImporter"; import { Importer } from "./importer"; diff --git a/libs/common/src/importers/meldiumCsvImporter.ts b/libs/common/src/importers/meldiumCsvImporter.ts index 79835a90b3..1a30ca5cfe 100644 --- a/libs/common/src/importers/meldiumCsvImporter.ts +++ b/libs/common/src/importers/meldiumCsvImporter.ts @@ -1,4 +1,4 @@ -import { ImportResult } from "../models/domain/importResult"; +import { ImportResult } from "../models/domain/import-result"; import { BaseImporter } from "./baseImporter"; import { Importer } from "./importer"; diff --git a/libs/common/src/importers/msecureCsvImporter.ts b/libs/common/src/importers/msecureCsvImporter.ts index 583d13d7d9..a1bb403493 100644 --- a/libs/common/src/importers/msecureCsvImporter.ts +++ b/libs/common/src/importers/msecureCsvImporter.ts @@ -1,7 +1,7 @@ import { CipherType } from "../enums/cipherType"; import { SecureNoteType } from "../enums/secureNoteType"; -import { ImportResult } from "../models/domain/importResult"; -import { SecureNoteView } from "../models/view/secureNoteView"; +import { ImportResult } from "../models/domain/import-result"; +import { SecureNoteView } from "../models/view/secure-note.view"; import { BaseImporter } from "./baseImporter"; import { Importer } from "./importer"; diff --git a/libs/common/src/importers/mykiCsvImporter.ts b/libs/common/src/importers/mykiCsvImporter.ts index d9a05e1ebb..ec326b06f8 100644 --- a/libs/common/src/importers/mykiCsvImporter.ts +++ b/libs/common/src/importers/mykiCsvImporter.ts @@ -1,10 +1,10 @@ import { CipherType } from "../enums/cipherType"; import { SecureNoteType } from "../enums/secureNoteType"; -import { ImportResult } from "../models/domain/importResult"; -import { CardView } from "../models/view/cardView"; -import { CipherView } from "../models/view/cipherView"; -import { IdentityView } from "../models/view/identityView"; -import { SecureNoteView } from "../models/view/secureNoteView"; +import { ImportResult } from "../models/domain/import-result"; +import { CardView } from "../models/view/card.view"; +import { CipherView } from "../models/view/cipher.view"; +import { IdentityView } from "../models/view/identity.view"; +import { SecureNoteView } from "../models/view/secure-note.view"; import { BaseImporter } from "./baseImporter"; import { Importer } from "./importer"; diff --git a/libs/common/src/importers/nordpassCsvImporter.ts b/libs/common/src/importers/nordpassCsvImporter.ts index 225e7ec2ae..b41a2ea035 100644 --- a/libs/common/src/importers/nordpassCsvImporter.ts +++ b/libs/common/src/importers/nordpassCsvImporter.ts @@ -1,8 +1,8 @@ import { CipherType } from "../enums/cipherType"; import { SecureNoteType } from "../enums/secureNoteType"; -import { ImportResult } from "../models/domain/importResult"; -import { CipherView } from "../models/view/cipherView"; -import { LoginView } from "../models/view/loginView"; +import { ImportResult } from "../models/domain/import-result"; +import { CipherView } from "../models/view/cipher.view"; +import { LoginView } from "../models/view/login.view"; import { BaseImporter } from "./baseImporter"; import { Importer } from "./importer"; diff --git a/libs/common/src/importers/onepasswordImporters/cipherImportContext.ts b/libs/common/src/importers/onepasswordImporters/cipherImportContext.ts index 560f5c013b..4a8810205f 100644 --- a/libs/common/src/importers/onepasswordImporters/cipherImportContext.ts +++ b/libs/common/src/importers/onepasswordImporters/cipherImportContext.ts @@ -1,4 +1,4 @@ -import { CipherView } from "../../models/view/cipherView"; +import { CipherView } from "../../models/view/cipher.view"; export class CipherImportContext { lowerProperty: string; diff --git a/libs/common/src/importers/onepasswordImporters/onepassword1PifImporter.ts b/libs/common/src/importers/onepasswordImporters/onepassword1PifImporter.ts index f261140e27..298f14bd28 100644 --- a/libs/common/src/importers/onepasswordImporters/onepassword1PifImporter.ts +++ b/libs/common/src/importers/onepasswordImporters/onepassword1PifImporter.ts @@ -1,12 +1,12 @@ import { CipherType } from "../../enums/cipherType"; import { FieldType } from "../../enums/fieldType"; import { SecureNoteType } from "../../enums/secureNoteType"; -import { ImportResult } from "../../models/domain/importResult"; -import { CardView } from "../../models/view/cardView"; -import { CipherView } from "../../models/view/cipherView"; -import { IdentityView } from "../../models/view/identityView"; -import { PasswordHistoryView } from "../../models/view/passwordHistoryView"; -import { SecureNoteView } from "../../models/view/secureNoteView"; +import { ImportResult } from "../../models/domain/import-result"; +import { CardView } from "../../models/view/card.view"; +import { CipherView } from "../../models/view/cipher.view"; +import { IdentityView } from "../../models/view/identity.view"; +import { PasswordHistoryView } from "../../models/view/password-history.view"; +import { SecureNoteView } from "../../models/view/secure-note.view"; import { BaseImporter } from "../baseImporter"; import { Importer } from "../importer"; diff --git a/libs/common/src/importers/onepasswordImporters/onepassword1PuxImporter.ts b/libs/common/src/importers/onepasswordImporters/onepassword1PuxImporter.ts index 67f4bb2590..5c1f486966 100644 --- a/libs/common/src/importers/onepasswordImporters/onepassword1PuxImporter.ts +++ b/libs/common/src/importers/onepasswordImporters/onepassword1PuxImporter.ts @@ -2,13 +2,13 @@ import { CipherRepromptType } from "../../enums/cipherRepromptType"; import { CipherType } from "../../enums/cipherType"; import { FieldType } from "../../enums/fieldType"; import { SecureNoteType } from "../../enums/secureNoteType"; -import { ImportResult } from "../../models/domain/importResult"; -import { CardView } from "../../models/view/cardView"; -import { CipherView } from "../../models/view/cipherView"; -import { IdentityView } from "../../models/view/identityView"; -import { LoginView } from "../../models/view/loginView"; -import { PasswordHistoryView } from "../../models/view/passwordHistoryView"; -import { SecureNoteView } from "../../models/view/secureNoteView"; +import { ImportResult } from "../../models/domain/import-result"; +import { CardView } from "../../models/view/card.view"; +import { CipherView } from "../../models/view/cipher.view"; +import { IdentityView } from "../../models/view/identity.view"; +import { LoginView } from "../../models/view/login.view"; +import { PasswordHistoryView } from "../../models/view/password-history.view"; +import { SecureNoteView } from "../../models/view/secure-note.view"; import { BaseImporter } from "../baseImporter"; import { Importer } from "../importer"; diff --git a/libs/common/src/importers/onepasswordImporters/onepasswordCsvImporter.ts b/libs/common/src/importers/onepasswordImporters/onepasswordCsvImporter.ts index d28bdcccc5..44e7a3c3d4 100644 --- a/libs/common/src/importers/onepasswordImporters/onepasswordCsvImporter.ts +++ b/libs/common/src/importers/onepasswordImporters/onepasswordCsvImporter.ts @@ -1,7 +1,7 @@ import { CipherType } from "../../enums/cipherType"; import { FieldType } from "../../enums/fieldType"; -import { ImportResult } from "../../models/domain/importResult"; -import { CipherView } from "../../models/view/cipherView"; +import { ImportResult } from "../../models/domain/import-result"; +import { CipherView } from "../../models/view/cipher.view"; import { BaseImporter } from "../baseImporter"; import { Importer } from "../importer"; diff --git a/libs/common/src/importers/onepasswordImporters/onepasswordMacCsvImporter.ts b/libs/common/src/importers/onepasswordImporters/onepasswordMacCsvImporter.ts index 2135c80a34..ffd6284c14 100644 --- a/libs/common/src/importers/onepasswordImporters/onepasswordMacCsvImporter.ts +++ b/libs/common/src/importers/onepasswordImporters/onepasswordMacCsvImporter.ts @@ -1,7 +1,7 @@ import { CipherType } from "../../enums/cipherType"; -import { CardView } from "../../models/view/cardView"; -import { CipherView } from "../../models/view/cipherView"; -import { IdentityView } from "../../models/view/identityView"; +import { CardView } from "../../models/view/card.view"; +import { CipherView } from "../../models/view/cipher.view"; +import { IdentityView } from "../../models/view/identity.view"; import { Importer } from "../importer"; import { IgnoredProperties, OnePasswordCsvImporter } from "./onepasswordCsvImporter"; diff --git a/libs/common/src/importers/onepasswordImporters/onepasswordWinCsvImporter.ts b/libs/common/src/importers/onepasswordImporters/onepasswordWinCsvImporter.ts index 3b3d6454f0..3097c6587a 100644 --- a/libs/common/src/importers/onepasswordImporters/onepasswordWinCsvImporter.ts +++ b/libs/common/src/importers/onepasswordImporters/onepasswordWinCsvImporter.ts @@ -1,8 +1,8 @@ import { CipherType } from "../../enums/cipherType"; -import { CardView } from "../../models/view/cardView"; -import { CipherView } from "../../models/view/cipherView"; -import { IdentityView } from "../../models/view/identityView"; -import { LoginView } from "../../models/view/loginView"; +import { CardView } from "../../models/view/card.view"; +import { CipherView } from "../../models/view/cipher.view"; +import { IdentityView } from "../../models/view/identity.view"; +import { LoginView } from "../../models/view/login.view"; import { Importer } from "../importer"; import { CipherImportContext } from "./cipherImportContext"; diff --git a/libs/common/src/importers/padlockCsvImporter.ts b/libs/common/src/importers/padlockCsvImporter.ts index 821391cff3..d9d1b29711 100644 --- a/libs/common/src/importers/padlockCsvImporter.ts +++ b/libs/common/src/importers/padlockCsvImporter.ts @@ -1,5 +1,5 @@ -import { ImportResult } from "../models/domain/importResult"; -import { CollectionView } from "../models/view/collectionView"; +import { ImportResult } from "../models/domain/import-result"; +import { CollectionView } from "../models/view/collection.view"; import { BaseImporter } from "./baseImporter"; import { Importer } from "./importer"; diff --git a/libs/common/src/importers/passkeepCsvImporter.ts b/libs/common/src/importers/passkeepCsvImporter.ts index c93b3a42ee..9ba05246ad 100644 --- a/libs/common/src/importers/passkeepCsvImporter.ts +++ b/libs/common/src/importers/passkeepCsvImporter.ts @@ -1,4 +1,4 @@ -import { ImportResult } from "../models/domain/importResult"; +import { ImportResult } from "../models/domain/import-result"; import { BaseImporter } from "./baseImporter"; import { Importer } from "./importer"; diff --git a/libs/common/src/importers/passmanJsonImporter.ts b/libs/common/src/importers/passmanJsonImporter.ts index f8bc7106bd..bf5904bc5c 100644 --- a/libs/common/src/importers/passmanJsonImporter.ts +++ b/libs/common/src/importers/passmanJsonImporter.ts @@ -1,4 +1,4 @@ -import { ImportResult } from "../models/domain/importResult"; +import { ImportResult } from "../models/domain/import-result"; import { BaseImporter } from "./baseImporter"; import { Importer } from "./importer"; diff --git a/libs/common/src/importers/passpackCsvImporter.ts b/libs/common/src/importers/passpackCsvImporter.ts index 8efaa3c3e7..fb5282594f 100644 --- a/libs/common/src/importers/passpackCsvImporter.ts +++ b/libs/common/src/importers/passpackCsvImporter.ts @@ -1,5 +1,5 @@ -import { ImportResult } from "../models/domain/importResult"; -import { CollectionView } from "../models/view/collectionView"; +import { ImportResult } from "../models/domain/import-result"; +import { CollectionView } from "../models/view/collection.view"; import { BaseImporter } from "./baseImporter"; import { Importer } from "./importer"; diff --git a/libs/common/src/importers/passwordAgentCsvImporter.ts b/libs/common/src/importers/passwordAgentCsvImporter.ts index cc37f5dd30..9ac68e04ed 100644 --- a/libs/common/src/importers/passwordAgentCsvImporter.ts +++ b/libs/common/src/importers/passwordAgentCsvImporter.ts @@ -1,4 +1,4 @@ -import { ImportResult } from "../models/domain/importResult"; +import { ImportResult } from "../models/domain/import-result"; import { BaseImporter } from "./baseImporter"; import { Importer } from "./importer"; diff --git a/libs/common/src/importers/passwordBossJsonImporter.ts b/libs/common/src/importers/passwordBossJsonImporter.ts index d60a84fb06..3ec00c2543 100644 --- a/libs/common/src/importers/passwordBossJsonImporter.ts +++ b/libs/common/src/importers/passwordBossJsonImporter.ts @@ -1,7 +1,7 @@ import { CipherType } from "../enums/cipherType"; -import { ImportResult } from "../models/domain/importResult"; -import { CardView } from "../models/view/cardView"; -import { FolderView } from "../models/view/folderView"; +import { ImportResult } from "../models/domain/import-result"; +import { CardView } from "../models/view/card.view"; +import { FolderView } from "../models/view/folder.view"; import { BaseImporter } from "./baseImporter"; import { Importer } from "./importer"; diff --git a/libs/common/src/importers/passwordDragonXmlImporter.ts b/libs/common/src/importers/passwordDragonXmlImporter.ts index 433950ad5f..1fa3dd60d0 100644 --- a/libs/common/src/importers/passwordDragonXmlImporter.ts +++ b/libs/common/src/importers/passwordDragonXmlImporter.ts @@ -1,4 +1,4 @@ -import { ImportResult } from "../models/domain/importResult"; +import { ImportResult } from "../models/domain/import-result"; import { BaseImporter } from "./baseImporter"; import { Importer } from "./importer"; diff --git a/libs/common/src/importers/passwordSafeXmlImporter.ts b/libs/common/src/importers/passwordSafeXmlImporter.ts index b7aa935879..ccbc059325 100644 --- a/libs/common/src/importers/passwordSafeXmlImporter.ts +++ b/libs/common/src/importers/passwordSafeXmlImporter.ts @@ -1,4 +1,4 @@ -import { ImportResult } from "../models/domain/importResult"; +import { ImportResult } from "../models/domain/import-result"; import { BaseImporter } from "./baseImporter"; import { Importer } from "./importer"; diff --git a/libs/common/src/importers/passwordWalletTxtImporter.ts b/libs/common/src/importers/passwordWalletTxtImporter.ts index b5940372a2..55902b9ebf 100644 --- a/libs/common/src/importers/passwordWalletTxtImporter.ts +++ b/libs/common/src/importers/passwordWalletTxtImporter.ts @@ -1,4 +1,4 @@ -import { ImportResult } from "../models/domain/importResult"; +import { ImportResult } from "../models/domain/import-result"; import { BaseImporter } from "./baseImporter"; import { Importer } from "./importer"; diff --git a/libs/common/src/importers/rememBearCsvImporter.ts b/libs/common/src/importers/rememBearCsvImporter.ts index 3f7dc464f3..4fe3e9a0a5 100644 --- a/libs/common/src/importers/rememBearCsvImporter.ts +++ b/libs/common/src/importers/rememBearCsvImporter.ts @@ -1,6 +1,6 @@ import { CipherType } from "../enums/cipherType"; -import { ImportResult } from "../models/domain/importResult"; -import { CardView } from "../models/view/cardView"; +import { ImportResult } from "../models/domain/import-result"; +import { CardView } from "../models/view/card.view"; import { BaseImporter } from "./baseImporter"; import { Importer } from "./importer"; diff --git a/libs/common/src/importers/roboformCsvImporter.ts b/libs/common/src/importers/roboformCsvImporter.ts index c5279e2b1c..cfc0022a12 100644 --- a/libs/common/src/importers/roboformCsvImporter.ts +++ b/libs/common/src/importers/roboformCsvImporter.ts @@ -1,4 +1,4 @@ -import { ImportResult } from "../models/domain/importResult"; +import { ImportResult } from "../models/domain/import-result"; import { BaseImporter } from "./baseImporter"; import { Importer } from "./importer"; diff --git a/libs/common/src/importers/safariCsvImporter.ts b/libs/common/src/importers/safariCsvImporter.ts index 786b282783..41d67f3b17 100644 --- a/libs/common/src/importers/safariCsvImporter.ts +++ b/libs/common/src/importers/safariCsvImporter.ts @@ -1,4 +1,4 @@ -import { ImportResult } from "../models/domain/importResult"; +import { ImportResult } from "../models/domain/import-result"; import { BaseImporter } from "./baseImporter"; import { Importer } from "./importer"; diff --git a/libs/common/src/importers/safeInCloudXmlImporter.ts b/libs/common/src/importers/safeInCloudXmlImporter.ts index 3e5a819938..800162c218 100644 --- a/libs/common/src/importers/safeInCloudXmlImporter.ts +++ b/libs/common/src/importers/safeInCloudXmlImporter.ts @@ -1,11 +1,11 @@ import { CipherType } from "../enums/cipherType"; import { FieldType } from "../enums/fieldType"; import { SecureNoteType } from "../enums/secureNoteType"; -import { ImportResult } from "../models/domain/importResult"; -import { CipherView } from "../models/view/cipherView"; -import { FieldView } from "../models/view/fieldView"; -import { FolderView } from "../models/view/folderView"; -import { SecureNoteView } from "../models/view/secureNoteView"; +import { ImportResult } from "../models/domain/import-result"; +import { CipherView } from "../models/view/cipher.view"; +import { FieldView } from "../models/view/field.view"; +import { FolderView } from "../models/view/folder.view"; +import { SecureNoteView } from "../models/view/secure-note.view"; import { BaseImporter } from "./baseImporter"; import { Importer } from "./importer"; diff --git a/libs/common/src/importers/saferpassCsvImport.ts b/libs/common/src/importers/saferpassCsvImport.ts index 6d962ba1b5..1de578ee08 100644 --- a/libs/common/src/importers/saferpassCsvImport.ts +++ b/libs/common/src/importers/saferpassCsvImport.ts @@ -1,4 +1,4 @@ -import { ImportResult } from "../models/domain/importResult"; +import { ImportResult } from "../models/domain/import-result"; import { BaseImporter } from "./baseImporter"; import { Importer } from "./importer"; diff --git a/libs/common/src/importers/secureSafeCsvImporter.ts b/libs/common/src/importers/secureSafeCsvImporter.ts index 8d0ac1fee6..b072b98784 100644 --- a/libs/common/src/importers/secureSafeCsvImporter.ts +++ b/libs/common/src/importers/secureSafeCsvImporter.ts @@ -1,4 +1,4 @@ -import { ImportResult } from "../models/domain/importResult"; +import { ImportResult } from "../models/domain/import-result"; import { BaseImporter } from "./baseImporter"; import { Importer } from "./importer"; diff --git a/libs/common/src/importers/splashIdCsvImporter.ts b/libs/common/src/importers/splashIdCsvImporter.ts index df1118d178..241175b079 100644 --- a/libs/common/src/importers/splashIdCsvImporter.ts +++ b/libs/common/src/importers/splashIdCsvImporter.ts @@ -1,5 +1,5 @@ -import { ImportResult } from "../models/domain/importResult"; -import { CipherView } from "../models/view/cipherView"; +import { ImportResult } from "../models/domain/import-result"; +import { CipherView } from "../models/view/cipher.view"; import { BaseImporter } from "./baseImporter"; import { Importer } from "./importer"; diff --git a/libs/common/src/importers/stickyPasswordXmlImporter.ts b/libs/common/src/importers/stickyPasswordXmlImporter.ts index caaa33702f..c2ce183655 100644 --- a/libs/common/src/importers/stickyPasswordXmlImporter.ts +++ b/libs/common/src/importers/stickyPasswordXmlImporter.ts @@ -1,4 +1,4 @@ -import { ImportResult } from "../models/domain/importResult"; +import { ImportResult } from "../models/domain/import-result"; import { BaseImporter } from "./baseImporter"; import { Importer } from "./importer"; diff --git a/libs/common/src/importers/truekeyCsvImporter.ts b/libs/common/src/importers/truekeyCsvImporter.ts index d28af7af07..dabfa4d3a4 100644 --- a/libs/common/src/importers/truekeyCsvImporter.ts +++ b/libs/common/src/importers/truekeyCsvImporter.ts @@ -1,8 +1,8 @@ import { CipherType } from "../enums/cipherType"; import { SecureNoteType } from "../enums/secureNoteType"; -import { ImportResult } from "../models/domain/importResult"; -import { CardView } from "../models/view/cardView"; -import { SecureNoteView } from "../models/view/secureNoteView"; +import { ImportResult } from "../models/domain/import-result"; +import { CardView } from "../models/view/card.view"; +import { SecureNoteView } from "../models/view/secure-note.view"; import { BaseImporter } from "./baseImporter"; import { Importer } from "./importer"; diff --git a/libs/common/src/importers/upmCsvImporter.ts b/libs/common/src/importers/upmCsvImporter.ts index ea092ffcb7..4a11bee69e 100644 --- a/libs/common/src/importers/upmCsvImporter.ts +++ b/libs/common/src/importers/upmCsvImporter.ts @@ -1,4 +1,4 @@ -import { ImportResult } from "../models/domain/importResult"; +import { ImportResult } from "../models/domain/import-result"; import { BaseImporter } from "./baseImporter"; import { Importer } from "./importer"; diff --git a/libs/common/src/importers/yotiCsvImporter.ts b/libs/common/src/importers/yotiCsvImporter.ts index 526f7d6928..ba74fb98c0 100644 --- a/libs/common/src/importers/yotiCsvImporter.ts +++ b/libs/common/src/importers/yotiCsvImporter.ts @@ -1,4 +1,4 @@ -import { ImportResult } from "../models/domain/importResult"; +import { ImportResult } from "../models/domain/import-result"; import { BaseImporter } from "./baseImporter"; import { Importer } from "./importer"; diff --git a/libs/common/src/importers/zohoVaultCsvImporter.ts b/libs/common/src/importers/zohoVaultCsvImporter.ts index 18008e8072..0484353edf 100644 --- a/libs/common/src/importers/zohoVaultCsvImporter.ts +++ b/libs/common/src/importers/zohoVaultCsvImporter.ts @@ -1,5 +1,5 @@ -import { ImportResult } from "../models/domain/importResult"; -import { CipherView } from "../models/view/cipherView"; +import { ImportResult } from "../models/domain/import-result"; +import { CipherView } from "../models/view/cipher.view"; import { BaseImporter } from "./baseImporter"; import { Importer } from "./importer"; diff --git a/libs/common/src/misc/linkedFieldOption.decorator.ts b/libs/common/src/misc/linkedFieldOption.decorator.ts index 4383631875..5296698a12 100644 --- a/libs/common/src/misc/linkedFieldOption.decorator.ts +++ b/libs/common/src/misc/linkedFieldOption.decorator.ts @@ -1,5 +1,5 @@ import { LinkedIdType } from "../enums/linkedIdType"; -import { ItemView } from "../models/view/itemView"; +import { ItemView } from "../models/view/item.view"; export class LinkedMetadata { constructor(readonly propertyKey: string, private readonly _i18nKey?: string) {} diff --git a/libs/common/src/misc/logInStrategies/apiLogin.strategy.ts b/libs/common/src/misc/logInStrategies/apiLogin.strategy.ts index 89ebc37910..2ca090930c 100644 --- a/libs/common/src/misc/logInStrategies/apiLogin.strategy.ts +++ b/libs/common/src/misc/logInStrategies/apiLogin.strategy.ts @@ -9,7 +9,7 @@ import { PlatformUtilsService } from "../../abstractions/platformUtils.service"; import { StateService } from "../../abstractions/state.service"; import { TokenService } from "../../abstractions/token.service"; import { TwoFactorService } from "../../abstractions/twoFactor.service"; -import { ApiLogInCredentials } from "../../models/domain/logInCredentials"; +import { ApiLogInCredentials } from "../../models/domain/log-in-credentials"; import { ApiTokenRequest } from "../../models/request/identityToken/apiTokenRequest"; import { IdentityTokenResponse } from "../../models/response/identityTokenResponse"; diff --git a/libs/common/src/misc/logInStrategies/logIn.strategy.ts b/libs/common/src/misc/logInStrategies/logIn.strategy.ts index 577130156f..8c199be0de 100644 --- a/libs/common/src/misc/logInStrategies/logIn.strategy.ts +++ b/libs/common/src/misc/logInStrategies/logIn.strategy.ts @@ -9,13 +9,13 @@ import { TokenService } from "../../abstractions/token.service"; import { TwoFactorService } from "../../abstractions/twoFactor.service"; import { TwoFactorProviderType } from "../../enums/twoFactorProviderType"; import { Account, AccountProfile, AccountTokens } from "../../models/domain/account"; -import { AuthResult } from "../../models/domain/authResult"; +import { AuthResult } from "../../models/domain/auth-result"; import { ApiLogInCredentials, PasswordLogInCredentials, SsoLogInCredentials, PasswordlessLogInCredentials, -} from "../../models/domain/logInCredentials"; +} from "../../models/domain/log-in-credentials"; import { DeviceRequest } from "../../models/request/deviceRequest"; import { ApiTokenRequest } from "../../models/request/identityToken/apiTokenRequest"; import { PasswordTokenRequest } from "../../models/request/identityToken/passwordTokenRequest"; diff --git a/libs/common/src/misc/logInStrategies/passwordLogin.strategy.ts b/libs/common/src/misc/logInStrategies/passwordLogin.strategy.ts index 81947e562d..d2ed8bd869 100644 --- a/libs/common/src/misc/logInStrategies/passwordLogin.strategy.ts +++ b/libs/common/src/misc/logInStrategies/passwordLogin.strategy.ts @@ -9,9 +9,9 @@ import { StateService } from "../../abstractions/state.service"; import { TokenService } from "../../abstractions/token.service"; import { TwoFactorService } from "../../abstractions/twoFactor.service"; import { HashPurpose } from "../../enums/hashPurpose"; -import { AuthResult } from "../../models/domain/authResult"; -import { PasswordLogInCredentials } from "../../models/domain/logInCredentials"; -import { SymmetricCryptoKey } from "../../models/domain/symmetricCryptoKey"; +import { AuthResult } from "../../models/domain/auth-result"; +import { PasswordLogInCredentials } from "../../models/domain/log-in-credentials"; +import { SymmetricCryptoKey } from "../../models/domain/symmetric-crypto-key"; import { PasswordTokenRequest } from "../../models/request/identityToken/passwordTokenRequest"; import { TokenRequestTwoFactor } from "../../models/request/identityToken/tokenRequestTwoFactor"; diff --git a/libs/common/src/misc/logInStrategies/passwordlessLogin.strategy.ts b/libs/common/src/misc/logInStrategies/passwordlessLogin.strategy.ts index 0acc4a49f0..41fcbc292a 100644 --- a/libs/common/src/misc/logInStrategies/passwordlessLogin.strategy.ts +++ b/libs/common/src/misc/logInStrategies/passwordlessLogin.strategy.ts @@ -8,9 +8,9 @@ import { PlatformUtilsService } from "../../abstractions/platformUtils.service"; import { StateService } from "../../abstractions/state.service"; import { TokenService } from "../../abstractions/token.service"; import { TwoFactorService } from "../../abstractions/twoFactor.service"; -import { AuthResult } from "../../models/domain/authResult"; -import { PasswordlessLogInCredentials } from "../../models/domain/logInCredentials"; -import { SymmetricCryptoKey } from "../../models/domain/symmetricCryptoKey"; +import { AuthResult } from "../../models/domain/auth-result"; +import { PasswordlessLogInCredentials } from "../../models/domain/log-in-credentials"; +import { SymmetricCryptoKey } from "../../models/domain/symmetric-crypto-key"; import { PasswordTokenRequest } from "../../models/request/identityToken/passwordTokenRequest"; import { TokenRequestTwoFactor } from "../../models/request/identityToken/tokenRequestTwoFactor"; diff --git a/libs/common/src/misc/logInStrategies/ssoLogin.strategy.ts b/libs/common/src/misc/logInStrategies/ssoLogin.strategy.ts index e56bd7a3d1..48be06a0d9 100644 --- a/libs/common/src/misc/logInStrategies/ssoLogin.strategy.ts +++ b/libs/common/src/misc/logInStrategies/ssoLogin.strategy.ts @@ -8,7 +8,7 @@ import { PlatformUtilsService } from "../../abstractions/platformUtils.service"; import { StateService } from "../../abstractions/state.service"; import { TokenService } from "../../abstractions/token.service"; import { TwoFactorService } from "../../abstractions/twoFactor.service"; -import { SsoLogInCredentials } from "../../models/domain/logInCredentials"; +import { SsoLogInCredentials } from "../../models/domain/log-in-credentials"; import { SsoTokenRequest } from "../../models/request/identityToken/ssoTokenRequest"; import { IdentityTokenResponse } from "../../models/response/identityTokenResponse"; diff --git a/libs/common/src/misc/serviceUtils.ts b/libs/common/src/misc/serviceUtils.ts index b6c0509237..b8c0ef384a 100644 --- a/libs/common/src/misc/serviceUtils.ts +++ b/libs/common/src/misc/serviceUtils.ts @@ -1,4 +1,4 @@ -import { ITreeNodeObject, TreeNode } from "../models/domain/treeNode"; +import { ITreeNodeObject, TreeNode } from "../models/domain/tree-node"; export class ServiceUtils { static nestedTraverse( diff --git a/libs/common/src/models/api/billingSyncConfigApi.ts b/libs/common/src/models/api/billing-sync-config.api.ts similarity index 100% rename from libs/common/src/models/api/billingSyncConfigApi.ts rename to libs/common/src/models/api/billing-sync-config.api.ts diff --git a/libs/common/src/models/api/cardApi.ts b/libs/common/src/models/api/card.api.ts similarity index 100% rename from libs/common/src/models/api/cardApi.ts rename to libs/common/src/models/api/card.api.ts diff --git a/libs/common/src/models/api/fieldApi.ts b/libs/common/src/models/api/field.api.ts similarity index 100% rename from libs/common/src/models/api/fieldApi.ts rename to libs/common/src/models/api/field.api.ts diff --git a/libs/common/src/models/api/identityApi.ts b/libs/common/src/models/api/identity.api.ts similarity index 100% rename from libs/common/src/models/api/identityApi.ts rename to libs/common/src/models/api/identity.api.ts diff --git a/libs/common/src/models/api/loginUriApi.ts b/libs/common/src/models/api/login-uri.api.ts similarity index 100% rename from libs/common/src/models/api/loginUriApi.ts rename to libs/common/src/models/api/login-uri.api.ts diff --git a/libs/common/src/models/api/loginApi.ts b/libs/common/src/models/api/login.api.ts similarity index 94% rename from libs/common/src/models/api/loginApi.ts rename to libs/common/src/models/api/login.api.ts index ddbe37ec9b..5278e5bd98 100644 --- a/libs/common/src/models/api/loginApi.ts +++ b/libs/common/src/models/api/login.api.ts @@ -1,6 +1,6 @@ import { BaseResponse } from "../response/baseResponse"; -import { LoginUriApi } from "./loginUriApi"; +import { LoginUriApi } from "./login-uri.api"; export class LoginApi extends BaseResponse { uris: LoginUriApi[]; diff --git a/libs/common/src/models/api/permissionsApi.ts b/libs/common/src/models/api/permissions.api.ts similarity index 100% rename from libs/common/src/models/api/permissionsApi.ts rename to libs/common/src/models/api/permissions.api.ts diff --git a/libs/common/src/models/api/scimConfigApi.ts b/libs/common/src/models/api/scim-config.api.ts similarity index 100% rename from libs/common/src/models/api/scimConfigApi.ts rename to libs/common/src/models/api/scim-config.api.ts diff --git a/libs/common/src/models/api/secureNoteApi.ts b/libs/common/src/models/api/secure-note.api.ts similarity index 100% rename from libs/common/src/models/api/secureNoteApi.ts rename to libs/common/src/models/api/secure-note.api.ts diff --git a/libs/common/src/models/api/sendFileApi.ts b/libs/common/src/models/api/send-file.api.ts similarity index 100% rename from libs/common/src/models/api/sendFileApi.ts rename to libs/common/src/models/api/send-file.api.ts diff --git a/libs/common/src/models/api/sendTextApi.ts b/libs/common/src/models/api/send-text.api.ts similarity index 100% rename from libs/common/src/models/api/sendTextApi.ts rename to libs/common/src/models/api/send-text.api.ts diff --git a/libs/common/src/models/api/ssoConfigApi.ts b/libs/common/src/models/api/sso-config.api.ts similarity index 99% rename from libs/common/src/models/api/ssoConfigApi.ts rename to libs/common/src/models/api/sso-config.api.ts index 0767f3d672..4ead9f3944 100644 --- a/libs/common/src/models/api/ssoConfigApi.ts +++ b/libs/common/src/models/api/sso-config.api.ts @@ -6,7 +6,7 @@ import { SsoType, } from "../../enums/ssoEnums"; import { BaseResponse } from "../response/baseResponse"; -import { SsoConfigView } from "../view/ssoConfigView"; +import { SsoConfigView } from "../view/sso-config.view"; export class SsoConfigApi extends BaseResponse { static fromView(view: SsoConfigView, api = new SsoConfigApi()) { diff --git a/libs/common/src/models/data/attachmentData.ts b/libs/common/src/models/data/attachment.data.ts similarity index 100% rename from libs/common/src/models/data/attachmentData.ts rename to libs/common/src/models/data/attachment.data.ts diff --git a/libs/common/src/models/data/cardData.ts b/libs/common/src/models/data/card.data.ts similarity index 90% rename from libs/common/src/models/data/cardData.ts rename to libs/common/src/models/data/card.data.ts index 9d90e4b2c9..fe80003a8f 100644 --- a/libs/common/src/models/data/cardData.ts +++ b/libs/common/src/models/data/card.data.ts @@ -1,4 +1,4 @@ -import { CardApi } from "../api/cardApi"; +import { CardApi } from "../api/card.api"; export class CardData { cardholderName: string; diff --git a/libs/common/src/models/data/cipherData.ts b/libs/common/src/models/data/cipher.data.ts similarity index 87% rename from libs/common/src/models/data/cipherData.ts rename to libs/common/src/models/data/cipher.data.ts index 34815a6596..c03d83476d 100644 --- a/libs/common/src/models/data/cipherData.ts +++ b/libs/common/src/models/data/cipher.data.ts @@ -2,13 +2,13 @@ import { CipherRepromptType } from "../../enums/cipherRepromptType"; import { CipherType } from "../../enums/cipherType"; import { CipherResponse } from "../response/cipherResponse"; -import { AttachmentData } from "./attachmentData"; -import { CardData } from "./cardData"; -import { FieldData } from "./fieldData"; -import { IdentityData } from "./identityData"; -import { LoginData } from "./loginData"; -import { PasswordHistoryData } from "./passwordHistoryData"; -import { SecureNoteData } from "./secureNoteData"; +import { AttachmentData } from "./attachment.data"; +import { CardData } from "./card.data"; +import { FieldData } from "./field.data"; +import { IdentityData } from "./identity.data"; +import { LoginData } from "./login.data"; +import { PasswordHistoryData } from "./password-history.data"; +import { SecureNoteData } from "./secure-note.data"; export class CipherData { id: string; diff --git a/libs/common/src/models/data/collectionData.ts b/libs/common/src/models/data/collection.data.ts similarity index 100% rename from libs/common/src/models/data/collectionData.ts rename to libs/common/src/models/data/collection.data.ts diff --git a/libs/common/src/models/data/encryptedOrganizationKeyData.ts b/libs/common/src/models/data/encrypted-organization-key.data.ts similarity index 100% rename from libs/common/src/models/data/encryptedOrganizationKeyData.ts rename to libs/common/src/models/data/encrypted-organization-key.data.ts diff --git a/libs/common/src/models/data/eventData.ts b/libs/common/src/models/data/event.data.ts similarity index 100% rename from libs/common/src/models/data/eventData.ts rename to libs/common/src/models/data/event.data.ts diff --git a/libs/common/src/models/data/fieldData.ts b/libs/common/src/models/data/field.data.ts similarity index 90% rename from libs/common/src/models/data/fieldData.ts rename to libs/common/src/models/data/field.data.ts index 6bec9def08..42e800cf6c 100644 --- a/libs/common/src/models/data/fieldData.ts +++ b/libs/common/src/models/data/field.data.ts @@ -1,6 +1,6 @@ import { FieldType } from "../../enums/fieldType"; import { LinkedIdType } from "../../enums/linkedIdType"; -import { FieldApi } from "../api/fieldApi"; +import { FieldApi } from "../api/field.api"; export class FieldData { type: FieldType; diff --git a/libs/common/src/models/data/folderData.ts b/libs/common/src/models/data/folder.data.ts similarity index 100% rename from libs/common/src/models/data/folderData.ts rename to libs/common/src/models/data/folder.data.ts diff --git a/libs/common/src/models/data/identityData.ts b/libs/common/src/models/data/identity.data.ts similarity index 95% rename from libs/common/src/models/data/identityData.ts rename to libs/common/src/models/data/identity.data.ts index 02aa7eb66c..620ec2ec43 100644 --- a/libs/common/src/models/data/identityData.ts +++ b/libs/common/src/models/data/identity.data.ts @@ -1,4 +1,4 @@ -import { IdentityApi } from "../api/identityApi"; +import { IdentityApi } from "../api/identity.api"; export class IdentityData { title: string; diff --git a/libs/common/src/models/data/localData.ts b/libs/common/src/models/data/local.data.ts similarity index 100% rename from libs/common/src/models/data/localData.ts rename to libs/common/src/models/data/local.data.ts diff --git a/libs/common/src/models/data/loginUriData.ts b/libs/common/src/models/data/login-uri.data.ts similarity index 83% rename from libs/common/src/models/data/loginUriData.ts rename to libs/common/src/models/data/login-uri.data.ts index 874db4e818..25db2146fb 100644 --- a/libs/common/src/models/data/loginUriData.ts +++ b/libs/common/src/models/data/login-uri.data.ts @@ -1,5 +1,5 @@ import { UriMatchType } from "../../enums/uriMatchType"; -import { LoginUriApi } from "../api/loginUriApi"; +import { LoginUriApi } from "../api/login-uri.api"; export class LoginUriData { uri: string; diff --git a/libs/common/src/models/data/loginData.ts b/libs/common/src/models/data/login.data.ts similarity index 85% rename from libs/common/src/models/data/loginData.ts rename to libs/common/src/models/data/login.data.ts index e51180c8b0..a15b1f2ed6 100644 --- a/libs/common/src/models/data/loginData.ts +++ b/libs/common/src/models/data/login.data.ts @@ -1,6 +1,6 @@ -import { LoginApi } from "../api/loginApi"; +import { LoginApi } from "../api/login.api"; -import { LoginUriData } from "./loginUriData"; +import { LoginUriData } from "./login-uri.data"; export class LoginData { uris: LoginUriData[]; diff --git a/libs/common/src/models/data/organizationData.ts b/libs/common/src/models/data/organization.data.ts similarity index 98% rename from libs/common/src/models/data/organizationData.ts rename to libs/common/src/models/data/organization.data.ts index 5d5e522959..737bc0e8b6 100644 --- a/libs/common/src/models/data/organizationData.ts +++ b/libs/common/src/models/data/organization.data.ts @@ -1,7 +1,7 @@ import { OrganizationUserStatusType } from "../../enums/organizationUserStatusType"; import { OrganizationUserType } from "../../enums/organizationUserType"; import { ProductType } from "../../enums/productType"; -import { PermissionsApi } from "../api/permissionsApi"; +import { PermissionsApi } from "../api/permissions.api"; import { ProfileOrganizationResponse } from "../response/profileOrganizationResponse"; export class OrganizationData { diff --git a/libs/common/src/models/data/passwordHistoryData.ts b/libs/common/src/models/data/password-history.data.ts similarity index 100% rename from libs/common/src/models/data/passwordHistoryData.ts rename to libs/common/src/models/data/password-history.data.ts diff --git a/libs/common/src/models/data/policyData.ts b/libs/common/src/models/data/policy.data.ts similarity index 100% rename from libs/common/src/models/data/policyData.ts rename to libs/common/src/models/data/policy.data.ts diff --git a/libs/common/src/models/data/providerData.ts b/libs/common/src/models/data/provider.data.ts similarity index 100% rename from libs/common/src/models/data/providerData.ts rename to libs/common/src/models/data/provider.data.ts diff --git a/libs/common/src/models/data/secureNoteData.ts b/libs/common/src/models/data/secure-note.data.ts similarity index 80% rename from libs/common/src/models/data/secureNoteData.ts rename to libs/common/src/models/data/secure-note.data.ts index f536b2de5d..c09f584705 100644 --- a/libs/common/src/models/data/secureNoteData.ts +++ b/libs/common/src/models/data/secure-note.data.ts @@ -1,5 +1,5 @@ import { SecureNoteType } from "../../enums/secureNoteType"; -import { SecureNoteApi } from "../api/secureNoteApi"; +import { SecureNoteApi } from "../api/secure-note.api"; export class SecureNoteData { type: SecureNoteType; diff --git a/libs/common/src/models/data/sendFileData.ts b/libs/common/src/models/data/send-file.data.ts similarity index 85% rename from libs/common/src/models/data/sendFileData.ts rename to libs/common/src/models/data/send-file.data.ts index aaf868c19d..5cdc9b19bb 100644 --- a/libs/common/src/models/data/sendFileData.ts +++ b/libs/common/src/models/data/send-file.data.ts @@ -1,4 +1,4 @@ -import { SendFileApi } from "../api/sendFileApi"; +import { SendFileApi } from "../api/send-file.api"; export class SendFileData { id: string; diff --git a/libs/common/src/models/data/sendTextData.ts b/libs/common/src/models/data/send-text.data.ts similarity index 80% rename from libs/common/src/models/data/sendTextData.ts rename to libs/common/src/models/data/send-text.data.ts index fedf2ed616..8e7335cde5 100644 --- a/libs/common/src/models/data/sendTextData.ts +++ b/libs/common/src/models/data/send-text.data.ts @@ -1,4 +1,4 @@ -import { SendTextApi } from "../api/sendTextApi"; +import { SendTextApi } from "../api/send-text.api"; export class SendTextData { text: string; diff --git a/libs/common/src/models/data/sendData.ts b/libs/common/src/models/data/send.data.ts similarity index 93% rename from libs/common/src/models/data/sendData.ts rename to libs/common/src/models/data/send.data.ts index 4c3bb8b2ff..752a1dcf9a 100644 --- a/libs/common/src/models/data/sendData.ts +++ b/libs/common/src/models/data/send.data.ts @@ -1,8 +1,8 @@ import { SendType } from "../../enums/sendType"; import { SendResponse } from "../response/sendResponse"; -import { SendFileData } from "./sendFileData"; -import { SendTextData } from "./sendTextData"; +import { SendFileData } from "./send-file.data"; +import { SendTextData } from "./send-text.data"; export class SendData { id: string; diff --git a/libs/common/src/models/domain/account-keys.spec.ts b/libs/common/src/models/domain/account-keys.spec.ts index c3c69e1908..8dac20d4eb 100644 --- a/libs/common/src/models/domain/account-keys.spec.ts +++ b/libs/common/src/models/domain/account-keys.spec.ts @@ -2,7 +2,7 @@ import { makeStaticByteArray } from "../../../spec/utils"; import { Utils } from "../../misc/utils"; import { AccountKeys, EncryptionPair } from "./account"; -import { SymmetricCryptoKey } from "./symmetricCryptoKey"; +import { SymmetricCryptoKey } from "./symmetric-crypto-key"; describe("AccountKeys", () => { describe("toJSON", () => { diff --git a/libs/common/src/models/domain/account-settings.spec.ts b/libs/common/src/models/domain/account-settings.spec.ts index 544d591b32..b108bf6d6d 100644 --- a/libs/common/src/models/domain/account-settings.spec.ts +++ b/libs/common/src/models/domain/account-settings.spec.ts @@ -1,5 +1,5 @@ import { AccountSettings, EncryptionPair } from "./account"; -import { EncString } from "./encString"; +import { EncString } from "./enc-string"; describe("AccountSettings", () => { describe("fromJSON", () => { diff --git a/libs/common/src/models/domain/account.ts b/libs/common/src/models/domain/account.ts index 754eda7391..49bb55d938 100644 --- a/libs/common/src/models/domain/account.ts +++ b/libs/common/src/models/domain/account.ts @@ -5,25 +5,25 @@ import { KdfType } from "../../enums/kdfType"; import { UriMatchType } from "../../enums/uriMatchType"; import { Utils } from "../../misc/utils"; import { DeepJsonify } from "../../types/deep-jsonify"; -import { CipherData } from "../data/cipherData"; -import { CollectionData } from "../data/collectionData"; -import { EncryptedOrganizationKeyData } from "../data/encryptedOrganizationKeyData"; -import { EventData } from "../data/eventData"; -import { FolderData } from "../data/folderData"; -import { OrganizationData } from "../data/organizationData"; -import { PolicyData } from "../data/policyData"; -import { ProviderData } from "../data/providerData"; -import { SendData } from "../data/sendData"; +import { CipherData } from "../data/cipher.data"; +import { CollectionData } from "../data/collection.data"; +import { EncryptedOrganizationKeyData } from "../data/encrypted-organization-key.data"; +import { EventData } from "../data/event.data"; +import { FolderData } from "../data/folder.data"; +import { OrganizationData } from "../data/organization.data"; +import { PolicyData } from "../data/policy.data"; +import { ProviderData } from "../data/provider.data"; +import { SendData } from "../data/send.data"; import { ServerConfigData } from "../data/server-config.data"; -import { CipherView } from "../view/cipherView"; -import { CollectionView } from "../view/collectionView"; -import { SendView } from "../view/sendView"; +import { CipherView } from "../view/cipher.view"; +import { CollectionView } from "../view/collection.view"; +import { SendView } from "../view/send.view"; -import { EncString } from "./encString"; -import { EnvironmentUrls } from "./environmentUrls"; -import { GeneratedPasswordHistory } from "./generatedPasswordHistory"; +import { EncString } from "./enc-string"; +import { EnvironmentUrls } from "./environment-urls"; +import { GeneratedPasswordHistory } from "./generated-password-history"; import { Policy } from "./policy"; -import { SymmetricCryptoKey } from "./symmetricCryptoKey"; +import { SymmetricCryptoKey } from "./symmetric-crypto-key"; export class EncryptionPair { encrypted?: TEncrypted; diff --git a/libs/common/src/models/domain/attachment.ts b/libs/common/src/models/domain/attachment.ts index 4ac8fed62e..a3fc69f55d 100644 --- a/libs/common/src/models/domain/attachment.ts +++ b/libs/common/src/models/domain/attachment.ts @@ -1,12 +1,12 @@ import { Jsonify } from "type-fest"; import { Utils } from "../../misc/utils"; -import { AttachmentData } from "../data/attachmentData"; -import { AttachmentView } from "../view/attachmentView"; +import { AttachmentData } from "../data/attachment.data"; +import { AttachmentView } from "../view/attachment.view"; -import Domain from "./domainBase"; -import { EncString } from "./encString"; -import { SymmetricCryptoKey } from "./symmetricCryptoKey"; +import Domain from "./domain-base"; +import { EncString } from "./enc-string"; +import { SymmetricCryptoKey } from "./symmetric-crypto-key"; export class Attachment extends Domain { id: string; diff --git a/libs/common/src/models/domain/authResult.ts b/libs/common/src/models/domain/auth-result.ts similarity index 100% rename from libs/common/src/models/domain/authResult.ts rename to libs/common/src/models/domain/auth-result.ts diff --git a/libs/common/src/models/domain/card.ts b/libs/common/src/models/domain/card.ts index 4c09532e03..4b8ca11309 100644 --- a/libs/common/src/models/domain/card.ts +++ b/libs/common/src/models/domain/card.ts @@ -1,11 +1,11 @@ import { Jsonify } from "type-fest"; -import { CardData } from "../data/cardData"; -import { CardView } from "../view/cardView"; +import { CardData } from "../data/card.data"; +import { CardView } from "../view/card.view"; -import Domain from "./domainBase"; -import { EncString } from "./encString"; -import { SymmetricCryptoKey } from "./symmetricCryptoKey"; +import Domain from "./domain-base"; +import { EncString } from "./enc-string"; +import { SymmetricCryptoKey } from "./symmetric-crypto-key"; export class Card extends Domain { cardholderName: EncString; diff --git a/libs/common/src/models/domain/cipher.ts b/libs/common/src/models/domain/cipher.ts index e2c15a1208..585a4395f7 100644 --- a/libs/common/src/models/domain/cipher.ts +++ b/libs/common/src/models/domain/cipher.ts @@ -2,20 +2,20 @@ import { Jsonify } from "type-fest"; import { CipherRepromptType } from "../../enums/cipherRepromptType"; import { CipherType } from "../../enums/cipherType"; -import { CipherData } from "../data/cipherData"; -import { LocalData } from "../data/localData"; -import { CipherView } from "../view/cipherView"; +import { CipherData } from "../data/cipher.data"; +import { LocalData } from "../data/local.data"; +import { CipherView } from "../view/cipher.view"; import { Attachment } from "./attachment"; import { Card } from "./card"; -import Domain from "./domainBase"; -import { EncString } from "./encString"; +import Domain from "./domain-base"; +import { EncString } from "./enc-string"; import { Field } from "./field"; import { Identity } from "./identity"; import { Login } from "./login"; import { Password } from "./password"; -import { SecureNote } from "./secureNote"; -import { SymmetricCryptoKey } from "./symmetricCryptoKey"; +import { SecureNote } from "./secure-note"; +import { SymmetricCryptoKey } from "./symmetric-crypto-key"; export class Cipher extends Domain { id: string; diff --git a/libs/common/src/models/domain/collection.ts b/libs/common/src/models/domain/collection.ts index 6f737cd477..63145c17c6 100644 --- a/libs/common/src/models/domain/collection.ts +++ b/libs/common/src/models/domain/collection.ts @@ -1,8 +1,8 @@ -import { CollectionData } from "../data/collectionData"; -import { CollectionView } from "../view/collectionView"; +import { CollectionData } from "../data/collection.data"; +import { CollectionView } from "../view/collection.view"; -import Domain from "./domainBase"; -import { EncString } from "./encString"; +import Domain from "./domain-base"; +import { EncString } from "./enc-string"; export class Collection extends Domain { id: string; diff --git a/libs/common/src/models/domain/decryptParameters.ts b/libs/common/src/models/domain/decrypt-parameters.ts similarity index 100% rename from libs/common/src/models/domain/decryptParameters.ts rename to libs/common/src/models/domain/decrypt-parameters.ts diff --git a/libs/common/src/models/domain/domainBase.ts b/libs/common/src/models/domain/domain-base.ts similarity index 95% rename from libs/common/src/models/domain/domainBase.ts rename to libs/common/src/models/domain/domain-base.ts index 0c9e5ad688..f4ece329a0 100644 --- a/libs/common/src/models/domain/domainBase.ts +++ b/libs/common/src/models/domain/domain-base.ts @@ -1,7 +1,7 @@ import { View } from "../view/view"; -import { EncString } from "./encString"; -import { SymmetricCryptoKey } from "./symmetricCryptoKey"; +import { EncString } from "./enc-string"; +import { SymmetricCryptoKey } from "./symmetric-crypto-key"; export default class Domain { protected buildDomainModel( diff --git a/libs/common/src/models/domain/encArrayBuffer.ts b/libs/common/src/models/domain/enc-array-buffer.ts similarity index 100% rename from libs/common/src/models/domain/encArrayBuffer.ts rename to libs/common/src/models/domain/enc-array-buffer.ts diff --git a/libs/common/src/models/domain/encString.ts b/libs/common/src/models/domain/enc-string.ts similarity index 98% rename from libs/common/src/models/domain/encString.ts rename to libs/common/src/models/domain/enc-string.ts index 25a5bbbf8f..f0ea7378f9 100644 --- a/libs/common/src/models/domain/encString.ts +++ b/libs/common/src/models/domain/enc-string.ts @@ -4,7 +4,7 @@ import { EncryptionType } from "../../enums/encryptionType"; import { IEncrypted } from "../../interfaces/IEncrypted"; import { Utils } from "../../misc/utils"; -import { SymmetricCryptoKey } from "./symmetricCryptoKey"; +import { SymmetricCryptoKey } from "./symmetric-crypto-key"; export class EncString implements IEncrypted { encryptedString?: string; diff --git a/libs/common/src/models/domain/encryptedObject.ts b/libs/common/src/models/domain/encrypted-object.ts similarity index 66% rename from libs/common/src/models/domain/encryptedObject.ts rename to libs/common/src/models/domain/encrypted-object.ts index 5ce93dbe92..08186fd357 100644 --- a/libs/common/src/models/domain/encryptedObject.ts +++ b/libs/common/src/models/domain/encrypted-object.ts @@ -1,4 +1,4 @@ -import { SymmetricCryptoKey } from "./symmetricCryptoKey"; +import { SymmetricCryptoKey } from "./symmetric-crypto-key"; export class EncryptedObject { iv: ArrayBuffer; diff --git a/libs/common/src/models/domain/encryptedOrganizationKey.ts b/libs/common/src/models/domain/encrypted-organization-key.ts similarity index 88% rename from libs/common/src/models/domain/encryptedOrganizationKey.ts rename to libs/common/src/models/domain/encrypted-organization-key.ts index 25a49aab14..5b60ea5029 100644 --- a/libs/common/src/models/domain/encryptedOrganizationKey.ts +++ b/libs/common/src/models/domain/encrypted-organization-key.ts @@ -1,8 +1,8 @@ import { CryptoService } from "../../abstractions/crypto.service"; -import { EncryptedOrganizationKeyData } from "../../models/data/encryptedOrganizationKeyData"; +import { EncryptedOrganizationKeyData } from "../data/encrypted-organization-key.data"; -import { EncString } from "./encString"; -import { SymmetricCryptoKey } from "./symmetricCryptoKey"; +import { EncString } from "./enc-string"; +import { SymmetricCryptoKey } from "./symmetric-crypto-key"; export abstract class BaseEncryptedOrganizationKey { decrypt: (cryptoService: CryptoService) => Promise; diff --git a/libs/common/src/models/domain/environmentUrls.ts b/libs/common/src/models/domain/environment-urls.ts similarity index 100% rename from libs/common/src/models/domain/environmentUrls.ts rename to libs/common/src/models/domain/environment-urls.ts diff --git a/libs/common/src/models/domain/field.ts b/libs/common/src/models/domain/field.ts index ea242ce24f..ed098f53ea 100644 --- a/libs/common/src/models/domain/field.ts +++ b/libs/common/src/models/domain/field.ts @@ -2,12 +2,12 @@ import { Jsonify } from "type-fest"; import { FieldType } from "../../enums/fieldType"; import { LinkedIdType } from "../../enums/linkedIdType"; -import { FieldData } from "../data/fieldData"; -import { FieldView } from "../view/fieldView"; +import { FieldData } from "../data/field.data"; +import { FieldView } from "../view/field.view"; -import Domain from "./domainBase"; -import { EncString } from "./encString"; -import { SymmetricCryptoKey } from "./symmetricCryptoKey"; +import Domain from "./domain-base"; +import { EncString } from "./enc-string"; +import { SymmetricCryptoKey } from "./symmetric-crypto-key"; export class Field extends Domain { name: EncString; diff --git a/libs/common/src/models/domain/folder.ts b/libs/common/src/models/domain/folder.ts index fcc700b067..c01928e00c 100644 --- a/libs/common/src/models/domain/folder.ts +++ b/libs/common/src/models/domain/folder.ts @@ -1,10 +1,10 @@ import { Jsonify } from "type-fest"; -import { FolderData } from "../data/folderData"; -import { FolderView } from "../view/folderView"; +import { FolderData } from "../data/folder.data"; +import { FolderView } from "../view/folder.view"; -import Domain from "./domainBase"; -import { EncString } from "./encString"; +import Domain from "./domain-base"; +import { EncString } from "./enc-string"; export class Folder extends Domain { id: string; diff --git a/libs/common/src/models/domain/generatedPasswordHistory.ts b/libs/common/src/models/domain/generated-password-history.ts similarity index 100% rename from libs/common/src/models/domain/generatedPasswordHistory.ts rename to libs/common/src/models/domain/generated-password-history.ts diff --git a/libs/common/src/models/domain/globalState.ts b/libs/common/src/models/domain/global-state.ts similarity index 92% rename from libs/common/src/models/domain/globalState.ts rename to libs/common/src/models/domain/global-state.ts index c907d3ecb5..5af13fecc8 100644 --- a/libs/common/src/models/domain/globalState.ts +++ b/libs/common/src/models/domain/global-state.ts @@ -1,8 +1,8 @@ import { StateVersion } from "../../enums/stateVersion"; import { ThemeType } from "../../enums/themeType"; -import { EnvironmentUrls } from "./environmentUrls"; -import { WindowState } from "./windowState"; +import { EnvironmentUrls } from "./environment-urls"; +import { WindowState } from "./window-state"; export class GlobalState { enableAlwaysOnTop?: boolean; diff --git a/libs/common/src/models/domain/identity.ts b/libs/common/src/models/domain/identity.ts index 075f4c8c4f..5888e59c4f 100644 --- a/libs/common/src/models/domain/identity.ts +++ b/libs/common/src/models/domain/identity.ts @@ -1,11 +1,11 @@ import { Jsonify } from "type-fest"; -import { IdentityData } from "../data/identityData"; -import { IdentityView } from "../view/identityView"; +import { IdentityData } from "../data/identity.data"; +import { IdentityView } from "../view/identity.view"; -import Domain from "./domainBase"; -import { EncString } from "./encString"; -import { SymmetricCryptoKey } from "./symmetricCryptoKey"; +import Domain from "./domain-base"; +import { EncString } from "./enc-string"; +import { SymmetricCryptoKey } from "./symmetric-crypto-key"; export class Identity extends Domain { title: EncString; diff --git a/libs/common/src/models/domain/importResult.ts b/libs/common/src/models/domain/import-result.ts similarity index 65% rename from libs/common/src/models/domain/importResult.ts rename to libs/common/src/models/domain/import-result.ts index 695dbf9d4a..6c67826306 100644 --- a/libs/common/src/models/domain/importResult.ts +++ b/libs/common/src/models/domain/import-result.ts @@ -1,6 +1,6 @@ -import { CipherView } from "../view/cipherView"; -import { CollectionView } from "../view/collectionView"; -import { FolderView } from "../view/folderView"; +import { CipherView } from "../view/cipher.view"; +import { CollectionView } from "../view/collection.view"; +import { FolderView } from "../view/folder.view"; export class ImportResult { success = false; diff --git a/libs/common/src/models/domain/logInCredentials.ts b/libs/common/src/models/domain/log-in-credentials.ts similarity index 93% rename from libs/common/src/models/domain/logInCredentials.ts rename to libs/common/src/models/domain/log-in-credentials.ts index 3da499ecbf..0f1873e740 100644 --- a/libs/common/src/models/domain/logInCredentials.ts +++ b/libs/common/src/models/domain/log-in-credentials.ts @@ -1,7 +1,8 @@ import { AuthenticationType } from "../../enums/authenticationType"; -import { SymmetricCryptoKey } from "../../models/domain/symmetricCryptoKey"; import { TokenRequestTwoFactor } from "../request/identityToken/tokenRequestTwoFactor"; +import { SymmetricCryptoKey } from "./symmetric-crypto-key"; + export class PasswordLogInCredentials { readonly type = AuthenticationType.Password; diff --git a/libs/common/src/models/domain/loginUri.ts b/libs/common/src/models/domain/login-uri.ts similarity index 80% rename from libs/common/src/models/domain/loginUri.ts rename to libs/common/src/models/domain/login-uri.ts index 419268cd51..ac5317687d 100644 --- a/libs/common/src/models/domain/loginUri.ts +++ b/libs/common/src/models/domain/login-uri.ts @@ -1,12 +1,12 @@ import { Jsonify } from "type-fest"; import { UriMatchType } from "../../enums/uriMatchType"; -import { LoginUriData } from "../data/loginUriData"; -import { LoginUriView } from "../view/loginUriView"; +import { LoginUriData } from "../data/login-uri.data"; +import { LoginUriView } from "../view/login-uri.view"; -import Domain from "./domainBase"; -import { EncString } from "./encString"; -import { SymmetricCryptoKey } from "./symmetricCryptoKey"; +import Domain from "./domain-base"; +import { EncString } from "./enc-string"; +import { SymmetricCryptoKey } from "./symmetric-crypto-key"; export class LoginUri extends Domain { uri: EncString; diff --git a/libs/common/src/models/domain/login.ts b/libs/common/src/models/domain/login.ts index 19b99e956a..2ce11c850b 100644 --- a/libs/common/src/models/domain/login.ts +++ b/libs/common/src/models/domain/login.ts @@ -1,12 +1,12 @@ import { Jsonify } from "type-fest"; -import { LoginData } from "../data/loginData"; -import { LoginView } from "../view/loginView"; +import { LoginData } from "../data/login.data"; +import { LoginView } from "../view/login.view"; -import Domain from "./domainBase"; -import { EncString } from "./encString"; -import { LoginUri } from "./loginUri"; -import { SymmetricCryptoKey } from "./symmetricCryptoKey"; +import Domain from "./domain-base"; +import { EncString } from "./enc-string"; +import { LoginUri } from "./login-uri"; +import { SymmetricCryptoKey } from "./symmetric-crypto-key"; export class Login extends Domain { uris: LoginUri[]; diff --git a/libs/common/src/models/domain/masterPasswordPolicyOptions.ts b/libs/common/src/models/domain/master-password-policy-options.ts similarity index 84% rename from libs/common/src/models/domain/masterPasswordPolicyOptions.ts rename to libs/common/src/models/domain/master-password-policy-options.ts index 2207d00c7e..9389d0e4c5 100644 --- a/libs/common/src/models/domain/masterPasswordPolicyOptions.ts +++ b/libs/common/src/models/domain/master-password-policy-options.ts @@ -1,4 +1,4 @@ -import Domain from "./domainBase"; +import Domain from "./domain-base"; export class MasterPasswordPolicyOptions extends Domain { minComplexity = 0; diff --git a/libs/common/src/models/domain/organization.ts b/libs/common/src/models/domain/organization.ts index 2e55250731..faf1ee1f97 100644 --- a/libs/common/src/models/domain/organization.ts +++ b/libs/common/src/models/domain/organization.ts @@ -1,8 +1,8 @@ import { OrganizationUserStatusType } from "../../enums/organizationUserStatusType"; import { OrganizationUserType } from "../../enums/organizationUserType"; import { ProductType } from "../../enums/productType"; -import { PermissionsApi } from "../api/permissionsApi"; -import { OrganizationData } from "../data/organizationData"; +import { PermissionsApi } from "../api/permissions.api"; +import { OrganizationData } from "../data/organization.data"; export class Organization { id: string; diff --git a/libs/common/src/models/domain/passwordGeneratorPolicyOptions.ts b/libs/common/src/models/domain/password-generator-policy-options.ts similarity index 94% rename from libs/common/src/models/domain/passwordGeneratorPolicyOptions.ts rename to libs/common/src/models/domain/password-generator-policy-options.ts index 19072a9f7c..a4500e6ba0 100644 --- a/libs/common/src/models/domain/passwordGeneratorPolicyOptions.ts +++ b/libs/common/src/models/domain/password-generator-policy-options.ts @@ -1,4 +1,4 @@ -import Domain from "./domainBase"; +import Domain from "./domain-base"; export class PasswordGeneratorPolicyOptions extends Domain { defaultType = ""; diff --git a/libs/common/src/models/domain/password.ts b/libs/common/src/models/domain/password.ts index 81ae30551f..4a1ffbd151 100644 --- a/libs/common/src/models/domain/password.ts +++ b/libs/common/src/models/domain/password.ts @@ -1,11 +1,11 @@ import { Jsonify } from "type-fest"; -import { PasswordHistoryData } from "../data/passwordHistoryData"; -import { PasswordHistoryView } from "../view/passwordHistoryView"; +import { PasswordHistoryData } from "../data/password-history.data"; +import { PasswordHistoryView } from "../view/password-history.view"; -import Domain from "./domainBase"; -import { EncString } from "./encString"; -import { SymmetricCryptoKey } from "./symmetricCryptoKey"; +import Domain from "./domain-base"; +import { EncString } from "./enc-string"; +import { SymmetricCryptoKey } from "./symmetric-crypto-key"; export class Password extends Domain { password: EncString; diff --git a/libs/common/src/models/domain/policy.ts b/libs/common/src/models/domain/policy.ts index c4a113cc33..8f520d3324 100644 --- a/libs/common/src/models/domain/policy.ts +++ b/libs/common/src/models/domain/policy.ts @@ -1,7 +1,7 @@ import { PolicyType } from "../../enums/policyType"; -import { PolicyData } from "../data/policyData"; +import { PolicyData } from "../data/policy.data"; -import Domain from "./domainBase"; +import Domain from "./domain-base"; export class Policy extends Domain { id: string; diff --git a/libs/common/src/models/domain/provider.ts b/libs/common/src/models/domain/provider.ts index 6e14340ba5..0968a92dc2 100644 --- a/libs/common/src/models/domain/provider.ts +++ b/libs/common/src/models/domain/provider.ts @@ -1,6 +1,6 @@ import { ProviderUserStatusType } from "../../enums/providerUserStatusType"; import { ProviderUserType } from "../../enums/providerUserType"; -import { ProviderData } from "../data/providerData"; +import { ProviderData } from "../data/provider.data"; export class Provider { id: string; diff --git a/libs/common/src/models/domain/resetPasswordPolicyOptions.ts b/libs/common/src/models/domain/reset-password-policy-options.ts similarity index 71% rename from libs/common/src/models/domain/resetPasswordPolicyOptions.ts rename to libs/common/src/models/domain/reset-password-policy-options.ts index 2ee11a5c27..dda3dd7635 100644 --- a/libs/common/src/models/domain/resetPasswordPolicyOptions.ts +++ b/libs/common/src/models/domain/reset-password-policy-options.ts @@ -1,4 +1,4 @@ -import Domain from "./domainBase"; +import Domain from "./domain-base"; export class ResetPasswordPolicyOptions extends Domain { autoEnrollEnabled = false; diff --git a/libs/common/src/models/domain/secureNote.ts b/libs/common/src/models/domain/secure-note.ts similarity index 76% rename from libs/common/src/models/domain/secureNote.ts rename to libs/common/src/models/domain/secure-note.ts index 475ad5300c..b880677ce8 100644 --- a/libs/common/src/models/domain/secureNote.ts +++ b/libs/common/src/models/domain/secure-note.ts @@ -1,11 +1,11 @@ import { Jsonify } from "type-fest"; import { SecureNoteType } from "../../enums/secureNoteType"; -import { SecureNoteData } from "../data/secureNoteData"; -import { SecureNoteView } from "../view/secureNoteView"; +import { SecureNoteData } from "../data/secure-note.data"; +import { SecureNoteView } from "../view/secure-note.view"; -import Domain from "./domainBase"; -import { SymmetricCryptoKey } from "./symmetricCryptoKey"; +import Domain from "./domain-base"; +import { SymmetricCryptoKey } from "./symmetric-crypto-key"; export class SecureNote extends Domain { type: SecureNoteType; diff --git a/libs/common/src/models/domain/sendAccess.ts b/libs/common/src/models/domain/send-access.ts similarity index 83% rename from libs/common/src/models/domain/sendAccess.ts rename to libs/common/src/models/domain/send-access.ts index dab68cc646..9ecc0ee958 100644 --- a/libs/common/src/models/domain/sendAccess.ts +++ b/libs/common/src/models/domain/send-access.ts @@ -1,12 +1,12 @@ import { SendType } from "../../enums/sendType"; import { SendAccessResponse } from "../response/sendAccessResponse"; -import { SendAccessView } from "../view/sendAccessView"; +import { SendAccessView } from "../view/send-access.view"; -import Domain from "./domainBase"; -import { EncString } from "./encString"; -import { SendFile } from "./sendFile"; -import { SendText } from "./sendText"; -import { SymmetricCryptoKey } from "./symmetricCryptoKey"; +import Domain from "./domain-base"; +import { EncString } from "./enc-string"; +import { SendFile } from "./send-file"; +import { SendText } from "./send-text"; +import { SymmetricCryptoKey } from "./symmetric-crypto-key"; export class SendAccess extends Domain { id: string; diff --git a/libs/common/src/models/domain/sendFile.ts b/libs/common/src/models/domain/send-file.ts similarity index 71% rename from libs/common/src/models/domain/sendFile.ts rename to libs/common/src/models/domain/send-file.ts index 177994078f..706dde8c9c 100644 --- a/libs/common/src/models/domain/sendFile.ts +++ b/libs/common/src/models/domain/send-file.ts @@ -1,9 +1,9 @@ -import { SendFileData } from "../data/sendFileData"; -import { SendFileView } from "../view/sendFileView"; +import { SendFileData } from "../data/send-file.data"; +import { SendFileView } from "../view/send-file.view"; -import Domain from "./domainBase"; -import { EncString } from "./encString"; -import { SymmetricCryptoKey } from "./symmetricCryptoKey"; +import Domain from "./domain-base"; +import { EncString } from "./enc-string"; +import { SymmetricCryptoKey } from "./symmetric-crypto-key"; export class SendFile extends Domain { id: string; diff --git a/libs/common/src/models/domain/sendText.ts b/libs/common/src/models/domain/send-text.ts similarity index 66% rename from libs/common/src/models/domain/sendText.ts rename to libs/common/src/models/domain/send-text.ts index 523e5ee58a..8c71d4d14b 100644 --- a/libs/common/src/models/domain/sendText.ts +++ b/libs/common/src/models/domain/send-text.ts @@ -1,9 +1,9 @@ -import { SendTextData } from "../data/sendTextData"; -import { SendTextView } from "../view/sendTextView"; +import { SendTextData } from "../data/send-text.data"; +import { SendTextView } from "../view/send-text.view"; -import Domain from "./domainBase"; -import { EncString } from "./encString"; -import { SymmetricCryptoKey } from "./symmetricCryptoKey"; +import Domain from "./domain-base"; +import { EncString } from "./enc-string"; +import { SymmetricCryptoKey } from "./symmetric-crypto-key"; export class SendText extends Domain { text: EncString; diff --git a/libs/common/src/models/domain/send.ts b/libs/common/src/models/domain/send.ts index 43ca31a715..6c6126cfc9 100644 --- a/libs/common/src/models/domain/send.ts +++ b/libs/common/src/models/domain/send.ts @@ -1,12 +1,12 @@ import { SendType } from "../../enums/sendType"; import { Utils } from "../../misc/utils"; -import { SendData } from "../data/sendData"; -import { SendView } from "../view/sendView"; +import { SendData } from "../data/send.data"; +import { SendView } from "../view/send.view"; -import Domain from "./domainBase"; -import { EncString } from "./encString"; -import { SendFile } from "./sendFile"; -import { SendText } from "./sendText"; +import Domain from "./domain-base"; +import { EncString } from "./enc-string"; +import { SendFile } from "./send-file"; +import { SendText } from "./send-text"; export class Send extends Domain { id: string; diff --git a/libs/common/src/models/domain/sortedCiphersCache.ts b/libs/common/src/models/domain/sorted-ciphers-cache.ts similarity index 97% rename from libs/common/src/models/domain/sortedCiphersCache.ts rename to libs/common/src/models/domain/sorted-ciphers-cache.ts index 8c32744e23..2835cb8d06 100644 --- a/libs/common/src/models/domain/sortedCiphersCache.ts +++ b/libs/common/src/models/domain/sorted-ciphers-cache.ts @@ -1,4 +1,4 @@ -import { CipherView } from "../view/cipherView"; +import { CipherView } from "../view/cipher.view"; const CacheTTL = 3000; diff --git a/libs/common/src/models/domain/state.ts b/libs/common/src/models/domain/state.ts index 5450325d25..be99d9bdab 100644 --- a/libs/common/src/models/domain/state.ts +++ b/libs/common/src/models/domain/state.ts @@ -1,7 +1,7 @@ import { Jsonify } from "type-fest"; import { Account } from "./account"; -import { GlobalState } from "./globalState"; +import { GlobalState } from "./global-state"; export class State< TGlobalState extends GlobalState = GlobalState, diff --git a/libs/common/src/models/domain/storageOptions.ts b/libs/common/src/models/domain/storage-options.ts similarity index 100% rename from libs/common/src/models/domain/storageOptions.ts rename to libs/common/src/models/domain/storage-options.ts diff --git a/libs/common/src/models/domain/symmetricCryptoKey.ts b/libs/common/src/models/domain/symmetric-crypto-key.ts similarity index 100% rename from libs/common/src/models/domain/symmetricCryptoKey.ts rename to libs/common/src/models/domain/symmetric-crypto-key.ts diff --git a/libs/common/src/models/domain/treeNode.ts b/libs/common/src/models/domain/tree-node.ts similarity index 100% rename from libs/common/src/models/domain/treeNode.ts rename to libs/common/src/models/domain/tree-node.ts diff --git a/libs/common/src/models/domain/windowState.ts b/libs/common/src/models/domain/window-state.ts similarity index 100% rename from libs/common/src/models/domain/windowState.ts rename to libs/common/src/models/domain/window-state.ts diff --git a/libs/common/src/models/export/cardExport.ts b/libs/common/src/models/export/card.export.ts similarity index 95% rename from libs/common/src/models/export/cardExport.ts rename to libs/common/src/models/export/card.export.ts index b0525e4e9c..edd730b773 100644 --- a/libs/common/src/models/export/cardExport.ts +++ b/libs/common/src/models/export/card.export.ts @@ -1,6 +1,6 @@ import { Card as CardDomain } from "../domain/card"; -import { EncString } from "../domain/encString"; -import { CardView } from "../view/cardView"; +import { EncString } from "../domain/enc-string"; +import { CardView } from "../view/card.view"; export class CardExport { static template(): CardExport { diff --git a/libs/common/src/models/export/cipherWithIdsExport.ts b/libs/common/src/models/export/cipher-with-ids.export.ts similarity index 79% rename from libs/common/src/models/export/cipherWithIdsExport.ts rename to libs/common/src/models/export/cipher-with-ids.export.ts index c9d789640b..2ad601e9a6 100644 --- a/libs/common/src/models/export/cipherWithIdsExport.ts +++ b/libs/common/src/models/export/cipher-with-ids.export.ts @@ -1,7 +1,7 @@ import { Cipher as CipherDomain } from "../domain/cipher"; -import { CipherView } from "../view/cipherView"; +import { CipherView } from "../view/cipher.view"; -import { CipherExport } from "./cipherExport"; +import { CipherExport } from "./cipher.export"; export class CipherWithIdExport extends CipherExport { id: string; diff --git a/libs/common/src/models/export/cipherExport.ts b/libs/common/src/models/export/cipher.export.ts similarity index 92% rename from libs/common/src/models/export/cipherExport.ts rename to libs/common/src/models/export/cipher.export.ts index 33f66ffd79..b4585cb406 100644 --- a/libs/common/src/models/export/cipherExport.ts +++ b/libs/common/src/models/export/cipher.export.ts @@ -1,14 +1,14 @@ import { CipherRepromptType } from "../../enums/cipherRepromptType"; import { CipherType } from "../../enums/cipherType"; import { Cipher as CipherDomain } from "../domain/cipher"; -import { EncString } from "../domain/encString"; -import { CipherView } from "../view/cipherView"; +import { EncString } from "../domain/enc-string"; +import { CipherView } from "../view/cipher.view"; -import { CardExport } from "./cardExport"; -import { FieldExport } from "./fieldExport"; -import { IdentityExport } from "./identityExport"; -import { LoginExport } from "./loginExport"; -import { SecureNoteExport } from "./secureNoteExport"; +import { CardExport } from "./card.export"; +import { FieldExport } from "./field.export"; +import { IdentityExport } from "./identity.export"; +import { LoginExport } from "./login.export"; +import { SecureNoteExport } from "./secure-note.export"; export class CipherExport { static template(): CipherExport { diff --git a/libs/common/src/models/export/collectionWithIdExport.ts b/libs/common/src/models/export/collection-with-id.export.ts similarity index 75% rename from libs/common/src/models/export/collectionWithIdExport.ts rename to libs/common/src/models/export/collection-with-id.export.ts index 7c668f8a9c..1978cc707e 100644 --- a/libs/common/src/models/export/collectionWithIdExport.ts +++ b/libs/common/src/models/export/collection-with-id.export.ts @@ -1,7 +1,7 @@ import { Collection as CollectionDomain } from "../domain/collection"; -import { CollectionView } from "../view/collectionView"; +import { CollectionView } from "../view/collection.view"; -import { CollectionExport } from "./collectionExport"; +import { CollectionExport } from "./collection.export"; export class CollectionWithIdExport extends CollectionExport { id: string; diff --git a/libs/common/src/models/export/collectionExport.ts b/libs/common/src/models/export/collection.export.ts similarity index 92% rename from libs/common/src/models/export/collectionExport.ts rename to libs/common/src/models/export/collection.export.ts index fe0777af1f..68277ee4e3 100644 --- a/libs/common/src/models/export/collectionExport.ts +++ b/libs/common/src/models/export/collection.export.ts @@ -1,6 +1,6 @@ import { Collection as CollectionDomain } from "../domain/collection"; -import { EncString } from "../domain/encString"; -import { CollectionView } from "../view/collectionView"; +import { EncString } from "../domain/enc-string"; +import { CollectionView } from "../view/collection.view"; export class CollectionExport { static template(): CollectionExport { diff --git a/libs/common/src/models/export/eventExport.ts b/libs/common/src/models/export/event.export.ts similarity index 93% rename from libs/common/src/models/export/eventExport.ts rename to libs/common/src/models/export/event.export.ts index 670c1b166a..03800384c4 100644 --- a/libs/common/src/models/export/eventExport.ts +++ b/libs/common/src/models/export/event.export.ts @@ -1,5 +1,5 @@ import { EventType } from "../../enums/eventType"; -import { EventView } from "../view/eventView"; +import { EventView } from "../view/event.view"; export class EventExport { message: string; diff --git a/libs/common/src/models/export/fieldExport.ts b/libs/common/src/models/export/field.export.ts similarity index 92% rename from libs/common/src/models/export/fieldExport.ts rename to libs/common/src/models/export/field.export.ts index 13cc2d9fa3..66c856d7bf 100644 --- a/libs/common/src/models/export/fieldExport.ts +++ b/libs/common/src/models/export/field.export.ts @@ -1,8 +1,8 @@ import { FieldType } from "../../enums/fieldType"; import { LinkedIdType } from "../../enums/linkedIdType"; -import { EncString } from "../domain/encString"; +import { EncString } from "../domain/enc-string"; import { Field as FieldDomain } from "../domain/field"; -import { FieldView } from "../view/fieldView"; +import { FieldView } from "../view/field.view"; export class FieldExport { static template(): FieldExport { diff --git a/libs/common/src/models/export/folderWithIdExport.ts b/libs/common/src/models/export/folder-with-id.export.ts similarity index 76% rename from libs/common/src/models/export/folderWithIdExport.ts rename to libs/common/src/models/export/folder-with-id.export.ts index 77c96811c4..655fab077b 100644 --- a/libs/common/src/models/export/folderWithIdExport.ts +++ b/libs/common/src/models/export/folder-with-id.export.ts @@ -1,7 +1,7 @@ import { Folder as FolderDomain } from "../domain/folder"; -import { FolderView } from "../view/folderView"; +import { FolderView } from "../view/folder.view"; -import { FolderExport } from "./folderExport"; +import { FolderExport } from "./folder.export"; export class FolderWithIdExport extends FolderExport { id: string; diff --git a/libs/common/src/models/export/folderExport.ts b/libs/common/src/models/export/folder.export.ts similarity index 88% rename from libs/common/src/models/export/folderExport.ts rename to libs/common/src/models/export/folder.export.ts index 8f3483c357..839dcceaab 100644 --- a/libs/common/src/models/export/folderExport.ts +++ b/libs/common/src/models/export/folder.export.ts @@ -1,6 +1,6 @@ -import { EncString } from "../domain/encString"; +import { EncString } from "../domain/enc-string"; import { Folder as FolderDomain } from "../domain/folder"; -import { FolderView } from "../view/folderView"; +import { FolderView } from "../view/folder.view"; export class FolderExport { static template(): FolderExport { diff --git a/libs/common/src/models/export/identityExport.ts b/libs/common/src/models/export/identity.export.ts similarity index 97% rename from libs/common/src/models/export/identityExport.ts rename to libs/common/src/models/export/identity.export.ts index c8f06e9e95..d4180d44a9 100644 --- a/libs/common/src/models/export/identityExport.ts +++ b/libs/common/src/models/export/identity.export.ts @@ -1,6 +1,6 @@ -import { EncString } from "../domain/encString"; +import { EncString } from "../domain/enc-string"; import { Identity as IdentityDomain } from "../domain/identity"; -import { IdentityView } from "../view/identityView"; +import { IdentityView } from "../view/identity.view"; export class IdentityExport { static template(): IdentityExport { diff --git a/libs/common/src/models/export/loginUriExport.ts b/libs/common/src/models/export/login-uri.export.ts similarity index 83% rename from libs/common/src/models/export/loginUriExport.ts rename to libs/common/src/models/export/login-uri.export.ts index b27d8ba84f..ee0d883c98 100644 --- a/libs/common/src/models/export/loginUriExport.ts +++ b/libs/common/src/models/export/login-uri.export.ts @@ -1,7 +1,7 @@ import { UriMatchType } from "../../enums/uriMatchType"; -import { EncString } from "../domain/encString"; -import { LoginUri as LoginUriDomain } from "../domain/loginUri"; -import { LoginUriView } from "../view/loginUriView"; +import { EncString } from "../domain/enc-string"; +import { LoginUri as LoginUriDomain } from "../domain/login-uri"; +import { LoginUriView } from "../view/login-uri.view"; export class LoginUriExport { static template(): LoginUriExport { diff --git a/libs/common/src/models/export/loginExport.ts b/libs/common/src/models/export/login.export.ts similarity index 91% rename from libs/common/src/models/export/loginExport.ts rename to libs/common/src/models/export/login.export.ts index 1be631daa9..6a143fb99a 100644 --- a/libs/common/src/models/export/loginExport.ts +++ b/libs/common/src/models/export/login.export.ts @@ -1,8 +1,8 @@ -import { EncString } from "../domain/encString"; +import { EncString } from "../domain/enc-string"; import { Login as LoginDomain } from "../domain/login"; -import { LoginView } from "../view/loginView"; +import { LoginView } from "../view/login.view"; -import { LoginUriExport } from "./loginUriExport"; +import { LoginUriExport } from "./login-uri.export"; export class LoginExport { static template(): LoginExport { diff --git a/libs/common/src/models/export/secureNoteExport.ts b/libs/common/src/models/export/secure-note.export.ts similarity index 91% rename from libs/common/src/models/export/secureNoteExport.ts rename to libs/common/src/models/export/secure-note.export.ts index de85bacd3b..7b7e987698 100644 --- a/libs/common/src/models/export/secureNoteExport.ts +++ b/libs/common/src/models/export/secure-note.export.ts @@ -1,6 +1,6 @@ import { SecureNoteType } from "../../enums/secureNoteType"; -import { SecureNote as SecureNoteDomain } from "../domain/secureNote"; -import { SecureNoteView } from "../view/secureNoteView"; +import { SecureNote as SecureNoteDomain } from "../domain/secure-note"; +import { SecureNoteView } from "../view/secure-note.view"; export class SecureNoteExport { static template(): SecureNoteExport { diff --git a/libs/common/src/models/request/cipherRequest.ts b/libs/common/src/models/request/cipherRequest.ts index 4ed5885082..046c302c5d 100644 --- a/libs/common/src/models/request/cipherRequest.ts +++ b/libs/common/src/models/request/cipherRequest.ts @@ -1,11 +1,11 @@ import { CipherRepromptType } from "../../enums/cipherRepromptType"; import { CipherType } from "../../enums/cipherType"; -import { CardApi } from "../api/cardApi"; -import { FieldApi } from "../api/fieldApi"; -import { IdentityApi } from "../api/identityApi"; -import { LoginApi } from "../api/loginApi"; -import { LoginUriApi } from "../api/loginUriApi"; -import { SecureNoteApi } from "../api/secureNoteApi"; +import { CardApi } from "../api/card.api"; +import { FieldApi } from "../api/field.api"; +import { IdentityApi } from "../api/identity.api"; +import { LoginUriApi } from "../api/login-uri.api"; +import { LoginApi } from "../api/login.api"; +import { SecureNoteApi } from "../api/secure-note.api"; import { Cipher } from "../domain/cipher"; import { AttachmentRequest } from "./attachmentRequest"; diff --git a/libs/common/src/models/request/organization/organizationSsoRequest.ts b/libs/common/src/models/request/organization/organizationSsoRequest.ts index e7fdb61ca1..2ad8b07638 100644 --- a/libs/common/src/models/request/organization/organizationSsoRequest.ts +++ b/libs/common/src/models/request/organization/organizationSsoRequest.ts @@ -1,4 +1,4 @@ -import { SsoConfigApi } from "../../api/ssoConfigApi"; +import { SsoConfigApi } from "../../api/sso-config.api"; export class OrganizationSsoRequest { enabled = false; diff --git a/libs/common/src/models/request/organizationUserInviteRequest.ts b/libs/common/src/models/request/organizationUserInviteRequest.ts index 7d03700437..9c01e718eb 100644 --- a/libs/common/src/models/request/organizationUserInviteRequest.ts +++ b/libs/common/src/models/request/organizationUserInviteRequest.ts @@ -1,5 +1,5 @@ import { OrganizationUserType } from "../../enums/organizationUserType"; -import { PermissionsApi } from "../api/permissionsApi"; +import { PermissionsApi } from "../api/permissions.api"; import { SelectionReadOnlyRequest } from "./selectionReadOnlyRequest"; diff --git a/libs/common/src/models/request/organizationUserUpdateRequest.ts b/libs/common/src/models/request/organizationUserUpdateRequest.ts index ec9ae3bc64..6a733303bc 100644 --- a/libs/common/src/models/request/organizationUserUpdateRequest.ts +++ b/libs/common/src/models/request/organizationUserUpdateRequest.ts @@ -1,5 +1,5 @@ import { OrganizationUserType } from "../../enums/organizationUserType"; -import { PermissionsApi } from "../api/permissionsApi"; +import { PermissionsApi } from "../api/permissions.api"; import { SelectionReadOnlyRequest } from "./selectionReadOnlyRequest"; diff --git a/libs/common/src/models/request/sendRequest.ts b/libs/common/src/models/request/sendRequest.ts index 1c77204c07..ffb31b4d1f 100644 --- a/libs/common/src/models/request/sendRequest.ts +++ b/libs/common/src/models/request/sendRequest.ts @@ -1,6 +1,6 @@ import { SendType } from "../../enums/sendType"; -import { SendFileApi } from "../api/sendFileApi"; -import { SendTextApi } from "../api/sendTextApi"; +import { SendFileApi } from "../api/send-file.api"; +import { SendTextApi } from "../api/send-text.api"; import { Send } from "../domain/send"; export class SendRequest { diff --git a/libs/common/src/models/response/cipherResponse.ts b/libs/common/src/models/response/cipherResponse.ts index 8eba6f6273..bb342d4aa0 100644 --- a/libs/common/src/models/response/cipherResponse.ts +++ b/libs/common/src/models/response/cipherResponse.ts @@ -1,9 +1,9 @@ import { CipherRepromptType } from "../../enums/cipherRepromptType"; -import { CardApi } from "../api/cardApi"; -import { FieldApi } from "../api/fieldApi"; -import { IdentityApi } from "../api/identityApi"; -import { LoginApi } from "../api/loginApi"; -import { SecureNoteApi } from "../api/secureNoteApi"; +import { CardApi } from "../api/card.api"; +import { FieldApi } from "../api/field.api"; +import { IdentityApi } from "../api/identity.api"; +import { LoginApi } from "../api/login.api"; +import { SecureNoteApi } from "../api/secure-note.api"; import { AttachmentResponse } from "./attachmentResponse"; import { BaseResponse } from "./baseResponse"; diff --git a/libs/common/src/models/response/organization/organizationSsoResponse.ts b/libs/common/src/models/response/organization/organizationSsoResponse.ts index abe6b72063..9cdd189087 100644 --- a/libs/common/src/models/response/organization/organizationSsoResponse.ts +++ b/libs/common/src/models/response/organization/organizationSsoResponse.ts @@ -1,4 +1,4 @@ -import { SsoConfigApi } from "../../api/ssoConfigApi"; +import { SsoConfigApi } from "../../api/sso-config.api"; import { BaseResponse } from "../baseResponse"; export class OrganizationSsoResponse extends BaseResponse { diff --git a/libs/common/src/models/response/organizationConnectionResponse.ts b/libs/common/src/models/response/organizationConnectionResponse.ts index 7f39d250f3..e4babe8845 100644 --- a/libs/common/src/models/response/organizationConnectionResponse.ts +++ b/libs/common/src/models/response/organizationConnectionResponse.ts @@ -1,6 +1,6 @@ import { OrganizationConnectionType } from "../../enums/organizationConnectionType"; -import { BillingSyncConfigApi } from "../api/billingSyncConfigApi"; -import { ScimConfigApi } from "../api/scimConfigApi"; +import { BillingSyncConfigApi } from "../api/billing-sync-config.api"; +import { ScimConfigApi } from "../api/scim-config.api"; import { BaseResponse } from "./baseResponse"; diff --git a/libs/common/src/models/response/organizationUserResponse.ts b/libs/common/src/models/response/organizationUserResponse.ts index 3e49375b90..ddfe52a4cc 100644 --- a/libs/common/src/models/response/organizationUserResponse.ts +++ b/libs/common/src/models/response/organizationUserResponse.ts @@ -1,7 +1,7 @@ import { KdfType } from "../../enums/kdfType"; import { OrganizationUserStatusType } from "../../enums/organizationUserStatusType"; import { OrganizationUserType } from "../../enums/organizationUserType"; -import { PermissionsApi } from "../api/permissionsApi"; +import { PermissionsApi } from "../api/permissions.api"; import { BaseResponse } from "./baseResponse"; import { SelectionReadOnlyResponse } from "./selectionReadOnlyResponse"; diff --git a/libs/common/src/models/response/profileOrganizationResponse.ts b/libs/common/src/models/response/profileOrganizationResponse.ts index 0287ae96c9..37f276dac5 100644 --- a/libs/common/src/models/response/profileOrganizationResponse.ts +++ b/libs/common/src/models/response/profileOrganizationResponse.ts @@ -1,7 +1,7 @@ import { OrganizationUserStatusType } from "../../enums/organizationUserStatusType"; import { OrganizationUserType } from "../../enums/organizationUserType"; import { ProductType } from "../../enums/productType"; -import { PermissionsApi } from "../api/permissionsApi"; +import { PermissionsApi } from "../api/permissions.api"; import { BaseResponse } from "./baseResponse"; diff --git a/libs/common/src/models/response/profileProviderResponse.ts b/libs/common/src/models/response/profileProviderResponse.ts index 84e8bbf67c..d834e3c14a 100644 --- a/libs/common/src/models/response/profileProviderResponse.ts +++ b/libs/common/src/models/response/profileProviderResponse.ts @@ -1,6 +1,6 @@ import { ProviderUserStatusType } from "../../enums/providerUserStatusType"; import { ProviderUserType } from "../../enums/providerUserType"; -import { PermissionsApi } from "../api/permissionsApi"; +import { PermissionsApi } from "../api/permissions.api"; import { BaseResponse } from "./baseResponse"; diff --git a/libs/common/src/models/response/provider/providerUserResponse.ts b/libs/common/src/models/response/provider/providerUserResponse.ts index cf1a181c00..6091cc9061 100644 --- a/libs/common/src/models/response/provider/providerUserResponse.ts +++ b/libs/common/src/models/response/provider/providerUserResponse.ts @@ -1,6 +1,6 @@ import { ProviderUserStatusType } from "../../../enums/providerUserStatusType"; import { ProviderUserType } from "../../../enums/providerUserType"; -import { PermissionsApi } from "../../api/permissionsApi"; +import { PermissionsApi } from "../../api/permissions.api"; import { BaseResponse } from "../baseResponse"; export class ProviderUserResponse extends BaseResponse { diff --git a/libs/common/src/models/response/sendAccessResponse.ts b/libs/common/src/models/response/sendAccessResponse.ts index e98a9d057d..f500c86b49 100644 --- a/libs/common/src/models/response/sendAccessResponse.ts +++ b/libs/common/src/models/response/sendAccessResponse.ts @@ -1,6 +1,6 @@ import { SendType } from "../../enums/sendType"; -import { SendFileApi } from "../api/sendFileApi"; -import { SendTextApi } from "../api/sendTextApi"; +import { SendFileApi } from "../api/send-file.api"; +import { SendTextApi } from "../api/send-text.api"; import { BaseResponse } from "./baseResponse"; diff --git a/libs/common/src/models/response/sendResponse.ts b/libs/common/src/models/response/sendResponse.ts index 287507250e..89ccdb6da7 100644 --- a/libs/common/src/models/response/sendResponse.ts +++ b/libs/common/src/models/response/sendResponse.ts @@ -1,6 +1,6 @@ import { SendType } from "../../enums/sendType"; -import { SendFileApi } from "../api/sendFileApi"; -import { SendTextApi } from "../api/sendTextApi"; +import { SendFileApi } from "../api/send-file.api"; +import { SendTextApi } from "../api/send-text.api"; import { BaseResponse } from "./baseResponse"; diff --git a/libs/common/src/models/view/attachmentView.ts b/libs/common/src/models/view/attachment.view.ts similarity index 92% rename from libs/common/src/models/view/attachmentView.ts rename to libs/common/src/models/view/attachment.view.ts index 6e81d58ca8..6a40ee52e5 100644 --- a/libs/common/src/models/view/attachmentView.ts +++ b/libs/common/src/models/view/attachment.view.ts @@ -1,7 +1,7 @@ import { Jsonify } from "type-fest"; import { Attachment } from "../domain/attachment"; -import { SymmetricCryptoKey } from "../domain/symmetricCryptoKey"; +import { SymmetricCryptoKey } from "../domain/symmetric-crypto-key"; import { View } from "./view"; diff --git a/libs/common/src/models/view/cardView.ts b/libs/common/src/models/view/card.view.ts similarity index 98% rename from libs/common/src/models/view/cardView.ts rename to libs/common/src/models/view/card.view.ts index fa57bd2b35..08beed7a77 100644 --- a/libs/common/src/models/view/cardView.ts +++ b/libs/common/src/models/view/card.view.ts @@ -3,7 +3,7 @@ import { Jsonify } from "type-fest"; import { CardLinkedId as LinkedId } from "../../enums/linkedIdType"; import { linkedFieldOption } from "../../misc/linkedFieldOption.decorator"; -import { ItemView } from "./itemView"; +import { ItemView } from "./item.view"; export class CardView extends ItemView { @linkedFieldOption(LinkedId.CardholderName) diff --git a/libs/common/src/models/view/cipherView.ts b/libs/common/src/models/view/cipher.view.ts similarity index 92% rename from libs/common/src/models/view/cipherView.ts rename to libs/common/src/models/view/cipher.view.ts index a835fa16ae..41043b7e5e 100644 --- a/libs/common/src/models/view/cipherView.ts +++ b/libs/common/src/models/view/cipher.view.ts @@ -3,16 +3,16 @@ import { Jsonify } from "type-fest"; import { CipherRepromptType } from "../../enums/cipherRepromptType"; import { CipherType } from "../../enums/cipherType"; import { LinkedIdType } from "../../enums/linkedIdType"; -import { LocalData } from "../data/localData"; +import { LocalData } from "../data/local.data"; import { Cipher } from "../domain/cipher"; -import { AttachmentView } from "./attachmentView"; -import { CardView } from "./cardView"; -import { FieldView } from "./fieldView"; -import { IdentityView } from "./identityView"; -import { LoginView } from "./loginView"; -import { PasswordHistoryView } from "./passwordHistoryView"; -import { SecureNoteView } from "./secureNoteView"; +import { AttachmentView } from "./attachment.view"; +import { CardView } from "./card.view"; +import { FieldView } from "./field.view"; +import { IdentityView } from "./identity.view"; +import { LoginView } from "./login.view"; +import { PasswordHistoryView } from "./password-history.view"; +import { SecureNoteView } from "./secure-note.view"; import { View } from "./view"; export class CipherView implements View { diff --git a/libs/common/src/models/view/collectionView.ts b/libs/common/src/models/view/collection.view.ts similarity index 92% rename from libs/common/src/models/view/collectionView.ts rename to libs/common/src/models/view/collection.view.ts index d230e591f3..e585a0d855 100644 --- a/libs/common/src/models/view/collectionView.ts +++ b/libs/common/src/models/view/collection.view.ts @@ -1,5 +1,5 @@ import { Collection } from "../domain/collection"; -import { ITreeNodeObject } from "../domain/treeNode"; +import { ITreeNodeObject } from "../domain/tree-node"; import { CollectionGroupDetailsResponse } from "../response/collectionResponse"; import { View } from "./view"; diff --git a/libs/common/src/models/view/eventView.ts b/libs/common/src/models/view/event.view.ts similarity index 100% rename from libs/common/src/models/view/eventView.ts rename to libs/common/src/models/view/event.view.ts diff --git a/libs/common/src/models/view/fieldView.ts b/libs/common/src/models/view/field.view.ts similarity index 100% rename from libs/common/src/models/view/fieldView.ts rename to libs/common/src/models/view/field.view.ts diff --git a/libs/common/src/models/view/folderView.ts b/libs/common/src/models/view/folder.view.ts similarity index 91% rename from libs/common/src/models/view/folderView.ts rename to libs/common/src/models/view/folder.view.ts index dcd1276705..d18ef65aed 100644 --- a/libs/common/src/models/view/folderView.ts +++ b/libs/common/src/models/view/folder.view.ts @@ -1,7 +1,7 @@ import { Jsonify } from "type-fest"; import { Folder } from "../domain/folder"; -import { ITreeNodeObject } from "../domain/treeNode"; +import { ITreeNodeObject } from "../domain/tree-node"; import { View } from "./view"; diff --git a/libs/common/src/models/view/identityView.ts b/libs/common/src/models/view/identity.view.ts similarity index 98% rename from libs/common/src/models/view/identityView.ts rename to libs/common/src/models/view/identity.view.ts index 437652e2ac..343135417d 100644 --- a/libs/common/src/models/view/identityView.ts +++ b/libs/common/src/models/view/identity.view.ts @@ -4,7 +4,7 @@ import { IdentityLinkedId as LinkedId } from "../../enums/linkedIdType"; import { linkedFieldOption } from "../../misc/linkedFieldOption.decorator"; import { Utils } from "../../misc/utils"; -import { ItemView } from "./itemView"; +import { ItemView } from "./item.view"; export class IdentityView extends ItemView { @linkedFieldOption(LinkedId.Title) diff --git a/libs/common/src/models/view/itemView.ts b/libs/common/src/models/view/item.view.ts similarity index 100% rename from libs/common/src/models/view/itemView.ts rename to libs/common/src/models/view/item.view.ts diff --git a/libs/common/src/models/view/loginUriView.ts b/libs/common/src/models/view/login-uri.view.ts similarity index 98% rename from libs/common/src/models/view/loginUriView.ts rename to libs/common/src/models/view/login-uri.view.ts index 28ca18e3a9..9d795f0721 100644 --- a/libs/common/src/models/view/loginUriView.ts +++ b/libs/common/src/models/view/login-uri.view.ts @@ -2,7 +2,7 @@ import { Jsonify } from "type-fest"; import { UriMatchType } from "../../enums/uriMatchType"; import { Utils } from "../../misc/utils"; -import { LoginUri } from "../domain/loginUri"; +import { LoginUri } from "../domain/login-uri"; import { View } from "./view"; diff --git a/libs/common/src/models/view/loginView.ts b/libs/common/src/models/view/login.view.ts similarity index 95% rename from libs/common/src/models/view/loginView.ts rename to libs/common/src/models/view/login.view.ts index 1e4b2201e3..ee4035d2db 100644 --- a/libs/common/src/models/view/loginView.ts +++ b/libs/common/src/models/view/login.view.ts @@ -5,8 +5,8 @@ import { linkedFieldOption } from "../../misc/linkedFieldOption.decorator"; import { Utils } from "../../misc/utils"; import { Login } from "../domain/login"; -import { ItemView } from "./itemView"; -import { LoginUriView } from "./loginUriView"; +import { ItemView } from "./item.view"; +import { LoginUriView } from "./login-uri.view"; export class LoginView extends ItemView { @linkedFieldOption(LinkedId.Username) diff --git a/libs/common/src/models/view/passwordHistoryView.ts b/libs/common/src/models/view/password-history.view.ts similarity index 100% rename from libs/common/src/models/view/passwordHistoryView.ts rename to libs/common/src/models/view/password-history.view.ts diff --git a/libs/common/src/models/view/secureNoteView.ts b/libs/common/src/models/view/secure-note.view.ts similarity index 83% rename from libs/common/src/models/view/secureNoteView.ts rename to libs/common/src/models/view/secure-note.view.ts index 984beee17c..20174f9855 100644 --- a/libs/common/src/models/view/secureNoteView.ts +++ b/libs/common/src/models/view/secure-note.view.ts @@ -1,9 +1,9 @@ import { Jsonify } from "type-fest"; import { SecureNoteType } from "../../enums/secureNoteType"; -import { SecureNote } from "../domain/secureNote"; +import { SecureNote } from "../domain/secure-note"; -import { ItemView } from "./itemView"; +import { ItemView } from "./item.view"; export class SecureNoteView extends ItemView { type: SecureNoteType = null; diff --git a/libs/common/src/models/view/sendAccessView.ts b/libs/common/src/models/view/send-access.view.ts similarity index 78% rename from libs/common/src/models/view/sendAccessView.ts rename to libs/common/src/models/view/send-access.view.ts index 71e5276a98..782492f94a 100644 --- a/libs/common/src/models/view/sendAccessView.ts +++ b/libs/common/src/models/view/send-access.view.ts @@ -1,8 +1,8 @@ import { SendType } from "../../enums/sendType"; -import { SendAccess } from "../domain/sendAccess"; +import { SendAccess } from "../domain/send-access"; -import { SendFileView } from "./sendFileView"; -import { SendTextView } from "./sendTextView"; +import { SendFileView } from "./send-file.view"; +import { SendTextView } from "./send-text.view"; import { View } from "./view"; export class SendAccessView implements View { diff --git a/libs/common/src/models/view/sendFileView.ts b/libs/common/src/models/view/send-file.view.ts similarity index 91% rename from libs/common/src/models/view/sendFileView.ts rename to libs/common/src/models/view/send-file.view.ts index 7d37f2def8..7ed291a2b7 100644 --- a/libs/common/src/models/view/sendFileView.ts +++ b/libs/common/src/models/view/send-file.view.ts @@ -1,4 +1,4 @@ -import { SendFile } from "../domain/sendFile"; +import { SendFile } from "../domain/send-file"; import { View } from "./view"; diff --git a/libs/common/src/models/view/sendTextView.ts b/libs/common/src/models/view/send-text.view.ts similarity index 86% rename from libs/common/src/models/view/sendTextView.ts rename to libs/common/src/models/view/send-text.view.ts index a2c6b5711f..cd10c799b6 100644 --- a/libs/common/src/models/view/sendTextView.ts +++ b/libs/common/src/models/view/send-text.view.ts @@ -1,4 +1,4 @@ -import { SendText } from "../domain/sendText"; +import { SendText } from "../domain/send-text"; import { View } from "./view"; diff --git a/libs/common/src/models/view/sendView.ts b/libs/common/src/models/view/send.view.ts similarity index 90% rename from libs/common/src/models/view/sendView.ts rename to libs/common/src/models/view/send.view.ts index 1a2a214fc8..3ef6bf9f0e 100644 --- a/libs/common/src/models/view/sendView.ts +++ b/libs/common/src/models/view/send.view.ts @@ -1,10 +1,10 @@ import { SendType } from "../../enums/sendType"; import { Utils } from "../../misc/utils"; import { Send } from "../domain/send"; -import { SymmetricCryptoKey } from "../domain/symmetricCryptoKey"; +import { SymmetricCryptoKey } from "../domain/symmetric-crypto-key"; -import { SendFileView } from "./sendFileView"; -import { SendTextView } from "./sendTextView"; +import { SendFileView } from "./send-file.view"; +import { SendTextView } from "./send-text.view"; import { View } from "./view"; export class SendView implements View { diff --git a/libs/common/src/models/view/ssoConfigView.ts b/libs/common/src/models/view/sso-config.view.ts similarity index 98% rename from libs/common/src/models/view/ssoConfigView.ts rename to libs/common/src/models/view/sso-config.view.ts index b4784c363c..474f46da92 100644 --- a/libs/common/src/models/view/ssoConfigView.ts +++ b/libs/common/src/models/view/sso-config.view.ts @@ -5,7 +5,7 @@ import { Saml2SigningBehavior, SsoType, } from "../../enums/ssoEnums"; -import { SsoConfigApi } from "../api/ssoConfigApi"; +import { SsoConfigApi } from "../api/sso-config.api"; import { View } from "./view"; diff --git a/libs/common/src/services/api.service.ts b/libs/common/src/services/api.service.ts index a4648e2504..a9c8e00dab 100644 --- a/libs/common/src/services/api.service.ts +++ b/libs/common/src/services/api.service.ts @@ -169,7 +169,7 @@ import { } from "../models/response/twoFactorWebAuthnResponse"; import { TwoFactorYubiKeyResponse } from "../models/response/twoFactorYubiKeyResponse"; import { UserKeyResponse } from "../models/response/userKeyResponse"; -import { SendAccessView } from "../models/view/sendAccessView"; +import { SendAccessView } from "../models/view/send-access.view"; export class ApiService implements ApiServiceAbstraction { private device: DeviceType; diff --git a/libs/common/src/services/auth.service.ts b/libs/common/src/services/auth.service.ts index 3807eee3d6..5fc48b10dd 100644 --- a/libs/common/src/services/auth.service.ts +++ b/libs/common/src/services/auth.service.ts @@ -21,14 +21,14 @@ import { ApiLogInStrategy } from "../misc/logInStrategies/apiLogin.strategy"; import { PasswordLogInStrategy } from "../misc/logInStrategies/passwordLogin.strategy"; import { PasswordlessLogInStrategy } from "../misc/logInStrategies/passwordlessLogin.strategy"; import { SsoLogInStrategy } from "../misc/logInStrategies/ssoLogin.strategy"; -import { AuthResult } from "../models/domain/authResult"; +import { AuthResult } from "../models/domain/auth-result"; import { ApiLogInCredentials, PasswordLogInCredentials, SsoLogInCredentials, PasswordlessLogInCredentials, -} from "../models/domain/logInCredentials"; -import { SymmetricCryptoKey } from "../models/domain/symmetricCryptoKey"; +} from "../models/domain/log-in-credentials"; +import { SymmetricCryptoKey } from "../models/domain/symmetric-crypto-key"; import { TokenRequestTwoFactor } from "../models/request/identityToken/tokenRequestTwoFactor"; import { PreloginRequest } from "../models/request/preloginRequest"; import { ErrorResponse } from "../models/response/errorResponse"; diff --git a/libs/common/src/services/azureFileUpload.service.ts b/libs/common/src/services/azureFileUpload.service.ts index d7017bfb69..95a6bd8809 100644 --- a/libs/common/src/services/azureFileUpload.service.ts +++ b/libs/common/src/services/azureFileUpload.service.ts @@ -1,6 +1,6 @@ import { LogService } from "../abstractions/log.service"; import { Utils } from "../misc/utils"; -import { EncArrayBuffer } from "../models/domain/encArrayBuffer"; +import { EncArrayBuffer } from "../models/domain/enc-array-buffer"; const MAX_SINGLE_BLOB_UPLOAD_SIZE = 256 * 1024 * 1024; // 256 MiB const MAX_BLOCKS_PER_BLOB = 50000; diff --git a/libs/common/src/services/bitwardenFileUpload.service.ts b/libs/common/src/services/bitwardenFileUpload.service.ts index 64432e13cb..ee6f97aae3 100644 --- a/libs/common/src/services/bitwardenFileUpload.service.ts +++ b/libs/common/src/services/bitwardenFileUpload.service.ts @@ -1,5 +1,5 @@ import { Utils } from "../misc/utils"; -import { EncArrayBuffer } from "../models/domain/encArrayBuffer"; +import { EncArrayBuffer } from "../models/domain/enc-array-buffer"; export class BitwardenFileUploadService { async upload( diff --git a/libs/common/src/services/cipher.service.ts b/libs/common/src/services/cipher.service.ts index 62d849d417..ff5f8d7a6b 100644 --- a/libs/common/src/services/cipher.service.ts +++ b/libs/common/src/services/cipher.service.ts @@ -14,22 +14,22 @@ import { FieldType } from "../enums/fieldType"; import { UriMatchType } from "../enums/uriMatchType"; import { sequentialize } from "../misc/sequentialize"; import { Utils } from "../misc/utils"; -import { CipherData } from "../models/data/cipherData"; +import { CipherData } from "../models/data/cipher.data"; import { AccountSettingsSettings } from "../models/domain/account"; import { Attachment } from "../models/domain/attachment"; import { Card } from "../models/domain/card"; import { Cipher } from "../models/domain/cipher"; -import Domain from "../models/domain/domainBase"; -import { EncArrayBuffer } from "../models/domain/encArrayBuffer"; -import { EncString } from "../models/domain/encString"; +import Domain from "../models/domain/domain-base"; +import { EncArrayBuffer } from "../models/domain/enc-array-buffer"; +import { EncString } from "../models/domain/enc-string"; import { Field } from "../models/domain/field"; import { Identity } from "../models/domain/identity"; import { Login } from "../models/domain/login"; -import { LoginUri } from "../models/domain/loginUri"; +import { LoginUri } from "../models/domain/login-uri"; import { Password } from "../models/domain/password"; -import { SecureNote } from "../models/domain/secureNote"; -import { SortedCiphersCache } from "../models/domain/sortedCiphersCache"; -import { SymmetricCryptoKey } from "../models/domain/symmetricCryptoKey"; +import { SecureNote } from "../models/domain/secure-note"; +import { SortedCiphersCache } from "../models/domain/sorted-ciphers-cache"; +import { SymmetricCryptoKey } from "../models/domain/symmetric-crypto-key"; import { AttachmentRequest } from "../models/request/attachmentRequest"; import { CipherBulkDeleteRequest } from "../models/request/cipherBulkDeleteRequest"; import { CipherBulkMoveRequest } from "../models/request/cipherBulkMoveRequest"; @@ -41,10 +41,10 @@ import { CipherRequest } from "../models/request/cipherRequest"; import { CipherShareRequest } from "../models/request/cipherShareRequest"; import { CipherResponse } from "../models/response/cipherResponse"; import { ErrorResponse } from "../models/response/errorResponse"; -import { AttachmentView } from "../models/view/attachmentView"; -import { CipherView } from "../models/view/cipherView"; -import { FieldView } from "../models/view/fieldView"; -import { PasswordHistoryView } from "../models/view/passwordHistoryView"; +import { AttachmentView } from "../models/view/attachment.view"; +import { CipherView } from "../models/view/cipher.view"; +import { FieldView } from "../models/view/field.view"; +import { PasswordHistoryView } from "../models/view/password-history.view"; import { View } from "../models/view/view"; const DomainMatchBlacklist = new Map>([ diff --git a/libs/common/src/services/collection.service.ts b/libs/common/src/services/collection.service.ts index 12054916e0..4e93b88d34 100644 --- a/libs/common/src/services/collection.service.ts +++ b/libs/common/src/services/collection.service.ts @@ -4,10 +4,10 @@ import { I18nService } from "../abstractions/i18n.service"; import { StateService } from "../abstractions/state.service"; import { ServiceUtils } from "../misc/serviceUtils"; import { Utils } from "../misc/utils"; -import { CollectionData } from "../models/data/collectionData"; +import { CollectionData } from "../models/data/collection.data"; import { Collection } from "../models/domain/collection"; -import { TreeNode } from "../models/domain/treeNode"; -import { CollectionView } from "../models/view/collectionView"; +import { TreeNode } from "../models/domain/tree-node"; +import { CollectionView } from "../models/view/collection.view"; const NestingDelimiter = "/"; diff --git a/libs/common/src/services/crypto.service.ts b/libs/common/src/services/crypto.service.ts index 970b9da001..8b2a15e245 100644 --- a/libs/common/src/services/crypto.service.ts +++ b/libs/common/src/services/crypto.service.ts @@ -13,11 +13,11 @@ import { KeySuffixOptions } from "../enums/keySuffixOptions"; import { sequentialize } from "../misc/sequentialize"; import { Utils } from "../misc/utils"; import { EFFLongWordList } from "../misc/wordlist"; -import { EncryptedOrganizationKeyData } from "../models/data/encryptedOrganizationKeyData"; -import { EncArrayBuffer } from "../models/domain/encArrayBuffer"; -import { EncString } from "../models/domain/encString"; -import { BaseEncryptedOrganizationKey } from "../models/domain/encryptedOrganizationKey"; -import { SymmetricCryptoKey } from "../models/domain/symmetricCryptoKey"; +import { EncryptedOrganizationKeyData } from "../models/data/encrypted-organization-key.data"; +import { EncArrayBuffer } from "../models/domain/enc-array-buffer"; +import { EncString } from "../models/domain/enc-string"; +import { BaseEncryptedOrganizationKey } from "../models/domain/encrypted-organization-key"; +import { SymmetricCryptoKey } from "../models/domain/symmetric-crypto-key"; import { ProfileOrganizationResponse } from "../models/response/profileOrganizationResponse"; import { ProfileProviderOrganizationResponse } from "../models/response/profileProviderOrganizationResponse"; import { ProfileProviderResponse } from "../models/response/profileProviderResponse"; diff --git a/libs/common/src/services/encrypt.service.ts b/libs/common/src/services/encrypt.service.ts index d02e541b3b..c210fdcd7b 100644 --- a/libs/common/src/services/encrypt.service.ts +++ b/libs/common/src/services/encrypt.service.ts @@ -4,10 +4,10 @@ import { LogService } from "../abstractions/log.service"; import { EncryptionType } from "../enums/encryptionType"; import { IEncrypted } from "../interfaces/IEncrypted"; import { Utils } from "../misc/utils"; -import { EncArrayBuffer } from "../models/domain/encArrayBuffer"; -import { EncString } from "../models/domain/encString"; -import { EncryptedObject } from "../models/domain/encryptedObject"; -import { SymmetricCryptoKey } from "../models/domain/symmetricCryptoKey"; +import { EncArrayBuffer } from "../models/domain/enc-array-buffer"; +import { EncString } from "../models/domain/enc-string"; +import { EncryptedObject } from "../models/domain/encrypted-object"; +import { SymmetricCryptoKey } from "../models/domain/symmetric-crypto-key"; export class EncryptService implements AbstractEncryptService { constructor( diff --git a/libs/common/src/services/environment.service.ts b/libs/common/src/services/environment.service.ts index 48561a9909..1d461fe45b 100644 --- a/libs/common/src/services/environment.service.ts +++ b/libs/common/src/services/environment.service.ts @@ -5,7 +5,7 @@ import { Urls, } from "../abstractions/environment.service"; import { StateService } from "../abstractions/state.service"; -import { EnvironmentUrls } from "../models/domain/environmentUrls"; +import { EnvironmentUrls } from "../models/domain/environment-urls"; export class EnvironmentService implements EnvironmentServiceAbstraction { private readonly urlsSubject = new Subject(); diff --git a/libs/common/src/services/event.service.ts b/libs/common/src/services/event.service.ts index 4279da8642..84e0aa2bf3 100644 --- a/libs/common/src/services/event.service.ts +++ b/libs/common/src/services/event.service.ts @@ -5,7 +5,7 @@ import { LogService } from "../abstractions/log.service"; import { OrganizationService } from "../abstractions/organization/organization.service.abstraction"; import { StateService } from "../abstractions/state.service"; import { EventType } from "../enums/eventType"; -import { EventData } from "../models/data/eventData"; +import { EventData } from "../models/data/event.data"; import { EventRequest } from "../models/request/eventRequest"; export class EventService implements EventServiceAbstraction { diff --git a/libs/common/src/services/export.service.ts b/libs/common/src/services/export.service.ts index 0fdd1e332d..101dd70649 100644 --- a/libs/common/src/services/export.service.ts +++ b/libs/common/src/services/export.service.ts @@ -13,20 +13,20 @@ import { FolderService } from "../abstractions/folder/folder.service.abstraction import { CipherType } from "../enums/cipherType"; import { DEFAULT_KDF_ITERATIONS, KdfType } from "../enums/kdfType"; import { Utils } from "../misc/utils"; -import { CipherData } from "../models/data/cipherData"; -import { CollectionData } from "../models/data/collectionData"; +import { CipherData } from "../models/data/cipher.data"; +import { CollectionData } from "../models/data/collection.data"; import { Cipher } from "../models/domain/cipher"; import { Collection } from "../models/domain/collection"; import { Folder } from "../models/domain/folder"; -import { CipherWithIdExport as CipherExport } from "../models/export/cipherWithIdsExport"; -import { CollectionWithIdExport as CollectionExport } from "../models/export/collectionWithIdExport"; -import { EventExport } from "../models/export/eventExport"; -import { FolderWithIdExport as FolderExport } from "../models/export/folderWithIdExport"; +import { CipherWithIdExport as CipherExport } from "../models/export/cipher-with-ids.export"; +import { CollectionWithIdExport as CollectionExport } from "../models/export/collection-with-id.export"; +import { EventExport } from "../models/export/event.export"; +import { FolderWithIdExport as FolderExport } from "../models/export/folder-with-id.export"; import { CollectionDetailsResponse } from "../models/response/collectionResponse"; -import { CipherView } from "../models/view/cipherView"; -import { CollectionView } from "../models/view/collectionView"; -import { EventView } from "../models/view/eventView"; -import { FolderView } from "../models/view/folderView"; +import { CipherView } from "../models/view/cipher.view"; +import { CollectionView } from "../models/view/collection.view"; +import { EventView } from "../models/view/event.view"; +import { FolderView } from "../models/view/folder.view"; export class ExportService implements ExportServiceAbstraction { constructor( diff --git a/libs/common/src/services/fileUpload.service.ts b/libs/common/src/services/fileUpload.service.ts index b7837a2d64..8a41b3ea67 100644 --- a/libs/common/src/services/fileUpload.service.ts +++ b/libs/common/src/services/fileUpload.service.ts @@ -2,8 +2,8 @@ import { ApiService } from "../abstractions/api.service"; import { FileUploadService as FileUploadServiceAbstraction } from "../abstractions/fileUpload.service"; import { LogService } from "../abstractions/log.service"; import { FileUploadType } from "../enums/fileUploadType"; -import { EncArrayBuffer } from "../models/domain/encArrayBuffer"; -import { EncString } from "../models/domain/encString"; +import { EncArrayBuffer } from "../models/domain/enc-array-buffer"; +import { EncString } from "../models/domain/enc-string"; import { AttachmentUploadDataResponse } from "../models/response/attachmentUploadDataResponse"; import { SendFileUploadDataResponse } from "../models/response/sendFileUploadDataResponse"; diff --git a/libs/common/src/services/folder/folder-api.service.ts b/libs/common/src/services/folder/folder-api.service.ts index 44e03c3050..b9e6bbae7f 100644 --- a/libs/common/src/services/folder/folder-api.service.ts +++ b/libs/common/src/services/folder/folder-api.service.ts @@ -1,7 +1,7 @@ import { ApiService } from "../../abstractions/api.service"; import { FolderApiServiceAbstraction } from "../../abstractions/folder/folder-api.service.abstraction"; import { InternalFolderService } from "../../abstractions/folder/folder.service.abstraction"; -import { FolderData } from "../../models/data/folderData"; +import { FolderData } from "../../models/data/folder.data"; import { Folder } from "../../models/domain/folder"; import { FolderRequest } from "../../models/request/folderRequest"; import { FolderResponse } from "../../models/response/folderResponse"; diff --git a/libs/common/src/services/folder/folder.service.ts b/libs/common/src/services/folder/folder.service.ts index 09a305c02f..4d8981c4ea 100644 --- a/libs/common/src/services/folder/folder.service.ts +++ b/libs/common/src/services/folder/folder.service.ts @@ -6,11 +6,11 @@ import { InternalFolderService as InternalFolderServiceAbstraction } from "../.. import { I18nService } from "../../abstractions/i18n.service"; import { StateService } from "../../abstractions/state.service"; import { Utils } from "../../misc/utils"; -import { CipherData } from "../../models/data/cipherData"; -import { FolderData } from "../../models/data/folderData"; +import { CipherData } from "../../models/data/cipher.data"; +import { FolderData } from "../../models/data/folder.data"; import { Folder } from "../../models/domain/folder"; -import { SymmetricCryptoKey } from "../../models/domain/symmetricCryptoKey"; -import { FolderView } from "../../models/view/folderView"; +import { SymmetricCryptoKey } from "../../models/domain/symmetric-crypto-key"; +import { FolderView } from "../../models/view/folder.view"; export class FolderService implements InternalFolderServiceAbstraction { protected _folders: BehaviorSubject = new BehaviorSubject([]); diff --git a/libs/common/src/services/import.service.ts b/libs/common/src/services/import.service.ts index acb45f7ebb..06b607c740 100644 --- a/libs/common/src/services/import.service.ts +++ b/libs/common/src/services/import.service.ts @@ -71,7 +71,7 @@ import { UpmCsvImporter } from "../importers/upmCsvImporter"; import { YotiCsvImporter } from "../importers/yotiCsvImporter"; import { ZohoVaultCsvImporter } from "../importers/zohoVaultCsvImporter"; import { Utils } from "../misc/utils"; -import { ImportResult } from "../models/domain/importResult"; +import { ImportResult } from "../models/domain/import-result"; import { CipherRequest } from "../models/request/cipherRequest"; import { CollectionRequest } from "../models/request/collectionRequest"; import { FolderRequest } from "../models/request/folderRequest"; @@ -79,7 +79,7 @@ import { ImportCiphersRequest } from "../models/request/importCiphersRequest"; import { ImportOrganizationCiphersRequest } from "../models/request/importOrganizationCiphersRequest"; import { KvpRequest } from "../models/request/kvpRequest"; import { ErrorResponse } from "../models/response/errorResponse"; -import { CipherView } from "../models/view/cipherView"; +import { CipherView } from "../models/view/cipher.view"; export class ImportService implements ImportServiceAbstraction { featuredImportOptions = featuredImportOptions as readonly ImportOption[]; diff --git a/libs/common/src/services/keyConnector.service.ts b/libs/common/src/services/keyConnector.service.ts index fd4b7ffa84..1dbc45f801 100644 --- a/libs/common/src/services/keyConnector.service.ts +++ b/libs/common/src/services/keyConnector.service.ts @@ -8,7 +8,7 @@ import { StateService } from "../abstractions/state.service"; import { TokenService } from "../abstractions/token.service"; import { OrganizationUserType } from "../enums/organizationUserType"; import { Utils } from "../misc/utils"; -import { SymmetricCryptoKey } from "../models/domain/symmetricCryptoKey"; +import { SymmetricCryptoKey } from "../models/domain/symmetric-crypto-key"; import { SetKeyConnectorKeyRequest } from "../models/request/account/setKeyConnectorKeyRequest"; import { KeyConnectorUserKeyRequest } from "../models/request/keyConnectorUserKeyRequest"; import { KeysRequest } from "../models/request/keysRequest"; diff --git a/libs/common/src/services/organization/organization.service.ts b/libs/common/src/services/organization/organization.service.ts index e5ae50d524..9d9a7d5734 100644 --- a/libs/common/src/services/organization/organization.service.ts +++ b/libs/common/src/services/organization/organization.service.ts @@ -3,7 +3,7 @@ import { BehaviorSubject, concatMap, filter } from "rxjs"; import { OrganizationService as OrganizationServiceAbstraction } from "../../abstractions/organization/organization.service.abstraction"; import { StateService } from "../../abstractions/state.service"; import { SyncNotifierService } from "../../abstractions/sync/syncNotifier.service.abstraction"; -import { OrganizationData } from "../../models/data/organizationData"; +import { OrganizationData } from "../../models/data/organization.data"; import { Organization } from "../../models/domain/organization"; import { isSuccessfullyCompleted } from "../../types/syncEventArgs"; diff --git a/libs/common/src/services/passwordGeneration.service.ts b/libs/common/src/services/passwordGeneration.service.ts index aad9e1ac3c..a86f6ac7ed 100644 --- a/libs/common/src/services/passwordGeneration.service.ts +++ b/libs/common/src/services/passwordGeneration.service.ts @@ -7,9 +7,9 @@ import { PolicyService } from "../abstractions/policy/policy.service.abstraction import { StateService } from "../abstractions/state.service"; import { PolicyType } from "../enums/policyType"; import { EFFLongWordList } from "../misc/wordlist"; -import { EncString } from "../models/domain/encString"; -import { GeneratedPasswordHistory } from "../models/domain/generatedPasswordHistory"; -import { PasswordGeneratorPolicyOptions } from "../models/domain/passwordGeneratorPolicyOptions"; +import { EncString } from "../models/domain/enc-string"; +import { GeneratedPasswordHistory } from "../models/domain/generated-password-history"; +import { PasswordGeneratorPolicyOptions } from "../models/domain/password-generator-policy-options"; import { Policy } from "../models/domain/policy"; const DefaultOptions = { diff --git a/libs/common/src/services/policy/policy-api.service.ts b/libs/common/src/services/policy/policy-api.service.ts index d7ccdc0384..5f84c7f922 100644 --- a/libs/common/src/services/policy/policy-api.service.ts +++ b/libs/common/src/services/policy/policy-api.service.ts @@ -6,8 +6,8 @@ import { PolicyApiServiceAbstraction } from "../../abstractions/policy/policy-ap import { InternalPolicyService } from "../../abstractions/policy/policy.service.abstraction"; import { StateService } from "../../abstractions/state.service"; import { PolicyType } from "../../enums/policyType"; -import { PolicyData } from "../../models/data/policyData"; -import { MasterPasswordPolicyOptions } from "../../models/domain/masterPasswordPolicyOptions"; +import { PolicyData } from "../../models/data/policy.data"; +import { MasterPasswordPolicyOptions } from "../../models/domain/master-password-policy-options"; import { PolicyRequest } from "../../models/request/policyRequest"; import { ListResponse } from "../../models/response/listResponse"; import { PolicyResponse } from "../../models/response/policyResponse"; diff --git a/libs/common/src/services/policy/policy.service.ts b/libs/common/src/services/policy/policy.service.ts index 7e963b8e90..a3d87e02f1 100644 --- a/libs/common/src/services/policy/policy.service.ts +++ b/libs/common/src/services/policy/policy.service.ts @@ -7,11 +7,11 @@ import { OrganizationUserStatusType } from "../../enums/organizationUserStatusTy import { OrganizationUserType } from "../../enums/organizationUserType"; import { PolicyType } from "../../enums/policyType"; import { Utils } from "../../misc/utils"; -import { PolicyData } from "../../models/data/policyData"; -import { MasterPasswordPolicyOptions } from "../../models/domain/masterPasswordPolicyOptions"; +import { PolicyData } from "../../models/data/policy.data"; +import { MasterPasswordPolicyOptions } from "../../models/domain/master-password-policy-options"; import { Organization } from "../../models/domain/organization"; import { Policy } from "../../models/domain/policy"; -import { ResetPasswordPolicyOptions } from "../../models/domain/resetPasswordPolicyOptions"; +import { ResetPasswordPolicyOptions } from "../../models/domain/reset-password-policy-options"; import { ListResponse } from "../../models/response/listResponse"; import { PolicyResponse } from "../../models/response/policyResponse"; diff --git a/libs/common/src/services/provider.service.ts b/libs/common/src/services/provider.service.ts index 53f095424b..e8d96976dd 100644 --- a/libs/common/src/services/provider.service.ts +++ b/libs/common/src/services/provider.service.ts @@ -1,6 +1,6 @@ import { ProviderService as ProviderServiceAbstraction } from "../abstractions/provider.service"; import { StateService } from "../abstractions/state.service"; -import { ProviderData } from "../models/data/providerData"; +import { ProviderData } from "../models/data/provider.data"; import { Provider } from "../models/domain/provider"; export class ProviderService implements ProviderServiceAbstraction { diff --git a/libs/common/src/services/search.service.ts b/libs/common/src/services/search.service.ts index fe25698b70..05f2423b17 100644 --- a/libs/common/src/services/search.service.ts +++ b/libs/common/src/services/search.service.ts @@ -7,8 +7,8 @@ import { SearchService as SearchServiceAbstraction } from "../abstractions/searc import { CipherType } from "../enums/cipherType"; import { FieldType } from "../enums/fieldType"; import { UriMatchType } from "../enums/uriMatchType"; -import { CipherView } from "../models/view/cipherView"; -import { SendView } from "../models/view/sendView"; +import { CipherView } from "../models/view/cipher.view"; +import { SendView } from "../models/view/send.view"; export class SearchService implements SearchServiceAbstraction { private static registeredPipeline = false; diff --git a/libs/common/src/services/send.service.ts b/libs/common/src/services/send.service.ts index 3d8daa3a69..e0df9364b4 100644 --- a/libs/common/src/services/send.service.ts +++ b/libs/common/src/services/send.service.ts @@ -8,17 +8,17 @@ import { StateService } from "../abstractions/state.service"; import { SEND_KDF_ITERATIONS } from "../enums/kdfType"; import { SendType } from "../enums/sendType"; import { Utils } from "../misc/utils"; -import { SendData } from "../models/data/sendData"; -import { EncArrayBuffer } from "../models/domain/encArrayBuffer"; -import { EncString } from "../models/domain/encString"; +import { SendData } from "../models/data/send.data"; +import { EncArrayBuffer } from "../models/domain/enc-array-buffer"; +import { EncString } from "../models/domain/enc-string"; import { Send } from "../models/domain/send"; -import { SendFile } from "../models/domain/sendFile"; -import { SendText } from "../models/domain/sendText"; -import { SymmetricCryptoKey } from "../models/domain/symmetricCryptoKey"; +import { SendFile } from "../models/domain/send-file"; +import { SendText } from "../models/domain/send-text"; +import { SymmetricCryptoKey } from "../models/domain/symmetric-crypto-key"; import { SendRequest } from "../models/request/sendRequest"; import { ErrorResponse } from "../models/response/errorResponse"; import { SendResponse } from "../models/response/sendResponse"; -import { SendView } from "../models/view/sendView"; +import { SendView } from "../models/view/send.view"; export class SendService implements SendServiceAbstraction { constructor( diff --git a/libs/common/src/services/state.service.ts b/libs/common/src/services/state.service.ts index cbae46ed13..ff21e440ca 100644 --- a/libs/common/src/services/state.service.ts +++ b/libs/common/src/services/state.service.ts @@ -13,16 +13,16 @@ import { StorageLocation } from "../enums/storageLocation"; import { ThemeType } from "../enums/themeType"; import { UriMatchType } from "../enums/uriMatchType"; import { StateFactory } from "../factories/stateFactory"; -import { CipherData } from "../models/data/cipherData"; -import { CollectionData } from "../models/data/collectionData"; -import { EncryptedOrganizationKeyData } from "../models/data/encryptedOrganizationKeyData"; -import { EventData } from "../models/data/eventData"; -import { FolderData } from "../models/data/folderData"; -import { LocalData } from "../models/data/localData"; -import { OrganizationData } from "../models/data/organizationData"; -import { PolicyData } from "../models/data/policyData"; -import { ProviderData } from "../models/data/providerData"; -import { SendData } from "../models/data/sendData"; +import { CipherData } from "../models/data/cipher.data"; +import { CollectionData } from "../models/data/collection.data"; +import { EncryptedOrganizationKeyData } from "../models/data/encrypted-organization-key.data"; +import { EventData } from "../models/data/event.data"; +import { FolderData } from "../models/data/folder.data"; +import { LocalData } from "../models/data/local.data"; +import { OrganizationData } from "../models/data/organization.data"; +import { PolicyData } from "../models/data/policy.data"; +import { ProviderData } from "../models/data/provider.data"; +import { SendData } from "../models/data/send.data"; import { ServerConfigData } from "../models/data/server-config.data"; import { Account, @@ -30,18 +30,18 @@ import { AccountSettings, AccountSettingsSettings, } from "../models/domain/account"; -import { EncString } from "../models/domain/encString"; -import { EnvironmentUrls } from "../models/domain/environmentUrls"; -import { GeneratedPasswordHistory } from "../models/domain/generatedPasswordHistory"; -import { GlobalState } from "../models/domain/globalState"; +import { EncString } from "../models/domain/enc-string"; +import { EnvironmentUrls } from "../models/domain/environment-urls"; +import { GeneratedPasswordHistory } from "../models/domain/generated-password-history"; +import { GlobalState } from "../models/domain/global-state"; import { Policy } from "../models/domain/policy"; import { State } from "../models/domain/state"; -import { StorageOptions } from "../models/domain/storageOptions"; -import { SymmetricCryptoKey } from "../models/domain/symmetricCryptoKey"; -import { WindowState } from "../models/domain/windowState"; -import { CipherView } from "../models/view/cipherView"; -import { CollectionView } from "../models/view/collectionView"; -import { SendView } from "../models/view/sendView"; +import { StorageOptions } from "../models/domain/storage-options"; +import { SymmetricCryptoKey } from "../models/domain/symmetric-crypto-key"; +import { WindowState } from "../models/domain/window-state"; +import { CipherView } from "../models/view/cipher.view"; +import { CollectionView } from "../models/view/collection.view"; +import { SendView } from "../models/view/send.view"; const keys = { state: "state", diff --git a/libs/common/src/services/stateMigration.service.ts b/libs/common/src/services/stateMigration.service.ts index e936860657..1ad874cb0f 100644 --- a/libs/common/src/services/stateMigration.service.ts +++ b/libs/common/src/services/stateMigration.service.ts @@ -4,25 +4,25 @@ import { KdfType } from "../enums/kdfType"; import { StateVersion } from "../enums/stateVersion"; import { ThemeType } from "../enums/themeType"; import { StateFactory } from "../factories/stateFactory"; -import { CipherData } from "../models/data/cipherData"; -import { CollectionData } from "../models/data/collectionData"; -import { EventData } from "../models/data/eventData"; -import { FolderData } from "../models/data/folderData"; -import { OrganizationData } from "../models/data/organizationData"; -import { PolicyData } from "../models/data/policyData"; -import { ProviderData } from "../models/data/providerData"; -import { SendData } from "../models/data/sendData"; +import { CipherData } from "../models/data/cipher.data"; +import { CollectionData } from "../models/data/collection.data"; +import { EventData } from "../models/data/event.data"; +import { FolderData } from "../models/data/folder.data"; +import { OrganizationData } from "../models/data/organization.data"; +import { PolicyData } from "../models/data/policy.data"; +import { ProviderData } from "../models/data/provider.data"; +import { SendData } from "../models/data/send.data"; import { Account, AccountSettings, AccountSettingsSettings, EncryptionPair, } from "../models/domain/account"; -import { EncString } from "../models/domain/encString"; -import { EnvironmentUrls } from "../models/domain/environmentUrls"; -import { GeneratedPasswordHistory } from "../models/domain/generatedPasswordHistory"; -import { GlobalState } from "../models/domain/globalState"; -import { StorageOptions } from "../models/domain/storageOptions"; +import { EncString } from "../models/domain/enc-string"; +import { EnvironmentUrls } from "../models/domain/environment-urls"; +import { GeneratedPasswordHistory } from "../models/domain/generated-password-history"; +import { GlobalState } from "../models/domain/global-state"; +import { StorageOptions } from "../models/domain/storage-options"; import { TokenService } from "./token.service"; diff --git a/libs/common/src/services/sync/sync.service.ts b/libs/common/src/services/sync/sync.service.ts index 736a3ceeea..1803b58792 100644 --- a/libs/common/src/services/sync/sync.service.ts +++ b/libs/common/src/services/sync/sync.service.ts @@ -15,12 +15,12 @@ import { StateService } from "../../abstractions/state.service"; import { SyncService as SyncServiceAbstraction } from "../../abstractions/sync/sync.service.abstraction"; import { SyncNotifierService } from "../../abstractions/sync/syncNotifier.service.abstraction"; import { sequentialize } from "../../misc/sequentialize"; -import { CipherData } from "../../models/data/cipherData"; -import { CollectionData } from "../../models/data/collectionData"; -import { FolderData } from "../../models/data/folderData"; -import { PolicyData } from "../../models/data/policyData"; -import { ProviderData } from "../../models/data/providerData"; -import { SendData } from "../../models/data/sendData"; +import { CipherData } from "../../models/data/cipher.data"; +import { CollectionData } from "../../models/data/collection.data"; +import { FolderData } from "../../models/data/folder.data"; +import { PolicyData } from "../../models/data/policy.data"; +import { ProviderData } from "../../models/data/provider.data"; +import { SendData } from "../../models/data/send.data"; import { CipherResponse } from "../../models/response/cipherResponse"; import { CollectionDetailsResponse } from "../../models/response/collectionResponse"; import { DomainsResponse } from "../../models/response/domainsResponse"; diff --git a/libs/common/src/services/webCryptoFunction.service.ts b/libs/common/src/services/webCryptoFunction.service.ts index 2e0b920f51..ad3f9b4633 100644 --- a/libs/common/src/services/webCryptoFunction.service.ts +++ b/libs/common/src/services/webCryptoFunction.service.ts @@ -2,8 +2,8 @@ import * as forge from "node-forge"; import { CryptoFunctionService } from "../abstractions/cryptoFunction.service"; import { Utils } from "../misc/utils"; -import { DecryptParameters } from "../models/domain/decryptParameters"; -import { SymmetricCryptoKey } from "../models/domain/symmetricCryptoKey"; +import { DecryptParameters } from "../models/domain/decrypt-parameters"; +import { SymmetricCryptoKey } from "../models/domain/symmetric-crypto-key"; export class WebCryptoFunctionService implements CryptoFunctionService { private crypto: Crypto; diff --git a/libs/electron/src/services/electronCrypto.service.ts b/libs/electron/src/services/electronCrypto.service.ts index 461d809d79..0fe814b138 100644 --- a/libs/electron/src/services/electronCrypto.service.ts +++ b/libs/electron/src/services/electronCrypto.service.ts @@ -4,7 +4,7 @@ import { LogService } from "@bitwarden/common/abstractions/log.service"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; import { StateService } from "@bitwarden/common/abstractions/state.service"; import { KeySuffixOptions } from "@bitwarden/common/enums/keySuffixOptions"; -import { SymmetricCryptoKey } from "@bitwarden/common/models/domain/symmetricCryptoKey"; +import { SymmetricCryptoKey } from "@bitwarden/common/models/domain/symmetric-crypto-key"; import { CryptoService } from "@bitwarden/common/services/crypto.service"; export class ElectronCryptoService extends CryptoService { diff --git a/libs/electron/src/services/electronRendererSecureStorage.service.ts b/libs/electron/src/services/electronRendererSecureStorage.service.ts index bc82280517..2a645559c8 100644 --- a/libs/electron/src/services/electronRendererSecureStorage.service.ts +++ b/libs/electron/src/services/electronRendererSecureStorage.service.ts @@ -1,7 +1,7 @@ import { ipcRenderer } from "electron"; import { AbstractStorageService } from "@bitwarden/common/abstractions/storage.service"; -import { StorageOptions } from "@bitwarden/common/models/domain/storageOptions"; +import { StorageOptions } from "@bitwarden/common/models/domain/storage-options"; export class ElectronRendererSecureStorageService implements AbstractStorageService { async get(key: string, options?: StorageOptions): Promise { diff --git a/libs/node/spec/services/nodeCryptoFunction.service.spec.ts b/libs/node/spec/services/nodeCryptoFunction.service.spec.ts index 5b8c7c78c6..d0097c2930 100644 --- a/libs/node/spec/services/nodeCryptoFunction.service.spec.ts +++ b/libs/node/spec/services/nodeCryptoFunction.service.spec.ts @@ -1,5 +1,5 @@ import { Utils } from "@bitwarden/common/misc/utils"; -import { SymmetricCryptoKey } from "@bitwarden/common/models/domain/symmetricCryptoKey"; +import { SymmetricCryptoKey } from "@bitwarden/common/models/domain/symmetric-crypto-key"; import { NodeCryptoFunctionService } from "@bitwarden/node/services/nodeCryptoFunction.service"; const RsaPublicKey = diff --git a/libs/node/src/cli/commands/login.command.ts b/libs/node/src/cli/commands/login.command.ts index f4040df71e..cfd4841705 100644 --- a/libs/node/src/cli/commands/login.command.ts +++ b/libs/node/src/cli/commands/login.command.ts @@ -19,12 +19,12 @@ import { TwoFactorService } from "@bitwarden/common/abstractions/twoFactor.servi import { TwoFactorProviderType } from "@bitwarden/common/enums/twoFactorProviderType"; import { NodeUtils } from "@bitwarden/common/misc/nodeUtils"; import { Utils } from "@bitwarden/common/misc/utils"; -import { AuthResult } from "@bitwarden/common/models/domain/authResult"; +import { AuthResult } from "@bitwarden/common/models/domain/auth-result"; import { ApiLogInCredentials, PasswordLogInCredentials, SsoLogInCredentials, -} from "@bitwarden/common/models/domain/logInCredentials"; +} from "@bitwarden/common/models/domain/log-in-credentials"; import { TokenRequestTwoFactor } from "@bitwarden/common/models/request/identityToken/tokenRequestTwoFactor"; import { TwoFactorEmailRequest } from "@bitwarden/common/models/request/twoFactorEmailRequest"; import { UpdateTempPasswordRequest } from "@bitwarden/common/models/request/updateTempPasswordRequest"; diff --git a/libs/node/src/services/nodeCryptoFunction.service.ts b/libs/node/src/services/nodeCryptoFunction.service.ts index 2c18f36899..fc22622a1e 100644 --- a/libs/node/src/services/nodeCryptoFunction.service.ts +++ b/libs/node/src/services/nodeCryptoFunction.service.ts @@ -4,8 +4,8 @@ import * as forge from "node-forge"; import { CryptoFunctionService } from "@bitwarden/common/abstractions/cryptoFunction.service"; import { Utils } from "@bitwarden/common/misc/utils"; -import { DecryptParameters } from "@bitwarden/common/models/domain/decryptParameters"; -import { SymmetricCryptoKey } from "@bitwarden/common/models/domain/symmetricCryptoKey"; +import { DecryptParameters } from "@bitwarden/common/models/domain/decrypt-parameters"; +import { SymmetricCryptoKey } from "@bitwarden/common/models/domain/symmetric-crypto-key"; export class NodeCryptoFunctionService implements CryptoFunctionService { pbkdf2(