mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web synced 2024-11-28 04:21:57 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #4009 from matrix-org/dbkr/log_exceptions_other_than_cancel

Browse source 
Log exceptions from accessSecretStorage
This commit is contained in:
David Baker 2020-01-31 11:00:16 +00:00 committed by GitHub
commit c111d70deb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/CrossSigningManager.js
View file

@ -37,6 +37,12 @@ function isCachingAllowed() {
); );
} }
export class AccessCancelledError extends Error {
constructor() {
super("Secret storage access canceled");
}
}
async function getSecretStorageKey({ keys: keyInfos }) { async function getSecretStorageKey({ keys: keyInfos }) {
const keyInfoEntries = Object.entries(keyInfos); const keyInfoEntries = Object.entries(keyInfos);
if (keyInfoEntries.length > 1) { if (keyInfoEntries.length > 1) {
@ -74,7 +80,7 @@ async function getSecretStorageKey({ keys: keyInfos }) {
); );
const [input] = await finished; const [input] = await finished;
if (!input) { if (!input) {
throw new Error("Secret storage access canceled"); throw new AccessCancelledError();
} }
const key = await inputToKey(input); const key = await inputToKey(input);

5
src/components/structures/auth/CompleteSecurity.js
View file

@ -19,7 +19,7 @@ import PropTypes from 'prop-types';
import { _t } from '../../../languageHandler'; import { _t } from '../../../languageHandler';
import * as sdk from '../../../index'; import * as sdk from '../../../index';
import { MatrixClientPeg } from '../../../MatrixClientPeg'; import { MatrixClientPeg } from '../../../MatrixClientPeg';
import { accessSecretStorage } from '../../../CrossSigningManager'; import { accessSecretStorage, AccessCancelledError } from '../../../CrossSigningManager';
const PHASE_INTRO = 0; const PHASE_INTRO = 0;
const PHASE_BUSY = 1; const PHASE_BUSY = 1;
@ -73,6 +73,9 @@ export default class CompleteSecurity extends React.Component {
}); });
} }
} catch (e) { } catch (e) {
if (!(e instanceof AccessCancelledError)) {
console.log(e);
}
// this will throw if the user hits cancel, so ignore // this will throw if the user hits cancel, so ignore
this.setState({ this.setState({
phase: PHASE_INTRO, phase: PHASE_INTRO,