This repository has been archived by the owner on Sep 11, 2024. It is now read-only.
-
-
Notifications
You must be signed in to change notification settings - Fork 832
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #3288 from matrix-org/jryans/user-settings-toggle-…
…3pid Add controls for toggling discovery in user settings
- Loading branch information
Showing
8 changed files
with
598 additions
and
38 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
248 changes: 248 additions & 0 deletions
248
src/components/views/settings/discovery/EmailAddresses.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,248 @@ | ||
| /* | ||
| Copyright 2019 New Vector Ltd | ||
| Copyright 2019 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. | ||
| */ | ||
|
|
||
| import React from 'react'; | ||
| import PropTypes from 'prop-types'; | ||
|
|
||
| import { _t } from "../../../../languageHandler"; | ||
| import MatrixClientPeg from "../../../../MatrixClientPeg"; | ||
| import sdk from '../../../../index'; | ||
| import Modal from '../../../../Modal'; | ||
| import IdentityAuthClient from '../../../../IdentityAuthClient'; | ||
| import AddThreepid from '../../../../AddThreepid'; | ||
|
|
||
| /* | ||
| TODO: Improve the UX for everything in here. | ||
| It's very much placeholder, but it gets the job done. The old way of handling | ||
| email addresses in user settings was to use dialogs to communicate state, however | ||
| due to our dialog system overriding dialogs (causing unmounts) this creates problems | ||
| for a sane UX. For instance, the user could easily end up entering an email address | ||
| and receive a dialog to verify the address, which then causes the component here | ||
| to forget what it was doing and ultimately fail. Dialogs are still used in some | ||
| places to communicate errors - these should be replaced with inline validation when | ||
| that is available. | ||
| */ | ||
|
|
||
| /* | ||
| TODO: Reduce all the copying between account vs. discovery components. | ||
| */ | ||
|
|
||
| export class EmailAddress extends React.Component { | ||
| static propTypes = { | ||
| email: PropTypes.object.isRequired, | ||
| }; | ||
|
|
||
| constructor(props) { | ||
| super(props); | ||
|
|
||
| const { bound } = props.email; | ||
|
|
||
| this.state = { | ||
| verifying: false, | ||
| addTask: null, | ||
| continueDisabled: false, | ||
| bound, | ||
| }; | ||
| } | ||
|
|
||
| async changeBinding({ bind, label, errorTitle }) { | ||
| const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog"); | ||
| const { medium, address } = this.props.email; | ||
|
|
||
| const task = new AddThreepid(); | ||
| this.setState({ | ||
| verifying: true, | ||
| continueDisabled: true, | ||
| addTask: task, | ||
| }); | ||
|
|
||
| try { | ||
| // XXX: Unfortunately, at the moment we can't just bind via the HS | ||
| // in a single operation, at it will error saying the 3PID is in use | ||
| // even though it's in use by the current user. For the moment, we | ||
| // work around this by removing the 3PID from the HS and re-adding | ||
| // it with IS binding enabled. | ||
| // See https://github.com/matrix-org/matrix-doc/pull/2140/files#r311462052 | ||
| await MatrixClientPeg.get().deleteThreePid(medium, address); | ||
| await task.addEmailAddress(address, bind); | ||
| this.setState({ | ||
| continueDisabled: false, | ||
| bound: bind, | ||
| }); | ||
| } catch (err) { | ||
| console.error(`Unable to ${label} email address ${address} ${err}`); | ||
| this.setState({ | ||
| verifying: false, | ||
| continueDisabled: false, | ||
| addTask: null, | ||
| }); | ||
| Modal.createTrackedDialog(`Unable to ${label} email address`, '', ErrorDialog, { | ||
| title: errorTitle, | ||
| description: ((err && err.message) ? err.message : _t("Operation failed")), | ||
| }); | ||
| } | ||
| } | ||
|
|
||
| onRevokeClick = (e) => { | ||
| e.stopPropagation(); | ||
| e.preventDefault(); | ||
| this.changeBinding({ | ||
| bind: false, | ||
| label: "revoke", | ||
| errorTitle: _t("Unable to revoke sharing for email address"), | ||
| }); | ||
| } | ||
|
|
||
| onShareClick = (e) => { | ||
| e.stopPropagation(); | ||
| e.preventDefault(); | ||
| this.changeBinding({ | ||
| bind: true, | ||
| label: "share", | ||
| errorTitle: _t("Unable to share email address"), | ||
| }); | ||
| } | ||
|
|
||
| onContinueClick = async (e) => { | ||
| e.stopPropagation(); | ||
| e.preventDefault(); | ||
|
|
||
| this.setState({ continueDisabled: true }); | ||
| try { | ||
| await this.state.addTask.checkEmailLinkClicked(); | ||
| this.setState({ | ||
| addTask: null, | ||
| continueDisabled: false, | ||
| verifying: false, | ||
| }); | ||
| } catch (err) { | ||
| this.setState({ continueDisabled: false }); | ||
| if (err.errcode !== 'M_THREEPID_AUTH_FAILED') { | ||
| const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog"); | ||
| console.error("Unable to verify email address: " + err); | ||
| Modal.createTrackedDialog('Unable to verify email address', '', ErrorDialog, { | ||
| title: _t("Unable to verify email address."), | ||
| description: ((err && err.message) ? err.message : _t("Operation failed")), | ||
| }); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| render() { | ||
| const AccessibleButton = sdk.getComponent('elements.AccessibleButton'); | ||
| const { address } = this.props.email; | ||
| const { verifying, bound } = this.state; | ||
|
|
||
| let status; | ||
| if (verifying) { | ||
| status = <span> | ||
| {_t("Check your inbox, then click Continue")} | ||
| <AccessibleButton | ||
| className="mx_ExistingEmailAddress_confirmBtn" | ||
| kind="primary_sm" | ||
| onClick={this.onContinueClick} | ||
| > | ||
| {_t("Continue")} | ||
| </AccessibleButton> | ||
| </span>; | ||
| } else if (bound) { | ||
| status = <AccessibleButton | ||
| className="mx_ExistingEmailAddress_confirmBtn" | ||
| kind="danger_sm" | ||
| onClick={this.onRevokeClick} | ||
| > | ||
| {_t("Revoke")} | ||
| </AccessibleButton>; | ||
| } else { | ||
| status = <AccessibleButton | ||
| className="mx_ExistingEmailAddress_confirmBtn" | ||
| kind="primary_sm" | ||
| onClick={this.onShareClick} | ||
| > | ||
| {_t("Share")} | ||
| </AccessibleButton>; | ||
| } | ||
|
|
||
| return ( | ||
| <div className="mx_ExistingEmailAddress"> | ||
| <span className="mx_ExistingEmailAddress_email">{address}</span> | ||
| {status} | ||
| </div> | ||
| ); | ||
| } | ||
| } | ||
|
|
||
| export default class EmailAddresses extends React.Component { | ||
| constructor() { | ||
| super(); | ||
|
|
||
| this.state = { | ||
| loaded: false, | ||
| emails: [], | ||
| }; | ||
| } | ||
|
|
||
| async componentWillMount() { | ||
| const client = MatrixClientPeg.get(); | ||
| const userId = client.getUserId(); | ||
|
|
||
| const { threepids } = await client.getThreePids(); | ||
| const emails = threepids.filter((a) => a.medium === 'email'); | ||
|
|
||
| if (emails.length > 0) { | ||
| // TODO: Handle terms agreement | ||
| // See https://github.com/vector-im/riot-web/issues/10522 | ||
| const authClient = new IdentityAuthClient(); | ||
| const identityAccessToken = await authClient.getAccessToken(); | ||
|
|
||
| // Restructure for lookup query | ||
| const query = emails.map(({ medium, address }) => [medium, address]); | ||
| const lookupResults = await client.bulkLookupThreePids(query, identityAccessToken); | ||
|
|
||
| // Record which are already bound | ||
| for (const [medium, address, mxid] of lookupResults.threepids) { | ||
| if (medium !== "email" || mxid !== userId) { | ||
| continue; | ||
| } | ||
| const email = emails.find(e => e.address === address); | ||
| if (!email) continue; | ||
| email.bound = true; | ||
| } | ||
| } | ||
|
|
||
| this.setState({ emails }); | ||
| } | ||
|
|
||
| render() { | ||
| let content; | ||
| if (this.state.emails.length > 0) { | ||
| content = this.state.emails.map((e) => { | ||
| return <EmailAddress email={e} key={e.address} />; | ||
| }); | ||
| } else { | ||
| content = <span className="mx_SettingsTab_subsectionText"> | ||
| {_t("Discovery options will appear once you have added an email above.")} | ||
| </span>; | ||
| } | ||
|
|
||
| return ( | ||
| <div className="mx_EmailAddresses"> | ||
| {content} | ||
| </div> | ||
| ); | ||
| } | ||
| } |
Oops, something went wrong.