Feat/remove opinionated storage

packages/common-types/src/baseTypes/aggregateTypes.ts

@@ -131,6 +131,8 @@ export type KeyDetails = {
   threshold: number;
   totalShares: number;
   shareDescriptions: ShareDescriptionMap;
+  deviceShare?: ShareStore;
+  userShare?: ShareStore;
 };
 
 export type TKeyArgs = {
@@ -249,7 +251,6 @@ export interface ITKeyApi {
   }): Promise<CatchupToLatestShareResult>;
   _syncShareMetadata(adjustScopedStore?: (ss: unknown) => unknown): Promise<void>;
   inputShareStoreSafe(shareStore: ShareStore, autoUpdateMetadata?: boolean): Promise<void>;
-  _setDeviceStorage(storeDeviceStorage: (deviceShareStore: ShareStore) => Promise<void>): void;
   addShareDescription(shareIndex: string, description: string, updateMetadata?: boolean): Promise<void>;
   _addRefreshMiddleware(
     moduleName: string,

packages/core/src/core.ts

@@ -81,8 +81,6 @@ class ThresholdKey implements ITKey {
 
   _shareSerializationMiddleware: ShareSerializationMiddleware;
 
-  storeDeviceShare: (deviceShareStore: ShareStore, customDeviceInfo?: StringifiedType) => Promise<void>;
-
   haveWriteMetadataLock: string;
 
   serverTimeOffset?: number = 0;
@@ -99,7 +97,6 @@ class ThresholdKey implements ITKey {
     this._refreshMiddleware = {};
     this._reconstructKeyMiddleware = {};
     this._shareSerializationMiddleware = undefined;
-    this.storeDeviceShare = undefined;
     this._localMetadataTransitions = [[], []];
     this.setModuleReferences(); // Providing ITKeyApi access to modules
     this.haveWriteMetadataLock = "";
@@ -252,16 +249,35 @@ class ThresholdKey implements ITKey {
         if (neverInitializeNewKey) {
           throw CoreError.default("key has not been generated yet");
         }
+
         // no metadata set, assumes new user
-        await this._initializeNewKey({ initializeModules: true, importedKey: importKey, delete1OutOf1: p.delete1OutOf1 });
-        return this.getKeyDetails();
+        const newKeyDetails = await this._initializeNewKey({ initializeModules: true, importedKey: importKey, delete1OutOf1: p.delete1OutOf1 });
+        const keyDetail = this.getKeyDetails();
+        keyDetail.deviceShare = newKeyDetails.deviceShare;
+        keyDetail.userShare = newKeyDetails.userShare;
+        return keyDetail;
       }
       // else we continue with catching up share and metadata
       shareStore = ShareStore.fromJSON(rawServiceProviderShare);
     } else {
       throw CoreError.default("Input is not supported");
     }
 
+    await this.postInit(shareStore, transitionMetadata, previouslyFetchedCloudMetadata, previousLocalMetadataTransitions);
+  }
+
+  async postInit(
+    shareStore: ShareStore,
+    transitionMetadata?: Metadata,
+    previouslyFetchedCloudMetadata?: Metadata,
+    previousLocalMetadataTransitions?: LocalMetadataTransitions
+  ) {
+    const previousLocalMetadataTransitionsExists =
+      previousLocalMetadataTransitions && previousLocalMetadataTransitions[0].length > 0 && previousLocalMetadataTransitions[1].length > 0;
+    const reinitializing = transitionMetadata && previousLocalMetadataTransitionsExists; // are we reinitializing the SDK?
+    // in the case we're reinitializing whilst newKeyAssign has not been synced
+    const reinitializingWithNewKeyAssign = reinitializing && previouslyFetchedCloudMetadata === undefined;
+
     // We determine the latest metadata on the SDK and if there has been
     // needed transitions to include
     let currentMetadata: Metadata;
@@ -690,10 +706,6 @@ class ThresholdKey implements ITKey {
       this.inputShareStore(new ShareStore(shares[shareIndex.toString("hex")], poly.getPolynomialID()));
     }
 
-    if (this.storeDeviceShare) {
-      await this.storeDeviceShare(new ShareStore(shares[shareIndexes[1].toString("hex")], poly.getPolynomialID()));
-    }
-
     const result = {
       privKey: this.privKey,
       deviceShare: new ShareStore(shares[shareIndexes[1].toString("hex")], poly.getPolynomialID()),
@@ -1081,13 +1093,6 @@ class ThresholdKey implements ITKey {
     };
   }
 
-  _setDeviceStorage(storeDeviceStorage: (deviceShareStore: ShareStore) => Promise<void>): void {
-    if (this.storeDeviceShare) {
-      throw CoreError.default("storeDeviceShare already set");
-    }
-    this.storeDeviceShare = storeDeviceStorage;
-  }
-
   async addShareDescription(shareIndex: string, description: string, updateMetadata?: boolean): Promise<void> {
     if (!this.metadata) {
       throw CoreError.metadataUndefined();
@@ -1305,7 +1310,6 @@ class ThresholdKey implements ITKey {
       outputShareStore: this.outputShareStore.bind(this),
       inputShare: this.inputShare.bind(this),
       outputShare: this.outputShare.bind(this),
-      _setDeviceStorage: this._setDeviceStorage.bind(this),
       encrypt: this.encrypt.bind(this),
       decrypt: this.decrypt.bind(this),
       getTKeyStore: this.getTKeyStore.bind(this),

packages/web-storage/src/WebStorageModule.ts

@@ -42,7 +42,6 @@ class WebStorageModule implements IModule {
 
   setModuleReferences(tbSDK: ITKeyApi): void {
     this.tbSDK = tbSDK;
-    this.tbSDK._setDeviceStorage(this.storeDeviceShare.bind(this));
   }
 
   // eslint-disable-next-line