Merge pull request #4521 from matrix-org/jryans/reset-from-access

Allow resetting storage from the access dialog
This commit is contained in:
J. Ryan Stinnett 2020-04-29 17:41:35 +01:00 committed by GitHub
commit 0e371b65d1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -21,6 +21,7 @@ import * as sdk from '../../../../index';
import {MatrixClientPeg} from '../../../../MatrixClientPeg'; import {MatrixClientPeg} from '../../../../MatrixClientPeg';
import { _t } from '../../../../languageHandler'; import { _t } from '../../../../languageHandler';
import { accessSecretStorage } from '../../../../CrossSigningManager';
/* /*
* Access Secure Secret Storage by requesting the user's passphrase. * Access Secure Secret Storage by requesting the user's passphrase.
@ -55,8 +56,9 @@ export default class AccessSecretStorageDialog extends React.PureComponent {
} }
_onResetRecoveryClick = () => { _onResetRecoveryClick = () => {
// Re-enter the access flow, but resetting storage this time around.
this.props.onFinished(false); this.props.onFinished(false);
throw new Error("Resetting secret storage unimplemented"); accessSecretStorage(() => {}, /* forceReset = */ true);
} }
_onRecoveryKeyChange = (e) => { _onRecoveryKeyChange = (e) => {