From 90a7601960fa8314dfa561871cbe9a75c6fc8179 Mon Sep 17 00:00:00 2001
From: Thomas Rittson <31796059+eliykat@users.noreply.github.com>
Date: Fri, 14 Jan 2022 05:59:24 +1000
Subject: [PATCH] Update jslib and minor fixes for account switching (#204)

* Update jslib

* Update stateMigrationService to use enums

* Remove duplicate subclass method

* Update jslib
---
 jslib                                  |  2 +-
 src/services/stateMigration.service.ts | 17 +++++------------
 2 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/jslib b/jslib
index 9e263365..ddcfe233 160000
--- a/jslib
+++ b/jslib
@@ -1 +1 @@
-Subproject commit 9e263365497d669c9f7c85a324315a0597a1ea60
+Subproject commit ddcfe2336740549c97523d9d75e602f905f0431c
diff --git a/src/services/stateMigration.service.ts b/src/services/stateMigration.service.ts
index 8c4ca3f9..fe06eac0 100644
--- a/src/services/stateMigration.service.ts
+++ b/src/services/stateMigration.service.ts
@@ -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 } = {
 };
 
 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;