Skip to content

[PM-31112] Decouple local tools crypto from user key #19433

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mzieniukbw wants to merge 11 commits into
base: main
Choose a base branch
from
Open

[PM-31112] Decouple local tools crypto from user key #19433

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
ab6caaa
sdk managed state init
mzieniukbw Mar 7, 2026
7828a15
tools user key encryptor using SDK crypto local user data key for enc…
mzieniukbw Mar 7, 2026
a3792c4
eslint
mzieniukbw Mar 8, 2026
078424a
sdk managed state init excluding CLI
mzieniukbw Mar 8, 2026
56aefdb
update sdk
mzieniukbw Mar 9, 2026
0f3384a
Merge branch 'main' into km/pm-31112-use-local-user-data-key
mzieniukbw Mar 9, 2026
ef5fdd0
client managed state
mzieniukbw Mar 10, 2026
95b6913
sdk upgrade
mzieniukbw Mar 10, 2026
d045ee9
Merge branch 'main' into km/pm-31112-use-local-user-data-key
mzieniukbw Mar 10, 2026
629ef89
Merge branch 'main' into km/pm-31112-use-local-user-data-key
mzieniukbw Mar 10, 2026
43187bb
Merge branch 'main' into km/pm-31112-use-local-user-data-key
mzieniukbw Mar 11, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions apps/browser/src/background/main.background.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -912,11 +912,10 @@ export default class MainBackground {
this.passwordStrengthService = new PasswordStrengthService();

this.passwordGenerationService = legacyPasswordGenerationServiceFactory(
this.encryptService,
this.keyService,
this.policyService,
this.accountService,
this.stateProvider,
this.sdkService,
);

this.devicesApiService = new DevicesApiServiceImplementation(this.apiService);
Expand Down Expand Up @@ -1147,7 +1146,11 @@ export default class MainBackground {

this.importMetadataService = new DefaultImportMetadataService(
createSystemServiceProvider(
new KeyServiceLegacyEncryptorProvider(this.encryptService, this.keyService),
new KeyServiceLegacyEncryptorProvider(
this.encryptService,
this.keyService,
this.sdkService,
),
this.stateProvider,
this.policyService,
buildExtensionRegistry(),
Expand Down Expand Up @@ -1481,7 +1484,7 @@ export default class MainBackground {
this.apiService,
this.i18nService,
this.keyService,
this.encryptService,
this.sdkService,
this.policyService,
this.accountService,
this.stateProvider,
Expand Down
9 changes: 6 additions & 3 deletions apps/cli/src/service-container/service-container.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -731,11 +731,10 @@ export class ServiceContainer {
this.passwordStrengthService = new PasswordStrengthService();

this.passwordGenerationService = legacyPasswordGenerationServiceFactory(
this.encryptService,
this.keyService,
this.policyService,
this.accountService,
this.stateProvider,
this.sdkService,
);

this.authRequestApiService = new DefaultAuthRequestApiService(this.apiService, this.logService);
Expand Down Expand Up @@ -951,7 +950,11 @@ export class ServiceContainer {

this.importMetadataService = new DefaultImportMetadataService(
createSystemServiceProvider(
new KeyServiceLegacyEncryptorProvider(this.encryptService, this.keyService),
new KeyServiceLegacyEncryptorProvider(
this.encryptService,
this.keyService,
this.sdkService,
),
this.stateProvider,
this.policyService,
buildExtensionRegistry(),
Expand Down
12 changes: 3 additions & 9 deletions libs/angular/src/services/jslib-services.module.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -793,18 +793,12 @@ const safeProviders: SafeProvider[] = [
safeProvider({
provide: PasswordGenerationServiceAbstraction,
useFactory: legacyPasswordGenerationServiceFactory,
deps: [
EncryptService,
KeyService,
PolicyServiceAbstraction,
AccountServiceAbstraction,
StateProvider,
],
deps: [PolicyServiceAbstraction, AccountServiceAbstraction, StateProvider, SdkService],
}),
safeProvider({
provide: GeneratorHistoryService,
useClass: LocalGeneratorHistoryService,
deps: [EncryptService, KeyService, StateProvider],
deps: [StateProvider, SdkService],
}),
safeProvider({
provide: UsernameGenerationServiceAbstraction,
Expand All @@ -813,7 +807,7 @@ const safeProviders: SafeProvider[] = [
ApiServiceAbstraction,
I18nServiceAbstraction,
KeyService,
EncryptService,
SdkService,
PolicyServiceAbstraction,
AccountServiceAbstraction,
StateProvider,
Expand Down
Loading
Loading