Browse Source

Update jslib and minor fixes for account switching (#204)

* Update jslib

* Update stateMigrationService to use enums

* Remove duplicate subclass method

* Update jslib
pull/206/head
Thomas Rittson 4 years ago committed by GitHub
parent
commit
90a7601960
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      jslib
  2. 17
      src/services/stateMigration.service.ts

2
jslib

@ -1 +1 @@ @@ -1 +1 @@
Subproject commit 9e263365497d669c9f7c85a324315a0597a1ea60
Subproject commit ddcfe2336740549c97523d9d75e602f905f0431c

17
src/services/stateMigration.service.ts

@ -3,6 +3,8 @@ import { State } from "jslib-common/models/domain/state"; @@ -3,6 +3,8 @@ import { State } from "jslib-common/models/domain/state";
import { StateMigrationService as BaseStateMigrationService } from "jslib-common/services/stateMigration.service";
import { StateVersion } from "jslib-common/enums/stateVersion";
import { DirectoryType } from "src/enums/directoryType";
import { Account, DirectoryConfigurations, DirectorySettings } from "src/models/account";
@ -47,21 +49,12 @@ const ClientKeys: { [key: string]: any } = { @@ -47,21 +49,12 @@ const ClientKeys: { [key: string]: any } = {
};
export class StateMigrationService extends BaseStateMigrationService {
async needsMigration(): Promise<boolean> {
const currentStateVersion = (
await this.storageService.get<State<Account>>("state", {
htmlStorageLocation: HtmlStorageLocation.Local,
})
)?.globals?.stateVersion;
return currentStateVersion == null || currentStateVersion < this.latestVersion;
}
async migrate(): Promise<void> {
let currentStateVersion =
(await this.storageService.get<State<Account>>("state"))?.globals?.stateVersion ?? 1;
while (currentStateVersion < this.latestVersion) {
(await this.storageService.get<State<Account>>("state"))?.globals?.stateVersion ?? StateVersion.One;
while (currentStateVersion < StateVersion.Latest) {
switch (currentStateVersion) {
case 1:
case StateVersion.One:
await this.migrateClientKeys();
await this.migrateStateFrom1To2();
break;

Loading…
Cancel
Save