diff --git a/.github/whitelist-capital-letters.txt b/.github/whitelist-capital-letters.txt index fb928a67e8..247107e87e 100644 --- a/.github/whitelist-capital-letters.txt +++ b/.github/whitelist-capital-letters.txt @@ -220,193 +220,6 @@ ./libs/common/src/enums/nativeMessagingVersion.ts ./libs/common/src/enums/cipherRepromptType.ts ./libs/common/src/enums/organizationUserType.ts -./libs/common/src/models/response/organization/organizationSsoResponse.ts -./libs/common/src/models/response/taxInfoResponse.ts -./libs/common/src/models/response/syncResponse.ts -./libs/common/src/models/response/taxRateResponse.ts -./libs/common/src/models/response/organizationKeysResponse.ts -./libs/common/src/models/response/authRequestResponse.ts -./libs/common/src/models/response/collectionResponse.ts -./libs/common/src/models/response/planResponse.ts -./libs/common/src/models/response/baseResponse.ts -./libs/common/src/models/response/twoFactorProviderResponse.ts -./libs/common/src/models/response/twoFactorAuthenticatorResponse.ts -./libs/common/src/models/response/billingResponse.ts -./libs/common/src/models/response/passwordHistoryResponse.ts -./libs/common/src/models/response/keyConnectorUserKeyResponse.ts -./libs/common/src/models/response/policyResponse.ts -./libs/common/src/models/response/organizationApiKeyInformationResponse.ts -./libs/common/src/models/response/profileProviderResponse.ts -./libs/common/src/models/response/preloginResponse.ts -./libs/common/src/models/response/identityCaptchaResponse.ts -./libs/common/src/models/response/profileResponse.ts -./libs/common/src/models/response/apiKeyResponse.ts -./libs/common/src/models/response/organizationUserBulkPublicKeyResponse.ts -./libs/common/src/models/response/sendFileUploadDataResponse.ts -./libs/common/src/models/response/userKeyResponse.ts -./libs/common/src/models/response/provider/providerOrganizationResponse.ts -./libs/common/src/models/response/provider/providerUserResponse.ts -./libs/common/src/models/response/provider/providerUserBulkPublicKeyResponse.ts -./libs/common/src/models/response/provider/providerResponse.ts -./libs/common/src/models/response/provider/providerUserBulkResponse.ts -./libs/common/src/models/response/billingHistoryResponse.ts -./libs/common/src/models/response/folderResponse.ts -./libs/common/src/models/response/billingPaymentResponse.ts -./libs/common/src/models/response/errorResponse.ts -./libs/common/src/models/response/organizationUserBulkResponse.ts -./libs/common/src/models/response/subscriptionResponse.ts -./libs/common/src/models/response/eventResponse.ts -./libs/common/src/models/response/ssoPreValidateResponse.ts -./libs/common/src/models/response/profileProviderOrganizationResponse.ts -./libs/common/src/models/response/sendAccessResponse.ts -./libs/common/src/models/response/organizationSubscriptionResponse.ts -./libs/common/src/models/response/groupResponse.ts -./libs/common/src/models/response/sendResponse.ts -./libs/common/src/models/response/listResponse.ts -./libs/common/src/models/response/twoFactorRescoverResponse.ts -./libs/common/src/models/response/identityTokenResponse.ts -./libs/common/src/models/response/cipherResponse.ts -./libs/common/src/models/response/profileOrganizationResponse.ts -./libs/common/src/models/response/organizationSponsorshipSyncStatusResponse.ts -./libs/common/src/models/response/organizationResponse.ts -./libs/common/src/models/response/globalDomainResponse.ts -./libs/common/src/models/response/domainsResponse.ts -./libs/common/src/models/response/attachmentUploadDataResponse.ts -./libs/common/src/models/response/selectionReadOnlyResponse.ts -./libs/common/src/models/response/paymentResponse.ts -./libs/common/src/models/response/organizationAutoEnrollStatusResponse.ts -./libs/common/src/models/response/keysResponse.ts -./libs/common/src/models/response/notificationResponse.ts -./libs/common/src/models/response/deviceVerificationResponse.ts -./libs/common/src/models/response/identityTwoFactorResponse.ts -./libs/common/src/models/response/organizationConnectionResponse.ts -./libs/common/src/models/response/organizationExportResponse.ts -./libs/common/src/models/response/deviceResponse.ts -./libs/common/src/models/response/authentication/registerResponse.ts -./libs/common/src/models/response/authentication/ICaptchaProtectedResponse.ts -./libs/common/src/models/response/organizationUserResponse.ts -./libs/common/src/models/response/twoFactorYubiKeyResponse.ts -./libs/common/src/models/response/breachAccountResponse.ts -./libs/common/src/models/response/twoFactorEmailResponse.ts -./libs/common/src/models/response/twoFactorWebAuthnResponse.ts -./libs/common/src/models/response/twoFactorDuoResponse.ts -./libs/common/src/models/response/attachmentResponse.ts -./libs/common/src/models/response/sendFileDownloadDataResponse.ts -./libs/common/src/models/response/emergencyAccessResponse.ts -./libs/common/src/models/request/organization/organizationSsoRequest.ts -./libs/common/src/models/request/organization/organizationSponsorshipCreateRequest.ts -./libs/common/src/models/request/organization/organizationSponsorshipRedeemRequest.ts -./libs/common/src/models/request/kvpRequest.ts -./libs/common/src/models/request/organizationImportGroupRequest.ts -./libs/common/src/models/request/storageRequest.ts -./libs/common/src/models/request/importDirectoryRequestGroup.ts -./libs/common/src/models/request/cipherBulkMoveRequest.ts -./libs/common/src/models/request/verifyEmailRequest.ts -./libs/common/src/models/request/deviceVerificationRequest.ts -./libs/common/src/models/request/deviceRequest.ts -./libs/common/src/models/request/cipherBulkShareRequest.ts -./libs/common/src/models/request/organizationUserBulkConfirmRequest.ts -./libs/common/src/models/request/emergencyAccessUpdateRequest.ts -./libs/common/src/models/request/passwordRequest.ts -./libs/common/src/models/request/updateTwoFactorAuthenticatorRequest.ts -./libs/common/src/models/request/folderRequest.ts -./libs/common/src/models/request/cipherBulkDeleteRequest.ts -./libs/common/src/models/request/importDirectoryRequest.ts -./libs/common/src/models/request/deleteRecoverRequest.ts -./libs/common/src/models/request/captchaProtectedRequest.ts -./libs/common/src/models/request/passwordHistoryRequest.ts -./libs/common/src/models/request/organizationCreateRequest.ts -./libs/common/src/models/request/bitPayInvoiceRequest.ts -./libs/common/src/models/request/updateTempPasswordRequest.ts -./libs/common/src/models/request/updateDomainsRequest.ts -./libs/common/src/models/request/organizationUserUpdateRequest.ts -./libs/common/src/models/request/twoFactorRecoveryRequest.ts -./libs/common/src/models/request/importOrganizationCiphersRequest.ts -./libs/common/src/models/request/updateTwoFactorWebAuthnDeleteRequest.ts -./libs/common/src/models/request/organizationUpdateRequest.ts -./libs/common/src/models/request/billingSyncConfigRequest.ts -./libs/common/src/models/request/importCiphersRequest.ts -./libs/common/src/models/request/organizationApiKeyRequest.ts -./libs/common/src/models/request/updateTwoFactorEmailRequest.ts -./libs/common/src/models/request/emailTokenRequest.ts -./libs/common/src/models/request/organizationUserConfirmRequest.ts -./libs/common/src/models/request/registerRequest.ts -./libs/common/src/models/request/cipherCreateRequest.ts -./libs/common/src/models/request/seatRequest.ts -./libs/common/src/models/request/sendAccessRequest.ts -./libs/common/src/models/request/setPasswordRequest.ts -./libs/common/src/models/request/cipherShareRequest.ts -./libs/common/src/models/request/verifyDeleteRecoverRequest.ts -./libs/common/src/models/request/identityToken/tokenRequest.ts -./libs/common/src/models/request/identityToken/apiTokenRequest.ts -./libs/common/src/models/request/identityToken/tokenRequestTwoFactor.ts -./libs/common/src/models/request/identityToken/ssoTokenRequest.ts -./libs/common/src/models/request/identityToken/passwordTokenRequest.ts -./libs/common/src/models/request/provider/providerUserConfirmRequest.ts -./libs/common/src/models/request/provider/providerOrganizationCreateRequest.ts -./libs/common/src/models/request/provider/providerUserUpdateRequest.ts -./libs/common/src/models/request/provider/providerUserBulkRequest.ts -./libs/common/src/models/request/provider/providerUpdateRequest.ts -./libs/common/src/models/request/provider/providerUserBulkConfirmRequest.ts -./libs/common/src/models/request/provider/providerUserAcceptRequest.ts -./libs/common/src/models/request/provider/providerUserInviteRequest.ts -./libs/common/src/models/request/provider/providerSetupRequest.ts -./libs/common/src/models/request/provider/providerAddOrganizationRequest.ts -./libs/common/src/models/request/cipherRequest.ts -./libs/common/src/models/request/groupRequest.ts -./libs/common/src/models/request/preloginRequest.ts -./libs/common/src/models/request/folderWithIdRequest.ts -./libs/common/src/models/request/selectionReadOnlyRequest.ts -./libs/common/src/models/request/kdfRequest.ts -./libs/common/src/models/request/organizationImportMemberRequest.ts -./libs/common/src/models/request/referenceEventRequest.ts -./libs/common/src/models/request/passwordHintRequest.ts -./libs/common/src/models/request/deviceTokenRequest.ts -./libs/common/src/models/request/organizationConnectionRequest.ts -./libs/common/src/models/request/emergencyAccessPasswordRequest.ts -./libs/common/src/models/request/organizationUserInviteRequest.ts -./libs/common/src/models/request/scimConfigRequest.ts -./libs/common/src/models/request/organizationUserUpdateGroupsRequest.ts -./libs/common/src/models/request/eventRequest.ts -./libs/common/src/models/request/iapCheckRequest.ts -./libs/common/src/models/request/organizationUpgradeRequest.ts -./libs/common/src/models/request/emergencyAccessInviteRequest.ts -./libs/common/src/models/request/twoFactorProviderRequest.ts -./libs/common/src/models/request/collectionRequest.ts -./libs/common/src/models/request/importDirectoryRequestUser.ts -./libs/common/src/models/request/secretVerificationRequest.ts -./libs/common/src/models/request/organizationUserBulkRequest.ts -./libs/common/src/models/request/taxInfoUpdateRequest.ts -./libs/common/src/models/request/emergencyAccessAcceptRequest.ts -./libs/common/src/models/request/updateTwoFactorDuoRequest.ts -./libs/common/src/models/request/sendWithIdRequest.ts -./libs/common/src/models/request/organizationTaxInfoUpdateRequest.ts -./libs/common/src/models/request/organizationUserAcceptRequest.ts -./libs/common/src/models/request/cipherBulkRestoreRequest.ts -./libs/common/src/models/request/emailRequest.ts -./libs/common/src/models/request/updateProfileRequest.ts -./libs/common/src/models/request/updateTwoFactorWebAuthnRequest.ts -./libs/common/src/models/request/emergencyAccessConfirmRequest.ts -./libs/common/src/models/request/passwordlessCreateAuthRequest.ts -./libs/common/src/models/request/verifyBankRequest.ts -./libs/common/src/models/request/keyConnectorUserKeyRequest.ts -./libs/common/src/models/request/organizationKeysRequest.ts -./libs/common/src/models/request/policyRequest.ts -./libs/common/src/models/request/organizationImportRequest.ts -./libs/common/src/models/request/account/setKeyConnectorKeyRequest.ts -./libs/common/src/models/request/account/verifyOTPRequest.ts -./libs/common/src/models/request/attachmentRequest.ts -./libs/common/src/models/request/cipherWithIdRequest.ts -./libs/common/src/models/request/updateKeyRequest.ts -./libs/common/src/models/request/twoFactorEmailRequest.ts -./libs/common/src/models/request/organizationSubscriptionUpdateRequest.ts -./libs/common/src/models/request/organizationUserResetPasswordEnrollmentRequest.ts -./libs/common/src/models/request/sendRequest.ts -./libs/common/src/models/request/keysRequest.ts -./libs/common/src/models/request/updateTwoFactorYubioOtpRequest.ts -./libs/common/src/models/request/paymentRequest.ts -./libs/common/src/models/request/organizationUserResetPasswordRequest.ts -./libs/common/src/models/request/cipherCollectionsRequest.ts ./libs/common/src/emailForwarders/fastmailForwarder.ts ./libs/common/src/emailForwarders/duckDuckGoForwarder.ts ./libs/common/src/emailForwarders/firefoxRelayForwarder.ts diff --git a/apps/cli/src/commands/confirm.command.ts b/apps/cli/src/commands/confirm.command.ts index 1eb469908a..79d30dfec6 100644 --- a/apps/cli/src/commands/confirm.command.ts +++ b/apps/cli/src/commands/confirm.command.ts @@ -1,7 +1,7 @@ import { ApiService } from "@bitwarden/common/abstractions/api.service"; import { CryptoService } from "@bitwarden/common/abstractions/crypto.service"; import { Utils } from "@bitwarden/common/misc/utils"; -import { OrganizationUserConfirmRequest } from "@bitwarden/common/models/request/organizationUserConfirmRequest"; +import { OrganizationUserConfirmRequest } from "@bitwarden/common/models/request/organization-user-confirm.request"; import { Response } from "@bitwarden/node/cli/models/response"; export class ConfirmCommand { diff --git a/apps/cli/src/commands/create.command.ts b/apps/cli/src/commands/create.command.ts index c06c81eafc..2cebe22508 100644 --- a/apps/cli/src/commands/create.command.ts +++ b/apps/cli/src/commands/create.command.ts @@ -11,8 +11,8 @@ import { Utils } from "@bitwarden/common/misc/utils"; 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 { CollectionRequest } from "@bitwarden/common/models/request/collection.request"; +import { SelectionReadOnlyRequest } from "@bitwarden/common/models/request/selection-read-only.request"; import { Response } from "@bitwarden/node/cli/models/response"; import { OrganizationCollectionRequest } from "../models/request/organizationCollectionRequest"; diff --git a/apps/cli/src/commands/edit.command.ts b/apps/cli/src/commands/edit.command.ts index 235d455ee0..6c3dd9d2ef 100644 --- a/apps/cli/src/commands/edit.command.ts +++ b/apps/cli/src/commands/edit.command.ts @@ -7,8 +7,8 @@ import { Utils } from "@bitwarden/common/misc/utils"; 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 { CollectionRequest } from "@bitwarden/common/models/request/collection.request"; +import { SelectionReadOnlyRequest } from "@bitwarden/common/models/request/selection-read-only.request"; import { Response } from "@bitwarden/node/cli/models/response"; import { OrganizationCollectionRequest } from "../models/request/organizationCollectionRequest"; diff --git a/apps/cli/src/commands/get.command.ts b/apps/cli/src/commands/get.command.ts index ce5975a496..fb08ce0656 100644 --- a/apps/cli/src/commands/get.command.ts +++ b/apps/cli/src/commands/get.command.ts @@ -22,7 +22,7 @@ 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 { ErrorResponse } from "@bitwarden/common/models/response/error.response"; 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"; diff --git a/apps/cli/src/commands/list.command.ts b/apps/cli/src/commands/list.command.ts index 4246769778..250237a787 100644 --- a/apps/cli/src/commands/list.command.ts +++ b/apps/cli/src/commands/list.command.ts @@ -10,8 +10,8 @@ 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"; +} from "@bitwarden/common/models/response/collection.response"; +import { ListResponse as ApiListResponse } from "@bitwarden/common/models/response/list.response"; 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/receive.command.ts b/apps/cli/src/commands/send/receive.command.ts index e67ff3de67..9a9803e57f 100644 --- a/apps/cli/src/commands/send/receive.command.ts +++ b/apps/cli/src/commands/send/receive.command.ts @@ -11,8 +11,8 @@ import { NodeUtils } from "@bitwarden/common/misc/nodeUtils"; import { Utils } from "@bitwarden/common/misc/utils"; 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 { SendAccessRequest } from "@bitwarden/common/models/request/send-access.request"; +import { ErrorResponse } from "@bitwarden/common/models/response/error.response"; import { SendAccessView } from "@bitwarden/common/models/view/send-access.view"; import { Response } from "@bitwarden/node/cli/models/response"; diff --git a/apps/cli/src/commands/unlock.command.ts b/apps/cli/src/commands/unlock.command.ts index 4318a22cbd..83de7a0b1c 100644 --- a/apps/cli/src/commands/unlock.command.ts +++ b/apps/cli/src/commands/unlock.command.ts @@ -8,7 +8,7 @@ import { StateService } from "@bitwarden/common/abstractions/state.service"; import { SyncService } from "@bitwarden/common/abstractions/sync/sync.service.abstraction"; import { HashPurpose } from "@bitwarden/common/enums/hashPurpose"; import { Utils } from "@bitwarden/common/misc/utils"; -import { SecretVerificationRequest } from "@bitwarden/common/models/request/secretVerificationRequest"; +import { SecretVerificationRequest } from "@bitwarden/common/models/request/secret-verification.request"; import { ConsoleLogService } from "@bitwarden/common/services/consoleLog.service"; import { Response } from "@bitwarden/node/cli/models/response"; import { MessageResponse } from "@bitwarden/node/cli/models/response/messageResponse"; diff --git a/apps/web/src/app/accounts/accept-emergency.component.ts b/apps/web/src/app/accounts/accept-emergency.component.ts index a3a2f43fc0..8cfdb9dcb1 100644 --- a/apps/web/src/app/accounts/accept-emergency.component.ts +++ b/apps/web/src/app/accounts/accept-emergency.component.ts @@ -5,7 +5,7 @@ import { ApiService } from "@bitwarden/common/abstractions/api.service"; import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; import { StateService } from "@bitwarden/common/abstractions/state.service"; -import { EmergencyAccessAcceptRequest } from "@bitwarden/common/models/request/emergencyAccessAcceptRequest"; +import { EmergencyAccessAcceptRequest } from "@bitwarden/common/models/request/emergency-access-accept.request"; import { BaseAcceptComponent } from "../common/base.accept.component"; diff --git a/apps/web/src/app/accounts/accept-organization.component.ts b/apps/web/src/app/accounts/accept-organization.component.ts index ae24498dde..be3826fe18 100644 --- a/apps/web/src/app/accounts/accept-organization.component.ts +++ b/apps/web/src/app/accounts/accept-organization.component.ts @@ -12,7 +12,7 @@ import { PolicyService } from "@bitwarden/common/abstractions/policy/policy.serv import { StateService } from "@bitwarden/common/abstractions/state.service"; import { Utils } from "@bitwarden/common/misc/utils"; import { Policy } from "@bitwarden/common/models/domain/policy"; -import { OrganizationUserAcceptRequest } from "@bitwarden/common/models/request/organizationUserAcceptRequest"; +import { OrganizationUserAcceptRequest } from "@bitwarden/common/models/request/organization-user-accept.request"; import { BaseAcceptComponent } from "../common/base.accept.component"; 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 8f4a61ad31..4fce6c05eb 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 @@ -19,8 +19,8 @@ import { AuthRequestType } from "@bitwarden/common/enums/authRequestType"; import { Utils } from "@bitwarden/common/misc/utils"; 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"; +import { PasswordlessCreateAuthRequest } from "@bitwarden/common/models/request/passwordless-create-auth.request"; +import { AuthRequestResponse } from "@bitwarden/common/models/response/auth-request.response"; @Component({ selector: "app-login-with-device", diff --git a/apps/web/src/app/accounts/login/login.component.ts b/apps/web/src/app/accounts/login/login.component.ts index 20e95e5b04..1c84265049 100644 --- a/apps/web/src/app/accounts/login/login.component.ts +++ b/apps/web/src/app/accounts/login/login.component.ts @@ -20,8 +20,8 @@ import { InternalPolicyService } from "@bitwarden/common/abstractions/policy/pol 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"; +import { ListResponse } from "@bitwarden/common/models/response/list.response"; +import { PolicyResponse } from "@bitwarden/common/models/response/policy.response"; import { flagEnabled } from "../../../utils/flags"; import { RouterService, StateService } from "../../core"; diff --git a/apps/web/src/app/accounts/recover-delete.component.ts b/apps/web/src/app/accounts/recover-delete.component.ts index 66f2fa0373..c6af89b3ad 100644 --- a/apps/web/src/app/accounts/recover-delete.component.ts +++ b/apps/web/src/app/accounts/recover-delete.component.ts @@ -5,7 +5,7 @@ import { ApiService } from "@bitwarden/common/abstractions/api.service"; 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 { DeleteRecoverRequest } from "@bitwarden/common/models/request/deleteRecoverRequest"; +import { DeleteRecoverRequest } from "@bitwarden/common/models/request/delete-recover.request"; @Component({ selector: "app-recover-delete", diff --git a/apps/web/src/app/accounts/recover-two-factor.component.ts b/apps/web/src/app/accounts/recover-two-factor.component.ts index 44245dfbce..bfedd8679a 100644 --- a/apps/web/src/app/accounts/recover-two-factor.component.ts +++ b/apps/web/src/app/accounts/recover-two-factor.component.ts @@ -7,7 +7,7 @@ import { CryptoService } from "@bitwarden/common/abstractions/crypto.service"; 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 { TwoFactorRecoveryRequest } from "@bitwarden/common/models/request/twoFactorRecoveryRequest"; +import { TwoFactorRecoveryRequest } from "@bitwarden/common/models/request/two-factor-recovery.request"; @Component({ selector: "app-recover-two-factor", 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 43b67ae124..6cd62ea13e 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 @@ -15,7 +15,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 { MasterPasswordPolicyOptions } from "@bitwarden/common/models/domain/master-password-policy-options"; -import { ReferenceEventRequest } from "@bitwarden/common/models/request/referenceEventRequest"; +import { ReferenceEventRequest } from "@bitwarden/common/models/request/reference-event.request"; @Component({ selector: "app-register-form", diff --git a/apps/web/src/app/accounts/register.component.ts b/apps/web/src/app/accounts/register.component.ts index 3283ddd5ce..c7c3b7dfc5 100644 --- a/apps/web/src/app/accounts/register.component.ts +++ b/apps/web/src/app/accounts/register.component.ts @@ -20,7 +20,7 @@ import { StateService } from "@bitwarden/common/abstractions/state.service"; 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"; +import { ReferenceEventRequest } from "@bitwarden/common/models/request/reference-event.request"; import { RouterService } from "../core"; 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 f4f8be64fb..9cfe933380 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 @@ -16,8 +16,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 { 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"; +import { ListResponse } from "@bitwarden/common/models/response/list.response"; +import { PolicyResponse } from "@bitwarden/common/models/response/policy.response"; import { RouterService } from "../../core"; 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 55550b0245..1f9b08987d 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 @@ -15,7 +15,7 @@ import { ProductType } from "@bitwarden/common/enums/productType"; 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"; +import { ReferenceEventRequest } from "@bitwarden/common/models/request/reference-event.request"; import { RouterService } from "./../../core/router.service"; import { VerticalStepperComponent } from "./vertical-stepper/vertical-stepper.component"; diff --git a/apps/web/src/app/accounts/verify-email-token.component.ts b/apps/web/src/app/accounts/verify-email-token.component.ts index c0ebfa78d7..6c2cf169a9 100644 --- a/apps/web/src/app/accounts/verify-email-token.component.ts +++ b/apps/web/src/app/accounts/verify-email-token.component.ts @@ -7,7 +7,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 { VerifyEmailRequest } from "@bitwarden/common/models/request/verifyEmailRequest"; +import { VerifyEmailRequest } from "@bitwarden/common/models/request/verify-email.request"; @Component({ selector: "app-verify-email-token", diff --git a/apps/web/src/app/accounts/verify-recover-delete.component.ts b/apps/web/src/app/accounts/verify-recover-delete.component.ts index 7139e4d10e..b3eb4819b8 100644 --- a/apps/web/src/app/accounts/verify-recover-delete.component.ts +++ b/apps/web/src/app/accounts/verify-recover-delete.component.ts @@ -6,7 +6,7 @@ import { ApiService } from "@bitwarden/common/abstractions/api.service"; 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 { VerifyDeleteRecoverRequest } from "@bitwarden/common/models/request/verifyDeleteRecoverRequest"; +import { VerifyDeleteRecoverRequest } from "@bitwarden/common/models/request/verify-delete-recover.request"; @Component({ selector: "app-verify-recover-delete", diff --git a/apps/web/src/app/common/base.events.component.ts b/apps/web/src/app/common/base.events.component.ts index 2e136ae211..51a2d3afad 100644 --- a/apps/web/src/app/common/base.events.component.ts +++ b/apps/web/src/app/common/base.events.component.ts @@ -5,8 +5,8 @@ import { FileDownloadService } from "@bitwarden/common/abstractions/fileDownload 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 { EventResponse } from "@bitwarden/common/models/response/eventResponse"; -import { ListResponse } from "@bitwarden/common/models/response/listResponse"; +import { EventResponse } from "@bitwarden/common/models/response/event.response"; +import { ListResponse } from "@bitwarden/common/models/response/list.response"; import { EventView } from "@bitwarden/common/models/view/event.view"; import { EventService } from "../core"; diff --git a/apps/web/src/app/common/base.people.component.ts b/apps/web/src/app/common/base.people.component.ts index e7c2c8f4ea..c3ee6bb209 100644 --- a/apps/web/src/app/common/base.people.component.ts +++ b/apps/web/src/app/common/base.people.component.ts @@ -16,9 +16,9 @@ import { OrganizationUserType } from "@bitwarden/common/enums/organizationUserTy import { ProviderUserStatusType } from "@bitwarden/common/enums/providerUserStatusType"; import { ProviderUserType } from "@bitwarden/common/enums/providerUserType"; import { Utils } from "@bitwarden/common/misc/utils"; -import { ListResponse } from "@bitwarden/common/models/response/listResponse"; -import { OrganizationUserUserDetailsResponse } from "@bitwarden/common/models/response/organizationUserResponse"; -import { ProviderUserUserDetailsResponse } from "@bitwarden/common/models/response/provider/providerUserResponse"; +import { ListResponse } from "@bitwarden/common/models/response/list.response"; +import { OrganizationUserUserDetailsResponse } from "@bitwarden/common/models/response/organization-user.response"; +import { ProviderUserUserDetailsResponse } from "@bitwarden/common/models/response/provider/provider-user.response"; import { UserConfirmComponent } from "../organizations/manage/user-confirm.component"; diff --git a/apps/web/src/app/core/event.service.ts b/apps/web/src/app/core/event.service.ts index 6f77079cd9..6205418810 100644 --- a/apps/web/src/app/core/event.service.ts +++ b/apps/web/src/app/core/event.service.ts @@ -7,7 +7,7 @@ import { DeviceType } from "@bitwarden/common/enums/deviceType"; import { EventType } from "@bitwarden/common/enums/eventType"; import { PolicyType } from "@bitwarden/common/enums/policyType"; import { Policy } from "@bitwarden/common/models/domain/policy"; -import { EventResponse } from "@bitwarden/common/models/response/eventResponse"; +import { EventResponse } from "@bitwarden/common/models/response/event.response"; @Injectable() export class EventService implements OnInit, OnDestroy { diff --git a/apps/web/src/app/organizations/manage/bulk/bulk-confirm.component.ts b/apps/web/src/app/organizations/manage/bulk/bulk-confirm.component.ts index 6c5f6e9a34..dc54300f6f 100644 --- a/apps/web/src/app/organizations/manage/bulk/bulk-confirm.component.ts +++ b/apps/web/src/app/organizations/manage/bulk/bulk-confirm.component.ts @@ -5,8 +5,8 @@ import { CryptoService } from "@bitwarden/common/abstractions/crypto.service"; import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; import { OrganizationUserStatusType } from "@bitwarden/common/enums/organizationUserStatusType"; import { Utils } from "@bitwarden/common/misc/utils"; -import { OrganizationUserBulkConfirmRequest } from "@bitwarden/common/models/request/organizationUserBulkConfirmRequest"; -import { OrganizationUserBulkRequest } from "@bitwarden/common/models/request/organizationUserBulkRequest"; +import { OrganizationUserBulkConfirmRequest } from "@bitwarden/common/models/request/organization-user-bulk-confirm.request"; +import { OrganizationUserBulkRequest } from "@bitwarden/common/models/request/organization-user-bulk.request"; import { BulkUserDetails } from "./bulk-status.component"; diff --git a/apps/web/src/app/organizations/manage/bulk/bulk-remove.component.ts b/apps/web/src/app/organizations/manage/bulk/bulk-remove.component.ts index 33641d7616..6a73de05df 100644 --- a/apps/web/src/app/organizations/manage/bulk/bulk-remove.component.ts +++ b/apps/web/src/app/organizations/manage/bulk/bulk-remove.component.ts @@ -2,7 +2,7 @@ import { Component, Input } from "@angular/core"; import { ApiService } from "@bitwarden/common/abstractions/api.service"; import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; -import { OrganizationUserBulkRequest } from "@bitwarden/common/models/request/organizationUserBulkRequest"; +import { OrganizationUserBulkRequest } from "@bitwarden/common/models/request/organization-user-bulk.request"; import { BulkUserDetails } from "./bulk-status.component"; diff --git a/apps/web/src/app/organizations/manage/bulk/bulk-restore-revoke.component.ts b/apps/web/src/app/organizations/manage/bulk/bulk-restore-revoke.component.ts index fa0a916ef0..7f12111d60 100644 --- a/apps/web/src/app/organizations/manage/bulk/bulk-restore-revoke.component.ts +++ b/apps/web/src/app/organizations/manage/bulk/bulk-restore-revoke.component.ts @@ -3,7 +3,7 @@ import { Component } from "@angular/core"; import { ModalConfig } from "@bitwarden/angular/services/modal.service"; import { ApiService } from "@bitwarden/common/abstractions/api.service"; import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; -import { OrganizationUserBulkRequest } from "@bitwarden/common/models/request/organizationUserBulkRequest"; +import { OrganizationUserBulkRequest } from "@bitwarden/common/models/request/organization-user-bulk.request"; import { BulkUserDetails } from "./bulk-status.component"; 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 d018ea32f3..bf38103140 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 @@ -9,9 +9,9 @@ import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUti import { Utils } from "@bitwarden/common/misc/utils"; 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"; +import { CollectionRequest } from "@bitwarden/common/models/request/collection.request"; +import { SelectionReadOnlyRequest } from "@bitwarden/common/models/request/selection-read-only.request"; +import { GroupResponse } from "@bitwarden/common/models/response/group.response"; @Component({ selector: "app-collection-add-edit", diff --git a/apps/web/src/app/organizations/manage/collections.component.ts b/apps/web/src/app/organizations/manage/collections.component.ts index d2bdc5caf5..111b0cd139 100644 --- a/apps/web/src/app/organizations/manage/collections.component.ts +++ b/apps/web/src/app/organizations/manage/collections.component.ts @@ -16,8 +16,8 @@ import { Organization } from "@bitwarden/common/models/domain/organization"; import { CollectionDetailsResponse, CollectionResponse, -} from "@bitwarden/common/models/response/collectionResponse"; -import { ListResponse } from "@bitwarden/common/models/response/listResponse"; +} from "@bitwarden/common/models/response/collection.response"; +import { ListResponse } from "@bitwarden/common/models/response/list.response"; import { CollectionView } from "@bitwarden/common/models/view/collection.view"; import { CollectionAddEditComponent } from "./collection-add-edit.component"; diff --git a/apps/web/src/app/organizations/manage/entity-events.component.ts b/apps/web/src/app/organizations/manage/entity-events.component.ts index 6801c90593..0eac612cd0 100644 --- a/apps/web/src/app/organizations/manage/entity-events.component.ts +++ b/apps/web/src/app/organizations/manage/entity-events.component.ts @@ -5,8 +5,8 @@ import { ApiService } from "@bitwarden/common/abstractions/api.service"; 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 { EventResponse } from "@bitwarden/common/models/response/eventResponse"; -import { ListResponse } from "@bitwarden/common/models/response/listResponse"; +import { EventResponse } from "@bitwarden/common/models/response/event.response"; +import { ListResponse } from "@bitwarden/common/models/response/list.response"; import { EventService } from "../../core"; diff --git a/apps/web/src/app/organizations/manage/entity-users.component.ts b/apps/web/src/app/organizations/manage/entity-users.component.ts index bce2812078..f2e443bce5 100644 --- a/apps/web/src/app/organizations/manage/entity-users.component.ts +++ b/apps/web/src/app/organizations/manage/entity-users.component.ts @@ -8,8 +8,8 @@ import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUti import { OrganizationUserStatusType } from "@bitwarden/common/enums/organizationUserStatusType"; import { OrganizationUserType } from "@bitwarden/common/enums/organizationUserType"; import { Utils } from "@bitwarden/common/misc/utils"; -import { SelectionReadOnlyRequest } from "@bitwarden/common/models/request/selectionReadOnlyRequest"; -import { OrganizationUserUserDetailsResponse } from "@bitwarden/common/models/response/organizationUserResponse"; +import { SelectionReadOnlyRequest } from "@bitwarden/common/models/request/selection-read-only.request"; +import { OrganizationUserUserDetailsResponse } from "@bitwarden/common/models/response/organization-user.response"; @Component({ selector: "app-entity-users", diff --git a/apps/web/src/app/organizations/manage/events.component.ts b/apps/web/src/app/organizations/manage/events.component.ts index 9ee2152f22..43896085ef 100644 --- a/apps/web/src/app/organizations/manage/events.component.ts +++ b/apps/web/src/app/organizations/manage/events.component.ts @@ -11,7 +11,7 @@ import { OrganizationService } from "@bitwarden/common/abstractions/organization import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; import { ProviderService } from "@bitwarden/common/abstractions/provider.service"; import { Organization } from "@bitwarden/common/models/domain/organization"; -import { EventResponse } from "@bitwarden/common/models/response/eventResponse"; +import { EventResponse } from "@bitwarden/common/models/response/event.response"; import { BaseEventsComponent } from "../../common/base.events.component"; import { EventService } from "../../core"; 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 9000f8318d..f916e20aee 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 @@ -7,9 +7,9 @@ import { LogService } from "@bitwarden/common/abstractions/log.service"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; 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 { GroupRequest } from "@bitwarden/common/models/request/group.request"; +import { SelectionReadOnlyRequest } from "@bitwarden/common/models/request/selection-read-only.request"; +import { CollectionDetailsResponse } from "@bitwarden/common/models/response/collection.response"; import { CollectionView } from "@bitwarden/common/models/view/collection.view"; @Component({ diff --git a/apps/web/src/app/organizations/manage/groups.component.ts b/apps/web/src/app/organizations/manage/groups.component.ts index 419e3ab641..e38ddf38da 100644 --- a/apps/web/src/app/organizations/manage/groups.component.ts +++ b/apps/web/src/app/organizations/manage/groups.component.ts @@ -9,7 +9,7 @@ import { LogService } from "@bitwarden/common/abstractions/log.service"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; import { SearchService } from "@bitwarden/common/abstractions/search.service"; import { Utils } from "@bitwarden/common/misc/utils"; -import { GroupResponse } from "@bitwarden/common/models/response/groupResponse"; +import { GroupResponse } from "@bitwarden/common/models/response/group.response"; import { EntityUsersComponent } from "./entity-users.component"; import { GroupAddEditComponent } from "./group-add-edit.component"; diff --git a/apps/web/src/app/organizations/manage/people.component.ts b/apps/web/src/app/organizations/manage/people.component.ts index cf426ef7aa..8fb4e789a5 100644 --- a/apps/web/src/app/organizations/manage/people.component.ts +++ b/apps/web/src/app/organizations/manage/people.component.ts @@ -20,12 +20,12 @@ import { ValidationService } from "@bitwarden/common/abstractions/validation.ser import { OrganizationUserStatusType } from "@bitwarden/common/enums/organizationUserStatusType"; import { OrganizationUserType } from "@bitwarden/common/enums/organizationUserType"; import { PolicyType } from "@bitwarden/common/enums/policyType"; -import { OrganizationKeysRequest } from "@bitwarden/common/models/request/organizationKeysRequest"; -import { OrganizationUserBulkRequest } from "@bitwarden/common/models/request/organizationUserBulkRequest"; -import { OrganizationUserConfirmRequest } from "@bitwarden/common/models/request/organizationUserConfirmRequest"; -import { ListResponse } from "@bitwarden/common/models/response/listResponse"; -import { OrganizationUserBulkResponse } from "@bitwarden/common/models/response/organizationUserBulkResponse"; -import { OrganizationUserUserDetailsResponse } from "@bitwarden/common/models/response/organizationUserResponse"; +import { OrganizationKeysRequest } from "@bitwarden/common/models/request/organization-keys.request"; +import { OrganizationUserBulkRequest } from "@bitwarden/common/models/request/organization-user-bulk.request"; +import { OrganizationUserConfirmRequest } from "@bitwarden/common/models/request/organization-user-confirm.request"; +import { ListResponse } from "@bitwarden/common/models/response/list.response"; +import { OrganizationUserBulkResponse } from "@bitwarden/common/models/response/organization-user-bulk.response"; +import { OrganizationUserUserDetailsResponse } from "@bitwarden/common/models/response/organization-user.response"; import { BasePeopleComponent } from "../../common/base.people.component"; diff --git a/apps/web/src/app/organizations/manage/policies.component.ts b/apps/web/src/app/organizations/manage/policies.component.ts index 468b4118d1..ba08e2efdd 100644 --- a/apps/web/src/app/organizations/manage/policies.component.ts +++ b/apps/web/src/app/organizations/manage/policies.component.ts @@ -7,7 +7,7 @@ import { OrganizationService } from "@bitwarden/common/abstractions/organization import { PolicyApiServiceAbstraction } from "@bitwarden/common/abstractions/policy/policy-api.service.abstraction"; import { PolicyType } from "@bitwarden/common/enums/policyType"; import { Organization } from "@bitwarden/common/models/domain/organization"; -import { PolicyResponse } from "@bitwarden/common/models/response/policyResponse"; +import { PolicyResponse } from "@bitwarden/common/models/response/policy.response"; import { PolicyListService } from "../../core"; import { BasePolicy } from "../policies/base-policy.component"; diff --git a/apps/web/src/app/organizations/manage/policy-edit.component.ts b/apps/web/src/app/organizations/manage/policy-edit.component.ts index 4efb35cba3..09a85d782b 100644 --- a/apps/web/src/app/organizations/manage/policy-edit.component.ts +++ b/apps/web/src/app/organizations/manage/policy-edit.component.ts @@ -14,8 +14,8 @@ import { LogService } from "@bitwarden/common/abstractions/log.service"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; import { PolicyApiServiceAbstraction } from "@bitwarden/common/abstractions/policy/policy-api.service.abstraction"; import { PolicyType } from "@bitwarden/common/enums/policyType"; -import { PolicyRequest } from "@bitwarden/common/models/request/policyRequest"; -import { PolicyResponse } from "@bitwarden/common/models/response/policyResponse"; +import { PolicyRequest } from "@bitwarden/common/models/request/policy.request"; +import { PolicyResponse } from "@bitwarden/common/models/response/policy.response"; import { BasePolicy, BasePolicyComponent } from "../policies/base-policy.component"; 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 53150fbfec..8899e6684c 100644 --- a/apps/web/src/app/organizations/manage/reset-password.component.ts +++ b/apps/web/src/app/organizations/manage/reset-password.component.ts @@ -21,7 +21,7 @@ import { PolicyService } from "@bitwarden/common/abstractions/policy/policy.serv 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"; +import { OrganizationUserResetPasswordRequest } from "@bitwarden/common/models/request/organization-user-reset-password.request"; @Component({ selector: "app-reset-password", 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 2756f5c6a7..4a9d01efb5 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 @@ -10,10 +10,10 @@ import { OrganizationUserType } from "@bitwarden/common/enums/organizationUserTy 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 { OrganizationUserInviteRequest } from "@bitwarden/common/models/request/organization-user-invite.request"; +import { OrganizationUserUpdateRequest } from "@bitwarden/common/models/request/organization-user-update.request"; +import { SelectionReadOnlyRequest } from "@bitwarden/common/models/request/selection-read-only.request"; +import { CollectionDetailsResponse } from "@bitwarden/common/models/response/collection.response"; import { CollectionView } from "@bitwarden/common/models/view/collection.view"; @Component({ diff --git a/apps/web/src/app/organizations/manage/user-groups.component.ts b/apps/web/src/app/organizations/manage/user-groups.component.ts index baacade757..999fba57a3 100644 --- a/apps/web/src/app/organizations/manage/user-groups.component.ts +++ b/apps/web/src/app/organizations/manage/user-groups.component.ts @@ -5,8 +5,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 { Utils } from "@bitwarden/common/misc/utils"; -import { OrganizationUserUpdateGroupsRequest } from "@bitwarden/common/models/request/organizationUserUpdateGroupsRequest"; -import { GroupResponse } from "@bitwarden/common/models/response/groupResponse"; +import { OrganizationUserUpdateGroupsRequest } from "@bitwarden/common/models/request/organization-user-update-groups.request"; +import { GroupResponse } from "@bitwarden/common/models/response/group.response"; @Component({ selector: "app-user-groups", diff --git a/apps/web/src/app/organizations/policies/base-policy.component.ts b/apps/web/src/app/organizations/policies/base-policy.component.ts index 6e530b075d..ef9635acb6 100644 --- a/apps/web/src/app/organizations/policies/base-policy.component.ts +++ b/apps/web/src/app/organizations/policies/base-policy.component.ts @@ -3,8 +3,8 @@ import { UntypedFormControl, UntypedFormGroup } from "@angular/forms"; import { PolicyType } from "@bitwarden/common/enums/policyType"; import { Organization } from "@bitwarden/common/models/domain/organization"; -import { PolicyRequest } from "@bitwarden/common/models/request/policyRequest"; -import { PolicyResponse } from "@bitwarden/common/models/response/policyResponse"; +import { PolicyRequest } from "@bitwarden/common/models/request/policy.request"; +import { PolicyResponse } from "@bitwarden/common/models/response/policy.response"; export abstract class BasePolicy { abstract name: string; diff --git a/apps/web/src/app/organizations/policies/require-sso.component.ts b/apps/web/src/app/organizations/policies/require-sso.component.ts index 53fbc584cf..a56f36c7f7 100644 --- a/apps/web/src/app/organizations/policies/require-sso.component.ts +++ b/apps/web/src/app/organizations/policies/require-sso.component.ts @@ -3,7 +3,7 @@ import { Component } from "@angular/core"; import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; import { PolicyType } from "@bitwarden/common/enums/policyType"; import { Organization } from "@bitwarden/common/models/domain/organization"; -import { PolicyRequest } from "@bitwarden/common/models/request/policyRequest"; +import { PolicyRequest } from "@bitwarden/common/models/request/policy.request"; import { BasePolicy, BasePolicyComponent } from "./base-policy.component"; diff --git a/apps/web/src/app/organizations/policies/single-org.component.ts b/apps/web/src/app/organizations/policies/single-org.component.ts index a36da283de..8b34d132df 100644 --- a/apps/web/src/app/organizations/policies/single-org.component.ts +++ b/apps/web/src/app/organizations/policies/single-org.component.ts @@ -2,7 +2,7 @@ import { Component } from "@angular/core"; import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; import { PolicyType } from "@bitwarden/common/enums/policyType"; -import { PolicyRequest } from "@bitwarden/common/models/request/policyRequest"; +import { PolicyRequest } from "@bitwarden/common/models/request/policy.request"; import { BasePolicy, BasePolicyComponent } from "./base-policy.component"; diff --git a/apps/web/src/app/organizations/settings/account.component.ts b/apps/web/src/app/organizations/settings/account.component.ts index 24f17ac7ad..ca3cb55991 100644 --- a/apps/web/src/app/organizations/settings/account.component.ts +++ b/apps/web/src/app/organizations/settings/account.component.ts @@ -8,9 +8,9 @@ import { LogService } from "@bitwarden/common/abstractions/log.service"; import { OrganizationApiServiceAbstraction } from "@bitwarden/common/abstractions/organization/organization-api.service.abstraction"; import { OrganizationService } from "@bitwarden/common/abstractions/organization/organization.service.abstraction"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; -import { OrganizationKeysRequest } from "@bitwarden/common/models/request/organizationKeysRequest"; -import { OrganizationUpdateRequest } from "@bitwarden/common/models/request/organizationUpdateRequest"; -import { OrganizationResponse } from "@bitwarden/common/models/response/organizationResponse"; +import { OrganizationKeysRequest } from "@bitwarden/common/models/request/organization-keys.request"; +import { OrganizationUpdateRequest } from "@bitwarden/common/models/request/organization-update.request"; +import { OrganizationResponse } from "@bitwarden/common/models/response/organization.response"; import { ApiKeyComponent } from "../../settings/api-key.component"; import { PurgeVaultComponent } from "../../settings/purge-vault.component"; diff --git a/apps/web/src/app/organizations/settings/adjust-subscription.component.ts b/apps/web/src/app/organizations/settings/adjust-subscription.component.ts index 6930f86068..00dd0cce30 100644 --- a/apps/web/src/app/organizations/settings/adjust-subscription.component.ts +++ b/apps/web/src/app/organizations/settings/adjust-subscription.component.ts @@ -4,7 +4,7 @@ import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; import { LogService } from "@bitwarden/common/abstractions/log.service"; import { OrganizationApiServiceAbstraction } from "@bitwarden/common/abstractions/organization/organization-api.service.abstraction"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; -import { OrganizationSubscriptionUpdateRequest } from "@bitwarden/common/models/request/organizationSubscriptionUpdateRequest"; +import { OrganizationSubscriptionUpdateRequest } from "@bitwarden/common/models/request/organization-subscription-update.request"; @Component({ selector: "app-adjust-subscription", diff --git a/apps/web/src/app/organizations/settings/billing-sync-api-key.component.ts b/apps/web/src/app/organizations/settings/billing-sync-api-key.component.ts index d93e1654d5..5fbd5aa907 100644 --- a/apps/web/src/app/organizations/settings/billing-sync-api-key.component.ts +++ b/apps/web/src/app/organizations/settings/billing-sync-api-key.component.ts @@ -6,8 +6,8 @@ import { OrganizationApiServiceAbstraction } from "@bitwarden/common/abstraction import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; import { UserVerificationService } from "@bitwarden/common/abstractions/userVerification/userVerification.service.abstraction"; import { OrganizationApiKeyType } from "@bitwarden/common/enums/organizationApiKeyType"; -import { OrganizationApiKeyRequest } from "@bitwarden/common/models/request/organizationApiKeyRequest"; -import { ApiKeyResponse } from "@bitwarden/common/models/response/apiKeyResponse"; +import { OrganizationApiKeyRequest } from "@bitwarden/common/models/request/organization-api-key.request"; +import { ApiKeyResponse } from "@bitwarden/common/models/response/api-key.response"; import { Verification } from "@bitwarden/common/types/verification"; @Component({ diff --git a/apps/web/src/app/organizations/settings/organization-billing.component.ts b/apps/web/src/app/organizations/settings/organization-billing.component.ts index 7cb05dc60d..99121482ff 100644 --- a/apps/web/src/app/organizations/settings/organization-billing.component.ts +++ b/apps/web/src/app/organizations/settings/organization-billing.component.ts @@ -7,8 +7,8 @@ import { OrganizationApiServiceAbstraction } from "@bitwarden/common/abstraction import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; import { PaymentMethodType } from "@bitwarden/common/enums/paymentMethodType"; import { TransactionType } from "@bitwarden/common/enums/transactionType"; -import { VerifyBankRequest } from "@bitwarden/common/models/request/verifyBankRequest"; -import { BillingResponse } from "@bitwarden/common/models/response/billingResponse"; +import { VerifyBankRequest } from "@bitwarden/common/models/request/verify-bank.request"; +import { BillingResponse } from "@bitwarden/common/models/response/billing.response"; @Component({ selector: "app-org-billing", 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 04a0c99443..fe29a38a96 100644 --- a/apps/web/src/app/organizations/settings/organization-subscription.component.ts +++ b/apps/web/src/app/organizations/settings/organization-subscription.component.ts @@ -15,8 +15,8 @@ import { OrganizationConnectionType } from "@bitwarden/common/enums/organization import { PlanType } from "@bitwarden/common/enums/planType"; 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"; +import { OrganizationConnectionResponse } from "@bitwarden/common/models/response/organization-connection.response"; +import { OrganizationSubscriptionResponse } from "@bitwarden/common/models/response/organization-subscription.response"; import { BillingSyncKeyComponent } from "../../settings/billing-sync-key.component"; diff --git a/apps/web/src/app/organizations/sponsorships/families-for-enterprise-setup.component.ts b/apps/web/src/app/organizations/sponsorships/families-for-enterprise-setup.component.ts index 9ce3d59932..58286c55fc 100644 --- a/apps/web/src/app/organizations/sponsorships/families-for-enterprise-setup.component.ts +++ b/apps/web/src/app/organizations/sponsorships/families-for-enterprise-setup.component.ts @@ -14,7 +14,7 @@ import { PlanSponsorshipType } from "@bitwarden/common/enums/planSponsorshipType import { PlanType } from "@bitwarden/common/enums/planType"; import { ProductType } from "@bitwarden/common/enums/productType"; import { Organization } from "@bitwarden/common/models/domain/organization"; -import { OrganizationSponsorshipRedeemRequest } from "@bitwarden/common/models/request/organization/organizationSponsorshipRedeemRequest"; +import { OrganizationSponsorshipRedeemRequest } from "@bitwarden/common/models/request/organization/organization-sponsorship-redeem.request"; import { OrganizationPlansComponent } from "../../settings/organization-plans.component"; import { DeleteOrganizationComponent } from "../settings/delete-organization.component"; diff --git a/apps/web/src/app/organizations/users/enroll-master-password-reset.component.ts b/apps/web/src/app/organizations/users/enroll-master-password-reset.component.ts index ae700771a5..1a7661fc36 100644 --- a/apps/web/src/app/organizations/users/enroll-master-password-reset.component.ts +++ b/apps/web/src/app/organizations/users/enroll-master-password-reset.component.ts @@ -12,7 +12,7 @@ import { SyncService } from "@bitwarden/common/abstractions/sync/sync.service.ab import { UserVerificationService } from "@bitwarden/common/abstractions/userVerification/userVerification.service.abstraction"; import { Utils } from "@bitwarden/common/misc/utils"; import { Organization } from "@bitwarden/common/models/domain/organization"; -import { OrganizationUserResetPasswordEnrollmentRequest } from "@bitwarden/common/models/request/organizationUserResetPasswordEnrollmentRequest"; +import { OrganizationUserResetPasswordEnrollmentRequest } from "@bitwarden/common/models/request/organization-user-reset-password-enrollment.request"; import { Verification } from "@bitwarden/common/types/verification"; @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 a10c42a07b..f45ccc939f 100644 --- a/apps/web/src/app/organizations/vault/add-edit.component.ts +++ b/apps/web/src/app/organizations/vault/add-edit.component.ts @@ -19,8 +19,8 @@ import { TotpService } from "@bitwarden/common/abstractions/totp.service"; 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"; -import { CipherRequest } from "@bitwarden/common/models/request/cipherRequest"; +import { CipherCreateRequest } from "@bitwarden/common/models/request/cipher-create.request"; +import { CipherRequest } from "@bitwarden/common/models/request/cipher.request"; import { AddEditComponent as BaseAddEditComponent } from "../../vault/add-edit.component"; diff --git a/apps/web/src/app/organizations/vault/collections.component.ts b/apps/web/src/app/organizations/vault/collections.component.ts index 1805827970..59fb4c8d15 100644 --- a/apps/web/src/app/organizations/vault/collections.component.ts +++ b/apps/web/src/app/organizations/vault/collections.component.ts @@ -9,7 +9,7 @@ import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUti 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"; +import { CipherCollectionsRequest } from "@bitwarden/common/models/request/cipher-collections.request"; import { CollectionsComponent as BaseCollectionsComponent } from "../../vault/collections.component"; diff --git a/apps/web/src/app/reports/pages/breach-report.component.ts b/apps/web/src/app/reports/pages/breach-report.component.ts index 154624c211..7e3c80fcbb 100644 --- a/apps/web/src/app/reports/pages/breach-report.component.ts +++ b/apps/web/src/app/reports/pages/breach-report.component.ts @@ -2,7 +2,7 @@ import { Component, OnInit } from "@angular/core"; import { AuditService } from "@bitwarden/common/abstractions/audit.service"; import { StateService } from "@bitwarden/common/abstractions/state.service"; -import { BreachAccountResponse } from "@bitwarden/common/models/response/breachAccountResponse"; +import { BreachAccountResponse } from "@bitwarden/common/models/response/breach-account.response"; @Component({ selector: "app-breach-report", diff --git a/apps/web/src/app/send/access.component.ts b/apps/web/src/app/send/access.component.ts index f850ad76af..002523b90f 100644 --- a/apps/web/src/app/send/access.component.ts +++ b/apps/web/src/app/send/access.component.ts @@ -13,9 +13,9 @@ import { Utils } from "@bitwarden/common/misc/utils"; 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 { SendAccessRequest } from "@bitwarden/common/models/request/send-access.request"; +import { ErrorResponse } from "@bitwarden/common/models/response/error.response"; +import { SendAccessResponse } from "@bitwarden/common/models/response/send-access.response"; import { SendAccessView } from "@bitwarden/common/models/view/send-access.view"; @Component({ diff --git a/apps/web/src/app/settings/add-credit.component.ts b/apps/web/src/app/settings/add-credit.component.ts index 3d33df2d3e..ccaf7314f2 100644 --- a/apps/web/src/app/settings/add-credit.component.ts +++ b/apps/web/src/app/settings/add-credit.component.ts @@ -15,7 +15,7 @@ import { OrganizationService } from "@bitwarden/common/abstractions/organization import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; import { StateService } from "@bitwarden/common/abstractions/state.service"; import { PaymentMethodType } from "@bitwarden/common/enums/paymentMethodType"; -import { BitPayInvoiceRequest } from "@bitwarden/common/models/request/bitPayInvoiceRequest"; +import { BitPayInvoiceRequest } from "@bitwarden/common/models/request/bit-pay-invoice.request"; @Component({ selector: "app-add-credit", diff --git a/apps/web/src/app/settings/adjust-payment.component.ts b/apps/web/src/app/settings/adjust-payment.component.ts index 4e9338081f..dc4bf17e0b 100644 --- a/apps/web/src/app/settings/adjust-payment.component.ts +++ b/apps/web/src/app/settings/adjust-payment.component.ts @@ -6,7 +6,7 @@ import { LogService } from "@bitwarden/common/abstractions/log.service"; import { OrganizationApiServiceAbstraction } from "@bitwarden/common/abstractions/organization/organization-api.service.abstraction"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; import { PaymentMethodType } from "@bitwarden/common/enums/paymentMethodType"; -import { PaymentRequest } from "@bitwarden/common/models/request/paymentRequest"; +import { PaymentRequest } from "@bitwarden/common/models/request/payment.request"; import { PaymentComponent } from "./payment.component"; import { TaxInfoComponent } from "./tax-info.component"; diff --git a/apps/web/src/app/settings/adjust-storage.component.ts b/apps/web/src/app/settings/adjust-storage.component.ts index 6931ad9d10..20c93ced41 100644 --- a/apps/web/src/app/settings/adjust-storage.component.ts +++ b/apps/web/src/app/settings/adjust-storage.component.ts @@ -6,8 +6,8 @@ import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; import { LogService } from "@bitwarden/common/abstractions/log.service"; import { OrganizationApiServiceAbstraction } from "@bitwarden/common/abstractions/organization/organization-api.service.abstraction"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; -import { StorageRequest } from "@bitwarden/common/models/request/storageRequest"; -import { PaymentResponse } from "@bitwarden/common/models/response/paymentResponse"; +import { StorageRequest } from "@bitwarden/common/models/request/storage.request"; +import { PaymentResponse } from "@bitwarden/common/models/response/payment.response"; import { PaymentComponent } from "./payment.component"; diff --git a/apps/web/src/app/settings/api-key.component.ts b/apps/web/src/app/settings/api-key.component.ts index c0e976ea08..ae376ffd69 100644 --- a/apps/web/src/app/settings/api-key.component.ts +++ b/apps/web/src/app/settings/api-key.component.ts @@ -2,8 +2,8 @@ import { Component } from "@angular/core"; import { LogService } from "@bitwarden/common/abstractions/log.service"; import { UserVerificationService } from "@bitwarden/common/abstractions/userVerification/userVerification.service.abstraction"; -import { SecretVerificationRequest } from "@bitwarden/common/models/request/secretVerificationRequest"; -import { ApiKeyResponse } from "@bitwarden/common/models/response/apiKeyResponse"; +import { SecretVerificationRequest } from "@bitwarden/common/models/request/secret-verification.request"; +import { ApiKeyResponse } from "@bitwarden/common/models/response/api-key.response"; import { Verification } from "@bitwarden/common/types/verification"; @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 ba194f4a93..70929ed808 100644 --- a/apps/web/src/app/settings/billing-sync-key.component.ts +++ b/apps/web/src/app/settings/billing-sync-key.component.ts @@ -4,9 +4,9 @@ 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/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"; +import { BillingSyncConfigRequest } from "@bitwarden/common/models/request/billing-sync-config.request"; +import { OrganizationConnectionRequest } from "@bitwarden/common/models/request/organization-connection.request"; +import { OrganizationConnectionResponse } from "@bitwarden/common/models/response/organization-connection.response"; @Component({ selector: "app-billing-sync-key", diff --git a/apps/web/src/app/settings/change-email.component.ts b/apps/web/src/app/settings/change-email.component.ts index 5dd0528ac9..2c41bd0b78 100644 --- a/apps/web/src/app/settings/change-email.component.ts +++ b/apps/web/src/app/settings/change-email.component.ts @@ -8,8 +8,8 @@ import { MessagingService } from "@bitwarden/common/abstractions/messaging.servi import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; import { StateService } from "@bitwarden/common/abstractions/state.service"; import { TwoFactorProviderType } from "@bitwarden/common/enums/twoFactorProviderType"; -import { EmailRequest } from "@bitwarden/common/models/request/emailRequest"; -import { EmailTokenRequest } from "@bitwarden/common/models/request/emailTokenRequest"; +import { EmailTokenRequest } from "@bitwarden/common/models/request/email-token.request"; +import { EmailRequest } from "@bitwarden/common/models/request/email.request"; @Component({ selector: "app-change-email", diff --git a/apps/web/src/app/settings/change-kdf.component.ts b/apps/web/src/app/settings/change-kdf.component.ts index 60820b594b..f6193d018b 100644 --- a/apps/web/src/app/settings/change-kdf.component.ts +++ b/apps/web/src/app/settings/change-kdf.component.ts @@ -8,7 +8,7 @@ import { MessagingService } from "@bitwarden/common/abstractions/messaging.servi import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; import { StateService } from "@bitwarden/common/abstractions/state.service"; import { DEFAULT_KDF_ITERATIONS, KdfType } from "@bitwarden/common/enums/kdfType"; -import { KdfRequest } from "@bitwarden/common/models/request/kdfRequest"; +import { KdfRequest } from "@bitwarden/common/models/request/kdf.request"; @Component({ selector: "app-change-kdf", diff --git a/apps/web/src/app/settings/change-password.component.ts b/apps/web/src/app/settings/change-password.component.ts index 40b4b21305..e6e1709d22 100644 --- a/apps/web/src/app/settings/change-password.component.ts +++ b/apps/web/src/app/settings/change-password.component.ts @@ -22,13 +22,13 @@ import { EmergencyAccessStatusType } from "@bitwarden/common/enums/emergencyAcce import { Utils } from "@bitwarden/common/misc/utils"; 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"; -import { OrganizationUserResetPasswordEnrollmentRequest } from "@bitwarden/common/models/request/organizationUserResetPasswordEnrollmentRequest"; -import { PasswordRequest } from "@bitwarden/common/models/request/passwordRequest"; -import { SendWithIdRequest } from "@bitwarden/common/models/request/sendWithIdRequest"; -import { UpdateKeyRequest } from "@bitwarden/common/models/request/updateKeyRequest"; +import { CipherWithIdRequest } from "@bitwarden/common/models/request/cipher-with-id.request"; +import { EmergencyAccessUpdateRequest } from "@bitwarden/common/models/request/emergency-access-update.request"; +import { FolderWithIdRequest } from "@bitwarden/common/models/request/folder-with-id.request"; +import { OrganizationUserResetPasswordEnrollmentRequest } from "@bitwarden/common/models/request/organization-user-reset-password-enrollment.request"; +import { PasswordRequest } from "@bitwarden/common/models/request/password.request"; +import { SendWithIdRequest } from "@bitwarden/common/models/request/send-with-id.request"; +import { UpdateKeyRequest } from "@bitwarden/common/models/request/update-key.request"; @Component({ selector: "app-change-password", diff --git a/apps/web/src/app/settings/domain-rules.component.ts b/apps/web/src/app/settings/domain-rules.component.ts index 2224f32955..5f95a06ac5 100644 --- a/apps/web/src/app/settings/domain-rules.component.ts +++ b/apps/web/src/app/settings/domain-rules.component.ts @@ -4,7 +4,7 @@ import { ApiService } from "@bitwarden/common/abstractions/api.service"; 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 { UpdateDomainsRequest } from "@bitwarden/common/models/request/updateDomainsRequest"; +import { UpdateDomainsRequest } from "@bitwarden/common/models/request/update-domains.request"; @Component({ selector: "app-domain-rules", diff --git a/apps/web/src/app/settings/emergency-access-add-edit.component.ts b/apps/web/src/app/settings/emergency-access-add-edit.component.ts index 522feeb303..aad2a957ff 100644 --- a/apps/web/src/app/settings/emergency-access-add-edit.component.ts +++ b/apps/web/src/app/settings/emergency-access-add-edit.component.ts @@ -5,8 +5,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 { EmergencyAccessType } from "@bitwarden/common/enums/emergencyAccessType"; -import { EmergencyAccessInviteRequest } from "@bitwarden/common/models/request/emergencyAccessInviteRequest"; -import { EmergencyAccessUpdateRequest } from "@bitwarden/common/models/request/emergencyAccessUpdateRequest"; +import { EmergencyAccessInviteRequest } from "@bitwarden/common/models/request/emergency-access-invite.request"; +import { EmergencyAccessUpdateRequest } from "@bitwarden/common/models/request/emergency-access-update.request"; @Component({ selector: "emergency-access-add-edit", 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 3951178912..618c134b56 100644 --- a/apps/web/src/app/settings/emergency-access-takeover.component.ts +++ b/apps/web/src/app/settings/emergency-access-takeover.component.ts @@ -15,8 +15,8 @@ import { KdfType } from "@bitwarden/common/enums/kdfType"; import { PolicyData } from "@bitwarden/common/models/data/policy.data"; import { Policy } from "@bitwarden/common/models/domain/policy"; 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"; +import { EmergencyAccessPasswordRequest } from "@bitwarden/common/models/request/emergency-access-password.request"; +import { PolicyResponse } from "@bitwarden/common/models/response/policy.response"; @Component({ selector: "emergency-access-takeover", 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 a9eede29f7..6c314aabc3 100644 --- a/apps/web/src/app/settings/emergency-access-view.component.ts +++ b/apps/web/src/app/settings/emergency-access-view.component.ts @@ -8,7 +8,7 @@ import { CryptoService } from "@bitwarden/common/abstractions/crypto.service"; import { CipherData } from "@bitwarden/common/models/data/cipher.data"; import { Cipher } from "@bitwarden/common/models/domain/cipher"; import { SymmetricCryptoKey } from "@bitwarden/common/models/domain/symmetric-crypto-key"; -import { EmergencyAccessViewResponse } from "@bitwarden/common/models/response/emergencyAccessResponse"; +import { EmergencyAccessViewResponse } from "@bitwarden/common/models/response/emergency-access.response"; import { CipherView } from "@bitwarden/common/models/view/cipher.view"; import { EmergencyAccessAttachmentsComponent } from "./emergency-access-attachments.component"; diff --git a/apps/web/src/app/settings/emergency-access.component.ts b/apps/web/src/app/settings/emergency-access.component.ts index e640e07036..64a2680ba8 100644 --- a/apps/web/src/app/settings/emergency-access.component.ts +++ b/apps/web/src/app/settings/emergency-access.component.ts @@ -13,11 +13,11 @@ import { StateService } from "@bitwarden/common/abstractions/state.service"; import { EmergencyAccessStatusType } from "@bitwarden/common/enums/emergencyAccessStatusType"; import { EmergencyAccessType } from "@bitwarden/common/enums/emergencyAccessType"; import { Utils } from "@bitwarden/common/misc/utils"; -import { EmergencyAccessConfirmRequest } from "@bitwarden/common/models/request/emergencyAccessConfirmRequest"; +import { EmergencyAccessConfirmRequest } from "@bitwarden/common/models/request/emergency-access-confirm.request"; import { EmergencyAccessGranteeDetailsResponse, EmergencyAccessGrantorDetailsResponse, -} from "@bitwarden/common/models/response/emergencyAccessResponse"; +} from "@bitwarden/common/models/response/emergency-access.response"; import { EmergencyAccessAddEditComponent } from "./emergency-access-add-edit.component"; import { EmergencyAccessConfirmComponent } from "./emergency-access-confirm.component"; diff --git a/apps/web/src/app/settings/organization-plans.component.ts b/apps/web/src/app/settings/organization-plans.component.ts index 7089b1d696..ad1c01d235 100644 --- a/apps/web/src/app/settings/organization-plans.component.ts +++ b/apps/web/src/app/settings/organization-plans.component.ts @@ -27,11 +27,11 @@ import { PolicyType } from "@bitwarden/common/enums/policyType"; import { ProductType } from "@bitwarden/common/enums/productType"; 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"; -import { ProviderOrganizationCreateRequest } from "@bitwarden/common/models/request/provider/providerOrganizationCreateRequest"; -import { PlanResponse } from "@bitwarden/common/models/response/planResponse"; +import { OrganizationCreateRequest } from "@bitwarden/common/models/request/organization-create.request"; +import { OrganizationKeysRequest } from "@bitwarden/common/models/request/organization-keys.request"; +import { OrganizationUpgradeRequest } from "@bitwarden/common/models/request/organization-upgrade.request"; +import { ProviderOrganizationCreateRequest } from "@bitwarden/common/models/request/provider/provider-organization-create.request"; +import { PlanResponse } from "@bitwarden/common/models/response/plan.response"; import { PaymentComponent } from "./payment.component"; import { TaxInfoComponent } from "./tax-info.component"; diff --git a/apps/web/src/app/settings/payment-method.component.ts b/apps/web/src/app/settings/payment-method.component.ts index 2cf9a17911..4dd2018095 100644 --- a/apps/web/src/app/settings/payment-method.component.ts +++ b/apps/web/src/app/settings/payment-method.component.ts @@ -5,7 +5,7 @@ import { ApiService } from "@bitwarden/common/abstractions/api.service"; import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; import { PaymentMethodType } from "@bitwarden/common/enums/paymentMethodType"; -import { BillingPaymentResponse } from "@bitwarden/common/models/response/billingPaymentResponse"; +import { BillingPaymentResponse } from "@bitwarden/common/models/response/billing-payment.response"; @Component({ selector: "app-payment-method", diff --git a/apps/web/src/app/settings/profile.component.ts b/apps/web/src/app/settings/profile.component.ts index fc7a56632e..229f2f5b00 100644 --- a/apps/web/src/app/settings/profile.component.ts +++ b/apps/web/src/app/settings/profile.component.ts @@ -7,8 +7,8 @@ import { KeyConnectorService } from "@bitwarden/common/abstractions/keyConnector 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 { UpdateProfileRequest } from "@bitwarden/common/models/request/updateProfileRequest"; -import { ProfileResponse } from "@bitwarden/common/models/response/profileResponse"; +import { UpdateProfileRequest } from "@bitwarden/common/models/request/update-profile.request"; +import { ProfileResponse } from "@bitwarden/common/models/response/profile.response"; @Component({ selector: "app-profile", diff --git a/apps/web/src/app/settings/tax-info.component.ts b/apps/web/src/app/settings/tax-info.component.ts index 216a0d030a..fdebdbd5a2 100644 --- a/apps/web/src/app/settings/tax-info.component.ts +++ b/apps/web/src/app/settings/tax-info.component.ts @@ -4,10 +4,10 @@ import { ActivatedRoute } from "@angular/router"; import { ApiService } from "@bitwarden/common/abstractions/api.service"; import { LogService } from "@bitwarden/common/abstractions/log.service"; import { OrganizationApiServiceAbstraction } from "@bitwarden/common/abstractions/organization/organization-api.service.abstraction"; -import { OrganizationTaxInfoUpdateRequest } from "@bitwarden/common/models/request/organizationTaxInfoUpdateRequest"; -import { TaxInfoUpdateRequest } from "@bitwarden/common/models/request/taxInfoUpdateRequest"; -import { TaxInfoResponse } from "@bitwarden/common/models/response/taxInfoResponse"; -import { TaxRateResponse } from "@bitwarden/common/models/response/taxRateResponse"; +import { OrganizationTaxInfoUpdateRequest } from "@bitwarden/common/models/request/organization-tax-info-update.request"; +import { TaxInfoUpdateRequest } from "@bitwarden/common/models/request/tax-info-update.request"; +import { TaxInfoResponse } from "@bitwarden/common/models/response/tax-info.response"; +import { TaxRateResponse } from "@bitwarden/common/models/response/tax-rate.response"; type TaxInfoView = Omit & { includeTaxId: boolean; diff --git a/apps/web/src/app/settings/two-factor-authenticator.component.ts b/apps/web/src/app/settings/two-factor-authenticator.component.ts index 569a95621f..652ee24a14 100644 --- a/apps/web/src/app/settings/two-factor-authenticator.component.ts +++ b/apps/web/src/app/settings/two-factor-authenticator.component.ts @@ -7,8 +7,8 @@ import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUti import { StateService } from "@bitwarden/common/abstractions/state.service"; import { UserVerificationService } from "@bitwarden/common/abstractions/userVerification/userVerification.service.abstraction"; import { TwoFactorProviderType } from "@bitwarden/common/enums/twoFactorProviderType"; -import { UpdateTwoFactorAuthenticatorRequest } from "@bitwarden/common/models/request/updateTwoFactorAuthenticatorRequest"; -import { TwoFactorAuthenticatorResponse } from "@bitwarden/common/models/response/twoFactorAuthenticatorResponse"; +import { UpdateTwoFactorAuthenticatorRequest } from "@bitwarden/common/models/request/update-two-factor-authenticator.request"; +import { TwoFactorAuthenticatorResponse } from "@bitwarden/common/models/response/two-factor-authenticator.response"; import { AuthResponse } from "@bitwarden/common/types/authResponse"; import { TwoFactorBaseComponent } from "./two-factor-base.component"; diff --git a/apps/web/src/app/settings/two-factor-base.component.ts b/apps/web/src/app/settings/two-factor-base.component.ts index d54092aebd..992861d4fc 100644 --- a/apps/web/src/app/settings/two-factor-base.component.ts +++ b/apps/web/src/app/settings/two-factor-base.component.ts @@ -7,8 +7,8 @@ import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUti import { UserVerificationService } from "@bitwarden/common/abstractions/userVerification/userVerification.service.abstraction"; import { TwoFactorProviderType } from "@bitwarden/common/enums/twoFactorProviderType"; import { VerificationType } from "@bitwarden/common/enums/verificationType"; -import { SecretVerificationRequest } from "@bitwarden/common/models/request/secretVerificationRequest"; -import { TwoFactorProviderRequest } from "@bitwarden/common/models/request/twoFactorProviderRequest"; +import { SecretVerificationRequest } from "@bitwarden/common/models/request/secret-verification.request"; +import { TwoFactorProviderRequest } from "@bitwarden/common/models/request/two-factor-provider.request"; import { AuthResponseBase } from "@bitwarden/common/types/authResponse"; @Directive() diff --git a/apps/web/src/app/settings/two-factor-duo.component.ts b/apps/web/src/app/settings/two-factor-duo.component.ts index 46c62b1bc5..be3f40a89f 100644 --- a/apps/web/src/app/settings/two-factor-duo.component.ts +++ b/apps/web/src/app/settings/two-factor-duo.component.ts @@ -6,8 +6,8 @@ import { LogService } from "@bitwarden/common/abstractions/log.service"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; import { UserVerificationService } from "@bitwarden/common/abstractions/userVerification/userVerification.service.abstraction"; import { TwoFactorProviderType } from "@bitwarden/common/enums/twoFactorProviderType"; -import { UpdateTwoFactorDuoRequest } from "@bitwarden/common/models/request/updateTwoFactorDuoRequest"; -import { TwoFactorDuoResponse } from "@bitwarden/common/models/response/twoFactorDuoResponse"; +import { UpdateTwoFactorDuoRequest } from "@bitwarden/common/models/request/update-two-factor-duo.request"; +import { TwoFactorDuoResponse } from "@bitwarden/common/models/response/two-factor-duo.response"; import { AuthResponse } from "@bitwarden/common/types/authResponse"; import { TwoFactorBaseComponent } from "./two-factor-base.component"; diff --git a/apps/web/src/app/settings/two-factor-email.component.ts b/apps/web/src/app/settings/two-factor-email.component.ts index 968695812b..a5a6f35b7f 100644 --- a/apps/web/src/app/settings/two-factor-email.component.ts +++ b/apps/web/src/app/settings/two-factor-email.component.ts @@ -7,9 +7,9 @@ import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUti import { StateService } from "@bitwarden/common/abstractions/state.service"; import { UserVerificationService } from "@bitwarden/common/abstractions/userVerification/userVerification.service.abstraction"; import { TwoFactorProviderType } from "@bitwarden/common/enums/twoFactorProviderType"; -import { TwoFactorEmailRequest } from "@bitwarden/common/models/request/twoFactorEmailRequest"; -import { UpdateTwoFactorEmailRequest } from "@bitwarden/common/models/request/updateTwoFactorEmailRequest"; -import { TwoFactorEmailResponse } from "@bitwarden/common/models/response/twoFactorEmailResponse"; +import { TwoFactorEmailRequest } from "@bitwarden/common/models/request/two-factor-email.request"; +import { UpdateTwoFactorEmailRequest } from "@bitwarden/common/models/request/update-two-factor-email.request"; +import { TwoFactorEmailResponse } from "@bitwarden/common/models/response/two-factor-email.response"; import { AuthResponse } from "@bitwarden/common/types/authResponse"; import { TwoFactorBaseComponent } from "./two-factor-base.component"; diff --git a/apps/web/src/app/settings/two-factor-recovery.component.ts b/apps/web/src/app/settings/two-factor-recovery.component.ts index c5cd76b329..d7bb2a4a65 100644 --- a/apps/web/src/app/settings/two-factor-recovery.component.ts +++ b/apps/web/src/app/settings/two-factor-recovery.component.ts @@ -2,7 +2,7 @@ import { Component } from "@angular/core"; import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; import { TwoFactorProviderType } from "@bitwarden/common/enums/twoFactorProviderType"; -import { TwoFactorRecoverResponse } from "@bitwarden/common/models/response/twoFactorRescoverResponse"; +import { TwoFactorRecoverResponse } from "@bitwarden/common/models/response/two-factor-recover.response"; @Component({ selector: "app-two-factor-recovery", diff --git a/apps/web/src/app/settings/two-factor-verify.component.ts b/apps/web/src/app/settings/two-factor-verify.component.ts index 5e8b91fd77..53da0d8fe1 100644 --- a/apps/web/src/app/settings/two-factor-verify.component.ts +++ b/apps/web/src/app/settings/two-factor-verify.component.ts @@ -5,7 +5,7 @@ import { LogService } from "@bitwarden/common/abstractions/log.service"; import { UserVerificationService } from "@bitwarden/common/abstractions/userVerification/userVerification.service.abstraction"; import { TwoFactorProviderType } from "@bitwarden/common/enums/twoFactorProviderType"; import { VerificationType } from "@bitwarden/common/enums/verificationType"; -import { SecretVerificationRequest } from "@bitwarden/common/models/request/secretVerificationRequest"; +import { SecretVerificationRequest } from "@bitwarden/common/models/request/secret-verification.request"; import { AuthResponse } from "@bitwarden/common/types/authResponse"; import { TwoFactorResponse } from "@bitwarden/common/types/twoFactorResponse"; import { Verification } from "@bitwarden/common/types/verification"; diff --git a/apps/web/src/app/settings/two-factor-webauthn.component.ts b/apps/web/src/app/settings/two-factor-webauthn.component.ts index 4180b95754..e6e3565277 100644 --- a/apps/web/src/app/settings/two-factor-webauthn.component.ts +++ b/apps/web/src/app/settings/two-factor-webauthn.component.ts @@ -6,13 +6,13 @@ import { LogService } from "@bitwarden/common/abstractions/log.service"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; import { UserVerificationService } from "@bitwarden/common/abstractions/userVerification/userVerification.service.abstraction"; import { TwoFactorProviderType } from "@bitwarden/common/enums/twoFactorProviderType"; -import { SecretVerificationRequest } from "@bitwarden/common/models/request/secretVerificationRequest"; -import { UpdateTwoFactorWebAuthnDeleteRequest } from "@bitwarden/common/models/request/updateTwoFactorWebAuthnDeleteRequest"; -import { UpdateTwoFactorWebAuthnRequest } from "@bitwarden/common/models/request/updateTwoFactorWebAuthnRequest"; +import { SecretVerificationRequest } from "@bitwarden/common/models/request/secret-verification.request"; +import { UpdateTwoFactorWebAuthnDeleteRequest } from "@bitwarden/common/models/request/update-two-factor-web-authn-delete.request"; +import { UpdateTwoFactorWebAuthnRequest } from "@bitwarden/common/models/request/update-two-factor-web-authn.request"; import { ChallengeResponse, TwoFactorWebAuthnResponse, -} from "@bitwarden/common/models/response/twoFactorWebAuthnResponse"; +} from "@bitwarden/common/models/response/two-factor-web-authn.response"; import { AuthResponse } from "@bitwarden/common/types/authResponse"; import { TwoFactorBaseComponent } from "./two-factor-base.component"; diff --git a/apps/web/src/app/settings/two-factor-yubikey.component.ts b/apps/web/src/app/settings/two-factor-yubikey.component.ts index a6f75af1f8..d6d5234e7f 100644 --- a/apps/web/src/app/settings/two-factor-yubikey.component.ts +++ b/apps/web/src/app/settings/two-factor-yubikey.component.ts @@ -6,8 +6,8 @@ import { LogService } from "@bitwarden/common/abstractions/log.service"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; import { UserVerificationService } from "@bitwarden/common/abstractions/userVerification/userVerification.service.abstraction"; import { TwoFactorProviderType } from "@bitwarden/common/enums/twoFactorProviderType"; -import { UpdateTwoFactorYubioOtpRequest } from "@bitwarden/common/models/request/updateTwoFactorYubioOtpRequest"; -import { TwoFactorYubiKeyResponse } from "@bitwarden/common/models/response/twoFactorYubiKeyResponse"; +import { UpdateTwoFactorYubioOtpRequest } from "@bitwarden/common/models/request/update-two-factor-yubio-otp.request"; +import { TwoFactorYubiKeyResponse } from "@bitwarden/common/models/response/two-factor-yubi-key.response"; import { AuthResponse } from "@bitwarden/common/types/authResponse"; import { TwoFactorBaseComponent } from "./two-factor-base.component"; diff --git a/apps/web/src/app/settings/update-key.component.ts b/apps/web/src/app/settings/update-key.component.ts index c12e7cae57..5ebd432fb4 100644 --- a/apps/web/src/app/settings/update-key.component.ts +++ b/apps/web/src/app/settings/update-key.component.ts @@ -11,9 +11,9 @@ import { MessagingService } from "@bitwarden/common/abstractions/messaging.servi 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/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"; +import { CipherWithIdRequest } from "@bitwarden/common/models/request/cipher-with-id.request"; +import { FolderWithIdRequest } from "@bitwarden/common/models/request/folder-with-id.request"; +import { UpdateKeyRequest } from "@bitwarden/common/models/request/update-key.request"; @Component({ selector: "app-update-key", diff --git a/apps/web/src/app/settings/user-billing-history.component.ts b/apps/web/src/app/settings/user-billing-history.component.ts index dfc3216d2f..30682e03b4 100644 --- a/apps/web/src/app/settings/user-billing-history.component.ts +++ b/apps/web/src/app/settings/user-billing-history.component.ts @@ -6,7 +6,7 @@ import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; import { PaymentMethodType } from "@bitwarden/common/enums/paymentMethodType"; import { TransactionType } from "@bitwarden/common/enums/transactionType"; -import { BillingHistoryResponse } from "@bitwarden/common/models/response/billingHistoryResponse"; +import { BillingHistoryResponse } from "@bitwarden/common/models/response/billing-history.response"; @Component({ selector: "app-user-billing", diff --git a/apps/web/src/app/settings/user-subscription.component.ts b/apps/web/src/app/settings/user-subscription.component.ts index 5eb1442bf5..88f3dd20f6 100644 --- a/apps/web/src/app/settings/user-subscription.component.ts +++ b/apps/web/src/app/settings/user-subscription.component.ts @@ -7,7 +7,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 { SubscriptionResponse } from "@bitwarden/common/models/response/subscriptionResponse"; +import { SubscriptionResponse } from "@bitwarden/common/models/response/subscription.response"; @Component({ selector: "app-user-subscription", diff --git a/apps/web/src/app/vault/bulk-delete.component.ts b/apps/web/src/app/vault/bulk-delete.component.ts index d7ba762c42..55a3cc508c 100644 --- a/apps/web/src/app/vault/bulk-delete.component.ts +++ b/apps/web/src/app/vault/bulk-delete.component.ts @@ -5,7 +5,7 @@ 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 { Organization } from "@bitwarden/common/models/domain/organization"; -import { CipherBulkDeleteRequest } from "@bitwarden/common/models/request/cipherBulkDeleteRequest"; +import { CipherBulkDeleteRequest } from "@bitwarden/common/models/request/cipher-bulk-delete.request"; @Component({ selector: "app-vault-bulk-delete", diff --git a/apps/web/src/app/vault/vault-filter/organization-filter/organization-options.component.ts b/apps/web/src/app/vault/vault-filter/organization-filter/organization-options.component.ts index f37194b856..06b88bd0e4 100644 --- a/apps/web/src/app/vault/vault-filter/organization-filter/organization-options.component.ts +++ b/apps/web/src/app/vault/vault-filter/organization-filter/organization-options.component.ts @@ -12,7 +12,7 @@ import { SyncService } from "@bitwarden/common/abstractions/sync/sync.service.ab import { PolicyType } from "@bitwarden/common/enums/policyType"; import { Organization } from "@bitwarden/common/models/domain/organization"; import { Policy } from "@bitwarden/common/models/domain/policy"; -import { OrganizationUserResetPasswordEnrollmentRequest } from "@bitwarden/common/models/request/organizationUserResetPasswordEnrollmentRequest"; +import { OrganizationUserResetPasswordEnrollmentRequest } from "@bitwarden/common/models/request/organization-user-reset-password-enrollment.request"; import { EnrollMasterPasswordReset } from "../../../organizations/users/enroll-master-password-reset.component"; 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 0df0187ed6..9ae665b898 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 @@ -13,7 +13,7 @@ import { PolicyService } from "@bitwarden/common/abstractions/policy/policy.serv import { StateService } from "@bitwarden/common/abstractions/state.service"; 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 { CollectionDetailsResponse } from "@bitwarden/common/models/response/collection.response"; import { CollectionView } from "@bitwarden/common/models/view/collection.view"; @Injectable() 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 58c75874fd..c4e44ab0f6 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 @@ -10,11 +10,11 @@ import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUti import { OrganizationApiKeyType } from "@bitwarden/common/enums/organizationApiKeyType"; import { OrganizationConnectionType } from "@bitwarden/common/enums/organizationConnectionType"; 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"; -import { ApiKeyResponse } from "@bitwarden/common/models/response/apiKeyResponse"; -import { OrganizationConnectionResponse } from "@bitwarden/common/models/response/organizationConnectionResponse"; +import { OrganizationApiKeyRequest } from "@bitwarden/common/models/request/organization-api-key.request"; +import { OrganizationConnectionRequest } from "@bitwarden/common/models/request/organization-connection.request"; +import { ScimConfigRequest } from "@bitwarden/common/models/request/scim-config.request"; +import { ApiKeyResponse } from "@bitwarden/common/models/response/api-key.response"; +import { OrganizationConnectionResponse } from "@bitwarden/common/models/response/organization-connection.response"; @Component({ selector: "app-org-manage-scim", 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 0752858204..7ac80e4402 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 @@ -19,8 +19,8 @@ import { import { Utils } from "@bitwarden/common/misc/utils"; 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 { OrganizationSsoRequest } from "@bitwarden/common/models/request/organization/organization-sso.request"; +import { OrganizationSsoResponse } from "@bitwarden/common/models/response/organization/organization-sso.response"; 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/policies/maximum-vault-timeout.component.ts b/bitwarden_license/bit-web/src/app/policies/maximum-vault-timeout.component.ts index 45aa36037a..c1e193fc64 100644 --- a/bitwarden_license/bit-web/src/app/policies/maximum-vault-timeout.component.ts +++ b/bitwarden_license/bit-web/src/app/policies/maximum-vault-timeout.component.ts @@ -3,7 +3,7 @@ import { UntypedFormBuilder } from "@angular/forms"; import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; import { PolicyType } from "@bitwarden/common/enums/policyType"; -import { PolicyRequest } from "@bitwarden/common/models/request/policyRequest"; +import { PolicyRequest } from "@bitwarden/common/models/request/policy.request"; import { BasePolicy, BasePolicyComponent, diff --git a/bitwarden_license/bit-web/src/app/providers/clients/clients.component.ts b/bitwarden_license/bit-web/src/app/providers/clients/clients.component.ts index a87302511a..5c22f52c82 100644 --- a/bitwarden_license/bit-web/src/app/providers/clients/clients.component.ts +++ b/bitwarden_license/bit-web/src/app/providers/clients/clients.component.ts @@ -15,7 +15,7 @@ import { ValidationService } from "@bitwarden/common/abstractions/validation.ser import { PlanType } from "@bitwarden/common/enums/planType"; import { ProviderUserType } from "@bitwarden/common/enums/providerUserType"; import { Organization } from "@bitwarden/common/models/domain/organization"; -import { ProviderOrganizationOrganizationDetailsResponse } from "@bitwarden/common/models/response/provider/providerOrganizationResponse"; +import { ProviderOrganizationOrganizationDetailsResponse } from "@bitwarden/common/models/response/provider/provider-organization.response"; import { WebProviderService } from "../services/webProvider.service"; diff --git a/bitwarden_license/bit-web/src/app/providers/manage/accept-provider.component.ts b/bitwarden_license/bit-web/src/app/providers/manage/accept-provider.component.ts index 104a8d0b91..4cb745e27b 100644 --- a/bitwarden_license/bit-web/src/app/providers/manage/accept-provider.component.ts +++ b/bitwarden_license/bit-web/src/app/providers/manage/accept-provider.component.ts @@ -5,7 +5,7 @@ import { ApiService } from "@bitwarden/common/abstractions/api.service"; import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; import { StateService } from "@bitwarden/common/abstractions/state.service"; -import { ProviderUserAcceptRequest } from "@bitwarden/common/models/request/provider/providerUserAcceptRequest"; +import { ProviderUserAcceptRequest } from "@bitwarden/common/models/request/provider/provider-user-accept.request"; import { BaseAcceptComponent } from "@bitwarden/web-vault/app/common/base.accept.component"; @Component({ diff --git a/bitwarden_license/bit-web/src/app/providers/manage/bulk/bulk-confirm.component.ts b/bitwarden_license/bit-web/src/app/providers/manage/bulk/bulk-confirm.component.ts index 1a142e76eb..9459040a79 100644 --- a/bitwarden_license/bit-web/src/app/providers/manage/bulk/bulk-confirm.component.ts +++ b/bitwarden_license/bit-web/src/app/providers/manage/bulk/bulk-confirm.component.ts @@ -1,8 +1,8 @@ import { Component, Input } from "@angular/core"; import { ProviderUserStatusType } from "@bitwarden/common/enums/providerUserStatusType"; -import { ProviderUserBulkConfirmRequest } from "@bitwarden/common/models/request/provider/providerUserBulkConfirmRequest"; -import { ProviderUserBulkRequest } from "@bitwarden/common/models/request/provider/providerUserBulkRequest"; +import { ProviderUserBulkConfirmRequest } from "@bitwarden/common/models/request/provider/provider-user-bulk-confirm.request"; +import { ProviderUserBulkRequest } from "@bitwarden/common/models/request/provider/provider-user-bulk.request"; import { BulkConfirmComponent as OrganizationBulkConfirmComponent } from "@bitwarden/web-vault/app/organizations/manage/bulk/bulk-confirm.component"; import { BulkUserDetails } from "@bitwarden/web-vault/app/organizations/manage/bulk/bulk-status.component"; diff --git a/bitwarden_license/bit-web/src/app/providers/manage/bulk/bulk-remove.component.ts b/bitwarden_license/bit-web/src/app/providers/manage/bulk/bulk-remove.component.ts index ea991fba0d..08d83b0ae4 100644 --- a/bitwarden_license/bit-web/src/app/providers/manage/bulk/bulk-remove.component.ts +++ b/bitwarden_license/bit-web/src/app/providers/manage/bulk/bulk-remove.component.ts @@ -1,6 +1,6 @@ import { Component, Input } from "@angular/core"; -import { ProviderUserBulkRequest } from "@bitwarden/common/models/request/provider/providerUserBulkRequest"; +import { ProviderUserBulkRequest } from "@bitwarden/common/models/request/provider/provider-user-bulk.request"; import { BulkRemoveComponent as OrganizationBulkRemoveComponent } from "@bitwarden/web-vault/app/organizations/manage/bulk/bulk-remove.component"; @Component({ diff --git a/bitwarden_license/bit-web/src/app/providers/manage/events.component.ts b/bitwarden_license/bit-web/src/app/providers/manage/events.component.ts index ca3a186cf2..0dd1b6de45 100644 --- a/bitwarden_license/bit-web/src/app/providers/manage/events.component.ts +++ b/bitwarden_license/bit-web/src/app/providers/manage/events.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 { ProviderService } from "@bitwarden/common/abstractions/provider.service"; -import { EventResponse } from "@bitwarden/common/models/response/eventResponse"; +import { EventResponse } from "@bitwarden/common/models/response/event.response"; import { BaseEventsComponent } from "@bitwarden/web-vault/app/common/base.events.component"; import { EventService } from "@bitwarden/web-vault/app/core"; diff --git a/bitwarden_license/bit-web/src/app/providers/manage/people.component.ts b/bitwarden_license/bit-web/src/app/providers/manage/people.component.ts index bdb7c30e90..b8ef60e8e4 100644 --- a/bitwarden_license/bit-web/src/app/providers/manage/people.component.ts +++ b/bitwarden_license/bit-web/src/app/providers/manage/people.component.ts @@ -16,11 +16,11 @@ import { StateService } from "@bitwarden/common/abstractions/state.service"; import { ValidationService } from "@bitwarden/common/abstractions/validation.service"; import { ProviderUserStatusType } from "@bitwarden/common/enums/providerUserStatusType"; import { ProviderUserType } from "@bitwarden/common/enums/providerUserType"; -import { ProviderUserBulkRequest } from "@bitwarden/common/models/request/provider/providerUserBulkRequest"; -import { ProviderUserConfirmRequest } from "@bitwarden/common/models/request/provider/providerUserConfirmRequest"; -import { ListResponse } from "@bitwarden/common/models/response/listResponse"; -import { ProviderUserBulkResponse } from "@bitwarden/common/models/response/provider/providerUserBulkResponse"; -import { ProviderUserUserDetailsResponse } from "@bitwarden/common/models/response/provider/providerUserResponse"; +import { ProviderUserBulkRequest } from "@bitwarden/common/models/request/provider/provider-user-bulk.request"; +import { ProviderUserConfirmRequest } from "@bitwarden/common/models/request/provider/provider-user-confirm.request"; +import { ListResponse } from "@bitwarden/common/models/response/list.response"; +import { ProviderUserBulkResponse } from "@bitwarden/common/models/response/provider/provider-user-bulk.response"; +import { ProviderUserUserDetailsResponse } from "@bitwarden/common/models/response/provider/provider-user.response"; import { BasePeopleComponent } from "@bitwarden/web-vault/app/common/base.people.component"; import { BulkStatusComponent } from "@bitwarden/web-vault/app/organizations/manage/bulk/bulk-status.component"; import { EntityEventsComponent } from "@bitwarden/web-vault/app/organizations/manage/entity-events.component"; 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 99f2a1301c..6b73709772 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 @@ -6,8 +6,8 @@ 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/permissions.api"; -import { ProviderUserInviteRequest } from "@bitwarden/common/models/request/provider/providerUserInviteRequest"; -import { ProviderUserUpdateRequest } from "@bitwarden/common/models/request/provider/providerUserUpdateRequest"; +import { ProviderUserInviteRequest } from "@bitwarden/common/models/request/provider/provider-user-invite.request"; +import { ProviderUserUpdateRequest } from "@bitwarden/common/models/request/provider/provider-user-update.request"; @Component({ selector: "provider-user-add-edit", diff --git a/bitwarden_license/bit-web/src/app/providers/services/webProvider.service.ts b/bitwarden_license/bit-web/src/app/providers/services/webProvider.service.ts index c11735367d..bcc633c65d 100644 --- a/bitwarden_license/bit-web/src/app/providers/services/webProvider.service.ts +++ b/bitwarden_license/bit-web/src/app/providers/services/webProvider.service.ts @@ -3,7 +3,7 @@ import { Injectable } from "@angular/core"; import { ApiService } from "@bitwarden/common/abstractions/api.service"; import { CryptoService } from "@bitwarden/common/abstractions/crypto.service"; import { SyncService } from "@bitwarden/common/abstractions/sync/sync.service.abstraction"; -import { ProviderAddOrganizationRequest } from "@bitwarden/common/models/request/provider/providerAddOrganizationRequest"; +import { ProviderAddOrganizationRequest } from "@bitwarden/common/models/request/provider/provider-add-organization.request"; @Injectable() export class WebProviderService { diff --git a/bitwarden_license/bit-web/src/app/providers/settings/account.component.ts b/bitwarden_license/bit-web/src/app/providers/settings/account.component.ts index 94a99ed5c6..adc62b03e4 100644 --- a/bitwarden_license/bit-web/src/app/providers/settings/account.component.ts +++ b/bitwarden_license/bit-web/src/app/providers/settings/account.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 { SyncService } from "@bitwarden/common/abstractions/sync/sync.service.abstraction"; -import { ProviderUpdateRequest } from "@bitwarden/common/models/request/provider/providerUpdateRequest"; -import { ProviderResponse } from "@bitwarden/common/models/response/provider/providerResponse"; +import { ProviderUpdateRequest } from "@bitwarden/common/models/request/provider/provider-update.request"; +import { ProviderResponse } from "@bitwarden/common/models/response/provider/provider.response"; @Component({ selector: "provider-account", diff --git a/bitwarden_license/bit-web/src/app/providers/setup/setup.component.ts b/bitwarden_license/bit-web/src/app/providers/setup/setup.component.ts index bdc9b49826..f5a95e9300 100644 --- a/bitwarden_license/bit-web/src/app/providers/setup/setup.component.ts +++ b/bitwarden_license/bit-web/src/app/providers/setup/setup.component.ts @@ -8,7 +8,7 @@ import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; import { SyncService } from "@bitwarden/common/abstractions/sync/sync.service.abstraction"; import { ValidationService } from "@bitwarden/common/abstractions/validation.service"; -import { ProviderSetupRequest } from "@bitwarden/common/models/request/provider/providerSetupRequest"; +import { ProviderSetupRequest } from "@bitwarden/common/models/request/provider/provider-setup.request"; @Component({ selector: "provider-setup", diff --git a/libs/angular/src/components/attachments.component.ts b/libs/angular/src/components/attachments.component.ts index ea273e7412..819ab43661 100644 --- a/libs/angular/src/components/attachments.component.ts +++ b/libs/angular/src/components/attachments.component.ts @@ -10,7 +10,7 @@ import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUti import { StateService } from "@bitwarden/common/abstractions/state.service"; import { Cipher } from "@bitwarden/common/models/domain/cipher"; import { EncArrayBuffer } from "@bitwarden/common/models/domain/enc-array-buffer"; -import { ErrorResponse } from "@bitwarden/common/models/response/errorResponse"; +import { ErrorResponse } from "@bitwarden/common/models/response/error.response"; import { AttachmentView } from "@bitwarden/common/models/view/attachment.view"; import { CipherView } from "@bitwarden/common/models/view/cipher.view"; diff --git a/libs/angular/src/components/hint.component.ts b/libs/angular/src/components/hint.component.ts index 12e11f58b2..7e802722bf 100644 --- a/libs/angular/src/components/hint.component.ts +++ b/libs/angular/src/components/hint.component.ts @@ -4,7 +4,7 @@ import { ApiService } from "@bitwarden/common/abstractions/api.service"; 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 { PasswordHintRequest } from "@bitwarden/common/models/request/passwordHintRequest"; +import { PasswordHintRequest } from "@bitwarden/common/models/request/password-hint.request"; export class HintComponent { email = ""; diff --git a/libs/angular/src/components/lock.component.ts b/libs/angular/src/components/lock.component.ts index a92643b5c6..cb709c46dd 100644 --- a/libs/angular/src/components/lock.component.ts +++ b/libs/angular/src/components/lock.component.ts @@ -19,7 +19,7 @@ import { KeySuffixOptions } from "@bitwarden/common/enums/keySuffixOptions"; import { Utils } from "@bitwarden/common/misc/utils"; 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"; +import { SecretVerificationRequest } from "@bitwarden/common/models/request/secret-verification.request"; @Directive() export class LockComponent implements OnInit, OnDestroy { diff --git a/libs/angular/src/components/register.component.ts b/libs/angular/src/components/register.component.ts index b40031cf59..029639e7eb 100644 --- a/libs/angular/src/components/register.component.ts +++ b/libs/angular/src/components/register.component.ts @@ -17,10 +17,10 @@ import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUti 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/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"; -import { RegisterResponse } from "@bitwarden/common/models/response/authentication/registerResponse"; +import { KeysRequest } from "@bitwarden/common/models/request/keys.request"; +import { ReferenceEventRequest } from "@bitwarden/common/models/request/reference-event.request"; +import { RegisterRequest } from "@bitwarden/common/models/request/register.request"; +import { RegisterResponse } from "@bitwarden/common/models/response/authentication/register.response"; import { PasswordColorText } from "../shared/components/password-strength/password-strength.component"; import { InputsFieldMatch } from "../validators/inputsFieldMatch.validator"; diff --git a/libs/angular/src/components/set-password.component.ts b/libs/angular/src/components/set-password.component.ts index ac49803dbc..3c98e58516 100644 --- a/libs/angular/src/components/set-password.component.ts +++ b/libs/angular/src/components/set-password.component.ts @@ -18,9 +18,9 @@ import { DEFAULT_KDF_ITERATIONS, DEFAULT_KDF_TYPE } from "@bitwarden/common/enum import { Utils } from "@bitwarden/common/misc/utils"; 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"; +import { KeysRequest } from "@bitwarden/common/models/request/keys.request"; +import { OrganizationUserResetPasswordEnrollmentRequest } from "@bitwarden/common/models/request/organization-user-reset-password-enrollment.request"; +import { SetPasswordRequest } from "@bitwarden/common/models/request/set-password.request"; import { ChangePasswordComponent as BaseChangePasswordComponent } from "./change-password.component"; diff --git a/libs/angular/src/components/sso.component.ts b/libs/angular/src/components/sso.component.ts index 4a171935a3..9477df62c9 100644 --- a/libs/angular/src/components/sso.component.ts +++ b/libs/angular/src/components/sso.component.ts @@ -14,7 +14,7 @@ import { StateService } from "@bitwarden/common/abstractions/state.service"; import { Utils } from "@bitwarden/common/misc/utils"; 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"; +import { SsoPreValidateResponse } from "@bitwarden/common/models/response/sso-pre-validate.response"; @Directive() export class SsoComponent { diff --git a/libs/angular/src/components/two-factor.component.ts b/libs/angular/src/components/two-factor.component.ts index 93f8161958..9cef495df6 100644 --- a/libs/angular/src/components/two-factor.component.ts +++ b/libs/angular/src/components/two-factor.component.ts @@ -15,8 +15,8 @@ import { TwoFactorService } from "@bitwarden/common/abstractions/twoFactor.servi import { TwoFactorProviderType } from "@bitwarden/common/enums/twoFactorProviderType"; import { WebAuthnIFrame } from "@bitwarden/common/misc/webauthn_iframe"; 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 { TokenTwoFactorRequest } from "@bitwarden/common/models/request/identity-token/token-two-factor.request"; +import { TwoFactorEmailRequest } from "@bitwarden/common/models/request/two-factor-email.request"; import { TwoFactorProviders } from "@bitwarden/common/services/twoFactor.service"; import { CaptchaProtectedComponent } from "./captchaProtected.component"; @@ -194,7 +194,7 @@ export class TwoFactorComponent extends CaptchaProtectedComponent implements OnI async doSubmit() { this.formPromise = this.authService.logInTwoFactor( - new TokenRequestTwoFactor(this.selectedProviderType, this.token, this.remember), + new TokenTwoFactorRequest(this.selectedProviderType, this.token, this.remember), this.captchaToken ); const response: AuthResult = await this.formPromise; diff --git a/libs/angular/src/components/update-password.component.ts b/libs/angular/src/components/update-password.component.ts index 0cf21bbd63..e923a100da 100644 --- a/libs/angular/src/components/update-password.component.ts +++ b/libs/angular/src/components/update-password.component.ts @@ -15,7 +15,7 @@ import { VerificationType } from "@bitwarden/common/enums/verificationType"; 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 { PasswordRequest } from "@bitwarden/common/models/request/password.request"; import { Verification } from "@bitwarden/common/types/verification"; import { ChangePasswordComponent as BaseChangePasswordComponent } from "./change-password.component"; diff --git a/libs/angular/src/components/update-temp-password.component.ts b/libs/angular/src/components/update-temp-password.component.ts index f761b79029..f1c3ce1549 100644 --- a/libs/angular/src/components/update-temp-password.component.ts +++ b/libs/angular/src/components/update-temp-password.component.ts @@ -13,7 +13,7 @@ import { SyncService } from "@bitwarden/common/abstractions/sync/sync.service.ab 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 { UpdateTempPasswordRequest } from "@bitwarden/common/models/request/update-temp-password.request"; import { ChangePasswordComponent as BaseChangePasswordComponent } from "./change-password.component"; diff --git a/libs/angular/src/components/view.component.ts b/libs/angular/src/components/view.component.ts index 115c6e18b0..3bf3cb92f9 100644 --- a/libs/angular/src/components/view.component.ts +++ b/libs/angular/src/components/view.component.ts @@ -28,7 +28,7 @@ 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/enc-array-buffer"; -import { ErrorResponse } from "@bitwarden/common/models/response/errorResponse"; +import { ErrorResponse } from "@bitwarden/common/models/response/error.response"; 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"; diff --git a/libs/angular/src/directives/api-action.directive.ts b/libs/angular/src/directives/api-action.directive.ts index f68e7f8665..a156b3c78f 100644 --- a/libs/angular/src/directives/api-action.directive.ts +++ b/libs/angular/src/directives/api-action.directive.ts @@ -2,7 +2,7 @@ import { Directive, ElementRef, Input, OnChanges } from "@angular/core"; import { LogService } from "@bitwarden/common/abstractions/log.service"; import { ValidationService } from "@bitwarden/common/abstractions/validation.service"; -import { ErrorResponse } from "@bitwarden/common/models/response/errorResponse"; +import { ErrorResponse } from "@bitwarden/common/models/response/error.response"; /** * Provides error handling, in particular for any error returned by the server in an api call. diff --git a/libs/common/spec/misc/logInStrategies/logIn.strategy.spec.ts b/libs/common/spec/misc/logInStrategies/logIn.strategy.spec.ts index 4c9d848b4a..c71d0a13af 100644 --- a/libs/common/spec/misc/logInStrategies/logIn.strategy.spec.ts +++ b/libs/common/spec/misc/logInStrategies/logIn.strategy.spec.ts @@ -18,11 +18,11 @@ import { Account, AccountProfile, AccountTokens } from "@bitwarden/common/models 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"; -import { IdentityTokenResponse } from "@bitwarden/common/models/response/identityTokenResponse"; -import { IdentityTwoFactorResponse } from "@bitwarden/common/models/response/identityTwoFactorResponse"; +import { PasswordTokenRequest } from "@bitwarden/common/models/request/identity-token/password-token.request"; +import { TokenTwoFactorRequest } from "@bitwarden/common/models/request/identity-token/token-two-factor.request"; +import { IdentityCaptchaResponse } from "@bitwarden/common/models/response/identity-captcha.response"; +import { IdentityTokenResponse } from "@bitwarden/common/models/response/identity-token.response"; +import { IdentityTwoFactorResponse } from "@bitwarden/common/models/response/identity-two-factor.response"; const email = "hello@world.com"; const masterPassword = "password"; @@ -237,7 +237,7 @@ describe("LogInStrategy", () => { it("sends 2FA token provided by user to server (single step)", async () => { // This occurs if the user enters the 2FA code as an argument in the CLI apiService.postIdentityToken(Arg.any()).resolves(identityTokenResponseFactory()); - credentials.twoFactor = new TokenRequestTwoFactor( + credentials.twoFactor = new TokenTwoFactorRequest( twoFactorProviderType, twoFactorToken, twoFactorRemember @@ -269,7 +269,7 @@ describe("LogInStrategy", () => { apiService.postIdentityToken(Arg.any()).resolves(identityTokenResponseFactory()); await passwordLogInStrategy.logInTwoFactor( - new TokenRequestTwoFactor(twoFactorProviderType, twoFactorToken, twoFactorRemember), + new TokenTwoFactorRequest(twoFactorProviderType, twoFactorToken, twoFactorRemember), null ); diff --git a/libs/common/spec/models/domain/sendAccess.spec.ts b/libs/common/spec/models/domain/sendAccess.spec.ts index 4dc6c40c1a..d0a8093ba2 100644 --- a/libs/common/spec/models/domain/sendAccess.spec.ts +++ b/libs/common/spec/models/domain/sendAccess.spec.ts @@ -4,7 +4,7 @@ import { Substitute, Arg } from "@fluffy-spoon/substitute"; import { SendType } from "@bitwarden/common/enums/sendType"; 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 { SendAccessResponse } from "@bitwarden/common/models/response/send-access.response"; import { mockEnc } from "../../utils"; diff --git a/libs/common/spec/services/organization/organization.service.spec.ts b/libs/common/spec/services/organization/organization.service.spec.ts index 33b5b6c86a..8722673571 100644 --- a/libs/common/spec/services/organization/organization.service.spec.ts +++ b/libs/common/spec/services/organization/organization.service.spec.ts @@ -4,7 +4,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/organization.data"; -import { SyncResponse } from "@bitwarden/common/models/response/syncResponse"; +import { SyncResponse } from "@bitwarden/common/models/response/sync.response"; 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 7f6821cec6..3f52557d05 100644 --- a/libs/common/spec/services/policy.service.spec.ts +++ b/libs/common/spec/services/policy.service.spec.ts @@ -13,8 +13,8 @@ import { MasterPasswordPolicyOptions } from "@bitwarden/common/models/domain/mas import { Organization } from "@bitwarden/common/models/domain/organization"; import { Policy } from "@bitwarden/common/models/domain/policy"; 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 { ListResponse } from "@bitwarden/common/models/response/list.response"; +import { PolicyResponse } from "@bitwarden/common/models/response/policy.response"; import { ContainerService } from "@bitwarden/common/services/container.service"; import { EncryptService } from "@bitwarden/common/services/encrypt.service"; import { PolicyService } from "@bitwarden/common/services/policy/policy.service"; diff --git a/libs/common/src/abstractions/account/account-api.service.abstraction.ts b/libs/common/src/abstractions/account/account-api.service.abstraction.ts index 6c838e5b18..7af1333a46 100644 --- a/libs/common/src/abstractions/account/account-api.service.abstraction.ts +++ b/libs/common/src/abstractions/account/account-api.service.abstraction.ts @@ -1,4 +1,4 @@ -import { SecretVerificationRequest } from "../../models/request/secretVerificationRequest"; +import { SecretVerificationRequest } from "../../models/request/secret-verification.request"; export abstract class AccountApiService { abstract deleteAccount(request: SecretVerificationRequest): Promise; diff --git a/libs/common/src/abstractions/api.service.ts b/libs/common/src/abstractions/api.service.ts index 5827c84282..76c163b4ff 100644 --- a/libs/common/src/abstractions/api.service.ts +++ b/libs/common/src/abstractions/api.service.ts @@ -1,165 +1,165 @@ import { OrganizationConnectionType } from "../enums/organizationConnectionType"; -import { SetKeyConnectorKeyRequest } from "../models/request/account/setKeyConnectorKeyRequest"; -import { AttachmentRequest } from "../models/request/attachmentRequest"; -import { BitPayInvoiceRequest } from "../models/request/bitPayInvoiceRequest"; -import { CipherBulkDeleteRequest } from "../models/request/cipherBulkDeleteRequest"; -import { CipherBulkMoveRequest } from "../models/request/cipherBulkMoveRequest"; -import { CipherBulkRestoreRequest } from "../models/request/cipherBulkRestoreRequest"; -import { CipherBulkShareRequest } from "../models/request/cipherBulkShareRequest"; -import { CipherCollectionsRequest } from "../models/request/cipherCollectionsRequest"; -import { CipherCreateRequest } from "../models/request/cipherCreateRequest"; -import { CipherRequest } from "../models/request/cipherRequest"; -import { CipherShareRequest } from "../models/request/cipherShareRequest"; -import { CollectionRequest } from "../models/request/collectionRequest"; -import { DeleteRecoverRequest } from "../models/request/deleteRecoverRequest"; -import { DeviceVerificationRequest } from "../models/request/deviceVerificationRequest"; -import { EmailRequest } from "../models/request/emailRequest"; -import { EmailTokenRequest } from "../models/request/emailTokenRequest"; -import { EmergencyAccessAcceptRequest } from "../models/request/emergencyAccessAcceptRequest"; -import { EmergencyAccessConfirmRequest } from "../models/request/emergencyAccessConfirmRequest"; -import { EmergencyAccessInviteRequest } from "../models/request/emergencyAccessInviteRequest"; -import { EmergencyAccessPasswordRequest } from "../models/request/emergencyAccessPasswordRequest"; -import { EmergencyAccessUpdateRequest } from "../models/request/emergencyAccessUpdateRequest"; -import { EventRequest } from "../models/request/eventRequest"; -import { GroupRequest } from "../models/request/groupRequest"; -import { IapCheckRequest } from "../models/request/iapCheckRequest"; -import { ApiTokenRequest } from "../models/request/identityToken/apiTokenRequest"; -import { PasswordTokenRequest } from "../models/request/identityToken/passwordTokenRequest"; -import { SsoTokenRequest } from "../models/request/identityToken/ssoTokenRequest"; -import { ImportCiphersRequest } from "../models/request/importCiphersRequest"; -import { ImportOrganizationCiphersRequest } from "../models/request/importOrganizationCiphersRequest"; -import { KdfRequest } from "../models/request/kdfRequest"; -import { KeyConnectorUserKeyRequest } from "../models/request/keyConnectorUserKeyRequest"; -import { KeysRequest } from "../models/request/keysRequest"; -import { OrganizationSponsorshipCreateRequest } from "../models/request/organization/organizationSponsorshipCreateRequest"; -import { OrganizationSponsorshipRedeemRequest } from "../models/request/organization/organizationSponsorshipRedeemRequest"; -import { OrganizationConnectionRequest } from "../models/request/organizationConnectionRequest"; -import { OrganizationImportRequest } from "../models/request/organizationImportRequest"; -import { OrganizationUserAcceptRequest } from "../models/request/organizationUserAcceptRequest"; -import { OrganizationUserBulkConfirmRequest } from "../models/request/organizationUserBulkConfirmRequest"; -import { OrganizationUserBulkRequest } from "../models/request/organizationUserBulkRequest"; -import { OrganizationUserConfirmRequest } from "../models/request/organizationUserConfirmRequest"; -import { OrganizationUserInviteRequest } from "../models/request/organizationUserInviteRequest"; -import { OrganizationUserResetPasswordEnrollmentRequest } from "../models/request/organizationUserResetPasswordEnrollmentRequest"; -import { OrganizationUserResetPasswordRequest } from "../models/request/organizationUserResetPasswordRequest"; -import { OrganizationUserUpdateGroupsRequest } from "../models/request/organizationUserUpdateGroupsRequest"; -import { OrganizationUserUpdateRequest } from "../models/request/organizationUserUpdateRequest"; -import { PasswordHintRequest } from "../models/request/passwordHintRequest"; -import { PasswordRequest } from "../models/request/passwordRequest"; -import { PasswordlessCreateAuthRequest } from "../models/request/passwordlessCreateAuthRequest"; -import { PaymentRequest } from "../models/request/paymentRequest"; -import { PreloginRequest } from "../models/request/preloginRequest"; -import { ProviderAddOrganizationRequest } from "../models/request/provider/providerAddOrganizationRequest"; -import { ProviderOrganizationCreateRequest } from "../models/request/provider/providerOrganizationCreateRequest"; -import { ProviderSetupRequest } from "../models/request/provider/providerSetupRequest"; -import { ProviderUpdateRequest } from "../models/request/provider/providerUpdateRequest"; -import { ProviderUserAcceptRequest } from "../models/request/provider/providerUserAcceptRequest"; -import { ProviderUserBulkConfirmRequest } from "../models/request/provider/providerUserBulkConfirmRequest"; -import { ProviderUserBulkRequest } from "../models/request/provider/providerUserBulkRequest"; -import { ProviderUserConfirmRequest } from "../models/request/provider/providerUserConfirmRequest"; -import { ProviderUserInviteRequest } from "../models/request/provider/providerUserInviteRequest"; -import { ProviderUserUpdateRequest } from "../models/request/provider/providerUserUpdateRequest"; -import { RegisterRequest } from "../models/request/registerRequest"; -import { SecretVerificationRequest } from "../models/request/secretVerificationRequest"; -import { SelectionReadOnlyRequest } from "../models/request/selectionReadOnlyRequest"; -import { SendAccessRequest } from "../models/request/sendAccessRequest"; -import { SendRequest } from "../models/request/sendRequest"; -import { SetPasswordRequest } from "../models/request/setPasswordRequest"; -import { StorageRequest } from "../models/request/storageRequest"; -import { TaxInfoUpdateRequest } from "../models/request/taxInfoUpdateRequest"; -import { TwoFactorEmailRequest } from "../models/request/twoFactorEmailRequest"; -import { TwoFactorProviderRequest } from "../models/request/twoFactorProviderRequest"; -import { TwoFactorRecoveryRequest } from "../models/request/twoFactorRecoveryRequest"; -import { UpdateDomainsRequest } from "../models/request/updateDomainsRequest"; -import { UpdateKeyRequest } from "../models/request/updateKeyRequest"; -import { UpdateProfileRequest } from "../models/request/updateProfileRequest"; -import { UpdateTempPasswordRequest } from "../models/request/updateTempPasswordRequest"; -import { UpdateTwoFactorAuthenticatorRequest } from "../models/request/updateTwoFactorAuthenticatorRequest"; -import { UpdateTwoFactorDuoRequest } from "../models/request/updateTwoFactorDuoRequest"; -import { UpdateTwoFactorEmailRequest } from "../models/request/updateTwoFactorEmailRequest"; -import { UpdateTwoFactorWebAuthnDeleteRequest } from "../models/request/updateTwoFactorWebAuthnDeleteRequest"; -import { UpdateTwoFactorWebAuthnRequest } from "../models/request/updateTwoFactorWebAuthnRequest"; -import { UpdateTwoFactorYubioOtpRequest } from "../models/request/updateTwoFactorYubioOtpRequest"; -import { VerifyDeleteRecoverRequest } from "../models/request/verifyDeleteRecoverRequest"; -import { VerifyEmailRequest } from "../models/request/verifyEmailRequest"; -import { ApiKeyResponse } from "../models/response/apiKeyResponse"; -import { AttachmentResponse } from "../models/response/attachmentResponse"; -import { AttachmentUploadDataResponse } from "../models/response/attachmentUploadDataResponse"; -import { AuthRequestResponse } from "../models/response/authRequestResponse"; -import { RegisterResponse } from "../models/response/authentication/registerResponse"; -import { BillingHistoryResponse } from "../models/response/billingHistoryResponse"; -import { BillingPaymentResponse } from "../models/response/billingPaymentResponse"; -import { BreachAccountResponse } from "../models/response/breachAccountResponse"; -import { CipherResponse } from "../models/response/cipherResponse"; +import { SetKeyConnectorKeyRequest } from "../models/request/account/set-key-connector-key.request"; +import { AttachmentRequest } from "../models/request/attachment.request"; +import { BitPayInvoiceRequest } from "../models/request/bit-pay-invoice.request"; +import { CipherBulkDeleteRequest } from "../models/request/cipher-bulk-delete.request"; +import { CipherBulkMoveRequest } from "../models/request/cipher-bulk-move.request"; +import { CipherBulkRestoreRequest } from "../models/request/cipher-bulk-restore.request"; +import { CipherBulkShareRequest } from "../models/request/cipher-bulk-share.request"; +import { CipherCollectionsRequest } from "../models/request/cipher-collections.request"; +import { CipherCreateRequest } from "../models/request/cipher-create.request"; +import { CipherShareRequest } from "../models/request/cipher-share.request"; +import { CipherRequest } from "../models/request/cipher.request"; +import { CollectionRequest } from "../models/request/collection.request"; +import { DeleteRecoverRequest } from "../models/request/delete-recover.request"; +import { DeviceVerificationRequest } from "../models/request/device-verification.request"; +import { EmailTokenRequest } from "../models/request/email-token.request"; +import { EmailRequest } from "../models/request/email.request"; +import { EmergencyAccessAcceptRequest } from "../models/request/emergency-access-accept.request"; +import { EmergencyAccessConfirmRequest } from "../models/request/emergency-access-confirm.request"; +import { EmergencyAccessInviteRequest } from "../models/request/emergency-access-invite.request"; +import { EmergencyAccessPasswordRequest } from "../models/request/emergency-access-password.request"; +import { EmergencyAccessUpdateRequest } from "../models/request/emergency-access-update.request"; +import { EventRequest } from "../models/request/event.request"; +import { GroupRequest } from "../models/request/group.request"; +import { IapCheckRequest } from "../models/request/iap-check.request"; +import { ApiTokenRequest } from "../models/request/identity-token/api-token.request"; +import { PasswordTokenRequest } from "../models/request/identity-token/password-token.request"; +import { SsoTokenRequest } from "../models/request/identity-token/sso-token.request"; +import { ImportCiphersRequest } from "../models/request/import-ciphers.request"; +import { ImportOrganizationCiphersRequest } from "../models/request/import-organization-ciphers.request"; +import { KdfRequest } from "../models/request/kdf.request"; +import { KeyConnectorUserKeyRequest } from "../models/request/key-connector-user-key.request"; +import { KeysRequest } from "../models/request/keys.request"; +import { OrganizationConnectionRequest } from "../models/request/organization-connection.request"; +import { OrganizationImportRequest } from "../models/request/organization-import.request"; +import { OrganizationUserAcceptRequest } from "../models/request/organization-user-accept.request"; +import { OrganizationUserBulkConfirmRequest } from "../models/request/organization-user-bulk-confirm.request"; +import { OrganizationUserBulkRequest } from "../models/request/organization-user-bulk.request"; +import { OrganizationUserConfirmRequest } from "../models/request/organization-user-confirm.request"; +import { OrganizationUserInviteRequest } from "../models/request/organization-user-invite.request"; +import { OrganizationUserResetPasswordEnrollmentRequest } from "../models/request/organization-user-reset-password-enrollment.request"; +import { OrganizationUserResetPasswordRequest } from "../models/request/organization-user-reset-password.request"; +import { OrganizationUserUpdateGroupsRequest } from "../models/request/organization-user-update-groups.request"; +import { OrganizationUserUpdateRequest } from "../models/request/organization-user-update.request"; +import { OrganizationSponsorshipCreateRequest } from "../models/request/organization/organization-sponsorship-create.request"; +import { OrganizationSponsorshipRedeemRequest } from "../models/request/organization/organization-sponsorship-redeem.request"; +import { PasswordHintRequest } from "../models/request/password-hint.request"; +import { PasswordRequest } from "../models/request/password.request"; +import { PasswordlessCreateAuthRequest } from "../models/request/passwordless-create-auth.request"; +import { PaymentRequest } from "../models/request/payment.request"; +import { PreloginRequest } from "../models/request/prelogin.request"; +import { ProviderAddOrganizationRequest } from "../models/request/provider/provider-add-organization.request"; +import { ProviderOrganizationCreateRequest } from "../models/request/provider/provider-organization-create.request"; +import { ProviderSetupRequest } from "../models/request/provider/provider-setup.request"; +import { ProviderUpdateRequest } from "../models/request/provider/provider-update.request"; +import { ProviderUserAcceptRequest } from "../models/request/provider/provider-user-accept.request"; +import { ProviderUserBulkConfirmRequest } from "../models/request/provider/provider-user-bulk-confirm.request"; +import { ProviderUserBulkRequest } from "../models/request/provider/provider-user-bulk.request"; +import { ProviderUserConfirmRequest } from "../models/request/provider/provider-user-confirm.request"; +import { ProviderUserInviteRequest } from "../models/request/provider/provider-user-invite.request"; +import { ProviderUserUpdateRequest } from "../models/request/provider/provider-user-update.request"; +import { RegisterRequest } from "../models/request/register.request"; +import { SecretVerificationRequest } from "../models/request/secret-verification.request"; +import { SelectionReadOnlyRequest } from "../models/request/selection-read-only.request"; +import { SendAccessRequest } from "../models/request/send-access.request"; +import { SendRequest } from "../models/request/send.request"; +import { SetPasswordRequest } from "../models/request/set-password.request"; +import { StorageRequest } from "../models/request/storage.request"; +import { TaxInfoUpdateRequest } from "../models/request/tax-info-update.request"; +import { TwoFactorEmailRequest } from "../models/request/two-factor-email.request"; +import { TwoFactorProviderRequest } from "../models/request/two-factor-provider.request"; +import { TwoFactorRecoveryRequest } from "../models/request/two-factor-recovery.request"; +import { UpdateDomainsRequest } from "../models/request/update-domains.request"; +import { UpdateKeyRequest } from "../models/request/update-key.request"; +import { UpdateProfileRequest } from "../models/request/update-profile.request"; +import { UpdateTempPasswordRequest } from "../models/request/update-temp-password.request"; +import { UpdateTwoFactorAuthenticatorRequest } from "../models/request/update-two-factor-authenticator.request"; +import { UpdateTwoFactorDuoRequest } from "../models/request/update-two-factor-duo.request"; +import { UpdateTwoFactorEmailRequest } from "../models/request/update-two-factor-email.request"; +import { UpdateTwoFactorWebAuthnDeleteRequest } from "../models/request/update-two-factor-web-authn-delete.request"; +import { UpdateTwoFactorWebAuthnRequest } from "../models/request/update-two-factor-web-authn.request"; +import { UpdateTwoFactorYubioOtpRequest } from "../models/request/update-two-factor-yubio-otp.request"; +import { VerifyDeleteRecoverRequest } from "../models/request/verify-delete-recover.request"; +import { VerifyEmailRequest } from "../models/request/verify-email.request"; +import { ApiKeyResponse } from "../models/response/api-key.response"; +import { AttachmentUploadDataResponse } from "../models/response/attachment-upload-data.response"; +import { AttachmentResponse } from "../models/response/attachment.response"; +import { AuthRequestResponse } from "../models/response/auth-request.response"; +import { RegisterResponse } from "../models/response/authentication/register.response"; +import { BillingHistoryResponse } from "../models/response/billing-history.response"; +import { BillingPaymentResponse } from "../models/response/billing-payment.response"; +import { BreachAccountResponse } from "../models/response/breach-account.response"; +import { CipherResponse } from "../models/response/cipher.response"; import { CollectionGroupDetailsResponse, CollectionResponse, -} from "../models/response/collectionResponse"; -import { DeviceVerificationResponse } from "../models/response/deviceVerificationResponse"; -import { DomainsResponse } from "../models/response/domainsResponse"; +} from "../models/response/collection.response"; +import { DeviceVerificationResponse } from "../models/response/device-verification.response"; +import { DomainsResponse } from "../models/response/domains.response"; import { EmergencyAccessGranteeDetailsResponse, EmergencyAccessGrantorDetailsResponse, EmergencyAccessTakeoverResponse, EmergencyAccessViewResponse, -} from "../models/response/emergencyAccessResponse"; -import { EventResponse } from "../models/response/eventResponse"; -import { GroupDetailsResponse, GroupResponse } from "../models/response/groupResponse"; -import { IdentityCaptchaResponse } from "../models/response/identityCaptchaResponse"; -import { IdentityTokenResponse } from "../models/response/identityTokenResponse"; -import { IdentityTwoFactorResponse } from "../models/response/identityTwoFactorResponse"; -import { KeyConnectorUserKeyResponse } from "../models/response/keyConnectorUserKeyResponse"; -import { ListResponse } from "../models/response/listResponse"; +} from "../models/response/emergency-access.response"; +import { EventResponse } from "../models/response/event.response"; +import { GroupDetailsResponse, GroupResponse } from "../models/response/group.response"; +import { IdentityCaptchaResponse } from "../models/response/identity-captcha.response"; +import { IdentityTokenResponse } from "../models/response/identity-token.response"; +import { IdentityTwoFactorResponse } from "../models/response/identity-two-factor.response"; +import { KeyConnectorUserKeyResponse } from "../models/response/key-connector-user-key.response"; +import { ListResponse } from "../models/response/list.response"; import { OrganizationConnectionConfigApis, OrganizationConnectionResponse, -} from "../models/response/organizationConnectionResponse"; -import { OrganizationExportResponse } from "../models/response/organizationExportResponse"; -import { OrganizationSponsorshipSyncStatusResponse } from "../models/response/organizationSponsorshipSyncStatusResponse"; -import { OrganizationUserBulkPublicKeyResponse } from "../models/response/organizationUserBulkPublicKeyResponse"; -import { OrganizationUserBulkResponse } from "../models/response/organizationUserBulkResponse"; +} from "../models/response/organization-connection.response"; +import { OrganizationExportResponse } from "../models/response/organization-export.response"; +import { OrganizationSponsorshipSyncStatusResponse } from "../models/response/organization-sponsorship-sync-status.response"; +import { OrganizationUserBulkPublicKeyResponse } from "../models/response/organization-user-bulk-public-key.response"; +import { OrganizationUserBulkResponse } from "../models/response/organization-user-bulk.response"; import { OrganizationUserDetailsResponse, - OrganizationUserResetPasswordDetailsReponse, OrganizationUserUserDetailsResponse, -} from "../models/response/organizationUserResponse"; -import { PaymentResponse } from "../models/response/paymentResponse"; -import { PlanResponse } from "../models/response/planResponse"; -import { PolicyResponse } from "../models/response/policyResponse"; -import { PreloginResponse } from "../models/response/preloginResponse"; -import { ProfileResponse } from "../models/response/profileResponse"; + OrganizationUserResetPasswordDetailsReponse, +} from "../models/response/organization-user.response"; +import { PaymentResponse } from "../models/response/payment.response"; +import { PlanResponse } from "../models/response/plan.response"; +import { PolicyResponse } from "../models/response/policy.response"; +import { PreloginResponse } from "../models/response/prelogin.response"; +import { ProfileResponse } from "../models/response/profile.response"; import { ProviderOrganizationOrganizationDetailsResponse, ProviderOrganizationResponse, -} from "../models/response/provider/providerOrganizationResponse"; -import { ProviderResponse } from "../models/response/provider/providerResponse"; -import { ProviderUserBulkPublicKeyResponse } from "../models/response/provider/providerUserBulkPublicKeyResponse"; -import { ProviderUserBulkResponse } from "../models/response/provider/providerUserBulkResponse"; +} from "../models/response/provider/provider-organization.response"; +import { ProviderUserBulkPublicKeyResponse } from "../models/response/provider/provider-user-bulk-public-key.response"; +import { ProviderUserBulkResponse } from "../models/response/provider/provider-user-bulk.response"; import { - ProviderUserResponse, ProviderUserUserDetailsResponse, -} from "../models/response/provider/providerUserResponse"; -import { SelectionReadOnlyResponse } from "../models/response/selectionReadOnlyResponse"; -import { SendAccessResponse } from "../models/response/sendAccessResponse"; -import { SendFileDownloadDataResponse } from "../models/response/sendFileDownloadDataResponse"; -import { SendFileUploadDataResponse } from "../models/response/sendFileUploadDataResponse"; -import { SendResponse } from "../models/response/sendResponse"; -import { SsoPreValidateResponse } from "../models/response/ssoPreValidateResponse"; -import { SubscriptionResponse } from "../models/response/subscriptionResponse"; -import { SyncResponse } from "../models/response/syncResponse"; -import { TaxInfoResponse } from "../models/response/taxInfoResponse"; -import { TaxRateResponse } from "../models/response/taxRateResponse"; -import { TwoFactorAuthenticatorResponse } from "../models/response/twoFactorAuthenticatorResponse"; -import { TwoFactorDuoResponse } from "../models/response/twoFactorDuoResponse"; -import { TwoFactorEmailResponse } from "../models/response/twoFactorEmailResponse"; -import { TwoFactorProviderResponse } from "../models/response/twoFactorProviderResponse"; -import { TwoFactorRecoverResponse } from "../models/response/twoFactorRescoverResponse"; + ProviderUserResponse, +} from "../models/response/provider/provider-user.response"; +import { ProviderResponse } from "../models/response/provider/provider.response"; +import { SelectionReadOnlyResponse } from "../models/response/selection-read-only.response"; +import { SendAccessResponse } from "../models/response/send-access.response"; +import { SendFileDownloadDataResponse } from "../models/response/send-file-download-data.response"; +import { SendFileUploadDataResponse } from "../models/response/send-file-upload-data.response"; +import { SendResponse } from "../models/response/send.response"; +import { SsoPreValidateResponse } from "../models/response/sso-pre-validate.response"; +import { SubscriptionResponse } from "../models/response/subscription.response"; +import { SyncResponse } from "../models/response/sync.response"; +import { TaxInfoResponse } from "../models/response/tax-info.response"; +import { TaxRateResponse } from "../models/response/tax-rate.response"; +import { TwoFactorAuthenticatorResponse } from "../models/response/two-factor-authenticator.response"; +import { TwoFactorDuoResponse } from "../models/response/two-factor-duo.response"; +import { TwoFactorEmailResponse } from "../models/response/two-factor-email.response"; +import { TwoFactorProviderResponse } from "../models/response/two-factor-provider.response"; +import { TwoFactorRecoverResponse } from "../models/response/two-factor-recover.response"; import { - ChallengeResponse, TwoFactorWebAuthnResponse, -} from "../models/response/twoFactorWebAuthnResponse"; -import { TwoFactorYubiKeyResponse } from "../models/response/twoFactorYubiKeyResponse"; -import { UserKeyResponse } from "../models/response/userKeyResponse"; + ChallengeResponse, +} from "../models/response/two-factor-web-authn.response"; +import { TwoFactorYubiKeyResponse } from "../models/response/two-factor-yubi-key.response"; +import { UserKeyResponse } from "../models/response/user-key.response"; import { SendAccessView } from "../models/view/send-access.view"; export abstract class ApiService { diff --git a/libs/common/src/abstractions/audit.service.ts b/libs/common/src/abstractions/audit.service.ts index 6b6b81f69e..cb2a07788a 100644 --- a/libs/common/src/abstractions/audit.service.ts +++ b/libs/common/src/abstractions/audit.service.ts @@ -1,4 +1,4 @@ -import { BreachAccountResponse } from "../models/response/breachAccountResponse"; +import { BreachAccountResponse } from "../models/response/breach-account.response"; export abstract class AuditService { passwordLeaked: (password: string) => Promise; diff --git a/libs/common/src/abstractions/auth.service.ts b/libs/common/src/abstractions/auth.service.ts index 959b5c8425..8b29c3cd69 100644 --- a/libs/common/src/abstractions/auth.service.ts +++ b/libs/common/src/abstractions/auth.service.ts @@ -9,8 +9,8 @@ import { PasswordlessLogInCredentials, } 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"; +import { TokenTwoFactorRequest } from "../models/request/identity-token/token-two-factor.request"; +import { AuthRequestPushNotification } from "../models/response/notification.response"; export abstract class AuthService { masterPasswordHash: string; @@ -23,7 +23,7 @@ export abstract class AuthService { | PasswordlessLogInCredentials ) => Promise; logInTwoFactor: ( - twoFactor: TokenRequestTwoFactor, + twoFactor: TokenTwoFactorRequest, captchaResponse: string ) => Promise; logOut: (callback: () => void) => void; diff --git a/libs/common/src/abstractions/config/config-api.service.abstraction.ts b/libs/common/src/abstractions/config/config-api.service.abstraction.ts index 9f7b82d78e..2b25164e7c 100644 --- a/libs/common/src/abstractions/config/config-api.service.abstraction.ts +++ b/libs/common/src/abstractions/config/config-api.service.abstraction.ts @@ -1,4 +1,4 @@ -import { ServerConfigResponse } from "../../models/response/server-config-response"; +import { ServerConfigResponse } from "../../models/response/server-config.response"; export abstract class ConfigApiServiceAbstraction { get: () => Promise; diff --git a/libs/common/src/abstractions/crypto.service.ts b/libs/common/src/abstractions/crypto.service.ts index 72f67854fc..e4dd43cdf2 100644 --- a/libs/common/src/abstractions/crypto.service.ts +++ b/libs/common/src/abstractions/crypto.service.ts @@ -4,9 +4,9 @@ import { KeySuffixOptions } from "../enums/keySuffixOptions"; 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"; +import { ProfileOrganizationResponse } from "../models/response/profile-organization.response"; +import { ProfileProviderOrganizationResponse } from "../models/response/profile-provider-organization.response"; +import { ProfileProviderResponse } from "../models/response/profile-provider.response"; export abstract class CryptoService { setKey: (key: SymmetricCryptoKey) => Promise; diff --git a/libs/common/src/abstractions/fileUpload.service.ts b/libs/common/src/abstractions/fileUpload.service.ts index bc597c5973..b8523f3218 100644 --- a/libs/common/src/abstractions/fileUpload.service.ts +++ b/libs/common/src/abstractions/fileUpload.service.ts @@ -1,7 +1,7 @@ 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"; +import { AttachmentUploadDataResponse } from "../models/response/attachment-upload-data.response"; +import { SendFileUploadDataResponse } from "../models/response/send-file-upload-data.response"; export abstract class FileUploadService { uploadSendFile: ( diff --git a/libs/common/src/abstractions/folder/folder-api.service.abstraction.ts b/libs/common/src/abstractions/folder/folder-api.service.abstraction.ts index ac925c25b6..d29ff71290 100644 --- a/libs/common/src/abstractions/folder/folder-api.service.abstraction.ts +++ b/libs/common/src/abstractions/folder/folder-api.service.abstraction.ts @@ -1,5 +1,5 @@ import { Folder } from "../../models/domain/folder"; -import { FolderResponse } from "../../models/response/folderResponse"; +import { FolderResponse } from "../../models/response/folder.response"; export class FolderApiServiceAbstraction { save: (folder: Folder) => Promise; diff --git a/libs/common/src/abstractions/keyConnector.service.ts b/libs/common/src/abstractions/keyConnector.service.ts index b8f3bf7cd8..7a6d0ac84c 100644 --- a/libs/common/src/abstractions/keyConnector.service.ts +++ b/libs/common/src/abstractions/keyConnector.service.ts @@ -1,5 +1,5 @@ import { Organization } from "../models/domain/organization"; -import { IdentityTokenResponse } from "../models/response/identityTokenResponse"; +import { IdentityTokenResponse } from "../models/response/identity-token.response"; export abstract class KeyConnectorService { getAndSetKey: (url?: string) => Promise; diff --git a/libs/common/src/abstractions/organization/organization-api.service.abstraction.ts b/libs/common/src/abstractions/organization/organization-api.service.abstraction.ts index ffd95504ca..cd86b0b46a 100644 --- a/libs/common/src/abstractions/organization/organization-api.service.abstraction.ts +++ b/libs/common/src/abstractions/organization/organization-api.service.abstraction.ts @@ -1,29 +1,29 @@ import { OrganizationApiKeyType } from "../../enums/organizationApiKeyType"; -import { ImportDirectoryRequest } from "../../models/request/importDirectoryRequest"; -import { OrganizationSsoRequest } from "../../models/request/organization/organizationSsoRequest"; -import { OrganizationApiKeyRequest } from "../../models/request/organizationApiKeyRequest"; -import { OrganizationCreateRequest } from "../../models/request/organizationCreateRequest"; -import { OrganizationKeysRequest } from "../../models/request/organizationKeysRequest"; -import { OrganizationSubscriptionUpdateRequest } from "../../models/request/organizationSubscriptionUpdateRequest"; -import { OrganizationTaxInfoUpdateRequest } from "../../models/request/organizationTaxInfoUpdateRequest"; -import { OrganizationUpdateRequest } from "../../models/request/organizationUpdateRequest"; -import { OrganizationUpgradeRequest } from "../../models/request/organizationUpgradeRequest"; -import { PaymentRequest } from "../../models/request/paymentRequest"; -import { SeatRequest } from "../../models/request/seatRequest"; -import { SecretVerificationRequest } from "../../models/request/secretVerificationRequest"; -import { StorageRequest } from "../../models/request/storageRequest"; -import { VerifyBankRequest } from "../../models/request/verifyBankRequest"; -import { ApiKeyResponse } from "../../models/response/apiKeyResponse"; -import { BillingResponse } from "../../models/response/billingResponse"; -import { ListResponse } from "../../models/response/listResponse"; -import { OrganizationSsoResponse } from "../../models/response/organization/organizationSsoResponse"; -import { OrganizationApiKeyInformationResponse } from "../../models/response/organizationApiKeyInformationResponse"; -import { OrganizationAutoEnrollStatusResponse } from "../../models/response/organizationAutoEnrollStatusResponse"; -import { OrganizationKeysResponse } from "../../models/response/organizationKeysResponse"; -import { OrganizationResponse } from "../../models/response/organizationResponse"; -import { OrganizationSubscriptionResponse } from "../../models/response/organizationSubscriptionResponse"; -import { PaymentResponse } from "../../models/response/paymentResponse"; -import { TaxInfoResponse } from "../../models/response/taxInfoResponse"; +import { ImportDirectoryRequest } from "../../models/request/import-directory.request"; +import { OrganizationApiKeyRequest } from "../../models/request/organization-api-key.request"; +import { OrganizationCreateRequest } from "../../models/request/organization-create.request"; +import { OrganizationKeysRequest } from "../../models/request/organization-keys.request"; +import { OrganizationSubscriptionUpdateRequest } from "../../models/request/organization-subscription-update.request"; +import { OrganizationTaxInfoUpdateRequest } from "../../models/request/organization-tax-info-update.request"; +import { OrganizationUpdateRequest } from "../../models/request/organization-update.request"; +import { OrganizationUpgradeRequest } from "../../models/request/organization-upgrade.request"; +import { OrganizationSsoRequest } from "../../models/request/organization/organization-sso.request"; +import { PaymentRequest } from "../../models/request/payment.request"; +import { SeatRequest } from "../../models/request/seat.request"; +import { SecretVerificationRequest } from "../../models/request/secret-verification.request"; +import { StorageRequest } from "../../models/request/storage.request"; +import { VerifyBankRequest } from "../../models/request/verify-bank.request"; +import { ApiKeyResponse } from "../../models/response/api-key.response"; +import { BillingResponse } from "../../models/response/billing.response"; +import { ListResponse } from "../../models/response/list.response"; +import { OrganizationApiKeyInformationResponse } from "../../models/response/organization-api-key-information.response"; +import { OrganizationAutoEnrollStatusResponse } from "../../models/response/organization-auto-enroll-status.response"; +import { OrganizationKeysResponse } from "../../models/response/organization-keys.response"; +import { OrganizationSubscriptionResponse } from "../../models/response/organization-subscription.response"; +import { OrganizationResponse } from "../../models/response/organization.response"; +import { OrganizationSsoResponse } from "../../models/response/organization/organization-sso.response"; +import { PaymentResponse } from "../../models/response/payment.response"; +import { TaxInfoResponse } from "../../models/response/tax-info.response"; export class OrganizationApiServiceAbstraction { get: (id: string) => 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 e5a33e8edd..91419cc4b2 100644 --- a/libs/common/src/abstractions/policy/policy-api.service.abstraction.ts +++ b/libs/common/src/abstractions/policy/policy-api.service.abstraction.ts @@ -1,8 +1,8 @@ import { PolicyType } from "../../enums/policyType"; 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"; +import { PolicyRequest } from "../../models/request/policy.request"; +import { ListResponse } from "../../models/response/list.response"; +import { PolicyResponse } from "../../models/response/policy.response"; export class PolicyApiServiceAbstraction { getPolicy: (organizationId: string, type: PolicyType) => Promise; diff --git a/libs/common/src/abstractions/policy/policy.service.abstraction.ts b/libs/common/src/abstractions/policy/policy.service.abstraction.ts index ccbde51238..90469a69bf 100644 --- a/libs/common/src/abstractions/policy/policy.service.abstraction.ts +++ b/libs/common/src/abstractions/policy/policy.service.abstraction.ts @@ -5,8 +5,8 @@ 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/reset-password-policy-options"; -import { ListResponse } from "../../models/response/listResponse"; -import { PolicyResponse } from "../../models/response/policyResponse"; +import { ListResponse } from "../../models/response/list.response"; +import { PolicyResponse } from "../../models/response/policy.response"; export abstract class PolicyService { policies$: Observable; diff --git a/libs/common/src/abstractions/sync/sync.service.abstraction.ts b/libs/common/src/abstractions/sync/sync.service.abstraction.ts index 90123f9876..20ca01876c 100644 --- a/libs/common/src/abstractions/sync/sync.service.abstraction.ts +++ b/libs/common/src/abstractions/sync/sync.service.abstraction.ts @@ -2,7 +2,7 @@ import { SyncCipherNotification, SyncFolderNotification, SyncSendNotification, -} from "../../models/response/notificationResponse"; +} from "../../models/response/notification.response"; export abstract class SyncService { syncInProgress: boolean; diff --git a/libs/common/src/abstractions/token.service.ts b/libs/common/src/abstractions/token.service.ts index ab60760e73..6bfc8a46ce 100644 --- a/libs/common/src/abstractions/token.service.ts +++ b/libs/common/src/abstractions/token.service.ts @@ -1,4 +1,4 @@ -import { IdentityTokenResponse } from "../models/response/identityTokenResponse"; +import { IdentityTokenResponse } from "../models/response/identity-token.response"; export abstract class TokenService { setTokens: ( diff --git a/libs/common/src/abstractions/twoFactor.service.ts b/libs/common/src/abstractions/twoFactor.service.ts index 74f091678b..25c0955770 100644 --- a/libs/common/src/abstractions/twoFactor.service.ts +++ b/libs/common/src/abstractions/twoFactor.service.ts @@ -1,5 +1,5 @@ import { TwoFactorProviderType } from "../enums/twoFactorProviderType"; -import { IdentityTwoFactorResponse } from "../models/response/identityTwoFactorResponse"; +import { IdentityTwoFactorResponse } from "../models/response/identity-two-factor.response"; export interface TwoFactorProviderDetails { type: TwoFactorProviderType; diff --git a/libs/common/src/abstractions/userVerification/userVerification-api.service.abstraction.ts b/libs/common/src/abstractions/userVerification/userVerification-api.service.abstraction.ts index 8e82ed8faa..bb77034e46 100644 --- a/libs/common/src/abstractions/userVerification/userVerification-api.service.abstraction.ts +++ b/libs/common/src/abstractions/userVerification/userVerification-api.service.abstraction.ts @@ -1,4 +1,4 @@ -import { VerifyOTPRequest } from "../../models/request/account/verifyOTPRequest"; +import { VerifyOTPRequest } from "../../models/request/account/verify-otp.request"; export abstract class UserVerificationApiServiceAbstraction { postAccountVerifyOTP: (request: VerifyOTPRequest) => Promise; diff --git a/libs/common/src/abstractions/userVerification/userVerification.service.abstraction.ts b/libs/common/src/abstractions/userVerification/userVerification.service.abstraction.ts index 3d53063e45..3327ae8480 100644 --- a/libs/common/src/abstractions/userVerification/userVerification.service.abstraction.ts +++ b/libs/common/src/abstractions/userVerification/userVerification.service.abstraction.ts @@ -1,4 +1,4 @@ -import { SecretVerificationRequest } from "../../models/request/secretVerificationRequest"; +import { SecretVerificationRequest } from "../../models/request/secret-verification.request"; import { Verification } from "../../types/verification"; export abstract class UserVerificationService { diff --git a/libs/common/src/misc/logInStrategies/apiLogin.strategy.ts b/libs/common/src/misc/logInStrategies/apiLogin.strategy.ts index 2ca090930c..a60735343a 100644 --- a/libs/common/src/misc/logInStrategies/apiLogin.strategy.ts +++ b/libs/common/src/misc/logInStrategies/apiLogin.strategy.ts @@ -10,8 +10,8 @@ import { StateService } from "../../abstractions/state.service"; import { TokenService } from "../../abstractions/token.service"; import { TwoFactorService } from "../../abstractions/twoFactor.service"; import { ApiLogInCredentials } from "../../models/domain/log-in-credentials"; -import { ApiTokenRequest } from "../../models/request/identityToken/apiTokenRequest"; -import { IdentityTokenResponse } from "../../models/response/identityTokenResponse"; +import { ApiTokenRequest } from "../../models/request/identity-token/api-token.request"; +import { IdentityTokenResponse } from "../../models/response/identity-token.response"; import { LogInStrategy } from "./logIn.strategy"; diff --git a/libs/common/src/misc/logInStrategies/logIn.strategy.ts b/libs/common/src/misc/logInStrategies/logIn.strategy.ts index 8c199be0de..34f3115f65 100644 --- a/libs/common/src/misc/logInStrategies/logIn.strategy.ts +++ b/libs/common/src/misc/logInStrategies/logIn.strategy.ts @@ -16,15 +16,15 @@ import { SsoLogInCredentials, PasswordlessLogInCredentials, } 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"; -import { SsoTokenRequest } from "../../models/request/identityToken/ssoTokenRequest"; -import { TokenRequestTwoFactor } from "../../models/request/identityToken/tokenRequestTwoFactor"; -import { KeysRequest } from "../../models/request/keysRequest"; -import { IdentityCaptchaResponse } from "../../models/response/identityCaptchaResponse"; -import { IdentityTokenResponse } from "../../models/response/identityTokenResponse"; -import { IdentityTwoFactorResponse } from "../../models/response/identityTwoFactorResponse"; +import { DeviceRequest } from "../../models/request/device.request"; +import { ApiTokenRequest } from "../../models/request/identity-token/api-token.request"; +import { PasswordTokenRequest } from "../../models/request/identity-token/password-token.request"; +import { SsoTokenRequest } from "../../models/request/identity-token/sso-token.request"; +import { TokenTwoFactorRequest } from "../../models/request/identity-token/token-two-factor.request"; +import { KeysRequest } from "../../models/request/keys.request"; +import { IdentityCaptchaResponse } from "../../models/response/identity-captcha.response"; +import { IdentityTokenResponse } from "../../models/response/identity-token.response"; +import { IdentityTwoFactorResponse } from "../../models/response/identity-two-factor.response"; export abstract class LogInStrategy { protected abstract tokenRequest: ApiTokenRequest | PasswordTokenRequest | SsoTokenRequest; @@ -51,7 +51,7 @@ export abstract class LogInStrategy { ): Promise; async logInTwoFactor( - twoFactor: TokenRequestTwoFactor, + twoFactor: TokenTwoFactorRequest, captchaResponse: string = null ): Promise { this.tokenRequest.setTwoFactor(twoFactor); @@ -84,17 +84,17 @@ export abstract class LogInStrategy { return new DeviceRequest(appId, this.platformUtilsService); } - protected async buildTwoFactor(userProvidedTwoFactor?: TokenRequestTwoFactor) { + protected async buildTwoFactor(userProvidedTwoFactor?: TokenTwoFactorRequest) { if (userProvidedTwoFactor != null) { return userProvidedTwoFactor; } const storedTwoFactorToken = await this.tokenService.getTwoFactorToken(); if (storedTwoFactorToken != null) { - return new TokenRequestTwoFactor(TwoFactorProviderType.Remember, storedTwoFactorToken, false); + return new TokenTwoFactorRequest(TwoFactorProviderType.Remember, storedTwoFactorToken, false); } - return new TokenRequestTwoFactor(); + return new TokenTwoFactorRequest(); } protected async saveAccountInformation(tokenResponse: IdentityTokenResponse) { diff --git a/libs/common/src/misc/logInStrategies/passwordLogin.strategy.ts b/libs/common/src/misc/logInStrategies/passwordLogin.strategy.ts index d2ed8bd869..2f2a3fdc94 100644 --- a/libs/common/src/misc/logInStrategies/passwordLogin.strategy.ts +++ b/libs/common/src/misc/logInStrategies/passwordLogin.strategy.ts @@ -12,8 +12,8 @@ import { HashPurpose } from "../../enums/hashPurpose"; 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"; +import { PasswordTokenRequest } from "../../models/request/identity-token/password-token.request"; +import { TokenTwoFactorRequest } from "../../models/request/identity-token/token-two-factor.request"; import { LogInStrategy } from "./logIn.strategy"; @@ -62,7 +62,7 @@ export class PasswordLogInStrategy extends LogInStrategy { } async logInTwoFactor( - twoFactor: TokenRequestTwoFactor, + twoFactor: TokenTwoFactorRequest, captchaResponse: string ): Promise { this.tokenRequest.captchaResponse = captchaResponse ?? this.captchaBypassToken; diff --git a/libs/common/src/misc/logInStrategies/passwordlessLogin.strategy.ts b/libs/common/src/misc/logInStrategies/passwordlessLogin.strategy.ts index 41fcbc292a..1ff4d92b03 100644 --- a/libs/common/src/misc/logInStrategies/passwordlessLogin.strategy.ts +++ b/libs/common/src/misc/logInStrategies/passwordlessLogin.strategy.ts @@ -11,8 +11,8 @@ import { TwoFactorService } from "../../abstractions/twoFactor.service"; 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"; +import { PasswordTokenRequest } from "../../models/request/identity-token/password-token.request"; +import { TokenTwoFactorRequest } from "../../models/request/identity-token/token-two-factor.request"; import { LogInStrategy } from "./logIn.strategy"; @@ -61,7 +61,7 @@ export class PasswordlessLogInStrategy extends LogInStrategy { } async logInTwoFactor( - twoFactor: TokenRequestTwoFactor, + twoFactor: TokenTwoFactorRequest, captchaResponse: string ): Promise { this.tokenRequest.captchaResponse = captchaResponse ?? this.captchaBypassToken; diff --git a/libs/common/src/misc/logInStrategies/ssoLogin.strategy.ts b/libs/common/src/misc/logInStrategies/ssoLogin.strategy.ts index 48be06a0d9..6a83b3218d 100644 --- a/libs/common/src/misc/logInStrategies/ssoLogin.strategy.ts +++ b/libs/common/src/misc/logInStrategies/ssoLogin.strategy.ts @@ -9,8 +9,8 @@ import { StateService } from "../../abstractions/state.service"; import { TokenService } from "../../abstractions/token.service"; import { TwoFactorService } from "../../abstractions/twoFactor.service"; import { SsoLogInCredentials } from "../../models/domain/log-in-credentials"; -import { SsoTokenRequest } from "../../models/request/identityToken/ssoTokenRequest"; -import { IdentityTokenResponse } from "../../models/response/identityTokenResponse"; +import { SsoTokenRequest } from "../../models/request/identity-token/sso-token.request"; +import { IdentityTokenResponse } from "../../models/response/identity-token.response"; import { LogInStrategy } from "./logIn.strategy"; diff --git a/libs/common/src/models/api/billing-sync-config.api.ts b/libs/common/src/models/api/billing-sync-config.api.ts index 78af5bd342..8850dc8c51 100644 --- a/libs/common/src/models/api/billing-sync-config.api.ts +++ b/libs/common/src/models/api/billing-sync-config.api.ts @@ -1,4 +1,4 @@ -import { BaseResponse } from "../response/baseResponse"; +import { BaseResponse } from "../response/base.response"; export class BillingSyncConfigApi extends BaseResponse { billingSyncKey: string; diff --git a/libs/common/src/models/api/card.api.ts b/libs/common/src/models/api/card.api.ts index 8d972624d4..d687357f75 100644 --- a/libs/common/src/models/api/card.api.ts +++ b/libs/common/src/models/api/card.api.ts @@ -1,4 +1,4 @@ -import { BaseResponse } from "../response/baseResponse"; +import { BaseResponse } from "../response/base.response"; export class CardApi extends BaseResponse { cardholderName: string; diff --git a/libs/common/src/models/api/field.api.ts b/libs/common/src/models/api/field.api.ts index cabdb7cca1..952ce51416 100644 --- a/libs/common/src/models/api/field.api.ts +++ b/libs/common/src/models/api/field.api.ts @@ -1,6 +1,6 @@ import { FieldType } from "../../enums/fieldType"; import { LinkedIdType } from "../../enums/linkedIdType"; -import { BaseResponse } from "../response/baseResponse"; +import { BaseResponse } from "../response/base.response"; export class FieldApi extends BaseResponse { name: string; diff --git a/libs/common/src/models/api/identity.api.ts b/libs/common/src/models/api/identity.api.ts index 9312438f76..3fb61b2b3c 100644 --- a/libs/common/src/models/api/identity.api.ts +++ b/libs/common/src/models/api/identity.api.ts @@ -1,4 +1,4 @@ -import { BaseResponse } from "../response/baseResponse"; +import { BaseResponse } from "../response/base.response"; export class IdentityApi extends BaseResponse { title: string; diff --git a/libs/common/src/models/api/login-uri.api.ts b/libs/common/src/models/api/login-uri.api.ts index 50ffb0dabb..ea84f165be 100644 --- a/libs/common/src/models/api/login-uri.api.ts +++ b/libs/common/src/models/api/login-uri.api.ts @@ -1,5 +1,5 @@ import { UriMatchType } from "../../enums/uriMatchType"; -import { BaseResponse } from "../response/baseResponse"; +import { BaseResponse } from "../response/base.response"; export class LoginUriApi extends BaseResponse { uri: string; diff --git a/libs/common/src/models/api/login.api.ts b/libs/common/src/models/api/login.api.ts index 5278e5bd98..82e28dd0a3 100644 --- a/libs/common/src/models/api/login.api.ts +++ b/libs/common/src/models/api/login.api.ts @@ -1,4 +1,4 @@ -import { BaseResponse } from "../response/baseResponse"; +import { BaseResponse } from "../response/base.response"; import { LoginUriApi } from "./login-uri.api"; diff --git a/libs/common/src/models/api/permissions.api.ts b/libs/common/src/models/api/permissions.api.ts index c35cb69cb5..d25fa00a9d 100644 --- a/libs/common/src/models/api/permissions.api.ts +++ b/libs/common/src/models/api/permissions.api.ts @@ -1,4 +1,4 @@ -import { BaseResponse } from "../response/baseResponse"; +import { BaseResponse } from "../response/base.response"; export class PermissionsApi extends BaseResponse { accessEventLogs: boolean; diff --git a/libs/common/src/models/api/scim-config.api.ts b/libs/common/src/models/api/scim-config.api.ts index d93798f12b..68e7f76cd4 100644 --- a/libs/common/src/models/api/scim-config.api.ts +++ b/libs/common/src/models/api/scim-config.api.ts @@ -1,5 +1,5 @@ import { ScimProviderType } from "../../enums/scimProviderType"; -import { BaseResponse } from "../response/baseResponse"; +import { BaseResponse } from "../response/base.response"; export class ScimConfigApi extends BaseResponse { enabled: boolean; diff --git a/libs/common/src/models/api/secure-note.api.ts b/libs/common/src/models/api/secure-note.api.ts index 80f18c6108..3f48f709b3 100644 --- a/libs/common/src/models/api/secure-note.api.ts +++ b/libs/common/src/models/api/secure-note.api.ts @@ -1,5 +1,5 @@ import { SecureNoteType } from "../../enums/secureNoteType"; -import { BaseResponse } from "../response/baseResponse"; +import { BaseResponse } from "../response/base.response"; export class SecureNoteApi extends BaseResponse { type: SecureNoteType; diff --git a/libs/common/src/models/api/send-file.api.ts b/libs/common/src/models/api/send-file.api.ts index 99fa0ff5d1..79317c8ecb 100644 --- a/libs/common/src/models/api/send-file.api.ts +++ b/libs/common/src/models/api/send-file.api.ts @@ -1,4 +1,4 @@ -import { BaseResponse } from "../response/baseResponse"; +import { BaseResponse } from "../response/base.response"; export class SendFileApi extends BaseResponse { id: string; diff --git a/libs/common/src/models/api/send-text.api.ts b/libs/common/src/models/api/send-text.api.ts index 56d2145069..9222861979 100644 --- a/libs/common/src/models/api/send-text.api.ts +++ b/libs/common/src/models/api/send-text.api.ts @@ -1,4 +1,4 @@ -import { BaseResponse } from "../response/baseResponse"; +import { BaseResponse } from "../response/base.response"; export class SendTextApi extends BaseResponse { text: string; diff --git a/libs/common/src/models/api/sso-config.api.ts b/libs/common/src/models/api/sso-config.api.ts index 4ead9f3944..cc8a5b1336 100644 --- a/libs/common/src/models/api/sso-config.api.ts +++ b/libs/common/src/models/api/sso-config.api.ts @@ -5,7 +5,7 @@ import { Saml2SigningBehavior, SsoType, } from "../../enums/ssoEnums"; -import { BaseResponse } from "../response/baseResponse"; +import { BaseResponse } from "../response/base.response"; import { SsoConfigView } from "../view/sso-config.view"; export class SsoConfigApi extends BaseResponse { diff --git a/libs/common/src/models/data/attachment.data.ts b/libs/common/src/models/data/attachment.data.ts index 50af03acda..a0bcad84df 100644 --- a/libs/common/src/models/data/attachment.data.ts +++ b/libs/common/src/models/data/attachment.data.ts @@ -1,4 +1,4 @@ -import { AttachmentResponse } from "../response/attachmentResponse"; +import { AttachmentResponse } from "../response/attachment.response"; export class AttachmentData { id: string; diff --git a/libs/common/src/models/data/cipher.data.ts b/libs/common/src/models/data/cipher.data.ts index c03d83476d..4cc57559c2 100644 --- a/libs/common/src/models/data/cipher.data.ts +++ b/libs/common/src/models/data/cipher.data.ts @@ -1,6 +1,6 @@ import { CipherRepromptType } from "../../enums/cipherRepromptType"; import { CipherType } from "../../enums/cipherType"; -import { CipherResponse } from "../response/cipherResponse"; +import { CipherResponse } from "../response/cipher.response"; import { AttachmentData } from "./attachment.data"; import { CardData } from "./card.data"; diff --git a/libs/common/src/models/data/collection.data.ts b/libs/common/src/models/data/collection.data.ts index 9e2607edc6..09513ca462 100644 --- a/libs/common/src/models/data/collection.data.ts +++ b/libs/common/src/models/data/collection.data.ts @@ -1,4 +1,4 @@ -import { CollectionDetailsResponse } from "../response/collectionResponse"; +import { CollectionDetailsResponse } from "../response/collection.response"; export class CollectionData { id: string; diff --git a/libs/common/src/models/data/folder.data.ts b/libs/common/src/models/data/folder.data.ts index 76f1e5d724..1ac444db13 100644 --- a/libs/common/src/models/data/folder.data.ts +++ b/libs/common/src/models/data/folder.data.ts @@ -1,4 +1,4 @@ -import { FolderResponse } from "../response/folderResponse"; +import { FolderResponse } from "../response/folder.response"; export class FolderData { id: string; diff --git a/libs/common/src/models/data/organization.data.ts b/libs/common/src/models/data/organization.data.ts index 737bc0e8b6..98ed39ef34 100644 --- a/libs/common/src/models/data/organization.data.ts +++ b/libs/common/src/models/data/organization.data.ts @@ -2,7 +2,7 @@ import { OrganizationUserStatusType } from "../../enums/organizationUserStatusTy import { OrganizationUserType } from "../../enums/organizationUserType"; import { ProductType } from "../../enums/productType"; import { PermissionsApi } from "../api/permissions.api"; -import { ProfileOrganizationResponse } from "../response/profileOrganizationResponse"; +import { ProfileOrganizationResponse } from "../response/profile-organization.response"; export class OrganizationData { id: string; diff --git a/libs/common/src/models/data/password-history.data.ts b/libs/common/src/models/data/password-history.data.ts index 72436f3d13..5b8ea076b2 100644 --- a/libs/common/src/models/data/password-history.data.ts +++ b/libs/common/src/models/data/password-history.data.ts @@ -1,4 +1,4 @@ -import { PasswordHistoryResponse } from "../response/passwordHistoryResponse"; +import { PasswordHistoryResponse } from "../response/password-history.response"; export class PasswordHistoryData { password: string; diff --git a/libs/common/src/models/data/policy.data.ts b/libs/common/src/models/data/policy.data.ts index c93b404028..2ede4d80bf 100644 --- a/libs/common/src/models/data/policy.data.ts +++ b/libs/common/src/models/data/policy.data.ts @@ -1,5 +1,5 @@ import { PolicyType } from "../../enums/policyType"; -import { PolicyResponse } from "../response/policyResponse"; +import { PolicyResponse } from "../response/policy.response"; export class PolicyData { id: string; diff --git a/libs/common/src/models/data/provider.data.ts b/libs/common/src/models/data/provider.data.ts index 5d141ed1a2..690e91d9dd 100644 --- a/libs/common/src/models/data/provider.data.ts +++ b/libs/common/src/models/data/provider.data.ts @@ -1,6 +1,6 @@ import { ProviderUserStatusType } from "../../enums/providerUserStatusType"; import { ProviderUserType } from "../../enums/providerUserType"; -import { ProfileProviderResponse } from "../response/profileProviderResponse"; +import { ProfileProviderResponse } from "../response/profile-provider.response"; export class ProviderData { id: string; diff --git a/libs/common/src/models/data/send.data.ts b/libs/common/src/models/data/send.data.ts index 752a1dcf9a..ca783d33cb 100644 --- a/libs/common/src/models/data/send.data.ts +++ b/libs/common/src/models/data/send.data.ts @@ -1,5 +1,5 @@ import { SendType } from "../../enums/sendType"; -import { SendResponse } from "../response/sendResponse"; +import { SendResponse } from "../response/send.response"; import { SendFileData } from "./send-file.data"; import { SendTextData } from "./send-text.data"; diff --git a/libs/common/src/models/data/server-config.data.ts b/libs/common/src/models/data/server-config.data.ts index 30043a0b02..34ed4f190b 100644 --- a/libs/common/src/models/data/server-config.data.ts +++ b/libs/common/src/models/data/server-config.data.ts @@ -4,7 +4,7 @@ import { ServerConfigResponse, ThirdPartyServerConfigResponse, EnvironmentServerConfigResponse, -} from "../response/server-config-response"; +} from "../response/server-config.response"; export class ServerConfigData { version: string; diff --git a/libs/common/src/models/domain/log-in-credentials.ts b/libs/common/src/models/domain/log-in-credentials.ts index 0f1873e740..46f2fe5f82 100644 --- a/libs/common/src/models/domain/log-in-credentials.ts +++ b/libs/common/src/models/domain/log-in-credentials.ts @@ -1,5 +1,5 @@ import { AuthenticationType } from "../../enums/authenticationType"; -import { TokenRequestTwoFactor } from "../request/identityToken/tokenRequestTwoFactor"; +import { TokenTwoFactorRequest } from "../request/identity-token/token-two-factor.request"; import { SymmetricCryptoKey } from "./symmetric-crypto-key"; @@ -10,7 +10,7 @@ export class PasswordLogInCredentials { public email: string, public masterPassword: string, public captchaToken?: string, - public twoFactor?: TokenRequestTwoFactor + public twoFactor?: TokenTwoFactorRequest ) {} } @@ -22,7 +22,7 @@ export class SsoLogInCredentials { public codeVerifier: string, public redirectUrl: string, public orgId: string, - public twoFactor?: TokenRequestTwoFactor + public twoFactor?: TokenTwoFactorRequest ) {} } @@ -41,6 +41,6 @@ export class PasswordlessLogInCredentials { public authRequestId: string, public decKey: SymmetricCryptoKey, public localPasswordHash: string, - public twoFactor?: TokenRequestTwoFactor + public twoFactor?: TokenTwoFactorRequest ) {} } diff --git a/libs/common/src/models/domain/send-access.ts b/libs/common/src/models/domain/send-access.ts index 9ecc0ee958..f2847b3b47 100644 --- a/libs/common/src/models/domain/send-access.ts +++ b/libs/common/src/models/domain/send-access.ts @@ -1,5 +1,5 @@ import { SendType } from "../../enums/sendType"; -import { SendAccessResponse } from "../response/sendAccessResponse"; +import { SendAccessResponse } from "../response/send-access.response"; import { SendAccessView } from "../view/send-access.view"; import Domain from "./domain-base"; diff --git a/libs/common/src/models/request/account/setKeyConnectorKeyRequest.ts b/libs/common/src/models/request/account/set-key-connector-key.request.ts similarity index 90% rename from libs/common/src/models/request/account/setKeyConnectorKeyRequest.ts rename to libs/common/src/models/request/account/set-key-connector-key.request.ts index a84cc7efd8..c01f769762 100644 --- a/libs/common/src/models/request/account/setKeyConnectorKeyRequest.ts +++ b/libs/common/src/models/request/account/set-key-connector-key.request.ts @@ -1,5 +1,5 @@ import { KdfType } from "../../../enums/kdfType"; -import { KeysRequest } from "../keysRequest"; +import { KeysRequest } from "../keys.request"; export class SetKeyConnectorKeyRequest { key: string; diff --git a/libs/common/src/models/request/account/verifyOTPRequest.ts b/libs/common/src/models/request/account/verify-otp.request.ts similarity index 100% rename from libs/common/src/models/request/account/verifyOTPRequest.ts rename to libs/common/src/models/request/account/verify-otp.request.ts diff --git a/libs/common/src/models/request/attachmentRequest.ts b/libs/common/src/models/request/attachment.request.ts similarity index 100% rename from libs/common/src/models/request/attachmentRequest.ts rename to libs/common/src/models/request/attachment.request.ts diff --git a/libs/common/src/models/request/billingSyncConfigRequest.ts b/libs/common/src/models/request/billing-sync-config.request.ts similarity index 100% rename from libs/common/src/models/request/billingSyncConfigRequest.ts rename to libs/common/src/models/request/billing-sync-config.request.ts diff --git a/libs/common/src/models/request/bitPayInvoiceRequest.ts b/libs/common/src/models/request/bit-pay-invoice.request.ts similarity index 100% rename from libs/common/src/models/request/bitPayInvoiceRequest.ts rename to libs/common/src/models/request/bit-pay-invoice.request.ts diff --git a/libs/common/src/models/request/captchaProtectedRequest.ts b/libs/common/src/models/request/captcha-protected.request.ts similarity index 100% rename from libs/common/src/models/request/captchaProtectedRequest.ts rename to libs/common/src/models/request/captcha-protected.request.ts diff --git a/libs/common/src/models/request/cipherBulkDeleteRequest.ts b/libs/common/src/models/request/cipher-bulk-delete.request.ts similarity index 100% rename from libs/common/src/models/request/cipherBulkDeleteRequest.ts rename to libs/common/src/models/request/cipher-bulk-delete.request.ts diff --git a/libs/common/src/models/request/cipherBulkMoveRequest.ts b/libs/common/src/models/request/cipher-bulk-move.request.ts similarity index 100% rename from libs/common/src/models/request/cipherBulkMoveRequest.ts rename to libs/common/src/models/request/cipher-bulk-move.request.ts diff --git a/libs/common/src/models/request/cipherBulkRestoreRequest.ts b/libs/common/src/models/request/cipher-bulk-restore.request.ts similarity index 100% rename from libs/common/src/models/request/cipherBulkRestoreRequest.ts rename to libs/common/src/models/request/cipher-bulk-restore.request.ts diff --git a/libs/common/src/models/request/cipherBulkShareRequest.ts b/libs/common/src/models/request/cipher-bulk-share.request.ts similarity index 86% rename from libs/common/src/models/request/cipherBulkShareRequest.ts rename to libs/common/src/models/request/cipher-bulk-share.request.ts index 6e77ad56de..33a7370b4d 100644 --- a/libs/common/src/models/request/cipherBulkShareRequest.ts +++ b/libs/common/src/models/request/cipher-bulk-share.request.ts @@ -1,6 +1,6 @@ import { Cipher } from "../domain/cipher"; -import { CipherWithIdRequest } from "./cipherWithIdRequest"; +import { CipherWithIdRequest } from "./cipher-with-id.request"; export class CipherBulkShareRequest { ciphers: CipherWithIdRequest[]; diff --git a/libs/common/src/models/request/cipherCollectionsRequest.ts b/libs/common/src/models/request/cipher-collections.request.ts similarity index 100% rename from libs/common/src/models/request/cipherCollectionsRequest.ts rename to libs/common/src/models/request/cipher-collections.request.ts diff --git a/libs/common/src/models/request/cipherCreateRequest.ts b/libs/common/src/models/request/cipher-create.request.ts similarity index 84% rename from libs/common/src/models/request/cipherCreateRequest.ts rename to libs/common/src/models/request/cipher-create.request.ts index d7ff5128d4..9c3be5544b 100644 --- a/libs/common/src/models/request/cipherCreateRequest.ts +++ b/libs/common/src/models/request/cipher-create.request.ts @@ -1,6 +1,6 @@ import { Cipher } from "../domain/cipher"; -import { CipherRequest } from "./cipherRequest"; +import { CipherRequest } from "./cipher.request"; export class CipherCreateRequest { cipher: CipherRequest; diff --git a/libs/common/src/models/request/cipherShareRequest.ts b/libs/common/src/models/request/cipher-share.request.ts similarity index 83% rename from libs/common/src/models/request/cipherShareRequest.ts rename to libs/common/src/models/request/cipher-share.request.ts index 4cf6dfde1e..4043599ce0 100644 --- a/libs/common/src/models/request/cipherShareRequest.ts +++ b/libs/common/src/models/request/cipher-share.request.ts @@ -1,6 +1,6 @@ import { Cipher } from "../domain/cipher"; -import { CipherRequest } from "./cipherRequest"; +import { CipherRequest } from "./cipher.request"; export class CipherShareRequest { cipher: CipherRequest; diff --git a/libs/common/src/models/request/cipherWithIdRequest.ts b/libs/common/src/models/request/cipher-with-id.request.ts similarity index 79% rename from libs/common/src/models/request/cipherWithIdRequest.ts rename to libs/common/src/models/request/cipher-with-id.request.ts index 0f22322f8c..f291e34264 100644 --- a/libs/common/src/models/request/cipherWithIdRequest.ts +++ b/libs/common/src/models/request/cipher-with-id.request.ts @@ -1,6 +1,6 @@ import { Cipher } from "../domain/cipher"; -import { CipherRequest } from "./cipherRequest"; +import { CipherRequest } from "./cipher.request"; export class CipherWithIdRequest extends CipherRequest { id: string; diff --git a/libs/common/src/models/request/cipherRequest.ts b/libs/common/src/models/request/cipher.request.ts similarity index 98% rename from libs/common/src/models/request/cipherRequest.ts rename to libs/common/src/models/request/cipher.request.ts index 046c302c5d..b7717d9729 100644 --- a/libs/common/src/models/request/cipherRequest.ts +++ b/libs/common/src/models/request/cipher.request.ts @@ -8,8 +8,8 @@ import { LoginApi } from "../api/login.api"; import { SecureNoteApi } from "../api/secure-note.api"; import { Cipher } from "../domain/cipher"; -import { AttachmentRequest } from "./attachmentRequest"; -import { PasswordHistoryRequest } from "./passwordHistoryRequest"; +import { AttachmentRequest } from "./attachment.request"; +import { PasswordHistoryRequest } from "./password-history.request"; export class CipherRequest { type: CipherType; diff --git a/libs/common/src/models/request/collectionRequest.ts b/libs/common/src/models/request/collection.request.ts similarity index 83% rename from libs/common/src/models/request/collectionRequest.ts rename to libs/common/src/models/request/collection.request.ts index c2176095f9..6f752bfb5d 100644 --- a/libs/common/src/models/request/collectionRequest.ts +++ b/libs/common/src/models/request/collection.request.ts @@ -1,6 +1,6 @@ import { Collection } from "../domain/collection"; -import { SelectionReadOnlyRequest } from "./selectionReadOnlyRequest"; +import { SelectionReadOnlyRequest } from "./selection-read-only.request"; export class CollectionRequest { name: string; diff --git a/libs/common/src/models/request/deleteRecoverRequest.ts b/libs/common/src/models/request/delete-recover.request.ts similarity index 100% rename from libs/common/src/models/request/deleteRecoverRequest.ts rename to libs/common/src/models/request/delete-recover.request.ts diff --git a/libs/common/src/models/request/deviceTokenRequest.ts b/libs/common/src/models/request/device-token.request.ts similarity index 100% rename from libs/common/src/models/request/deviceTokenRequest.ts rename to libs/common/src/models/request/device-token.request.ts diff --git a/libs/common/src/models/request/deviceVerificationRequest.ts b/libs/common/src/models/request/device-verification.request.ts similarity index 100% rename from libs/common/src/models/request/deviceVerificationRequest.ts rename to libs/common/src/models/request/device-verification.request.ts diff --git a/libs/common/src/models/request/deviceRequest.ts b/libs/common/src/models/request/device.request.ts similarity index 100% rename from libs/common/src/models/request/deviceRequest.ts rename to libs/common/src/models/request/device.request.ts diff --git a/libs/common/src/models/request/emailTokenRequest.ts b/libs/common/src/models/request/email-token.request.ts similarity index 61% rename from libs/common/src/models/request/emailTokenRequest.ts rename to libs/common/src/models/request/email-token.request.ts index 7e0515ca19..04d50dda7f 100644 --- a/libs/common/src/models/request/emailTokenRequest.ts +++ b/libs/common/src/models/request/email-token.request.ts @@ -1,4 +1,4 @@ -import { SecretVerificationRequest } from "./secretVerificationRequest"; +import { SecretVerificationRequest } from "./secret-verification.request"; export class EmailTokenRequest extends SecretVerificationRequest { newEmail: string; diff --git a/libs/common/src/models/request/emailRequest.ts b/libs/common/src/models/request/email.request.ts similarity index 67% rename from libs/common/src/models/request/emailRequest.ts rename to libs/common/src/models/request/email.request.ts index 0b55961596..8b7b842721 100644 --- a/libs/common/src/models/request/emailRequest.ts +++ b/libs/common/src/models/request/email.request.ts @@ -1,4 +1,4 @@ -import { EmailTokenRequest } from "./emailTokenRequest"; +import { EmailTokenRequest } from "./email-token.request"; export class EmailRequest extends EmailTokenRequest { newMasterPasswordHash: string; diff --git a/libs/common/src/models/request/emergencyAccessAcceptRequest.ts b/libs/common/src/models/request/emergency-access-accept.request.ts similarity index 100% rename from libs/common/src/models/request/emergencyAccessAcceptRequest.ts rename to libs/common/src/models/request/emergency-access-accept.request.ts diff --git a/libs/common/src/models/request/emergencyAccessConfirmRequest.ts b/libs/common/src/models/request/emergency-access-confirm.request.ts similarity index 100% rename from libs/common/src/models/request/emergencyAccessConfirmRequest.ts rename to libs/common/src/models/request/emergency-access-confirm.request.ts diff --git a/libs/common/src/models/request/emergencyAccessInviteRequest.ts b/libs/common/src/models/request/emergency-access-invite.request.ts similarity index 100% rename from libs/common/src/models/request/emergencyAccessInviteRequest.ts rename to libs/common/src/models/request/emergency-access-invite.request.ts diff --git a/libs/common/src/models/request/emergencyAccessPasswordRequest.ts b/libs/common/src/models/request/emergency-access-password.request.ts similarity index 100% rename from libs/common/src/models/request/emergencyAccessPasswordRequest.ts rename to libs/common/src/models/request/emergency-access-password.request.ts diff --git a/libs/common/src/models/request/emergencyAccessUpdateRequest.ts b/libs/common/src/models/request/emergency-access-update.request.ts similarity index 100% rename from libs/common/src/models/request/emergencyAccessUpdateRequest.ts rename to libs/common/src/models/request/emergency-access-update.request.ts diff --git a/libs/common/src/models/request/eventRequest.ts b/libs/common/src/models/request/event.request.ts similarity index 100% rename from libs/common/src/models/request/eventRequest.ts rename to libs/common/src/models/request/event.request.ts diff --git a/libs/common/src/models/request/folderWithIdRequest.ts b/libs/common/src/models/request/folder-with-id.request.ts similarity index 79% rename from libs/common/src/models/request/folderWithIdRequest.ts rename to libs/common/src/models/request/folder-with-id.request.ts index a36c2b7064..9d8078c12c 100644 --- a/libs/common/src/models/request/folderWithIdRequest.ts +++ b/libs/common/src/models/request/folder-with-id.request.ts @@ -1,6 +1,6 @@ import { Folder } from "../domain/folder"; -import { FolderRequest } from "./folderRequest"; +import { FolderRequest } from "./folder.request"; export class FolderWithIdRequest extends FolderRequest { id: string; diff --git a/libs/common/src/models/request/folderRequest.ts b/libs/common/src/models/request/folder.request.ts similarity index 100% rename from libs/common/src/models/request/folderRequest.ts rename to libs/common/src/models/request/folder.request.ts diff --git a/libs/common/src/models/request/groupRequest.ts b/libs/common/src/models/request/group.request.ts similarity index 65% rename from libs/common/src/models/request/groupRequest.ts rename to libs/common/src/models/request/group.request.ts index c4c349c8e8..f3cb6d85e6 100644 --- a/libs/common/src/models/request/groupRequest.ts +++ b/libs/common/src/models/request/group.request.ts @@ -1,4 +1,4 @@ -import { SelectionReadOnlyRequest } from "./selectionReadOnlyRequest"; +import { SelectionReadOnlyRequest } from "./selection-read-only.request"; export class GroupRequest { name: string; diff --git a/libs/common/src/models/request/iapCheckRequest.ts b/libs/common/src/models/request/iap-check.request.ts similarity index 100% rename from libs/common/src/models/request/iapCheckRequest.ts rename to libs/common/src/models/request/iap-check.request.ts diff --git a/libs/common/src/models/request/identityToken/apiTokenRequest.ts b/libs/common/src/models/request/identity-token/api-token.request.ts similarity index 68% rename from libs/common/src/models/request/identityToken/apiTokenRequest.ts rename to libs/common/src/models/request/identity-token/api-token.request.ts index 247ba1746e..60c8b6d381 100644 --- a/libs/common/src/models/request/identityToken/apiTokenRequest.ts +++ b/libs/common/src/models/request/identity-token/api-token.request.ts @@ -1,13 +1,13 @@ -import { DeviceRequest } from "../deviceRequest"; +import { DeviceRequest } from "../device.request"; -import { TokenRequest } from "./tokenRequest"; -import { TokenRequestTwoFactor } from "./tokenRequestTwoFactor"; +import { TokenTwoFactorRequest } from "./token-two-factor.request"; +import { TokenRequest } from "./token.request"; export class ApiTokenRequest extends TokenRequest { constructor( public clientId: string, public clientSecret: string, - protected twoFactor: TokenRequestTwoFactor, + protected twoFactor: TokenTwoFactorRequest, device?: DeviceRequest ) { super(twoFactor, device); diff --git a/libs/common/src/models/request/identityToken/passwordTokenRequest.ts b/libs/common/src/models/request/identity-token/password-token.request.ts similarity index 74% rename from libs/common/src/models/request/identityToken/passwordTokenRequest.ts rename to libs/common/src/models/request/identity-token/password-token.request.ts index eda100374d..20485eb2bf 100644 --- a/libs/common/src/models/request/identityToken/passwordTokenRequest.ts +++ b/libs/common/src/models/request/identity-token/password-token.request.ts @@ -1,17 +1,17 @@ import { ClientType } from "../../../enums/clientType"; import { Utils } from "../../../misc/utils"; -import { CaptchaProtectedRequest } from "../captchaProtectedRequest"; -import { DeviceRequest } from "../deviceRequest"; +import { CaptchaProtectedRequest } from "../captcha-protected.request"; +import { DeviceRequest } from "../device.request"; -import { TokenRequest } from "./tokenRequest"; -import { TokenRequestTwoFactor } from "./tokenRequestTwoFactor"; +import { TokenTwoFactorRequest } from "./token-two-factor.request"; +import { TokenRequest } from "./token.request"; export class PasswordTokenRequest extends TokenRequest implements CaptchaProtectedRequest { constructor( public email: string, public masterPasswordHash: string, public captchaResponse: string, - protected twoFactor: TokenRequestTwoFactor, + protected twoFactor: TokenTwoFactorRequest, device?: DeviceRequest ) { super(twoFactor, device); diff --git a/libs/common/src/models/request/identityToken/ssoTokenRequest.ts b/libs/common/src/models/request/identity-token/sso-token.request.ts similarity index 69% rename from libs/common/src/models/request/identityToken/ssoTokenRequest.ts rename to libs/common/src/models/request/identity-token/sso-token.request.ts index c7697c2f13..8074e04c3c 100644 --- a/libs/common/src/models/request/identityToken/ssoTokenRequest.ts +++ b/libs/common/src/models/request/identity-token/sso-token.request.ts @@ -1,14 +1,14 @@ -import { DeviceRequest } from "../deviceRequest"; +import { DeviceRequest } from "../device.request"; -import { TokenRequest } from "./tokenRequest"; -import { TokenRequestTwoFactor } from "./tokenRequestTwoFactor"; +import { TokenTwoFactorRequest } from "./token-two-factor.request"; +import { TokenRequest } from "./token.request"; export class SsoTokenRequest extends TokenRequest { constructor( public code: string, public codeVerifier: string, public redirectUri: string, - protected twoFactor: TokenRequestTwoFactor, + protected twoFactor: TokenTwoFactorRequest, device?: DeviceRequest ) { super(twoFactor, device); diff --git a/libs/common/src/models/request/identityToken/tokenRequestTwoFactor.ts b/libs/common/src/models/request/identity-token/token-two-factor.request.ts similarity index 85% rename from libs/common/src/models/request/identityToken/tokenRequestTwoFactor.ts rename to libs/common/src/models/request/identity-token/token-two-factor.request.ts index 9d196ac684..8a7ac2ccc2 100644 --- a/libs/common/src/models/request/identityToken/tokenRequestTwoFactor.ts +++ b/libs/common/src/models/request/identity-token/token-two-factor.request.ts @@ -1,6 +1,6 @@ import { TwoFactorProviderType } from "../../../enums/twoFactorProviderType"; -export class TokenRequestTwoFactor { +export class TokenTwoFactorRequest { constructor( public provider: TwoFactorProviderType = null, public token: string = null, diff --git a/libs/common/src/models/request/identityToken/tokenRequest.ts b/libs/common/src/models/request/identity-token/token.request.ts similarity index 84% rename from libs/common/src/models/request/identityToken/tokenRequest.ts rename to libs/common/src/models/request/identity-token/token.request.ts index 5e38d2069b..91007ce342 100644 --- a/libs/common/src/models/request/identityToken/tokenRequest.ts +++ b/libs/common/src/models/request/identity-token/token.request.ts @@ -1,12 +1,12 @@ -import { DeviceRequest } from "../deviceRequest"; +import { DeviceRequest } from "../device.request"; -import { TokenRequestTwoFactor } from "./tokenRequestTwoFactor"; +import { TokenTwoFactorRequest } from "./token-two-factor.request"; export abstract class TokenRequest { protected device?: DeviceRequest; protected passwordlessAuthRequest: string; - constructor(protected twoFactor: TokenRequestTwoFactor, device?: DeviceRequest) { + constructor(protected twoFactor: TokenTwoFactorRequest, device?: DeviceRequest) { this.device = device != null ? device : null; } @@ -15,7 +15,7 @@ export abstract class TokenRequest { // Implemented in subclass if required } - setTwoFactor(twoFactor: TokenRequestTwoFactor) { + setTwoFactor(twoFactor: TokenTwoFactorRequest) { this.twoFactor = twoFactor; } diff --git a/libs/common/src/models/request/importCiphersRequest.ts b/libs/common/src/models/request/import-ciphers.request.ts similarity index 53% rename from libs/common/src/models/request/importCiphersRequest.ts rename to libs/common/src/models/request/import-ciphers.request.ts index ebaa03a33d..aa94239f23 100644 --- a/libs/common/src/models/request/importCiphersRequest.ts +++ b/libs/common/src/models/request/import-ciphers.request.ts @@ -1,6 +1,6 @@ -import { CipherRequest } from "./cipherRequest"; -import { FolderRequest } from "./folderRequest"; -import { KvpRequest } from "./kvpRequest"; +import { CipherRequest } from "./cipher.request"; +import { FolderRequest } from "./folder.request"; +import { KvpRequest } from "./kvp.request"; export class ImportCiphersRequest { ciphers: CipherRequest[] = []; diff --git a/libs/common/src/models/request/importDirectoryRequestGroup.ts b/libs/common/src/models/request/import-directory-request-group.ts similarity index 100% rename from libs/common/src/models/request/importDirectoryRequestGroup.ts rename to libs/common/src/models/request/import-directory-request-group.ts diff --git a/libs/common/src/models/request/importDirectoryRequestUser.ts b/libs/common/src/models/request/import-directory-request-user.ts similarity index 100% rename from libs/common/src/models/request/importDirectoryRequestUser.ts rename to libs/common/src/models/request/import-directory-request-user.ts diff --git a/libs/common/src/models/request/importDirectoryRequest.ts b/libs/common/src/models/request/import-directory.request.ts similarity index 53% rename from libs/common/src/models/request/importDirectoryRequest.ts rename to libs/common/src/models/request/import-directory.request.ts index a13ce4564f..dd3032de67 100644 --- a/libs/common/src/models/request/importDirectoryRequest.ts +++ b/libs/common/src/models/request/import-directory.request.ts @@ -1,5 +1,5 @@ -import { ImportDirectoryRequestGroup } from "./importDirectoryRequestGroup"; -import { ImportDirectoryRequestUser } from "./importDirectoryRequestUser"; +import { ImportDirectoryRequestGroup } from "./import-directory-request-group"; +import { ImportDirectoryRequestUser } from "./import-directory-request-user"; export class ImportDirectoryRequest { groups: ImportDirectoryRequestGroup[] = []; diff --git a/libs/common/src/models/request/importOrganizationCiphersRequest.ts b/libs/common/src/models/request/import-organization-ciphers.request.ts similarity index 55% rename from libs/common/src/models/request/importOrganizationCiphersRequest.ts rename to libs/common/src/models/request/import-organization-ciphers.request.ts index f2936afbc6..17eda64dab 100644 --- a/libs/common/src/models/request/importOrganizationCiphersRequest.ts +++ b/libs/common/src/models/request/import-organization-ciphers.request.ts @@ -1,6 +1,6 @@ -import { CipherRequest } from "./cipherRequest"; -import { CollectionRequest } from "./collectionRequest"; -import { KvpRequest } from "./kvpRequest"; +import { CipherRequest } from "./cipher.request"; +import { CollectionRequest } from "./collection.request"; +import { KvpRequest } from "./kvp.request"; export class ImportOrganizationCiphersRequest { ciphers: CipherRequest[] = []; diff --git a/libs/common/src/models/request/kdfRequest.ts b/libs/common/src/models/request/kdf.request.ts similarity index 72% rename from libs/common/src/models/request/kdfRequest.ts rename to libs/common/src/models/request/kdf.request.ts index 47c1ce0776..7377d01d6c 100644 --- a/libs/common/src/models/request/kdfRequest.ts +++ b/libs/common/src/models/request/kdf.request.ts @@ -1,6 +1,6 @@ import { KdfType } from "../../enums/kdfType"; -import { PasswordRequest } from "./passwordRequest"; +import { PasswordRequest } from "./password.request"; export class KdfRequest extends PasswordRequest { kdf: KdfType; diff --git a/libs/common/src/models/request/keyConnectorUserKeyRequest.ts b/libs/common/src/models/request/key-connector-user-key.request.ts similarity index 100% rename from libs/common/src/models/request/keyConnectorUserKeyRequest.ts rename to libs/common/src/models/request/key-connector-user-key.request.ts diff --git a/libs/common/src/models/request/keysRequest.ts b/libs/common/src/models/request/keys.request.ts similarity index 100% rename from libs/common/src/models/request/keysRequest.ts rename to libs/common/src/models/request/keys.request.ts diff --git a/libs/common/src/models/request/kvpRequest.ts b/libs/common/src/models/request/kvp.request.ts similarity index 100% rename from libs/common/src/models/request/kvpRequest.ts rename to libs/common/src/models/request/kvp.request.ts diff --git a/libs/common/src/models/request/organizationApiKeyRequest.ts b/libs/common/src/models/request/organization-api-key.request.ts similarity index 74% rename from libs/common/src/models/request/organizationApiKeyRequest.ts rename to libs/common/src/models/request/organization-api-key.request.ts index 613a3bfb39..d40ac004cb 100644 --- a/libs/common/src/models/request/organizationApiKeyRequest.ts +++ b/libs/common/src/models/request/organization-api-key.request.ts @@ -1,6 +1,6 @@ import { OrganizationApiKeyType } from "../../enums/organizationApiKeyType"; -import { SecretVerificationRequest } from "./secretVerificationRequest"; +import { SecretVerificationRequest } from "./secret-verification.request"; export class OrganizationApiKeyRequest extends SecretVerificationRequest { type: OrganizationApiKeyType = OrganizationApiKeyType.Default; diff --git a/libs/common/src/models/request/organizationConnectionRequest.ts b/libs/common/src/models/request/organization-connection.request.ts similarity index 78% rename from libs/common/src/models/request/organizationConnectionRequest.ts rename to libs/common/src/models/request/organization-connection.request.ts index 2506ac1d08..fcb4a6f906 100644 --- a/libs/common/src/models/request/organizationConnectionRequest.ts +++ b/libs/common/src/models/request/organization-connection.request.ts @@ -1,7 +1,7 @@ import { OrganizationConnectionType } from "../../enums/organizationConnectionType"; -import { BillingSyncConfigRequest } from "./billingSyncConfigRequest"; -import { ScimConfigRequest } from "./scimConfigRequest"; +import { BillingSyncConfigRequest } from "./billing-sync-config.request"; +import { ScimConfigRequest } from "./scim-config.request"; /**API request config types for OrganizationConnectionRequest */ export type OrganizationConnectionRequestConfigs = BillingSyncConfigRequest | ScimConfigRequest; diff --git a/libs/common/src/models/request/organizationCreateRequest.ts b/libs/common/src/models/request/organization-create.request.ts similarity index 91% rename from libs/common/src/models/request/organizationCreateRequest.ts rename to libs/common/src/models/request/organization-create.request.ts index db713d90c1..a0c08fd43a 100644 --- a/libs/common/src/models/request/organizationCreateRequest.ts +++ b/libs/common/src/models/request/organization-create.request.ts @@ -1,7 +1,7 @@ import { PaymentMethodType } from "../../enums/paymentMethodType"; import { PlanType } from "../../enums/planType"; -import { OrganizationKeysRequest } from "./organizationKeysRequest"; +import { OrganizationKeysRequest } from "./organization-keys.request"; export class OrganizationCreateRequest { name: string; diff --git a/libs/common/src/models/request/organizationImportGroupRequest.ts b/libs/common/src/models/request/organization-import-group.request.ts similarity index 85% rename from libs/common/src/models/request/organizationImportGroupRequest.ts rename to libs/common/src/models/request/organization-import-group.request.ts index 086ce65345..af07dc3529 100644 --- a/libs/common/src/models/request/organizationImportGroupRequest.ts +++ b/libs/common/src/models/request/organization-import-group.request.ts @@ -1,4 +1,4 @@ -import { ImportDirectoryRequestGroup } from "./importDirectoryRequestGroup"; +import { ImportDirectoryRequestGroup } from "./import-directory-request-group"; export class OrganizationImportGroupRequest { name: string; diff --git a/libs/common/src/models/request/organizationImportMemberRequest.ts b/libs/common/src/models/request/organization-import-member.request.ts similarity index 80% rename from libs/common/src/models/request/organizationImportMemberRequest.ts rename to libs/common/src/models/request/organization-import-member.request.ts index 8161365cbd..f42705962b 100644 --- a/libs/common/src/models/request/organizationImportMemberRequest.ts +++ b/libs/common/src/models/request/organization-import-member.request.ts @@ -1,4 +1,4 @@ -import { ImportDirectoryRequestUser } from "./importDirectoryRequestUser"; +import { ImportDirectoryRequestUser } from "./import-directory-request-user"; export class OrganizationImportMemberRequest { email: string; diff --git a/libs/common/src/models/request/organizationImportRequest.ts b/libs/common/src/models/request/organization-import.request.ts similarity index 80% rename from libs/common/src/models/request/organizationImportRequest.ts rename to libs/common/src/models/request/organization-import.request.ts index af7db2be70..1bd5bb18c0 100644 --- a/libs/common/src/models/request/organizationImportRequest.ts +++ b/libs/common/src/models/request/organization-import.request.ts @@ -1,6 +1,6 @@ -import { ImportDirectoryRequest } from "./importDirectoryRequest"; -import { OrganizationImportGroupRequest } from "./organizationImportGroupRequest"; -import { OrganizationImportMemberRequest } from "./organizationImportMemberRequest"; +import { ImportDirectoryRequest } from "./import-directory.request"; +import { OrganizationImportGroupRequest } from "./organization-import-group.request"; +import { OrganizationImportMemberRequest } from "./organization-import-member.request"; export class OrganizationImportRequest { groups: OrganizationImportGroupRequest[] = []; diff --git a/libs/common/src/models/request/organizationKeysRequest.ts b/libs/common/src/models/request/organization-keys.request.ts similarity index 78% rename from libs/common/src/models/request/organizationKeysRequest.ts rename to libs/common/src/models/request/organization-keys.request.ts index c63e05ab11..cabb948542 100644 --- a/libs/common/src/models/request/organizationKeysRequest.ts +++ b/libs/common/src/models/request/organization-keys.request.ts @@ -1,4 +1,4 @@ -import { KeysRequest } from "./keysRequest"; +import { KeysRequest } from "./keys.request"; export class OrganizationKeysRequest extends KeysRequest { constructor(publicKey: string, encryptedPrivateKey: string) { diff --git a/libs/common/src/models/request/organizationSubscriptionUpdateRequest.ts b/libs/common/src/models/request/organization-subscription-update.request.ts similarity index 100% rename from libs/common/src/models/request/organizationSubscriptionUpdateRequest.ts rename to libs/common/src/models/request/organization-subscription-update.request.ts diff --git a/libs/common/src/models/request/organizationTaxInfoUpdateRequest.ts b/libs/common/src/models/request/organization-tax-info-update.request.ts similarity index 71% rename from libs/common/src/models/request/organizationTaxInfoUpdateRequest.ts rename to libs/common/src/models/request/organization-tax-info-update.request.ts index 283151f4b5..0f8ec92160 100644 --- a/libs/common/src/models/request/organizationTaxInfoUpdateRequest.ts +++ b/libs/common/src/models/request/organization-tax-info-update.request.ts @@ -1,4 +1,4 @@ -import { TaxInfoUpdateRequest } from "./taxInfoUpdateRequest"; +import { TaxInfoUpdateRequest } from "./tax-info-update.request"; export class OrganizationTaxInfoUpdateRequest extends TaxInfoUpdateRequest { taxId: string; diff --git a/libs/common/src/models/request/organizationUpdateRequest.ts b/libs/common/src/models/request/organization-update.request.ts similarity index 69% rename from libs/common/src/models/request/organizationUpdateRequest.ts rename to libs/common/src/models/request/organization-update.request.ts index faddf6410a..c681d06e3d 100644 --- a/libs/common/src/models/request/organizationUpdateRequest.ts +++ b/libs/common/src/models/request/organization-update.request.ts @@ -1,4 +1,4 @@ -import { OrganizationKeysRequest } from "./organizationKeysRequest"; +import { OrganizationKeysRequest } from "./organization-keys.request"; export class OrganizationUpdateRequest { name: string; diff --git a/libs/common/src/models/request/organizationUpgradeRequest.ts b/libs/common/src/models/request/organization-upgrade.request.ts similarity index 82% rename from libs/common/src/models/request/organizationUpgradeRequest.ts rename to libs/common/src/models/request/organization-upgrade.request.ts index b62976fa2f..2c13cd4873 100644 --- a/libs/common/src/models/request/organizationUpgradeRequest.ts +++ b/libs/common/src/models/request/organization-upgrade.request.ts @@ -1,6 +1,6 @@ import { PlanType } from "../../enums/planType"; -import { OrganizationKeysRequest } from "./organizationKeysRequest"; +import { OrganizationKeysRequest } from "./organization-keys.request"; export class OrganizationUpgradeRequest { businessName: string; diff --git a/libs/common/src/models/request/organizationUserAcceptRequest.ts b/libs/common/src/models/request/organization-user-accept.request.ts similarity index 100% rename from libs/common/src/models/request/organizationUserAcceptRequest.ts rename to libs/common/src/models/request/organization-user-accept.request.ts diff --git a/libs/common/src/models/request/organizationUserBulkConfirmRequest.ts b/libs/common/src/models/request/organization-user-bulk-confirm.request.ts similarity index 100% rename from libs/common/src/models/request/organizationUserBulkConfirmRequest.ts rename to libs/common/src/models/request/organization-user-bulk-confirm.request.ts diff --git a/libs/common/src/models/request/organizationUserBulkRequest.ts b/libs/common/src/models/request/organization-user-bulk.request.ts similarity index 100% rename from libs/common/src/models/request/organizationUserBulkRequest.ts rename to libs/common/src/models/request/organization-user-bulk.request.ts diff --git a/libs/common/src/models/request/organizationUserConfirmRequest.ts b/libs/common/src/models/request/organization-user-confirm.request.ts similarity index 100% rename from libs/common/src/models/request/organizationUserConfirmRequest.ts rename to libs/common/src/models/request/organization-user-confirm.request.ts diff --git a/libs/common/src/models/request/organizationUserInviteRequest.ts b/libs/common/src/models/request/organization-user-invite.request.ts similarity index 81% rename from libs/common/src/models/request/organizationUserInviteRequest.ts rename to libs/common/src/models/request/organization-user-invite.request.ts index 9c01e718eb..90a0bff446 100644 --- a/libs/common/src/models/request/organizationUserInviteRequest.ts +++ b/libs/common/src/models/request/organization-user-invite.request.ts @@ -1,7 +1,7 @@ import { OrganizationUserType } from "../../enums/organizationUserType"; import { PermissionsApi } from "../api/permissions.api"; -import { SelectionReadOnlyRequest } from "./selectionReadOnlyRequest"; +import { SelectionReadOnlyRequest } from "./selection-read-only.request"; export class OrganizationUserInviteRequest { emails: string[] = []; diff --git a/libs/common/src/models/request/organizationUserResetPasswordEnrollmentRequest.ts b/libs/common/src/models/request/organization-user-reset-password-enrollment.request.ts similarity index 62% rename from libs/common/src/models/request/organizationUserResetPasswordEnrollmentRequest.ts rename to libs/common/src/models/request/organization-user-reset-password-enrollment.request.ts index f7129d156a..b1f08430da 100644 --- a/libs/common/src/models/request/organizationUserResetPasswordEnrollmentRequest.ts +++ b/libs/common/src/models/request/organization-user-reset-password-enrollment.request.ts @@ -1,4 +1,4 @@ -import { SecretVerificationRequest } from "./secretVerificationRequest"; +import { SecretVerificationRequest } from "./secret-verification.request"; export class OrganizationUserResetPasswordEnrollmentRequest extends SecretVerificationRequest { resetPasswordKey: string; diff --git a/libs/common/src/models/request/organizationUserResetPasswordRequest.ts b/libs/common/src/models/request/organization-user-reset-password.request.ts similarity index 100% rename from libs/common/src/models/request/organizationUserResetPasswordRequest.ts rename to libs/common/src/models/request/organization-user-reset-password.request.ts diff --git a/libs/common/src/models/request/organizationUserUpdateGroupsRequest.ts b/libs/common/src/models/request/organization-user-update-groups.request.ts similarity index 100% rename from libs/common/src/models/request/organizationUserUpdateGroupsRequest.ts rename to libs/common/src/models/request/organization-user-update-groups.request.ts diff --git a/libs/common/src/models/request/organizationUserUpdateRequest.ts b/libs/common/src/models/request/organization-user-update.request.ts similarity index 80% rename from libs/common/src/models/request/organizationUserUpdateRequest.ts rename to libs/common/src/models/request/organization-user-update.request.ts index 6a733303bc..5921b662c2 100644 --- a/libs/common/src/models/request/organizationUserUpdateRequest.ts +++ b/libs/common/src/models/request/organization-user-update.request.ts @@ -1,7 +1,7 @@ import { OrganizationUserType } from "../../enums/organizationUserType"; import { PermissionsApi } from "../api/permissions.api"; -import { SelectionReadOnlyRequest } from "./selectionReadOnlyRequest"; +import { SelectionReadOnlyRequest } from "./selection-read-only.request"; export class OrganizationUserUpdateRequest { type: OrganizationUserType; diff --git a/libs/common/src/models/request/organization/organizationSponsorshipCreateRequest.ts b/libs/common/src/models/request/organization/organization-sponsorship-create.request.ts similarity index 100% rename from libs/common/src/models/request/organization/organizationSponsorshipCreateRequest.ts rename to libs/common/src/models/request/organization/organization-sponsorship-create.request.ts diff --git a/libs/common/src/models/request/organization/organizationSponsorshipRedeemRequest.ts b/libs/common/src/models/request/organization/organization-sponsorship-redeem.request.ts similarity index 100% rename from libs/common/src/models/request/organization/organizationSponsorshipRedeemRequest.ts rename to libs/common/src/models/request/organization/organization-sponsorship-redeem.request.ts diff --git a/libs/common/src/models/request/organization/organizationSsoRequest.ts b/libs/common/src/models/request/organization/organization-sso.request.ts similarity index 100% rename from libs/common/src/models/request/organization/organizationSsoRequest.ts rename to libs/common/src/models/request/organization/organization-sso.request.ts diff --git a/libs/common/src/models/request/passwordHintRequest.ts b/libs/common/src/models/request/password-hint.request.ts similarity index 100% rename from libs/common/src/models/request/passwordHintRequest.ts rename to libs/common/src/models/request/password-hint.request.ts diff --git a/libs/common/src/models/request/passwordHistoryRequest.ts b/libs/common/src/models/request/password-history.request.ts similarity index 100% rename from libs/common/src/models/request/passwordHistoryRequest.ts rename to libs/common/src/models/request/password-history.request.ts diff --git a/libs/common/src/models/request/passwordRequest.ts b/libs/common/src/models/request/password.request.ts similarity index 66% rename from libs/common/src/models/request/passwordRequest.ts rename to libs/common/src/models/request/password.request.ts index eb3498a27f..601492c98b 100644 --- a/libs/common/src/models/request/passwordRequest.ts +++ b/libs/common/src/models/request/password.request.ts @@ -1,4 +1,4 @@ -import { SecretVerificationRequest } from "./secretVerificationRequest"; +import { SecretVerificationRequest } from "./secret-verification.request"; export class PasswordRequest extends SecretVerificationRequest { newMasterPasswordHash: string; diff --git a/libs/common/src/models/request/passwordlessCreateAuthRequest.ts b/libs/common/src/models/request/passwordless-create-auth.request.ts similarity index 100% rename from libs/common/src/models/request/passwordlessCreateAuthRequest.ts rename to libs/common/src/models/request/passwordless-create-auth.request.ts diff --git a/libs/common/src/models/request/paymentRequest.ts b/libs/common/src/models/request/payment.request.ts similarity index 68% rename from libs/common/src/models/request/paymentRequest.ts rename to libs/common/src/models/request/payment.request.ts index 8e7f70a1bf..d9e937e8a1 100644 --- a/libs/common/src/models/request/paymentRequest.ts +++ b/libs/common/src/models/request/payment.request.ts @@ -1,5 +1,6 @@ import { PaymentMethodType } from "../../enums/paymentMethodType"; -import { OrganizationTaxInfoUpdateRequest } from "../request/organizationTaxInfoUpdateRequest"; + +import { OrganizationTaxInfoUpdateRequest } from "./organization-tax-info-update.request"; export class PaymentRequest extends OrganizationTaxInfoUpdateRequest { paymentMethodType: PaymentMethodType; diff --git a/libs/common/src/models/request/policyRequest.ts b/libs/common/src/models/request/policy.request.ts similarity index 100% rename from libs/common/src/models/request/policyRequest.ts rename to libs/common/src/models/request/policy.request.ts diff --git a/libs/common/src/models/request/preloginRequest.ts b/libs/common/src/models/request/prelogin.request.ts similarity index 100% rename from libs/common/src/models/request/preloginRequest.ts rename to libs/common/src/models/request/prelogin.request.ts diff --git a/libs/common/src/models/request/provider/providerAddOrganizationRequest.ts b/libs/common/src/models/request/provider/provider-add-organization.request.ts similarity index 100% rename from libs/common/src/models/request/provider/providerAddOrganizationRequest.ts rename to libs/common/src/models/request/provider/provider-add-organization.request.ts diff --git a/libs/common/src/models/request/provider/providerOrganizationCreateRequest.ts b/libs/common/src/models/request/provider/provider-organization-create.request.ts similarity index 69% rename from libs/common/src/models/request/provider/providerOrganizationCreateRequest.ts rename to libs/common/src/models/request/provider/provider-organization-create.request.ts index 8d02f53068..145aca9cae 100644 --- a/libs/common/src/models/request/provider/providerOrganizationCreateRequest.ts +++ b/libs/common/src/models/request/provider/provider-organization-create.request.ts @@ -1,4 +1,4 @@ -import { OrganizationCreateRequest } from "../organizationCreateRequest"; +import { OrganizationCreateRequest } from "../organization-create.request"; export class ProviderOrganizationCreateRequest { constructor( diff --git a/libs/common/src/models/request/provider/providerSetupRequest.ts b/libs/common/src/models/request/provider/provider-setup.request.ts similarity index 100% rename from libs/common/src/models/request/provider/providerSetupRequest.ts rename to libs/common/src/models/request/provider/provider-setup.request.ts diff --git a/libs/common/src/models/request/provider/providerUpdateRequest.ts b/libs/common/src/models/request/provider/provider-update.request.ts similarity index 100% rename from libs/common/src/models/request/provider/providerUpdateRequest.ts rename to libs/common/src/models/request/provider/provider-update.request.ts diff --git a/libs/common/src/models/request/provider/providerUserAcceptRequest.ts b/libs/common/src/models/request/provider/provider-user-accept.request.ts similarity index 100% rename from libs/common/src/models/request/provider/providerUserAcceptRequest.ts rename to libs/common/src/models/request/provider/provider-user-accept.request.ts diff --git a/libs/common/src/models/request/provider/providerUserBulkConfirmRequest.ts b/libs/common/src/models/request/provider/provider-user-bulk-confirm.request.ts similarity index 100% rename from libs/common/src/models/request/provider/providerUserBulkConfirmRequest.ts rename to libs/common/src/models/request/provider/provider-user-bulk-confirm.request.ts diff --git a/libs/common/src/models/request/provider/providerUserBulkRequest.ts b/libs/common/src/models/request/provider/provider-user-bulk.request.ts similarity index 100% rename from libs/common/src/models/request/provider/providerUserBulkRequest.ts rename to libs/common/src/models/request/provider/provider-user-bulk.request.ts diff --git a/libs/common/src/models/request/provider/providerUserConfirmRequest.ts b/libs/common/src/models/request/provider/provider-user-confirm.request.ts similarity index 100% rename from libs/common/src/models/request/provider/providerUserConfirmRequest.ts rename to libs/common/src/models/request/provider/provider-user-confirm.request.ts diff --git a/libs/common/src/models/request/provider/providerUserInviteRequest.ts b/libs/common/src/models/request/provider/provider-user-invite.request.ts similarity index 100% rename from libs/common/src/models/request/provider/providerUserInviteRequest.ts rename to libs/common/src/models/request/provider/provider-user-invite.request.ts diff --git a/libs/common/src/models/request/provider/providerUserUpdateRequest.ts b/libs/common/src/models/request/provider/provider-user-update.request.ts similarity index 100% rename from libs/common/src/models/request/provider/providerUserUpdateRequest.ts rename to libs/common/src/models/request/provider/provider-user-update.request.ts diff --git a/libs/common/src/models/request/referenceEventRequest.ts b/libs/common/src/models/request/reference-event.request.ts similarity index 100% rename from libs/common/src/models/request/referenceEventRequest.ts rename to libs/common/src/models/request/reference-event.request.ts diff --git a/libs/common/src/models/request/registerRequest.ts b/libs/common/src/models/request/register.request.ts similarity index 76% rename from libs/common/src/models/request/registerRequest.ts rename to libs/common/src/models/request/register.request.ts index 8650c5c509..646d3e78f2 100644 --- a/libs/common/src/models/request/registerRequest.ts +++ b/libs/common/src/models/request/register.request.ts @@ -1,8 +1,8 @@ import { KdfType } from "../../enums/kdfType"; -import { CaptchaProtectedRequest } from "./captchaProtectedRequest"; -import { KeysRequest } from "./keysRequest"; -import { ReferenceEventRequest } from "./referenceEventRequest"; +import { CaptchaProtectedRequest } from "./captcha-protected.request"; +import { KeysRequest } from "./keys.request"; +import { ReferenceEventRequest } from "./reference-event.request"; export class RegisterRequest implements CaptchaProtectedRequest { masterPasswordHint: string; diff --git a/libs/common/src/models/request/scimConfigRequest.ts b/libs/common/src/models/request/scim-config.request.ts similarity index 100% rename from libs/common/src/models/request/scimConfigRequest.ts rename to libs/common/src/models/request/scim-config.request.ts diff --git a/libs/common/src/models/request/seatRequest.ts b/libs/common/src/models/request/seat.request.ts similarity index 100% rename from libs/common/src/models/request/seatRequest.ts rename to libs/common/src/models/request/seat.request.ts diff --git a/libs/common/src/models/request/secretVerificationRequest.ts b/libs/common/src/models/request/secret-verification.request.ts similarity index 100% rename from libs/common/src/models/request/secretVerificationRequest.ts rename to libs/common/src/models/request/secret-verification.request.ts diff --git a/libs/common/src/models/request/selectionReadOnlyRequest.ts b/libs/common/src/models/request/selection-read-only.request.ts similarity index 100% rename from libs/common/src/models/request/selectionReadOnlyRequest.ts rename to libs/common/src/models/request/selection-read-only.request.ts diff --git a/libs/common/src/models/request/sendAccessRequest.ts b/libs/common/src/models/request/send-access.request.ts similarity index 100% rename from libs/common/src/models/request/sendAccessRequest.ts rename to libs/common/src/models/request/send-access.request.ts diff --git a/libs/common/src/models/request/sendWithIdRequest.ts b/libs/common/src/models/request/send-with-id.request.ts similarity index 79% rename from libs/common/src/models/request/sendWithIdRequest.ts rename to libs/common/src/models/request/send-with-id.request.ts index 8591a57ecb..53e6750734 100644 --- a/libs/common/src/models/request/sendWithIdRequest.ts +++ b/libs/common/src/models/request/send-with-id.request.ts @@ -1,6 +1,6 @@ import { Send } from "../domain/send"; -import { SendRequest } from "./sendRequest"; +import { SendRequest } from "./send.request"; export class SendWithIdRequest extends SendRequest { id: string; diff --git a/libs/common/src/models/request/sendRequest.ts b/libs/common/src/models/request/send.request.ts similarity index 100% rename from libs/common/src/models/request/sendRequest.ts rename to libs/common/src/models/request/send.request.ts diff --git a/libs/common/src/models/request/setPasswordRequest.ts b/libs/common/src/models/request/set-password.request.ts similarity index 93% rename from libs/common/src/models/request/setPasswordRequest.ts rename to libs/common/src/models/request/set-password.request.ts index 919a132f58..b87e42e2f0 100644 --- a/libs/common/src/models/request/setPasswordRequest.ts +++ b/libs/common/src/models/request/set-password.request.ts @@ -1,6 +1,6 @@ import { KdfType } from "../../enums/kdfType"; -import { KeysRequest } from "./keysRequest"; +import { KeysRequest } from "./keys.request"; export class SetPasswordRequest { masterPasswordHash: string; diff --git a/libs/common/src/models/request/storageRequest.ts b/libs/common/src/models/request/storage.request.ts similarity index 100% rename from libs/common/src/models/request/storageRequest.ts rename to libs/common/src/models/request/storage.request.ts diff --git a/libs/common/src/models/request/taxInfoUpdateRequest.ts b/libs/common/src/models/request/tax-info-update.request.ts similarity index 100% rename from libs/common/src/models/request/taxInfoUpdateRequest.ts rename to libs/common/src/models/request/tax-info-update.request.ts diff --git a/libs/common/src/models/request/twoFactorEmailRequest.ts b/libs/common/src/models/request/two-factor-email.request.ts similarity index 61% rename from libs/common/src/models/request/twoFactorEmailRequest.ts rename to libs/common/src/models/request/two-factor-email.request.ts index e4fa59c259..9206dbd53f 100644 --- a/libs/common/src/models/request/twoFactorEmailRequest.ts +++ b/libs/common/src/models/request/two-factor-email.request.ts @@ -1,4 +1,4 @@ -import { SecretVerificationRequest } from "./secretVerificationRequest"; +import { SecretVerificationRequest } from "./secret-verification.request"; export class TwoFactorEmailRequest extends SecretVerificationRequest { email: string; diff --git a/libs/common/src/models/request/twoFactorProviderRequest.ts b/libs/common/src/models/request/two-factor-provider.request.ts similarity index 71% rename from libs/common/src/models/request/twoFactorProviderRequest.ts rename to libs/common/src/models/request/two-factor-provider.request.ts index 9d606bc95e..5d866b4658 100644 --- a/libs/common/src/models/request/twoFactorProviderRequest.ts +++ b/libs/common/src/models/request/two-factor-provider.request.ts @@ -1,6 +1,6 @@ import { TwoFactorProviderType } from "../../enums/twoFactorProviderType"; -import { SecretVerificationRequest } from "./secretVerificationRequest"; +import { SecretVerificationRequest } from "./secret-verification.request"; export class TwoFactorProviderRequest extends SecretVerificationRequest { type: TwoFactorProviderType; diff --git a/libs/common/src/models/request/twoFactorRecoveryRequest.ts b/libs/common/src/models/request/two-factor-recovery.request.ts similarity index 61% rename from libs/common/src/models/request/twoFactorRecoveryRequest.ts rename to libs/common/src/models/request/two-factor-recovery.request.ts index 39135a37f7..59a20752ab 100644 --- a/libs/common/src/models/request/twoFactorRecoveryRequest.ts +++ b/libs/common/src/models/request/two-factor-recovery.request.ts @@ -1,4 +1,4 @@ -import { SecretVerificationRequest } from "./secretVerificationRequest"; +import { SecretVerificationRequest } from "./secret-verification.request"; export class TwoFactorRecoveryRequest extends SecretVerificationRequest { recoveryCode: string; diff --git a/libs/common/src/models/request/updateDomainsRequest.ts b/libs/common/src/models/request/update-domains.request.ts similarity index 100% rename from libs/common/src/models/request/updateDomainsRequest.ts rename to libs/common/src/models/request/update-domains.request.ts diff --git a/libs/common/src/models/request/updateKeyRequest.ts b/libs/common/src/models/request/update-key.request.ts similarity index 53% rename from libs/common/src/models/request/updateKeyRequest.ts rename to libs/common/src/models/request/update-key.request.ts index a9fceffdb0..c7faa8eb2e 100644 --- a/libs/common/src/models/request/updateKeyRequest.ts +++ b/libs/common/src/models/request/update-key.request.ts @@ -1,6 +1,6 @@ -import { CipherWithIdRequest } from "./cipherWithIdRequest"; -import { FolderWithIdRequest } from "./folderWithIdRequest"; -import { SendWithIdRequest } from "./sendWithIdRequest"; +import { CipherWithIdRequest } from "./cipher-with-id.request"; +import { FolderWithIdRequest } from "./folder-with-id.request"; +import { SendWithIdRequest } from "./send-with-id.request"; export class UpdateKeyRequest { ciphers: CipherWithIdRequest[] = []; diff --git a/libs/common/src/models/request/updateProfileRequest.ts b/libs/common/src/models/request/update-profile.request.ts similarity index 100% rename from libs/common/src/models/request/updateProfileRequest.ts rename to libs/common/src/models/request/update-profile.request.ts diff --git a/libs/common/src/models/request/updateTempPasswordRequest.ts b/libs/common/src/models/request/update-temp-password.request.ts similarity index 83% rename from libs/common/src/models/request/updateTempPasswordRequest.ts rename to libs/common/src/models/request/update-temp-password.request.ts index 1bd97697c5..1a403caff0 100644 --- a/libs/common/src/models/request/updateTempPasswordRequest.ts +++ b/libs/common/src/models/request/update-temp-password.request.ts @@ -1,4 +1,4 @@ -import { OrganizationUserResetPasswordRequest } from "./organizationUserResetPasswordRequest"; +import { OrganizationUserResetPasswordRequest } from "./organization-user-reset-password.request"; export class UpdateTempPasswordRequest extends OrganizationUserResetPasswordRequest { masterPasswordHint: string; diff --git a/libs/common/src/models/request/updateTwoFactorAuthenticatorRequest.ts b/libs/common/src/models/request/update-two-factor-authenticator.request.ts similarity index 61% rename from libs/common/src/models/request/updateTwoFactorAuthenticatorRequest.ts rename to libs/common/src/models/request/update-two-factor-authenticator.request.ts index 9b7182873b..7c61c6943d 100644 --- a/libs/common/src/models/request/updateTwoFactorAuthenticatorRequest.ts +++ b/libs/common/src/models/request/update-two-factor-authenticator.request.ts @@ -1,4 +1,4 @@ -import { SecretVerificationRequest } from "./secretVerificationRequest"; +import { SecretVerificationRequest } from "./secret-verification.request"; export class UpdateTwoFactorAuthenticatorRequest extends SecretVerificationRequest { token: string; diff --git a/libs/common/src/models/request/updateTwoFactorDuoRequest.ts b/libs/common/src/models/request/update-two-factor-duo.request.ts similarity index 65% rename from libs/common/src/models/request/updateTwoFactorDuoRequest.ts rename to libs/common/src/models/request/update-two-factor-duo.request.ts index cd82215d97..d113715b37 100644 --- a/libs/common/src/models/request/updateTwoFactorDuoRequest.ts +++ b/libs/common/src/models/request/update-two-factor-duo.request.ts @@ -1,4 +1,4 @@ -import { SecretVerificationRequest } from "./secretVerificationRequest"; +import { SecretVerificationRequest } from "./secret-verification.request"; export class UpdateTwoFactorDuoRequest extends SecretVerificationRequest { integrationKey: string; diff --git a/libs/common/src/models/request/updateTwoFactorEmailRequest.ts b/libs/common/src/models/request/update-two-factor-email.request.ts similarity index 60% rename from libs/common/src/models/request/updateTwoFactorEmailRequest.ts rename to libs/common/src/models/request/update-two-factor-email.request.ts index be7da1fdc6..51a351f83a 100644 --- a/libs/common/src/models/request/updateTwoFactorEmailRequest.ts +++ b/libs/common/src/models/request/update-two-factor-email.request.ts @@ -1,4 +1,4 @@ -import { SecretVerificationRequest } from "./secretVerificationRequest"; +import { SecretVerificationRequest } from "./secret-verification.request"; export class UpdateTwoFactorEmailRequest extends SecretVerificationRequest { token: string; diff --git a/libs/common/src/models/request/updateTwoFactorWebAuthnDeleteRequest.ts b/libs/common/src/models/request/update-two-factor-web-authn-delete.request.ts similarity index 57% rename from libs/common/src/models/request/updateTwoFactorWebAuthnDeleteRequest.ts rename to libs/common/src/models/request/update-two-factor-web-authn-delete.request.ts index 1decda7256..0d62b49065 100644 --- a/libs/common/src/models/request/updateTwoFactorWebAuthnDeleteRequest.ts +++ b/libs/common/src/models/request/update-two-factor-web-authn-delete.request.ts @@ -1,4 +1,4 @@ -import { SecretVerificationRequest } from "./secretVerificationRequest"; +import { SecretVerificationRequest } from "./secret-verification.request"; export class UpdateTwoFactorWebAuthnDeleteRequest extends SecretVerificationRequest { id: number; diff --git a/libs/common/src/models/request/updateTwoFactorWebAuthnRequest.ts b/libs/common/src/models/request/update-two-factor-web-authn.request.ts similarity index 66% rename from libs/common/src/models/request/updateTwoFactorWebAuthnRequest.ts rename to libs/common/src/models/request/update-two-factor-web-authn.request.ts index 2e788b52d9..70d71322eb 100644 --- a/libs/common/src/models/request/updateTwoFactorWebAuthnRequest.ts +++ b/libs/common/src/models/request/update-two-factor-web-authn.request.ts @@ -1,4 +1,4 @@ -import { SecretVerificationRequest } from "./secretVerificationRequest"; +import { SecretVerificationRequest } from "./secret-verification.request"; export class UpdateTwoFactorWebAuthnRequest extends SecretVerificationRequest { deviceResponse: PublicKeyCredential; diff --git a/libs/common/src/models/request/updateTwoFactorYubioOtpRequest.ts b/libs/common/src/models/request/update-two-factor-yubio-otp.request.ts similarity index 70% rename from libs/common/src/models/request/updateTwoFactorYubioOtpRequest.ts rename to libs/common/src/models/request/update-two-factor-yubio-otp.request.ts index cb495b1e6a..a14dd35ca9 100644 --- a/libs/common/src/models/request/updateTwoFactorYubioOtpRequest.ts +++ b/libs/common/src/models/request/update-two-factor-yubio-otp.request.ts @@ -1,4 +1,4 @@ -import { SecretVerificationRequest } from "./secretVerificationRequest"; +import { SecretVerificationRequest } from "./secret-verification.request"; export class UpdateTwoFactorYubioOtpRequest extends SecretVerificationRequest { key1: string; diff --git a/libs/common/src/models/request/verifyBankRequest.ts b/libs/common/src/models/request/verify-bank.request.ts similarity index 100% rename from libs/common/src/models/request/verifyBankRequest.ts rename to libs/common/src/models/request/verify-bank.request.ts diff --git a/libs/common/src/models/request/verifyDeleteRecoverRequest.ts b/libs/common/src/models/request/verify-delete-recover.request.ts similarity index 100% rename from libs/common/src/models/request/verifyDeleteRecoverRequest.ts rename to libs/common/src/models/request/verify-delete-recover.request.ts diff --git a/libs/common/src/models/request/verifyEmailRequest.ts b/libs/common/src/models/request/verify-email.request.ts similarity index 100% rename from libs/common/src/models/request/verifyEmailRequest.ts rename to libs/common/src/models/request/verify-email.request.ts diff --git a/libs/common/src/models/response/apiKeyResponse.ts b/libs/common/src/models/response/api-key.response.ts similarity index 85% rename from libs/common/src/models/response/apiKeyResponse.ts rename to libs/common/src/models/response/api-key.response.ts index 950850eec1..21d9dc29c9 100644 --- a/libs/common/src/models/response/apiKeyResponse.ts +++ b/libs/common/src/models/response/api-key.response.ts @@ -1,4 +1,4 @@ -import { BaseResponse } from "./baseResponse"; +import { BaseResponse } from "./base.response"; export class ApiKeyResponse extends BaseResponse { apiKey: string; diff --git a/libs/common/src/models/response/attachmentUploadDataResponse.ts b/libs/common/src/models/response/attachment-upload-data.response.ts similarity index 89% rename from libs/common/src/models/response/attachmentUploadDataResponse.ts rename to libs/common/src/models/response/attachment-upload-data.response.ts index 4520c30997..120aec6bb1 100644 --- a/libs/common/src/models/response/attachmentUploadDataResponse.ts +++ b/libs/common/src/models/response/attachment-upload-data.response.ts @@ -1,7 +1,7 @@ import { FileUploadType } from "../../enums/fileUploadType"; -import { BaseResponse } from "./baseResponse"; -import { CipherResponse } from "./cipherResponse"; +import { BaseResponse } from "./base.response"; +import { CipherResponse } from "./cipher.response"; export class AttachmentUploadDataResponse extends BaseResponse { attachmentId: string; diff --git a/libs/common/src/models/response/attachmentResponse.ts b/libs/common/src/models/response/attachment.response.ts similarity index 91% rename from libs/common/src/models/response/attachmentResponse.ts rename to libs/common/src/models/response/attachment.response.ts index a9ebfaf329..32e4b6bfb8 100644 --- a/libs/common/src/models/response/attachmentResponse.ts +++ b/libs/common/src/models/response/attachment.response.ts @@ -1,4 +1,4 @@ -import { BaseResponse } from "./baseResponse"; +import { BaseResponse } from "./base.response"; export class AttachmentResponse extends BaseResponse { id: string; diff --git a/libs/common/src/models/response/authRequestResponse.ts b/libs/common/src/models/response/auth-request.response.ts similarity index 94% rename from libs/common/src/models/response/authRequestResponse.ts rename to libs/common/src/models/response/auth-request.response.ts index a72d25ace9..f94980a295 100644 --- a/libs/common/src/models/response/authRequestResponse.ts +++ b/libs/common/src/models/response/auth-request.response.ts @@ -1,6 +1,6 @@ import { DeviceType } from "../../enums/deviceType"; -import { BaseResponse } from "./baseResponse"; +import { BaseResponse } from "./base.response"; export class AuthRequestResponse extends BaseResponse { id: string; diff --git a/libs/common/src/models/response/authentication/ICaptchaProtectedResponse.ts b/libs/common/src/models/response/authentication/captcha-protected.response.ts similarity index 100% rename from libs/common/src/models/response/authentication/ICaptchaProtectedResponse.ts rename to libs/common/src/models/response/authentication/captcha-protected.response.ts diff --git a/libs/common/src/models/response/authentication/registerResponse.ts b/libs/common/src/models/response/authentication/register.response.ts similarity index 67% rename from libs/common/src/models/response/authentication/registerResponse.ts rename to libs/common/src/models/response/authentication/register.response.ts index b9f5f152be..1e52fd42c2 100644 --- a/libs/common/src/models/response/authentication/registerResponse.ts +++ b/libs/common/src/models/response/authentication/register.response.ts @@ -1,6 +1,6 @@ -import { BaseResponse } from "../baseResponse"; +import { BaseResponse } from "../base.response"; -import { ICaptchaProtectedResponse } from "./ICaptchaProtectedResponse"; +import { ICaptchaProtectedResponse } from "./captcha-protected.response"; export class RegisterResponse extends BaseResponse implements ICaptchaProtectedResponse { captchaBypassToken: string; diff --git a/libs/common/src/models/response/baseResponse.ts b/libs/common/src/models/response/base.response.ts similarity index 100% rename from libs/common/src/models/response/baseResponse.ts rename to libs/common/src/models/response/base.response.ts diff --git a/libs/common/src/models/response/billingHistoryResponse.ts b/libs/common/src/models/response/billing-history.response.ts similarity index 91% rename from libs/common/src/models/response/billingHistoryResponse.ts rename to libs/common/src/models/response/billing-history.response.ts index c7dead81f5..6fba1bbfb2 100644 --- a/libs/common/src/models/response/billingHistoryResponse.ts +++ b/libs/common/src/models/response/billing-history.response.ts @@ -1,5 +1,5 @@ -import { BaseResponse } from "./baseResponse"; -import { BillingInvoiceResponse, BillingTransactionResponse } from "./billingResponse"; +import { BaseResponse } from "./base.response"; +import { BillingInvoiceResponse, BillingTransactionResponse } from "./billing.response"; export class BillingHistoryResponse extends BaseResponse { invoices: BillingInvoiceResponse[] = []; diff --git a/libs/common/src/models/response/billingPaymentResponse.ts b/libs/common/src/models/response/billing-payment.response.ts similarity index 78% rename from libs/common/src/models/response/billingPaymentResponse.ts rename to libs/common/src/models/response/billing-payment.response.ts index 869e5a0d3f..95459293fc 100644 --- a/libs/common/src/models/response/billingPaymentResponse.ts +++ b/libs/common/src/models/response/billing-payment.response.ts @@ -1,5 +1,5 @@ -import { BaseResponse } from "./baseResponse"; -import { BillingSourceResponse } from "./billingResponse"; +import { BaseResponse } from "./base.response"; +import { BillingSourceResponse } from "./billing.response"; export class BillingPaymentResponse extends BaseResponse { balance: number; diff --git a/libs/common/src/models/response/billingResponse.ts b/libs/common/src/models/response/billing.response.ts similarity index 98% rename from libs/common/src/models/response/billingResponse.ts rename to libs/common/src/models/response/billing.response.ts index 8d09cf9311..81a3f49079 100644 --- a/libs/common/src/models/response/billingResponse.ts +++ b/libs/common/src/models/response/billing.response.ts @@ -1,7 +1,7 @@ import { PaymentMethodType } from "../../enums/paymentMethodType"; import { TransactionType } from "../../enums/transactionType"; -import { BaseResponse } from "./baseResponse"; +import { BaseResponse } from "./base.response"; export class BillingResponse extends BaseResponse { balance: number; diff --git a/libs/common/src/models/response/breachAccountResponse.ts b/libs/common/src/models/response/breach-account.response.ts similarity index 95% rename from libs/common/src/models/response/breachAccountResponse.ts rename to libs/common/src/models/response/breach-account.response.ts index 00d39acc0e..5c3c1f762e 100644 --- a/libs/common/src/models/response/breachAccountResponse.ts +++ b/libs/common/src/models/response/breach-account.response.ts @@ -1,4 +1,4 @@ -import { BaseResponse } from "./baseResponse"; +import { BaseResponse } from "./base.response"; export class BreachAccountResponse extends BaseResponse { addedDate: string; diff --git a/libs/common/src/models/response/cipherResponse.ts b/libs/common/src/models/response/cipher.response.ts similarity index 94% rename from libs/common/src/models/response/cipherResponse.ts rename to libs/common/src/models/response/cipher.response.ts index bb342d4aa0..2c95c6a385 100644 --- a/libs/common/src/models/response/cipherResponse.ts +++ b/libs/common/src/models/response/cipher.response.ts @@ -5,9 +5,9 @@ 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"; -import { PasswordHistoryResponse } from "./passwordHistoryResponse"; +import { AttachmentResponse } from "./attachment.response"; +import { BaseResponse } from "./base.response"; +import { PasswordHistoryResponse } from "./password-history.response"; export class CipherResponse extends BaseResponse { id: string; diff --git a/libs/common/src/models/response/collectionResponse.ts b/libs/common/src/models/response/collection.response.ts similarity index 88% rename from libs/common/src/models/response/collectionResponse.ts rename to libs/common/src/models/response/collection.response.ts index 2f677f7d85..4165aa568e 100644 --- a/libs/common/src/models/response/collectionResponse.ts +++ b/libs/common/src/models/response/collection.response.ts @@ -1,5 +1,5 @@ -import { BaseResponse } from "./baseResponse"; -import { SelectionReadOnlyResponse } from "./selectionReadOnlyResponse"; +import { BaseResponse } from "./base.response"; +import { SelectionReadOnlyResponse } from "./selection-read-only.response"; export class CollectionResponse extends BaseResponse { id: string; diff --git a/libs/common/src/models/response/deviceVerificationResponse.ts b/libs/common/src/models/response/device-verification.response.ts similarity index 90% rename from libs/common/src/models/response/deviceVerificationResponse.ts rename to libs/common/src/models/response/device-verification.response.ts index 65762bb9b6..f5ce248d42 100644 --- a/libs/common/src/models/response/deviceVerificationResponse.ts +++ b/libs/common/src/models/response/device-verification.response.ts @@ -1,4 +1,4 @@ -import { BaseResponse } from "./baseResponse"; +import { BaseResponse } from "./base.response"; export class DeviceVerificationResponse extends BaseResponse { isDeviceVerificationSectionEnabled: boolean; diff --git a/libs/common/src/models/response/deviceResponse.ts b/libs/common/src/models/response/device.response.ts similarity index 91% rename from libs/common/src/models/response/deviceResponse.ts rename to libs/common/src/models/response/device.response.ts index aac9ac6c6b..5ac624c72f 100644 --- a/libs/common/src/models/response/deviceResponse.ts +++ b/libs/common/src/models/response/device.response.ts @@ -1,6 +1,6 @@ import { DeviceType } from "../../enums/deviceType"; -import { BaseResponse } from "./baseResponse"; +import { BaseResponse } from "./base.response"; export class DeviceResponse extends BaseResponse { id: string; diff --git a/libs/common/src/models/response/domainsResponse.ts b/libs/common/src/models/response/domains.response.ts similarity index 83% rename from libs/common/src/models/response/domainsResponse.ts rename to libs/common/src/models/response/domains.response.ts index 3014c2f21b..9ac932a05f 100644 --- a/libs/common/src/models/response/domainsResponse.ts +++ b/libs/common/src/models/response/domains.response.ts @@ -1,5 +1,5 @@ -import { BaseResponse } from "./baseResponse"; -import { GlobalDomainResponse } from "./globalDomainResponse"; +import { BaseResponse } from "./base.response"; +import { GlobalDomainResponse } from "./global-domain.response"; export class DomainsResponse extends BaseResponse { equivalentDomains: string[][]; diff --git a/libs/common/src/models/response/emergencyAccessResponse.ts b/libs/common/src/models/response/emergency-access.response.ts similarity index 96% rename from libs/common/src/models/response/emergencyAccessResponse.ts rename to libs/common/src/models/response/emergency-access.response.ts index 9ac5380dc2..381f4e16ec 100644 --- a/libs/common/src/models/response/emergencyAccessResponse.ts +++ b/libs/common/src/models/response/emergency-access.response.ts @@ -2,8 +2,8 @@ import { EmergencyAccessStatusType } from "../../enums/emergencyAccessStatusType import { EmergencyAccessType } from "../../enums/emergencyAccessType"; import { KdfType } from "../../enums/kdfType"; -import { BaseResponse } from "./baseResponse"; -import { CipherResponse } from "./cipherResponse"; +import { BaseResponse } from "./base.response"; +import { CipherResponse } from "./cipher.response"; export class EmergencyAccessGranteeDetailsResponse extends BaseResponse { id: string; diff --git a/libs/common/src/models/response/errorResponse.ts b/libs/common/src/models/response/error.response.ts similarity index 97% rename from libs/common/src/models/response/errorResponse.ts rename to libs/common/src/models/response/error.response.ts index 859803b441..81b69d540b 100644 --- a/libs/common/src/models/response/errorResponse.ts +++ b/libs/common/src/models/response/error.response.ts @@ -1,6 +1,6 @@ import { Utils } from "../../misc/utils"; -import { BaseResponse } from "./baseResponse"; +import { BaseResponse } from "./base.response"; export class ErrorResponse extends BaseResponse { message: string; diff --git a/libs/common/src/models/response/eventResponse.ts b/libs/common/src/models/response/event.response.ts similarity index 97% rename from libs/common/src/models/response/eventResponse.ts rename to libs/common/src/models/response/event.response.ts index 47e3d14093..fe102019cc 100644 --- a/libs/common/src/models/response/eventResponse.ts +++ b/libs/common/src/models/response/event.response.ts @@ -1,7 +1,7 @@ import { DeviceType } from "../../enums/deviceType"; import { EventType } from "../../enums/eventType"; -import { BaseResponse } from "./baseResponse"; +import { BaseResponse } from "./base.response"; export class EventResponse extends BaseResponse { type: EventType; diff --git a/libs/common/src/models/response/folderResponse.ts b/libs/common/src/models/response/folder.response.ts similarity index 87% rename from libs/common/src/models/response/folderResponse.ts rename to libs/common/src/models/response/folder.response.ts index 70d4897f87..4eeeddb9a9 100644 --- a/libs/common/src/models/response/folderResponse.ts +++ b/libs/common/src/models/response/folder.response.ts @@ -1,4 +1,4 @@ -import { BaseResponse } from "./baseResponse"; +import { BaseResponse } from "./base.response"; export class FolderResponse extends BaseResponse { id: string; diff --git a/libs/common/src/models/response/globalDomainResponse.ts b/libs/common/src/models/response/global-domain.response.ts similarity index 87% rename from libs/common/src/models/response/globalDomainResponse.ts rename to libs/common/src/models/response/global-domain.response.ts index e3197e769f..aab7c0b8d7 100644 --- a/libs/common/src/models/response/globalDomainResponse.ts +++ b/libs/common/src/models/response/global-domain.response.ts @@ -1,4 +1,4 @@ -import { BaseResponse } from "./baseResponse"; +import { BaseResponse } from "./base.response"; export class GlobalDomainResponse extends BaseResponse { type: number; diff --git a/libs/common/src/models/response/groupResponse.ts b/libs/common/src/models/response/group.response.ts similarity index 87% rename from libs/common/src/models/response/groupResponse.ts rename to libs/common/src/models/response/group.response.ts index ab4b58b7b5..bb87a4e29b 100644 --- a/libs/common/src/models/response/groupResponse.ts +++ b/libs/common/src/models/response/group.response.ts @@ -1,5 +1,5 @@ -import { BaseResponse } from "./baseResponse"; -import { SelectionReadOnlyResponse } from "./selectionReadOnlyResponse"; +import { BaseResponse } from "./base.response"; +import { SelectionReadOnlyResponse } from "./selection-read-only.response"; export class GroupResponse extends BaseResponse { id: string; diff --git a/libs/common/src/models/response/identityCaptchaResponse.ts b/libs/common/src/models/response/identity-captcha.response.ts similarity index 80% rename from libs/common/src/models/response/identityCaptchaResponse.ts rename to libs/common/src/models/response/identity-captcha.response.ts index 2537057e1b..c6cc045407 100644 --- a/libs/common/src/models/response/identityCaptchaResponse.ts +++ b/libs/common/src/models/response/identity-captcha.response.ts @@ -1,4 +1,4 @@ -import { BaseResponse } from "./baseResponse"; +import { BaseResponse } from "./base.response"; export class IdentityCaptchaResponse extends BaseResponse { siteKey: string; diff --git a/libs/common/src/models/response/identityTokenResponse.ts b/libs/common/src/models/response/identity-token.response.ts similarity index 96% rename from libs/common/src/models/response/identityTokenResponse.ts rename to libs/common/src/models/response/identity-token.response.ts index 87b5d39661..accadd0b37 100644 --- a/libs/common/src/models/response/identityTokenResponse.ts +++ b/libs/common/src/models/response/identity-token.response.ts @@ -1,6 +1,6 @@ import { KdfType } from "../../enums/kdfType"; -import { BaseResponse } from "./baseResponse"; +import { BaseResponse } from "./base.response"; export class IdentityTokenResponse extends BaseResponse { accessToken: string; diff --git a/libs/common/src/models/response/identityTwoFactorResponse.ts b/libs/common/src/models/response/identity-two-factor.response.ts similarity index 94% rename from libs/common/src/models/response/identityTwoFactorResponse.ts rename to libs/common/src/models/response/identity-two-factor.response.ts index dc7dfde725..8009b4cd01 100644 --- a/libs/common/src/models/response/identityTwoFactorResponse.ts +++ b/libs/common/src/models/response/identity-two-factor.response.ts @@ -1,6 +1,6 @@ import { TwoFactorProviderType } from "../../enums/twoFactorProviderType"; -import { BaseResponse } from "./baseResponse"; +import { BaseResponse } from "./base.response"; export class IdentityTwoFactorResponse extends BaseResponse { twoFactorProviders: TwoFactorProviderType[]; diff --git a/libs/common/src/models/response/keyConnectorUserKeyResponse.ts b/libs/common/src/models/response/key-connector-user-key.response.ts similarity index 79% rename from libs/common/src/models/response/keyConnectorUserKeyResponse.ts rename to libs/common/src/models/response/key-connector-user-key.response.ts index 5183397b5f..70a4cd7556 100644 --- a/libs/common/src/models/response/keyConnectorUserKeyResponse.ts +++ b/libs/common/src/models/response/key-connector-user-key.response.ts @@ -1,4 +1,4 @@ -import { BaseResponse } from "./baseResponse"; +import { BaseResponse } from "./base.response"; export class KeyConnectorUserKeyResponse extends BaseResponse { key: string; diff --git a/libs/common/src/models/response/keysResponse.ts b/libs/common/src/models/response/keys.response.ts similarity index 85% rename from libs/common/src/models/response/keysResponse.ts rename to libs/common/src/models/response/keys.response.ts index e1e8e5dbe5..79f601f0a5 100644 --- a/libs/common/src/models/response/keysResponse.ts +++ b/libs/common/src/models/response/keys.response.ts @@ -1,4 +1,4 @@ -import { BaseResponse } from "./baseResponse"; +import { BaseResponse } from "./base.response"; export class KeysResponse extends BaseResponse { privateKey: string; diff --git a/libs/common/src/models/response/listResponse.ts b/libs/common/src/models/response/list.response.ts similarity index 88% rename from libs/common/src/models/response/listResponse.ts rename to libs/common/src/models/response/list.response.ts index e37c6697d4..75966a251d 100644 --- a/libs/common/src/models/response/listResponse.ts +++ b/libs/common/src/models/response/list.response.ts @@ -1,4 +1,4 @@ -import { BaseResponse } from "./baseResponse"; +import { BaseResponse } from "./base.response"; export class ListResponse extends BaseResponse { data: T[]; diff --git a/libs/common/src/models/response/notificationResponse.ts b/libs/common/src/models/response/notification.response.ts similarity index 98% rename from libs/common/src/models/response/notificationResponse.ts rename to libs/common/src/models/response/notification.response.ts index 1e2a504506..300eb1e8b5 100644 --- a/libs/common/src/models/response/notificationResponse.ts +++ b/libs/common/src/models/response/notification.response.ts @@ -1,6 +1,6 @@ import { NotificationType } from "../../enums/notificationType"; -import { BaseResponse } from "./baseResponse"; +import { BaseResponse } from "./base.response"; export class NotificationResponse extends BaseResponse { contextId: string; diff --git a/libs/common/src/models/response/organizationApiKeyInformationResponse.ts b/libs/common/src/models/response/organization-api-key-information.response.ts similarity index 86% rename from libs/common/src/models/response/organizationApiKeyInformationResponse.ts rename to libs/common/src/models/response/organization-api-key-information.response.ts index 16ed725128..b551586e2b 100644 --- a/libs/common/src/models/response/organizationApiKeyInformationResponse.ts +++ b/libs/common/src/models/response/organization-api-key-information.response.ts @@ -1,6 +1,6 @@ import { OrganizationApiKeyType } from "../../enums/organizationApiKeyType"; -import { BaseResponse } from "./baseResponse"; +import { BaseResponse } from "./base.response"; export class OrganizationApiKeyInformationResponse extends BaseResponse { keyType: OrganizationApiKeyType; diff --git a/libs/common/src/models/response/organizationAutoEnrollStatusResponse.ts b/libs/common/src/models/response/organization-auto-enroll-status.response.ts similarity index 86% rename from libs/common/src/models/response/organizationAutoEnrollStatusResponse.ts rename to libs/common/src/models/response/organization-auto-enroll-status.response.ts index d960463e2f..5063bdfa0a 100644 --- a/libs/common/src/models/response/organizationAutoEnrollStatusResponse.ts +++ b/libs/common/src/models/response/organization-auto-enroll-status.response.ts @@ -1,4 +1,4 @@ -import { BaseResponse } from "./baseResponse"; +import { BaseResponse } from "./base.response"; export class OrganizationAutoEnrollStatusResponse extends BaseResponse { id: string; diff --git a/libs/common/src/models/response/organizationConnectionResponse.ts b/libs/common/src/models/response/organization-connection.response.ts similarity index 95% rename from libs/common/src/models/response/organizationConnectionResponse.ts rename to libs/common/src/models/response/organization-connection.response.ts index e4babe8845..c64bfc6d1a 100644 --- a/libs/common/src/models/response/organizationConnectionResponse.ts +++ b/libs/common/src/models/response/organization-connection.response.ts @@ -2,7 +2,7 @@ import { OrganizationConnectionType } from "../../enums/organizationConnectionTy import { BillingSyncConfigApi } from "../api/billing-sync-config.api"; import { ScimConfigApi } from "../api/scim-config.api"; -import { BaseResponse } from "./baseResponse"; +import { BaseResponse } from "./base.response"; /**API response config types for OrganizationConnectionResponse */ export type OrganizationConnectionConfigApis = BillingSyncConfigApi | ScimConfigApi; diff --git a/libs/common/src/models/response/organizationExportResponse.ts b/libs/common/src/models/response/organization-export.response.ts similarity index 61% rename from libs/common/src/models/response/organizationExportResponse.ts rename to libs/common/src/models/response/organization-export.response.ts index 847fcab96b..949ce6a2a1 100644 --- a/libs/common/src/models/response/organizationExportResponse.ts +++ b/libs/common/src/models/response/organization-export.response.ts @@ -1,7 +1,7 @@ -import { BaseResponse } from "./baseResponse"; -import { CipherResponse } from "./cipherResponse"; -import { CollectionResponse } from "./collectionResponse"; -import { ListResponse } from "./listResponse"; +import { BaseResponse } from "./base.response"; +import { CipherResponse } from "./cipher.response"; +import { CollectionResponse } from "./collection.response"; +import { ListResponse } from "./list.response"; export class OrganizationExportResponse extends BaseResponse { collections: ListResponse; diff --git a/libs/common/src/models/response/organizationKeysResponse.ts b/libs/common/src/models/response/organization-keys.response.ts similarity index 71% rename from libs/common/src/models/response/organizationKeysResponse.ts rename to libs/common/src/models/response/organization-keys.response.ts index 3d5c0d2986..9fcca4ef61 100644 --- a/libs/common/src/models/response/organizationKeysResponse.ts +++ b/libs/common/src/models/response/organization-keys.response.ts @@ -1,4 +1,4 @@ -import { KeysResponse } from "./keysResponse"; +import { KeysResponse } from "./keys.response"; export class OrganizationKeysResponse extends KeysResponse { constructor(response: any) { diff --git a/libs/common/src/models/response/organizationSponsorshipSyncStatusResponse.ts b/libs/common/src/models/response/organization-sponsorship-sync-status.response.ts similarity index 86% rename from libs/common/src/models/response/organizationSponsorshipSyncStatusResponse.ts rename to libs/common/src/models/response/organization-sponsorship-sync-status.response.ts index b0af451b36..905c015cc5 100644 --- a/libs/common/src/models/response/organizationSponsorshipSyncStatusResponse.ts +++ b/libs/common/src/models/response/organization-sponsorship-sync-status.response.ts @@ -1,4 +1,4 @@ -import { BaseResponse } from "./baseResponse"; +import { BaseResponse } from "./base.response"; export class OrganizationSponsorshipSyncStatusResponse extends BaseResponse { lastSyncDate?: Date; diff --git a/libs/common/src/models/response/organizationSubscriptionResponse.ts b/libs/common/src/models/response/organization-subscription.response.ts similarity index 90% rename from libs/common/src/models/response/organizationSubscriptionResponse.ts rename to libs/common/src/models/response/organization-subscription.response.ts index 1985dc6eec..ce412a987b 100644 --- a/libs/common/src/models/response/organizationSubscriptionResponse.ts +++ b/libs/common/src/models/response/organization-subscription.response.ts @@ -1,8 +1,8 @@ -import { OrganizationResponse } from "./organizationResponse"; +import { OrganizationResponse } from "./organization.response"; import { BillingSubscriptionResponse, BillingSubscriptionUpcomingInvoiceResponse, -} from "./subscriptionResponse"; +} from "./subscription.response"; export class OrganizationSubscriptionResponse extends OrganizationResponse { storageName: string; diff --git a/libs/common/src/models/response/organizationUserBulkPublicKeyResponse.ts b/libs/common/src/models/response/organization-user-bulk-public-key.response.ts similarity index 87% rename from libs/common/src/models/response/organizationUserBulkPublicKeyResponse.ts rename to libs/common/src/models/response/organization-user-bulk-public-key.response.ts index 1b77e0367c..ea611219a2 100644 --- a/libs/common/src/models/response/organizationUserBulkPublicKeyResponse.ts +++ b/libs/common/src/models/response/organization-user-bulk-public-key.response.ts @@ -1,4 +1,4 @@ -import { BaseResponse } from "./baseResponse"; +import { BaseResponse } from "./base.response"; export class OrganizationUserBulkPublicKeyResponse extends BaseResponse { id: string; diff --git a/libs/common/src/models/response/organizationUserBulkResponse.ts b/libs/common/src/models/response/organization-user-bulk.response.ts similarity index 84% rename from libs/common/src/models/response/organizationUserBulkResponse.ts rename to libs/common/src/models/response/organization-user-bulk.response.ts index 15c6f371a4..577c2b7dca 100644 --- a/libs/common/src/models/response/organizationUserBulkResponse.ts +++ b/libs/common/src/models/response/organization-user-bulk.response.ts @@ -1,4 +1,4 @@ -import { BaseResponse } from "./baseResponse"; +import { BaseResponse } from "./base.response"; export class OrganizationUserBulkResponse extends BaseResponse { id: string; diff --git a/libs/common/src/models/response/organizationUserResponse.ts b/libs/common/src/models/response/organization-user.response.ts similarity index 95% rename from libs/common/src/models/response/organizationUserResponse.ts rename to libs/common/src/models/response/organization-user.response.ts index ddfe52a4cc..0a92a1fdce 100644 --- a/libs/common/src/models/response/organizationUserResponse.ts +++ b/libs/common/src/models/response/organization-user.response.ts @@ -3,8 +3,8 @@ import { OrganizationUserStatusType } from "../../enums/organizationUserStatusTy import { OrganizationUserType } from "../../enums/organizationUserType"; import { PermissionsApi } from "../api/permissions.api"; -import { BaseResponse } from "./baseResponse"; -import { SelectionReadOnlyResponse } from "./selectionReadOnlyResponse"; +import { BaseResponse } from "./base.response"; +import { SelectionReadOnlyResponse } from "./selection-read-only.response"; export class OrganizationUserResponse extends BaseResponse { id: string; diff --git a/libs/common/src/models/response/organizationResponse.ts b/libs/common/src/models/response/organization.response.ts similarity index 96% rename from libs/common/src/models/response/organizationResponse.ts rename to libs/common/src/models/response/organization.response.ts index addb2a2839..1723ed7cfb 100644 --- a/libs/common/src/models/response/organizationResponse.ts +++ b/libs/common/src/models/response/organization.response.ts @@ -1,7 +1,7 @@ import { PlanType } from "../../enums/planType"; -import { BaseResponse } from "./baseResponse"; -import { PlanResponse } from "./planResponse"; +import { BaseResponse } from "./base.response"; +import { PlanResponse } from "./plan.response"; export class OrganizationResponse extends BaseResponse { id: string; diff --git a/libs/common/src/models/response/organization/organizationSsoResponse.ts b/libs/common/src/models/response/organization/organization-sso.response.ts similarity index 95% rename from libs/common/src/models/response/organization/organizationSsoResponse.ts rename to libs/common/src/models/response/organization/organization-sso.response.ts index 9cdd189087..cf669cd359 100644 --- a/libs/common/src/models/response/organization/organizationSsoResponse.ts +++ b/libs/common/src/models/response/organization/organization-sso.response.ts @@ -1,5 +1,5 @@ import { SsoConfigApi } from "../../api/sso-config.api"; -import { BaseResponse } from "../baseResponse"; +import { BaseResponse } from "../base.response"; export class OrganizationSsoResponse extends BaseResponse { enabled: boolean; diff --git a/libs/common/src/models/response/passwordHistoryResponse.ts b/libs/common/src/models/response/password-history.response.ts similarity index 85% rename from libs/common/src/models/response/passwordHistoryResponse.ts rename to libs/common/src/models/response/password-history.response.ts index f3a8a13324..16c0623215 100644 --- a/libs/common/src/models/response/passwordHistoryResponse.ts +++ b/libs/common/src/models/response/password-history.response.ts @@ -1,4 +1,4 @@ -import { BaseResponse } from "./baseResponse"; +import { BaseResponse } from "./base.response"; export class PasswordHistoryResponse extends BaseResponse { password: string; diff --git a/libs/common/src/models/response/paymentResponse.ts b/libs/common/src/models/response/payment.response.ts similarity index 83% rename from libs/common/src/models/response/paymentResponse.ts rename to libs/common/src/models/response/payment.response.ts index ec4977cd52..4a6a43aa2d 100644 --- a/libs/common/src/models/response/paymentResponse.ts +++ b/libs/common/src/models/response/payment.response.ts @@ -1,5 +1,5 @@ -import { BaseResponse } from "./baseResponse"; -import { ProfileResponse } from "./profileResponse"; +import { BaseResponse } from "./base.response"; +import { ProfileResponse } from "./profile.response"; export class PaymentResponse extends BaseResponse { userProfile: ProfileResponse; diff --git a/libs/common/src/models/response/planResponse.ts b/libs/common/src/models/response/plan.response.ts similarity index 98% rename from libs/common/src/models/response/planResponse.ts rename to libs/common/src/models/response/plan.response.ts index 04652542c9..fcb23b5a13 100644 --- a/libs/common/src/models/response/planResponse.ts +++ b/libs/common/src/models/response/plan.response.ts @@ -1,7 +1,7 @@ import { PlanType } from "../../enums/planType"; import { ProductType } from "../../enums/productType"; -import { BaseResponse } from "./baseResponse"; +import { BaseResponse } from "./base.response"; export class PlanResponse extends BaseResponse { type: PlanType; diff --git a/libs/common/src/models/response/policyResponse.ts b/libs/common/src/models/response/policy.response.ts similarity index 91% rename from libs/common/src/models/response/policyResponse.ts rename to libs/common/src/models/response/policy.response.ts index d38375efad..1429d74c11 100644 --- a/libs/common/src/models/response/policyResponse.ts +++ b/libs/common/src/models/response/policy.response.ts @@ -1,6 +1,6 @@ import { PolicyType } from "../../enums/policyType"; -import { BaseResponse } from "./baseResponse"; +import { BaseResponse } from "./base.response"; export class PolicyResponse extends BaseResponse { id: string; diff --git a/libs/common/src/models/response/preloginResponse.ts b/libs/common/src/models/response/prelogin.response.ts similarity index 86% rename from libs/common/src/models/response/preloginResponse.ts rename to libs/common/src/models/response/prelogin.response.ts index 7756f8ed3a..18c3ff73fc 100644 --- a/libs/common/src/models/response/preloginResponse.ts +++ b/libs/common/src/models/response/prelogin.response.ts @@ -1,6 +1,6 @@ import { KdfType } from "../../enums/kdfType"; -import { BaseResponse } from "./baseResponse"; +import { BaseResponse } from "./base.response"; export class PreloginResponse extends BaseResponse { kdf: KdfType; diff --git a/libs/common/src/models/response/profileOrganizationResponse.ts b/libs/common/src/models/response/profile-organization.response.ts similarity index 98% rename from libs/common/src/models/response/profileOrganizationResponse.ts rename to libs/common/src/models/response/profile-organization.response.ts index 37f276dac5..34d72b10d4 100644 --- a/libs/common/src/models/response/profileOrganizationResponse.ts +++ b/libs/common/src/models/response/profile-organization.response.ts @@ -3,7 +3,7 @@ import { OrganizationUserType } from "../../enums/organizationUserType"; import { ProductType } from "../../enums/productType"; import { PermissionsApi } from "../api/permissions.api"; -import { BaseResponse } from "./baseResponse"; +import { BaseResponse } from "./base.response"; export class ProfileOrganizationResponse extends BaseResponse { id: string; diff --git a/libs/common/src/models/response/profileProviderOrganizationResponse.ts b/libs/common/src/models/response/profile-provider-organization.response.ts similarity index 69% rename from libs/common/src/models/response/profileProviderOrganizationResponse.ts rename to libs/common/src/models/response/profile-provider-organization.response.ts index 74b74c0033..89c14e9a4d 100644 --- a/libs/common/src/models/response/profileProviderOrganizationResponse.ts +++ b/libs/common/src/models/response/profile-provider-organization.response.ts @@ -1,4 +1,4 @@ -import { ProfileOrganizationResponse } from "./profileOrganizationResponse"; +import { ProfileOrganizationResponse } from "./profile-organization.response"; export class ProfileProviderOrganizationResponse extends ProfileOrganizationResponse { constructor(response: any) { diff --git a/libs/common/src/models/response/profileProviderResponse.ts b/libs/common/src/models/response/profile-provider.response.ts similarity index 95% rename from libs/common/src/models/response/profileProviderResponse.ts rename to libs/common/src/models/response/profile-provider.response.ts index d834e3c14a..665a202690 100644 --- a/libs/common/src/models/response/profileProviderResponse.ts +++ b/libs/common/src/models/response/profile-provider.response.ts @@ -2,7 +2,7 @@ import { ProviderUserStatusType } from "../../enums/providerUserStatusType"; import { ProviderUserType } from "../../enums/providerUserType"; import { PermissionsApi } from "../api/permissions.api"; -import { BaseResponse } from "./baseResponse"; +import { BaseResponse } from "./base.response"; export class ProfileProviderResponse extends BaseResponse { id: string; diff --git a/libs/common/src/models/response/profileResponse.ts b/libs/common/src/models/response/profile.response.ts similarity index 88% rename from libs/common/src/models/response/profileResponse.ts rename to libs/common/src/models/response/profile.response.ts index 80eb985f44..a8d50ffa4b 100644 --- a/libs/common/src/models/response/profileResponse.ts +++ b/libs/common/src/models/response/profile.response.ts @@ -1,7 +1,7 @@ -import { BaseResponse } from "./baseResponse"; -import { ProfileOrganizationResponse } from "./profileOrganizationResponse"; -import { ProfileProviderOrganizationResponse } from "./profileProviderOrganizationResponse"; -import { ProfileProviderResponse } from "./profileProviderResponse"; +import { BaseResponse } from "./base.response"; +import { ProfileOrganizationResponse } from "./profile-organization.response"; +import { ProfileProviderOrganizationResponse } from "./profile-provider-organization.response"; +import { ProfileProviderResponse } from "./profile-provider.response"; export class ProfileResponse extends BaseResponse { id: string; diff --git a/libs/common/src/models/response/provider/providerOrganizationResponse.ts b/libs/common/src/models/response/provider/provider-organization.response.ts similarity index 95% rename from libs/common/src/models/response/provider/providerOrganizationResponse.ts rename to libs/common/src/models/response/provider/provider-organization.response.ts index 959ae8065b..e0e011f486 100644 --- a/libs/common/src/models/response/provider/providerOrganizationResponse.ts +++ b/libs/common/src/models/response/provider/provider-organization.response.ts @@ -1,4 +1,4 @@ -import { BaseResponse } from "../baseResponse"; +import { BaseResponse } from "../base.response"; export class ProviderOrganizationResponse extends BaseResponse { id: string; diff --git a/libs/common/src/models/response/provider/providerUserBulkPublicKeyResponse.ts b/libs/common/src/models/response/provider/provider-user-bulk-public-key.response.ts similarity index 80% rename from libs/common/src/models/response/provider/providerUserBulkPublicKeyResponse.ts rename to libs/common/src/models/response/provider/provider-user-bulk-public-key.response.ts index ad078f9821..f5bdc9fe19 100644 --- a/libs/common/src/models/response/provider/providerUserBulkPublicKeyResponse.ts +++ b/libs/common/src/models/response/provider/provider-user-bulk-public-key.response.ts @@ -1,3 +1,3 @@ -import { OrganizationUserBulkPublicKeyResponse } from "../organizationUserBulkPublicKeyResponse"; +import { OrganizationUserBulkPublicKeyResponse } from "../organization-user-bulk-public-key.response"; export class ProviderUserBulkPublicKeyResponse extends OrganizationUserBulkPublicKeyResponse {} diff --git a/libs/common/src/models/response/provider/providerUserBulkResponse.ts b/libs/common/src/models/response/provider/provider-user-bulk.response.ts similarity index 83% rename from libs/common/src/models/response/provider/providerUserBulkResponse.ts rename to libs/common/src/models/response/provider/provider-user-bulk.response.ts index 6cf12f96c4..25804346f2 100644 --- a/libs/common/src/models/response/provider/providerUserBulkResponse.ts +++ b/libs/common/src/models/response/provider/provider-user-bulk.response.ts @@ -1,4 +1,4 @@ -import { BaseResponse } from "../baseResponse"; +import { BaseResponse } from "../base.response"; export class ProviderUserBulkResponse extends BaseResponse { id: string; diff --git a/libs/common/src/models/response/provider/providerUserResponse.ts b/libs/common/src/models/response/provider/provider-user.response.ts similarity index 95% rename from libs/common/src/models/response/provider/providerUserResponse.ts rename to libs/common/src/models/response/provider/provider-user.response.ts index 6091cc9061..a1a2ed50a8 100644 --- a/libs/common/src/models/response/provider/providerUserResponse.ts +++ b/libs/common/src/models/response/provider/provider-user.response.ts @@ -1,7 +1,7 @@ import { ProviderUserStatusType } from "../../../enums/providerUserStatusType"; import { ProviderUserType } from "../../../enums/providerUserType"; import { PermissionsApi } from "../../api/permissions.api"; -import { BaseResponse } from "../baseResponse"; +import { BaseResponse } from "../base.response"; export class ProviderUserResponse extends BaseResponse { id: string; diff --git a/libs/common/src/models/response/provider/providerResponse.ts b/libs/common/src/models/response/provider/provider.response.ts similarity index 89% rename from libs/common/src/models/response/provider/providerResponse.ts rename to libs/common/src/models/response/provider/provider.response.ts index 2b8729fa9c..95d038cb96 100644 --- a/libs/common/src/models/response/provider/providerResponse.ts +++ b/libs/common/src/models/response/provider/provider.response.ts @@ -1,4 +1,4 @@ -import { BaseResponse } from "../baseResponse"; +import { BaseResponse } from "../base.response"; export class ProviderResponse extends BaseResponse { id: string; diff --git a/libs/common/src/models/response/selectionReadOnlyResponse.ts b/libs/common/src/models/response/selection-read-only.response.ts similarity index 88% rename from libs/common/src/models/response/selectionReadOnlyResponse.ts rename to libs/common/src/models/response/selection-read-only.response.ts index cee9361c50..e62fcf01a6 100644 --- a/libs/common/src/models/response/selectionReadOnlyResponse.ts +++ b/libs/common/src/models/response/selection-read-only.response.ts @@ -1,4 +1,4 @@ -import { BaseResponse } from "./baseResponse"; +import { BaseResponse } from "./base.response"; export class SelectionReadOnlyResponse extends BaseResponse { id: string; diff --git a/libs/common/src/models/response/sendAccessResponse.ts b/libs/common/src/models/response/send-access.response.ts similarity index 95% rename from libs/common/src/models/response/sendAccessResponse.ts rename to libs/common/src/models/response/send-access.response.ts index f500c86b49..f53ebaef31 100644 --- a/libs/common/src/models/response/sendAccessResponse.ts +++ b/libs/common/src/models/response/send-access.response.ts @@ -2,7 +2,7 @@ import { SendType } from "../../enums/sendType"; import { SendFileApi } from "../api/send-file.api"; import { SendTextApi } from "../api/send-text.api"; -import { BaseResponse } from "./baseResponse"; +import { BaseResponse } from "./base.response"; export class SendAccessResponse extends BaseResponse { id: string; diff --git a/libs/common/src/models/response/sendFileDownloadDataResponse.ts b/libs/common/src/models/response/send-file-download-data.response.ts similarity index 84% rename from libs/common/src/models/response/sendFileDownloadDataResponse.ts rename to libs/common/src/models/response/send-file-download-data.response.ts index ca2575a24c..982a7e39f7 100644 --- a/libs/common/src/models/response/sendFileDownloadDataResponse.ts +++ b/libs/common/src/models/response/send-file-download-data.response.ts @@ -1,4 +1,4 @@ -import { BaseResponse } from "./baseResponse"; +import { BaseResponse } from "./base.response"; export class SendFileDownloadDataResponse extends BaseResponse { id: string = null; diff --git a/libs/common/src/models/response/sendFileUploadDataResponse.ts b/libs/common/src/models/response/send-file-upload-data.response.ts similarity index 84% rename from libs/common/src/models/response/sendFileUploadDataResponse.ts rename to libs/common/src/models/response/send-file-upload-data.response.ts index b787f2ccc7..f9d1ba9a60 100644 --- a/libs/common/src/models/response/sendFileUploadDataResponse.ts +++ b/libs/common/src/models/response/send-file-upload-data.response.ts @@ -1,7 +1,7 @@ import { FileUploadType } from "../../enums/fileUploadType"; -import { BaseResponse } from "./baseResponse"; -import { SendResponse } from "./sendResponse"; +import { BaseResponse } from "./base.response"; +import { SendResponse } from "./send.response"; export class SendFileUploadDataResponse extends BaseResponse { fileUploadType: FileUploadType; diff --git a/libs/common/src/models/response/sendResponse.ts b/libs/common/src/models/response/send.response.ts similarity index 97% rename from libs/common/src/models/response/sendResponse.ts rename to libs/common/src/models/response/send.response.ts index 89ccdb6da7..77554864c1 100644 --- a/libs/common/src/models/response/sendResponse.ts +++ b/libs/common/src/models/response/send.response.ts @@ -2,7 +2,7 @@ import { SendType } from "../../enums/sendType"; import { SendFileApi } from "../api/send-file.api"; import { SendTextApi } from "../api/send-text.api"; -import { BaseResponse } from "./baseResponse"; +import { BaseResponse } from "./base.response"; export class SendResponse extends BaseResponse { id: string; diff --git a/libs/common/src/models/response/server-config-response.ts b/libs/common/src/models/response/server-config.response.ts similarity index 96% rename from libs/common/src/models/response/server-config-response.ts rename to libs/common/src/models/response/server-config.response.ts index c296292f30..1d6f8ffe1b 100644 --- a/libs/common/src/models/response/server-config-response.ts +++ b/libs/common/src/models/response/server-config.response.ts @@ -1,4 +1,4 @@ -import { BaseResponse } from "./baseResponse"; +import { BaseResponse } from "./base.response"; export class ServerConfigResponse extends BaseResponse { version: string; diff --git a/libs/common/src/models/response/ssoPreValidateResponse.ts b/libs/common/src/models/response/sso-pre-validate.response.ts similarity index 79% rename from libs/common/src/models/response/ssoPreValidateResponse.ts rename to libs/common/src/models/response/sso-pre-validate.response.ts index 1b403e522c..a38e99a1b1 100644 --- a/libs/common/src/models/response/ssoPreValidateResponse.ts +++ b/libs/common/src/models/response/sso-pre-validate.response.ts @@ -1,4 +1,4 @@ -import { BaseResponse } from "./baseResponse"; +import { BaseResponse } from "./base.response"; export class SsoPreValidateResponse extends BaseResponse { token: string; diff --git a/libs/common/src/models/response/subscriptionResponse.ts b/libs/common/src/models/response/subscription.response.ts similarity index 98% rename from libs/common/src/models/response/subscriptionResponse.ts rename to libs/common/src/models/response/subscription.response.ts index fc5570c3e0..1b5f57a32d 100644 --- a/libs/common/src/models/response/subscriptionResponse.ts +++ b/libs/common/src/models/response/subscription.response.ts @@ -1,4 +1,4 @@ -import { BaseResponse } from "./baseResponse"; +import { BaseResponse } from "./base.response"; export class SubscriptionResponse extends BaseResponse { storageName: string; diff --git a/libs/common/src/models/response/syncResponse.ts b/libs/common/src/models/response/sync.response.ts similarity index 77% rename from libs/common/src/models/response/syncResponse.ts rename to libs/common/src/models/response/sync.response.ts index cab3ff2e7f..e2a39bb103 100644 --- a/libs/common/src/models/response/syncResponse.ts +++ b/libs/common/src/models/response/sync.response.ts @@ -1,11 +1,11 @@ -import { BaseResponse } from "./baseResponse"; -import { CipherResponse } from "./cipherResponse"; -import { CollectionDetailsResponse } from "./collectionResponse"; -import { DomainsResponse } from "./domainsResponse"; -import { FolderResponse } from "./folderResponse"; -import { PolicyResponse } from "./policyResponse"; -import { ProfileResponse } from "./profileResponse"; -import { SendResponse } from "./sendResponse"; +import { BaseResponse } from "./base.response"; +import { CipherResponse } from "./cipher.response"; +import { CollectionDetailsResponse } from "./collection.response"; +import { DomainsResponse } from "./domains.response"; +import { FolderResponse } from "./folder.response"; +import { PolicyResponse } from "./policy.response"; +import { ProfileResponse } from "./profile.response"; +import { SendResponse } from "./send.response"; export class SyncResponse extends BaseResponse { profile?: ProfileResponse; diff --git a/libs/common/src/models/response/taxInfoResponse.ts b/libs/common/src/models/response/tax-info.response.ts similarity index 93% rename from libs/common/src/models/response/taxInfoResponse.ts rename to libs/common/src/models/response/tax-info.response.ts index bb4693ca66..8886ad5ce7 100644 --- a/libs/common/src/models/response/taxInfoResponse.ts +++ b/libs/common/src/models/response/tax-info.response.ts @@ -1,4 +1,4 @@ -import { BaseResponse } from "./baseResponse"; +import { BaseResponse } from "./base.response"; export class TaxInfoResponse extends BaseResponse { taxId: string; diff --git a/libs/common/src/models/response/taxRateResponse.ts b/libs/common/src/models/response/tax-rate.response.ts similarity index 90% rename from libs/common/src/models/response/taxRateResponse.ts rename to libs/common/src/models/response/tax-rate.response.ts index 28274a50f6..5bc9608f65 100644 --- a/libs/common/src/models/response/taxRateResponse.ts +++ b/libs/common/src/models/response/tax-rate.response.ts @@ -1,4 +1,4 @@ -import { BaseResponse } from "./baseResponse"; +import { BaseResponse } from "./base.response"; export class TaxRateResponse extends BaseResponse { id: string; diff --git a/libs/common/src/models/response/twoFactorAuthenticatorResponse.ts b/libs/common/src/models/response/two-factor-authenticator.response.ts similarity index 84% rename from libs/common/src/models/response/twoFactorAuthenticatorResponse.ts rename to libs/common/src/models/response/two-factor-authenticator.response.ts index 8eb73eaa93..e3ffcd81e8 100644 --- a/libs/common/src/models/response/twoFactorAuthenticatorResponse.ts +++ b/libs/common/src/models/response/two-factor-authenticator.response.ts @@ -1,4 +1,4 @@ -import { BaseResponse } from "./baseResponse"; +import { BaseResponse } from "./base.response"; export class TwoFactorAuthenticatorResponse extends BaseResponse { enabled: boolean; diff --git a/libs/common/src/models/response/twoFactorDuoResponse.ts b/libs/common/src/models/response/two-factor-duo.response.ts similarity index 90% rename from libs/common/src/models/response/twoFactorDuoResponse.ts rename to libs/common/src/models/response/two-factor-duo.response.ts index 401de79688..cdf2966240 100644 --- a/libs/common/src/models/response/twoFactorDuoResponse.ts +++ b/libs/common/src/models/response/two-factor-duo.response.ts @@ -1,4 +1,4 @@ -import { BaseResponse } from "./baseResponse"; +import { BaseResponse } from "./base.response"; export class TwoFactorDuoResponse extends BaseResponse { enabled: boolean; diff --git a/libs/common/src/models/response/twoFactorEmailResponse.ts b/libs/common/src/models/response/two-factor-email.response.ts similarity index 84% rename from libs/common/src/models/response/twoFactorEmailResponse.ts rename to libs/common/src/models/response/two-factor-email.response.ts index ad1936d33c..365a8cfc03 100644 --- a/libs/common/src/models/response/twoFactorEmailResponse.ts +++ b/libs/common/src/models/response/two-factor-email.response.ts @@ -1,4 +1,4 @@ -import { BaseResponse } from "./baseResponse"; +import { BaseResponse } from "./base.response"; export class TwoFactorEmailResponse extends BaseResponse { enabled: boolean; diff --git a/libs/common/src/models/response/twoFactorProviderResponse.ts b/libs/common/src/models/response/two-factor-provider.response.ts similarity index 88% rename from libs/common/src/models/response/twoFactorProviderResponse.ts rename to libs/common/src/models/response/two-factor-provider.response.ts index 4ccd86cb6d..b735a4fbf3 100644 --- a/libs/common/src/models/response/twoFactorProviderResponse.ts +++ b/libs/common/src/models/response/two-factor-provider.response.ts @@ -1,6 +1,6 @@ import { TwoFactorProviderType } from "../../enums/twoFactorProviderType"; -import { BaseResponse } from "./baseResponse"; +import { BaseResponse } from "./base.response"; export class TwoFactorProviderResponse extends BaseResponse { enabled: boolean; diff --git a/libs/common/src/models/response/twoFactorRescoverResponse.ts b/libs/common/src/models/response/two-factor-recover.response.ts similarity index 79% rename from libs/common/src/models/response/twoFactorRescoverResponse.ts rename to libs/common/src/models/response/two-factor-recover.response.ts index 0e26db9b53..df2249d067 100644 --- a/libs/common/src/models/response/twoFactorRescoverResponse.ts +++ b/libs/common/src/models/response/two-factor-recover.response.ts @@ -1,4 +1,4 @@ -import { BaseResponse } from "./baseResponse"; +import { BaseResponse } from "./base.response"; export class TwoFactorRecoverResponse extends BaseResponse { code: string; diff --git a/libs/common/src/models/response/twoFactorWebAuthnResponse.ts b/libs/common/src/models/response/two-factor-web-authn.response.ts similarity index 97% rename from libs/common/src/models/response/twoFactorWebAuthnResponse.ts rename to libs/common/src/models/response/two-factor-web-authn.response.ts index 21ab66a036..61c5a56245 100644 --- a/libs/common/src/models/response/twoFactorWebAuthnResponse.ts +++ b/libs/common/src/models/response/two-factor-web-authn.response.ts @@ -1,6 +1,6 @@ import { Utils } from "../../misc/utils"; -import { BaseResponse } from "./baseResponse"; +import { BaseResponse } from "./base.response"; export class TwoFactorWebAuthnResponse extends BaseResponse { enabled: boolean; diff --git a/libs/common/src/models/response/twoFactorYubiKeyResponse.ts b/libs/common/src/models/response/two-factor-yubi-key.response.ts similarity index 92% rename from libs/common/src/models/response/twoFactorYubiKeyResponse.ts rename to libs/common/src/models/response/two-factor-yubi-key.response.ts index ee75074b24..a7bcf12b87 100644 --- a/libs/common/src/models/response/twoFactorYubiKeyResponse.ts +++ b/libs/common/src/models/response/two-factor-yubi-key.response.ts @@ -1,4 +1,4 @@ -import { BaseResponse } from "./baseResponse"; +import { BaseResponse } from "./base.response"; export class TwoFactorYubiKeyResponse extends BaseResponse { enabled: boolean; diff --git a/libs/common/src/models/response/userKeyResponse.ts b/libs/common/src/models/response/user-key.response.ts similarity index 84% rename from libs/common/src/models/response/userKeyResponse.ts rename to libs/common/src/models/response/user-key.response.ts index 5550abdf08..f712a0a53b 100644 --- a/libs/common/src/models/response/userKeyResponse.ts +++ b/libs/common/src/models/response/user-key.response.ts @@ -1,4 +1,4 @@ -import { BaseResponse } from "./baseResponse"; +import { BaseResponse } from "./base.response"; export class UserKeyResponse extends BaseResponse { userId: string; diff --git a/libs/common/src/models/view/collection.view.ts b/libs/common/src/models/view/collection.view.ts index e585a0d855..259a8e9b85 100644 --- a/libs/common/src/models/view/collection.view.ts +++ b/libs/common/src/models/view/collection.view.ts @@ -1,6 +1,6 @@ import { Collection } from "../domain/collection"; import { ITreeNodeObject } from "../domain/tree-node"; -import { CollectionGroupDetailsResponse } from "../response/collectionResponse"; +import { CollectionGroupDetailsResponse } from "../response/collection.response"; import { View } from "./view"; diff --git a/libs/common/src/services/account/account-api.service.ts b/libs/common/src/services/account/account-api.service.ts index 98cb84aecf..ffc032eb9f 100644 --- a/libs/common/src/services/account/account-api.service.ts +++ b/libs/common/src/services/account/account-api.service.ts @@ -1,6 +1,6 @@ import { AccountApiService as AccountApiServiceAbstraction } from "../../abstractions/account/account-api.service.abstraction"; import { ApiService } from "../../abstractions/api.service"; -import { SecretVerificationRequest } from "../../models/request/secretVerificationRequest"; +import { SecretVerificationRequest } from "../../models/request/secret-verification.request"; export class AccountApiService implements AccountApiServiceAbstraction { constructor(private apiService: ApiService) {} diff --git a/libs/common/src/services/anonymousHub.service.ts b/libs/common/src/services/anonymousHub.service.ts index d0a069414a..413f100b42 100644 --- a/libs/common/src/services/anonymousHub.service.ts +++ b/libs/common/src/services/anonymousHub.service.ts @@ -15,7 +15,7 @@ import { LogService } from "../abstractions/log.service"; import { AuthRequestPushNotification, NotificationResponse, -} from "./../models/response/notificationResponse"; +} from "./../models/response/notification.response"; @Injectable() export class AnonymousHubService implements AnonymousHubServiceAbstraction { diff --git a/libs/common/src/services/api.service.ts b/libs/common/src/services/api.service.ts index a9c8e00dab..938cd1b9e6 100644 --- a/libs/common/src/services/api.service.ts +++ b/libs/common/src/services/api.service.ts @@ -6,169 +6,169 @@ import { TokenService } from "../abstractions/token.service"; import { DeviceType } from "../enums/deviceType"; import { OrganizationConnectionType } from "../enums/organizationConnectionType"; import { Utils } from "../misc/utils"; -import { SetKeyConnectorKeyRequest } from "../models/request/account/setKeyConnectorKeyRequest"; -import { AttachmentRequest } from "../models/request/attachmentRequest"; -import { BitPayInvoiceRequest } from "../models/request/bitPayInvoiceRequest"; -import { CipherBulkDeleteRequest } from "../models/request/cipherBulkDeleteRequest"; -import { CipherBulkMoveRequest } from "../models/request/cipherBulkMoveRequest"; -import { CipherBulkShareRequest } from "../models/request/cipherBulkShareRequest"; -import { CipherCollectionsRequest } from "../models/request/cipherCollectionsRequest"; -import { CipherCreateRequest } from "../models/request/cipherCreateRequest"; -import { CipherRequest } from "../models/request/cipherRequest"; -import { CipherShareRequest } from "../models/request/cipherShareRequest"; -import { CollectionRequest } from "../models/request/collectionRequest"; -import { DeleteRecoverRequest } from "../models/request/deleteRecoverRequest"; -import { DeviceRequest } from "../models/request/deviceRequest"; -import { DeviceVerificationRequest } from "../models/request/deviceVerificationRequest"; -import { EmailRequest } from "../models/request/emailRequest"; -import { EmailTokenRequest } from "../models/request/emailTokenRequest"; -import { EmergencyAccessAcceptRequest } from "../models/request/emergencyAccessAcceptRequest"; -import { EmergencyAccessConfirmRequest } from "../models/request/emergencyAccessConfirmRequest"; -import { EmergencyAccessInviteRequest } from "../models/request/emergencyAccessInviteRequest"; -import { EmergencyAccessPasswordRequest } from "../models/request/emergencyAccessPasswordRequest"; -import { EmergencyAccessUpdateRequest } from "../models/request/emergencyAccessUpdateRequest"; -import { EventRequest } from "../models/request/eventRequest"; -import { GroupRequest } from "../models/request/groupRequest"; -import { IapCheckRequest } from "../models/request/iapCheckRequest"; -import { ApiTokenRequest } from "../models/request/identityToken/apiTokenRequest"; -import { PasswordTokenRequest } from "../models/request/identityToken/passwordTokenRequest"; -import { SsoTokenRequest } from "../models/request/identityToken/ssoTokenRequest"; -import { TokenRequestTwoFactor } from "../models/request/identityToken/tokenRequestTwoFactor"; -import { ImportCiphersRequest } from "../models/request/importCiphersRequest"; -import { ImportOrganizationCiphersRequest } from "../models/request/importOrganizationCiphersRequest"; -import { KdfRequest } from "../models/request/kdfRequest"; -import { KeyConnectorUserKeyRequest } from "../models/request/keyConnectorUserKeyRequest"; -import { KeysRequest } from "../models/request/keysRequest"; -import { OrganizationSponsorshipCreateRequest } from "../models/request/organization/organizationSponsorshipCreateRequest"; -import { OrganizationSponsorshipRedeemRequest } from "../models/request/organization/organizationSponsorshipRedeemRequest"; -import { OrganizationConnectionRequest } from "../models/request/organizationConnectionRequest"; -import { OrganizationImportRequest } from "../models/request/organizationImportRequest"; -import { OrganizationUserAcceptRequest } from "../models/request/organizationUserAcceptRequest"; -import { OrganizationUserBulkConfirmRequest } from "../models/request/organizationUserBulkConfirmRequest"; -import { OrganizationUserBulkRequest } from "../models/request/organizationUserBulkRequest"; -import { OrganizationUserConfirmRequest } from "../models/request/organizationUserConfirmRequest"; -import { OrganizationUserInviteRequest } from "../models/request/organizationUserInviteRequest"; -import { OrganizationUserResetPasswordEnrollmentRequest } from "../models/request/organizationUserResetPasswordEnrollmentRequest"; -import { OrganizationUserResetPasswordRequest } from "../models/request/organizationUserResetPasswordRequest"; -import { OrganizationUserUpdateGroupsRequest } from "../models/request/organizationUserUpdateGroupsRequest"; -import { OrganizationUserUpdateRequest } from "../models/request/organizationUserUpdateRequest"; -import { PasswordHintRequest } from "../models/request/passwordHintRequest"; -import { PasswordRequest } from "../models/request/passwordRequest"; -import { PasswordlessCreateAuthRequest } from "../models/request/passwordlessCreateAuthRequest"; -import { PaymentRequest } from "../models/request/paymentRequest"; -import { PreloginRequest } from "../models/request/preloginRequest"; -import { ProviderAddOrganizationRequest } from "../models/request/provider/providerAddOrganizationRequest"; -import { ProviderOrganizationCreateRequest } from "../models/request/provider/providerOrganizationCreateRequest"; -import { ProviderSetupRequest } from "../models/request/provider/providerSetupRequest"; -import { ProviderUpdateRequest } from "../models/request/provider/providerUpdateRequest"; -import { ProviderUserAcceptRequest } from "../models/request/provider/providerUserAcceptRequest"; -import { ProviderUserBulkConfirmRequest } from "../models/request/provider/providerUserBulkConfirmRequest"; -import { ProviderUserBulkRequest } from "../models/request/provider/providerUserBulkRequest"; -import { ProviderUserConfirmRequest } from "../models/request/provider/providerUserConfirmRequest"; -import { ProviderUserInviteRequest } from "../models/request/provider/providerUserInviteRequest"; -import { ProviderUserUpdateRequest } from "../models/request/provider/providerUserUpdateRequest"; -import { RegisterRequest } from "../models/request/registerRequest"; -import { SecretVerificationRequest } from "../models/request/secretVerificationRequest"; -import { SelectionReadOnlyRequest } from "../models/request/selectionReadOnlyRequest"; -import { SendAccessRequest } from "../models/request/sendAccessRequest"; -import { SendRequest } from "../models/request/sendRequest"; -import { SetPasswordRequest } from "../models/request/setPasswordRequest"; -import { StorageRequest } from "../models/request/storageRequest"; -import { TaxInfoUpdateRequest } from "../models/request/taxInfoUpdateRequest"; -import { TwoFactorEmailRequest } from "../models/request/twoFactorEmailRequest"; -import { TwoFactorProviderRequest } from "../models/request/twoFactorProviderRequest"; -import { TwoFactorRecoveryRequest } from "../models/request/twoFactorRecoveryRequest"; -import { UpdateDomainsRequest } from "../models/request/updateDomainsRequest"; -import { UpdateKeyRequest } from "../models/request/updateKeyRequest"; -import { UpdateProfileRequest } from "../models/request/updateProfileRequest"; -import { UpdateTempPasswordRequest } from "../models/request/updateTempPasswordRequest"; -import { UpdateTwoFactorAuthenticatorRequest } from "../models/request/updateTwoFactorAuthenticatorRequest"; -import { UpdateTwoFactorDuoRequest } from "../models/request/updateTwoFactorDuoRequest"; -import { UpdateTwoFactorEmailRequest } from "../models/request/updateTwoFactorEmailRequest"; -import { UpdateTwoFactorWebAuthnDeleteRequest } from "../models/request/updateTwoFactorWebAuthnDeleteRequest"; -import { UpdateTwoFactorWebAuthnRequest } from "../models/request/updateTwoFactorWebAuthnRequest"; -import { UpdateTwoFactorYubioOtpRequest } from "../models/request/updateTwoFactorYubioOtpRequest"; -import { VerifyDeleteRecoverRequest } from "../models/request/verifyDeleteRecoverRequest"; -import { VerifyEmailRequest } from "../models/request/verifyEmailRequest"; -import { ApiKeyResponse } from "../models/response/apiKeyResponse"; -import { AttachmentResponse } from "../models/response/attachmentResponse"; -import { AttachmentUploadDataResponse } from "../models/response/attachmentUploadDataResponse"; -import { AuthRequestResponse } from "../models/response/authRequestResponse"; -import { RegisterResponse } from "../models/response/authentication/registerResponse"; -import { BillingHistoryResponse } from "../models/response/billingHistoryResponse"; -import { BillingPaymentResponse } from "../models/response/billingPaymentResponse"; -import { BreachAccountResponse } from "../models/response/breachAccountResponse"; -import { CipherResponse } from "../models/response/cipherResponse"; +import { SetKeyConnectorKeyRequest } from "../models/request/account/set-key-connector-key.request"; +import { AttachmentRequest } from "../models/request/attachment.request"; +import { BitPayInvoiceRequest } from "../models/request/bit-pay-invoice.request"; +import { CipherBulkDeleteRequest } from "../models/request/cipher-bulk-delete.request"; +import { CipherBulkMoveRequest } from "../models/request/cipher-bulk-move.request"; +import { CipherBulkShareRequest } from "../models/request/cipher-bulk-share.request"; +import { CipherCollectionsRequest } from "../models/request/cipher-collections.request"; +import { CipherCreateRequest } from "../models/request/cipher-create.request"; +import { CipherShareRequest } from "../models/request/cipher-share.request"; +import { CipherRequest } from "../models/request/cipher.request"; +import { CollectionRequest } from "../models/request/collection.request"; +import { DeleteRecoverRequest } from "../models/request/delete-recover.request"; +import { DeviceVerificationRequest } from "../models/request/device-verification.request"; +import { DeviceRequest } from "../models/request/device.request"; +import { EmailTokenRequest } from "../models/request/email-token.request"; +import { EmailRequest } from "../models/request/email.request"; +import { EmergencyAccessAcceptRequest } from "../models/request/emergency-access-accept.request"; +import { EmergencyAccessConfirmRequest } from "../models/request/emergency-access-confirm.request"; +import { EmergencyAccessInviteRequest } from "../models/request/emergency-access-invite.request"; +import { EmergencyAccessPasswordRequest } from "../models/request/emergency-access-password.request"; +import { EmergencyAccessUpdateRequest } from "../models/request/emergency-access-update.request"; +import { EventRequest } from "../models/request/event.request"; +import { GroupRequest } from "../models/request/group.request"; +import { IapCheckRequest } from "../models/request/iap-check.request"; +import { ApiTokenRequest } from "../models/request/identity-token/api-token.request"; +import { PasswordTokenRequest } from "../models/request/identity-token/password-token.request"; +import { SsoTokenRequest } from "../models/request/identity-token/sso-token.request"; +import { TokenTwoFactorRequest } from "../models/request/identity-token/token-two-factor.request"; +import { ImportCiphersRequest } from "../models/request/import-ciphers.request"; +import { ImportOrganizationCiphersRequest } from "../models/request/import-organization-ciphers.request"; +import { KdfRequest } from "../models/request/kdf.request"; +import { KeyConnectorUserKeyRequest } from "../models/request/key-connector-user-key.request"; +import { KeysRequest } from "../models/request/keys.request"; +import { OrganizationConnectionRequest } from "../models/request/organization-connection.request"; +import { OrganizationImportRequest } from "../models/request/organization-import.request"; +import { OrganizationUserAcceptRequest } from "../models/request/organization-user-accept.request"; +import { OrganizationUserBulkConfirmRequest } from "../models/request/organization-user-bulk-confirm.request"; +import { OrganizationUserBulkRequest } from "../models/request/organization-user-bulk.request"; +import { OrganizationUserConfirmRequest } from "../models/request/organization-user-confirm.request"; +import { OrganizationUserInviteRequest } from "../models/request/organization-user-invite.request"; +import { OrganizationUserResetPasswordEnrollmentRequest } from "../models/request/organization-user-reset-password-enrollment.request"; +import { OrganizationUserResetPasswordRequest } from "../models/request/organization-user-reset-password.request"; +import { OrganizationUserUpdateGroupsRequest } from "../models/request/organization-user-update-groups.request"; +import { OrganizationUserUpdateRequest } from "../models/request/organization-user-update.request"; +import { OrganizationSponsorshipCreateRequest } from "../models/request/organization/organization-sponsorship-create.request"; +import { OrganizationSponsorshipRedeemRequest } from "../models/request/organization/organization-sponsorship-redeem.request"; +import { PasswordHintRequest } from "../models/request/password-hint.request"; +import { PasswordRequest } from "../models/request/password.request"; +import { PasswordlessCreateAuthRequest } from "../models/request/passwordless-create-auth.request"; +import { PaymentRequest } from "../models/request/payment.request"; +import { PreloginRequest } from "../models/request/prelogin.request"; +import { ProviderAddOrganizationRequest } from "../models/request/provider/provider-add-organization.request"; +import { ProviderOrganizationCreateRequest } from "../models/request/provider/provider-organization-create.request"; +import { ProviderSetupRequest } from "../models/request/provider/provider-setup.request"; +import { ProviderUpdateRequest } from "../models/request/provider/provider-update.request"; +import { ProviderUserAcceptRequest } from "../models/request/provider/provider-user-accept.request"; +import { ProviderUserBulkConfirmRequest } from "../models/request/provider/provider-user-bulk-confirm.request"; +import { ProviderUserBulkRequest } from "../models/request/provider/provider-user-bulk.request"; +import { ProviderUserConfirmRequest } from "../models/request/provider/provider-user-confirm.request"; +import { ProviderUserInviteRequest } from "../models/request/provider/provider-user-invite.request"; +import { ProviderUserUpdateRequest } from "../models/request/provider/provider-user-update.request"; +import { RegisterRequest } from "../models/request/register.request"; +import { SecretVerificationRequest } from "../models/request/secret-verification.request"; +import { SelectionReadOnlyRequest } from "../models/request/selection-read-only.request"; +import { SendAccessRequest } from "../models/request/send-access.request"; +import { SendRequest } from "../models/request/send.request"; +import { SetPasswordRequest } from "../models/request/set-password.request"; +import { StorageRequest } from "../models/request/storage.request"; +import { TaxInfoUpdateRequest } from "../models/request/tax-info-update.request"; +import { TwoFactorEmailRequest } from "../models/request/two-factor-email.request"; +import { TwoFactorProviderRequest } from "../models/request/two-factor-provider.request"; +import { TwoFactorRecoveryRequest } from "../models/request/two-factor-recovery.request"; +import { UpdateDomainsRequest } from "../models/request/update-domains.request"; +import { UpdateKeyRequest } from "../models/request/update-key.request"; +import { UpdateProfileRequest } from "../models/request/update-profile.request"; +import { UpdateTempPasswordRequest } from "../models/request/update-temp-password.request"; +import { UpdateTwoFactorAuthenticatorRequest } from "../models/request/update-two-factor-authenticator.request"; +import { UpdateTwoFactorDuoRequest } from "../models/request/update-two-factor-duo.request"; +import { UpdateTwoFactorEmailRequest } from "../models/request/update-two-factor-email.request"; +import { UpdateTwoFactorWebAuthnDeleteRequest } from "../models/request/update-two-factor-web-authn-delete.request"; +import { UpdateTwoFactorWebAuthnRequest } from "../models/request/update-two-factor-web-authn.request"; +import { UpdateTwoFactorYubioOtpRequest } from "../models/request/update-two-factor-yubio-otp.request"; +import { VerifyDeleteRecoverRequest } from "../models/request/verify-delete-recover.request"; +import { VerifyEmailRequest } from "../models/request/verify-email.request"; +import { ApiKeyResponse } from "../models/response/api-key.response"; +import { AttachmentUploadDataResponse } from "../models/response/attachment-upload-data.response"; +import { AttachmentResponse } from "../models/response/attachment.response"; +import { AuthRequestResponse } from "../models/response/auth-request.response"; +import { RegisterResponse } from "../models/response/authentication/register.response"; +import { BillingHistoryResponse } from "../models/response/billing-history.response"; +import { BillingPaymentResponse } from "../models/response/billing-payment.response"; +import { BreachAccountResponse } from "../models/response/breach-account.response"; +import { CipherResponse } from "../models/response/cipher.response"; import { CollectionGroupDetailsResponse, CollectionResponse, -} from "../models/response/collectionResponse"; -import { DeviceVerificationResponse } from "../models/response/deviceVerificationResponse"; -import { DomainsResponse } from "../models/response/domainsResponse"; +} from "../models/response/collection.response"; +import { DeviceVerificationResponse } from "../models/response/device-verification.response"; +import { DomainsResponse } from "../models/response/domains.response"; import { EmergencyAccessGranteeDetailsResponse, EmergencyAccessGrantorDetailsResponse, EmergencyAccessTakeoverResponse, EmergencyAccessViewResponse, -} from "../models/response/emergencyAccessResponse"; -import { ErrorResponse } from "../models/response/errorResponse"; -import { EventResponse } from "../models/response/eventResponse"; -import { GroupDetailsResponse, GroupResponse } from "../models/response/groupResponse"; -import { IdentityCaptchaResponse } from "../models/response/identityCaptchaResponse"; -import { IdentityTokenResponse } from "../models/response/identityTokenResponse"; -import { IdentityTwoFactorResponse } from "../models/response/identityTwoFactorResponse"; -import { KeyConnectorUserKeyResponse } from "../models/response/keyConnectorUserKeyResponse"; -import { ListResponse } from "../models/response/listResponse"; +} from "../models/response/emergency-access.response"; +import { ErrorResponse } from "../models/response/error.response"; +import { EventResponse } from "../models/response/event.response"; +import { GroupDetailsResponse, GroupResponse } from "../models/response/group.response"; +import { IdentityCaptchaResponse } from "../models/response/identity-captcha.response"; +import { IdentityTokenResponse } from "../models/response/identity-token.response"; +import { IdentityTwoFactorResponse } from "../models/response/identity-two-factor.response"; +import { KeyConnectorUserKeyResponse } from "../models/response/key-connector-user-key.response"; +import { ListResponse } from "../models/response/list.response"; import { OrganizationConnectionConfigApis, OrganizationConnectionResponse, -} from "../models/response/organizationConnectionResponse"; -import { OrganizationExportResponse } from "../models/response/organizationExportResponse"; -import { OrganizationSponsorshipSyncStatusResponse } from "../models/response/organizationSponsorshipSyncStatusResponse"; -import { OrganizationUserBulkPublicKeyResponse } from "../models/response/organizationUserBulkPublicKeyResponse"; -import { OrganizationUserBulkResponse } from "../models/response/organizationUserBulkResponse"; +} from "../models/response/organization-connection.response"; +import { OrganizationExportResponse } from "../models/response/organization-export.response"; +import { OrganizationSponsorshipSyncStatusResponse } from "../models/response/organization-sponsorship-sync-status.response"; +import { OrganizationUserBulkPublicKeyResponse } from "../models/response/organization-user-bulk-public-key.response"; +import { OrganizationUserBulkResponse } from "../models/response/organization-user-bulk.response"; import { OrganizationUserDetailsResponse, - OrganizationUserResetPasswordDetailsReponse, OrganizationUserUserDetailsResponse, -} from "../models/response/organizationUserResponse"; -import { PaymentResponse } from "../models/response/paymentResponse"; -import { PlanResponse } from "../models/response/planResponse"; -import { PolicyResponse } from "../models/response/policyResponse"; -import { PreloginResponse } from "../models/response/preloginResponse"; -import { ProfileResponse } from "../models/response/profileResponse"; + OrganizationUserResetPasswordDetailsReponse, +} from "../models/response/organization-user.response"; +import { PaymentResponse } from "../models/response/payment.response"; +import { PlanResponse } from "../models/response/plan.response"; +import { PolicyResponse } from "../models/response/policy.response"; +import { PreloginResponse } from "../models/response/prelogin.response"; +import { ProfileResponse } from "../models/response/profile.response"; import { ProviderOrganizationOrganizationDetailsResponse, ProviderOrganizationResponse, -} from "../models/response/provider/providerOrganizationResponse"; -import { ProviderResponse } from "../models/response/provider/providerResponse"; -import { ProviderUserBulkPublicKeyResponse } from "../models/response/provider/providerUserBulkPublicKeyResponse"; -import { ProviderUserBulkResponse } from "../models/response/provider/providerUserBulkResponse"; +} from "../models/response/provider/provider-organization.response"; +import { ProviderUserBulkPublicKeyResponse } from "../models/response/provider/provider-user-bulk-public-key.response"; +import { ProviderUserBulkResponse } from "../models/response/provider/provider-user-bulk.response"; import { ProviderUserResponse, ProviderUserUserDetailsResponse, -} from "../models/response/provider/providerUserResponse"; -import { SelectionReadOnlyResponse } from "../models/response/selectionReadOnlyResponse"; -import { SendAccessResponse } from "../models/response/sendAccessResponse"; -import { SendFileDownloadDataResponse } from "../models/response/sendFileDownloadDataResponse"; -import { SendFileUploadDataResponse } from "../models/response/sendFileUploadDataResponse"; -import { SendResponse } from "../models/response/sendResponse"; -import { SsoPreValidateResponse } from "../models/response/ssoPreValidateResponse"; -import { SubscriptionResponse } from "../models/response/subscriptionResponse"; -import { SyncResponse } from "../models/response/syncResponse"; -import { TaxInfoResponse } from "../models/response/taxInfoResponse"; -import { TaxRateResponse } from "../models/response/taxRateResponse"; -import { TwoFactorAuthenticatorResponse } from "../models/response/twoFactorAuthenticatorResponse"; -import { TwoFactorDuoResponse } from "../models/response/twoFactorDuoResponse"; -import { TwoFactorEmailResponse } from "../models/response/twoFactorEmailResponse"; -import { TwoFactorProviderResponse } from "../models/response/twoFactorProviderResponse"; -import { TwoFactorRecoverResponse } from "../models/response/twoFactorRescoverResponse"; +} from "../models/response/provider/provider-user.response"; +import { ProviderResponse } from "../models/response/provider/provider.response"; +import { SelectionReadOnlyResponse } from "../models/response/selection-read-only.response"; +import { SendAccessResponse } from "../models/response/send-access.response"; +import { SendFileDownloadDataResponse } from "../models/response/send-file-download-data.response"; +import { SendFileUploadDataResponse } from "../models/response/send-file-upload-data.response"; +import { SendResponse } from "../models/response/send.response"; +import { SsoPreValidateResponse } from "../models/response/sso-pre-validate.response"; +import { SubscriptionResponse } from "../models/response/subscription.response"; +import { SyncResponse } from "../models/response/sync.response"; +import { TaxInfoResponse } from "../models/response/tax-info.response"; +import { TaxRateResponse } from "../models/response/tax-rate.response"; +import { TwoFactorAuthenticatorResponse } from "../models/response/two-factor-authenticator.response"; +import { TwoFactorDuoResponse } from "../models/response/two-factor-duo.response"; +import { TwoFactorEmailResponse } from "../models/response/two-factor-email.response"; +import { TwoFactorProviderResponse } from "../models/response/two-factor-provider.response"; +import { TwoFactorRecoverResponse } from "../models/response/two-factor-recover.response"; import { TwoFactorWebAuthnResponse, ChallengeResponse, -} from "../models/response/twoFactorWebAuthnResponse"; -import { TwoFactorYubiKeyResponse } from "../models/response/twoFactorYubiKeyResponse"; -import { UserKeyResponse } from "../models/response/userKeyResponse"; +} from "../models/response/two-factor-web-authn.response"; +import { TwoFactorYubiKeyResponse } from "../models/response/two-factor-yubi-key.response"; +import { UserKeyResponse } from "../models/response/user-key.response"; import { SendAccessView } from "../models/view/send-access.view"; export class ApiService implements ApiServiceAbstraction { @@ -2267,7 +2267,7 @@ export class ApiService implements ApiServiceAbstraction { const tokenRequest = new ApiTokenRequest( clientId, clientSecret, - new TokenRequestTwoFactor(), + new TokenTwoFactorRequest(), deviceRequest ); diff --git a/libs/common/src/services/audit.service.ts b/libs/common/src/services/audit.service.ts index 4ceebf6746..8581026f64 100644 --- a/libs/common/src/services/audit.service.ts +++ b/libs/common/src/services/audit.service.ts @@ -3,8 +3,8 @@ import { AuditService as AuditServiceAbstraction } from "../abstractions/audit.s import { CryptoFunctionService } from "../abstractions/cryptoFunction.service"; import { throttle } from "../misc/throttle"; import { Utils } from "../misc/utils"; -import { BreachAccountResponse } from "../models/response/breachAccountResponse"; -import { ErrorResponse } from "../models/response/errorResponse"; +import { BreachAccountResponse } from "../models/response/breach-account.response"; +import { ErrorResponse } from "../models/response/error.response"; const PwnedPasswordsApi = "https://api.pwnedpasswords.com/range/"; diff --git a/libs/common/src/services/auth.service.ts b/libs/common/src/services/auth.service.ts index 5fc48b10dd..26e5c2e03d 100644 --- a/libs/common/src/services/auth.service.ts +++ b/libs/common/src/services/auth.service.ts @@ -29,10 +29,10 @@ import { PasswordlessLogInCredentials, } 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"; -import { AuthRequestPushNotification } from "../models/response/notificationResponse"; +import { TokenTwoFactorRequest } from "../models/request/identity-token/token-two-factor.request"; +import { PreloginRequest } from "../models/request/prelogin.request"; +import { ErrorResponse } from "../models/response/error.response"; +import { AuthRequestPushNotification } from "../models/response/notification.response"; const sessionTimeoutLength = 2 * 60 * 1000; // 2 minutes @@ -155,7 +155,7 @@ export class AuthService implements AuthServiceAbstraction { } async logInTwoFactor( - twoFactor: TokenRequestTwoFactor, + twoFactor: TokenTwoFactorRequest, captchaResponse: string ): Promise { if (this.logInStrategy == null) { diff --git a/libs/common/src/services/cipher.service.ts b/libs/common/src/services/cipher.service.ts index ff5f8d7a6b..415cbe6910 100644 --- a/libs/common/src/services/cipher.service.ts +++ b/libs/common/src/services/cipher.service.ts @@ -30,17 +30,17 @@ import { Password } from "../models/domain/password"; 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"; -import { CipherBulkRestoreRequest } from "../models/request/cipherBulkRestoreRequest"; -import { CipherBulkShareRequest } from "../models/request/cipherBulkShareRequest"; -import { CipherCollectionsRequest } from "../models/request/cipherCollectionsRequest"; -import { CipherCreateRequest } from "../models/request/cipherCreateRequest"; -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 { AttachmentRequest } from "../models/request/attachment.request"; +import { CipherBulkDeleteRequest } from "../models/request/cipher-bulk-delete.request"; +import { CipherBulkMoveRequest } from "../models/request/cipher-bulk-move.request"; +import { CipherBulkRestoreRequest } from "../models/request/cipher-bulk-restore.request"; +import { CipherBulkShareRequest } from "../models/request/cipher-bulk-share.request"; +import { CipherCollectionsRequest } from "../models/request/cipher-collections.request"; +import { CipherCreateRequest } from "../models/request/cipher-create.request"; +import { CipherShareRequest } from "../models/request/cipher-share.request"; +import { CipherRequest } from "../models/request/cipher.request"; +import { CipherResponse } from "../models/response/cipher.response"; +import { ErrorResponse } from "../models/response/error.response"; import { AttachmentView } from "../models/view/attachment.view"; import { CipherView } from "../models/view/cipher.view"; import { FieldView } from "../models/view/field.view"; diff --git a/libs/common/src/services/config/config-api.service.ts b/libs/common/src/services/config/config-api.service.ts index 5e3b75bcd7..318eae413c 100644 --- a/libs/common/src/services/config/config-api.service.ts +++ b/libs/common/src/services/config/config-api.service.ts @@ -1,6 +1,6 @@ import { ApiService } from "../../abstractions/api.service"; import { ConfigApiServiceAbstraction as ConfigApiServiceAbstraction } from "../../abstractions/config/config-api.service.abstraction"; -import { ServerConfigResponse } from "../../models/response/server-config-response"; +import { ServerConfigResponse } from "../../models/response/server-config.response"; export class ConfigApiService implements ConfigApiServiceAbstraction { constructor(private apiService: ApiService) {} diff --git a/libs/common/src/services/crypto.service.ts b/libs/common/src/services/crypto.service.ts index 8b2a15e245..8524598ede 100644 --- a/libs/common/src/services/crypto.service.ts +++ b/libs/common/src/services/crypto.service.ts @@ -18,9 +18,9 @@ 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"; +import { ProfileOrganizationResponse } from "../models/response/profile-organization.response"; +import { ProfileProviderOrganizationResponse } from "../models/response/profile-provider-organization.response"; +import { ProfileProviderResponse } from "../models/response/profile-provider.response"; export class CryptoService implements CryptoServiceAbstraction { constructor( diff --git a/libs/common/src/services/event.service.ts b/libs/common/src/services/event.service.ts index 84e0aa2bf3..3221741a22 100644 --- a/libs/common/src/services/event.service.ts +++ b/libs/common/src/services/event.service.ts @@ -6,7 +6,7 @@ import { OrganizationService } from "../abstractions/organization/organization.s import { StateService } from "../abstractions/state.service"; import { EventType } from "../enums/eventType"; import { EventData } from "../models/data/event.data"; -import { EventRequest } from "../models/request/eventRequest"; +import { EventRequest } from "../models/request/event.request"; export class EventService implements EventServiceAbstraction { private inited = false; diff --git a/libs/common/src/services/export.service.ts b/libs/common/src/services/export.service.ts index 101dd70649..9d19ebc014 100644 --- a/libs/common/src/services/export.service.ts +++ b/libs/common/src/services/export.service.ts @@ -22,7 +22,7 @@ import { CipherWithIdExport as CipherExport } from "../models/export/cipher-with 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 { CollectionDetailsResponse } from "../models/response/collection.response"; import { CipherView } from "../models/view/cipher.view"; import { CollectionView } from "../models/view/collection.view"; import { EventView } from "../models/view/event.view"; diff --git a/libs/common/src/services/fileUpload.service.ts b/libs/common/src/services/fileUpload.service.ts index 8a41b3ea67..7bc9ae4dc8 100644 --- a/libs/common/src/services/fileUpload.service.ts +++ b/libs/common/src/services/fileUpload.service.ts @@ -4,8 +4,8 @@ import { LogService } from "../abstractions/log.service"; import { FileUploadType } from "../enums/fileUploadType"; 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"; +import { AttachmentUploadDataResponse } from "../models/response/attachment-upload-data.response"; +import { SendFileUploadDataResponse } from "../models/response/send-file-upload-data.response"; import { AzureFileUploadService } from "./azureFileUpload.service"; import { BitwardenFileUploadService } from "./bitwardenFileUpload.service"; diff --git a/libs/common/src/services/folder/folder-api.service.ts b/libs/common/src/services/folder/folder-api.service.ts index b9e6bbae7f..587dbb84f7 100644 --- a/libs/common/src/services/folder/folder-api.service.ts +++ b/libs/common/src/services/folder/folder-api.service.ts @@ -3,8 +3,8 @@ import { FolderApiServiceAbstraction } from "../../abstractions/folder/folder-ap import { InternalFolderService } from "../../abstractions/folder/folder.service.abstraction"; 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"; +import { FolderRequest } from "../../models/request/folder.request"; +import { FolderResponse } from "../../models/response/folder.response"; export class FolderApiService implements FolderApiServiceAbstraction { constructor(private folderService: InternalFolderService, private apiService: ApiService) {} diff --git a/libs/common/src/services/import.service.ts b/libs/common/src/services/import.service.ts index 06b607c740..a1f76ff5f8 100644 --- a/libs/common/src/services/import.service.ts +++ b/libs/common/src/services/import.service.ts @@ -72,13 +72,13 @@ import { YotiCsvImporter } from "../importers/yotiCsvImporter"; import { ZohoVaultCsvImporter } from "../importers/zohoVaultCsvImporter"; import { Utils } from "../misc/utils"; 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"; -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 { CipherRequest } from "../models/request/cipher.request"; +import { CollectionRequest } from "../models/request/collection.request"; +import { FolderRequest } from "../models/request/folder.request"; +import { ImportCiphersRequest } from "../models/request/import-ciphers.request"; +import { ImportOrganizationCiphersRequest } from "../models/request/import-organization-ciphers.request"; +import { KvpRequest } from "../models/request/kvp.request"; +import { ErrorResponse } from "../models/response/error.response"; import { CipherView } from "../models/view/cipher.view"; export class ImportService implements ImportServiceAbstraction { diff --git a/libs/common/src/services/keyConnector.service.ts b/libs/common/src/services/keyConnector.service.ts index 1dbc45f801..2430ba27c2 100644 --- a/libs/common/src/services/keyConnector.service.ts +++ b/libs/common/src/services/keyConnector.service.ts @@ -9,10 +9,10 @@ import { TokenService } from "../abstractions/token.service"; import { OrganizationUserType } from "../enums/organizationUserType"; import { Utils } from "../misc/utils"; 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"; -import { IdentityTokenResponse } from "../models/response/identityTokenResponse"; +import { SetKeyConnectorKeyRequest } from "../models/request/account/set-key-connector-key.request"; +import { KeyConnectorUserKeyRequest } from "../models/request/key-connector-user-key.request"; +import { KeysRequest } from "../models/request/keys.request"; +import { IdentityTokenResponse } from "../models/response/identity-token.response"; export class KeyConnectorService implements KeyConnectorServiceAbstraction { constructor( diff --git a/libs/common/src/services/notifications.service.ts b/libs/common/src/services/notifications.service.ts index 01975ec592..cd5188eba3 100644 --- a/libs/common/src/services/notifications.service.ts +++ b/libs/common/src/services/notifications.service.ts @@ -16,7 +16,7 @@ import { SyncCipherNotification, SyncFolderNotification, SyncSendNotification, -} from "../models/response/notificationResponse"; +} from "../models/response/notification.response"; export class NotificationsService implements NotificationsServiceAbstraction { private signalrConnection: signalR.HubConnection; diff --git a/libs/common/src/services/organization/organization-api.service.ts b/libs/common/src/services/organization/organization-api.service.ts index f15d76c27b..58630e73d8 100644 --- a/libs/common/src/services/organization/organization-api.service.ts +++ b/libs/common/src/services/organization/organization-api.service.ts @@ -2,31 +2,31 @@ import { ApiService } from "../../abstractions/api.service"; import { OrganizationApiServiceAbstraction } from "../../abstractions/organization/organization-api.service.abstraction"; import { SyncService } from "../../abstractions/sync/sync.service.abstraction"; import { OrganizationApiKeyType } from "../../enums/organizationApiKeyType"; -import { ImportDirectoryRequest } from "../../models/request/importDirectoryRequest"; -import { OrganizationSsoRequest } from "../../models/request/organization/organizationSsoRequest"; -import { OrganizationApiKeyRequest } from "../../models/request/organizationApiKeyRequest"; -import { OrganizationCreateRequest } from "../../models/request/organizationCreateRequest"; -import { OrganizationKeysRequest } from "../../models/request/organizationKeysRequest"; -import { OrganizationSubscriptionUpdateRequest } from "../../models/request/organizationSubscriptionUpdateRequest"; -import { OrganizationTaxInfoUpdateRequest } from "../../models/request/organizationTaxInfoUpdateRequest"; -import { OrganizationUpdateRequest } from "../../models/request/organizationUpdateRequest"; -import { OrganizationUpgradeRequest } from "../../models/request/organizationUpgradeRequest"; -import { PaymentRequest } from "../../models/request/paymentRequest"; -import { SeatRequest } from "../../models/request/seatRequest"; -import { SecretVerificationRequest } from "../../models/request/secretVerificationRequest"; -import { StorageRequest } from "../../models/request/storageRequest"; -import { VerifyBankRequest } from "../../models/request/verifyBankRequest"; -import { ApiKeyResponse } from "../../models/response/apiKeyResponse"; -import { BillingResponse } from "../../models/response/billingResponse"; -import { ListResponse } from "../../models/response/listResponse"; -import { OrganizationSsoResponse } from "../../models/response/organization/organizationSsoResponse"; -import { OrganizationApiKeyInformationResponse } from "../../models/response/organizationApiKeyInformationResponse"; -import { OrganizationAutoEnrollStatusResponse } from "../../models/response/organizationAutoEnrollStatusResponse"; -import { OrganizationKeysResponse } from "../../models/response/organizationKeysResponse"; -import { OrganizationResponse } from "../../models/response/organizationResponse"; -import { OrganizationSubscriptionResponse } from "../../models/response/organizationSubscriptionResponse"; -import { PaymentResponse } from "../../models/response/paymentResponse"; -import { TaxInfoResponse } from "../../models/response/taxInfoResponse"; +import { ImportDirectoryRequest } from "../../models/request/import-directory.request"; +import { OrganizationApiKeyRequest } from "../../models/request/organization-api-key.request"; +import { OrganizationCreateRequest } from "../../models/request/organization-create.request"; +import { OrganizationKeysRequest } from "../../models/request/organization-keys.request"; +import { OrganizationSubscriptionUpdateRequest } from "../../models/request/organization-subscription-update.request"; +import { OrganizationTaxInfoUpdateRequest } from "../../models/request/organization-tax-info-update.request"; +import { OrganizationUpdateRequest } from "../../models/request/organization-update.request"; +import { OrganizationUpgradeRequest } from "../../models/request/organization-upgrade.request"; +import { OrganizationSsoRequest } from "../../models/request/organization/organization-sso.request"; +import { PaymentRequest } from "../../models/request/payment.request"; +import { SeatRequest } from "../../models/request/seat.request"; +import { SecretVerificationRequest } from "../../models/request/secret-verification.request"; +import { StorageRequest } from "../../models/request/storage.request"; +import { VerifyBankRequest } from "../../models/request/verify-bank.request"; +import { ApiKeyResponse } from "../../models/response/api-key.response"; +import { BillingResponse } from "../../models/response/billing.response"; +import { ListResponse } from "../../models/response/list.response"; +import { OrganizationApiKeyInformationResponse } from "../../models/response/organization-api-key-information.response"; +import { OrganizationAutoEnrollStatusResponse } from "../../models/response/organization-auto-enroll-status.response"; +import { OrganizationKeysResponse } from "../../models/response/organization-keys.response"; +import { OrganizationSubscriptionResponse } from "../../models/response/organization-subscription.response"; +import { OrganizationResponse } from "../../models/response/organization.response"; +import { OrganizationSsoResponse } from "../../models/response/organization/organization-sso.response"; +import { PaymentResponse } from "../../models/response/payment.response"; +import { TaxInfoResponse } from "../../models/response/tax-info.response"; export class OrganizationApiService implements OrganizationApiServiceAbstraction { constructor(private apiService: ApiService, private syncService: SyncService) {} diff --git a/libs/common/src/services/policy/policy-api.service.ts b/libs/common/src/services/policy/policy-api.service.ts index 5f84c7f922..f74042a36f 100644 --- a/libs/common/src/services/policy/policy-api.service.ts +++ b/libs/common/src/services/policy/policy-api.service.ts @@ -8,9 +8,9 @@ import { StateService } from "../../abstractions/state.service"; import { PolicyType } from "../../enums/policyType"; 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"; +import { PolicyRequest } from "../../models/request/policy.request"; +import { ListResponse } from "../../models/response/list.response"; +import { PolicyResponse } from "../../models/response/policy.response"; export class PolicyApiService implements PolicyApiServiceAbstraction { constructor( diff --git a/libs/common/src/services/policy/policy.service.ts b/libs/common/src/services/policy/policy.service.ts index a3d87e02f1..9f084eb4d6 100644 --- a/libs/common/src/services/policy/policy.service.ts +++ b/libs/common/src/services/policy/policy.service.ts @@ -12,8 +12,8 @@ import { MasterPasswordPolicyOptions } from "../../models/domain/master-password import { Organization } from "../../models/domain/organization"; import { Policy } from "../../models/domain/policy"; import { ResetPasswordPolicyOptions } from "../../models/domain/reset-password-policy-options"; -import { ListResponse } from "../../models/response/listResponse"; -import { PolicyResponse } from "../../models/response/policyResponse"; +import { ListResponse } from "../../models/response/list.response"; +import { PolicyResponse } from "../../models/response/policy.response"; export class PolicyService implements InternalPolicyServiceAbstraction { private _policies: BehaviorSubject = new BehaviorSubject([]); diff --git a/libs/common/src/services/send.service.ts b/libs/common/src/services/send.service.ts index e0df9364b4..a9acaab630 100644 --- a/libs/common/src/services/send.service.ts +++ b/libs/common/src/services/send.service.ts @@ -15,9 +15,9 @@ import { Send } from "../models/domain/send"; 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 { SendRequest } from "../models/request/send.request"; +import { ErrorResponse } from "../models/response/error.response"; +import { SendResponse } from "../models/response/send.response"; import { SendView } from "../models/view/send.view"; export class SendService implements SendServiceAbstraction { diff --git a/libs/common/src/services/sync/sync.service.ts b/libs/common/src/services/sync/sync.service.ts index 1803b58792..2513871636 100644 --- a/libs/common/src/services/sync/sync.service.ts +++ b/libs/common/src/services/sync/sync.service.ts @@ -21,18 +21,18 @@ 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"; -import { FolderResponse } from "../../models/response/folderResponse"; +import { CipherResponse } from "../../models/response/cipher.response"; +import { CollectionDetailsResponse } from "../../models/response/collection.response"; +import { DomainsResponse } from "../../models/response/domains.response"; +import { FolderResponse } from "../../models/response/folder.response"; import { SyncCipherNotification, SyncFolderNotification, SyncSendNotification, -} from "../../models/response/notificationResponse"; -import { PolicyResponse } from "../../models/response/policyResponse"; -import { ProfileResponse } from "../../models/response/profileResponse"; -import { SendResponse } from "../../models/response/sendResponse"; +} from "../../models/response/notification.response"; +import { PolicyResponse } from "../../models/response/policy.response"; +import { ProfileResponse } from "../../models/response/profile.response"; +import { SendResponse } from "../../models/response/send.response"; export class SyncService implements SyncServiceAbstraction { syncInProgress = false; diff --git a/libs/common/src/services/token.service.ts b/libs/common/src/services/token.service.ts index 5b6ffe6d88..c7eaff6421 100644 --- a/libs/common/src/services/token.service.ts +++ b/libs/common/src/services/token.service.ts @@ -1,7 +1,7 @@ import { StateService } from "../abstractions/state.service"; import { TokenService as TokenServiceAbstraction } from "../abstractions/token.service"; import { Utils } from "../misc/utils"; -import { IdentityTokenResponse } from "../models/response/identityTokenResponse"; +import { IdentityTokenResponse } from "../models/response/identity-token.response"; export class TokenService implements TokenServiceAbstraction { static decodeToken(token: string): Promise { diff --git a/libs/common/src/services/twoFactor.service.ts b/libs/common/src/services/twoFactor.service.ts index 7720d9bec9..edcc1cecf1 100644 --- a/libs/common/src/services/twoFactor.service.ts +++ b/libs/common/src/services/twoFactor.service.ts @@ -5,7 +5,7 @@ import { TwoFactorService as TwoFactorServiceAbstraction, } from "../abstractions/twoFactor.service"; import { TwoFactorProviderType } from "../enums/twoFactorProviderType"; -import { IdentityTwoFactorResponse } from "../models/response/identityTwoFactorResponse"; +import { IdentityTwoFactorResponse } from "../models/response/identity-two-factor.response"; export const TwoFactorProviders: Partial> = { diff --git a/libs/common/src/services/userVerification/userVerification-api.service.ts b/libs/common/src/services/userVerification/userVerification-api.service.ts index 26d5091354..7bc9a43ae8 100644 --- a/libs/common/src/services/userVerification/userVerification-api.service.ts +++ b/libs/common/src/services/userVerification/userVerification-api.service.ts @@ -1,6 +1,6 @@ import { ApiService } from "../../abstractions/api.service"; import { UserVerificationApiServiceAbstraction } from "../../abstractions/userVerification/userVerification-api.service.abstraction"; -import { VerifyOTPRequest } from "../../models/request/account/verifyOTPRequest"; +import { VerifyOTPRequest } from "../../models/request/account/verify-otp.request"; export class UserVerificationApiService implements UserVerificationApiServiceAbstraction { constructor(private apiService: ApiService) {} diff --git a/libs/common/src/services/userVerification/userVerification.service.ts b/libs/common/src/services/userVerification/userVerification.service.ts index fe2d5f4716..e94e3eb80a 100644 --- a/libs/common/src/services/userVerification/userVerification.service.ts +++ b/libs/common/src/services/userVerification/userVerification.service.ts @@ -3,8 +3,8 @@ import { I18nService } from "../../abstractions/i18n.service"; import { UserVerificationApiServiceAbstraction } from "../../abstractions/userVerification/userVerification-api.service.abstraction"; import { UserVerificationService as UserVerificationServiceAbstraction } from "../../abstractions/userVerification/userVerification.service.abstraction"; import { VerificationType } from "../../enums/verificationType"; -import { VerifyOTPRequest } from "../../models/request/account/verifyOTPRequest"; -import { SecretVerificationRequest } from "../../models/request/secretVerificationRequest"; +import { VerifyOTPRequest } from "../../models/request/account/verify-otp.request"; +import { SecretVerificationRequest } from "../../models/request/secret-verification.request"; import { Verification } from "../../types/verification"; /** diff --git a/libs/common/src/services/validation.service.ts b/libs/common/src/services/validation.service.ts index b51d55a2d8..8c0c94d9d4 100644 --- a/libs/common/src/services/validation.service.ts +++ b/libs/common/src/services/validation.service.ts @@ -1,7 +1,7 @@ import { I18nService } from "../abstractions/i18n.service"; import { PlatformUtilsService } from "../abstractions/platformUtils.service"; import { ValidationService as ValidationServiceAbstraction } from "../abstractions/validation.service"; -import { ErrorResponse } from "../models/response/errorResponse"; +import { ErrorResponse } from "../models/response/error.response"; export class ValidationService implements ValidationServiceAbstraction { constructor( diff --git a/libs/common/src/types/syncEventArgs.ts b/libs/common/src/types/syncEventArgs.ts index 4e28ae4be7..2e07ab2711 100644 --- a/libs/common/src/types/syncEventArgs.ts +++ b/libs/common/src/types/syncEventArgs.ts @@ -1,4 +1,4 @@ -import { SyncResponse } from "../models/response/syncResponse"; +import { SyncResponse } from "../models/response/sync.response"; type SyncStatus = "Started" | "Completed"; diff --git a/libs/common/src/types/twoFactorResponse.ts b/libs/common/src/types/twoFactorResponse.ts index fb9840fcc6..2b2875b1bf 100644 --- a/libs/common/src/types/twoFactorResponse.ts +++ b/libs/common/src/types/twoFactorResponse.ts @@ -1,9 +1,9 @@ -import { TwoFactorAuthenticatorResponse } from "../models/response/twoFactorAuthenticatorResponse"; -import { TwoFactorDuoResponse } from "../models/response/twoFactorDuoResponse"; -import { TwoFactorEmailResponse } from "../models/response/twoFactorEmailResponse"; -import { TwoFactorRecoverResponse } from "../models/response/twoFactorRescoverResponse"; -import { TwoFactorWebAuthnResponse } from "../models/response/twoFactorWebAuthnResponse"; -import { TwoFactorYubiKeyResponse } from "../models/response/twoFactorYubiKeyResponse"; +import { TwoFactorAuthenticatorResponse } from "../models/response/two-factor-authenticator.response"; +import { TwoFactorDuoResponse } from "../models/response/two-factor-duo.response"; +import { TwoFactorEmailResponse } from "../models/response/two-factor-email.response"; +import { TwoFactorRecoverResponse } from "../models/response/two-factor-recover.response"; +import { TwoFactorWebAuthnResponse } from "../models/response/two-factor-web-authn.response"; +import { TwoFactorYubiKeyResponse } from "../models/response/two-factor-yubi-key.response"; export type TwoFactorResponse = | TwoFactorRecoverResponse diff --git a/libs/node/src/cli/commands/login.command.ts b/libs/node/src/cli/commands/login.command.ts index cfd4841705..dfff7b9ad2 100644 --- a/libs/node/src/cli/commands/login.command.ts +++ b/libs/node/src/cli/commands/login.command.ts @@ -25,10 +25,10 @@ import { PasswordLogInCredentials, SsoLogInCredentials, } 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"; -import { ErrorResponse } from "@bitwarden/common/models/response/errorResponse"; +import { TokenTwoFactorRequest } from "@bitwarden/common/models/request/identity-token/token-two-factor.request"; +import { TwoFactorEmailRequest } from "@bitwarden/common/models/request/two-factor-email.request"; +import { UpdateTempPasswordRequest } from "@bitwarden/common/models/request/update-temp-password.request"; +import { ErrorResponse } from "@bitwarden/common/models/response/error.response"; import { Response } from "../models/response"; import { MessageResponse } from "../models/response/messageResponse"; @@ -151,7 +151,7 @@ export class LoginCommand { const twoFactor = twoFactorToken == null ? null - : new TokenRequestTwoFactor(twoFactorMethod, twoFactorToken, false); + : new TokenTwoFactorRequest(twoFactorMethod, twoFactorToken, false); try { if (this.validatedParams != null) { @@ -255,13 +255,13 @@ export class LoginCommand { } response = await this.authService.logInTwoFactor( - new TokenRequestTwoFactor(selectedProvider.type, twoFactorToken), + new TokenTwoFactorRequest(selectedProvider.type, twoFactorToken), null ); } if (response.captchaSiteKey) { - const twoFactorRequest = new TokenRequestTwoFactor(selectedProvider.type, twoFactorToken); + const twoFactorRequest = new TokenTwoFactorRequest(selectedProvider.type, twoFactorToken); const handledResponse = await this.handleCaptchaRequired(twoFactorRequest); // Error Response @@ -427,7 +427,7 @@ export class LoginCommand { } private async handleCaptchaRequired( - twoFactorRequest: TokenRequestTwoFactor, + twoFactorRequest: TokenTwoFactorRequest, credentials: PasswordLogInCredentials = null ): Promise { const badCaptcha = Response.badRequest(