bitwarden/directory-connector
1
0
Fork 0
mirror of https://github.com/bitwarden/directory-connector synced 2025-12-15 07:43:27 +00:00
Code Issues Releases Wiki Activity

Update jslib (#222)

Browse Source
This commit is contained in:
Addison Beck
2022-02-03 14:47:36 -05:00
committed by addison
parent a578fb49c7
commit d519c39761
4 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
jslib

Submodule jslib updated: 92a65b7b36...448856cc22

5
src/app/services/services.module.ts
View File

@@ -45,7 +45,6 @@ import { StateMigrationService } from "../../services/stateMigration.service";
import { Account } from "../../models/account"; import { Account } from "../../models/account";
import { GlobalStateFactory } from "jslib-common/factories/globalStateFactory";
import { StateFactory } from "jslib-common/factories/stateFactory"; import { StateFactory } from "jslib-common/factories/stateFactory";
import { GlobalState } from "jslib-common/models/domain/globalState"; import { GlobalState } from "jslib-common/models/domain/globalState";
@@ -206,7 +205,7 @@ export function initFactory(
new StateMigrationService( new StateMigrationService(
storageService, storageService,
secureStorageService, secureStorageService,
new GlobalStateFactory(GlobalState) new StateFactory(GlobalState, Account)
), ),
deps: [StorageServiceAbstraction, "SECURE_STORAGE"], deps: [StorageServiceAbstraction, "SECURE_STORAGE"],
}, },
@@ -223,7 +222,7 @@ export function initFactory(
secureStorageService, secureStorageService,
logService, logService,
stateMigrationService, stateMigrationService,
true, // TODO: It seems like we aren't applying this from settings anywhere. Is toggling secure storage working? true,
new StateFactory(GlobalState, Account) new StateFactory(GlobalState, Account)
), ),
deps: [ deps: [

2
src/bwdc.ts
View File

@@ -127,7 +127,7 @@ export class Main {
this.stateMigrationService = new StateMigrationService( this.stateMigrationService = new StateMigrationService(
this.storageService, this.storageService,
this.secureStorageService, this.secureStorageService,
new GlobalStateFactory(GlobalState) new StateFactory(GlobalState, Account)
); );
this.stateService = new StateService( this.stateService = new StateService(

7
src/services/state.service.ts
View File

@@ -43,14 +43,17 @@ const keys = {
const StoredSecurely = "[STORED SECURELY]"; const StoredSecurely = "[STORED SECURELY]";
export class StateService extends BaseStateService<Account> implements StateServiceAbstraction { export class StateService
extends BaseStateService<GlobalState, Account>
implements StateServiceAbstraction
{
constructor( constructor(
protected storageService: StorageService, protected storageService: StorageService,
protected secureStorageService: StorageService, protected secureStorageService: StorageService,
protected logService: LogService, protected logService: LogService,
protected stateMigrationService: StateMigrationService, protected stateMigrationService: StateMigrationService,
private useSecureStorageForSecrets = true, private useSecureStorageForSecrets = true,
protected stateFactory: StateFactory<Account, GlobalState> protected stateFactory: StateFactory<GlobalState, Account>
) { ) {
super(storageService, secureStorageService, logService, stateMigrationService, stateFactory); super(storageService, secureStorageService, logService, stateMigrationService, stateFactory);
} }