Browse Source

Update jslib (#222)

pull/223/head
Addison Beck 4 years ago committed by GitHub
parent
commit
7c85c9fddd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      jslib
  2. 5
      src/app/services/services.module.ts
  3. 2
      src/bwdc.ts
  4. 7
      src/services/state.service.ts

2
jslib

@ -1 +1 @@ @@ -1 +1 @@
Subproject commit 92a65b7b368a8dbf55350657674c90169b04c30b
Subproject commit 448856cc22510086bfddc99e3f1022ee28727694

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

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

2
src/bwdc.ts

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

7
src/services/state.service.ts

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

Loading…
Cancel
Save