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

Support IS v2 auth in preview bar

pull/21833/head
J. Ryan Stinnett 2019-07-29 15:08:54 +01:00
parent 244b613623
commit dacb5d42ac
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/components/views/dialogs/AddressPickerDialog.js
View File

@ -520,7 +520,12 @@ module.exports = React.createClass({
const isAccessToken = await authClient.getAccessToken();
if (cancelled) return null;
const lookup = await MatrixClientPeg.get().lookupThreePid(medium, address, undefined, isAccessToken);
const lookup = await MatrixClientPeg.get().lookupThreePid(
medium,
address,
undefined /* callback */,
isAccessToken,
);
if (cancelled || lookup === null || !lookup.mxid) return null;
const profile = await MatrixClientPeg.get().getProfileInfo(lookup.mxid);

8
src/components/views/rooms/RoomPreviewBar.js
View File

@ -25,6 +25,7 @@ import MatrixClientPeg from '../../../MatrixClientPeg';
import dis from '../../../dispatcher';
import classNames from 'classnames';
import { _t } from '../../../languageHandler';
import IdentityAuthClient from '../../../IdentityAuthClient';
const MessageCase = Object.freeze({
NotLoggedIn: "NotLoggedIn",
@ -111,8 +112,13 @@ module.exports = React.createClass({
if (this.props.inviterName && this.props.invitedEmail) {
this.setState({busy: true});
try {
const authClient = new IdentityAuthClient();
const isAccessToken = await authClient.getAccessToken();
const result = await MatrixClientPeg.get().lookupThreePid(
'email', this.props.invitedEmail,
'email',
this.props.invitedEmail,
undefined /* callback */,
isAccessToken,
);
this.setState({invitedEmailMxid: result.mxid});
} catch (err) {