Merge pull request #5812 from matrix-org/jryans/cancel-security-key

Tweak security key error handling

src/SecurityManager.ts

@@ -395,6 +395,8 @@ export async function accessSecretStorage(func = async () => { }, forceReset = f
     } catch (e) {
         SecurityCustomisations.catchAccessSecretStorageError?.(e);
         console.error(e);
+        // Re-throw so that higher level logic can abort as needed
+        throw e;
     } finally {
         // Clear secret storage key cache now that work is complete
         secretStorageBeingAccessed = false;

src/stores/SetupEncryptionStore.js

@@ -121,7 +121,6 @@ export class SetupEncryptionStore extends EventEmitter {
             // on the first trust check, and the key backup restore will happen
             // in the background.
             await new Promise((resolve, reject) => {
-                try {
                 accessSecretStorage(async () => {
                     await cli.checkOwnCrossSigningTrust();
                     resolve();
@@ -132,10 +131,6 @@ export class SetupEncryptionStore extends EventEmitter {
                         await cli.restoreKeyBackupWithSecretStorage(backupInfo);
                     }
                 }).catch(reject);
-                } catch (e) {
-                    console.error(e);
-                    reject(e);
-                }
             });
 
             if (cli.getCrossSigningId()) {