Return file/words flags with import results

nimiq · Mar 15, 2019 · 8bcfeb0 · 8bcfeb0
1 parent a3a7509
commit 8bcfeb0
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 0 deletions.
diff --git a/client/src/PublicRequest.ts b/client/src/PublicRequest.ts
@@ -12,6 +12,8 @@ export type SingleKeyResult = {
         keyPath: string,
         address: Uint8Array,
     }>;
+    fileExported: boolean;
+    wordsExported: boolean;
 };
 
 export type TransactionInfo = {

diff --git a/src/request/create/Create.js b/src/request/create/Create.js
@@ -114,6 +114,8 @@ class Create {
                 address: key.deriveAddress(keyPath).serialize(),
                 keyPath,
             }],
+            fileExported: false,
+            wordsExported: false,
         }];
 
         this._resolve(result);

diff --git a/src/request/import/ImportFile.js b/src/request/import/ImportFile.js
@@ -150,6 +150,8 @@ class ImportFile {
             keyId: /** @type {number} */ (key.id),
             keyType: key.type,
             addresses,
+            fileExported: true,
+            wordsExported: false,
         }];
 
         this._resolve(result);

diff --git a/src/request/import/ImportWords.js b/src/request/import/ImportWords.js
@@ -116,6 +116,9 @@ class ImportWords {
             );
 
             downloadLoginFile.on(DownloadLoginFile.Events.DOWNLOADED, () => {
+                for (let i = 0; i < this._keyResults.length; i++) {
+                    this._keyResults[i].fileExported = true;
+                }
                 this._resolve(this._keyResults);
             });
             window.location.hash = ImportWords.Pages.DOWNLOAD_LOGINFILE;
@@ -180,18 +183,23 @@ class ImportWords {
         try {
             if (this._secrets.entropy) {
                 const key = new Key(this._secrets.entropy, false);
+
                 /** @type {{keyPath: string, address: Uint8Array}[]} */
                 const addresses = this._request.requestedKeyPaths.map(keyPath => ({
                     keyPath,
                     address: key.deriveAddress(keyPath).serialize(),
                 }));
 
+                /** @type {KeyguardRequest.SingleKeyResult} */
                 const result = {
                     keyId: await KeyStore.instance.put(key, encryptionKey || undefined),
                     keyType: Nimiq.Secret.Type.ENTROPY,
                     addresses,
+                    fileExported: false,
+                    wordsExported: true,
                 };
                 this._keyResults.push(result);
+
                 const secretString = Nimiq.BufferUtils.toBase64(key.secret.serialize());
                 sessionStorage.setItem(ImportApi.SESSION_STORAGE_KEY_PREFIX + result.keyId, secretString);
 
@@ -208,13 +216,17 @@ class ImportWords {
             }
             if (this._secrets.privateKey) {
                 const key = new Key(this._secrets.privateKey, false);
+
+                /** @type {KeyguardRequest.SingleKeyResult} */
                 const result = {
                     keyId: await KeyStore.instance.put(key, encryptionKey || undefined),
                     keyType: Nimiq.Secret.Type.PRIVATE_KEY,
                     addresses: [{
                         keyPath: Constants.LEGACY_DERIVATION_PATH,
                         address: key.deriveAddress(Constants.LEGACY_DERIVATION_PATH).serialize(),
                     }],
+                    fileExported: false,
+                    wordsExported: true,
                 };
                 this._keyResults.push(result);
             } else {