mirror of
https://github.com/bitwarden/browser
synced 2025-12-17 08:43:33 +00:00
[Pm-13097] Rename cryptoservice to keyservice and move it to km ownership (#11358)
* Rename cryptoservice to keyservice * Rename cryptoservice to keyservice * Move key service to key management ownership * Remove accidentally added file * Fix cli build * Fix browser build * Run prettier * Fix builds * Fix cli build * Fix tests * Fix incorrect renames * Rename webauthn-login-crypto-service * Fix build errors due to merge conflicts * Fix linting
This commit is contained in:
@@ -1,28 +1,28 @@
|
||||
import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction";
|
||||
import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
|
||||
import { CryptoService } from "@bitwarden/common/platform/abstractions/crypto.service";
|
||||
import { EncryptService } from "@bitwarden/common/platform/abstractions/encrypt.service";
|
||||
import { StateProvider } from "@bitwarden/common/platform/state";
|
||||
import { engine, services, strategies } from "@bitwarden/generator-core";
|
||||
import { LocalGeneratorHistoryService } from "@bitwarden/generator-history";
|
||||
import { DefaultGeneratorNavigationService } from "@bitwarden/generator-navigation";
|
||||
import { KeyService } from "@bitwarden/key-management";
|
||||
|
||||
import { LegacyPasswordGenerationService } from "./legacy-password-generation.service";
|
||||
import { PasswordGenerationServiceAbstraction } from "./password-generation.service.abstraction";
|
||||
|
||||
const { PassphraseGeneratorStrategy, PasswordGeneratorStrategy } = strategies;
|
||||
const { CryptoServiceRandomizer, PasswordRandomizer } = engine;
|
||||
const { KeyServiceRandomizer, PasswordRandomizer } = engine;
|
||||
|
||||
const DefaultGeneratorService = services.DefaultGeneratorService;
|
||||
|
||||
export function legacyPasswordGenerationServiceFactory(
|
||||
encryptService: EncryptService,
|
||||
cryptoService: CryptoService,
|
||||
keyService: KeyService,
|
||||
policyService: PolicyService,
|
||||
accountService: AccountService,
|
||||
stateProvider: StateProvider,
|
||||
): PasswordGenerationServiceAbstraction {
|
||||
const randomizer = new CryptoServiceRandomizer(cryptoService);
|
||||
const randomizer = new KeyServiceRandomizer(keyService);
|
||||
const passwordRandomizer = new PasswordRandomizer(randomizer);
|
||||
|
||||
const passwords = new DefaultGeneratorService(
|
||||
@@ -37,7 +37,7 @@ export function legacyPasswordGenerationServiceFactory(
|
||||
|
||||
const navigation = new DefaultGeneratorNavigationService(stateProvider, policyService);
|
||||
|
||||
const history = new LocalGeneratorHistoryService(encryptService, cryptoService, stateProvider);
|
||||
const history = new LocalGeneratorHistoryService(encryptService, keyService, stateProvider);
|
||||
|
||||
return new LegacyPasswordGenerationService(
|
||||
accountService,
|
||||
|
||||
@@ -1,18 +1,18 @@
|
||||
import { ApiService } from "@bitwarden/common/abstractions/api.service";
|
||||
import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction";
|
||||
import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
|
||||
import { CryptoService } from "@bitwarden/common/platform/abstractions/crypto.service";
|
||||
import { EncryptService } from "@bitwarden/common/platform/abstractions/encrypt.service";
|
||||
import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
|
||||
import { StateProvider } from "@bitwarden/common/platform/state";
|
||||
import { RestClient } from "@bitwarden/common/tools/integration/rpc";
|
||||
import { engine, services, strategies, Integrations } from "@bitwarden/generator-core";
|
||||
import { DefaultGeneratorNavigationService } from "@bitwarden/generator-navigation";
|
||||
import { KeyService } from "@bitwarden/key-management";
|
||||
|
||||
import { LegacyUsernameGenerationService } from "./legacy-username-generation.service";
|
||||
import { UsernameGenerationServiceAbstraction } from "./username-generation.service.abstraction";
|
||||
|
||||
const { CryptoServiceRandomizer, UsernameRandomizer, EmailRandomizer, EmailCalculator } = engine;
|
||||
const { KeyServiceRandomizer, UsernameRandomizer, EmailRandomizer, EmailCalculator } = engine;
|
||||
const DefaultGeneratorService = services.DefaultGeneratorService;
|
||||
const {
|
||||
CatchallGeneratorStrategy,
|
||||
@@ -24,13 +24,13 @@ const {
|
||||
export function legacyUsernameGenerationServiceFactory(
|
||||
apiService: ApiService,
|
||||
i18nService: I18nService,
|
||||
cryptoService: CryptoService,
|
||||
keyService: KeyService,
|
||||
encryptService: EncryptService,
|
||||
policyService: PolicyService,
|
||||
accountService: AccountService,
|
||||
stateProvider: StateProvider,
|
||||
): UsernameGenerationServiceAbstraction {
|
||||
const randomizer = new CryptoServiceRandomizer(cryptoService);
|
||||
const randomizer = new KeyServiceRandomizer(keyService);
|
||||
const restClient = new RestClient(apiService, i18nService);
|
||||
const usernameRandomizer = new UsernameRandomizer(randomizer);
|
||||
const emailRandomizer = new EmailRandomizer(randomizer);
|
||||
@@ -57,7 +57,7 @@ export function legacyUsernameGenerationServiceFactory(
|
||||
restClient,
|
||||
i18nService,
|
||||
encryptService,
|
||||
cryptoService,
|
||||
keyService,
|
||||
stateProvider,
|
||||
),
|
||||
policyService,
|
||||
@@ -69,7 +69,7 @@ export function legacyUsernameGenerationServiceFactory(
|
||||
restClient,
|
||||
i18nService,
|
||||
encryptService,
|
||||
cryptoService,
|
||||
keyService,
|
||||
stateProvider,
|
||||
),
|
||||
policyService,
|
||||
@@ -81,7 +81,7 @@ export function legacyUsernameGenerationServiceFactory(
|
||||
restClient,
|
||||
i18nService,
|
||||
encryptService,
|
||||
cryptoService,
|
||||
keyService,
|
||||
stateProvider,
|
||||
),
|
||||
policyService,
|
||||
@@ -93,7 +93,7 @@ export function legacyUsernameGenerationServiceFactory(
|
||||
restClient,
|
||||
i18nService,
|
||||
encryptService,
|
||||
cryptoService,
|
||||
keyService,
|
||||
stateProvider,
|
||||
),
|
||||
policyService,
|
||||
@@ -105,7 +105,7 @@ export function legacyUsernameGenerationServiceFactory(
|
||||
restClient,
|
||||
i18nService,
|
||||
encryptService,
|
||||
cryptoService,
|
||||
keyService,
|
||||
stateProvider,
|
||||
),
|
||||
policyService,
|
||||
@@ -117,7 +117,7 @@ export function legacyUsernameGenerationServiceFactory(
|
||||
restClient,
|
||||
i18nService,
|
||||
encryptService,
|
||||
cryptoService,
|
||||
keyService,
|
||||
stateProvider,
|
||||
),
|
||||
policyService,
|
||||
|
||||
Reference in New Issue
Block a user