+
0 && Email.looksValid(term)) {
+ if (term.indexOf('@') > 0 && Email.looksValid(term) && SettingsStore.getValue(UIFeature.IdentityServer)) {
// Start off by suggesting the plain email while we try and resolve it
// to a real account.
this.setState({
@@ -1037,7 +1039,9 @@ export default class InviteDialog extends React.PureComponent {
}
_renderIdentityServerWarning() {
- if (!this.state.tryingIdentityServer || this.state.canUseIdentityServer) {
+ if (!this.state.tryingIdentityServer || this.state.canUseIdentityServer ||
+ !SettingsStore.getValue(UIFeature.IdentityServer)
+ ) {
return null;
}
@@ -1086,22 +1090,38 @@ export default class InviteDialog extends React.PureComponent {
let buttonText;
let goButtonFn;
+ const identityServersEnabled = SettingsStore.getValue(UIFeature.IdentityServer);
+
const userId = MatrixClientPeg.get().getUserId();
if (this.props.kind === KIND_DM) {
title = _t("Direct Messages");
- helpText = _t(
- "Start a conversation with someone using their name, username (like
+ { helpText } {inviteText}
+ ;
}
buttonText = _t("Go");
goButtonFn = this._startDm;
} else { // KIND_INVITE
title = _t("Invite to this room");
- helpText = _t(
- "Invite someone using their name, username (like {
const matrixToUrl = this.getUrl();
const encodedUrl = encodeURIComponent(matrixToUrl);
+ const showQrCode = SettingsStore.getValue(UIFeature.ShareQRCode);
+ const showSocials = SettingsStore.getValue(UIFeature.ShareSocial);
+
+ let qrSocialSection;
+ if (showQrCode || showSocials) {
+ qrSocialSection = <>
+
+ {
/>
{ checkbox }
-
- -
;
}
diff --git a/src/components/views/dialogs/UserSettingsDialog.js b/src/components/views/dialogs/UserSettingsDialog.js
index f74f57b970..7164540aea 100644
--- a/src/components/views/dialogs/UserSettingsDialog.js
+++ b/src/components/views/dialogs/UserSettingsDialog.js
@@ -87,12 +87,14 @@ export default class UserSettingsDialog extends React.Component {
"mx_UserSettingsDialog_appearanceIcon",
+
+ { showQrCode &&
+ ;
+ }
+
const BaseDialog = sdk.getComponent('views.dialogs.BaseDialog');
return
+
}
+ { showSocials &&
+ { socials.map((social) => (
+
+ 
+
+ )) }
+
}
+ - -
-
+ { qrSocialSection }
-
-
- { socials.map((social) => (
-
-
-
- )) }
-
-
+
;
+ } else {
+ content = {_t("Unable to set up keys")}
+
+
+
+
;
+ }
+
+ return (
+
+ {content}
+
+
-
;
}
}
diff --git a/src/components/views/elements/ReplyThread.js b/src/components/views/elements/ReplyThread.js
index 70592c72c5..2d17c858a2 100644
--- a/src/components/views/elements/ReplyThread.js
+++ b/src/components/views/elements/ReplyThread.js
@@ -28,6 +28,7 @@ import escapeHtml from "escape-html";
import MatrixClientContext from "../../../contexts/MatrixClientContext";
import {Action} from "../../../dispatcher/actions";
import sanitizeHtml from "sanitize-html";
+import {UIFeature} from "../../../settings/UIFeature";
// This component does no cycle detection, simply because the only way to make such a cycle would be to
// craft event_id's, using a homeserver that generates predictable event IDs; even then the impact would
@@ -366,6 +367,7 @@ export default class ReplyThread extends React.Component {
isRedacted={ev.isRedacted()}
isTwelveHour={SettingsStore.getValue("showTwelveHourTimestamps")}
useIRCLayout={this.props.useIRCLayout}
+ enableFlair={SettingsStore.getValue(UIFeature.Flair)}
/>
;
});
diff --git a/src/components/views/rooms/EventTile.js b/src/components/views/rooms/EventTile.js
index ab9f240f2d..f444fb1f1a 100644
--- a/src/components/views/rooms/EventTile.js
+++ b/src/components/views/rooms/EventTile.js
@@ -206,6 +206,9 @@ export default class EventTile extends React.Component {
// whether to use the irc layout
useIRCLayout: PropTypes.bool,
+
+ // whether or not to show flair at all
+ enableFlair: PropTypes.bool,
};
static defaultProps = {
@@ -736,10 +739,10 @@ export default class EventTile extends React.Component {
else if (msgtype === 'm.file') text = _td('%(senderName)s uploaded a file');
sender =
-
- );
- }
-}
diff --git a/src/components/views/rooms/SearchResultTile.js b/src/components/views/rooms/SearchResultTile.js
index 136bd23729..8b2a9c2d61 100644
--- a/src/components/views/rooms/SearchResultTile.js
+++ b/src/components/views/rooms/SearchResultTile.js
@@ -19,6 +19,8 @@ import React from 'react';
import PropTypes from 'prop-types';
import * as sdk from '../../../index';
import {haveTileForEvent} from "./EventTile";
+import SettingsStore from "../../../settings/SettingsStore";
+import {UIFeature} from "../../../settings/UIFeature";
export default class SearchResultTile extends React.Component {
static propTypes = {
@@ -45,18 +47,27 @@ export default class SearchResultTile extends React.Component {
const ret = [{_t(
- "Never lose encrypted messages",
- )}
-
-
- {_t( - "Messages in this room are secured with end-to-end " + - "encryption. Only you and the recipient(s) have the " + - "keys to read these messages.", - )}
-{_t( - "Securely back up your keys to avoid losing them. " + - "Learn more.", {}, - { - // TODO: We don't have this link yet: this will prevent the translators - // having to re-translate the string when we do. - a: sub => '', - }, - )}
-
-
- {setupCaption}
-
-
- { _t("Not now") }
-
-
- { _t("Don't ask me again") }
-
-
-
-
- {_t("Reset")}
-
-
+ const actions = [];
+
+ // TODO: determine how better to expose this to users in addition to prompts at login/toast
+ if (!keysExistEverywhere && homeserverSupportsCrossSigning) {
+ actions.push(
+
-
- {_t("Set up")}
-
-
+ if (keysExistAnywhere) {
+ actions.push(
+
+ {actions}
+
;
+ }
+
return (
{summarisedStatus}
@@ -230,7 +239,7 @@ export default class CrossSigningPanel extends React.PureComponent {
{_t("Cross-signing private keys:")}
- {crossSigningPrivateKeysInStorage ? _t("in secret storage") : _t("not found")}
+ {crossSigningPrivateKeysInStorage ? _t("in secret storage") : _t("not found in storage")}
{_t("Master private key:")}
@@ -251,8 +260,7 @@ export default class CrossSigningPanel extends React.PureComponent {
{errorSection}
- {bootstrapButton}
- {resetButton}
+ {actionRow}
);
}
diff --git a/src/components/views/settings/SecureBackupPanel.js b/src/components/views/settings/SecureBackupPanel.js
index 7f0655d54a..3547efc3f2 100644
--- a/src/components/views/settings/SecureBackupPanel.js
+++ b/src/components/views/settings/SecureBackupPanel.js
@@ -24,7 +24,7 @@ import { isSecureBackupRequired } from '../../../utils/WellKnownUtils';
import Spinner from '../elements/Spinner';
import AccessibleButton from '../elements/AccessibleButton';
import QuestionDialog from '../dialogs/QuestionDialog';
-import RestoreKeyBackupDialog from '../dialogs/keybackup/RestoreKeyBackupDialog';
+import RestoreKeyBackupDialog from '../dialogs/security/RestoreKeyBackupDialog';
import { accessSecretStorage } from '../../../SecurityManager';
export default class SecureBackupPanel extends React.PureComponent {
@@ -131,7 +131,7 @@ export default class SecureBackupPanel extends React.PureComponent {
const cli = MatrixClientPeg.get();
const secretStorage = cli._crypto._secretStorage;
- const backupKeyStored = await cli.isKeyBackupKeyStored();
+ const backupKeyStored = !!(await cli.isKeyBackupKeyStored());
const backupKeyFromCache = await cli._crypto.getSessionBackupPrivateKey();
const backupKeyCached = !!(backupKeyFromCache);
const backupKeyWellFormed = backupKeyFromCache instanceof Uint8Array;
@@ -150,7 +150,7 @@ export default class SecureBackupPanel extends React.PureComponent {
_startNewBackup = () => {
Modal.createTrackedDialogAsync('Key Backup', 'Key Backup',
- import('../../../async-components/views/dialogs/keybackup/CreateKeyBackupDialog'),
+ import('../../../async-components/views/dialogs/security/CreateKeyBackupDialog'),
{
onFinished: () => {
this._loadBackupStatus();
@@ -367,14 +367,14 @@ export default class SecureBackupPanel extends React.PureComponent {
;
actions.push(
-
+
{restoreButtonCaption}
,
);
if (!isSecureBackupRequired()) {
actions.push(
-
+
{_t("Delete Backup")}
,
);
@@ -388,7 +388,7 @@ export default class SecureBackupPanel extends React.PureComponent {
+
{_t("Set up")}
,
);
@@ -396,7 +396,7 @@ export default class SecureBackupPanel extends React.PureComponent {
if (secretStorageKeyInAccount) {
actions.push(
-
+
{_t("Reset")}
,
);
diff --git a/src/components/views/settings/tabs/room/GeneralRoomSettingsTab.js b/src/components/views/settings/tabs/room/GeneralRoomSettingsTab.js
index 90eb60e632..9b8004d9d6 100644
--- a/src/components/views/settings/tabs/room/GeneralRoomSettingsTab.js
+++ b/src/components/views/settings/tabs/room/GeneralRoomSettingsTab.js
@@ -73,6 +73,18 @@ export default class GeneralRoomSettingsTab extends React.Component {
urlPreviewSettings = null;
}
+ let flairSection;
+ if (SettingsStore.getValue(UIFeature.Flair)) {
+ flairSection = <>
+ {_t("Flair")}
+
{_t("Back up your keys before signing out to avoid losing them.")}
; actions.push( -
+
+ ;
+ }
+
return (
{_t("General")}
@@ -87,14 +99,8 @@ export default class GeneralRoomSettingsTab extends React.Component {
canonicalAliasEvent={canonicalAliasEv} aliasEvents={aliasEvents} />
{_t("Other")}
- {_t("Flair")}
-
-
-
- {urlPreviewSettings}
+ { flairSection }
+ { urlPreviewSettings }
{_t("Leave room")}
diff --git a/src/components/views/settings/tabs/user/GeneralUserSettingsTab.js b/src/components/views/settings/tabs/user/GeneralUserSettingsTab.js
index fadb4c756b..54d4928d83 100644
--- a/src/components/views/settings/tabs/user/GeneralUserSettingsTab.js
+++ b/src/components/views/settings/tabs/user/GeneralUserSettingsTab.js
@@ -388,17 +388,31 @@ export default class GeneralUserSettingsTab extends React.Component {
width="18" height="18" alt={_t("Warning")} />
: null;
+ let accountManagementSection;
+ if (SettingsStore.getValue(UIFeature.Deactivate)) {
+ accountManagementSection = <>
+
);
}
diff --git a/src/components/views/settings/tabs/user/SecurityUserSettingsTab.js b/src/components/views/settings/tabs/user/SecurityUserSettingsTab.js
index 0c49f108d6..d30bcc34e0 100644
--- a/src/components/views/settings/tabs/user/SecurityUserSettingsTab.js
+++ b/src/components/views/settings/tabs/user/SecurityUserSettingsTab.js
@@ -103,14 +103,14 @@ export default class SecurityUserSettingsTab extends React.Component {
_onExportE2eKeysClicked = () => {
Modal.createTrackedDialogAsync('Export E2E Keys', '',
- import('../../../../../async-components/views/dialogs/ExportE2eKeysDialog'),
+ import('../../../../../async-components/views/dialogs/security/ExportE2eKeysDialog'),
{matrixClient: MatrixClientPeg.get()},
);
};
_onImportE2eKeysClicked = () => {
Modal.createTrackedDialogAsync('Import E2E Keys', '',
- import('../../../../../async-components/views/dialogs/ImportE2eKeysDialog'),
+ import('../../../../../async-components/views/dialogs/security/ImportE2eKeysDialog'),
{matrixClient: MatrixClientPeg.get()},
);
};
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index b2b4e01202..9f5446328f 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -411,13 +411,12 @@
"Set password": "Set password",
"To return to your account in future you need to set a password": "To return to your account in future you need to set a password",
"Set Password": "Set Password",
- "Set up encryption": "Set up encryption",
+ "Set up Secure Backup": "Set up Secure Backup",
"Encryption upgrade available": "Encryption upgrade available",
"Verify this session": "Verify this session",
- "Set up": "Set up",
"Upgrade": "Upgrade",
"Verify": "Verify",
- "Verify yourself & others to keep your chats safe": "Verify yourself & others to keep your chats safe",
+ "Safeguard against losing access to encrypted messages & data": "Safeguard against losing access to encrypted messages & data",
"Other users may not trust it": "Other users may not trust it",
"New login. Was this you?": "New login. Was this you?",
"Verify the new login accessing your account: %(name)s": "Verify the new login accessing your account: %(name)s",
@@ -474,7 +473,6 @@
"Show timestamps in 12 hour format (e.g. 2:30pm)": "Show timestamps in 12 hour format (e.g. 2:30pm)",
"Always show message timestamps": "Always show message timestamps",
"Autoplay GIFs and videos": "Autoplay GIFs and videos",
- "Show a reminder to enable Secure Message Recovery in encrypted rooms": "Show a reminder to enable Secure Message Recovery in encrypted rooms",
"Enable automatic language detection for syntax highlighting": "Enable automatic language detection for syntax highlighting",
"Show avatars in user and room mentions": "Show avatars in user and room mentions",
"Enable big emoji in chat": "Enable big emoji in chat",
@@ -652,12 +650,14 @@
"Cross-signing is ready for use.": "Cross-signing is ready for use.",
"Your account has a cross-signing identity in secret storage, but it is not yet trusted by this session.": "Your account has a cross-signing identity in secret storage, but it is not yet trusted by this session.",
"Cross-signing is not set up.": "Cross-signing is not set up.",
+ "Set up": "Set up",
"Reset": "Reset",
"Cross-signing public keys:": "Cross-signing public keys:",
"in memory": "in memory",
"not found": "not found",
"Cross-signing private keys:": "Cross-signing private keys:",
"in secret storage": "in secret storage",
+ "not found in storage": "not found in storage",
"Master private key:": "Master private key:",
"cached locally": "cached locally",
"not found locally": "not found locally",
@@ -832,9 +832,9 @@
"Account management": "Account management",
"Deactivating your account is a permanent action - be careful!": "Deactivating your account is a permanent action - be careful!",
"Deactivate Account": "Deactivate Account",
- "General": "General",
- "Discovery": "Discovery",
"Deactivate account": "Deactivate account",
+ "Discovery": "Discovery",
+ "General": "General",
"Legal": "Legal",
"Credits": "Credits",
"For help with using %(brand)s, click here.": "For help with using %(brand)s, click here.",
@@ -1171,12 +1171,6 @@
"%(roomName)s is not accessible at this time.": "%(roomName)s is not accessible at this time.",
"Try again later, or ask a room admin to check if you have access.": "Try again later, or ask a room admin to check if you have access.",
"%(errcode)s was returned while trying to access the room. If you think you're seeing this message in error, please submit a bug report .": "%(errcode)s was returned while trying to access the room. If you think you're seeing this message in error, please submit a bug report .",
- "Start using Key Backup": "Start using Key Backup",
- "Never lose encrypted messages": "Never lose encrypted messages",
- "Messages in this room are secured with end-to-end encryption. Only you and the recipient(s) have the keys to read these messages.": "Messages in this room are secured with end-to-end encryption. Only you and the recipient(s) have the keys to read these messages.",
- "Securely back up your keys to avoid losing them. Learn more.": "Securely back up your keys to avoid losing them. Learn more.",
- "Not now": "Not now",
- "Don't ask me again": "Don't ask me again",
"Appearance": "Appearance",
"Show rooms with unread messages first": "Show rooms with unread messages first",
"Show previews of messages": "Show previews of messages",
@@ -1630,9 +1624,6 @@
"Invite people to join %(communityName)s": "Invite people to join %(communityName)s",
"You cannot delete this message. (%(code)s)": "You cannot delete this message. (%(code)s)",
"Removing…": "Removing…",
- "Destroy cross-signing keys?": "Destroy cross-signing keys?",
- "Deleting cross-signing keys is permanent. Anyone you have verified with will see security alerts. You almost certainly don't want to do this, unless you've lost every device you can cross-sign from.": "Deleting cross-signing keys is permanent. Anyone you have verified with will see security alerts. You almost certainly don't want to do this, unless you've lost every device you can cross-sign from.",
- "Clear cross-signing keys": "Clear cross-signing keys",
"Confirm Removal": "Confirm Removal",
"Are you sure you wish to remove (delete) this event? Note that if you delete a room name or topic change, it could undo the change.": "Are you sure you wish to remove (delete) this event? Note that if you delete a room name or topic change, it could undo the change.",
"Clear all data in this session?": "Clear all data in this session?",
@@ -1732,9 +1723,11 @@
"Recently Direct Messaged": "Recently Direct Messaged",
"Direct Messages": "Direct Messages",
"Start a conversation with someone using their name, username (like {
});
}
- private joinRoom(payload: ActionPayload) {
+ private async joinRoom(payload: ActionPayload) {
this.setState({
joining: true,
});
- MatrixClientPeg.get().joinRoom(
- this.state.roomAlias || this.state.roomId, payload.opts,
- ).then(() => {
+
+ const cli = MatrixClientPeg.get();
+ const address = this.state.roomAlias || this.state.roomId;
+ try {
+ await retry(() => cli.joinRoom(address, payload.opts), NUM_JOIN_RETRY, (err) => {
+ // if we received a Gateway timeout then retry
+ return err.httpStatus === 504;
+ });
+
// We do *not* clear the 'joining' flag because the Room object and/or our 'joined' member event may not
// have come down the sync stream yet, and that's the point at which we'd consider the user joined to the
// room.
dis.dispatch({ action: 'join_room_ready' });
- }, (err) => {
+ } catch (err) {
dis.dispatch({
action: 'join_room_error',
err: err,
});
+
let msg = err.message ? err.message : JSON.stringify(err);
console.log("Failed to join room:", msg);
+
if (err.name === "ConnectionError") {
msg = _t("There was an error joining the room");
} else if (err.errcode === 'M_INCOMPATIBLE_ROOM_VERSION') {
@@ -296,12 +308,13 @@ class RoomViewStore extends Store {
}
}
}
+
const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
Modal.createTrackedDialog('Failed to join room', '', ErrorDialog, {
title: _t("Failed to join room"),
description: msg,
});
- });
+ }
}
private getInvitingUserId(roomId: string): string {
diff --git a/src/toasts/SetupEncryptionToast.ts b/src/toasts/SetupEncryptionToast.ts
index 9dbc4acafc..5aa030e497 100644
--- a/src/toasts/SetupEncryptionToast.ts
+++ b/src/toasts/SetupEncryptionToast.ts
@@ -18,7 +18,7 @@ import Modal from "../Modal";
import * as sdk from "../index";
import { _t } from "../languageHandler";
import DeviceListener from "../DeviceListener";
-import SetupEncryptionDialog from "../components/views/dialogs/SetupEncryptionDialog";
+import SetupEncryptionDialog from "../components/views/dialogs/security/SetupEncryptionDialog";
import { accessSecretStorage } from "../SecurityManager";
import ToastStore from "../stores/ToastStore";
import GenericToast from "../components/views/toasts/GenericToast";
@@ -28,7 +28,7 @@ const TOAST_KEY = "setupencryption";
const getTitle = (kind: Kind) => {
switch (kind) {
case Kind.SET_UP_ENCRYPTION:
- return _t("Set up encryption");
+ return _t("Set up Secure Backup");
case Kind.UPGRADE_ENCRYPTION:
return _t("Encryption upgrade available");
case Kind.VERIFY_THIS_SESSION:
@@ -36,10 +36,20 @@ const getTitle = (kind: Kind) => {
}
};
+const getIcon = (kind: Kind) => {
+ switch (kind) {
+ case Kind.SET_UP_ENCRYPTION:
+ case Kind.UPGRADE_ENCRYPTION:
+ return "secure_backup";
+ case Kind.VERIFY_THIS_SESSION:
+ return "verification_warning";
+ }
+};
+
const getSetupCaption = (kind: Kind) => {
switch (kind) {
case Kind.SET_UP_ENCRYPTION:
- return _t("Set up");
+ return _t("Continue");
case Kind.UPGRADE_ENCRYPTION:
return _t("Upgrade");
case Kind.VERIFY_THIS_SESSION:
@@ -51,7 +61,7 @@ const getDescription = (kind: Kind) => {
switch (kind) {
case Kind.SET_UP_ENCRYPTION:
case Kind.UPGRADE_ENCRYPTION:
- return _t("Verify yourself & others to keep your chats safe");
+ return _t("Safeguard against losing access to encrypted messages & data");
case Kind.VERIFY_THIS_SESSION:
return _t("Other users may not trust it");
}
@@ -88,7 +98,7 @@ export const showToast = (kind: Kind) => {
ToastStore.sharedInstance().addOrReplaceToast({
key: TOAST_KEY,
title: getTitle(kind),
- icon: "verification_warning",
+ icon: getIcon(kind),
props: {
description: getDescription(kind),
acceptLabel: getSetupCaption(kind),
diff --git a/src/utils/promise.ts b/src/utils/promise.ts
index d3ae2c3d1b..f828ddfdaf 100644
--- a/src/utils/promise.ts
+++ b/src/utils/promise.ts
@@ -68,3 +68,21 @@ export function allSettled(promises: Promise[]): Promise(fn: () => Promise, num: number, predicate?: (e: E) => boolean) {
+ let lastErr: E;
+ for (let i = 0; i < num; i++) {
+ try {
+ const v = await fn();
+ // If `await fn()` throws then we won't reach here
+ return v;
+ } catch (err) {
+ if (predicate && !predicate(err)) {
+ throw err;
+ }
+ lastErr = err;
+ }
+ }
+ throw lastErr;
+}
diff --git a/test/components/views/dialogs/AccessSecretStorageDialog-test.js b/test/components/views/dialogs/AccessSecretStorageDialog-test.js
index 5a8dcbf763..7c4b2996c9 100644
--- a/test/components/views/dialogs/AccessSecretStorageDialog-test.js
+++ b/test/components/views/dialogs/AccessSecretStorageDialog-test.js
@@ -20,7 +20,7 @@ import sdk from '../../../skinned-sdk';
import {MatrixClientPeg} from '../../../../src/MatrixClientPeg';
import { stubClient } from '../../../test-utils';
-const AccessSecretStorageDialog = sdk.getComponent("dialogs.secretstorage.AccessSecretStorageDialog");
+const AccessSecretStorageDialog = sdk.getComponent("dialogs.security.AccessSecretStorageDialog");
describe("AccessSecretStorageDialog", function() {
it("Closes the dialog if _onRecoveryKeyNext is called with a valid key", (done) => {
diff --git a/test/end-to-end-tests/src/scenarios/e2e-encryption.js b/test/end-to-end-tests/src/scenarios/e2e-encryption.js
index d31d2c0d57..20e8af2947 100644
--- a/test/end-to-end-tests/src/scenarios/e2e-encryption.js
+++ b/test/end-to-end-tests/src/scenarios/e2e-encryption.js
@@ -21,6 +21,7 @@ const {receiveMessage} = require('../usecases/timeline');
const {createDm} = require('../usecases/create-room');
const {checkRoomSettings} = require('../usecases/room-settings');
const {startSasVerifcation, acceptSasVerification} = require('../usecases/verify');
+const { setupSecureBackup } = require('../usecases/security');
const assert = require('assert');
module.exports = async function e2eEncryptionScenarios(alice, bob) {
@@ -43,4 +44,5 @@ module.exports = async function e2eEncryptionScenarios(alice, bob) {
const bobMessage = "You've got to tell me!";
await sendMessage(bob, bobMessage);
await receiveMessage(alice, {sender: "bob", body: bobMessage, encrypted: true});
+ await setupSecureBackup(alice);
};
diff --git a/test/end-to-end-tests/src/usecases/security.js b/test/end-to-end-tests/src/usecases/security.js
new file mode 100644
index 0000000000..31540874e9
--- /dev/null
+++ b/test/end-to-end-tests/src/usecases/security.js
@@ -0,0 +1,42 @@
+/*
+Copyright 2020 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+const { acceptToast } = require("./toasts");
+
+async function setupSecureBackup(session) {
+ session.log.step("sets up Secure Backup");
+
+ await acceptToast(session, "Set up Secure Backup");
+
+ // Continue with the default (generate a security key)
+ const xsignContButton = await session.query('.mx_CreateSecretStorageDialog .mx_Dialog_buttons .mx_Dialog_primary');
+ await xsignContButton.click();
+
+ //ignore the recovery key
+ //TODO: It's probably important for the tests to know the recovery key
+ const copyButton = await session.query('.mx_CreateSecretStorageDialog_recoveryKeyButtons_copyBtn');
+ await copyButton.click();
+
+ //acknowledge that we copied the recovery key to a safe place
+ const copyContinueButton = await session.query(
+ '.mx_CreateSecretStorageDialog .mx_Dialog_buttons .mx_Dialog_primary',
+ );
+ await copyContinueButton.click();
+
+ session.log.done();
+}
+
+module.exports = { setupSecureBackup };
diff --git a/test/end-to-end-tests/src/usecases/signup.js b/test/end-to-end-tests/src/usecases/signup.js
index fd41ef1a71..ef8a259091 100644
--- a/test/end-to-end-tests/src/usecases/signup.js
+++ b/test/end-to-end-tests/src/usecases/signup.js
@@ -79,21 +79,6 @@ module.exports = async function signup(session, username, password, homeserver)
const acceptButton = await session.query('.mx_InteractiveAuthEntryComponents_termsSubmit');
await acceptButton.click();
- // Continue with the default (generate a security key)
- const xsignContButton = await session.query('.mx_CreateSecretStorageDialog .mx_Dialog_buttons .mx_Dialog_primary');
- await xsignContButton.click();
-
- //ignore the recovery key
- //TODO: It's probably important for the tests to know the recovery key
- const copyButton = await session.query('.mx_CreateSecretStorageDialog_recoveryKeyButtons_copyBtn');
- await copyButton.click();
-
- //acknowledge that we copied the recovery key to a safe place
- const copyContinueButton = await session.query(
- '.mx_CreateSecretStorageDialog .mx_Dialog_buttons .mx_Dialog_primary',
- );
- await copyContinueButton.click();
-
//wait for registration to finish so the hash gets set
//onhashchange better?
diff --git a/yarn.lock b/yarn.lock
index 515ddddfc7..efc1f0eae1 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1907,17 +1907,7 @@ airbnb-prop-types@^2.15.0:
prop-types-exact "^1.2.0"
react-is "^16.9.0"
-ajv-errors@^1.0.0:
- version "1.0.1"
- resolved "https://registry.yarnpkg.com/ajv-errors/-/ajv-errors-1.0.1.tgz#f35986aceb91afadec4102fbd85014950cefa64d"
- integrity sha512-DCRfO/4nQ+89p/RK43i8Ezd41EqdGIU4ld7nGF8OQ14oc/we5rEntLCUa7+jrn3nn83BosfwZA0wb4pon2o8iQ==
-
-ajv-keywords@^3.1.0:
- version "3.4.1"
- resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.4.1.tgz#ef916e271c64ac12171fd8384eaae6b2345854da"
- integrity sha512-RO1ibKvd27e6FEShVFfPALuHI3WjSVNeK5FIsmme/LYRNxjKuNj+Dt7bucLa6NdSv3JcVTyMlm9kGR84z1XpaQ==
-
-ajv@^6.1.0, ajv@^6.10.0, ajv@^6.10.2, ajv@^6.5.5:
+ajv@^6.10.0, ajv@^6.10.2, ajv@^6.5.5:
version "6.12.2"
resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.2.tgz#c629c5eced17baf314437918d2da88c99d5958cd"
integrity sha512-k+V+hzjm5q/Mr8ef/1Y9goCmlsK4I6Sm74teeyGvFk1XrOsbsKLjEdrvny42CZ+a8sXbk8KWpY/bDwS+FLL2UQ==
@@ -2142,13 +2132,6 @@ async-limiter@~1.0.0:
resolved "https://registry.yarnpkg.com/async-limiter/-/async-limiter-1.0.1.tgz#dd379e94f0db8310b08291f9d64c3209766617fd"
integrity sha512-csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ==
-async@^2.5.0:
- version "2.6.3"
- resolved "https://registry.yarnpkg.com/async/-/async-2.6.3.tgz#d72625e2344a3656e3a3ad4fa749fa83299d82ff"
- integrity sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==
- dependencies:
- lodash "^4.17.14"
-
asynckit@^0.4.0:
version "0.4.0"
resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
@@ -2294,11 +2277,6 @@ bcrypt-pbkdf@^1.0.0:
dependencies:
tweetnacl "^0.14.3"
-big.js@^5.2.2:
- version "5.2.2"
- resolved "https://registry.yarnpkg.com/big.js/-/big.js-5.2.2.tgz#65f0af382f578bcdc742bd9c281e9cb2d7768328"
- integrity sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==
-
binary-extensions@^1.0.0:
version "1.13.1"
resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.13.1.tgz#598afe54755b2868a5330d2aff9d4ebb53209b65"
@@ -3285,11 +3263,6 @@ emojibase-regex@^4.0.1:
resolved "https://registry.yarnpkg.com/emojibase-regex/-/emojibase-regex-4.0.1.tgz#a2cd4bbb42825422da9ec72f15e970bc2c90b46a"
integrity sha512-S42UHkFfz15i4NNz+wi9iMKFo+B6Kalc6PJLpYX0BUANViXw4vSyYZMFdBGRLduSabWHuEcTLZl9xOa2YP3eJw==
-emojis-list@^3.0.0:
- version "3.0.0"
- resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-3.0.0.tgz#5570662046ad29e2e916e71aae260abdff4f6a78"
- integrity sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==
-
encoding@^0.1.11:
version "0.1.12"
resolved "https://registry.yarnpkg.com/encoding/-/encoding-0.1.12.tgz#538b66f3ee62cd1ab51ec323829d1f9480c74beb"
@@ -4018,14 +3991,6 @@ file-entry-cache@^5.0.1:
dependencies:
flat-cache "^2.0.1"
-file-loader@^3.0.1:
- version "3.0.1"
- resolved "https://registry.yarnpkg.com/file-loader/-/file-loader-3.0.1.tgz#f8e0ba0b599918b51adfe45d66d1e771ad560faa"
- integrity sha512-4sNIOXgtH/9WZq4NvlfU3Opn5ynUsqBwSLyM+I7UOwdGigTBYfVVQEwe/msZNX/j4pCJTIM14Fsw66Svo1oVrw==
- dependencies:
- loader-utils "^1.0.2"
- schema-utils "^1.0.0"
-
file-saver@^1.3.8:
version "1.3.8"
resolved "https://registry.yarnpkg.com/file-saver/-/file-saver-1.3.8.tgz#e68a30c7cb044e2fb362b428469feb291c2e09d8"
@@ -5746,15 +5711,6 @@ load-json-file@^4.0.0:
pify "^3.0.0"
strip-bom "^3.0.0"
-loader-utils@^1.0.2, loader-utils@^1.1.0:
- version "1.4.0"
- resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.4.0.tgz#c579b5e34cb34b1a74edc6c1fb36bfa371d5a613"
- integrity sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==
- dependencies:
- big.js "^5.2.2"
- emojis-list "^3.0.0"
- json5 "^1.0.1"
-
locate-path@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-2.0.0.tgz#2b568b265eec944c6d9c0de9c3dbbbca0354cd8e"
@@ -7684,15 +7640,6 @@ scheduler@^0.19.1:
loose-envify "^1.1.0"
object-assign "^4.1.1"
-schema-utils@^1.0.0:
- version "1.0.0"
- resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-1.0.0.tgz#0b79a93204d7b600d4b2850d1f66c2a34951c770"
- integrity sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==
- dependencies:
- ajv "^6.1.0"
- ajv-errors "^1.0.0"
- ajv-keywords "^3.1.0"
-
"semver@2 || 3 || 4 || 5", semver@^5.4.1, semver@^5.5.0, semver@^5.5.1, semver@^5.6.0, semver@^5.7.0, semver@^5.7.1:
version "5.7.1"
resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"
@@ -7850,14 +7797,6 @@ socks@~2.3.2:
ip "1.1.5"
smart-buffer "^4.1.0"
-source-map-loader@^0.2.4:
- version "0.2.4"
- resolved "https://registry.yarnpkg.com/source-map-loader/-/source-map-loader-0.2.4.tgz#c18b0dc6e23bf66f6792437557c569a11e072271"
- integrity sha512-OU6UJUty+i2JDpTItnizPrlpOIBLmQbWMuBg9q5bVtnHACqw1tn9nNwqJLbv0/00JjnJb/Ee5g5WS5vrRv7zIQ==
- dependencies:
- async "^2.5.0"
- loader-utils "^1.1.0"
-
source-map-resolve@^0.5.0:
version "0.5.3"
resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.3.tgz#190866bece7553e1f8f267a2ee82c606b5509a1a"
{_t("Deactivate account")}
+ {this._renderManagementSection()}
+ ;
+ }
+
+ let discoverySection;
+ if (SettingsStore.getValue(UIFeature.IdentityServer)) {
+ discoverySection = <>
+ {discoWarning} {_t("Discovery")}
+ {this._renderDiscoverySection()}
+ ;
+ }
+
return (
{_t("General")}
{this._renderProfileSection()}
{this._renderAccountSection()}
{this._renderLanguageSection()}
- {discoWarning} {_t("Discovery")}
- {this._renderDiscoverySection()}
+ { discoverySection }
{this._renderIntegrationManagerSection() /* Has its own title */}
- {_t("Deactivate account")}
- {this._renderManagementSection()}
+ { accountManagementSection }