OpenCloud
/
element-web
mirror of https://github.com/vector-im/element-web
1
0
Fork 0
Code Issues Releases Wiki Activity

rename secret storage force-reset variable to avoid confusion

pull/21833/head
Zoe 2020-03-25 14:21:17 +00:00
parent b7013c6f5d
commit 9dd81216fb
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/CrossSigningManager.js
View File

@ -195,19 +195,19 @@ export async function promptForBackupPassphrase() {
* *
* @param {Function} [func] An operation to perform once secret storage has been * @param {Function} [func] An operation to perform once secret storage has been
* bootstrapped. Optional. * bootstrapped. Optional.
* @param {bool} [force] Reset secret storage even if it's already set up * @param {bool} [forceReset] Reset secret storage even if it's already set up
*/ */
export async function accessSecretStorage(func = async () => { }, force = false) { export async function accessSecretStorage(func = async () => { }, forceReset = false) {
const cli = MatrixClientPeg.get(); const cli = MatrixClientPeg.get();
secretStorageBeingAccessed = true; secretStorageBeingAccessed = true;
try { try {
if (!await cli.hasSecretStorageKey() || force) { if (!await cli.hasSecretStorageKey() || forceReset) {
// This dialog calls bootstrap itself after guiding the user through // This dialog calls bootstrap itself after guiding the user through
// passphrase creation. // passphrase creation.
const { finished } = Modal.createTrackedDialogAsync('Create Secret Storage dialog', '', const { finished } = Modal.createTrackedDialogAsync('Create Secret Storage dialog', '',
import("./async-components/views/dialogs/secretstorage/CreateSecretStorageDialog"), import("./async-components/views/dialogs/secretstorage/CreateSecretStorageDialog"),
{ {
force, force: forceReset,
}, },
null, /* priority = */ false, /* static = */ true, null, /* priority = */ false, /* static = */ true,
); );

6
src/components/views/settings/CrossSigningPanel.js
View File

@ -98,12 +98,12 @@ export default class CrossSigningPanel extends React.PureComponent {
* 2. Access existing secret storage by requesting passphrase and accessing * 2. Access existing secret storage by requesting passphrase and accessing
* cross-signing keys as needed. * cross-signing keys as needed.
* 3. All keys are loaded and there's nothing to do. * 3. All keys are loaded and there's nothing to do.
* @param {bool} [force] Bootstrap again even if keys already present * @param {bool} [forceReset] Bootstrap again even if keys already present
*/ */
_bootstrapSecureSecretStorage = async (force=false) => { _bootstrapSecureSecretStorage = async (forceReset=false) => {
this.setState({ error: null }); this.setState({ error: null });
try { try {
await accessSecretStorage(() => undefined, force); await accessSecretStorage(() => undefined, forceReset);
} catch (e) { } catch (e) {
this.setState({ error: e }); this.setState({ error: e });
console.error("Error bootstrapping secret storage", e); console.error("Error bootstrapping secret storage", e);