bitwarden/browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser synced 2026-02-11 05:53:42 +00:00
Code Issues Releases Wiki Activity

Further import cleanups

Browse Source
This commit is contained in:
Bernd Schoolmann
2025-01-24 19:19:27 +01:00
parent d914f60dd3
commit 41ac8fffb2
19 changed files with 55 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
libs/common/src/key-management/crypto/abstractions/bulk-encrypt.service.ts
View File

@@ -1,4 +1,5 @@
import { InitializerMetadata } from "../../../platform/interfaces/initializer-metadata.interface";
import { InitializerMetadata } from "@bitwarden/common/platform/interfaces/initializer-metadata.interface";
import { Decryptable } from "../interfaces/decryptable.interface";
import { SymmetricCryptoKey } from "../models/domain/symmetric-crypto-key";

3
libs/common/src/key-management/crypto/abstractions/encrypt.service.ts
View File

@@ -1,4 +1,5 @@
import { InitializerMetadata } from "../../../platform/interfaces/initializer-metadata.interface";
import { InitializerMetadata } from "@bitwarden/common/platform/interfaces/initializer-metadata.interface";
import { Decryptable } from "../interfaces/decryptable.interface";
import { Encrypted } from "../interfaces/encrypted";
import { EncArrayBuffer } from "../models/domain/enc-array-buffer";

2
libs/common/src/key-management/crypto/abstractions/key-generation.service.ts
View File

