bitwarden/browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser synced 2025-12-11 05:43:41 +00:00
Code Issues Releases Wiki Activity

[SM-288] Rename models to follow naming convention (#3795)

Browse Source
This commit is contained in:
Oscar Hinton
2022-10-14 18:25:50 +02:00
committed by GitHub
parent 1fd8d316a1
commit e941f06bac
445 changed files with 939 additions and 938 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libs/common/spec/importers/bitwardenPasswordProtectedImporter.spec.ts
View File

@@ -6,7 +6,7 @@ import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
import { KdfType } from "@bitwarden/common/enums/kdfType";
import { BitwardenPasswordProtectedImporter } from "@bitwarden/common/importers/bitwardenPasswordProtectedImporter";
import { Utils } from "@bitwarden/common/misc/utils";
import { ImportResult } from "@bitwarden/common/models/domain/importResult";
import { ImportResult } from "@bitwarden/common/models/domain/import-result";
import { data as emptyDecryptedData } from "./testData/bitwardenJson/empty.json";

6
libs/common/spec/importers/firefoxCsvImporter.spec.ts
View File

@@ -1,7 +1,7 @@
import { FirefoxCsvImporter as Importer } from "@bitwarden/common/importers/firefoxCsvImporter";
import { CipherView } from "@bitwarden/common/models/view/cipherView";
import { LoginUriView } from "@bitwarden/common/models/view/loginUriView";
import { LoginView } from "@bitwarden/common/models/view/loginView";
import { CipherView } from "@bitwarden/common/models/view/cipher.view";
import { LoginUriView } from "@bitwarden/common/models/view/login-uri.view";
import { LoginView } from "@bitwarden/common/models/view/login.view";
import { data as firefoxAccountsData } from "./testData/firefoxCsv/firefoxAccountsData.csv";
import { data as simplePasswordData } from "./testData/firefoxCsv/simplePasswordData.csv";

6
libs/common/spec/importers/lastpassCsvImporter.spec.ts
View File

@@ -1,9 +1,9 @@
import { CipherType } from "@bitwarden/common/enums/cipherType";
import { FieldType } from "@bitwarden/common/enums/fieldType";
import { LastPassCsvImporter as Importer } from "@bitwarden/common/importers/lastpassCsvImporter";
import { ImportResult } from "@bitwarden/common/models/domain/importResult";
import { CipherView } from "@bitwarden/common/models/view/cipherView";
import { FieldView } from "@bitwarden/common/models/view/fieldView";
import { ImportResult } from "@bitwarden/common/models/domain/import-result";
import { CipherView } from "@bitwarden/common/models/view/cipher.view";
import { FieldView } from "@bitwarden/common/models/view/field.view";
function baseExcept(result: ImportResult) {
expect(result).not.toBeNull();

2
libs/common/spec/importers/mykiCsvImporter.spec.ts
View File

@@ -1,6 +1,6 @@
import { CipherType } from "@bitwarden/common/enums/cipherType";
import { MykiCsvImporter as Importer } from "@bitwarden/common/importers/mykiCsvImporter";
import { CipherView } from "@bitwarden/common/models/view/cipherView";
import { CipherView } from "@bitwarden/common/models/view/cipher.view";
import { userAccountData } from "./testData/mykiCsv/UserAccount.csv";
import { userCreditCardData } from "./testData/mykiCsv/UserCreditCard.csv";

4
libs/common/spec/importers/nordpassCsvImporter.spec.ts
View File

@@ -1,8 +1,8 @@
import { CipherType } from "@bitwarden/common/enums/cipherType";
import { SecureNoteType } from "@bitwarden/common/enums/secureNoteType";
import { NordPassCsvImporter as Importer } from "@bitwarden/common/importers/nordpassCsvImporter";
import { CipherView } from "@bitwarden/common/models/view/cipherView";
import { IdentityView } from "@bitwarden/common/models/view/identityView";
import { CipherView } from "@bitwarden/common/models/view/cipher.view";
import { IdentityView } from "@bitwarden/common/models/view/identity.view";
import { data as creditCardData } from "./testData/nordpassCsv/nordpass.card.csv";
import { data as identityData } from "./testData/nordpassCsv/nordpass.identity.csv";

2
libs/common/spec/importers/onepassword1PuxImporter.spec.ts
View File

@@ -3,7 +3,7 @@ import { FieldType } from "@bitwarden/common/enums/fieldType";
import { SecureNoteType } from "@bitwarden/common/enums/secureNoteType";
import { OnePassword1PuxImporter as Importer } from "@bitwarden/common/importers/onepasswordImporters/onepassword1PuxImporter";
import { Utils } from "@bitwarden/common/misc/utils";
import { FieldView } from "@bitwarden/common/models/view/fieldView";
import { FieldView } from "@bitwarden/common/models/view/field.view";
import { APICredentialsData } from "./testData/onePassword1Pux/APICredentials";
import { BankAccountData } from "./testData/onePassword1Pux/BankAccount";

2
libs/common/spec/importers/onepasswordMacCsvImporter.spec.ts
View File

@@ -1,6 +1,6 @@
import { CipherType } from "@bitwarden/common/enums/cipherType";
import { OnePasswordMacCsvImporter as Importer } from "@bitwarden/common/importers/onepasswordImporters/onepasswordMacCsvImporter";
import { CipherView } from "@bitwarden/common/models/view/cipherView";
import { CipherView } from "@bitwarden/common/models/view/cipher.view";
import { data as creditCardData } from "./testData/onePasswordCsv/creditCard.mac.csv";
import { data as identityData } from "./testData/onePasswordCsv/identity.mac.csv";

4
libs/common/spec/importers/onepasswordWinCsvImporter.spec.ts
View File

@@ -1,8 +1,8 @@
import { CipherType } from "@bitwarden/common/enums/cipherType";
import { FieldType } from "@bitwarden/common/enums/fieldType";
import { OnePasswordWinCsvImporter as Importer } from "@bitwarden/common/importers/onepasswordImporters/onepasswordWinCsvImporter";
import { CipherView } from "@bitwarden/common/models/view/cipherView";
import { FieldView } from "@bitwarden/common/models/view/fieldView";
import { CipherView } from "@bitwarden/common/models/view/cipher.view";
import { FieldView } from "@bitwarden/common/models/view/field.view";
import { data as creditCardData } from "./testData/onePasswordCsv/creditCard.windows.csv";
import { data as identityData } from "./testData/onePasswordCsv/identity.windows.csv";

6
libs/common/spec/importers/safariCsvImporter.spec.ts
View File

@@ -1,7 +1,7 @@
import { SafariCsvImporter as Importer } from "@bitwarden/common/importers/safariCsvImporter";
import { CipherView } from "@bitwarden/common/models/view/cipherView";
import { LoginUriView } from "@bitwarden/common/models/view/loginUriView";
import { LoginView } from "@bitwarden/common/models/view/loginView";
import { CipherView } from "@bitwarden/common/models/view/cipher.view";
import { LoginUriView } from "@bitwarden/common/models/view/login-uri.view";
import { LoginView } from "@bitwarden/common/models/view/login.view";
import { data as oldSimplePasswordData } from "./testData/safariCsv/oldSimplePasswordData.csv";
import { data as simplePasswordData } from "./testData/safariCsv/simplePasswordData.csv";

2
libs/common/spec/misc/logInStrategies/apiLogIn.strategy.spec.ts
View File

@@ -14,7 +14,7 @@ import { TokenService } from "@bitwarden/common/abstractions/token.service";
import { TwoFactorService } from "@bitwarden/common/abstractions/twoFactor.service";
import { ApiLogInStrategy } from "@bitwarden/common/misc/logInStrategies/apiLogin.strategy";
import { Utils } from "@bitwarden/common/misc/utils";
import { ApiLogInCredentials } from "@bitwarden/common/models/domain/logInCredentials";
import { ApiLogInCredentials } from "@bitwarden/common/models/domain/log-in-credentials";
import { identityTokenResponseFactory } from "./logIn.strategy.spec";

6
libs/common/spec/misc/logInStrategies/logIn.strategy.spec.ts
View File

@@ -15,9 +15,9 @@ import { TwoFactorProviderType } from "@bitwarden/common/enums/twoFactorProvider
import { PasswordLogInStrategy } from "@bitwarden/common/misc/logInStrategies/passwordLogin.strategy";
import { Utils } from "@bitwarden/common/misc/utils";
import { Account, AccountProfile, AccountTokens } from "@bitwarden/common/models/domain/account";
import { AuthResult } from "@bitwarden/common/models/domain/authResult";
import { EncString } from "@bitwarden/common/models/domain/encString";
import { PasswordLogInCredentials } from "@bitwarden/common/models/domain/logInCredentials";
import { AuthResult } from "@bitwarden/common/models/domain/auth-result";
import { EncString } from "@bitwarden/common/models/domain/enc-string";
import { PasswordLogInCredentials } from "@bitwarden/common/models/domain/log-in-credentials";
import { PasswordTokenRequest } from "@bitwarden/common/models/request/identityToken/passwordTokenRequest";
import { TokenRequestTwoFactor } from "@bitwarden/common/models/request/identityToken/tokenRequestTwoFactor";
import { IdentityCaptchaResponse } from "@bitwarden/common/models/response/identityCaptchaResponse";

4
libs/common/spec/misc/logInStrategies/passwordLogIn.strategy.spec.ts
View File

@@ -14,8 +14,8 @@ import { TwoFactorService } from "@bitwarden/common/abstractions/twoFactor.servi
import { HashPurpose } from "@bitwarden/common/enums/hashPurpose";
import { PasswordLogInStrategy } from "@bitwarden/common/misc/logInStrategies/passwordLogin.strategy";
import { Utils } from "@bitwarden/common/misc/utils";
import { PasswordLogInCredentials } from "@bitwarden/common/models/domain/logInCredentials";
import { SymmetricCryptoKey } from "@bitwarden/common/models/domain/symmetricCryptoKey";
import { PasswordLogInCredentials } from "@bitwarden/common/models/domain/log-in-credentials";
import { SymmetricCryptoKey } from "@bitwarden/common/models/domain/symmetric-crypto-key";
import { identityTokenResponseFactory } from "./logIn.strategy.spec";

2
libs/common/spec/misc/logInStrategies/ssoLogIn.strategy.spec.ts
View File

@@ -13,7 +13,7 @@ import { TokenService } from "@bitwarden/common/abstractions/token.service";
import { TwoFactorService } from "@bitwarden/common/abstractions/twoFactor.service";
import { SsoLogInStrategy } from "@bitwarden/common/misc/logInStrategies/ssoLogin.strategy";
import { Utils } from "@bitwarden/common/misc/utils";
import { SsoLogInCredentials } from "@bitwarden/common/models/domain/logInCredentials";
import { SsoLogInCredentials } from "@bitwarden/common/models/domain/log-in-credentials";
import { identityTokenResponseFactory } from "./logIn.strategy.spec";

6
libs/common/spec/models/domain/attachment.spec.ts
View File

@@ -2,10 +2,10 @@ import { mock, MockProxy } from "jest-mock-extended";
import { AbstractEncryptService } from "@bitwarden/common/abstractions/abstractEncrypt.service";
import { CryptoService } from "@bitwarden/common/abstractions/crypto.service";
import { AttachmentData } from "@bitwarden/common/models/data/attachmentData";
import { AttachmentData } from "@bitwarden/common/models/data/attachment.data";
import { Attachment } from "@bitwarden/common/models/domain/attachment";
import { EncString } from "@bitwarden/common/models/domain/encString";
import { SymmetricCryptoKey } from "@bitwarden/common/models/domain/symmetricCryptoKey";
import { EncString } from "@bitwarden/common/models/domain/enc-string";
import { SymmetricCryptoKey } from "@bitwarden/common/models/domain/symmetric-crypto-key";
import { ContainerService } from "@bitwarden/common/services/container.service";
import { makeStaticByteArray, mockEnc, mockFromJson } from "../../utils";

4
libs/common/spec/models/domain/card.spec.ts
View File

@@ -1,6 +1,6 @@
import { CardData } from "@bitwarden/common/models/data/cardData";
import { CardData } from "@bitwarden/common/models/data/card.data";
import { Card } from "@bitwarden/common/models/domain/card";
import { EncString } from "@bitwarden/common/models/domain/encString";
import { EncString } from "@bitwarden/common/models/domain/enc-string";
import { mockEnc, mockFromJson } from "../../utils";

12
libs/common/spec/models/domain/cipher.spec.ts
View File

@@ -7,19 +7,19 @@ import { CipherType } from "@bitwarden/common/enums/cipherType";
import { FieldType } from "@bitwarden/common/enums/fieldType";
import { SecureNoteType } from "@bitwarden/common/enums/secureNoteType";
import { UriMatchType } from "@bitwarden/common/enums/uriMatchType";
import { CipherData } from "@bitwarden/common/models/data/cipherData";
import { CipherData } from "@bitwarden/common/models/data/cipher.data";
import { Attachment } from "@bitwarden/common/models/domain/attachment";
import { Card } from "@bitwarden/common/models/domain/card";
import { Cipher } from "@bitwarden/common/models/domain/cipher";
import { EncString } from "@bitwarden/common/models/domain/encString";
import { EncString } from "@bitwarden/common/models/domain/enc-string";
import { Field } from "@bitwarden/common/models/domain/field";
import { Identity } from "@bitwarden/common/models/domain/identity";
import { Login } from "@bitwarden/common/models/domain/login";
import { Password } from "@bitwarden/common/models/domain/password";
import { SecureNote } from "@bitwarden/common/models/domain/secureNote";
import { CardView } from "@bitwarden/common/models/view/cardView";
import { IdentityView } from "@bitwarden/common/models/view/identityView";
import { LoginView } from "@bitwarden/common/models/view/loginView";
import { SecureNote } from "@bitwarden/common/models/domain/secure-note";
import { CardView } from "@bitwarden/common/models/view/card.view";
import { IdentityView } from "@bitwarden/common/models/view/identity.view";
import { LoginView } from "@bitwarden/common/models/view/login.view";
import { mockEnc, mockFromJson } from "../../utils";

2
libs/common/spec/models/domain/collection.spec.ts
View File

@@ -1,4 +1,4 @@
import { CollectionData } from "@bitwarden/common/models/data/collectionData";
import { CollectionData } from "@bitwarden/common/models/data/collection.data";
import { Collection } from "@bitwarden/common/models/domain/collection";
import { mockEnc } from "../../utils";

2
libs/common/spec/models/domain/encArrayBuffer.spec.ts
View File

@@ -1,5 +1,5 @@
import { EncryptionType } from "@bitwarden/common/enums/encryptionType";
import { EncArrayBuffer } from "@bitwarden/common/models/domain/encArrayBuffer";
import { EncArrayBuffer } from "@bitwarden/common/models/domain/enc-array-buffer";
import { makeStaticByteArray } from "../../utils";

4
libs/common/spec/models/domain/encString.spec.ts
View File

@@ -5,8 +5,8 @@ import { mock, MockProxy } from "jest-mock-extended";
import { AbstractEncryptService } from "@bitwarden/common/abstractions/abstractEncrypt.service";
import { CryptoService } from "@bitwarden/common/abstractions/crypto.service";
import { EncryptionType } from "@bitwarden/common/enums/encryptionType";
import { EncString } from "@bitwarden/common/models/domain/encString";
import { SymmetricCryptoKey } from "@bitwarden/common/models/domain/symmetricCryptoKey";
import { EncString } from "@bitwarden/common/models/domain/enc-string";
import { SymmetricCryptoKey } from "@bitwarden/common/models/domain/symmetric-crypto-key";
import { ContainerService } from "@bitwarden/common/services/container.service";
describe("EncString", () => {

4
libs/common/spec/models/domain/field.spec.ts
View File

@@ -1,6 +1,6 @@
import { FieldType } from "@bitwarden/common/enums/fieldType";
import { FieldData } from "@bitwarden/common/models/data/fieldData";
import { EncString } from "@bitwarden/common/models/domain/encString";
import { FieldData } from "@bitwarden/common/models/data/field.data";
import { EncString } from "@bitwarden/common/models/domain/enc-string";
import { Field } from "@bitwarden/common/models/domain/field";
import { mockEnc, mockFromJson } from "../../utils";

6
libs/common/spec/models/domain/folder.spec.ts
View File

@@ -1,5 +1,5 @@
import { FolderData } from "@bitwarden/common/models/data/folderData";
import { EncString } from "@bitwarden/common/models/domain/encString";
import { FolderData } from "@bitwarden/common/models/data/folder.data";
import { EncString } from "@bitwarden/common/models/domain/enc-string";
import { Folder } from "@bitwarden/common/models/domain/folder";
import { mockEnc, mockFromJson } from "../../utils";
@@ -41,7 +41,7 @@ describe("Folder", () => {
});
describe("fromJSON", () => {
jest.mock("@bitwarden/common/models/domain/encString");
jest.mock("@bitwarden/common/models/domain/enc-string");
jest.spyOn(EncString, "fromJSON").mockImplementation(mockFromJson);
it("initializes nested objects", () => {

4
libs/common/spec/models/domain/identity.spec.ts
View File

@@ -1,5 +1,5 @@
import { IdentityData } from "@bitwarden/common/models/data/identityData";
import { EncString } from "@bitwarden/common/models/domain/encString";
import { IdentityData } from "@bitwarden/common/models/data/identity.data";
import { EncString } from "@bitwarden/common/models/domain/enc-string";
import { Identity } from "@bitwarden/common/models/domain/identity";
import { mockEnc, mockFromJson } from "../../utils";

8
libs/common/spec/models/domain/login.spec.ts
View File

@@ -2,11 +2,11 @@
import { Substitute, Arg } from "@fluffy-spoon/substitute";
import { UriMatchType } from "@bitwarden/common/enums/uriMatchType";
import { LoginData } from "@bitwarden/common/models/data/loginData";
import { EncString } from "@bitwarden/common/models/domain/encString";
import { LoginData } from "@bitwarden/common/models/data/login.data";
import { EncString } from "@bitwarden/common/models/domain/enc-string";
import { Login } from "@bitwarden/common/models/domain/login";
import { LoginUri } from "@bitwarden/common/models/domain/loginUri";
import { LoginUriView } from "@bitwarden/common/models/view/loginUriView";
import { LoginUri } from "@bitwarden/common/models/domain/login-uri";
import { LoginUriView } from "@bitwarden/common/models/view/login-uri.view";
import { mockEnc, mockFromJson } from "../../utils";

6
libs/common/spec/models/domain/loginUri.spec.ts
View File

@@ -1,9 +1,9 @@
import { Jsonify } from "type-fest";
import { UriMatchType } from "@bitwarden/common/enums/uriMatchType";
import { LoginUriData } from "@bitwarden/common/models/data/loginUriData";
import { EncString } from "@bitwarden/common/models/domain/encString";
import { LoginUri } from "@bitwarden/common/models/domain/loginUri";
import { LoginUriData } from "@bitwarden/common/models/data/login-uri.data";
import { EncString } from "@bitwarden/common/models/domain/enc-string";
import { LoginUri } from "@bitwarden/common/models/domain/login-uri";
import { mockEnc, mockFromJson } from "../../utils";

4
libs/common/spec/models/domain/password.spec.ts
View File

@@ -1,5 +1,5 @@
import { PasswordHistoryData } from "@bitwarden/common/models/data/passwordHistoryData";
import { EncString } from "@bitwarden/common/models/domain/encString";
import { PasswordHistoryData } from "@bitwarden/common/models/data/password-history.data";
import { EncString } from "@bitwarden/common/models/domain/enc-string";
import { Password } from "@bitwarden/common/models/domain/password";
import { mockEnc, mockFromJson } from "../../utils";

4
libs/common/spec/models/domain/secureNote.spec.ts
View File

@@ -1,6 +1,6 @@
import { SecureNoteType } from "@bitwarden/common/enums/secureNoteType";
import { SecureNoteData } from "@bitwarden/common/models/data/secureNoteData";
import { SecureNote } from "@bitwarden/common/models/domain/secureNote";
import { SecureNoteData } from "@bitwarden/common/models/data/secure-note.data";
import { SecureNote } from "@bitwarden/common/models/domain/secure-note";
describe("SecureNote", () => {
let data: SecureNoteData;

6
libs/common/spec/models/domain/send.spec.ts
View File

@@ -4,10 +4,10 @@ import { Substitute, Arg, SubstituteOf } from "@fluffy-spoon/substitute";
import { AbstractEncryptService } from "@bitwarden/common/abstractions/abstractEncrypt.service";
import { CryptoService } from "@bitwarden/common/abstractions/crypto.service";
import { SendType } from "@bitwarden/common/enums/sendType";
import { SendData } from "@bitwarden/common/models/data/sendData";
import { EncString } from "@bitwarden/common/models/domain/encString";
import { SendData } from "@bitwarden/common/models/data/send.data";
import { EncString } from "@bitwarden/common/models/domain/enc-string";
import { Send } from "@bitwarden/common/models/domain/send";
import { SendText } from "@bitwarden/common/models/domain/sendText";
import { SendText } from "@bitwarden/common/models/domain/send-text";
import { ContainerService } from "@bitwarden/common/services/container.service";
import { makeStaticByteArray, mockEnc } from "../../utils";

4
libs/common/spec/models/domain/sendAccess.spec.ts
View File

@@ -2,8 +2,8 @@
import { Substitute, Arg } from "@fluffy-spoon/substitute";
import { SendType } from "@bitwarden/common/enums/sendType";
import { SendAccess } from "@bitwarden/common/models/domain/sendAccess";
import { SendText } from "@bitwarden/common/models/domain/sendText";
import { SendAccess } from "@bitwarden/common/models/domain/send-access";
import { SendText } from "@bitwarden/common/models/domain/send-text";
import { SendAccessResponse } from "@bitwarden/common/models/response/sendAccessResponse";
import { mockEnc } from "../../utils";

4
libs/common/spec/models/domain/sendFile.spec.ts
View File

@@ -1,5 +1,5 @@
import { SendFileData } from "@bitwarden/common/models/data/sendFileData";
import { SendFile } from "@bitwarden/common/models/domain/sendFile";
import { SendFileData } from "@bitwarden/common/models/data/send-file.data";
import { SendFile } from "@bitwarden/common/models/domain/send-file";
import { mockEnc } from "../../utils";

4
libs/common/spec/models/domain/sendText.spec.ts
View File

@@ -1,5 +1,5 @@
import { SendTextData } from "@bitwarden/common/models/data/sendTextData";
import { SendText } from "@bitwarden/common/models/domain/sendText";
import { SendTextData } from "@bitwarden/common/models/data/send-text.data";
import { SendText } from "@bitwarden/common/models/domain/send-text";
import { mockEnc } from "../../utils";

2
libs/common/spec/models/domain/symmetricCryptoKey.spec.ts
View File

@@ -1,5 +1,5 @@
import { EncryptionType } from "@bitwarden/common/enums/encryptionType";
import { SymmetricCryptoKey } from "@bitwarden/common/models/domain/symmetricCryptoKey";
import { SymmetricCryptoKey } from "@bitwarden/common/models/domain/symmetric-crypto-key";
import { makeStaticByteArray } from "../../utils";

6
libs/common/spec/models/view/attachmentView.spec.ts
View File

@@ -1,9 +1,9 @@
import { SymmetricCryptoKey } from "@bitwarden/common/models/domain/symmetricCryptoKey";
import { AttachmentView } from "@bitwarden/common/models/view/attachmentView";
import { SymmetricCryptoKey } from "@bitwarden/common/models/domain/symmetric-crypto-key";
import { AttachmentView } from "@bitwarden/common/models/view/attachment.view";
import { mockFromJson } from "../../utils";
jest.mock("@bitwarden/common/models/domain/symmetricCryptoKey");
jest.mock("@bitwarden/common/models/domain/symmetric-crypto-key");
describe("AttachmentView", () => {
it("fromJSON initializes nested objects", () => {

24
libs/common/spec/models/view/cipherView.spec.ts
View File

@@ -1,19 +1,19 @@
import { CipherType } from "@bitwarden/common/enums/cipherType";
import { AttachmentView } from "@bitwarden/common/models/view/attachmentView";
import { CardView } from "@bitwarden/common/models/view/cardView";
import { CipherView } from "@bitwarden/common/models/view/cipherView";
import { FieldView } from "@bitwarden/common/models/view/fieldView";
import { IdentityView } from "@bitwarden/common/models/view/identityView";
import { LoginView } from "@bitwarden/common/models/view/loginView";
import { PasswordHistoryView } from "@bitwarden/common/models/view/passwordHistoryView";
import { SecureNoteView } from "@bitwarden/common/models/view/secureNoteView";
import { AttachmentView } from "@bitwarden/common/models/view/attachment.view";
import { CardView } from "@bitwarden/common/models/view/card.view";
import { CipherView } from "@bitwarden/common/models/view/cipher.view";
import { FieldView } from "@bitwarden/common/models/view/field.view";
import { IdentityView } from "@bitwarden/common/models/view/identity.view";
import { LoginView } from "@bitwarden/common/models/view/login.view";
import { PasswordHistoryView } from "@bitwarden/common/models/view/password-history.view";
import { SecureNoteView } from "@bitwarden/common/models/view/secure-note.view";
import { mockFromJson } from "../../utils";
jest.mock("@bitwarden/common/models/view/loginView");
jest.mock("@bitwarden/common/models/view/attachmentView");
jest.mock("@bitwarden/common/models/view/fieldView");
jest.mock("@bitwarden/common/models/view/passwordHistoryView");
jest.mock("@bitwarden/common/models/view/login.view");
jest.mock("@bitwarden/common/models/view/attachment.view");
jest.mock("@bitwarden/common/models/view/field.view");
jest.mock("@bitwarden/common/models/view/password-history.view");
describe("CipherView", () => {
beforeEach(() => {

2
libs/common/spec/models/view/folderView.spec.ts
View File

@@ -1,4 +1,4 @@
import { FolderView } from "@bitwarden/common/models/view/folderView";
import { FolderView } from "@bitwarden/common/models/view/folder.view";
describe("FolderView", () => {
describe("fromJSON", () => {

6
libs/common/spec/models/view/loginView.spec.ts
View File

@@ -1,9 +1,9 @@
import { LoginUriView } from "@bitwarden/common/models/view/loginUriView";
import { LoginView } from "@bitwarden/common/models/view/loginView";
import { LoginUriView } from "@bitwarden/common/models/view/login-uri.view";
import { LoginView } from "@bitwarden/common/models/view/login.view";
import { mockFromJson } from "../../utils";
jest.mock("@bitwarden/common/models/view/loginUriView");
jest.mock("@bitwarden/common/models/view/login-uri.view");
describe("LoginView", () => {
beforeEach(() => {

2
libs/common/spec/models/view/passwordHistoryView.spec.ts
View File

@@ -1,4 +1,4 @@
import { PasswordHistoryView } from "@bitwarden/common/models/view/passwordHistoryView";
import { PasswordHistoryView } from "@bitwarden/common/models/view/password-history.view";
describe("PasswordHistoryView", () => {
it("fromJSON initializes nested objects", () => {

6
libs/common/spec/services/cipher.service.spec.ts
View File

@@ -10,9 +10,9 @@ import { SearchService } from "@bitwarden/common/abstractions/search.service";
import { SettingsService } from "@bitwarden/common/abstractions/settings.service";
import { StateService } from "@bitwarden/common/abstractions/state.service";
import { Cipher } from "@bitwarden/common/models/domain/cipher";
import { EncArrayBuffer } from "@bitwarden/common/models/domain/encArrayBuffer";
import { EncString } from "@bitwarden/common/models/domain/encString";
import { SymmetricCryptoKey } from "@bitwarden/common/models/domain/symmetricCryptoKey";
import { EncArrayBuffer } from "@bitwarden/common/models/domain/enc-array-buffer";
import { EncString } from "@bitwarden/common/models/domain/enc-string";
import { SymmetricCryptoKey } from "@bitwarden/common/models/domain/symmetric-crypto-key";
import { CipherService } from "@bitwarden/common/services/cipher.service";
const ENCRYPTED_TEXT = "This data has been encrypted";

6
libs/common/spec/services/encrypt.service.spec.ts
View File

@@ -3,9 +3,9 @@ import { mockReset, mock } from "jest-mock-extended";
import { CryptoFunctionService } from "@bitwarden/common/abstractions/cryptoFunction.service";
import { LogService } from "@bitwarden/common/abstractions/log.service";
import { EncryptionType } from "@bitwarden/common/enums/encryptionType";
import { EncArrayBuffer } from "@bitwarden/common/models/domain/encArrayBuffer";
import { EncString } from "@bitwarden/common/models/domain/encString";
import { SymmetricCryptoKey } from "@bitwarden/common/models/domain/symmetricCryptoKey";
import { EncArrayBuffer } from "@bitwarden/common/models/domain/enc-array-buffer";
import { EncString } from "@bitwarden/common/models/domain/enc-string";
import { SymmetricCryptoKey } from "@bitwarden/common/models/domain/symmetric-crypto-key";
import { EncryptService } from "@bitwarden/common/services/encrypt.service";
import { makeStaticByteArray } from "../utils";

8
libs/common/spec/services/export.service.spec.ts
View File

@@ -11,11 +11,11 @@ import { CipherType } from "@bitwarden/common/enums/cipherType";
import { KdfType } from "@bitwarden/common/enums/kdfType";
import { Utils } from "@bitwarden/common/misc/utils";
import { Cipher } from "@bitwarden/common/models/domain/cipher";
import { EncString } from "@bitwarden/common/models/domain/encString";
import { EncString } from "@bitwarden/common/models/domain/enc-string";
import { Login } from "@bitwarden/common/models/domain/login";
import { CipherWithIdExport as CipherExport } from "@bitwarden/common/models/export/cipherWithIdsExport";
import { CipherView } from "@bitwarden/common/models/view/cipherView";
import { LoginView } from "@bitwarden/common/models/view/loginView";
import { CipherWithIdExport as CipherExport } from "@bitwarden/common/models/export/cipher-with-ids.export";
import { CipherView } from "@bitwarden/common/models/view/cipher.view";
import { LoginView } from "@bitwarden/common/models/view/login.view";
import { ExportService } from "@bitwarden/common/services/export.service";
import { BuildTestObject, GetUniqueString } from "../utils";

6
libs/common/spec/services/folder.service.spec.ts
View File

@@ -6,9 +6,9 @@ import { AbstractEncryptService } from "@bitwarden/common/abstractions/abstractE
import { CipherService } from "@bitwarden/common/abstractions/cipher.service";
import { CryptoService } from "@bitwarden/common/abstractions/crypto.service";
import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
import { FolderData } from "@bitwarden/common/models/data/folderData";
import { EncString } from "@bitwarden/common/models/domain/encString";
import { FolderView } from "@bitwarden/common/models/view/folderView";
import { FolderData } from "@bitwarden/common/models/data/folder.data";
import { EncString } from "@bitwarden/common/models/domain/enc-string";
import { FolderView } from "@bitwarden/common/models/view/folder.view";
import { ContainerService } from "@bitwarden/common/services/container.service";
import { FolderService } from "@bitwarden/common/services/folder/folder.service";
import { StateService } from "@bitwarden/common/services/state.service";

2
libs/common/spec/services/organization/organization.service.spec.ts
View File

@@ -3,7 +3,7 @@ import { BehaviorSubject, firstValueFrom, Subject } from "rxjs";
import { StateService } from "@bitwarden/common/abstractions/state.service";
import { SyncNotifierService } from "@bitwarden/common/abstractions/sync/syncNotifier.service.abstraction";
import { OrganizationData } from "@bitwarden/common/models/data/organizationData";
import { OrganizationData } from "@bitwarden/common/models/data/organization.data";
import { SyncResponse } from "@bitwarden/common/models/response/syncResponse";
import { OrganizationService } from "@bitwarden/common/services/organization/organization.service";
import { SyncEventArgs } from "@bitwarden/common/types/syncEventArgs";

10
libs/common/spec/services/policy.service.spec.ts
View File

@@ -6,13 +6,13 @@ import { CryptoService } from "@bitwarden/common/abstractions/crypto.service";
import { OrganizationService } from "@bitwarden/common/abstractions/organization/organization.service.abstraction";
import { OrganizationUserStatusType } from "@bitwarden/common/enums/organizationUserStatusType";
import { PolicyType } from "@bitwarden/common/enums/policyType";
import { PermissionsApi } from "@bitwarden/common/models/api/permissionsApi";
import { OrganizationData } from "@bitwarden/common/models/data/organizationData";
import { PolicyData } from "@bitwarden/common/models/data/policyData";
import { MasterPasswordPolicyOptions } from "@bitwarden/common/models/domain/masterPasswordPolicyOptions";
import { PermissionsApi } from "@bitwarden/common/models/api/permissions.api";
import { OrganizationData } from "@bitwarden/common/models/data/organization.data";
import { PolicyData } from "@bitwarden/common/models/data/policy.data";
import { MasterPasswordPolicyOptions } from "@bitwarden/common/models/domain/master-password-policy-options";
import { Organization } from "@bitwarden/common/models/domain/organization";
import { Policy } from "@bitwarden/common/models/domain/policy";
import { ResetPasswordPolicyOptions } from "@bitwarden/common/models/domain/resetPasswordPolicyOptions";
import { ResetPasswordPolicyOptions } from "@bitwarden/common/models/domain/reset-password-policy-options";
import { ListResponse } from "@bitwarden/common/models/response/listResponse";
import { PolicyResponse } from "@bitwarden/common/models/response/policyResponse";
import { ContainerService } from "@bitwarden/common/services/container.service";

2
libs/common/spec/services/stateMigration.service.spec.ts
View File

@@ -5,7 +5,7 @@ import { AbstractStorageService } from "@bitwarden/common/abstractions/storage.s
import { StateVersion } from "@bitwarden/common/enums/stateVersion";
import { StateFactory } from "@bitwarden/common/factories/stateFactory";
import { Account } from "@bitwarden/common/models/domain/account";
import { GlobalState } from "@bitwarden/common/models/domain/globalState";
import { GlobalState } from "@bitwarden/common/models/domain/global-state";
import { StateMigrationService } from "@bitwarden/common/services/stateMigration.service";
const userId = "USER_ID";

2
libs/common/spec/utils.ts
View File

@@ -1,7 +1,7 @@
// eslint-disable-next-line no-restricted-imports
import { Substitute, Arg } from "@fluffy-spoon/substitute";
import { EncString } from "@bitwarden/common/models/domain/encString";
import { EncString } from "@bitwarden/common/models/domain/enc-string";
function newGuid() {
return "xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx".replace(/[xy]/g, (c) => {

2
libs/common/spec/web/services/webCryptoFunction.service.spec.ts
View File

@@ -3,7 +3,7 @@ import { Substitute } from "@fluffy-spoon/substitute";
import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service";
import { Utils } from "@bitwarden/common/misc/utils";
import { SymmetricCryptoKey } from "@bitwarden/common/models/domain/symmetricCryptoKey";
import { SymmetricCryptoKey } from "@bitwarden/common/models/domain/symmetric-crypto-key";
import { WebCryptoFunctionService } from "@bitwarden/common/services/webCryptoFunction.service";
const RsaPublicKey =