mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web synced 2024-10-25 20:26:51 +03:00
Code Issues Projects Releases Packages Wiki Activity

Indicate which access flow was used

Browse source
This commit is contained in:
J. Ryan Stinnett 2019-12-05 16:23:00 +00:00
parent 2bdc16b4bd
commit d66dbdea61
2 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/CrossSigningManager.js
View file

@ -63,11 +63,14 @@ export const getSecretStorageKey = async ({ keys: keyInfos }) => {
throw new Error("Secret storage access canceled");
}
let key;
const { passphrase } = info;
if (passphrase) {
key = await deriveKey(input, passphrase.salt, passphrase.iterations);
if (input.passphrase) {
key = await deriveKey(
input.passphrase,
info.passphrase.salt,
info.passphrase.iterations,
);
} else {
key = decodeRecoveryKey(input);
key = decodeRecoveryKey(input.recoveryKey);
}
// Save to cache to avoid future prompts in the current session
secretStorageKeys[name] = key;

4
src/components/views/dialogs/secretstorage/AccessSecretStorageDialog.js
View file

@ -65,11 +65,11 @@ export default class AccessSecretStorageDialog extends React.PureComponent {
}
_onPassPhraseNext = async () => {
this.props.onFinished(this.state.passPhrase);
this.props.onFinished({ passphrase: this.state.passPhrase });
}
_onRecoveryKeyNext = async () => {
this.props.onFinished(this.state.recoveryKey);
this.props.onFinished({ recoveryKey: this.state.recoveryKey });
}
_onPassPhraseChange = (e) => {