@@ -1,6 +1,6 @@
import { CsprngArray } from "@bitwarden/common/types/csprng";
import { KdfConfig } from "@bitwarden/key-management";
import { CsprngArray } from "../../../types/csprng";
import { SymmetricCryptoKey } from "../models/domain/symmetric-crypto-key";
export abstract class KeyGenerationService {

4
libs/common/src/key-management/crypto/models/domain/encryption-pair.spec.ts
View File

@@ -1,5 +1,5 @@
import { Utils } from "../../../../platform/misc/utils";
import { EncryptionPair } from "../../../../platform/models/domain/account";
import { Utils } from "@bitwarden/common/platform/misc/utils";
import { EncryptionPair } from "@bitwarden/common/platform/models/domain/account";
describe("EncryptionPair", () => {
describe("toJSON", () => {

3
libs/common/src/key-management/crypto/models/domain/symmetric-crypto-key.ts
View File

@@ -2,7 +2,8 @@
// @ts-strict-ignore
import { Jsonify } from "type-fest";
import { Utils } from "../../../../platform/misc/utils";
import { Utils } from "@bitwarden/common/platform/misc/utils";
import { EncryptionType } from "../../enums";
export class SymmetricCryptoKey {

7
libs/common/src/key-management/crypto/services/bulk-encrypt.service.implementation.ts
View File

@@ -3,9 +3,10 @@
import { firstValueFrom, fromEvent, filter, map, takeUntil, defaultIfEmpty, Subject } from "rxjs";
import { Jsonify } from "type-fest";
import { LogService } from "../../../platform/abstractions/log.service";
import { InitializerMetadata } from "../../../platform/interfaces/initializer-metadata.interface";
import { Utils } from "../../../platform/misc/utils";
import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
import { InitializerMetadata } from "@bitwarden/common/platform/interfaces/initializer-metadata.interface";
import { Utils } from "@bitwarden/common/platform/misc/utils";
import { BulkEncryptService } from "../abstractions/bulk-encrypt.service";
import { CryptoFunctionService } from "../abstractions/crypto-function.service";
import { getClassInitializer } from "../enums/get-class-initializer";

6
libs/common/src/key-management/crypto/services/encrypt.service.implementation.ts
View File

@@ -4,10 +4,10 @@ import {
EncryptionType,
encryptionTypeToString as encryptionTypeName,
} from "@bitwarden/common/key-management/crypto/enums";
import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
import { InitializerMetadata } from "@bitwarden/common/platform/interfaces/initializer-metadata.interface";
import { Utils } from "@bitwarden/common/platform/misc/utils";
import { LogService } from "../../../platform/abstractions/log.service";
import { InitializerMetadata } from "../../../platform/interfaces/initializer-metadata.interface";
import { Utils } from "../../../platform/misc/utils";
import { CryptoFunctionService } from "../abstractions/crypto-function.service";
import { EncryptService } from "../abstractions/encrypt.service";
import { Decryptable } from "../interfaces/decryptable.interface";

7
libs/common/src/key-management/crypto/services/encrypt.service.spec.ts
View File

@@ -1,9 +1,10 @@
import { mockReset, mock } from "jest-mock-extended";
import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
import { Utils } from "@bitwarden/common/platform/misc/utils";
import { CsprngArray } from "@bitwarden/common/types/csprng";
import { makeStaticByteArray } from "../../../../spec";
import { LogService } from "../../../platform/abstractions/log.service";
import { Utils } from "../../../platform/misc/utils";
import { CsprngArray } from "../../../types/csprng";
import { CryptoFunctionService } from "../abstractions/crypto-function.service";
import { EncryptionType } from "../enums";
import { EncArrayBuffer } from "../models/domain/enc-array-buffer";

7
libs/common/src/key-management/crypto/services/encrypt.worker.ts
View File

@@ -2,12 +2,13 @@
// @ts-strict-ignore
import { Jsonify } from "type-fest";
import { ConsoleLogService } from "../../../platform/services/console-log.service";
import { ContainerService } from "../../../platform/services/container.service";
import { ConsoleLogService } from "@bitwarden/common/platform/services/console-log.service";
import { ContainerService } from "@bitwarden/common/platform/services/container.service";
import { getClassInitializer } from "../enums/get-class-initializer";
import { Decryptable } from "../interfaces/decryptable.interface";
import { SymmetricCryptoKey } from "../models/domain/symmetric-crypto-key";
import { getClassInitializer } from "./../enums/get-class-initializer";
import { EncryptServiceImplementation } from "./encrypt.service.implementation";
import { WebCryptoFunctionService } from "./web-crypto-function.service";

4
libs/common/src/key-management/crypto/services/key-generation.service.ts
View File

@@ -1,9 +1,9 @@
// FIXME: Update this file to be type safe and remove this and next line
// @ts-strict-ignore
import { Utils } from "@bitwarden/common/platform/misc/utils";
import { CsprngArray } from "@bitwarden/common/types/csprng";
import { KdfConfig, PBKDF2KdfConfig, Argon2KdfConfig, KdfType } from "@bitwarden/key-management";
import { Utils } from "../../../platform/misc/utils";
import { CsprngArray } from "../../../types/csprng";
import { CryptoFunctionService } from "../abstractions/crypto-function.service";
import { KeyGenerationService as KeyGenerationServiceAbstraction } from "../abstractions/key-generation.service";
import { SymmetricCryptoKey } from "../models/domain/symmetric-crypto-key";

5
libs/common/src/key-management/crypto/services/multithread-encrypt.service.implementation.ts
View File

@@ -3,8 +3,9 @@
import { defaultIfEmpty, filter, firstValueFrom, fromEvent, map, Subject, takeUntil } from "rxjs";
import { Jsonify } from "type-fest";
import { InitializerMetadata } from "../../../platform/interfaces/initializer-metadata.interface";
import { Utils } from "../../../platform/misc/utils";
import { InitializerMetadata } from "@bitwarden/common/platform/interfaces/initializer-metadata.interface";
import { Utils } from "@bitwarden/common/platform/misc/utils";
import { getClassInitializer } from "../enums/get-class-initializer";
import { Decryptable } from "../interfaces/decryptable.interface";
import { SymmetricCryptoKey } from "../models/domain/symmetric-crypto-key";

5
libs/common/src/key-management/crypto/services/web-crypto-function.service.spec.ts
View File

@@ -1,7 +1,8 @@
import { mock } from "jest-mock-extended";
import { PlatformUtilsService } from "../../../platform/abstractions/platform-utils.service";
import { Utils } from "../../../platform/misc/utils";
import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
import { Utils } from "@bitwarden/common/platform/misc/utils";
import { EcbDecryptParameters } from "../models/domain/decrypt-parameters";
import { SymmetricCryptoKey } from "../models/domain/symmetric-crypto-key";

5
libs/common/src/key-management/crypto/services/web-crypto-function.service.ts
View File

@@ -1,8 +1,9 @@
import * as argon2 from "argon2-browser";
import * as forge from "node-forge";
import { Utils } from "../../../platform/misc/utils";
import { CsprngArray } from "../../../types/csprng";
import { Utils } from "@bitwarden/common/platform/misc/utils";
import { CsprngArray } from "@bitwarden/common/types/csprng";
import { CryptoFunctionService } from "../abstractions/crypto-function.service";
import { CbcDecryptParameters, EcbDecryptParameters } from "../models/domain/decrypt-parameters";
import { SymmetricCryptoKey } from "../models/domain/symmetric-crypto-key";

2
libs/common/src/platform/interfaces/initializer-metadata.interface.ts
View File

@@ -1,4 +1,4 @@
import { InitializerKey } from "../../key-management/crypto/enums/initializer-key";
import { InitializerKey } from "@bitwarden/common/key-management/crypto/enums/initializer-key";
/**
* This interface enables deserialization of arbitrary objects by recording their class name as an enum, which

7
libs/common/src/platform/misc/utils.ts
View File

@@ -8,10 +8,9 @@ import { Observable, of, switchMap } from "rxjs";
import { getHostname, parse } from "tldts";
import { Merge } from "type-fest";
// FIXME: remove `src` and fix import
// eslint-disable-next-line no-restricted-imports
import { KeyService } from "../../../../key-management/src/abstractions/key.service";
import { EncryptService } from "../../key-management/crypto/abstractions/encrypt.service";
import { EncryptService } from "@bitwarden/common/key-management/crypto/abstractions/encrypt.service";
import { KeyService } from "@bitwarden/key-management";
import { I18nService } from "../abstractions/i18n.service";
// FIXME: Remove when updating file. Eslint update

18
libs/common/src/vault/services/cipher.service.spec.ts
View File

@@ -1,12 +1,13 @@
import { mock } from "jest-mock-extended";
import { BehaviorSubject, map, of } from "rxjs";
// FIXME: remove `src` and fix import
// eslint-disable-next-line no-restricted-imports
import {
CipherDecryptionKeys,
KeyService,
} from "../../../../key-management/src/abstractions/key.service";
import { BulkEncryptService } from "@bitwarden/common/key-management/crypto/abstractions/bulk-encrypt.service";
import { EncryptService } from "@bitwarden/common/key-management/crypto/abstractions/encrypt.service";
import { EncArrayBuffer } from "@bitwarden/common/key-management/crypto/models/domain/enc-array-buffer";
import { EncString } from "@bitwarden/common/key-management/crypto/models/domain/enc-string";
import { SymmetricCryptoKey } from "@bitwarden/common/key-management/crypto/models/domain/symmetric-crypto-key";
import { CipherDecryptionKeys, KeyService } from "@bitwarden/key-management";
import { FakeAccountService, mockAccountServiceWith } from "../../../spec/fake-account-service";
import { FakeStateProvider } from "../../../spec/fake-state-provider";
import { makeStaticByteArray } from "../../../spec/utils";
@@ -14,11 +15,6 @@ import { ApiService } from "../../abstractions/api.service";
import { SearchService } from "../../abstractions/search.service";
import { AutofillSettingsService } from "../../autofill/services/autofill-settings.service";
import { DomainSettingsService } from "../../autofill/services/domain-settings.service";
import { BulkEncryptService } from "../../key-management/crypto/abstractions/bulk-encrypt.service";
import { EncryptService } from "../../key-management/crypto/abstractions/encrypt.service";
import { EncArrayBuffer } from "../../key-management/crypto/models/domain/enc-array-buffer";
import { EncString } from "../../key-management/crypto/models/domain/enc-string";
import { SymmetricCryptoKey } from "../../key-management/crypto/models/domain/symmetric-crypto-key";
import { UriMatchStrategy } from "../../models/domain/domain-service";
import { ConfigService } from "../../platform/abstractions/config/config.service";
import { I18nService } from "../../platform/abstractions/i18n.service";

15
libs/common/src/vault/services/cipher.service.ts
View File

@@ -14,20 +14,19 @@ import {
} from "rxjs";
import { SemVer } from "semver";
// FIXME: remove `src` and fix import
// eslint-disable-next-line no-restricted-imports
import { KeyService } from "../../../../key-management/src/abstractions/key.service";
import { BulkEncryptService } from "@bitwarden/common/key-management/crypto/abstractions/bulk-encrypt.service";
import { EncryptService } from "@bitwarden/common/key-management/crypto/abstractions/encrypt.service";
import { EncArrayBuffer } from "@bitwarden/common/key-management/crypto/models/domain/enc-array-buffer";
import { EncString } from "@bitwarden/common/key-management/crypto/models/domain/enc-string";
import { SymmetricCryptoKey } from "@bitwarden/common/key-management/crypto/models/domain/symmetric-crypto-key";
import { KeyService } from "@bitwarden/key-management";
import { ApiService } from "../../abstractions/api.service";
import { SearchService } from "../../abstractions/search.service";
import { AccountService } from "../../auth/abstractions/account.service";
import { AutofillSettingsServiceAbstraction } from "../../autofill/services/autofill-settings.service";
import { DomainSettingsService } from "../../autofill/services/domain-settings.service";
import { FeatureFlag } from "../../enums/feature-flag.enum";
import { BulkEncryptService } from "../../key-management/crypto/abstractions/bulk-encrypt.service";
import { EncryptService } from "../../key-management/crypto/abstractions/encrypt.service";
import { EncArrayBuffer } from "../../key-management/crypto/models/domain/enc-array-buffer";
import { EncString } from "../../key-management/crypto/models/domain/enc-string";
import { SymmetricCryptoKey } from "../../key-management/crypto/models/domain/symmetric-crypto-key";
import { UriMatchStrategySetting } from "../../models/domain/domain-service";
import { ErrorResponse } from "../../models/response/error.response";
import { ListResponse } from "../../models/response/list.response";

4
libs/key-management/src/abstractions/key.service.ts
View File

@@ -3,6 +3,7 @@
import { Observable } from "rxjs";
import { EncryptedOrganizationKeyData } from "@bitwarden/common/admin-console/models/data/encrypted-organization-key.data";
import { HashPurpose, KeySuffixOptions } from "@bitwarden/common/key-management/crypto/enums";
import {
EncryptedString,
EncString,
@@ -21,9 +22,6 @@ import { ProfileProviderOrganizationResponse } from "../../../common/src/admin-c
import { ProfileProviderResponse } from "../../../common/src/admin-console/models/response/profile-provider.response";
// FIXME: remove `src` and fix import
// eslint-disable-next-line no-restricted-imports
import { KeySuffixOptions, HashPurpose } from "../../../common/src/key-management/crypto/enums";
// FIXME: remove `src` and fix import
// eslint-disable-next-line no-restricted-imports
import { OrganizationId, UserId } from "../../../common/src/types/guid";
// FIXME: remove `src` and fix import
// eslint-disable-next-line no-restricted-imports

2
libs/key-management/src/index.ts
View File

@@ -7,7 +7,7 @@ export { BiometricsCommands } from "./biometrics/biometrics-commands";
export { BiometricsService } from "./biometrics/biometric.service";
export * from "./biometrics/biometric.state";
export { KeyService } from "./abstractions/key.service";
export { KeyService, CipherDecryptionKeys } from "./abstractions/key.service";
export { DefaultKeyService } from "./key.service";
export { UserKeyRotationDataProvider } from "./abstractions/user-key-rotation-data-provider.abstraction";
export {